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

2
src/REL/instDll/main.c
View file

@ -107,7 +107,7 @@ void ObjectSetup(void)
|| mgInfoTbl[lbl_1_bss_14].type == 5
|| mgInfoTbl[lbl_1_bss_14].type == 6
|| mgInfoTbl[lbl_1_bss_14].type == 8
|| !_CheckFlag(0xB)) {
|| !_CheckFlag(FLAG_ID_MAKE(0, 11))) {
HuDataDirClose(DATADIR_INST);
omSysPauseEnable(1);
omOvlCallEx(mgInfoTbl[lbl_1_bss_14].ovl, 1, 0, 0);

2
src/REL/m440Dll/object.c
View file

@ -92,7 +92,7 @@ void fn_1_AEE4(omObjData* arg0) {
}
temp_r31->unk5C = var_f31;
temp_r28 = temp_r31->unk4;
if (_CheckFlag(0x1000CU) == 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 12)) == 0) {
GWPlayer[temp_r28].coin_win = 0;
}
arg0->func = fn_1_B17C;

2
src/REL/modeseldll/filesel.c
View file

@ -471,7 +471,7 @@ s32 fn_1_3AAC(void)
} else {
_SetFlag(0x30000);
temp_r28 = HuCardFormat(temp_r31);
_ClearFlag(0x30000);
_ClearFlag(FLAG_ID_MAKE(3, 0));
if(temp_r28 == 0) {
SLSerialNoGet();
}

8
src/REL/modeseldll/main.c
View file

@ -136,10 +136,10 @@ void fn_1_414(void)
}
his = omOvlHisGet(0);
omOvlHisChg(0, his->overlay, 1, his->stat);
_ClearFlag(0x10000);
_ClearFlag(0x10008);
_ClearFlag(0x1000C);
_ClearFlag(0x1000B);
_ClearFlag(FLAG_ID_MAKE(1, 0));
_ClearFlag(FLAG_ID_MAKE(1, 8));
_ClearFlag(FLAG_ID_MAKE(1, 12));
_ClearFlag(FLAG_ID_MAKE(1, 11));
GWGameStat.sound_mode = msmSysGetOutputMode();
switch(result) {
case 0:

2
src/REL/modeseldll/modesel.c
View file

@ -225,7 +225,7 @@ s32 fn_1_2490(void)
temp_f30 += 5.0f;
HuPrcVSleep();
}
_ClearFlag(0x1000B);
_ClearFlag(FLAG_ID_MAKE(1, 11));
WipeColorSet(255, 255, 255);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 10);
while(WipeStatGet()) {

34
src/REL/mstory4Dll/main.c
View file

@ -331,41 +331,41 @@ void fn_1_EC(void)
}
GWSystem.board = lbl_1_bss_8;
if(lbl_1_data_554[0] == 1 || lbl_1_bss_8 == 0 && lbl_1_bss_C == 1) {
_SetFlag(2);
_SetFlag(FLAG_ID_MAKE(0, 2));
} else {
_ClearFlag(2);
_ClearFlag(FLAG_ID_MAKE(0, 2));
}
if(lbl_1_data_554[1] == 1 || lbl_1_bss_8 == 1 && lbl_1_bss_C == 1) {
_SetFlag(3);
_SetFlag(FLAG_ID_MAKE(0, 3));
} else {
_ClearFlag(3);
_ClearFlag(FLAG_ID_MAKE(0, 3));
}
if(lbl_1_data_554[2] == 1 || lbl_1_bss_8 == 2 && lbl_1_bss_C == 1) {
_SetFlag(4);
_SetFlag(FLAG_ID_MAKE(0, 4));
} else {
_ClearFlag(4);
_ClearFlag(FLAG_ID_MAKE(0, 4));
}
if(lbl_1_data_554[3] == 1 || lbl_1_bss_8 == 3 && lbl_1_bss_C == 1) {
_SetFlag(5);
_SetFlag(FLAG_ID_MAKE(0, 5));
} else {
_ClearFlag(5);
_ClearFlag(FLAG_ID_MAKE(0, 5));
}
if(lbl_1_data_554[4] == 1 || lbl_1_bss_8 == 4 && lbl_1_bss_C == 1) {
_SetFlag(6);
_SetFlag(FLAG_ID_MAKE(0, 6));
} else {
_ClearFlag(6);
_ClearFlag(FLAG_ID_MAKE(0, 6));
}
if(lbl_1_data_554[5] == 1 || lbl_1_bss_8 == 5 && lbl_1_bss_C == 1) {
_SetFlag(7);
_SetFlag(FLAG_ID_MAKE(0, 7));
} else {
_ClearFlag(7);
_ClearFlag(FLAG_ID_MAKE(0, 7));
}
if(GWSystem.board == BOARD_ID_MAIN6) {
_SetFlag(2);
_SetFlag(3);
_SetFlag(4);
_SetFlag(5);
_SetFlag(6);
_SetFlag(FLAG_ID_MAKE(0, 2));
_SetFlag(FLAG_ID_MAKE(0, 3));
_SetFlag(FLAG_ID_MAKE(0, 4));
_SetFlag(FLAG_ID_MAKE(0, 5));
_SetFlag(FLAG_ID_MAKE(0, 6));
switch(lbl_1_bss_C) {
case 0:
HuPrcChildCreate(fn_1_0, 100, 12288, 0, lbl_1_bss_0);

2
src/REL/resultDll/main.c
View file

@ -103,7 +103,7 @@ void ObjectSetup(void)
}
}
HuDataDirClose(mgInfoTbl[lbl_1_bss_17C].data_dir);
if(mgInfoTbl[lbl_1_bss_17C].type == 3 || mgInfoTbl[lbl_1_bss_17C].type == 5 || mgInfoTbl[lbl_1_bss_17C].type == 6 || !_CheckFlag(0x10000)) {
if(mgInfoTbl[lbl_1_bss_17C].type == 3 || mgInfoTbl[lbl_1_bss_17C].type == 5 || mgInfoTbl[lbl_1_bss_17C].type == 6 || !_CheckFlag(FLAG_ID_MAKE(1, 0))) {
if(_CheckFlag(0x10000)) {
HuAR_DVDtoARAM(DATADIR_BOARD);
while(HuARDMACheck());

2
src/REL/selmenuDll/main.c
View file

@ -204,7 +204,7 @@ void ObjectSetup(void)
SetDefLight(&pos, &dir, 255, 255, 255, 64, 64, 64, 255, 255, 255);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
GWMGTypeSet(-1);
_ClearFlag(0x10000);
_ClearFlag(FLAG_ID_MAKE(1, 0));
GWSystem.turn = 1;
GWSystem.max_turn = 20;
}

4
src/REL/w03Dll/main.c
View file

@ -405,14 +405,14 @@ void fn_1_DEC(void) {
}
for (i = 0; i < 4; i++) {
if ((WipeStatGet() != 0) || (_CheckFlag(0x1001CU) != 0)) {
if ((WipeStatGet() != 0) || (_CheckFlag(FLAG_ID_MAKE(1, 28)) != 0)) {
HuAudFXVolSet(lbl_1_data_21C[i], 0);
} else {
HuAudFXVolSet(lbl_1_data_21C[i], 0x7F);
}
}
if (_CheckFlag(0x10010) == 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 16)) == 0) {
if (lbl_1_bss_8 == 0) {
HuAudFXPauseAll(1);
lbl_1_bss_8 = 1;