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

Clean up board rels

Browse source
This commit is contained in:
gamemasterplc 2024-03-14 09:57:45 -05:00
parent b664e01d0b
commit 0e92b2ba09
15 changed files with 267 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -328,7 +328,7 @@ void BoardSaveInit(s32 board)
GWPlayer[i].items[0] = -1;
GWPlayer[i].items[1] = -1;
GWPlayer[i].items[2] = -1;
if(BoardPartyFlagGet() == 0 || _CheckFlag(FLAG_ID_MAKE(1, 11))) {
if(GWPartyGet() == 0 || _CheckFlag(FLAG_ID_MAKE(1, 11))) {
GWStarsSet(i, 0);
} else {
GWStarsSet(i, BoardPlayerHandicapGet(i));
@ -433,14 +433,14 @@ static void MainFunc(void)
_ClearFlag(FLAG_ID_MAKE(1, 28));
do {
BoardStatusShowSetAll(1);
if(BoardCurrGet() == 5 && GWSystem.player_curr == 0 && !turn_cont && boardTurnFunc) {
if(GWBoardGet() == 5 && GWSystem.player_curr == 0 && !turn_cont && boardTurnFunc) {
GWSystem.player_curr = -1;
boardTurnFunc();
GWSystem.player_curr = 0;
}
BoardMusStartBoard();
for(i=GWSystem.player_curr; i<4; i++) {
if(BoardCurrGet() == 7 || BoardCurrGet() == 8) {
if(GWBoardGet() == 7 || GWBoardGet() == 8) {
if((int)(GWSystem.max_turn-GWSystem.turn) < 5 && i == 0 && !turn_cont) {
BoardLast5GfxInit();
_SetFlag(FLAG_ID_MAKE(0, 8));
@ -494,7 +494,7 @@ static void MainFunc(void)
BoardPlayerMoveAwayStartCurr(GWPlayer[i].space_curr, 1);
fade_type = 0;
} else {
if(BoardCurrGet() == 7 || BoardCurrGet() == 8) {
if(GWBoardGet() == 7 || GWBoardGet() == 8) {
if(GWSystem.turn != GWSystem.max_turn) {
WipeColorSet(255, 255, 255);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_CROSS, 1);
@ -514,7 +514,7 @@ static void MainFunc(void)
}
BoardPlayerPostTurnHookExec(i);
}
if(BoardCurrGet() == 7 || BoardCurrGet() == 8) {
if(GWBoardGet() == 7 || GWBoardGet() == 8) {
GWSystem.player_curr = 0;
if(BoardTurnNext()) {
BoardAudSeqFadeOut(0, 500);
@ -733,7 +733,7 @@ static void DestroyBoard(void)
}
BoardModelKillAll();
BoardWinKillAll();
HuDataDirClose(dir_table[BoardCurrGet()]);
HuDataDirClose(dir_table[GWBoardGet()]);
HuDataDirClose(DATADIR_EFFECT);
HuDataDirClose(DATADIR_BGUEST);
HuDataDirClose(DATADIR_BKOOPASUIT);

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

@ -347,7 +347,7 @@ s32 BoardSpaceStarGetNext(void)
s16 star_pos;
star_total = GWSystem.star_total;
star_pos = GWSystem.star_pos;
if(BoardCurrGet() == 5) {
if(GWBoardGet() == 5) {
s16 i;
s32 count;
s32 last_free;
@ -504,7 +504,7 @@ s32 BoardSpaceStarCheck(s32 index)
s32 ret;
BoardSpace *space = BoardSpaceGet(0, index);
BoardSpace *star_space;
if(BoardCurrGet() == 7 || BoardCurrGet() == 8) {
if(GWBoardGet() == 7 || GWBoardGet() == 8) {
ret = 0;
goto end;
}
@ -623,7 +623,7 @@ s32 BoardSpaceWalkExec(s32 player, s32 space)
return 0;
}
space_ptr = BoardSpaceGet(0, space);
if(BoardCurrGet() == 7 || BoardCurrGet() == 8) {
if(GWBoardGet() == 7 || GWBoardGet() == 8) {
is_star = 0;
} else {
star_space = BoardSpaceGet(0, boardSpaceStarTbl[GWSystem.star_pos]);
@ -677,10 +677,10 @@ s32 BoardSpaceBlockExec(s32 player, s32 space)
if(space == GWSystem.block_pos) {
event_exec = 1;
}
if((int)GWSystem.bonus_star == 0 && BoardPartyFlagGet() == 1 && !_CheckFlag(FLAG_ID_MAKE(1, 11))) {
if((int)GWSystem.bonus_star == 0 && GWPartyGet() == 1 && !_CheckFlag(FLAG_ID_MAKE(1, 11))) {
event_exec = 0;
}
if(BoardCurrGet() == 7 || BoardCurrGet() == 8) {
if(GWBoardGet() == 7 || GWBoardGet() == 8) {
event_exec = 0;
}
if(event_exec) {
@ -987,7 +987,7 @@ void BoardSpaceInit(s32 data_num)
memset(spaceAttr, 0, sizeof(spaceAttr));
lbl_801D3FC4[0] = lbl_801D3FC4[1] = lbl_801D3FC4[2] = lbl_801D3FC4[3] = -1;
spaceDrawF = 0;
board = BoardCurrGet();
board = GWBoardGet();
{
AnimBmpData *bmp;
AnimData *data;
@ -1059,7 +1059,7 @@ void BoardSpaceInit(s32 data_num)
GWSystem.star_total = 0;
GWSystem.star_flag = 0;
}
if(BoardCurrGet() != 7 && BoardCurrGet() != 8) {
if(GWBoardGet() != 7 && GWBoardGet() != 8) {
starPlatMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 6), NULL, 0);
BoardModelMotionStart(starPlatMdl, 0, 0x40000001);
BoardModelVisibilitySet(starPlatMdl, 0);