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

More name cleanups

Browse source
This commit is contained in:
gamemasterplc 2024-06-09 11:05:21 -05:00
parent 933e2ab693
commit f5ca9fba8e
8 changed files with 52 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@ static void MegaSquishFunc(omObjData *object);
static s32 DoSparkSpace(s32 player, s32 pause_cam);
static void RemoveSparkSpace(s32 player);
static void SetRollPlayerSize(s32 player);
static void SetPlayerSizeAuto(s32 player);
static s32 MegaPlayerPassFunc(s32 player, s32 space);
static s32 MegaExecJump(s32 player, s32 space);
@ -67,7 +67,7 @@ static s32 (*preTurnHook[4])();
s16 boardPlayerMdl[4];
static s16 playerMot[4];
static s8 rollType;
static s8 itemPrev;
static s8 moveAwayPlayer[4];
static s16 junctionArrowRot[4];
static omObjData* moveAwayObj;
@ -75,7 +75,7 @@ static omObjData* rollObj;
static omObjData* junctionObj;
static s32 junctionMask;
static omObjData* bowserSuitObj;
static s32 rollResized;
static s32 megaDoubleDiceF;
static s16 suitMdl = -1;
static s16 suitPlayerMdl = -1;
@ -148,12 +148,12 @@ static s32 megaSquishSfxTbl[] = {
0x228, 0x268, 0x2A8, 0x2E8,
};
s32 BoardRollTypeGet(void) {
return rollType;
s32 BoardItemPrevGet(void) {
return itemPrev;
}
void BoardRollTypeSet(s32 type) {
rollType = type;
void BoardItemPrevSet(s32 type) {
itemPrev = type;
}
s32 BoardPlayerGetCharMess(s32 player) {
@ -694,10 +694,10 @@ void BoardPlayerTurnExec(s32 arg0) {
if (_CheckFlag(0x10006U) == 0) {
BoardCameraViewSet(2);
omVibrate((s16) arg0, 0xC, 4, 2);
BoardRollTypeSet(-1);
BoardItemPrevSet(-1);
BoardYourTurnExec(arg0);
rollResized = 0;
SetRollPlayerSize(arg0);
megaDoubleDiceF = 0;
SetPlayerSizeAuto(arg0);
if (preTurnHook[arg0] != 0U) {
if (preTurnHook[arg0]() != 0) {
preTurnHook[arg0] = 0;
@ -729,8 +729,8 @@ void BoardPlayerTurnRollExec(s32 arg0) {
BoardRollKill();
BoardCameraTargetPlayerSet(arg0);
BoardCameraMotionWait();
BoardRollTypeSet(BoardItemUseExec(arg0));
if (BoardRollTypeGet() == 0xC) {
BoardItemPrevSet(BoardItemUseExec(arg0));
if (BoardItemPrevGet() == 0xC) {
_SetFlag(0x10016);
BoardSpaceLandExec(arg0, GWPlayer[arg0].space_curr);
BoardCameraMoveSet(1);
@ -832,15 +832,15 @@ block_14:
if (_CheckFlag(0x1000BU) != 0) {
BoardTutorialHookExec(7, 0);
}
if (BoardRollTypeGet() != -1) {
BoardItemPlayerRestore(arg0, BoardRollTypeGet());
if (BoardItemPrevGet() != -1) {
BoardItemPlayerRestore(arg0, BoardItemPrevGet());
while (BoardItemDoneCheck() == 0) {
HuPrcVSleep();
}
BoardRollTypeSet(-1);
BoardItemPrevSet(-1);
}
BoardPlayerSizeRestore(arg0);
rollResized = 0;
megaDoubleDiceF = 0;
if (_CheckFlag(0x1000BU) != 0) {
BoardTutorialHookExec(8, 0);
}
@ -2346,7 +2346,7 @@ static s32 DoSparkSpace(s32 player, s32 pause_cam)
BoardModelAlphaSet(sp2E, sp2C);
HuPrcVSleep();
}
temp_r17 = BoardRollTypeGet();
temp_r17 = BoardItemPrevGet();
if(temp_r17 == 0 || temp_r17 == 1 || temp_r17 == 2 || temp_r17 == 3 || temp_r17 == 10) {
BoardCameraTargetPlayerSet(player);
BoardPlayerIdleSet(player);
@ -2355,11 +2355,11 @@ static s32 DoSparkSpace(s32 player, s32 pause_cam)
while(!BoardItemDoneCheck()) {
HuPrcVSleep();
}
BoardRollTypeSet(-1);
BoardItemPrevSet(-1);
}
if(rollResized) {
if(megaDoubleDiceF) {
BoardPlayerSizeRestore(player);
rollResized = 0;
megaDoubleDiceF = 0;
}
if(sp128 != -1) {
HuAudFXPlay(boardSparkSfxTbl[GWPlayer[sp128].character]);
@ -2428,7 +2428,7 @@ static void RemoveSparkSpace(s32 player)
}
}
static void SetRollPlayerSize(s32 player)
static void SetPlayerSizeAuto(s32 player)
{
s32 auto_size = BoardPlayerAutoSizeGet(player);
if(auto_size != 0) {
@ -2446,14 +2446,13 @@ static void SetRollPlayerSize(s32 player)
BoardPlayerResizeAnimExec(player, auto_size);
BoardPlayerSizeSet(player, auto_size);
HuPrcSleep(30);
rollResized = 1;
megaDoubleDiceF = 1;
}
}
s32 BoardRollResizeCheck(void)
s32 BoardMegaDoubleDiceCheck(void)
{
return rollResized;
return megaDoubleDiceF;
}
void BoardPlayerResizeAnimExec(s32 player, s32 size)

13
src/game/board/roll.c
View file

@ -41,7 +41,6 @@ typedef struct {
float unk08;
} DiceDigitWork;
s32 BoardRollResizeCheck(void);
static void RollMain(void);
static void DiceCreate(s32 arg0);
@ -129,7 +128,7 @@ s32 BoardRollExec(s32 arg0) {
numDice = 1;
diceSize = 0;
maxRoll = 0xA;
switch (BoardRollTypeGet()) {
switch (BoardItemPrevGet()) {
case 0:
numDice = 1;
break;
@ -149,7 +148,7 @@ s32 BoardRollExec(s32 arg0) {
} else if (BoardPlayerSizeGet(arg0) == 2) {
diceSize = 2;
maxRoll = 10;
if (BoardRollResizeCheck() != 0) {
if (BoardMegaDoubleDiceCheck() != 0) {
numDice = 2;
}
}
@ -226,7 +225,7 @@ static void RollMain(void) {
temp_r25 = BoardPlayerSameTeamFind(temp_r26);
var_r27 += BoardPlayerItemCount(temp_r25);
}
if (BoardRollTypeGet() != -1 || var_r27 == 0 || _CheckFlag(0x10009) || BoardRollResizeCheck()) {
if (BoardItemPrevGet() != -1 || var_r27 == 0 || _CheckFlag(0x10009) || BoardMegaDoubleDiceCheck()) {
var_r29 = 0x90004;
} else {
var_r29 = 0x90002;
@ -389,7 +388,7 @@ static void DoInput(s32 arg0) {
var_r30 = BoardPlayerSameTeamFind(rollPlayer);
var_r31 += BoardPlayerItemCount(var_r30);
}
if (var_r31 == 0 || BoardRollTypeGet() != -1 || BoardRollResizeCheck() || _CheckFlag(0x10009)) {
if (var_r31 == 0 || BoardItemPrevGet() != -1 || BoardMegaDoubleDiceCheck() || _CheckFlag(0x10009)) {
if (_CheckFlag(0x10009) && GWBoardGet() == 5 && *sp8 == 0x200 && var_r31 != 0) {
HuAudFXPlay(4);
}
@ -910,7 +909,7 @@ static s32 GetBtnRoll(s32 arg0) {
var_r31 = HuPadBtnDown[var_r29];
return var_r31;
}
if (_CheckFlag(0x10009) || BoardRollTypeGet() != -1) {
if (_CheckFlag(0x10009) || BoardItemPrevGet() != -1) {
return 0x100;
}
var_r31 = GetComBtnRoll(arg0);
@ -918,7 +917,7 @@ static s32 GetBtnRoll(s32 arg0) {
}
static s32 GetComBtnRoll(s32 arg0) {
if (BoardRollTypeGet() != -1 || BoardPlayerItemCount(arg0) == 0 || BoardRollResizeCheck() || _CheckFlag(0x10009)) {
if (BoardItemPrevGet() != -1 || BoardPlayerItemCount(arg0) == 0 || BoardMegaDoubleDiceCheck() || _CheckFlag(0x10009)) {
return 0x100;
}
if (BoardComUseItemCheck(arg0)) {

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

@ -671,7 +671,7 @@ void BoardStarShowNext(s32 arg0) {
HuPrcSleep(18);
}
BoardStatusItemSet(0);
if (GWBoardGet() == 5 && BoardRollTypeGet() != 9 && boardStarGiveHook) {
if (GWBoardGet() == 5 && BoardItemPrevGet() != 9 && boardStarGiveHook) {
boardStarGiveHook();
}
BoardSpaceStarMove();
@ -753,7 +753,7 @@ void BoardStarShowNext(s32 arg0) {
BoardWinCreate(3, var_r30, -1);
BoardWinWait();
BoardWinKill();
if (GWBoardGet() == 5 && BoardRollTypeGet() != 9 && boardStarShowNextHook) {
if (GWBoardGet() == 5 && BoardItemPrevGet() != 9 && boardStarShowNextHook) {
boardStarShowNextHook();
}
BoardAudSeqFadeOut(1, 1000);

2
src/game/board/ui.c
View file

@ -1096,7 +1096,7 @@ static void ItemUseProc(void) {
BoardDataAsyncWait(var_r24);
}
HideItemWindow();
BoardRollTypeSet(itemUsed);
BoardItemPrevSet(itemUsed);
if (itemUsed != -1) {
switch (itemUsed) {
case 13:

16
src/game/kerent.c
View file

@ -903,8 +903,8 @@ void BoardPlayerIdleSet(void);
void BoardPlayerMotBlendSet(void);
void BoardPlayerMotBlendCheck(void);
void BoardPlayerRankCalc(void);
void BoardRollTypeGet(void);
void BoardRollTypeSet(void);
void BoardItemPrevGet(void);
void BoardItemPrevSet(void);
void BoardPlayerItemRemove(void);
void BoardPlayerItemFind(void);
void BoardPlayerItemAdd(void);
@ -1920,8 +1920,8 @@ extern void _kerjmp_BoardPlayerIdleSet(void);
extern void _kerjmp_BoardPlayerMotBlendSet(void);
extern void _kerjmp_BoardPlayerMotBlendCheck(void);
extern void _kerjmp_BoardPlayerRankCalc(void);
extern void _kerjmp_BoardRollTypeGet(void);
extern void _kerjmp_BoardRollTypeSet(void);
extern void _kerjmp_BoardItemPrevGet(void);
extern void _kerjmp_BoardItemPrevSet(void);
extern void _kerjmp_BoardPlayerItemRemove(void);
extern void _kerjmp_BoardPlayerItemFind(void);
extern void _kerjmp_BoardPlayerItemAdd(void);
@ -3845,10 +3845,10 @@ asm void _kerent(void) {
b BoardPlayerMotBlendCheck
entry _kerjmp_BoardPlayerRankCalc
b BoardPlayerRankCalc
entry _kerjmp_BoardRollTypeGet
b BoardRollTypeGet
entry _kerjmp_BoardRollTypeSet
b BoardRollTypeSet
entry _kerjmp_BoardItemPrevGet
b BoardItemPrevGet
entry _kerjmp_BoardItemPrevSet
b BoardItemPrevSet
entry _kerjmp_BoardPlayerItemRemove
b BoardPlayerItemRemove
entry _kerjmp_BoardPlayerItemFind