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

Merge branch 'main' of https://github.com/abnormalhare/marioparty4

Browse source
This commit is contained in:
CreateSource 2024-07-16 23:00:52 -04:00
commit a733d96000
62 changed files with 778 additions and 615 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;

4
src/REL/m444dll/datalist.c
View file

@ -111,7 +111,7 @@ void fn_1_D588(DataListModel *model_list)
for(clear_i=0; clear_i<90; clear_i++) {
lbl_1_bss_199C2[clear_i] = lbl_1_bss_1990E[clear_i] = -1;
}
for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
if(list->type == 0) {
data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA);
model = Hu3DModelCreate(data);
@ -132,7 +132,7 @@ void fn_1_D588(DataListModel *model_list)
(void)i;
}
list = model_list;
for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
if(list->type == 2) {
model = Hu3DModelLink(lbl_1_bss_199C2[list->link]);
lbl_1_bss_199C2[i] = model;

4
src/REL/modeseldll/datalist.c
View file

@ -60,7 +60,7 @@ void fn_1_BED8(DataListModel *model_list)
for(clear_i=0; clear_i<24; clear_i++) {
lbl_1_bss_19A[clear_i] = lbl_1_bss_16A[clear_i] = -1;
}
for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
if(list->type == 0) {
data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA);
model = Hu3DModelCreate(data);
@ -81,7 +81,7 @@ void fn_1_BED8(DataListModel *model_list)
(void)i;
}
list = model_list;
for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
if(list->type == 2) {
model = Hu3DModelLink(lbl_1_bss_19A[list->link]);
lbl_1_bss_19A[i] = model;

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()) {

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

@ -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;
@ -330,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 == 5) {
_SetFlag(2);
_SetFlag(3);
_SetFlag(4);
_SetFlag(5);
_SetFlag(6);
if(GWSystem.board == BOARD_ID_MAIN6) {
_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);
@ -482,7 +483,7 @@ void fn_1_12E8(void)
}
}
char *lbl_1_data_640[] = {
char *charNameTbl[] = {
"Mario",
"Luigi",
"Peach",
@ -523,7 +524,7 @@ void fn_1_13A0(void)
}
print8(x, y+(row_h*5), scale, "Chara Name :");
fontcolor = 13;
print8(x, y+(row_h*5), scale, " %s", lbl_1_data_640[itemno/6]);
print8(x, y+(row_h*5), scale, " %s", charNameTbl[itemno/6]);
fontcolor = 15;
print8(x, y+(row_h*6), scale, "Item Name :");
if(lbl_1_data_0[itemno].unk10 == 1) {
@ -577,7 +578,7 @@ void fn_1_13A0(void)
s32 character;
for(i=1; i<4; i++) {
GWPlayerCfg[i].character = GWPlayerCfg[i-1].character+1;
if(GWPlayerCfg[i].character > 8) {
if(GWPlayerCfg[i].character > GW_CHARACTER_MAX) {
GWPlayerCfg[i].character = 0;
}
}
@ -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 {

4
src/REL/resultDll/datalist.c
View file

@ -17,7 +17,7 @@ void fn_1_8FF8(DataListModel *model_list)
for(clear_i=0; clear_i<32; clear_i++) {
lbl_1_bss_1A9C[clear_i] = lbl_1_bss_1A5C[clear_i] = -1;
}
for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
if(list->type == 0) {
data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA);
model = Hu3DModelCreate(data);
@ -38,7 +38,7 @@ void fn_1_8FF8(DataListModel *model_list)
(void)i;
}
list = model_list;
for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) {
if(list->type == 2) {
model = Hu3DModelLink(lbl_1_bss_1A9C[list->link]);
lbl_1_bss_1A9C[i] = model;

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

12
src/REL/w02Dll/main.c
View file

@ -266,7 +266,7 @@ void fn_1_990(void) {
currPlayer = GWSystem.player_curr;
BoardWinCreateChoice(2, 0x130011U, 4, 0);
BoardWinCreateChoice(2, MAKE_MESSID(19, 17), 4, 0);
if (GWPlayer[currPlayer].com) {
if (frandBool() != 0) {
BoardComKeySetLeft();
@ -278,7 +278,7 @@ void fn_1_990(void) {
BoardWinKill();
textChoice = BoardWinChoiceGet();
if ((textChoice == 1) || (textChoice == -1)) {
BoardWinCreate(2, 0x130012U, 4);
BoardWinCreate(2, MAKE_MESSID(19, 18), 4);
BoardWinWait();
BoardWinKill();
BoardMGExit();
@ -288,7 +288,7 @@ void fn_1_990(void) {
BoardMGDoneFlagSet(0);
return;
}
BoardAudSeqPause(0, 1, 0x3E8);
BoardAudSeqPause(0, 1, 1000);
HuPrcChildCreate(fn_1_954, 0x2003U, 0x1000U, 0, boardMainProc);
rotation.x = 0.0f;
rotation.y = rotation.z = 0.0f;
@ -328,7 +328,7 @@ void fn_1_C50(void) {
currPlayer = GWSystem.player_curr;
if (BoardPlayerItemCount((s32) currPlayer) == 3) {
BoardWinCreate(2, 0x13001A, 4);
BoardWinCreate(2, MAKE_MESSID(19, 26), 4);
BoardWinWait();
BoardWinKill();
HuPrcEnd();
@ -357,7 +357,7 @@ void fn_1_C50(void) {
fn_1_79BC(lbl_1_bss_8);
HuAudFXPlay(0x43);
BoardWinCreateChoice(2, 0x130016, 4, 0);
BoardWinCreateChoice(2, MAKE_MESSID(19, 22), 4, 0);
if (GWPlayer[currPlayer].com) {
if (BoardComPreferItemCheck(currPlayer, lbl_1_bss_8[0], lbl_1_bss_8[1], lbl_1_bss_8[2]) != -1) {
BoardComKeySetLeft();
@ -370,7 +370,7 @@ void fn_1_C50(void) {
textChoice = BoardWinChoiceGet();
if ((textChoice == 1) || (textChoice == -1)) {
HuAudFXPlay(0x44);
BoardWinCreate(2, 0x130017, 4);
BoardWinCreate(2, MAKE_MESSID(19, 23), 4);
BoardWinWait();
BoardWinKill();
BoardMGExit();

2
src/REL/w02Dll/mg_coin.c
View file

@ -348,7 +348,7 @@ void fn_1_46E8(void)
BoardModelAttrReset(lbl_1_bss_30[9], 0x40000002);
}
sprintf(sp8, "%d", lbl_1_bss_84);
BoardWinCreate(2, 0x130013, 4);
BoardWinCreate(2, MAKE_MESSID(19, 19), 4);
BoardWinInsertMesSet((u32)sp8, 0);
BoardWinWait();
BoardWinKill();

2
src/REL/w02Dll/mg_item.c
View file

@ -424,7 +424,7 @@ void fn_1_6EA8(void)
s32 temp_r28;
temp_r31 = lbl_1_bss_108->work[0];
BoardWinCreate(2, 0x130018, 4);
BoardWinCreate(2, MAKE_MESSID(19, 24), 4);
BoardWinInsertMesSet(lbl_1_bss_190[temp_r31]+0x80000, 1);
BoardWinWait();
BoardWinKill();

4
src/REL/w02Dll/roulette.c
View file

@ -107,7 +107,7 @@ s32 fn_1_BE88(void) {
fn_1_121C(0x130002);
do {
BoardWinCreateChoice(2, 0x13001DU, 4, 0);
BoardWinCreateChoice(2, MAKE_MESSID(19, 29), 4, 0);
/* COM has 50% to bribe goomba */
if (GWPlayer[lbl_1_bss_388].com) {
if (frandBool()) {
@ -121,7 +121,7 @@ s32 fn_1_BE88(void) {
rouletteChoice = BoardWinChoiceGet();
// If chose to play roulette
if (rouletteChoice == 0) {
BoardWinCreateChoice(1, 0x130003U, 4, 0);
BoardWinCreateChoice(1, MAKE_MESSID(19, 3), 4, 0);
playerCoinRegion = 3;
if (coinAmount < 0x14) {
BoardWinChoiceDisable(0);

10
src/REL/w03Dll/condor.c
View file

@ -230,12 +230,12 @@ s32 fn_1_3478(s32 arg0) {
BoardModelMotionShiftSet(lbl_1_data_310, 1, 0.0f, 5.0f, 0x40000001);
temp_r26 = BoardPlayerGetCharMess(arg0);
BoardWinCreate(2, 0x160010, 8);
BoardWinCreate(2, MAKE_MESSID(22, 16), 8);
BoardWinInsertMesSet(temp_r26, 3);
BoardWinWait();
if (BoardPlayerCoinsGet(arg0) < 5) {
BoardWinCreate(2, 0x160013, 8);
BoardWinCreate(2, MAKE_MESSID(22, 19), 8);
BoardWinWait();
BoardWinKill();
return 0;
@ -243,7 +243,7 @@ s32 fn_1_3478(s32 arg0) {
var_r29 = 0;
while (var_r29 == 0) {
BoardWinCreateChoice(2, 0x160011, 8, 0);
BoardWinCreateChoice(2, MAKE_MESSID(22, 17), 8, 0);
BoardWinAttrSet(0x10);
if (GWPlayer[arg0].com != 0) {
@ -261,7 +261,7 @@ s32 fn_1_3478(s32 arg0) {
break;
default:
case 1:
BoardWinCreate(2, 0x160014, 8);
BoardWinCreate(2, MAKE_MESSID(22, 20), 8);
BoardWinWait();
BoardWinKill();
return 0;
@ -501,7 +501,7 @@ void fn_1_3F5C(s32 arg0) {
HuPrcVSleep();
}
BoardWinCreate(2, 0x16000F, 8);
BoardWinCreate(2, MAKE_MESSID(22, 15), 8);
BoardWinWait();
BoardWinKill();
}

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;

8
src/REL/w03Dll/mg_coin.c
View file

@ -137,7 +137,7 @@ s32 fn_1_7D18(s32 arg0) {
s16 temp_r28;
f32 arctan;
BoardWinCreateChoice(2, 0x160015, 2, 0);
BoardWinCreateChoice(2, MAKE_MESSID(22, 21), 2, 0);
if (GWPlayer[arg0].com != 0) {
BoardComKeySetLeft();
@ -147,7 +147,7 @@ s32 fn_1_7D18(s32 arg0) {
BoardWinKill();
if (BoardWinChoiceGet() != 0) {
BoardWinCreate(2, 0x160018, 2);
BoardWinCreate(2, MAKE_MESSID(22, 24), 2);
BoardWinWait();
BoardWinKill();
return 0;
@ -635,7 +635,7 @@ void fn_1_9384(void) {
void fn_1_9474(s32 arg0) {
sprintf(lbl_1_bss_150, "%d", lbl_1_bss_14C);
BoardWinCreate(2, 0x160017U, 2);
BoardWinCreate(2, MAKE_MESSID(22, 23), 2);
BoardWinInsertMesSet((u32)lbl_1_bss_150, 4);
BoardWinWait();
BoardWinKill();
@ -658,7 +658,7 @@ void fn_1_9474(s32 arg0) {
HuPrcVSleep();
}
BoardWinCreate(2, 0x160018U, 2);
BoardWinCreate(2, MAKE_MESSID(22, 24), 2);
BoardWinWait();
BoardWinKill();
BoardModelMotionStart(lbl_1_bss_C[7], 0, 0x40000002);

10
src/REL/w03Dll/mg_item.c
View file

@ -211,13 +211,13 @@ s32 fn_1_9CF4(s32 arg0) {
s16 temp_r29;
if (BoardPlayerItemCount(arg0) == 3) {
BoardWinCreate(2, 0x16001E, 2);
BoardWinCreate(2, MAKE_MESSID(22, 30), 2);
BoardWinWait();
BoardWinKill();
return 0;
}
BoardWinCreateChoice(2, 0x16001A, 2, 0);
BoardWinCreateChoice(2, MAKE_MESSID(22, 26), 2, 0);
if (GWPlayer[arg0].com != 0) {
BoardComKeySetLeft();
@ -226,7 +226,7 @@ s32 fn_1_9CF4(s32 arg0) {
BoardWinWait();
if (BoardWinChoiceGet() != 0) {
BoardWinCreate(2, 0x16001B, 2);
BoardWinCreate(2, MAKE_MESSID(22, 27), 2);
BoardWinWait();
BoardWinKill();
return 0;
@ -361,7 +361,7 @@ void fn_1_A44C(s32 arg0) {
}
temp_r29 = fn_1_BBC4() + 0x80000;
BoardWinCreate(2, 0x16001C, 2);
BoardWinCreate(2, MAKE_MESSID(22, 28), 2);
BoardWinInsertMesSet(temp_r29, 0);
BoardWinWait();
fn_1_B8E8(4);
@ -386,7 +386,7 @@ void fn_1_A44C(s32 arg0) {
}
HuPrcSleep(0x1E);
BoardWinCreate(2, 0x16001D, 2);
BoardWinCreate(2, MAKE_MESSID(22, 29), 2);
BoardWinWait();
BoardWinKill();
}

12
src/REL/w03Dll/river.c
View file

@ -176,12 +176,12 @@ s32 fn_1_6898(s32 arg0) {
}
BoardCameraTargetModelSet(-1);
BoardWinCreate(2, 0x160009, 2);
BoardWinCreate(2, MAKE_MESSID(22, 9), 2);
BoardWinWait();
temp_r3 = BoardPlayerCoinsGet(arg0);
if (temp_r3 < 5) {
BoardWinCreate(2, 0x16000A, 2);
BoardWinCreate(2, MAKE_MESSID(22, 10), 2);
BoardWinWait();
BoardWinKill();
return 0;
@ -202,7 +202,7 @@ s32 fn_1_6898(s32 arg0) {
j = 0;
while (j == 0) {
BoardWinCreateChoice(2, 0x16000B, 2, 0);
BoardWinCreateChoice(2, MAKE_MESSID(22, 11), 2, 0);
BoardWinInsertMesSet(lbl_1_bss_130, 2);
BoardWinAttrSet(0x10);
@ -219,7 +219,7 @@ s32 fn_1_6898(s32 arg0) {
break;
case 1:
case -1:
BoardWinCreate(2, 0x16000E, 2);
BoardWinCreate(2, MAKE_MESSID(22, 14), 2);
BoardWinWait();
BoardWinKill();
return 0;
@ -235,7 +235,7 @@ s32 fn_1_6898(s32 arg0) {
}
HuAudFXPlay(0xF);
BoardWinCreate(2, 0x0016000C, 2);
BoardWinCreate(2, MAKE_MESSID(22, 12), 2);
BoardWinWait();
BoardWinKill();
return 1;
@ -434,7 +434,7 @@ void fn_1_735C(s32 arg0) {
GWPlayer[arg0].space_curr = temp_r29;
GWPlayer[arg0].space_prev = -1;
BoardPlayerPostTurnHookSet(arg0, fn_1_6698);
BoardWinCreate(2, 0x16000D, 2);
BoardWinCreate(2, MAKE_MESSID(22, 13), 2);
BoardWinWait();
BoardWinKill();
}

18
src/REL/w03Dll/statue.c
View file

@ -88,7 +88,7 @@ void fn_1_1358(void) {
}
if (lbl_1_bss_2C) {
sprintf(lbl_1_bss_44, "%d", lbl_1_bss_2C);
BoardWinCreate(0, 0x160006, -1);
BoardWinCreate(0, MAKE_MESSID(22, 6), -1);
BoardWinInsertMesSet((s32)lbl_1_bss_44, 0);
BoardWinWait();
BoardWinKill();
@ -145,7 +145,7 @@ s32 fn_1_1650(s32 arg0) {
BoardPlayerIdleSet(arg0);
if (lbl_1_bss_0->unk2) {
BoardWinCreate(0, 0x160000, -1);
BoardWinCreate(0, MAKE_MESSID(22, 0), -1);
BoardWinWait();
BoardWinKill();
return 0;
@ -178,9 +178,9 @@ s32 fn_1_1650(s32 arg0) {
}
BoardPlayerIdleSet(arg0);
BoardWinCreate(2, 0x160001, 2);
BoardWinCreate(2, MAKE_MESSID(22, 1), 2);
BoardWinWait();
BoardWinCreateChoice(0, 0x160002, -1, 0);
BoardWinCreateChoice(0, MAKE_MESSID(22, 2), -1, 0);
BoardWinAttrSet(0x10);
if (GWPlayer[arg0].com) {
@ -338,7 +338,7 @@ s32 fn_1_1D1C(void) {
while (BoardMusStatusGet(1) != 0) {
HuPrcVSleep();
}
BoardWinCreate(2, 0x160003, 2);
BoardWinCreate(2, MAKE_MESSID(22, 3), 2);
BoardWinWait();
BoardWinKill();
@ -404,7 +404,7 @@ void fn_1_1ED4(s32 arg0) {
}
BoardAudSeqPause(0, 0, 1000);
BoardWinCreate(2, 0x160004, 2);
BoardWinCreate(2, MAKE_MESSID(22, 4), 2);
BoardWinWait();
BoardWinKill();
BoardConfettiStop();
@ -482,7 +482,7 @@ void fn_1_20E0(s32 arg0) {
}
BoardAudSeqPause(0, 0, 1000);
BoardWinCreate(2, 0x160005, 2);
BoardWinCreate(2, MAKE_MESSID(22, 5), 2);
BoardWinWait();
BoardCameraQuakeSet(0x8CA0, 100.0f);
omVibrate(arg0, 0xE10, 4, 2);
@ -588,7 +588,7 @@ s32 fn_1_2930(s32 arg0) {
lbl_1_bss_0->unk2 = 0;
lbl_1_bss_0->unk0 = 0;
fn_1_B5C(0);
BoardWinCreate(0, 0x160008, -1);
BoardWinCreate(0, MAKE_MESSID(22, 8), -1);
BoardWinWait();
BoardWinKill();
fn_1_CF4();
@ -596,7 +596,7 @@ s32 fn_1_2930(s32 arg0) {
}
sprintf(lbl_1_bss_38, "%d", lbl_1_bss_0->unk0);
BoardWinCreate(0, 0x160007, -1);
BoardWinCreate(0, MAKE_MESSID(22, 7), -1);
BoardWinInsertMesSet((s32)lbl_1_bss_38, 1);
BoardWinWait();
BoardWinKill();

231
src/REL/w05Dll/dolphin.c
View file

@ -149,7 +149,7 @@ void fn_1_4034(s32 arg0) {
BoardCameraViewSet(2);
BoardCameraMotionWait();
HuAudFXPlay(0x480);
BoardWinCreate(2, 0x270007, 0xA);
BoardWinCreate(2, MAKE_MESSID(39, 7), 0xA);
BoardWinWait();
BoardWinKill();
if (arg0 >= 4) {
@ -305,23 +305,24 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec* arg3) {
BoardModelPosGet(lbl_1_bss_64, &sp18);
temp_r30 = fn_1_66C0(4, &sp18);
temp_r29 = fn_1_66C0(5, &sp18);
loop_1:
var_f28 = sqrtf((arg3->x - sp3C.x) * (arg3->x - sp3C.x) + (arg3->z - sp3C.z) * (arg3->z - sp3C.z));
if (var_f28 <= temp_f23) {
sp3C.x = arg3->x;
sp3C.z = arg3->z;
BoardModelPosSetV(lbl_1_bss_64, &sp3C);
sp30 = sp3C;
sp30.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
} else {
PSVECAdd(&sp3C, &sp24, &sp3C);
BoardModelPosSetV(lbl_1_bss_64, &sp3C);
sp30 = sp3C;
sp30.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
HuPrcVSleep();
goto loop_1;
while (1) {
var_f28 = sqrtf((arg3->x - sp3C.x) * (arg3->x - sp3C.x) + (arg3->z - sp3C.z) * (arg3->z - sp3C.z));
if (var_f28 <= temp_f23) {
sp3C.x = arg3->x;
sp3C.z = arg3->z;
BoardModelPosSetV(lbl_1_bss_64, &sp3C);
sp30 = sp3C;
sp30.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
break;
} else {
PSVECAdd(&sp3C, &sp24, &sp3C);
BoardModelPosSetV(lbl_1_bss_64, &sp3C);
sp30 = sp3C;
sp30.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
HuPrcVSleep();
}
}
HuAudFXStop(temp_r28);
temp_r30->work[1] = 1;
@ -346,24 +347,26 @@ loop_1:
var_f24 = 0.0f;
temp_f19 = 15.0f;
loop_14:
sp24.y = temp_f19 - (0.075f * (0.25f * (var_f24 * var_f24)));
var_f24++;
PSVECAdd(&sp30, &sp24, &sp30);
var_f28 = sqrtf(((sp3C.x - sp30.x) * (sp3C.x - sp30.x)) + ((sp3C.z - sp30.z) * (sp3C.z - sp30.z)));
if (var_f28 < 5.0f) {
sp24.x = sp24.z = 0.0f;
sp30.x = sp3C.x;
sp30.z = sp3C.z;
}
if (sp30.y <= sp3C.y && sp24.y < 0.0f) {
sp30.y = sp3C.y;
} else {
while (1) {
sp24.y = temp_f19 - (0.075f * (0.25f * (var_f24 * var_f24)));
var_f24++;
PSVECAdd(&sp30, &sp24, &sp30);
var_f28 = sqrtf(((sp3C.x - sp30.x) * (sp3C.x - sp30.x)) + ((sp3C.z - sp30.z) * (sp3C.z - sp30.z)));
if (var_f28 < 5.0f) {
sp24.x = sp24.z = 0.0f;
sp30.x = sp3C.x;
sp30.z = sp3C.z;
}
if (sp30.y <= sp3C.y && sp24.y < 0.0f) {
sp30.y = sp3C.y;
} else {
BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
HuPrcVSleep();
continue;
}
BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
HuPrcVSleep();
goto loop_14;
break;
}
BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
}
void fn_1_5648(void) {
@ -375,17 +378,17 @@ void fn_1_5648(void) {
sp8.y = 0.003921569f * (360.0f * frand8());
BoardModelRotSetV(lbl_1_bss_6C[var_r31], &sp8);
}
loop_3:
for (var_r31 = 0; var_r31 < 3; var_r31++) {
BoardModelRotGet(lbl_1_bss_6C[var_r31], &sp8);
sp8.y += 10.0f;
if (sp8.y >= 360.0f) {
sp8.y -= 360.0f;
while (1) {
for (var_r31 = 0; var_r31 < 3; var_r31++) {
BoardModelRotGet(lbl_1_bss_6C[var_r31], &sp8);
sp8.y += 10.0f;
if (sp8.y >= 360.0f) {
sp8.y -= 360.0f;
}
BoardModelRotSetV(lbl_1_bss_6C[var_r31], &sp8);
}
BoardModelRotSetV(lbl_1_bss_6C[var_r31], &sp8);
HuPrcVSleep();
}
HuPrcVSleep();
goto loop_3;
}
void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
@ -440,62 +443,63 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
temp_r27 = fn_1_66C0(4, &sp1C);
temp_r25 = fn_1_66C0(5, &sp1C);
loop_4:
sp18 = BoardModelRotYGet(lbl_1_bss_64);
sp58 = sp64;
var_f27 = sqrtf(((arg2->x - sp58.x) * (arg2->x - sp58.x)) + ((arg2->z - sp58.z) * (arg2->z - sp58.z)));
if (var_f27 <= temp_f22) {
sp58.x = arg2->x;
sp58.z = arg2->z;
BoardModelPosSetV(lbl_1_bss_64, &sp58);
sp4C = sp58;
sp4C.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
} else {
PSVECAdd(&sp58, &sp40, &sp58);
sp64 = sp58;
if (var_r29 == 0) {
sp58.y += 250.0 * sin((M_PI * var_f28) / 180.0);
var_f28 -= 2.5f;
if (var_f28 < -540.0f) {
var_f28 = -540.0f;
}
if (var_r30 == 0) {
temp_r27->work[1] = 1;
temp_r25->work[1] = 1;
var_r30++;
} else if (var_r30 == 1 && var_f28 < -180.0f) {
HuAudFXStop(var_r28);
HuAudFXPlay(0x47D);
HuAudPlayerVoicePlay(lbl_1_bss_68, 0x125);
fn_1_66C0(3, &sp58);
var_r30++;
} else if ((var_r30 == 2) && (var_f28 < -360.0f)) {
var_r28 = HuAudFXPlay(0x47F);
HuAudFXPlay(0x481);
fn_1_66C0(3, &sp58);
var_r30++;
} else if ((var_r30 == 3) && (-540.0f == var_f28)) {
var_r30++;
BoardModelPosGet(lbl_1_bss_64, &sp1C);
var_r26 = fn_1_66C0(4, &sp1C);
var_r24 = fn_1_66C0(5, &sp1C);
}
while (1) {
sp18 = BoardModelRotYGet(lbl_1_bss_64);
sp58 = sp64;
var_f27 = sqrtf(((arg2->x - sp58.x) * (arg2->x - sp58.x)) + ((arg2->z - sp58.z) * (arg2->z - sp58.z)));
if (var_f27 <= temp_f22) {
sp58.x = arg2->x;
sp58.z = arg2->z;
BoardModelPosSetV(lbl_1_bss_64, &sp58);
sp4C = sp58;
sp4C.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
break;
} else {
var_r29--;
PSVECAdd(&sp58, &sp40, &sp58);
sp64 = sp58;
if (var_r29 == 0) {
sp58.y += 250.0 * sin((M_PI * var_f28) / 180.0);
var_f28 -= 2.5f;
if (var_f28 < -540.0f) {
var_f28 = -540.0f;
}
if (var_r30 == 0) {
temp_r27->work[1] = 1;
temp_r25->work[1] = 1;
var_r30++;
} else if (var_r30 == 1 && var_f28 < -180.0f) {
HuAudFXStop(var_r28);
HuAudFXPlay(0x47D);
HuAudPlayerVoicePlay(lbl_1_bss_68, 0x125);
fn_1_66C0(3, &sp58);
var_r30++;
} else if ((var_r30 == 2) && (var_f28 < -360.0f)) {
var_r28 = HuAudFXPlay(0x47F);
HuAudFXPlay(0x481);
fn_1_66C0(3, &sp58);
var_r30++;
} else if ((var_r30 == 3) && (-540.0f == var_f28)) {
var_r30++;
BoardModelPosGet(lbl_1_bss_64, &sp1C);
var_r26 = fn_1_66C0(4, &sp1C);
var_r24 = fn_1_66C0(5, &sp1C);
}
} else {
var_r29--;
}
BoardModelPosSetV(lbl_1_bss_64, &sp58);
sp28.x = sp34.x = (45.0 * -sin((M_PI * var_f28) / 180.0));
BoardModelRotSetV(lbl_1_bss_64, &sp34);
BoardPlayerRotSetV(lbl_1_bss_68, &sp28);
sp4C = sp58;
sp4C.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
fn_1_64BC();
BoardCameraTargetSet(sp58.x, -50.0f, sp58.z);
HuPrcVSleep();
}
BoardModelPosSetV(lbl_1_bss_64, &sp58);
sp28.x = sp34.x = (45.0 * -sin((M_PI * var_f28) / 180.0));
BoardModelRotSetV(lbl_1_bss_64, &sp34);
BoardPlayerRotSetV(lbl_1_bss_68, &sp28);
sp4C = sp58;
sp4C.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
fn_1_64BC();
BoardCameraTargetSet(sp58.x, -50.0f, sp58.z);
HuPrcVSleep();
goto loop_4;
}
HuAudFXStop(var_r28);
var_r26->work[1] = 1;
@ -519,22 +523,23 @@ loop_4:
BoardPlayerMotionStart(lbl_1_bss_68, 4, 0);
var_f23 = 0.0f;
temp_f18 = 15.0f;
loop_32:
sp40.y = temp_f18 - (0.075f * (0.25f * (var_f23 * var_f23)));
var_f23++;
PSVECAdd(&sp4C, &sp40, &sp4C);
var_f27 = sqrtf(((sp58.x - sp4C.x) * (sp58.x - sp4C.x)) + ((sp58.z - sp4C.z) * (sp58.z - sp4C.z)));
if (var_f27 < 5.0f) {
sp40.x = sp40.z = 0.0f;
sp4C.x = sp58.x;
sp4C.z = sp58.z;
}
if (sp4C.y <= sp58.y && sp40.y < 0.0f) {
sp4C.y = sp58.y;
} else {
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
HuPrcVSleep();
goto loop_32;
while (1) {
sp40.y = temp_f18 - (0.075f * (0.25f * (var_f23 * var_f23)));
var_f23++;
PSVECAdd(&sp4C, &sp40, &sp4C);
var_f27 = sqrtf(((sp58.x - sp4C.x) * (sp58.x - sp4C.x)) + ((sp58.z - sp4C.z) * (sp58.z - sp4C.z)));
if (var_f27 < 5.0f) {
sp40.x = sp40.z = 0.0f;
sp4C.x = sp58.x;
sp4C.z = sp58.z;
}
if (sp4C.y <= sp58.y && sp40.y < 0.0f) {
sp4C.y = sp58.y;
break;
} else {
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
HuPrcVSleep();
}
}
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
HuPrcKill(temp_r23);

12
src/REL/w05Dll/hotel.c
View file

@ -121,7 +121,7 @@ void fn_1_155C(void) {
BoardWinCreate(2, var_r27, 7);
BoardWinInsertMesSet(MAKE_MESSID_PTR(sp8), 1);
} else {
BoardWinCreate(2, 0x270003, 7);
BoardWinCreate(2, MAKE_MESSID(39, 3), 7);
BoardWinInsertMesSet(MAKE_MESSID_PTR(sp18), 0);
}
BoardWinWait();
@ -135,7 +135,7 @@ void fn_1_155C(void) {
HuAudFXPlay(0xF);
lbl_1_bss_0->unk_00 += var_r30;
sprintf(sp18, "%d", lbl_1_bss_0->unk_00);
BoardWinCreate(2, 0x270016, 7);
BoardWinCreate(2, MAKE_MESSID(39, 22), 7);
BoardWinInsertMesSet(MAKE_MESSID_PTR(sp18), 0);
BoardWinWait();
BoardWinKill();
@ -275,7 +275,7 @@ void fn_1_1E44(void) {
HuPrcVSleep();
}
if (lbl_1_bss_0->unk_00 == 0) {
BoardWinCreate(2, 0x270005, 7);
BoardWinCreate(2, MAKE_MESSID(39, 5), 7);
BoardWinWait();
BoardWinKill();
} else {
@ -299,9 +299,9 @@ void fn_1_1E44(void) {
sprintf(&sp84, "%d", lbl_1_bss_0->unk_00);
sprintf(&sp74, "%d", var_r28);
if (var_r28 == lbl_1_bss_0->unk_00) {
BoardWinCreate(2, 0x270004, 7);
BoardWinCreate(2, MAKE_MESSID(39, 4), 7);
} else {
BoardWinCreate(2, 0x270017, 7);
BoardWinCreate(2, MAKE_MESSID(39, 23), 7);
}
BoardWinInsertMesSet(MAKE_MESSID_PTR(sp84), 0);
BoardWinInsertMesSet(MAKE_MESSID_PTR(sp74), 1);
@ -369,7 +369,7 @@ void fn_1_1E44(void) {
}
BoardModelKill(temp_r3);
HuPadRumbleStop(GWPlayer[lbl_1_bss_28].port);
BoardWinCreate(0, 0x270006, -1);
BoardWinCreate(0, MAKE_MESSID(39, 6), -1);
BoardWinWait();
BoardWinKill();
HuPrcSleep(0x1E);

10
src/REL/w05Dll/main.c
View file

@ -233,7 +233,7 @@ void fn_1_954(void) {
temp_r30 = GWSystem.player_curr;
if (BoardPlayerItemCount(temp_r30) == 3) {
BoardWinCreate(2, 0x270009, 7);
BoardWinCreate(2, MAKE_MESSID(39, 9), 7);
BoardWinWait();
BoardWinKill();
HuPrcEnd();
@ -256,7 +256,7 @@ void fn_1_954(void) {
var_r31++;
}
fn_1_74D0(lbl_1_bss_8);
BoardWinCreateChoice(2, 0x27000A, 7, 0);
BoardWinCreateChoice(2, MAKE_MESSID(39, 10), 7, 0);
if (GWPlayer[temp_r30].com != 0) {
if (BoardComPreferItemCheck(temp_r30, lbl_1_bss_8[0], lbl_1_bss_8[1], lbl_1_bss_8[2]) != -1) {
BoardComKeySetLeft();
@ -271,7 +271,7 @@ void fn_1_954(void) {
while (((u32)fn_1_8884() & 0x10) == 0) {
HuPrcVSleep();
}
BoardWinCreate(2, 0x27000B, 7);
BoardWinCreate(2, MAKE_MESSID(39, 11), 7);
BoardWinWait();
BoardWinKill();
BoardMGExit();
@ -346,7 +346,7 @@ void fn_1_E40(void) {
temp_r31 = GWSystem.player_curr;
fn_1_96B4();
BoardWinCreateChoice(2, 0x27000F, 7, 0);
BoardWinCreateChoice(2, MAKE_MESSID(39, 15), 7, 0);
if (GWPlayer[temp_r31].com != 0) {
if (frandBool() != 0) {
BoardComKeySetLeft();
@ -359,7 +359,7 @@ void fn_1_E40(void) {
temp_r30 = BoardWinChoiceGet();
if ((temp_r30 == 1) || (temp_r30 == -1)) {
fn_1_9760();
BoardWinCreate(2, 0x270010, 7);
BoardWinCreate(2, MAKE_MESSID(39, 16), 7);
BoardWinWait();
BoardWinKill();
BoardMGExit();

70
src/REL/w05Dll/mg_coin.c
View file

@ -137,8 +137,7 @@ void fn_1_9C98(dataCopy2* arg0) {
void fn_1_9D0C(omObjData* arg0) {
Vec sp1C;
Vec sp10;
f32 spC;
f32 sp8;
f32 sp8[2];
s32 var_r30;
dataCopy2* temp_r31;
@ -147,8 +146,8 @@ void fn_1_9D0C(omObjData* arg0) {
temp_r31->unk_02 = 5;
temp_r31->unk_04 = 0x3C;
temp_r31->unk_00 = MGSeqCreate(1, temp_r31->unk_02, 0x120, 0x40);
HuWinMesMaxSizeGet(1, &sp8, 0x27000E);
temp_r31->unk_06 = HuWinCreate(-10000.0f, 368.0f, sp8, spC, 0);
HuWinMesMaxSizeGet(1, sp8, 0x27000E);
temp_r31->unk_06 = HuWinCreate(-10000.0f, 368.0f, sp8[0], sp8[1], 0);
HuWinMesSet(temp_r31->unk_06, 0x27000E);
HuWinBGTPLvlSet(temp_r31->unk_06, 0.0f);
HuWinMesSpeedSet(temp_r31->unk_06, 0);
@ -374,9 +373,9 @@ void fn_1_AB24(void) {
}
HuPrcSleep(0x1E);
lbl_1_bss_C6 = lbl_1_data_4B2[lbl_1_bss_C2];
BoardAudSeqPause(0, 0, 0x3E8);
BoardAudSeqPause(0, 0, 1000);
sprintf(&sp8, "%d", lbl_1_bss_C6);
BoardWinCreate(2, 0x270011, 7);
BoardWinCreate(2, MAKE_MESSID(39, 17), 7);
BoardWinInsertMesSet((u32)&sp8, 0);
BoardWinInsertMesSet(lbl_1_data_4B8[lbl_1_bss_C2], 1);
BoardWinWait();
@ -402,42 +401,43 @@ void fn_1_AB24(void) {
var_f31 = -1.0f;
var_r29 = 0;
loop_10:
for (var_r31 = 0; var_r31 < lbl_1_bss_C6; var_r31++) {
if (var_r31 >= var_r29) {
sp124[var_r31].y += var_f31;
BoardModelPosSetV(lbl_1_bss_D6[var_r31], &sp124[var_r31]);
sp34[var_r31].y += 45.0f;
if (sp34[var_r31].y >= 360.0f) {
sp34[var_r31].y -= 360.0f;
}
BoardModelRotSetV(lbl_1_bss_D6[var_r31], &sp34[var_r31]);
if (sp124[var_r31].y <= (80.0f + sp28.y)) {
sp10 = sp124[var_r31];
CharModelCoinEffectCreate(1, &sp10);
BoardModelVisibilitySet(lbl_1_bss_D6[var_r31], 0);
var_r29++;
BoardPlayerCoinsAdd(lbl_1_bss_C0, 1);
HuAudFXPlay(7);
omVibrate(lbl_1_bss_C0, 0xC, 6, 6);
while (1) {
for (var_r31 = 0; var_r31 < lbl_1_bss_C6; var_r31++) {
if (var_r31 >= var_r29) {
sp124[var_r31].y += var_f31;
BoardModelPosSetV(lbl_1_bss_D6[var_r31], &sp124[var_r31]);
sp34[var_r31].y += 45.0f;
if (sp34[var_r31].y >= 360.0f) {
sp34[var_r31].y -= 360.0f;
}
BoardModelRotSetV(lbl_1_bss_D6[var_r31], &sp34[var_r31]);
if (sp124[var_r31].y <= (80.0f + sp28.y)) {
sp10 = sp124[var_r31];
CharModelCoinEffectCreate(1, &sp10);
BoardModelVisibilitySet(lbl_1_bss_D6[var_r31], 0);
var_r29++;
BoardPlayerCoinsAdd(lbl_1_bss_C0, 1);
HuAudFXPlay(7);
omVibrate(lbl_1_bss_C0, 0xC, 6, 6);
}
}
}
}
var_f31 *= 1.05f;
if (var_f31 < -20.0f) {
var_f31 = -20.0f;
}
if (var_r29 == lbl_1_bss_C6) {
BoardPlayerMotionShiftSet(lbl_1_bss_C0, 7, 0.0f, 10.0f, 0);
} else {
HuPrcVSleep();
goto loop_10;
var_f31 *= 1.05f;
if (var_f31 < -20.0f) {
var_f31 = -20.0f;
}
if (var_r29 == lbl_1_bss_C6) {
BoardPlayerMotionShiftSet(lbl_1_bss_C0, 7, 0.0f, 10.0f, 0);
break;
} else {
HuPrcVSleep();
}
}
while (BoardPlayerMotionEndCheck(lbl_1_bss_C0) == 0) {
HuPrcVSleep();
}
BoardWinCreate(2, 0x270012, 7);
BoardWinCreate(2, MAKE_MESSID(39, 18), 7);
BoardWinWait();
BoardWinKill();
temp_r30->func = fn_1_B214;

142
src/REL/w05Dll/mg_item.c
View file

@ -306,7 +306,7 @@ void fn_1_799C(void) {
while (fn_1_1208(lbl_1_bss_14[6], 90.0f, 6.0f) == 0) {
HuPrcVSleep();
}
BoardWinCreate(2, 0x27000C, 7);
BoardWinCreate(2, MAKE_MESSID(39, 12), 7);
BoardWinInsertMesSet(lbl_1_bss_B0[temp_r31] + 0x80000, 0);
BoardWinWait();
BoardWinKill();
@ -349,7 +349,7 @@ void fn_1_799C(void) {
HuPrcVSleep();
}
BoardAudSeqPause(0, 0, 0x3E8);
BoardWinCreate(2, 0x27000D, 7);
BoardWinCreate(2, MAKE_MESSID(39, 13), 7);
BoardWinWait();
BoardWinKill();
temp_r30->func = &fn_1_7E4C;
@ -372,8 +372,7 @@ void fn_1_7E94(dataCopy* arg0) {
}
void fn_1_7F04(omObjData* arg0) {
f32 spC;
f32 sp8;
f32 sp8[2];
s32 var_r30;
s32 var_r28;
dataCopy* temp_r31;
@ -382,8 +381,8 @@ void fn_1_7F04(omObjData* arg0) {
temp_r31->unk_00 = 5;
temp_r31->unk_02 = 0x3C;
temp_r31->unk_04 = MGSeqCreate(1, temp_r31->unk_00, 0x120, 0x40);
HuWinMesMaxSizeGet(1, &sp8, 0x27000E);
temp_r31->unk_06 = HuWinCreate(-10000.0f, 344.0f, sp8, spC, 0);
HuWinMesMaxSizeGet(1, sp8, 0x27000E);
temp_r31->unk_06 = HuWinCreate(-10000.0f, 344.0f, sp8[0], sp8[1], 0);
HuWinMesSet(temp_r31->unk_06, 0x27000E);
HuWinBGTPLvlSet(temp_r31->unk_06, 0.0f);
HuWinMesSpeedSet(temp_r31->unk_06, 0);
@ -616,31 +615,33 @@ void fn_1_896C(void) {
sp8 = 0.0f;
var_f31 = 12.0f;
loop_20:
for (var_r28 = 0, var_r31 = 0; var_r31 < 3; var_r31++) {
var_r29 = (1 << var_r31);
if ((temp_r30 & var_r29) != 0) {
var_r28++;
sp8 += 0.1f;
if (sp8 > 1.0f) {
sp8 = 1.0f;
}
while (1) {
for (var_r28 = 0, var_r31 = 0; var_r31 < 3; var_r31++) {
var_r29 = (1 << var_r31);
if ((temp_r30 & var_r29) != 0) {
var_r28++;
sp8 += 0.1f;
if (sp8 > 1.0f) {
sp8 = 1.0f;
}
spC.x = spC.y = spC.z = sp8;
BoardModelScaleSetV(lbl_1_bss_A4[var_r31], (Vec* ) &sp8); //!
BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
sp18.y += var_f31;
if (sp18.y >= temp_f29) {
sp18.y = temp_f29;
var_r28 -= 1;
spC.x = spC.y = spC.z = sp8;
BoardModelScaleSetV(lbl_1_bss_A4[var_r31], (Vec* ) &sp8); //!
BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
sp18.y += var_f31;
if (sp18.y >= temp_f29) {
sp18.y = temp_f29;
var_r28 -= 1;
}
BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
}
BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
}
}
var_f31 *= 0.95f;
if (var_r28 > 0) {
HuPrcVSleep();
goto loop_20;
var_f31 *= 0.95f;
if (var_r28 > 0) {
HuPrcVSleep();
} else {
break;
}
}
spC.x = spC.y = spC.z = 1.0f;
for (var_r31 = 0; var_r31 < 3; var_r31++) {
@ -653,56 +654,59 @@ loop_20:
HuPrcCurrentGet()->user_data = (void*)temp_r30;
var_f30 = 0.0f;
loop_37:
temp_r30 = (u32) HuPrcCurrentGet()->user_data;
if ((temp_r30 & 8) == 0) {
for (var_r31 = 0; var_r31 < 3; var_r31++) {
var_r29 = (1 << var_r31);
if ((temp_r30 & var_r29) != 0) {
BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
sp18.y = (sp18.y + (0.25 * sin((M_PI * var_f30) / 180.0)));
BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
while (1) {
temp_r30 = (u32) HuPrcCurrentGet()->user_data;
if ((temp_r30 & 8) == 0) {
for (var_r31 = 0; var_r31 < 3; var_r31++) {
var_r29 = (1 << var_r31);
if ((temp_r30 & var_r29) != 0) {
BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
sp18.y = (sp18.y + (0.25 * sin((M_PI * var_f30) / 180.0)));
BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
}
}
var_f30 += 5.0f;
if (var_f30 >= 360.0f) {
var_f30 -= 360.0f;
}
HuPrcVSleep();
} else {
break;
}
var_f30 += 5.0f;
if (var_f30 >= 360.0f) {
var_f30 -= 360.0f;
}
HuPrcVSleep();
goto loop_37;
}
for (var_r31 = 0; var_r31 < 3; var_r31++) {
BoardModelMotionStartEndSet(lbl_1_bss_AA[var_r31], 0x28, 0x46);
}
HuPrcSleep(0xD);
HuPrcSleep(13);
var_f31 = -8.0f;
loop_50:
for (var_r28 = 0, var_r31 = 0; var_r31 < 3; var_r31++) {
var_r29 = (1 << var_r31);
if ((temp_r30 & var_r29) != 0) {
var_r28++;
sp8 -= 0.02f;
if (sp8 < 0.0f) {
sp8 = 0.0f;
while (1) {
for (var_r28 = 0, var_r31 = 0; var_r31 < 3; var_r31++) {
var_r29 = (1 << var_r31);
if ((temp_r30 & var_r29) != 0) {
var_r28++;
sp8 -= 0.02f;
if (sp8 < 0.0f) {
sp8 = 0.0f;
}
spC.x = spC.y = spC.z = sp8;
BoardModelScaleSetV(lbl_1_bss_A4[var_r31], (Vec* ) &sp8); //!
BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
sp18.y += var_f31;
if (sp18.y <= (temp_f29 - 150.0f)) {
sp18.y = temp_f29 - 150.0f;
}
if (BoardModelMotionTimeGet(lbl_1_bss_AA[var_r31]) >= 70.0f) {
var_r28--;
}
BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
}
spC.x = spC.y = spC.z = sp8;
BoardModelScaleSetV(lbl_1_bss_A4[var_r31], (Vec* ) &sp8); //!
BoardModelPosGet(lbl_1_bss_A4[var_r31], &sp18);
sp18.y += var_f31;
if (sp18.y <= (temp_f29 - 150.0f)) {
sp18.y = temp_f29 - 150.0f;
}
if (BoardModelMotionTimeGet(lbl_1_bss_AA[var_r31]) >= 70.0f) {
var_r28--;
}
BoardModelPosSetV(lbl_1_bss_A4[var_r31], &sp18);
}
}
var_f31 *= 0.98f;
if (var_r28 > 0) {
HuPrcVSleep();
goto loop_50;
var_f31 *= 0.98f;
if (var_r28 > 0) {
HuPrcVSleep();
} else {
break;
}
}
for (var_r31 = 0; var_r31 < 3; var_r31++) {

8
src/REL/w05Dll/monkey.c
View file

@ -70,7 +70,7 @@ void fn_1_2C7C(s32 arg0) {
BoardCameraRotSet(-33.0f, 0.0f);
BoardCameraMotionWait();
HuAudFXPlay(0x48A);
BoardWinCreate(0, 0x270018, -1);
BoardWinCreate(0, MAKE_MESSID(39, 24), -1);
BoardWinWait();
BoardWinKill();
fn_1_3044();
@ -167,8 +167,8 @@ void fn_1_3430(void) {
}
void fn_1_3514(void) {
Vec sp2C; /* compiler-managed */
Vec sp20; /* compiler-managed */
Vec sp2C;
Vec sp20;
Vec sp14;
Vec sp8;
f32 var_f29;
@ -308,7 +308,7 @@ void fn_1_3D88(void) {
HuAudFXPlay(0x48B);
HuPrcChildCreate(fn_1_3E8C, 0x2001U, 0x1000U, 0, boardMainProc);
BoardPlayerIdleSet(lbl_1_bss_4C);
BoardWinCreate(0, 0x270019, -1);
BoardWinCreate(0, MAKE_MESSID(39, 25), -1);
BoardWinWait();
BoardWinKill();
}

5
src/game/board/audio.c
View file

@ -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:

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

12
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++) {
@ -156,7 +156,7 @@ static void BlockProc(void) {
SetBlockStop();
}
BoardWinCreate(0, work->contains_star != 0 ? 0x10001 : 0x10002, -1);
BoardWinCreate(0, work->contains_star != 0 ? MAKE_MESSID(1, 1) : MAKE_MESSID(1, 2), -1);
BoardWinWait();
BoardWinKill();
KillCoinMdl();
@ -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);
}

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

@ -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);
@ -149,13 +149,13 @@ static void ExecBooHouse(void) {
var_r30 = GWPlayer[currPlayer].space_curr;
BoardPlayerIdleSet(currPlayer);
if (BoardPlayerCoinsGet(currPlayer) < 5) {
BoardWinCreate(0, 0x70001, -1);
BoardWinCreate(0, MAKE_MESSID(7, 1), -1);
BoardWinWait();
BoardWinKill();
BoardDataAsyncWait(var_r28);
HuPrcEnd();
}
BoardWinCreateChoice(0, 0x70000, -1, 0);
BoardWinCreateChoice(0, MAKE_MESSID(7, 0), -1, 0);
if (GWPlayer[currPlayer].com != 0) {
if (BoardBooComUseCheck(currPlayer) != 0) {
BoardComKeySetLeft();
@ -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);
@ -645,7 +645,7 @@ void ApplyStarSteal(void) {
s32 temp_r31;
HuAudFXPlay(0x4C);
BoardWinCreate(2, 0x7000A, 3);
BoardWinCreate(2, MAKE_MESSID(7, 10), 3);
BoardWinWait();
BoardWinKill();
BoardStatusShowSetForce(currPlayer);
@ -670,7 +670,7 @@ void ApplyStarSteal(void) {
}
void ApplyBooLight(void) {
BoardWinCreate(2, 0x7000B, 3);
BoardWinCreate(2, MAKE_MESSID(7, 11), 3);
BoardWinWait();
BoardWinKill();
BoardPlayerMotionShiftSet(currPlayer, 8, 0.0f, 8.0f, 0);

47
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);
@ -150,19 +150,23 @@ typedef struct bowser_event_work {
static void ExecBowser(void)
{
#define BOWSER_EVENT 0
#define MINI_BOWSER_EVENT 1
s32 i;
s32 status;
if(!_CheckFlag(0x10003)) {
if(!_CheckFlag(FLAG_ID_MAKE(1, 3))) {
HuAudFXPlay(841);
omVibrate(eventPlayer, 12, 4, 2);
if(GWBoardGet() == 5 && boardBowserHook) {
if(GWBoardGet() == BOARD_ID_MAIN6 && boardBowserHook) {
boardBowserHook(1);
}
BoardAudSeqPause(0, 1, 1000);
//20% of bowser, 80% chance of koopa kid
if(BoardRandMod(100) < 20) {
eventType = 0;
eventType = BOWSER_EVENT;
} else {
eventType = 1;
eventType = MINI_BOWSER_EVENT;
}
} else {
BoardMusStart(1, 6, 127, 0);
@ -170,7 +174,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();
@ -197,7 +201,7 @@ static void ExecBowser(void)
BoardPlayerIdleSet(i);
}
BoardCameraMotionWait();
if(GWBoardGet() == 5 && boardBowserHook) {
if(GWBoardGet() == BOARD_ID_MAIN6 && boardBowserHook) {
boardBowserHook(0);
} else {
HuPrcSleep(30);
@ -240,7 +244,7 @@ static void ExecBowserMain(void)
BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, 0);
HuPrcSleep(8);
HuAudFXPlay(58);
BoardWinCreate(2, 0x3000B, 5);
BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
BoardWinWait();
BoardWinKill();
BoardAudSeqFadeOut(1, 1000);
@ -287,7 +291,7 @@ static void ExecMGReturn(void)
BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, 0);
HuPrcSleep(8);
HuAudFXPlay(58);
BoardWinCreate(2, 0x3000B, 5);
BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
BoardWinWait();
BoardWinKill();
while(!BoardStatusStopCheck(0)) {
@ -318,7 +322,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;
@ -349,7 +353,7 @@ static void ExecBowserSpecial(void)
HuAudFXPlay(58);
BoardMusStart(1, 6, 127, 0);
HuPrcSleep(120);
BoardWinCreate(2, 0x30007, 5);
BoardWinCreate(2, MAKE_MESSID(3, 7), 5);
BoardWinWait();
BoardWinKill();
HuAudFXPlay(857);
@ -412,7 +416,7 @@ static void ExecBowserGame(void)
for(i=0; i<4; i++) {
BoardPlayerPosGet(i, &playerPosTemp[i]);
}
BoardWinCreate(2, 0x30008, 5);
BoardWinCreate(2, MAKE_MESSID(3, 8), 5);
BoardWinWait();
mess = messLoss[GWSystem.bowser_loss];
BoardWinCreate(2, mess, 5);
@ -524,7 +528,7 @@ static void ExecBowserShuffle(void)
s32 player;
s32 player_new;
s32 reset_cam;
BoardWinCreate(2, 0x30010, 5);
BoardWinCreate(2, MAKE_MESSID(3, 16), 5);
BoardWinWait();
BoardWinKill();
for(i=0; i<4; i++) {
@ -585,7 +589,7 @@ static void ExecBowserRevo(void)
{
s32 i;
s32 coin;
BoardWinCreate(2, 0x30011, 5);
BoardWinCreate(2, MAKE_MESSID(3, 17), 5);
BoardWinWait();
BoardWinKill();
for(coin=i=0; i<4; i++) {
@ -619,7 +623,7 @@ static void ExecBowserRevo(void)
static void ExecBowserSuit(void)
{
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, 0);
BoardWinCreate(2, 0x30012, 5);
BoardWinCreate(2, MAKE_MESSID(3, 18), 5);
BoardWinWait();
HuAudFXPlay(857);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, 0);
@ -765,7 +769,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 +782,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 +889,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;
@ -1441,19 +1445,20 @@ static s32 ExecMiniBowserEvent(void)
BoardAudSeqFadeOutFast(1);
BoardMusStart(1, 11, 127, 0);
HuAudFXPlay(62);
BoardWinCreate(2, 0x30000, 6);
BoardWinCreate(2, MAKE_MESSID(3, 0), 6);
BoardWinWait();
if(BoardRandMod(100) < 70) {
MiniBowserTake();
} else {
MiniBowserTakeAll();
}
//5% chance bowser will appear after baby bowser
if(BoardRandMod(100) < 5) {
doneF = 1;
}
if(doneF) {
HuPrcSleep(60);
BoardWinCreate(2, 0x30006, 6);
BoardWinCreate(2, MAKE_MESSID(3, 6), 6);
BoardWinWait();
BoardWinKill();
HuAudFXPlay(62);
@ -1461,7 +1466,7 @@ static s32 ExecMiniBowserEvent(void)
HuPrcSleep(60);
} else {
HuAudFXPlay(62);
BoardWinCreate(2, 0x30002, 6);
BoardWinCreate(2, MAKE_MESSID(3, 2), 6);
BoardWinWait();
BoardWinKill();
BoardAudSeqFadeOut(1, 1000);

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

@ -8,6 +8,7 @@
#include "game/board/tutorial.h"
#include "game/board/window.h"
#include "game/board/boo.h"
#include "game/chrman.h"
#include "ext_math.h"
@ -29,15 +30,136 @@ static BOOL CheckLampUse(s32 player, s32 item);
static s8 itemUse = -1;
static s8 comItemPreferTbl[8][12] = {
{ 0x0C, 0x0B, 0x05, 0x03, 0x01, 0x02, 0x06, 0x04, 0x00, 0x07, 0x09, 0x0A },
{ 0x0C, 0x0B, 0x05, 0x0A, 0x03, 0x01, 0x02, 0x00, 0x06, 0x04, 0x07, 0x09 },
{ 0x0C, 0x0B, 0x05, 0x06, 0x03, 0x01, 0x02, 0x0A, 0x07, 0x09, 0x00, 0x04 },
{ 0x0C, 0x05, 0x0B, 0x09, 0x03, 0x01, 0x02, 0x06, 0x00, 0x04, 0x0A, 0x07 },
{ 0x0C, 0x0B, 0x04, 0x09, 0x0A, 0x03, 0x01, 0x05, 0x02, 0x06, 0x00, 0x07 },
{ 0x0C, 0x0B, 0x05, 0x03, 0x01, 0x0A, 0x06, 0x02, 0x00, 0x04, 0x09, 0x07 },
{ 0x0C, 0x05, 0x0B, 0x04, 0x07, 0x09, 0x03, 0x01, 0x0A, 0x06, 0x02, 0x00 },
{ 0x0C, 0x05, 0x07, 0x0B, 0x0A, 0x09, 0x04, 0x06, 0x03, 0x01, 0x02, 0x00 }
#define BOARD_ITEM_MINI_MUSHROOM 0
#define BOARD_ITEM_MEGA_MUSHROOM 1
#define BOARD_ITEM_SUPER_MINI_MUSHROOM 2
#define BOARD_ITEM_SUPER_MEGA_MUSHROOM 3
#define BOARD_ITEM_MINI_MEGA_HAMMER 4
#define BOARD_ITEM_WARP_PIPE 5
#define BOARD_ITEM_SWAP_CARD 6
#define BOARD_ITEM_SPARKY_STICKER 7
#define BOARD_ITEM_GADDLIGHT 8
#define BOARD_ITEM_CHOMP_CALL 9
#define BOARD_ITEM_BOWSER_SUIT 10
#define BOARD_ITEM_BOOS_CRYSTAL_BALL 11
#define BOARD_ITEM_MAGIC_LAMP 12
#define SHOP_ITEMS_END BOARD_ITEM_MAGIC_LAMP
#define BOARD_ITEM_ITEM_BAG 13
#define BOARD_ITEMS_END BOARD_ITEM_ITEM_BAG
static s8 comItemPreferTbl[GW_CHARACTER_MAX][SHOP_ITEMS_END] = {
{ //Mario
BOARD_ITEM_MAGIC_LAMP,
BOARD_ITEM_BOOS_CRYSTAL_BALL,
BOARD_ITEM_WARP_PIPE,
BOARD_ITEM_SUPER_MEGA_MUSHROOM,
BOARD_ITEM_MEGA_MUSHROOM,
BOARD_ITEM_SUPER_MINI_MUSHROOM,
BOARD_ITEM_SWAP_CARD,
BOARD_ITEM_MINI_MEGA_HAMMER,
BOARD_ITEM_MINI_MUSHROOM,
BOARD_ITEM_SPARKY_STICKER,
BOARD_ITEM_CHOMP_CALL,
BOARD_ITEM_BOWSER_SUIT
},
{ //Luigi
BOARD_ITEM_MAGIC_LAMP,
BOARD_ITEM_BOOS_CRYSTAL_BALL,
BOARD_ITEM_WARP_PIPE,
BOARD_ITEM_BOWSER_SUIT,
BOARD_ITEM_SUPER_MEGA_MUSHROOM,
BOARD_ITEM_MEGA_MUSHROOM,
BOARD_ITEM_SUPER_MINI_MUSHROOM,
BOARD_ITEM_MINI_MUSHROOM,
BOARD_ITEM_SWAP_CARD,
BOARD_ITEM_MINI_MEGA_HAMMER,
BOARD_ITEM_SPARKY_STICKER,
BOARD_ITEM_CHOMP_CALL
},
{ //Peach
BOARD_ITEM_MAGIC_LAMP,
BOARD_ITEM_BOOS_CRYSTAL_BALL,
BOARD_ITEM_WARP_PIPE,
BOARD_ITEM_SWAP_CARD,
BOARD_ITEM_SUPER_MEGA_MUSHROOM,
BOARD_ITEM_MEGA_MUSHROOM,
BOARD_ITEM_SUPER_MINI_MUSHROOM,
BOARD_ITEM_BOWSER_SUIT,
BOARD_ITEM_SPARKY_STICKER,
BOARD_ITEM_CHOMP_CALL,
BOARD_ITEM_MINI_MUSHROOM,
BOARD_ITEM_MINI_MEGA_HAMMER
},
{ //Yoshi
BOARD_ITEM_MAGIC_LAMP,
BOARD_ITEM_WARP_PIPE,
BOARD_ITEM_BOOS_CRYSTAL_BALL,
BOARD_ITEM_CHOMP_CALL,
BOARD_ITEM_SUPER_MEGA_MUSHROOM,
BOARD_ITEM_MEGA_MUSHROOM,
BOARD_ITEM_SUPER_MINI_MUSHROOM,
BOARD_ITEM_SWAP_CARD,
BOARD_ITEM_MINI_MUSHROOM,
BOARD_ITEM_MINI_MEGA_HAMMER,
BOARD_ITEM_BOWSER_SUIT,
BOARD_ITEM_SPARKY_STICKER
},
{ //Wario
BOARD_ITEM_MAGIC_LAMP,
BOARD_ITEM_BOOS_CRYSTAL_BALL,
BOARD_ITEM_MINI_MEGA_HAMMER,
BOARD_ITEM_CHOMP_CALL,
BOARD_ITEM_BOWSER_SUIT,
BOARD_ITEM_SUPER_MEGA_MUSHROOM,
BOARD_ITEM_MEGA_MUSHROOM,
BOARD_ITEM_WARP_PIPE,
BOARD_ITEM_SUPER_MINI_MUSHROOM,
BOARD_ITEM_SWAP_CARD,
BOARD_ITEM_MINI_MUSHROOM,
BOARD_ITEM_SPARKY_STICKER
},
{ //DK
BOARD_ITEM_MAGIC_LAMP,
BOARD_ITEM_BOOS_CRYSTAL_BALL,
BOARD_ITEM_WARP_PIPE,
BOARD_ITEM_SUPER_MEGA_MUSHROOM,
BOARD_ITEM_MEGA_MUSHROOM,
BOARD_ITEM_BOWSER_SUIT,
BOARD_ITEM_SWAP_CARD,
BOARD_ITEM_SUPER_MINI_MUSHROOM,
BOARD_ITEM_MINI_MUSHROOM,
BOARD_ITEM_MINI_MEGA_HAMMER,
BOARD_ITEM_CHOMP_CALL,
BOARD_ITEM_SPARKY_STICKER
},
{ //Daisy
BOARD_ITEM_MAGIC_LAMP,
BOARD_ITEM_WARP_PIPE,
BOARD_ITEM_BOOS_CRYSTAL_BALL,
BOARD_ITEM_MINI_MEGA_HAMMER,
BOARD_ITEM_SPARKY_STICKER,
BOARD_ITEM_CHOMP_CALL,
BOARD_ITEM_SUPER_MEGA_MUSHROOM,
BOARD_ITEM_MEGA_MUSHROOM,
BOARD_ITEM_BOWSER_SUIT,
BOARD_ITEM_SWAP_CARD,
BOARD_ITEM_SUPER_MINI_MUSHROOM,
BOARD_ITEM_MINI_MUSHROOM
},
{ //Waluigi
BOARD_ITEM_MAGIC_LAMP,
BOARD_ITEM_WARP_PIPE,
BOARD_ITEM_SPARKY_STICKER,
BOARD_ITEM_BOOS_CRYSTAL_BALL,
BOARD_ITEM_BOWSER_SUIT,
BOARD_ITEM_CHOMP_CALL,
BOARD_ITEM_MINI_MEGA_HAMMER,
BOARD_ITEM_SWAP_CARD,
BOARD_ITEM_SUPER_MEGA_MUSHROOM,
BOARD_ITEM_MEGA_MUSHROOM,
BOARD_ITEM_SUPER_MINI_MUSHROOM,
BOARD_ITEM_MINI_MUSHROOM
}
};
static UseCheckFunc comItemUseCheckFuncTbl[] = {
@ -131,9 +253,9 @@ s8 BoardComPreferItemGet(s32 player, s8 *items, s8 num_items) {
weight = 100;
for (i = 0; i < num_items; i++) {
item = items[i];
for (j = 0; j < 12; j++) {
for (j = 0; j < SHOP_ITEMS_END; j++) {
if (item == comItemPreferTbl[character][j]) {
if (j < weight && (BoardPlayerItemFind(player, item) == -1 || item == 0xC || item == 0xB)) {
if (j < weight && (BoardPlayerItemFind(player, item) == -1 || item == BOARD_ITEM_MAGIC_LAMP || item == BOARD_ITEM_BOOS_CRYSTAL_BALL)) {
weight = j;
prefer = i;
}
@ -162,7 +284,7 @@ s32 BoardComItemWeightGet(s32 player, s32 item) {
s32 weight;
s32 i;
for (i = 0; i < 12; i++) {
for (i = 0; i < SHOP_ITEMS_END; i++) {
if (item == comItemPreferTbl[GWPlayer[player].character][i]) {
break;
}
@ -230,7 +352,7 @@ static s32 ChooseUseItem(s32 player) {
useItem = -1;
character = GWPlayer[player].character;
weight = 0x64;
weight = 100;
for (i = 0; i < 3; i++) {
item = GWPlayer[player].items[i];
if (item == -1) {
@ -242,7 +364,7 @@ static s32 ChooseUseItem(s32 player) {
}
result = func(player, item);
if (result) {
for (j = 0; j < 0xC; j++) {
for (j = 0; j < SHOP_ITEMS_END; j++) {
if (item == comItemPreferTbl[character][j]) {
if (j < weight) {
weight = j;
@ -252,7 +374,7 @@ static s32 ChooseUseItem(s32 player) {
}
}
}
if (weight == 0x64) {
if (weight == 100) {
return -1;
}
useItem = comItemPreferTbl[character][weight];
@ -295,13 +417,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 +441,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 +477,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 +490,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 +580,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 {
@ -661,7 +783,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 {

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

@ -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 {

26
src/game/board/lottery.c
View file

@ -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;

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

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

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;

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

@ -92,17 +92,17 @@ 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;
}
if ((GWSystem.max_turn - GWSystem.turn) == 0) {
BoardWinCreate(0, 0x50003U, -1);
BoardWinCreate(0, MAKE_MESSID(5, 3), -1);
BoardWinWait();
BoardWinKill();
} else if (BoardPlayerItemCount(curPlayer) == 3) {
BoardWinCreate(0, 0x50000U, -1);
BoardWinCreate(0, MAKE_MESSID(5, 0), -1);
BoardWinWait();
BoardWinKill();
} else {
@ -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) {
@ -385,10 +385,10 @@ 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) {
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();

32
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() == 5))) {
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;
@ -2420,7 +2420,7 @@ static s32 DoSparkSpace(s32 player, s32 pause_cam)
static void RemoveSparkSpace(s32 player)
{
if(GWPlayer[player].spark) {
BoardWinCreate(0, 0x12001C, -1);
BoardWinCreate(0, MAKE_MESSID(18, 28), -1);
BoardWinWait();
BoardWinKill();
GWPlayer[player].spark = 0;
@ -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);

18
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() == 5 && *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) {
@ -871,7 +871,7 @@ static void SameRollExec(void) {
HuPrcVSleep();
}
BoardAudSeqPause(0, 0, 0x3E8);
BoardWinCreate(0, 0x90000, -1);
BoardWinCreate(0, MAKE_MESSID(9, 0), -1);
BoardWinInsertMesSet(sameRollCoinStr, 0);
BoardWinWait();
BoardWinKill();
@ -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)) {

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

@ -248,7 +248,7 @@ static void ExecShop(void) {
BoardWinKill();
HuPrcEnd();
}
BoardWinCreateChoice(0, 0xF0000, -1, 0);
BoardWinCreateChoice(0, MAKE_MESSID(15, 0), -1, 0);
DecideComEnter(shopPlayer);
BoardWinWait();
if (BoardWinChoiceGet() != 0) {
@ -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;

50
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(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;
}
@ -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;
}
@ -623,7 +633,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 +690,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 +1069,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);

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

@ -144,10 +144,10 @@ 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)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 1))) {
BoardSpaceHostSet(boardSpaceStarTbl[GWSystem.star_pos]);
}
}
@ -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) {
@ -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();
@ -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;
@ -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);
@ -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();
@ -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);
@ -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);
@ -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) {

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

@ -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++) {
@ -152,12 +152,12 @@ 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();
if ((GWBoardGet() == 2 || GWBoardGet() == 5) && boardLightSetHook) {
if ((GWBoardGet() == BOARD_ID_MAIN3 || GWBoardGet() == BOARD_ID_MAIN6) && boardLightSetHook) {
boardLightSetHook();
}
BoardCameraMotionWait();
@ -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);
@ -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) {
@ -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,12 +714,12 @@ 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();
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;
@ -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;

8
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);
}
@ -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) {

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

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

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

@ -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) {

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) {