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

add FLAG_ID_MAKE macros to all flag function calls

Browse source
This commit is contained in:
Rainchus 2024-07-15 13:27:19 -05:00
parent 38085a347f
commit db89eb87be
32 changed files with 158 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,7 +111,7 @@ static s16 battleSprPrioTbl[] = {
};
void BoardBattleExec(s32 player, s32 space) {
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
HuAudFXPlay(0x34A);
BoardCameraViewSet(2);
BoardPlayerMotBlendSet(player, 0, 0xF);
@ -195,13 +195,13 @@ static void ExecBattle(void) {
battleMGIdx[var_r30] = var_r31;
BoardMGSetupPlayPush(4, temp_r28);
}
if (_CheckFlag(0x10004)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 4))) {
BoardStatusItemSet(1);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
_ClearFlag(0x1001C);
_ClearFlag(FLAG_ID_MAKE(1, 28));
HuPrcSleep(60);
HuPrcEnd();
}
@ -287,28 +287,28 @@ static void ExecBattle(void) {
temp_r28 = battleMGList[battleMGIdx[mgChoice]];
GWMGAvailSet(temp_r28);
GWSystem.mg_next = temp_r28 - 401;
if (_CheckFlag(0xB)) {
if (_CheckFlag(FLAG_ID_MAKE(0, 11))) {
var_r24 = DATADIR_INST;
} else {
var_r24 = mgInfoTbl[temp_r28 - 401].data_dir;
}
var_r21 = BoardDataDirReadAsync(var_r24);
}
_SetFlag(0x1000E);
_SetFlag(FLAG_ID_MAKE(1, 14));
WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
HuAudFXAllStop();
_SetFlag(0x1001C);
_SetFlag(FLAG_ID_MAKE(1, 28));
HideBattleSpr();
for (var_r31 = 0; var_r31 < 4; var_r31++) {
BoardPlayerMotionStart(var_r31, 1, 0x40000001);
}
BoardDataAsyncWait(var_r21);
if (var_r27 == 0) {
_SetFlag(0x10004);
_SetFlag(FLAG_ID_MAKE(1, 4));
BoardNextOvlSet(OVL_INST);
BoardFilterFadeOut(30);
StopBattleBomb();

10
src/game/board/block.c
View file

@ -127,12 +127,12 @@ static void BlockProc(void) {
if (work->contains_star != 0) {
SetBlockStop();
BoardModelPosGet(starMdl, &sp8);
if (_CheckFlag(0x1000B) == 0) {
BoardAudSeqPause(0, 1, 0x3E8);
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) == 0) {
BoardAudSeqPause(0, 1, 1000);
}
BoardStarGive(player, &sp8);
if (_CheckFlag(0x1000B) == 0) {
BoardAudSeqPause(0, 0, 0x3E8);
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) == 0) {
BoardAudSeqPause(0, 0, 1000);
}
} else {
for (i = 0; i < 0x14; i++) {
@ -165,7 +165,7 @@ static void BlockProc(void) {
BoardPlayerIdleSet((s32) player);
HuPrcVSleep();
if ((_CheckFlag(0x1000B) != 0) && work->contains_star == 0) {
if ((_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) && work->contains_star == 0) {
BoardTutorialHookExec(0x16, 0);
}

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

@ -102,7 +102,7 @@ static s32 ExecMiniBowserEvent(void);
s32 BoardBowserExec(s32 player, s32 space)
{
if(_CheckFlag(0x1000B)) {
if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
HuAudFXPlay(841);
BoardCameraViewSet(2);
BoardPlayerMotBlendSet(player, 0, 15);
@ -152,7 +152,7 @@ static void ExecBowser(void)
{
s32 i;
s32 status;
if(!_CheckFlag(0x10003)) {
if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
HuAudFXPlay(841);
omVibrate(eventPlayer, 12, 4, 2);
if(GWBoardGet() == BOARD_ID_MAIN6 && boardBowserHook) {
@ -170,7 +170,7 @@ static void ExecBowser(void)
status = BoardDataDirReadAsync(DATADIR_BKOOPA);
BoardDataAsyncWait(status);
CreatePlayerMot();
if(!_CheckFlag(0x10003)) {
if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
ExecBowserMain();
} else {
ExecMGReturn();
@ -318,7 +318,7 @@ static void SquishPlayers(void)
Vec pos_space;
s32 i;
BoardPlayerPosGet(eventPlayer, &pos);
if(!_CheckFlag(0x10003)) {
if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
HuAudFXPlay(798);
}
pos.y += 6.0f;
@ -765,7 +765,7 @@ static void CreateBowserObj(void)
work->mot_active = 0;
work->fall_done = 0;
work->jump_done = 0;
if(!_CheckFlag(0x10003)) {
if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
work->state = 1;
} else {
work->state = 0;
@ -778,7 +778,7 @@ static void CreateBowserObj(void)
bowserObj->trans.x = pos.x;
bowserObj->trans.y = pos.y;
bowserObj->trans.z = pos.z;
if(!_CheckFlag(0x10003)) {
if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
suitItemMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 99), NULL, 0);
BoardModelLayerSet(suitItemMdl, 2);
BoardModelVisibilitySet(suitItemMdl, 0);
@ -885,7 +885,7 @@ static void ExecBowserFall(BowserWork *work, omObjData *object)
BoardCameraQuakeSet(60, 100.0f);
object->trans.y = pos.y;
BoardPlayerPosGet(eventPlayer, &pos_player);
if(!_CheckFlag(0x10003)) {
if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
HuAudFXPlay(798);
}
pos_player.y += 6.0f;

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

@ -661,7 +661,7 @@ s32 BoardComFarPlayerFind(void) {
s32 space;
s32 i;
if (_CheckFlag(0x1000B) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
return -1;
}
far_player = -1;

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

@ -1,5 +1,6 @@
#include "game/board/com_path.h"
#include "game/board/space.h"
#include "game/flag.h"
#define NODE_INDEX(x) ((x) ? ((x) - pathNodeData) : -1)
@ -311,7 +312,7 @@ s16 BoardComPathShortcutLenGet(s16 space, u32 type, s32 block_pipe) {
s16 i;
s32 search_child;
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
return 0;
}
PopulateCandidates(space, 30);

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

@ -59,7 +59,7 @@ static void ComFortuneSwapStar(s32 player1, s32 player2);
void BoardFortuneExec(s32 player, s32 space)
{
if(_CheckFlag(0x1000B)) {
if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
HuAudFXPlay(842);
BoardCameraViewSet(2);
BoardPlayerMotBlendSet(player, 0, 15);
@ -86,7 +86,7 @@ void BoardFortuneExec(s32 player, s32 space)
static void FortuneExec(void)
{
BoardAudSeqFadeOut(0, 1000);
if(!_CheckFlag(0x10005)) {
if(!_CheckFlag(FLAG_ID_MAKE(1, 5))) {
GWPlayer[currPlayer].show_next = 0;
FortuneMain();
} else {

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

@ -259,21 +259,21 @@ static void ExecMGSetup(void) {
HuDataDirClose(0x20000);
HuDataDirClose(sp60[GWBoardGet()]);
HuPrcSleep(2);
if (_CheckFlag(0xBU) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(0, 11)) != 0) {
var_r23 = 0x140000;
} else {
var_r23 = mgInfoTbl[mgNext].data_dir;
}
var_r22 = BoardDataDirReadAsync(var_r23);
BoardAudSeqFadeOut(0, 0x3E8U);
_SetFlag(0x1000EU);
WipeColorSet(0xFFU, 0xFFU, 0xFFU);
BoardAudSeqFadeOut(0, 1000);
_SetFlag(FLAG_ID_MAKE(1, 14));
WipeColorSet(255, 255, 255);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
HuAudFXAllStop();
_SetFlag(0x1001CU);
_SetFlag(FLAG_ID_MAKE(1, 28));
for (var_r31 = 0; var_r31 < 4; var_r31++) {
BoardStatusItemHideSet(var_r31, 1);
@ -723,7 +723,7 @@ static void CenterStatus(bitcopy* arg0, omObjData* arg1) {
}
SetupStatusLayout();
DetermineMGList(arg0);
if (_CheckFlag(0x1000BU) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
BoardTutorialHookExec(0x1A, 0);
}
temp_r30 = (bitcopy*) mgSetupObj->work;
@ -812,7 +812,7 @@ static void PopupVS(bitcopy* arg0, omObjData* arg1) {
}
HuSprScaleSet(temp_r29->unk_00[0], 0, var_f30, var_f30);
arg0->unk_04 += 9;
if ((_CheckFlag(0x1000BU) != 0) && arg0->field00_bit1 == 3) {
if ((_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) && arg0->field00_bit1 == 3) {
BoardTutorialHookExec(0x1B, 0);
if (*boardTutorialData == 1) {
arg0->field00_bit1 = 0;

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

@ -92,7 +92,7 @@ static void MushroomMain(void) {
BoardCameraMotionWait();
BoardPlayerIdleSet(curPlayer);
if (_CheckFlag(0x1000B) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
BoardTutorialHookExec(13, 0);
boardTutorialData[0] = 0;
}
@ -125,7 +125,7 @@ static void MushroomMain(void) {
BoardRand();
var_r26 = 0; //inline?
var_r29 = var_r26;
if (_CheckFlag(0x1000BU) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
var_r29 = 0;
}
}
@ -173,7 +173,7 @@ static void MushroomMain(void) {
MarkKillBox();
BoardPlayerMotionEndWait(curPlayer);
BoardPlayerIdleSet(curPlayer);
if (_CheckFlag(0x1000BU) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
BoardPlayerIdleSet(curPlayer);
BoardTutorialHookExec(14, 0);
if (++boardTutorialData[0] < 2) {
@ -388,7 +388,7 @@ static void InitBox(s32 arg0) {
if (GWBoardGet() == BOARD_ID_EXTRA2) {
itemResult = 0;
}
if (_CheckFlag(0x1000BU) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
itemResult = (boardTutorialData[0] ^ 1);
var_r29 = 0;
}

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

@ -172,9 +172,9 @@ static void PauseExit(void) {
pausePad = -1;
omSysPauseCtrl(0);
if (GWMGExplainGet()) {
_SetFlag(0xB);
_SetFlag(FLAG_ID_MAKE(0, 11));
} else {
_ClearFlag(0xB);
_ClearFlag(FLAG_ID_MAKE(0, 11));
}
if (GWPartyGet() == 0) {
GWGameStat.story_pause.explain_mg = GWMGExplainGet();

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

@ -221,7 +221,7 @@ void BoardPlayerModelInit(void) {
memset(&boardPlayerMdl, 0, 8);
suitMdl = -1;
suitPlayerMdl = -1;
if ((_CheckFlag(0x10005U) != 0) || (_CheckFlag(0x10006U) && (GWBoardGet() == BOARD_ID_MAIN6))) {
if ((_CheckFlag(FLAG_ID_MAKE(1, 5)) != 0) || (_CheckFlag(FLAG_ID_MAKE(1, 6)) && (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;
@ -688,10 +688,10 @@ void BoardPlayerTurnExec(s32 arg0) {
BoardPauseDisableSet(1);
BoardComUseItemSet(arg0, -1);
GWSystem.bowser_event = 0xF;
_ClearFlag(0x10016);
_ClearFlag(0x1000E);
_ClearFlag(FLAG_ID_MAKE(1, 22));
_ClearFlag(FLAG_ID_MAKE(1, 14));
BoardCameraMoveSet(1);
if (_CheckFlag(0x10006U) == 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 6)) == 0) {
BoardCameraViewSet(2);
omVibrate((s16) arg0, 0xC, 4, 2);
BoardItemPrevSet(-1);
@ -703,7 +703,7 @@ void BoardPlayerTurnExec(s32 arg0) {
preTurnHook[arg0] = 0;
}
}
if (_CheckFlag(0x1000BU) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
BoardTutorialHookExec(5, 0);
}
BoardPlayerTurnRollExec(arg0);
@ -762,7 +762,7 @@ void BoardPlayerTurnMoveExec(s32 arg0) {
BoardPauseDisableSet(1);
var_r28 = 0;
if (_CheckFlag(0x10006U) == 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 6)) == 0) {
BoardCameraMoveSet(1);
var_r29 = 1;
BoardCameraViewSet(1);
@ -776,15 +776,15 @@ void BoardPlayerTurnMoveExec(s32 arg0) {
} else {
var_r29 = 0;
var_r28 = 1;
_ClearFlag(0x10006);
_ClearFlag(0x10007);
_ClearFlag(FLAG_ID_MAKE(1, 6));
_ClearFlag(FLAG_ID_MAKE(1, 7));
sp8 = GWPlayer[arg0].space_next;
goto block_14;
}
do {
BoardPauseDisableSet(1);
GWPlayer[arg0].space_prev = GWPlayer[arg0].space_curr;
if (_CheckFlag(0x20001U) == 0) {
if (_CheckFlag(FLAG_ID_MAKE(2, 1)) == 0) {
if (ExecJunction(arg0, &sp8) != 0) {
break;
}
@ -829,7 +829,7 @@ block_14:
if (GWPlayer[arg0].bowser_suit != 0) {
BoardCameraTargetPlayerSet(arg0);
}
if (_CheckFlag(0x1000BU) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
BoardTutorialHookExec(7, 0);
}
if (BoardItemPrevGet() != -1) {
@ -841,12 +841,12 @@ block_14:
}
BoardPlayerSizeRestore(arg0);
megaDoubleDiceF = 0;
if (_CheckFlag(0x1000BU) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
BoardTutorialHookExec(8, 0);
}
BoardSpaceBlockExec(arg0, sp8);
BoardSpaceLandExec(arg0, sp8);
_SetFlag(0x1000E);
_SetFlag(FLAG_ID_MAKE(1, 14));
if (GWSystem.bowser_event != 1) {
BoardCameraViewSet(2);
BoardCameraMotionWait();
@ -1004,7 +1004,7 @@ static void InitJunction(s32 arg0, s32 arg1, f32 arg8) {
HuWinBGTPLvlSet(temp_r29->unk_04, 0.0f);
HuWinMesSpeedSet(temp_r29->unk_04, 0);
HuWinMesSet(temp_r29->unk_04, 0x90003);
if (_CheckFlag(0x1000BU) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
HuWinDispOff(temp_r29->unk_04);
}
temp_r26 = BoardSpaceGet(0, arg1);
@ -1400,7 +1400,7 @@ static s32 ExecJunction(s32 arg0, s16* arg1) {
HuPrcSleep(10);
while (1) {
if ((_CheckFlag(0x1000B) != 0) && (boardTutorialDirInputTime != -1)) {
if ((_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) && (boardTutorialDirInputTime != -1)) {
if (boardTutorialDirInputTime > 0) {
spC4.x = boardTutorialDirInputX;
spC4.z = boardTutorialDirInputY;
@ -2667,7 +2667,7 @@ static s32 MegaPlayerPassFunc(s32 player, s32 space)
if(temp_r26 == 0) {
return 0;
}
if (_CheckFlag(0x1000BU) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
BoardTutorialHookExec(24, 0);
}
BoardPlayerPosGet(player, &spB8);

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

@ -219,13 +219,13 @@ static void RollMain(void) {
BoardCameraTargetModelSet(-1);
for (i = 0; i < numDice; i++) {
temp_r26 = rollPlayer;
if (!_CheckFlag(0x1000B)) {
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
var_r27 = BoardPlayerItemCount(temp_r26);
if (GWTeamGet()) {
temp_r25 = BoardPlayerSameTeamFind(temp_r26);
var_r27 += BoardPlayerItemCount(temp_r25);
}
if (BoardItemPrevGet() != -1 || var_r27 == 0 || _CheckFlag(0x10009) || BoardMegaDoubleDiceCheck()) {
if (BoardItemPrevGet() != -1 || var_r27 == 0 || _CheckFlag(FLAG_ID_MAKE(1, 9)) || BoardMegaDoubleDiceCheck()) {
var_r29 = 0x90004;
} else {
var_r29 = 0x90002;
@ -296,7 +296,7 @@ static void RollMain(void) {
destMode = var_r30;
GWPlayer[rollPlayer].roll = var_r30;
BoardRollCreate(rollPlayer, 1);
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialHookExec(6, 0);
}
if (tutorialRollF != 0) {
@ -388,8 +388,8 @@ static void DoInput(s32 arg0) {
var_r30 = BoardPlayerSameTeamFind(rollPlayer);
var_r31 += BoardPlayerItemCount(var_r30);
}
if (var_r31 == 0 || BoardItemPrevGet() != -1 || BoardMegaDoubleDiceCheck() || _CheckFlag(0x10009)) {
if (_CheckFlag(0x10009) && GWBoardGet() == BOARD_ID_MAIN6 && *sp8 == 0x200 && var_r31 != 0) {
if (var_r31 == 0 || BoardItemPrevGet() != -1 || BoardMegaDoubleDiceCheck() || _CheckFlag(FLAG_ID_MAKE(1, 9))) {
if (_CheckFlag(FLAG_ID_MAKE(1, 9)) && GWBoardGet() == BOARD_ID_MAIN6 && *sp8 == 0x200 && var_r31 != 0) {
HuAudFXPlay(4);
}
} else if (*sp8 == 0x200) {
@ -900,7 +900,7 @@ static s32 GetBtnRoll(s32 arg0) {
var_r31 = 0x200;
return var_r31;
}
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
var_r31 = 0x100;
return var_r31;
}
@ -909,7 +909,7 @@ static s32 GetBtnRoll(s32 arg0) {
var_r31 = HuPadBtnDown[var_r29];
return var_r31;
}
if (_CheckFlag(0x10009) || BoardItemPrevGet() != -1) {
if (_CheckFlag(FLAG_ID_MAKE(1, 9)) || BoardItemPrevGet() != -1) {
return 0x100;
}
var_r31 = GetComBtnRoll(arg0);
@ -917,7 +917,7 @@ static s32 GetBtnRoll(s32 arg0) {
}
static s32 GetComBtnRoll(s32 arg0) {
if (BoardItemPrevGet() != -1 || BoardPlayerItemCount(arg0) == 0 || BoardMegaDoubleDiceCheck() || _CheckFlag(0x10009)) {
if (BoardItemPrevGet() != -1 || BoardPlayerItemCount(arg0) == 0 || BoardMegaDoubleDiceCheck() || _CheckFlag(FLAG_ID_MAKE(1, 9))) {
return 0x100;
}
if (BoardComUseItemCheck(arg0)) {

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

@ -520,9 +520,19 @@ s32 BoardSpaceStarCheck(s32 index)
void BoardSpaceLandExec(s32 player, s32 space)
{
#define BLUE_SPACE 1
#define RED_SPACE 2
#define BOWSER_SPACE 3
#define MUSHROOM_SPACE 4
#define BATTLE_SPACE 5
#define HAPPENING_SPACE 6
#define FORTUNE_SPACE 7
#define STAR_SPACE 8
#define WARP_SPACE 9
BoardSpace *space_ptr = BoardSpaceGet(0, space);
switch(space_ptr->type) {
case 1:
case BLUE_SPACE:
GWPlayer[player].blue_count++;
if(GWPlayer[player].blue_count > 99) {
GWPlayer[player].blue_count = 99;
@ -530,7 +540,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardLandBlueExec(player, space);
break;
case 2:
case RED_SPACE:
GWPlayer[player].red_count++;
if(GWPlayer[player].red_count > 99) {
GWPlayer[player].red_count = 99;
@ -538,7 +548,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardLandRedExec(player, space);
break;
case 3:
case BOWSER_SPACE:
GWPlayer[player].bowser_count++;
if(GWPlayer[player].bowser_count > 99) {
GWPlayer[player].bowser_count = 99;
@ -546,7 +556,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardBowserExec(player, space);
break;
case 4:
case MUSHROOM_SPACE:
GWPlayer[player].mushroom_count++;
if(GWPlayer[player].mushroom_count > 99) {
GWPlayer[player].mushroom_count = 99;
@ -554,7 +564,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardMushroomExec(player, space);
break;
case 5:
case BATTLE_SPACE:
GWPlayer[player].battle_count++;
if(GWPlayer[player].battle_count > 99) {
GWPlayer[player].battle_count = 99;
@ -562,7 +572,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardBattleExec(player, space);
break;
case 6:
case HAPPENING_SPACE:
GWPlayer[player].question_count++;
if(GWPlayer[player].question_count > 99) {
GWPlayer[player].question_count = 99;
@ -586,7 +596,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
GWPlayer[player].color = 3;
break;
case 7:
case FORTUNE_SPACE:
GWPlayer[player].fortune_count++;
if(GWPlayer[player].fortune_count > 99) {
GWPlayer[player].fortune_count = 99;
@ -594,7 +604,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardFortuneExec(player, space);
break;
case 9:
case WARP_SPACE:
GWPlayer[player].warp_count++;
if(GWPlayer[player].warp_count > 99) {
GWPlayer[player].warp_count = 99;
@ -602,7 +612,7 @@ void BoardSpaceLandExec(s32 player, s32 space)
BoardWarpExec(player, space);
break;
case 8:
case STAR_SPACE:
BoardStarExec(player, space);
break;
}

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

@ -147,7 +147,7 @@ void BoardStarHostSet(s16 arg0) {
if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
return;
}
if (_CheckFlag(0x10001)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 1))) {
BoardSpaceHostSet(boardSpaceStarTbl[GWSystem.star_pos]);
}
}
@ -371,7 +371,7 @@ block_B:
}
BoardModelRotYSet(temp_r30, 0.0f);
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, 0x40000001);
if (!_CheckFlag(0x10016)) {
if (!_CheckFlag(FLAG_ID_MAKE(1, 22))) {
BoardCameraViewSet(1);
BoardCameraTargetPlayerSet(temp_r31);
BoardCameraMotionWait();
@ -612,7 +612,7 @@ void BoardStarGive(s32 arg0, Vec *arg1) {
HuAudFXPlay(0x338);
HuAudFXPlay(0x353);
StarInlineFunc01();
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialHookExec(0x15, 0);
}
BoardPlayerMotBlendSet(arg0, 0, 0xF);
@ -627,7 +627,7 @@ void BoardStarGive(s32 arg0, Vec *arg1) {
BoardPlayerStarsAdd(arg0, 1);
HuAudFXPlay(8);
HuPrcSleep(10);
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardPlayerMotionEndWait(arg0);
} else {
temp_r25 = HuAudSStreamPlay(6);
@ -684,7 +684,7 @@ void BoardStarShowNext(s32 arg0) {
BoardSpacePosGet(0, GWPlayer[arg0].space_curr, &sp38);
BoardPlayerPosSetV(arg0, &sp38);
}
if (!_CheckFlag(0x10017)) {
if (!_CheckFlag(FLAG_ID_MAKE(1, 23))) {
BoardAudSeqFadeOut(0, 1000);
}
showNextObj = omAddObjEx(boardObjMan, 0x7E03, 0, 0, -1, ShowNextUpdate);
@ -778,10 +778,10 @@ void BoardStarShowNext(s32 arg0) {
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
if (!_CheckFlag(0x10017)) {
if (!_CheckFlag(FLAG_ID_MAKE(1, 23))) {
BoardMusStartBoard();
}
_ClearFlag(0x1001C);
_ClearFlag(FLAG_ID_MAKE(1, 28));
}
static void ShowNextUpdate(omObjData *arg0) {

34
src/game/board/start.c
View file

@ -152,8 +152,8 @@ static void ExecStart(void) {
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
_ClearFlag(0x1001C);
if (!_CheckFlag(0x1000B)) {
_ClearFlag(FLAG_ID_MAKE(1, 28));
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
streamStatus = HuAudSStreamPlay(5);
ShowLogo();
FocusStart();
@ -166,10 +166,10 @@ static void ExecStart(void) {
}
CreatePlayerStart();
ExecStartRoll();
if (!_CheckFlag(0x1000B)) {
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardAudSeqFadeOut(0, 0x1F4);
}
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialHookExec(4, 0);
WipeColorSet(0, 0, 0);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
@ -333,7 +333,7 @@ static void CreatePlayerStart(void) {
BoardPlayerPosSet(playerOrderOld[var_r30->unk00_field2], var_r29->trans.x, var_r29->trans.y, var_r29->trans.z);
BoardPlayerMotionShiftSet(playerOrderOld[var_r30->unk00_field2], 4, 10.0f, 1.0f, 0);
}
if (!_CheckFlag(0x1000B)) {
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardMusStart(0, 0xC, 0x7F, 0);
}
while (GetPlayerStartState(3) != 0) {
@ -387,7 +387,7 @@ static void PlayerFall(omObjData *arg0, PlayerStartWork *arg1) {
if (arg1->unk00_field3 != 0) {
SetPlayerStartState(playerOrderOld[arg1->unk00_field2], 0);
BoardPlayerIdleSet(playerOrderOld[arg1->unk00_field2]);
if (_CheckFlag(0x1000B) && arg1->unk00_field2 == 3) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) && arg1->unk00_field2 == 3) {
BoardTutorialHookExec(0, 0);
}
return;
@ -440,7 +440,7 @@ static void PlayerDiceFall(omObjData *arg0, PlayerStartWork *arg1) {
BoardModelVisibilitySet(arg1->unk08, 1);
} else {
if (arg1->unk02 > 30.0f) {
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
if (arg1->unk00_field2 == 3) {
BoardTutorialHookExec(1, 0);
for (i = 0; i < 4; i++) {
@ -490,7 +490,7 @@ static void PlayerDiceRoll(omObjData *arg0, PlayerStartWork *arg1) {
}
if (arg1->unk00_field4 == 0) {
if (GWPlayer[playerOrderOld[arg1->unk00_field2]].com) {
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
if (arg1->unk0E != 0) {
arg1->unk0E--;
} else {
@ -526,7 +526,7 @@ static void PlayerDiceRoll(omObjData *arg0, PlayerStartWork *arg1) {
var_r29++;
}
}
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
arg1->unk04 = tutorialRollTbl[arg1->unk00_field2];
}
playerOrderNew[playerOrderOld[arg1->unk00_field2]] = arg1->unk04;
@ -556,7 +556,7 @@ static void PlayerDiceNumShow(omObjData *arg0, PlayerStartWork *arg1) {
if (arg1->unk06 < 0) {
arg1->unk06 = 0;
SetPlayerStartState(playerOrderOld[arg1->unk00_field2], 0);
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialHookExec(2, 0);
}
}
@ -644,14 +644,14 @@ static void ExecStartRoll(void) {
s32 var_r24;
s32 i;
if (!_CheckFlag(0x1000B)) {
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
for (i = 0; i < 4; i++) {
SetPlayerStartState(i, 2);
}
while (GetPlayerStartState(3) != 0) {
HuPrcVSleep();
}
_CheckFlag(0x1000B);
_CheckFlag(FLAG_ID_MAKE(1, 11));
var_r29 = startMesTbl[GWBoardGet()][0];
BoardWinCreate(2, var_r29, BoardWinPortraitGetStar());
BoardWinWait();
@ -690,7 +690,7 @@ static void ExecStartRoll(void) {
BoardStatusItemSet(0);
HuPrcVSleep();
for (i = 0; i < 4; i++) {
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialHookExec(3, i);
} else {
if (i == 0) {
@ -714,7 +714,7 @@ static void ExecStartRoll(void) {
for (i = 0; i < 4; i++) {
BoardPlayerIdleSet(i);
}
if (!_CheckFlag(0x1000B)) {
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
var_r29 = startMesTbl[GWBoardGet()][3];
BoardWinCreate(2, var_r29, BoardWinPortraitGetStar());
BoardWinWait();
@ -790,7 +790,7 @@ static void InitCamera(void) {
camFocus = BoardModelCreate(0x7000A, NULL, 0);
BoardModelVisibilitySet(camFocus, 0);
BoardModelPosSetV(camFocus, &camStartFocusPos);
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardCameraMoveSet(0);
sp14.x = spacePos.x + 150.0f;
sp14.y = spacePos.y + 100.0f;
@ -820,7 +820,7 @@ static void InitCamera(void) {
static void InitHost(void) {
Vec sp8;
if (!_CheckFlag(0x1000B)) {
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
hostMdl = BoardStarHostMdlGet();
sp8.x = spacePos.x + 150.0f;
sp8.y = spacePos.y;
@ -837,7 +837,7 @@ static void CreateTapWin(void) {
float var_f30;
s32 var_r31;
if (!_CheckFlag(0x1000B)) {
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
var_r31 = 0x120014;
HuWinMesMaxSizeGet(1, sp8, var_r31);
var_f31 = -10000.0f;

6
src/game/board/tutorial.c
View file

@ -24,7 +24,7 @@ static void *gameStatCopy;
static void TutorialProcFunc(void) {
while (1) {
if (_CheckFlag(0x10010)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 16))) {
BoardTutorialHookExec(0x1E, 0);
}
HuPrcVSleep();
@ -38,13 +38,13 @@ void BoardTutorialInit(void) {
tutorialHook = NULL;
tutorialProcess = NULL;
boardTutorialF = 0;
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
tutorialProcess = HuPrcChildCreate(TutorialProcFunc, 0x2002, 0x2000, 0, boardMainProc);
}
}
void BoardTutorialKill(void) {
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
if (tutorialProcess) {
HuPrcKill(tutorialProcess);
}

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

@ -983,7 +983,7 @@ static void WaitYourTurn(UnkUiWork02 *arg0, omObjData *arg1) {
static void ShrinkYourTurn(UnkUiWork02 *arg0, omObjData *arg1) {
s32 temp_r30 = GWPlayer[arg0->unk00_bit5].port;
if ((HuPadBtnDown[temp_r30] & 0x100) || GWPlayer[arg0->unk00_bit5].com || _CheckFlag(0x1000B)) {
if ((HuPadBtnDown[temp_r30] & 0x100) || GWPlayer[arg0->unk00_bit5].com || _CheckFlag(FLAG_ID_MAKE(1, 11))) {
arg0->unk00_bit3 = 2;
arg0->unk01 = 0;
arg0->unk04 = 1.0f;
@ -1117,7 +1117,7 @@ static void ItemUseProc(void) {
while (BoardItemDoneCheck() == 0) {
HuPrcVSleep();
}
if (_CheckFlag(0x1000B) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
BoardTutorialHookExec(0x17, 0);
}
FinishItemUse(temp_r23, var_r25);
@ -1183,13 +1183,13 @@ static void DestroyItemUse(void) {
}
void BoardMakeRandomItem(void) {
s32 temp_r3;
s32 chosenItemIndex;
s32 i;
for (i = 0; i < 3; i++) {
temp_r3 = BoardRandMod(0xE);
if (temp_r3 != 0xA && temp_r3 != 0xD) {
itemRandTbl[i] = temp_r3;
chosenItemIndex = BoardRandMod(0xE);
if (chosenItemIndex != 0xA && chosenItemIndex != 0xD) {
itemRandTbl[i] = chosenItemIndex;
}
}
BoardItemBagItemSet(itemRandTbl);
@ -1262,7 +1262,7 @@ static inline void ExecItemPickInlineFunc02(s32 arg0, s8 arg1, s32 arg2) {
while (!CheckItemWindow()) {
HuPrcVSleep();
}
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialHostHide(1);
}
}
@ -1277,7 +1277,7 @@ static void ExecItemPick(void) {
UnkUiWork03 *temp_r27;
Vec (*temp_r28)[6];
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialHostHide(0);
}
itemPickObj = omAddObjEx(boardObjMan, 0x7E03, 0, 0, -1, &UpdateItemPick);
@ -1975,7 +1975,7 @@ static void CreatePickerWindow(UnkUiWork01 *arg0, s32 arg1) {
HuWinBGTPLvlSet(arg0->unk06, 0.0f);
HuWinMesSpeedSet(arg0->unk06, 0);
HuWinMesSet(arg0->unk06, var_r30);
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
HuWinDispOff(arg0->unk06);
}
}

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

@ -62,7 +62,7 @@ void WarpProcess(void) {
}
BoardPlayerIdleSet(curr_player);
if (_CheckFlag(0x1000B) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
BoardTutorialHookExec(18, 0);
boardTutorialData[0] = 0;
}

6
src/game/board/window.c
View file

@ -113,7 +113,7 @@ static void ExecBoardWindow(void) {
if (windowID == -1) {
HuPrcEnd();
}
if (_CheckFlag(0x1000B) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
HuWinPriSet(windowID, 3);
}
}
@ -148,7 +148,7 @@ static void ExecBoardWindow(void) {
if (comKeyFunc) {
comKeyFunc();
}
} else if ((_CheckFlag(0x1000B) != 0) && ((winPosIdx == 5) || (winPosIdx == 6))) {
} else if ((_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) && ((winPosIdx == 5) || (winPosIdx == 6))) {
win_curr = &winData[windowID];
win_curr->active_pad = 0xF;
HuWinComKeyWait(-1, -1, -1, -1, 0);
@ -352,7 +352,7 @@ void BoardWinPlayerSet(s32 player) {
} else {
disablePlayer = ~(1 << GWPlayer[player].port);
}
if (_CheckFlag(0x1000BU) != 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
disablePlayer = 0;
}
if (windowID != -1) {

10
src/game/minigame_seq.c
View file

@ -3066,7 +3066,7 @@ static s32 SeqInitRecord(SeqWork *work, va_list params)
static s32 SeqUpdateRecord(SeqWork *work)
{
s16 group;
if(_CheckFlag(0x1000C)) {
if(_CheckFlag(FLAG_ID_MAKE(1, 12))) {
work->state = 0;
work->stat |= 0xC;
} else {
@ -3199,7 +3199,7 @@ static void PauseProc(void)
HuPrcVSleep();
}
} else {
if(mgPracticeEnableF && !_CheckFlag(0x1000C)) {
if(mgPracticeEnableF && !_CheckFlag(FLAG_ID_MAKE(1, 12))) {
window[2] = HuWinExCreateStyled(-10000.0f, 400.0f, 412, 42, -1, 0);
HuWinPriSet(window[2], 0);
HuWinDispOn(window[2]);
@ -3315,7 +3315,7 @@ void MGSeqPauseKill(void)
void MGSeqPauseEnableCtrl(s32 flag)
{
if(!_CheckFlag(0x10008)) {
if(!_CheckFlag(FLAG_ID_MAKE(1, 8))) {
omSysPauseEnable(flag);
}
}
@ -3373,7 +3373,7 @@ void MGSeqPracticeInit(void)
Process *process;
s16 i;
process = HuPrcCurrentGet();
if(!_CheckFlag(0x1000C)) {
if(!_CheckFlag(FLAG_ID_MAKE(1, 12))) {
return;
}
wipeFadeInF = 0;
@ -3531,7 +3531,7 @@ void MGSeqPracticeExitCheck(omObjData *object)
}
object->work[0]++;
}
if(!omPauseChk() || _CheckFlag(0x1000C) || !pauseWaitF) {
if(!omPauseChk() || _CheckFlag(FLAG_ID_MAKE(1, 12)) || !pauseWaitF) {
return;
}
for(i=input=0; i<4; i++) {

2
src/game/saveload.c
View file

@ -137,7 +137,7 @@ s32 SLFileCreate(char *fileName, u32 size, void *addr) {
HuWinMesWait(window);
_SetFlag(FLAG_ID_MAKE(3, 0));
result = HuCardCreate(curSlotNo, fileName, size, &curFileInfo);
_ClearFlag(0x30000);
_ClearFlag(FLAG_ID_MAKE(3, 0));
if (result < 0) {
HuWinExAnimOut(window);
HuWinExCleanup(window);

2
src/game/sreset.c
View file

@ -125,7 +125,7 @@ static void *ToeThreadFunc(void *param)
while(1) {
BOOL hide_disp;
OSSleepThread(&ToeMessageQueue.queueSend);
if(!_CheckFlag(0x30000)) {
if(!_CheckFlag(FLAG_ID_MAKE(3, 0))) {
BOOL reset;
if(!HuSoftResetCheck()) {
if(SR_ExecReset) {