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

Use inlines for coin gain and collect amounts

Browse source
This commit is contained in:
gamemasterplc 2024-04-02 13:31:26 -05:00
parent 1ff18808ea
commit a75efa7882
5 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/game/board/bowser.c
View file

@ -467,8 +467,7 @@ static void DoMGReturnEffect(void)
s32 mess;
s32 mess_char;
for(player=0; player<4; player++) {
s16 gain = GWPlayer[player].coin_gain;
if(gain == 1) {
if(GWPlayerCoinWinGet(player) == 1) {
break;
}
}

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

@ -322,8 +322,8 @@ void BoardSaveInit(s32 board)
GWPlayer[i].coins_max = 0;
GWPlayer[i].stars_max = 0;
GWPlayer[i].coins_battle = 0;
GWPlayer[i].unk_26 = 0;
GWPlayer[i].coin_gain = 0;
GWPlayer[i].coin_collect = 0;
GWPlayer[i].coin_win = 0;
GWPlayer[i].items[0] = -1;
GWPlayer[i].items[1] = -1;
GWPlayer[i].items[2] = -1;

2
src/game/flag.c
View file

@ -15,7 +15,7 @@ static u8 *GetFlagPtr(u32 flag)
return ret;
}
u32 _CheckFlag(u32 flag)
s32 _CheckFlag(u32 flag)
{
u8 *flag_ptr = GetFlagPtr(flag);
u16 index = flag;

7
src/game/objsub.c
View file

@ -1199,11 +1199,8 @@ void omGameSysInit(Process *objman) {
omSysPauseEnable(0);
for (i = 0; i < 4; i++) {
if (_CheckFlag(0x1000C) == 0) {
GWPlayer[i].coin_gain = 0;
}
GWPlayer[i].unk_26 = 0;
GWPlayerCoinWinSet(i, 0);
GWPlayerCoinCollectSet(i, 0);
}
if (mgPracticeEnableF != 0) {