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