kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

match m407dll, some cleanup as well

Browse source
This commit is contained in:
Rainchus 2024-04-06 14:00:15 -05:00
parent 34a7ca2006
commit 4e2c3b7631
12 changed files with 692 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/REL/m407dll/camera.c
View file

@ -4,6 +4,21 @@
#define M_PI 3.141592653589793
typedef struct unkDominationData2 {
/* 0x00 */ s32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ Point3d unk_08;
/* 0x14 */ Point3d unk_14;
/* 0x20 */ f32 unk_20;
/* 0x24 */ Point3d unk_24;
/* 0x30 */ Point3d unk_30;
/* 0x3C */ f32 unk_3C;
/* 0x40 */ s32 unk_40;
/* 0x44 */ f32 unk_44;
/* 0x48 */ f32 unk_48;
} unkDominationData2; //sizeof 0x4C
//function signatures
void fn_1_1CAC(f32, f32, f32);
void fn_1_1D08(f32, f32, f32);
void fn_1_1D64(f32);
@ -11,31 +26,18 @@ void fn_1_2024(omObjData*);
double cos(double x);
double sin(double x);
//bss
Process* lbl_1_bss_34;
omObjData* lbl_1_bss_30;
typedef struct unkDominationData2 {
s32 unk_00;
s32 unk_04;
Point3d unk_08;
Point3d unk_14;
f32 unk_20;
Point3d unk_24;
Point3d unk_30;
f32 unk_3C;
s32 unk_40;
f32 unk_44;
f32 unk_48;
} unkDominationData2;
void fn_1_1B1C(Process* arg0) {
unkDominationData2* unkData;
lbl_1_bss_34 = arg0;
Hu3DCameraViewportSet(1, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f);
Hu3DCameraPerspectiveSet(1, 45.0f, 10.0f, 40000.0f, 1.2f);
lbl_1_bss_30 = omAddObjEx(lbl_1_bss_34, 0x80, 0U, 0U, -1, fn_1_2024);
lbl_1_bss_30->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData2), 0x10000000);
lbl_1_bss_30 = omAddObjEx(lbl_1_bss_34, 0x80, 0, 0, -1, fn_1_2024);
lbl_1_bss_30->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData2), MEMORY_DEFAULT_NUM);
unkData = OM_GET_DATA_PTR(lbl_1_bss_30, unkDominationData2);
unkData->unk_04 = 0;
fn_1_1CAC(0.0f, 0.0f, 0.0f);
@ -151,10 +153,10 @@ void fn_1_2024(omObjData* arg0) {
}
break;
case 2:
var_f31 = (f32) sin((M_PI * (90.0f * temp_r31->unk_44)) / 180.0);
var_f31 = sin((M_PI * (90.0f * temp_r31->unk_44)) / 180.0);
break;
case 3:
var_f31 = (f32) sin((M_PI * (90.0f * temp_r31->unk_44)) / 180.0);
var_f31 = sin((M_PI * (90.0f * temp_r31->unk_44)) / 180.0);
if (temp_r31->unk_48 > 0.5) {
temp_r31->unk_00 = 4;
}