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

Renamed BoardDiceDigit2DShowSet to BoardRollDispSet

Browse source
This commit is contained in:
kabiskac 2024-06-09 18:09:26 +02:00
parent 772041094d
commit 3f30fd613d
28 changed files with 72 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/board/boo_house.c
View file

@ -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);

4
src/game/board/lottery.c
View file

@ -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) {

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

@ -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);

14
src/game/board/player.c
View file

@ -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;
}

4
src/game/board/shop.c
View file

@ -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) {

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

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

10
src/game/kerent.c
View file

@ -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
}
}