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

Matched REL/m403 + some code cleanup

Browse source
This commit is contained in:
mrshigure 2024-05-08 17:53:15 -07:00
parent 4add2acaac
commit 36948439b2
19 changed files with 2967 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/REL/m402Dll/main.c
View file

@ -751,24 +751,6 @@ static void fn_1_1F58(s32 arg0) {
lbl_1_bss_1A4 = -1;
}
static inline float fn_1_1FC4InlineFunc(float arg0, float arg1, float arg2) {
float var_f29;
float var_f27;
var_f29 = fmod(arg1 - arg0, 360.0);
if (0.0f > var_f29) {
var_f29 += 360.0f;
}
if (180.0f < var_f29) {
var_f29 -= 360.0f;
}
var_f27 = fmod(arg0 + var_f29 * arg2, 360.0);
if (0.0f > var_f27) {
var_f27 += 360.0f;
}
return var_f27;
}
static void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3) {
Vec sp18;
float var_f28;
@ -789,7 +771,7 @@ static void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3) {
sp18.x = 10.0f * sp18.x;
sp18.z = 10.0f * sp18.z;
}
*arg1 = fn_1_1FC4InlineFunc(*arg1, atan2d(sp18.x, sp18.z), 0.4f);
*arg1 = fn_1_1E20(*arg1, atan2d(sp18.x, sp18.z), 0.4f);
if (8.0f <= var_f28) {
var_r30 = 2;
} else {
@ -943,7 +925,6 @@ static void fn_1_3204(omObjData *arg0) {
omObjData *temp_r29;
UnkData234Struct *temp_r28;
u16 var_r26;
s32 temp_r20;
temp_r31 = arg0->data;
if (lbl_1_bss_58->work[0] == 1007) {
@ -960,10 +941,7 @@ static void fn_1_3204(omObjData *arg0) {
}
Hu3DMotionSpeedSet(arg0->model[0], 1.0f);
if (lbl_1_bss_26 == temp_r31->unk54) {
temp_r20 = temp_r31->unk54;
if (!_CheckFlag(FLAG_ID_MAKE(1, 12))) {
GWPlayer[temp_r20].coin_win = 10;
}
GWPlayerCoinWinSet(temp_r31->unk54, 10);
}
arg0->func = fn_1_43D8;
return;
@ -1243,7 +1221,7 @@ static void fn_1_43D8(omObjData *arg0) {
arg0->func = fn_1_3204;
}
break;
case 2010:
if (temp_r31->unk54 == lbl_1_bss_26) {
temp_r31->unk4C = 2012;
@ -1259,10 +1237,10 @@ static void fn_1_43D8(omObjData *arg0) {
fn_1_2B30(temp_r31, arg0, temp_r30);
}
break;
case 2011:
break;
case 2011:
break;
case 2012:
temp_r31->unk1C -= temp_r31->unk20;
if (0.0f > temp_r31->unk1C) {

1592
src/REL/m403Dll/main.c Executable file
View file

File diff suppressed because it is too large Load diff

1024
src/REL/m403Dll/scene.c Executable file
View file

File diff suppressed because it is too large Load diff

4
src/REL/option/rumble.c
View file

@ -129,13 +129,13 @@ static void fn_1_32F0(omObjData *arg0) {
fn_1_39E0(temp_r31->unk00, 1, 1);
temp_r31->unk20 = 1;
temp_r31->unk28 = 0;
GWRumbleSet(1);
GWRumbleSet(1);
arg0->unk10 = 3;
} else if (fn_1_584(4) != 0 && temp_r31->unk20 != 0) {
fn_1_39E0(temp_r31->unk00, 0, 1);
temp_r31->unk20 = 0;
temp_r31->unk28 = 0;
GWRumbleSet(0);
GWRumbleSet(0);
arg0->unk10 = 3;
}
}

8
src/REL/present/present.c
View file

@ -84,10 +84,10 @@ static const UnkPresentNestedOuterStruct lbl_1_rodata_2B8[] = {
},
{ 0x0000000B, { { 0x00000062, 0xFFFFFFFF, 0x00320036, 0x00320072 }, { 0x00000063, 0xFFFFFFFF, 0x00320037, 0x00320073 },
{ 0x00000064, 0xFFFFFFFF, 0x00320038, 0x00320074 }, { 0x00000065, 0xFFFFFFFF, 0x00320039, 0x00320075 },
{ 0x00000066, 0xFFFFFFFF, 0x0032003A, 0x00320076 }, { 0x00000067, 0xFFFFFFFF, 0x0032003B, 0x00320077 },
{ 0x00000068, 0xFFFFFFFF, 0x0032003C, 0x00320078 }, { 0x00000069, 0xFFFFFFFF, 0x0032003D, 0x00320079 },
{ 0x0000006A, 0xFFFFFFFF, 0x0032003E, 0x0032007A }, { 0x0000006B, 0xFFFFFFFF, 0x0032003F, 0x0032007B },
{ 0x0000006C, 0xFFFFFFFF, 0x00320040, 0x0032007C }
{ 0x00000066, 0xFFFFFFFF, 0x0032003A, 0x00320076 }, { 0x00000067, 0xFFFFFFFF, 0x0032003B, 0x00320077 },
{ 0x00000068, 0xFFFFFFFF, 0x0032003C, 0x00320078 }, { 0x00000069, 0xFFFFFFFF, 0x0032003D, 0x00320079 },
{ 0x0000006A, 0xFFFFFFFF, 0x0032003E, 0x0032007A }, { 0x0000006B, 0xFFFFFFFF, 0x0032003F, 0x0032007B },
{ 0x0000006C, 0xFFFFFFFF, 0x00320040, 0x0032007C }
},
},
};

16
src/REL/w01Dll/main.c
View file

@ -1114,7 +1114,7 @@ static void fn_1_3624(void) {
}
temp_r19 = HuAudFXPlay(0x40C);
fn_1_4774();
WipeCreate(1, 0, -1);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
lbl_1_bss_6B0 = 1;
HuAudFXPlay(0x413);
while (TRUE) {
@ -1163,7 +1163,7 @@ static void fn_1_3624(void) {
lbl_1_bss_660.x = lbl_1_bss_660.z = 0.0f;
BoardAudSeqFadeOut(1, 1000);
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
HuAudFXPlay(0x401);
temp_f28 = (-lbl_1_bss_63C - lbl_1_bss_660.y) / 30.0f;
for (i = 0; i < 30; i++) {
@ -1213,7 +1213,7 @@ static void fn_1_45F4(void) {
BoardAudSeqPause(0, 0, 1000);
BoardCameraMoveSet(1);
BoardCameraMotionWait();
WipeCreate(1, 0, 21);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -1316,7 +1316,7 @@ static s32 fn_1_48B4(void) {
HuAudFXPlay(0x402);
BoardStatusShowSetAll(0);
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 21);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -1930,7 +1930,7 @@ static void fn_1_77EC(s32 arg0, s32 arg1) {
static void fn_1_7894(void) {
lbl_1_bss_6B1 = 1;
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 21);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -1987,7 +1987,7 @@ static void fn_1_7A64(void) {
fn_1_852C();
BoardModelMotionSpeedSet(lbl_1_bss_6AE, lbl_1_bss_670);
BoardCameraMotionWait();
WipeCreate(1, 0, -1);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
lbl_1_bss_6B0 = 1;
temp_r19 = HuAudFXPlay(0x412);
while (TRUE) {
@ -2005,13 +2005,13 @@ static void fn_1_7A64(void) {
if (lbl_1_bss_0->unk00_field0 == 0) {
if (BoardModelMotionTimeGet(lbl_1_bss_6AE) <= 20.0f && var_r28 == 0) {
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
var_r28 = 1;
}
} else {
if (BoardModelMotionTimeGet(lbl_1_bss_6AE) >= lbl_1_bss_644 - 20.0f && var_r28 == 0) {
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
var_r28 = 1;
}
}

8
src/REL/w04Dll/big_boo.c
View file

@ -301,7 +301,7 @@ static void fn_1_68D8(void) {
HuPrcVSleep();
}
BoardModelAlphaSet(lbl_1_bss_274, 0);
WipeCreate(2, 0, 60);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
WipeColorSet(0, 0, 0);
while (WipeStatGet() != 0) {
HuPrcVSleep();
@ -384,7 +384,7 @@ static void fn_1_6CF8(void) {
BoardCameraXRotZoomSet(1600.0f, -5.0f);
lbl_1_bss_104 = HuPrcChildCreate(fn_1_75D8, 0x2003, 0x1000, 0, boardMainProc);
HuPrcDestructorSet2(lbl_1_bss_104, fn_1_757C);
WipeCreate(1, 0, 60);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -417,7 +417,7 @@ static void fn_1_7300(void) {
s32 i;
s32 j;
WipeCreate(2, 0, 30);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -453,7 +453,7 @@ static void fn_1_7300(void) {
sp8.x = sp8.y = sp8.z = 3.0f;
BoardModelScaleSetV(lbl_1_bss_274, &sp8);
BoardModelPosSetV(lbl_1_bss_274, &lbl_1_bss_108);
WipeCreate(1, 0, 30);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}

12
src/REL/w06Dll/bowser.c
View file

@ -317,7 +317,7 @@ static void fn_1_95AC(s32 arg0) {
HuPrcVSleep();
}
WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(2, 1, 1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_CROSS, 1);
HuPrcSleep(2);
BoardCameraMoveSet(0);
BoardModelVisibilitySet(BoardPlayerModelGet(arg0), 0);
@ -334,7 +334,7 @@ static void fn_1_95AC(s32 arg0) {
sp38.z = sp2C.z;
BoardPlayerPosSetV(arg0, &sp38);
BoardModelVisibilitySet(BoardPlayerModelGet(arg0), 1);
WipeCreate(1, 1, 30);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_CROSS, 30);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -553,7 +553,7 @@ static void fn_1_A408(s32 arg0) {
_SetFlag(FLAG_ID_MAKE(1, 28));
_SetFlag(FLAG_ID_MAKE(1, 14));
WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(2, 0, -1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -669,7 +669,7 @@ static void fn_1_AB4C(s32 arg0, s32 arg1) {
BoardCameraMotionStartEx(lbl_1_data_49A, &spC, &sp18, 2000.0f, -1.0f, 2);
BoardCameraMotionWait();
BoardCameraTargetModelSet(-1);
WipeCreate(1, 0, 21);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -1048,7 +1048,7 @@ static void fn_1_C40C(void) {
sp20.y += 250.0f;
BoardModelPosSetV(lbl_1_data_4A0, &sp20);
BoardModelScaleSet(lbl_1_data_4A0, 10.0f, 10.0f, 10.0f);
WipeCreate(1, 0, 21);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -1083,7 +1083,7 @@ static void fn_1_C40C(void) {
BoardWinKill();
BoardAudSeqFadeOut(1, 1000);
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 21);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}