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();
}

12
src/game/hsfman.c
View file

@ -1500,7 +1500,7 @@ void Hu3DLLightInfinitytSet(s16 dataIndex, s16 lightIndex) {
Hu3DLightInfinitytSet(light);
}
inline void Hu3DLightPointSet(LightData *light, u16 arg1, f32 arg8, f32 arg9) {
inline void Hu3DLightPointSet(LightData *light, f32 arg8, f32 arg9, u16 arg1) {
light->unk_00 &= 0xFF00;
light->unk_00 |= 2;
light->unk_04 = arg8;
@ -1508,19 +1508,19 @@ inline void Hu3DLightPointSet(LightData *light, u16 arg1, f32 arg8, f32 arg9) {
light->unk_02 = arg1;
}
void Hu3DGLightPointSet(s16 arg0, u16 arg1, f32 arg8, f32 arg9) {
void Hu3DGLightPointSet(s16 arg0, f32 arg8, f32 arg9, u16 arg1) {
LightData* light = &Hu3DGlobalLight[arg0];
Hu3DLightPointSet(light, arg1, arg8, arg9);
Hu3DLightPointSet(light, arg8, arg9, arg1);
}
void Hu3DLLightPointSet(s16 arg0, s16 arg1, u16 arg2, f32 arg8, f32 arg9) {
void Hu3DLLightPointSet(s16 arg0, s16 arg1, f32 arg8, f32 arg9, u16 arg2) {
ModelData* data;
LightData* light;
data = &Hu3DData[arg0];
light = &Hu3DLocalLight[data->unk_38[arg1]];
Hu3DLightPointSet(light, arg2, arg8, arg9);
Hu3DLightPointSet(light, arg8, arg9, arg2);
}
void Hu3DGLightKill(s16 index) {
@ -1755,7 +1755,7 @@ s32 Hu3DModelLightInfoSet(s16 arg0, s16 arg1) {
Hu3DGLightSpotSet(sp12, 2, var_r18->light.cutoff);
break;
case 1:
Hu3DGLightPointSet(sp12, 2, var_r18->data.base.scale.x - var_r18->data.base.rot.z, 1.0f);
Hu3DGLightPointSet(sp12, var_r18->data.base.scale.x - var_r18->data.base.rot.z, 1.0f, 2);
Hu3DGLightPosSet(sp12, var_r18->light.pos.x, var_r18->light.pos.y, var_r18->light.pos.z, var_r18->light.target.x, var_r18->light.target.y, var_r18->light.target.z);
break;
case 2:

48
src/game/saveload.c
View file

@ -152,7 +152,7 @@ s32 SLFileCreate(char *fileName, u32 size, void *addr) {
}
_SetFlag(FLAG_ID_MAKE(3, 0));
result = HuCardWrite(&curFileInfo, addr, size, 0);
_ClearFlag(FLAG_ID_MAKE(3, 0));
_ClearFlag(FLAG_ID_MAKE(3, 0));
if (result < 0) {
HuWinExAnimOut(window);
HuWinExCleanup(window);
@ -552,18 +552,18 @@ s32 SLStatSet(s32 reportF) {
}
return CARD_RESULT_FATAL_ERROR;
}
CARDSetCommentAddress(&stat, 0);
CARDSetIconAddress(&stat, 64);
CARDSetBannerFormat(&stat, CARD_STAT_BANNER_C8);
CARDSetIconFormat(&stat, 0, CARD_STAT_ICON_C8);
CARDSetIconFormat(&stat, 1, CARD_STAT_ICON_C8);
CARDSetIconFormat(&stat, 2, CARD_STAT_ICON_C8);
CARDSetIconFormat(&stat, 3, CARD_STAT_ICON_C8);
CARDSetCommentAddress(&stat, 0);
CARDSetIconAddress(&stat, 64);
CARDSetBannerFormat(&stat, CARD_STAT_BANNER_C8);
CARDSetIconFormat(&stat, 0, CARD_STAT_ICON_C8);
CARDSetIconFormat(&stat, 1, CARD_STAT_ICON_C8);
CARDSetIconFormat(&stat, 2, CARD_STAT_ICON_C8);
CARDSetIconFormat(&stat, 3, CARD_STAT_ICON_C8);
CARDSetIconSpeed(&stat, 0, CARD_STAT_SPEED_MIDDLE);
CARDSetIconSpeed(&stat, 1, CARD_STAT_SPEED_MIDDLE);
CARDSetIconSpeed(&stat, 2, CARD_STAT_SPEED_MIDDLE);
CARDSetIconSpeed(&stat, 3, CARD_STAT_SPEED_MIDDLE);
CARDSetIconSpeed(&stat, 4, CARD_STAT_SPEED_END);
CARDSetIconSpeed(&stat, 1, CARD_STAT_SPEED_MIDDLE);
CARDSetIconSpeed(&stat, 2, CARD_STAT_SPEED_MIDDLE);
CARDSetIconSpeed(&stat, 3, CARD_STAT_SPEED_MIDDLE);
CARDSetIconSpeed(&stat, 4, CARD_STAT_SPEED_END);
CARDSetIconAnim(&stat, CARD_STAT_ANIM_LOOP);
result = CARDSetStatus(curSlotNo, fileNo, &stat);
@ -706,43 +706,43 @@ s16 SLMessOut(s16 mess) {
slot_mess = 0;
has_choice = 0;
HuWinInit(1);
SLKillSaveWin();
SLKillSaveWin();
switch (mess) {
case 0:
save_mess = MAKE_MESSID(16, 2);
break;
case 1:
save_mess = MAKE_MESSID(16, 83);
HuWinInsertMesSizeGet(MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]), 0);
slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]);
break;
case 2:
HuWinInsertMesSizeGet(MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]), 0);
slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]);
save_mess = MAKE_MESSID(16, 74);
break;
case 3:
save_mess = MAKE_MESSID(16, 74);
HuWinInsertMesSizeGet(MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]), 0);
slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]);
break;
case 4:
save_mess = MAKE_MESSID(16, 74);
HuWinInsertMesSizeGet(MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]), 0);
slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]);
break;
case 5:
HuWinInsertMesSizeGet(MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]), 0);
slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]);
save_mess = MAKE_MESSID(16, 4);
has_choice = 1;
break;
case 6:
save_mess = MAKE_MESSID(16, 54);
break;
@ -751,30 +751,30 @@ s16 SLMessOut(s16 mess) {
slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]);
save_mess = MAKE_MESSID(16, 55);
break;
case 8:
HuWinInsertMesSizeGet(MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]), 0);
slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]);
save_mess = MAKE_MESSID(16, 57);
break;
case 9:
HuWinInsertMesSizeGet(MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]), 0);
slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]);
save_mess = MAKE_MESSID(16, 69);
break;
case 10:
save_mess = MAKE_MESSID(16, 70);
has_choice = 1;
break;
case 11:
HuWinInsertMesSizeGet(MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]), 0);
slot_mess = MAKE_MESSID_PTR(SlotNameTbl[curSlotNo]);
save_mess = MAKE_MESSID(16, 72);
break;
case 12:
save_mess = MAKE_MESSID(16, 80);
break;