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

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);
}