Applied DATA_MAKE_NUM and MAKE_MESSID macros
This commit is contained in:
kabiskac
parent
c1c506360c
commit
a0ebc7588d
116 changed files with 38174 additions and 37156 deletions
|
|
@ -1,15 +1,15 @@
|
|||
#include "REL/w05Dll.h"
|
||||
|
||||
#include "game/hsfdraw.h"
|
||||
#include "game/audio.h"
|
||||
#include "game/objsub.h"
|
||||
#include "game/frand.h"
|
||||
#include "game/chrman.h"
|
||||
#include "game/frand.h"
|
||||
#include "game/hsfdraw.h"
|
||||
#include "game/objsub.h"
|
||||
|
||||
#include "game/board/audio.h"
|
||||
#include "game/board/model.h"
|
||||
#include "game/board/player.h"
|
||||
#include "game/board/window.h"
|
||||
#include "game/board/audio.h"
|
||||
|
||||
// bss
|
||||
s16 lbl_1_bss_72[2];
|
||||
|
|
@ -20,44 +20,60 @@ s16 lbl_1_bss_58[6];
|
|||
|
||||
// data
|
||||
char *lbl_1_data_22C[6] = { "orange1", "orange2", "pine2", "pine1", "suika1", "suika2" };
|
||||
s32 lbl_1_data_244[6] = { 0x00790027, 0x00790028, 0x00790029, 0x0079002A, 0x0079002B, 0xFFFFFFFF };
|
||||
s32 lbl_1_data_244[6] = {
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x27),
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x28),
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x29),
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x2A),
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x2B),
|
||||
DATA_NUM_LISTEND,
|
||||
};
|
||||
Vec lbl_1_data_25C[6] = {
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 90.0f, 0.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 180.0f, 0.0f },
|
||||
{ 0.0f, 270.0f, 0.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 180.0f, 0.0f },
|
||||
{ 0.0f, 270.0f, 0.0f },
|
||||
{ 0.0f, 90.0f, 0.0f },
|
||||
};
|
||||
Vec lbl_1_data_2A4[6] = {
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 300.0f, 0.0f },
|
||||
{ 0.0f, 450.0f, 0.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 300.0f, 0.0f },
|
||||
{ 0.0f, 450.0f, 0.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
};
|
||||
s32 lbl_1_data_2EC[2] = { 0x76, 0x77 };
|
||||
s32 lbl_1_data_2F4[6] = { 0x0079002C, 0x0079002D, 0x0079002E, 0x0079002C, 0x0079002F, 0x00790030 };
|
||||
s32 lbl_1_data_2F4[6] = {
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x2C),
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x2D),
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x2E),
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x2C),
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x2F),
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x30),
|
||||
};
|
||||
|
||||
void fn_1_3F74(void) {
|
||||
void fn_1_3F74(void)
|
||||
{
|
||||
s32 var_r31;
|
||||
|
||||
BoardAudSeqPause(0, 1, 0x3E8);
|
||||
|
||||
|
||||
for (var_r31 = 0x3C; var_r31 != 0; var_r31--) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
||||
|
||||
BoardMusStart(1, 0x24, 0x7F, 0);
|
||||
HuPrcEnd();
|
||||
}
|
||||
|
||||
void fn_1_3FD8(void) {
|
||||
void fn_1_3FD8(void)
|
||||
{
|
||||
s32 var_r31;
|
||||
|
||||
BoardAudSeqFadeOut(1, 0x3E8);
|
||||
|
||||
|
||||
for (var_r31 = 0x3C; var_r31 != 0; var_r31--) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -65,7 +81,8 @@ void fn_1_3FD8(void) {
|
|||
HuPrcEnd();
|
||||
}
|
||||
|
||||
void fn_1_4034(s32 arg0) {
|
||||
void fn_1_4034(s32 arg0)
|
||||
{
|
||||
Vec sp40;
|
||||
Vec sp34;
|
||||
Vec sp28;
|
||||
|
|
@ -79,20 +96,20 @@ void fn_1_4034(s32 arg0) {
|
|||
s16 var_r30;
|
||||
s32 var_r27;
|
||||
BoardSpace *var_r25;
|
||||
omObjData* temp_r24;
|
||||
omObjData *temp_r24;
|
||||
BoardSpace *var_r28;
|
||||
s32 var_r31;
|
||||
s32 temp_r26;
|
||||
|
||||
lbl_1_bss_68 = GWSystem.player_curr;
|
||||
sp10 = GWPlayer[lbl_1_bss_68].character;
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < 2; var_r31++) {
|
||||
lbl_1_bss_72[var_r31] = BoardPlayerMotionCreate(lbl_1_bss_68, lbl_1_data_2EC[var_r31] | lbl_1_data_124[GWPlayer[lbl_1_bss_68].character]);
|
||||
}
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
lbl_1_bss_6C[var_r31] = BoardModelCreate(0x7000A, NULL, 1);
|
||||
lbl_1_bss_6C[var_r31] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 0x0A), NULL, 1);
|
||||
BoardModelAttrSet(lbl_1_bss_6C[var_r31], 0x40000001);
|
||||
BoardModelVisibilitySet(lbl_1_bss_6C[var_r31], 0);
|
||||
}
|
||||
|
|
@ -118,7 +135,7 @@ void fn_1_4034(s32 arg0) {
|
|||
}
|
||||
BoardPlayerIdleSet(lbl_1_bss_68);
|
||||
HuPrcSleep(8);
|
||||
lbl_1_bss_64 = BoardModelCreate(0x790026, lbl_1_data_244, 0);
|
||||
lbl_1_bss_64 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x26), lbl_1_data_244, 0);
|
||||
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_data_118), lbl_1_data_22C[arg0], &sp40);
|
||||
PSVECAdd(&sp40, &lbl_1_data_2A4[arg0], &sp40);
|
||||
BoardModelMotionStart(lbl_1_bss_64, 4, 0);
|
||||
|
|
@ -126,7 +143,7 @@ void fn_1_4034(s32 arg0) {
|
|||
BoardModelPosSetV(lbl_1_bss_64, &sp40);
|
||||
BoardModelRotSetV(lbl_1_bss_64, &lbl_1_data_25C[arg0]);
|
||||
fn_1_66C0(0, &sp40);
|
||||
|
||||
|
||||
var_r30 = 0;
|
||||
while (BoardModelMotionTimeGet(lbl_1_bss_64) < BoardModelMotionMaxTimeGet(lbl_1_bss_64)) {
|
||||
if (BoardModelMotionTimeGet(lbl_1_bss_64) > 50.0f && var_r30 == 0) {
|
||||
|
|
@ -157,7 +174,8 @@ void fn_1_4034(s32 arg0) {
|
|||
}
|
||||
if ((arg0 & 1) != 0) {
|
||||
var_r27 = arg0 - 1;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
var_r27 = arg0 + 1;
|
||||
}
|
||||
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_data_118), lbl_1_data_22C[var_r27], &sp34);
|
||||
|
|
@ -167,7 +185,7 @@ void fn_1_4034(s32 arg0) {
|
|||
while (fn_1_1208(lbl_1_bss_64, temp_f25, 10.0f) == 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
||||
|
||||
BoardPlayerPosGet(lbl_1_bss_68, &sp28);
|
||||
var_f27 = sqrtf(((sp40.x - sp28.x) * (sp40.x - sp28.x)) + ((sp40.z - sp28.z) * (sp40.z - sp28.z)));
|
||||
PSVECSubtract(&sp40, &sp28, &sp1C);
|
||||
|
|
@ -176,7 +194,7 @@ void fn_1_4034(s32 arg0) {
|
|||
BoardPlayerMotionStart(lbl_1_bss_68, 4, 0);
|
||||
var_f26 = 0.0f;
|
||||
temp_f22 = 15.0f;
|
||||
|
||||
|
||||
loop_37:
|
||||
sp1C.y = temp_f22 - (0.075f * (0.25f * (var_f26 * var_f26)));
|
||||
var_f26++;
|
||||
|
|
@ -190,28 +208,30 @@ loop_37:
|
|||
|
||||
if (sp28.y <= 20.0f + sp40.y) {
|
||||
sp28.y = 20.0f + sp40.y;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
BoardPlayerPosSetV(lbl_1_bss_68, &sp28);
|
||||
HuPrcVSleep();
|
||||
goto loop_37;
|
||||
}
|
||||
BoardPlayerPosSetV(lbl_1_bss_68, &sp28);
|
||||
BoardPlayerMotionStart(lbl_1_bss_68, lbl_1_bss_72[0], 0);
|
||||
|
||||
|
||||
while (fn_1_1208(BoardPlayerModelGet(lbl_1_bss_68), temp_f25, 10.0f) == 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
||||
|
||||
while (BoardPlayerMotionEndCheck(lbl_1_bss_68) == 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
||||
|
||||
BoardPlayerMotionStart(lbl_1_bss_68, lbl_1_bss_72[1], 0x40000001);
|
||||
HuPrcSleep(0x12);
|
||||
temp_r24->work[1] = 1;
|
||||
if (arg0 < 4) {
|
||||
fn_1_4EB4(arg0, temp_r26, &sp34);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
fn_1_5794(arg0, temp_r26, &sp34);
|
||||
}
|
||||
BoardModelPosGet(lbl_1_bss_64, &sp40);
|
||||
|
|
@ -222,7 +242,7 @@ loop_37:
|
|||
while (BoardPlayerMotBlendCheck(lbl_1_bss_68) == 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
||||
|
||||
fn_1_66C0(1, &sp40);
|
||||
BoardModelMotionShiftSet(lbl_1_bss_64, 5, 0.0f, 5.0f, 0);
|
||||
var_r30 = 0;
|
||||
|
|
@ -272,7 +292,7 @@ loop_37:
|
|||
for (var_r31 = 0; var_r31 < 2; var_r31++) {
|
||||
BoardPlayerMotionKill(lbl_1_bss_68, lbl_1_bss_72[var_r31]);
|
||||
}
|
||||
|
||||
|
||||
fn_1_6670();
|
||||
|
||||
for (var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
|
|
@ -280,7 +300,8 @@ loop_37:
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_4EB4(s32 arg1, s32 arg2, Vec* arg3) {
|
||||
void fn_1_4EB4(s32 arg1, s32 arg2, Vec *arg3)
|
||||
{
|
||||
Vec sp3C;
|
||||
Vec sp30;
|
||||
Vec sp24;
|
||||
|
|
@ -291,8 +312,8 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec* arg3) {
|
|||
f32 var_f22;
|
||||
f32 var_f24;
|
||||
f32 var_f28;
|
||||
omObjData* temp_r30;
|
||||
omObjData* temp_r29;
|
||||
omObjData *temp_r30;
|
||||
omObjData *temp_r29;
|
||||
s32 temp_r28;
|
||||
|
||||
temp_f23 = 10.0f;
|
||||
|
|
@ -315,7 +336,8 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec* arg3) {
|
|||
sp30.y += 20.0f;
|
||||
BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
|
||||
break;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
PSVECAdd(&sp3C, &sp24, &sp3C);
|
||||
BoardModelPosSetV(lbl_1_bss_64, &sp3C);
|
||||
sp30 = sp3C;
|
||||
|
|
@ -336,17 +358,17 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec* arg3) {
|
|||
while (BoardPlayerMotBlendCheck(lbl_1_bss_68) == 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
||||
|
||||
BoardPlayerPosGet(lbl_1_bss_68, &sp30);
|
||||
var_f28 = sqrtf(((sp3C.x - sp30.x) * (sp3C.x - sp30.x)) + ((sp3C.z - sp30.z) * (sp3C.z - sp30.z)));
|
||||
PSVECSubtract(&sp3C, &sp30, &sp24);
|
||||
PSVECNormalize(&sp24, &sp24);
|
||||
PSVECScale(&sp24, &sp24, var_f28 / 45.0f);
|
||||
BoardPlayerMotionStart(lbl_1_bss_68, 4, 0);
|
||||
|
||||
|
||||
var_f24 = 0.0f;
|
||||
temp_f19 = 15.0f;
|
||||
|
||||
|
||||
while (1) {
|
||||
sp24.y = temp_f19 - (0.075f * (0.25f * (var_f24 * var_f24)));
|
||||
var_f24++;
|
||||
|
|
@ -359,7 +381,8 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec* arg3) {
|
|||
}
|
||||
if (sp30.y <= sp3C.y && sp24.y < 0.0f) {
|
||||
sp30.y = sp3C.y;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
|
||||
HuPrcVSleep();
|
||||
continue;
|
||||
|
|
@ -369,7 +392,8 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec* arg3) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_5648(void) {
|
||||
void fn_1_5648(void)
|
||||
{
|
||||
Vec sp8;
|
||||
s32 var_r31;
|
||||
|
||||
|
|
@ -391,7 +415,8 @@ void fn_1_5648(void) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
|
||||
void fn_1_5794(s32 arg0, s32 arg1, Vec *arg2)
|
||||
{
|
||||
Vec sp64;
|
||||
Vec sp58;
|
||||
Vec sp4C;
|
||||
|
|
@ -400,16 +425,16 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
|
|||
Vec sp28;
|
||||
Vec sp1C;
|
||||
f32 sp18;
|
||||
Process* temp_r23;
|
||||
Process *temp_r23;
|
||||
f32 temp_f18;
|
||||
f32 temp_f22;
|
||||
f32 var_f27;
|
||||
f32 var_f23;
|
||||
f32 var_f28;
|
||||
omObjData* temp_r27;
|
||||
omObjData* var_r26;
|
||||
omObjData* temp_r25;
|
||||
omObjData* var_r24;
|
||||
omObjData *temp_r27;
|
||||
omObjData *var_r26;
|
||||
omObjData *temp_r25;
|
||||
omObjData *var_r24;
|
||||
s32 var_r28;
|
||||
s32 var_r29;
|
||||
s32 var_r30;
|
||||
|
|
@ -429,7 +454,8 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
|
|||
PSVECScale(&sp40, &sp40, temp_f22);
|
||||
if (arg0 == 5) {
|
||||
var_r29 = 0x96;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
var_r29 = 0x5A;
|
||||
}
|
||||
var_f28 = 0.0f;
|
||||
|
|
@ -442,7 +468,7 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
|
|||
BoardModelPosGet(lbl_1_bss_64, &sp1C);
|
||||
temp_r27 = fn_1_66C0(4, &sp1C);
|
||||
temp_r25 = fn_1_66C0(5, &sp1C);
|
||||
|
||||
|
||||
while (1) {
|
||||
sp18 = BoardModelRotYGet(lbl_1_bss_64);
|
||||
sp58 = sp64;
|
||||
|
|
@ -455,7 +481,8 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
|
|||
sp4C.y += 20.0f;
|
||||
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
|
||||
break;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
PSVECAdd(&sp58, &sp40, &sp58);
|
||||
sp64 = sp58;
|
||||
if (var_r29 == 0) {
|
||||
|
|
@ -469,24 +496,28 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
|
|||
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)) {
|
||||
}
|
||||
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 {
|
||||
}
|
||||
else {
|
||||
var_r29--;
|
||||
}
|
||||
BoardModelPosSetV(lbl_1_bss_64, &sp58);
|
||||
|
|
@ -536,7 +567,8 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
|
|||
if (sp4C.y <= sp58.y && sp40.y < 0.0f) {
|
||||
sp4C.y = sp58.y;
|
||||
break;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -545,7 +577,8 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
|
|||
HuPrcKill(temp_r23);
|
||||
}
|
||||
|
||||
void fn_1_62AC(s32 arg0, Vec* arg1) {
|
||||
void fn_1_62AC(s32 arg0, Vec *arg1)
|
||||
{
|
||||
Vec sp34;
|
||||
Vec sp28;
|
||||
Vec sp1C;
|
||||
|
|
@ -578,7 +611,8 @@ void fn_1_62AC(s32 arg0, Vec* arg1) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_64BC(void) {
|
||||
void fn_1_64BC(void)
|
||||
{
|
||||
Vec sp20;
|
||||
Vec sp14;
|
||||
Vec sp8;
|
||||
|
|
@ -602,7 +636,8 @@ void fn_1_64BC(void) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_65E8(void) {
|
||||
void fn_1_65E8(void)
|
||||
{
|
||||
s32 var_r31;
|
||||
|
||||
for (var_r31 = 0; var_r31 < 6; var_r31++) {
|
||||
|
|
@ -611,7 +646,8 @@ void fn_1_65E8(void) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_6670(void) {
|
||||
void fn_1_6670(void)
|
||||
{
|
||||
s32 var_r31;
|
||||
|
||||
for (var_r31 = 0; var_r31 < 6; var_r31++) {
|
||||
|
|
@ -619,9 +655,10 @@ void fn_1_6670(void) {
|
|||
}
|
||||
}
|
||||
|
||||
omObjData* fn_1_66C0(u32 arg0, Vec* arg1) {
|
||||
omObjData *fn_1_66C0(u32 arg0, Vec *arg1)
|
||||
{
|
||||
Vec sp8;
|
||||
omObjData* temp_r31;
|
||||
omObjData *temp_r31;
|
||||
f32 temp_f31;
|
||||
|
||||
temp_r31 = omAddObjEx(boardObjMan, 0x101, 0, 0, -1, fn_1_6914);
|
||||
|
|
@ -665,7 +702,8 @@ omObjData* fn_1_66C0(u32 arg0, Vec* arg1) {
|
|||
return temp_r31;
|
||||
}
|
||||
|
||||
void fn_1_6914(omObjData* arg0) {
|
||||
void fn_1_6914(omObjData *arg0)
|
||||
{
|
||||
Vec sp8;
|
||||
|
||||
if (arg0->work[1] != 0) {
|
||||
|
|
@ -680,7 +718,8 @@ void fn_1_6914(omObjData* arg0) {
|
|||
BoardModelKill(arg0->work[0]);
|
||||
omDelObjEx(boardObjMan, arg0);
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
switch (arg0->work[2]) {
|
||||
case 0:
|
||||
case 1:
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@
|
|||
|
||||
// data
|
||||
s32 lbl_1_data_150[5] = {
|
||||
0x790021, 0x790022, 0x790023, 0x790024, 0x790025,
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x21), DATA_MAKE_NUM(DATADIR_W05, 0x22), DATA_MAKE_NUM(DATADIR_W05, 0x23),
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x24), DATA_MAKE_NUM(DATADIR_W05, 0x25),
|
||||
};
|
||||
s16 lbl_1_data_164 = 0xFFFF;
|
||||
|
||||
|
|
@ -36,7 +37,7 @@ void fn_1_14D0(void) {
|
|||
}
|
||||
|
||||
u32 lbl_1_data_170[4] = { 0, 10, 25, 40 };
|
||||
s32 lbl_1_data_180 = 0x79000C;
|
||||
s32 lbl_1_data_180 = DATA_MAKE_NUM(DATADIR_W05, 0x0C);
|
||||
|
||||
s16 fn_1_14FC(void) {
|
||||
s16 var_r31;
|
||||
|
|
@ -112,10 +113,10 @@ void fn_1_155C(void) {
|
|||
sprintf(sp18, "%d", lbl_1_bss_0->unk_00);
|
||||
if (var_r30 > 0) {
|
||||
if (var_r30 >= 5) {
|
||||
var_r27 = 0x270001;
|
||||
var_r27 = MAKE_MESSID(0x27, 0x01);
|
||||
var_r30 = 5;
|
||||
} else {
|
||||
var_r27 = 0x270002;
|
||||
var_r27 = MAKE_MESSID(0x27, 0x02);
|
||||
}
|
||||
sprintf(sp8, "%d", var_r30);
|
||||
BoardWinCreate(2, var_r27, 7);
|
||||
|
|
@ -198,7 +199,10 @@ void fn_1_155C(void) {
|
|||
BoardRollDispSet(1);
|
||||
}
|
||||
|
||||
s32 lbl_1_data_188[4] = { 0x79000C, 0x79000E, 0x79000F, 0x790010 };
|
||||
s32 lbl_1_data_188[4] = {
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x0C), DATA_MAKE_NUM(DATADIR_W05, 0x0E),
|
||||
DATA_MAKE_NUM(DATADIR_W05, 0x0F),DATA_MAKE_NUM(DATADIR_W05, 0x10)
|
||||
};
|
||||
s32 lbl_1_data_198[2] = { 28, 25 };
|
||||
|
||||
void fn_1_1E44(void) {
|
||||
|
|
@ -279,7 +283,7 @@ void fn_1_1E44(void) {
|
|||
BoardWinWait();
|
||||
BoardWinKill();
|
||||
} else {
|
||||
temp_r3 = BoardModelCreate(0x790004, NULL, 0);
|
||||
temp_r3 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x04), NULL, 0);
|
||||
BoardModelVisibilitySet(temp_r3, 0);
|
||||
BoardModelLayerSet(temp_r3, 2U);
|
||||
if (lbl_1_bss_0->unk_00 > BoardPlayerCoinsGet(lbl_1_bss_28)) {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
#include "REL/w05Dll.h"
|
||||
|
||||
#include "game/gamework_data.h"
|
||||
#include "game/chrman.h"
|
||||
#include "game/frand.h"
|
||||
#include "game/gamework_data.h"
|
||||
|
||||
|
||||
#include "game/board/audio.h"
|
||||
#include "game/board/boo_house.h"
|
||||
|
|
@ -17,68 +18,50 @@
|
|||
|
||||
// data
|
||||
BoardMapObject lbl_1_data_0[7] = {
|
||||
{ { 3300.0f, 100.0f, -900.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 1.0f, 1.0f, 1.0f },
|
||||
0x790011
|
||||
},
|
||||
{ { -2550.0f, 0.0f, 1350.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 1.0f, 1.0f, 1.0f },
|
||||
0x790014
|
||||
},
|
||||
{ { -3000.0f, 100.0f, -1050.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 1.0f, 1.0f, 1.0f },
|
||||
0x79001A
|
||||
},
|
||||
{ { 2100.0f, 100.0f, -450.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 1.0f, 1.0f, 1.0f },
|
||||
0x79001B
|
||||
},
|
||||
{ { -450.0f, 100.0f, -750.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 1.0f, 1.0f, 1.0f },
|
||||
0x79000A
|
||||
},
|
||||
{ { -2710.0f, 0.0f, 1315.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 1.0f, 1.0f, 1.0f },
|
||||
0x79000A
|
||||
},
|
||||
{ { 3055.0f, 100.0f, -815.0f },
|
||||
{ 0.0f, 0.0f, 0.0f },
|
||||
{ 1.0f, 1.0f, 1.0f },
|
||||
0x79000A
|
||||
},
|
||||
{ { 3300.0f, 100.0f, -900.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W05, 0x11) },
|
||||
{ { -2550.0f, 0.0f, 1350.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W05, 0x14) },
|
||||
{ { -3000.0f, 100.0f, -1050.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W05, 0x1A) },
|
||||
{ { 2100.0f, 100.0f, -450.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W05, 0x1B) },
|
||||
{ { -450.0f, 100.0f, -750.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W05, 0x0A) },
|
||||
{ { -2710.0f, 0.0f, 1315.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W05, 0x0A) },
|
||||
{ { 3055.0f, 100.0f, -815.0f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 1.0f }, DATA_MAKE_NUM(DATADIR_W05, 0x0A) },
|
||||
};
|
||||
s16 lbl_1_data_118 = 0xFFFF;
|
||||
s16 lbl_1_data_11A = 0xFFFF;
|
||||
s16 lbl_1_data_11C = 0xFFFF;
|
||||
s16 lbl_1_data_11E = 0xFFFF;
|
||||
s16 lbl_1_data_120 = 0xFFFF;
|
||||
s32 lbl_1_data_124[8] = {0x5F0000, 0x1A0000, 0x6D0000, 0x8A0000, 0x850000, 0x110000, 0xD0000, 0x810000};
|
||||
s32 lbl_1_data_144[2] = {0x790006, 0xFFFFFFFF};
|
||||
s32 lbl_1_data_124[8] = {
|
||||
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x00),
|
||||
};
|
||||
s32 lbl_1_data_144[2] = { DATA_MAKE_NUM(DATADIR_W05, 0x06), DATA_NUM_LISTEND };
|
||||
s32 lbl_1_data_14C = 0xFFFFFFFF;
|
||||
|
||||
// bss
|
||||
s16 lbl_1_bss_14[7];
|
||||
s32* lbl_1_bss_10;
|
||||
s32 *lbl_1_bss_10;
|
||||
s16 lbl_1_bss_8[4];
|
||||
Process* lbl_1_bss_4;
|
||||
bitcopy* lbl_1_bss_0;
|
||||
Process *lbl_1_bss_4;
|
||||
bitcopy *lbl_1_bss_0;
|
||||
|
||||
void BoardCreate(void) {
|
||||
void BoardCreate(void)
|
||||
{
|
||||
s32 sp8;
|
||||
s32 var_r31;
|
||||
BoardMapObject* temp_r30;
|
||||
BoardMapObject *temp_r30;
|
||||
|
||||
sp8 = GWBoardGet();
|
||||
lbl_1_bss_0 = (bitcopy*) GWSystem.board_data;
|
||||
BoardSpaceInit(0x790000);
|
||||
lbl_1_data_118 = BoardModelCreate(0x790001, NULL, 0);
|
||||
lbl_1_data_120 = BoardModelCreate(0x790002, NULL, 0);
|
||||
lbl_1_bss_0 = (bitcopy *)GWSystem.board_data;
|
||||
BoardSpaceInit(DATA_MAKE_NUM(DATADIR_W05, 0x00));
|
||||
lbl_1_data_118 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x01), NULL, 0);
|
||||
lbl_1_data_120 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x02), NULL, 0);
|
||||
fn_8006DDE8(lbl_1_data_118, -1.0f);
|
||||
BoardModelPosSet(lbl_1_data_118, 0.0f, 0.0f, 0.0f);
|
||||
BoardModelMotionStart(lbl_1_data_118, 0, 0x40000001);
|
||||
|
|
@ -88,23 +71,24 @@ void BoardCreate(void) {
|
|||
BoardModelMotionStart(lbl_1_data_120, 0, 0x40000001);
|
||||
BoardModelMotionSpeedSet(lbl_1_data_120, 1.0f);
|
||||
BoardModelLayerSet(lbl_1_data_120, 1);
|
||||
lbl_1_data_11A = BoardModelCreate(0x790003, NULL, 0);
|
||||
lbl_1_data_11A = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x03), NULL, 0);
|
||||
fn_8006DDE8(lbl_1_data_11A, -1.0f);
|
||||
BoardModelPosSet(lbl_1_data_11A, 0.0f, 0.0f, 0.0f);
|
||||
BoardModelMotionStart(lbl_1_data_11A, 0, 0x40000001);
|
||||
lbl_1_data_11C = BoardModelCreate(0x790005, lbl_1_data_144, 0);
|
||||
lbl_1_data_11C = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x05), lbl_1_data_144, 0);
|
||||
BoardModelPosSet(lbl_1_data_11C, 0.0f, 0.0f, 0.0f);
|
||||
BoardModelMotionStart(lbl_1_data_11C, 1, 0x40000001);
|
||||
lbl_1_data_11E = BoardModelCreate(0x2001C, &lbl_1_data_14C, 0);
|
||||
BoardModelMotionStart(lbl_1_data_11E, 1, 0x40000001);
|
||||
BoardLightHookSet(&fn_1_744, &fn_1_788);
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < 7; var_r31++) {
|
||||
temp_r30 = &lbl_1_data_0[var_r31];
|
||||
if (temp_r30->data_num != -1) {
|
||||
if ((var_r31 == 4) || (var_r31 == 5) || (var_r31 == 6)) {
|
||||
lbl_1_bss_10 = &lbl_1_data_14C;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
lbl_1_bss_10 = NULL;
|
||||
}
|
||||
lbl_1_bss_14[var_r31] = BoardModelCreate(temp_r30->data_num, lbl_1_bss_10, 0);
|
||||
|
|
@ -129,7 +113,8 @@ void BoardCreate(void) {
|
|||
BoardLotteryHostSet(lbl_1_data_11E);
|
||||
}
|
||||
|
||||
void BoardDestroy(void) {
|
||||
void BoardDestroy(void)
|
||||
{
|
||||
s32 var_r31;
|
||||
|
||||
for (var_r31 = 0; var_r31 < 7; var_r31++) {
|
||||
|
|
@ -161,20 +146,21 @@ void BoardDestroy(void) {
|
|||
BoardSpaceDestroy();
|
||||
}
|
||||
|
||||
void fn_1_744(void) {
|
||||
void fn_1_744(void)
|
||||
{
|
||||
s16 var_r31 = BoardModelIDGet(lbl_1_data_118);
|
||||
Hu3DModelLightInfoSet(var_r31, 1);
|
||||
}
|
||||
|
||||
void fn_1_788(void) {
|
||||
}
|
||||
void fn_1_788(void) { }
|
||||
|
||||
s32 fn_1_78C(void) {
|
||||
s32 fn_1_78C(void)
|
||||
{
|
||||
s32 var_r30 = GWSystem.player_curr;
|
||||
s32 var_r29 = GWPlayer[var_r30].space_curr;
|
||||
s32 var_r28;
|
||||
u32 temp_r3;
|
||||
|
||||
|
||||
temp_r3 = BoardSpaceFlagGet(0, var_r29);
|
||||
if ((temp_r3 & 2) != 0) {
|
||||
fn_1_1E44();
|
||||
|
|
@ -186,9 +172,10 @@ s32 fn_1_78C(void) {
|
|||
}
|
||||
}
|
||||
|
||||
s32 fn_1_82C(void) {
|
||||
s32 fn_1_82C(void)
|
||||
{
|
||||
s32 temp_r30;
|
||||
BoardSpace* temp_r3;
|
||||
BoardSpace *temp_r3;
|
||||
|
||||
temp_r30 = GWSystem.player_curr;
|
||||
temp_r3 = BoardSpaceGet(0, GWPlayer[temp_r30].space_curr);
|
||||
|
|
@ -213,15 +200,16 @@ s32 fn_1_82C(void) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
void fn_1_92C(void) {
|
||||
void fn_1_92C(void)
|
||||
{
|
||||
fn_1_6B28();
|
||||
fn_1_9680();
|
||||
}
|
||||
|
||||
void fn_1_950(void) {
|
||||
}
|
||||
void fn_1_950(void) { }
|
||||
|
||||
void fn_1_954(void) {
|
||||
void fn_1_954(void)
|
||||
{
|
||||
Vec sp14;
|
||||
Vec sp8;
|
||||
s32 var_r26;
|
||||
|
|
@ -239,7 +227,7 @@ void fn_1_954(void) {
|
|||
HuPrcEnd();
|
||||
}
|
||||
lbl_1_bss_8[0] = 0;
|
||||
|
||||
|
||||
for (var_r31 = 1; var_r31 < 3;) {
|
||||
lbl_1_bss_8[var_r31] = (u32)frandmod(0xE);
|
||||
if ((lbl_1_bss_8[var_r31] == 0xA) || (lbl_1_bss_8[var_r31] == 0xD)) {
|
||||
|
|
@ -260,7 +248,8 @@ void fn_1_954(void) {
|
|||
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();
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
BoardComKeySetRight();
|
||||
}
|
||||
}
|
||||
|
|
@ -297,7 +286,7 @@ void fn_1_954(void) {
|
|||
temp_r27 = GWPlayer[temp_r30].space_curr;
|
||||
var_r26 = BoardSpaceLinkFlagSearch(0, temp_r27, 0x02000000);
|
||||
BoardPlayerMoveBetween(temp_r30, temp_r27, var_r26);
|
||||
|
||||
|
||||
while (GWPlayer[temp_r30].moving != 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -314,28 +303,32 @@ void fn_1_954(void) {
|
|||
HuPrcEnd();
|
||||
}
|
||||
|
||||
void fn_1_D4C(void) {
|
||||
void fn_1_D4C(void)
|
||||
{
|
||||
BoardWinKill();
|
||||
CharModelDataClose(-1);
|
||||
lbl_1_bss_4 = NULL;
|
||||
}
|
||||
|
||||
void fn_1_D84(void) {
|
||||
void fn_1_D84(void)
|
||||
{
|
||||
lbl_1_bss_4 = HuPrcChildCreate(fn_1_954, 0x2003U, 0x3000U, 0, boardMainProc);
|
||||
HuPrcDestructorSet2(lbl_1_bss_4, fn_1_D4C);
|
||||
|
||||
|
||||
while (lbl_1_bss_4 != 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
}
|
||||
|
||||
void fn_1_E04(void) {
|
||||
void fn_1_E04(void)
|
||||
{
|
||||
HuPrcSleep(0x3C);
|
||||
BoardMusStart(1, 0x23, 0x7F, 0);
|
||||
HuPrcEnd();
|
||||
}
|
||||
|
||||
void fn_1_E40(void) {
|
||||
void fn_1_E40(void)
|
||||
{
|
||||
Vec sp20;
|
||||
Vec sp14;
|
||||
Vec sp8;
|
||||
|
|
@ -350,7 +343,8 @@ void fn_1_E40(void) {
|
|||
if (GWPlayer[temp_r31].com != 0) {
|
||||
if (frandBool() != 0) {
|
||||
BoardComKeySetLeft();
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
BoardComKeySetRight();
|
||||
}
|
||||
}
|
||||
|
|
@ -363,7 +357,7 @@ void fn_1_E40(void) {
|
|||
BoardWinWait();
|
||||
BoardWinKill();
|
||||
BoardMGExit();
|
||||
|
||||
|
||||
while (BoardMGDoneFlagGet() != 1) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -399,7 +393,8 @@ void fn_1_E40(void) {
|
|||
BoardPlayerMotionStart(temp_r31, 1, 0x40000001);
|
||||
}
|
||||
|
||||
s32 fn_1_1114(void) {
|
||||
s32 fn_1_1114(void)
|
||||
{
|
||||
u32 temp_r31;
|
||||
s16 var_r30 = GWPlayer[GWSystem.player_curr].space_curr;
|
||||
|
||||
|
|
@ -412,13 +407,15 @@ s32 fn_1_1114(void) {
|
|||
while (lbl_1_bss_4 != 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
} else if ((temp_r31 & 0x400000) != 0) {
|
||||
}
|
||||
else if ((temp_r31 & 0x400000) != 0) {
|
||||
fn_1_E40();
|
||||
}
|
||||
BoardRollDispSet(1);
|
||||
}
|
||||
|
||||
s32 fn_1_1208(s16 arg0, f32 arg8, f32 arg9) {
|
||||
s32 fn_1_1208(s16 arg0, f32 arg8, f32 arg9)
|
||||
{
|
||||
f32 var_f29;
|
||||
f32 var_f31;
|
||||
s32 var_r31;
|
||||
|
|
@ -440,12 +437,15 @@ s32 fn_1_1208(s16 arg0, f32 arg8, f32 arg9) {
|
|||
if (var_f29 < 180.0f) {
|
||||
if (var_f29 > arg9) {
|
||||
var_f31 = var_f31 + arg9;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
var_f31 = arg8;
|
||||
}
|
||||
} else if ((360.0f - var_f29) > arg9) {
|
||||
}
|
||||
else if ((360.0f - var_f29) > arg9) {
|
||||
var_f31 = var_f31 - arg9;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
var_f31 = arg8;
|
||||
}
|
||||
if (var_f31 < 0.0f) {
|
||||
|
|
@ -455,7 +455,8 @@ s32 fn_1_1208(s16 arg0, f32 arg8, f32 arg9) {
|
|||
var_f31 -= 360.0f;
|
||||
}
|
||||
BoardModelRotYSet(arg0, var_f31);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
var_r31 = 1;
|
||||
}
|
||||
return var_r31;
|
||||
|
|
|
|||
|
|
@ -1,25 +1,27 @@
|
|||
#include "REL/w05Dll.h"
|
||||
|
||||
#include "game/hsfdraw.h"
|
||||
#include "game/audio.h"
|
||||
#include "game/objsub.h"
|
||||
#include "game/frand.h"
|
||||
#include "game/chrman.h"
|
||||
#include "game/pad.h"
|
||||
#include "game/frand.h"
|
||||
#include "game/hsfdraw.h"
|
||||
#include "game/minigame_seq.h"
|
||||
#include "game/objsub.h"
|
||||
#include "game/pad.h"
|
||||
|
||||
|
||||
#include "game/board/audio.h"
|
||||
#include "game/board/model.h"
|
||||
#include "game/board/window.h"
|
||||
#include "game/board/audio.h"
|
||||
|
||||
|
||||
s16 lbl_1_bss_102[3];
|
||||
s16 lbl_1_bss_100;
|
||||
s16 lbl_1_bss_FE;
|
||||
s16 lbl_1_bss_D6[20];
|
||||
s16 lbl_1_bss_D4;
|
||||
omObjData* lbl_1_bss_D0;
|
||||
omObjData* lbl_1_bss_CC;
|
||||
omObjData* lbl_1_bss_C8;
|
||||
omObjData *lbl_1_bss_D0;
|
||||
omObjData *lbl_1_bss_CC;
|
||||
omObjData *lbl_1_bss_C8;
|
||||
s16 lbl_1_bss_C6;
|
||||
s16 lbl_1_bss_C4;
|
||||
s16 lbl_1_bss_C2;
|
||||
|
|
@ -29,14 +31,16 @@ s32 lbl_1_bss_B8;
|
|||
|
||||
char *lbl_1_data_464[3] = { "gyoei", "gyoei1", "gyoei2" };
|
||||
s32 lbl_1_data_470[3] = { 0x7B, 0x7C, 0x7D };
|
||||
s32 lbl_1_data_47C[3] = { 0x00790016, 0x00790017, 0x00790018 };
|
||||
s32 lbl_1_data_47C[3] = { DATA_MAKE_NUM(DATADIR_W05, 0x16), DATA_MAKE_NUM(DATADIR_W05, 0x17), DATA_MAKE_NUM(DATADIR_W05, 0x18) };
|
||||
char *lbl_1_data_494[3] = { "uo", "uo1", "uo2" };
|
||||
|
||||
void fn_1_9680(void) {
|
||||
void fn_1_9680(void)
|
||||
{
|
||||
BoardModelAttrSet(lbl_1_bss_14[1], 0x40000002U);
|
||||
}
|
||||
|
||||
void fn_1_96B4(void) {
|
||||
void fn_1_96B4(void)
|
||||
{
|
||||
BoardModelAttrReset(lbl_1_bss_14[1], 0x40000002);
|
||||
BoardModelMotionTimeSet(lbl_1_bss_14[1], 0.0f);
|
||||
|
||||
|
|
@ -47,58 +51,63 @@ void fn_1_96B4(void) {
|
|||
BoardModelMotionStartEndSet(lbl_1_bss_14[1], 0x3C, 0x64);
|
||||
}
|
||||
|
||||
void fn_1_9760(void) {
|
||||
void fn_1_9760(void)
|
||||
{
|
||||
BoardModelAttrReset(lbl_1_bss_14[1], 0x40000001);
|
||||
BoardModelMotionStartEndSet(lbl_1_bss_14[1], 0, 0xA0);
|
||||
}
|
||||
|
||||
void fn_1_97AC(void) {
|
||||
void fn_1_97AC(void)
|
||||
{
|
||||
Vec sp8;
|
||||
s32 var_r31;
|
||||
|
||||
lbl_1_bss_C0 = GWSystem.player_curr;
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
lbl_1_bss_102[var_r31] = BoardPlayerMotionCreate(lbl_1_bss_C0, lbl_1_data_470[var_r31] | lbl_1_data_124[GWPlayer[lbl_1_bss_C0].character]);
|
||||
}
|
||||
sp8.x = sp8.y = sp8.z = 1.0f;
|
||||
lbl_1_bss_100 = BoardModelCreate(0x790015, NULL, 0);
|
||||
lbl_1_bss_100 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x15), NULL, 0);
|
||||
BoardModelScaleSetV(lbl_1_bss_100, &sp8);
|
||||
BoardModelVisibilitySet(lbl_1_bss_100, 0);
|
||||
lbl_1_bss_D4 = BoardModelCreate(0x79002C, NULL, 0);
|
||||
lbl_1_bss_D4 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x2C), NULL, 0);
|
||||
BoardModelVisibilitySet(lbl_1_bss_D4, 0);
|
||||
lbl_1_bss_C2 = frandmod(3U);
|
||||
lbl_1_bss_FE = BoardModelCreate(lbl_1_data_47C[lbl_1_bss_C2], NULL, 0);
|
||||
BoardModelVisibilitySet(lbl_1_bss_FE, 0);
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < 0x14; var_r31++) {
|
||||
lbl_1_bss_D6[var_r31] = BoardModelCreate(0x7000A, NULL, 1);
|
||||
lbl_1_bss_D6[var_r31] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 0x0A), NULL, 1);
|
||||
BoardModelVisibilitySet(lbl_1_bss_D6[var_r31], 0);
|
||||
}
|
||||
BoardPlayerPostTurnHookSet(lbl_1_bss_C0, (s32 (*)())fn_1_9B74);
|
||||
BoardPlayerPostTurnHookSet(lbl_1_bss_C0, (s32(*)())fn_1_9B74);
|
||||
lbl_1_bss_CC = omAddObjEx(boardObjMan, 0x101, 0U, 0U, -1, fn_1_9A68);
|
||||
lbl_1_bss_D0 = omAddObjEx(boardObjMan, 0x101, 0U, 0U, -1, fn_1_9C24);
|
||||
lbl_1_bss_C6 = 0;
|
||||
lbl_1_bss_C4 = 0;
|
||||
}
|
||||
|
||||
void fn_1_9A68(omObjData* arg0) {
|
||||
void fn_1_9A68(omObjData *arg0)
|
||||
{
|
||||
if ((lbl_1_bss_C4 != 0) && (BoardMGDoneFlagGet() == 1)) {
|
||||
fn_1_9AF0();
|
||||
omDelObjEx(boardObjMan, arg0);
|
||||
}
|
||||
}
|
||||
|
||||
void fn_1_9AC0(void) {
|
||||
void fn_1_9AC0(void)
|
||||
{
|
||||
lbl_1_bss_C4 = 1;
|
||||
BoardMGExit();
|
||||
}
|
||||
|
||||
void fn_1_9AF0(void) {
|
||||
void fn_1_9AF0(void)
|
||||
{
|
||||
s32 var_r31;
|
||||
|
||||
omDelObjEx(boardObjMan, lbl_1_bss_D0);
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < 0x14; var_r31++) {
|
||||
BoardModelKill(lbl_1_bss_D6[var_r31]);
|
||||
}
|
||||
|
|
@ -106,7 +115,8 @@ void fn_1_9AF0(void) {
|
|||
BoardMGDoneFlagSet(0);
|
||||
}
|
||||
|
||||
void fn_1_9B74(void) {
|
||||
void fn_1_9B74(void)
|
||||
{
|
||||
HsfObject *var_r31;
|
||||
omDelObjEx(boardObjMan, lbl_1_bss_C8);
|
||||
BoardModelKill(lbl_1_bss_FE);
|
||||
|
|
@ -115,7 +125,8 @@ void fn_1_9B74(void) {
|
|||
BoardModelAttrReset(lbl_1_bss_14[1], 0x40000004);
|
||||
}
|
||||
|
||||
void fn_1_9C24(omObjData* arg0) {
|
||||
void fn_1_9C24(omObjData *arg0)
|
||||
{
|
||||
if (arg0->work[0] == 0) {
|
||||
arg0->work[0] = MGSeqCreate(3, 0);
|
||||
return;
|
||||
|
|
@ -125,7 +136,8 @@ void fn_1_9C24(omObjData* arg0) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_9C98(dataCopy2* arg0) {
|
||||
void fn_1_9C98(dataCopy2 *arg0)
|
||||
{
|
||||
Vec sp8;
|
||||
Vec temp_r4;
|
||||
|
||||
|
|
@ -134,21 +146,22 @@ void fn_1_9C98(dataCopy2* arg0) {
|
|||
BoardModelPosSetV(arg0->unk_0A, &sp8);
|
||||
}
|
||||
|
||||
void fn_1_9D0C(omObjData* arg0) {
|
||||
void fn_1_9D0C(omObjData *arg0)
|
||||
{
|
||||
Vec sp1C;
|
||||
Vec sp10;
|
||||
f32 sp8[2];
|
||||
s32 var_r30;
|
||||
dataCopy2* temp_r31;
|
||||
dataCopy2 *temp_r31;
|
||||
|
||||
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x34, 0x10000000);
|
||||
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x34, MEMORY_DEFAULT_NUM);
|
||||
temp_r31 = arg0->data;
|
||||
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);
|
||||
HuWinMesMaxSizeGet(1, sp8, MAKE_MESSID(0x27, 0x0E));
|
||||
temp_r31->unk_06 = HuWinCreate(-10000.0f, 368.0f, sp8[0], sp8[1], 0);
|
||||
HuWinMesSet(temp_r31->unk_06, 0x27000E);
|
||||
HuWinMesSet(temp_r31->unk_06, MAKE_MESSID(0x27, 0x0E));
|
||||
HuWinBGTPLvlSet(temp_r31->unk_06, 0.0f);
|
||||
HuWinMesSpeedSet(temp_r31->unk_06, 0);
|
||||
temp_r31->unk_08 = 1;
|
||||
|
|
@ -158,7 +171,7 @@ void fn_1_9D0C(omObjData* arg0) {
|
|||
for (var_r30 = 0; var_r30 < 3; var_r30++) {
|
||||
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_bss_14[1]), lbl_1_data_494[var_r30], &temp_r31->unk_0C[var_r30]);
|
||||
}
|
||||
temp_r31->unk_0A = BoardModelCreate(0x790019, NULL, 0);
|
||||
temp_r31->unk_0A = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x19), NULL, 0);
|
||||
BoardModelAttrSet(temp_r31->unk_0A, 0x40000001);
|
||||
sp1C.x = sp1C.y = sp1C.z = 1.5f;
|
||||
BoardModelScaleSetV(temp_r31->unk_0A, &sp1C);
|
||||
|
|
@ -168,7 +181,8 @@ void fn_1_9D0C(omObjData* arg0) {
|
|||
arg0->func = fn_1_9F24;
|
||||
}
|
||||
|
||||
void fn_1_9F24(omObjData* arg0) {
|
||||
void fn_1_9F24(omObjData *arg0)
|
||||
{
|
||||
Vec sp24;
|
||||
Vec sp18;
|
||||
Vec spC;
|
||||
|
|
@ -176,7 +190,7 @@ void fn_1_9F24(omObjData* arg0) {
|
|||
s16 sp8;
|
||||
f32 var_f31;
|
||||
u16 temp_r29;
|
||||
dataCopy2* temp_r31;
|
||||
dataCopy2 *temp_r31;
|
||||
|
||||
temp_r31 = arg0->data;
|
||||
if (--temp_r31->unk_04 == 0) {
|
||||
|
|
@ -189,7 +203,8 @@ void fn_1_9F24(omObjData* arg0) {
|
|||
temp_r29 = GWPlayer[lbl_1_bss_C0].port;
|
||||
if (GWPlayer[lbl_1_bss_C0].com != 0) {
|
||||
fn_1_B2B0(arg0, &spA, &sp8);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
sp8 = HuPadDStkRep[temp_r29];
|
||||
spA = HuPadBtnDown[temp_r29];
|
||||
}
|
||||
|
|
@ -201,10 +216,12 @@ void fn_1_9F24(omObjData* arg0) {
|
|||
BoardPlayerMotionStart(lbl_1_bss_C0, lbl_1_bss_102[0], 0);
|
||||
BoardPlayerMotionSpeedSet(lbl_1_bss_C0, 0.5f);
|
||||
arg0->func = fn_1_A224;
|
||||
} else if ((temp_r31->unk_08 != 0) && ((sp8 & 1) != 0)) {
|
||||
}
|
||||
else if ((temp_r31->unk_08 != 0) && ((sp8 & 1) != 0)) {
|
||||
HuAudFXPlay(0);
|
||||
temp_r31->unk_08--;
|
||||
} else if ((temp_r31->unk_08 != 2) && ((sp8 & 2) != 0)) {
|
||||
}
|
||||
else if ((temp_r31->unk_08 != 2) && ((sp8 & 2) != 0)) {
|
||||
HuAudFXPlay(0);
|
||||
temp_r31->unk_08++;
|
||||
}
|
||||
|
|
@ -216,7 +233,8 @@ void fn_1_9F24(omObjData* arg0) {
|
|||
BoardModelPosSetV(temp_r31->unk_0A, &spC);
|
||||
}
|
||||
|
||||
void fn_1_A224(omObjData* arg0) {
|
||||
void fn_1_A224(omObjData *arg0)
|
||||
{
|
||||
Vec sp14;
|
||||
Vec sp8;
|
||||
f32 temp_f31;
|
||||
|
|
@ -239,21 +257,22 @@ void fn_1_A224(omObjData* arg0) {
|
|||
BoardPlayerMotionStart(lbl_1_bss_C0, lbl_1_bss_102[1], 0);
|
||||
BoardPlayerMotionSpeedSet(lbl_1_bss_C0, 0.5f);
|
||||
switch (lbl_1_bss_C2) {
|
||||
case 0:
|
||||
omVibrate(lbl_1_bss_C0, 0x7FFF, 0xC, 0);
|
||||
break;
|
||||
case 1:
|
||||
omVibrate(lbl_1_bss_C0, 0x7FFF, 4, 2);
|
||||
break;
|
||||
case 2:
|
||||
omVibrate(lbl_1_bss_C0, 0x7FFF, 6, 6);
|
||||
break;
|
||||
case 0:
|
||||
omVibrate(lbl_1_bss_C0, 0x7FFF, 0xC, 0);
|
||||
break;
|
||||
case 1:
|
||||
omVibrate(lbl_1_bss_C0, 0x7FFF, 4, 2);
|
||||
break;
|
||||
case 2:
|
||||
omVibrate(lbl_1_bss_C0, 0x7FFF, 6, 6);
|
||||
break;
|
||||
}
|
||||
arg0->func = fn_1_A4F8;
|
||||
}
|
||||
}
|
||||
|
||||
void fn_1_A4F8(omObjData* arg0) {
|
||||
void fn_1_A4F8(omObjData *arg0)
|
||||
{
|
||||
f32 temp_f31;
|
||||
|
||||
temp_f31 = BoardPlayerMotionMaxTimeGet(lbl_1_bss_C0);
|
||||
|
|
@ -264,13 +283,14 @@ void fn_1_A4F8(omObjData* arg0) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_A5B0(omObjData* arg0) {
|
||||
void fn_1_A5B0(omObjData *arg0)
|
||||
{
|
||||
Vec sp14;
|
||||
Vec sp8;
|
||||
HsfObject* temp_r28;
|
||||
dataCopy2* temp_r30;
|
||||
omObjData* temp_r29;
|
||||
Vec* temp_r31;
|
||||
HsfObject *temp_r28;
|
||||
dataCopy2 *temp_r30;
|
||||
omObjData *temp_r29;
|
||||
Vec *temp_r31;
|
||||
f32 temp_f30;
|
||||
f32 var_f31;
|
||||
|
||||
|
|
@ -295,7 +315,7 @@ void fn_1_A5B0(omObjData* arg0) {
|
|||
BoardModelVisibilitySet(lbl_1_bss_D4, 1);
|
||||
BoardModelMotionTimeSet(lbl_1_bss_D4, 110.0f);
|
||||
lbl_1_bss_C8 = temp_r29 = omAddObjEx(boardObjMan, 0x101, 0, 0, -1, fn_1_B3C4);
|
||||
temp_r29->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, 0x10000000);
|
||||
temp_r29->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM);
|
||||
temp_r31 = temp_r29->data;
|
||||
lbl_1_bss_C8->work[1] = 1;
|
||||
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_bss_14[1]), "fish", &sp14);
|
||||
|
|
@ -323,7 +343,8 @@ void fn_1_A5B0(omObjData* arg0) {
|
|||
BoardModelMotionSpeedSet(lbl_1_bss_100, var_f31);
|
||||
}
|
||||
|
||||
void fn_1_A990(omObjData* arg0) {
|
||||
void fn_1_A990(omObjData *arg0)
|
||||
{
|
||||
Vec sp8;
|
||||
Process *var_r31;
|
||||
|
||||
|
|
@ -344,9 +365,10 @@ void fn_1_A990(omObjData* arg0) {
|
|||
}
|
||||
|
||||
s16 lbl_1_data_4B2[3] = { 20, 10, 5 };
|
||||
s32 lbl_1_data_4B8[3] = { 0x00270013, 0x00270014, 0x00270015 };
|
||||
s32 lbl_1_data_4B8[3] = { MAKE_MESSID(0x27, 0x13), MAKE_MESSID(0x27, 0x14), MAKE_MESSID(0x27, 0x15) };
|
||||
|
||||
void fn_1_AB24(void) {
|
||||
void fn_1_AB24(void)
|
||||
{
|
||||
Vec sp124[20];
|
||||
Vec sp34[20];
|
||||
Vec sp28;
|
||||
|
|
@ -359,7 +381,7 @@ void fn_1_AB24(void) {
|
|||
s32 var_r29;
|
||||
s32 var_r31;
|
||||
f32 var_f30;
|
||||
Vec* temp_r4;
|
||||
Vec *temp_r4;
|
||||
|
||||
temp_r30 = HuPrcCurrentGet()->user_data;
|
||||
spC = temp_r30->data;
|
||||
|
|
@ -367,7 +389,7 @@ void fn_1_AB24(void) {
|
|||
BoardModelPosGet(lbl_1_bss_14[5], &sp1C);
|
||||
var_f30 = (180.0 * (atan2((sp1C.z - sp28.z), (sp1C.x - sp28.x)) / M_PI));
|
||||
BoardPlayerMotBlendSet(lbl_1_bss_C0, var_f30, 0xF);
|
||||
|
||||
|
||||
while (BoardPlayerMotBlendCheck(lbl_1_bss_C0) == 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -381,12 +403,12 @@ void fn_1_AB24(void) {
|
|||
BoardWinWait();
|
||||
BoardWinKill();
|
||||
BoardPlayerMotBlendSet(lbl_1_bss_C0, 0, 0xF);
|
||||
|
||||
|
||||
while (BoardPlayerMotBlendCheck(lbl_1_bss_C0) == 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
BoardPlayerPosGet(lbl_1_bss_C0, &sp28);
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < lbl_1_bss_C6; var_r31++) {
|
||||
BoardModelVisibilitySet(lbl_1_bss_D6[var_r31], 1);
|
||||
sp124[var_r31] = sp28;
|
||||
|
|
@ -400,7 +422,7 @@ void fn_1_AB24(void) {
|
|||
}
|
||||
var_f31 = -1.0f;
|
||||
var_r29 = 0;
|
||||
|
||||
|
||||
while (1) {
|
||||
for (var_r31 = 0; var_r31 < lbl_1_bss_C6; var_r31++) {
|
||||
if (var_r31 >= var_r29) {
|
||||
|
|
@ -429,11 +451,12 @@ void fn_1_AB24(void) {
|
|||
if (var_r29 == lbl_1_bss_C6) {
|
||||
BoardPlayerMotionShiftSet(lbl_1_bss_C0, 7, 0.0f, 10.0f, 0);
|
||||
break;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
while (BoardPlayerMotionEndCheck(lbl_1_bss_C0) == 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -444,7 +467,8 @@ void fn_1_AB24(void) {
|
|||
HuPrcEnd();
|
||||
}
|
||||
|
||||
void fn_1_B214(omObjData* arg0) {
|
||||
void fn_1_B214(omObjData *arg0)
|
||||
{
|
||||
s32 var_r31;
|
||||
|
||||
for (var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
|
|
@ -456,8 +480,9 @@ void fn_1_B214(omObjData* arg0) {
|
|||
omDelObjEx(boardObjMan, arg0);
|
||||
}
|
||||
|
||||
void fn_1_B2B0(omObjData* arg0, u16* arg1, s16* arg2) {
|
||||
dataCopy2* temp_r31;
|
||||
void fn_1_B2B0(omObjData *arg0, u16 *arg1, s16 *arg2)
|
||||
{
|
||||
dataCopy2 *temp_r31;
|
||||
|
||||
temp_r31 = arg0->data;
|
||||
*arg1 = 0;
|
||||
|
|
@ -490,7 +515,8 @@ void fn_1_B2B0(omObjData* arg0, u16* arg1, s16* arg2) {
|
|||
*arg2 = 2;
|
||||
}
|
||||
|
||||
void fn_1_B3C4(omObjData* arg0) {
|
||||
void fn_1_B3C4(omObjData *arg0)
|
||||
{
|
||||
Vec sp2C;
|
||||
Vec sp20;
|
||||
Vec sp14;
|
||||
|
|
@ -526,9 +552,10 @@ void fn_1_B3C4(omObjData* arg0) {
|
|||
if ((0.0f == BoardModelMotionTimeGet(lbl_1_bss_FE)) && (arg0->work[1] != 0)) {
|
||||
HuAudFXPlay(0x484);
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
arg0->work[0] += 1;
|
||||
}
|
||||
BoardModelPosSetV(lbl_1_bss_FE, &sp20);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
#include "REL/w05Dll.h"
|
||||
|
||||
#include "game/hsfdraw.h"
|
||||
#include "game/audio.h"
|
||||
#include "game/objsub.h"
|
||||
#include "game/frand.h"
|
||||
#include "game/chrman.h"
|
||||
#include "game/pad.h"
|
||||
#include "game/frand.h"
|
||||
#include "game/hsfdraw.h"
|
||||
#include "game/minigame_seq.h"
|
||||
#include "game/objsub.h"
|
||||
#include "game/pad.h"
|
||||
|
||||
#include "game/board/audio.h"
|
||||
#include "game/board/model.h"
|
||||
#include "game/board/window.h"
|
||||
#include "game/board/audio.h"
|
||||
|
||||
// data
|
||||
s32 lbl_1_data_310[2] = { 0x79, 0x7A };
|
||||
|
|
@ -24,22 +24,23 @@ s16 lbl_1_bss_A4[3];
|
|||
s16 lbl_1_bss_A2;
|
||||
s16 lbl_1_bss_9E[2];
|
||||
s16 lbl_1_bss_9C;
|
||||
Process* lbl_1_bss_98;
|
||||
omObjData* lbl_1_bss_94;
|
||||
omObjData* lbl_1_bss_90;
|
||||
omObjData* lbl_1_bss_8C;
|
||||
Process *lbl_1_bss_98;
|
||||
omObjData *lbl_1_bss_94;
|
||||
omObjData *lbl_1_bss_90;
|
||||
omObjData *lbl_1_bss_8C;
|
||||
s32 lbl_1_bss_88;
|
||||
s32 lbl_1_bss_7C[3];
|
||||
AnimData* lbl_1_bss_78;
|
||||
AnimData *lbl_1_bss_78;
|
||||
|
||||
|
||||
void fn_1_6B28(void) {
|
||||
void fn_1_6B28(void)
|
||||
{
|
||||
BoardModelAttrSet(*lbl_1_bss_14, 0x40000002U);
|
||||
lbl_1_bss_98 = NULL;
|
||||
lbl_1_bss_78 = NULL;
|
||||
}
|
||||
|
||||
void fn_1_6B7C(void) {
|
||||
void fn_1_6B7C(void)
|
||||
{
|
||||
Vec sp1C;
|
||||
Vec sp10;
|
||||
s32 spC;
|
||||
|
|
@ -51,7 +52,7 @@ void fn_1_6B7C(void) {
|
|||
for (var_r31 = 0; var_r31 < 2; var_r31++) {
|
||||
lbl_1_bss_9E[var_r31] = BoardPlayerMotionCreate(lbl_1_bss_B6, lbl_1_data_310[var_r31] | lbl_1_data_124[GWPlayer[lbl_1_bss_B6].character]);
|
||||
}
|
||||
lbl_1_bss_A2 = BoardModelCreate(0x790013, NULL, 0);
|
||||
lbl_1_bss_A2 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x13), NULL, 0);
|
||||
BoardModelVisibilitySet(lbl_1_bss_A2, 0);
|
||||
sp1C.x = sp1C.y = sp1C.z = 3.33333f;
|
||||
BoardModelScaleSetV(lbl_1_bss_A2, &sp1C);
|
||||
|
|
@ -63,11 +64,11 @@ void fn_1_6B7C(void) {
|
|||
HuPrcVSleep();
|
||||
}
|
||||
BoardPlayerMotBlendSet(lbl_1_bss_B6, 0, 0xF);
|
||||
|
||||
|
||||
while (BoardPlayerMotBlendCheck(lbl_1_bss_B6) == 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
||||
|
||||
HuPrcSleep(0x3C);
|
||||
BoardAudSeqPause(0, 1, 0x3E8);
|
||||
HuAudFXPlay(0x30D);
|
||||
|
|
@ -94,14 +95,14 @@ void fn_1_6B7C(void) {
|
|||
BoardModelAttrReset(lbl_1_bss_14[0], 0x40000002);
|
||||
omVibrate(lbl_1_bss_B6, 0x7FFF, 6, 6);
|
||||
HuAudFXPlay(0x492);
|
||||
|
||||
|
||||
while (BoardModelMotionTimeGet(lbl_1_bss_14[0]) < 90.0f) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
BoardModelMotionTimeSet(lbl_1_bss_14[0], 90.0f);
|
||||
HuPadRumbleStop(GWPlayer[lbl_1_bss_B6].port);
|
||||
BoardModelHookReset(lbl_1_bss_14[0]);
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
BoardModelHookSet(lbl_1_bss_14[0], lbl_1_data_330[var_r31], lbl_1_bss_AA[var_r31]);
|
||||
}
|
||||
|
|
@ -111,15 +112,16 @@ void fn_1_6B7C(void) {
|
|||
lbl_1_bss_94 = omAddObjEx(boardObjMan, 0x101, 0, 0, -1, fn_1_7284);
|
||||
lbl_1_bss_8C = omAddObjEx(boardObjMan, 0x101, 0, 0, -1, fn_1_78A0);
|
||||
lbl_1_bss_90 = omAddObjEx(boardObjMan, 0x101, 0, 0, -1, NULL);
|
||||
lbl_1_bss_90->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x14, 0x10000000U);
|
||||
lbl_1_bss_90->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x14, MEMORY_DEFAULT_NUM);
|
||||
if (lbl_1_bss_78 == NULL) {
|
||||
lbl_1_bss_78 = HuSprAnimRead(HuDataSelHeapReadNum(0x120000, 0x10000000, HEAP_DATA));
|
||||
lbl_1_bss_78 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_EFFECT, 0x00));
|
||||
HuSprAnimLock(lbl_1_bss_78);
|
||||
}
|
||||
lbl_1_bss_9C = 0;
|
||||
}
|
||||
|
||||
void fn_1_7284(omObjData* arg0) {
|
||||
void fn_1_7284(omObjData *arg0)
|
||||
{
|
||||
if ((lbl_1_bss_9C != 0) && (BoardMGDoneFlagGet() == 1)) {
|
||||
fn_1_77B0();
|
||||
fn_1_7314();
|
||||
|
|
@ -128,12 +130,14 @@ void fn_1_7284(omObjData* arg0) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_72E4(void) {
|
||||
void fn_1_72E4(void)
|
||||
{
|
||||
lbl_1_bss_9C = 1;
|
||||
BoardMGExit();
|
||||
}
|
||||
|
||||
void fn_1_7314(void) {
|
||||
void fn_1_7314(void)
|
||||
{
|
||||
s32 var_r31;
|
||||
|
||||
BoardModelHookReset(lbl_1_bss_14[0]);
|
||||
|
|
@ -148,12 +152,14 @@ void fn_1_7314(void) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_73C0(void) {
|
||||
void fn_1_73C0(void)
|
||||
{
|
||||
omDelObjEx(boardObjMan, lbl_1_bss_90);
|
||||
BoardMGDoneFlagSet(0);
|
||||
}
|
||||
|
||||
void fn_1_7400(void) {
|
||||
void fn_1_7400(void)
|
||||
{
|
||||
|
||||
while (BoardModelMotionTimeGet(lbl_1_bss_14[0]) < 30.0f) {
|
||||
HuPrcVSleep();
|
||||
|
|
@ -162,42 +168,42 @@ void fn_1_7400(void) {
|
|||
BoardModelMotionTimeSet(lbl_1_bss_14[0], 30.0f);
|
||||
lbl_1_bss_98 = HuPrcCreate(fn_1_896C, 0x2004, 0x1000, 0);
|
||||
HuPrcDestructorSet2(lbl_1_bss_98, fn_1_91DC);
|
||||
lbl_1_bss_98->user_data = (void* )7;
|
||||
lbl_1_bss_98->user_data = (void *)7;
|
||||
HuPrcEnd();
|
||||
}
|
||||
|
||||
s32 lbl_1_data_350[14] = {
|
||||
0x0007006D, 0x0007006E, 0x0007006F, 0x00070070,
|
||||
0x00070071, 0x00070072, 0x00070073, 0x00070074,
|
||||
0x00070076, 0x00070077, 0x00070078, 0x00070079,
|
||||
0x0007007A, 0x0007007B
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x6D),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x6E),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x6F),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x70),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x71),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x72),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x73),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x74),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x76),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x77),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x78),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x79),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x7A),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x7B),
|
||||
};
|
||||
|
||||
s16 lbl_1_data_388[92] = {
|
||||
0, 1, -1, 2, 0, -1, 1, 2,
|
||||
0, -1, 2, 1, 0, 2, -1, 1,
|
||||
0, 2, 1, -1, 1, 2, -1, 0,
|
||||
1, 2, 0, -1, 1, -1, 0, 2,
|
||||
1, -1, 2, 0, 1, 0, 2, -1,
|
||||
1, 0, -1, 2, 2, -1, 0, 1,
|
||||
2, -1, 1, 0, 2, 0, 1, -1,
|
||||
2, 0, -1, 1, 2, 1, -1, 0,
|
||||
2, 1, 0, -1, -1, 0, 1, 2,
|
||||
-1, 0, 2, 1, -1, 1, 2, 0,
|
||||
-1, 1, 0, 2, -1, 2, 0, 1,
|
||||
-1, 2, 1, 0
|
||||
};
|
||||
s16 lbl_1_data_388[92] = { 0, 1, -1, 2, 0, -1, 1, 2, 0, -1, 2, 1, 0, 2, -1, 1, 0, 2, 1, -1, 1, 2, -1, 0, 1, 2, 0, -1, 1, -1, 0, 2, 1, -1, 2, 0, 1, 0,
|
||||
2, -1, 1, 0, -1, 2, 2, -1, 0, 1, 2, -1, 1, 0, 2, 0, 1, -1, 2, 0, -1, 1, 2, 1, -1, 0, 2, 1, 0, -1, -1, 0, 1, 2, -1, 0, 2, 1, -1, 1, 2, 0, -1, 1, 0,
|
||||
2, -1, 2, 0, 1, -1, 2, 1, 0 };
|
||||
|
||||
f32 lbl_1_data_440[3] = {-90.0f, 0.0f, 90.0f};
|
||||
f32 lbl_1_data_440[3] = { -90.0f, 0.0f, 90.0f };
|
||||
|
||||
void fn_1_74D0(s16 arg0[3]) {
|
||||
void fn_1_74D0(s16 arg0[3])
|
||||
{
|
||||
f32 temp_f31;
|
||||
s32 var_r31;
|
||||
|
||||
for (var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
lbl_1_bss_B0[var_r31] = arg0[var_r31];
|
||||
}
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
lbl_1_bss_A4[var_r31] = BoardModelCreate(lbl_1_data_350[lbl_1_bss_B0[var_r31]], NULL, 0);
|
||||
if (lbl_1_bss_B0[var_r31] == 0xB) {
|
||||
|
|
@ -214,12 +220,12 @@ void fn_1_74D0(s16 arg0[3]) {
|
|||
}
|
||||
|
||||
for (var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
lbl_1_bss_AA[var_r31] = BoardModelCreate(0x790012, NULL, 1);
|
||||
lbl_1_bss_AA[var_r31] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x12), NULL, 1);
|
||||
BoardModelHookSet(lbl_1_bss_14[0], lbl_1_data_330[var_r31], lbl_1_bss_AA[var_r31]);
|
||||
BoardModelAttrSet(lbl_1_bss_AA[var_r31], 0x40000002);
|
||||
BoardModelMotionTimeSet(lbl_1_bss_AA[var_r31], 10.0f);
|
||||
}
|
||||
|
||||
|
||||
HuAudFXPlay(0x488);
|
||||
BoardModelMotionTimeSet(lbl_1_bss_14[0], 0.0f);
|
||||
BoardModelMotionStartEndSet(lbl_1_bss_14[0], 0, 0x1E);
|
||||
|
|
@ -227,7 +233,8 @@ void fn_1_74D0(s16 arg0[3]) {
|
|||
HuPrcCreate(fn_1_7400, 0x2004, 0x1000, 0);
|
||||
}
|
||||
|
||||
void fn_1_77B0(void) {
|
||||
void fn_1_77B0(void)
|
||||
{
|
||||
HuAudFXPlay(0x489);
|
||||
BoardModelMotionStartEndSet(lbl_1_bss_14[0], 0x5A, 0x78);
|
||||
BoardModelMotionTimeSet(lbl_1_bss_14[0], 90.0f);
|
||||
|
|
@ -243,7 +250,8 @@ void fn_1_77B0(void) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_78A0(omObjData* arg0) {
|
||||
void fn_1_78A0(omObjData *arg0)
|
||||
{
|
||||
if (arg0->work[0] == 0) {
|
||||
arg0->work[0] = MGSeqCreate(3, 0);
|
||||
return;
|
||||
|
|
@ -254,7 +262,8 @@ void fn_1_78A0(omObjData* arg0) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_7928(omObjData* arg0) {
|
||||
void fn_1_7928(omObjData *arg0)
|
||||
{
|
||||
Process *temp;
|
||||
if (((u32)lbl_1_bss_98->user_data & 0x10) != 0) {
|
||||
temp = HuPrcCreate(fn_1_799C, 0x2004, 0x1800, 0);
|
||||
|
|
@ -263,7 +272,8 @@ void fn_1_7928(omObjData* arg0) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_799C(void) {
|
||||
void fn_1_799C(void)
|
||||
{
|
||||
Vec sp2C;
|
||||
Vec sp20;
|
||||
Vec sp14;
|
||||
|
|
@ -275,7 +285,7 @@ void fn_1_799C(void) {
|
|||
s32 temp_r31;
|
||||
s32 var_r28;
|
||||
s32 var_r29;
|
||||
omObjData* temp_r30;
|
||||
omObjData *temp_r30;
|
||||
|
||||
temp_r30 = HuPrcCurrentGet()->user_data;
|
||||
BoardPlayerPosGet(lbl_1_bss_B6, &sp2C);
|
||||
|
|
@ -285,7 +295,7 @@ void fn_1_799C(void) {
|
|||
PSVECSubtract(&sp2C, &sp20, &sp14);
|
||||
temp_f30 = PSVECMag(&sp14);
|
||||
PSVECScale(&sp14, &sp14, 0.016666668);
|
||||
|
||||
|
||||
for (var_r29 = 0; var_r29 < 0x3C; var_r29++) {
|
||||
BoardModelPosGet(lbl_1_bss_A4[temp_r31], &sp20);
|
||||
PSVECAdd(&sp20, &sp14, &sp20);
|
||||
|
|
@ -344,7 +354,7 @@ void fn_1_799C(void) {
|
|||
HuPrcVSleep();
|
||||
}
|
||||
HuPrcSleep(0x1E);
|
||||
|
||||
|
||||
while (HuAudSStreamStatGet(temp_r27) != 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
@ -356,13 +366,15 @@ void fn_1_799C(void) {
|
|||
HuPrcEnd();
|
||||
}
|
||||
|
||||
void fn_1_7E4C(omObjData* arg0) {
|
||||
void fn_1_7E4C(omObjData *arg0)
|
||||
{
|
||||
lbl_1_bss_9C = 1;
|
||||
BoardMGExit();
|
||||
omDelObjEx(boardObjMan, arg0);
|
||||
}
|
||||
|
||||
void fn_1_7E94(dataCopy* arg0) {
|
||||
void fn_1_7E94(dataCopy *arg0)
|
||||
{
|
||||
if (--arg0->unk_02 == 0) {
|
||||
arg0->unk_02 = 0x3C;
|
||||
if (--arg0->unk_00 >= 0) {
|
||||
|
|
@ -371,19 +383,20 @@ void fn_1_7E94(dataCopy* arg0) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_7F04(omObjData* arg0) {
|
||||
void fn_1_7F04(omObjData *arg0)
|
||||
{
|
||||
f32 sp8[2];
|
||||
s32 var_r30;
|
||||
s32 var_r28;
|
||||
dataCopy* temp_r31;
|
||||
dataCopy *temp_r31;
|
||||
|
||||
temp_r31 = arg0->data;
|
||||
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);
|
||||
HuWinMesMaxSizeGet(1, sp8, MAKE_MESSID(0x27, 0x0E));
|
||||
temp_r31->unk_06 = HuWinCreate(-10000.0f, 344.0f, sp8[0], sp8[1], 0);
|
||||
HuWinMesSet(temp_r31->unk_06, 0x27000E);
|
||||
HuWinMesSet(temp_r31->unk_06, MAKE_MESSID(0x27, 0x0E));
|
||||
HuWinBGTPLvlSet(temp_r31->unk_06, 0.0f);
|
||||
HuWinMesSpeedSet(temp_r31->unk_06, 0);
|
||||
temp_r31->unk_08 = 1;
|
||||
|
|
@ -409,26 +422,28 @@ void fn_1_7F04(omObjData* arg0) {
|
|||
arg0->func = fn_1_80D8;
|
||||
}
|
||||
|
||||
void fn_1_80D8(omObjData* arg0) {
|
||||
void fn_1_80D8(omObjData *arg0)
|
||||
{
|
||||
s32 sp10;
|
||||
s32 spC;
|
||||
s32 sp8;
|
||||
f32 var_f31;
|
||||
s32 temp_r30;
|
||||
s32 var_r29;
|
||||
dataCopy* temp_r31;
|
||||
dataCopy *temp_r31;
|
||||
|
||||
temp_r31 = arg0->data;
|
||||
fn_1_7E94(temp_r31);
|
||||
temp_r30 = GWPlayer[lbl_1_bss_B6].port;
|
||||
if (GWPlayer[lbl_1_bss_B6].com != 0) {
|
||||
fn_1_8798(temp_r31, &sp10, &spC, &sp8);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
sp10 = HuPadStkX[temp_r30];
|
||||
spC = HuPadStkY[temp_r30];
|
||||
sp8 = HuPadBtnDown[temp_r30];
|
||||
}
|
||||
|
||||
|
||||
if (((sp8 & 0x100) != 0) || (temp_r31->unk_00 < 0)) {
|
||||
MGSeqParamSet(temp_r31->unk_04, 2, -1);
|
||||
HuWinKill(temp_r31->unk_06);
|
||||
|
|
@ -442,12 +457,14 @@ void fn_1_80D8(omObjData* arg0) {
|
|||
if (var_f31 < 0.0f) {
|
||||
var_f31 += 360.0f;
|
||||
}
|
||||
|
||||
|
||||
if ((var_f31 > 170.0f) && (var_f31 < 190.0f)) {
|
||||
var_r29 = 0;
|
||||
} else if ((var_f31 > 260.0f) && (var_f31 < 280.0f)) {
|
||||
}
|
||||
else if ((var_f31 > 260.0f) && (var_f31 < 280.0f)) {
|
||||
var_r29 = 1;
|
||||
} else if ((var_f31 < 10.0f) || (var_f31 > 350.0f)) {
|
||||
}
|
||||
else if ((var_f31 < 10.0f) || (var_f31 > 350.0f)) {
|
||||
var_r29 = 2;
|
||||
}
|
||||
if (var_r29 != -1) {
|
||||
|
|
@ -457,9 +474,10 @@ void fn_1_80D8(omObjData* arg0) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_8410(omObjData* arg0) {
|
||||
void fn_1_8410(omObjData *arg0)
|
||||
{
|
||||
s32 temp_r30;
|
||||
dataCopy* temp_r31;
|
||||
dataCopy *temp_r31;
|
||||
|
||||
temp_r31 = arg0->data;
|
||||
if (BoardPlayerMotionTimeGet(lbl_1_bss_B6) >= 30.0f) {
|
||||
|
|
@ -470,13 +488,14 @@ void fn_1_8410(omObjData* arg0) {
|
|||
temp_r30 |= 0x1C0;
|
||||
lbl_1_bss_98 = HuPrcCreate(fn_1_896C, 0x2004, 0x4000, 0);
|
||||
HuPrcDestructorSet2(lbl_1_bss_98, fn_1_91DC);
|
||||
lbl_1_bss_98->user_data = (void*)temp_r30;
|
||||
lbl_1_bss_98->user_data = (void *)temp_r30;
|
||||
lbl_1_bss_8C->work[0] = temp_r31->unk_08;
|
||||
arg0->func = fn_1_850C;
|
||||
}
|
||||
}
|
||||
|
||||
void fn_1_850C(omObjData* arg0) {
|
||||
void fn_1_850C(omObjData *arg0)
|
||||
{
|
||||
Vec sp14;
|
||||
Vec sp8;
|
||||
f32 temp_f31;
|
||||
|
|
@ -495,7 +514,8 @@ void fn_1_850C(omObjData* arg0) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_8668(omObjData* arg0) {
|
||||
void fn_1_8668(omObjData *arg0)
|
||||
{
|
||||
s32 var_r30;
|
||||
|
||||
if (arg0->work[0] == 0) {
|
||||
|
|
@ -504,7 +524,7 @@ void fn_1_8668(omObjData* arg0) {
|
|||
arg0->func = NULL;
|
||||
lbl_1_bss_8C->func = fn_1_7928;
|
||||
BoardModelKill(lbl_1_bss_A2);
|
||||
|
||||
|
||||
for (var_r30 = 0; var_r30 < 2; var_r30++) {
|
||||
BoardPlayerMotionKill(lbl_1_bss_B6, lbl_1_bss_9E[var_r30]);
|
||||
}
|
||||
|
|
@ -513,7 +533,8 @@ void fn_1_8668(omObjData* arg0) {
|
|||
arg0->work[0] -= 1;
|
||||
}
|
||||
|
||||
void fn_1_8798(dataCopy* arg0, s32* arg1, s32* arg2, s32* arg3) {
|
||||
void fn_1_8798(dataCopy *arg0, s32 *arg1, s32 *arg2, s32 *arg3)
|
||||
{
|
||||
*arg1 = *arg2 = *arg3 = 0;
|
||||
if (arg0->unk_10 != 0) {
|
||||
arg0->unk_10 -= 1;
|
||||
|
|
@ -532,17 +553,19 @@ void fn_1_8798(dataCopy* arg0, s32* arg1, s32* arg2, s32* arg3) {
|
|||
*arg2 = (frandBool() * 0x8C) - 0x46;
|
||||
}
|
||||
|
||||
void* fn_1_8884(void) {
|
||||
void *fn_1_8884(void)
|
||||
{
|
||||
if (lbl_1_bss_98 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
return lbl_1_bss_98->user_data;
|
||||
}
|
||||
|
||||
void fn_1_88B8(void) {
|
||||
void fn_1_88B8(void)
|
||||
{
|
||||
s32 userData = (s32)lbl_1_bss_98->user_data;
|
||||
userData |= 8;
|
||||
lbl_1_bss_98->user_data = (void* ) (userData);
|
||||
lbl_1_bss_98->user_data = (void *)(userData);
|
||||
|
||||
while (((u32)fn_1_8884() & 0x20) == 0) {
|
||||
HuPrcVSleep();
|
||||
|
|
@ -551,7 +574,8 @@ void fn_1_88B8(void) {
|
|||
lbl_1_bss_98 = NULL;
|
||||
}
|
||||
|
||||
void fn_1_896C(void) {
|
||||
void fn_1_896C(void)
|
||||
{
|
||||
Vec sp18;
|
||||
Vec spC;
|
||||
f32 sp8;
|
||||
|
|
@ -565,7 +589,7 @@ void fn_1_896C(void) {
|
|||
ParticleData *var_r27;
|
||||
|
||||
temp_r30 = (u32)HuPrcCurrentGet()->user_data;
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
var_r29 = (1 << var_r31);
|
||||
if ((temp_r30 & var_r29) != 0) {
|
||||
|
|
@ -573,7 +597,8 @@ void fn_1_896C(void) {
|
|||
if ((temp_r30 & 0x80) != 0) {
|
||||
BoardModelMotionStartEndSet(lbl_1_bss_AA[var_r31], 0, 0x28);
|
||||
BoardModelMotionTimeSet(lbl_1_bss_AA[var_r31], 0.0f);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
BoardModelMotionStartEndSet(lbl_1_bss_AA[var_r31], 0xA, 0x28);
|
||||
BoardModelMotionTimeSet(lbl_1_bss_AA[var_r31], 10.0f);
|
||||
}
|
||||
|
|
@ -581,11 +606,12 @@ void fn_1_896C(void) {
|
|||
}
|
||||
if ((temp_r30 & 0x80) != 0) {
|
||||
HuPrcSleep(0x19);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
HuPrcSleep(0xF);
|
||||
}
|
||||
spC.x = spC.y = spC.z = 0.0f;
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
var_r29 = (1 << var_r31);
|
||||
if ((temp_r30 & var_r29) != 0) {
|
||||
|
|
@ -606,7 +632,8 @@ void fn_1_896C(void) {
|
|||
if ((temp_r30 & 0x100) != 0) {
|
||||
lbl_1_bss_88 = HuAudFXPlay(0x35F);
|
||||
HuAudFXPlay(0x310);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
HuAudFXPlay(0x362);
|
||||
}
|
||||
}
|
||||
|
|
@ -614,7 +641,7 @@ void fn_1_896C(void) {
|
|||
temp_f29 = 150.0f + sp18.y;
|
||||
sp8 = 0.0f;
|
||||
var_f31 = 12.0f;
|
||||
|
||||
|
||||
while (1) {
|
||||
for (var_r28 = 0, var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
var_r29 = (1 << var_r31);
|
||||
|
|
@ -626,7 +653,7 @@ void fn_1_896C(void) {
|
|||
}
|
||||
|
||||
spC.x = spC.y = spC.z = sp8;
|
||||
BoardModelScaleSetV(lbl_1_bss_A4[var_r31], (Vec* ) &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) {
|
||||
|
|
@ -639,7 +666,8 @@ void fn_1_896C(void) {
|
|||
var_f31 *= 0.95f;
|
||||
if (var_r28 > 0) {
|
||||
HuPrcVSleep();
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -650,12 +678,12 @@ void fn_1_896C(void) {
|
|||
BoardModelScaleSetV(lbl_1_bss_A4[var_r31], &spC);
|
||||
}
|
||||
}
|
||||
temp_r30 = (u32) HuPrcCurrentGet()->user_data | 0x10;
|
||||
HuPrcCurrentGet()->user_data = (void*)temp_r30;
|
||||
temp_r30 = (u32)HuPrcCurrentGet()->user_data | 0x10;
|
||||
HuPrcCurrentGet()->user_data = (void *)temp_r30;
|
||||
var_f30 = 0.0f;
|
||||
|
||||
while (1) {
|
||||
temp_r30 = (u32) HuPrcCurrentGet()->user_data;
|
||||
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);
|
||||
|
|
@ -670,7 +698,8 @@ void fn_1_896C(void) {
|
|||
var_f30 -= 360.0f;
|
||||
}
|
||||
HuPrcVSleep();
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -689,7 +718,7 @@ void fn_1_896C(void) {
|
|||
sp8 = 0.0f;
|
||||
}
|
||||
spC.x = spC.y = spC.z = sp8;
|
||||
BoardModelScaleSetV(lbl_1_bss_A4[var_r31], (Vec* ) &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)) {
|
||||
|
|
@ -704,11 +733,12 @@ void fn_1_896C(void) {
|
|||
var_f31 *= 0.98f;
|
||||
if (var_r28 > 0) {
|
||||
HuPrcVSleep();
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for (var_r31 = 0; var_r31 < 3; var_r31++) {
|
||||
var_r29 = (1 << var_r31);
|
||||
if ((temp_r30 & var_r29) != 0) {
|
||||
|
|
@ -719,13 +749,14 @@ void fn_1_896C(void) {
|
|||
}
|
||||
temp_r30 = (u32)HuPrcCurrentGet()->user_data;
|
||||
temp_r30 |= 0x20;
|
||||
HuPrcCurrentGet()->user_data = (void*)temp_r30;
|
||||
HuPrcCurrentGet()->user_data = (void *)temp_r30;
|
||||
while (1) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
}
|
||||
|
||||
void fn_1_91DC(void) {
|
||||
void fn_1_91DC(void)
|
||||
{
|
||||
u32 temp_r30;
|
||||
s32 var_r29;
|
||||
s32 var_r31;
|
||||
|
|
@ -741,9 +772,10 @@ void fn_1_91DC(void) {
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_9268(ModelData* model, ParticleData* particle, f32 (*matrix)[4]) {
|
||||
void fn_1_9268(ModelData *model, ParticleData *particle, f32 (*matrix)[4])
|
||||
{
|
||||
Vec sp8;
|
||||
HsfanimStruct01* var_r31;
|
||||
HsfanimStruct01 *var_r31;
|
||||
f32 temp_f30;
|
||||
f32 temp_f29;
|
||||
f32 temp_f31;
|
||||
|
|
@ -761,12 +793,13 @@ void fn_1_9268(ModelData* model, ParticleData* particle, f32 (*matrix)[4]) {
|
|||
BoardModelScaleGet(particle->unk_02, &sp8);
|
||||
temp_f31 = sp8.x;
|
||||
BoardModelPosGet(particle->unk_02, &sp8);
|
||||
|
||||
|
||||
for (var_r29 = 0; var_r29 < 0x16; var_r29++) {
|
||||
var_r31 = particle->unk_48;
|
||||
|
||||
for (var_r28 = 0; var_r28 < particle->unk_30; var_r28++, var_r31++) {
|
||||
if (var_r31->unk2C == 0.0f) break;
|
||||
if (var_r31->unk2C == 0.0f)
|
||||
break;
|
||||
}
|
||||
if (var_r28 != particle->unk_30) {
|
||||
temp_f30 = 360.0f * (0.003921569f * (s32)(frand() & 0xFF));
|
||||
|
|
@ -790,4 +823,4 @@ void fn_1_9268(ModelData* model, ParticleData* particle, f32 (*matrix)[4]) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#include "game/board/player.h"
|
||||
|
||||
// data
|
||||
s32 lbl_1_data_1A8[3] = { 0x0079001F, 0x00790020, 0xFFFFFFFF };
|
||||
s32 lbl_1_data_1A8[3] = { DATA_MAKE_NUM(DATADIR_W05, 0x1F), DATA_MAKE_NUM(DATADIR_W05, 0x20), DATA_NUM_LISTEND };
|
||||
char *lbl_1_data_1C4[2] = { "monkyA", "monkyB"};
|
||||
s32 lbl_1_data_1CC[3] = { 0x78, 0x6F, 0x70 };
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ void fn_1_2B40(void) {
|
|||
BoardModelMotionTimeSet(lbl_1_bss_14[3], 0.0f);
|
||||
|
||||
for (var_r31 = 0; var_r31 < 2; var_r31++) {
|
||||
lbl_1_bss_4E[var_r31] = BoardModelCreate(0x79001E, lbl_1_data_1A8, 0);
|
||||
lbl_1_bss_4E[var_r31] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x1E), lbl_1_data_1A8, 0);
|
||||
BoardModelAttrSet(lbl_1_bss_4E[var_r31], 0x40000001);
|
||||
}
|
||||
BoardModelHookSet(lbl_1_bss_14[2], lbl_1_data_1C4[0], lbl_1_bss_4E[0]);
|
||||
|
|
@ -53,8 +53,8 @@ void fn_1_2C7C(s32 arg0) {
|
|||
BoardModelPosGet(lbl_1_bss_4A, &lbl_1_bss_38);
|
||||
lbl_1_bss_38.x -= 140.0f;
|
||||
}
|
||||
lbl_1_bss_44[0] = BoardModelCreate(0x79001C, NULL, 0);
|
||||
lbl_1_bss_44[1] = BoardModelCreate(0x79001D, NULL, 0);
|
||||
lbl_1_bss_44[0] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x1C), NULL, 0);
|
||||
lbl_1_bss_44[1] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x1D), NULL, 0);
|
||||
BoardModelVisibilitySet(lbl_1_bss_44[0], 0);
|
||||
BoardModelVisibilitySet(lbl_1_bss_44[1], 0);
|
||||
BoardModelAttrSet(lbl_1_bss_44[0], 0x40000001);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue