diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2023-12-08 16:25:12 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2023-12-08 16:25:12 -0500 |
| commit | a3170e5d69e1a62bd2103634ba97f681ac47ed77 (patch) | |
| tree | 579b932cc66c4649bedba3ad5e60daae0e213d0c /src/d/d_stage.cpp | |
| parent | 009b4fb35e5a1d010fcf98590dfbcc7071fc28f8 (diff) | |
add default params to a lot more functions
Diffstat (limited to 'src/d/d_stage.cpp')
| -rw-r--r-- | src/d/d_stage.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 74d1bdaa..bc3529e4 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1489,13 +1489,13 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file) JUT_ASSERT(1842, stageProc != 0); if (stageProc->mBase.mBase.mProcName != PROC_PLAY_SCENE) { - fopAcM_create(PROC_TITLE, 0, NULL, -1); + fopAcM_create(PROC_TITLE, 0); } fopMsgM_Create(PROC_METER, NULL, NULL); cXyz agb_pos(appen->mPos.x, appen->mPos.y + 10.0f, appen->mPos.z); - fopAcM_create(PROC_AGB, 0, &agb_pos, -1); + fopAcM_create(PROC_AGB, 0, &agb_pos); dComIfGp_setAgb(NULL); return 1; } @@ -1962,10 +1962,10 @@ int dStage_roomDrtgInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void* /* 80042EB8-80042F14 .text dKankyo_create__Fv */ void dKankyo_create() { - fopKyM_Create(PROC_KANKYO, NULL, NULL); - fopKyM_Create(PROC_KYEFF, NULL, NULL); - fopKyM_Create(PROC_KYEFF2, NULL, NULL); - fopKyM_Create(PROC_ENVSE, NULL, NULL); + fopKyM_Create(PROC_KANKYO); + fopKyM_Create(PROC_KYEFF); + fopKyM_Create(PROC_KYEFF2); + fopKyM_Create(PROC_ENVSE); } /* 80042F14-80042FC4 .text dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei */ @@ -2262,9 +2262,9 @@ int dStage_changeSceneExitId(cBgS_PolyInfo& i_poly, f32 i_speed, u32 i_mode, s8 s16 point = IkadaGetLinkIdArg1(actor_p); if (exit_id == 0x3E) { - dComIfGp_setNextStage("Obshop", point, roomNo, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("Obshop", point, roomNo, -1, i_speed, i_mode); } else if (exit_id == 0x3B) { - dComIfGp_setNextStage("Abship", point, roomNo, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("Abship", point, roomNo, -1, i_speed, i_mode); } dComIfGp_setIkadaShipBeforeRoomId(i_roomNo); @@ -2274,22 +2274,21 @@ int dStage_changeSceneExitId(cBgS_PolyInfo& i_poly, f32 i_speed, u32 i_mode, s8 } else if (exit_id == 0x3D) { JUT_ASSERT(4134, dComIfGp_getIkadaShipBeforeRoomId() >= 0 && dComIfGp_getIkadaShipBeforeRoomId() < 64); - dComIfGp_setNextStage("sea", -2, dComIfGp_getIkadaShipBeforeRoomId(), -1, i_speed, i_mode, - 1, 0); + dComIfGp_setNextStage("sea", -2, dComIfGp_getIkadaShipBeforeRoomId(), -1, i_speed, i_mode); return 1; } else if (exit_id == 0x3C) { if (strcmp(dComIfGp_getStartStageName(), "Asoko") == 0) { if (dComIfGs_isEventBit(0x808)) { if (dComIfGs_isEventBit(0x520)) { - dComIfGp_setNextStage("sea", 5, 11, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("sea", 5, 11, -1, i_speed, i_mode); } else { - dComIfGp_setNextStage("MajyuE", 18, 0, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("MajyuE", 18, 0, -1, i_speed, i_mode); } } else { - dComIfGp_setNextStage("A_umikz", 0, 0, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("A_umikz", 0, 0, -1, i_speed, i_mode); } } else { - dComIfGp_setNextStage("Asoko", 0, 0, -1, i_speed, i_mode, 1, 0); + dComIfGp_setNextStage("Asoko", 0, 0, -1, i_speed, i_mode); } return 1; } @@ -2318,14 +2317,14 @@ int dStage_changeScene(int i_exitId, f32 speed, u32 mode, s8 room_no) { s32 wipe = dStage_sclsInfo_getWipe(scls_info); dComIfGp_setNextStage(scls_info->mStage, scls_info->mStart, scls_info->mRoom, -1, speed, mode, - 1, wipe == 15 ? 0 : wipe); + TRUE, wipe == 15 ? 0 : wipe); return 1; } /* 80043AB0-80043B10 .text dStage_restartRoom__FUlUl */ void dStage_restartRoom(u32 roomParam, u32 mode) { dComIfGp_setNextStage(dComIfGp_getStartStageName(), -1, dComIfGs_getRestartRoomNo(), -1, 0.0f, - mode, 0, 0); + mode, FALSE); dComIfGs_setRestartRoomParam(roomParam); } @@ -2335,7 +2334,7 @@ void dStage_turnRestart() { if (layerNo >= 0) layerNo ^= 1; - dComIfGp_setNextStage(dComIfGp_getStartStageName(), -3, dComIfGs_getTurnRestartRoomNo(), layerNo, 0.0f, 0, 0, 6); + dComIfGp_setNextStage(dComIfGp_getStartStageName(), -3, dComIfGs_getTurnRestartRoomNo(), layerNo, 0.0f, 0, FALSE, 6); s32 hour = dKy_getdaytime_hour(); f32 nextTime = 180.0f; @@ -2361,7 +2360,7 @@ void dStage_escapeRestart() { } dComIfGp_setNextStage(dComIfGp_getStartStageName(), -3, dComIfGs_getTurnRestartRoomNo(), -1, - 0.0f, 0, 0, 9); + 0.0f, 0, FALSE, 9); } /* 80043C84-80043CD0 .text dStage_checkRestart__Fv */ |
