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

18
src/game/board/item.c
View file

@ -863,7 +863,7 @@ static void ExecItemPipe(void) {
HuPrcVSleep();
}
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 30);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -889,7 +889,7 @@ static void ExecItemPipe(void) {
BoardPlayerVoiceEnableSet(sp2C[var_r31], 4, 0);
BoardModelVisibilitySet(BoardPlayerModelGet(sp2C[var_r31]), 0);
}
WipeCreate(1, 0, 30);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -1422,7 +1422,7 @@ static void ExecItemWhistle(void) {
HuPrcVSleep();
}
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 60);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -1437,7 +1437,7 @@ static void ExecItemWhistle(void) {
for (var_r31 = 0; var_r31 < 4; var_r31++) {
BoardModelVisibilitySet(sp20[var_r31], 1);
}
WipeCreate(1, 0, 60);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -1540,7 +1540,7 @@ static void ExecItemWhistle(void) {
BoardModelPosSetV(temp_r28, &sp9C);
var_f30 *= 0.945f;
if (sp9C.y >= 500.0f && var_r26 == 0) {
WipeCreate(2, 0, 45);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 45);
BoardAudSeqFadeOut(0, 1000);
var_r26 = 1;
}
@ -2248,7 +2248,7 @@ static void GenieSceneExec(void) {
Hu3DModelPosSet(temp_r27, booCamPos.x, booCamPos.y, booCamPos.z - 175.0f);
temp_r23 = Hu3DData[temp_r27].unk_120;
temp_r23->unk_02 = 1;
WipeCreate(1, 0, 45);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 45);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -2345,7 +2345,7 @@ static void GenieSceneExec(void) {
}
HuPrcVSleep();
}
WipeCreate(2, 0, 45);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 45);
BoardAudSeqFadeOut(1, 1000);
while (WipeStatGet() != 0) {
HuPrcVSleep();
@ -2428,7 +2428,7 @@ static void ExecItemGenie(void) {
HuAudFXStop(temp_r25);
HuAudFXPauseAll(1);
WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(2, 0, 45);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 45);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -2448,7 +2448,7 @@ static void ExecItemGenie(void) {
BoardPlayerPosSetV(currItemRestore, &spC);
BoardCameraMotionWait();
BoardCameraMoveSet(1);
WipeCreate(1, 0, 45);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 45);
HuPrcSleep(15);
BoardAudSeqPause(0, 0, 1000);
while (WipeStatGet() != 0) {

18
src/game/board/pause.c
View file

@ -506,13 +506,13 @@ static void PauseConfigObjFunc(omObjData *arg0) {
break;
case 1:
if (UpdatePauseBox(arg0, temp_r31, 1) != 0) {
GWMGExplainSet(boxState[1]);
GWMGExplainSet(boxState[1]);
}
UpdatePauseText(cursorPos);
break;
case 2:
if (UpdatePauseBox(arg0, temp_r31, 2) != 0) {
GWMGShowComSet(boxState[2]);
GWMGShowComSet(boxState[2]);
}
UpdatePauseText(cursorPos);
break;
@ -534,7 +534,7 @@ static void PauseConfigObjFunc(omObjData *arg0) {
break;
case 4:
if (UpdatePauseBox(arg0, temp_r31, 4) != 0) {
GWRumbleSet(boxState[4]);
GWRumbleSet(boxState[4]);
}
UpdatePauseText(cursorPos);
break;
@ -542,13 +542,13 @@ static void PauseConfigObjFunc(omObjData *arg0) {
if (UpdatePauseBoxExt(arg0, temp_r31, 5) != 0) {
switch (boxState[5]) {
case 0:
GWMessSpeedSet(2);
GWMessSpeedSet(2);
break;
case 1:
GWMessSpeedSet(1);
GWMessSpeedSet(1);
break;
case 2:
GWMessSpeedSet(0);
GWMessSpeedSet(0);
break;
}
}
@ -562,13 +562,13 @@ static void PauseConfigObjFunc(omObjData *arg0) {
if (UpdatePauseBoxExt(arg0, temp_r31, 6) != 0) {
switch (boxState[6]) {
case 0:
GWSaveModeSet(1);
GWSaveModeSet(1);
break;
case 1:
GWSaveModeSet(0);
GWSaveModeSet(0);
break;
case 2:
GWSaveModeSet(2);
GWSaveModeSet(2);
break;
}
}

8
src/game/board/star.c
View file

@ -663,7 +663,7 @@ void BoardStarShowNext(s32 arg0) {
var_r26 = &wipeData;
if (var_r26->mode == 0) {
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 21);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -727,7 +727,7 @@ void BoardStarShowNext(s32 arg0) {
BoardCameraMotionWait();
BoardCameraMoveSet(1);
HuPrcSleep(1);
WipeCreate(1, 0, 21);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -758,7 +758,7 @@ void BoardStarShowNext(s32 arg0) {
}
BoardAudSeqFadeOut(1, 1000);
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 21);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -774,7 +774,7 @@ void BoardStarShowNext(s32 arg0) {
BoardCameraMotionWait();
BoardCameraMoveSet(1);
BoardStatusItemSet(1);
WipeCreate(1, 0, 21);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}

10
src/game/board/start.c
View file

@ -148,7 +148,7 @@ static void ExecStart(void) {
InitCamera();
CreateTapWin();
InitHost();
WipeCreate(1, 0, 0x15);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -172,7 +172,7 @@ static void ExecStart(void) {
if (_CheckFlag(0x1000B)) {
BoardTutorialHookExec(4, 0);
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 0x15);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -188,7 +188,7 @@ static void ExecStart(void) {
BoardCameraMotionWait();
BoardCameraMoveSet(1);
BoardModelVisibilitySet(BoardStarHostMdlGet(), 0);
WipeCreate(1, 0, 0x15);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -197,7 +197,7 @@ static void ExecStart(void) {
BoardCameraNearFarSet(100.0f, 13000.0f);
if (GWBoardGet() == 7 || GWBoardGet() == 8) {
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 0x15);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -213,7 +213,7 @@ static void ExecStart(void) {
BoardCameraViewSet(2);
BoardCameraMotionWait();
BoardCameraMoveSet(1);
WipeCreate(1, 0, 0x15);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}