From 3f30fd613da69687b72b2e36e3276234dab5566e Mon Sep 17 00:00:00 2001 From: kabiskac Date: Sun, 9 Jun 2024 18:09:26 +0200 Subject: [PATCH] Renamed BoardDiceDigit2DShowSet to BoardRollDispSet --- config/GMPE01_00/symbols.txt | 2 +- include/game/board/player.h | 2 +- src/REL/w01Dll/main.c | 12 ++++++------ src/REL/w02Dll/main.c | 6 +++--- src/REL/w02Dll/roulette.c | 4 ++-- src/REL/w03Dll/condor.c | 4 ++-- src/REL/w03Dll/mg_coin.c | 4 ++-- src/REL/w03Dll/mg_item.c | 4 ++-- src/REL/w03Dll/river.c | 4 ++-- src/REL/w03Dll/statue.c | 4 ++-- src/REL/w04Dll/boo_event.c | 4 ++-- src/REL/w04Dll/bridge.c | 4 ++-- src/REL/w04Dll/main.c | 8 ++++---- src/REL/w05Dll/hotel.c | 6 +++--- src/REL/w05Dll/main.c | 4 ++-- src/REL/w05Dll/monkey.c | 6 +++--- src/REL/w06Dll/bowser.c | 4 ++-- src/REL/w06Dll/bridge.c | 4 ++-- src/REL/w06Dll/fire.c | 4 ++-- src/REL/w06Dll/mg_coin.c | 4 ++-- src/REL/w06Dll/mg_item.c | 4 ++-- src/game/board/boo_house.c | 6 +++--- src/game/board/lottery.c | 4 ++-- src/game/board/pause.c | 4 ++-- src/game/board/player.c | 14 +++++++------- src/game/board/shop.c | 4 ++-- src/game/board/star.c | 4 ++-- src/game/kerent.c | 10 +++++----- 28 files changed, 72 insertions(+), 72 deletions(-) diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index cef26135..b93c5259 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -1187,7 +1187,7 @@ ExecMotBlend = .text:0x80068230; // type:function size:0x51C scope:local BoardPlayerMotBlendCheck = .text:0x8006874C; // type:function size:0x2C BoardRollCreate = .text:0x80068778; // type:function size:0x138 BoardRollUpdateSet = .text:0x800688B0; // type:function size:0x38 -BoardDiceDigit2DShowSet = .text:0x800688E8; // type:function size:0x10C +BoardRollDispSet = .text:0x800688E8; // type:function size:0x10C UpdateRollSprite = .text:0x800689F4; // type:function size:0x194 scope:local UpdateRoll = .text:0x80068B88; // type:function size:0x278 scope:local BoardPlayerBtnDownWait = .text:0x80068E00; // type:function size:0x6C diff --git a/include/game/board/player.h b/include/game/board/player.h index 893bf6ec..df4e2c49 100644 --- a/include/game/board/player.h +++ b/include/game/board/player.h @@ -128,7 +128,7 @@ s32 BoardPlayerAnimBlendCheck(s32); s16 BoardBowserSuitPlayerModelGet(void); void BoardBowserSuitMotionSetWait(void); void BoardBowserSuitPlayerModelKill(void); -void BoardDiceDigit2DShowSet(s32); +void BoardRollDispSet(s32); s32 BoardPlayerMotBlendCheck(s32); void BoardBowserSuitMotionSetWalk(void); s16 BoardBowserSuitModelGet(void); diff --git a/src/REL/w01Dll/main.c b/src/REL/w01Dll/main.c index da46efb7..70dce0bd 100755 --- a/src/REL/w01Dll/main.c +++ b/src/REL/w01Dll/main.c @@ -650,13 +650,13 @@ static s32 fn_1_157C(void) { temp_curr = GWPlayer[GWSystem.player_curr].space_curr; temp_r31 = BoardSpaceFlagGet(0, temp_curr) & 0x600000; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); if (temp_r31 == 0x200000) { fn_1_130C(); } else if (temp_r31 == 0x400000) { fn_1_128C(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } static void fn_1_1670(void) { @@ -1355,7 +1355,7 @@ static void fn_1_4FA8(void) { static void fn_1_4FD8(void) { lbl_1_bss_6B4 = GWSystem.player_curr; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); if (BoardPlayerSizeGet(lbl_1_bss_6B4) == 2 || GWPlayer[lbl_1_bss_6B4].bowser_suit) { return; } @@ -1364,7 +1364,7 @@ static void fn_1_4FD8(void) { while (lbl_1_bss_8) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } static void fn_1_50D4(void) { @@ -1518,13 +1518,13 @@ static void fn_1_5694(s32 arg0) { static void fn_1_586C(s32 arg0, s32 arg1) { lbl_1_bss_29 = arg0; lbl_1_bss_26 = arg1; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lbl_1_bss_14 = HuPrcChildCreate(fn_1_592C, 0x2003, 0x2000, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_14, fn_1_5B2C); while (lbl_1_bss_14) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } static void fn_1_592C(void) { diff --git a/src/REL/w02Dll/main.c b/src/REL/w02Dll/main.c index 9caf50aa..d50f3d08 100644 --- a/src/REL/w02Dll/main.c +++ b/src/REL/w02Dll/main.c @@ -432,7 +432,7 @@ s32 fn_1_1128(void) { s16 currSpace; currSpace = GWPlayer[GWSystem.player_curr].space_curr; spaceFlags = BoardSpaceFlagGet(0, currSpace) & 0x600000; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); if (spaceFlags & 0x200000) { fn_1_990(); @@ -444,7 +444,7 @@ s32 fn_1_1128(void) { } } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } void fn_1_121C(u32 mesg) { @@ -453,4 +453,4 @@ void fn_1_121C(u32 mesg) { BoardWinKill(); } -f32 const padMain = 0.0f; \ No newline at end of file +f32 const padMain = 0.0f; diff --git a/src/REL/w02Dll/roulette.c b/src/REL/w02Dll/roulette.c index 9105d06e..eb273ffc 100644 --- a/src/REL/w02Dll/roulette.c +++ b/src/REL/w02Dll/roulette.c @@ -105,7 +105,7 @@ void fn_1_BCFC(void) { s32 temp_r30; s32 temp_r29; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); spaceLinkFlags = BoardSpaceLinkFlagSearch(0, (s32) GWPlayer[lbl_1_bss_388].space_curr, 2U); BoardPlayerMoveToAsync(lbl_1_bss_388, spaceLinkFlags); while (GWPlayer[lbl_1_bss_388].moving) { @@ -129,7 +129,7 @@ void fn_1_BCFC(void) { BoardCameraViewSet(1); BoardStatusShowSetAll(1); BoardCameraMotionWait(); - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); HuPrcKill(NULL); while(TRUE) { HuPrcVSleep(); diff --git a/src/REL/w03Dll/condor.c b/src/REL/w03Dll/condor.c index 4a937672..a8d7a2a8 100644 --- a/src/REL/w03Dll/condor.c +++ b/src/REL/w03Dll/condor.c @@ -105,7 +105,7 @@ void fn_1_3058(void) { } s32 fn_1_309C(void) { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lbl_1_bss_70 = HuPrcChildCreate(fn_1_313C, 0x2003U, 0x2000U, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_70, fn_1_3218); @@ -113,7 +113,7 @@ s32 fn_1_309C(void) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); return lbl_1_bss_7C; } diff --git a/src/REL/w03Dll/mg_coin.c b/src/REL/w03Dll/mg_coin.c index a52e5570..6a06ff1e 100644 --- a/src/REL/w03Dll/mg_coin.c +++ b/src/REL/w03Dll/mg_coin.c @@ -94,13 +94,13 @@ void fn_1_7B58(void) { } void fn_1_7BA8(void) { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lbl_1_bss_140 = HuPrcChildCreate(&fn_1_7C98, 0x2003, 0x2000, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_140, &fn_1_7C38); while (lbl_1_bss_140) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } void fn_1_7C38(void) { diff --git a/src/REL/w03Dll/mg_item.c b/src/REL/w03Dll/mg_item.c index 0b9441b9..afb983f6 100644 --- a/src/REL/w03Dll/mg_item.c +++ b/src/REL/w03Dll/mg_item.c @@ -141,7 +141,7 @@ void fn_1_9A9C(void) { } void fn_1_9AA0(void) { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lbl_1_bss_180 = HuPrcChildCreate(fn_1_9C8C, 0x2003, 0x2000, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_180, fn_1_9B30); @@ -149,7 +149,7 @@ void fn_1_9AA0(void) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } void fn_1_9B30(void) { diff --git a/src/REL/w03Dll/river.c b/src/REL/w03Dll/river.c index 577e1994..a1359f2e 100644 --- a/src/REL/w03Dll/river.c +++ b/src/REL/w03Dll/river.c @@ -101,7 +101,7 @@ s32 fn_1_6698(void) { } s16 fn_1_675C(void) { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lbl_1_bss_120 = HuPrcChildCreate(fn_1_67F8, 0x2003, 0x2000, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_120, fn_1_6884); @@ -109,7 +109,7 @@ s16 fn_1_675C(void) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); return lbl_1_bss_128; } diff --git a/src/REL/w03Dll/statue.c b/src/REL/w03Dll/statue.c index 91374679..c5855b55 100644 --- a/src/REL/w03Dll/statue.c +++ b/src/REL/w03Dll/statue.c @@ -53,7 +53,7 @@ s8 lbl_1_bss_2C; Process* lbl_1_bss_28; void fn_1_12C8(void) { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lbl_1_bss_28 = HuPrcChildCreate(&fn_1_1358, 0x2003, 0x2000, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_28, &fn_1_152C); @@ -61,7 +61,7 @@ void fn_1_12C8(void) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } void fn_1_1358(void) { diff --git a/src/REL/w04Dll/boo_event.c b/src/REL/w04Dll/boo_event.c index d61dbbac..3a89e85b 100755 --- a/src/REL/w04Dll/boo_event.c +++ b/src/REL/w04Dll/boo_event.c @@ -180,7 +180,7 @@ static void fn_1_20EC(void) { } fn_1_5648(); fn_1_2C10(); - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); BoardPlayerMotBlendSet(temp_r30, 180, 15); BoardCameraViewSet(2); while (!BoardPlayerMotBlendCheck(temp_r30)) { @@ -238,7 +238,7 @@ static void fn_1_20EC(void) { fn_1_28BC(); fn_1_2B8C(); BoardAudSeqPause(0, 0, 1000); - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); BoardCameraViewSet(1); BoardCameraMotionWait(); BoardPlayerMotionKill(temp_r30, lbl_1_bss_52[temp_r30][0]); diff --git a/src/REL/w04Dll/bridge.c b/src/REL/w04Dll/bridge.c index f3fa85fb..8198e5e7 100755 --- a/src/REL/w04Dll/bridge.c +++ b/src/REL/w04Dll/bridge.c @@ -101,7 +101,7 @@ void fn_1_1618(void) { temp_r31 = GWSystem.player_curr; temp_r30 = BoardPlayerMotionCreate(temp_r31, lbl_1_data_2AC[GWPlayer[temp_r31].character]); - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); BoardPlayerMotBlendSet(temp_r31, 180, 15); BoardCameraViewSet(2); while (!BoardPlayerMotBlendCheck(temp_r31)) { @@ -125,7 +125,7 @@ void fn_1_1618(void) { BoardPlayerMotionShiftSet(temp_r31, 1, 0.0f, 10.0f, 0x40000001); BoardCameraViewSet(1); BoardCameraMotionWait(); - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); BoardPlayerMotionKill(temp_r31, temp_r30); HuPrcKill(NULL); while (TRUE) { diff --git a/src/REL/w04Dll/main.c b/src/REL/w04Dll/main.c index 25da96a5..ec194dc7 100755 --- a/src/REL/w04Dll/main.c +++ b/src/REL/w04Dll/main.c @@ -208,12 +208,12 @@ static s32 fn_1_7FC(void) { if (lbl_1_bss_0->unk00 & 1) { fn_1_55B4(); } else { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); BoardPlayerIdleSet(temp_r31); BoardWinCreate(0, MAKE_MESSID(32, 25), -1); BoardWinWait(); BoardWinKill(); - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } return 1; } @@ -389,7 +389,7 @@ static s32 fn_1_103C(void) { var_r30 = GWPlayer[GWSystem.player_curr].space_curr; temp_r31 = BoardSpaceFlagGet(0, var_r30) & 0x600000; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); if (temp_r31 & 0x200000) { lbl_1_bss_4 = HuPrcChildCreate(fn_1_958, 0x2003, 0x2000, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_4, fn_1_CF8); @@ -399,7 +399,7 @@ static s32 fn_1_103C(void) { } else if (temp_r31 & 0x400000) { fn_1_DB0(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } s32 fn_1_1130(s16 arg0, float arg1, float arg2) { diff --git a/src/REL/w05Dll/hotel.c b/src/REL/w05Dll/hotel.c index 30043d10..285330e9 100644 --- a/src/REL/w05Dll/hotel.c +++ b/src/REL/w05Dll/hotel.c @@ -69,7 +69,7 @@ void fn_1_155C(void) { u32 var_r31; lbl_1_bss_28 = GWSystem.player_curr; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); temp_r28 = BoardModelMotionCreate(lbl_1_bss_14[4], lbl_1_data_180); temp_f30 = BoardPlayerRotYGet(lbl_1_bss_28); BoardPlayerPosGet(lbl_1_bss_28, &sp58); @@ -195,7 +195,7 @@ void fn_1_155C(void) { } BoardCameraMotionWait(); BoardModelMotionKill(lbl_1_bss_14[4], temp_r28); - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } s32 lbl_1_data_188[4] = { 0x79000C, 0x79000E, 0x79000F, 0x790010 }; @@ -229,7 +229,7 @@ void fn_1_1E44(void) { s32 var_r30; lbl_1_bss_28 = GWSystem.player_curr; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); for (var_r31 = 0; var_r31 < 4; var_r31++) { sp8[var_r31] = BoardModelMotionCreate(lbl_1_bss_14[4], lbl_1_data_188[var_r31]); diff --git a/src/REL/w05Dll/main.c b/src/REL/w05Dll/main.c index 7e679724..f2c14f97 100644 --- a/src/REL/w05Dll/main.c +++ b/src/REL/w05Dll/main.c @@ -404,7 +404,7 @@ s32 fn_1_1114(void) { s16 var_r30 = GWPlayer[GWSystem.player_curr].space_curr; temp_r31 = BoardSpaceFlagGet(0, var_r30) & 0x600000; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); if ((temp_r31 & 0x200000) != 0) { lbl_1_bss_4 = HuPrcChildCreate(fn_1_954, 0x2003, 0x3000, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_4, fn_1_D4C); @@ -415,7 +415,7 @@ s32 fn_1_1114(void) { } else if ((temp_r31 & 0x400000) != 0) { fn_1_E40(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } s32 fn_1_1208(s16 arg0, f32 arg8, f32 arg9) { diff --git a/src/REL/w05Dll/monkey.c b/src/REL/w05Dll/monkey.c index 71f0d0b5..e68f49af 100644 --- a/src/REL/w05Dll/monkey.c +++ b/src/REL/w05Dll/monkey.c @@ -62,7 +62,7 @@ void fn_1_2C7C(s32 arg0) { for (var_r31 = 0; var_r31 < 3; var_r31++) { lbl_1_bss_30[var_r31] = BoardPlayerMotionCreate(lbl_1_bss_4C, lbl_1_data_1CC[var_r31] | lbl_1_data_124[GWPlayer[lbl_1_bss_4C].character]); } - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); BoardPlayerIdleSet(lbl_1_bss_4C); spC.y = 100.0f; spC.z = 0.0f; @@ -83,7 +83,7 @@ void fn_1_2C7C(s32 arg0) { BoardPlayerIdleSet(lbl_1_bss_4C); BoardCameraViewSet(1); BoardCameraMotionWait(); - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); for (var_r31 = 0; var_r31 < 2; var_r31++) { BoardModelKill(lbl_1_bss_44[var_r31]); @@ -333,4 +333,4 @@ void fn_1_3E8C(void) { HuPrcVSleep(); } HuPrcEnd(); -} \ No newline at end of file +} diff --git a/src/REL/w06Dll/bowser.c b/src/REL/w06Dll/bowser.c index bd6aabc0..5b05c367 100755 --- a/src/REL/w06Dll/bowser.c +++ b/src/REL/w06Dll/bowser.c @@ -182,13 +182,13 @@ s32 fn_1_92D8(s32 arg0, s32 arg1) { return lbl_1_bss_F0; } lbl_1_bss_F4 = arg0; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lbl_1_bss_E8 = HuPrcChildCreate(fn_1_93C8, 0x2003, 0x3800, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_E8, fn_1_94D4); while (lbl_1_bss_E8) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); return lbl_1_bss_F0; } diff --git a/src/REL/w06Dll/bridge.c b/src/REL/w06Dll/bridge.c index 6078145d..9045bc1e 100755 --- a/src/REL/w06Dll/bridge.c +++ b/src/REL/w06Dll/bridge.c @@ -171,7 +171,7 @@ void fn_1_7FA4(void) { } void fn_1_8264(s32 arg0, s16 arg1) { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lbl_1_bss_E6 = arg0; lbl_1_bss_E4 = arg1; lbl_1_bss_C8 = HuPrcChildCreate(fn_1_8320, 0x2003, 0x3800, 0, boardMainProc); @@ -179,7 +179,7 @@ void fn_1_8264(s32 arg0, s16 arg1) { while (lbl_1_bss_C8) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } static void fn_1_8320(void) { diff --git a/src/REL/w06Dll/fire.c b/src/REL/w06Dll/fire.c index 4b0cdba0..be247094 100755 --- a/src/REL/w06Dll/fire.c +++ b/src/REL/w06Dll/fire.c @@ -67,13 +67,13 @@ static s32 lbl_1_data_230[] = { }; void fn_1_6EF0(void) { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lbl_1_bss_90 = HuPrcChildCreate(fn_1_6F80, 0x2003, 0x3800, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_90, fn_1_7210); while (lbl_1_bss_90) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } static void fn_1_6F80(void) { diff --git a/src/REL/w06Dll/mg_coin.c b/src/REL/w06Dll/mg_coin.c index b480e7c4..112ba588 100755 --- a/src/REL/w06Dll/mg_coin.c +++ b/src/REL/w06Dll/mg_coin.c @@ -138,13 +138,13 @@ void fn_1_4A10(void) { void fn_1_4A60(void) { lbl_1_bss_8C = 0; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lbl_1_bss_48 = HuPrcChildCreate(fn_1_4BA0, 0x2003, 0x3800, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_48, fn_1_4B00); while (lbl_1_bss_48) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } static void fn_1_4B00(void) { diff --git a/src/REL/w06Dll/mg_item.c b/src/REL/w06Dll/mg_item.c index 3fe296f0..60400ef0 100755 --- a/src/REL/w06Dll/mg_item.c +++ b/src/REL/w06Dll/mg_item.c @@ -174,13 +174,13 @@ void fn_1_F6C(void) { } void fn_1_1054(void) { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lbl_1_bss_18 = HuPrcChildCreate(fn_1_1148, 0x2003, 0x3800, 0, boardMainProc); HuPrcDestructorSet2(lbl_1_bss_18, fn_1_10E4); while (lbl_1_bss_18) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } static void fn_1_10E4(void) { diff --git a/src/game/board/boo_house.c b/src/game/board/boo_house.c index 05e5b246..1e88d796 100644 --- a/src/game/board/boo_house.c +++ b/src/game/board/boo_house.c @@ -120,13 +120,13 @@ void BoardBooHouseKill(void) { void BoardBooHouseExec(s32 arg0) { currPlayer = arg0; if (BoardPlayerSizeGet(currPlayer) != 2) { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); houseProc = HuPrcChildCreate(&ExecBooHouse, 0x2003, 0x3800, 0, boardMainProc); HuPrcDestructorSet2(houseProc, &DestroyBooHouse); while (houseProc != 0U) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } } @@ -181,7 +181,7 @@ static void ExecBooHouse(void) { } } BoardWinKill(); - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); BoardAudSeqPause(0, 1, 0x3E8); BoardDataAsyncWait(var_r28); temp_r29 = BoardSpaceLinkFlagSearch(0, var_r30, 0x02000000); diff --git a/src/game/board/lottery.c b/src/game/board/lottery.c index fe14093c..8b718597 100755 --- a/src/game/board/lottery.c +++ b/src/game/board/lottery.c @@ -210,13 +210,13 @@ void BoardLotteryExec(void) { if (BoardPlayerSizeGet(GWSystem.player_curr) == 2) { return; } - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); lotteryProc = HuPrcChildCreate(ExecLottery, 0x2003, 0x3800, 0, boardMainProc); HuPrcDestructorSet2(lotteryProc, DestroyLottery); while (lotteryProc) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } void BoardLotteryInit(void) { diff --git a/src/game/board/pause.c b/src/game/board/pause.c index 3bdcbfe3..75c5f74e 100755 --- a/src/game/board/pause.c +++ b/src/game/board/pause.c @@ -154,7 +154,7 @@ void BoardPauseStart(void) { static void PauseExit(void) { if (pauseQuitF == 0) { BoardRollWinDispSet(1); - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); BoardStatusItemSet(1); BoardRollUPauseSet(1); BoardLast5GfxShowSet(1); @@ -200,7 +200,7 @@ static void PauseProcess(void) { BoardFilterFadeInit(30, 0xA0); temp_r31 = BoardDataDirReadAsync(DATADIR_BPAUSE); BoardRollWinDispSet(0); - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); BoardStatusItemSet(0); BoardRollUPauseSet(0); BoardLast5GfxShowSet(0); diff --git a/src/game/board/player.c b/src/game/board/player.c index 54aa6f89..b24a3d2a 100644 --- a/src/game/board/player.c +++ b/src/game/board/player.c @@ -1241,12 +1241,12 @@ static s32 DoDebugMove(s32 arg0, s16* arg1) { goto end; } else { if (HuPadBtnDown[var_r20] == 0x10) { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); BoardPlayerIdleSet(arg0); StopJunctionPlayer(0); BoardViewMapExec(arg0); InitJunction(arg0, sp28->space_curr, -1.0f); - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); goto loop_21; } if ((0.0f != spA0.x) || (0.0f != spA0.z)) { @@ -1438,7 +1438,7 @@ static s32 ExecJunction(s32 arg0, s16* arg1) { break; } else if (var_r20 == 0x20 || var_r20 == 0x10) { HuAudFXPlay(1); - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); BoardPlayerIdleSet(arg0); StopJunctionPlayer(0); if (var_r20 == 0x10) { @@ -1447,7 +1447,7 @@ static s32 ExecJunction(s32 arg0, s16* arg1) { BoardViewOverheadExec(arg0); } InitJunction(arg0, sp30->space_curr, var_f28); - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } else { if ((0.0f != spC4.x) || (0.0f != spC4.z)) { var_f29 = (90.0 + (180.0 * (atan2(spC4.z, spC4.x) / M_PI))); @@ -1932,7 +1932,7 @@ void BoardRollUpdateSet(s32 arg0) { } } -void BoardDiceDigit2DShowSet(s32 arg0) { +void BoardRollDispSet(s32 arg0) { s32 var_r30; bitcopy3* temp_r31; @@ -2292,7 +2292,7 @@ static s32 DoSparkSpace(s32 player, s32 pause_cam) if(!sp138) { return 0; } - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); if(pause_cam) { BoardCameraMoveSet(0); } else { @@ -2413,7 +2413,7 @@ static s32 DoSparkSpace(s32 player, s32 pause_cam) BoardCameraTargetPlayerSet(sp30); BoardCameraMotionWait(); BoardCameraMoveSet(1); - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); return 1; } diff --git a/src/game/board/shop.c b/src/game/board/shop.c index 20608ce6..f6ed2050 100755 --- a/src/game/board/shop.c +++ b/src/game/board/shop.c @@ -194,13 +194,13 @@ void BoardShopExec(s32 player, s32 space) { return; } shopPlayer = player; - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); shopProc = HuPrcChildCreate(ExecShop, 0x2003, 0x3800, 0, boardMainProc); HuPrcDestructorSet2(shopProc, DestroyShop); while (shopProc) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } static void ExecShop(void) { diff --git a/src/game/board/star.c b/src/game/board/star.c index 012a475a..b980c827 100755 --- a/src/game/board/star.c +++ b/src/game/board/star.c @@ -161,13 +161,13 @@ void BoardStarExec(s32 arg0, s32 arg1) { return; } if (BoardPlayerSizeGet(arg0) != 2) { - BoardDiceDigit2DShowSet(0); + BoardRollDispSet(0); starProc = HuPrcChildCreate(ExecStar, 0x2003, 0x3800, 0, boardMainProc); HuPrcDestructorSet2(starProc, DestroyStar); while (starProc != NULL) { HuPrcVSleep(); } - BoardDiceDigit2DShowSet(1); + BoardRollDispSet(1); } } diff --git a/src/game/kerent.c b/src/game/kerent.c index 89e1a56b..68e81c2a 100644 --- a/src/game/kerent.c +++ b/src/game/kerent.c @@ -920,7 +920,7 @@ void BoardPlayerDiceJumpStart(void); void BoardPlayerDiceJumpCheck(void); void BoardRollCreate(void); void BoardRollUpdateSet(void); -void BoardDiceDigit2DShowSet(void); +void BoardRollDispSet(void); void BoardPlayerBtnDownWait(void); void BoardPlayerAutoSizeSet(void); void BoardPlayerAutoSizeGet(void); @@ -1937,7 +1937,7 @@ extern void _kerjmp_BoardPlayerDiceJumpStart(void); extern void _kerjmp_BoardPlayerDiceJumpCheck(void); extern void _kerjmp_BoardRollCreate(void); extern void _kerjmp_BoardRollUpdateSet(void); -extern void _kerjmp_BoardDiceDigit2DShowSet(void); +extern void _kerjmp_BoardRollDispSet(void); extern void _kerjmp_BoardPlayerBtnDownWait(void); extern void _kerjmp_BoardPlayerAutoSizeSet(void); extern void _kerjmp_BoardPlayerAutoSizeGet(void); @@ -3879,8 +3879,8 @@ asm void _kerent(void) { b BoardRollCreate entry _kerjmp_BoardRollUpdateSet b BoardRollUpdateSet - entry _kerjmp_BoardDiceDigit2DShowSet - b BoardDiceDigit2DShowSet + entry _kerjmp_BoardRollDispSet + b BoardRollDispSet entry _kerjmp_BoardPlayerBtnDownWait b BoardPlayerBtnDownWait entry _kerjmp_BoardPlayerAutoSizeSet @@ -4072,4 +4072,4 @@ asm void _kerent(void) { entry _kerjmp_BoardBooHouseTutorialExec b BoardBooHouseTutorialExec #endif -} \ No newline at end of file +}