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

Match and clean up board/mg_setup.c

Browse source
This commit is contained in:
gamemasterplc 2024-03-12 00:07:26 -05:00
parent ed0aa74ec5
commit db822e01ec
4 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/board/battle.c
View file

@ -42,8 +42,8 @@ typedef struct {
s16 unk08;
} BattleWork;
extern s32 BoardMGSetupPlayPush(s32, s16);
extern void BoardMGSetupPlayPop(s32, s16);
extern s32 BoardMGSetupPlaySearch(s32, s16);
extern void BoardMGSetupPlayPush(s32, s16);
static void DestroyBattle(void);
static void ExecBattle(void);
@ -181,7 +181,7 @@ static void ExecBattle(void) {
if (!(var_r29->flag & 1)) {
continue;
}
} else if (BoardMGSetupPlayPush(4, temp_r28) != 0) {
} else if (BoardMGSetupPlaySearch(4, temp_r28) != 0) {
continue;
}
}
@ -191,7 +191,7 @@ static void ExecBattle(void) {
break;
}
battleMGIdx[var_r30] = var_r31;
BoardMGSetupPlayPop(4, temp_r28);
BoardMGSetupPlayPush(4, temp_r28);
}
if (_CheckFlag(0x10004)) {
BoardStatusItemSet(1);