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

use DATA_MAKE_NUM macros

Browse source
This commit is contained in:
dbalatoni13 2025-01-11 15:48:46 +01:00
parent 33bcb055f5
commit ae4f750f81
17 changed files with 2221 additions and 1969 deletions
Download patch file Download diff file Expand all files Collapse all files

1149
src/REL/m418Dll/main.c
View file

File diff suppressed because it is too large Load diff

113
src/REL/m420dll/player.c
View file

@ -59,16 +59,111 @@ M420DllUnkStruct2 lbl_1_data_50[4] = {
{ 0x19, 0x01, 0x14, 0x04, 0x0A, 0x08, 0x01, 0x01 },
};
// TODO MAKE_NUM
static const s32 lbl_1_rodata_F8[8][0xB] = {
{ 0x5F0000, 0x5F0017, 0x5F0018, 0x5F0068, 0x5F0069, 0x5F006A, 0x5F0035, 0x5F006B, 0x5F006E, 0x5F0049, 0x33001B },
{ 0x1A0000, 0x1A0017, 0x1A0018, 0x1A0068, 0x1A0069, 0x1A006A, 0x1A0035, 0x1A006B, 0x1A006E, 0x1A0049, 0x33001C },
{ 0x6D0000, 0x6D0017, 0x6D0018, 0x6D0068, 0x6D0069, 0x6D006A, 0x6D0035, 0x6D006B, 0x6D006E, 0x6D0049, 0x33001D },
{ 0x8A0000, 0x8A0017, 0x8A0018, 0x8A0068, 0x8A0069, 0x8A006A, 0x8A0035, 0x8A006B, 0x8A006E, 0x8A0049, 0x33001E },
{ 0x850000, 0x850017, 0x850018, 0x850068, 0x850069, 0x85006A, 0x850035, 0x85006B, 0x85006E, 0x850049, 0x33001F },
{ 0x110000, 0x110017, 0x110018, 0x110068, 0x110069, 0x11006A, 0x110035, 0x11006B, 0x11006E, 0x110049, 0x330020 },
{ 0x0D0000, 0x0D0017, 0x0D0018, 0x0D0068, 0x0D0069, 0x0D006A, 0x0D0035, 0x0D006B, 0x0D006E, 0x0D0049, 0x330021 },
{ 0x810000, 0x810017, 0x810018, 0x810068, 0x810069, 0x81006A, 0x810035, 0x81006B, 0x81006E, 0x810049, 0x330022 },
{
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x68),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x69),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x6A),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x35),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x6B),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x6E),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x49),
0x33001B,
},
{
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x00),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x17),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x18),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x68),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x69),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x6A),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x35),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x6B),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x6E),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x49),
0x33001C,
},
{
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x00),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x17),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x18),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x68),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x69),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x6A),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x35),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x6B),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x6E),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x49),
0x33001D,
},
{
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x00),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x17),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x18),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x68),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x69),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x6A),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x35),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x6B),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x6E),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x49),
0x33001E,
},
{
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x00),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x17),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x18),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x68),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x69),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x6A),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x35),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x6B),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x6E),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x49),
0x33001F,
},
{
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x00),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x17),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x18),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x68),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x69),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x6A),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x35),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x6B),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x6E),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x49),
0x330020,
},
{
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x00),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x17),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x18),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x68),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x69),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x6A),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x35),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x6B),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x6E),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x49),
0x330021,
},
{
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x00),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x17),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x18),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x68),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x69),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x6A),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x35),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x6B),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x6E),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x49),
0x330022,
},
};
static const Vec lbl_1_rodata_258[4][2] = {
{ { -372.0f, 300.0f, -220.0f }, { 0.0f, 50.0f, 0.0f } },

330
src/REL/m424Dll/claw.c
View file

@ -1,6 +1,5 @@
#include "REL/m424Dll.h"
#include "math.h"
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
@ -8,6 +7,8 @@
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/pad.h"
#include "math.h"
// STRUCT
typedef struct _M424DllClawStruct {
@ -66,8 +67,8 @@ typedef struct _M424DllClawStruct3 {
} M424DllClawStruct3; // sizeof 0x8
// BSS
Process* lbl_1_bss_6DC;
omObjData* lbl_1_bss_6D8;
Process *lbl_1_bss_6DC;
omObjData *lbl_1_bss_6D8;
s32 lbl_1_bss_6D0[2];
s32 lbl_1_bss_6CC;
s32 lbl_1_bss_6C8;
@ -77,25 +78,30 @@ M424DllClawStruct3 lbl_1_bss_640[0x10];
// DATA
Vec lbl_1_data_1E0[4] = {
{ 950.0f, 275.0f, 0.0f },
{ 950.0f, 275.0f, 0.0f },
{ 900.0f, 360.0f, 320.0f },
{ 494.99996f, 220.0f, 494.99996f },
{ 0.0f, 225.0f, 0.0f },
{ 494.99996f, 220.0f, 494.99996f },
{ 0.0f, 225.0f, 0.0f },
};
f32 lbl_1_data_210[3] = { 12.0f, 11.0f, 17.5f };
char lbl_1_data_21C[12][0x10] = {
"tsume10", "tsume11", "tsume12",
"tsume20", "tsume21", "tsume22",
"tsume30", "tsume31", "tsume32",
"tsume40", "tsume41", "tsume42",
};
u8 lbl_1_data_2DC[12] = {
1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0
};
s32 lbl_1_data_2E8[9] = {
0x5F0000, 0x5F0002, 0x5F0003, 0x5F0005, 0x5F0006,
0x5F0042, 0x5F0008, 0x5F0017, 0x5F0018
"tsume10",
"tsume11",
"tsume12",
"tsume20",
"tsume21",
"tsume22",
"tsume30",
"tsume31",
"tsume32",
"tsume40",
"tsume41",
"tsume42",
};
u8 lbl_1_data_2DC[12] = { 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 };
s32 lbl_1_data_2E8[9] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x06), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x42),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x08), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18) };
Vec lbl_1_data_30C = { 0.0f, 0.0f, 0.0f };
// PROTO
@ -104,22 +110,23 @@ void fn_1_8924(u8, s32);
u8 fn_1_8950(u8);
u8 fn_1_897C(u8);
u8 fn_1_89A8(u8);
Vec* fn_1_89D4(u8);
void fn_1_94D0(omObjData*);
void fn_1_9A64(omObjData*);
void fn_1_AE58(omObjData*);
void fn_1_AE64(omObjData*);
Vec *fn_1_89D4(u8);
void fn_1_94D0(omObjData *);
void fn_1_9A64(omObjData *);
void fn_1_AE58(omObjData *);
void fn_1_AE64(omObjData *);
u16 fn_1_B79C(f32, f32, f32);
s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3);
s32 fn_1_B9E0(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2, s32 arg3);
void fn_1_C604(s32, s32);
s32 fn_1_C878(s16, const char*, Mtx, s32);
void fn_1_C99C(HsfObject*, Mtx, const char*, Mtx);
s32 fn_1_C878(s16, const char *, Mtx, s32);
void fn_1_C99C(HsfObject *, Mtx, const char *, Mtx);
void fn_1_CE74(s32);
void fn_1_CF00(Process*);
void fn_1_CF80(omObjData*);
void fn_1_CF00(Process *);
void fn_1_CF80(omObjData *);
s32 fn_1_D010(s32, s32);
omObjData* fn_1_93F0(Process* arg0) {
omObjData *fn_1_93F0(Process *arg0)
{
lbl_1_bss_6DC = arg0;
lbl_1_bss_6D8 = omAddObjEx(arg0, 0x40, 5, 9, -1, fn_1_94D0);
lbl_1_bss_6CC = 0;
@ -130,13 +137,15 @@ omObjData* fn_1_93F0(Process* arg0) {
return lbl_1_bss_6D8;
}
void fn_1_94A4(void) {
void fn_1_94A4(void)
{
fn_1_AE58(lbl_1_bss_6D8);
}
void fn_1_94D0(omObjData* arg0) {
void fn_1_94D0(omObjData *arg0)
{
s32 var_r29;
M424DllClawStruct* var_r31;
M424DllClawStruct *var_r31;
var_r31 = arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x1B0, 0x10000000);
memset(var_r31, 0, 0x1B0);
@ -170,7 +179,7 @@ void fn_1_94D0(omObjData* arg0) {
}
var_r31->unk184 = -1;
var_r31->unk30 = lbl_1_data_30C;
for (var_r29 = 0; var_r29 < 0xC; var_r29++) {
var_r31->unk3C[var_r29] = lbl_1_data_30C;
var_r31->unkCC[var_r29] = lbl_1_data_30C;
@ -218,7 +227,8 @@ void fn_1_94D0(omObjData* arg0) {
arg0->func = fn_1_9A64;
}
void fn_1_9A64(omObjData* arg0) {
void fn_1_9A64(omObjData *arg0)
{
Mtx sp74;
Mtx sp44;
Vec sp38;
@ -228,7 +238,7 @@ void fn_1_9A64(omObjData* arg0) {
Vec sp8;
f32 var_f31;
f32 temp_f30;
M424DllClawStruct* temp_r31;
M424DllClawStruct *temp_r31;
s32 var_r29;
s32 temp_r28;
s32 var_r27;
@ -242,13 +252,15 @@ void fn_1_9A64(omObjData* arg0) {
if (temp_r31->unk6 != 0) {
fn_1_AE64(arg0);
}
} else {
}
else {
temp_r31->unkC = 0;
temp_r31->unkA = 0;
}
if (fn_1_FE0() <= 1) {
var_r25 = -1;
} else {
}
else {
var_r25 = temp_r31->unk10;
}
switch (var_r25) {
@ -262,7 +274,8 @@ void fn_1_9A64(omObjData* arg0) {
if (fn_1_FE0() > 4) {
temp_r31->unk10 = 10;
temp_r31->unk12 = 0;
} else if ((temp_r31->unkA & 0x100) != 0) {
}
else if ((temp_r31->unkA & 0x100) != 0) {
HuAudFXPlay(0x62A);
temp_r31->unk184 = HuAudFXPlay(0x621);
temp_r31->unk10 = 2;
@ -275,7 +288,8 @@ void fn_1_9A64(omObjData* arg0) {
if (temp_r31->unk24 >= 1.0f) {
temp_r31->unk24 = 1.0f;
temp_r31->unk20 = -1.0f;
} else {
}
else {
if (temp_r31->unk24 <= 0.0f) {
temp_r31->unk24 = 0.0f;
temp_r31->unk20 = 1.0f;
@ -289,7 +303,8 @@ void fn_1_9A64(omObjData* arg0) {
HuAudFXPlay(0x622);
temp_r31->unk10 = 10;
temp_r31->unk12 = 0;
} else if (((temp_r31->unkC & 0x100) == 0) || (temp_r31->unk12 >= 360.0f)) {
}
else if (((temp_r31->unkC & 0x100) == 0) || (temp_r31->unk12 >= 360.0f)) {
if (temp_r31->unk184 != -1) {
HuAudFXStop(temp_r31->unk184);
temp_r31->unk184 = -1;
@ -363,23 +378,27 @@ void fn_1_9A64(omObjData* arg0) {
temp_r31->unk28 = 0.0f;
if (temp_r31->unk168 != -1) {
var_r27 = fn_1_897C(temp_r31->unk168);
} else {
}
else {
var_r27 = -1;
}
if (temp_r31->unk168 == -1) {
if (fn_1_FE0() > 4) {
temp_r31->unk10 = 10;
temp_r31->unk12 = 0;
} else {
}
else {
temp_r31->unk10 = 8;
temp_r31->unk12 = 0;
HuAudFXPlay(0x625);
}
} else if (var_r27 == 0) {
}
else if (var_r27 == 0) {
temp_r31->unk10 = 8;
temp_r31->unk12 = 0;
HuAudFXPlay(0x625);
} else {
}
else {
if (temp_r31->unk168 != -1) {
fn_1_252C(-0.01f, 0x3C);
fn_1_2670(0x75, 0);
@ -394,15 +413,18 @@ void fn_1_9A64(omObjData* arg0) {
case 7:
if (arg0->rot.y < temp_r31->unk180) {
arg0->rot.y += 1.25f;
} else if (arg0->rot.y > temp_r31->unk180) {
}
else if (arg0->rot.y > temp_r31->unk180) {
arg0->rot.y = temp_r31->unk180;
}
var_f31 = 0.35f - temp_r31->unk24;
if (var_f31 > 0.0125f) {
temp_r31->unk24 += 0.0125f;
} else if (var_f31 < -0.0125f) {
}
else if (var_f31 < -0.0125f) {
temp_r31->unk24 -= 0.0125f;
} else {
}
else {
temp_r31->unk24 = 0.35f;
}
if ((arg0->rot.y == temp_r31->unk180) && (0.35f == temp_r31->unk24)) {
@ -423,7 +445,8 @@ void fn_1_9A64(omObjData* arg0) {
var_r26 = fn_1_89A8(temp_r31->unk168);
HuAudCharVoicePlay(var_r26, 0x123);
fn_1_D010(0x628, 30);
} else {
}
else {
fn_1_8924(temp_r31->unk168, 2);
}
temp_r31->unk16C = temp_r31->unk168;
@ -451,12 +474,14 @@ void fn_1_9A64(omObjData* arg0) {
temp_r31->unk12++;
if (arg0->rot.y > 270.0f) {
arg0->rot.y -= 1.25f;
} else if (arg0->rot.y < 270.0f) {
}
else if (arg0->rot.y < 270.0f) {
arg0->rot.y = 270.0f;
}
if (temp_r31->unk24 > 0.025f) {
temp_r31->unk24 -= 0.025f;
} else if (temp_r31->unk24 < 0.05f) {
}
else if (temp_r31->unk24 < 0.05f) {
temp_r31->unk24 = 0.0f;
}
if ((270.0f == arg0->rot.y) && (0.0f == temp_r31->unk24)) {
@ -482,7 +507,8 @@ void fn_1_9A64(omObjData* arg0) {
temp_r31->unk18 = fn_1_B79C(lbl_1_data_1E0[0].y, lbl_1_data_1E0[1].y, temp_r31->unk1C);
temp_r31->unk10 = 11;
temp_r31->unk12 = 0;
} else {
}
else {
temp_r31->unk10 = 13;
temp_r31->unk12 = 0;
}
@ -520,7 +546,8 @@ void fn_1_9A64(omObjData* arg0) {
temp_r31->unk10 = 0xC;
}
}
} else {
}
else {
sp14 = lbl_1_data_1E0[var_r29];
sp8 = lbl_1_data_1E0[var_r29 + 1];
var_f31 = atan2d((sp8.x - arg0->trans.x), (sp8.z - arg0->trans.z));
@ -551,7 +578,8 @@ void fn_1_9A64(omObjData* arg0) {
if (fn_1_B888() != 0) {
temp_r31->unk10 = 14;
temp_r31->unk12 = 0;
} else {
}
else {
temp_r31->unk10 = 15;
temp_r31->unk12 = 0;
}
@ -585,7 +613,7 @@ void fn_1_9A64(omObjData* arg0) {
temp_r31->unk30.x = sp74[0][3];
temp_r31->unk30.y = sp74[1][3];
temp_r31->unk30.z = sp74[2][3];
for (var_r29 = 0; var_r29 < 0xC; var_r29++) {
PSMTXCopy(sp44, sp74);
fn_1_C878(arg0->model[4], lbl_1_data_21C[var_r29], sp74, 1);
@ -611,25 +639,17 @@ void fn_1_9A64(omObjData* arg0) {
temp_r31->unk164 = 1;
}
void fn_1_AE58(omObjData* arg0) {
void fn_1_AE58(omObjData *arg0)
{
arg0->func = NULL;
}
f32 lbl_1_data_36C[4][2] = {
30.0f, 24.0f,
24.0f, 18.0f,
12.0f, 6.0f,
6.0f, 0.0f
};
f32 lbl_1_data_36C[4][2] = { 30.0f, 24.0f, 24.0f, 18.0f, 12.0f, 6.0f, 6.0f, 0.0f };
f32 lbl_1_data_38C[4][2] = {
0.2f, 0.15f,
0.15f, 0.1f,
0.1f, 0.05f,
0.05f, 0.0f
};
f32 lbl_1_data_38C[4][2] = { 0.2f, 0.15f, 0.15f, 0.1f, 0.1f, 0.05f, 0.05f, 0.0f };
void fn_1_AE64(omObjData* arg0) {
void fn_1_AE64(omObjData *arg0)
{
M424DllClawStruct2 sp20[8];
M424DllClawStruct2 sp10;
s32 spC;
@ -642,12 +662,12 @@ void fn_1_AE64(omObjData* arg0) {
f32 var_f24;
s32 temp_r24;
s32 temp_r23;
M424DllClawStruct* temp_r31;
Vec* var_r30;
M424DllClawStruct *temp_r31;
Vec *var_r30;
s32 var_r29;
s32 var_r28;
s32 var_r27;
M424DllBallStruct2* var_r26;
M424DllBallStruct2 *var_r26;
s32 var_r25;
spC = 0;
@ -693,7 +713,7 @@ void fn_1_AE64(omObjData* arg0) {
if (var_r28 != 0) {
for (var_r29 = 0; var_r29 < (var_r28 - 1); var_r29++) {
var_r27 = var_r29 + 1;
for (;var_r27 < var_r28; var_r27++) {
for (; var_r27 < var_r28; var_r27++) {
if (sp20[var_r29].unkC < sp20[var_r27].unkC) {
sp10 = sp20[var_r29];
sp20[var_r29] = sp20[var_r27];
@ -729,7 +749,8 @@ void fn_1_AE64(omObjData* arg0) {
var_f29 = (var_f29 - 350.0f) / 250.0f + temp_r23;
if (var_f29 < 0.0f) {
var_f29 = 0.0f;
} else if (var_f29 > 1.0f) {
}
else if (var_f29 > 1.0f) {
var_f29 = 1.0f;
}
temp_r31->unk194 = (60.0f * (1.0f - var_f29));
@ -748,7 +769,8 @@ void fn_1_AE64(omObjData* arg0) {
temp_r31->unk1AC = 0;
return;
}
} else {
}
else {
if (var_f31 >= (15.0f + temp_r31->unk1A8)) {
temp_r31->unk1A0++;
temp_r31->unk1A8 = var_f31;
@ -766,7 +788,8 @@ void fn_1_AE64(omObjData* arg0) {
if (++temp_r31->unk1AC >= temp_r31->unk194) {
var_r25 = 0;
}
} else {
}
else {
var_r25 = 0;
}
if (var_r25 != 0) {
@ -778,7 +801,8 @@ void fn_1_AE64(omObjData* arg0) {
}
}
u16 fn_1_B79C(f32 arg0, f32 arg1, f32 arg2) {
u16 fn_1_B79C(f32 arg0, f32 arg1, f32 arg2)
{
f32 var_f31;
f32 var_f3;
u16 var_r31;
@ -791,8 +815,9 @@ u16 fn_1_B79C(f32 arg0, f32 arg1, f32 arg2) {
return var_r31;
}
s32 fn_1_B804(void) {
M424DllClawStruct* temp_r31;
s32 fn_1_B804(void)
{
M424DllClawStruct *temp_r31;
if (!lbl_1_bss_6D8) {
return 0;
@ -807,17 +832,20 @@ s32 fn_1_B804(void) {
return 0;
}
s32 fn_1_B888(void) {
s32 fn_1_B888(void)
{
if (lbl_1_bss_6CC >= 3) {
return 1;
} else {
}
else {
return 0;
}
}
s32 fn_1_B8AC(void) {
M424DllClawStruct* temp_r31;
s32 fn_1_B8AC(void)
{
M424DllClawStruct *temp_r31;
if (!lbl_1_bss_6D8) {
return 0;
}
@ -832,9 +860,10 @@ s32 fn_1_B8AC(void) {
return 0;
}
s32 fn_1_B924(void) {
M424DllClawStruct* temp_r31;
s32 fn_1_B924(void)
{
M424DllClawStruct *temp_r31;
if (!lbl_1_bss_6D8) {
return 0;
}
@ -849,11 +878,13 @@ s32 fn_1_B924(void) {
return 0;
}
void fn_1_B99C(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2) {
void fn_1_B99C(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2)
{
fn_1_B9E0(arg0, arg1, arg8, arg2, 0x10);
}
s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3) {
s32 fn_1_B9E0(Vec *arg0, Vec *arg1, f32 arg8, Vec *arg2, s32 arg3)
{
Vec sp60;
Vec sp54;
Vec sp48;
@ -870,11 +901,11 @@ s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3) {
f32 var_f25;
f32 var_f24;
f32 var_f23;
M424DllClawStruct* temp_r31;
M424DllClawStruct *temp_r31;
s32 var_r29;
s32 var_r28;
s32 var_r26;
omObjData* var_r24;
omObjData *var_r24;
s32 var_r23;
var_r23 = 1;
@ -907,7 +938,8 @@ s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3) {
var_f23 = sqrtf((sp18.x * sp18.x) + (sp18.z * sp18.z));
if ((temp_r31->unk3C[var_r29].y > sp24.y) && (var_f23 < 17.599999999999998)) {
temp_r31->unk15C = 1;
} else {
}
else {
PSVECNormalize(&sp18, &sp18);
PSVECScale(&sp18, &sp18, temp_f30);
PSVECAdd(&temp_r31->unk3C[var_r29], &sp18, arg2);
@ -947,9 +979,10 @@ s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3) {
PSVECAdd(&sp60, &sp30, arg2);
var_r28 = 1;
var_r26 = 1;
} else if (var_f29 < temp_f30) {
}
else if (var_f29 < temp_f30) {
if (PSVECMag(&sp30) <= 0.0f) {
sp30.x = sp30.y = 0.0f;
sp30.z = 1.0f;
}
@ -1025,12 +1058,13 @@ s32 fn_1_B9E0(Vec* arg0, Vec* arg1, f32 arg8, Vec* arg2, s32 arg3) {
return var_r28;
}
s32 fn_1_C210(Vec* arg0) {
s32 fn_1_C210(Vec *arg0)
{
Vec sp1C;
Vec sp10;
f32 spC;
M424DllClawStruct* temp_r31;
omObjData* var_r30;
M424DllClawStruct *temp_r31;
omObjData *var_r30;
s32 var_r29;
var_r29 = 0;
@ -1052,21 +1086,23 @@ s32 fn_1_C210(Vec* arg0) {
return var_r29;
}
void fn_1_C2E0(s32 arg0) {
void fn_1_C2E0(s32 arg0)
{
Vec sp4C;
Vec sp40;
Vec sp34;
Vec sp28;
Vec* spC;
M424DllBallStruct2* temp_r27;
Vec* temp_r28;
M424DllClawStruct* temp_r31;
Vec *spC;
M424DllBallStruct2 *temp_r27;
Vec *temp_r28;
M424DllClawStruct *temp_r31;
s32 var_r30;
s32 var_r26;
omObjData* var_r25;
omObjData *var_r25;
if ((u8)omPauseChk() != 0U)
return;
if ((u8)omPauseChk() != 0U) return;
var_r25 = lbl_1_bss_6D8;
if (lbl_1_bss_6D8) {
temp_r31 = var_r25->data;
@ -1074,10 +1110,11 @@ void fn_1_C2E0(s32 arg0) {
temp_r27 = &lbl_1_bss_60[0];
if (temp_r27) {
var_r26 = 0x10;
for (var_r30 = 0; var_r30 < lbl_1_bss_58; var_r30++) {
temp_r27 = &lbl_1_bss_60[var_r30];
if ((fn_1_8950(var_r30) == 3) || (fn_1_8950(var_r30) == 4)) continue;
if ((fn_1_8950(var_r30) == 3) || (fn_1_8950(var_r30) == 4))
continue;
temp_r28 = fn_1_89D4(var_r30);
spC = fn_1_8A00(var_r30);
sp28 = *temp_r28;
@ -1116,18 +1153,19 @@ void fn_1_C2E0(s32 arg0) {
}
}
void fn_1_C604(s32 arg0, s32 arg1) {
void fn_1_C604(s32 arg0, s32 arg1)
{
Vec sp30;
Vec sp24;
Vec sp18;
Vec spC;
M424DllBallStruct2* sp8;
Vec* var_r31;
M424DllBallStruct2 *sp8;
Vec *var_r31;
f32 temp_f31;
f32 var_f30;
s32 var_r30;
M424DllBallStruct2* var_r28;
Vec* var_r27;
M424DllBallStruct2 *var_r28;
Vec *var_r27;
sp8 = &lbl_1_bss_60[var_r30];
var_r27 = fn_1_89D4(arg0);
@ -1145,7 +1183,8 @@ void fn_1_C604(s32 arg0, s32 arg1) {
sp18.x *= temp_f31;
sp18.y *= temp_f31;
sp18.z *= temp_f31;
} else {
}
else {
sp18.x = 0.0f;
sp18.y = 0.0f;
sp18.z = 1.0f;
@ -1168,22 +1207,25 @@ void fn_1_C604(s32 arg0, s32 arg1) {
}
}
void fn_1_C854(void) {
void fn_1_C854(void)
{
fn_1_C2E0(0);
}
s32 fn_1_C878(s16 arg0, const char* arg1, Mtx arg2, s32 arg3) {
s32 fn_1_C878(s16 arg0, const char *arg1, Mtx arg2, s32 arg3)
{
Mtx sp44;
Mtx sp14;
HsfData* temp_r30;
ModelData* temp_r31;
HsfData *temp_r30;
ModelData *temp_r31;
temp_r31 = &Hu3DData[arg0];
temp_r30 = temp_r31->hsfData;
lbl_1_bss_6C8 = 0;
if (temp_r31->unk_08 != -1) {
lbl_1_bss_6C4 = 1;
} else {
}
else {
lbl_1_bss_6C4 = 0;
}
mtxRot(sp14, temp_r31->rot.x, temp_r31->rot.y, temp_r31->rot.z);
@ -1197,18 +1239,19 @@ s32 fn_1_C878(s16 arg0, const char* arg1, Mtx arg2, s32 arg3) {
return lbl_1_bss_6C8;
}
void fn_1_C99C(HsfObject* arg0, Mtx arg1, const char* arg2, Mtx arg3) {
void fn_1_C99C(HsfObject *arg0, Mtx arg1, const char *arg2, Mtx arg3)
{
Mtx spF8;
Mtx spC8;
Mtx sp98;
Mtx sp68;
Mtx sp38;
Mtx sp8;
HsfTransform* var_r31;
HsfTransform* var_r30;
HsfTransform* var_r29;
HsfObject* temp_r28;
HsfObject* temp_r27;
HsfTransform *var_r31;
HsfTransform *var_r30;
HsfTransform *var_r29;
HsfObject *temp_r28;
HsfObject *temp_r27;
u32 var_r25;
u32 var_r24;
u32 var_r23;
@ -1216,13 +1259,15 @@ void fn_1_C99C(HsfObject* arg0, Mtx arg1, const char* arg2, Mtx arg3) {
if (lbl_1_bss_6C8 == 0) {
if (lbl_1_bss_6C4 != 0) {
var_r31 = &arg0->data.curr;
} else {
}
else {
var_r31 = &arg0->data.base;
}
if ((var_r31->scale.x <= 0.0f) && (var_r31->scale.y <= 0.0f) && (var_r31->scale.z <= 0.0f)) {
PSMTXCopy(arg1, spF8);
OSReport("OBJ MTX CHECK ERROR %s \n", arg0->name);
} else {
}
else {
mtxRot(spC8, var_r31->rot.x, var_r31->rot.y, var_r31->rot.z);
PSMTXScale(spF8, var_r31->scale.x, var_r31->scale.y, var_r31->scale.z);
PSMTXConcat(spC8, spF8, spF8);
@ -1241,13 +1286,15 @@ void fn_1_C99C(HsfObject* arg0, Mtx arg1, const char* arg2, Mtx arg3) {
if (lbl_1_bss_6C8 == 0) {
if (lbl_1_bss_6C4 != 0) {
var_r30 = &temp_r28->data.curr;
} else {
}
else {
var_r30 = &temp_r28->data.base;
}
if ((var_r30->scale.x <= 0.0f) && (var_r30->scale.y <= 0.0f) && (var_r30->scale.z <= 0.0f)) {
PSMTXCopy(spF8, sp68);
OSReport("OBJ MTX CHECK ERROR %s \n", temp_r28->name);
} else {
}
else {
mtxRot(sp98, var_r30->rot.x, var_r30->rot.y, var_r30->rot.z);
PSMTXScale(sp68, var_r30->scale.x, var_r30->scale.y, var_r30->scale.z);
PSMTXConcat(sp98, sp68, sp68);
@ -1266,13 +1313,15 @@ void fn_1_C99C(HsfObject* arg0, Mtx arg1, const char* arg2, Mtx arg3) {
if (lbl_1_bss_6C8 == 0) {
if (lbl_1_bss_6C4 != 0) {
var_r29 = &temp_r27->data.curr;
} else {
}
else {
var_r29 = &temp_r27->data.base;
}
if ((var_r29->scale.x <= 0.0f) && (var_r29->scale.y <= 0.0f) && (var_r29->scale.z <= 0.0f)) {
PSMTXCopy(sp68, sp8);
OSReport("OBJ MTX CHECK ERROR %s \n", temp_r27->name);
} else {
}
else {
mtxRot(sp38, var_r29->rot.x, var_r29->rot.y, var_r29->rot.z);
PSMTXScale(sp8, var_r29->scale.x, var_r29->scale.y, var_r29->scale.z);
PSMTXConcat(sp38, sp8, sp8);
@ -1296,8 +1345,9 @@ void fn_1_C99C(HsfObject* arg0, Mtx arg1, const char* arg2, Mtx arg3) {
}
}
void fn_1_CE74(s32 arg0) {
ModelData* temp_r31;
void fn_1_CE74(s32 arg0)
{
ModelData *temp_r31;
temp_r31 = &Hu3DData[arg0];
if (temp_r31->unk_08 != -1) {
@ -1311,21 +1361,23 @@ void fn_1_CE74(s32 arg0) {
}
}
void fn_1_CF00(Process* arg0) {
M424DllClawStruct3* var_r31;
void fn_1_CF00(Process *arg0)
{
M424DllClawStruct3 *var_r31;
s32 var_r30;
omAddObjEx(arg0, 0x40, 0, 0, -1, fn_1_CF80);
var_r31 = &lbl_1_bss_640[0];
for (var_r30 = 0; var_r30 < 0x10; var_r30++, var_r31++) {
var_r31->unk0 = -1;
var_r31->unk4 = -1;
}
}
void fn_1_CF80(omObjData* arg0) {
M424DllClawStruct3* var_r31;
void fn_1_CF80(omObjData *arg0)
{
M424DllClawStruct3 *var_r31;
s32 var_r30;
var_r31 = &lbl_1_bss_640[0];
@ -1340,13 +1392,15 @@ void fn_1_CF80(omObjData* arg0) {
}
}
s32 fn_1_D010(s32 arg0, s32 arg1) {
M424DllClawStruct3* var_r31;
s32 fn_1_D010(s32 arg0, s32 arg1)
{
M424DllClawStruct3 *var_r31;
s32 var_r30;
var_r31 = &lbl_1_bss_640[0];
for (var_r30 = 0; var_r30 < 0x10; var_r30++, var_r31++) {
if (var_r31->unk0 == -1) break;
if (var_r31->unk0 == -1)
break;
}
if (var_r30 >= 0x10) {
return -1;

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

@ -139,7 +139,7 @@ void ObjectSetup(void)
lbl_1_bss_34 = omAddObjEx(var_r31, 0xA, 0, 0, -1, fn_1_65C);
fn_1_4A80(var_r31);
fn_1_BBC4(var_r31);
lbl_1_bss_10 = espEntry(0x3D001B, 0x64, 0);
lbl_1_bss_10 = espEntry(DATA_MAKE_NUM(DATADIR_M430, 0x1B), 0x64, 0);
espPosSet(lbl_1_bss_10, 288.0, 240.0);
espScaleSet(lbl_1_bss_10, 0.22499999403953552, 60.0);
espDispOff(lbl_1_bss_10);

43
src/REL/m430Dll/player.c
View file

@ -219,21 +219,22 @@ void fn_1_F6A0(omObjData *object);
void fn_1_FC9C(omObjData *object);
M430PlayerData170Struct lbl_1_data_170[7] = {
{ 0x5F0042, -1 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x42), -1 },
{ 0, 1 },
{ 0, 2 },
{ 0, 3 },
{ 0, -1 },
{ 0x5F0017, -1 },
{ 0x5F0018, -1 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), -1 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18), -1 },
};
M430PlayerData170Struct lbl_1_data_1A8[4] = {
{ 0, 4 },
{ 0x5F0000, -1 },
{ 0x5F0017, -1 },
{ 0x5F0018, -1 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), -1 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), -1 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18), -1 },
};
s32 lbl_1_data_1C8[5] = { 0, 0x3D0031, 0x3D0039, 0x3D0041, 0x3D0049 };
s32 lbl_1_data_1C8[5] = { 0, DATA_MAKE_NUM(DATADIR_M430, 0x31), DATA_MAKE_NUM(DATADIR_M430, 0x39), DATA_MAKE_NUM(DATADIR_M430, 0x41),
DATA_MAKE_NUM(DATADIR_M430, 0x49) };
float lbl_1_data_1DC[7] = { -262.5f, -173.25f, -86.625f, 0.0f, 86.625f, 173.25f, 262.5f };
Vec lbl_1_data_1F8[8] = {
{ 0.0f, 0.0f, 0.0f },
@ -246,9 +247,9 @@ Vec lbl_1_data_1F8[8] = {
{ -60.000004f, 0.0f, -120.00001f },
};
float lbl_1_data_258[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 25.0f, 0.0f, 25.0f };
s32 lbl_1_data_278[2] = { 0x3D001C, 0x3D001D };
s32 lbl_1_data_280[2] = { 0x3D001E, 0x3D001F };
s32 lbl_1_data_288[2] = { 0x3D0020, 0x3D0021 };
s32 lbl_1_data_278[2] = { DATA_MAKE_NUM(DATADIR_M430, 0x1C), DATA_MAKE_NUM(DATADIR_M430, 0x1D) };
s32 lbl_1_data_280[2] = { DATA_MAKE_NUM(DATADIR_M430, 0x1E), DATA_MAKE_NUM(DATADIR_M430, 0x1F) };
s32 lbl_1_data_288[2] = { DATA_MAKE_NUM(DATADIR_M430, 0x20), DATA_MAKE_NUM(DATADIR_M430, 0x21) };
s32 lbl_1_bss_17C;
Process *lbl_1_bss_178;
@ -427,7 +428,7 @@ void fn_1_C1E4(omObjData *object)
Hu3DModelLayerSet(object->model[1], 2);
Hu3DModelCameraSet(object->model[1], 3);
Hu3DModelScaleSet(object->model[1], 1.2f, 1.2f, 1.2f);
object->model[2] = Hu3DModelCreateFile(0x3D0025);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x25));
Hu3DModelLayerSet(object->model[2], 1);
Hu3DModelCameraSet(object->model[2], 3);
work->unk_60 = HuAudFXPlay(0x67A);
@ -1659,14 +1660,14 @@ void fn_1_10B88(void)
for (var_r30 = 0; var_r30 < 0x10; var_r30++, var_r31++) {
var_r31->unk_00 = var_r30;
if (var_r30 == 0) {
var_r31->unk_04 = Hu3DModelCreateFile(0x3D0023);
var_r31->unk_04 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x23));
}
else {
var_r31->unk_04 = Hu3DModelLink(lbl_1_bss_16C[0].unk_04);
}
Hu3DModelLayerSet(var_r31->unk_04, 2);
Hu3DModelAttrSet(var_r31->unk_04, HU3D_ATTR_DISPOFF);
var_r31->unk_08 = Hu3DModelCreateFile(0x3D0024);
var_r31->unk_08 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x24));
Hu3DModelLayerSet(var_r31->unk_08, 2);
Hu3DModelAttrSet(var_r31->unk_08, HU3D_ATTR_DISPOFF);
var_r31->unk_0C = 0;
@ -1836,7 +1837,7 @@ void fn_1_113AC(void)
for (var_r30 = 0; var_r30 < 0x20; var_r31++) {
var_r31->unk_00 = var_r30;
if (var_r30 == 0) {
var_r31->unk_04 = Hu3DModelCreateFile(0x3D0022);
var_r31->unk_04 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x22));
}
else {
var_r31->unk_04 = Hu3DModelLink(lbl_1_bss_168[0].unk_04);
@ -2006,7 +2007,7 @@ void fn_1_11C1C(void)
memset(var_r31, 0, 8 * sizeof(M430PlayerBss164Struct));
for (var_r30 = 0; var_r30 < 8; var_r30++, var_r31++) {
if (var_r30 == 0) {
var_r31->unk_14 = HuSprAnimRead(HuDataReadNum(0x3D0026, MEMORY_DEFAULT_NUM));
var_r31->unk_14 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x26), MEMORY_DEFAULT_NUM));
}
else {
var_r31->unk_14 = lbl_1_bss_164[0].unk_14;
@ -2182,7 +2183,7 @@ void fn_1_125C4(void)
switch (var_r30) {
case 0:
case 1:
var_r31->unk_10[var_r30] = espEntry(0x610033, 1, 0);
var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x33), 1, 0);
espPriSet(var_r31->unk_10[var_r30], 0x40);
var_r31->unk_28[var_r30][0] = (var_r30 * 0x14) + 0xB;
var_r31->unk_28[var_r30][1] = 0;
@ -2191,17 +2192,17 @@ void fn_1_125C4(void)
break;
case 2:
if (var_r29 == 0) {
var_r31->unk_10[var_r30] = espEntry(0x61001B, 1, 0);
var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x1B), 1, 0);
}
else {
var_r31->unk_10[var_r30] = espEntry(0x61001C, 1, 0);
var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x1C), 1, 0);
}
espPriSet(var_r31->unk_10[var_r30], 0xFF);
var_r31->unk_28[var_r30][0] = 0;
var_r31->unk_28[var_r30][1] = 0;
break;
case 3:
var_r31->unk_10[var_r30] = espEntry(0x61001D, 1, 0);
var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x1D), 1, 0);
espPriSet(var_r31->unk_10[var_r30], 0x100);
espTPLvlSet(var_r31->unk_10[var_r30], 0.6000000238418579);
espColorSet(var_r31->unk_10[var_r30], 0, 0, 0);
@ -2209,13 +2210,13 @@ void fn_1_125C4(void)
var_r31->unk_28[var_r30][1] = 0;
break;
case 4:
var_r31->unk_10[var_r30] = espEntry(0x610008, 1, 0);
var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x08), 1, 0);
espPriSet(var_r31->unk_10[var_r30], 0x80);
var_r31->unk_28[var_r30][0] = -0x21;
var_r31->unk_28[var_r30][1] = 0;
break;
case 5:
var_r31->unk_10[var_r30] = espEntry(0x3D0028, 1, 0);
var_r31->unk_10[var_r30] = espEntry(DATA_MAKE_NUM(DATADIR_M430, 0x28), 1, 0);
espPriSet(var_r31->unk_10[var_r30], 0x80);
espZRotSet(var_r31->unk_10[var_r30], 45.0);
var_r31->unk_28[var_r30][0] = -0xA;

36
src/REL/m430Dll/water.c
View file

@ -165,11 +165,11 @@ void fn_1_4A80(Process *process)
{
omObjData *object;
lbl_1_bss_150 = HuSprAnimRead(HuDataReadNum(0x3D0019, 0x10000000));
lbl_1_bss_14C = HuSprAnimRead(HuDataReadNum(0x3D001A, 0x10000000));
lbl_1_bss_148 = HuSprAnimRead(HuDataReadNum(0x3D0014, 0x10000000));
lbl_1_bss_144 = HuSprAnimRead(HuDataReadNum(0x3D0017, 0x10000000));
lbl_1_bss_140 = HuSprAnimRead(HuDataReadNum(0x3D0018, 0x10000000));
lbl_1_bss_150 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x19), MEMORY_DEFAULT_NUM));
lbl_1_bss_14C = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x1A), MEMORY_DEFAULT_NUM));
lbl_1_bss_148 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x14), MEMORY_DEFAULT_NUM));
lbl_1_bss_144 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x17), MEMORY_DEFAULT_NUM));
lbl_1_bss_140 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M430, 0x18), MEMORY_DEFAULT_NUM));
object = lbl_1_bss_58 = omAddObjEx(process, 0x1E, 0x68, 0, -1, fn_1_4CB4);
object->work[0] = 0;
object = lbl_1_bss_54 = omAddObjEx(process, 0x1E, 7, 0, -1, fn_1_803C);
@ -200,12 +200,12 @@ void fn_1_4CB4(omObjData *object)
s32 var_r25;
M430DllWork *work;
u32 spC[1] = { 0x3D0001 };
u32 spC[1] = { DATA_MAKE_NUM(DATADIR_M430, 0x01) };
s32 sp8[1];
u32 sp90[4] = { 0x003D000B, 0x003D000C, 0x003D000D, 0x003D000E };
u32 sp80[4] = { 0x003D0002, 0x003D0002, 0x003D0003, 0x003D0003 };
u32 sp70[4] = { 0x003D0004, 0x003D0004, 0x00000000, 0x00000000 };
u32 sp60[4] = { 0x003D0006, 0x003D0007, 0x003D0008, 0x003D0009 };
u32 sp90[4] = { DATA_MAKE_NUM(DATADIR_M430, 0x0B), DATA_MAKE_NUM(DATADIR_M430, 0x0C), DATA_MAKE_NUM(DATADIR_M430, 0x0D), DATA_MAKE_NUM(DATADIR_M430, 0x0E) };
u32 sp80[4] = { DATA_MAKE_NUM(DATADIR_M430, 0x02), DATA_MAKE_NUM(DATADIR_M430, 0x02), DATA_MAKE_NUM(DATADIR_M430, 0x03), DATA_MAKE_NUM(DATADIR_M430, 0x03) };
u32 sp70[4] = { DATA_MAKE_NUM(DATADIR_M430, 0x04), DATA_MAKE_NUM(DATADIR_M430, 0x04), 0, 0 };
u32 sp60[4] = { DATA_MAKE_NUM(DATADIR_M430, 0x06), DATA_MAKE_NUM(DATADIR_M430, 0x07), DATA_MAKE_NUM(DATADIR_M430, 0x08), DATA_MAKE_NUM(DATADIR_M430, 0x09) };
s32 sp50[4];
s32 sp40[4];
s32 sp30[4];
@ -227,11 +227,11 @@ void fn_1_4CB4(omObjData *object)
}
var_r30 = work;
for (var_r31 = 0; var_r31 < 2; var_r31++) {
object->model[var_r31] = Hu3DModelCreateFile(0x3D0000);
object->model[var_r31] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x00));
var_r30[var_r31].unk_18 = object->model[var_r31];
Hu3DModelLayerSet(var_r30[var_r31].unk_18, 0);
Hu3DModelScaleSet(var_r30[var_r31].unk_18, 1.15f, 1.15f, 1.15f);
var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(0x3D000A), 1);
var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M430, 0x0A)), 1);
var_r30[var_r31].unk_1A = var_r27;
Hu3DModelLayerSet(var_r27, 1);
*((s16 *)Hu3DData[var_r27].unk_120) = 1;
@ -247,14 +247,14 @@ void fn_1_4CB4(omObjData *object)
var_r26->material[var_r28].invAlpha = 0.001f;
}
}
object->model[2] = Hu3DModelCreateFile(0x3D000F);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x0F));
Hu3DModelLayerSet(object->model[2], 1);
Hu3DModelScaleSet(object->model[2], 1.5f, 1.5f, 1.5f);
object->model[3] = Hu3DModelCreateFile(0x3D0010);
object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x10));
Hu3DModelLayerSet(object->model[3], 2);
Hu3DModelScaleSet(object->model[3], 1.5f, 1.5f, 1.5f);
for (var_r31 = 0; var_r31 < 2; var_r31++) {
var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(0x3D0015), 0x64);
var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M430, 0x15)), 0x64);
object->model[var_r31 + 4] = var_r27;
var_r30[var_r31].unk_10 = var_r27;
Hu3DModelLayerSet(var_r27, 2);
@ -264,7 +264,7 @@ void fn_1_4CB4(omObjData *object)
*((s16 *)Hu3DData[var_r27].unk_120) = 0;
}
for (var_r31 = 0; var_r31 < 2; var_r31++) {
var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(0x3D0015), 0x64);
var_r27 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M430, 0x15)), 0x64);
object->model[var_r31 + 6] = var_r27;
var_r30[var_r31].unk_14 = var_r27;
Hu3DModelLayerSet(var_r27, 1);
@ -701,7 +701,7 @@ M430DllUnkStruct2 *fn_1_70AC(omObjData *arg0, s32 var_r27, s16 var_r28)
s32 var_r30;
M430DllUnkStruct2 *var_r29;
u32 sp10[2] = { 0x003D0011, 0x003D0012 };
u32 sp10[2] = { DATA_MAKE_NUM(DATADIR_M430, 0x11), DATA_MAKE_NUM(DATADIR_M430, 0x12) };
s32 sp8[2] = { 1, 2 };
var_r29 = HuMemDirectMallocNum(HEAP_SYSTEM, var_r28 * sizeof(M430DllUnkStruct2), MEMORY_DEFAULT_NUM);
memset(var_r29, 0, var_r28 * 0x3C);
@ -807,7 +807,7 @@ void fn_1_7848(omObjData *object)
work = HuMemDirectMallocNum(HEAP_SYSTEM, var_r30 * sizeof(M430DllWork2), MEMORY_DEFAULT_NUM);
object->data = work;
memset(work, 0, var_r30 * sizeof(M430DllWork2));
var_r26 = Hu3DModelCreateFile(0x3D0013);
var_r26 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x13));
var_f29 = 1000.0f;
for (var_r31 = work, var_r29 = 0; var_r29 < var_r30; var_r29++, var_r31++) {
var_r31->unk_00 = Hu3DModelLink(var_r26);

3
src/REL/m449Dll/main.c
View file

@ -127,7 +127,8 @@ s32 lbl_1_data_0[0x12] = {
0x610000,
};
s32 lbl_1_data_48[0x12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
s32 lbl_1_data_90[4] = { 0x5F0000, 0x500000, 0x5F0017, 0x5F0085 };
s32 lbl_1_data_90[4]
= { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), 0x500000, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x85) };
s32 lbl_1_data_A0[4] = { 0x50001C, 0x50001E, 0x50001D, 0x50001F };
u8 lbl_1_data_B0[0x38] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08,
0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,

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

@ -3,7 +3,6 @@
#include "game/object.h"
#include "game/objsub.h"
#include "game/hsfmotion.h"
#include "game/pad.h"
@ -15,7 +14,6 @@
#include "game/minigame_seq.h"
#include "game/wipe.h"
#include "ext_math.h"
#include "math.h"
@ -329,15 +327,15 @@ s32 fn_1_C90(void)
s32 fn_1_3214(void);
u32 lbl_1_data_E0[5][2] = {
0x5F0000,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00),
0,
0x540024,
1,
0x54001C,
1,
0x5F0017,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17),
0,
0x5F0018,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18),
0,
};

22
src/REL/m456Dll/main.c
View file

@ -436,16 +436,16 @@ s32 fn_1_F4C(void)
}
M456DllDataE4Struct lbl_1_data_E4[0xA] = {
{ 0x5F0000, 0 },
{ 0x55001C, 1 },
{ 0x550024, 1 },
{ 0x55002C, 1 },
{ 0x550034, 1 },
{ 0x5F002A, 0 },
{ 0x5F0005, 0 },
{ 0x5F0017, 0 },
{ 0x5F0018, 0 },
{ 0x55003C, 1 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), 0 },
{ DATA_MAKE_NUM(DATADIR_M456, 0x1C), 1 },
{ DATA_MAKE_NUM(DATADIR_M456, 0x24), 1 },
{ DATA_MAKE_NUM(DATADIR_M456, 0x2C), 1 },
{ DATA_MAKE_NUM(DATADIR_M456, 0x34), 1 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x2A), 0 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05), 0 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), 0 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18), 0 },
{ DATA_MAKE_NUM(DATADIR_M456, 0x3C), 1 },
};
Vec lbl_1_data_134[4] = {
{ -300.0f, 0.0f, 0.0f },
@ -826,7 +826,7 @@ void fn_1_2448(omObjData *object)
}
M456DllData1B0Struct lbl_1_data_1B0[0x10] = {
{ 0x550044, 0x10E },
{ DATA_MAKE_NUM(DATADIR_M456, 0x44), 0x10E },
{ 0x610037, 0xFA },
{ 0x610030, 0xFA },
{ 0x610030, 0xFA },

18
src/REL/m458Dll/main.c
View file

@ -77,16 +77,16 @@ void fn_1_6D9C(omObjData *arg0);
s32 lbl_1_data_0[2] = { 0x570025, 0x570026 };
s32 lbl_1_data_8[2] = { 0, 0 };
s32 lbl_1_data_10[0xA] = {
0x5F0000,
0x5F0002,
0x5F0003,
0x5F0005,
0x5F0006,
0x5F0036,
0x5F002F,
0x5F001A,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x06),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x36),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x2F),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x1A),
0x570000,
0x5F0017,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17),
};
u32 lbl_1_data_38[0xA] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 };
u32 lbl_1_data_60[0xA] = { 0x30008, 0, 0, 0x3000A, 0, 0, 0x57002A, 0x570028, 0x570029, 0x570027 };

979
src/REL/m461Dll/main.c
View file

File diff suppressed because it is too large Load diff

210
src/REL/mstory2Dll/board_clear.c
View file

@ -10,12 +10,13 @@
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "game/pad.h"
#include "game/objsub.h"
typedef struct {
/* 0x000 */ s32 unk00;
@ -42,17 +43,17 @@ void fn_1_C858(void);
void fn_1_CCCC(int arg0, int arg1, int arg2, int arg3, int arg4);
void fn_1_CD78(void);
void fn_1_D224(int arg0, int arg1, int arg2, int arg3, int arg4);
void fn_1_D2D0(omObjData* arg0, StructBss16C* arg1);
void fn_1_D2D0(omObjData *arg0, StructBss16C *arg1);
void fn_1_D478(void);
void fn_1_D764(int arg0);
void fn_1_DB58(int arg0, int arg1, int arg2, int arg3, int arg4);
void fn_1_DC54(omObjData* arg0, StructBss16C* arg1);
void fn_1_DC54(omObjData *arg0, StructBss16C *arg1);
void fn_1_DDC4(void);
void fn_1_E1B8(void);
void fn_1_E244(void);
void fn_1_E334(void);
void fn_1_B37C(omObjData* arg0, StructBss16C* arg1)
void fn_1_B37C(omObjData *arg0, StructBss16C *arg1)
{
fn_1_BE8(30);
fn_1_DB58(4, -1, 15, 1, 0);
@ -60,7 +61,7 @@ void fn_1_B37C(omObjData* arg0, StructBss16C* arg1)
arg1->unk04 = NULL;
}
void fn_1_B3E4(Process* arg0, s32 arg1)
void fn_1_B3E4(Process *arg0, s32 arg1)
{
int i;
lbl_1_bss_298 = arg0;
@ -73,20 +74,19 @@ void fn_1_B3E4(Process* arg0, s32 arg1)
HuPrcChildCreate(fn_1_C858, 100, 8192, 0, HuPrcCurrentGet());
HuPrcChildCreate(fn_1_CD78, 100, 8192, 0, HuPrcCurrentGet());
HuPrcChildCreate(fn_1_D478, 100, 8192, 0, HuPrcCurrentGet());
for(i=0; i<4; i++) {
for (i = 0; i < 4; i++) {
HuPrcChildCreate(fn_1_DDC4, 100, 8192, 0, HuPrcCurrentGet());
}
HuPrcChildCreate(fn_1_C4C0, 100, 8192, 0, HuPrcCurrentGet());
}
void fn_1_B518(omObjData *object)
{
if(object->work[2]) {
if (object->work[2]) {
object->work[2]--;
return;
}
if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
fn_1_1DFC(object, 1, object->work[1], 15, 1);
object->work[0] = object->work[1] = object->work[2] = 0;
}
@ -98,42 +98,47 @@ void fn_1_B5A4(void)
int posY = 40;
GXColor winColor = { 0, 0, 128, 128 };
int i;
while(1) {
while (1) {
fn_1_BC8();
printWin(posX, posY, 220, 160, &winColor);
if(lbl_1_bss_3B4.unk04 == NULL) {
if (lbl_1_bss_3B4.unk04 == NULL) {
print8(posX, posY, 1, "PROC_MAIN -> FALSE");
} else {
}
else {
print8(posX, posY, 1, "PROC_MAIN -> TRUE");
}
if(lbl_1_bss_38C.unk04 == NULL) {
print8(posX, posY+10, 1, "PROC_MAP -> FALSE");
} else {
print8(posX, posY+10, 1, "PROC_MAP -> TRUE");
if (lbl_1_bss_38C.unk04 == NULL) {
print8(posX, posY + 10, 1, "PROC_MAP -> FALSE");
}
if(lbl_1_bss_364.unk04 == NULL) {
print8(posX, posY+20, 1, "PROC_KOOPA -> FALSE");
} else {
print8(posX, posY+20, 1, "PROC_KOOPA -> TRUE");
else {
print8(posX, posY + 10, 1, "PROC_MAP -> TRUE");
}
if(lbl_1_bss_33C.unk04 == NULL) {
print8(posX, posY+30, 1, "PROC_MKOOPA -> FALSE");
} else {
print8(posX, posY+30, 1, "PROC_MKOOPA -> TRUE");
if (lbl_1_bss_364.unk04 == NULL) {
print8(posX, posY + 20, 1, "PROC_KOOPA -> FALSE");
}
for(i=0; i<4; i++) {
if(lbl_1_bss_29C[i].unk04 == NULL) {
print8(posX, posY+40+(i*10), 1, "PROC_PLAYER%d -> FALSE", i);
} else {
print8(posX, posY+40+(i*10), 1, "PROC_PLAYER%d -> TRUE", i);
else {
print8(posX, posY + 20, 1, "PROC_KOOPA -> TRUE");
}
if (lbl_1_bss_33C.unk04 == NULL) {
print8(posX, posY + 30, 1, "PROC_MKOOPA -> FALSE");
}
else {
print8(posX, posY + 30, 1, "PROC_MKOOPA -> TRUE");
}
for (i = 0; i < 4; i++) {
if (lbl_1_bss_29C[i].unk04 == NULL) {
print8(posX, posY + 40 + (i * 10), 1, "PROC_PLAYER%d -> FALSE", i);
}
else {
print8(posX, posY + 40 + (i * 10), 1, "PROC_PLAYER%d -> TRUE", i);
}
}
print8(posX, posY+90, 1, "P:%d W:%d", lbl_1_bss_3DC.unk00, lbl_1_bss_3DC.unk0C);
print8(posX, posY+110, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for(i=0; i<4; i++) {
print8(posX, posY+120+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_3DC.unk30[i].unk00, lbl_1_bss_3DC.unk30[i].unk04, lbl_1_bss_3DC.unk30[i].unk08, lbl_1_bss_3DC.unk30[i].unk0C, lbl_1_bss_3DC.unk30[i].unk14, lbl_1_bss_3DC.unk30[i].unk10);
print8(posX, posY + 90, 1, "P:%d W:%d", lbl_1_bss_3DC.unk00, lbl_1_bss_3DC.unk0C);
print8(posX, posY + 110, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for (i = 0; i < 4; i++) {
print8(posX, posY + 120 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_3DC.unk30[i].unk00, lbl_1_bss_3DC.unk30[i].unk04,
lbl_1_bss_3DC.unk30[i].unk08, lbl_1_bss_3DC.unk30[i].unk0C, lbl_1_bss_3DC.unk30[i].unk14, lbl_1_bss_3DC.unk30[i].unk10);
}
}
}
@ -152,15 +157,15 @@ void fn_1_B9E0(void)
lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk04 = (void *)fn_1_DC54;
fn_1_3854(&lbl_1_bss_24);
fn_1_2750(fn_1_E244);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk04 == NULL) {
if (lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk04 == NULL) {
break;
}
}
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_33C.unk04 == NULL) {
if (lbl_1_bss_33C.unk04 == NULL) {
break;
}
}
@ -181,8 +186,8 @@ void fn_1_BA90(void)
fn_1_1A94(lbl_1_bss_3DC.unk04);
HuAudSeqFadeOut(lbl_1_bss_78[0], 1000);
fn_1_BE8(60);
for(i=0; i<4; i++) {
if(lbl_1_bss_3DC.unk30[i].unk00 != lbl_1_bss_3DC.unk30[lbl_1_bss_3DC.unk00].unk00) {
for (i = 0; i < 4; i++) {
if (lbl_1_bss_3DC.unk30[i].unk00 != lbl_1_bss_3DC.unk30[lbl_1_bss_3DC.unk00].unk00) {
Hu3DModelAttrSet(lbl_1_bss_29C[i].unk00->model[1], 1);
}
Hu3DModelAttrSet(lbl_1_bss_29C[i].unk00->model[2], 1);
@ -236,9 +241,9 @@ void fn_1_BF48(void)
int padNo;
WipeColorSet(0, 0, 0);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while(1) {
while (1) {
fn_1_BC8();
if(!WipeStatGet()) {
if (!WipeStatGet()) {
break;
}
}
@ -253,14 +258,14 @@ void fn_1_BF48(void)
GWPlayerCfg[0].pad_idx = padNo;
GWPlayerCfg[0].group = 0;
GWPlayerCfg[0].iscom = FALSE;
for(i=0; i<4; i++) {
for (i = 0; i < 4; i++) {
GWPlayer[i].character = GWPlayerCfg[i].character;
GWPlayer[i].port = GWPlayerCfg[i].pad_idx;
GWPlayer[i].com = GWPlayerCfg[i].iscom;
GWPlayer[i].team = GWPlayerCfg[i].group;
}
GWPlayerCfg[1].character = 8;
for(i=1; i<4; i++) {
for (i = 1; i < 4; i++) {
GWPlayerCfg[i].iscom = GWPlayerCfg[i].group = 1;
}
his = omOvlHisGet(0);
@ -269,14 +274,14 @@ void fn_1_BF48(void)
HuAudSStreamAllFadeOut(1000);
GWSystem.mg_type = -1;
GWMGAvailSet(450);
GWSystem.mg_next = 450-401;
GWSystem.mg_next = 450 - 401;
omOvlCallEx(OVL_M450, 1, 0, 0);
while(1) {
while (1) {
fn_1_BC8();
}
}
void fn_1_C270(omObjData* arg0, StructBss16C* arg1)
void fn_1_C270(omObjData *arg0, StructBss16C *arg1)
{
int temp = 0;
fn_1_B984();
@ -293,9 +298,9 @@ void fn_1_C4C0(void)
lbl_1_bss_3B4.unk00 = obj = omAddObjEx(lbl_1_bss_298, 256, 16, 16, -1, NULL);
lbl_1_bss_3B4.unk04 = (void *)fn_1_C270;
lbl_1_bss_3B4.unk00->data = &lbl_1_bss_3B4;
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_3B4.unk04 != NULL) {
if (lbl_1_bss_3B4.unk04 != NULL) {
lbl_1_bss_3B4.unk04(obj, &lbl_1_bss_3B4);
}
}
@ -324,10 +329,10 @@ void fn_1_C574(omObjData *object)
fn_1_1DFC(object, 6, 6, 0, 2);
}
void fn_1_C79C(omObjData* arg0, StructBss16C* arg1)
void fn_1_C79C(omObjData *arg0, StructBss16C *arg1)
{
Hu3DData[arg0->model[5]].pos.y = fn_1_B08(80, 90, arg1->unk08++, 360);
if(arg1->unk08 >= 360) {
if (arg1->unk08 >= 360) {
arg1->unk08 = 0;
}
}
@ -339,9 +344,9 @@ void fn_1_C858(void)
lbl_1_bss_38C.unk04 = (void *)fn_1_C79C;
lbl_1_bss_38C.unk00->data = &lbl_1_bss_38C;
fn_1_C574(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_38C.unk04 != NULL) {
if (lbl_1_bss_38C.unk04 != NULL) {
lbl_1_bss_38C.unk04(obj, &lbl_1_bss_38C);
}
}
@ -365,12 +370,12 @@ void fn_1_CB0C(omObjData *object)
void fn_1_CCCC(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_364.unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_364.unk00->work[0] = arg4;
lbl_1_bss_364.unk00->work[1] = arg1;
lbl_1_bss_364.unk00->work[2] = arg2+1;
lbl_1_bss_364.unk00->work[2] = arg2 + 1;
}
void fn_1_CD78(void)
@ -380,15 +385,16 @@ void fn_1_CD78(void)
lbl_1_bss_364.unk04 = NULL;
lbl_1_bss_364.unk00->data = &lbl_1_bss_38C;
fn_1_CB0C(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_364.unk04 != NULL) {
if (lbl_1_bss_364.unk04 != NULL) {
lbl_1_bss_364.unk04(obj, &lbl_1_bss_364);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -415,25 +421,25 @@ void fn_1_D030(omObjData *object)
void fn_1_D224(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_33C.unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_33C.unk00->work[0] = arg4;
lbl_1_bss_33C.unk00->work[1] = arg1;
lbl_1_bss_33C.unk00->work[2] = arg2+1;
lbl_1_bss_33C.unk00->work[2] = arg2 + 1;
}
void fn_1_D2D0(omObjData* arg0, StructBss16C* arg1)
void fn_1_D2D0(omObjData *arg0, StructBss16C *arg1)
{
int i;
for(i=0; i<15; i++) {
for (i = 0; i < 15; i++) {
fn_1_BC8();
Hu3DData[arg0->model[1]].rot.y = fn_1_864(0, 135, i, 15);
}
arg1->unk04 = NULL;
}
void fn_1_D394(omObjData* arg0, StructBss16C* arg1)
void fn_1_D394(omObjData *arg0, StructBss16C *arg1)
{
Vec pos = { -120, 0, 800 };
fn_1_1DFC(arg0, 1, 2, 15, 1);
@ -449,15 +455,16 @@ void fn_1_D478(void)
lbl_1_bss_33C.unk04 = NULL;
lbl_1_bss_33C.unk00->data = &lbl_1_bss_33C;
fn_1_D030(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_33C.unk04 != NULL) {
if (lbl_1_bss_33C.unk04 != NULL) {
lbl_1_bss_33C.unk04(obj, &lbl_1_bss_33C);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -470,20 +477,20 @@ void fn_1_D764(int arg0)
int i;
int order[4];
order[0] = 0;
for(i=1; i<4; i++) {
order[i] = order[i-1]+1;
if(order[i] >= 4) {
for (i = 1; i < 4; i++) {
order[i] = order[i - 1] + 1;
if (order[i] >= 4) {
order[i] = 0;
}
if(arg0 == order[i]) {
if (arg0 == order[i]) {
lbl_1_bss_3DC.unk00 = i;
}
}
for(i=0; i<4; i++) {
for (i = 0; i < 4; i++) {
fn_1_357C(&lbl_1_bss_3DC.unk30[i], order[i]);
}
for(i=0; i<4; i++) {
lbl_1_bss_3DC.unk30[i].unk18 = GWPlayer[order[i]].rank+1;
for (i = 0; i < 4; i++) {
lbl_1_bss_3DC.unk30[i].unk18 = GWPlayer[order[i]].rank + 1;
}
}
@ -499,20 +506,22 @@ void fn_1_D898(omObjData *object, int player)
int playerNo = player;
int charNo = lbl_1_bss_3DC.unk30[playerNo].unk10;
object->model[1] = CharModelCreate(charNo, 4);
object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000);
object->motion[2] = CharModelMotionCreate(charNo, 0x5F0003);
object->motion[3] = CharModelMotionCreate(charNo, 0x5F0005);
object->motion[4] = CharModelMotionCreate(charNo, 0x5F001A);
object->motion[5] = CharModelMotionCreate(charNo, 0x5F006D);
object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00));
object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03));
object->motion[3] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05));
object->motion[4] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x1A));
object->motion[5] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x6D));
CharModelMotionDataClose(charNo);
Hu3DModelPosSet(object->model[1], lbl_1_data_668[playerNo].x, lbl_1_data_668[lbl_1_bss_3DC.unk30[playerNo].unk18-1].y+90, lbl_1_data_668[playerNo].z);
Hu3DModelPosSet(
object->model[1], lbl_1_data_668[playerNo].x, lbl_1_data_668[lbl_1_bss_3DC.unk30[playerNo].unk18 - 1].y + 90, lbl_1_data_668[playerNo].z);
Hu3DModelRotSet(object->model[1], 0, 0, 0);
Hu3DModelScaleSet(object->model[1], 1, 1, 1);
Hu3DModelShadowSet(object->model[1]);
fn_1_1DFC(object, 1, 1, 0, 1);
object->model[2] = Hu3DModelCreateFile(0x660056);
Hu3DModelPosSet(object->model[2], lbl_1_data_668[playerNo].x, lbl_1_data_668[lbl_1_bss_3DC.unk30[playerNo].unk18-1].y, lbl_1_data_668[playerNo].z);
if(lbl_1_bss_3DC.unk30[playerNo].unk18 == 4) {
Hu3DModelPosSet(
object->model[2], lbl_1_data_668[playerNo].x, lbl_1_data_668[lbl_1_bss_3DC.unk30[playerNo].unk18 - 1].y, lbl_1_data_668[playerNo].z);
if (lbl_1_bss_3DC.unk30[playerNo].unk18 == 4) {
Hu3DModelAttrSet(object->model[2], 1);
}
Hu3DModelScaleSet(object->model[2], 1.5, 1, 1.5);
@ -522,15 +531,15 @@ void fn_1_D898(omObjData *object, int player)
void fn_1_DB58(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk00->work[0] = arg4;
lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk00->work[1] = arg1;
lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk00->work[2] = arg2+1;
lbl_1_bss_29C[lbl_1_bss_3DC.unk00].unk00->work[2] = arg2 + 1;
}
void fn_1_DC54(omObjData* arg0, StructBss16C* arg1)
void fn_1_DC54(omObjData *arg0, StructBss16C *arg1)
{
Vec pos = { 120, 0, 800 };
fn_1_2948(arg0, 1, pos, -1, 30, 10);
@ -550,15 +559,16 @@ void fn_1_DDC4(void)
lbl_1_bss_29C[playerNo].unk04 = NULL;
lbl_1_bss_29C[playerNo].unk00->data = &lbl_1_bss_29C[0];
fn_1_D898(obj, playerNo);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_29C[playerNo].unk04 != NULL) {
if (lbl_1_bss_29C[playerNo].unk04 != NULL) {
lbl_1_bss_29C[playerNo].unk04(obj, &lbl_1_bss_29C[playerNo]);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -596,7 +606,7 @@ void fn_1_E334(void)
{
StructBss24 *work = &lbl_1_bss_24;
StructBss24 temp;
if(work->unk40 == 50) {
if (work->unk40 == 50) {
fn_1_1DFC(lbl_1_bss_38C.unk00, 5, 5, 0, 0);
fn_1_1DFC(lbl_1_bss_38C.unk00, 6, 6, 0, 0);
HuAudFXPlay(161);
@ -609,11 +619,11 @@ void fn_1_E334(void)
temp.unk20.z = 0;
temp.unk38 = 150;
fn_1_4FEC(work, &temp, work->unk40, 180, 10);
if(work->unk40++ >= 90) {
if(work->unk40 == 91) {
if (work->unk40++ >= 90) {
if (work->unk40 == 91) {
lbl_1_bss_88[0] = HuAudFXPlay(32);
}
work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40-90, 90);
Hu3DData[lbl_1_bss_38C.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40-90, 90);
work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40 - 90, 90);
Hu3DData[lbl_1_bss_38C.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40 - 90, 90);
}
}
}

216
src/REL/mstory2Dll/board_entrance.c
View file

@ -9,12 +9,13 @@
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "game/pad.h"
#include "game/objsub.h"
typedef struct {
/* 0x000 */ s32 unk00;
@ -38,26 +39,10 @@ Process *lbl_1_bss_C8;
s32 lbl_1_bss_88[16];
s32 lbl_1_bss_78[4];
u32 lbl_1_data_3A0[11] = {
0x00250000,
0x00250000,
0x00250000,
0x00250000,
0x00250000,
0x00250000,
0x00250000,
0x00250000,
0x00250000,
0x00250000,
0x00250000
};
u32 lbl_1_data_3A0[11]
= { 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000 };
s32 lbl_1_data_3CC[2][2] = {
20,
70,
1,
1
};
s32 lbl_1_data_3CC[2][2] = { 20, 70, 1, 1 };
s32 lbl_1_data_3DC = -1;
s32 lbl_1_data_3E0[2] = { -1, -1 };
@ -65,11 +50,11 @@ s32 lbl_1_data_3E0[2] = { -1, -1 };
void fn_1_9768(void);
void fn_1_9A10(void);
void fn_1_9BD4(s32 arg0);
void fn_1_9ECC(omObjData* arg0, StructBss16C* arg1);
void fn_1_9ECC(omObjData *arg0, StructBss16C *arg1);
void fn_1_9FDC(void);
void fn_1_A4A8(omObjData* arg0, StructBss16C* arg1);
void fn_1_A4A8(omObjData *arg0, StructBss16C *arg1);
void fn_1_A58C(void);
void fn_1_AB10(omObjData* arg0, StructBss16C* arg1);
void fn_1_AB10(omObjData *arg0, StructBss16C *arg1);
void fn_1_AE5C(void);
void fn_1_B1C0(void);
@ -78,30 +63,28 @@ void fn_1_B24C(void);
void fn_1_7DB0(void)
{
int i;
while(1) {
while (1) {
do {
HuPrcVSleep();
} while(lbl_1_data_3DC == -1 || lbl_1_data_3E0[0] == -1 || lbl_1_data_3E0[1] == -1 || lbl_1_data_3E0[0] != Hu3DMotionIDGet(lbl_1_data_3DC));
for(i=0; i<2; i++) {
if(lbl_1_data_3CC[1][i] != -1) {
if(Hu3DMotionTimeGet(lbl_1_data_3DC) >= lbl_1_data_3CC[0][i]) {
} while (lbl_1_data_3DC == -1 || lbl_1_data_3E0[0] == -1 || lbl_1_data_3E0[1] == -1 || lbl_1_data_3E0[0] != Hu3DMotionIDGet(lbl_1_data_3DC));
for (i = 0; i < 2; i++) {
if (lbl_1_data_3CC[1][i] != -1) {
if (Hu3DMotionTimeGet(lbl_1_data_3DC) >= lbl_1_data_3CC[0][i]) {
OSReport("KE-System TIME:%d\n", lbl_1_data_3CC[0][i]);
HuAudFXPlay(81);
lbl_1_data_3CC[1][i] = -1;
}
}
}
if(Hu3DMotionTimeGet(lbl_1_data_3DC) <= 10) {
for(i=0; i<2; i++) {
if (Hu3DMotionTimeGet(lbl_1_data_3DC) <= 10) {
for (i = 0; i < 2; i++) {
lbl_1_data_3CC[1][i] = 1;
}
}
}
}
void fn_1_7F54(Process* arg0, s32 arg1)
void fn_1_7F54(Process *arg0, s32 arg1)
{
lbl_1_bss_C8 = arg0;
lbl_1_bss_194.unk0C = arg1;
@ -119,11 +102,11 @@ void fn_1_7F54(Process* arg0, s32 arg1)
void fn_1_806C(omObjData *object)
{
if(object->work[2]) {
if (object->work[2]) {
object->work[2]--;
return;
}
if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
fn_1_1DFC(object, 1, object->work[1], 15, 1);
object->work[0] = object->work[1] = object->work[2] = 0;
}
@ -135,44 +118,51 @@ void fn_1_80F8(void)
int posY = 40;
GXColor winColor = { 0, 0, 128, 128 };
int i;
while(1) {
while (1) {
fn_1_BC8();
fontcolor = FONT_COLOR_WHITE;
printWin(posX, posY, 220, 130, &winColor);
if(lbl_1_bss_16C.unk04 == NULL) {
if (lbl_1_bss_16C.unk04 == NULL) {
print8(posX, posY, 1, "PROC_MAIN -> FALSE");
} else {
}
else {
print8(posX, posY, 1, "PROC_MAIN -> TRUE");
}
if(lbl_1_bss_144.unk04 == NULL) {
print8(posX, posY+10, 1, "PROC_MAP -> FALSE");
} else {
print8(posX, posY+10, 1, "PROC_MAP -> TRUE");
if (lbl_1_bss_144.unk04 == NULL) {
print8(posX, posY + 10, 1, "PROC_MAP -> FALSE");
}
if(lbl_1_bss_11C.unk04 == NULL) {
print8(posX, posY+20, 1, "PROC_PLAYER -> FALSE");
} else {
print8(posX, posY+20, 1, "PROC_PLAYER -> TRUE");
else {
print8(posX, posY + 10, 1, "PROC_MAP -> TRUE");
}
if(lbl_1_bss_F4.unk04 == NULL) {
print8(posX, posY+30, 1, "PROC_SUB -> FALSE");
} else {
print8(posX, posY+30, 1, "PROC_SUB -> TRUE");
if (lbl_1_bss_11C.unk04 == NULL) {
print8(posX, posY + 20, 1, "PROC_PLAYER -> FALSE");
}
if(lbl_1_bss_CC.unk04 == NULL) {
print8(posX, posY+40, 1, "PROC_KOOPA -> FALSE");
} else {
print8(posX, posY+40, 1, "PROC_KOOPA -> TRUE");
else {
print8(posX, posY + 20, 1, "PROC_PLAYER -> TRUE");
}
print8(posX, posY+60, 1, "P:%d W:%d", lbl_1_bss_194.unk00, lbl_1_bss_194.unk0C);
print8(posX, posY+80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for(i=0; i<4; i++) {
print8(posX, posY+90+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_194.unk30[i].unk00, lbl_1_bss_194.unk30[i].unk04, lbl_1_bss_194.unk30[i].unk08, lbl_1_bss_194.unk30[i].unk0C, lbl_1_bss_194.unk30[i].unk14, lbl_1_bss_194.unk30[i].unk10);
if (lbl_1_bss_F4.unk04 == NULL) {
print8(posX, posY + 30, 1, "PROC_SUB -> FALSE");
}
if(HuPadBtnDown[0] & PAD_BUTTON_X) {
else {
print8(posX, posY + 30, 1, "PROC_SUB -> TRUE");
}
if (lbl_1_bss_CC.unk04 == NULL) {
print8(posX, posY + 40, 1, "PROC_KOOPA -> FALSE");
}
else {
print8(posX, posY + 40, 1, "PROC_KOOPA -> TRUE");
}
print8(posX, posY + 60, 1, "P:%d W:%d", lbl_1_bss_194.unk00, lbl_1_bss_194.unk0C);
print8(posX, posY + 80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for (i = 0; i < 4; i++) {
print8(posX, posY + 90 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_194.unk30[i].unk00, lbl_1_bss_194.unk30[i].unk04,
lbl_1_bss_194.unk30[i].unk08, lbl_1_bss_194.unk30[i].unk0C, lbl_1_bss_194.unk30[i].unk14, lbl_1_bss_194.unk30[i].unk10);
}
if (HuPadBtnDown[0] & PAD_BUTTON_X) {
fn_1_7384(lbl_1_bss_11C.unk00->model[1], lbl_1_bss_194.unk30[lbl_1_bss_194.unk00].unk10, 30, 120, TRUE);
} else if(HuPadBtnDown[0] & PAD_BUTTON_Y) {
}
else if (HuPadBtnDown[0] & PAD_BUTTON_Y) {
fn_1_7384(lbl_1_bss_11C.unk00->model[1], lbl_1_bss_194.unk30[lbl_1_bss_194.unk00].unk10, 30, 120, FALSE);
}
}
@ -200,10 +190,10 @@ void fn_1_85DC(void)
fn_1_1DFC(lbl_1_bss_144.unk00, 2, 2, 0, 0);
do {
fn_1_BC8();
} while(lbl_1_bss_11C.unk04 != NULL);
} while (lbl_1_bss_11C.unk04 != NULL);
do {
fn_1_BC8();
} while(lbl_1_bss_F4.unk04 != NULL);
} while (lbl_1_bss_F4.unk04 != NULL);
lbl_1_bss_194.unk04 = fn_1_185C(1, 0, 21, 2, lbl_1_bss_194.unk0C);
HuAudFXPlay(lbl_1_data_0[0][2]);
fn_1_1DFC(lbl_1_bss_F4.unk00, 1, 3, 5, 1);
@ -227,17 +217,17 @@ void fn_1_87D4(void)
fn_1_BC8();
Hu3DMotionTimeSet(lbl_1_bss_CC.unk00->model[1], 100);
Hu3DModelAttrReset(lbl_1_bss_CC.unk00->model[1], 1);
while(1) {
while (1) {
fn_1_BC8();
if(Hu3DMotionTimeGet(lbl_1_bss_CC.unk00->model[1]) >= 132) {
if (Hu3DMotionTimeGet(lbl_1_bss_CC.unk00->model[1]) >= 132) {
break;
}
}
fn_1_1DFC(lbl_1_bss_F4.unk00, 1, 4, 0, 0);
fn_1_BC8();
while(1) {
while (1) {
fn_1_BC8();
if(Hu3DMotionTimeGet(lbl_1_bss_F4.unk00->model[1]) >= 5) {
if (Hu3DMotionTimeGet(lbl_1_bss_F4.unk00->model[1]) >= 5) {
break;
}
}
@ -247,8 +237,8 @@ void fn_1_87D4(void)
HuAudFXPlay(156);
omVibrate(lbl_1_bss_194.unk0C, 45, 12, 0);
speed = 50;
for(i=0; i<60; i++) {
float weight = fn_1_B08(0, speed, i%15, 15);
for (i = 0; i < 60; i++) {
float weight = fn_1_B08(0, speed, i % 15, 15);
speed = fn_1_88C(speed, 0, 30);
lbl_1_bss_194.unk100 = fn_1_88C(lbl_1_bss_194.unk100, weight, 5);
fn_1_BC8();
@ -326,9 +316,9 @@ void fn_1_9034(void)
fn_1_1D18(lbl_1_bss_194.unk04, 0x1F0007);
fn_1_1AFC(lbl_1_bss_194.unk04, -1);
fn_1_1A94(lbl_1_bss_194.unk04);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_CC.unk04 == NULL) {
if (lbl_1_bss_CC.unk04 == NULL) {
break;
}
}
@ -349,9 +339,9 @@ void fn_1_9198(void)
HuAudFXFadeOut(lbl_1_bss_88[0], 1000);
WipeColorSet(0, 0, 0);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while(1) {
while (1) {
fn_1_BC8();
if(!WipeStatGet()) {
if (!WipeStatGet()) {
break;
}
}
@ -364,7 +354,7 @@ void fn_1_9198(void)
omOvlGotoEx(OVL_MENT, 1, 11, 0);
}
void fn_1_92BC(omObjData* arg0, StructBss16C* arg1)
void fn_1_92BC(omObjData *arg0, StructBss16C *arg1)
{
int temp = 0;
fn_1_8580();
@ -382,9 +372,9 @@ void fn_1_9768(void)
lbl_1_bss_16C.unk00 = obj = omAddObjEx(lbl_1_bss_C8, 256, 16, 16, -1, NULL);
lbl_1_bss_16C.unk04 = (void *)fn_1_92BC;
lbl_1_bss_16C.unk00->data = &lbl_1_bss_16C;
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_16C.unk04 != NULL) {
if (lbl_1_bss_16C.unk04 != NULL) {
lbl_1_bss_16C.unk04(obj, &lbl_1_bss_16C);
}
}
@ -403,10 +393,10 @@ void fn_1_981C(omObjData *object)
object->model[4] = Hu3DModelCreateFile(0x660051);
}
void fn_1_9954(omObjData* arg0, StructBss16C* arg1)
void fn_1_9954(omObjData *arg0, StructBss16C *arg1)
{
Hu3DData[arg0->model[5]].pos.y = fn_1_B08(125, 130, arg1->unk08++, 360);
if(arg1->unk08 >= 360) {
if (arg1->unk08 >= 360) {
arg1->unk08 = 0;
}
}
@ -418,9 +408,9 @@ void fn_1_9A10(void)
lbl_1_bss_144.unk04 = (void *)fn_1_9954;
lbl_1_bss_144.unk00->data = &lbl_1_bss_144;
fn_1_981C(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_144.unk04 != NULL) {
if (lbl_1_bss_144.unk04 != NULL) {
lbl_1_bss_144.unk04(obj, &lbl_1_bss_144);
}
}
@ -431,16 +421,16 @@ void fn_1_9BD4(s32 arg0)
int i;
int order[4];
order[0] = 0;
for(i=1; i<4; i++) {
order[i] = order[i-1]+1;
if(order[i] >= 4) {
for (i = 1; i < 4; i++) {
order[i] = order[i - 1] + 1;
if (order[i] >= 4) {
order[i] = 0;
}
if(arg0 == order[i]) {
if (arg0 == order[i]) {
lbl_1_bss_194.unk00 = i;
}
}
for(i=0; i<4; i++) {
for (i = 0; i < 4; i++) {
fn_1_357C(&lbl_1_bss_194.unk30[i], order[i]);
}
}
@ -449,13 +439,13 @@ void fn_1_9CB8(omObjData *object)
{
int charNo = lbl_1_bss_194.unk30[lbl_1_bss_194.unk00].unk10;
object->model[1] = CharModelCreate(charNo, 1);
object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000);
object->motion[2] = CharModelMotionCreate(charNo, 0x5F0035);
object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660018+charNo);
object->motion[7] = Hu3DJointMotionFile(object->model[1], 0x660048+charNo);
object->motion[8] = Hu3DJointMotionFile(object->model[1], 0x660040+charNo);
object->motion[9] = Hu3DJointMotionFile(object->model[1], 0x660020+charNo);
object->motion[10] = CharModelMotionCreate(charNo, 0x5F0012);
object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00));
object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x35));
object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660018 + charNo);
object->motion[7] = Hu3DJointMotionFile(object->model[1], 0x660048 + charNo);
object->motion[8] = Hu3DJointMotionFile(object->model[1], 0x660040 + charNo);
object->motion[9] = Hu3DJointMotionFile(object->model[1], 0x660020 + charNo);
object->motion[10] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x12));
CharModelMotionDataClose(charNo);
Hu3DModelPosSet(object->model[1], 120, 0, 800);
Hu3DModelRotSet(object->model[1], 0, -135, 0);
@ -464,13 +454,13 @@ void fn_1_9CB8(omObjData *object)
fn_1_1DFC(object, 1, 1, 0, 1);
}
void fn_1_9ECC(omObjData* arg0, StructBss16C* arg1)
void fn_1_9ECC(omObjData *arg0, StructBss16C *arg1)
{
int i;
fn_1_1DFC(arg0, 1, 2, 0, 0);
fn_1_BC8();
Hu3DMotionTimeSet(arg0->model[1], 60);
for(i=0; i<60; i++) {
for (i = 0; i < 60; i++) {
fn_1_BC8();
Hu3DData[arg0->model[1]].rot.y = fn_1_864(-135, -90, i, 60);
}
@ -485,12 +475,12 @@ void fn_1_9FDC(void)
lbl_1_bss_11C.unk04 = NULL;
lbl_1_bss_11C.unk00->data = &lbl_1_bss_11C;
fn_1_9CB8(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_11C.unk04 != NULL) {
if (lbl_1_bss_11C.unk04 != NULL) {
lbl_1_bss_11C.unk04(obj, &lbl_1_bss_11C);
}
if(obj->work[0]) {
if (obj->work[0]) {
fn_1_6704(obj);
}
}
@ -513,7 +503,7 @@ void fn_1_A288(omObjData *object)
CharModelEffectNpcInit(object->model[1], object->motion[2], 1, 9);
}
void fn_1_A4A8(omObjData* arg0, StructBss16C* arg1)
void fn_1_A4A8(omObjData *arg0, StructBss16C *arg1)
{
Vec pos = { -120, 0, 800 };
fn_1_1DFC(arg0, 1, 2, 15, 1);
@ -529,12 +519,12 @@ void fn_1_A58C(void)
lbl_1_bss_F4.unk04 = NULL;
lbl_1_bss_F4.unk00->data = &lbl_1_bss_F4;
fn_1_A288(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_F4.unk04 != NULL) {
if (lbl_1_bss_F4.unk04 != NULL) {
lbl_1_bss_F4.unk04(obj, &lbl_1_bss_F4);
}
if(obj->work[0]) {
if (obj->work[0]) {
fn_1_6704(obj);
}
}
@ -563,11 +553,11 @@ void fn_1_A848(omObjData *object)
HuPrcChildCreate(fn_1_7DB0, 100, 8192, 0, HuPrcCurrentGet());
}
void fn_1_AB10(omObjData* arg0, StructBss16C* arg1)
void fn_1_AB10(omObjData *arg0, StructBss16C *arg1)
{
int i;
fn_1_1DFC(lbl_1_bss_CC.unk00, 1, 8, 15, 1);
for(i=0; i<30; i++) {
for (i = 0; i < 30; i++) {
fn_1_BC8();
Hu3DData[lbl_1_bss_CC.unk00->model[1]].pos.x = fn_1_864(-120, -60, i, 30);
}
@ -576,7 +566,7 @@ void fn_1_AB10(omObjData* arg0, StructBss16C* arg1)
fn_1_2264(lbl_1_bss_CC.unk00, 1, 6, 15);
fn_1_1DFC(lbl_1_bss_CC.unk00, 1, 7, 15, 1);
fn_1_1DFC(lbl_1_bss_11C.unk00, 1, 10, 15, 1);
for(i=0; i<240; i++) {
for (i = 0; i < 240; i++) {
fn_1_BC8();
Hu3DData[lbl_1_bss_CC.unk00->model[1]].pos.x = fn_1_864(-60, 540, i, 180);
Hu3DData[lbl_1_bss_11C.unk00->model[1]].pos.x = fn_1_864(120, 840, i, 180);
@ -588,12 +578,12 @@ void fn_1_AB10(omObjData* arg0, StructBss16C* arg1)
void fn_1_ADB0(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_CC.unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_CC.unk00->work[0] = arg4;
lbl_1_bss_CC.unk00->work[1] = arg1;
lbl_1_bss_CC.unk00->work[2] = arg2+1;
lbl_1_bss_CC.unk00->work[2] = arg2 + 1;
}
void fn_1_AE5C(void)
@ -603,12 +593,12 @@ void fn_1_AE5C(void)
lbl_1_bss_CC.unk04 = NULL;
lbl_1_bss_CC.unk00->data = &lbl_1_bss_CC;
fn_1_A848(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_CC.unk04 != NULL) {
if (lbl_1_bss_CC.unk04 != NULL) {
lbl_1_bss_CC.unk04(obj, &lbl_1_bss_CC);
}
if(obj->work[0]) {
if (obj->work[0]) {
fn_1_6704(obj);
}
}
@ -638,7 +628,7 @@ void fn_1_B24C(void)
temp.unk20.z = 0;
temp.unk38 = 1400;
fn_1_42A0(work, &temp, work->unk40++, 60, 10);
if(0.0f != lbl_1_bss_194.unk100) {
work->unk08.y = 100+lbl_1_bss_194.unk100;
if (0.0f != lbl_1_bss_194.unk100) {
work->unk08.y = 100 + lbl_1_bss_194.unk100;
}
}
}

319
src/REL/mstory2Dll/board_miss.c
View file

@ -10,13 +10,13 @@
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "game/pad.h"
#include "game/objsub.h"
#include "game/board/main.h"
typedef struct {
/* 0x000 */ s32 unk00;
@ -59,27 +59,19 @@ s32 lbl_1_data_698[7] = {
DATADIR_W10,
};
s32 lbl_1_data_6B4[8] = {
DATADIR_MARIOMDL1,
DATADIR_LUIGIMDL1,
DATADIR_PEACHMDL1,
DATADIR_YOSHIMDL1,
DATADIR_WARIOMDL1,
DATADIR_DONKEYMDL1,
DATADIR_DAISYMDL1,
DATADIR_WALUIGIMDL1
};
s32 lbl_1_data_6B4[8] = { DATADIR_MARIOMDL1, DATADIR_LUIGIMDL1, DATADIR_PEACHMDL1, DATADIR_YOSHIMDL1, DATADIR_WARIOMDL1, DATADIR_DONKEYMDL1,
DATADIR_DAISYMDL1, DATADIR_WALUIGIMDL1 };
void fn_1_FDFC(void);
void fn_1_10194(void);
void fn_1_106B0(omObjData* arg0, StructBss16C* arg1);
void fn_1_106B0(omObjData *arg0, StructBss16C *arg1);
void fn_1_1094C(void);
void fn_1_10DF4(int arg0, int arg1, int arg2, int arg3, int arg4);
void fn_1_10EA0(omObjData* arg0, StructBss16C* arg1);
void fn_1_10EA0(omObjData *arg0, StructBss16C *arg1);
void fn_1_1112C(void);
void fn_1_11418(int arg0);
void fn_1_11934(omObjData* arg0, StructBss16C* arg1);
void fn_1_11A98(omObjData* arg0, StructBss16C* arg1);
void fn_1_11934(omObjData *arg0, StructBss16C *arg1);
void fn_1_11A98(omObjData *arg0, StructBss16C *arg1);
void fn_1_11BB0(void);
void fn_1_11FD0(void);
void fn_1_1205C(void);
@ -88,25 +80,25 @@ void fn_1_1218C(void);
void fn_1_E570(void)
{
int statId = HuDataDirReadAsync(DATADIR_BOARD);
if(statId != -1) {
while(!HuDataGetAsyncStat(statId)) {
if (statId != -1) {
while (!HuDataGetAsyncStat(statId)) {
HuPrcVSleep();
}
}
HuAR_MRAMtoARAM(DATADIR_BOARD);
while(HuARDMACheck()) {
while (HuARDMACheck()) {
HuPrcVSleep();
}
HuDataDirClose(DATADIR_BOARD);
statId = HuDataDirReadAsync(lbl_1_data_698[GWSystem.board]);
if(statId != -1) {
while(!HuDataGetAsyncStat(statId)) {
if (statId != -1) {
while (!HuDataGetAsyncStat(statId)) {
HuPrcVSleep();
}
}
lbl_1_bss_4E4 = TRUE;
HuPrcEnd();
while(1) {
while (1) {
HuPrcVSleep();
}
}
@ -119,22 +111,22 @@ void fn_1_E638(void)
lbl_1_bss_4E8[0].unk10 = lbl_1_bss_688.unk30[lbl_1_bss_688.unk00].unk10;
lbl_1_bss_4E8[0].unk14 = lbl_1_bss_688.unk30[lbl_1_bss_688.unk00].unk14;
lbl_1_bss_4E8[0].unk08 = 0;
for(i=1; i<4; i++) {
for (i = 1; i < 4; i++) {
lbl_1_bss_4E8[i].unk10 = -1;
lbl_1_bss_4E8[i].unk14 = i;
lbl_1_bss_4E8[i].unk08 = 1;
}
for(i=1; i<4; i++) {
for (i = 1; i < 4; i++) {
do {
lbl_1_bss_4E8[i].unk10 = rand8()%8;
for(j=0; j<4; j++) {
if(i != j && lbl_1_bss_4E8[j].unk10 != -1 && lbl_1_bss_4E8[i].unk10 == lbl_1_bss_4E8[j].unk10) {
lbl_1_bss_4E8[i].unk10 = rand8() % 8;
for (j = 0; j < 4; j++) {
if (i != j && lbl_1_bss_4E8[j].unk10 != -1 && lbl_1_bss_4E8[i].unk10 == lbl_1_bss_4E8[j].unk10) {
break;
}
}
} while(j != 4);
} while (j != 4);
}
for(i=0; i<4; i++) {
for (i = 0; i < 4; i++) {
GWPlayerCfg[i].character = lbl_1_bss_4E8[i].unk10;
GWPlayerCfg[i].pad_idx = lbl_1_bss_4E8[i].unk14;
GWPlayerCfg[i].group = 0;
@ -148,15 +140,7 @@ void fn_1_E638(void)
void fn_1_E8EC(void)
{
int ovlTbl[7] = {
OVL_W01,
OVL_W02,
OVL_W03,
OVL_W04,
OVL_W05,
OVL_W06,
OVL_W10
};
int ovlTbl[7] = { OVL_W01, OVL_W02, OVL_W03, OVL_W04, OVL_W05, OVL_W06, OVL_W10 };
omOvlHisData *his;
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet()) {
@ -168,7 +152,7 @@ void fn_1_E8EC(void)
omOvlHisChg(0, OVL_MSTORY3, 0, his->stat);
do {
fn_1_BC8();
} while(lbl_1_bss_4E4 != 1);
} while (lbl_1_bss_4E4 != 1);
CharARAMOpen(GWPlayerCfg[0].character);
CharARAMOpen(GWPlayerCfg[1].character);
CharARAMOpen(GWPlayerCfg[2].character);
@ -176,12 +160,12 @@ void fn_1_E8EC(void)
HuAudSeqAllFadeOut(1000);
HuAudSStreamAllFadeOut(1000);
omOvlCallEx(ovlTbl[GWSystem.board], 1, 0, 0);
while(1) {
while (1) {
fn_1_BC8();
}
}
void fn_1_EA2C(Process* arg0, s32 arg1)
void fn_1_EA2C(Process *arg0, s32 arg1)
{
int i;
lbl_1_bss_4E0 = arg0;
@ -194,7 +178,7 @@ void fn_1_EA2C(Process* arg0, s32 arg1)
HuPrcChildCreate(fn_1_10194, 100, 8192, 0, HuPrcCurrentGet());
HuPrcChildCreate(fn_1_1094C, 100, 8192, 0, HuPrcCurrentGet());
HuPrcChildCreate(fn_1_1112C, 100, 8192, 0, HuPrcCurrentGet());
for(i=0; i<4; i++) {
for (i = 0; i < 4; i++) {
HuPrcChildCreate(fn_1_11BB0, 100, 8192, 0, HuPrcCurrentGet());
}
HuPrcChildCreate(fn_1_FDFC, 100, 8192, 0, HuPrcCurrentGet());
@ -202,11 +186,11 @@ void fn_1_EA2C(Process* arg0, s32 arg1)
void fn_1_EB60(omObjData *object)
{
if(object->work[2]) {
if (object->work[2]) {
object->work[2]--;
return;
}
if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
fn_1_1DFC(object, 1, object->work[1], 15, 1);
object->work[0] = object->work[1] = object->work[2] = 0;
}
@ -218,40 +202,46 @@ void fn_1_EBEC(void)
int posY = 40;
GXColor winColor = { 0, 0, 128, 128 };
int i;
while(1) {
while (1) {
fn_1_BC8();
printWin(posX, posY, 220, 160, &winColor);
if(lbl_1_bss_660.unk04 == NULL) {
if (lbl_1_bss_660.unk04 == NULL) {
print8(posX, posY, 1, "PROC_MAIN -> FALSE");
} else {
}
else {
print8(posX, posY, 1, "PROC_MAIN -> TRUE");
}
if(lbl_1_bss_638.unk04 == NULL) {
print8(posX, posY+10, 1, "PROC_MAP -> FALSE");
} else {
print8(posX, posY+10, 1, "PROC_MAP -> TRUE");
if (lbl_1_bss_638.unk04 == NULL) {
print8(posX, posY + 10, 1, "PROC_MAP -> FALSE");
}
if(lbl_1_bss_610.unk04 == NULL) {
print8(posX, posY+20, 1, "PROC_KOOPA -> FALSE");
} else {
print8(posX, posY+20, 1, "PROC_KOOPA -> TRUE");
else {
print8(posX, posY + 10, 1, "PROC_MAP -> TRUE");
}
if(lbl_1_bss_5E8.unk04 == NULL) {
print8(posX, posY+30, 1, "PROC_MKOOPA -> FALSE");
} else {
print8(posX, posY+30, 1, "PROC_MKOOPA -> TRUE");
if (lbl_1_bss_610.unk04 == NULL) {
print8(posX, posY + 20, 1, "PROC_KOOPA -> FALSE");
}
for(i=0; i<4; i++) {
if(lbl_1_bss_548[i].unk04 == NULL) {
print8(posX, posY+40+(i*10), 1, "PROC_PLAYER%d -> FALSE", i);
} else {
print8(posX, posY+40+(i*10), 1, "PROC_PLAYER%d -> TRUE", i);
else {
print8(posX, posY + 20, 1, "PROC_KOOPA -> TRUE");
}
if (lbl_1_bss_5E8.unk04 == NULL) {
print8(posX, posY + 30, 1, "PROC_MKOOPA -> FALSE");
}
else {
print8(posX, posY + 30, 1, "PROC_MKOOPA -> TRUE");
}
for (i = 0; i < 4; i++) {
if (lbl_1_bss_548[i].unk04 == NULL) {
print8(posX, posY + 40 + (i * 10), 1, "PROC_PLAYER%d -> FALSE", i);
}
else {
print8(posX, posY + 40 + (i * 10), 1, "PROC_PLAYER%d -> TRUE", i);
}
}
print8(posX, posY+90, 1, "P:%d W:%d", lbl_1_bss_688.unk00, lbl_1_bss_688.unk0C);
print8(posX, posY+110, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for(i=0; i<4; i++) {
print8(posX, posY+120+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_688.unk30[i].unk00, lbl_1_bss_688.unk30[i].unk04, lbl_1_bss_688.unk30[i].unk08, lbl_1_bss_688.unk30[i].unk0C, lbl_1_bss_688.unk30[i].unk14, lbl_1_bss_688.unk30[i].unk10);
print8(posX, posY + 90, 1, "P:%d W:%d", lbl_1_bss_688.unk00, lbl_1_bss_688.unk0C);
print8(posX, posY + 110, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for (i = 0; i < 4; i++) {
print8(posX, posY + 120 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_688.unk30[i].unk00, lbl_1_bss_688.unk30[i].unk04,
lbl_1_bss_688.unk30[i].unk08, lbl_1_bss_688.unk30[i].unk0C, lbl_1_bss_688.unk30[i].unk14, lbl_1_bss_688.unk30[i].unk10);
}
}
}
@ -269,46 +259,46 @@ void fn_1_EFCC(void)
void fn_1_F028(void)
{
int i;
for(i=0; i<4; i++) {
for (i = 0; i < 4; i++) {
lbl_1_bss_548[i].unk04 = (void *)fn_1_11934;
}
do {
fn_1_BC8();
for(i=0; i<4; i++) {
if(lbl_1_bss_548[i].unk04 != NULL) {
for (i = 0; i < 4; i++) {
if (lbl_1_bss_548[i].unk04 != NULL) {
break;
}
}
} while(i != 4);
} while (i != 4);
lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 = (void *)fn_1_11A98;
fn_1_3854(&lbl_1_bss_24);
fn_1_2750(fn_1_1205C);
do {
fn_1_BC8();
} while(lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 != NULL);
} while (lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 != NULL);
do {
fn_1_BC8();
} while(lbl_1_bss_5E8.unk04 != NULL);
} while (lbl_1_bss_5E8.unk04 != NULL);
fn_1_BE8(30);
if(0) {
//Dummy code to stop this function from inlining
if (0) {
// Dummy code to stop this function from inlining
do {
fn_1_BC8();
for(i=0; i<4; i++) {
if(lbl_1_bss_548[i].unk04 != NULL) {
for (i = 0; i < 4; i++) {
if (lbl_1_bss_548[i].unk04 != NULL) {
break;
}
}
} while(i != 4);
} while (i != 4);
lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 = (void *)fn_1_11A98;
fn_1_3854(&lbl_1_bss_24);
fn_1_2750(fn_1_1205C);
do {
fn_1_BC8();
} while(lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 != NULL);
} while (lbl_1_bss_548[lbl_1_bss_688.unk00].unk04 != NULL);
do {
fn_1_BC8();
} while(lbl_1_bss_5E8.unk04 != NULL);
} while (lbl_1_bss_5E8.unk04 != NULL);
fn_1_BE8(30);
}
}
@ -363,11 +353,11 @@ void fn_1_F3D0(void)
HuAudSeqFadeOut(lbl_1_bss_78[0], 1000);
do {
fn_1_BC8();
} while(lbl_1_bss_5E8.unk04 != NULL);
} while (lbl_1_bss_5E8.unk04 != NULL);
lbl_1_bss_610.unk04 = (void *)fn_1_106B0;
do {
fn_1_BC8();
} while(lbl_1_bss_610.unk04 != NULL);
} while (lbl_1_bss_610.unk04 != NULL);
fn_1_7384(lbl_1_bss_548[lbl_1_bss_688.unk00].unk00->model[1], lbl_1_bss_688.unk30[lbl_1_bss_688.unk00].unk10, 1, 20, 1);
lbl_1_bss_78[1] = HuAudSeqPlay(6);
fn_1_BE8(30);
@ -404,10 +394,7 @@ void fn_1_F3D0(void)
fn_1_BE8(150);
}
void fn_1_F838(void)
{
}
void fn_1_F838(void) { }
void fn_1_F83C(void)
{
@ -422,7 +409,7 @@ void fn_1_F83C(void)
omOvlReturnEx(1, 1);
}
void fn_1_F8B4(omObjData* arg0, StructBss16C* arg1)
void fn_1_F8B4(omObjData *arg0, StructBss16C *arg1)
{
int mode = 0;
int i;
@ -430,36 +417,37 @@ void fn_1_F8B4(omObjData* arg0, StructBss16C* arg1)
fn_1_F028();
fn_1_F150();
lbl_1_bss_688.unk04 = fn_1_185C(1, 0, 21, 2, lbl_1_bss_688.unk0C);
while(1) {
while (1) {
fn_1_BC8();
if(fn_1_F22C()) {
if (fn_1_F22C()) {
mode = 0;
break;
} else if(fn_1_F2FC()) {
}
else if (fn_1_F2FC()) {
mode = 1;
break;
}
}
fn_1_1A94(lbl_1_bss_688.unk04);
for(i=0; i<4; i++) {
if(lbl_1_bss_688.unk30[i].unk00 != lbl_1_bss_688.unk30[lbl_1_bss_688.unk00].unk00) {
for (i = 0; i < 4; i++) {
if (lbl_1_bss_688.unk30[i].unk00 != lbl_1_bss_688.unk30[lbl_1_bss_688.unk00].unk00) {
Hu3DModelAttrSet(lbl_1_bss_548[i].unk00->model[1], 1);
}
Hu3DModelAttrSet(lbl_1_bss_548[i].unk00->model[2], 1);
}
switch(mode) {
switch (mode) {
case 0:
fn_1_F3D0();
break;
case 1:
break;
}
switch(mode) {
switch (mode) {
case 0:
fn_1_E8EC();
break;
case 1:
fn_1_F83C();
break;
@ -473,9 +461,9 @@ void fn_1_FDFC(void)
lbl_1_bss_660.unk00 = obj = omAddObjEx(lbl_1_bss_4E0, 256, 16, 16, -1, NULL);
lbl_1_bss_660.unk04 = (void *)fn_1_F8B4;
lbl_1_bss_660.unk00->data = &lbl_1_bss_660;
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_660.unk04 != NULL) {
if (lbl_1_bss_660.unk04 != NULL) {
lbl_1_bss_660.unk04(obj, &lbl_1_bss_660);
}
}
@ -504,10 +492,10 @@ void fn_1_FEB0(omObjData *object)
fn_1_1DFC(object, 6, 6, 0, 2);
}
void fn_1_100D8(omObjData* arg0, StructBss16C* arg1)
void fn_1_100D8(omObjData *arg0, StructBss16C *arg1)
{
Hu3DData[arg0->model[5]].pos.y = fn_1_B08(80, 90, arg1->unk08++, 360);
if(arg1->unk08 >= 360) {
if (arg1->unk08 >= 360) {
arg1->unk08 = 0;
}
}
@ -519,9 +507,9 @@ void fn_1_10194(void)
lbl_1_bss_638.unk04 = (void *)fn_1_100D8;
lbl_1_bss_638.unk00->data = &lbl_1_bss_638;
fn_1_FEB0(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_638.unk04 != NULL) {
if (lbl_1_bss_638.unk04 != NULL) {
lbl_1_bss_638.unk04(obj, &lbl_1_bss_638);
}
}
@ -545,38 +533,38 @@ void fn_1_10448(omObjData *object)
void fn_1_10604(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_610.unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_610.unk00->work[0] = arg4;
lbl_1_bss_610.unk00->work[1] = arg1;
lbl_1_bss_610.unk00->work[2] = arg2+1;
lbl_1_bss_610.unk00->work[2] = arg2 + 1;
}
void fn_1_106B0(omObjData* arg0, StructBss16C* arg1)
void fn_1_106B0(omObjData *arg0, StructBss16C *arg1)
{
int i = 0;
float speed = 50;
HuAudFXPlay(153);
fn_1_10604(2, 1, 0, 0, 1);
fn_1_BE8(5);
Hu3DMotionTimeSet(lbl_1_bss_610.unk00->model[1], 100);
fn_1_BC8();
Hu3DModelAttrReset(arg0->model[1], 1);
while(1) {
while (1) {
fn_1_BC8();
if(Hu3DMotionTimeGet(lbl_1_bss_610.unk00->model[1]) >= 137) {
if (Hu3DMotionTimeGet(lbl_1_bss_610.unk00->model[1]) >= 137) {
break;
}
}
HuAudFXPlay(156);
omVibrate(lbl_1_bss_688.unk0C, 45, 12, 0);
fn_1_67D8(lbl_1_bss_548[lbl_1_bss_688.unk00].unk00, 6, 1, 5, 0);
for(i=0; i<60; i++) {
for (i = 0; i < 60; i++) {
float posY;
fn_1_BC8();
posY = fn_1_B08(0, speed, i%15, 15);
posY = fn_1_B08(0, speed, i % 15, 15);
speed = fn_1_88C(speed, 0, 30);
lbl_1_bss_688.unk100 = fn_1_88C(lbl_1_bss_688.unk100, posY, 5);
}
@ -591,15 +579,16 @@ void fn_1_1094C(void)
lbl_1_bss_610.unk04 = NULL;
lbl_1_bss_610.unk00->data = &lbl_1_bss_638;
fn_1_10448(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_610.unk04 != NULL) {
if (lbl_1_bss_610.unk04 != NULL) {
lbl_1_bss_610.unk04(obj, &lbl_1_bss_610);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -626,15 +615,15 @@ void fn_1_10C00(omObjData *object)
void fn_1_10DF4(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_5E8.unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_5E8.unk00->work[0] = arg4;
lbl_1_bss_5E8.unk00->work[1] = arg1;
lbl_1_bss_5E8.unk00->work[2] = arg2+1;
lbl_1_bss_5E8.unk00->work[2] = arg2 + 1;
}
void fn_1_10EA0(omObjData* arg0, StructBss16C* arg1)
void fn_1_10EA0(omObjData *arg0, StructBss16C *arg1)
{
Vec pos = { -600, 0, 800 };
fn_1_1DFC(arg0, 1, 2, 15, 1);
@ -643,17 +632,17 @@ void fn_1_10EA0(omObjData* arg0, StructBss16C* arg1)
arg1->unk04 = NULL;
}
void fn_1_10F84(omObjData* arg0, StructBss16C* arg1)
void fn_1_10F84(omObjData *arg0, StructBss16C *arg1)
{
int i;
for(i=0; i<15; i++) {
for (i = 0; i < 15; i++) {
fn_1_BC8();
Hu3DData[arg0->model[1]].rot.y = fn_1_864(0, 135, i, 15);
}
arg1->unk04 = NULL;
}
void fn_1_11048(omObjData* arg0, StructBss16C* arg1)
void fn_1_11048(omObjData *arg0, StructBss16C *arg1)
{
Vec pos = { -120, 0, 800 };
fn_1_1DFC(arg0, 1, 2, 15, 1);
@ -669,15 +658,16 @@ void fn_1_1112C(void)
lbl_1_bss_5E8.unk04 = NULL;
lbl_1_bss_5E8.unk00->data = &lbl_1_bss_5E8;
fn_1_10C00(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_5E8.unk04 != NULL) {
if (lbl_1_bss_5E8.unk04 != NULL) {
lbl_1_bss_5E8.unk04(obj, &lbl_1_bss_5E8);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -690,20 +680,20 @@ void fn_1_11418(int arg0)
int i;
int order[4];
order[0] = 0;
for(i=1; i<4; i++) {
order[i] = order[i-1]+1;
if(order[i] >= 4) {
for (i = 1; i < 4; i++) {
order[i] = order[i - 1] + 1;
if (order[i] >= 4) {
order[i] = 0;
}
if(arg0 == order[i]) {
if (arg0 == order[i]) {
lbl_1_bss_688.unk00 = i;
}
}
for(i=0; i<4; i++) {
for (i = 0; i < 4; i++) {
fn_1_357C(&lbl_1_bss_688.unk30[i], order[i]);
}
for(i=0; i<4; i++) {
lbl_1_bss_688.unk30[i].unk18 = GWPlayer[order[i]].rank+1;
for (i = 0; i < 4; i++) {
lbl_1_bss_688.unk30[i].unk18 = GWPlayer[order[i]].rank + 1;
}
}
@ -719,21 +709,23 @@ void fn_1_1154C(omObjData *object, int player)
int playerNo = player;
int charNo = lbl_1_bss_688.unk30[playerNo].unk10;
object->model[1] = CharModelCreate(charNo, 4);
object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000);
object->motion[2] = CharModelMotionCreate(charNo, 0x5F0003);
object->motion[3] = CharModelMotionCreate(charNo, 0x5F0005);
object->motion[4] = CharModelMotionCreate(charNo, 0x5F001A);
object->motion[5] = CharModelMotionCreate(charNo, 0x5F006D);
object->motion[6] = Hu3DJointMotionFile(object->model[1], 0x660018+charNo);
object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00));
object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03));
object->motion[3] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05));
object->motion[4] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x1A));
object->motion[5] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x6D));
object->motion[6] = Hu3DJointMotionFile(object->model[1], 0x660018 + charNo);
CharModelMotionDataClose(charNo);
Hu3DModelPosSet(object->model[1], lbl_1_data_81C[playerNo].x, lbl_1_data_81C[lbl_1_bss_688.unk30[playerNo].unk18-1].y+90, lbl_1_data_81C[playerNo].z);
Hu3DModelPosSet(
object->model[1], lbl_1_data_81C[playerNo].x, lbl_1_data_81C[lbl_1_bss_688.unk30[playerNo].unk18 - 1].y + 90, lbl_1_data_81C[playerNo].z);
Hu3DModelRotSet(object->model[1], 0, 0, 0);
Hu3DModelScaleSet(object->model[1], 1, 1, 1);
Hu3DModelShadowSet(object->model[1]);
fn_1_1DFC(object, 1, 1, 0, 1);
object->model[2] = Hu3DModelCreateFile(0x660056);
Hu3DModelPosSet(object->model[2], lbl_1_data_81C[playerNo].x, lbl_1_data_81C[lbl_1_bss_688.unk30[playerNo].unk18-1].y, lbl_1_data_81C[playerNo].z);
if(lbl_1_bss_688.unk30[playerNo].unk18 == 4) {
Hu3DModelPosSet(
object->model[2], lbl_1_data_81C[playerNo].x, lbl_1_data_81C[lbl_1_bss_688.unk30[playerNo].unk18 - 1].y, lbl_1_data_81C[playerNo].z);
if (lbl_1_bss_688.unk30[playerNo].unk18 == 4) {
Hu3DModelAttrSet(object->model[2], 1);
}
Hu3DModelScaleSet(object->model[2], 1.5, 1, 1.5);
@ -743,28 +735,28 @@ void fn_1_1154C(omObjData *object, int player)
void fn_1_11838(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_548[lbl_1_bss_688.unk00].unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_548[lbl_1_bss_688.unk00].unk00->work[0] = arg4;
lbl_1_bss_548[lbl_1_bss_688.unk00].unk00->work[1] = arg1;
lbl_1_bss_548[lbl_1_bss_688.unk00].unk00->work[2] = arg2+1;
lbl_1_bss_548[lbl_1_bss_688.unk00].unk00->work[2] = arg2 + 1;
}
void fn_1_11934(omObjData* arg0, StructBss16C* arg1)
void fn_1_11934(omObjData *arg0, StructBss16C *arg1)
{
float posY = Hu3DData[arg0->model[1]].pos.y;
int i;
for(i=0; i<60; i++) {
for (i = 0; i < 60; i++) {
fn_1_BC8();
Hu3DData[arg0->model[1]].pos.y = fn_1_984(posY, 0, i, 60);
Hu3DData[arg0->model[2]].pos.y = fn_1_984(posY-90, -90, i, 60);
Hu3DData[arg0->model[2]].pos.y = fn_1_984(posY - 90, -90, i, 60);
}
Hu3DModelAttrSet(arg0->model[2], 1);
arg1->unk04 = NULL;
}
void fn_1_11A98(omObjData* arg0, StructBss16C* arg1)
void fn_1_11A98(omObjData *arg0, StructBss16C *arg1)
{
Vec pos = { 120, 0, 800 };
lbl_1_bss_5E8.unk04 = (void *)fn_1_11048;
@ -783,15 +775,16 @@ void fn_1_11BB0(void)
lbl_1_bss_548[playerNo].unk04 = NULL;
lbl_1_bss_548[playerNo].unk00->data = &lbl_1_bss_548[0];
fn_1_1154C(obj, playerNo);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_548[playerNo].unk04 != NULL) {
if (lbl_1_bss_548[playerNo].unk04 != NULL) {
lbl_1_bss_548[playerNo].unk04(obj, &lbl_1_bss_548[playerNo]);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -823,8 +816,8 @@ void fn_1_1205C(void)
temp.unk20.z = 0;
temp.unk38 = 1750;
fn_1_4FEC(work, &temp, work->unk40++, 60, 30);
if(0.0f != lbl_1_bss_688.unk100) {
work->unk08.y = lbl_1_bss_688.unk100+125;
if (0.0f != lbl_1_bss_688.unk100) {
work->unk08.y = lbl_1_bss_688.unk100 + 125;
}
}
@ -832,7 +825,7 @@ void fn_1_1218C(void)
{
StructBss24 *work = &lbl_1_bss_24;
StructBss24 temp;
if(work->unk40 == 50) {
if (work->unk40 == 50) {
fn_1_1DFC(lbl_1_bss_638.unk00, 5, 5, 0, 0);
fn_1_1DFC(lbl_1_bss_638.unk00, 6, 6, 0, 0);
HuAudFXPlay(161);
@ -845,11 +838,11 @@ void fn_1_1218C(void)
temp.unk20.z = 0;
temp.unk38 = 125;
fn_1_4FEC(work, &temp, work->unk40, 180, 10);
if(work->unk40++ >= 90) {
if(work->unk40 == 91) {
if (work->unk40++ >= 90) {
if (work->unk40 == 91) {
lbl_1_bss_88[0] = HuAudFXPlay(32);
}
work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40-90, 90);
Hu3DData[lbl_1_bss_638.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40-90, 90);
work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40 - 90, 90);
Hu3DData[lbl_1_bss_638.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40 - 90, 90);
}
}
}

200
src/REL/mstory2Dll/ending.c
View file

@ -3,19 +3,20 @@
#include "game/board/main.h"
#include "game/chrman.h"
#include "game/data.h"
#include "game/esprite.h"
#include "game/gamework.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "game/pad.h"
#include "game/objsub.h"
#include "game/esprite.h"
typedef struct {
/* 0x000 */ s32 unk00;
@ -46,11 +47,11 @@ s32 lbl_1_data_F14 = 127;
void fn_1_19F14(void);
void fn_1_1A160(void);
void fn_1_1A538(omObjData* arg0, StructBss16C* arg1);
void fn_1_1A538(omObjData *arg0, StructBss16C *arg1);
void fn_1_1A578(void);
void fn_1_1A9D0(omObjData* arg0, StructBss16C* arg1);
void fn_1_1A9D0(omObjData *arg0, StructBss16C *arg1);
void fn_1_1AAB4(void);
void fn_1_1AFD4(omObjData* arg0, StructBss16C* arg1);
void fn_1_1AFD4(omObjData *arg0, StructBss16C *arg1);
void fn_1_1B0E4(void);
void fn_1_1AD3C(int arg0);
void fn_1_1B318(void);
@ -60,44 +61,44 @@ void fn_1_1B430(void);
void fn_1_186D0(void)
{
int i;
while(1) {
while (1) {
HuPrcVSleep();
if(lbl_1_data_F08 != -1 && lbl_1_data_F0C[0] != -1 && lbl_1_data_F0C[1] != -1 && lbl_1_data_F0C[0] == Hu3DMotionIDGet(lbl_1_data_F08)) {
for(i=0; i<2; i++) {
if(lbl_1_data_EF8[1][i] != -1) {
if(Hu3DMotionTimeGet(lbl_1_data_F08) >= lbl_1_data_EF8[0][i]) {
if (lbl_1_data_F08 != -1 && lbl_1_data_F0C[0] != -1 && lbl_1_data_F0C[1] != -1 && lbl_1_data_F0C[0] == Hu3DMotionIDGet(lbl_1_data_F08)) {
for (i = 0; i < 2; i++) {
if (lbl_1_data_EF8[1][i] != -1) {
if (Hu3DMotionTimeGet(lbl_1_data_F08) >= lbl_1_data_EF8[0][i]) {
OSReport("KE-System TIME:%d\n", lbl_1_data_EF8[0][i]);
HuAudFXPlayVol(81, lbl_1_data_F14);
lbl_1_data_EF8[1][i] = -1;
}
}
}
if(Hu3DMotionTimeGet(lbl_1_data_F08) <= 10) {
for(i=0; i<2; i++) {
if (Hu3DMotionTimeGet(lbl_1_data_F08) <= 10) {
for (i = 0; i < 2; i++) {
lbl_1_data_EF8[1][i] = 1;
}
}
}
if(lbl_1_bss_B3C == 1) {
if (lbl_1_bss_B3C == 1) {
lbl_1_data_F14--;
if(lbl_1_data_F14 <= 0) {
if (lbl_1_data_F14 <= 0) {
lbl_1_data_F14 = 0;
}
}
if(lbl_1_bss_B3C == 2) {
if (lbl_1_bss_B3C == 2) {
break;
}
}
HuPrcEnd();
while(1) {
while (1) {
HuPrcVSleep();
}
}
void fn_1_188F0(Process* arg0, s32 arg1)
void fn_1_188F0(Process *arg0, s32 arg1)
{
lbl_1_bss_B38 = arg0;
if(GWSystem.diff_story == 2) {
if (GWSystem.diff_story == 2) {
GWGameStat.field10E_bit4 = TRUE;
}
lbl_1_bss_C0C.unk0C = arg1;
@ -115,11 +116,11 @@ void fn_1_188F0(Process* arg0, s32 arg1)
void fn_1_18A34(omObjData *object)
{
if(object->work[2]) {
if (object->work[2]) {
object->work[2]--;
return;
}
if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
fn_1_1DFC(object, 1, object->work[1], 15, 1);
object->work[0] = object->work[1] = object->work[2] = 0;
}
@ -131,40 +132,46 @@ void fn_1_18AC0(void)
int posY = 40;
GXColor winColor = { 0, 0, 128, 128 };
int i;
while(1) {
while (1) {
fn_1_BC8();
fontcolor = FONT_COLOR_WHITE;
printWin(posX, posY, 220, 130, &winColor);
if(lbl_1_bss_BE4.unk04 == NULL) {
if (lbl_1_bss_BE4.unk04 == NULL) {
print8(posX, posY, 1, "PROC_MAIN -> FALSE");
} else {
}
else {
print8(posX, posY, 1, "PROC_MAIN -> TRUE");
}
if(lbl_1_bss_BBC.unk04 == NULL) {
print8(posX, posY+10, 1, "PROC_MAP -> FALSE");
} else {
print8(posX, posY+10, 1, "PROC_MAP -> TRUE");
if (lbl_1_bss_BBC.unk04 == NULL) {
print8(posX, posY + 10, 1, "PROC_MAP -> FALSE");
}
if(lbl_1_bss_B94.unk04 == NULL) {
print8(posX, posY+20, 1, "PROC_PLAYER -> FALSE");
} else {
print8(posX, posY+20, 1, "PROC_PLAYER -> TRUE");
else {
print8(posX, posY + 10, 1, "PROC_MAP -> TRUE");
}
if(lbl_1_bss_B6C.unk04 == NULL) {
print8(posX, posY+30, 1, "PROC_SUB -> FALSE");
} else {
print8(posX, posY+30, 1, "PROC_SUB -> TRUE");
if (lbl_1_bss_B94.unk04 == NULL) {
print8(posX, posY + 20, 1, "PROC_PLAYER -> FALSE");
}
if(lbl_1_bss_B44.unk04 == NULL) {
print8(posX, posY+40, 1, "PROC_KOOPA -> FALSE");
} else {
print8(posX, posY+40, 1, "PROC_KOOPA -> TRUE");
else {
print8(posX, posY + 20, 1, "PROC_PLAYER -> TRUE");
}
print8(posX, posY+60, 1, "P:%d W:%d", lbl_1_bss_C0C.unk00, lbl_1_bss_C0C.unk0C);
print8(posX, posY+80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for(i=0; i<4; i++) {
print8(posX, posY+90+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_C0C.unk30[i].unk00, lbl_1_bss_C0C.unk30[i].unk04, lbl_1_bss_C0C.unk30[i].unk08, lbl_1_bss_C0C.unk30[i].unk0C, lbl_1_bss_C0C.unk30[i].unk14, lbl_1_bss_C0C.unk30[i].unk10);
if (lbl_1_bss_B6C.unk04 == NULL) {
print8(posX, posY + 30, 1, "PROC_SUB -> FALSE");
}
else {
print8(posX, posY + 30, 1, "PROC_SUB -> TRUE");
}
if (lbl_1_bss_B44.unk04 == NULL) {
print8(posX, posY + 40, 1, "PROC_KOOPA -> FALSE");
}
else {
print8(posX, posY + 40, 1, "PROC_KOOPA -> TRUE");
}
print8(posX, posY + 60, 1, "P:%d W:%d", lbl_1_bss_C0C.unk00, lbl_1_bss_C0C.unk0C);
print8(posX, posY + 80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for (i = 0; i < 4; i++) {
print8(posX, posY + 90 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_C0C.unk30[i].unk00, lbl_1_bss_C0C.unk30[i].unk04,
lbl_1_bss_C0C.unk30[i].unk08, lbl_1_bss_C0C.unk30[i].unk0C, lbl_1_bss_C0C.unk30[i].unk14, lbl_1_bss_C0C.unk30[i].unk10);
}
}
}
@ -211,7 +218,7 @@ void fn_1_18EC4(void)
do {
fn_1_BC8();
} while (WipeStatGet());
if(0) {
if (0) {
fn_1_BC8();
}
}
@ -226,15 +233,15 @@ void fn_1_19138(void)
fn_1_2750(fn_1_1B430);
fn_1_BE8(30);
fn_1_1DFC(lbl_1_bss_BBC.unk00, 2, 2, 0, 0);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_B94.unk04 == NULL) {
if (lbl_1_bss_B94.unk04 == NULL) {
break;
}
}
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_B6C.unk04 == NULL) {
if (lbl_1_bss_B6C.unk04 == NULL) {
break;
}
}
@ -251,16 +258,8 @@ void fn_1_19138(void)
fn_1_BE8(60);
}
char *lbl_1_data_10E4[8] = {
"movie/endmov_ma0.thp",
"movie/endmov_lu0.thp",
"movie/endmov_pe0.thp",
"movie/endmov_yo0.thp",
"movie/endmov_wa0.thp",
"movie/endmov_do0.thp",
"movie/endmov_da0.thp",
"movie/endmov_wl0.thp"
};
char *lbl_1_data_10E4[8] = { "movie/endmov_ma0.thp", "movie/endmov_lu0.thp", "movie/endmov_pe0.thp", "movie/endmov_yo0.thp", "movie/endmov_wa0.thp",
"movie/endmov_do0.thp", "movie/endmov_da0.thp", "movie/endmov_wl0.thp" };
void fn_1_19334(void)
{
@ -303,7 +302,7 @@ void fn_1_19334(void)
lbl_1_bss_B94.unk04 = NULL;
lbl_1_bss_B44.unk04 = NULL;
lbl_1_bss_B6C.unk04 = NULL;
CharModelKill(-1);
Hu3DAllKill();
fn_1_BE8(60);
@ -320,7 +319,7 @@ void fn_1_19334(void)
sprid = HuSprCreate(HuSprAnimRead(HuDataReadNum(0x660061, 0x10000000)), 950, 0);
HuSprGrpMemberSet(gid, 2, sprid);
HuSprBankSet(gid, 2, lbl_1_bss_C0C.unk30[lbl_1_bss_C0C.unk00].unk10);
if(GWLanguageGet() == 0 && lbl_1_bss_C0C.unk30[lbl_1_bss_C0C.unk00].unk10 == 5) {
if (GWLanguageGet() == 0 && lbl_1_bss_C0C.unk30[lbl_1_bss_C0C.unk00].unk10 == 5) {
HuSprBankSet(gid, 2, 8);
}
HuSprPosSet(gid, 2, 288, 254);
@ -328,28 +327,28 @@ void fn_1_19334(void)
HuPrcSleep(5);
WipeColorSet(0, 0, 0);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10);
while(WipeStatGet()) {
while (WipeStatGet()) {
HuPrcVSleep();
}
while(!HuTHPEndCheck()) {
if(time >= 3300) {
while (!HuTHPEndCheck()) {
if (time >= 3300) {
HuSprAttrReset(gid, 1, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(gid, 2, HUSPR_ATTR_DISPOFF);
} else {
}
else {
time++;
}
HuPrcVSleep();
}
WipeColorSet(0, 0, 0);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
while(WipeStatGet()) {
while (WipeStatGet()) {
HuPrcVSleep();
}
HuTHPClose();
HuPrcVSleep();
HuSprGrpKill(gid);
}
}
void fn_1_199A0(void)
@ -423,13 +422,13 @@ void fn_1_19BE8(void)
HuAudFadeOut(1);
his = omOvlHisGet(0);
omOvlHisChg(0, OVL_MSTORY2, 20, 1);
omOvlCallEx(OVL_STAFF, 1, 0, 0);
while(1) {
omOvlCallEx(OVL_STAFF, 1, 0, 0);
while (1) {
fn_1_BC8();
}
}
void fn_1_19C6C(omObjData* arg0, StructBss16C* arg1)
void fn_1_19C6C(omObjData *arg0, StructBss16C *arg1)
{
int temp = 0;
fn_1_18E7C();
@ -446,9 +445,9 @@ void fn_1_19F14(void)
lbl_1_bss_BE4.unk00 = obj = omAddObjEx(lbl_1_bss_B38, 256, 16, 16, -1, NULL);
lbl_1_bss_BE4.unk04 = (void *)fn_1_19C6C;
lbl_1_bss_BE4.unk00->data = &lbl_1_bss_BE4;
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_BE4.unk04 != NULL) {
if (lbl_1_bss_BE4.unk04 != NULL) {
lbl_1_bss_BE4.unk04(obj, &lbl_1_bss_BE4);
}
}
@ -477,9 +476,9 @@ void fn_1_1A160(void)
lbl_1_bss_BBC.unk00 = obj = omAddObjEx(lbl_1_bss_B38, 256, 16, 16, -1, NULL);
lbl_1_bss_BBC.unk04 = NULL;
fn_1_19FC8(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_BBC.unk04 != NULL) {
if (lbl_1_bss_BBC.unk04 != NULL) {
lbl_1_bss_BBC.unk04(obj, &lbl_1_bss_BBC);
}
}
@ -501,7 +500,7 @@ void fn_1_1A368(omObjData *object)
HuPrcChildCreate(fn_1_186D0, 100, 8192, 0, HuPrcCurrentGet());
}
void fn_1_1A538(omObjData* arg0, StructBss16C* arg1)
void fn_1_1A538(omObjData *arg0, StructBss16C *arg1)
{
Hu3DData[lbl_1_bss_B44.unk00->model[1]].pos.z -= 2.5f;
}
@ -512,12 +511,12 @@ void fn_1_1A578(void)
lbl_1_bss_B44.unk00 = obj = omAddObjEx(lbl_1_bss_B38, 256, 16, 16, -1, NULL);
lbl_1_bss_B44.unk04 = NULL;
fn_1_1A368(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_B44.unk04 != NULL) {
if (lbl_1_bss_B44.unk04 != NULL) {
lbl_1_bss_B44.unk04(obj, &lbl_1_bss_B44);
}
if(obj->work[0]) {
if (obj->work[0]) {
fn_1_6704(obj);
}
}
@ -540,8 +539,7 @@ void fn_1_1A7CC(omObjData *object)
CharModelEffectNpcInit(object->model[1], object->motion[2], 1, 9);
}
void fn_1_1A9D0(omObjData* arg0, StructBss16C* arg1)
void fn_1_1A9D0(omObjData *arg0, StructBss16C *arg1)
{
Vec pos = { -120, 0, 800 };
fn_1_1DFC(arg0, 1, 2, 15, 1);
@ -556,12 +554,12 @@ void fn_1_1AAB4(void)
lbl_1_bss_B6C.unk00 = obj = omAddObjEx(lbl_1_bss_B38, 256, 16, 16, -1, NULL);
lbl_1_bss_B6C.unk04 = NULL;
fn_1_1A7CC(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_B6C.unk04 != NULL) {
if (lbl_1_bss_B6C.unk04 != NULL) {
lbl_1_bss_B6C.unk04(obj, &lbl_1_bss_B6C);
}
if(obj->work[0]) {
if (obj->work[0]) {
fn_1_6704(obj);
}
}
@ -572,16 +570,16 @@ void fn_1_1AD3C(int arg0)
int i;
int order[4];
order[0] = 0;
for(i=1; i<4; i++) {
order[i] = order[i-1]+1;
if(order[i] >= 4) {
for (i = 1; i < 4; i++) {
order[i] = order[i - 1] + 1;
if (order[i] >= 4) {
order[i] = 0;
}
if(arg0 == order[i]) {
if (arg0 == order[i]) {
lbl_1_bss_C0C.unk00 = i;
}
}
for(i=0; i<4; i++) {
for (i = 0; i < 4; i++) {
fn_1_357C(&lbl_1_bss_C0C.unk30[i], order[i]);
}
}
@ -590,10 +588,10 @@ void fn_1_1AE20(omObjData *object)
{
int charNo = lbl_1_bss_C0C.unk30[lbl_1_bss_C0C.unk00].unk10;
object->model[1] = CharModelCreate(charNo, 1);
object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000);
object->motion[2] = CharModelMotionCreate(charNo, 0x5F0035);
object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660010+charNo);
object->motion[4] = Hu3DJointMotionFile(object->model[1], 0x660008+charNo);
object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00));
object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x35));
object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660010 + charNo);
object->motion[4] = Hu3DJointMotionFile(object->model[1], 0x660008 + charNo);
CharModelMotionDataClose(charNo);
Hu3DModelPosSet(object->model[1], 120, 0, 800);
Hu3DModelRotSet(object->model[1], 0, -135, 0);
@ -603,13 +601,13 @@ void fn_1_1AE20(omObjData *object)
fn_1_1DFC(object, 1, 1, 0, 1);
}
void fn_1_1AFD4(omObjData* arg0, StructBss16C* arg1)
void fn_1_1AFD4(omObjData *arg0, StructBss16C *arg1)
{
int i;
fn_1_1DFC(arg0, 1, 2, 0, 0);
fn_1_BC8();
Hu3DMotionTimeSet(arg0->model[1], 60);
for(i=0; i<60; i++) {
for (i = 0; i < 60; i++) {
fn_1_BC8();
Hu3DData[arg0->model[1]].rot.y = fn_1_864(-135, -90, i, 60);
}
@ -623,12 +621,12 @@ void fn_1_1B0E4(void)
lbl_1_bss_B94.unk00 = obj = omAddObjEx(lbl_1_bss_B38, 256, 16, 16, -1, NULL);
lbl_1_bss_B94.unk04 = NULL;
fn_1_1AE20(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_B94.unk04 != NULL) {
if (lbl_1_bss_B94.unk04 != NULL) {
lbl_1_bss_B94.unk04(obj, &lbl_1_bss_B94);
}
if(obj->work[0]) {
if (obj->work[0]) {
fn_1_6704(obj);
}
}
@ -670,7 +668,7 @@ void fn_1_1B430(void)
temp.unk20.z = 0;
temp.unk38 = 1400;
fn_1_42A0(work, &temp, work->unk40++, 60, 10);
if(0.0f != lbl_1_bss_C0C.unk100) {
work->unk08.y = 125+lbl_1_bss_C0C.unk100;
if (0.0f != lbl_1_bss_C0C.unk100) {
work->unk08.y = 125 + lbl_1_bss_C0C.unk100;
}
}
}

367
src/REL/mstory2Dll/mg_clear.c
View file

@ -9,70 +9,71 @@
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "game/pad.h"
#include "game/objsub.h"
typedef struct struct_data850 {
s32 unk0;
s32 unk4;
s32 unk8;
s32 unkC;
s32 unk10;
s32 unk0;
s32 unk4;
s32 unk8;
s32 unkC;
s32 unk10;
} StructData850;
StructData850 lbl_1_data_850[] = {
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x00), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x01), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x02), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x03), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x04), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x05), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x06), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x07), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x08), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x09), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0A), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0B), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0C), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0D), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0E), 1, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0F), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x10), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x11), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x12), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x13), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x14), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x15), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x16), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x17), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x18), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x19), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1A), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1B), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1C), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1D), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1E), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1F), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x20), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x21), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x22), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x23), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x24), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x25), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x26), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x27), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x28), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x29), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2A), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2B), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2C), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2D), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2E), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2F), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x00), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x01), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x02), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x03), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x04), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x05), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x06), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x07), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x08), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x09), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0A), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0B), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0C), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0D), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0E), 1, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x0F), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x10), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x11), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x12), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x13), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x14), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x15), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x16), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x17), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x18), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x19), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1A), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1B), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1C), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1D), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1E), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x1F), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x20), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x21), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x22), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x23), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x24), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x25), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x26), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x27), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x28), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x29), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2A), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2B), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2C), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2D), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2E), 0, 0, 0, 1 },
{ DATA_MAKE_NUM(DATADIR_MSTORY4, 0x2F), 0, 0, 0, 1 },
};
s32 lbl_1_data_C10[2][2] = { 20, 70, 1, 1 };
@ -101,15 +102,15 @@ BOOL lbl_1_bss_794;
Process *lbl_1_bss_790;
void fn_1_13BB8(void);
void fn_1_13FB4(omObjData* arg0, StructBss16C* arg1);
void fn_1_140A0(omObjData* arg0, StructBss16C* arg1);
void fn_1_13FB4(omObjData *arg0, StructBss16C *arg1);
void fn_1_140A0(omObjData *arg0, StructBss16C *arg1);
void fn_1_1449C(void);
void fn_1_14A9C(int arg0, int arg1, int arg2, int arg3, int arg4);
void fn_1_14B48(omObjData* arg0, StructBss16C* arg1);
void fn_1_14B48(omObjData *arg0, StructBss16C *arg1);
void fn_1_14C40(void);
void fn_1_15134(int arg0, int arg1, int arg2, int arg3, int arg4);
void fn_1_151E0(omObjData* arg0, StructBss16C* arg1);
void fn_1_152C4(omObjData* arg0, StructBss16C* arg1);
void fn_1_151E0(omObjData *arg0, StructBss16C *arg1);
void fn_1_152C4(omObjData *arg0, StructBss16C *arg1);
void fn_1_153A8(void);
void fn_1_15668(int arg0);
void fn_1_159F0(void);
@ -121,28 +122,28 @@ void fn_1_15F70(void);
void fn_1_123C8(void)
{
int i;
while(1) {
while (1) {
do {
HuPrcVSleep();
} while(lbl_1_data_C20 == -1 || lbl_1_data_C24[0] == -1 || lbl_1_data_C24[1] == -1 || lbl_1_data_C24[0] != Hu3DMotionIDGet(lbl_1_data_C20));
for(i=0; i<2; i++) {
if(lbl_1_data_C10[1][i] != -1) {
if(Hu3DMotionTimeGet(lbl_1_data_C20) >= lbl_1_data_C10[0][i]) {
} while (lbl_1_data_C20 == -1 || lbl_1_data_C24[0] == -1 || lbl_1_data_C24[1] == -1 || lbl_1_data_C24[0] != Hu3DMotionIDGet(lbl_1_data_C20));
for (i = 0; i < 2; i++) {
if (lbl_1_data_C10[1][i] != -1) {
if (Hu3DMotionTimeGet(lbl_1_data_C20) >= lbl_1_data_C10[0][i]) {
OSReport("KE-System TIME:%d\n", lbl_1_data_C10[0][i]);
HuAudFXPlay(81);
lbl_1_data_C10[1][i] = -1;
}
}
}
if(Hu3DMotionTimeGet(lbl_1_data_C20) <= 10) {
for(i=0; i<2; i++) {
if (Hu3DMotionTimeGet(lbl_1_data_C20) <= 10) {
for (i = 0; i < 2; i++) {
lbl_1_data_C10[1][i] = 1;
}
}
}
}
void fn_1_1256C(Process* arg0, s32 arg1)
void fn_1_1256C(Process *arg0, s32 arg1)
{
lbl_1_bss_790 = arg0;
lbl_1_bss_860.unk0C = arg1;
@ -160,11 +161,11 @@ void fn_1_1256C(Process* arg0, s32 arg1)
void fn_1_12690(omObjData *object)
{
if(object->work[2]) {
if (object->work[2]) {
object->work[2]--;
return;
}
if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
fn_1_1DFC(object, 1, object->work[1], 15, 1);
object->work[0] = object->work[1] = object->work[2] = 0;
}
@ -176,38 +177,44 @@ void fn_1_1271C(void)
int posY = 40;
GXColor winColor = { 0, 0, 128, 128 };
int i;
while(1) {
while (1) {
fn_1_BC8();
printWin(posX, posY, 220, 130, &winColor);
if(lbl_1_bss_838.unk04 == NULL) {
if (lbl_1_bss_838.unk04 == NULL) {
print8(posX, posY, 1, "PROC_MAIN -> FALSE");
} else {
}
else {
print8(posX, posY, 1, "PROC_MAIN -> TRUE");
}
if(lbl_1_bss_810.unk04 == NULL) {
print8(posX, posY+10, 1, "PROC_MAP -> FALSE");
} else {
print8(posX, posY+10, 1, "PROC_MAP -> TRUE");
if (lbl_1_bss_810.unk04 == NULL) {
print8(posX, posY + 10, 1, "PROC_MAP -> FALSE");
}
if(lbl_1_bss_7E8.unk04 == NULL) {
print8(posX, posY+20, 1, "PROC_KOOPA -> FALSE");
} else {
print8(posX, posY+20, 1, "PROC_KOOPA -> TRUE");
else {
print8(posX, posY + 10, 1, "PROC_MAP -> TRUE");
}
if(lbl_1_bss_7C0.unk04 == NULL) {
print8(posX, posY+30, 1, "PROC_MKOOPA -> FALSE");
} else {
print8(posX, posY+30, 1, "PROC_MKOOPA -> TRUE");
if (lbl_1_bss_7E8.unk04 == NULL) {
print8(posX, posY + 20, 1, "PROC_KOOPA -> FALSE");
}
if(lbl_1_bss_798.unk04 == NULL) {
print8(posX, posY+40, 1, "PROC_PLAYER -> FALSE");
} else {
print8(posX, posY+40, 1, "PROC_PLAYER -> TRUE");
else {
print8(posX, posY + 20, 1, "PROC_KOOPA -> TRUE");
}
print8(posX, posY+60, 1, "P:%d W:%d", lbl_1_bss_860.unk00, lbl_1_bss_860.unk0C);
print8(posX, posY+80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for(i=0; i<4; i++) {
print8(posX, posY+90+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_860.unk30[i].unk00, lbl_1_bss_860.unk30[i].unk04, lbl_1_bss_860.unk30[i].unk08, lbl_1_bss_860.unk30[i].unk0C, lbl_1_bss_860.unk30[i].unk14, lbl_1_bss_860.unk30[i].unk10);
if (lbl_1_bss_7C0.unk04 == NULL) {
print8(posX, posY + 30, 1, "PROC_MKOOPA -> FALSE");
}
else {
print8(posX, posY + 30, 1, "PROC_MKOOPA -> TRUE");
}
if (lbl_1_bss_798.unk04 == NULL) {
print8(posX, posY + 40, 1, "PROC_PLAYER -> FALSE");
}
else {
print8(posX, posY + 40, 1, "PROC_PLAYER -> TRUE");
}
print8(posX, posY + 60, 1, "P:%d W:%d", lbl_1_bss_860.unk00, lbl_1_bss_860.unk0C);
print8(posX, posY + 80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for (i = 0; i < 4; i++) {
print8(posX, posY + 90 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_860.unk30[i].unk00, lbl_1_bss_860.unk30[i].unk04,
lbl_1_bss_860.unk30[i].unk08, lbl_1_bss_860.unk30[i].unk0C, lbl_1_bss_860.unk30[i].unk14, lbl_1_bss_860.unk30[i].unk10);
}
}
}
@ -239,16 +246,16 @@ void fn_1_12B10(void)
fn_1_BE8(60);
fn_1_1DFC(lbl_1_bss_798.unk00, 1, 4, 15, 0);
fn_1_BE8(16);
while(1) {
while (1) {
fn_1_BC8();
if(Hu3DMotionTimeGet(lbl_1_bss_798.unk00->model[1]) >= 20) {
if (Hu3DMotionTimeGet(lbl_1_bss_798.unk00->model[1]) >= 20) {
break;
}
}
Hu3DMotionSpeedSet(lbl_1_bss_798.unk00->model[1], 0);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_7E8.unk04 == NULL) {
if (lbl_1_bss_7E8.unk04 == NULL) {
break;
}
}
@ -259,9 +266,9 @@ void fn_1_12B10(void)
fn_1_BE8(80);
Hu3DMotionSpeedSet(lbl_1_bss_798.unk00->model[1], 1);
fn_1_1DFC(lbl_1_bss_798.unk00, 1, 1, 15, 1);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_7C0.unk04 == NULL) {
if (lbl_1_bss_7C0.unk04 == NULL) {
break;
}
}
@ -304,20 +311,20 @@ void fn_1_12DD4(void)
fn_1_1AFC(lbl_1_bss_860.unk04, -1);
fn_1_1D18(lbl_1_bss_860.unk04, 0x250004);
fn_1_1A94(lbl_1_bss_860.unk04);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_7C0.unk04 == NULL) {
if (lbl_1_bss_7C0.unk04 == NULL) {
break;
}
}
}
void fn_1_13150(omObjData* arg0, StructBss16C* arg1)
void fn_1_13150(omObjData *arg0, StructBss16C *arg1)
{
int streamNo = HuAudSStreamPlay(7);
while(1) {
while (1) {
fn_1_BC8();
if(HuAudSStreamStatGet(streamNo) == 0) {
if (HuAudSStreamStatGet(streamNo) == 0) {
break;
}
}
@ -325,12 +332,12 @@ void fn_1_13150(omObjData* arg0, StructBss16C* arg1)
arg1->unk04 = NULL;
}
void fn_1_131C0(omObjData* arg0, StructBss16C* arg1)
void fn_1_131C0(omObjData *arg0, StructBss16C *arg1)
{
int presentSe = (lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10*6)+5;
int presentSe = (lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6) + 5;
fn_1_BE8(150);
OSReport("########## PRESENT_SE : %d\n", presentSe);
HuAudFXPlay(presentSe+2260);
HuAudFXPlay(presentSe + 2260);
fn_1_1DFC(lbl_1_bss_810.unk00, 7, 7, 1, 0);
arg1->unk04 = NULL;
}
@ -339,23 +346,24 @@ void fn_1_13264(void)
{
int i;
fn_1_1DFC(lbl_1_bss_798.unk00, 1, 2, 15, 1);
for(i=0; i<30; i++) {
for (i = 0; i < 30; i++) {
fn_1_BC8();
if(lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 != 5) {
if (lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 != 5) {
Hu3DData[lbl_1_bss_798.unk00->model[1]].pos.x = fn_1_864(120, 80, i, 30);
}
Hu3DData[lbl_1_bss_798.unk00->model[1]].rot.y = fn_1_864(-60, -90, i, 30);
}
fn_1_1DFC(lbl_1_bss_798.unk00, 1, 5, 5, 0);
fn_1_BE8(10);
while(1) {
while (1) {
fn_1_BC8();
if(Hu3DMotionTimeGet(lbl_1_bss_798.unk00->model[1]) >= 30) {
if (Hu3DMotionTimeGet(lbl_1_bss_798.unk00->model[1]) >= 30) {
break;
}
}
Hu3DModelPosSet(lbl_1_bss_810.unk00->model[5], 0, 0, 0);
Hu3DModelHookSet(lbl_1_bss_798.unk00->model[1], CharModelHookNameGet(lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10, 1, 1), lbl_1_bss_810.unk00->model[5]);
Hu3DModelHookSet(
lbl_1_bss_798.unk00->model[1], CharModelHookNameGet(lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10, 1, 1), lbl_1_bss_810.unk00->model[5]);
fn_1_BE8(60);
lbl_1_bss_810.unk04 = (void *)fn_1_13FB4;
HuAudFXPlay(163);
@ -367,9 +375,9 @@ void fn_1_13264(void)
HuAudSeqPause(lbl_1_bss_78[0], 1, 1000);
WipeColorSet(255, 255, 255);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
while(1) {
while (1) {
fn_1_BC8();
if(!WipeStatGet()) {
if (!WipeStatGet()) {
break;
}
}
@ -381,9 +389,9 @@ void fn_1_13264(void)
fn_1_BE8(30);
HuAudFXPlay(169);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
while(1) {
while (1) {
fn_1_BC8();
if(!WipeStatGet()) {
if (!WipeStatGet()) {
break;
}
}
@ -393,9 +401,9 @@ void fn_1_13264(void)
lbl_1_bss_798.unk04 = (void *)fn_1_131C0;
lbl_1_bss_860.unk04 = fn_1_185C(1, 0, 21, 2, lbl_1_bss_860.unk0C);
lbl_1_bss_7C0.unk04 = (void *)fn_1_13150;
fn_1_1D4C(lbl_1_bss_860.unk04, (lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10*6)+0x32000B, 0);
fn_1_1D4C(lbl_1_bss_860.unk04, (lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6) + 0x32000B, 0);
fn_1_6DBC(lbl_1_bss_860.unk04, 0x320086, 0, 300);
fn_1_1D18(lbl_1_bss_860.unk04,0x250004);
fn_1_1D18(lbl_1_bss_860.unk04, 0x250004);
fn_1_1A94(lbl_1_bss_860.unk04);
fn_1_3854(&lbl_1_bss_24);
fn_1_2750(fn_1_15E58);
@ -435,7 +443,7 @@ void fn_1_13828(void)
void fn_1_138CC(void)
{
omOvlHisData* var_r31;
omOvlHisData *var_r31;
msmSeStopAll(FALSE, 1000);
do {
@ -444,15 +452,16 @@ void fn_1_138CC(void)
CharModelKill(-1);
HuAudFXAllStop();
HuAudSStreamAllStop();
GWMGAvailSet(omMgIndexGet(58)+401);
GWMGAvailSet(omMgIndexGet(58) + 401);
GWGameStat.present[lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6 + 5] = 1;
OSReport("########## PRESENTFLG CHR:%d, MAP:5, PRESENT:%d\n", lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10, lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6 + 5);
OSReport("########## PRESENTFLG CHR:%d, MAP:5, PRESENT:%d\n", lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10,
lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6 + 5);
var_r31 = omOvlHisGet(0);
omOvlHisChg(0, OVL_MSTORY2, 20, var_r31->stat);
omOvlCallEx(OVL_PRESENT, 1, lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10 * 6 + 5 + 1, 0);
}
void fn_1_13A18(omObjData* arg0, StructBss16C* arg1)
void fn_1_13A18(omObjData *arg0, StructBss16C *arg1)
{
int temp = 0;
fn_1_12AC8();
@ -469,15 +478,15 @@ void fn_1_13BB8(void)
lbl_1_bss_838.unk00 = obj = omAddObjEx(lbl_1_bss_790, 256, 16, 16, -1, NULL);
lbl_1_bss_838.unk04 = (void *)fn_1_13A18;
lbl_1_bss_838.unk00->data = &lbl_1_bss_838;
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_838.unk04 != NULL) {
if (lbl_1_bss_838.unk04 != NULL) {
lbl_1_bss_838.unk04(obj, &lbl_1_bss_838);
}
}
}
void fn_1_13C6C(omObjData* object)
void fn_1_13C6C(omObjData *object)
{
s32 charNo;
charNo = lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10;
@ -511,28 +520,27 @@ void fn_1_13C6C(omObjData* object)
fn_1_1DFC(object, 8, 8, 0, 1);
}
void fn_1_13FB4(omObjData* arg0, StructBss16C* arg1)
void fn_1_13FB4(omObjData *arg0, StructBss16C *arg1)
{
Mtx matrix;
Hu3DData[arg0->model[7]].pos.y = fn_1_B08(180, 185, arg1->unk08++, 360);
Hu3DModelObjMtxGet(arg0->model[7], "effect", matrix);
Hu3DModelPosSet(arg0->model[8], matrix[0][3], matrix[1][3], matrix[2][3]);
if(arg1->unk08 >= 360) {
if (arg1->unk08 >= 360) {
arg1->unk08 = 0;
}
}
void fn_1_140A0(omObjData* arg0, StructBss16C* arg1)
void fn_1_140A0(omObjData *arg0, StructBss16C *arg1)
{
Mtx matrix;
Hu3DData[arg0->model[7]].pos.y += arg1->unk0C/100.0f;
Hu3DData[arg0->model[7]].pos.y += arg1->unk0C / 100.0f;
Hu3DModelObjMtxGet(arg0->model[7], "effect", matrix);
Hu3DModelPosSet(arg0->model[8], matrix[0][3], matrix[1][3], matrix[2][3]);
arg1->unk0C += 2;
}
void fn_1_1416C(omObjData* arg0, StructBss16C* arg1)
void fn_1_1416C(omObjData *arg0, StructBss16C *arg1)
{
int i;
Vec pos;
@ -540,19 +548,20 @@ void fn_1_1416C(omObjData* arg0, StructBss16C* arg1)
Hu3DModelPosSet(arg0->model[5], -180, 100, 800);
Hu3DModelRotSet(arg0->model[5], 0, 0, 0);
Hu3DModelAttrReset(arg0->model[5], 1);
for(i=0; i<60; i++) {
for (i = 0; i < 60; i++) {
fn_1_BC8();
if(i == 30) {
if (i == 30) {
HuAudFXPlay(151);
}
if(i <= 30) {
pos.y = fn_1_A4C(0, 100, i+30, 60);
if (i <= 30) {
pos.y = fn_1_A4C(0, 100, i + 30, 60);
pos.x = fn_1_864(-180, -45, i, 30);
rotY = fn_1_984(0, -90, i, 30);
} else {
pos.x = fn_1_864(-45, 0, i-30, 30);
pos.y = fn_1_A4C(0, 25, i-30, 30);
rotY = fn_1_984(-90, -360, i-30, 30);
}
else {
pos.x = fn_1_864(-45, 0, i - 30, 30);
pos.y = fn_1_A4C(0, 25, i - 30, 30);
rotY = fn_1_984(-90, -360, i - 30, 30);
}
Hu3DModelPosSet(arg0->model[5], pos.x, pos.y, 800);
Hu3DModelRotSet(arg0->model[5], 0, rotY, 0);
@ -567,9 +576,9 @@ void fn_1_1449C(void)
lbl_1_bss_810.unk04 = NULL;
lbl_1_bss_810.unk00->data = &lbl_1_bss_810;
fn_1_13C6C(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_810.unk04 != NULL) {
if (lbl_1_bss_810.unk04 != NULL) {
lbl_1_bss_810.unk04(obj, &lbl_1_bss_810);
}
}
@ -597,15 +606,15 @@ void fn_1_14868(omObjData *object)
void fn_1_14A9C(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_7E8.unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_7E8.unk00->work[0] = arg4;
lbl_1_bss_7E8.unk00->work[1] = arg1;
lbl_1_bss_7E8.unk00->work[2] = arg2+1;
lbl_1_bss_7E8.unk00->work[2] = arg2 + 1;
}
void fn_1_14B48(omObjData* arg0, StructBss16C* arg1)
void fn_1_14B48(omObjData *arg0, StructBss16C *arg1)
{
Vec pos = { -1000, 0, 810 };
lbl_1_bss_810.unk04 = (void *)fn_1_1416C;
@ -622,15 +631,16 @@ void fn_1_14C40(void)
lbl_1_bss_7E8.unk04 = NULL;
lbl_1_bss_7E8.unk00->data = &lbl_1_bss_810;
fn_1_14868(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_7E8.unk04 != NULL) {
if (lbl_1_bss_7E8.unk04 != NULL) {
lbl_1_bss_7E8.unk04(obj, &lbl_1_bss_7E8);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -656,15 +666,15 @@ void fn_1_14F6C(omObjData *object)
void fn_1_15134(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_7C0.unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_7C0.unk00->work[0] = arg4;
lbl_1_bss_7C0.unk00->work[1] = arg1;
lbl_1_bss_7C0.unk00->work[2] = arg2+1;
lbl_1_bss_7C0.unk00->work[2] = arg2 + 1;
}
void fn_1_151E0(omObjData* arg0, StructBss16C* arg1)
void fn_1_151E0(omObjData *arg0, StructBss16C *arg1)
{
Vec pos = { -800, 0, 800 };
fn_1_1DFC(arg0, 1, 2, 15, 1);
@ -673,7 +683,7 @@ void fn_1_151E0(omObjData* arg0, StructBss16C* arg1)
arg1->unk04 = NULL;
}
void fn_1_152C4(omObjData* arg0, StructBss16C* arg1)
void fn_1_152C4(omObjData *arg0, StructBss16C *arg1)
{
Vec pos = { -120, 0, 800 };
fn_1_1DFC(arg0, 1, 2, 15, 1);
@ -689,15 +699,16 @@ void fn_1_153A8(void)
lbl_1_bss_7C0.unk04 = NULL;
lbl_1_bss_7C0.unk00->data = &lbl_1_bss_7C0;
fn_1_14F6C(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_7C0.unk04 != NULL) {
if (lbl_1_bss_7C0.unk04 != NULL) {
lbl_1_bss_7C0.unk04(obj, &lbl_1_bss_7C0);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -710,16 +721,16 @@ void fn_1_15668(int arg0)
int i;
int order[4];
order[0] = 0;
for(i=1; i<4; i++) {
order[i] = order[i-1]+1;
if(order[i] >= 4) {
for (i = 1; i < 4; i++) {
order[i] = order[i - 1] + 1;
if (order[i] >= 4) {
order[i] = 0;
}
if(arg0 == order[i]) {
if (arg0 == order[i]) {
lbl_1_bss_860.unk00 = i;
}
}
for(i=0; i<4; i++) {
for (i = 0; i < 4; i++) {
fn_1_357C(&lbl_1_bss_860.unk30[i], order[i]);
}
}
@ -728,12 +739,12 @@ void fn_1_1574C(omObjData *object)
{
int charNo = lbl_1_bss_860.unk30[lbl_1_bss_860.unk00].unk10;
object->model[1] = CharModelCreate(charNo, 1);
object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000);
object->motion[2] = CharModelMotionCreate(charNo, 0x5F0002);
object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660028+charNo);
object->motion[4] = Hu3DJointMotionFile(object->model[1], 0x660030+charNo);
object->motion[5] = Hu3DJointMotionFile(object->model[1], 0x660038+charNo);
object->motion[6] = Hu3DJointMotionFile(object->model[1], 0x660000+charNo);
object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00));
object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02));
object->motion[3] = Hu3DJointMotionFile(object->model[1], 0x660028 + charNo);
object->motion[4] = Hu3DJointMotionFile(object->model[1], 0x660030 + charNo);
object->motion[5] = Hu3DJointMotionFile(object->model[1], 0x660038 + charNo);
object->motion[6] = Hu3DJointMotionFile(object->model[1], 0x660000 + charNo);
CharModelMotionDataClose(charNo);
Hu3DModelPosSet(object->model[1], 120, 0, 800);
Hu3DModelRotSet(object->model[1], 0, -60, 0);
@ -745,12 +756,12 @@ void fn_1_1574C(omObjData *object)
void fn_1_15944(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_798.unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_798.unk00->work[0] = arg4;
lbl_1_bss_798.unk00->work[1] = arg1;
lbl_1_bss_798.unk00->work[2] = arg2+1;
lbl_1_bss_798.unk00->work[2] = arg2 + 1;
}
void fn_1_159F0(void)
@ -760,15 +771,16 @@ void fn_1_159F0(void)
lbl_1_bss_798.unk04 = NULL;
lbl_1_bss_798.unk00->data = &lbl_1_bss_798;
fn_1_1574C(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_798.unk04 != NULL) {
if (lbl_1_bss_798.unk04 != NULL) {
lbl_1_bss_798.unk04(obj, &lbl_1_bss_798);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -800,7 +812,6 @@ void fn_1_15D68(void)
temp.unk20.z = 0;
temp.unk38 = 1400;
fn_1_4FEC(work, &temp, work->unk40++, 120, 10);
}
void fn_1_15E58(void)
@ -828,4 +839,4 @@ void fn_1_15F70(void)
temp.unk20.z = 0;
temp.unk38 = 1200;
fn_1_6004(work, &temp, work->unk40++, 10, 5);
}
}

175
src/REL/mstory2Dll/mg_miss.c
View file

@ -9,12 +9,13 @@
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "game/pad.h"
#include "game/objsub.h"
typedef struct {
/* 0x000 */ s32 unk00;
@ -47,7 +48,7 @@ void fn_1_18184(void);
void fn_1_18408(void);
void fn_1_18494(void);
void fn_1_16060(Process* arg0, s32 arg1)
void fn_1_16060(Process *arg0, s32 arg1)
{
lbl_1_bss_968 = arg0;
lbl_1_bss_A34.unk0C = arg1;
@ -65,11 +66,11 @@ void fn_1_16060(Process* arg0, s32 arg1)
void fn_1_16178(omObjData *object)
{
if(object->work[2]) {
if (object->work[2]) {
object->work[2]--;
return;
}
if(object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
if (object->work[2] == 0 && Hu3DMotionEndCheck(object->model[1])) {
fn_1_1DFC(object, 1, object->work[1], 15, 1);
object->work[0] = object->work[1] = object->work[2] = 0;
}
@ -81,38 +82,44 @@ void fn_1_16204(void)
int posY = 40;
GXColor winColor = { 0, 0, 128, 128 };
int i;
while(1) {
while (1) {
fn_1_BC8();
printWin(posX, posY, 220, 130, &winColor);
if(lbl_1_bss_A0C.unk04 == NULL) {
if (lbl_1_bss_A0C.unk04 == NULL) {
print8(posX, posY, 1, "PROC_MAIN -> FALSE");
} else {
}
else {
print8(posX, posY, 1, "PROC_MAIN -> TRUE");
}
if(lbl_1_bss_9E4.unk04 == NULL) {
print8(posX, posY+10, 1, "PROC_MAP -> FALSE");
} else {
print8(posX, posY+10, 1, "PROC_MAP -> TRUE");
if (lbl_1_bss_9E4.unk04 == NULL) {
print8(posX, posY + 10, 1, "PROC_MAP -> FALSE");
}
if(lbl_1_bss_9BC.unk04 == NULL) {
print8(posX, posY+20, 1, "PROC_KOOPA -> FALSE");
} else {
print8(posX, posY+20, 1, "PROC_KOOPA -> TRUE");
else {
print8(posX, posY + 10, 1, "PROC_MAP -> TRUE");
}
if(lbl_1_bss_994.unk04 == NULL) {
print8(posX, posY+30, 1, "PROC_MKOOPA -> FALSE");
} else {
print8(posX, posY+30, 1, "PROC_MKOOPA -> TRUE");
if (lbl_1_bss_9BC.unk04 == NULL) {
print8(posX, posY + 20, 1, "PROC_KOOPA -> FALSE");
}
if(lbl_1_bss_96C.unk04 == NULL) {
print8(posX, posY+40, 1, "PROC_PLAYER -> FALSE");
} else {
print8(posX, posY+40, 1, "PROC_PLAYER -> TRUE");
else {
print8(posX, posY + 20, 1, "PROC_KOOPA -> TRUE");
}
print8(posX, posY+60, 1, "P:%d W:%d", lbl_1_bss_A34.unk00, lbl_1_bss_A34.unk0C);
print8(posX, posY+80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for(i=0; i<4; i++) {
print8(posX, posY+90+(i*10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_A34.unk30[i].unk00, lbl_1_bss_A34.unk30[i].unk04, lbl_1_bss_A34.unk30[i].unk08, lbl_1_bss_A34.unk30[i].unk0C, lbl_1_bss_A34.unk30[i].unk14, lbl_1_bss_A34.unk30[i].unk10);
if (lbl_1_bss_994.unk04 == NULL) {
print8(posX, posY + 30, 1, "PROC_MKOOPA -> FALSE");
}
else {
print8(posX, posY + 30, 1, "PROC_MKOOPA -> TRUE");
}
if (lbl_1_bss_96C.unk04 == NULL) {
print8(posX, posY + 40, 1, "PROC_PLAYER -> FALSE");
}
else {
print8(posX, posY + 40, 1, "PROC_PLAYER -> TRUE");
}
print8(posX, posY + 60, 1, "P:%d W:%d", lbl_1_bss_A34.unk00, lbl_1_bss_A34.unk0C);
print8(posX, posY + 80, 1, "NO) IDX:GRP:COM:DIF:PAD:CHR");
for (i = 0; i < 4; i++) {
print8(posX, posY + 90 + (i * 10), 1, "%2d) %3d:%3d:%3d:%3d:%3d:%3d", i, lbl_1_bss_A34.unk30[i].unk00, lbl_1_bss_A34.unk30[i].unk04,
lbl_1_bss_A34.unk30[i].unk08, lbl_1_bss_A34.unk30[i].unk0C, lbl_1_bss_A34.unk30[i].unk14, lbl_1_bss_A34.unk30[i].unk10);
}
}
}
@ -150,7 +157,7 @@ int fn_1_1670C(void)
result = fn_1_1C64(lbl_1_bss_A34.unk08);
fn_1_1D18(lbl_1_bss_A34.unk08, 0x250004);
fn_1_71DC(lbl_1_bss_A34.unk08);
if(result) {
if (result) {
HuAudFXPlay(lbl_1_data_0[6][2]);
fn_1_1774C(3, 1, 15, 1, 0);
fn_1_1D18(lbl_1_bss_A34.unk04, 0x1F0012);
@ -183,14 +190,11 @@ void fn_1_16984(void)
fn_1_BE8(150);
}
void fn_1_169D4(void)
{
}
void fn_1_169D4(void) { }
void fn_1_169D8(int arg0)
{
omOvlHisData* his;
omOvlHisData *his;
if (arg0 != 0) {
HuAudSeqFadeOut(lbl_1_bss_78[0], 1000);
@ -206,32 +210,34 @@ void fn_1_169D8(int arg0)
HuAudSeqAllFadeOut(1000);
HuAudSStreamAllFadeOut(1000);
GWMGAvailSet(450);
GWSystem.mg_next = 450-401;
GWSystem.mg_next = 450 - 401;
omOvlCallEx(OVL_M450, 1, 0, 0);
} else {
}
else {
HuAudFadeOut(1);
omOvlReturnEx(1, 1);
}
}
void fn_1_16ACC(omObjData* arg0, StructBss16C* arg1)
void fn_1_16ACC(omObjData *arg0, StructBss16C *arg1)
{
int mode = 0;
fn_1_165B0();
fn_1_1661C();
lbl_1_bss_A34.unk04 = fn_1_185C(1, 0, 21, 2, lbl_1_bss_A34.unk0C);
while(1) {
while (1) {
fn_1_BC8();
if(fn_1_1670C()) {
if (fn_1_1670C()) {
mode = 0;
break;
} else if(fn_1_168B0()) {
}
else if (fn_1_168B0()) {
mode = 1;
break;
}
}
fn_1_1A94(lbl_1_bss_A34.unk04);
switch(mode) {
switch (mode) {
case 0:
fn_1_16984();
break;
@ -248,9 +254,9 @@ void fn_1_16FC0(void)
lbl_1_bss_A0C.unk00 = obj = omAddObjEx(lbl_1_bss_968, 256, 16, 16, -1, NULL);
lbl_1_bss_A0C.unk04 = (void *)fn_1_16ACC;
lbl_1_bss_A0C.unk00->data = &lbl_1_bss_A0C;
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_A0C.unk04 != NULL) {
if (lbl_1_bss_A0C.unk04 != NULL) {
lbl_1_bss_A0C.unk04(obj, &lbl_1_bss_A0C);
}
}
@ -277,10 +283,10 @@ void fn_1_17074(omObjData *object)
fn_1_1DFC(object, 6, 6, 0, 2);
}
void fn_1_1727C(omObjData* arg0, StructBss16C* arg1)
void fn_1_1727C(omObjData *arg0, StructBss16C *arg1)
{
Hu3DData[arg0->model[5]].pos.y = fn_1_B08(80, 90, arg1->unk08++, 360);
if(arg1->unk08 >= 360) {
if (arg1->unk08 >= 360) {
arg1->unk08 = 0;
}
}
@ -292,9 +298,9 @@ void fn_1_17338(void)
lbl_1_bss_9E4.unk04 = (void *)fn_1_1727C;
lbl_1_bss_9E4.unk00->data = &lbl_1_bss_9E4;
fn_1_17074(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_9E4.unk04 != NULL) {
if (lbl_1_bss_9E4.unk04 != NULL) {
lbl_1_bss_9E4.unk04(obj, &lbl_1_bss_9E4);
}
}
@ -316,12 +322,12 @@ void fn_1_175CC(omObjData *object)
void fn_1_1774C(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_9BC.unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_9BC.unk00->work[0] = arg4;
lbl_1_bss_9BC.unk00->work[1] = arg1;
lbl_1_bss_9BC.unk00->work[2] = arg2+1;
lbl_1_bss_9BC.unk00->work[2] = arg2 + 1;
}
void fn_1_177F8(void)
@ -331,15 +337,16 @@ void fn_1_177F8(void)
lbl_1_bss_9BC.unk04 = NULL;
lbl_1_bss_9BC.unk00->data = &lbl_1_bss_9E4;
fn_1_175CC(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_9BC.unk04 != NULL) {
if (lbl_1_bss_9BC.unk04 != NULL) {
lbl_1_bss_9BC.unk04(obj, &lbl_1_bss_9BC);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -361,12 +368,12 @@ void fn_1_17A70(omObjData *object)
void fn_1_17B98(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_994.unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_994.unk00->work[0] = arg4;
lbl_1_bss_994.unk00->work[1] = arg1;
lbl_1_bss_994.unk00->work[2] = arg2+1;
lbl_1_bss_994.unk00->work[2] = arg2 + 1;
}
void fn_1_17C44(void)
@ -376,15 +383,16 @@ void fn_1_17C44(void)
lbl_1_bss_994.unk04 = NULL;
lbl_1_bss_994.unk00->data = &lbl_1_bss_994;
fn_1_17A70(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_994.unk04 != NULL) {
if (lbl_1_bss_994.unk04 != NULL) {
lbl_1_bss_994.unk04(obj, &lbl_1_bss_994);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -397,16 +405,16 @@ void fn_1_17E64(s32 arg0)
int i;
int order[4];
order[0] = 0;
for(i=1; i<4; i++) {
order[i] = order[i-1]+1;
if(order[i] >= 4) {
for (i = 1; i < 4; i++) {
order[i] = order[i - 1] + 1;
if (order[i] >= 4) {
order[i] = 0;
}
if(arg0 == order[i]) {
if (arg0 == order[i]) {
lbl_1_bss_A34.unk00 = i;
}
}
for(i=0; i<4; i++) {
for (i = 0; i < 4; i++) {
fn_1_357C(&lbl_1_bss_A34.unk30[i], order[i]);
}
}
@ -415,10 +423,10 @@ void fn_1_17F48(omObjData *object)
{
int charNo = lbl_1_bss_A34.unk30[lbl_1_bss_A34.unk00].unk10;
object->model[1] = CharModelCreate(charNo, 1);
object->motion[1] = CharModelMotionCreate(charNo, 0x5F0000);
object->motion[2] = CharModelMotionCreate(charNo, 0x5F0018);
object->motion[3] = CharModelMotionCreate(charNo, 0x5F0034);
object->motion[4] = CharModelMotionCreate(charNo, 0x5F0048);
object->motion[1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00));
object->motion[2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18));
object->motion[3] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x34));
object->motion[4] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x48));
CharModelVoiceEnableSet(charNo, object->motion[2], FALSE);
CharModelMotionDataClose(charNo);
Hu3DModelPosSet(object->model[1], 120, 0, 800);
@ -431,12 +439,12 @@ void fn_1_17F48(omObjData *object)
void fn_1_180D8(int arg0, int arg1, int arg2, int arg3, int arg4)
{
fn_1_1DFC(lbl_1_bss_96C.unk00, 1, arg0, arg2, arg3);
if(arg3 == 1) {
if (arg3 == 1) {
arg4 = 0;
}
lbl_1_bss_96C.unk00->work[0] = arg4;
lbl_1_bss_96C.unk00->work[1] = arg1;
lbl_1_bss_96C.unk00->work[2] = arg2+1;
lbl_1_bss_96C.unk00->work[2] = arg2 + 1;
}
void fn_1_18184(void)
@ -446,15 +454,16 @@ void fn_1_18184(void)
lbl_1_bss_96C.unk04 = NULL;
lbl_1_bss_96C.unk00->data = &lbl_1_bss_96C;
fn_1_17F48(obj);
while(1) {
while (1) {
fn_1_BC8();
if(lbl_1_bss_96C.unk04 != NULL) {
if (lbl_1_bss_96C.unk04 != NULL) {
lbl_1_bss_96C.unk04(obj, &lbl_1_bss_96C);
}
if(obj->work[0]) {
if(obj->work[2]) {
if (obj->work[0]) {
if (obj->work[2]) {
obj->work[2]--;
} else if(obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
}
else if (obj->work[2] == 0 && Hu3DMotionEndCheck(obj->model[1])) {
fn_1_1DFC(obj, 1, obj->work[1], 15, 1);
obj->work[0] = obj->work[1] = obj->work[2] = 0;
}
@ -478,7 +487,7 @@ void fn_1_18494(void)
{
StructBss24 *work = &lbl_1_bss_24;
StructBss24 temp;
if(work->unk40 == 50) {
if (work->unk40 == 50) {
fn_1_1DFC(lbl_1_bss_9E4.unk00, 5, 5, 0, 0);
fn_1_1DFC(lbl_1_bss_9E4.unk00, 6, 6, 0, 0);
HuAudFXPlay(161);
@ -491,11 +500,11 @@ void fn_1_18494(void)
temp.unk20.z = 0;
temp.unk38 = 150;
fn_1_4FEC(work, &temp, work->unk40, 180, 10);
if(work->unk40++ >= 90) {
if(work->unk40 == 91) {
if (work->unk40++ >= 90) {
if (work->unk40 == 91) {
lbl_1_bss_88[0] = HuAudFXPlay(32);
}
work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40-90, 90);
Hu3DData[lbl_1_bss_9E4.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40-90, 90);
work->unk20.x = fn_1_864(work->unk20.x, -45, work->unk40 - 90, 90);
Hu3DData[lbl_1_bss_9E4.unk00->model[5]].rot.x = fn_1_864(0, 45, work->unk40 - 90, 90);
}
}
}