From 38085a347f31c9f378fd560cdffafe823c70bc75 Mon Sep 17 00:00:00 2001 From: Rainchus Date: Mon, 15 Jul 2024 11:33:37 -0500 Subject: [PATCH] add board id defines, name dlls with comments in configure.py --- configure.py | 140 ++++++++++++++++++------------------- include/game/board/main.h | 10 +++ src/REL/mstory4Dll/main.c | 5 +- src/game/board/audio.c | 5 +- src/game/board/boo_house.c | 4 +- src/game/board/bowser.c | 4 +- src/game/board/com.c | 16 ++--- src/game/board/last5.c | 2 +- src/game/board/lottery.c | 26 +++---- src/game/board/main.c | 28 ++++---- src/game/board/mushroom.c | 2 +- src/game/board/player.c | 2 +- src/game/board/roll.c | 2 +- src/game/board/shop.c | 4 +- src/game/board/space.c | 22 +++--- src/game/board/star.c | 12 ++-- src/game/board/start.c | 20 +++--- src/game/board/tutorial.c | 2 +- src/game/board/ui.c | 2 +- src/game/board/view.c | 10 +-- 20 files changed, 165 insertions(+), 153 deletions(-) diff --git a/configure.py b/configure.py index be43d212..e73ad4c3 100644 --- a/configure.py +++ b/configure.py @@ -822,7 +822,7 @@ config.libs = [ }, ), Rel( - "m401Dll", + "m401Dll", #Manta Rings objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m401Dll/main.c"), @@ -830,13 +830,13 @@ config.libs = [ }, ), Rel( - "m402Dll", + "m402Dll", #Slime Time objects={ Object(Matching, "REL/m402Dll/main.c"), }, ), Rel( - "m403Dll", + "m403Dll", #Booksquirm objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m403Dll/main.c"), @@ -844,20 +844,20 @@ config.libs = [ }, ), Rel( - "m404Dll", + "m404Dll", #Trace Race objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m404Dll/main.c"), }, ), Rel( - "m405Dll", + "m405Dll", #Mario Medley objects={ Object(Matching, "REL/m405Dll/main.c"), }, ), Rel( - "m406Dll", + "m406Dll", #Avalanche! objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m406Dll/main.c"), @@ -866,7 +866,7 @@ config.libs = [ }, ), Rel( - "m407dll", + "m407dll", #Domination objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m407dll/player.c"), @@ -880,7 +880,7 @@ config.libs = [ }, ), Rel( - "m408Dll", + "m408Dll", #Paratrooper Plunge objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m408Dll/main.c"), @@ -890,7 +890,7 @@ config.libs = [ }, ), Rel( - "m409Dll", + "m409Dll", #Toad's Quick Draw objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m409Dll/main.c"), @@ -899,7 +899,7 @@ config.libs = [ }, ), Rel( - "m410Dll", + "m410Dll", #Three Throw objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m410Dll/main.c"), @@ -909,35 +909,35 @@ config.libs = [ }, ), Rel( - "m411Dll", + "m411Dll", #Photo Finish objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m411Dll/main.c"), }, ), Rel( - "m412Dll", + "m412Dll", #Mr. Blizzard's Brigade objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m412Dll/main.c"), }, ), Rel( - "m413Dll", + "m413Dll", #Bob-omb Breakers objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m413Dll/main.c"), }, ), Rel( - "m414Dll", + "m414Dll", #Long Claw of the Law objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m414Dll/main.c"), }, ), Rel( - "m415Dll", + "m415Dll", #Stamp Out! objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m415Dll/main.c"), @@ -945,7 +945,7 @@ config.libs = [ }, ), Rel( - "m416Dll", + "m416Dll", #Candlelight Flight objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m416Dll/main.c"), @@ -953,7 +953,7 @@ config.libs = [ }, ), Rel( - "m417Dll", + "m417Dll", #Makin' Waves objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m417Dll/main.c"), @@ -963,21 +963,21 @@ config.libs = [ }, ), Rel( - "m418Dll", + "m418Dll", #Hide and Go BOOM! objects={ Object(NonMatching, "REL/m418Dll/main.c"), Object(NonMatching, "REL/m418Dll/sequence.c"), }, ), Rel( - "m419Dll", + "m419Dll", #Tree Stomp objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m419Dll/main.c"), }, ), Rel( - "m420dll", + "m420dll", #Fish n' Drips objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m420dll/main.c"), @@ -987,7 +987,7 @@ config.libs = [ }, ), Rel( - "m421Dll", + "m421Dll", #Hop or Pop objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m421Dll/main.c"), @@ -996,21 +996,21 @@ config.libs = [ }, ), Rel( - "m422Dll", + "m422Dll", #Money Belts objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m422Dll/main.c"), }, ), Rel( - "m423Dll", + "m423Dll", #GOOOOOOOAL!! objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m423Dll/main.c"), }, ), Rel( - "m424Dll", + "m424Dll", #Blame it on the Crane objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m424Dll/main.c"), @@ -1020,7 +1020,7 @@ config.libs = [ }, ), Rel( - "m425Dll", + "m425Dll", #The Great Deflate objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m425Dll/main.c"), @@ -1028,14 +1028,14 @@ config.libs = [ }, ), Rel( - "m426Dll", + "m426Dll", #Revers-a-Bomb objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m426Dll/main.c"), }, ), Rel( - "m427Dll", + "m427Dll", #Right Oar Left? objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m427Dll/main.c"), @@ -1044,7 +1044,7 @@ config.libs = [ }, ), Rel( - "m428Dll", + "m428Dll", #Cliffhangers objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m428Dll/main.c"), @@ -1053,13 +1053,13 @@ config.libs = [ }, ), Rel( - "m429Dll", + "m429Dll", #Team Treasure Trek objects={ Object(Matching, "REL/m429Dll/main.c"), }, ), Rel( - "m430Dll", + "m430Dll", #Pair-a-sailing objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m430Dll/main.c"), @@ -1068,7 +1068,7 @@ config.libs = [ }, ), Rel( - "m431Dll", + "m431Dll", #Order Up objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m431Dll/main.c"), @@ -1076,13 +1076,13 @@ config.libs = [ }, ), Rel( - "m432Dll", + "m432Dll", #Dungeon Duos objects={ Object(NonMatching, "REL/m432Dll/main.c"), }, ), Rel( - "m433Dll", + "m433Dll", #Beach Volley Folly objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m433Dll/main.c"), @@ -1091,7 +1091,7 @@ config.libs = [ }, ), Rel( - "m434Dll", + "m434Dll", #Cheep Cheep Sweep objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m434Dll/main.c"), @@ -1101,28 +1101,28 @@ config.libs = [ }, ), Rel( - "m435Dll", + "m435Dll", #Darts of Doom objects={ Object(NonMatching, "REL/m435Dll/main.c"), Object(NonMatching, "REL/m435Dll/sequence.c"), }, ), Rel( - "m436Dll", + "m436Dll", #Fruits of Doom objects={ Object(NonMatching, "REL/m436Dll/main.c"), Object(NonMatching, "REL/m436Dll/sequence.c"), }, ), Rel( - "m437Dll", + "m437Dll", #Balloon of Doom objects={ Object(NonMatching, "REL/m437Dll/main.c"), Object(NonMatching, "REL/m437Dll/sequence.c"), }, ), Rel( - "m438Dll", + "m438Dll", #Chain Chomp Fever objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m438Dll/main.c"), @@ -1131,14 +1131,14 @@ config.libs = [ }, ), Rel( - "m439Dll", + "m439Dll", #Paths of Peril objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m439Dll/main.c"), }, ), Rel( - "m440Dll", + "m440Dll", #Bowser's Bigger Blast objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m440Dll/main.c"), @@ -1146,13 +1146,13 @@ config.libs = [ }, ), Rel( - "m441Dll", + "m441Dll", #Butterfly Blitz objects={ Object(NonMatching, "REL/m441Dll/main.c"), }, ), Rel( - "m442Dll", + "m442Dll", #Barrel Baron objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m442Dll/main.c"), @@ -1160,7 +1160,7 @@ config.libs = [ }, ), Rel( - "m443Dll", + "m443Dll", #Mario Speedwagons objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m443Dll/main.c"), @@ -1169,7 +1169,7 @@ config.libs = [ }, ), Rel( - "m444dll", + "m444dll", #Reversal of Fortune objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m444dll/main.c"), @@ -1179,14 +1179,14 @@ config.libs = [ }, ), Rel( - "m445Dll", + "m445Dll", #Bowser Bop objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m445Dll/main.c"), }, ), Rel( - "m446dll", + "m446dll", #Mystic Match 'Em objects={ Object(Matching, "REL/executor.c"), Object(Matching, "REL/m446Dll/main.c"), @@ -1200,7 +1200,7 @@ config.libs = [ }, ), Rel( - "m447dll", + "m447dll", #Archaeologuess objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m447dll/main.c"), @@ -1212,33 +1212,33 @@ config.libs = [ }, ), Rel( - "m448Dll", + "m448Dll", #Goomba's Chip Flip objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m448Dll/main.c"), }, ), Rel( - "m449Dll", + "m449Dll", #Kareening Koopa objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m449Dll/main.c"), }, ), Rel( - "m450Dll", + "m450Dll", #The Final Battle! objects={ Object(NonMatching, "REL/m450Dll/main.c"), }, ), Rel( - "m451Dll", + "m451Dll", #Jigsaw Jitters objects={ Object(Matching, "REL/m451Dll/m451.c"), }, ), Rel( - "m453Dll", + "m453Dll", #Challenge Booksquirm objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m453Dll/main.c"), @@ -1247,7 +1247,7 @@ config.libs = [ }, ), Rel( - "m455Dll", + "m455Dll", #Rumble Fishing objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m455Dll/main.c"), @@ -1255,7 +1255,7 @@ config.libs = [ }, ), Rel( - "m456Dll", + "m456Dll", #Take a Breather objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m456Dll/main.c"), @@ -1263,28 +1263,28 @@ config.libs = [ }, ), Rel( - "m457Dll", + "m457Dll", #Bowser Wrestling objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m457Dll/main.c"), }, ), Rel( - "m458Dll", + "m458Dll", #Panels of Doom objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m458Dll/main.c"), }, ), Rel( - "m459dll", + "m459dll", #Mushroom Medic objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m459dll/main.c"), }, ), Rel( - "m460Dll", + "m460Dll", #Doors of Doom objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m460Dll/main.c"), @@ -1294,21 +1294,21 @@ config.libs = [ }, ), Rel( - "m461Dll", + "m461Dll", #Bob-omb X-ing objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m461Dll/main.c"), }, ), Rel( - "m461Dll", + "m462Dll", #Goomba Stomp objects={ Object(Matching, "REL/executor.c"), Object(NonMatching, "REL/m462Dll/main.c"), }, ), Rel( - "m463Dll", + "m463Dll", #Panel Panic 9 Player objects={ Object(NonMatching, "REL/m463Dll/main.c"), }, @@ -1471,7 +1471,7 @@ config.libs = [ }, ), Rel( - "w01Dll", + "w01Dll", #Toad's Midway Madness objects={ Object(Matching, "REL/board_executor.c"), Object(Matching, "REL/w01Dll/main.c"), @@ -1480,7 +1480,7 @@ config.libs = [ }, ), Rel( - "w02Dll", + "w02Dll", #Goomba's Greedy Gala objects={ Object(Matching, "REL/board_executor.c"), Object(Matching, "REL/w02Dll/main.c"), @@ -1493,7 +1493,7 @@ config.libs = [ }, ), Rel( - "w03Dll", + "w03Dll", #Shy Guy's Jungle Jam objects={ Object(Matching, "REL/board_executor.c"), Object(Matching, "REL/w03Dll/main.c"), @@ -1506,7 +1506,7 @@ config.libs = [ }, ), Rel( - "w04Dll", + "w04Dll", #Boo's Haunted Bash objects={ Object(Matching, "REL/board_executor.c"), Object(Matching, "REL/w04Dll/main.c"), @@ -1518,7 +1518,7 @@ config.libs = [ }, ), Rel( - "w05Dll", + "w05Dll", #Koopa's Seaside Soiree objects={ Object(Matching, "REL/board_executor.c"), Object(Matching, "REL/w05Dll/main.c"), @@ -1530,7 +1530,7 @@ config.libs = [ }, ), Rel( - "w06Dll", + "w06Dll", #Bowser's Gnarly Party objects={ Object(Matching, "REL/board_executor.c"), Object(Matching, "REL/w06Dll/main.c"), @@ -1542,7 +1542,7 @@ config.libs = [ }, ), Rel( - "w10Dll", + "w10Dll", #Tutorial board objects={ Object(Matching, "REL/board_executor.c"), Object(Matching, "REL/w10Dll/main.c"), @@ -1552,14 +1552,14 @@ config.libs = [ }, ), Rel( - "w20Dll", + "w20Dll", #Mega Board Mayhem objects={ Object(Matching, "REL/board_executor.c"), Object(Matching, "REL/w20Dll/main.c"), }, ), Rel( - "w21Dll", + "w21Dll", #Mini Board Mad Dash objects={ Object(Matching, "REL/board_executor.c"), Object(Matching, "REL/w21Dll/main.c"), diff --git a/include/game/board/main.h b/include/game/board/main.h index ce7bdef5..2b4d84cc 100644 --- a/include/game/board/main.h +++ b/include/game/board/main.h @@ -6,6 +6,16 @@ #include "game/data.h" #include "dolphin.h" +#define BOARD_ID_MAIN1 0 //TOADS_MIDWAY_MADNESS +#define BOARD_ID_MAIN2 1 //GOOMBAS_GREEDY_GALA +#define BOARD_ID_MAIN3 2 //SHY_GUYS_JUNGLE_JAM +#define BOARD_ID_MAIN4 3 //BOOS_HAUNTED_BASH +#define BOARD_ID_MAIN5 4 //KOOPAS_SEASIDE_SOIREE +#define BOARD_ID_MAIN6 5 //BOWSERS_GNARLY_PARTY +#define BOARD_ID_TUTORIAL 6 //TUTORIAL_BOARD +#define BOARD_ID_EXTRA1 7 //MEGA_BOARD_MAYHEM +#define BOARD_ID_EXTRA2 8 //MINI_BOARD_MAD_DASH + #define BOARD_FABS(value) ((value < 0) ? -(value) : (value)) typedef struct board_focus_data { diff --git a/src/REL/mstory4Dll/main.c b/src/REL/mstory4Dll/main.c index 38dc9400..75ff0750 100644 --- a/src/REL/mstory4Dll/main.c +++ b/src/REL/mstory4Dll/main.c @@ -10,6 +10,7 @@ #include "game/chrman.h" #include "rel_sqrt_consts.h" #include "REL/executor.h" +#include "game/board/main.h" typedef struct struct_data0 { s32 unk0; @@ -359,7 +360,7 @@ void fn_1_EC(void) } else { _ClearFlag(7); } - if(GWSystem.board == 5) { + if(GWSystem.board == BOARD_ID_MAIN6) { _SetFlag(2); _SetFlag(3); _SetFlag(4); @@ -592,7 +593,7 @@ void fn_1_13A0(void) CharARAMOpen(GWPlayerCfg[2].character); CharARAMOpen(GWPlayerCfg[3].character); GWSystem.board = itemno%6; - if(GWSystem.board != 5) { + if(GWSystem.board != BOARD_ID_MAIN6) { GWPlayerCoinWinSet(0, 10); omOvlGotoEx(OVL_MSTORY, 1, 2, 9999); } else { diff --git a/src/game/board/audio.c b/src/game/board/audio.c index ffe31714..3be2dcbb 100755 --- a/src/game/board/audio.c +++ b/src/game/board/audio.c @@ -2,6 +2,7 @@ #include "game/audio.h" #include "game/gamework_data.h" #include "game/msm.h" +#include "game/board/main.h" static s16 boardSeq[2][2]; @@ -136,10 +137,10 @@ void BoardAudFXPlay(void) { s32 var_r31; switch (GWBoardGet()) { - case 4: + case BOARD_ID_MAIN5: var_r31 = 0x48D; break; - case 5: + case BOARD_ID_MAIN6: var_r31 = 0x4A2; break; default: diff --git a/src/game/board/boo_house.c b/src/game/board/boo_house.c index 1e88d796..65877a3a 100644 --- a/src/game/board/boo_house.c +++ b/src/game/board/boo_house.c @@ -99,7 +99,7 @@ void BoardBooHouseCreate(void) { Vec sp14; Vec sp8; - if ((GWBoardGet() == 7) || (GWBoardGet() == 8)) { + if ((GWBoardGet() == BOARD_ID_EXTRA1) || (GWBoardGet() == BOARD_ID_EXTRA2)) { return; } BoardSpaceLinkTransformGet(0x08000000, &sp14, &sp8, 0); @@ -335,7 +335,7 @@ static void OpenBooHouse(void) { BoardModelHookSet(houseMdl[0], "yoko05", houseMdl[4]); BoardModelHookSet(houseMdl[0], "yoko9", houseMdl[5]); BoardModelHookSet(houseMdl[0], "yoko06", temp_r31); - if (GWBoardGet() == 5) { + if (GWBoardGet() == BOARD_ID_MAIN6) { BoardModelPosSet(temp_r31, 0.0f, 0.0f, -25.0f); } else { BoardModelPosSet(temp_r31, 0.0f, 0.0f, 0.0f); diff --git a/src/game/board/bowser.c b/src/game/board/bowser.c index b26d3f0f..63e9b102 100644 --- a/src/game/board/bowser.c +++ b/src/game/board/bowser.c @@ -155,7 +155,7 @@ static void ExecBowser(void) if(!_CheckFlag(0x10003)) { HuAudFXPlay(841); omVibrate(eventPlayer, 12, 4, 2); - if(GWBoardGet() == 5 && boardBowserHook) { + if(GWBoardGet() == BOARD_ID_MAIN6 && boardBowserHook) { boardBowserHook(1); } BoardAudSeqPause(0, 1, 1000); @@ -197,7 +197,7 @@ static void ExecBowser(void) BoardPlayerIdleSet(i); } BoardCameraMotionWait(); - if(GWBoardGet() == 5 && boardBowserHook) { + if(GWBoardGet() == BOARD_ID_MAIN6 && boardBowserHook) { boardBowserHook(0); } else { HuPrcSleep(30); diff --git a/src/game/board/com.c b/src/game/board/com.c index d98c4bb7..78df1f38 100755 --- a/src/game/board/com.c +++ b/src/game/board/com.c @@ -295,13 +295,13 @@ static BOOL CheckMiniUse(s32 player, s32 item) { if ((diff == 0 || diff == 1) && character == 1) { chance = 7; } - if (GWBoardGet() != 7 && GWBoardGet() != 8) { + if (GWBoardGet() != BOARD_ID_EXTRA1 && GWBoardGet() != BOARD_ID_EXTRA2) { star_dist_pipe = BoardComPathShortcutLenGet(space, 8, 0); star_dist_no_pipe = BoardComPathShortcutLenGet(space, 8, 1); } else { - star_dist_pipe = 0x3E7; + star_dist_pipe = 999; star_dist_no_pipe = BoardComPathBestGetFlag(space, 0x10000000, 10); - if ((GWBoardGet() == 8 || GWBoardGet() == 7) && BoardRandMod(0x64) < 0x3C) { + if ((GWBoardGet() == BOARD_ID_EXTRA2 || GWBoardGet() == BOARD_ID_EXTRA1) && BoardRandMod(100) < 60) { force_use_mini = 1; } } @@ -319,7 +319,7 @@ static BOOL CheckMiniUse(s32 player, s32 item) { max_dist = 10; break; } - if ((star_dist_no_pipe < max_dist || star_dist_pipe < max_dist || force_use_mini != 0) && BoardRandMod(0x64) >= chance) { + if ((star_dist_no_pipe < max_dist || star_dist_pipe < max_dist || force_use_mini != 0) && BoardRandMod(100) >= chance) { return TRUE; } return FALSE; @@ -355,7 +355,7 @@ static BOOL CheckMegaUse(s32 player, s32 item) { if (((diff == 0 || diff == 1) && character == 0) || ((diff == 0 || diff == 1) && character == 5)) { max_len = 8; } - if (GWBoardGet() != 7 || BoardRandMod(0x64) >= 60) { + if (GWBoardGet() != BOARD_ID_EXTRA1 || BoardRandMod(100) >= 60) { space = GWPlayer[player].space_curr; short_len = BoardComPathShortcutLenGet(space, 8, 0); space_search = GWPlayer[player].space_curr; @@ -368,7 +368,7 @@ static BOOL CheckMegaUse(s32 player, s32 item) { } } } - if (GWBoardGet() != 7 && GWBoardGet() != 8 && short_len < 10 && short_len > 0) { + if (GWBoardGet() != BOARD_ID_EXTRA1 && GWBoardGet() != BOARD_ID_EXTRA2 && short_len < 10 && short_len > 0) { return FALSE; } } @@ -458,13 +458,13 @@ static BOOL CheckBoardChangeUse(s32 player, s32 item) { search_space = GWPlayer[i].space_curr; if (!GWTeamGet() || i != BoardPlayerSameTeamFind(player)) { space = GWPlayer[i].space_curr; - if (GWBoardGet() == 7) { + if (GWBoardGet() == BOARD_ID_EXTRA1) { if (BoardComPathBestGetFlag(search_space, 0x10000000, 10) != -1) { length = 10; } else { length = 0; } - } else if (GWBoardGet() == 8) { + } else if (GWBoardGet() == BOARD_ID_EXTRA2) { if (BoardComPathBestGetFlag(search_space, 0x200000, 10) != -1 || BoardComPathBestGetFlag(search_space, 0x400000, 10) != -1) { length = 10; } else { diff --git a/src/game/board/last5.c b/src/game/board/last5.c index 15f25834..890a6eb5 100644 --- a/src/game/board/last5.c +++ b/src/game/board/last5.c @@ -1658,7 +1658,7 @@ static void UpdateLast5Roulette(omObjData *object) work->switch_vel += work->switch_accel; work->switch_accel++; if(work->switch_vel > 60 || (work->switch_vel > 40 && BoardRandMod(100) > 80)) { - if((GWBoardGet() == 0 || GWBoardGet() == 2) && work->choices[work->choice] == 2) { + if((GWBoardGet() == BOARD_ID_MAIN1 || GWBoardGet() == BOARD_ID_MAIN3) && work->choices[work->choice] == 2) { work->switch_timer++; return; } else { diff --git a/src/game/board/lottery.c b/src/game/board/lottery.c index 8b718597..9e307af2 100755 --- a/src/game/board/lottery.c +++ b/src/game/board/lottery.c @@ -235,7 +235,7 @@ void BoardLotteryInit(void) { } turnMot = -1; loseMot = -1; - if (GWBoardGet() != 8) { + if (GWBoardGet() != BOARD_ID_EXTRA2) { BoardModelVisibilitySet(BoardLotteryHostGet(), 0); BoardSpaceLinkTransformGet(0x10000000, &sp14, &sp8, NULL); lotteryMdl[0] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BKUJIYA, 0), NULL, 0); @@ -436,31 +436,31 @@ static void ExecLottery(void) { s32 temp_r29; switch (GWBoardGet()) { - case 0: + case BOARD_ID_MAIN1: lotteryMessBase = MAKE_MESSID(6, 2); break; - case 1: + case BOARD_ID_MAIN2: lotteryMessBase = MAKE_MESSID(6, 15); break; - case 2: + case BOARD_ID_MAIN3: lotteryMessBase = MAKE_MESSID(6, 28); break; - case 3: + case BOARD_ID_MAIN4: lotteryMessBase = MAKE_MESSID(6, 41); break; - case 4: + case BOARD_ID_MAIN5: lotteryMessBase = MAKE_MESSID(6, 54); break; - case 5: + case BOARD_ID_MAIN6: lotteryMessBase = MAKE_MESSID(6, 67); break; - case 6: + case BOARD_ID_TUTORIAL: lotteryMessBase = MAKE_MESSID(6, 2); break; - case 7: + case BOARD_ID_EXTRA1: lotteryMessBase = MAKE_MESSID(6, 82); break; - case 8: + case BOARD_ID_EXTRA2: lotteryMessBase = MAKE_MESSID(6, 82); break; } @@ -504,7 +504,7 @@ static void ExecLottery(void) { BoardSpacePosGet(0, temp_r28, &sp38); BoardSpacePosGet(0, lotterySpace, &sp2C); PSVECSubtract(&sp2C, &sp38, &sp20); - if (GWBoardGet() == 2 || GWBoardGet() == 3) { + if (GWBoardGet() == BOARD_ID_MAIN3 || GWBoardGet() == BOARD_ID_MAIN4) { PSVECScale(&sp20, &sp20, 0.95f); PSVECAdd(&sp20, &sp38, &sp2C); } @@ -564,7 +564,7 @@ static void ExecLottery(void) { } else { var_r27 = 0; } - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { var_r27 = 0; } PayEnterFee(var_r27); @@ -731,7 +731,7 @@ static void ShowTicket(void) { DATA_MAKE_NUM(DATADIR_BKUJIYA, 28) }; - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { return; } sp8 = GWPlayer[GWSystem.player_curr].ticket_player; diff --git a/src/game/board/main.c b/src/game/board/main.c index 61f8868b..9aaa66a1 100644 --- a/src/game/board/main.c +++ b/src/game/board/main.c @@ -123,39 +123,39 @@ void BoardObjectSetup(BoardFunc create, BoardFunc destroy) boardMainObj = omAddObjEx(boardObjMan, 0, 0, 0, -1, InitBoardFunc); switch(omcurovl) { case OVL_W01: - GWSystem.board = 0; + GWSystem.board = BOARD_ID_MAIN1; break; case OVL_W02: - GWSystem.board = 1; + GWSystem.board = BOARD_ID_MAIN2; break; case OVL_W03: - GWSystem.board = 2; + GWSystem.board = BOARD_ID_MAIN3; break; case OVL_W04: - GWSystem.board = 3; + GWSystem.board = BOARD_ID_MAIN4; break; case OVL_W05: - GWSystem.board = 4; + GWSystem.board = BOARD_ID_MAIN5; break; case OVL_W06: - GWSystem.board = 5; + GWSystem.board = BOARD_ID_MAIN6; break; case OVL_W10: - GWSystem.board = 6; + GWSystem.board = BOARD_ID_TUTORIAL; break; case OVL_W20: - GWSystem.board = 7; + GWSystem.board = BOARD_ID_EXTRA1; break; case OVL_W21: - GWSystem.board = 8; + GWSystem.board = BOARD_ID_EXTRA2; break; } } @@ -294,7 +294,7 @@ void BoardSaveInit(s32 board) GWMGTypeSet(0); GWSystem.unk_38 = 0; GWSystem.block_pos = 0; - memset(GWSystem.board_data, 0, 32); + memset(GWSystem.board_data, 0, sizeof(GWSystem.board_data)); for(i=0; i<4; i++) { s32 party_flag; BoardPlayerAutoSizeSet(i, 0); @@ -434,14 +434,14 @@ static void MainFunc(void) _ClearFlag(FLAG_ID_MAKE(1, 28)); do { BoardStatusShowSetAll(1); - if(GWBoardGet() == 5 && GWSystem.player_curr == 0 && !turn_cont && boardTurnFunc) { + if(GWBoardGet() == BOARD_ID_MAIN6 && 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(GWBoardGet() == 7 || GWBoardGet() == 8) { + if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { if(CHECK_LAST5_TURN() && i == 0 && !turn_cont) { BoardLast5GfxInit(); _SetFlag(FLAG_ID_MAKE(0, 8)); @@ -495,7 +495,7 @@ static void MainFunc(void) BoardPlayerMoveAwayStartCurr(GWPlayer[i].space_curr, 1); fade_type = 0; } else { - if(GWBoardGet() == 7 || GWBoardGet() == 8) { + if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { if(GWSystem.turn != GWSystem.max_turn) { WipeColorSet(255, 255, 255); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_CROSS, 1); @@ -515,7 +515,7 @@ static void MainFunc(void) } BoardPlayerPostTurnHookExec(i); } - if(GWBoardGet() == 7 || GWBoardGet() == 8) { + if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { GWSystem.player_curr = 0; if(BoardTurnNext()) { BoardAudSeqFadeOut(0, 500); diff --git a/src/game/board/mushroom.c b/src/game/board/mushroom.c index 251e720a..f80ff77c 100644 --- a/src/game/board/mushroom.c +++ b/src/game/board/mushroom.c @@ -385,7 +385,7 @@ static void InitBox(s32 arg0) { var_r27 = 1; } var_r29 = var_r27; - if (GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA2) { itemResult = 0; } if (_CheckFlag(0x1000BU) != 0) { diff --git a/src/game/board/player.c b/src/game/board/player.c index b24a3d2a..a0bdfdea 100644 --- a/src/game/board/player.c +++ b/src/game/board/player.c @@ -221,7 +221,7 @@ void BoardPlayerModelInit(void) { memset(&boardPlayerMdl, 0, 8); suitMdl = -1; suitPlayerMdl = -1; - if ((_CheckFlag(0x10005U) != 0) || (_CheckFlag(0x10006U) && (GWBoardGet() == 5))) { + if ((_CheckFlag(0x10005U) != 0) || (_CheckFlag(0x10006U) && (GWBoardGet() == BOARD_ID_MAIN6))) { for (var_r31 = 0; var_r31 < 4; var_r31++) { temp_r25 = GWPlayer[var_r31].team_backup; GWPlayer[var_r31].team = temp_r25; diff --git a/src/game/board/roll.c b/src/game/board/roll.c index 318f382c..a35bc669 100755 --- a/src/game/board/roll.c +++ b/src/game/board/roll.c @@ -389,7 +389,7 @@ static void DoInput(s32 arg0) { var_r31 += BoardPlayerItemCount(var_r30); } if (var_r31 == 0 || BoardItemPrevGet() != -1 || BoardMegaDoubleDiceCheck() || _CheckFlag(0x10009)) { - if (_CheckFlag(0x10009) && GWBoardGet() == 5 && *sp8 == 0x200 && var_r31 != 0) { + if (_CheckFlag(0x10009) && GWBoardGet() == BOARD_ID_MAIN6 && *sp8 == 0x200 && var_r31 != 0) { HuAudFXPlay(4); } } else if (*sp8 == 0x200) { diff --git a/src/game/board/shop.c b/src/game/board/shop.c index f6ed2050..74219244 100755 --- a/src/game/board/shop.c +++ b/src/game/board/shop.c @@ -803,7 +803,7 @@ static void GetShopItems(s32 arg0) { temp_r19 = rankItemGroupTbl[var_r27][GWPlayer[arg0].rank][temp_r22]; activeItemTbl[0] = activeItemTbl[1] = activeItemTbl[2] = activeItemTbl[3] = activeItemTbl[4] = -1; temp_r20 = BoardPlayerCoinsGet(shopPlayer); - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { GetDefaultShopItems(arg0); return; } @@ -904,7 +904,7 @@ static void DecideComEnter(s32 arg0) { var_r28 = 0; break; } - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { if (BoardPlayerCoinsGet(arg0) < 15) { BoardComKeySetRight(); return; diff --git a/src/game/board/space.c b/src/game/board/space.c index 8f5db247..a17381b2 100644 --- a/src/game/board/space.c +++ b/src/game/board/space.c @@ -347,7 +347,7 @@ s32 BoardSpaceStarGetNext(void) s16 star_pos; star_total = GWSystem.star_total; star_pos = GWSystem.star_pos; - if(GWBoardGet() == 5) { + if(GWBoardGet() == BOARD_ID_MAIN6) { s16 i; s32 count; s32 last_free; @@ -371,7 +371,7 @@ s32 BoardSpaceStarGetNext(void) goto begin; } switch(GWSystem.board) { - case 0: + case BOARD_ID_MAIN1: if(star_total >= 2) { break; } @@ -380,7 +380,7 @@ s32 BoardSpaceStarGetNext(void) } goto begin; - case 1: + case BOARD_ID_MAIN2: if(star_total >= 2) { break; } @@ -389,7 +389,7 @@ s32 BoardSpaceStarGetNext(void) } goto begin; - case 2: + case BOARD_ID_MAIN3: if(star_total == 1) { if(random_pos < 3 || random_pos > 5) { break; @@ -405,7 +405,7 @@ s32 BoardSpaceStarGetNext(void) goto begin; } - case 3: + case BOARD_ID_MAIN4: if(star_total == 1) { if(random_pos < 5 || random_pos > 7) { break; @@ -421,7 +421,7 @@ s32 BoardSpaceStarGetNext(void) break; } - case 4: + case BOARD_ID_MAIN5: if(star_total == 1) { if(random_pos <= 1 || random_pos >= 4) { goto begin; @@ -429,7 +429,7 @@ s32 BoardSpaceStarGetNext(void) } break; - case 5: + case BOARD_ID_MAIN6: if(star_total == 1) { if(random_pos == 1 || random_pos == 4 || random_pos == 5) { goto begin; @@ -504,7 +504,7 @@ s32 BoardSpaceStarCheck(s32 index) s32 ret; BoardSpace *space = BoardSpaceGet(0, index); BoardSpace *star_space; - if(GWBoardGet() == 7 || GWBoardGet() == 8) { + if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { ret = 0; goto end; } @@ -623,7 +623,7 @@ s32 BoardSpaceWalkExec(s32 player, s32 space) return 0; } space_ptr = BoardSpaceGet(0, space); - if(GWBoardGet() == 7 || GWBoardGet() == 8) { + if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { is_star = 0; } else { star_space = BoardSpaceGet(0, boardSpaceStarTbl[GWSystem.star_pos]); @@ -680,7 +680,7 @@ s32 BoardSpaceBlockExec(s32 player, s32 space) if(!GWBonusStarGet() && GWPartyGet() == 1 && !_CheckFlag(FLAG_ID_MAKE(1, 11))) { event_exec = 0; } - if(GWBoardGet() == 7 || GWBoardGet() == 8) { + if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { event_exec = 0; } if(event_exec) { @@ -1059,7 +1059,7 @@ void BoardSpaceInit(s32 data_num) GWSystem.star_total = 0; GWSystem.star_flag = 0; } - if(GWBoardGet() != 7 && GWBoardGet() != 8) { + if(GWBoardGet() != BOARD_ID_EXTRA1 && GWBoardGet() != BOARD_ID_EXTRA2) { starPlatMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 6), NULL, 0); BoardModelMotionStart(starPlatMdl, 0, 0x40000001); BoardModelVisibilitySet(starPlatMdl, 0); diff --git a/src/game/board/star.c b/src/game/board/star.c index b980c827..bb5623da 100755 --- a/src/game/board/star.c +++ b/src/game/board/star.c @@ -144,7 +144,7 @@ static HsfanimStruct00 starEffParam = { void BoardStarHostSet(s16 arg0) { hostMdl = arg0; - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { return; } if (_CheckFlag(0x10001)) { @@ -157,7 +157,7 @@ s16 BoardStarHostMdlGet(void) { } void BoardStarExec(s32 arg0, s32 arg1) { - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { return; } if (BoardPlayerSizeGet(arg0) != 2) { @@ -587,7 +587,7 @@ void BoardStarGive(s32 arg0, Vec *arg1) { s32 temp_r25; GiveStarWork *temp_r31; - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { return; } starCharPos = *arg1; @@ -656,7 +656,7 @@ void BoardStarShowNext(s32 arg0) { s16 var_r29; var_r28 = 0; - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { return; } _SetFlag(0x1001C); @@ -671,7 +671,7 @@ void BoardStarShowNext(s32 arg0) { HuPrcSleep(18); } BoardStatusItemSet(0); - if (GWBoardGet() == 5 && BoardItemPrevGet() != 9 && boardStarGiveHook) { + if (GWBoardGet() == BOARD_ID_MAIN6 && BoardItemPrevGet() != 9 && boardStarGiveHook) { boardStarGiveHook(); } BoardSpaceStarMove(); @@ -753,7 +753,7 @@ void BoardStarShowNext(s32 arg0) { BoardWinCreate(3, var_r30, -1); BoardWinWait(); BoardWinKill(); - if (GWBoardGet() == 5 && BoardItemPrevGet() != 9 && boardStarShowNextHook) { + if (GWBoardGet() == BOARD_ID_MAIN6 && BoardItemPrevGet() != 9 && boardStarShowNextHook) { boardStarShowNextHook(); } BoardAudSeqFadeOut(1, 1000); diff --git a/src/game/board/start.c b/src/game/board/start.c index 5013d43a..f6b529ba 100755 --- a/src/game/board/start.c +++ b/src/game/board/start.c @@ -139,7 +139,7 @@ static void ExecStart(void) { BoardCameraNearFarSet(100.0f, 23000.0f); GWSystem.player_curr = -1; startSpace = BoardSpaceFlagPosGet(0, 0x80000000, &spacePos); - if ((GWBoardGet() == 2 || GWBoardGet() == 5) && boardLightResetHook) { + if ((GWBoardGet() == BOARD_ID_MAIN3 || GWBoardGet() == BOARD_ID_MAIN6) && boardLightResetHook) { boardLightResetHook(); } for (i = 0; i < 4; i++) { @@ -157,7 +157,7 @@ static void ExecStart(void) { streamStatus = HuAudSStreamPlay(5); ShowLogo(); FocusStart(); - if ((GWBoardGet() == 2 || GWBoardGet() == 5) && boardLightSetHook) { + if ((GWBoardGet() == BOARD_ID_MAIN3 || GWBoardGet() == BOARD_ID_MAIN6) && boardLightSetHook) { boardLightSetHook(); } BoardCameraMotionWait(); @@ -195,7 +195,7 @@ static void ExecStart(void) { HuPrcEnd(); } BoardCameraNearFarSet(100.0f, 13000.0f); - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { WipeColorSet(0, 0, 0); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21); while (WipeStatGet() != 0) { @@ -719,7 +719,7 @@ static void ExecStartRoll(void) { BoardWinCreate(2, var_r29, BoardWinPortraitGetStar()); BoardWinWait(); HuPrcSleep(30); - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { var_r22 = 100; var_r23 = 1; } else { @@ -763,26 +763,26 @@ static void InitCamera(void) { camStartFocusPos.y = 100.0f; camStartFocusPos.z = 500.0f; switch (GWBoardGet()) { - case 0: + case BOARD_ID_MAIN1: camStartFocusPos.z -= 200.0f; camStartFocusPos.x -= 150.0f; break; - case 3: + case BOARD_ID_MAIN4: camStartFocusPos.z -= 250.0f; camStartFocusPos.x -= 150.0f; break; - case 4: + case BOARD_ID_MAIN5: camStartFocusPos.z -= 400.0f; camStartFocusPos.x -= 150.0f; break; - case 5: + case BOARD_ID_MAIN6: camStartFocusPos.z -= 500.0f; break; - case 7: + case BOARD_ID_EXTRA1: camStartFocusPos.z -= 520.0f; camStartFocusPos.x -= 150.0f; break; - case 8: + case BOARD_ID_EXTRA2: camStartFocusPos.z -= 250.0f; camStartFocusPos.x -= 150.0f; break; diff --git a/src/game/board/tutorial.c b/src/game/board/tutorial.c index 5bdca944..79bc686c 100755 --- a/src/game/board/tutorial.c +++ b/src/game/board/tutorial.c @@ -69,7 +69,7 @@ void BoardTutorialPlayerInit(void) { GWPlayer[i].com = 1; GWPlayerCfg[i].iscom = 1; } - GWSystem.board = 6; + GWSystem.board = BOARD_ID_TUTORIAL; } void BoardTutorialWorkSave(void) { diff --git a/src/game/board/ui.c b/src/game/board/ui.c index 730ee8fd..ccfedd4a 100755 --- a/src/game/board/ui.c +++ b/src/game/board/ui.c @@ -573,7 +573,7 @@ static void CreateBoardStatusSprite(s32 arg0, UnkUiStatusStruct *arg1) { } arg1->unk00_bit6 = 0; HuSprTPLvlSet(arg1->unk02, 0, 0.7f); - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { HuSprAttrSet(arg1->unk02, 7, 4); HuSprAttrSet(arg1->unk02, 8, 4); HuSprAttrSet(arg1->unk02, 9, 4); diff --git a/src/game/board/view.c b/src/game/board/view.c index 0d5ea2d5..a22e11d9 100755 --- a/src/game/board/view.c +++ b/src/game/board/view.c @@ -306,7 +306,7 @@ static void ExecStarView(void) { static void ExecOverheadView(void) { u32 var_r31; - if ((GWBoardGet() == 2 || GWBoardGet() == 5) && boardLightResetHook) { + if ((GWBoardGet() == BOARD_ID_MAIN3 || GWBoardGet() == BOARD_ID_MAIN6) && boardLightResetHook) { boardLightResetHook(); } InitOverheadView(); @@ -326,7 +326,7 @@ static void ExecOverheadView(void) { } HuPrcVSleep(); } - if ((GWBoardGet() == 2 || GWBoardGet() == 5) && boardLightSetHook) { + if ((GWBoardGet() == BOARD_ID_MAIN3 || GWBoardGet() == BOARD_ID_MAIN6) && boardLightSetHook) { boardLightSetHook(); } DestroyButtonWin(); @@ -483,7 +483,7 @@ static void InitOverheadView(void) { Hu3D2Dto3D(&sp10, 1, &sp10); BoardModelPosSetV(temp_r31->unk04, &sp10); HuSprGrpDrawNoSet(temp_r31->unk02, 0x40); - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { BoardModelVisibilitySet(temp_r31->unk04, 0); HuSprTPLvlSet(temp_r31->unk02, 8, 0.0f); } @@ -527,7 +527,7 @@ static void UpdateOverheadView(omObjData *arg0) { temp_r31->unk01 ^= 1; HuAudFXPlay(0x1C); } - if (GWBoardGet() == 7 || GWBoardGet() == 8) { + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { var_r27 = 1; } else { var_r27 = 0; @@ -559,7 +559,7 @@ static void UpdateOverheadView(omObjData *arg0) { HuSprZRotSet(temp_r31->unk02, var_r28, temp_f30); HuSprScaleSet(temp_r31->unk02, var_r28, 0.5f, temp_f31); HuSprPosSet(temp_r31->unk02, var_r28, var_r29[0], var_r29[1]); - if (i == 4 && (GWBoardGet() == 7 || GWBoardGet() == 8)) { + if (i == 4 && (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2)) { BoardModelVisibilitySet(temp_r31->unk04, 0); } else if (temp_r31->unk01 != 0) { if (i != 4) {