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

Applied some Attr defines

Browse source
This commit is contained in:
dbalatoni13 2024-11-03 23:53:45 +01:00
parent 348cdffb0e
commit c9f46f9418
99 changed files with 15333 additions and 15096 deletions
Download patch file Download diff file Expand all files Collapse all files

866
src/REL/bootDll/main.c
View file

@ -1,19 +1,19 @@
#include "game/gamework_data.h" #include "ext_math.h"
#include "game/process.h" #include "game/audio.h"
#include "game/chrman.h" #include "game/chrman.h"
#include "game/data.h" #include "game/data.h"
#include "game/sprite.h" #include "game/gamework_data.h"
#include "game/object.h"
#include "game/audio.h"
#include "game/memory.h"
#include "game/hsfman.h" #include "game/hsfman.h"
#include "game/wipe.h" #include "game/memory.h"
#include "game/pad.h"
#include "game/window.h"
#include "game/thpmain.h"
#include "game/msm.h" #include "game/msm.h"
#include "game/object.h"
#include "game/pad.h"
#include "game/process.h"
#include "game/sprite.h"
#include "game/thpmain.h"
#include "game/window.h"
#include "game/wipe.h"
#include "math.h" #include "math.h"
#include "ext_math.h"
#include "rel_sqrt_consts.h" #include "rel_sqrt_consts.h"
@ -50,352 +50,360 @@ void *logoReadNintendo(void);
void ObjectSetup(void) void ObjectSetup(void)
{ {
omOvlHisData *history; omOvlHisData *history;
OSReport("******* Boot ObjectSetup *********\n"); OSReport("******* Boot ObjectSetup *********\n");
objman[0] = omInitObjMan(50, 8192); objman[0] = omInitObjMan(50, 8192);
lbl_1_bss_3C[0].x = -67; lbl_1_bss_3C[0].x = -67;
lbl_1_bss_3C[0].y = 40; lbl_1_bss_3C[0].y = 40;
lbl_1_bss_3C[0].z = 0; lbl_1_bss_3C[0].z = 0;
lbl_1_bss_24[0].x = 260; lbl_1_bss_24[0].x = 260;
lbl_1_bss_24[0].y = -103; lbl_1_bss_24[0].y = -103;
lbl_1_bss_24[0].z = -18; lbl_1_bss_24[0].z = -18;
lbl_1_bss_1C[0] = 2885; lbl_1_bss_1C[0] = 2885;
Hu3DCameraCreate(1); Hu3DCameraCreate(1);
Hu3DCameraPerspectiveSet(1, 30, 20, 15000, 1.2); Hu3DCameraPerspectiveSet(1, 30, 20, 15000, 1.2);
Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1);
HuPrcCreate(BootProc, 100, 12288, 0); HuPrcCreate(BootProc, 100, 12288, 0);
Hu3DBGColorSet(0, 0, 0); Hu3DBGColorSet(0, 0, 0);
history = omOvlHisGet(0); history = omOvlHisGet(0);
omOvlHisChg(0, history->overlay, 1, history->stat); omOvlHisChg(0, history->overlay, 1, history->stat);
} }
static void BootProc(void) static void BootProc(void)
{ {
AnimData *data; AnimData *data;
s16 group; s16 group;
s16 sprite_nintendo; s16 sprite_nintendo;
s16 sprite_hudson; s16 sprite_hudson;
s16 i; s16 i;
OSTick tick_prev; OSTick tick_prev;
Process *curr = HuPrcCurrentGet(); Process *curr = HuPrcCurrentGet();
if(omovlevtno == 0) { if (omovlevtno == 0) {
ProgressiveProc(); ProgressiveProc();
} }
group = HuSprGrpCreate(2); group = HuSprGrpCreate(2);
data = HuSprAnimRead(logoReadNintendo()); data = HuSprAnimRead(logoReadNintendo());
sprite_nintendo = HuSprCreate(data, 0, 0); sprite_nintendo = HuSprCreate(data, 0, 0);
HuSprGrpMemberSet(group, 0, sprite_nintendo); HuSprGrpMemberSet(group, 0, sprite_nintendo);
HuSprPosSet(group, 0, 288, 240); HuSprPosSet(group, 0, 288, 240);
HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF); HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF);
if(omovlevtno != 0) { if (omovlevtno != 0) {
HuAudSndGrpSetSet(0); HuAudSndGrpSetSet(0);
data = HuSprAnimReadFile(TITLE_HUDSON_ANM); data = HuSprAnimReadFile(TITLE_HUDSON_ANM);
sprite_hudson = HuSprCreate(data, 0, 0); sprite_hudson = HuSprCreate(data, 0, 0);
HuSprGrpMemberSet(group, 1, sprite_hudson); HuSprGrpMemberSet(group, 1, sprite_hudson);
HuSprPosSet(group, 1, 288, 240); HuSprPosSet(group, 1, 288, 240);
HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF);
HuWinInit(1); HuWinInit(1);
TitleInit(); TitleInit();
SystemInitF = 1; SystemInitF = 1;
} else { }
s16 group_thp; else {
BOOL skip_wait; s16 group_thp;
float win_size[2]; BOOL skip_wait;
s16 sprite_thp; float win_size[2];
for(i=0; i<4; i++) { s16 sprite_thp;
GWPlayerCfg[i].pad_idx = i; for (i = 0; i < 4; i++) {
} GWPlayerCfg[i].pad_idx = i;
repeat: }
HuSprAttrReset(group, 0, HUSPR_ATTR_DISPOFF); repeat:
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); HuSprAttrReset(group, 0, HUSPR_ATTR_DISPOFF);
while(WipeStatGet()) { WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
HuPrcVSleep(); while (WipeStatGet()) {
} HuPrcVSleep();
WipeColorSet(255, 255, 255); }
if(!SystemInitF) { WipeColorSet(255, 255, 255);
tick_prev = OSGetTick(); if (!SystemInitF) {
CharManInit(); tick_prev = OSGetTick();
HuWindowInit(); CharManInit();
MGSeqInit(); HuWindowInit();
HuWinInit(1); MGSeqInit();
TitleInit(); HuWinInit(1);
data = HuSprAnimReadFile(TITLE_HUDSON_ANM); TitleInit();
sprite_hudson = HuSprCreate(data, 0, 0); data = HuSprAnimReadFile(TITLE_HUDSON_ANM);
HuSprGrpMemberSet(group, 1, sprite_hudson); sprite_hudson = HuSprCreate(data, 0, 0);
HuSprPosSet(group, 1, 288, 240); HuSprGrpMemberSet(group, 1, sprite_hudson);
HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); HuSprPosSet(group, 1, 288, 240);
while(OSTicksToMilliseconds(OSGetTick()-tick_prev) < 3000) { HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF);
HuPrcVSleep(); while (OSTicksToMilliseconds(OSGetTick() - tick_prev) < 3000) {
} HuPrcVSleep();
} else { }
for(i=0; i<180; i++) { }
if(HuPadBtnDown[0] & (PAD_BUTTON_START|PAD_BUTTON_A)) { else {
break; for (i = 0; i < 180; i++) {
} if (HuPadBtnDown[0] & (PAD_BUTTON_START | PAD_BUTTON_A)) {
HuPrcVSleep(); break;
} }
} HuPrcVSleep();
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); }
while(WipeStatGet()) { }
HuPrcVSleep(); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
} while (WipeStatGet()) {
HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF); HuPrcVSleep();
HuSprAttrReset(group, 1, HUSPR_ATTR_DISPOFF); }
HuPrcSleep(60); HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); HuSprAttrReset(group, 1, HUSPR_ATTR_DISPOFF);
while(WipeStatGet()) { HuPrcSleep(60);
HuPrcVSleep(); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
} while (WipeStatGet()) {
if(!SystemInitF) { HuPrcVSleep();
void *group_samp; }
tick_prev = OSGetTick(); if (!SystemInitF) {
group_samp = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(0)); void *group_samp;
msmSysLoadGroup(0, group_samp, 0); tick_prev = OSGetTick();
HuMemDirectFree(group_samp); group_samp = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(0));
while(OSTicksToMilliseconds(OSGetTick()-tick_prev) < 3000) { msmSysLoadGroup(0, group_samp, 0);
HuPrcVSleep(); HuMemDirectFree(group_samp);
} while (OSTicksToMilliseconds(OSGetTick() - tick_prev) < 3000) {
} else { HuPrcVSleep();
for(i=0; i<180; i++) { }
if(HuPadBtnDown[0] & (PAD_BUTTON_START|PAD_BUTTON_A)) { }
break; else {
} for (i = 0; i < 180; i++) {
HuPrcVSleep(); if (HuPadBtnDown[0] & (PAD_BUTTON_START | PAD_BUTTON_A)) {
} break;
} }
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); HuPrcVSleep();
while(WipeStatGet()) { }
HuPrcVSleep(); }
} WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
tick_prev = OSGetTick(); while (WipeStatGet()) {
if(!SystemInitF) { HuPrcVSleep();
HuAudSndGrpSetSet(0); }
SystemInitF = 1; tick_prev = OSGetTick();
} if (!SystemInitF) {
while(OSTicksToMilliseconds(OSGetTick()-tick_prev) < 1000) { HuAudSndGrpSetSet(0);
HuPrcVSleep(); SystemInitF = 1;
} }
HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF); while (OSTicksToMilliseconds(OSGetTick() - tick_prev) < 1000) {
HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); HuPrcVSleep();
group_thp = HuSprGrpCreate(1); }
sprite_thp = HuTHPSprCreateVol("movie/opmov_a00.thp", 0, 100, 122); HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF);
HuSprGrpMemberSet(group_thp, 0, sprite_thp); HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF);
HuSprPosSet(group_thp, 0, 288, 240); group_thp = HuSprGrpCreate(1);
HuWinMesMaxSizeBetGet(win_size, MAKE_MESSID(54, 0), MAKE_MESSID(54, 4)); sprite_thp = HuTHPSprCreateVol("movie/opmov_a00.thp", 0, 100, 122);
demoWin = HuWinCreate(-10000, 448-win_size[1], win_size[0], win_size[1], 0); HuSprGrpMemberSet(group_thp, 0, sprite_thp);
HuWinMesSpeedSet(demoWin, 0); HuSprPosSet(group_thp, 0, 288, 240);
HuWinBGTPLvlSet(demoWin, 0); HuWinMesMaxSizeBetGet(win_size, MAKE_MESSID(54, 0), MAKE_MESSID(54, 4));
HuWinPriSet(demoWin, 10); demoWin = HuWinCreate(-10000, 448 - win_size[1], win_size[0], win_size[1], 0);
HuWinAttrSet(demoWin, 0x800); HuWinMesSpeedSet(demoWin, 0);
HuPrcSleep(5); HuWinBGTPLvlSet(demoWin, 0);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); HuWinPriSet(demoWin, 10);
while(WipeStatGet()) { HuWinAttrSet(demoWin, 0x800);
HuPrcVSleep(); HuPrcSleep(5);
} WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10);
skip_wait = FALSE; while (WipeStatGet()) {
while(!HuTHPEndCheck()) { HuPrcVSleep();
UpdateDemoMess(); }
if(HuPadBtnDown[0] & (PAD_BUTTON_START|PAD_BUTTON_A)) { skip_wait = FALSE;
skip_wait = TRUE; while (!HuTHPEndCheck()) {
break; UpdateDemoMess();
} if (HuPadBtnDown[0] & (PAD_BUTTON_START | PAD_BUTTON_A)) {
HuPrcVSleep(); skip_wait = TRUE;
} break;
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); }
while(WipeStatGet()) { HuPrcVSleep();
HuPrcVSleep(); }
} WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
HuWinKill(demoWin); while (WipeStatGet()) {
HuTHPClose(); HuPrcVSleep();
HuPrcVSleep(); }
HuSprGrpKill(group_thp); HuWinKill(demoWin);
if(!skip_wait) { HuTHPClose();
HuPrcSleep(60); HuPrcVSleep();
} HuSprGrpKill(group_thp);
skip_wait = FALSE; if (!skip_wait) {
} HuPrcSleep(60);
if(!TitleProc()) { }
HuPrcSleep(60); skip_wait = FALSE;
goto repeat; }
} if (!TitleProc()) {
WipeColorSet(255, 255, 255); HuPrcSleep(60);
HuAudSStreamAllFadeOut(500); goto repeat;
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); }
while(WipeStatGet()) { WipeColorSet(255, 255, 255);
HuPrcVSleep(); HuAudSStreamAllFadeOut(500);
} WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
HuPrcVSleep(); while (WipeStatGet()) {
if(omSysExitReq) { HuPrcVSleep();
omOvlReturnEx(1, 1); }
} else { HuPrcVSleep();
omOvlCallEx(OVL_MODESEL, 1, 0, 0); if (omSysExitReq) {
} omOvlReturnEx(1, 1);
for(i=0; i<4; i++) { }
GWPlayerCfg[i].character = -1; else {
} omOvlCallEx(OVL_MODESEL, 1, 0, 0);
HuPrcEnd(); }
do { for (i = 0; i < 4; i++) {
HuPrcVSleep(); GWPlayerCfg[i].character = -1;
} while(1); }
HuPrcEnd();
do {
HuPrcVSleep();
} while (1);
} }
static s16 demoTimingTbl[] = { static s16 demoTimingTbl[] = {
1686, 1785, 1686,
1850, 1936, 1785,
1993, 2097, 1850,
2135, 2245, 1936,
2258, 2320, 1993,
-1, -1, 2097,
2135,
2245,
2258,
2320,
-1,
-1,
}; };
static void UpdateDemoMess(void) static void UpdateDemoMess(void)
{ {
int frame = HuTHPFrameGet(); int frame = HuTHPFrameGet();
int i; int i;
for(i=0; demoTimingTbl[i*2] != -1; i++) { for (i = 0; demoTimingTbl[i * 2] != -1; i++) {
if(frame == demoTimingTbl[i*2]) { if (frame == demoTimingTbl[i * 2]) {
HuWinMesSet(demoWin, MAKE_MESSID(54, i)); HuWinMesSet(demoWin, MAKE_MESSID(54, i));
} }
if(frame == demoTimingTbl[(i*2)+1]) { if (frame == demoTimingTbl[(i * 2) + 1]) {
HuWinHomeClear(demoWin); HuWinHomeClear(demoWin);
} }
} }
} }
static u16 progressivePosTbl[] = { static u16 progressivePosTbl[] = { 236, 313, 353, 313 };
236, 313,
353, 313
};
static void ProgressiveProc(void) static void ProgressiveProc(void)
{ {
s16 i; s16 i;
s16 option; s16 option;
s16 group; s16 group;
s16 sprite; s16 sprite;
AnimData *data; AnimData *data;
option = 0; option = 0;
if(OSGetResetCode() != OS_RESET_RESTART) { if (OSGetResetCode() != OS_RESET_RESTART) {
return; return;
} }
if(VIGetDTVStatus() != VI_NON_INTERLACE) { if (VIGetDTVStatus() != VI_NON_INTERLACE) {
OSSetProgressiveMode(OS_PROGRESSIVE_MODE_OFF); OSSetProgressiveMode(OS_PROGRESSIVE_MODE_OFF);
return; return;
} }
if(OSGetProgressiveMode() == OS_PROGRESSIVE_MODE_OFF && !(HU_PAD_BTN_ALL & PAD_BUTTON_B)) { if (OSGetProgressiveMode() == OS_PROGRESSIVE_MODE_OFF && !(HU_PAD_BTN_ALL & PAD_BUTTON_B)) {
return; return;
} }
if(OSGetProgressiveMode() == OS_PROGRESSIVE_MODE_ON) { if (OSGetProgressiveMode() == OS_PROGRESSIVE_MODE_ON) {
VIConfigure(&GXNtsc480IntDf); VIConfigure(&GXNtsc480IntDf);
VIFlush(); VIFlush();
} }
group = HuSprGrpCreate(3); group = HuSprGrpCreate(3);
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CHOOSE_ANM); data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CHOOSE_ANM);
sprite = HuSprCreate(data, 0, 0); sprite = HuSprCreate(data, 0, 0);
HuSprGrpMemberSet(group, 0, sprite); HuSprGrpMemberSet(group, 0, sprite);
HuSprPosSet(group, 0, 288, 240); HuSprPosSet(group, 0, 288, 240);
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_ON_ANM); data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_ON_ANM);
sprite = HuSprCreate(data, 0, 0); sprite = HuSprCreate(data, 0, 0);
HuSprGrpMemberSet(group, 1, sprite); HuSprGrpMemberSet(group, 1, sprite);
HuSprPosSet(group, 1, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]); HuSprPosSet(group, 1, progressivePosTbl[option * 2], progressivePosTbl[(option * 2) + 1]);
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_OFF_ANM); data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_OFF_ANM);
sprite = HuSprCreate(data, 0, 0); sprite = HuSprCreate(data, 0, 0);
HuSprGrpMemberSet(group, 2, sprite); HuSprGrpMemberSet(group, 2, sprite);
HuSprPosSet(group, 2, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]); HuSprPosSet(group, 2, progressivePosTbl[option * 2], progressivePosTbl[(option * 2) + 1]);
HuSprAttrSet(group, 2, HUSPR_ATTR_DISPOFF); HuSprAttrSet(group, 2, HUSPR_ATTR_DISPOFF);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
while(WipeStatGet()) { while (WipeStatGet()) {
HuPrcVSleep(); HuPrcVSleep();
} }
for(i=0; i<600; i++) { for (i = 0; i < 600; i++) {
if(HU_PAD_DSTK_ALL & (PAD_BUTTON_LEFT | PAD_BUTTON_RIGHT)) { if (HU_PAD_DSTK_ALL & (PAD_BUTTON_LEFT | PAD_BUTTON_RIGHT)) {
option ^= 1; option ^= 1;
HuSprPosSet(group, 1, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]); HuSprPosSet(group, 1, progressivePosTbl[option * 2], progressivePosTbl[(option * 2) + 1]);
i=0; i = 0;
} }
if(HU_PAD_BTNDOWN_ALL & PAD_BUTTON_A) { if (HU_PAD_BTNDOWN_ALL & PAD_BUTTON_A) {
HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF);
HuSprPosSet(group, 2, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]); HuSprPosSet(group, 2, progressivePosTbl[option * 2], progressivePosTbl[(option * 2) + 1]);
HuSprAttrReset(group, 2, HUSPR_ATTR_DISPOFF); HuSprAttrReset(group, 2, HUSPR_ATTR_DISPOFF);
break; break;
} }
HuPrcVSleep(); HuPrcVSleep();
} }
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20);
while(WipeStatGet()) { while (WipeStatGet()) {
HuPrcVSleep(); HuPrcVSleep();
} }
if(!option) { if (!option) {
OSSetProgressiveMode(OS_PROGRESSIVE_MODE_ON); OSSetProgressiveMode(OS_PROGRESSIVE_MODE_ON);
VIConfigure(&GXNtsc480Prog); VIConfigure(&GXNtsc480Prog);
VIFlush(); VIFlush();
HuPrcSleep(100); HuPrcSleep(100);
} else { }
OSSetProgressiveMode(OS_PROGRESSIVE_MODE_OFF); else {
} OSSetProgressiveMode(OS_PROGRESSIVE_MODE_OFF);
HuSprGrpKill(group); }
group = HuSprGrpCreate(1); HuSprGrpKill(group);
if(!option) { group = HuSprGrpCreate(1);
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_ON_ANM); if (!option) {
} else { data = HuSprAnimReadFile(TITLE_PROGRESSIVE_ON_ANM);
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_OFF_ANM); }
} else {
sprite = HuSprCreate(data, 0, 0); data = HuSprAnimReadFile(TITLE_PROGRESSIVE_OFF_ANM);
HuSprGrpMemberSet(group, 0, sprite); }
HuSprPosSet(group, 0, 288, 240); sprite = HuSprCreate(data, 0, 0);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 20); HuSprGrpMemberSet(group, 0, sprite);
while(WipeStatGet()) { HuSprPosSet(group, 0, 288, 240);
HuPrcVSleep(); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 20);
} while (WipeStatGet()) {
HuPrcSleep(60); HuPrcVSleep();
for(i=0; i<180; i++) { }
if(HU_PAD_BTNDOWN_ALL & PAD_BUTTON_A) { HuPrcSleep(60);
break; for (i = 0; i < 180; i++) {
} if (HU_PAD_BTNDOWN_ALL & PAD_BUTTON_A) {
HuPrcVSleep(); break;
} }
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); HuPrcVSleep();
while(WipeStatGet()) { }
HuPrcVSleep(); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
} while (WipeStatGet()) {
HuSprGrpKill(group); HuPrcVSleep();
HuPrcSleep(30); }
HuSprGrpKill(group);
HuPrcSleep(30);
} }
u16 lbl_1_data_58[] = { u16 lbl_1_data_58[] = { 1, 2 };
1, 2
};
void fn_1_1178(void) void fn_1_1178(void)
{ {
s16 i; s16 i;
for(i=0; i<1; i++) { for (i = 0; i < 1; i++) {
Vec pos, target, up; Vec pos, target, up;
float x, y, z; float x, y, z;
x = lbl_1_bss_3C[i].x; x = lbl_1_bss_3C[i].x;
y = lbl_1_bss_3C[i].y; y = lbl_1_bss_3C[i].y;
z = lbl_1_bss_3C[i].z; z = lbl_1_bss_3C[i].z;
pos.x = (((sind(y)*cosd(x))*lbl_1_bss_1C[i])+lbl_1_bss_24[i].x); pos.x = (((sind(y) * cosd(x)) * lbl_1_bss_1C[i]) + lbl_1_bss_24[i].x);
pos.y = (-sind(x)*lbl_1_bss_1C[i])+lbl_1_bss_24[i].y; pos.y = (-sind(x) * lbl_1_bss_1C[i]) + lbl_1_bss_24[i].y;
pos.z = ((cosd(y)*cosd(x))*lbl_1_bss_1C[i])+lbl_1_bss_24[i].z; pos.z = ((cosd(y) * cosd(x)) * lbl_1_bss_1C[i]) + lbl_1_bss_24[i].z;
target.x = lbl_1_bss_24[i].x; target.x = lbl_1_bss_24[i].x;
target.y = lbl_1_bss_24[i].y; target.y = lbl_1_bss_24[i].y;
target.z = lbl_1_bss_24[i].z; target.z = lbl_1_bss_24[i].z;
up.x = sind(y)*sind(x); up.x = sind(y) * sind(x);
up.y = cosd(x); up.y = cosd(x);
up.z = cosd(y)*sind(x); up.z = cosd(y) * sind(x);
Hu3DCameraPosSet(lbl_1_data_58[i], pos.x, pos.y, pos.z, up.x, up.y, up.z, target.x, target.y, target.z); Hu3DCameraPosSet(lbl_1_data_58[i], pos.x, pos.y, pos.z, up.x, up.y, up.z, target.x, target.y, target.z);
} }
} }
void fn_1_152C(void) { void fn_1_152C(void)
{
Vec pos; Vec pos;
Vec offset; Vec offset;
Vec dir; Vec dir;
Vec y_offset; Vec y_offset;
f32 z_rot; f32 z_rot;
s8 stick_pos; s8 stick_pos;
@ -421,16 +429,16 @@ void fn_1_152C(void) {
dir.z = (cosd(lbl_1_bss_3C[0].y) * sind(lbl_1_bss_3C[0].x)); dir.z = (cosd(lbl_1_bss_3C[0].y) * sind(lbl_1_bss_3C[0].x));
z_rot = lbl_1_bss_3C[0].z; z_rot = lbl_1_bss_3C[0].z;
y_offset.x = dir.x * (offset.x * offset.x + (1.0f - offset.x * offset.x) * cosd(z_rot)) y_offset.x = dir.x * (offset.x * offset.x + (1.0f - offset.x * offset.x) * cosd(z_rot))
+ dir.y * (offset.x * offset.y * (1.0f - cosd(z_rot)) - offset.z * sind(z_rot)) + dir.y * (offset.x * offset.y * (1.0f - cosd(z_rot)) - offset.z * sind(z_rot))
+ dir.z * (offset.x * offset.z * (1.0f - cosd(z_rot)) + offset.y * sind(z_rot)); + dir.z * (offset.x * offset.z * (1.0f - cosd(z_rot)) + offset.y * sind(z_rot));
y_offset.y = dir.y * (offset.y * offset.y + (1.0f - offset.y * offset.y) * cosd(z_rot)) y_offset.y = dir.y * (offset.y * offset.y + (1.0f - offset.y * offset.y) * cosd(z_rot))
+ dir.x * (offset.x * offset.y * (1.0f - cosd(z_rot)) + offset.z * sind(z_rot)) + dir.x * (offset.x * offset.y * (1.0f - cosd(z_rot)) + offset.z * sind(z_rot))
+ dir.z * (offset.y * offset.z * (1.0f - cosd(z_rot)) - offset.x * sind(z_rot)); + dir.z * (offset.y * offset.z * (1.0f - cosd(z_rot)) - offset.x * sind(z_rot));
y_offset.z = dir.z * (offset.z * offset.z + (1.0f - offset.z * offset.z) * cosd(z_rot)) y_offset.z = dir.z * (offset.z * offset.z + (1.0f - offset.z * offset.z) * cosd(z_rot))
+ (dir.x * (offset.x * offset.z * (1.0 - cosd(z_rot)) - offset.y * sind(z_rot)) + (dir.x * (offset.x * offset.z * (1.0 - cosd(z_rot)) - offset.y * sind(z_rot))
+ dir.y * (offset.y * offset.z * (1.0 - cosd(z_rot)) + offset.x * sind(z_rot))); + dir.y * (offset.y * offset.z * (1.0 - cosd(z_rot)) + offset.x * sind(z_rot)));
VECCrossProduct(&dir, &offset, &offset); VECCrossProduct(&dir, &offset, &offset);
VECNormalize(&offset, &offset); VECNormalize(&offset, &offset);
@ -452,100 +460,100 @@ void fn_1_152C(void) {
static void TitleInit(void) static void TitleInit(void)
{ {
s16 model; s16 model;
s16 sprite; s16 sprite;
AnimData *sprite_data; AnimData *sprite_data;
titleModel[0] = model = Hu3DModelCreateFile(TITLE_CHAR_HSF); titleModel[0] = model = Hu3DModelCreateFile(TITLE_CHAR_HSF);
Hu3DModelAttrSet(model, 1); Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(model, 0x40000001); Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP);
titleModel[1] = model = Hu3DModelCreateFile(TITLE_CUBE_HSF); titleModel[1] = model = Hu3DModelCreateFile(TITLE_CUBE_HSF);
Hu3DModelAttrSet(model, 1); Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(model, 0x40000001); Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP);
titleModel[2] = model = Hu3DModelCreateFile(TITLE_SKY_HSF); titleModel[2] = model = Hu3DModelCreateFile(TITLE_SKY_HSF);
Hu3DModelAttrSet(model, 1); Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(model, 0x40000001); Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP);
Hu3DModelCameraInfoSet(model, 1); Hu3DModelCameraInfoSet(model, 1);
Hu3DModelLightInfoSet(model, 1); Hu3DModelLightInfoSet(model, 1);
titleGroup = HuSprGrpCreate(4); titleGroup = HuSprGrpCreate(4);
sprite_data = HuSprAnimReadFile(TITLE_BG_ANM); sprite_data = HuSprAnimReadFile(TITLE_BG_ANM);
sprite = HuSprCreate(sprite_data, 0, 0); sprite = HuSprCreate(sprite_data, 0, 0);
HuSprGrpMemberSet(titleGroup, 0, sprite); HuSprGrpMemberSet(titleGroup, 0, sprite);
HuSprAttrSet(titleGroup, 0, HUSPR_ATTR_DISPOFF); HuSprAttrSet(titleGroup, 0, HUSPR_ATTR_DISPOFF);
HuSprDrawNoSet(titleGroup, 0, 127); HuSprDrawNoSet(titleGroup, 0, 127);
HuSprPosSet(titleGroup, 0, 288, 240); HuSprPosSet(titleGroup, 0, 288, 240);
sprite_data = HuSprAnimReadFile(TITLE_COPYRIGHT_ANM); sprite_data = HuSprAnimReadFile(TITLE_COPYRIGHT_ANM);
sprite = HuSprCreate(sprite_data, 1, 0); sprite = HuSprCreate(sprite_data, 1, 0);
HuSprGrpMemberSet(titleGroup, 1, sprite); HuSprGrpMemberSet(titleGroup, 1, sprite);
HuSprAttrSet(titleGroup, 1, HUSPR_ATTR_DISPOFF); HuSprAttrSet(titleGroup, 1, HUSPR_ATTR_DISPOFF);
HuSprPosSet(titleGroup, 1, 288, 420); HuSprPosSet(titleGroup, 1, 288, 420);
sprite_data = HuSprAnimReadFile(TITLE_PRESS_START_ANM); sprite_data = HuSprAnimReadFile(TITLE_PRESS_START_ANM);
sprite = HuSprCreate(sprite_data, 2, 0); sprite = HuSprCreate(sprite_data, 2, 0);
HuSprGrpMemberSet(titleGroup, 2, sprite); HuSprGrpMemberSet(titleGroup, 2, sprite);
HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF|HUSPR_ATTR_LINEAR); HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF | HUSPR_ATTR_LINEAR);
HuSprPosSet(titleGroup, 2, 288, 380); HuSprPosSet(titleGroup, 2, 288, 380);
sprite_data = HuSprAnimReadFile(TITLE_LOGO_ANM); sprite_data = HuSprAnimReadFile(TITLE_LOGO_ANM);
sprite = HuSprCreate(sprite_data, 0, 0); sprite = HuSprCreate(sprite_data, 0, 0);
HuSprGrpMemberSet(titleGroup, 3, sprite); HuSprGrpMemberSet(titleGroup, 3, sprite);
HuSprAttrSet(titleGroup, 3, HUSPR_ATTR_DISPOFF|HUSPR_ATTR_LINEAR); HuSprAttrSet(titleGroup, 3, HUSPR_ATTR_DISPOFF | HUSPR_ATTR_LINEAR);
HuSprPosSet(titleGroup, 3, 288, 200); HuSprPosSet(titleGroup, 3, 288, 200);
} }
static BOOL TitleProc(void) static BOOL TitleProc(void)
{ {
float scale; float scale;
float scale_time; float scale_time;
s32 y_offset[32]; s32 y_offset[32];
s16 i; s16 i;
Hu3DModelAttrReset(titleModel[0], 1); Hu3DModelAttrReset(titleModel[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(titleModel[1], 1); Hu3DModelAttrReset(titleModel[1], HU3D_ATTR_DISPOFF);
HuSprAttrReset(titleGroup, 0, HUSPR_ATTR_DISPOFF); HuSprAttrReset(titleGroup, 0, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(titleGroup, 1, HUSPR_ATTR_DISPOFF); HuSprAttrReset(titleGroup, 1, HUSPR_ATTR_DISPOFF);
OSReport(">>>>>>>>MSM_SE_SEL_01 %d\n", msmSeGetEntryID(2092, y_offset)); OSReport(">>>>>>>>MSM_SE_SEL_01 %d\n", msmSeGetEntryID(2092, y_offset));
OSReport(">>>>>>>>SE Num %d\n", msmSeGetNumPlay(0)); OSReport(">>>>>>>>SE Num %d\n", msmSeGetNumPlay(0));
HuAudSStreamPlay(20); HuAudSStreamPlay(20);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
while(WipeStatGet()) { while (WipeStatGet()) {
HuPrcVSleep(); HuPrcVSleep();
} }
HuSprAttrReset(titleGroup, 3, HUSPR_ATTR_DISPOFF); HuSprAttrReset(titleGroup, 3, HUSPR_ATTR_DISPOFF);
for(i=1; i<=50; i++) { for (i = 1; i <= 50; i++) {
scale = (cosd(i*1.8)*10.0)+1.0; scale = (cosd(i * 1.8) * 10.0) + 1.0;
HuSprScaleSet(titleGroup, 3, scale, scale); HuSprScaleSet(titleGroup, 3, scale, scale);
HuSprTPLvlSet(titleGroup, 3, i/50.0); HuSprTPLvlSet(titleGroup, 3, i / 50.0);
HuPrcVSleep(); HuPrcVSleep();
} }
HuSprAttrReset(titleGroup, 2, HUSPR_ATTR_DISPOFF); HuSprAttrReset(titleGroup, 2, HUSPR_ATTR_DISPOFF);
for(i=scale_time=0; i<1800; i++) { for (i = scale_time = 0; i < 1800; i++) {
if(i <= 10) { if (i <= 10) {
HuSprTPLvlSet(titleGroup, 2, i/10.0); HuSprTPLvlSet(titleGroup, 2, i / 10.0);
} }
if(HuPadBtnDown[0] & PAD_BUTTON_START) { if (HuPadBtnDown[0] & PAD_BUTTON_START) {
s32 ret = HuAudFXPlay(2092); s32 ret = HuAudFXPlay(2092);
if(ret < 0) { if (ret < 0) {
OSReport(">>>>>Error %d\n", ret); OSReport(">>>>>Error %d\n", ret);
} }
HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF); HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF);
return 1; return 1;
} }
scale = (sind(i*scale_time)*0.1)+0.9; scale = (sind(i * scale_time) * 0.1) + 0.9;
scale_time += 0.05; scale_time += 0.05;
if(scale_time > 5) { if (scale_time > 5) {
scale_time = 5; scale_time = 5;
} }
HuSprScaleSet(titleGroup, 2, scale, scale); HuSprScaleSet(titleGroup, 2, scale, scale);
HuPrcVSleep(); HuPrcVSleep();
} }
WipeColorSet(255, 255, 255); WipeColorSet(255, 255, 255);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
while(WipeStatGet()) { while (WipeStatGet()) {
HuPrcVSleep(); HuPrcVSleep();
} }
Hu3DModelAttrSet(titleModel[0], 1); Hu3DModelAttrSet(titleModel[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(titleModel[1], 1); Hu3DModelAttrSet(titleModel[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(titleModel[2], 1); Hu3DModelAttrSet(titleModel[2], HU3D_ATTR_DISPOFF);
HuSprAttrSet(titleGroup, 0, HUSPR_ATTR_DISPOFF); HuSprAttrSet(titleGroup, 0, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(titleGroup, 1, HUSPR_ATTR_DISPOFF); HuSprAttrSet(titleGroup, 1, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF); HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(titleGroup, 3, HUSPR_ATTR_DISPOFF); HuSprAttrSet(titleGroup, 3, HUSPR_ATTR_DISPOFF);
return 0; return 0;
} }

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

File diff suppressed because it is too large Load diff

162
src/REL/m401Dll/main.c
View file

@ -606,7 +606,7 @@ void fn_2_20B0(omObjData *object)
Vec sp8; Vec sp8;
HsfObject *temp_r30 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[4]); HsfObject *temp_r30 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[4]);
temp_r30->type = 2; temp_r30->type = 2;
Hu3DModelAttrReset(object->model[7], 1); Hu3DModelAttrReset(object->model[7], HU3D_ATTR_DISPOFF);
sp8.x = 0; sp8.x = 0;
sp8.y = -370; sp8.y = -370;
sp8.z = -43000; sp8.z = -43000;
@ -617,8 +617,8 @@ void fn_2_20B0(omObjData *object)
sp8.z = -32000; sp8.z = -32000;
lbl_2_bss_CC = fn_2_10A88(&sp8, 3); lbl_2_bss_CC = fn_2_10A88(&sp8, 3);
lbl_2_bss_90[2] = HuAudFXEmiterPlay(1291, &sp8); lbl_2_bss_90[2] = HuAudFXEmiterPlay(1291, &sp8);
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[2], 0xC0000001); Hu3DModelAttrSet(object->model[2], HU3D_CLUSTER_ATTR_LOOP);
} }
void fn_2_21F8(omObjData *object) void fn_2_21F8(omObjData *object)
@ -631,11 +631,11 @@ void fn_2_21F8(omObjData *object)
HsfObject *temp_r29 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[0]); HsfObject *temp_r29 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[0]);
s32 temp_r28; s32 temp_r28;
temp_r29->type = 2; temp_r29->type = 2;
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[1], 1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(object->model[1], 0x40000001); Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[3], 1); Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF);
lbl_2_bss_44.x = 0; lbl_2_bss_44.x = 0;
lbl_2_bss_44.y = 100; lbl_2_bss_44.y = 100;
lbl_2_bss_44.z = 0; lbl_2_bss_44.z = 0;
@ -663,8 +663,8 @@ void fn_2_21F8(omObjData *object)
sp14.z = -4720; sp14.z = -4720;
lbl_2_bss_D4 = fn_2_10A88(&sp14, 3); lbl_2_bss_D4 = fn_2_10A88(&sp14, 3);
lbl_2_bss_90[1] = HuAudFXEmiterPlay(1291, &sp14); lbl_2_bss_90[1] = HuAudFXEmiterPlay(1291, &sp14);
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[2], 0xC0000001); Hu3DModelAttrSet(object->model[2], HU3D_CLUSTER_ATTR_LOOP);
temp_r28 = 4; temp_r28 = 4;
for (temp_r30 = 0; temp_r30 < temp_r28; temp_r30++) { for (temp_r30 = 0; temp_r30 < temp_r28; temp_r30++) {
sp8.x = -340.0f + ((1.0f / 255.0f) * (680.0f * frandu8())); sp8.x = -340.0f + ((1.0f / 255.0f) * (680.0f * frandu8()));
@ -690,13 +690,13 @@ void fn_2_26E0(omObjData *object)
Vec sp8; Vec sp8;
Work2FA4 *temp_r30; Work2FA4 *temp_r30;
s32 temp_r29; s32 temp_r29;
Hu3DModelAttrReset(object->model[4], 1); Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelClusterAttrSet(object->model[4], 0, 0xC0000001); Hu3DModelClusterAttrSet(object->model[4], 0, 0xC0000001);
Hu3DModelAttrReset(object->model[8], 1); Hu3DModelAttrReset(object->model[8], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[8], 0x40000001); Hu3DModelAttrSet(object->model[8], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(object->model[4], 0x40000001); Hu3DModelAttrSet(object->model[4], HU3D_MOTATTR_LOOP);
Hu3DModelShadowMapSet(object->model[4]); Hu3DModelShadowMapSet(object->model[4]);
Hu3DModelAttrReset(object->model[5], 1); Hu3DModelAttrReset(object->model[5], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(object->model[4], 0, 0, 0); Hu3DModelPosSet(object->model[4], 0, 0, 0);
Hu3DModelAmbSet(object->model[4], 1, 1, 1); Hu3DModelAmbSet(object->model[4], 1, 1, 1);
Hu3DModelPosSet(object->model[5], 0, 0, 0); Hu3DModelPosSet(object->model[5], 0, 0, 0);
@ -711,7 +711,7 @@ void fn_2_26E0(omObjData *object)
temp_r30->unk14[1].z = -50; temp_r30->unk14[1].z = -50;
for (temp_r29 = 0; temp_r29 < 2; temp_r29++) { for (temp_r29 = 0; temp_r29 < 2; temp_r29++) {
Hu3DModelPosSet(object->model[temp_r29 + 9], temp_r30->unk14[temp_r29].x, temp_r30->unk14[temp_r29].y, temp_r30->unk14[temp_r29].z); Hu3DModelPosSet(object->model[temp_r29 + 9], temp_r30->unk14[temp_r29].x, temp_r30->unk14[temp_r29].y, temp_r30->unk14[temp_r29].z);
Hu3DModelAttrReset(object->model[temp_r29 + 9], 1); Hu3DModelAttrReset(object->model[temp_r29 + 9], HU3D_ATTR_DISPOFF);
} }
Hu3DMotionSet(object->model[10], object->motion[0]); Hu3DMotionSet(object->model[10], object->motion[0]);
Hu3DMotionSet(object->model[9], object->motion[2]); Hu3DMotionSet(object->model[9], object->motion[2]);
@ -725,18 +725,18 @@ void fn_2_26E0(omObjData *object)
temp_r30->unk14[1].z = -50; temp_r30->unk14[1].z = -50;
for (temp_r29 = 0; temp_r29 < 2; temp_r29++) { for (temp_r29 = 0; temp_r29 < 2; temp_r29++) {
Hu3DModelPosSet(object->model[temp_r29 + 9], temp_r30->unk14[temp_r29].x, temp_r30->unk14[temp_r29].y, temp_r30->unk14[temp_r29].z); Hu3DModelPosSet(object->model[temp_r29 + 9], temp_r30->unk14[temp_r29].x, temp_r30->unk14[temp_r29].y, temp_r30->unk14[temp_r29].z);
Hu3DModelAttrReset(object->model[temp_r29 + 9], 1); Hu3DModelAttrReset(object->model[temp_r29 + 9], HU3D_ATTR_DISPOFF);
} }
Hu3DMotionSet(object->model[10], object->motion[1]); Hu3DMotionSet(object->model[10], object->motion[1]);
Hu3DMotionSet(object->model[9], object->motion[2]); Hu3DMotionSet(object->model[9], object->motion[2]);
} }
Hu3DModelAttrSet(object->model[9], 0x40000001); Hu3DModelAttrSet(object->model[9], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(object->model[10], 0x40000001); Hu3DModelAttrSet(object->model[10], HU3D_MOTATTR_LOOP);
Hu3DModelRotSet(object->model[9], 0, 90, 0); Hu3DModelRotSet(object->model[9], 0, 90, 0);
Hu3DModelPosSet(object->model[11], 210, 1018, 0); Hu3DModelPosSet(object->model[11], 210, 1018, 0);
Hu3DModelRotSet(object->model[11], 0, 90, 0); Hu3DModelRotSet(object->model[11], 0, 90, 0);
Hu3DModelAttrReset(object->model[11], 1); Hu3DModelAttrReset(object->model[11], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[11], 0x40000001); Hu3DModelAttrSet(object->model[11], HU3D_MOTATTR_LOOP);
sp2C.x = 0; sp2C.x = 0;
sp2C.y = 1300; sp2C.y = 1300;
sp2C.z = 1300; sp2C.z = 1300;
@ -760,9 +760,9 @@ void fn_2_2CBC(omObjData *object)
{ {
HsfObject *temp_r30 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[0]); HsfObject *temp_r30 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[0]);
temp_r30->type = -1; temp_r30->type = -1;
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
lbl_2_bss_D8->work[0] = 1; lbl_2_bss_D8->work[0] = 1;
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
HuAudFXStop(lbl_2_bss_90[0]); HuAudFXStop(lbl_2_bss_90[0]);
HuAudFXStop(lbl_2_bss_90[1]); HuAudFXStop(lbl_2_bss_90[1]);
} }
@ -784,8 +784,8 @@ void fn_2_2E20(omObjData *object)
{ {
HsfObject *temp_r30 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[3]); HsfObject *temp_r30 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[3]);
temp_r30->type = -1; temp_r30->type = -1;
Hu3DModelAttrSet(lbl_2_bss_100[0]->model[0], 1); Hu3DModelAttrSet(lbl_2_bss_100[0]->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_2_bss_100[1]->model[0], 1); Hu3DModelAttrSet(lbl_2_bss_100[1]->model[0], HU3D_ATTR_DISPOFF);
lbl_2_bss_D0->work[0] = 1; lbl_2_bss_D0->work[0] = 1;
HuAudFXStop(lbl_2_bss_90[0]); HuAudFXStop(lbl_2_bss_90[0]);
} }
@ -794,11 +794,11 @@ void fn_2_2ED0(omObjData *object)
{ {
HsfObject *temp_r30 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[4]); HsfObject *temp_r30 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[4]);
temp_r30->type = -1; temp_r30->type = -1;
Hu3DModelAttrSet(object->model[7], 1); Hu3DModelAttrSet(object->model[7], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
lbl_2_bss_8->work[0] = 1; lbl_2_bss_8->work[0] = 1;
lbl_2_bss_CC->work[0] = 1; lbl_2_bss_CC->work[0] = 1;
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
HuAudFXStop(lbl_2_bss_90[1]); HuAudFXStop(lbl_2_bss_90[1]);
HuAudFXStop(lbl_2_bss_90[2]); HuAudFXStop(lbl_2_bss_90[2]);
} }
@ -823,31 +823,31 @@ void fn_2_2FA4(omObjData *object)
temp_r30->unk8.z = 0; temp_r30->unk8.z = 0;
temp_r30->unk2C = 0; temp_r30->unk2C = 0;
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x00)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x00));
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x01)); object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x01));
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x07)); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x07));
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[2], 0x40000001); Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_LOOP);
object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x1F)); object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x1F));
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x20)); object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x20));
Hu3DModelAttrSet(object->model[4], 1); Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF);
object->model[11] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x2C)); object->model[11] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x2C));
Hu3DModelAttrSet(object->model[11], 1); Hu3DModelAttrSet(object->model[11], HU3D_ATTR_DISPOFF);
object->model[7] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x03)); object->model[7] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x03));
Hu3DModelAttrSet(object->model[7], 1); Hu3DModelAttrSet(object->model[7], HU3D_ATTR_DISPOFF);
object->model[8] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x23)); object->model[8] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x23));
Hu3DModelAttrSet(object->model[8], 1); Hu3DModelAttrSet(object->model[8], HU3D_ATTR_DISPOFF);
object->model[9] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x28)); object->model[9] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x28));
Hu3DModelAttrSet(object->model[9], 1); Hu3DModelAttrSet(object->model[9], HU3D_ATTR_DISPOFF);
object->model[10] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x28)); object->model[10] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x28));
Hu3DModelAttrSet(object->model[10], 1); Hu3DModelAttrSet(object->model[10], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(object->model[10]); Hu3DModelShadowSet(object->model[10]);
object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x21)); object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x21));
Hu3DModelAttrSet(object->model[5], 1); Hu3DModelAttrSet(object->model[5], HU3D_ATTR_DISPOFF);
object->model[6] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x22)); object->model[6] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x22));
Hu3DModelAttrSet(object->model[6], 1); Hu3DModelAttrSet(object->model[6], HU3D_ATTR_DISPOFF);
object->motion[0] = Hu3DJointMotionFile(object->model[10], DATA_MAKE_NUM(DATADIR_M401, 0x29)); object->motion[0] = Hu3DJointMotionFile(object->model[10], DATA_MAKE_NUM(DATADIR_M401, 0x29));
object->motion[1] = Hu3DJointMotionFile(object->model[10], DATA_MAKE_NUM(DATADIR_M401, 0x2A)); object->motion[1] = Hu3DJointMotionFile(object->model[10], DATA_MAKE_NUM(DATADIR_M401, 0x2A));
object->motion[2] = Hu3DJointMotionFile(object->model[9], DATA_MAKE_NUM(DATADIR_M401, 0x2B)); object->motion[2] = Hu3DJointMotionFile(object->model[9], DATA_MAKE_NUM(DATADIR_M401, 0x2B));
@ -1080,16 +1080,16 @@ void fn_2_3B24(omObjData *object)
object->model[2] = Hu3DModelLink(lbl_2_bss_118[0]->model[2]); object->model[2] = Hu3DModelLink(lbl_2_bss_118[0]->model[2]);
object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x27)); object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x27));
} }
Hu3DModelAttrSet(object->model[3], 0x40000002); Hu3DModelAttrSet(object->model[3], HU3D_MOTATTR_PAUSE);
Hu3DModelClusterAttrSet(object->model[3], 0, 0xC0000002); Hu3DModelClusterAttrSet(object->model[3], 0, 0xC0000002);
Hu3DModelLayerSet(object->model[3], 7); Hu3DModelLayerSet(object->model[3], 7);
for (temp_r28 = 0; temp_r28 < 10; temp_r28++) { for (temp_r28 = 0; temp_r28 < 10; temp_r28++) {
object->motion[temp_r28] = CharModelMotionCreate(lbl_2_data_4[temp_r27], lbl_2_data_158[temp_r27][temp_r28]); object->motion[temp_r28] = CharModelMotionCreate(lbl_2_data_4[temp_r27], lbl_2_data_158[temp_r27][temp_r28]);
} }
CharModelMotionSet(temp_r31->unk86, object->motion[2]); CharModelMotionSet(temp_r31->unk86, object->motion[2]);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[2], 0x40000001); Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[2], 2); Hu3DModelLayerSet(object->model[2], 2);
Hu3DModelAmbSet(object->model[0], 1, 1, 1); Hu3DModelAmbSet(object->model[0], 1, 1, 1);
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
@ -1168,7 +1168,7 @@ void fn_2_3F28(omObjData *object)
temp_r31->unk30.x = object->trans.x; temp_r31->unk30.x = object->trans.x;
temp_r31->unk30.y = object->trans.y; temp_r31->unk30.y = object->trans.y;
temp_r31->unk30.z = object->trans.z; temp_r31->unk30.z = object->trans.z;
Hu3DModelAttrReset(object->model[3], 1); Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[3], 0x40000002); Hu3DModelAttrReset(object->model[3], 0x40000002);
Hu3DModelClusterAttrReset(object->model[3], 0, 0xC0000002); Hu3DModelClusterAttrReset(object->model[3], 0, 0xC0000002);
Hu3DModelPosSet(object->model[3], object->trans.x, 100, 100 + object->trans.z); Hu3DModelPosSet(object->model[3], object->trans.x, 100, 100 + object->trans.z);
@ -1269,8 +1269,8 @@ void fn_2_48A0(omObjData *object)
if (object->trans.y >= 910.0f) { if (object->trans.y >= 910.0f) {
if (temp_r31->unk6C == 0) { if (temp_r31->unk6C == 0) {
temp_r31->unk6C = 1; temp_r31->unk6C = 1;
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[2], 0x40000001); Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_LOOP);
Hu3DModelPosSet(object->model[2], object->trans.x, 950, 30 + object->trans.z); Hu3DModelPosSet(object->model[2], object->trans.x, 950, 30 + object->trans.z);
Hu3DModelScaleSet(object->model[2], 1, 1, 1); Hu3DModelScaleSet(object->model[2], 1, 1, 1);
Hu3DMotionTimeSet(object->model[2], 0); Hu3DMotionTimeSet(object->model[2], 0);
@ -1328,7 +1328,7 @@ void fn_2_48A0(omObjData *object)
temp_r31->unk80 -= 360.0f; temp_r31->unk80 -= 360.0f;
} }
if (temp_r31->unk6E == 13) { if (temp_r31->unk6E == 13) {
Hu3DModelAttrReset(lbl_2_bss_10C->model[6], 1); Hu3DModelAttrReset(lbl_2_bss_10C->model[6], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(lbl_2_bss_10C->model[6], 0); Hu3DMotionTimeSet(lbl_2_bss_10C->model[6], 0);
} }
else if (temp_r31->unk6E == 50) { else if (temp_r31->unk6E == 50) {
@ -1383,14 +1383,14 @@ void fn_2_48A0(omObjData *object)
if (temp_r31->unk6C == 0) { if (temp_r31->unk6C == 0) {
temp_r31->unk6C = 1; temp_r31->unk6C = 1;
omVibrate(temp_r31->unk4, 12, 4, 2); omVibrate(temp_r31->unk4, 12, 4, 2);
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[2], 0x40000002); Hu3DModelAttrReset(object->model[2], 0x40000002);
Hu3DModelAttrSet(object->model[2], 0x40000001); Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_LOOP);
Hu3DModelPosSet(object->model[2], object->trans.x, 950, 30 + object->trans.z); Hu3DModelPosSet(object->model[2], object->trans.x, 950, 30 + object->trans.z);
Hu3DModelScaleSet(object->model[2], 1, 1, 1); Hu3DModelScaleSet(object->model[2], 1, 1, 1);
Hu3DMotionTimeSet(object->model[2], 0); Hu3DMotionTimeSet(object->model[2], 0);
Hu3DModelAttrReset(object->model[3], 0x40000002); Hu3DModelAttrReset(object->model[3], 0x40000002);
Hu3DModelAttrReset(object->model[3], 1); Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF);
Hu3DModelClusterAttrReset(object->model[3], 0, 0xC0000002); Hu3DModelClusterAttrReset(object->model[3], 0, 0xC0000002);
Hu3DModelPosSet(object->model[3], object->trans.x, 0, 30 + object->trans.z); Hu3DModelPosSet(object->model[3], object->trans.x, 0, 30 + object->trans.z);
Hu3DMotionTimeSet(object->model[3], 0); Hu3DMotionTimeSet(object->model[3], 0);
@ -1584,10 +1584,10 @@ void fn_2_5CC0(omObjData *object)
temp_r31->unk6A = 0; temp_r31->unk6A = 0;
} }
if (temp_r31->unk7A & 0x1) { if (temp_r31->unk7A & 0x1) {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
} }
} }
if (temp_f29 != 0) { if (temp_f29 != 0) {
@ -2075,7 +2075,7 @@ void fn_2_7CB4(omObjData *object)
temp_r31->unk28 = 0; temp_r31->unk28 = 0;
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x0B)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x0B));
Hu3DModelClusterAttrSet(object->model[0], 0, 0xC0000001); Hu3DModelClusterAttrSet(object->model[0], 0, 0xC0000001);
Hu3DModelAttrSet(object->model[0], 0x1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAmbSet(object->model[0], 0.6f, 0.6f, 0.6f); Hu3DModelAmbSet(object->model[0], 0.6f, 0.6f, 0.6f);
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
temp_r31->unk0 = 0; temp_r31->unk0 = 0;
@ -2243,7 +2243,7 @@ void fn_2_8868(omObjData *object)
Work7CB4 *temp_r31; Work7CB4 *temp_r31;
temp_r31 = object->data; temp_r31 = object->data;
if (lbl_2_bss_60.z < -20800.0f) { if (lbl_2_bss_60.z < -20800.0f) {
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
temp_r31->unk2C = 0; temp_r31->unk2C = 0;
temp_r31->unk2E = 0; temp_r31->unk2E = 0;
temp_r31->unk30 = 0; temp_r31->unk30 = 0;
@ -2265,7 +2265,7 @@ void fn_2_8968(omObjData *object)
temp_r29->unk1E = ((frand() % 15) + 22) * 0.43478262f; temp_r29->unk1E = ((frand() % 15) + 22) * 0.43478262f;
} }
if (fn_2_8450(object)) { if (fn_2_8450(object)) {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_2_8B58; object->func = fn_2_8B58;
} }
} }
@ -2277,7 +2277,7 @@ void fn_2_8B58(omObjData *object)
Work7CB4 *temp_r31; Work7CB4 *temp_r31;
temp_r31 = object->data; temp_r31 = object->data;
if (lbl_2_bss_60.z < -30500.0f) { if (lbl_2_bss_60.z < -30500.0f) {
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
temp_r31->unk2C = 1; temp_r31->unk2C = 1;
temp_r31->unk2E = 0; temp_r31->unk2E = 0;
temp_r31->unk30 = 0; temp_r31->unk30 = 0;
@ -2299,7 +2299,7 @@ void fn_2_8C58(omObjData *object)
temp_r29->unk1E = ((frand() % 15) + lbl_2_data_424[lbl_2_bss_14++]) * 0.43478262f; temp_r29->unk1E = ((frand() % 15) + lbl_2_data_424[lbl_2_bss_14++]) * 0.43478262f;
} }
if (fn_2_8450(object)) { if (fn_2_8450(object)) {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
object->func = NULL; object->func = NULL;
} }
} }
@ -2326,8 +2326,8 @@ void fn_2_8E74(omObjData *object)
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x0D)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x0D));
object->motion[0] = Hu3DJointMotionFile(object->model[0], DATA_MAKE_NUM(DATADIR_M401, 0x10)); object->motion[0] = Hu3DJointMotionFile(object->model[0], DATA_MAKE_NUM(DATADIR_M401, 0x10));
Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
omSetTra(object, -1000, 0, -23000); omSetTra(object, -1000, 0, -23000);
omSetRot(object, 0, 90, 0); omSetRot(object, 0, 90, 0);
temp_r31->unkC.x = 1000.0f - object->trans.x; temp_r31->unkC.x = 1000.0f - object->trans.x;
@ -2349,7 +2349,7 @@ void fn_2_91AC(omObjData *object, Vec *pos)
temp_r30 = object->data; temp_r30 = object->data;
temp_r30->unk18 = *pos; temp_r30->unk18 = *pos;
temp_r30->unk34.z = (1.0f / 255.0f) * (360.0f * frandu8()); temp_r30->unk34.z = (1.0f / 255.0f) * (360.0f * frandu8());
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
omSetTra(object, pos->x, pos->y, pos->z); omSetTra(object, pos->x, pos->y, pos->z);
object->work[2] = HuAudFXEmiterPlay(1284, &pos); object->work[2] = HuAudFXEmiterPlay(1284, &pos);
object->func = fn_2_9298; object->func = fn_2_9298;
@ -2377,7 +2377,7 @@ void fn_2_9298(omObjData *object)
spC.z = object->trans.z; spC.z = object->trans.z;
HuAudFXEmiterUpDate(object->work[2], &spC); HuAudFXEmiterUpDate(object->work[2], &spC);
if (object->trans.z > lbl_2_bss_6C.z - 220.0f) { if (object->trans.z > lbl_2_bss_6C.z - 220.0f) {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
HuAudFXStop(object->work[2]); HuAudFXStop(object->work[2]);
object->func = NULL; object->func = NULL;
} }
@ -2393,8 +2393,8 @@ void fn_2_95E4(omObjData *object)
omSetTra(object, 3000, 0, -37000); omSetTra(object, 3000, 0, -37000);
omSetRot(object, 0, 270, 0); omSetRot(object, 0, 270, 0);
Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DModelAttrSet(object->model[0], 0x1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
object->work[3] = 3; object->work[3] = 3;
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
object->func = fn_2_979C; object->func = fn_2_979C;
@ -2403,10 +2403,10 @@ void fn_2_95E4(omObjData *object)
void fn_2_9734(s32 flag) void fn_2_9734(s32 flag)
{ {
if (flag) { if (flag) {
Hu3DModelAttrReset(lbl_2_bss_FC->model[0], 1); Hu3DModelAttrReset(lbl_2_bss_FC->model[0], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrSet(lbl_2_bss_FC->model[0], 1); Hu3DModelAttrSet(lbl_2_bss_FC->model[0], HU3D_ATTR_DISPOFF);
} }
} }
@ -2419,7 +2419,7 @@ void fn_2_979C(omObjData *object)
omSetTra(object, -2500, -800, -21000); omSetTra(object, -2500, -800, -21000);
omSetRot(object, 0, 125, 0); omSetRot(object, 0, 125, 0);
Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
object->func = fn_2_988C; object->func = fn_2_988C;
} }
} }
@ -2447,7 +2447,7 @@ void fn_2_99A4(omObjData *object)
omSetTra(object, 3000, temp_f31, -37000); omSetTra(object, 3000, temp_f31, -37000);
omSetRot(object, 0, 270, 0); omSetRot(object, 0, 270, 0);
Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
object->func = fn_2_9B90; object->func = fn_2_9B90;
lbl_2_bss_78.x = object->trans.x; lbl_2_bss_78.x = object->trans.x;
lbl_2_bss_78.y = object->trans.y; lbl_2_bss_78.y = object->trans.y;
@ -2490,7 +2490,7 @@ void fn_2_9D00(Process *objman)
for (temp_r30 = 0; temp_r30 < 2; temp_r30++) { for (temp_r30 = 0; temp_r30 < 2; temp_r30++) {
temp_r31->motion[temp_r30] = Hu3DJointMotionFile(temp_r31->model[0], lbl_2_data_42C[temp_r30]); temp_r31->motion[temp_r30] = Hu3DJointMotionFile(temp_r31->model[0], lbl_2_data_42C[temp_r30]);
} }
Hu3DModelAttrSet(temp_r31->model[0], 1); Hu3DModelAttrSet(temp_r31->model[0], HU3D_ATTR_DISPOFF);
temp_r31->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(WorkA318), MEMORY_DEFAULT_NUM); temp_r31->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(WorkA318), MEMORY_DEFAULT_NUM);
Hu3DModelShadowSet(temp_r31->model[0]); Hu3DModelShadowSet(temp_r31->model[0]);
temp_r31->work[3] = 1; temp_r31->work[3] = 1;
@ -2510,12 +2510,12 @@ void fn_2_9E28(float arg1, float arg2)
temp_f31 = arg1; temp_f31 = arg1;
for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { for (temp_r31 = 0; temp_r31 < 4; temp_r31++) {
temp_r30 = lbl_2_bss_E4[temp_r31]->data; temp_r30 = lbl_2_bss_E4[temp_r31]->data;
Hu3DModelAttrReset(lbl_2_bss_E4[temp_r31]->model[0], 1); Hu3DModelAttrReset(lbl_2_bss_E4[temp_r31]->model[0], HU3D_ATTR_DISPOFF);
temp_f29 = -400.0f + ((1.0f / 255.0f) * (800.0f * frandu8())); temp_f29 = -400.0f + ((1.0f / 255.0f) * (800.0f * frandu8()));
temp_r30->unk0.x = -250.0f + ((1.0f / 255.0f) * (500.0f * frandu8())); temp_r30->unk0.x = -250.0f + ((1.0f / 255.0f) * (500.0f * frandu8()));
omSetTra(lbl_2_bss_E4[temp_r31], temp_f29, temp_r30->unk0.x + lbl_2_bss_60.y, temp_f31); omSetTra(lbl_2_bss_E4[temp_r31], temp_f29, temp_r30->unk0.x + lbl_2_bss_60.y, temp_f31);
Hu3DMotionSet(lbl_2_bss_E4[temp_r31]->model[0], lbl_2_bss_E4[temp_r31]->motion[0]); Hu3DMotionSet(lbl_2_bss_E4[temp_r31]->model[0], lbl_2_bss_E4[temp_r31]->motion[0]);
Hu3DModelAttrSet(lbl_2_bss_E4[temp_r31]->model[0], 0x40000001); Hu3DModelAttrSet(lbl_2_bss_E4[temp_r31]->model[0], HU3D_MOTATTR_LOOP);
temp_f31 += temp_f30; temp_f31 += temp_f30;
temp_r30->unkC = (frand() % 30) + 30; temp_r30->unkC = (frand() % 30) + 30;
temp_r30->unk0.z = 0; temp_r30->unk0.z = 0;
@ -2583,7 +2583,7 @@ void fn_2_A318(omObjData *object)
temp_r30->unk0.z = 0; temp_r30->unk0.z = 0;
temp_r30->unkC = (frand() % 30) + 25; temp_r30->unkC = (frand() % 30) + 25;
Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
} }
} }
if (temp_r30->unk0.x < -300.0f) { if (temp_r30->unk0.x < -300.0f) {
@ -2600,7 +2600,7 @@ void fn_2_A318(omObjData *object)
} }
omSetTra(object, object->trans.x, temp_r30->unk0.x + lbl_2_bss_60.y, object->trans.z); omSetTra(object, object->trans.x, temp_r30->unk0.x + lbl_2_bss_60.y, object->trans.z);
if (object->trans.z > lbl_2_bss_6C.z - 160.0f) { if (object->trans.z > lbl_2_bss_6C.z - 160.0f) {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
object->func = NULL; object->func = NULL;
} }
} }
@ -2927,12 +2927,12 @@ void fn_2_CAB0(omObjData *object)
Hu3DGLightColorSet(lbl_2_bss_A8, temp_r28, temp_r28, temp_r28, 255); Hu3DGLightColorSet(lbl_2_bss_A8, temp_r28, temp_r28, temp_r28, 255);
if (lbl_2_bss_60.z < -26600.0f && lbl_2_bss_60.z > -27500.0f) { if (lbl_2_bss_60.z < -26600.0f && lbl_2_bss_60.z > -27500.0f) {
for (temp_r31 = 0; temp_r31 < 9; temp_r31++) { for (temp_r31 = 0; temp_r31 < 9; temp_r31++) {
Hu3DModelAttrSet(object->model[temp_r31], 1); Hu3DModelAttrSet(object->model[temp_r31], HU3D_ATTR_DISPOFF);
} }
} }
else { else {
for (temp_r31 = 0; temp_r31 < 9; temp_r31++) { for (temp_r31 = 0; temp_r31 < 9; temp_r31++) {
Hu3DModelAttrReset(object->model[temp_r31], 1); Hu3DModelAttrReset(object->model[temp_r31], HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -3082,8 +3082,8 @@ void fn_2_DBCC(s16 arg0)
} }
temp_f31 = 0.5f + ((1.0f / 255.0f) * (0.5f * frandu8())); temp_f31 = 0.5f + ((1.0f / 255.0f) * (0.5f * frandu8()));
Hu3DModelScaleSet(temp_r31->model[temp_r30], temp_f31, temp_f31, temp_f31); Hu3DModelScaleSet(temp_r31->model[temp_r30], temp_f31, temp_f31, temp_f31);
Hu3DModelAttrSet(temp_r31->model[temp_r30], 1); Hu3DModelAttrSet(temp_r31->model[temp_r30], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(temp_r31->model[temp_r30], 0x40000001); Hu3DModelAttrSet(temp_r31->model[temp_r30], HU3D_MOTATTR_LOOP);
Hu3DMotionTimeSet(temp_r31->model[temp_r30], (1.0f / 255.0f) * (Hu3DMotionMaxTimeGet(temp_r31->model[temp_r30]) * frandu8())); Hu3DMotionTimeSet(temp_r31->model[temp_r30], (1.0f / 255.0f) * (Hu3DMotionMaxTimeGet(temp_r31->model[temp_r30]) * frandu8()));
temp_r28[temp_r30] = 0; temp_r28[temp_r30] = 0;
} }
@ -3174,7 +3174,7 @@ void fn_2_E24C(omObjData *object)
temp_r28 = lbl_2_bss_C4->data; temp_r28 = lbl_2_bss_C4->data;
for (temp_r30 = 0; temp_r30 < temp_r31->unk0; temp_r30++) { for (temp_r30 = 0; temp_r30 < temp_r31->unk0; temp_r30++) {
temp_r28[temp_r31->unk30[temp_r30]] = 0; temp_r28[temp_r31->unk30[temp_r30]] = 0;
Hu3DModelAttrSet(object->model[temp_r30], 1); Hu3DModelAttrSet(object->model[temp_r30], HU3D_ATTR_DISPOFF);
} }
fn_2_DE1C(temp_r31); fn_2_DE1C(temp_r31);
omDelObjEx(HuPrcCurrentGet(), object); omDelObjEx(HuPrcCurrentGet(), object);
@ -3188,13 +3188,13 @@ void fn_2_E364(omObjData *object, s16 arg1)
WorkE6E8 *temp_r29 = object->data; WorkE6E8 *temp_r29 = object->data;
if (arg1 == 1) { if (arg1 == 1) {
for (temp_r31 = 0; temp_r31 < temp_r29->unk0; temp_r31++) { for (temp_r31 = 0; temp_r31 < temp_r29->unk0; temp_r31++) {
Hu3DModelAttrReset(object->model[temp_r31], 1); Hu3DModelAttrReset(object->model[temp_r31], HU3D_ATTR_DISPOFF);
} }
object->func = fn_2_E6E8; object->func = fn_2_E6E8;
} }
else { else {
for (temp_r31 = 0; temp_r31 < temp_r29->unk0; temp_r31++) { for (temp_r31 = 0; temp_r31 < temp_r29->unk0; temp_r31++) {
Hu3DModelAttrSet(object->model[temp_r31], 1); Hu3DModelAttrSet(object->model[temp_r31], HU3D_ATTR_DISPOFF);
} }
object->func = NULL; object->func = NULL;
} }

22
src/REL/m401Dll/main_ex.c
View file

@ -78,8 +78,8 @@ void fn_2_1041C(void)
lbl_2_bss_220[1][2] = lbl_2_bss_238; lbl_2_bss_220[1][2] = lbl_2_bss_238;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
lbl_2_bss_136[i] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x17)); lbl_2_bss_136[i] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x17));
Hu3DModelAttrSet(lbl_2_bss_136[i], 1); Hu3DModelAttrSet(lbl_2_bss_136[i], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_2_bss_136[i], 0x40000001); Hu3DModelAttrSet(lbl_2_bss_136[i], HU3D_MOTATTR_LOOP);
Hu3DModelScaleSet(lbl_2_bss_136[i], 1.5f, 1.5f, 1.0f); Hu3DModelScaleSet(lbl_2_bss_136[i], 1.5f, 1.5f, 1.0f);
Hu3DModelLayerSet(lbl_2_bss_136[i], 2); Hu3DModelLayerSet(lbl_2_bss_136[i], 2);
} }
@ -104,9 +104,9 @@ void fn_2_1079C(void)
lbl_2_bss_13E[i].unk2[0] = Hu3DParticleCreate(lbl_2_bss_250, 80); lbl_2_bss_13E[i].unk2[0] = Hu3DParticleCreate(lbl_2_bss_250, 80);
lbl_2_bss_13E[i].unk2[1] = Hu3DParticleCreate(lbl_2_bss_24C, 80); lbl_2_bss_13E[i].unk2[1] = Hu3DParticleCreate(lbl_2_bss_24C, 80);
lbl_2_bss_13E[i].unk2[2] = Hu3DParticleCreate(lbl_2_bss_248, 80); lbl_2_bss_13E[i].unk2[2] = Hu3DParticleCreate(lbl_2_bss_248, 80);
Hu3DModelAttrSet(lbl_2_bss_13E[i].unk2[0], 1); Hu3DModelAttrSet(lbl_2_bss_13E[i].unk2[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_2_bss_13E[i].unk2[1], 1); Hu3DModelAttrSet(lbl_2_bss_13E[i].unk2[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_2_bss_13E[i].unk2[2], 1); Hu3DModelAttrSet(lbl_2_bss_13E[i].unk2[2], HU3D_ATTR_DISPOFF);
} }
lbl_2_bss_134 = 0; lbl_2_bss_134 = 0;
} }
@ -118,7 +118,7 @@ s16 fn_2_108C8(void)
for (i = 0; i < 28; i++) { for (i = 0; i < 28; i++) {
if (!lbl_2_bss_13E[i].unk0) { if (!lbl_2_bss_13E[i].unk0) {
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
Hu3DModelAttrReset(lbl_2_bss_13E[i].unk2[j], 1); Hu3DModelAttrReset(lbl_2_bss_13E[i].unk2[j], HU3D_ATTR_DISPOFF);
} }
lbl_2_bss_13E[i].unk0 = 1; lbl_2_bss_13E[i].unk0 = 1;
return i; return i;
@ -132,7 +132,7 @@ void fn_2_10980(s16 arg0)
s32 i; s32 i;
lbl_2_bss_13E[arg0].unk0 = 0; lbl_2_bss_13E[arg0].unk0 = 0;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
Hu3DModelAttrSet(lbl_2_bss_13E[arg0].unk2[i], 1); Hu3DModelAttrSet(lbl_2_bss_13E[arg0].unk2[i], HU3D_ATTR_DISPOFF);
} }
} }
@ -189,7 +189,7 @@ omObjData *fn_2_10A88(Vec *arg0, s16 arg1)
Hu3DModelLayerSet(temp_r31->model[temp_r30], 1); Hu3DModelLayerSet(temp_r31->model[temp_r30], 1);
if (arg1 == 1) { if (arg1 == 1) {
temp_r31->unk10 = fn_2_10A08(); temp_r31->unk10 = fn_2_10A08();
Hu3DModelAttrReset(temp_r31->unk10, 1); Hu3DModelAttrReset(temp_r31->unk10, HU3D_ATTR_DISPOFF);
temp_r28->unk_44 = lbl_2_bss_220[1][temp_r30]; temp_r28->unk_44 = lbl_2_bss_220[1][temp_r30];
temp_r27->unk1C = 1.0f; temp_r27->unk1C = 1.0f;
temp_r31->work[3] = 45; temp_r31->work[3] = 45;
@ -382,7 +382,7 @@ void fn_2_113AC(omObjData *object)
} }
if (temp_r30->unk10 == 0) { if (temp_r30->unk10 == 0) {
if (object->unk10) { if (object->unk10) {
Hu3DModelAttrSet(object->unk10, 1); Hu3DModelAttrSet(object->unk10, HU3D_ATTR_DISPOFF);
} }
fn_2_10980(temp_r30->unk12); fn_2_10980(temp_r30->unk12);
omDelObjEx(HuPrcCurrentGet(), object); omDelObjEx(HuPrcCurrentGet(), object);
@ -413,7 +413,7 @@ void fn_2_118B0(omObjData *object)
if (temp_r30->unk10 == 0) { if (temp_r30->unk10 == 0) {
if (object->unk10) { if (object->unk10) {
Hu3DModelAttrSet(object->unk10, 1); Hu3DModelAttrSet(object->unk10, HU3D_ATTR_DISPOFF);
} }
fn_2_10980(temp_r30->unk12); fn_2_10980(temp_r30->unk12);
omDelObjEx(HuPrcCurrentGet(), object); omDelObjEx(HuPrcCurrentGet(), object);
@ -1059,7 +1059,7 @@ void fn_2_14738(omObjData *object)
{ {
omSetTra(object, lbl_2_bss_6C.x, lbl_2_bss_6C.y, lbl_2_bss_6C.z); omSetTra(object, lbl_2_bss_6C.x, lbl_2_bss_6C.y, lbl_2_bss_6C.z);
if (object->work[0] == 1) { if (object->work[0] == 1) {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
omDelObjEx(HuPrcCurrentGet(), object); omDelObjEx(HuPrcCurrentGet(), object);
} }
} }

494
src/REL/m402Dll/main.c
View file

File diff suppressed because it is too large Load diff

312
src/REL/m403Dll/main.c
View file

@ -1,5 +1,5 @@
#include "REL/m403Dll.h"
#include "REL/executor.h" #include "REL/executor.h"
#include "REL/m403Dll.h"
#include "game/audio.h" #include "game/audio.h"
#include "game/chrman.h" #include "game/chrman.h"
#include "game/data.h" #include "game/data.h"
@ -165,7 +165,8 @@ static Vec lbl_1_data_20_unused = { 0.0f, 4000.0f, -2000.0f };
static Vec lbl_1_data_2C_unused = { 0.0f, 1.0f, 0.0f }; static Vec lbl_1_data_2C_unused = { 0.0f, 1.0f, 0.0f };
static u8 lbl_1_data_38_unused[0xC] = { 0 }; static u8 lbl_1_data_38_unused[0xC] = { 0 };
void ObjectSetup(void) { void ObjectSetup(void)
{
LightData *var_r28; LightData *var_r28;
Process *temp_r31; Process *temp_r31;
omObjData *var_r29; omObjData *var_r29;
@ -218,12 +219,14 @@ void ObjectSetup(void) {
} }
} }
static void fn_1_424(omObjData *arg0) { static void fn_1_424(omObjData *arg0)
{
lbl_1_bss_30 = 0; lbl_1_bss_30 = 0;
arg0->func = fn_1_444; arg0->func = fn_1_444;
} }
static void fn_1_444(omObjData *arg0) { static void fn_1_444(omObjData *arg0)
{
Vec sp2C; Vec sp2C;
Vec sp20; Vec sp20;
Vec sp14; Vec sp14;
@ -296,18 +299,12 @@ static void fn_1_444(omObjData *arg0) {
static s32 lbl_1_data_68 = -1; static s32 lbl_1_data_68 = -1;
s32 lbl_1_data_6C[] = { s32 lbl_1_data_6C[] = { DATA_MAKE_NUM(DATADIR_MGCONST, 0), DATA_MAKE_NUM(DATADIR_MGCONST, 1), DATA_MAKE_NUM(DATADIR_MGCONST, 2),
DATA_MAKE_NUM(DATADIR_MGCONST, 0), DATA_MAKE_NUM(DATADIR_MGCONST, 3), DATA_MAKE_NUM(DATADIR_MGCONST, 4), DATA_MAKE_NUM(DATADIR_MGCONST, 5), DATA_MAKE_NUM(DATADIR_MGCONST, 6),
DATA_MAKE_NUM(DATADIR_MGCONST, 1), DATA_MAKE_NUM(DATADIR_MGCONST, 7) };
DATA_MAKE_NUM(DATADIR_MGCONST, 2),
DATA_MAKE_NUM(DATADIR_MGCONST, 3),
DATA_MAKE_NUM(DATADIR_MGCONST, 4),
DATA_MAKE_NUM(DATADIR_MGCONST, 5),
DATA_MAKE_NUM(DATADIR_MGCONST, 6),
DATA_MAKE_NUM(DATADIR_MGCONST, 7)
};
static void fn_1_82C(omObjData *arg0) { static void fn_1_82C(omObjData *arg0)
{
Vec sp1C; Vec sp1C;
Vec sp10; Vec sp10;
float var_f31; float var_f31;
@ -323,7 +320,8 @@ static void fn_1_82C(omObjData *arg0) {
lbl_1_bss_2A = 1800; lbl_1_bss_2A = 1800;
lbl_1_bss_2C = MGSeqStartCreate(); lbl_1_bss_2C = MGSeqStartCreate();
MGSeqPosSet(lbl_1_bss_2C, 320.0f, 240.0f); MGSeqPosSet(lbl_1_bss_2C, 320.0f, 240.0f);
} else if (MGSeqStatGet(lbl_1_bss_2C) == 0) { }
else if (MGSeqStatGet(lbl_1_bss_2C) == 0) {
lbl_1_bss_2C = -1; lbl_1_bss_2C = -1;
lbl_1_bss_30++; lbl_1_bss_30++;
lbl_1_bss_28 = 0; lbl_1_bss_28 = 0;
@ -357,10 +355,11 @@ static void fn_1_82C(omObjData *arg0) {
case 6: case 6:
var_r29 = 0; var_r29 = 0;
if (lbl_1_bss_2 != 0) { if (lbl_1_bss_2 != 0) {
if (((Unkm403Struct_01*) lbl_1_bss_34[lbl_1_bss_4]->data)->unk07 == 0 && fn_1_8264() == 0) { if (((Unkm403Struct_01 *)lbl_1_bss_34[lbl_1_bss_4]->data)->unk07 == 0 && fn_1_8264() == 0) {
var_r29++; var_r29++;
} }
} else if (lbl_1_data_0 <= 1 && fn_1_8264() == 0) { }
else if (lbl_1_data_0 <= 1 && fn_1_8264() == 0) {
var_r29++; var_r29++;
} }
if (lbl_1_bss_2 != 0) { if (lbl_1_bss_2 != 0) {
@ -384,7 +383,7 @@ static void fn_1_82C(omObjData *arg0) {
if (lbl_1_bss_2 == 0) { if (lbl_1_bss_2 == 0) {
if (lbl_1_data_0 != 0) { if (lbl_1_data_0 != 0) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (((Unkm403Struct_01*) lbl_1_bss_34[i]->data)->unk07 != 0) { if (((Unkm403Struct_01 *)lbl_1_bss_34[i]->data)->unk07 != 0) {
break; break;
} }
} }
@ -432,12 +431,13 @@ static void fn_1_82C(omObjData *arg0) {
if (lbl_1_data_0 == 0) { if (lbl_1_data_0 == 0) {
lbl_1_bss_2C = MGSeqDrawCreate(); lbl_1_bss_2C = MGSeqDrawCreate();
HuAudSStreamPlay(4); HuAudSStreamPlay(4);
} else { }
else {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
sp8[i] = -1; sp8[i] = -1;
} }
for (i = 0, var_r27 = 0; i < 4; i++) { for (i = 0, var_r27 = 0; i < 4; i++) {
if (((Unkm403Struct_01*) lbl_1_bss_34[i]->data)->unk07 != 0) { if (((Unkm403Struct_01 *)lbl_1_bss_34[i]->data)->unk07 != 0) {
GWPlayerCoinWinAdd(i, 10); GWPlayerCoinWinAdd(i, 10);
sp8[var_r27++] = GWPlayerCfg[i].character; sp8[var_r27++] = GWPlayerCfg[i].character;
} }
@ -463,7 +463,8 @@ static void fn_1_82C(omObjData *arg0) {
} }
} }
static void fn_1_1214(omObjData *arg0) { static void fn_1_1214(omObjData *arg0)
{
if (WipeStatGet() == 0) { if (WipeStatGet() == 0) {
fn_1_676C(); fn_1_676C();
CharModelKill(-1); CharModelKill(-1);
@ -474,7 +475,8 @@ static void fn_1_1214(omObjData *arg0) {
} }
} }
static void fn_1_1274(omObjData *arg0) { static void fn_1_1274(omObjData *arg0)
{
Hu3DLightAllKill(); Hu3DLightAllKill();
lbl_1_bss_18[0] = Hu3DGLightCreateV(&lbl_1_data_4, &lbl_1_data_10, &lbl_1_data_1C); lbl_1_bss_18[0] = Hu3DGLightCreateV(&lbl_1_data_4, &lbl_1_data_10, &lbl_1_data_1C);
Hu3DGLightStaticSet(lbl_1_bss_18[0], 1); Hu3DGLightStaticSet(lbl_1_bss_18[0], 1);
@ -489,7 +491,8 @@ static void fn_1_1274(omObjData *arg0) {
arg0->func = fn_1_1460; arg0->func = fn_1_1460;
} }
static void fn_1_1460(omObjData *arg0) { static void fn_1_1460(omObjData *arg0)
{
s8 sp11[] = { 1, 0, 2, 1, 0, 3, 2, 1, 0 }; s8 sp11[] = { 1, 0, 2, 1, 0, 3, 2, 1, 0 };
s8 sp8[] = { 1, 1, 2, 2, 2, 3, 3, 3, 3 }; s8 sp8[] = { 1, 1, 2, 2, 2, 3, 3, 3, 3 };
s32 var_r30; s32 var_r30;
@ -538,7 +541,8 @@ static void fn_1_1460(omObjData *arg0) {
} }
} }
static void fn_1_16D8(omObjData *arg0) { static void fn_1_16D8(omObjData *arg0)
{
Unkm403Struct_00 *temp_r3; Unkm403Struct_00 *temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(*temp_r3), MEMORY_DEFAULT_NUM); temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(*temp_r3), MEMORY_DEFAULT_NUM);
@ -555,7 +559,8 @@ static void fn_1_16D8(omObjData *arg0) {
arg0->func = fn_1_17DC; arg0->func = fn_1_17DC;
} }
static void fn_1_17DC(omObjData *arg0) { static void fn_1_17DC(omObjData *arg0)
{
Unkm403Struct_00 *temp_r31; Unkm403Struct_00 *temp_r31;
float temp_f31; float temp_f31;
@ -572,7 +577,8 @@ static void fn_1_17DC(omObjData *arg0) {
temp_r31->unk10.y = temp_r31->unk28.y + temp_f31 * (temp_r31->unk40.y - temp_r31->unk28.y); temp_r31->unk10.y = temp_r31->unk28.y + temp_f31 * (temp_r31->unk40.y - temp_r31->unk28.y);
temp_r31->unk10.z = temp_r31->unk28.z + temp_f31 * (temp_r31->unk40.z - temp_r31->unk28.z); temp_r31->unk10.z = temp_r31->unk28.z + temp_f31 * (temp_r31->unk40.z - temp_r31->unk28.z);
temp_r31->unk130 = temp_r31->unk134 + temp_f31 * (temp_r31->unk138 - temp_r31->unk134); temp_r31->unk130 = temp_r31->unk134 + temp_f31 * (temp_r31->unk138 - temp_r31->unk134);
} else { }
else {
fn_1_57E0(2.0f * temp_f31, &temp_r31->unk04, temp_r31->unkF4, &temp_r31->unk64, temp_r31->unk88, 3); fn_1_57E0(2.0f * temp_f31, &temp_r31->unk04, temp_r31->unkF4, &temp_r31->unk64, temp_r31->unk88, 3);
fn_1_57E0(2.0f * temp_f31, &temp_r31->unk10, temp_r31->unk100, &temp_r31->unkAC, temp_r31->unkD0, 3); fn_1_57E0(2.0f * temp_f31, &temp_r31->unk10, temp_r31->unk100, &temp_r31->unkAC, temp_r31->unkD0, 3);
temp_r31->unk130 = fn_1_52AC(2.0f * temp_f31, temp_r31->unk124, temp_r31->unk10C, temp_r31->unk118, 3); temp_r31->unk130 = fn_1_52AC(2.0f * temp_f31, temp_r31->unk124, temp_r31->unk10C, temp_r31->unk118, 3);
@ -587,7 +593,8 @@ static void fn_1_17DC(omObjData *arg0) {
CZoom = temp_r31->unk130; CZoom = temp_r31->unk130;
} }
static void fn_1_1A50(float arg0, Vec *arg1, Vec *arg2, float arg3) { static void fn_1_1A50(float arg0, Vec *arg1, Vec *arg2, float arg3)
{
Unkm403Struct_00 *temp_r31; Unkm403Struct_00 *temp_r31;
temp_r31 = lbl_1_bss_48->data; temp_r31 = lbl_1_bss_48->data;
@ -606,7 +613,8 @@ static void fn_1_1A50(float arg0, Vec *arg1, Vec *arg2, float arg3) {
temp_r31->unk138 = arg3; temp_r31->unk138 = arg3;
} }
static void fn_1_1AF0(float arg0, Vec *arg1, Vec *arg2, float arg3, Vec *arg4, Vec *arg5, float arg6) { static void fn_1_1AF0(float arg0, Vec *arg1, Vec *arg2, float arg3, Vec *arg4, Vec *arg5, float arg6)
{
Unkm403Struct_00 *temp_r31; Unkm403Struct_00 *temp_r31;
temp_r31 = lbl_1_bss_48->data; temp_r31 = lbl_1_bss_48->data;
@ -646,37 +654,26 @@ static void fn_1_1AF0(float arg0, Vec *arg1, Vec *arg2, float arg3, Vec *arg4, V
fn_1_4FF4(temp_r31->unk124, temp_r31->unk10C, temp_r31->unk118, 3); fn_1_4FF4(temp_r31->unk124, temp_r31->unk10C, temp_r31->unk118, 3);
} }
static void fn_1_1DA8(float arg0) { static void fn_1_1DA8(float arg0)
{
Unkm403Struct_00 *temp_r31; Unkm403Struct_00 *temp_r31;
temp_r31 = lbl_1_bss_48->data; temp_r31 = lbl_1_bss_48->data;
temp_r31->unk140 = arg0; temp_r31->unk140 = arg0;
} }
static s32 lbl_1_data_C4[] = { static s32 lbl_1_data_C4[] = { 0, 2, 3, 8, 10, 9, 23, 24 };
0, 2, 3, 8, 10, 9, 23, 24
};
static Vec lbl_1_data_E4[] = { static Vec lbl_1_data_E4[] = { { -300.0f, 2200.0f, 0.0f }, { -100.0f, 2200.0f, 0.0f }, { 100.0f, 2200.0f, 0.0f }, { 300.0f, 2200.0f, 0.0f } };
{ -300.0f, 2200.0f, 0.0f },
{ -100.0f, 2200.0f, 0.0f },
{ 100.0f, 2200.0f, 0.0f },
{ 300.0f, 2200.0f, 0.0f }
};
static float lbl_1_data_114[] = { static float lbl_1_data_114[] = { 40.0f, 40.0f, 40.0f, 40.0f, 40.0f, 100.0f, 40.0f, 80.0f };
40.0f, 40.0f, 40.0f, 40.0f,
40.0f, 100.0f, 40.0f, 80.0f
};
static float lbl_1_data_134[] = { static float lbl_1_data_134[] = { 160.0f, 160.0f, 180.0f, 160.0f, 160.0f, 180.0f, 180.0f, 200.0f };
160.0f, 160.0f, 180.0f, 160.0f,
160.0f, 180.0f, 180.0f, 200.0f
};
static u32 lbl_1_data_154 = 0x41C64E6D; static u32 lbl_1_data_154 = 0x41C64E6D;
static void fn_1_1DD0(omObjData *arg0) { static void fn_1_1DD0(omObjData *arg0)
{
Unkm403Struct_01 *temp_r3; Unkm403Struct_01 *temp_r3;
s32 temp_r27; s32 temp_r27;
s32 i; s32 i;
@ -715,7 +712,7 @@ static void fn_1_1DD0(omObjData *arg0) {
} }
temp_r28 = CharModelCreate(temp_r3->unk01, 4); temp_r28 = CharModelCreate(temp_r3->unk01, 4);
arg0->model[0] = temp_r28; arg0->model[0] = temp_r28;
Hu3DModelAttrSet(temp_r28, 0x40000001); Hu3DModelAttrSet(temp_r28, HU3D_MOTATTR_LOOP);
Hu3DModelShadowSet(temp_r28); Hu3DModelShadowSet(temp_r28);
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
arg0->motion[i] = CharModelMotionCreate(temp_r3->unk01, lbl_1_data_C4[i]); arg0->motion[i] = CharModelMotionCreate(temp_r3->unk01, lbl_1_data_C4[i]);
@ -730,7 +727,8 @@ static void fn_1_1DD0(omObjData *arg0) {
arg0->func = fn_1_2158; arg0->func = fn_1_2158;
} }
static void fn_1_2158(omObjData *arg0) { static void fn_1_2158(omObjData *arg0)
{
Unkm403Struct_01 *temp_r31; Unkm403Struct_01 *temp_r31;
s32 sp8; s32 sp8;
@ -747,9 +745,9 @@ static void fn_1_2158(omObjData *arg0) {
} }
/* fallthrough */ /* fallthrough */
case 1: case 1:
temp_r31->unk18 = 3; temp_r31->unk18 = 3;
temp_r31->unk48 = 0.0f; temp_r31->unk48 = 0.0f;
temp_r31->unk0C = 0; temp_r31->unk0C = 0;
break; break;
case 5: case 5:
arg0->func = fn_1_22A4; arg0->func = fn_1_22A4;
@ -763,7 +761,8 @@ static void fn_1_2158(omObjData *arg0) {
fn_1_2FDC(arg0); fn_1_2FDC(arg0);
} }
static void fn_1_22A4(omObjData *arg0) { static void fn_1_22A4(omObjData *arg0)
{
Unkm403Struct_01 *temp_r31; Unkm403Struct_01 *temp_r31;
s32 temp_r29; s32 temp_r29;
s32 temp_r28; s32 temp_r28;
@ -774,13 +773,15 @@ static void fn_1_22A4(omObjData *arg0) {
if (lbl_1_bss_30 == 6 && !(temp_r31->unk07 & 2)) { if (lbl_1_bss_30 == 6 && !(temp_r31->unk07 & 2)) {
if (temp_r31->unk05 != 0) { if (temp_r31->unk05 != 0) {
fn_1_2598(arg0); fn_1_2598(arg0);
} else { }
else {
temp_r31->unk10 = HuPadStkX[temp_r31->unk04]; temp_r31->unk10 = HuPadStkX[temp_r31->unk04];
temp_r31->unk12 = HuPadStkY[temp_r31->unk04]; temp_r31->unk12 = HuPadStkY[temp_r31->unk04];
temp_r31->unk14 = HuPadBtnDown[temp_r31->unk04]; temp_r31->unk14 = HuPadBtnDown[temp_r31->unk04];
temp_r31->unk16 = HuPadBtn[temp_r31->unk04]; temp_r31->unk16 = HuPadBtn[temp_r31->unk04];
} }
} else { }
else {
temp_r31->unk10 = temp_r31->unk12 = 0; temp_r31->unk10 = temp_r31->unk12 = 0;
temp_r31->unk14 = temp_r31->unk16 = 0; temp_r31->unk14 = temp_r31->unk16 = 0;
} }
@ -807,7 +808,7 @@ static void fn_1_22A4(omObjData *arg0) {
HuAudFXPlay(0x523); HuAudFXPlay(0x523);
temp_r31->unk07 = 0; temp_r31->unk07 = 0;
Hu3DModelShadowReset(temp_r29); Hu3DModelShadowReset(temp_r29);
Hu3DModelAttrSet(temp_r29, 1); Hu3DModelAttrSet(temp_r29, HU3D_ATTR_DISPOFF);
lbl_1_data_0--; lbl_1_data_0--;
temp_r28 = fn_1_400C(DATA_MAKE_NUM(DATADIR_M403, 19), 100, fn_1_40A8); temp_r28 = fn_1_400C(DATA_MAKE_NUM(DATADIR_M403, 19), 100, fn_1_40A8);
Hu3DModelPosSet(temp_r28, temp_r31->unk2C.x, temp_r31->unk2C.y, temp_r31->unk2C.z); Hu3DModelPosSet(temp_r28, temp_r31->unk2C.x, temp_r31->unk2C.y, temp_r31->unk2C.z);
@ -816,7 +817,8 @@ static void fn_1_22A4(omObjData *arg0) {
} }
if (fn_1_8264() != 0) { if (fn_1_8264() != 0) {
temp_r31->unkA0 = 0; temp_r31->unkA0 = 0;
} else if (!(temp_r31->unk07 & 2) && temp_r31->unkA0 == 0) { }
else if (!(temp_r31->unk07 & 2) && temp_r31->unkA0 == 0) {
omVibrate(temp_r31->unk00, 12, 6, 6); omVibrate(temp_r31->unk00, 12, 6, 6);
temp_r31->unkA0 = 1; temp_r31->unkA0 = 1;
} }
@ -824,7 +826,8 @@ static void fn_1_22A4(omObjData *arg0) {
} }
} }
static void fn_1_2598(omObjData *arg0) { static void fn_1_2598(omObjData *arg0)
{
Vec sp38[6]; Vec sp38[6];
Vec sp14; Vec sp14;
Vec sp8; Vec sp8;
@ -867,7 +870,7 @@ static void fn_1_2598(omObjData *arg0) {
break; break;
case 1: case 1:
temp_r31->unk5C = 2; temp_r31->unk5C = 2;
temp_r31->unk5E = (s32) (60.0f * (1.2f - 0.2f * temp_r28) * (fn_1_4528() / 65536.0f)); temp_r31->unk5E = (s32)(60.0f * (1.2f - 0.2f * temp_r28) * (fn_1_4528() / 65536.0f));
temp_r31->unk60 = 500.0f * ((fn_1_4528() - 0x8000) / 32768.0f); temp_r31->unk60 = 500.0f * ((fn_1_4528() - 0x8000) / 32768.0f);
temp_r31->unk64 = 200.0f * ((fn_1_4528() - 0x8000) / 32768.0f); temp_r31->unk64 = 200.0f * ((fn_1_4528() - 0x8000) / 32768.0f);
var_r27 = temp_r31->unk10; var_r27 = temp_r31->unk10;
@ -880,10 +883,12 @@ static void fn_1_2598(omObjData *arg0) {
var_f31 = fn_1_59F4(&sp8); var_f31 = fn_1_59F4(&sp8);
if (var_f31 < 20.0f) { if (var_f31 < 20.0f) {
temp_r31->unk5C = 3; temp_r31->unk5C = 3;
} else { }
else {
if (var_f31 >= 100.0f) { if (var_f31 >= 100.0f) {
var_f28 = 0.8f; var_f28 = 0.8f;
} else { }
else {
var_f28 = 0.4f; var_f28 = 0.4f;
} }
var_f30 = fn_1_457C(temp_r31->unk3C, atan2d(sp8.x, sp8.z), var_f28); var_f30 = fn_1_457C(temp_r31->unk3C, atan2d(sp8.x, sp8.z), var_f28);
@ -895,16 +900,20 @@ static void fn_1_2598(omObjData *arg0) {
if (temp_r31->unk5E == 0) { if (temp_r31->unk5E == 0) {
temp_r31->unk5E = -1; temp_r31->unk5E = -1;
} }
} else if (temp_r31->unk5E >= 0) { }
else if (temp_r31->unk5E >= 0) {
if (temp_r31->unk5E == 0) { if (temp_r31->unk5E == 0) {
if (var_f31 < 150.0f && temp_r31->unk0E != 0) { if (var_f31 < 150.0f && temp_r31->unk0E != 0) {
temp_r31->unk5C = 3; temp_r31->unk5C = 3;
} else if ((s32) ((temp_r28 + 2) * (fn_1_4528() / 65536.0f)) != 0 && var_r22 == 0) { }
else if ((s32)((temp_r28 + 2) * (fn_1_4528() / 65536.0f)) != 0 && var_r22 == 0) {
temp_r31->unk5C = 4; temp_r31->unk5C = 4;
} else { }
else {
temp_r31->unk5C = 1; temp_r31->unk5C = 1;
} }
} else { }
else {
temp_r31->unk5E--; temp_r31->unk5E--;
} }
} }
@ -916,16 +925,19 @@ static void fn_1_2598(omObjData *arg0) {
sp8.z = temp_r31->unk64 - temp_r31->unk2C.z; sp8.z = temp_r31->unk64 - temp_r31->unk2C.z;
if (fn_1_59F4(&sp8) >= 30.000002f && temp_r31->unk0E == 0) { if (fn_1_59F4(&sp8) >= 30.000002f && temp_r31->unk0E == 0) {
temp_r31->unk5C = 2; temp_r31->unk5C = 2;
} else if (fn_1_8264() == 0) { }
else if (fn_1_8264() == 0) {
temp_r31->unk5C = 0; temp_r31->unk5C = 0;
} else { }
else {
if (temp_r31->unk5E > 0) { if (temp_r31->unk5E > 0) {
temp_r31->unk5E--; temp_r31->unk5E--;
} }
if (temp_r31->unk5E == 0) { if (temp_r31->unk5E == 0) {
if ((s32) ((temp_r28 + 2) * (fn_1_4528() / 65536.0f)) != 0 && var_r22 == 0) { if ((s32)((temp_r28 + 2) * (fn_1_4528() / 65536.0f)) != 0 && var_r22 == 0) {
temp_r31->unk5C = 4; temp_r31->unk5C = 4;
} else { }
else {
temp_r31->unk5C = 1; temp_r31->unk5C = 1;
} }
} }
@ -972,7 +984,8 @@ static void fn_1_2598(omObjData *arg0) {
temp_r31->unk16 = var_r20; temp_r31->unk16 = var_r20;
} }
static void fn_1_2FDC(omObjData *arg0) { static void fn_1_2FDC(omObjData *arg0)
{
float var_f29; float var_f29;
Unkm403Struct_01 *temp_r31; Unkm403Struct_01 *temp_r31;
s32 temp_r25; s32 temp_r25;
@ -1000,7 +1013,8 @@ static void fn_1_2FDC(omObjData *arg0) {
if (temp_r31->unk1C >= 6.0f) { if (temp_r31->unk1C >= 6.0f) {
var_r28 = 2; var_r28 = 2;
var_r27 = 1; var_r27 = 1;
} else { }
else {
var_r28 = 1; var_r28 = 1;
var_r27 = 1; var_r27 = 1;
} }
@ -1012,7 +1026,8 @@ static void fn_1_2FDC(omObjData *arg0) {
temp_r31->unk24 -= 0.5f * temp_r31->unk28; temp_r31->unk24 -= 0.5f * temp_r31->unk28;
} }
temp_r31->unk1C *= 1.0 + 0.25 * cosd(90.0f * (temp_r31->unk24 / (0.5f * temp_r31->unk28))); temp_r31->unk1C *= 1.0 + 0.25 * cosd(90.0f * (temp_r31->unk24 / (0.5f * temp_r31->unk28)));
} else { }
else {
temp_r31->unk24 = 0.0f; temp_r31->unk24 = 0.0f;
temp_r31->unk1C = 0.0f; temp_r31->unk1C = 0.0f;
var_r28 = 0; var_r28 = 0;
@ -1024,7 +1039,8 @@ static void fn_1_2FDC(omObjData *arg0) {
var_r27 = 0; var_r27 = 0;
if (Hu3DData[temp_r25].unk_0C == -1 && CharModelMotionEndCheck(temp_r31->unk01)) { if (Hu3DData[temp_r25].unk_0C == -1 && CharModelMotionEndCheck(temp_r31->unk01)) {
temp_r31->unk48 += -2.4333334f; temp_r31->unk48 += -2.4333334f;
} else { }
else {
temp_r31->unk48 = 0.0f; temp_r31->unk48 = 0.0f;
} }
if (temp_r31->unk0C != 0) { if (temp_r31->unk0C != 0) {
@ -1033,7 +1049,8 @@ static void fn_1_2FDC(omObjData *arg0) {
temp_r31->unk0D = 0; temp_r31->unk0D = 0;
var_r28 = 5; var_r28 = 5;
var_r27 = 0; var_r27 = 0;
} else { }
else {
temp_r31->unk48 *= -0.1f; temp_r31->unk48 *= -0.1f;
temp_r31->unk0C = 0; temp_r31->unk0C = 0;
var_r28 = 4; var_r28 = 4;
@ -1062,9 +1079,10 @@ static void fn_1_2FDC(omObjData *arg0) {
} }
if (temp_r31->unk07 & 4) { if (temp_r31->unk07 & 4) {
if (temp_r31->unk0A & 2) { if (temp_r31->unk0A & 2) {
Hu3DModelAttrSet(temp_r25, 1); Hu3DModelAttrSet(temp_r25, HU3D_ATTR_DISPOFF);
} else { }
Hu3DModelAttrReset(temp_r25, 1); else {
Hu3DModelAttrReset(temp_r25, HU3D_ATTR_DISPOFF);
} }
if (--temp_r31->unk0A == 0) { if (--temp_r31->unk0A == 0) {
temp_r31->unk07 &= ~4; temp_r31->unk07 &= ~4;
@ -1087,7 +1105,8 @@ static void fn_1_2FDC(omObjData *arg0) {
omSetRot(arg0, temp_r31->unk38, temp_r31->unk3C, temp_r31->unk40); omSetRot(arg0, temp_r31->unk38, temp_r31->unk3C, temp_r31->unk40);
} }
static void fn_1_3800(void) { static void fn_1_3800(void)
{
s32 var_r29; s32 var_r29;
s32 i; s32 i;
Unkm403Struct_01 *temp_r30; Unkm403Struct_01 *temp_r30;
@ -1104,13 +1123,14 @@ static void fn_1_3800(void) {
} }
} }
static s32 fn_1_3894(void) { static s32 fn_1_3894(void)
{
Vec sp14[4]; Vec sp14[4];
Vec sp8; Vec sp8;
float var_f31; float var_f31;
float var_f30; float var_f30;
s32 var_r26; s32 var_r26;
omObjData* temp_r25; omObjData *temp_r25;
Unkm403Struct_01 *temp_r28; Unkm403Struct_01 *temp_r28;
Unkm403Struct_01 *temp_r27; Unkm403Struct_01 *temp_r27;
Unkm403Struct_01 *temp_r31; Unkm403Struct_01 *temp_r31;
@ -1166,7 +1186,8 @@ static s32 fn_1_3894(void) {
return var_r26; return var_r26;
} }
static void fn_1_3B80(omObjData *arg0) { static void fn_1_3B80(omObjData *arg0)
{
s32 sp8[4]; s32 sp8[4];
s32 var_r30; s32 var_r30;
s32 i; s32 i;
@ -1178,22 +1199,24 @@ static void fn_1_3B80(omObjData *arg0) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
fn_1_3E4C(lbl_1_bss_34[i]); fn_1_3E4C(lbl_1_bss_34[i]);
} }
} else { }
else {
for (i = 0, var_r30 = 0; i < 4; i++) { for (i = 0, var_r30 = 0; i < 4; i++) {
((Unkm403Struct_01*) lbl_1_bss_34[i]->data)->unk9C = 0; ((Unkm403Struct_01 *)lbl_1_bss_34[i]->data)->unk9C = 0;
if (((Unkm403Struct_01*) lbl_1_bss_34[i]->data)->unk07 != 0) { if (((Unkm403Struct_01 *)lbl_1_bss_34[i]->data)->unk07 != 0) {
sp8[var_r30++] = i; sp8[var_r30++] = i;
} }
} }
if (var_r30 != 0) { if (var_r30 != 0) {
i = sp8[(s32) (var_r30 * (fn_1_4528() / 65536.0f))]; i = sp8[(s32)(var_r30 * (fn_1_4528() / 65536.0f))];
((Unkm403Struct_01*) lbl_1_bss_34[i]->data)->unk9C = 1; ((Unkm403Struct_01 *)lbl_1_bss_34[i]->data)->unk9C = 1;
} }
} }
fn_1_3800(); fn_1_3800();
} }
static void fn_1_3D6C(Vec *arg0, Vec *arg1) { static void fn_1_3D6C(Vec *arg0, Vec *arg1)
{
Vec sp18[6]; Vec sp18[6];
Vec spC; Vec spC;
float var_f31; float var_f31;
@ -1214,7 +1237,8 @@ static void fn_1_3D6C(Vec *arg0, Vec *arg1) {
} }
} }
static void fn_1_3E4C(omObjData *arg0) { static void fn_1_3E4C(omObjData *arg0)
{
Vec sp8; Vec sp8;
float var_f30; float var_f30;
float var_f31; float var_f31;
@ -1232,14 +1256,16 @@ static void fn_1_3E4C(omObjData *arg0) {
if (fn_1_86A0(&temp_r31->unk2C, &sp8) != 0) { if (fn_1_86A0(&temp_r31->unk2C, &sp8) != 0) {
temp_r31->unk2C.x = sp8.x; temp_r31->unk2C.x = sp8.x;
temp_r31->unk2C.z = sp8.z; temp_r31->unk2C.z = sp8.z;
} else { }
else {
if (fn_1_7F78(temp_r31->unk2C.x, temp_r31->unk2C.z) - 10.0f < 100.0f) { if (fn_1_7F78(temp_r31->unk2C.x, temp_r31->unk2C.z) - 10.0f < 100.0f) {
temp_r31->unk07 |= 2; temp_r31->unk07 |= 2;
} }
var_f31 = var_f30 / lbl_1_data_134[temp_r31->unk01]; var_f31 = var_f30 / lbl_1_data_134[temp_r31->unk01];
} }
} }
} else { }
else {
var_f31 = var_f30 / lbl_1_data_134[temp_r31->unk01]; var_f31 = var_f30 / lbl_1_data_134[temp_r31->unk01];
} }
if (arg0->scale.y < var_f31) { if (arg0->scale.y < var_f31) {
@ -1249,7 +1275,8 @@ static void fn_1_3E4C(omObjData *arg0) {
} }
} }
static s16 fn_1_400C(s32 arg0, s16 arg1, ParticleHook arg2) { static s16 fn_1_400C(s32 arg0, s16 arg1, ParticleHook arg2)
{
AnimData *var_r29; AnimData *var_r29;
ParticleData *temp_r31; ParticleData *temp_r31;
s32 temp_r30; s32 temp_r30;
@ -1263,7 +1290,8 @@ static s16 fn_1_400C(s32 arg0, s16 arg1, ParticleHook arg2) {
return temp_r30; return temp_r30;
} }
static void fn_1_40A8(ModelData *model, ParticleData *particle, Mtx matrix) { static void fn_1_40A8(ModelData *model, ParticleData *particle, Mtx matrix)
{
float temp_f31; float temp_f31;
float temp_f30; float temp_f30;
float temp_f29; float temp_f29;
@ -1311,47 +1339,55 @@ static void fn_1_40A8(ModelData *model, ParticleData *particle, Mtx matrix) {
DCFlushRange(particle->unk_48, particle->unk_30 * sizeof(HsfanimStruct01)); DCFlushRange(particle->unk_48, particle->unk_30 * sizeof(HsfanimStruct01));
} }
static s32 fn_1_4528(void) { static s32 fn_1_4528(void)
{
lbl_1_data_154 *= 0x41C64E6D; lbl_1_data_154 *= 0x41C64E6D;
lbl_1_data_154 += 0x3039; lbl_1_data_154 += 0x3039;
return lbl_1_data_154 >> 16; return lbl_1_data_154 >> 16;
} }
static float fn_1_457C(float arg0, float arg1, float arg2) { static float fn_1_457C(float arg0, float arg1, float arg2)
{
float var_f31; float var_f31;
if (arg0 > 180.0f) { if (arg0 > 180.0f) {
arg0 -= 360.0f; arg0 -= 360.0f;
} else if (arg0 <= -180.0f) { }
else if (arg0 <= -180.0f) {
arg0 += 360.0f; arg0 += 360.0f;
} }
if (arg1 > 180.0f) { if (arg1 > 180.0f) {
arg1 -= 360.0f; arg1 -= 360.0f;
} else if (arg1 <= -180.0f) { }
else if (arg1 <= -180.0f) {
arg1 += 360.0f; arg1 += 360.0f;
} }
var_f31 = arg0 - arg1; var_f31 = arg0 - arg1;
if (var_f31 > 180.0f) { if (var_f31 > 180.0f) {
var_f31 -= 360.0f; var_f31 -= 360.0f;
} else if (var_f31 <= -180.0f) { }
else if (var_f31 <= -180.0f) {
var_f31 += 360.0f; var_f31 += 360.0f;
} }
arg0 = arg1 + var_f31 * arg2; arg0 = arg1 + var_f31 * arg2;
if (arg0 > 180.0f) { if (arg0 > 180.0f) {
arg0 -= 360.0f; arg0 -= 360.0f;
} else if (arg0 <= -180.0f) { }
else if (arg0 <= -180.0f) {
arg0 += 360.0f; arg0 += 360.0f;
} }
return arg0; return arg0;
} }
static void fn_1_46E4(Mtx arg0, float arg1, float arg2, float arg3) { static void fn_1_46E4(Mtx arg0, float arg1, float arg2, float arg3)
{
Mtx sp38; Mtx sp38;
Mtx sp8; Mtx sp8;
if (arg3 != 0.0f) { if (arg3 != 0.0f) {
PSMTXRotRad(arg0, 'Z', MTXDegToRad(arg3)); PSMTXRotRad(arg0, 'Z', MTXDegToRad(arg3));
} else { }
else {
PSMTXIdentity(arg0); PSMTXIdentity(arg0);
} }
if (arg1 != 0.0f) { if (arg1 != 0.0f) {
@ -1364,7 +1400,8 @@ static void fn_1_46E4(Mtx arg0, float arg1, float arg2, float arg3) {
} }
} }
static void fn_1_4804(float *arg0, float *arg1) { static void fn_1_4804(float *arg0, float *arg1)
{
float temp_f29; float temp_f29;
float var_f28; float var_f28;
double var_f30; double var_f30;
@ -1374,7 +1411,8 @@ static void fn_1_4804(float *arg0, float *arg1) {
temp_f29 = -arg0[2]; temp_f29 = -arg0[2];
if (1.0 - temp_f29 * temp_f29 < 0.0) { if (1.0 - temp_f29 * temp_f29 < 0.0) {
var_f30 = -(1.0 - temp_f29 * temp_f29); var_f30 = -(1.0 - temp_f29 * temp_f29);
} else { }
else {
var_f30 = 1.0 - temp_f29 * temp_f29; var_f30 = 1.0 - temp_f29 * temp_f29;
} }
var_f28 = sqrtf(var_f30); var_f28 = sqrtf(var_f30);
@ -1386,7 +1424,8 @@ static void fn_1_4804(float *arg0, float *arg1) {
arg1[1] = atan2d(var_f28, temp_f29); arg1[1] = atan2d(var_f28, temp_f29);
} }
static float fn_1_4B10(float arg0, float arg1, float arg2, float arg3) { static float fn_1_4B10(float arg0, float arg1, float arg2, float arg3)
{
float temp_f31; float temp_f31;
float var_f30; float var_f30;
@ -1395,7 +1434,8 @@ static float fn_1_4B10(float arg0, float arg1, float arg2, float arg3) {
return var_f30; return var_f30;
} }
static void fn_1_4B88(float *arg0, float *arg1, float *arg2, float *arg3, float arg4) { static void fn_1_4B88(float *arg0, float *arg1, float *arg2, float *arg3, float arg4)
{
s32 i; s32 i;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -1403,12 +1443,14 @@ static void fn_1_4B88(float *arg0, float *arg1, float *arg2, float *arg3, float
} }
} }
static float fn_1_4CA4(float arg0, float arg1, float arg2, float arg3) { static float fn_1_4CA4(float arg0, float arg1, float arg2, float arg3)
{
float var_f31 = 2.0 * ((arg0 - 1.0) * arg1 + (1.0 - 2.0 * arg0) * arg2 + arg0 * arg3); float var_f31 = 2.0 * ((arg0 - 1.0) * arg1 + (1.0 - 2.0 * arg0) * arg2 + arg0 * arg3);
return var_f31; return var_f31;
} }
static void fn_1_4D1C(float *arg0, float *arg1, float *arg2, float *arg3, float arg4) { static void fn_1_4D1C(float *arg0, float *arg1, float *arg2, float *arg3, float arg4)
{
float spC[3]; float spC[3];
float var_f29; float var_f29;
s32 i; s32 i;
@ -1422,14 +1464,16 @@ static void fn_1_4D1C(float *arg0, float *arg1, float *arg2, float *arg3, float
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
*(arg3++) = var_f29 * spC[i]; *(arg3++) = var_f29 * spC[i];
} }
} else { }
else {
*(arg3++) = 0.0f; *(arg3++) = 0.0f;
*(arg3++) = 0.0f; *(arg3++) = 0.0f;
*(arg3++) = 1.0f; *(arg3++) = 1.0f;
} }
} }
static void fn_1_4FF4(float *arg0, float *arg1, float *arg2, s32 arg3) { static void fn_1_4FF4(float *arg0, float *arg1, float *arg2, s32 arg3)
{
float sp48[16]; float sp48[16];
float sp8[16]; float sp8[16];
double temp_f31; double temp_f31;
@ -1441,7 +1485,8 @@ static void fn_1_4FF4(float *arg0, float *arg1, float *arg2, s32 arg3) {
sp48[i] = arg0[i + 1] - arg0[i]; sp48[i] = arg0[i + 1] - arg0[i];
if (sp48[i] == 0.0f) { if (sp48[i] == 0.0f) {
sp8[i + 1] = 0.0f; sp8[i + 1] = 0.0f;
} else { }
else {
sp8[i + 1] = (arg1[i + 1] - arg1[i]) / sp48[i]; sp8[i + 1] = (arg1[i + 1] - arg1[i]) / sp48[i];
} }
} }
@ -1456,13 +1501,15 @@ static void fn_1_4FF4(float *arg0, float *arg1, float *arg2, s32 arg3) {
for (i = arg3 - 2; i > 0; i--) { for (i = arg3 - 2; i > 0; i--) {
if (sp8[i] == 0.0f) { if (sp8[i] == 0.0f) {
arg2[i] = 0.0f; arg2[i] = 0.0f;
} else { }
else {
arg2[i] = (arg2[i] - sp48[i] * arg2[i + 1]) / sp8[i]; arg2[i] = (arg2[i] - sp48[i] * arg2[i + 1]) / sp8[i];
} }
} }
} }
static float fn_1_52AC(float arg0, float *arg1, float *arg2, float *arg3, s32 arg4) { static float fn_1_52AC(float arg0, float *arg1, float *arg2, float *arg3, s32 arg4)
{
float temp_f31; float temp_f31;
float temp_f30; float temp_f30;
float var_f29; float var_f29;
@ -1472,14 +1519,18 @@ static float fn_1_52AC(float arg0, float *arg1, float *arg2, float *arg3, s32 ar
arg0 -= temp_r31; arg0 -= temp_r31;
temp_f31 = arg1[temp_r31 + 1] - arg1[temp_r31]; temp_f31 = arg1[temp_r31 + 1] - arg1[temp_r31];
temp_f30 = temp_f31 * arg0; temp_f30 = temp_f31 * arg0;
var_f29 = arg2[temp_r31] + temp_f30 * (temp_f30 * (3.0f * arg3[temp_r31] + temp_f30 * (arg3[temp_r31 + 1] - arg3[temp_r31]) / temp_f31) + ((arg2[temp_r31 + 1] - arg2[temp_r31]) / temp_f31 - temp_f31 * (2.0f * arg3[temp_r31] + arg3[temp_r31 + 1]))); var_f29 = arg2[temp_r31]
+ temp_f30
* (temp_f30 * (3.0f * arg3[temp_r31] + temp_f30 * (arg3[temp_r31 + 1] - arg3[temp_r31]) / temp_f31)
+ ((arg2[temp_r31 + 1] - arg2[temp_r31]) / temp_f31 - temp_f31 * (2.0f * arg3[temp_r31] + arg3[temp_r31 + 1])));
if (temp_f31 == 0.0f) { if (temp_f31 == 0.0f) {
var_f29 = arg2[temp_r31]; var_f29 = arg2[temp_r31];
} }
return var_f29; return var_f29;
} }
static void fn_1_5400(float *arg0, Vec *arg1, float arg2[][3], s32 arg3) { static void fn_1_5400(float *arg0, Vec *arg1, float arg2[][3], s32 arg3)
{
Vec sp8; Vec sp8;
float temp_f31; float temp_f31;
float spD4[16]; float spD4[16];
@ -1494,7 +1545,7 @@ static void fn_1_5400(float *arg0, Vec *arg1, float arg2[][3], s32 arg3) {
} }
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
for (i = 0; i < arg3; i++) { for (i = 0; i < arg3; i++) {
spD4[i] = ((float*) &arg1[i])[j]; spD4[i] = ((float *)&arg1[i])[j];
} }
fn_1_4FF4(arg0, spD4, sp94, arg3); fn_1_4FF4(arg0, spD4, sp94, arg3);
for (i = 0; i < arg3; i++) { for (i = 0; i < arg3; i++) {
@ -1503,7 +1554,8 @@ static void fn_1_5400(float *arg0, Vec *arg1, float arg2[][3], s32 arg3) {
} }
} }
static void fn_1_57E0(float arg0, Vec *arg1, float *arg2, Vec *arg3, float arg4[][3], s32 arg5) { static void fn_1_57E0(float arg0, Vec *arg1, float *arg2, Vec *arg3, float arg4[][3], s32 arg5)
{
float sp48[16]; float sp48[16];
float sp8[16]; float sp8[16];
s32 i; s32 i;
@ -1511,14 +1563,15 @@ static void fn_1_57E0(float arg0, Vec *arg1, float *arg2, Vec *arg3, float arg4[
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
for (j = 0; j < arg5; j++) { for (j = 0; j < arg5; j++) {
sp48[j] = ((float*) &arg3[j])[i]; sp48[j] = ((float *)&arg3[j])[i];
sp8[j] = arg4[j][i]; sp8[j] = arg4[j][i];
} }
((float*) arg1)[i] = fn_1_52AC(arg0, arg2, sp48, sp8, arg5); ((float *)arg1)[i] = fn_1_52AC(arg0, arg2, sp48, sp8, arg5);
} }
} }
static float fn_1_59F4(Vec *arg0) { static float fn_1_59F4(Vec *arg0)
{
float var_f30; float var_f30;
float var_f29; float var_f29;
@ -1529,31 +1582,36 @@ static float fn_1_59F4(Vec *arg0) {
arg0->x *= var_f29; arg0->x *= var_f29;
arg0->y *= var_f29; arg0->y *= var_f29;
arg0->z *= var_f29; arg0->z *= var_f29;
} else { }
else {
arg0->x = arg0->y = arg0->z = 0.0f; arg0->x = arg0->y = arg0->z = 0.0f;
} }
return var_f30; return var_f30;
} }
static void fn_1_5B8C(Vec arg0, Vec arg1, Vec *arg2, float arg3) { static void fn_1_5B8C(Vec arg0, Vec arg1, Vec *arg2, float arg3)
{
if (arg3 <= 0.0f) { if (arg3 <= 0.0f) {
arg2->x = arg0.x; arg2->x = arg0.x;
arg2->y = arg0.y; arg2->y = arg0.y;
arg2->z = arg0.z; arg2->z = arg0.z;
arg3 = 0.0f; arg3 = 0.0f;
} else if (arg3 >= 1.0f) { }
else if (arg3 >= 1.0f) {
arg2->x = arg0.x + arg1.x; arg2->x = arg0.x + arg1.x;
arg2->y = arg0.y + arg1.y; arg2->y = arg0.y + arg1.y;
arg2->z = arg0.z + arg1.z; arg2->z = arg0.z + arg1.z;
arg3 = 1.0f; arg3 = 1.0f;
} else { }
else {
arg2->x = arg0.x + arg3 * arg1.x; arg2->x = arg0.x + arg3 * arg1.x;
arg2->y = arg0.y + arg3 * arg1.y; arg2->y = arg0.y + arg3 * arg1.y;
arg2->z = arg0.z + arg3 * arg1.z; arg2->z = arg0.z + arg3 * arg1.z;
} }
} }
static float fn_1_5C64(Vec arg0, Vec arg1, Vec arg2) { static float fn_1_5C64(Vec arg0, Vec arg1, Vec arg2)
{
float var_f31; float var_f31;
float temp_f30; float temp_f30;
@ -1565,7 +1623,8 @@ static float fn_1_5C64(Vec arg0, Vec arg1, Vec arg2) {
return var_f31; return var_f31;
} }
static float fn_1_5D20(Vec *arg0, Vec *arg1, Vec *arg2) { static float fn_1_5D20(Vec *arg0, Vec *arg1, Vec *arg2)
{
Vec sp44; Vec sp44;
float var_f31; float var_f31;
@ -1577,7 +1636,8 @@ static float fn_1_5D20(Vec *arg0, Vec *arg1, Vec *arg2) {
return (arg0->x - sp44.x) * (arg0->x - sp44.x) + (arg0->y - sp44.y) * (arg0->y - sp44.y) + (arg0->z - sp44.z) * (arg0->z - sp44.z); return (arg0->x - sp44.x) * (arg0->x - sp44.x) + (arg0->y - sp44.y) * (arg0->y - sp44.y) + (arg0->z - sp44.z) * (arg0->z - sp44.z);
} }
static float fn_1_605C(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, Vec *arg4) { static float fn_1_605C(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, Vec *arg4)
{
float var_f27; float var_f27;
if (arg2->x * arg2->x + arg2->y * arg2->y + arg2->z * arg2->z == 0.0f) { if (arg2->x * arg2->x + arg2->y * arg2->y + arg2->z * arg2->z == 0.0f) {

469
src/REL/m403Dll/scene.c
View file

@ -1,8 +1,8 @@
#include "REL/m403Dll.h" #include "REL/m403Dll.h"
#include "game/audio.h" #include "game/audio.h"
#include "game/frand.h" #include "game/frand.h"
#include "game/hsfman.h"
#include "game/hsfdraw.h" #include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h" #include "game/hsfmotion.h"
#include "game/memory.h" #include "game/memory.h"
#include "game/object.h" #include "game/object.h"
@ -53,298 +53,92 @@ static s32 lbl_1_bss_74;
static s32 lbl_1_bss_70; static s32 lbl_1_bss_70;
static s32 lbl_1_bss_58[6]; static s32 lbl_1_bss_58[6];
static Vec lbl_1_data_158[] = { static Vec lbl_1_data_158[] = { { 92.39f, 0.0f, 38.27f }, { 100.0f, 0.0f, 0.0f }, { 92.39f, 0.0f, -38.27f }, { 70.71f, 0.0f, -70.71f },
{ 92.39f, 0.0f, 38.27f }, { 38.27f, 0.0f, -92.39f }, { 0.0f, 0.0f, -100.0f }, { -38.27f, 0.0f, -92.39f }, { -70.71f, 0.0f, -70.71f }, { -92.39f, 0.0f, -38.27f },
{ 100.0f, 0.0f, 0.0f }, { -100.0f, 0.0f, 0.0f }, { -92.39f, 0.0f, 38.27f }, { -70.71f, 0.0f, 70.71f }, { -38.27f, 0.0f, 92.39f }, { 0.0f, 0.0f, 100.0f },
{ 92.39f, 0.0f, -38.27f }, { 38.27f, 0.0f, 92.39f }, { 70.71f, 0.0f, 70.71f } };
{ 70.71f, 0.0f, -70.71f },
{ 38.27f, 0.0f, -92.39f },
{ 0.0f, 0.0f, -100.0f },
{ -38.27f, 0.0f, -92.39f },
{ -70.71f, 0.0f, -70.71f },
{ -92.39f, 0.0f, -38.27f },
{ -100.0f, 0.0f, 0.0f },
{ -92.39f, 0.0f, 38.27f },
{ -70.71f, 0.0f, 70.71f },
{ -38.27f, 0.0f, 92.39f },
{ 0.0f, 0.0f, 100.0f },
{ 38.27f, 0.0f, 92.39f },
{ 70.71f, 0.0f, 70.71f }
};
static Vec lbl_1_data_218[] = { static Vec lbl_1_data_218[] = { { 55.43f, 0.0f, 22.96f }, { 60.0f, 0.0f, 0.0f }, { 55.43f, 0.0f, -22.96f }, { 42.43f, 0.0f, -42.43f },
{ 55.43f, 0.0f, 22.96f }, { 22.96f, 0.0f, -55.43f }, { 0.0f, 0.0f, -60.0f }, { -22.96f, 0.0f, -55.43f }, { -42.43f, 0.0f, -42.43f }, { -55.43f, 0.0f, -22.96f },
{ 60.0f, 0.0f, 0.0f }, { -60.0f, 0.0f, 0.0f }, { -55.43f, 0.0f, 22.96f }, { -42.43f, 0.0f, 42.43f }, { -22.96f, 0.0f, 55.43f }, { 0.0f, 0.0f, 60.0f },
{ 55.43f, 0.0f, -22.96f }, { 22.96f, 0.0f, 55.43f }, { 42.43f, 0.0f, 42.43f } };
{ 42.43f, 0.0f, -42.43f },
{ 22.96f, 0.0f, -55.43f },
{ 0.0f, 0.0f, -60.0f },
{ -22.96f, 0.0f, -55.43f },
{ -42.43f, 0.0f, -42.43f },
{ -55.43f, 0.0f, -22.96f },
{ -60.0f, 0.0f, 0.0f },
{ -55.43f, 0.0f, 22.96f },
{ -42.43f, 0.0f, 42.43f },
{ -22.96f, 0.0f, 55.43f },
{ 0.0f, 0.0f, 60.0f },
{ 22.96f, 0.0f, 55.43f },
{ 42.43f, 0.0f, 42.43f }
};
static Vec lbl_1_data_2D8[] = { static Vec lbl_1_data_2D8[]
{ 38.79f, 0.0f, -53.4f }, = { { 38.79f, 0.0f, -53.4f }, { 0.0f, 0.0f, -120.0f }, { -38.79f, 0.0f, -53.4f }, { -114.13f, 0.0f, -37.08f }, { -62.77f, 0.0f, 20.4f },
{ 0.0f, 0.0f, -120.0f }, { -70.53f, 0.0f, 97.08f }, { 0.0f, 0.0f, 66.0f }, { 70.53f, 0.0f, 97.08f }, { 62.77f, 0.0f, 20.4f }, { 114.13f, 0.0f, -37.08f } };
{ -38.79f, 0.0f, -53.4f },
{ -114.13f, 0.0f, -37.08f },
{ -62.77f, 0.0f, 20.4f },
{ -70.53f, 0.0f, 97.08f },
{ 0.0f, 0.0f, 66.0f },
{ 70.53f, 0.0f, 97.08f },
{ 62.77f, 0.0f, 20.4f },
{ 114.13f, 0.0f, -37.08f }
};
static Vec lbl_1_data_350[] = { static Vec lbl_1_data_350[]
{ 21.34f, 0.0f, -29.37f }, = { { 21.34f, 0.0f, -29.37f }, { 0.0f, 0.0f, -66.0f }, { -21.34f, 0.0f, -29.37f }, { -62.77f, 0.0f, -20.4f }, { -34.52f, 0.0f, 11.22f },
{ 0.0f, 0.0f, -66.0f }, { -38.79f, 0.0f, 53.4f }, { 0.0f, 0.0f, 36.3f }, { 38.79f, 0.0f, 53.4f }, { 34.52f, 0.0f, 11.22f }, { 62.77f, 0.0f, -20.4f } };
{ -21.34f, 0.0f, -29.37f },
{ -62.77f, 0.0f, -20.4f },
{ -34.52f, 0.0f, 11.22f },
{ -38.79f, 0.0f, 53.4f },
{ 0.0f, 0.0f, 36.3f },
{ 38.79f, 0.0f, 53.4f },
{ 34.52f, 0.0f, 11.22f },
{ 62.77f, 0.0f, -20.4f }
};
static Vec lbl_1_data_3C8[] = { static Vec lbl_1_data_3C8[] = { { 110.87f, 0.0f, 45.92f }, { 120.0f, 0.0f, 0.0f }, { 110.87f, 0.0f, -45.92f }, { 84.85f, 0.0f, -84.85f },
{ 110.87f, 0.0f, 45.92f }, { 45.92f, 0.0f, -110.87f }, { 0.0f, 0.0f, -120.0f }, { -45.92f, 0.0f, -110.87f }, { -84.85f, 0.0f, -84.85f }, { -110.87f, 0.0f, -45.92f },
{ 120.0f, 0.0f, 0.0f }, { -120.0f, 0.0f, 0.0f }, { -110.87f, 0.0f, 45.92f }, { -84.85f, 0.0f, 84.85f }, { -45.92f, 0.0f, 110.87f }, { 0.0f, 0.0f, 120.0f },
{ 110.87f, 0.0f, -45.92f }, { 45.92f, 0.0f, 110.87f }, { 84.85f, 0.0f, 84.85f } };
{ 84.85f, 0.0f, -84.85f },
{ 45.92f, 0.0f, -110.87f },
{ 0.0f, 0.0f, -120.0f },
{ -45.92f, 0.0f, -110.87f },
{ -84.85f, 0.0f, -84.85f },
{ -110.87f, 0.0f, -45.92f },
{ -120.0f, 0.0f, 0.0f },
{ -110.87f, 0.0f, 45.92f },
{ -84.85f, 0.0f, 84.85f },
{ -45.92f, 0.0f, 110.87f },
{ 0.0f, 0.0f, 120.0f },
{ 45.92f, 0.0f, 110.87f },
{ 84.85f, 0.0f, 84.85f }
};
static Vec lbl_1_data_488[] = { static Vec lbl_1_data_488[] = { { 73.17f, 0.0f, 30.31f }, { 79.2f, 0.0f, 0.0f }, { 73.17f, 0.0f, -30.31f }, { 56.0f, 0.0f, -56.0f },
{ 73.17f, 0.0f, 30.31f }, { 30.31f, 0.0f, -73.17f }, { 0.0f, 0.0f, -79.2f }, { -30.31f, 0.0f, -73.17f }, { -56.0f, 0.0f, -56.0f }, { -73.17f, 0.0f, -30.31f },
{ 79.2f, 0.0f, 0.0f }, { -79.2f, 0.0f, 0.0f }, { -73.17f, 0.0f, 30.31f }, { -56.0f, 0.0f, 56.0f }, { -30.31f, 0.0f, 73.17f }, { 0.0f, 0.0f, 79.2f },
{ 73.17f, 0.0f, -30.31f }, { 30.31f, 0.0f, 73.17f }, { 56.0f, 0.0f, 56.0f } };
{ 56.0f, 0.0f, -56.0f },
{ 30.31f, 0.0f, -73.17f },
{ 0.0f, 0.0f, -79.2f },
{ -30.31f, 0.0f, -73.17f },
{ -56.0f, 0.0f, -56.0f },
{ -73.17f, 0.0f, -30.31f },
{ -79.2f, 0.0f, 0.0f },
{ -73.17f, 0.0f, 30.31f },
{ -56.0f, 0.0f, 56.0f },
{ -30.31f, 0.0f, 73.17f },
{ 0.0f, 0.0f, 79.2f },
{ 30.31f, 0.0f, 73.17f },
{ 56.0f, 0.0f, 56.0f }
};
static Vec lbl_1_data_548[] = { static Vec lbl_1_data_548[]
{ 48.49f, 0.0f, -66.74f }, = { { 48.49f, 0.0f, -66.74f }, { 0.0f, 0.0f, -150.0f }, { -48.49f, 0.0f, -66.74f }, { -142.66f, 0.0f, -46.35f }, { -78.46f, 0.0f, 25.49f },
{ 0.0f, 0.0f, -150.0f }, { -88.17f, 0.0f, 121.35f }, { 0.0f, 0.0f, 82.5f }, { 88.17f, 0.0f, 121.35f }, { 78.46f, 0.0f, 25.49f }, { 142.66f, 0.0f, -46.35f } };
{ -48.49f, 0.0f, -66.74f },
{ -142.66f, 0.0f, -46.35f },
{ -78.46f, 0.0f, 25.49f },
{ -88.17f, 0.0f, 121.35f },
{ 0.0f, 0.0f, 82.5f },
{ 88.17f, 0.0f, 121.35f },
{ 78.46f, 0.0f, 25.49f },
{ 142.66f, 0.0f, -46.35f }
};
static Vec lbl_1_data_5C0[] = { static Vec lbl_1_data_5C0[]
{ 29.09f, 0.0f, -40.05f }, = { { 29.09f, 0.0f, -40.05f }, { 0.0f, 0.0f, -90.0f }, { -29.09f, 0.0f, -40.05f }, { -85.59f, 0.0f, -27.81f }, { -47.08f, 0.0f, 15.3f },
{ 0.0f, 0.0f, -90.0f }, { -52.9f, 0.0f, 72.81f }, { 0.0f, 0.0f, 49.5f }, { 52.9f, 0.0f, 72.81f }, { 47.08f, 0.0f, 15.3f }, { 85.59f, 0.0f, -27.81f } };
{ -29.09f, 0.0f, -40.05f },
{ -85.59f, 0.0f, -27.81f },
{ -47.08f, 0.0f, 15.3f },
{ -52.9f, 0.0f, 72.81f },
{ 0.0f, 0.0f, 49.5f },
{ 52.9f, 0.0f, 72.81f },
{ 47.08f, 0.0f, 15.3f },
{ 85.59f, 0.0f, -27.81f }
};
static Vec lbl_1_data_638[] = { static Vec lbl_1_data_638[] = { { 129.1f, 0.0f, 54.6f }, { 140.0f, 0.0f, 0.0f }, { 129.3f, 0.0f, -53.6f }, { 99.0f, 0.0f, -99.0f },
{ 129.1f, 0.0f, 54.6f }, { 53.6f, 0.0f, -129.3f }, { 0.0f, 0.0f, -140.0f }, { -53.6f, 0.0f, -129.3f }, { -99.0f, 0.0f, -99.0f }, { -129.4f, 0.0f, -53.5f },
{ 140.0f, 0.0f, 0.0f }, { -140.0f, 0.0f, 0.0f }, { -136.0f, 0.0f, 20.4f }, { -102.1f, 0.0f, -7.6f }, { -70.0f, 0.0f, -14.0f }, { -37.8f, 0.0f, -7.6f },
{ 129.3f, 0.0f, -53.6f }, { -10.6f, 0.0f, 10.6f }, { 7.6f, 0.0f, 37.8f }, { 14.0f, 0.0f, 70.0f }, { 7.6f, 0.0f, 102.2f }, { -20.4f, 0.0f, 136.0f }, { 0.1f, 0.0f, 140.1f },
{ 99.0f, 0.0f, -99.0f }, { 53.9f, 0.0f, 129.5f }, { 99.5f, 0.0f, 99.0f } };
{ 53.6f, 0.0f, -129.3f },
{ 0.0f, 0.0f, -140.0f },
{ -53.6f, 0.0f, -129.3f },
{ -99.0f, 0.0f, -99.0f },
{ -129.4f, 0.0f, -53.5f },
{ -140.0f, 0.0f, 0.0f },
{ -136.0f, 0.0f, 20.4f },
{ -102.1f, 0.0f, -7.6f },
{ -70.0f, 0.0f, -14.0f },
{ -37.8f, 0.0f, -7.6f },
{ -10.6f, 0.0f, 10.6f },
{ 7.6f, 0.0f, 37.8f },
{ 14.0f, 0.0f, 70.0f },
{ 7.6f, 0.0f, 102.2f },
{ -20.4f, 0.0f, 136.0f },
{ 0.1f, 0.0f, 140.1f },
{ 53.9f, 0.0f, 129.5f },
{ 99.5f, 0.0f, 99.0f }
};
static Vec lbl_1_data_740[] = { static Vec lbl_1_data_740[] = { { 95.9f, 0.0f, 42.9f }, { 106.6f, 0.0f, 0.4f }, { 98.4f, 0.0f, -37.2f }, { 81.7f, 0.0f, -65.9f },
{ 95.9f, 0.0f, 42.9f }, { 55.4f, 0.0f, -89.6f }, { 11.5f, 0.0f, -101.7f }, { -24.5f, 0.0f, -99.9f }, { -60.9f, 0.0f, -88.6f }, { -98.7f, 0.0f, -64.4f },
{ 106.6f, 0.0f, 0.4f }, { -110.4f, 0.0f, -41.5f }, { -110.4f, 0.0f, -30.8f }, { -90.4f, 0.0f, -42.3f }, { -53.8f, 0.0f, -48.5f }, { -14.6f, 0.0f, -40.5f },
{ 98.4f, 0.0f, -37.2f }, { 17.1f, 0.0f, -16.3f }, { 35.8f, 0.0f, 28.2f }, { 35.8f, 0.0f, 65.6f }, { 24.7f, 0.0f, 101.6f }, { 19.6f, 0.0f, 114.6f },
{ 81.7f, 0.0f, -65.9f }, { 34.9f, 0.0f, 114.5f }, { 62.9f, 0.0f, 99.0f }, { 83.0f, 0.0f, 73.2f } };
{ 55.4f, 0.0f, -89.6f },
{ 11.5f, 0.0f, -101.7f },
{ -24.5f, 0.0f, -99.9f },
{ -60.9f, 0.0f, -88.6f },
{ -98.7f, 0.0f, -64.4f },
{ -110.4f, 0.0f, -41.5f },
{ -110.4f, 0.0f, -30.8f },
{ -90.4f, 0.0f, -42.3f },
{ -53.8f, 0.0f, -48.5f },
{ -14.6f, 0.0f, -40.5f },
{ 17.1f, 0.0f, -16.3f },
{ 35.8f, 0.0f, 28.2f },
{ 35.8f, 0.0f, 65.6f },
{ 24.7f, 0.0f, 101.6f },
{ 19.6f, 0.0f, 114.6f },
{ 34.9f, 0.0f, 114.5f },
{ 62.9f, 0.0f, 99.0f },
{ 83.0f, 0.0f, 73.2f }
};
static Vec lbl_1_data_848[] = { static Vec lbl_1_data_848[] = { { 110.9f, 0.0f, 45.9f }, { 120.0f, 0.0f, 0.0f }, { 110.9f, 0.0f, -45.8f }, { 84.8f, 0.0f, -84.9f },
{ 110.9f, 0.0f, 45.9f }, { 45.9f, 0.0f, -110.9f }, { 0.0f, 0.0f, -120.0f }, { -45.9f, 0.0f, -110.9f }, { -84.9f, 0.0f, -84.8f }, { -110.9f, 0.0f, -45.9f },
{ 120.0f, 0.0f, 0.0f }, { -120.0f, 0.0f, 0.0f }, { -116.5f, 0.0f, 17.5f }, { -87.6f, 0.0f, -6.6f }, { -60.0f, 0.0f, -12.0f }, { -32.4f, 0.0f, -6.5f },
{ 110.9f, 0.0f, -45.8f }, { -9.1f, 0.0f, 9.1f }, { 6.5f, 0.0f, 32.5f }, { 12.0f, 0.0f, 60.0f }, { 6.5f, 0.0f, 87.6f }, { -17.5f, 0.0f, 116.5f }, { 0.0f, 0.0f, 120.0f },
{ 84.8f, 0.0f, -84.9f }, { 45.9f, 0.0f, 110.9f }, { 84.8f, 0.0f, 84.9f } };
{ 45.9f, 0.0f, -110.9f },
{ 0.0f, 0.0f, -120.0f },
{ -45.9f, 0.0f, -110.9f },
{ -84.9f, 0.0f, -84.8f },
{ -110.9f, 0.0f, -45.9f },
{ -120.0f, 0.0f, 0.0f },
{ -116.5f, 0.0f, 17.5f },
{ -87.6f, 0.0f, -6.6f },
{ -60.0f, 0.0f, -12.0f },
{ -32.4f, 0.0f, -6.5f },
{ -9.1f, 0.0f, 9.1f },
{ 6.5f, 0.0f, 32.5f },
{ 12.0f, 0.0f, 60.0f },
{ 6.5f, 0.0f, 87.6f },
{ -17.5f, 0.0f, 116.5f },
{ 0.0f, 0.0f, 120.0f },
{ 45.9f, 0.0f, 110.9f },
{ 84.8f, 0.0f, 84.9f }
};
static Vec lbl_1_data_950[] = { static Vec lbl_1_data_950[] = { { 80.0f, 0.0f, 31.0f }, { 83.9f, 0.0f, -0.1f }, { 77.2f, 0.0f, -31.7f }, { 60.4f, 0.0f, -56.8f },
{ 80.0f, 0.0f, 31.0f }, { 35.6f, 0.0f, -77.4f }, { -0.5f, 0.0f, -84.1f }, { -31.5f, 0.0f, -82.9f }, { -58.9f, 0.0f, -71.4f }, { -86.3f, 0.0f, -49.4f },
{ 83.9f, 0.0f, -0.1f }, { -91.5f, 0.0f, -36.4f }, { -91.5f, 0.0f, -27.3f }, { -82.1f, 0.0f, -29.8f }, { -54.7f, 0.0f, -36.2f }, { -21.9f, 0.0f, -30.9f },
{ 77.2f, 0.0f, -31.7f }, { 13.3f, 0.0f, -10.2f }, { 28.3f, 0.0f, 18.3f }, { 33.4f, 0.0f, 58.4f }, { 28.0f, 0.0f, 81.6f }, { 20.7f, 0.0f, 93.3f }, { 30.4f, 0.0f, 93.3f },
{ 60.4f, 0.0f, -56.8f }, { 55.4f, 0.0f, 82.2f }, { 70.4f, 0.0f, 59.3f } };
{ 35.6f, 0.0f, -77.4f },
{ -0.5f, 0.0f, -84.1f },
{ -31.5f, 0.0f, -82.9f },
{ -58.9f, 0.0f, -71.4f },
{ -86.3f, 0.0f, -49.4f },
{ -91.5f, 0.0f, -36.4f },
{ -91.5f, 0.0f, -27.3f },
{ -82.1f, 0.0f, -29.8f },
{ -54.7f, 0.0f, -36.2f },
{ -21.9f, 0.0f, -30.9f },
{ 13.3f, 0.0f, -10.2f },
{ 28.3f, 0.0f, 18.3f },
{ 33.4f, 0.0f, 58.4f },
{ 28.0f, 0.0f, 81.6f },
{ 20.7f, 0.0f, 93.3f },
{ 30.4f, 0.0f, 93.3f },
{ 55.4f, 0.0f, 82.2f },
{ 70.4f, 0.0f, 59.3f }
};
static s32 lbl_1_data_A58[] = { static s32 lbl_1_data_A58[]
DATA_MAKE_NUM(DATADIR_M403, 4), = { DATA_MAKE_NUM(DATADIR_M403, 4), DATA_MAKE_NUM(DATADIR_M403, 5), DATA_MAKE_NUM(DATADIR_M403, 6), DATA_MAKE_NUM(DATADIR_M403, 9),
DATA_MAKE_NUM(DATADIR_M403, 5), DATA_MAKE_NUM(DATADIR_M403, 12), DATA_MAKE_NUM(DATADIR_M403, 15), DATA_MAKE_NUM(DATADIR_M403, 7), DATA_MAKE_NUM(DATADIR_M403, 8),
DATA_MAKE_NUM(DATADIR_M403, 6), DATA_MAKE_NUM(DATADIR_M403, 10), DATA_MAKE_NUM(DATADIR_M403, 11), DATA_MAKE_NUM(DATADIR_M403, 13), DATA_MAKE_NUM(DATADIR_M403, 14) };
DATA_MAKE_NUM(DATADIR_M403, 9),
DATA_MAKE_NUM(DATADIR_M403, 12),
DATA_MAKE_NUM(DATADIR_M403, 15),
DATA_MAKE_NUM(DATADIR_M403, 7),
DATA_MAKE_NUM(DATADIR_M403, 8),
DATA_MAKE_NUM(DATADIR_M403, 10),
DATA_MAKE_NUM(DATADIR_M403, 11),
DATA_MAKE_NUM(DATADIR_M403, 13),
DATA_MAKE_NUM(DATADIR_M403, 14)
};
static Vec lbl_1_data_A88[] = { static Vec lbl_1_data_A88[] = { { -400.0f, 0.0f, 300.0f }, { 0.0f, 0.0f, 300.0f }, { 400.0f, 0.0f, 300.0f }, { -400.0f, 0.0f, 700.0f },
{ -400.0f, 0.0f, 300.0f }, { 0.0f, 0.0f, 700.0f }, { 400.0f, 0.0f, 700.0f } };
{ 0.0f, 0.0f, 300.0f },
{ 400.0f, 0.0f, 300.0f },
{ -400.0f, 0.0f, 700.0f },
{ 0.0f, 0.0f, 700.0f },
{ 400.0f, 0.0f, 700.0f }
};
static s32 lbl_1_data_AD0[] = { 6, 8, 10 }; static s32 lbl_1_data_AD0[] = { 6, 8, 10 };
static s32 lbl_1_data_ADC[] = { 7, 9, 11 }; static s32 lbl_1_data_ADC[] = { 7, 9, 11 };
static s32 lbl_1_data_AE8[] = { 1, 2, 3, 4, 5 }; static s32 lbl_1_data_AE8[] = { 1, 2, 3, 4, 5 };
static Vec *lbl_1_data_AFC[] = { static Vec *lbl_1_data_AFC[] = { lbl_1_data_3C8, lbl_1_data_158, lbl_1_data_548, lbl_1_data_2D8, lbl_1_data_638, lbl_1_data_848 };
lbl_1_data_3C8,
lbl_1_data_158,
lbl_1_data_548,
lbl_1_data_2D8,
lbl_1_data_638,
lbl_1_data_848
};
static s32 lbl_1_data_B14[] = { static s32 lbl_1_data_B14[] = { 16, 16, 10, 10, 22, 22 };
16, 16, 10, 10, 22, 22
};
static Vec lbl_1_data_B2C[] = { static Vec lbl_1_data_B2C[] = { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, -20.0f }, { 0.0f, 0.0f, -20.0f }, { 40.0f, 0.0f, -20.0f },
{ 0.0f, 0.0f, 0.0f }, { 40.0f, 0.0f, -20.0f } };
{ 0.0f, 0.0f, 0.0f },
{ 0.0f, 0.0f, -20.0f },
{ 0.0f, 0.0f, -20.0f },
{ 40.0f, 0.0f, -20.0f },
{ 40.0f, 0.0f, -20.0f }
};
static Vec *lbl_1_data_B74[][2] = { static Vec *lbl_1_data_B74[][2] = { { lbl_1_data_3C8, lbl_1_data_488 }, { lbl_1_data_158, lbl_1_data_218 }, { lbl_1_data_548, lbl_1_data_5C0 },
{ lbl_1_data_3C8, lbl_1_data_488 }, { lbl_1_data_2D8, lbl_1_data_350 }, { lbl_1_data_638, lbl_1_data_740 }, { lbl_1_data_848, lbl_1_data_950 } };
{ lbl_1_data_158, lbl_1_data_218 },
{ lbl_1_data_548, lbl_1_data_5C0 },
{ lbl_1_data_2D8, lbl_1_data_350 },
{ lbl_1_data_638, lbl_1_data_740 },
{ lbl_1_data_848, lbl_1_data_950 }
};
static s32 lbl_1_data_BA4[] = { static s32 lbl_1_data_BA4[] = { 16, 16, 10, 10, 22, 22 };
16, 16, 10, 10, 22, 22
};
void fn_1_650C(Process *arg0) { void fn_1_650C(Process *arg0)
{
Vec sp20; Vec sp20;
Vec sp14; Vec sp14;
Vec sp8; Vec sp8;
@ -379,21 +173,23 @@ void fn_1_650C(Process *arg0) {
memset(lbl_1_bss_58, 0, sizeof(lbl_1_bss_58)); memset(lbl_1_bss_58, 0, sizeof(lbl_1_bss_58));
} }
void fn_1_676C(void) { void fn_1_676C(void)
{
fn_1_799C(); fn_1_799C();
} }
static void fn_1_678C(omObjData *arg0) { static void fn_1_678C(omObjData *arg0)
{
arg0->stat |= 0x100; arg0->stat |= 0x100;
arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M403, 16)); arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M403, 16));
arg0->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M403, 17)); arg0->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M403, 17));
arg0->func = fn_1_6810; arg0->func = fn_1_6810;
} }
static void fn_1_6810(omObjData *arg0) { static void fn_1_6810(omObjData *arg0) { }
}
static void fn_1_6814(omObjData *arg0) { static void fn_1_6814(omObjData *arg0)
{
arg0->stat |= 0x100; arg0->stat |= 0x100;
arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M403, 0)); arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M403, 0));
arg0->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M403, 3)); arg0->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M403, 3));
@ -408,7 +204,8 @@ static void fn_1_6814(omObjData *arg0) {
arg0->func = fn_1_6980; arg0->func = fn_1_6980;
} }
static void fn_1_6980(omObjData *arg0) { static void fn_1_6980(omObjData *arg0)
{
ModelData *var_r30; ModelData *var_r30;
UnkBss9CData *var_r29; UnkBss9CData *var_r29;
@ -418,15 +215,18 @@ static void fn_1_6980(omObjData *arg0) {
arg0->work[0]++; arg0->work[0]++;
var_r30 = &Hu3DData[arg0->model[1]]; var_r30 = &Hu3DData[arg0->model[1]];
var_r30->rot.x = -120.0f * arg0->work[0] / 60.0f; var_r30->rot.x = -120.0f * arg0->work[0] / 60.0f;
} else { }
else {
lbl_1_bss_78 ^= 1; lbl_1_bss_78 ^= 1;
lbl_1_bss_7C = 0; lbl_1_bss_7C = 0;
} }
} else if (arg0->work[0] != 0) { }
else if (arg0->work[0] != 0) {
arg0->work[0]--; arg0->work[0]--;
var_r30 = &Hu3DData[arg0->model[1]]; var_r30 = &Hu3DData[arg0->model[1]];
var_r30->rot.x = -120.0f * arg0->work[0] / 60.0f; var_r30->rot.x = -120.0f * arg0->work[0] / 60.0f;
} else { }
else {
lbl_1_bss_78 ^= 1; lbl_1_bss_78 ^= 1;
lbl_1_bss_7C = 0; lbl_1_bss_7C = 0;
} }
@ -452,7 +252,8 @@ static void fn_1_6980(omObjData *arg0) {
} }
} }
static void fn_1_6C98(omObjData *arg0) { static void fn_1_6C98(omObjData *arg0)
{
UnkBss9CData *var_r29; UnkBss9CData *var_r29;
s32 i; s32 i;
@ -464,10 +265,10 @@ static void fn_1_6C98(omObjData *arg0) {
} }
for (i = 0; i < 12U; i++) { for (i = 0; i < 12U; i++) {
var_r29->unk24[i] = Hu3DModelCreateFile(lbl_1_data_A58[i]); var_r29->unk24[i] = Hu3DModelCreateFile(lbl_1_data_A58[i]);
Hu3DModelAttrSet(var_r29->unk24[i], 1); Hu3DModelAttrSet(var_r29->unk24[i], HU3D_ATTR_DISPOFF);
} }
arg0->model[0] = var_r29->unk24[0]; arg0->model[0] = var_r29->unk24[0];
Hu3DModelAttrReset(arg0->model[0], 1); Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
var_r29->unk00_field0 = 0; var_r29->unk00_field0 = 0;
var_r29->unk04 = 4 - lbl_1_bss_98; var_r29->unk04 = 4 - lbl_1_bss_98;
fn_1_6FE8(arg0); fn_1_6FE8(arg0);
@ -500,7 +301,8 @@ static void fn_1_6C98(omObjData *arg0) {
arg0->func = fn_1_73E8; arg0->func = fn_1_73E8;
} }
static void fn_1_6ED8(omObjData *arg0) { static void fn_1_6ED8(omObjData *arg0)
{
Mtx sp38; Mtx sp38;
Mtx sp8; Mtx sp8;
s32 i; s32 i;
@ -516,7 +318,8 @@ static void fn_1_6ED8(omObjData *arg0) {
} }
} }
static void fn_1_6FE8(omObjData *arg0) { static void fn_1_6FE8(omObjData *arg0)
{
UnkBss9CData *temp_r30; UnkBss9CData *temp_r30;
s32 temp_r29; s32 temp_r29;
s32 temp_r28; s32 temp_r28;
@ -575,16 +378,17 @@ static void fn_1_6FE8(omObjData *arg0) {
memcpy(lbl_1_bss_58, &temp_r30->unk0C, sizeof(temp_r30->unk0C)); memcpy(lbl_1_bss_58, &temp_r30->unk0C, sizeof(temp_r30->unk0C));
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
if (arg0->model[i + 1] >= 0) { if (arg0->model[i + 1] >= 0) {
Hu3DModelAttrSet(arg0->model[i + 1], 1); Hu3DModelAttrSet(arg0->model[i + 1], HU3D_ATTR_DISPOFF);
} }
} }
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
arg0->model[i + 1] = temp_r30->unk24[temp_r30->unk0C[i]]; arg0->model[i + 1] = temp_r30->unk24[temp_r30->unk0C[i]];
Hu3DModelAttrReset(arg0->model[i + 1], 1); Hu3DModelAttrReset(arg0->model[i + 1], HU3D_ATTR_DISPOFF);
} }
} }
static void fn_1_73E8(omObjData *arg0) { static void fn_1_73E8(omObjData *arg0)
{
UnkBss9CData *temp_r30; UnkBss9CData *temp_r30;
ModelData *var_r27; ModelData *var_r27;
s32 i; s32 i;
@ -605,10 +409,12 @@ static void fn_1_73E8(omObjData *arg0) {
arg0->trans.z = -500.0f + 7.5f * lbl_1_bss_B0->work[0] / 60.0f; arg0->trans.z = -500.0f + 7.5f * lbl_1_bss_B0->work[0] / 60.0f;
break; break;
} }
} else { }
else {
return; return;
} }
} else { }
else {
switch (temp_r30->unk04) { switch (temp_r30->unk04) {
case 0: case 0:
if (lbl_1_bss_84 != 0) { if (lbl_1_bss_84 != 0) {
@ -635,7 +441,8 @@ static void fn_1_73E8(omObjData *arg0) {
Hu3DModelShadowReset(arg0->model[i]); Hu3DModelShadowReset(arg0->model[i]);
Hu3DModelShadowMapSet(arg0->model[i]); Hu3DModelShadowMapSet(arg0->model[i]);
} }
} else { }
else {
temp_r30->unk08 += lbl_1_bss_80; temp_r30->unk08 += lbl_1_bss_80;
if (temp_r30->unk08 > 90.0f) { if (temp_r30->unk08 > 90.0f) {
temp_r30->unk00_field0 = 1; temp_r30->unk00_field0 = 1;
@ -669,8 +476,9 @@ static void fn_1_73E8(omObjData *arg0) {
fn_1_6ED8(arg0); fn_1_6ED8(arg0);
} }
static void fn_1_799C(void) { static void fn_1_799C(void)
omObjData* temp_r30; {
omObjData *temp_r30;
UnkBss9CData *temp_r29; UnkBss9CData *temp_r29;
s32 i; s32 i;
s32 j; s32 j;
@ -693,7 +501,8 @@ static void fn_1_799C(void) {
} }
} }
static void fn_1_7A98(s16 arg0) { static void fn_1_7A98(s16 arg0)
{
s16 i; s16 i;
HsfData *temp_r31; HsfData *temp_r31;
HsfObject *var_r28; HsfObject *var_r28;
@ -711,7 +520,8 @@ static void fn_1_7A98(s16 arg0) {
} }
} }
static s32 fn_1_7B20(float arg0, float arg1) { static s32 fn_1_7B20(float arg0, float arg1)
{
s32 var_r31; s32 var_r31;
s32 var_r30; s32 var_r30;
@ -719,37 +529,44 @@ static s32 fn_1_7B20(float arg0, float arg1) {
var_r30 = (arg1 + 400.0f) / 400.0f; var_r30 = (arg1 + 400.0f) / 400.0f;
if (var_r31 < 0) { if (var_r31 < 0) {
var_r31 = 0; var_r31 = 0;
} else if (var_r31 > 2) { }
else if (var_r31 > 2) {
var_r31 = 2; var_r31 = 2;
} }
if (var_r30 < 0) { if (var_r30 < 0) {
var_r30 = 0; var_r30 = 0;
} else if (var_r30 > 1) { }
else if (var_r30 > 1) {
var_r30 = 1; var_r30 = 1;
} }
return var_r31 + var_r30 * 3; return var_r31 + var_r30 * 3;
} }
static void fn_1_7BD4(s32 arg0, Vec *arg1) { static void fn_1_7BD4(s32 arg0, Vec *arg1)
{
arg1->x = lbl_1_data_A88[arg0].x; arg1->x = lbl_1_data_A88[arg0].x;
arg1->y = lbl_1_data_A88[arg0].y; arg1->y = lbl_1_data_A88[arg0].y;
arg1->z = lbl_1_data_A88[arg0].z; arg1->z = lbl_1_data_A88[arg0].z;
} }
static s32 fn_1_7C20(UnkBss9CData *arg0, s32 arg1) { static s32 fn_1_7C20(UnkBss9CData *arg0, s32 arg1)
{
return arg0->unk0C[arg1]; return arg0->unk0C[arg1];
} }
void fn_1_7C30(float arg0) { void fn_1_7C30(float arg0)
{
lbl_1_bss_8C = 1; lbl_1_bss_8C = 1;
lbl_1_bss_80 = arg0; lbl_1_bss_80 = arg0;
} }
void fn_1_7C50(s32 arg0) { void fn_1_7C50(s32 arg0)
{
lbl_1_bss_74 = arg0; lbl_1_bss_74 = arg0;
} }
void fn_1_7C60(void) { void fn_1_7C60(void)
{
float var_f30; float var_f30;
lbl_1_bss_7C = 1; lbl_1_bss_7C = 1;
@ -758,7 +575,8 @@ void fn_1_7C60(void) {
HuAudFXPlay(0x524); HuAudFXPlay(0x524);
} }
static s32 fn_1_7D04(float arg0, float arg1, Vec *arg2) { static s32 fn_1_7D04(float arg0, float arg1, Vec *arg2)
{
Mtx sp4C; Mtx sp4C;
Mtx sp1C; Mtx sp1C;
Vec sp10; Vec sp10;
@ -799,7 +617,8 @@ static s32 fn_1_7D04(float arg0, float arg1, Vec *arg2) {
return temp_r23; return temp_r23;
} }
float fn_1_7F78(float arg0, float arg1) { float fn_1_7F78(float arg0, float arg1)
{
float temp_f30; float temp_f30;
float var_f31; float var_f31;
omObjData *temp_r31; omObjData *temp_r31;
@ -808,7 +627,8 @@ float fn_1_7F78(float arg0, float arg1) {
temp_f30 = -(arg1 - temp_r31->trans.z); temp_f30 = -(arg1 - temp_r31->trans.z);
if (cosd(temp_r31->rot.x) <= 0.0) { if (cosd(temp_r31->rot.x) <= 0.0) {
var_f31 = 9999.0f; var_f31 = 9999.0f;
} else { }
else {
var_f31 = temp_f30 * sind(temp_r31->rot.x) / cosd(temp_r31->rot.x); var_f31 = temp_f30 * sind(temp_r31->rot.x) / cosd(temp_r31->rot.x);
if (var_f31 > 9999.0f) { if (var_f31 > 9999.0f) {
var_f31 = 9999.0f; var_f31 = 9999.0f;
@ -817,19 +637,23 @@ float fn_1_7F78(float arg0, float arg1) {
return var_f31; return var_f31;
} }
float fn_1_80D4(Vec *arg0, float arg1) { float fn_1_80D4(Vec *arg0, float arg1)
{
return fn_1_7F78(0.0f, arg0->z - arg1); return fn_1_7F78(0.0f, arg0->z - arg1);
} }
static s32 fn_1_8254(void) { static s32 fn_1_8254(void)
{
return lbl_1_bss_7C; return lbl_1_bss_7C;
} }
s32 fn_1_8264(void) { s32 fn_1_8264(void)
{
return lbl_1_bss_88; return lbl_1_bss_88;
} }
static s32 fn_1_8274(UnkBss9CData *arg0, s32 *arg1) { static s32 fn_1_8274(UnkBss9CData *arg0, s32 *arg1)
{
s32 var_r30; s32 var_r30;
s32 i; s32 i;
@ -842,7 +666,8 @@ static s32 fn_1_8274(UnkBss9CData *arg0, s32 *arg1) {
return var_r30; return var_r30;
} }
s32 fn_1_82D0(Vec *arg0) { s32 fn_1_82D0(Vec *arg0)
{
omObjData *temp_r31; omObjData *temp_r31;
UnkBss9CData *temp_r28; UnkBss9CData *temp_r28;
s32 sp8[6]; s32 sp8[6];
@ -864,10 +689,11 @@ s32 fn_1_82D0(Vec *arg0) {
return var_r26; return var_r26;
} }
s32 fn_1_8470(Vec *arg0) { s32 fn_1_8470(Vec *arg0)
{
Mtx sp50; Mtx sp50;
Mtx sp20; Mtx sp20;
omObjData* temp_r30; omObjData *temp_r30;
UnkBss9CData *temp_r27; UnkBss9CData *temp_r27;
s32 sp8[6]; s32 sp8[6];
s32 temp_r26; s32 temp_r26;
@ -896,14 +722,16 @@ s32 fn_1_8470(Vec *arg0) {
return var_r25; return var_r25;
} }
void fn_1_8670(s32 arg0) { void fn_1_8670(s32 arg0)
{
if (arg0 > lbl_1_bss_74) { if (arg0 > lbl_1_bss_74) {
arg0 = lbl_1_bss_74; arg0 = lbl_1_bss_74;
} }
lbl_1_bss_70 = arg0; lbl_1_bss_70 = arg0;
} }
s32 fn_1_86A0(Vec *arg0, Vec *arg1) { s32 fn_1_86A0(Vec *arg0, Vec *arg1)
{
Vec sp48; Vec sp48;
Vec sp3C; Vec sp3C;
Vec sp30; Vec sp30;
@ -972,14 +800,16 @@ s32 fn_1_86A0(Vec *arg0, Vec *arg1) {
continue; continue;
} }
VECSubtract(&temp_r30[temp_r27], &temp_r30[i], &sp24); VECSubtract(&temp_r30[temp_r27], &temp_r30[i], &sp24);
temp_f30 = (sp3C.x * sp24.x - sp24.x * temp_r30[i].x + sp3C.y * sp24.y - sp24.y * temp_r30[i].y + sp3C.z * sp24.z - sp24.z * temp_r30[i].z) / (sp24.x * sp24.x + sp24.y * sp24.y + sp24.z * sp24.z); temp_f30 = (sp3C.x * sp24.x - sp24.x * temp_r30[i].x + sp3C.y * sp24.y - sp24.y * temp_r30[i].y + sp3C.z * sp24.z - sp24.z * temp_r30[i].z)
/ (sp24.x * sp24.x + sp24.y * sp24.y + sp24.z * sp24.z);
sp30.x = temp_r30[i].x + temp_f30 * sp24.x; sp30.x = temp_r30[i].x + temp_f30 * sp24.x;
sp30.y = temp_r30[i].y + temp_f30 * sp24.y; sp30.y = temp_r30[i].y + temp_f30 * sp24.y;
sp30.z = temp_r30[i].z + temp_f30 * sp24.z; sp30.z = temp_r30[i].z + temp_f30 * sp24.z;
VECSubtract(&sp30, &sp3C, &spC); VECSubtract(&sp30, &sp3C, &spC);
temp_f28 = VECMag(&spC); temp_f28 = VECMag(&spC);
VECSubtract(&temp_r29[temp_r27], &temp_r29[i], &sp18); VECSubtract(&temp_r29[temp_r27], &temp_r29[i], &sp18);
temp_f29 = (sp3C.x * sp18.x - sp18.x * temp_r29[i].x + sp3C.y * sp18.y - sp18.y * temp_r29[i].y + sp3C.z * sp18.z - sp18.z * temp_r29[i].z) / (sp18.x * sp18.x + sp18.y * sp18.y + sp18.z * sp18.z); temp_f29 = (sp3C.x * sp18.x - sp18.x * temp_r29[i].x + sp3C.y * sp18.y - sp18.y * temp_r29[i].y + sp3C.z * sp18.z - sp18.z * temp_r29[i].z)
/ (sp18.x * sp18.x + sp18.y * sp18.y + sp18.z * sp18.z);
sp30.x = temp_r29[i].x + temp_f29 * sp18.x; sp30.x = temp_r29[i].x + temp_f29 * sp18.x;
sp30.y = temp_r29[i].y + temp_f29 * sp18.y; sp30.y = temp_r29[i].y + temp_f29 * sp18.y;
sp30.z = temp_r29[i].z + temp_f29 * sp18.z; sp30.z = temp_r29[i].z + temp_f29 * sp18.z;
@ -987,15 +817,18 @@ s32 fn_1_86A0(Vec *arg0, Vec *arg1) {
temp_f27 = VECMag(&spC); temp_f27 = VECMag(&spC);
if (temp_f28 == 0.0f) { if (temp_f28 == 0.0f) {
var_f31 = temp_f30; var_f31 = temp_f30;
} else if (temp_f27 == 0.0f) { }
else if (temp_f27 == 0.0f) {
var_f31 = temp_f29; var_f31 = temp_f29;
} else { }
else {
temp_f26 = 1.0f - temp_f28 / (temp_f28 + temp_f27); temp_f26 = 1.0f - temp_f28 / (temp_f28 + temp_f27);
var_f31 = temp_f30 * temp_f26 + temp_f29 * (1.0f - temp_f26); var_f31 = temp_f30 * temp_f26 + temp_f29 * (1.0f - temp_f26);
} }
if (var_f31 < 0.0f) { if (var_f31 < 0.0f) {
var_f31 = 0.0f; var_f31 = 0.0f;
} else if (var_f31 > 1.0f) { }
else if (var_f31 > 1.0f) {
var_f31 = 1.0f; var_f31 = 1.0f;
} }
sp3C.x = temp_r29[i].x + var_f31 * sp18.x; sp3C.x = temp_r29[i].x + var_f31 * sp18.x;

6
src/REL/m404Dll/main.c
View file

@ -477,7 +477,7 @@ void fn_1_7E0(omObjData *object)
} }
espDispOff(var_r31->unk_02[var_r30]); espDispOff(var_r31->unk_02[var_r30]);
espDrawNoSet(var_r31->unk_02[var_r30], 0); espDrawNoSet(var_r31->unk_02[var_r30], 0);
espAttrSet(var_r31->unk_02[var_r30], 1); espAttrSet(var_r31->unk_02[var_r30], HUSPR_ATTR_NOANIM);
espPosSet(var_r31->unk_02[var_r30], lbl_1_data_84C[var_r29][0] + lbl_1_data_81C[var_r30][0], espPosSet(var_r31->unk_02[var_r30], lbl_1_data_84C[var_r29][0] + lbl_1_data_81C[var_r30][0],
lbl_1_data_84C[var_r29][1] + lbl_1_data_81C[var_r30][1]); lbl_1_data_84C[var_r29][1] + lbl_1_data_81C[var_r30][1]);
} }
@ -1070,7 +1070,7 @@ void fn_1_44A0(omObjData *object)
var_r28 = 1; var_r28 = 1;
CharModelMotionSpeedSet(var_r31->unk_0C, 1.0f); CharModelMotionSpeedSet(var_r31->unk_0C, 1.0f);
Hu3DMotionOverlayReset(object->model[0]); Hu3DMotionOverlayReset(object->model[0]);
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
if (var_r31->unk_74 >= 0) { if (var_r31->unk_74 >= 0) {
HuAudFXStop(var_r31->unk_74); HuAudFXStop(var_r31->unk_74);
var_r31->unk_74 = -1; var_r31->unk_74 = -1;
@ -1230,7 +1230,7 @@ void fn_1_55F4(omObjData *object)
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M404, 0x09)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M404, 0x09));
object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M404, 0x0A)); object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M404, 0x0A));
Hu3DModelAttrSet(object->model[1], 0x40000001); Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_LOOP);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M404, 0x00)); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M404, 0x00));
Hu3DModelShadowMapSet(object->model[2]); Hu3DModelShadowMapSet(object->model[2]);

542
src/REL/m405Dll/main.c
View file

File diff suppressed because it is too large Load diff

98
src/REL/m406Dll/map.c
View file

@ -478,7 +478,7 @@ omObjData *fn_1_2308(Process *arg0)
for (var_r31 = 0; var_r31 < 7; var_r31++) { for (var_r31 = 0; var_r31 < 7; var_r31++) {
var_r30 = lbl_1_bss_CC->model[var_r31] = Hu3DModelCreateFile(lbl_1_data_7A8[var_r31]); var_r30 = lbl_1_bss_CC->model[var_r31] = Hu3DModelCreateFile(lbl_1_data_7A8[var_r31]);
Hu3DModelShadowMapSet(var_r30); Hu3DModelShadowMapSet(var_r30);
Hu3DModelAttrSet(var_r30, 1); Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF);
if (var_r31 < 6) { if (var_r31 < 6) {
fn_1_CDD8(var_r30, 1.25f, 1.05f, 1.0f, 1.0f); fn_1_CDD8(var_r30, 1.25f, 1.05f, 1.0f, 1.0f);
} }
@ -491,19 +491,19 @@ omObjData *fn_1_2308(Process *arg0)
lbl_1_bss_CC->model[var_r31 + 7] = var_r30; lbl_1_bss_CC->model[var_r31 + 7] = var_r30;
} }
if (var_r30 != -1) { if (var_r30 != -1) {
Hu3DModelAttrSet(var_r30, 1); Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF);
Hu3DModelLayerSet(var_r30, 5); Hu3DModelLayerSet(var_r30, 5);
} }
} }
var_r30 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 54)); var_r30 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 54));
lbl_1_bss_CC->model[14] = var_r30; lbl_1_bss_CC->model[14] = var_r30;
Hu3DModelPosSet(var_r30, 0.0f, 10.0f, 0.0f); Hu3DModelPosSet(var_r30, 0.0f, 10.0f, 0.0f);
Hu3DModelAttrSet(var_r30, 1); Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF);
Hu3DModelLayerSet(var_r30, 5); Hu3DModelLayerSet(var_r30, 5);
lbl_1_bss_C8 = omAddObjEx(arg0, 0x7D, 6, 0, 2, NULL); lbl_1_bss_C8 = omAddObjEx(arg0, 0x7D, 6, 0, 2, NULL);
for (var_r31 = 0; var_r31 < 6; var_r31++) { for (var_r31 = 0; var_r31 < 6; var_r31++) {
lbl_1_bss_C8->model[var_r31] = Hu3DModelCreateFile(lbl_1_data_7E0[var_r31]); lbl_1_bss_C8->model[var_r31] = Hu3DModelCreateFile(lbl_1_data_7E0[var_r31]);
Hu3DModelAttrSet(lbl_1_bss_C8->model[var_r31], 1); Hu3DModelAttrSet(lbl_1_bss_C8->model[var_r31], HU3D_ATTR_DISPOFF);
} }
lbl_1_bss_C4 = omAddObjEx(arg0, 0x7D, 3, 0, 3, NULL); lbl_1_bss_C4 = omAddObjEx(arg0, 0x7D, 3, 0, 3, NULL);
lbl_1_bss_C4->trans.x = lbl_1_data_780->x; lbl_1_bss_C4->trans.x = lbl_1_data_780->x;
@ -588,20 +588,20 @@ void fn_1_2C24(omObjData *object)
var_f31 = -(5000.0f + (10000.0f * var_r30)); var_f31 = -(5000.0f + (10000.0f * var_r30));
if (fabs(Center.z - var_f31) > 10000.0 || !lbl_1_bss_BC) { if (fabs(Center.z - var_f31) > 10000.0 || !lbl_1_bss_BC) {
if (object->model[var_r30] != -1) { if (object->model[var_r30] != -1) {
Hu3DModelAttrSet(object->model[var_r30], 1); Hu3DModelAttrSet(object->model[var_r30], HU3D_ATTR_DISPOFF);
} }
var_r29 = var_r30 + 7; var_r29 = var_r30 + 7;
if (object->model[var_r29] != -1) { if (object->model[var_r29] != -1) {
Hu3DModelAttrSet(object->model[var_r29], 1); Hu3DModelAttrSet(object->model[var_r29], HU3D_ATTR_DISPOFF);
} }
} }
else { else {
if (object->model[var_r30] != -1) { if (object->model[var_r30] != -1) {
Hu3DModelAttrReset(object->model[var_r30], 1); Hu3DModelAttrReset(object->model[var_r30], HU3D_ATTR_DISPOFF);
} }
var_r29 = var_r30 + 7; var_r29 = var_r30 + 7;
if (object->model[var_r29] != -1) { if (object->model[var_r29] != -1) {
Hu3DModelAttrReset(object->model[var_r29], 1); Hu3DModelAttrReset(object->model[var_r29], HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -609,41 +609,41 @@ void fn_1_2C24(omObjData *object)
if (object->model[var_r29] != -1) { if (object->model[var_r29] != -1) {
var_f31 = 25000.0f; var_f31 = 25000.0f;
if (fabs(Center.z - var_f31) < 15000.0) { if (fabs(Center.z - var_f31) < 15000.0) {
Hu3DModelAttrSet(object->model[var_r29], 1); Hu3DModelAttrSet(object->model[var_r29], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrReset(object->model[var_r29], 1); Hu3DModelAttrReset(object->model[var_r29], HU3D_ATTR_DISPOFF);
} }
} }
var_r29 = 6; var_r29 = 6;
if (object->model[var_r29] != -1) { if (object->model[var_r29] != -1) {
Hu3DModelAttrSet(object->model[var_r29], 1); Hu3DModelAttrSet(object->model[var_r29], HU3D_ATTR_DISPOFF);
} }
for (var_r30 = 0; var_r30 < 3; var_r30++) { for (var_r30 = 0; var_r30 < 3; var_r30++) {
if (fabs(Center.z - lbl_1_data_780[var_r30].z) > 10000.0) { if (fabs(Center.z - lbl_1_data_780[var_r30].z) > 10000.0) {
Hu3DModelAttrSet(lbl_1_bss_C4->model[var_r30], 1); Hu3DModelAttrSet(lbl_1_bss_C4->model[var_r30], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrReset(lbl_1_bss_C4->model[var_r30], 1); Hu3DModelAttrReset(lbl_1_bss_C4->model[var_r30], HU3D_ATTR_DISPOFF);
} }
} }
return; return;
} }
for (var_r30 = 0; var_r30 < 6; var_r30++) { for (var_r30 = 0; var_r30 < 6; var_r30++) {
if (object->model[var_r30] != -1) { if (object->model[var_r30] != -1) {
Hu3DModelAttrSet(object->model[var_r30], 1); Hu3DModelAttrSet(object->model[var_r30], HU3D_ATTR_DISPOFF);
} }
var_r29 = var_r30 + 7; var_r29 = var_r30 + 7;
if (object->model[var_r29] != -1) { if (object->model[var_r29] != -1) {
Hu3DModelAttrSet(object->model[var_r29], 1); Hu3DModelAttrSet(object->model[var_r29], HU3D_ATTR_DISPOFF);
} }
} }
var_r29 = 6; var_r29 = 6;
if (object->model[var_r29] != -1) { if (object->model[var_r29] != -1) {
Hu3DModelAttrReset(object->model[var_r29], 1); Hu3DModelAttrReset(object->model[var_r29], HU3D_ATTR_DISPOFF);
} }
for (var_r30 = 0; var_r30 < 3; var_r30++) { for (var_r30 = 0; var_r30 < 3; var_r30++) {
Hu3DModelAttrSet(lbl_1_bss_C4->model[var_r30], 1); Hu3DModelAttrSet(lbl_1_bss_C4->model[var_r30], HU3D_ATTR_DISPOFF);
} }
} }
@ -1340,7 +1340,7 @@ void fn_1_4964(ModelData *arg0)
} }
} }
else { else {
Hu3DModelAttrSet(var_r31->unk_00, 1); Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF);
var_r31->unk_08 = -1; var_r31->unk_08 = -1;
var_r31->unk_0C--; var_r31->unk_0C--;
} }
@ -1351,10 +1351,10 @@ void fn_1_4964(ModelData *arg0)
fn_1_D488(sp38, &lbl_1_data_F0[var_r24], &lbl_1_data_F0[var_r24 + 1], &spB8); fn_1_D488(sp38, &lbl_1_data_F0[var_r24], &lbl_1_data_F0[var_r24 + 1], &spB8);
fn_1_D488(sp38, &lbl_1_data_438[var_r24], &lbl_1_data_438[var_r24 + 1], &spAC); fn_1_D488(sp38, &lbl_1_data_438[var_r24], &lbl_1_data_438[var_r24 + 1], &spAC);
fn_1_D488(var_r31->unk_10, &spB8, &spAC, &var_r31->unk_3C); fn_1_D488(var_r31->unk_10, &spB8, &spAC, &var_r31->unk_3C);
Hu3DModelAttrReset(var_r31->unk_00, 1); Hu3DModelAttrReset(var_r31->unk_00, HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrSet(var_r31->unk_00, 1); Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF);
var_r31->unk_08 = -1; var_r31->unk_08 = -1;
continue; continue;
} }
@ -1506,7 +1506,7 @@ void fn_1_67CC(ModelData *arg0)
var_r31 = var_r29->unk_30; var_r31 = var_r29->unk_30;
for (var_r30 = 0; var_r30 < 12; var_r30++, var_r31++) { for (var_r30 = 0; var_r30 < 12; var_r30++, var_r31++) {
if (var_r31->unk_04 != 3 || var_r31->unk_0C > 0) { if (var_r31->unk_04 != 3 || var_r31->unk_0C > 0) {
Hu3DModelAttrSet(var_r31->unk_00, 1); Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF);
var_r31->unk_0C--; var_r31->unk_0C--;
} }
else { else {
@ -1517,9 +1517,9 @@ void fn_1_67CC(ModelData *arg0)
var_r31->unk_30.y -= 0.49f; var_r31->unk_30.y -= 0.49f;
Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_3C.x, var_r31->unk_3C.y, var_r31->unk_3C.z); Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_3C.x, var_r31->unk_3C.y, var_r31->unk_3C.z);
Hu3DModelRotSet(var_r31->unk_00, var_r31->unk_20, var_r31->unk_24, 0.0f); Hu3DModelRotSet(var_r31->unk_00, var_r31->unk_20, var_r31->unk_24, 0.0f);
Hu3DModelAttrReset(var_r31->unk_00, 1); Hu3DModelAttrReset(var_r31->unk_00, HU3D_ATTR_DISPOFF);
if (++var_r31->unk_08 >= 600.0f) { if (++var_r31->unk_08 >= 600.0f) {
Hu3DModelAttrSet(var_r31->unk_00, 1); Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF);
var_r31->unk_04 = 0; var_r31->unk_04 = 0;
var_r31->unk_08 = 0; var_r31->unk_08 = 0;
} }
@ -1646,10 +1646,10 @@ void fn_1_6FFC(void)
var_r30 = lbl_1_bss_B0; var_r30 = lbl_1_bss_B0;
if (var_r30->unk_04 <= 0) { if (var_r30->unk_04 <= 0) {
Hu3DModelAttrSet(var_r30->unk_00, 1); Hu3DModelAttrSet(var_r30->unk_00, HU3D_ATTR_DISPOFF);
return; return;
} }
Hu3DModelAttrReset(var_r30->unk_00, 1); Hu3DModelAttrReset(var_r30->unk_00, HU3D_ATTR_DISPOFF);
var_r27 = &Hu3DData[var_r30->unk_00]; var_r27 = &Hu3DData[var_r30->unk_00];
var_r29 = var_r27->unk_120; var_r29 = var_r27->unk_120;
var_r31 = var_r29->unk_3C; var_r31 = var_r29->unk_3C;
@ -1680,7 +1680,7 @@ void fn_1_717C(void)
UnkM406Struct10 *var_r31; UnkM406Struct10 *var_r31;
var_r31 = lbl_1_bss_B0; var_r31 = lbl_1_bss_B0;
Hu3DModelAttrSet(var_r31->unk_00, 1); Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF);
HuSprAnimKill(var_r31->unk_08); HuSprAnimKill(var_r31->unk_08);
} }
@ -1805,10 +1805,10 @@ void fn_1_77F0(void)
var_r30 = lbl_1_bss_AC; var_r30 = lbl_1_bss_AC;
if (var_r30->unk_04 <= 0) { if (var_r30->unk_04 <= 0) {
Hu3DModelAttrSet(var_r30->unk_00, 1); Hu3DModelAttrSet(var_r30->unk_00, HU3D_ATTR_DISPOFF);
return; return;
} }
Hu3DModelAttrReset(var_r30->unk_00, 1); Hu3DModelAttrReset(var_r30->unk_00, HU3D_ATTR_DISPOFF);
var_r27 = &Hu3DData[var_r30->unk_00]; var_r27 = &Hu3DData[var_r30->unk_00];
var_r29 = var_r27->unk_120; var_r29 = var_r27->unk_120;
var_r31 = var_r29->unk_3C; var_r31 = var_r29->unk_3C;
@ -1846,7 +1846,7 @@ void fn_1_79B0(void)
UnkM406Struct10 *var_r31; UnkM406Struct10 *var_r31;
var_r31 = lbl_1_bss_AC; var_r31 = lbl_1_bss_AC;
Hu3DModelAttrSet(var_r31->unk_00, 1); Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF);
HuSprAnimKill(var_r31->unk_08); HuSprAnimKill(var_r31->unk_08);
} }
@ -1939,10 +1939,10 @@ void fn_1_7C4C(void)
var_r30 = lbl_1_bss_A8; var_r30 = lbl_1_bss_A8;
if (var_r30->unk_04 <= 0) { if (var_r30->unk_04 <= 0) {
Hu3DModelAttrSet(var_r30->unk_00, 1); Hu3DModelAttrSet(var_r30->unk_00, HU3D_ATTR_DISPOFF);
return; return;
} }
Hu3DModelAttrReset(var_r30->unk_00, 1); Hu3DModelAttrReset(var_r30->unk_00, HU3D_ATTR_DISPOFF);
var_r27 = &Hu3DData[var_r30->unk_00]; var_r27 = &Hu3DData[var_r30->unk_00];
var_r29 = var_r27->unk_120; var_r29 = var_r27->unk_120;
var_r31 = var_r29->unk_3C; var_r31 = var_r29->unk_3C;
@ -2031,10 +2031,10 @@ void fn_1_7F80(void)
var_r30 = lbl_1_bss_A4; var_r30 = lbl_1_bss_A4;
if (var_r30->unk_04 <= 0) { if (var_r30->unk_04 <= 0) {
Hu3DModelAttrSet(var_r30->unk_00, 1); Hu3DModelAttrSet(var_r30->unk_00, HU3D_ATTR_DISPOFF);
return; return;
} }
Hu3DModelAttrReset(var_r30->unk_00, 1); Hu3DModelAttrReset(var_r30->unk_00, HU3D_ATTR_DISPOFF);
var_r27 = &Hu3DData[var_r30->unk_00]; var_r27 = &Hu3DData[var_r30->unk_00];
var_r29 = var_r27->unk_120; var_r29 = var_r27->unk_120;
var_r31 = var_r29->unk_3C; var_r31 = var_r29->unk_3C;
@ -2235,7 +2235,7 @@ void fn_1_8F98(void)
var_r31->unk_04 = Hu3DModelLink(lbl_1_bss_A0->unk_04); var_r31->unk_04 = Hu3DModelLink(lbl_1_bss_A0->unk_04);
} }
Hu3DModelLayerSet(var_r31->unk_04, 3); Hu3DModelLayerSet(var_r31->unk_04, 3);
Hu3DModelAttrSet(var_r31->unk_04, 1); Hu3DModelAttrSet(var_r31->unk_04, HU3D_ATTR_DISPOFF);
} }
for (var_r30 = 0, var_r31 = &lbl_1_bss_A0[64]; var_r30 < 64; var_r30++, var_r31++) { for (var_r30 = 0, var_r31 = &lbl_1_bss_A0[64]; var_r30 < 64; var_r30++, var_r31++) {
@ -2254,7 +2254,7 @@ void fn_1_8F98(void)
var_r31->unk_04 = Hu3DModelLink(lbl_1_bss_A0[64].unk_04); var_r31->unk_04 = Hu3DModelLink(lbl_1_bss_A0[64].unk_04);
} }
Hu3DModelLayerSet(var_r31->unk_04, 3); Hu3DModelLayerSet(var_r31->unk_04, 3);
Hu3DModelAttrSet(var_r31->unk_04, 1); Hu3DModelAttrSet(var_r31->unk_04, HU3D_ATTR_DISPOFF);
} }
} }
@ -2285,7 +2285,7 @@ void fn_1_91E0(void)
var_r30->unk_F0[2][3] = var_r31->unk_1C[2][3]; var_r30->unk_F0[2][3] = var_r31->unk_1C[2][3];
Hu3DModelTPLvlSet(var_r31->unk_04, 1.0f - var_f30); Hu3DModelTPLvlSet(var_r31->unk_04, 1.0f - var_f30);
if ((var_r31->unk_0C += var_r31->unk_10) >= var_r31->unk_14) { if ((var_r31->unk_0C += var_r31->unk_10) >= var_r31->unk_14) {
Hu3DModelAttrSet(var_r31->unk_04, 1); Hu3DModelAttrSet(var_r31->unk_04, HU3D_ATTR_DISPOFF);
var_r31->unk_00 = 0; var_r31->unk_00 = 0;
var_r31->unk_0C = 0.0f; var_r31->unk_0C = 0.0f;
} }
@ -2306,7 +2306,7 @@ void fn_1_91E0(void)
var_r30->unk_F0[2][3] = var_r31->unk_1C[2][3]; var_r30->unk_F0[2][3] = var_r31->unk_1C[2][3];
Hu3DModelTPLvlSet(var_r31->unk_04, 1.0f - var_f30); Hu3DModelTPLvlSet(var_r31->unk_04, 1.0f - var_f30);
if ((var_r31->unk_0C += var_r31->unk_10) >= var_r31->unk_14) { if ((var_r31->unk_0C += var_r31->unk_10) >= var_r31->unk_14) {
Hu3DModelAttrSet(var_r31->unk_04, 1); Hu3DModelAttrSet(var_r31->unk_04, HU3D_ATTR_DISPOFF);
var_r31->unk_00 = 0; var_r31->unk_00 = 0;
var_r31->unk_0C = 0.0f; var_r31->unk_0C = 0.0f;
} }
@ -2431,7 +2431,7 @@ s32 fn_1_94C0(Mtx arg0, s32 arg1, s32 arg2)
Hu3DModelPosSet(var_r31->unk_04, 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(var_r31->unk_04, 0.0f, 0.0f, 0.0f);
Hu3DModelRotSet(var_r31->unk_04, 0.0f, 0.0f, 0.0f); Hu3DModelRotSet(var_r31->unk_04, 0.0f, 0.0f, 0.0f);
Hu3DModelScaleSet(var_r31->unk_04, 1.0f, 1.0f, 1.0f); Hu3DModelScaleSet(var_r31->unk_04, 1.0f, 1.0f, 1.0f);
Hu3DModelAttrReset(var_r31->unk_04, 1); Hu3DModelAttrReset(var_r31->unk_04, HU3D_ATTR_DISPOFF);
(void)var_r31; (void)var_r31;
return var_r28; return var_r28;
} }
@ -2614,7 +2614,7 @@ void fn_1_ADB4(ModelData *arg0, float (*arg1)[4])
var_r31 = &Hu3DCamera[0]; var_r31 = &Hu3DCamera[0];
var_r30 = lbl_1_bss_9C; var_r30 = lbl_1_bss_9C;
if (var_r30->unk_28 <= 0.0f) { if (var_r30->unk_28 <= 0.0f) {
Hu3DModelAttrSet(var_r30->unk_20, 1); Hu3DModelAttrSet(var_r30->unk_20, HU3D_ATTR_DISPOFF);
return; return;
} }
GXSetScissor(var_r31->scissor_x, var_r31->scissor_y, var_r31->scissor_w, var_r31->scissor_h); GXSetScissor(var_r31->scissor_x, var_r31->scissor_y, var_r31->scissor_w, var_r31->scissor_h);
@ -2653,16 +2653,16 @@ void fn_1_B104(float arg8)
var_r31 = lbl_1_bss_9C; var_r31 = lbl_1_bss_9C;
var_r31->unk_24 = arg8; var_r31->unk_24 = arg8;
if (var_r31->unk_24 <= 0.0f) { if (var_r31->unk_24 <= 0.0f) {
Hu3DModelAttrSet(var_r31->unk_10, 1); Hu3DModelAttrSet(var_r31->unk_10, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk_14, 1); Hu3DModelAttrSet(var_r31->unk_14, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk_18, 1); Hu3DModelAttrSet(var_r31->unk_18, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk_1C, 1); Hu3DModelAttrSet(var_r31->unk_1C, HU3D_ATTR_DISPOFF);
return; return;
} }
Hu3DModelAttrReset(var_r31->unk_10, 1); Hu3DModelAttrReset(var_r31->unk_10, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r31->unk_14, 1); Hu3DModelAttrReset(var_r31->unk_14, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r31->unk_18, 1); Hu3DModelAttrReset(var_r31->unk_18, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r31->unk_1C, 1); Hu3DModelAttrReset(var_r31->unk_1C, HU3D_ATTR_DISPOFF);
} }
void fn_1_B1E0(float arg8) void fn_1_B1E0(float arg8)
@ -2672,10 +2672,10 @@ void fn_1_B1E0(float arg8)
var_r31 = lbl_1_bss_9C; var_r31 = lbl_1_bss_9C;
var_r31->unk_28 = arg8; var_r31->unk_28 = arg8;
if (var_r31->unk_28 <= 0.0f) { if (var_r31->unk_28 <= 0.0f) {
Hu3DModelAttrSet(var_r31->unk_20, 1); Hu3DModelAttrSet(var_r31->unk_20, HU3D_ATTR_DISPOFF);
return; return;
} }
Hu3DModelAttrReset(var_r31->unk_20, 1); Hu3DModelAttrReset(var_r31->unk_20, HU3D_ATTR_DISPOFF);
} }
void fn_1_B25C(void) void fn_1_B25C(void)

26
src/REL/m406Dll/player.c
View file

@ -380,15 +380,15 @@ void fn_1_D90C(omObjData *object)
CharModelLayerSetAll(Hu3DData[object->model[0]].layer + 1); CharModelLayerSetAll(Hu3DData[object->model[0]].layer + 1);
object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 32)); object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 32));
Hu3DModelHookSet(object->model[0], "test11_tex_we-itemhook-body", object->model[5]); Hu3DModelHookSet(object->model[0], "test11_tex_we-itemhook-body", object->model[5]);
Hu3DModelAttrSet(object->model[5], 1); Hu3DModelAttrSet(object->model[5], HU3D_ATTR_DISPOFF);
fn_1_13A88(object->model[0], "test11_tex_we-itemhook-body", sp8); fn_1_13A88(object->model[0], "test11_tex_we-itemhook-body", sp8);
var_r31->unk_68 = sp8[0][3]; var_r31->unk_68 = sp8[0][3];
var_r31->unk_6C = sp8[1][3]; var_r31->unk_6C = sp8[1][3];
var_r31->unk_70 = sp8[2][3]; var_r31->unk_70 = sp8[2][3];
object->model[6] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 33)); object->model[6] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 33));
Hu3DModelAttrSet(object->model[6], 1); Hu3DModelAttrSet(object->model[6], HU3D_ATTR_DISPOFF);
object->model[7] = Hu3DModelCreateFile(lbl_1_data_1120[var_r31->unk_0C]); object->model[7] = Hu3DModelCreateFile(lbl_1_data_1120[var_r31->unk_0C]);
Hu3DModelAttrSet(object->model[7], 1); Hu3DModelAttrSet(object->model[7], HU3D_ATTR_DISPOFF);
for (var_r29 = 0; var_r29 < 10U; var_r29++) { for (var_r29 = 0; var_r29 < 10U; var_r29++) {
object->motion[var_r29] = CharModelMotionCreate(var_r31->unk_0C, lbl_1_data_1078[var_r29]); object->motion[var_r29] = CharModelMotionCreate(var_r31->unk_0C, lbl_1_data_1078[var_r29]);
} }
@ -542,7 +542,7 @@ void fn_1_E214(omObjData *object)
if ((var_r26->attr & 1) == 0) { if ((var_r26->attr & 1) == 0) {
Hu3D3Dto2D(&object->trans, 1, &sp28); Hu3D3Dto2D(&object->trans, 1, &sp28);
if (sp28.x < 0.0 || sp28.x >= 576.0f || sp28.y < 0.0 || sp28.y >= 480.0f) { if (sp28.x < 0.0 || sp28.x >= 576.0f || sp28.y < 0.0 || sp28.y >= 480.0f) {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
} }
} }
return; return;
@ -653,7 +653,7 @@ void fn_1_E214(omObjData *object)
} }
break; break;
case 2: case 2:
Hu3DModelAttrReset(object->model[5], 1); Hu3DModelAttrReset(object->model[5], HU3D_ATTR_DISPOFF);
if (var_r31->unk_5A < 20) { if (var_r31->unk_5A < 20) {
var_r31->unk_54 = var_r31->unk_5A / 20.0f; var_r31->unk_54 = var_r31->unk_5A / 20.0f;
} }
@ -703,11 +703,11 @@ void fn_1_E214(omObjData *object)
var_r31->unk_00_field3 = 0; var_r31->unk_00_field3 = 0;
var_r31->unk_12 = 0; var_r31->unk_12 = 0;
var_r31->unk_5C = 0; var_r31->unk_5C = 0;
Hu3DModelAttrSet(object->model[5], 1); Hu3DModelAttrSet(object->model[5], HU3D_ATTR_DISPOFF);
Hu3DData[object->model[6]].unk_64 = 0.0f; Hu3DData[object->model[6]].unk_64 = 0.0f;
Hu3DModelPosSet(object->model[6], object->trans.x + var_r31->unk_68, object->trans.y + var_r31->unk_6C, Hu3DModelPosSet(object->model[6], object->trans.x + var_r31->unk_68, object->trans.y + var_r31->unk_6C,
object->trans.z + var_r31->unk_70); object->trans.z + var_r31->unk_70);
Hu3DModelAttrReset(object->model[6], 1); Hu3DModelAttrReset(object->model[6], HU3D_ATTR_DISPOFF);
PSMTXIdentity(var_r26->unk_F0); PSMTXIdentity(var_r26->unk_F0);
fn_1_117BC(var_r31->unk_14.x, 25.0f, &var_r31->unk_44, &var_r31->unk_2C); fn_1_117BC(var_r31->unk_14.x, 25.0f, &var_r31->unk_44, &var_r31->unk_2C);
} }
@ -719,7 +719,7 @@ void fn_1_E214(omObjData *object)
break; break;
} }
if (Hu3DMotionEndCheck(object->model[6])) { if (Hu3DMotionEndCheck(object->model[6])) {
Hu3DModelAttrSet(object->model[6], 1); Hu3DModelAttrSet(object->model[6], HU3D_ATTR_DISPOFF);
} }
fn_1_DD7C(object, var_r27, var_f31, var_r25); fn_1_DD7C(object, var_r27, var_f31, var_r25);
fn_1_F194(object); fn_1_F194(object);
@ -950,7 +950,7 @@ void fn_1_FA50(ModelData *model, Mtx mtx)
else { else {
var_r30->func = fn_1_11058; var_r30->func = fn_1_11058;
} }
Hu3DModelAttrSet(*var_r30->model, 1); Hu3DModelAttrSet(*var_r30->model, HU3D_ATTR_DISPOFF);
for (var_r26 = 0; var_r26 < 2; var_r26++) { for (var_r26 = 0; var_r26 < 2; var_r26++) {
if (var_r31->unk_7C[var_r26] >= 0) { if (var_r31->unk_7C[var_r26] >= 0) {
HuAudFXStop(var_r31->unk_7C[var_r26]); HuAudFXStop(var_r31->unk_7C[var_r26]);
@ -1146,7 +1146,7 @@ void fn_1_1065C(omObjData *object)
var_r31->unk_2C.z = -20.0f; var_r31->unk_2C.z = -20.0f;
Hu3DModelShadowReset(object->model[0]); Hu3DModelShadowReset(object->model[0]);
fn_1_6BB4(&object->trans); fn_1_6BB4(&object->trans);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_1_10744; object->func = fn_1_10744;
} }
@ -1271,7 +1271,7 @@ void fn_1_11058(omObjData *object)
var_r30->unk_64 = 90.0f + (frand() & 0x1F); var_r30->unk_64 = 90.0f + (frand() & 0x1F);
} }
for (var_r28 = 0; var_r28 < 8; var_r28++) { for (var_r28 = 0; var_r28 < 8; var_r28++) {
Hu3DModelAttrSet(object->model[var_r28], 1); Hu3DModelAttrSet(object->model[var_r28], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(object->model[var_r28], 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(object->model[var_r28], 0.0f, 0.0f, 0.0f);
Hu3DModelRotSet(object->model[var_r28], 0.0f, 0.0f, 0.0f); Hu3DModelRotSet(object->model[var_r28], 0.0f, 0.0f, 0.0f);
Hu3DModelScaleSet(object->model[var_r28], 1.0f, 1.0f, 1.0f); Hu3DModelScaleSet(object->model[var_r28], 1.0f, 1.0f, 1.0f);
@ -1313,8 +1313,8 @@ void fn_1_114A0(omObjData *object)
case 1: case 1:
if (var_r31->unk_64 != 0) { if (var_r31->unk_64 != 0) {
if (--var_r31->unk_64 == 0) { if (--var_r31->unk_64 == 0) {
Hu3DModelAttrReset(object->model[5], 1); Hu3DModelAttrReset(object->model[5], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[7], 1); Hu3DModelAttrReset(object->model[7], HU3D_ATTR_DISPOFF);
} }
else { else {
return; return;

130
src/REL/m407dll/effect.c
View file

@ -1,48 +1,44 @@
#include "game/process.h"
#include "game/object.h"
#include "game/hsfmotion.h"
#include "game/hsfdraw.h" #include "game/hsfdraw.h"
#include "game/hsfmotion.h"
#include "game/object.h"
#include "game/process.h"
#include "REL/m407dll.h" #include "REL/m407dll.h"
typedef struct unkDominationData4 { typedef struct unkDominationData4 {
/* 0x00 */ u32 unk_00; /* 0x00 */ u32 unk_00;
/* 0x04 */ u32 unk_04; /* 0x04 */ u32 unk_04;
/* 0x08 */ s32 unk_08; /* 0x08 */ s32 unk_08;
/* 0x0C */ s32 unk_0C; /* 0x0C */ s32 unk_0C;
/* 0x10 */ f32 unk_10; /* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14; /* 0x14 */ f32 unk_14;
/* 0x18 */ f32 unk_18; /* 0x18 */ f32 unk_18;
/* 0x1C */ s32 unk_1C; /* 0x1C */ s32 unk_1C;
} unkDominationData4; //size of 0x20 } unkDominationData4; // size of 0x20
//function signatures // function signatures
void fn_1_4858(omObjData* arg0); void fn_1_4858(omObjData *arg0);
void fn_1_485C(omObjData* arg0); void fn_1_485C(omObjData *arg0);
void fn_1_46EC(omObjData* arg0); void fn_1_46EC(omObjData *arg0);
void fn_1_465C(omObjData* arg0, s32 arg1); void fn_1_465C(omObjData *arg0, s32 arg1);
void fn_1_4808(omObjData* arg0); void fn_1_4808(omObjData *arg0);
//bss // bss
Process* lbl_1_bss_3970; Process *lbl_1_bss_3970;
omObjData* lbl_1_bss_37E0[100]; omObjData *lbl_1_bss_37E0[100];
//data // data
s32 lbl_1_data_288[] = { s32 lbl_1_data_288[] = { DATA_MAKE_NUM(DATADIR_M407, 0x15), DATA_MAKE_NUM(DATADIR_M407, 0x16), DATA_MAKE_NUM(DATADIR_M407, 0x17),
DATA_MAKE_NUM(DATADIR_M407, 0x15), DATA_MAKE_NUM(DATADIR_M407, 0x18), DATA_MAKE_NUM(DATADIR_M407, 0x19) };
DATA_MAKE_NUM(DATADIR_M407, 0x16),
DATA_MAKE_NUM(DATADIR_M407, 0x17),
DATA_MAKE_NUM(DATADIR_M407, 0x18),
DATA_MAKE_NUM(DATADIR_M407, 0x19)
};
ObjFuncs lbl_1_data_29C[] = { ObjFuncs lbl_1_data_29C[] = {
fn_1_4858, fn_1_4858,
fn_1_485C, fn_1_485C,
}; };
void fn_1_41CC(Process* arg0) { void fn_1_41CC(Process *arg0)
Process* sp8; {
Process *sp8;
u32 i; u32 i;
u32 temp_r30; u32 temp_r30;
@ -60,15 +56,15 @@ void fn_1_41CC(Process* arg0) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC); lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC);
lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i; lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 1; lbl_1_bss_37E0[temp_r30 + i]->work[1] = 1;
} }
temp_r30 += i; temp_r30 += i;
for (i = 0; i < 30; i++) { for (i = 0; i < 30; i++) {
lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC); lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC);
lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i; lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 2; lbl_1_bss_37E0[temp_r30 + i]->work[1] = 2;
} }
temp_r30 += i; temp_r30 += i;
@ -76,19 +72,20 @@ void fn_1_41CC(Process* arg0) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC); lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC);
lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i; lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 3; lbl_1_bss_37E0[temp_r30 + i]->work[1] = 3;
} }
temp_r30 += i; temp_r30 += i;
for (i = 0; i < 22; i++) { for (i = 0; i < 22; i++) {
lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC); lbl_1_bss_37E0[temp_r30 + i] = omAddObjEx(lbl_1_bss_3970, 0x800, 1, 0, 5, fn_1_46EC);
lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i; lbl_1_bss_37E0[temp_r30 + i]->work[0] = temp_r30 + i;
lbl_1_bss_37E0[temp_r30 + i]->work[1] = 4; lbl_1_bss_37E0[temp_r30 + i]->work[1] = 4;
} }
} }
void fn_1_44F4(void) { void fn_1_44F4(void)
{
u32 i; u32 i;
for (i = 0; i < ARRAY_COUNT(lbl_1_bss_37E0); i++) { for (i = 0; i < ARRAY_COUNT(lbl_1_bss_37E0); i++) {
@ -96,9 +93,10 @@ void fn_1_44F4(void) {
} }
} }
void fn_1_4544(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4) { void fn_1_4544(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4)
omObjData* temp_r29; {
unkDominationData4* temp_r31; omObjData *temp_r29;
unkDominationData4 *temp_r31;
u32 i; u32 i;
if ((arg4 < (Center.z - 2000.0f)) || (arg4 > (2000.0f + Center.z))) { if ((arg4 < (Center.z - 2000.0f)) || (arg4 > (2000.0f + Center.z))) {
@ -119,24 +117,27 @@ void fn_1_4544(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4) {
} }
} }
void fn_1_465C(omObjData* arg0, s32 arg1) { void fn_1_465C(omObjData *arg0, s32 arg1)
unkDominationData4* temp_r31; {
unkDominationData4 *temp_r31;
temp_r31 = arg0->data; temp_r31 = arg0->data;
temp_r31->unk_0C = arg1; temp_r31->unk_0C = arg1;
temp_r31->unk_1C = 0; temp_r31->unk_1C = 0;
} }
void fn_1_4680(omObjData* arg0) { void fn_1_4680(omObjData *arg0)
unkDominationData4* temp_r31; {
unkDominationData4 *temp_r31;
temp_r31 = arg0->data; temp_r31 = arg0->data;
lbl_1_data_29C[temp_r31->unk_0C](arg0); lbl_1_data_29C[temp_r31->unk_0C](arg0);
omSetTra(arg0, temp_r31->unk_10, temp_r31->unk_14, temp_r31->unk_18); omSetTra(arg0, temp_r31->unk_10, temp_r31->unk_14, temp_r31->unk_18);
} }
void fn_1_46EC(omObjData* arg0) { void fn_1_46EC(omObjData *arg0)
unkDominationData4* temp_r30; {
unkDominationData4 *temp_r30;
arg0->func = fn_1_4680; arg0->func = fn_1_4680;
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData4), MEMORY_DEFAULT_NUM); arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData4), MEMORY_DEFAULT_NUM);
@ -145,19 +146,20 @@ void fn_1_46EC(omObjData* arg0) {
temp_r30->unk_08 = arg0->work[1]; temp_r30->unk_08 = arg0->work[1];
temp_r30->unk_1C = 0; temp_r30->unk_1C = 0;
arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_288[temp_r30->unk_08]); arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_288[temp_r30->unk_08]);
Hu3DModelAttrSet(arg0->model[0], 0x4000); Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(arg0->model[0], 0x40000002); Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(arg0->model[0], 1); Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
temp_r30->unk_10 = 0.0f; temp_r30->unk_10 = 0.0f;
temp_r30->unk_14 = 0.0f; temp_r30->unk_14 = 0.0f;
temp_r30->unk_18 = 0.0f; temp_r30->unk_18 = 0.0f;
fn_1_465C(arg0, 0); fn_1_465C(arg0, 0);
} }
void fn_1_4808(omObjData* arg0) { void fn_1_4808(omObjData *arg0)
unkDominationData4* sp8; {
unkDominationData4 *sp8;
sp8 = arg0->data; sp8 = arg0->data;
Hu3DModelKill(arg0->model[0]); Hu3DModelKill(arg0->model[0]);
if (arg0->data) { if (arg0->data) {
@ -165,31 +167,31 @@ void fn_1_4808(omObjData* arg0) {
} }
} }
void fn_1_4858(omObjData* arg0) { void fn_1_4858(omObjData *arg0) { }
} void fn_1_485C(omObjData *arg0)
{
void fn_1_485C(omObjData* arg0) { unkDominationData4 *temp_r30;
unkDominationData4* temp_r30;
temp_r30 = arg0->data; temp_r30 = arg0->data;
if (temp_r30->unk_04 != 0) { if (temp_r30->unk_04 != 0) {
temp_r30->unk_04--; temp_r30->unk_04--;
} }
if (temp_r30->unk_1C == 0) { if (temp_r30->unk_1C == 0) {
Hu3DMotionTimeSet(*arg0->model, 0.0f); Hu3DMotionTimeSet(*arg0->model, 0.0f);
Hu3DModelAttrReset(*arg0->model, 1); Hu3DModelAttrReset(*arg0->model, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(*arg0->model, 0x40000002); Hu3DModelAttrReset(*arg0->model, 0x40000002);
Hu3DModelAttrSet(*arg0->model, 0x40000001); Hu3DModelAttrSet(*arg0->model, HU3D_MOTATTR_LOOP);
temp_r30->unk_1C++; temp_r30->unk_1C++;
} else if (temp_r30->unk_1C == 1) { }
else if (temp_r30->unk_1C == 1) {
Hu3DModelAttrReset(arg0->model[0], 0x40000001); Hu3DModelAttrReset(arg0->model[0], 0x40000001);
temp_r30->unk_1C++; temp_r30->unk_1C++;
} }
if (Hu3DMotionEndCheck(*arg0->model) != 0) { if (Hu3DMotionEndCheck(*arg0->model) != 0) {
Hu3DModelAttrSet(*arg0->model, 1); Hu3DModelAttrSet(*arg0->model, HU3D_ATTR_DISPOFF);
fn_1_465C(arg0, 0); fn_1_465C(arg0, 0);
} }
} }

6
src/REL/m407dll/map.c
View file

@ -76,7 +76,7 @@ void fn_1_162C(omObjData *arg0)
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f); Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
arg0->model[1] = Hu3DModelCreateFile(lbl_1_data_198[3]); arg0->model[1] = Hu3DModelCreateFile(lbl_1_data_198[3]);
Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f); Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f);
Hu3DModelAttrSet(arg0->model[1], 1); Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF);
for (i = 0; i < ARRAY_COUNT(GWPlayerCfg); i++) { for (i = 0; i < ARRAY_COUNT(GWPlayerCfg); i++) {
arg0->model[i + 2] = Hu3DModelCreateFile(lbl_1_data_198[GWPlayerCfg[i].character + 4]); arg0->model[i + 2] = Hu3DModelCreateFile(lbl_1_data_198[GWPlayerCfg[i].character + 4]);
Hu3DModelAmbSet(arg0->model[i + 2], 1.0f, 1.0f, 1.0f); Hu3DModelAmbSet(arg0->model[i + 2], 1.0f, 1.0f, 1.0f);
@ -107,11 +107,11 @@ void fn_1_162C(omObjData *arg0)
Hu3DModelPosSet(arg0->model[11], 0.0f, 0.0f, -3900.0f); Hu3DModelPosSet(arg0->model[11], 0.0f, 0.0f, -3900.0f);
Hu3DModelPosSet(arg0->model[12], 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(arg0->model[12], 0.0f, 0.0f, 0.0f);
Hu3DModelAttrSet(arg0->model[12], 0x40000001); Hu3DModelAttrSet(arg0->model[12], HU3D_MOTATTR_LOOP);
if (lbl_1_bss_20 > 0) { if (lbl_1_bss_20 > 0) {
Hu3DModelPosSet(arg0->model[1], 0.0f, 0.0f, 200.0f * (f32)lbl_1_bss_20); Hu3DModelPosSet(arg0->model[1], 0.0f, 0.0f, 200.0f * (f32)lbl_1_bss_20);
Hu3DModelAttrReset(arg0->model[1], 1); Hu3DModelAttrReset(arg0->model[1], HU3D_ATTR_DISPOFF);
} }
} }

2
src/REL/m407dll/player.c
View file

@ -363,7 +363,7 @@ void fn_1_64C(omObjData *arg0)
Hu3DModelShadowSet(arg0->model[1]); Hu3DModelShadowSet(arg0->model[1]);
CharModelMotionDataClose(temp_r31->unk_01); CharModelMotionDataClose(temp_r31->unk_01);
CharModelMotionSet(temp_r31->unk_01, arg0->motion[1]); CharModelMotionSet(temp_r31->unk_01, arg0->motion[1]);
Hu3DModelAttrSet(arg0->model[0], 0x40000001); Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelHookSet(arg0->model[0], lbl_1_data_13C[temp_r31->unk_01], arg0->model[1]); Hu3DModelHookSet(arg0->model[0], lbl_1_data_13C[temp_r31->unk_01], arg0->model[1]);
temp_r31->unk_10 = (600.0f - (400.0f * temp_r29)); temp_r31->unk_10 = (600.0f - (400.0f * temp_r29));
temp_r31->unk_14 = 0.0f; temp_r31->unk_14 = 0.0f;

38
src/REL/m407dll/whomp.c
View file

@ -229,10 +229,10 @@ void fn_1_2930(omObjData *arg0)
} }
if ((temp_r31->unk_08.y < 0.0f) || (temp_r31->unk_08.z < (Center.z - 2000.0f))) { if ((temp_r31->unk_08.y < 0.0f) || (temp_r31->unk_08.z < (Center.z - 2000.0f))) {
Hu3DModelAttrSet(arg0->model[0], 1); Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrReset(arg0->model[0], 1); Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
} }
omSetTra(arg0, temp_r31->unk_08.x, temp_r31->unk_08.y, temp_r31->unk_08.z); omSetTra(arg0, temp_r31->unk_08.x, temp_r31->unk_08.y, temp_r31->unk_08.z);
@ -271,7 +271,7 @@ void fn_1_2B7C(omObjData *arg0)
temp_r30->unk_14.z = 0.0f; temp_r30->unk_14.z = 0.0f;
if (temp_r30->unk_00 < 80) { if (temp_r30->unk_00 < 80) {
arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_228[1]); arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_228[1]);
Hu3DModelAttrSet(arg0->model[0], 0x4000); Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_NOCULL);
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f); Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
if (temp_r30->unk_00 == 0) { if (temp_r30->unk_00 == 0) {
arg0->motion[5] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[5]); arg0->motion[5] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[5]);
@ -292,7 +292,7 @@ void fn_1_2B7C(omObjData *arg0)
lbl_1_bss_68[temp_r30->unk_00][i] = arg0->motion[i]; lbl_1_bss_68[temp_r30->unk_00][i] = arg0->motion[i];
} }
Hu3DMotionSet(arg0->model[0], arg0->motion[5]); Hu3DMotionSet(arg0->model[0], arg0->motion[5]);
Hu3DModelAttrSet(arg0->model[0], 0x40000001); Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP);
temp_r30->unk_04 = 1; temp_r30->unk_04 = 1;
} }
else { else {
@ -306,8 +306,8 @@ void fn_1_2B7C(omObjData *arg0)
arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_228[0]); arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_228[0]);
arg0->model[1] = Hu3DModelCreateFile(lbl_1_data_228[2]); arg0->model[1] = Hu3DModelCreateFile(lbl_1_data_228[2]);
arg0->model[2] = Hu3DModelCreateFile(lbl_1_data_228[3]); arg0->model[2] = Hu3DModelCreateFile(lbl_1_data_228[3]);
Hu3DModelAttrSet(arg0->model[0], 0x4000); Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(arg0->model[1], 0x4000); Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_NOCULL);
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f); Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f); Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f);
arg0->motion[2] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[2]); arg0->motion[2] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[2]);
@ -318,11 +318,11 @@ void fn_1_2B7C(omObjData *arg0)
Hu3DModelHookSet(arg0->model[0], "itemhook_r", arg0->model[1]); Hu3DModelHookSet(arg0->model[0], "itemhook_r", arg0->model[1]);
Hu3DModelShadowSet(arg0->model[0]); Hu3DModelShadowSet(arg0->model[0]);
Hu3DModelShadowSet(arg0->model[1]); Hu3DModelShadowSet(arg0->model[1]);
Hu3DModelAttrSet(arg0->model[0], 1); Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->model[1], 1); Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->model[2], 1); Hu3DModelAttrSet(arg0->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->model[2], 0x40000002); Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(arg0->model[2], 0x40000001); Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_LOOP);
temp_r30->unk_04 = 1; temp_r30->unk_04 = 1;
break; break;
} }
@ -403,7 +403,7 @@ void fn_1_3364(omObjData *arg0)
} }
temp_r31->unk_08.y = -300.0f; temp_r31->unk_08.y = -300.0f;
Hu3DModelAttrSet(arg0->model[0], 1); Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
fn_1_290C(arg0, 0); fn_1_290C(arg0, 0);
} }
@ -414,11 +414,11 @@ void fn_1_34A4(omObjData *arg0)
temp_r30 = arg0->data; temp_r30 = arg0->data;
if (temp_r30->unk_2C == 0) { if (temp_r30->unk_2C == 0) {
if (temp_r30->unk_28 == 1) { if (temp_r30->unk_28 == 1) {
Hu3DModelAttrReset(arg0->model[0], 1); Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->model[1], 1); Hu3DModelAttrReset(arg0->model[1], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrReset(arg0->model[0], 1); Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
} }
Hu3DMotionSet(arg0->model[0], arg0->motion[3]); Hu3DMotionSet(arg0->model[0], arg0->motion[3]);
Hu3DModelAttrReset(arg0->model[0], 0x40000001); Hu3DModelAttrReset(arg0->model[0], 0x40000001);
@ -466,10 +466,10 @@ void fn_1_36D0(omObjData *arg0)
sp8 = arg0->data; sp8 = arg0->data;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 10.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionSet(arg0->model[1], arg0->motion[0]); Hu3DMotionSet(arg0->model[1], arg0->motion[0]);
Hu3DModelAttrSet(arg0->model[1], 0x40000001); Hu3DModelAttrSet(arg0->model[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(arg0->model[2], 1); Hu3DModelAttrReset(arg0->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->model[2], 0x40000002); Hu3DModelAttrReset(arg0->model[2], 0x40000002);
Hu3DModelAttrSet(arg0->model[2], 0x40000001); Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_LOOP);
fn_1_290C(arg0, 0); fn_1_290C(arg0, 0);
} }
@ -481,7 +481,7 @@ void fn_1_37B0(omObjData *arg0)
if (temp_r31->unk_2C == 0) { if (temp_r31->unk_2C == 0) {
temp_r31->unk_14.x = 0.0f; temp_r31->unk_14.x = 0.0f;
temp_r31->unk_08.y = 0.0f; temp_r31->unk_08.y = 0.0f;
Hu3DModelAttrSet(arg0->model[0], 0x40000002); Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE);
temp_r31->unk_2C++; temp_r31->unk_2C++;
} }
temp_r31->unk_14.x -= 4.0f; temp_r31->unk_14.x -= 4.0f;

12
src/REL/m408Dll/camera.c
View file

@ -191,8 +191,8 @@ void fn_1_8FAC(omObjData *object)
Center.z + (cosd(CRot.y) * cosd(CRot.x) * CZoom)); Center.z + (cosd(CRot.y) * cosd(CRot.x) * CZoom));
fn_1_BDE0(); fn_1_BDE0();
if (lbl_1_bss_10C == 5) { if (lbl_1_bss_10C == 5) {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
lbl_1_bss_10C = 5; lbl_1_bss_10C = 5;
object->func = fn_1_9514; object->func = fn_1_9514;
} }
@ -208,7 +208,7 @@ void fn_1_9514(omObjData *object)
object->work[2] = 0; object->work[2] = 0;
} }
if (fn_1_6878() >= 4) { if (fn_1_6878() >= 4) {
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
} }
omSetTra(object, Center.x + (sind(CRot.y) * cosd(CRot.x) * CZoom), Center.y + (-sind(CRot.x) * CZoom) - 1000, omSetTra(object, Center.x + (sind(CRot.y) * cosd(CRot.x) * CZoom), Center.y + (-sind(CRot.x) * CZoom) - 1000,
Center.z + (cosd(CRot.y) * cosd(CRot.x) * CZoom)); Center.z + (cosd(CRot.y) * cosd(CRot.x) * CZoom));
@ -235,7 +235,7 @@ void fn_1_9770(omObjData *object)
object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Work99C8), MEMORY_DEFAULT_NUM); object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Work99C8), MEMORY_DEFAULT_NUM);
temp_r31 = object->data; temp_r31 = object->data;
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x0A)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x0A));
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DMotionSpeedSet(object->model[0], 3.0f); Hu3DMotionSpeedSet(object->model[0], 3.0f);
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
object->func = fn_1_99C8; object->func = fn_1_99C8;
@ -429,8 +429,8 @@ void fn_1_99C8(omObjData *object)
void fn_1_A334(omObjData *object) void fn_1_A334(omObjData *object)
{ {
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
} }
void fn_1_A37C(ModelData *model, ParticleData *particle, Mtx matrix) void fn_1_A37C(ModelData *model, ParticleData *particle, Mtx matrix)

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

@ -647,7 +647,7 @@ void fn_1_26E4(omObjData *object)
object->model[1] = Hu3DModelCreateFile(lbl_1_data_C8[temp_r31->unk2]); object->model[1] = Hu3DModelCreateFile(lbl_1_data_C8[temp_r31->unk2]);
Hu3DModelLayerSet(object->model[1], 6); Hu3DModelLayerSet(object->model[1], 6);
Hu3DModelScaleSet(object->model[1], 0.1f * temp_r31->unk8, 0.1f * temp_r31->unk8, 0.1f * temp_r31->unk8); Hu3DModelScaleSet(object->model[1], 0.1f * temp_r31->unk8, 0.1f * temp_r31->unk8, 0.1f * temp_r31->unk8);
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
temp_r31->unk94.x = temp_r31->unk94.y = temp_r31->unk94.z = 0; temp_r31->unk94.x = temp_r31->unk94.y = temp_r31->unk94.z = 0;
temp_r31->unkA0.x = temp_r31->unkA0.y = temp_r31->unkA0.z = 0; temp_r31->unkA0.x = temp_r31->unkA0.y = temp_r31->unkA0.z = 0;
fn_1_1BE8(object, 1.0f); fn_1_1BE8(object, 1.0f);
@ -725,7 +725,7 @@ void fn_1_2FAC(omObjData *object)
temp_r31->unk1C.y = object->trans.y; temp_r31->unk1C.y = object->trans.y;
temp_r31->unk1C.z = object->trans.z; temp_r31->unk1C.z = object->trans.z;
omSetRot(object, temp_r31->unk4C.x, temp_r31->unk4C.y, temp_r31->unk4C.z); omSetRot(object, temp_r31->unk4C.x, temp_r31->unk4C.y, temp_r31->unk4C.z);
Hu3DModelAttrReset(object->model[1], 0x1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
temp_r31->unkC += 0.2f * (1.0f - temp_r31->unkC); temp_r31->unkC += 0.2f * (1.0f - temp_r31->unkC);
if (object->trans.y < 11940) { if (object->trans.y < 11940) {
object->work[1]++; object->work[1]++;
@ -739,7 +739,7 @@ void fn_1_2FAC(omObjData *object)
object->trans.y = temp_r31->unk1C.y = temp_r31->unk94.y = lbl_1_bss_54; object->trans.y = temp_r31->unk1C.y = temp_r31->unk94.y = lbl_1_bss_54;
object->trans.z = temp_r31->unk1C.z = temp_r31->unk94.z = lbl_1_data_104[temp_r31->unk0][1]; object->trans.z = temp_r31->unk1C.z = temp_r31->unk94.z = lbl_1_data_104[temp_r31->unk0][1];
object->rot.y = temp_r31->unk58.x = atan2d(object->trans.x, object->trans.z) + 180.0; object->rot.y = temp_r31->unk58.x = atan2d(object->trans.x, object->trans.z) + 180.0;
Hu3DModelAttrReset(object->model[1], 1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
((ParticleData *)Hu3DData[object->model[2]].unk_120)->unk_00 = 0; ((ParticleData *)Hu3DData[object->model[2]].unk_120)->unk_00 = 0;
object->func = fn_1_3E80; object->func = fn_1_3E80;
} }
@ -983,15 +983,15 @@ void fn_1_4A58(omObjData *object)
object->func = fn_1_3E80; object->func = fn_1_3E80;
} }
if (temp_r26) { if (temp_r26) {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
for (temp_r28 = 0; temp_r28 < temp_r31->unk8; temp_r28++) { for (temp_r28 = 0; temp_r28 < temp_r31->unk8; temp_r28++) {
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
} }
} }
else { else {
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
for (temp_r28 = 0; temp_r28 < temp_r31->unk8; temp_r28++) { for (temp_r28 = 0; temp_r28 < temp_r31->unk8; temp_r28++) {
Hu3DModelAttrReset(object->model[1], 1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -1088,20 +1088,20 @@ void fn_1_5684(omObjData *object)
if (fn_1_6878() >= 4) { if (fn_1_6878() >= 4) {
GWPlayerCoinCollectAdd(object->work[0], temp_r31->unk14); GWPlayerCoinCollectAdd(object->work[0], temp_r31->unk14);
if (lbl_1_bss_48) { if (lbl_1_bss_48) {
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
CharModelMotionSet(temp_r31->unk2, object->motion[6]); CharModelMotionSet(temp_r31->unk2, object->motion[6]);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
object->trans.x = lbl_1_data_144[object->work[0]].x; object->trans.x = lbl_1_data_144[object->work[0]].x;
object->trans.y = 0; object->trans.y = 0;
object->trans.z = lbl_1_data_144[object->work[0]].z; object->trans.z = lbl_1_data_144[object->work[0]].z;
object->rot.x = object->rot.y = object->rot.z = 0; object->rot.x = object->rot.y = object->rot.z = 0;
} }
else { else {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
} }
for (temp_r29 = 0; temp_r29 < 4; temp_r29++) { for (temp_r29 = 0; temp_r29 < 4; temp_r29++) {
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
} }
object->func = fn_1_5AA0; object->func = fn_1_5AA0;
} }

46
src/REL/m408Dll/object.c
View file

@ -219,7 +219,7 @@ void fn_1_11960(omObjData *object)
if (temp_r27 < 0) { if (temp_r27 < 0) {
temp_r27 = Hu3DModelCreateFile(lbl_1_data_1A0[temp_r31->unk0]); temp_r27 = Hu3DModelCreateFile(lbl_1_data_1A0[temp_r31->unk0]);
temp_r23 = Hu3DJointMotionFile(temp_r27, lbl_1_data_1C4[temp_r31->unk0]); temp_r23 = Hu3DJointMotionFile(temp_r27, lbl_1_data_1C4[temp_r31->unk0]);
Hu3DModelAttrSet(temp_r27, 0x40000001); Hu3DModelAttrSet(temp_r27, HU3D_MOTATTR_LOOP);
Hu3DMotionSet(temp_r27, temp_r23); Hu3DMotionSet(temp_r27, temp_r23);
temp_r28 = temp_r27; temp_r28 = temp_r27;
} }
@ -233,7 +233,7 @@ void fn_1_11960(omObjData *object)
if (temp_r26 < 0) { if (temp_r26 < 0) {
temp_r26 = Hu3DModelCreateFile(lbl_1_data_1A0[temp_r31->unk0]); temp_r26 = Hu3DModelCreateFile(lbl_1_data_1A0[temp_r31->unk0]);
temp_r22 = Hu3DJointMotionFile(temp_r26, lbl_1_data_1C4[temp_r31->unk0]); temp_r22 = Hu3DJointMotionFile(temp_r26, lbl_1_data_1C4[temp_r31->unk0]);
Hu3DModelAttrSet(temp_r26, 0x40000001); Hu3DModelAttrSet(temp_r26, HU3D_MOTATTR_LOOP);
Hu3DMotionSet(temp_r26, temp_r22); Hu3DMotionSet(temp_r26, temp_r22);
temp_r28 = temp_r26; temp_r28 = temp_r26;
} }
@ -270,15 +270,15 @@ void fn_1_11960(omObjData *object)
Hu3DModelRotSetV(object->model[temp_r29], &temp_r31->unk34); Hu3DModelRotSetV(object->model[temp_r29], &temp_r31->unk34);
Hu3DModelScaleSet(object->model[temp_r29], 0.15f, 0.15f, 0.15f); Hu3DModelScaleSet(object->model[temp_r29], 0.15f, 0.15f, 0.15f);
Hu3DModelCameraSet(object->model[temp_r29], 1); Hu3DModelCameraSet(object->model[temp_r29], 1);
Hu3DModelAttrSet(object->model[temp_r29], 1); Hu3DModelAttrSet(object->model[temp_r29], HU3D_ATTR_DISPOFF);
if (temp_r31->unk0 < 7) { if (temp_r31->unk0 < 7) {
Hu3DModelAttrSet(object->model[temp_r29], 0x40000001); Hu3DModelAttrSet(object->model[temp_r29], HU3D_MOTATTR_LOOP);
} }
} }
for (temp_r29 = lbl_1_bss_DA0; temp_r29 < lbl_1_bss_DA0 + lbl_1_bss_D9C; temp_r29++) { for (temp_r29 = lbl_1_bss_DA0; temp_r29 < lbl_1_bss_DA0 + lbl_1_bss_D9C; temp_r29++) {
temp_r28 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M408, 0x18)), 32); temp_r28 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M408, 0x18)), 32);
object->model[temp_r29] = temp_r28; object->model[temp_r29] = temp_r28;
Hu3DModelAttrSet(temp_r28, 1); Hu3DModelAttrSet(temp_r28, HU3D_ATTR_DISPOFF);
Hu3DModelLayerSet(temp_r28, 6); Hu3DModelLayerSet(temp_r28, 6);
Hu3DParticleColSet(temp_r28, 255, 255, 255); Hu3DParticleColSet(temp_r28, 255, 255, 255);
Hu3DParticleHookSet(temp_r28, fn_1_15658); Hu3DParticleHookSet(temp_r28, fn_1_15658);
@ -403,10 +403,10 @@ void fn_1_123C8(omObjData *object)
Hu3DModelRotSetV(object->model[temp_r29], &temp_r31->unk34); Hu3DModelRotSetV(object->model[temp_r29], &temp_r31->unk34);
Hu3DModelScaleSet(object->model[temp_r29], 0.15f * temp_r31->unk4C, 0.15f * temp_r31->unk4C, 0.15f * temp_r31->unk4C); Hu3DModelScaleSet(object->model[temp_r29], 0.15f * temp_r31->unk4C, 0.15f * temp_r31->unk4C, 0.15f * temp_r31->unk4C);
if (temp_r31->unkC.y > fn_1_6888() - 1000 && temp_r31->unkC.y < fn_1_6888() + 200) { if (temp_r31->unkC.y > fn_1_6888() - 1000 && temp_r31->unkC.y < fn_1_6888() + 200) {
Hu3DModelAttrReset(object->model[temp_r29], 1); Hu3DModelAttrReset(object->model[temp_r29], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrSet(object->model[temp_r29], 1); Hu3DModelAttrSet(object->model[temp_r29], HU3D_ATTR_DISPOFF);
} }
if (temp_r31->unk0 == 7 || temp_r31->unk0 == 8) { if (temp_r31->unk0 == 7 || temp_r31->unk0 == 8) {
if (temp_r31->unkC.y > fn_1_6888() - 150 && temp_r31->unkC.y < fn_1_6888() + 10) { if (temp_r31->unkC.y > fn_1_6888() - 150 && temp_r31->unkC.y < fn_1_6888() + 10) {
@ -415,13 +415,13 @@ void fn_1_123C8(omObjData *object)
} }
} }
else { else {
Hu3DModelAttrSet(object->model[temp_r29], 1); Hu3DModelAttrSet(object->model[temp_r29], HU3D_ATTR_DISPOFF);
} }
} }
temp_r28 = fn_1_6878(); temp_r28 = fn_1_6878();
if (temp_r28 == 5) { if (temp_r28 == 5) {
for (temp_r29 = 0; temp_r29 < lbl_1_bss_DA0; temp_r29++, temp_r31++) { for (temp_r29 = 0; temp_r29 < lbl_1_bss_DA0; temp_r29++, temp_r31++) {
Hu3DModelAttrSet(object->model[temp_r29], 1); Hu3DModelAttrSet(object->model[temp_r29], HU3D_ATTR_DISPOFF);
} }
object->func = fn_1_12670; object->func = fn_1_12670;
} }
@ -567,7 +567,7 @@ void fn_1_12C6C(StructBssDA4 *arg0)
if (arg0->unkC.y - 15.0f > Center.y + CZoom) { if (arg0->unkC.y - 15.0f > Center.y + CZoom) {
arg0->unk54 = 4; arg0->unk54 = 4;
arg0->unk50 = 0; arg0->unk50 = 0;
Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF);
} }
break; break;
@ -646,7 +646,7 @@ void fn_1_1305C(StructBssDA4 *arg0)
if (arg0->unkC.y - 15.0f > Center.y + CZoom) { if (arg0->unkC.y - 15.0f > Center.y + CZoom) {
arg0->unk54 = 4; arg0->unk54 = 4;
arg0->unk50 = 0; arg0->unk50 = 0;
Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF);
} }
break; break;
@ -709,7 +709,7 @@ void fn_1_134D8(StructBssDA4 *arg0)
if (arg0->unkC.y - 15.0f > Center.y + CZoom) { if (arg0->unkC.y - 15.0f > Center.y + CZoom) {
arg0->unk54 = 4; arg0->unk54 = 4;
arg0->unk50 = 0; arg0->unk50 = 0;
Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF);
} }
break; break;
@ -784,7 +784,7 @@ void fn_1_13820(StructBssDA4 *arg0)
arg0->unk5C = 1; arg0->unk5C = 1;
arg0->unk54 = 4; arg0->unk54 = 4;
arg0->unk50 = 0; arg0->unk50 = 0;
Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF);
break; break;
case 4: case 4:
@ -833,7 +833,7 @@ void fn_1_13D88(StructBssDA4 *arg0)
} }
if (arg0->unk5C == 1 && arg0->unkC.y - 15.0f > Center.y + CZoom) { if (arg0->unk5C == 1 && arg0->unkC.y - 15.0f > Center.y + CZoom) {
arg0->unk50 = 0; arg0->unk50 = 0;
Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF);
} }
if (arg0->unk34.y > 360.0f) { if (arg0->unk34.y > 360.0f) {
arg0->unk34.y -= 360.0f; arg0->unk34.y -= 360.0f;
@ -911,7 +911,7 @@ void fn_1_1406C(StructBssDA4 *arg0)
break; break;
case 3: case 3:
Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF);
arg0->unk5C = 1; arg0->unk5C = 1;
arg0->unk50 = 0; arg0->unk50 = 0;
arg0->unk54++; arg0->unk54++;
@ -1018,7 +1018,7 @@ void fn_1_144D0(StructBssDA4 *arg0)
} }
else { else {
arg0->unk54 = 4; arg0->unk54 = 4;
Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF);
} }
temp_f27 = 0; temp_f27 = 0;
temp_f29 = 50 + (40 * temp_f27); temp_f29 = 50 + (40 * temp_f27);
@ -1046,7 +1046,7 @@ void fn_1_144D0(StructBssDA4 *arg0)
case 4: case 4:
if (arg0->unk5C == 1 && arg0->unkC.y - 15.0f > Center.y + CZoom) { if (arg0->unk5C == 1 && arg0->unkC.y - 15.0f > Center.y + CZoom) {
arg0->unk50 = 0; arg0->unk50 = 0;
Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF);
} }
break; break;
} }
@ -1086,7 +1086,7 @@ void fn_1_14DB4(StructBssDA4 *arg0)
arg0->unk54 = 4; arg0->unk54 = 4;
arg0->unk60 = 0; arg0->unk60 = 0;
temp_r30 = lbl_1_bss_75A8->model[arg0->unk8]; temp_r30 = lbl_1_bss_75A8->model[arg0->unk8];
Hu3DModelAttrReset(temp_r30, 1); Hu3DModelAttrReset(temp_r30, HU3D_ATTR_DISPOFF);
fn_1_15B50(temp_r30); fn_1_15B50(temp_r30);
fn_1_155E0(temp_r30, 1); fn_1_155E0(temp_r30, 1);
fn_1_15618(temp_r30, arg0->unkC.x, arg0->unkC.y, arg0->unkC.z); fn_1_15618(temp_r30, arg0->unkC.x, arg0->unkC.y, arg0->unkC.z);
@ -1122,7 +1122,7 @@ void fn_1_14DB4(StructBssDA4 *arg0)
} }
else { else {
arg0->unk50 = 0; arg0->unk50 = 0;
Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF);
} }
break; break;
} }
@ -1172,7 +1172,7 @@ void fn_1_151A4(StructBssDA4 *arg0)
arg0->unk54 = 4; arg0->unk54 = 4;
arg0->unk60 = 0; arg0->unk60 = 0;
temp_r30 = lbl_1_bss_75A8->model[arg0->unk8]; temp_r30 = lbl_1_bss_75A8->model[arg0->unk8];
Hu3DModelAttrReset(temp_r30, 1); Hu3DModelAttrReset(temp_r30, HU3D_ATTR_DISPOFF);
fn_1_15B50(temp_r30); fn_1_15B50(temp_r30);
fn_1_155E0(temp_r30, 1); fn_1_155E0(temp_r30, 1);
fn_1_15618(temp_r30, arg0->unkC.x, arg0->unkC.y, arg0->unkC.z); fn_1_15618(temp_r30, arg0->unkC.x, arg0->unkC.y, arg0->unkC.z);
@ -1205,7 +1205,7 @@ void fn_1_151A4(StructBssDA4 *arg0)
} }
else { else {
arg0->unk50 = 0; arg0->unk50 = 0;
Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF);
} }
break; break;
} }
@ -1368,7 +1368,7 @@ void fn_1_15BCC(omObjData *object)
for (temp_r29 = 0; temp_r29 < 4; temp_r29++) { for (temp_r29 = 0; temp_r29 < 4; temp_r29++) {
temp_r30 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M408, 0x19)), 9); temp_r30 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M408, 0x19)), 9);
object->model[temp_r29] = temp_r30; object->model[temp_r29] = temp_r30;
Hu3DModelAttrSet(temp_r30, 1); Hu3DModelAttrSet(temp_r30, HU3D_ATTR_DISPOFF);
Hu3DModelLayerSet(temp_r30, 7); Hu3DModelLayerSet(temp_r30, 7);
Hu3DParticleColSet(temp_r30, 255, 255, 255); Hu3DParticleColSet(temp_r30, 255, 255, 255);
Hu3DParticleHookSet(temp_r30, fn_1_15D64); Hu3DParticleHookSet(temp_r30, fn_1_15D64);
@ -1391,7 +1391,7 @@ void fn_1_15CA4(omObjData *object)
temp_r29 = object->model[temp_r31]; temp_r29 = object->model[temp_r31];
temp_r28 = &Hu3DData[temp_r29]; temp_r28 = &Hu3DData[temp_r29];
temp_r27 = temp_r28->unk_120; temp_r27 = temp_r28->unk_120;
Hu3DModelAttrReset(temp_r29, 1); Hu3DModelAttrReset(temp_r29, HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(temp_r29, lbl_1_bss_D6C[temp_r31].x, lbl_1_bss_D6C[temp_r31].y, lbl_1_bss_D6C[temp_r31].z); Hu3DModelPosSet(temp_r29, lbl_1_bss_D6C[temp_r31].x, lbl_1_bss_D6C[temp_r31].y, lbl_1_bss_D6C[temp_r31].z);
temp_r27->unk_34 = 0; temp_r27->unk_34 = 0;
} }

52
src/REL/m408Dll/stage.c
View file

@ -95,12 +95,12 @@ void fn_1_C530(omObjData *object)
omSetSca(object, 0.1f, 0.1f, 0.1f); omSetSca(object, 0.1f, 0.1f, 0.1f);
temp_r31 = object->model[0]; temp_r31 = object->model[0];
Hu3DModelLayerSet(temp_r31, 1); Hu3DModelLayerSet(temp_r31, 1);
Hu3DModelAttrSet(temp_r31, 1); Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF);
object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x1E)); object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x1E));
temp_r31 = object->model[4]; temp_r31 = object->model[4];
Hu3DModelLayerSet(temp_r31, 1); Hu3DModelLayerSet(temp_r31, 1);
Hu3DModelScaleSet(temp_r31, 0.1f, 0.1f, 0.1f); Hu3DModelScaleSet(temp_r31, 0.1f, 0.1f, 0.1f);
Hu3DModelAttrSet(temp_r31, 1); Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF);
object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x20)); object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x20));
temp_r31 = object->model[5]; temp_r31 = object->model[5];
Hu3DModelLayerSet(temp_r31, 1); Hu3DModelLayerSet(temp_r31, 1);
@ -110,13 +110,13 @@ void fn_1_C530(omObjData *object)
Hu3DModelLayerSet(temp_r31, 1); Hu3DModelLayerSet(temp_r31, 1);
Hu3DModelPosSet(temp_r31, -20, -10, -150); Hu3DModelPosSet(temp_r31, -20, -10, -150);
Hu3DModelScaleSet(temp_r31, 0.14500001f, 0.14500001f, 0.14500001f); Hu3DModelScaleSet(temp_r31, 0.14500001f, 0.14500001f, 0.14500001f);
Hu3DModelAttrSet(temp_r31, 1); Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF);
object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x1D)); object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x1D));
temp_r31 = object->model[3]; temp_r31 = object->model[3];
Hu3DModelPosSet(temp_r31, 0, -50, -500); Hu3DModelPosSet(temp_r31, 0, -50, -500);
Hu3DModelScaleSet(temp_r31, 0.15f, 0.15f, 0.15f); Hu3DModelScaleSet(temp_r31, 0.15f, 0.15f, 0.15f);
Hu3DModelLayerSet(temp_r31, 0); Hu3DModelLayerSet(temp_r31, 0);
Hu3DModelAttrSet(temp_r31, 1); Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF);
sp8 = fn_1_F4B0(temp_r31, temp_r31); sp8 = fn_1_F4B0(temp_r31, temp_r31);
object->model[9] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x1C)); object->model[9] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x1C));
temp_r31 = object->model[9]; temp_r31 = object->model[9];
@ -124,19 +124,19 @@ void fn_1_C530(omObjData *object)
Hu3DModelScaleSet(temp_r31, 0.11000001f, 0.1f, 0.11000001f); Hu3DModelScaleSet(temp_r31, 0.11000001f, 0.1f, 0.11000001f);
Hu3DModelPosSet(temp_r31, 0, 10000, 0); Hu3DModelPosSet(temp_r31, 0, 10000, 0);
Hu3DModelLayerSet(temp_r31, 1); Hu3DModelLayerSet(temp_r31, 1);
Hu3DModelAttrSet(temp_r31, 1); Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF);
object->model[11] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x1F)); object->model[11] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x1F));
temp_r31 = object->model[11]; temp_r31 = object->model[11];
Hu3DModelPosSet(temp_r31, 0, 10000, 0); Hu3DModelPosSet(temp_r31, 0, 10000, 0);
Hu3DModelLayerSet(temp_r31, 1); Hu3DModelLayerSet(temp_r31, 1);
Hu3DModelScaleSet(temp_r31, 0.105f, 0.1f, 0.105f); Hu3DModelScaleSet(temp_r31, 0.105f, 0.1f, 0.105f);
Hu3DModelAttrSet(temp_r31, 1); Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF);
object->model[12] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x23)); object->model[12] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x23));
temp_r31 = object->model[12]; temp_r31 = object->model[12];
Hu3DModelLayerSet(temp_r31, 3); Hu3DModelLayerSet(temp_r31, 3);
Hu3DModelPosSet(temp_r31, 0, 5000, 0); Hu3DModelPosSet(temp_r31, 0, 5000, 0);
Hu3DModelScaleSet(temp_r31, 0.1f, 0.1f, 0.1f); Hu3DModelScaleSet(temp_r31, 0.1f, 0.1f, 0.1f);
Hu3DModelAttrSet(temp_r31, 1); Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF);
Hu3DMotionSpeedSet(temp_r31, 0); Hu3DMotionSpeedSet(temp_r31, 0);
object->model[19] = temp_r31 = fn_1_D978(lbl_1_bss_14C[0], 80, fn_1_E310); object->model[19] = temp_r31 = fn_1_D978(lbl_1_bss_14C[0], 80, fn_1_E310);
Hu3DModelLayerSet(temp_r31, 1); Hu3DModelLayerSet(temp_r31, 1);
@ -153,13 +153,13 @@ void fn_1_C530(omObjData *object)
Hu3DModelLayerSet(temp_r31, 3); Hu3DModelLayerSet(temp_r31, 3);
Hu3DModelRotSet(temp_r31, 0, frandmod(360), 0); Hu3DModelRotSet(temp_r31, 0, frandmod(360), 0);
Hu3DModelScaleSet(temp_r31, 0.1f, 0.1f, 0.1f); Hu3DModelScaleSet(temp_r31, 0.1f, 0.1f, 0.1f);
Hu3DModelAttrSet(temp_r31, 1); Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF);
Hu3DMotionSpeedSet(temp_r31, 0); Hu3DMotionSpeedSet(temp_r31, 0);
} }
object->model[6] = temp_r31 = fn_1_D978(lbl_1_bss_14C[4], 1, fn_1_EEF8); object->model[6] = temp_r31 = fn_1_D978(lbl_1_bss_14C[4], 1, fn_1_EEF8);
Hu3DModelPosSet(temp_r31, 0, 5000, 0); Hu3DModelPosSet(temp_r31, 0, 5000, 0);
Hu3DModelLayerSet(temp_r31, 3); Hu3DModelLayerSet(temp_r31, 3);
Hu3DModelAttrReset(temp_r31, 1); Hu3DModelAttrReset(temp_r31, HU3D_ATTR_DISPOFF);
Hu3DParticleBlendModeSet(temp_r31, 1); Hu3DParticleBlendModeSet(temp_r31, 1);
temp_r29 = ((ParticleData *)Hu3DData[temp_r31].unk_120)->unk_1C; temp_r29 = ((ParticleData *)Hu3DData[temp_r31].unk_120)->unk_1C;
temp_r29[1] = 800; temp_r29[1] = 800;
@ -243,18 +243,18 @@ void fn_1_CEEC(void)
return; return;
} }
lbl_1_bss_140 = 2; lbl_1_bss_140 = 2;
Hu3DModelAttrSet(temp_r31->model[5], 1); Hu3DModelAttrSet(temp_r31->model[5], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(temp_r31->model[9], 1); Hu3DModelAttrSet(temp_r31->model[9], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(temp_r31->model[11], 1); Hu3DModelAttrSet(temp_r31->model[11], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(temp_r31->model[12], 1); Hu3DModelAttrSet(temp_r31->model[12], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(temp_r31->model[19], 1); Hu3DModelAttrSet(temp_r31->model[19], HU3D_ATTR_DISPOFF);
for (temp_r30 = 0; temp_r30 < 4; temp_r30++) { for (temp_r30 = 0; temp_r30 < 4; temp_r30++) {
Hu3DModelAttrSet(temp_r31->model[temp_r30 + 14], 1); Hu3DModelAttrSet(temp_r31->model[temp_r30 + 14], HU3D_ATTR_DISPOFF);
} }
Hu3DModelAttrReset(temp_r31->model[0], 1); Hu3DModelAttrReset(temp_r31->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(temp_r31->model[4], 1); Hu3DModelAttrReset(temp_r31->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(temp_r31->model[2], 1); Hu3DModelAttrReset(temp_r31->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(temp_r31->model[3], 1); Hu3DModelAttrReset(temp_r31->model[3], HU3D_ATTR_DISPOFF);
} }
void fn_1_D6F0(omObjData *object); void fn_1_D6F0(omObjData *object);
@ -276,14 +276,14 @@ void fn_1_D004(omObjData *object)
temp_f28 = 7000; temp_f28 = 7000;
switch (temp_r30[0]) { switch (temp_r30[0]) {
case 2: case 2:
Hu3DModelAttrReset(object->model[9], 1); Hu3DModelAttrReset(object->model[9], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[11], 1); Hu3DModelAttrReset(object->model[11], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[12], 1); Hu3DModelAttrReset(object->model[12], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[19], 1); Hu3DModelAttrReset(object->model[19], HU3D_ATTR_DISPOFF);
for (temp_r26 = 0; temp_r26 < 4; temp_r26++) { for (temp_r26 = 0; temp_r26 < 4; temp_r26++) {
Hu3DModelAttrReset(object->model[temp_r26 + 14], 1); Hu3DModelAttrReset(object->model[temp_r26 + 14], HU3D_ATTR_DISPOFF);
} }
Hu3DModelAttrReset(object->model[6], 1); Hu3DModelAttrReset(object->model[6], HU3D_ATTR_DISPOFF);
if (lbl_1_bss_134 < 0) { if (lbl_1_bss_134 < 0) {
lbl_1_bss_134 = HuAudFXPlay(1363); lbl_1_bss_134 = HuAudFXPlay(1363);
} }
@ -405,7 +405,7 @@ s16 fn_1_D978(AnimData *arg0, s16 arg1, ParticleHook arg2)
HsfanimStruct01 *temp_r27; HsfanimStruct01 *temp_r27;
temp_r28 = Hu3DParticleCreate(arg0, arg1); temp_r28 = Hu3DParticleCreate(arg0, arg1);
Hu3DParticleHookSet(temp_r28, arg2); Hu3DParticleHookSet(temp_r28, arg2);
Hu3DModelAttrSet(temp_r28, 1); Hu3DModelAttrSet(temp_r28, HU3D_ATTR_DISPOFF);
temp_r29 = Hu3DData[temp_r28].unk_120; temp_r29 = Hu3DData[temp_r28].unk_120;
temp_r27 = temp_r29->unk_48; temp_r27 = temp_r29->unk_48;
for (temp_r31 = 0; temp_r31 < temp_r29->unk_30; temp_r31++, temp_r27++) { for (temp_r31 = 0; temp_r31 < temp_r29->unk_30; temp_r31++, temp_r27++) {

36
src/REL/m409Dll/main.c
View file

@ -142,7 +142,7 @@ s8 fn_1_524(void)
CRot.y = fn_1_4120(var_r31[0].rot.y, var_r31[1].rot.y, var_r31[2].rot.y, temp_f31); CRot.y = fn_1_4120(var_r31[0].rot.y, var_r31[1].rot.y, var_r31[2].rot.y, temp_f31);
CRot.z = fn_1_4120(var_r31[0].rot.z, var_r31[1].rot.z, var_r31[2].rot.z, temp_f31); CRot.z = fn_1_4120(var_r31[0].rot.z, var_r31[1].rot.z, var_r31[2].rot.z, temp_f31);
if (var_f30 > 0.65f) { if (var_f30 > 0.65f) {
Hu3DModelAttrSet(lbl_1_bss_DC->model[1], 1U); Hu3DModelAttrSet(lbl_1_bss_DC->model[1], HU3D_ATTR_DISPOFF);
} }
temp_f29 = var_r31[0].rot.x + (-var_r31[0].rot.x * temp_f31); temp_f29 = var_r31[0].rot.x + (-var_r31[0].rot.x * temp_f31);
Hu3DModelRotSet(lbl_1_bss_DC->model[2], 0.2f * temp_f29, 0.85f * CRot.y, 0.0f); Hu3DModelRotSet(lbl_1_bss_DC->model[2], 0.2f * temp_f29, 0.85f * CRot.y, 0.0f);
@ -453,7 +453,7 @@ void fn_1_2098(omObjData *object)
lbl_1_bss_18 += 0.008f; lbl_1_bss_18 += 0.008f;
if (lbl_1_bss_18 >= 1.0f) { if (lbl_1_bss_18 >= 1.0f) {
fn_1_2414(0x60, 0x40); fn_1_2414(0x60, 0x40);
Hu3DModelAttrSet(lbl_1_bss_DC->model[4], 1U); Hu3DModelAttrSet(lbl_1_bss_DC->model[4], HU3D_ATTR_DISPOFF);
lbl_1_bss_18 = 1.0f; lbl_1_bss_18 = 1.0f;
} }
var_f31 = sin((M_PI * (90.0f * lbl_1_bss_18)) / 180.0); var_f31 = sin((M_PI * (90.0f * lbl_1_bss_18)) / 180.0);
@ -499,8 +499,8 @@ static inline void unkInline(unkStruct4 *var_r31, s16 var_r29, s16 *var_r28, s16
{ {
var_r31[var_r29].unk2 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x02)); var_r31[var_r29].unk2 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x02));
var_r31[var_r29].unk4 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x03)); var_r31[var_r29].unk4 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x03));
Hu3DModelAttrSet(var_r31[var_r29].unk2, 0x40000001); Hu3DModelAttrSet(var_r31[var_r29].unk2, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(var_r31[var_r29].unk4, 0x40000002); Hu3DModelAttrSet(var_r31[var_r29].unk4, HU3D_MOTATTR_PAUSE);
if (arg3) { if (arg3) {
Hu3DModelAttrSet(var_r31[var_r29].unk2, 0x00000001); Hu3DModelAttrSet(var_r31[var_r29].unk2, 0x00000001);
Hu3DModelAttrSet(var_r31[var_r29].unk4, 0x00000001); Hu3DModelAttrSet(var_r31[var_r29].unk4, 0x00000001);
@ -508,7 +508,7 @@ static inline void unkInline(unkStruct4 *var_r31, s16 var_r29, s16 *var_r28, s16
var_r31[var_r29].unk6 = Hu3DModelCreateFile(0x2001C); var_r31[var_r29].unk6 = Hu3DModelCreateFile(0x2001C);
var_r31[var_r29].unk8 = Hu3DJointMotionFile(var_r31[var_r29].unk6, DATA_MAKE_NUM(DATADIR_M409, 11)); var_r31[var_r29].unk8 = Hu3DJointMotionFile(var_r31[var_r29].unk6, DATA_MAKE_NUM(DATADIR_M409, 11));
var_r31[var_r29].unkA = Hu3DJointMotionFile(var_r31[var_r29].unk6, DATA_MAKE_NUM(DATADIR_M409, 12)); var_r31[var_r29].unkA = Hu3DJointMotionFile(var_r31[var_r29].unk6, DATA_MAKE_NUM(DATADIR_M409, 12));
Hu3DModelAttrSet(var_r31[var_r29].unk6, 0x40000001); Hu3DModelAttrSet(var_r31[var_r29].unk6, HU3D_MOTATTR_LOOP);
Hu3DMotionSet(var_r31[var_r29].unk6, var_r31[var_r29].unk8); Hu3DMotionSet(var_r31[var_r29].unk6, var_r31[var_r29].unk8);
var_r31[var_r29].unkC = var_r29 + 3; var_r31[var_r29].unkC = var_r29 + 3;
if (arg3) { if (arg3) {
@ -549,7 +549,7 @@ void fn_1_2484(omObjData *object)
var_r29 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x0A)); var_r29 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x0A));
Hu3DModelLayerSet(var_r29, 0); Hu3DModelLayerSet(var_r29, 0);
object->model[6] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x07)); object->model[6] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x07));
Hu3DModelAttrSet(object->model[6], 2); Hu3DModelAttrSet(object->model[6], HU3D_ATTR_ZWRITE_OFF);
Hu3DModelScaleSet(object->model[6], 1.1f, 1.0f, 1.0f); Hu3DModelScaleSet(object->model[6], 1.1f, 1.0f, 1.0f);
Hu3DModelRotSet(object->model[6], 0.2f * lbl_1_data_4C->rot.x, 0.85f * lbl_1_data_4C->rot.y, 0.0f); Hu3DModelRotSet(object->model[6], 0.2f * lbl_1_data_4C->rot.x, 0.85f * lbl_1_data_4C->rot.y, 0.0f);
Hu3DModelLayerSet(object->model[6], 1); Hu3DModelLayerSet(object->model[6], 1);
@ -557,11 +557,11 @@ void fn_1_2484(omObjData *object)
lbl_1_bss_24.unk14 = 0.0f; lbl_1_bss_24.unk14 = 0.0f;
object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x01)); object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x01));
object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x04)); object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x04));
Hu3DModelAttrSet(object->model[4], 0x40000001); Hu3DModelAttrSet(object->model[4], HU3D_MOTATTR_LOOP);
Hu3DModelPosSet(object->model[4], 1660.0f, 0.0f, -1200.0f); Hu3DModelPosSet(object->model[4], 1660.0f, 0.0f, -1200.0f);
Hu3DModelPosSet(object->model[1], 1660.0f, 0.0f, -1200.0f); Hu3DModelPosSet(object->model[1], 1660.0f, 0.0f, -1200.0f);
Hu3DModelLayerSet(object->model[1], 6); Hu3DModelLayerSet(object->model[1], 6);
Hu3DModelAttrSet(object->model[1], 0x40000002); Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_PAUSE);
unkInline(var_r31, 0, &var_r28, 0); unkInline(var_r31, 0, &var_r28, 0);
for (var_r29 = 1; var_r29 < 4; var_r29++) { for (var_r29 = 1; var_r29 < 4; var_r29++) {
@ -626,8 +626,8 @@ void fn_1_2DCC(omObjData *object)
temp_f29 = Hu3DMotionMaxTimeGet(var_r31->unk4); temp_f29 = Hu3DMotionMaxTimeGet(var_r31->unk4);
if (Hu3DMotionTimeGet(var_r31->unk4) >= temp_f29) { if (Hu3DMotionTimeGet(var_r31->unk4) >= temp_f29) {
Hu3DMotionSet(var_r31->unk6, var_r31->unk8); Hu3DMotionSet(var_r31->unk6, var_r31->unk8);
Hu3DModelAttrSet(var_r31->unk6, 0x40000001); Hu3DModelAttrSet(var_r31->unk6, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(var_r31->unk4, 0x40000002); Hu3DModelAttrSet(var_r31->unk4, HU3D_MOTATTR_PAUSE);
fn_1_2414(24, 8); fn_1_2414(24, 8);
lbl_1_bss_24.unk1 = 0; lbl_1_bss_24.unk1 = 0;
} }
@ -652,9 +652,9 @@ void fn_1_2DCC(omObjData *object)
if (Hu3DMotionTimeGet(var_r31->unk4) <= 0.0f) { if (Hu3DMotionTimeGet(var_r31->unk4) <= 0.0f) {
Hu3DMotionSet(var_r31->unk6, var_r31->unk8); Hu3DMotionSet(var_r31->unk6, var_r31->unk8);
Hu3DMotionSpeedSet(var_r31->unk6, 1.0f); Hu3DMotionSpeedSet(var_r31->unk6, 1.0f);
Hu3DModelAttrSet(var_r31->unk6, 0x40000001); Hu3DModelAttrSet(var_r31->unk6, HU3D_MOTATTR_LOOP);
Hu3DMotionSpeedSet(var_r31->unk4, 1.0f); Hu3DMotionSpeedSet(var_r31->unk4, 1.0f);
Hu3DModelAttrSet(var_r31->unk4, 0x40000002); Hu3DModelAttrSet(var_r31->unk4, HU3D_MOTATTR_PAUSE);
fn_1_2414(24, 0); fn_1_2414(24, 0);
} }
break; break;
@ -695,9 +695,9 @@ void fn_1_2DCC(omObjData *object)
} }
var_r27 = var_r31->unkC - 1; var_r27 = var_r31->unkC - 1;
if (var_r27 == -3) { if (var_r27 == -3) {
Hu3DModelAttrSet(var_r31->unk2, 1); Hu3DModelAttrSet(var_r31->unk2, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk4, 1); Hu3DModelAttrSet(var_r31->unk4, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk6, 1); Hu3DModelAttrSet(var_r31->unk6, HU3D_ATTR_DISPOFF);
var_r31->unkC = 2; var_r31->unkC = 2;
var_r27 = 1; var_r27 = 1;
} }
@ -794,9 +794,9 @@ void fn_1_3988(unkStruct4 *arg0, s16 arg1, s16 arg2)
arg0->unk1C = ((850.0f * arg2) - 370.0f); arg0->unk1C = ((850.0f * arg2) - 370.0f);
arg0->unkC = arg2; arg0->unkC = arg2;
if ((arg0->unkC >= 2) && (fn_1_2454(7) != 2)) { if ((arg0->unkC >= 2) && (fn_1_2454(7) != 2)) {
Hu3DModelAttrSet(arg0->unk2, 1U); Hu3DModelAttrSet(arg0->unk2, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk4, 1U); Hu3DModelAttrSet(arg0->unk4, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk6, 1U); Hu3DModelAttrSet(arg0->unk6, HU3D_ATTR_DISPOFF);
} }
} }

386
src/REL/m409Dll/player.c
View file

@ -1,17 +1,17 @@
#include "REL/m409Dll.h" #include "REL/m409Dll.h"
#include "math.h"
#include "ext_math.h"
#include "ext_math.h" #include "ext_math.h"
#include "game/audio.h" #include "game/audio.h"
#include "game/chrman.h" #include "game/chrman.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "game/pad.h"
#include "game/hsfmotion.h" #include "game/hsfmotion.h"
#include "game/pad.h"
#include "game/sprite.h"
#include "math.h"
// bss // bss
omObjData* lbl_1_bss_3A0[4]; omObjData *lbl_1_bss_3A0[4];
omObjData* lbl_1_bss_39C; omObjData *lbl_1_bss_39C;
s32 lbl_1_bss_38C[4]; s32 lbl_1_bss_38C[4];
unkStruct10 lbl_1_bss_10C[8]; unkStruct10 lbl_1_bss_10C[8];
s16 lbl_1_bss_108; s16 lbl_1_bss_108;
@ -22,39 +22,26 @@ unkStruct9 lbl_1_bss_F0;
// data // data
u32 lbl_1_data_138 = 0xFFFF0000; u32 lbl_1_data_138 = 0xFFFF0000;
s32 lbl_1_data_13C[7] = { 0x30, 0x2D, 0x3A, 0x2E, DATA_MAKE_NUM(DATADIR_M409, 0x32), 0x17, 0x18 }; s32 lbl_1_data_13C[7] = { 0x30, 0x2D, 0x3A, 0x2E, DATA_MAKE_NUM(DATADIR_M409, 0x32), 0x17, 0x18 };
GXColor lbl_1_data_158[8] = { GXColor lbl_1_data_158[8] = { { 0xFF, 0x00, 0x00, 0xFF }, { 0x00, 0x00, 0xFF, 0xFF }, { 0xFF, 0x80, 0x80, 0xFF }, { 0x00, 0xFF, 0x00, 0xFF },
{ 0xFF, 0x00, 0x00, 0xFF }, { 0x80, 0x00, 0xC0, 0xFF }, { 0x90, 0x30, 0x00, 0xFF }, { 0xFF, 0xFF, 0x00, 0xFF }, { 0x00, 0x00, 0x00, 0xFF } };
{ 0x00, 0x00, 0xFF, 0xFF },
{ 0xFF, 0x80, 0x80, 0xFF },
{ 0x00, 0xFF, 0x00, 0xFF },
{ 0x80, 0x00, 0xC0, 0xFF },
{ 0x90, 0x30, 0x00, 0xFF },
{ 0xFF, 0xFF, 0x00, 0xFF },
{ 0x00, 0x00, 0x00, 0xFF }
};
HsfVector2f lbl_1_data_178[4] = { HsfVector2f lbl_1_data_178[4] = {
{ 72.0f, 80.0f }, { 504.0f, 80.0f }, { 72.0f, 80.0f },
{ 72.0f, 400.0f }, { 504.0f, 400.0f }, { 504.0f, 80.0f },
}; { 72.0f, 400.0f },
GXColor lbl_1_data_198[8] = { { 504.0f, 400.0f },
{ 0xD0, 0x00, 0x00, 0xFF },
{ 0x00, 0x00, 0xFF, 0xFF },
{ 0x00, 0xA0, 0x00, 0xFF },
{ 0xFF, 0xFF, 0x00, 0xFF },
{ 0xA0, 0x00, 0xFF, 0xFF },
{ 0xFF, 0x80, 0x40, 0xFF },
{ 0xFF, 0xA0, 0xF0, 0xFF },
{ 0x00, 0xFF, 0x40, 0xFF }
}; };
GXColor lbl_1_data_198[8] = { { 0xD0, 0x00, 0x00, 0xFF }, { 0x00, 0x00, 0xFF, 0xFF }, { 0x00, 0xA0, 0x00, 0xFF }, { 0xFF, 0xFF, 0x00, 0xFF },
{ 0xA0, 0x00, 0xFF, 0xFF }, { 0xFF, 0x80, 0x40, 0xFF }, { 0xFF, 0xA0, 0xF0, 0xFF }, { 0x00, 0xFF, 0x40, 0xFF } };
void fn_1_67E0(Process* arg0) { void fn_1_67E0(Process *arg0)
{
s32 var_r31; s32 var_r31;
s32 temp_r28; s32 temp_r28;
omObjData* var_r30; omObjData *var_r30;
omMakeGroupEx(arg0, 0, 4); omMakeGroupEx(arg0, 0, 4);
omGetGroupMemberListEx(arg0, 0); omGetGroupMemberListEx(arg0, 0);
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
lbl_1_bss_3A0[var_r31] = var_r30 = omAddObjEx(arg0, 0x30, 3, 7, 0, fn_1_6928); lbl_1_bss_3A0[var_r31] = var_r30 = omAddObjEx(arg0, 0x30, 3, 7, 0, fn_1_6928);
var_r30->work[0] = var_r31; var_r30->work[0] = var_r31;
@ -63,38 +50,27 @@ void fn_1_67E0(Process* arg0) {
fn_1_BF88(0x40, 0x40); fn_1_BF88(0x40, 0x40);
fn_1_DF20(DATA_MAKE_NUM(DATADIR_M409, 0x2C), 0x40, 0x40); fn_1_DF20(DATA_MAKE_NUM(DATADIR_M409, 0x2C), 0x40, 0x40);
temp_r28 = (u8)frand(); temp_r28 = (u8)frand();
for (var_r31 = 0; var_r31 < (temp_r28 + 1); var_r31++) { for (var_r31 = 0; var_r31 < (temp_r28 + 1); var_r31++) {
fn_1_ABB4(); fn_1_ABB4();
} }
} }
void fn_1_6900(void) { void fn_1_6900(void)
{
CharModelKill(-1); CharModelKill(-1);
fn_1_C0C0(); fn_1_C0C0();
} }
void fn_1_6928(omObjData* arg0) { void fn_1_6928(omObjData *arg0)
Vec sp8[4] = { {
{ -185.0f, 35.0f, 100.0f }, Vec sp8[4] = { { -185.0f, 35.0f, 100.0f }, { -62.5f, 35.0f, 100.0f }, { 62.5f, 35.0f, 100.0f }, { 185.0f, 35.0f, 100.0f } };
{ -62.5f, 35.0f, 100.0f }, s8 sp38[8][32] = { "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r",
{ 62.5f, 35.0f, 100.0f }, "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r", "test11_tex_we-itemhook-r" };
{ 185.0f, 35.0f, 100.0f } unkStruct7 *var_r31;
};
s8 sp38[8][32] = {
"test11_tex_we-itemhook-r",
"test11_tex_we-itemhook-r",
"test11_tex_we-itemhook-r",
"test11_tex_we-itemhook-r",
"test11_tex_we-itemhook-r",
"test11_tex_we-itemhook-r",
"test11_tex_we-itemhook-r",
"test11_tex_we-itemhook-r"
};
unkStruct7* var_r31;
s32 var_r30; s32 var_r30;
s32 var_r28; s32 var_r28;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct7), MEMORY_DEFAULT_NUM); var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct7), MEMORY_DEFAULT_NUM);
arg0->data = var_r31; arg0->data = var_r31;
var_r31->unk0 = arg0->work[0]; var_r31->unk0 = arg0->work[0];
@ -118,12 +94,13 @@ void fn_1_6928(omObjData* arg0) {
var_r31->unk3C.x = var_r31->unk3C.z = 0.0f; var_r31->unk3C.x = var_r31->unk3C.z = 0.0f;
var_r30 = CharModelCreate(var_r31->unk1, 4); var_r30 = CharModelCreate(var_r31->unk1, 4);
arg0->model[0] = var_r30; arg0->model[0] = var_r30;
Hu3DModelAttrSet(var_r30, 0x40000001); Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP);
for (var_r28 = 0; var_r28 < 7; var_r28++) { for (var_r28 = 0; var_r28 < 7; var_r28++) {
if ((lbl_1_data_13C[var_r28] & 0xFFFF0000) != 0) { if ((lbl_1_data_13C[var_r28] & 0xFFFF0000) != 0) {
arg0->motion[var_r28] = CharModelMotionCreate(var_r31->unk1, var_r31->unk1 + lbl_1_data_13C[var_r28]); arg0->motion[var_r28] = CharModelMotionCreate(var_r31->unk1, var_r31->unk1 + lbl_1_data_13C[var_r28]);
} else { }
else {
arg0->motion[var_r28] = CharModelMotionCreate(var_r31->unk1, lbl_1_data_13C[var_r28]); arg0->motion[var_r28] = CharModelMotionCreate(var_r31->unk1, lbl_1_data_13C[var_r28]);
} }
} }
@ -134,12 +111,13 @@ void fn_1_6928(omObjData* arg0) {
Hu3DModelRotSet(var_r30, 0.0f, 30.0f, 0.0f); Hu3DModelRotSet(var_r30, 0.0f, 30.0f, 0.0f);
CharModelStepTypeSet(var_r31->unk1, 0); CharModelStepTypeSet(var_r31->unk1, 0);
arg0->model[1] = var_r30 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x12)); arg0->model[1] = var_r30 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x12));
Hu3DModelHookSet(arg0->model[0], (char*)sp38[var_r31->unk1], arg0->model[1]); Hu3DModelHookSet(arg0->model[0], (char *)sp38[var_r31->unk1], arg0->model[1]);
var_r30 = fn_1_DA48(2, 1); var_r30 = fn_1_DA48(2, 1);
var_r31->unk57 = var_r30; var_r31->unk57 = var_r30;
lbl_1_bss_F0.unk10[var_r30].unk30 = fn_1_8838; lbl_1_bss_F0.unk10[var_r30].unk30 = fn_1_8838;
fn_1_E2A8(var_r30, 0, DATA_MAKE_NUM(DATADIR_M409, 0x2B), 0x40, 0x40); fn_1_E2A8(var_r30, 0, DATA_MAKE_NUM(DATADIR_M409, 0x2B), 0x40, 0x40);
fn_1_F098(var_r30, lbl_1_data_158[var_r31->unk1].r, lbl_1_data_158[var_r31->unk1].g, lbl_1_data_158[var_r31->unk1].b, lbl_1_data_158[var_r31->unk1].a); fn_1_F098(
var_r30, lbl_1_data_158[var_r31->unk1].r, lbl_1_data_158[var_r31->unk1].g, lbl_1_data_158[var_r31->unk1].b, lbl_1_data_158[var_r31->unk1].a);
fn_1_F024(var_r30, 1, lbl_1_data_158[var_r31->unk1].r, lbl_1_data_158[var_r31->unk1].g, lbl_1_data_158[var_r31->unk1].b, 0x98); fn_1_F024(var_r30, 1, lbl_1_data_158[var_r31->unk1].r, lbl_1_data_158[var_r31->unk1].g, lbl_1_data_158[var_r31->unk1].b, 0x98);
fn_1_E85C(var_r30, 0, var_r31->unk24.x, 100.0f + var_r31->unk24.y, -1200.0f); fn_1_E85C(var_r30, 0, var_r31->unk24.x, 100.0f + var_r31->unk24.y, -1200.0f);
fn_1_ED44(var_r30, 0, 0x10); fn_1_ED44(var_r30, 0, 0x10);
@ -163,30 +141,31 @@ void fn_1_6928(omObjData* arg0) {
espColorSet(var_r30, 0, 0, 0); espColorSet(var_r30, 0, 0, 0);
espTPLvlSet(var_r30, 0.5); espTPLvlSet(var_r30, 0.5);
espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x, lbl_1_data_178[var_r31->unk0].y); espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x, lbl_1_data_178[var_r31->unk0].y);
espAttrSet(var_r30, 4); espAttrSet(var_r30, HUSPR_ATTR_DISPOFF);
var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_M409, 0x30), 1, 0); var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_M409, 0x30), 1, 0);
var_r31->unk54 = var_r30; var_r31->unk54 = var_r30;
espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x, lbl_1_data_178[var_r31->unk0].y); espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x, lbl_1_data_178[var_r31->unk0].y);
espAttrSet(var_r30, 4); espAttrSet(var_r30, HUSPR_ATTR_DISPOFF);
var_r30 = espEntry(var_r31->unk1 + DATA_MAKE_NUM(DATADIR_MGCONST, 0x00), 1, 0); var_r30 = espEntry(var_r31->unk1 + DATA_MAKE_NUM(DATADIR_MGCONST, 0x00), 1, 0);
var_r31->unk56 = var_r30; var_r31->unk56 = var_r30;
espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x - 27.0f, lbl_1_data_178[var_r31->unk0].y - 20.0f); espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x - 27.0f, lbl_1_data_178[var_r31->unk0].y - 20.0f);
espAttrSet(var_r30, 4); espAttrSet(var_r30, HUSPR_ATTR_DISPOFF);
for (var_r28 = 0; var_r28 < 3; var_r28++) { for (var_r28 = 0; var_r28 < 3; var_r28++) {
var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x0A), 0, 0); var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x0A), 0, 0);
var_r31->unk5A[var_r28][0] = var_r30; var_r31->unk5A[var_r28][0] = var_r30;
espAttrSet(var_r30, 4); espAttrSet(var_r30, HUSPR_ATTR_DISPOFF);
espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x - 32.0f + (var_r28 * 0x1E), 16.0f + lbl_1_data_178[var_r31->unk0].y); espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x - 32.0f + (var_r28 * 0x1E), 16.0f + lbl_1_data_178[var_r31->unk0].y);
var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x0B), 0, 0); var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x0B), 0, 0);
var_r31->unk5A[var_r28][1] = var_r30; var_r31->unk5A[var_r28][1] = var_r30;
espAttrSet(var_r30, 4); espAttrSet(var_r30, HUSPR_ATTR_DISPOFF);
espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x - 32.0f + (var_r28 * 0x1E), 16.0f + lbl_1_data_178[var_r31->unk0].y); espPosSet(var_r30, lbl_1_data_178[var_r31->unk0].x - 32.0f + (var_r28 * 0x1E), 16.0f + lbl_1_data_178[var_r31->unk0].y);
} }
arg0->func = fn_1_7344; arg0->func = fn_1_7344;
} }
void fn_1_7344(omObjData* arg0) { void fn_1_7344(omObjData *arg0)
{
s16 sp8; s16 sp8;
f32 temp_f28; f32 temp_f28;
f32 temp_f29; f32 temp_f29;
@ -206,17 +185,18 @@ void fn_1_7344(omObjData* arg0) {
s16 var_r28; s16 var_r28;
s32 var_r24; s32 var_r24;
s32 temp_r23; s32 temp_r23;
unkStruct8Sub* temp_r30; unkStruct8Sub *temp_r30;
unkStruct7* temp_r31; unkStruct7 *temp_r31;
var_f31 = 0.0f; var_f31 = 0.0f;
temp_r31 = (unkStruct7*)arg0->data; temp_r31 = (unkStruct7 *)arg0->data;
temp_r19 = arg0->model[0]; temp_r19 = arg0->model[0];
temp_r31->unk48 = temp_r31->unk24; temp_r31->unk48 = temp_r31->unk24;
var_r28 = temp_r31->unk1C; var_r28 = temp_r31->unk1C;
if (temp_r31->unk5 != 0) { if (temp_r31->unk5 != 0) {
fn_1_7FE8(arg0); fn_1_7FE8(arg0);
} else { }
else {
temp_r31->unkA = HuPadStkX[temp_r31->unk4]; temp_r31->unkA = HuPadStkX[temp_r31->unk4];
temp_r31->unkC = HuPadStkY[temp_r31->unk4]; temp_r31->unkC = HuPadStkY[temp_r31->unk4];
temp_r31->unkE = HuPadBtnDown[temp_r31->unk4]; temp_r31->unkE = HuPadBtnDown[temp_r31->unk4];
@ -231,14 +211,15 @@ void fn_1_7344(omObjData* arg0) {
temp_r30 = fn_1_CCCC(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8); temp_r30 = fn_1_CCCC(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8);
if (fn_1_2454(7) != 3) { if (fn_1_2454(7) != 3) {
fn_1_ED00(temp_r31->unk57, 4); fn_1_ED00(temp_r31->unk57, 4);
} else { }
espAttrReset(temp_r31->unk54, 4); else {
espAttrReset(temp_r31->unk55, 4); espAttrReset(temp_r31->unk54, HUSPR_ATTR_DISPOFF);
espAttrReset(temp_r31->unk55, HUSPR_ATTR_DISPOFF);
for (var_r24 = 0; var_r24 < 3; var_r24++) { for (var_r24 = 0; var_r24 < 3; var_r24++) {
espAttrReset(temp_r31->unk5A[var_r24][0], 4); espAttrReset(temp_r31->unk5A[var_r24][0], HUSPR_ATTR_DISPOFF);
} }
espAttrReset(temp_r31->unk56, 4); espAttrReset(temp_r31->unk56, HUSPR_ATTR_DISPOFF);
fn_1_EE24(temp_r31->unk57, 4); fn_1_EE24(temp_r31->unk57, 4);
temp_f28 = (ABS(temp_r26) + ABS(temp_r25)); temp_f28 = (ABS(temp_r26) + ABS(temp_r25));
temp_f30 = 0.008f * (temp_f28 * temp_r26); temp_f30 = 0.008f * (temp_f28 * temp_r26);
@ -283,7 +264,7 @@ void fn_1_7344(omObjData* arg0) {
case 6: case 6:
fn_1_ED44(temp_r31->unk57, 0, 4); fn_1_ED44(temp_r31->unk57, 0, 4);
Hu3DModelHookReset(temp_r19); Hu3DModelHookReset(temp_r19);
Hu3DModelAttrSet(arg0->model[1], 1); Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF);
temp_r23 = fn_1_DA48(1, 1); temp_r23 = fn_1_DA48(1, 1);
fn_1_DEF4(temp_r23, 0, 0); fn_1_DEF4(temp_r23, 0, 0);
fn_1_E7C8(lbl_1_bss_F0.unk6, 0, DATA_MAKE_NUM(DATADIR_M409, 0x2C)); fn_1_E7C8(lbl_1_bss_F0.unk6, 0, DATA_MAKE_NUM(DATADIR_M409, 0x2C));
@ -299,7 +280,8 @@ void fn_1_7344(omObjData* arg0) {
if (fn_1_2454(0x80) == 0x80) { if (fn_1_2454(0x80) == 0x80) {
if (temp_r31->unk59 >= 3) { if (temp_r31->unk59 >= 3) {
var_r28 = 5; var_r28 = 5;
} else { }
else {
var_r28 = 6; var_r28 = 6;
} }
var_r27 = 0; var_r27 = 0;
@ -334,7 +316,8 @@ void fn_1_7344(omObjData* arg0) {
if (CharModelMotionEndCheck(temp_r31->unk1) != 0) { if (CharModelMotionEndCheck(temp_r31->unk1) != 0) {
if (CharModelMotionTimeGet(temp_r31->unk1) <= 0.0f) { if (CharModelMotionTimeGet(temp_r31->unk1) <= 0.0f) {
var_r28 = 0; var_r28 = 0;
} else { }
else {
var_r28 = 2; var_r28 = 2;
} }
var_r27 = 1; var_r27 = 1;
@ -351,7 +334,8 @@ void fn_1_7344(omObjData* arg0) {
var_r27 = 0; var_r27 = 0;
var_f31 = 0.0f; var_f31 = 0.0f;
} }
} else if (CharModelMotionEndCheck(temp_r31->unk1) != 0) { }
else if (CharModelMotionEndCheck(temp_r31->unk1) != 0) {
var_r28 = 2; var_r28 = 2;
var_r27 = 1; var_r27 = 1;
var_f31 = 0.0f; var_f31 = 0.0f;
@ -370,7 +354,8 @@ void fn_1_7344(omObjData* arg0) {
temp_r31->unk60 = 0; temp_r31->unk60 = 0;
temp_r31->unk18 = -1; temp_r31->unk18 = -1;
} }
} else { }
else {
temp_r31->unk3C.y = 0.0f; temp_r31->unk3C.y = 0.0f;
} }
break; break;
@ -386,14 +371,15 @@ void fn_1_7344(omObjData* arg0) {
omSetRot(arg0, temp_r31->unk3C.x, temp_r31->unk3C.y, temp_r31->unk3C.z); omSetRot(arg0, temp_r31->unk3C.x, temp_r31->unk3C.y, temp_r31->unk3C.z);
} }
void fn_1_7FE8(omObjData* arg0) { void fn_1_7FE8(omObjData *arg0)
{
Vec sp20; Vec sp20;
Vec sp14; Vec sp14;
s32 sp10; s32 sp10;
f32 spC; f32 spC;
s16 sp8; s16 sp8;
unkStruct10* var_r30; unkStruct10 *var_r30;
unkStruct8Sub* temp_r29; unkStruct8Sub *temp_r29;
f32 temp_f0; f32 temp_f0;
f32 temp_f0_2; f32 temp_f0_2;
f32 temp_f1; f32 temp_f1;
@ -401,21 +387,22 @@ void fn_1_7FE8(omObjData* arg0) {
f32 temp_f30; f32 temp_f30;
f32 var_f28; f32 var_f28;
s32 var_r28; s32 var_r28;
unkStruct7* temp_r31; unkStruct7 *temp_r31;
temp_r31 = (unkStruct7*)arg0->data; temp_r31 = (unkStruct7 *)arg0->data;
sp10 = arg0->model[0]; sp10 = arg0->model[0];
sp8 = temp_r31->unk1C; sp8 = temp_r31->unk1C;
temp_r31->unkE = temp_r31->unk10 = 0; temp_r31->unkE = temp_r31->unk10 = 0;
temp_r29 = fn_1_CCCC(temp_r31->unk57, 0); temp_r29 = fn_1_CCCC(temp_r31->unk57, 0);
sp20.x = sp20.y = sp20.z = 0.0f; sp20.x = sp20.y = sp20.z = 0.0f;
switch (lbl_1_bss_108) { /* irregular */ switch (lbl_1_bss_108) { /* irregular */
case 2: case 2:
if (temp_r31->unk61 == 0) { if (temp_r31->unk61 == 0) {
var_r30 = &lbl_1_bss_10C[0]; var_r30 = &lbl_1_bss_10C[0];
for (var_r28 = 0; var_r28 < 8; var_r28++, var_r30++) { for (var_r28 = 0; var_r28 < 8; var_r28++, var_r30++) {
if (var_r30->unk2 == 0) break; if (var_r30->unk2 == 0)
break;
sp20.x += var_r30->unkC.x; sp20.x += var_r30->unkC.x;
sp20.y += var_r30->unkC.y; sp20.y += var_r30->unkC.y;
sp20.z += var_r30->unkC.z; sp20.z += var_r30->unkC.z;
@ -423,13 +410,15 @@ void fn_1_7FE8(omObjData* arg0) {
sp20.x /= var_r28; sp20.x /= var_r28;
sp20.y /= var_r28; sp20.y /= var_r28;
sp20.z /= var_r28; sp20.z /= var_r28;
} else { }
else {
var_r30 = &lbl_1_bss_10C[temp_r31->unk62]; var_r30 = &lbl_1_bss_10C[temp_r31->unk62];
if (var_r30->unk2 != 0) { if (var_r30->unk2 != 0) {
sp20.x = var_r30->unkC.x; sp20.x = var_r30->unkC.x;
sp20.y = var_r30->unkC.y; sp20.y = var_r30->unkC.y;
sp20.z = var_r30->unkC.z; sp20.z = var_r30->unkC.z;
} else { }
else {
sp20.x = 0.0f; sp20.x = 0.0f;
sp20.y = 800.0f; sp20.y = 800.0f;
sp20.z = -1200.0f; sp20.z = -1200.0f;
@ -458,7 +447,9 @@ void fn_1_7FE8(omObjData* arg0) {
sp20.z = var_r30->unkC.z; sp20.z = var_r30->unkC.z;
temp_f29 = 100.0f * (0.5f * (4 - temp_r31->unk6)); temp_f29 = 100.0f * (0.5f * (4 - temp_r31->unk6));
temp_f29 = 20.0f + (temp_f29 * (fn_1_ABB4() / 65536.0f)); temp_f29 = 20.0f + (temp_f29 * (fn_1_ABB4() / 65536.0f));
temp_f30 = ((var_r30->unkC.z - temp_r29->unk0.z) * (var_r30->unkC.z - temp_r29->unk0.z)) + (((var_r30->unkC.x - temp_r29->unk0.x) * (var_r30->unkC.x - temp_r29->unk0.x)) + ((var_r30->unkC.y - temp_r29->unk0.y) * (var_r30->unkC.y - temp_r29->unk0.y))); temp_f30 = ((var_r30->unkC.z - temp_r29->unk0.z) * (var_r30->unkC.z - temp_r29->unk0.z))
+ (((var_r30->unkC.x - temp_r29->unk0.x) * (var_r30->unkC.x - temp_r29->unk0.x))
+ ((var_r30->unkC.y - temp_r29->unk0.y) * (var_r30->unkC.y - temp_r29->unk0.y)));
if ((sqrtf(temp_f30) < temp_f29) && ((s32)((0x20 - (temp_r31->unk6 * 8)) * (fn_1_ABB4() / 65536.0f)) == 0)) { if ((sqrtf(temp_f30) < temp_f29) && ((s32)((0x20 - (temp_r31->unk6 * 8)) * (fn_1_ABB4() / 65536.0f)) == 0)) {
temp_r31->unkE = (temp_r31->unkE | 0x100); temp_r31->unkE = (temp_r31->unkE | 0x100);
} }
@ -488,17 +479,18 @@ void fn_1_7FE8(omObjData* arg0) {
temp_r31->unk63--; temp_r31->unk63--;
} }
void fn_1_8838(unkStruct8* arg0) { void fn_1_8838(unkStruct8 *arg0)
{
Vec sp18; Vec sp18;
Vec spC; Vec spC;
f32 sp8; f32 sp8;
f32 temp_f30; f32 temp_f30;
f32 temp_f31; f32 temp_f31;
unkStruct8Sub* temp_r30; unkStruct8Sub *temp_r30;
Vec* var_r26; Vec *var_r26;
s32 var_r28; s32 var_r28;
unkStruct10* temp_r29; unkStruct10 *temp_r29;
unkStruct8Sub* temp_r31; unkStruct8Sub *temp_r31;
temp_r30 = &arg0->unk3C[0]; temp_r30 = &arg0->unk3C[0];
if (temp_r30->unk0.x < -600.0f) { if (temp_r30->unk0.x < -600.0f) {
@ -576,7 +568,8 @@ void fn_1_8838(unkStruct8* arg0) {
temp_r31->unk18.x = (temp_r31->unk78 + (temp_r31->unk7C * temp_f31)); temp_r31->unk18.x = (temp_r31->unk78 + (temp_r31->unk7C * temp_f31));
temp_r31->unk18.y = (temp_r31->unk78 + (temp_r31->unk7C * temp_f31)); temp_r31->unk18.y = (temp_r31->unk78 + (temp_r31->unk7C * temp_f31));
temp_r31->unk18.z = 1.0f; temp_r31->unk18.z = 1.0f;
} else { }
else {
temp_r31->unk0.x = temp_r29->unkC.x; temp_r31->unk0.x = temp_r29->unkC.x;
temp_r31->unk0.y = temp_r29->unkC.y; temp_r31->unk0.y = temp_r29->unkC.y;
temp_r31->unk0.z = temp_r29->unkC.z; temp_r31->unk0.z = temp_r29->unkC.z;
@ -584,25 +577,27 @@ void fn_1_8838(unkStruct8* arg0) {
temp_r31->unk34 &= ~4; temp_r31->unk34 &= ~4;
} }
s8 fn_1_8D08(u8 arg0) { s8 fn_1_8D08(u8 arg0)
unkStruct7* data; {
unkStruct8Sub* var_r30; unkStruct7 *data;
unkStruct8Sub *var_r30;
data = (unkStruct7*)lbl_1_bss_3A0[arg0]->data; data = (unkStruct7 *)lbl_1_bss_3A0[arg0]->data;
var_r30 = fn_1_CCCC(data->unk57, 1); var_r30 = fn_1_CCCC(data->unk57, 1);
return var_r30->unk70[0]; return var_r30->unk70[0];
} }
void fn_1_8D6C(unkStruct8* arg0) { void fn_1_8D6C(unkStruct8 *arg0)
{
Vec sp20; Vec sp20;
Vec sp14; Vec sp14;
Vec sp8; Vec sp8;
s32 temp_r28; s32 temp_r28;
s32 var_r27; s32 var_r27;
f32 var_f31; f32 var_f31;
unkStruct10* var_r29; unkStruct10 *var_r29;
unkStruct7* temp_r30; unkStruct7 *temp_r30;
unkStruct8Sub* temp_r31; unkStruct8Sub *temp_r31;
temp_r31 = &arg0->unk3C[0]; temp_r31 = &arg0->unk3C[0];
if ((temp_r31->unk34 & 4) == 0) { if ((temp_r31->unk34 & 4) == 0) {
@ -641,19 +636,20 @@ void fn_1_8D6C(unkStruct8* arg0) {
if (!(var_f31 >= 2250.0f) && (var_r29->unk2 == 3)) { if (!(var_f31 >= 2250.0f) && (var_r29->unk2 == 3)) {
var_r29->unk2 = 4; var_r29->unk2 = 4;
temp_r31->unk34 |= 4; temp_r31->unk34 |= 4;
temp_r30 = (unkStruct7*)lbl_1_bss_3A0[temp_r31->unk70[0]]->data; temp_r30 = (unkStruct7 *)lbl_1_bss_3A0[temp_r31->unk70[0]]->data;
if (var_r29->unk48 == lbl_1_bss_106) { if (var_r29->unk48 == lbl_1_bss_106) {
espAttrSet(temp_r30->unk5A[temp_r30->unk59][0], 4); espAttrSet(temp_r30->unk5A[temp_r30->unk59][0], HUSPR_ATTR_DISPOFF);
espAttrReset(temp_r30->unk5A[temp_r30->unk59][1], 4); espAttrReset(temp_r30->unk5A[temp_r30->unk59][1], HUSPR_ATTR_DISPOFF);
HuAudFXPlay(9); HuAudFXPlay(9);
temp_r30->unk59++; temp_r30->unk59++;
omVibrate(temp_r30->unk0, 0xC, 6, 6); omVibrate(temp_r30->unk0, 0xC, 6, 6);
if (temp_r30->unk59 < 3) { if (temp_r30->unk59 < 3) {
temp_r30->unk60++; temp_r30->unk60++;
} }
} else if (temp_r30->unk59 != 0) { }
espAttrReset(temp_r30->unk5A[temp_r30->unk59][0], 4); else if (temp_r30->unk59 != 0) {
espAttrSet(temp_r30->unk5A[temp_r30->unk59][1], 4); espAttrReset(temp_r30->unk5A[temp_r30->unk59][0], HUSPR_ATTR_DISPOFF);
espAttrSet(temp_r30->unk5A[temp_r30->unk59][1], HUSPR_ATTR_DISPOFF);
} }
} }
} }
@ -682,35 +678,36 @@ void fn_1_8D6C(unkStruct8* arg0) {
} }
} }
void fn_1_91C0(omObjData* arg0) { void fn_1_91C0(omObjData *arg0)
{
s32 var_r28; s32 var_r28;
s32 var_r30; s32 var_r30;
unkStruct10* var_r31; unkStruct10 *var_r31;
lbl_1_bss_108 = 0; lbl_1_bss_108 = 0;
var_r28 = Hu3DModelCreateFile(0x20000); var_r28 = Hu3DModelCreateFile(0x20000);
arg0->model[0] = var_r28; arg0->model[0] = var_r28;
Hu3DModelAttrSet(var_r28, 0x40000001); Hu3DModelAttrSet(var_r28, HU3D_MOTATTR_LOOP);
for (var_r30 = 0; var_r30 < 3; var_r30++) { for (var_r30 = 0; var_r30 < 3; var_r30++) {
arg0->motion[var_r30] = Hu3DJointMotion(var_r28, HuDataSelHeapReadNum(var_r30 + DATA_MAKE_NUM(DATADIR_M409, 0x0F), MEMORY_DEFAULT_NUM, HEAP_DATA)); arg0->motion[var_r30]
= Hu3DJointMotion(var_r28, HuDataSelHeapReadNum(var_r30 + DATA_MAKE_NUM(DATADIR_M409, 0x0F), MEMORY_DEFAULT_NUM, HEAP_DATA));
} }
Hu3DMotionSet(var_r28, arg0->motion[0]); Hu3DMotionSet(var_r28, arg0->motion[0]);
omSetTra(arg0, 419.99997f, 250.0f, -180.0f); omSetTra(arg0, 419.99997f, 250.0f, -180.0f);
omSetRot(arg0, 0.0f, -30.0f, 0.0f); omSetRot(arg0, 0.0f, -30.0f, 0.0f);
for (var_r30 = 0; var_r30 < 4; var_r30++) { for (var_r30 = 0; var_r30 < 4; var_r30++) {
arg0->work[var_r30] = 0; arg0->work[var_r30] = 0;
} }
for (var_r30 = 0; var_r30 < 8; var_r30++) { for (var_r30 = 0; var_r30 < 8; var_r30++) {
var_r28 = Hu3DModelCreateFile(var_r30 + DATA_MAKE_NUM(DATADIR_M409, 0x1B)); var_r28 = Hu3DModelCreateFile(var_r30 + DATA_MAKE_NUM(DATADIR_M409, 0x1B));
arg0->model[var_r30 + 1] = var_r28; arg0->model[var_r30 + 1] = var_r28;
Hu3DModelAttrSet(var_r28, 1); Hu3DModelAttrSet(var_r28, HU3D_ATTR_DISPOFF);
} }
lbl_1_bss_104 = 0; lbl_1_bss_104 = 0;
for (var_r31 = lbl_1_bss_10C, var_r30 = 0; var_r30 < 8; var_r30++, var_r31++) { for (var_r31 = lbl_1_bss_10C, var_r30 = 0; var_r30 < 8; var_r30++, var_r31++) {
var_r28 = Hu3DModelCreateFile(var_r30 + DATA_MAKE_NUM(DATADIR_M409, 0x13)); var_r28 = Hu3DModelCreateFile(var_r30 + DATA_MAKE_NUM(DATADIR_M409, 0x13));
var_r31->unk0 = var_r28; var_r31->unk0 = var_r28;
@ -738,15 +735,16 @@ void fn_1_91C0(omObjData* arg0) {
arg0->func = fn_1_962C; arg0->func = fn_1_962C;
} }
void fn_1_962C(omObjData* arg0) { void fn_1_962C(omObjData *arg0)
{
s32 sp8[7]; s32 sp8[7];
unkStruct10* var_r31; unkStruct10 *var_r31;
s32 var_r29; s32 var_r29;
s32 var_r28; s32 var_r28;
s32 var_r27; s32 var_r27;
s32 var_r26; s32 var_r26;
f32 var_f31; f32 var_f31;
var_r27 = 0; var_r27 = 0;
var_r31 = &lbl_1_bss_10C[0]; var_r31 = &lbl_1_bss_10C[0];
@ -756,11 +754,14 @@ void fn_1_962C(omObjData* arg0) {
lbl_1_bss_108++; lbl_1_bss_108++;
} }
for (var_r29 = 0; var_r29 < 4; var_r29++) { for (var_r29 = 0; var_r29 < 4; var_r29++) {
if (lbl_1_bss_38C[var_r29] == 0) break; if (lbl_1_bss_38C[var_r29] == 0)
break;
} }
if (var_r29 < 4) break; if (var_r29 < 4)
if (lbl_1_bss_104 == 0) break; break;
if (lbl_1_bss_104 == 0)
break;
lbl_1_bss_108 = 6; lbl_1_bss_108 = 6;
break; break;
case 1: case 1:
@ -777,7 +778,7 @@ void fn_1_962C(omObjData* arg0) {
lbl_1_bss_108++; lbl_1_bss_108++;
break; break;
case 3: case 3:
Hu3DModelAttrReset(var_r26 = arg0->model[lbl_1_bss_106 + 1], 1); Hu3DModelAttrReset(var_r26 = arg0->model[lbl_1_bss_106 + 1], HU3D_ATTR_DISPOFF);
Hu3DModelHookSet(arg0->model[0], "g001mk-itemhook_r", var_r26); Hu3DModelHookSet(arg0->model[0], "g001mk-itemhook_r", var_r26);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 8.0f, HU3D_MOTATTR_NONE); Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(0x558); HuAudFXPlay(0x558);
@ -809,12 +810,12 @@ void fn_1_962C(omObjData* arg0) {
lbl_1_bss_108 = 0; lbl_1_bss_108 = 0;
Hu3DModelHookReset(arg0->model[0]); Hu3DModelHookReset(arg0->model[0]);
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(arg0->model[lbl_1_bss_106 + 1], 1); Hu3DModelAttrSet(arg0->model[lbl_1_bss_106 + 1], HU3D_ATTR_DISPOFF);
} }
break; break;
case 6: case 6:
fn_1_2414(7, 4); fn_1_2414(7, 4);
fn_1_23EC(lbl_1_bss_104- 1); fn_1_23EC(lbl_1_bss_104 - 1);
lbl_1_bss_108++; lbl_1_bss_108++;
break; break;
case 7: case 7:
@ -827,7 +828,7 @@ void fn_1_962C(omObjData* arg0) {
switch (var_r31->unk2) { switch (var_r31->unk2) {
case 0: case 0:
Hu3DModelAttrSet(var_r31->unk0, 1); Hu3DModelAttrSet(var_r31->unk0, HU3D_ATTR_DISPOFF);
var_r31->unkC.x = var_r31->unkC.y = var_r31->unkC.z = 0.0f; var_r31->unkC.x = var_r31->unkC.y = var_r31->unkC.z = 0.0f;
continue; continue;
case 1: case 1:
@ -835,7 +836,7 @@ void fn_1_962C(omObjData* arg0) {
var_r31->unkC.y = (fn_1_ABB4() / 65536.0f) * 100.0f; var_r31->unkC.y = (fn_1_ABB4() / 65536.0f) * 100.0f;
var_r31->unkC.z = -1200.0f; var_r31->unkC.z = -1200.0f;
Hu3DModelPosSet(var_r31->unk0, var_r31->unkC.x, var_r31->unkC.y, var_r31->unkC.z); Hu3DModelPosSet(var_r31->unk0, var_r31->unkC.x, var_r31->unkC.y, var_r31->unkC.z);
Hu3DModelAttrSet(var_r31->unk0, 1); Hu3DModelAttrSet(var_r31->unk0, HU3D_ATTR_DISPOFF);
fn_1_EC1C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 2.0f, 2.0f, 1.0f); fn_1_EC1C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 2.0f, 2.0f, 1.0f);
var_r31->unk18.z = ((fn_1_ABB4() - 0x8000) / 32768.0f) * 60.0f; var_r31->unk18.z = ((fn_1_ABB4() - 0x8000) / 32768.0f) * 60.0f;
var_r31->unk4 = ((100.0f - var_r31->unkC.y) * 0.5f); var_r31->unk4 = ((100.0f - var_r31->unkC.y) * 0.5f);
@ -843,7 +844,8 @@ void fn_1_962C(omObjData* arg0) {
var_r31->unk4C = ((fn_1_ABB4() - 0x8000) / 32768.0f) * 360.0f; var_r31->unk4C = ((fn_1_ABB4() - 0x8000) / 32768.0f) * 360.0f;
var_r31->unk2++; var_r31->unk2++;
case 2: case 2:
if (--var_r31->unk4 != 0) break; if (--var_r31->unk4 != 0)
break;
var_r31->unk4 = 1; var_r31->unk4 = 1;
var_r31->unk2++; var_r31->unk2++;
case 3: case 3:
@ -852,7 +854,8 @@ void fn_1_962C(omObjData* arg0) {
if (var_r31->unk18.z >= 0.0f) { if (var_r31->unk18.z >= 0.0f) {
var_r31->unk18.z = 0.0f; var_r31->unk18.z = 0.0f;
} }
} else { }
else {
var_r31->unk18.z -= 0.08f; var_r31->unk18.z -= 0.08f;
if (var_r31->unk18.z <= 0.0f) { if (var_r31->unk18.z <= 0.0f) {
var_r31->unk18.z = 0.0f; var_r31->unk18.z = 0.0f;
@ -864,7 +867,7 @@ void fn_1_962C(omObjData* arg0) {
var_r31->unkC.x += sind(var_r31->unk18.z) * var_r31->unk8; var_r31->unkC.x += sind(var_r31->unk18.z) * var_r31->unk8;
var_r31->unkC.y += cosd(var_r31->unk18.z) * var_r31->unk8; var_r31->unkC.y += cosd(var_r31->unk18.z) * var_r31->unk8;
if (var_r31->unkC.y >= 200.0) { if (var_r31->unkC.y >= 200.0) {
Hu3DModelAttrReset(var_r31->unk0, 1); Hu3DModelAttrReset(var_r31->unk0, HU3D_ATTR_DISPOFF);
} }
if (var_r31->unkC.x >= 550.0f) { if (var_r31->unkC.x >= 550.0f) {
var_r31->unk18.z = -((fn_1_ABB4() / 65536.0f) * 20.0f); var_r31->unk18.z = -((fn_1_ABB4() / 65536.0f) * 20.0f);
@ -877,13 +880,15 @@ void fn_1_962C(omObjData* arg0) {
} }
break; break;
case 4: case 4:
if (--var_r31->unk4 != 0) break; if (--var_r31->unk4 != 0)
Hu3DModelAttrSet(var_r31->unk0, 1); break;
Hu3DModelAttrSet(var_r31->unk0, HU3D_ATTR_DISPOFF);
fn_1_E85C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, var_r31->unkC.x, var_r31->unkC.y, var_r31->unkC.z); fn_1_E85C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, var_r31->unkC.x, var_r31->unkC.y, var_r31->unkC.z);
fn_1_EE68(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 4); fn_1_EE68(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 4);
if (lbl_1_bss_106 == var_r31->unk48) { if (lbl_1_bss_106 == var_r31->unk48) {
HuAudFXPlay(0x557); HuAudFXPlay(0x557);
} else { }
else {
HuAudFXPlay(0x55A); HuAudFXPlay(0x55A);
} }
if (var_r31->unk48 == arg0->work[1]) { if (var_r31->unk48 == arg0->work[1]) {
@ -913,7 +918,8 @@ void fn_1_962C(omObjData* arg0) {
if (var_r31->unkC.x <= -150.0f) { if (var_r31->unkC.x <= -150.0f) {
var_r31->unkC.x = -150.0f; var_r31->unkC.x = -150.0f;
} }
} else { }
else {
var_r27++; var_r27++;
} }
@ -921,15 +927,17 @@ void fn_1_962C(omObjData* arg0) {
Hu3DModelPosSet(var_r31->unk0, var_r31->unkC.x, var_r31->unkC.y, var_r31->unkC.z); Hu3DModelPosSet(var_r31->unk0, var_r31->unkC.x, var_r31->unkC.y, var_r31->unkC.z);
var_f31 = sin((var_r31->unk4C * M_PI) / 180.0); var_f31 = sin((var_r31->unk4C * M_PI) / 180.0);
var_r31->unk4C += 3.0f; var_r31->unk4C += 3.0f;
Hu3DModelRotSet(var_r31->unk0, 8.0 * sin((var_r31->unk4C * 0.3 * M_PI) / 180.0), var_r31->unk4C * 0.05f, (-var_r31->unk18.z * 0.25f) + (var_f31 * 8.0f)); Hu3DModelRotSet(
var_r31->unk0, 8.0 * sin((var_r31->unk4C * 0.3 * M_PI) / 180.0), var_r31->unk4C * 0.05f, (-var_r31->unk18.z * 0.25f) + (var_f31 * 8.0f));
} }
if (lbl_1_bss_108 == 2 && var_r27 >= arg0->work[0]) { if (lbl_1_bss_108 == 2 && var_r27 >= arg0->work[0]) {
lbl_1_bss_108++; lbl_1_bss_108++;
} }
} }
s32 fn_1_A584(unkStruct10* arg0) { s32 fn_1_A584(unkStruct10 *arg0)
{
s32 sp20[8]; s32 sp20[8];
Vec sp14; Vec sp14;
Vec sp8; Vec sp8;
@ -938,7 +946,7 @@ s32 fn_1_A584(unkStruct10* arg0) {
f32 var_f31; f32 var_f31;
s32 var_r28; s32 var_r28;
s32 var_r29; s32 var_r29;
unkStruct10* var_r31; unkStruct10 *var_r31;
if ((arg0->unk2 == 0) || (arg0->unk2 >= 4U)) { if ((arg0->unk2 == 0) || (arg0->unk2 >= 4U)) {
return 0; return 0;
@ -947,7 +955,7 @@ s32 fn_1_A584(unkStruct10* arg0) {
var_r28 = 0; var_r28 = 0;
sp14.x = sp14.y = sp14.z = 0.0f; sp14.x = sp14.y = sp14.z = 0.0f;
var_r31 = lbl_1_bss_10C; var_r31 = lbl_1_bss_10C;
for (var_r29 = 0; var_r29 < 8; var_r29++, var_r31++) { for (var_r29 = 0; var_r29 < 8; var_r29++, var_r31++) {
if ((var_r31->unk2 != 0) && (var_r31->unk2 < 4U) && (var_r31 != arg0)) { if ((var_r31->unk2 != 0) && (var_r31->unk2 < 4U) && (var_r31 != arg0)) {
sp8.x = arg0->unkC.x - var_r31->unkC.x; sp8.x = arg0->unkC.x - var_r31->unkC.x;
@ -981,7 +989,7 @@ s32 fn_1_A584(unkStruct10* arg0) {
} }
arg0->unk18.z = var_f31 = fn_1_AD40(arg0->unk18.z, var_f31, 0.5f); arg0->unk18.z = var_f31 = fn_1_AD40(arg0->unk18.z, var_f31, 0.5f);
var_r31 = lbl_1_bss_10C; var_r31 = lbl_1_bss_10C;
for (var_r29 = 0; var_r29 < 8; var_r29++, var_r31++) { for (var_r29 = 0; var_r29 < 8; var_r29++, var_r31++) {
if ((var_r31 != arg0) && (var_r31->unk2 != 0) && (var_r31->unk2 < 4U)) { if ((var_r31 != arg0) && (var_r31->unk2 != 0) && (var_r31->unk2 < 4U)) {
sp8.x = var_r31->unkC.x - arg0->unkC.x; sp8.x = var_r31->unkC.x - arg0->unkC.x;
@ -1009,23 +1017,25 @@ s32 fn_1_A584(unkStruct10* arg0) {
return 1; return 1;
} }
s8 fn_1_A9C0(Vec* arg0, f32* arg1) { s8 fn_1_A9C0(Vec *arg0, f32 *arg1)
{
f32 sp8; f32 sp8;
f32 temp_f29; f32 temp_f29;
f32 var_f30; f32 var_f30;
f32 var_f28; f32 var_f28;
s32 var_r27; s32 var_r27;
s32 var_r29; s32 var_r29;
unkStruct10* var_r31; unkStruct10 *var_r31;
var_r27 = -1; var_r27 = -1;
var_r31 = lbl_1_bss_10C; var_r31 = lbl_1_bss_10C;
var_f30 = *arg1; var_f30 = *arg1;
var_f30 *= var_f30; var_f30 *= var_f30;
for (var_r29 = 0; var_r29 < 8; var_r29++, var_r31++) { for (var_r29 = 0; var_r29 < 8; var_r29++, var_r31++) {
if (((Hu3DModelAttrGet(var_r31->unk0) & 1) == 0) && !(var_r31->unkC.y < 300.0f)) { if (((Hu3DModelAttrGet(var_r31->unk0) & 1) == 0) && !(var_r31->unkC.y < 300.0f)) {
temp_f29 = ((arg0->z - var_r31->unkC.z) * (arg0->z - var_r31->unkC.z)) + (((arg0->x - var_r31->unkC.x) * (arg0->x - var_r31->unkC.x)) + ((arg0->y - var_r31->unkC.y) * (arg0->y - var_r31->unkC.y))); temp_f29 = ((arg0->z - var_r31->unkC.z) * (arg0->z - var_r31->unkC.z))
+ (((arg0->x - var_r31->unkC.x) * (arg0->x - var_r31->unkC.x)) + ((arg0->y - var_r31->unkC.y) * (arg0->y - var_r31->unkC.y)));
if (!(temp_f29 > var_f30)) { if (!(temp_f29 > var_f30)) {
var_r27 = var_r29; var_r27 = var_r29;
var_f30 = temp_f29; var_f30 = temp_f29;
@ -1038,21 +1048,23 @@ s8 fn_1_A9C0(Vec* arg0, f32* arg1) {
u32 lbl_1_data_1EC = 0x41C64E6D; u32 lbl_1_data_1EC = 0x41C64E6D;
s32 fn_1_ABB4(void) { s32 fn_1_ABB4(void)
{
lbl_1_data_1EC *= 0x41C64E6D; lbl_1_data_1EC *= 0x41C64E6D;
lbl_1_data_1EC += 0x3039; lbl_1_data_1EC += 0x3039;
return (lbl_1_data_1EC >> 0x10); return (lbl_1_data_1EC >> 0x10);
} }
void fn_1_AC08(s32* arg0, s32 arg1) { void fn_1_AC08(s32 *arg0, s32 arg1)
{
s32 temp_r29; s32 temp_r29;
s32 temp_r30; s32 temp_r30;
s32 var_r31; s32 var_r31;
for (var_r31 = 0; var_r31 < arg1; var_r31++) { for (var_r31 = 0; var_r31 < arg1; var_r31++) {
arg0[var_r31] = var_r31; arg0[var_r31] = var_r31;
} }
for (var_r31 = 0; var_r31 < arg1; var_r31++) { for (var_r31 = 0; var_r31 < arg1; var_r31++) {
temp_r30 = (arg1 * (fn_1_ABB4() / 65536.0f)); temp_r30 = (arg1 * (fn_1_ABB4() / 65536.0f));
temp_r29 = arg0[var_r31]; temp_r29 = arg0[var_r31];
@ -1061,7 +1073,8 @@ void fn_1_AC08(s32* arg0, s32 arg1) {
} }
} }
f32 fn_1_AD40(f32 arg0, f32 arg1, f32 arg2) { f32 fn_1_AD40(f32 arg0, f32 arg1, f32 arg2)
{
f32 var_f31; f32 var_f31;
f32 var_f30; f32 var_f30;
f32 var_f29; f32 var_f29;
@ -1083,7 +1096,8 @@ f32 fn_1_AD40(f32 arg0, f32 arg1, f32 arg2) {
return var_f31; return var_f31;
} }
f32 fn_1_AE94(f32 arg8, f32 arg9, f32 argA, f32 argB) { f32 fn_1_AE94(f32 arg8, f32 arg9, f32 argA, f32 argB)
{
f32 temp_f31; f32 temp_f31;
f32 var_f30; f32 var_f30;
@ -1092,7 +1106,8 @@ f32 fn_1_AE94(f32 arg8, f32 arg9, f32 argA, f32 argB) {
return var_f30; return var_f30;
} }
void fn_1_AF0C(f32* arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg8) { void fn_1_AF0C(f32 *arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 arg8)
{
s32 var_r31; s32 var_r31;
for (var_r31 = 0; var_r31 < 3; var_r31++) { for (var_r31 = 0; var_r31 < 3; var_r31++) {
@ -1101,14 +1116,16 @@ void fn_1_AF0C(f32* arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg8) {
} }
} }
f32 fn_1_B028(f32 arg8, f32 arg9, f32 argA, f32 argB) { f32 fn_1_B028(f32 arg8, f32 arg9, f32 argA, f32 argB)
{
f32 var_f31; f32 var_f31;
var_f31 = (2.0 * ((arg8 * argB) + (((arg8 - 1.0) * arg9) + ((1.0 - (2.0 * arg8)) * argA)))); var_f31 = (2.0 * ((arg8 * argB) + (((arg8 - 1.0) * arg9) + ((1.0 - (2.0 * arg8)) * argA))));
return var_f31; return var_f31;
} }
void fn_1_B0A0(f32* arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg8) { void fn_1_B0A0(f32 *arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 arg8)
{
f32 spC[3]; f32 spC[3];
f32 var_f29; f32 var_f29;
s32 var_r31; s32 var_r31;
@ -1116,22 +1133,24 @@ void fn_1_B0A0(f32* arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg8) {
for (var_r31 = 0; var_r31 < 3; var_r31++) { for (var_r31 = 0; var_r31 < 3; var_r31++) {
spC[var_r31] = fn_1_B028(arg8, *arg0++, *arg1++, *arg2++); spC[var_r31] = fn_1_B028(arg8, *arg0++, *arg1++, *arg2++);
} }
var_f29 = sqrtf((spC[2] * spC[2]) + ((spC[0] * spC[0]) + (spC[1] * spC[1]))); var_f29 = sqrtf((spC[2] * spC[2]) + ((spC[0] * spC[0]) + (spC[1] * spC[1])));
if (var_f29) { if (var_f29) {
var_f29 = (1.0 / var_f29); var_f29 = (1.0 / var_f29);
for (var_r31 = 0; var_r31 < 3; var_r31++) { for (var_r31 = 0; var_r31 < 3; var_r31++) {
*arg3++ = var_f29 * spC[var_r31]; *arg3++ = var_f29 * spC[var_r31];
} }
} else { }
else {
*arg3++ = 0.0f; *arg3++ = 0.0f;
*arg3++ = 0.0f; *arg3++ = 0.0f;
*arg3++ = 1.0f; *arg3++ = 1.0f;
} }
} }
f32 fn_1_B378(Vec* arg0) { f32 fn_1_B378(Vec *arg0)
{
f32 var_f30; f32 var_f30;
f32 var_f29; f32 var_f29;
@ -1142,24 +1161,28 @@ f32 fn_1_B378(Vec* arg0) {
arg0->x *= var_f29; arg0->x *= var_f29;
arg0->y *= var_f29; arg0->y *= var_f29;
arg0->z *= var_f29; arg0->z *= var_f29;
} else { }
else {
arg0->x = arg0->y = arg0->z = 0.0f; arg0->x = arg0->y = arg0->z = 0.0f;
} }
return var_f30; return var_f30;
} }
f32 fn_1_B510(Vec arg0, Vec arg1, Vec* arg2, f32 arg8) { f32 fn_1_B510(Vec arg0, Vec arg1, Vec *arg2, f32 arg8)
{
if (arg8 <= 0.0f) { if (arg8 <= 0.0f) {
arg2->x = arg0.x; arg2->x = arg0.x;
arg2->y = arg0.y; arg2->y = arg0.y;
arg2->z = arg0.z; arg2->z = arg0.z;
arg8 = 0.0f; arg8 = 0.0f;
} else if (arg8 >= 1.0f) { }
else if (arg8 >= 1.0f) {
arg2->x = (arg0.x + arg1.x); arg2->x = (arg0.x + arg1.x);
arg2->y = (arg0.y + arg1.y); arg2->y = (arg0.y + arg1.y);
arg2->z = (arg0.z + arg1.z); arg2->z = (arg0.z + arg1.z);
arg8 = 1.0f; arg8 = 1.0f;
} else { }
else {
arg2->x = (arg0.x + (arg8 * arg1.x)); arg2->x = (arg0.x + (arg8 * arg1.x));
arg2->y = (arg0.y + (arg8 * arg1.y)); arg2->y = (arg0.y + (arg8 * arg1.y));
arg2->z = (arg0.z + (arg8 * arg1.z)); arg2->z = (arg0.z + (arg8 * arg1.z));
@ -1167,7 +1190,8 @@ f32 fn_1_B510(Vec arg0, Vec arg1, Vec* arg2, f32 arg8) {
return arg8; return arg8;
} }
f32 fn_1_B5E8(Vec arg0, Vec arg1, Vec arg2) { f32 fn_1_B5E8(Vec arg0, Vec arg1, Vec arg2)
{
f32 temp_f30; f32 temp_f30;
f32 var_f31; f32 var_f31;
@ -1179,25 +1203,31 @@ f32 fn_1_B5E8(Vec arg0, Vec arg1, Vec arg2) {
return var_f31; return var_f31;
} }
f32 fn_1_B6A4(Vec* arg0, Vec* arg1, Vec* arg2) { f32 fn_1_B6A4(Vec *arg0, Vec *arg1, Vec *arg2)
{
Vec sp44; Vec sp44;
f32 var_f31; f32 var_f31;
if (((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y))) == 0.0f) { if (((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y))) == 0.0f) {
return ((arg0->z - arg1->z) * (arg0->z - arg1->z)) + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y))); return ((arg0->z - arg1->z) * (arg0->z - arg1->z))
} else { + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y)));
}
else {
var_f31 = fn_1_B5E8(*arg0, *arg1, *arg2); var_f31 = fn_1_B5E8(*arg0, *arg1, *arg2);
fn_1_B510(*arg1, *arg2, &sp44, var_f31); fn_1_B510(*arg1, *arg2, &sp44, var_f31);
return ((arg0->z - sp44.z) * (arg0->z - sp44.z)) + (((arg0->x - sp44.x) * (arg0->x - sp44.x)) + ((arg0->y - sp44.y) * (arg0->y - sp44.y))); return ((arg0->z - sp44.z) * (arg0->z - sp44.z)) + (((arg0->x - sp44.x) * (arg0->x - sp44.x)) + ((arg0->y - sp44.y) * (arg0->y - sp44.y)));
} }
} }
f32 fn_1_B9E0(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) { f32 fn_1_B9E0(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, Vec *arg4)
{
f32 var_f31; f32 var_f31;
if (((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y))) == 0.0f) { if (((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y))) == 0.0f) {
return ((arg0->z - arg1->z) * (arg0->z - arg1->z)) + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y))); return ((arg0->z - arg1->z) * (arg0->z - arg1->z))
} else { + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y)));
}
else {
var_f31 = fn_1_B5E8(*arg0, *arg1, *arg2); var_f31 = fn_1_B5E8(*arg0, *arg1, *arg2);
fn_1_B510(*arg1, *arg2, arg3, var_f31); fn_1_B510(*arg1, *arg2, arg3, var_f31);
} }
@ -1207,9 +1237,10 @@ f32 fn_1_B9E0(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) {
return fn_1_B378(arg4); return fn_1_B378(arg4);
} }
void fn_1_BE90(ModelData *model, ParticleData *particle, Mtx matrix) { void fn_1_BE90(ModelData *model, ParticleData *particle, Mtx matrix)
{
s32 var_r29; s32 var_r29;
HsfanimStruct01* var_r31; HsfanimStruct01 *var_r31;
var_r31 = particle->unk_48; var_r31 = particle->unk_48;
for (var_r29 = 0; var_r29 < particle->unk_30; var_r29++, var_r31++) { for (var_r29 = 0; var_r29 < particle->unk_30; var_r29++, var_r31++) {
@ -1221,9 +1252,10 @@ void fn_1_BE90(ModelData *model, ParticleData *particle, Mtx matrix) {
DCFlushRange(particle->unk_48, particle->unk_30 * 0x44); DCFlushRange(particle->unk_48, particle->unk_30 * 0x44);
} }
f32 fn_1_BF38(s16 arg0) { f32 fn_1_BF38(s16 arg0)
MotionData* motionData; {
HsfMotion* hsfMotionData; MotionData *motionData;
HsfMotion *hsfMotionData;
f32 length; f32 length;
motionData = &Hu3DMotion[arg0]; motionData = &Hu3DMotion[arg0];

246
src/REL/m410Dll/game.c
View file

@ -78,7 +78,8 @@ void fn_1_34C0(omObjData *object)
for (var_r30 = 0; var_r30 < 3; var_r30++) { for (var_r30 = 0; var_r30 < 3; var_r30++) {
if (!var_r30) { if (!var_r30) {
object->model[var_r30] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 12)); object->model[var_r30] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 12));
} else { }
else {
object->model[var_r30] = Hu3DModelLink(*object->model); object->model[var_r30] = Hu3DModelLink(*object->model);
} }
Hu3DModelPosSet(object->model[var_r30], 0.0f, 140.0f + (140.0f * var_r30), -790.0f); Hu3DModelPosSet(object->model[var_r30], 0.0f, 140.0f + (140.0f * var_r30), -790.0f);
@ -98,43 +99,44 @@ void fn_1_3614(omObjData *object)
s16 var_r28; s16 var_r28;
switch (object->work[0]) { switch (object->work[0]) {
case 0: case 0:
if (fn_1_2804() == 1) { if (fn_1_2804() == 1) {
object->work[0]++; object->work[0]++;
object->work[1] = 256; object->work[1] = 256;
} }
break; break;
case 1: case 1:
if (!--object->work[1]) { if (!--object->work[1]) {
object->work[0]++; object->work[0]++;
object->work[1] = 90; object->work[1] = 90;
lbl_1_bss_50 = 0.0f; lbl_1_bss_50 = 0.0f;
lbl_1_bss_4C = -10.000001f; lbl_1_bss_4C = -10.000001f;
lbl_1_bss_48 = 2.0000002f; lbl_1_bss_48 = 2.0000002f;
lbl_1_bss_34 = HuAudFXPlay(1381); lbl_1_bss_34 = HuAudFXPlay(1381);
} }
break; break;
case 2: case 2:
if (!--object->work[1]) { if (!--object->work[1]) {
object->work[0]++; object->work[0]++;
lbl_1_bss_4C = 0.0f; lbl_1_bss_4C = 0.0f;
lbl_1_bss_48 = 0.40000007f; lbl_1_bss_48 = 0.40000007f;
} }
break; break;
case 3: case 3:
if (fn_1_281C() == 2) { if (fn_1_281C() == 2) {
object->work[0]++; object->work[0]++;
lbl_1_bss_4C = -2.0000002f; lbl_1_bss_4C = -2.0000002f;
lbl_1_bss_48 = 0.05000001f; lbl_1_bss_48 = 0.05000001f;
} }
break; break;
} }
if (fn_1_281C() == 2) { if (fn_1_281C() == 2) {
if (!--lbl_1_data_D8) { if (!--lbl_1_data_D8) {
lbl_1_bss_4C = -lbl_1_bss_4C; lbl_1_bss_4C = -lbl_1_bss_4C;
lbl_1_data_D8 = 900; lbl_1_data_D8 = 900;
} }
} else if (fn_1_281C() > 2) { }
else if (fn_1_281C() > 2) {
lbl_1_bss_4C = 0.0f; lbl_1_bss_4C = 0.0f;
} }
if (lbl_1_bss_50 != lbl_1_bss_4C) { if (lbl_1_bss_50 != lbl_1_bss_4C) {
@ -143,7 +145,8 @@ void fn_1_3614(omObjData *object)
if (lbl_1_bss_50 > lbl_1_bss_4C) { if (lbl_1_bss_50 > lbl_1_bss_4C) {
lbl_1_bss_50 = lbl_1_bss_4C; lbl_1_bss_50 = lbl_1_bss_4C;
} }
} else { }
else {
lbl_1_bss_50 -= lbl_1_bss_48; lbl_1_bss_50 -= lbl_1_bss_48;
if (lbl_1_bss_50 < lbl_1_bss_4C) { if (lbl_1_bss_50 < lbl_1_bss_4C) {
lbl_1_bss_50 = lbl_1_bss_4C; lbl_1_bss_50 = lbl_1_bss_4C;
@ -159,7 +162,8 @@ void fn_1_3614(omObjData *object)
var_f31 = (0.5 * (16384.0 * fabs(lbl_1_bss_50))) - 8191.0; var_f31 = (0.5 * (16384.0 * fabs(lbl_1_bss_50))) - 8191.0;
if (var_f31 < -8191.0f) { if (var_f31 < -8191.0f) {
var_f31 = -8191.0f; var_f31 = -8191.0f;
} else if (var_f31 > 8191.0f) { }
else if (var_f31 > 8191.0f) {
var_f31 = 8191.0f; var_f31 = 8191.0f;
} }
HuAudFXPitchSet(lbl_1_bss_34, var_f31); HuAudFXPitchSet(lbl_1_bss_34, var_f31);
@ -169,7 +173,8 @@ void fn_1_3614(omObjData *object)
var_r30 = &Hu3DData[object->model[var_r29]]; var_r30 = &Hu3DData[object->model[var_r29]];
if (var_r29 & 1) { if (var_r29 & 1) {
var_f29 = lbl_1_bss_50; var_f29 = lbl_1_bss_50;
} else { }
else {
var_f29 = -lbl_1_bss_50; var_f29 = -lbl_1_bss_50;
} }
var_f30 = var_f29; var_f30 = var_f29;
@ -178,7 +183,8 @@ void fn_1_3614(omObjData *object)
if (var_r30->pos.x <= -40.0f) { if (var_r30->pos.x <= -40.0f) {
var_r30->pos.x += 40.0f; var_r30->pos.x += 40.0f;
} }
} else { }
else {
if (var_r30->pos.x >= 40.0f) { if (var_r30->pos.x >= 40.0f) {
var_r30->pos.x -= 40.0f; var_r30->pos.x -= 40.0f;
} }
@ -212,7 +218,7 @@ void fn_1_3BE0(s16 arg0) // what happens with the argument?
var_r24 = 0; var_r24 = 0;
if (omPauseChk()) { if (omPauseChk()) {
return; return;
} }
@ -310,7 +316,8 @@ void fn_1_3BE0(s16 arg0) // what happens with the argument?
for (var_r26 = 0; var_r26 < 18; var_r26++, var_r28++) { for (var_r26 = 0; var_r26 < 18; var_r26++, var_r28++) {
if (var_r30->unk_40 != var_r28 || var_r28->unk_40 != var_r30) { if (var_r30->unk_40 != var_r28 || var_r28->unk_40 != var_r30) {
var_f31 = fn_1_4FEC(var_r30->unk_04, var_r30->unk_1C, var_r30->unk_28, var_r28->unk_04, var_r28->unk_1C, var_r28->unk_28, var_r28->unk_2C); var_f31 = fn_1_4FEC(
var_r30->unk_04, var_r30->unk_1C, var_r30->unk_28, var_r28->unk_04, var_r28->unk_1C, var_r28->unk_28, var_r28->unk_2C);
if (var_f31 >= 0.0f && var_f31 < var_f30) { if (var_f31 >= 0.0f && var_f31 < var_f30) {
var_r30->unk_00_field5 = 0; var_r30->unk_00_field5 = 0;
if (var_f31 <= var_f29) { if (var_f31 <= var_f29) {
@ -346,40 +353,40 @@ void fn_1_3BE0(s16 arg0) // what happens with the argument?
} }
for (var_r29 = 0; var_r29 < var_r27; var_r29++) { for (var_r29 = 0; var_r29 < var_r27; var_r29++) {
switch (sp1B0[var_r29].unk_00) { switch (sp1B0[var_r29].unk_00) {
case 0: case 0:
fn_1_5AF4(sp1B0[var_r29].unk_08, sp1B0[var_r29].unk_04); fn_1_5AF4(sp1B0[var_r29].unk_08, sp1B0[var_r29].unk_04);
sp1B0[var_r29].unk_08->unk_40 = NULL; sp1B0[var_r29].unk_08->unk_40 = NULL;
sp1B0[var_r29].unk_08->unk_3C++; sp1B0[var_r29].unk_08->unk_3C++;
break; break;
case 1: case 1:
fn_1_61DC(sp1B0[var_r29].unk_08, sp1B0[var_r29].unk_0C_unk); fn_1_61DC(sp1B0[var_r29].unk_08, sp1B0[var_r29].unk_0C_unk);
sp1B0[var_r29].unk_08->unk_40 = sp1B0[var_r29].unk_0C_unk; sp1B0[var_r29].unk_08->unk_40 = sp1B0[var_r29].unk_0C_unk;
sp1B0[var_r29].unk_0C_unk->unk_40 = sp1B0[var_r29].unk_08; sp1B0[var_r29].unk_0C_unk->unk_40 = sp1B0[var_r29].unk_08;
sp1B0[var_r29].unk_08->unk_3C++; sp1B0[var_r29].unk_08->unk_3C++;
sp1B0[var_r29].unk_0C_unk->unk_3C++; sp1B0[var_r29].unk_0C_unk->unk_3C++;
break; break;
case 2: case 2:
fn_1_66B8(sp1B0[var_r29].unk_08, sp1B0[var_r29].unk_0C_unk); fn_1_66B8(sp1B0[var_r29].unk_08, sp1B0[var_r29].unk_0C_unk);
sp1B0[var_r29].unk_08->unk_40 = sp1B0[var_r29].unk_0C_unk; sp1B0[var_r29].unk_08->unk_40 = sp1B0[var_r29].unk_0C_unk;
sp1B0[var_r29].unk_08->unk_3C++; sp1B0[var_r29].unk_08->unk_3C++;
break; break;
case 3: case 3:
fn_1_6364(sp1B0[var_r29].unk_08, sp1B0[var_r29].unk_0C_unk); fn_1_6364(sp1B0[var_r29].unk_08, sp1B0[var_r29].unk_0C_unk);
sp1B0[var_r29].unk_08->unk_40 = sp1B0[var_r29].unk_0C_unk; sp1B0[var_r29].unk_08->unk_40 = sp1B0[var_r29].unk_0C_unk;
sp1B0[var_r29].unk_0C_unk->unk_40 = sp1B0[var_r29].unk_08; sp1B0[var_r29].unk_0C_unk->unk_40 = sp1B0[var_r29].unk_08;
sp1B0[var_r29].unk_08->unk_3C++; sp1B0[var_r29].unk_08->unk_3C++;
sp1B0[var_r29].unk_08->unk_44 = 2; sp1B0[var_r29].unk_08->unk_44 = 2;
if (VECMag(&sp1B0[var_r29].unk_08->unk_1C) > 10.0f) { if (VECMag(&sp1B0[var_r29].unk_08->unk_1C) > 10.0f) {
HuAudFXPlay(1377); HuAudFXPlay(1377);
} }
break; break;
} }
} }
var_f30 *= 1.0f - var_f29; var_f30 *= 1.0f - var_f29;
var_r24++; var_r24++;
} while (var_r24 < 100); } while (var_r24 < 100);
(void)var_r24; (void)var_r24;
for (var_r29 = 0; var_r29 < var_r25; var_r29++) { for (var_r29 = 0; var_r29 < var_r25; var_r29++) {
var_r31 = spC0[var_r29]; var_r31 = spC0[var_r29];
var_r31->unk_04.x += var_r31->unk_1C.x * var_f30; var_r31->unk_04.x += var_r31->unk_1C.x * var_f30;
@ -434,7 +441,8 @@ float fn_1_48D8(UnkM410Struct2 *arg0, u8 *arg1)
if (0.0f != arg0->unk_1C.x) { if (0.0f != arg0->unk_1C.x) {
if (arg0->unk_1C.x < 0.0f) { if (arg0->unk_1C.x < 0.0f) {
var_f29 = (-500.0f - arg0->unk_04.x + arg0->unk_28) / arg0->unk_1C.x; var_f29 = (-500.0f - arg0->unk_04.x + arg0->unk_28) / arg0->unk_1C.x;
} else { }
else {
var_f29 = (500.0f - arg0->unk_04.x - arg0->unk_28) / arg0->unk_1C.x; var_f29 = (500.0f - arg0->unk_04.x - arg0->unk_28) / arg0->unk_1C.x;
} }
var_f31 = var_f29; var_f31 = var_f29;
@ -454,7 +462,8 @@ float fn_1_48D8(UnkM410Struct2 *arg0, u8 *arg1)
if (var_f31 >= 0.0f && var_f31 < 1.0f) { if (var_f31 >= 0.0f && var_f31 < 1.0f) {
if (var_f31 == var_f30) { if (var_f31 == var_f30) {
*arg1 |= 2; *arg1 |= 2;
} else if (var_f31 < var_f30) { }
else if (var_f31 < var_f30) {
var_f30 = var_f31; var_f30 = var_f31;
*arg1 = 2; *arg1 = 2;
} }
@ -468,7 +477,8 @@ float fn_1_48D8(UnkM410Struct2 *arg0, u8 *arg1)
if (var_f31 >= 0.0f && var_f31 < 1.0f) { if (var_f31 >= 0.0f && var_f31 < 1.0f) {
if (var_f31 == var_f30) { if (var_f31 == var_f30) {
*arg1 |= 4; *arg1 |= 4;
} else if (var_f31 < var_f30) { }
else if (var_f31 < var_f30) {
*arg1 = 4; *arg1 = 4;
var_f30 = var_f31; var_f30 = var_f31;
} }
@ -650,7 +660,8 @@ void fn_1_5AF4(UnkM410Struct2 *arg0, u8 arg1)
if (fabs(arg0->unk_1C.y) > 10.0) { if (fabs(arg0->unk_1C.y) > 10.0) {
if (arg0->unk_04.z < -400.0f) { if (arg0->unk_04.z < -400.0f) {
HuAudFXPlay(1380); HuAudFXPlay(1380);
} else { }
else {
HuAudFXPlay(1379); HuAudFXPlay(1379);
} }
} }
@ -697,7 +708,8 @@ void fn_1_5CA0(Vec arg0, Vec arg1, Vec arg2, Vec *arg3, Vec *arg4)
var_f30 = var_f31 - var_f29; var_f30 = var_f31 - var_f29;
if (var_f30 < 0.001f) { if (var_f30 < 0.001f) {
arg3->x = arg3->y = arg3->z = 0.0f; arg3->x = arg3->y = arg3->z = 0.0f;
} else { }
else {
VECCrossProduct(&sp34, &sp28, &sp10); VECCrossProduct(&sp34, &sp28, &sp10);
VECNormalize(&sp10, &sp10); VECNormalize(&sp10, &sp10);
VECCrossProduct(&sp28, &sp10, &sp1C); VECCrossProduct(&sp28, &sp10, &sp1C);
@ -731,7 +743,8 @@ void fn_1_5EDC(UnkM410Struct2 *arg0, UnkM410Struct2 *arg1)
arg0->unk_04.x += sp8.x * var_f30; arg0->unk_04.x += sp8.x * var_f30;
arg0->unk_04.y += sp8.y * var_f30; arg0->unk_04.y += sp8.y * var_f30;
arg0->unk_04.z += sp8.z * var_f30; arg0->unk_04.z += sp8.z * var_f30;
} else { }
else {
VECNormalize(&sp14, &sp14); VECNormalize(&sp14, &sp14);
arg0->unk_04.x -= sp14.x * var_f30; arg0->unk_04.x -= sp14.x * var_f30;
arg0->unk_04.y -= sp14.y * var_f30; arg0->unk_04.y -= sp14.y * var_f30;
@ -781,7 +794,8 @@ void fn_1_61DC(UnkM410Struct2 *arg0, UnkM410Struct2 *arg1)
if (arg0->unk_00_field1 || arg1->unk_00_field1) { if (arg0->unk_00_field1 || arg1->unk_00_field1) {
if (arg0->unk_00_field1) { if (arg0->unk_00_field1) {
fn_1_5EDC(arg1, arg0); fn_1_5EDC(arg1, arg0);
} else { }
else {
fn_1_5EDC(arg0, arg1); fn_1_5EDC(arg0, arg1);
} }
return; return;
@ -823,7 +837,8 @@ void fn_1_6364(UnkM410Struct2 *arg0, UnkM410Struct2 *arg1)
arg0->unk_04.x += sp8.x * var_f31; arg0->unk_04.x += sp8.x * var_f31;
arg0->unk_04.y += sp8.y * var_f31; arg0->unk_04.y += sp8.y * var_f31;
arg0->unk_04.z += sp8.z * var_f31; arg0->unk_04.z += sp8.z * var_f31;
} else { }
else {
VECNormalize(&sp14, &sp14); VECNormalize(&sp14, &sp14);
arg0->unk_04.x -= sp14.x * var_f31; arg0->unk_04.x -= sp14.x * var_f31;
arg0->unk_04.y -= sp14.y * var_f31; arg0->unk_04.y -= sp14.y * var_f31;
@ -882,11 +897,12 @@ void fn_1_67D4(omObjData *arg0)
if ((var_r30 % 15) == 0) { if ((var_r30 % 15) == 0) {
arg0->model[var_r30] = Hu3DModelCreateFile(lbl_1_data_DC[GWPlayerCfg[var_r29->unk_34].character]); arg0->model[var_r30] = Hu3DModelCreateFile(lbl_1_data_DC[GWPlayerCfg[var_r29->unk_34].character]);
var_r28 = arg0->model[var_r30]; var_r28 = arg0->model[var_r30];
} else { }
else {
arg0->model[var_r30] = Hu3DModelLink(var_r28); arg0->model[var_r30] = Hu3DModelLink(var_r28);
} }
var_r29->unk_30 = arg0->model[var_r30]; var_r29->unk_30 = arg0->model[var_r30];
Hu3DModelAttrSet(arg0->model[var_r30], 1); Hu3DModelAttrSet(arg0->model[var_r30], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(arg0->model[var_r30]); Hu3DModelShadowSet(arg0->model[var_r30]);
} }
arg0->func = fn_1_6968; arg0->func = fn_1_6968;
@ -906,7 +922,7 @@ void fn_1_6968(omObjData *object)
for (var_r30 = 0; var_r30 < 60; var_r30++, var_r31++) { for (var_r30 = 0; var_r30 < 60; var_r30++, var_r31++) {
if (!var_r31->unk_00_field0) { if (!var_r31->unk_00_field0) {
Hu3DModelAttrSet(var_r31->unk_30, 1); Hu3DModelAttrSet(var_r31->unk_30, HU3D_ATTR_DISPOFF);
continue; continue;
} }
if (var_r31->unk_00_field1) { if (var_r31->unk_00_field1) {
@ -918,10 +934,12 @@ void fn_1_6968(omObjData *object)
var_r31->unk_1C.y = var_f31 * sp8.y; var_r31->unk_1C.y = var_f31 * sp8.y;
var_r31->unk_1C.z = var_f31 * sp8.z; var_r31->unk_1C.z = var_f31 * sp8.z;
var_r31->unk_36--; var_r31->unk_36--;
} else { }
else {
var_r31->unk_1C = sp8; var_r31->unk_1C = sp8;
} }
} else { }
else {
var_r31->unk_1C.y += -0.95277786f; var_r31->unk_1C.y += -0.95277786f;
if (var_r31->unk_00_field3 && (fn_1_281C() != 4 || (fn_1_281C() == 4 && var_r31->unk_36 < 15))) { if (var_r31->unk_00_field3 && (fn_1_281C() != 4 || (fn_1_281C() == 4 && var_r31->unk_36 < 15))) {
if (--var_r31->unk_36 == 0) { if (--var_r31->unk_36 == 0) {
@ -943,14 +961,16 @@ void fn_1_6968(omObjData *object)
PSMTXConcat(sp14, var_r28->unk_F0, var_r28->unk_F0); PSMTXConcat(sp14, var_r28->unk_F0, var_r28->unk_F0);
} }
} }
} else { }
else {
var_r31->unk_44--; var_r31->unk_44--;
} }
} }
if (var_r31->unk_00_field2) { if (var_r31->unk_00_field2) {
Hu3DModelAttrReset(var_r31->unk_30, 1); Hu3DModelAttrReset(var_r31->unk_30, HU3D_ATTR_DISPOFF);
} else { }
Hu3DModelAttrSet(var_r31->unk_30, 1); else {
Hu3DModelAttrSet(var_r31->unk_30, HU3D_ATTR_DISPOFF);
} }
Hu3DModelPosSet(object->model[var_r30], var_r31->unk_04.x, var_r31->unk_04.y, var_r31->unk_04.z); Hu3DModelPosSet(object->model[var_r30], var_r31->unk_04.x, var_r31->unk_04.y, var_r31->unk_04.z);
} }
@ -960,12 +980,12 @@ void fn_1_6968(omObjData *object)
for (var_r30 = 0; var_r30 < 60; var_r30++, var_r31++) { for (var_r30 = 0; var_r30 < 60; var_r30++, var_r31++) {
if (var_r31->unk_00_field0) { if (var_r31->unk_00_field0) {
fn_1_7520(&var_r31->unk_04); fn_1_7520(&var_r31->unk_04);
Hu3DModelAttrSet(var_r31->unk_30, 1); Hu3DModelAttrSet(var_r31->unk_30, HU3D_ATTR_DISPOFF);
var_r31->unk_00_field0 = 0; var_r31->unk_00_field0 = 0;
} }
} }
lbl_1_bss_58->func = NULL; lbl_1_bss_58->func = NULL;
Hu3DModelAttrReset(lbl_1_bss_38, 1); Hu3DModelAttrReset(lbl_1_bss_38, HU3D_ATTR_DISPOFF);
fn_1_287C(4); fn_1_287C(4);
} }
} }
@ -992,8 +1012,8 @@ void fn_1_6DB4(omObjData *object)
var_r31->unk_34 = var_r29 / 6; var_r31->unk_34 = var_r29 / 6;
object->model[var_r29] = Hu3DModelCreateFile(lbl_1_data_104[var_r31->unk_34]); object->model[var_r29] = Hu3DModelCreateFile(lbl_1_data_104[var_r31->unk_34]);
var_r28 = object->model[var_r29]; var_r28 = object->model[var_r29];
(void)var_r28; (void)var_r28;
Hu3DModelAttrSet(object->model[var_r29], 0x40000002); Hu3DModelAttrSet(object->model[var_r29], HU3D_MOTATTR_PAUSE);
Hu3DData[object->model[var_r29]].cluster_attr[0] = 0; Hu3DData[object->model[var_r29]].cluster_attr[0] = 0;
var_r31->unk_30 = object->model[var_r29]; var_r31->unk_30 = object->model[var_r29];
var_r31->unk_32 = var_r29; var_r31->unk_32 = var_r29;
@ -1010,15 +1030,16 @@ void fn_1_6DB4(omObjData *object)
if (!var_r29) { if (!var_r29) {
object->model[var_r29 + 0x12] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 10)); object->model[var_r29 + 0x12] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 10));
} else { }
else {
object->model[var_r29 + 0x12] = Hu3DModelLink(object->model[18]); object->model[var_r29 + 0x12] = Hu3DModelLink(object->model[18]);
} }
Hu3DModelShadowMapSet(object->model[var_r29 + 18]); Hu3DModelShadowMapSet(object->model[var_r29 + 18]);
Hu3DModelPosSet(object->model[var_r29 + 18], var_r31->unk_04.x, var_r31->unk_04.y, var_r31->unk_04.z); Hu3DModelPosSet(object->model[var_r29 + 18], var_r31->unk_04.x, var_r31->unk_04.y, var_r31->unk_04.z);
if (!var_r29) { if (!var_r29) {
object->model[var_r29 + 36] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 11)); object->model[var_r29 + 36] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 11));
}
} else { else {
object->model[var_r29 + 36] = Hu3DModelLink(object->model[36]); object->model[var_r29 + 36] = Hu3DModelLink(object->model[36]);
} }
Hu3DModelPosSet(object->model[var_r29 + 0x24], 20.0f + var_r31->unk_04.x, -10.0f + var_r31->unk_04.y, var_r31->unk_04.z); Hu3DModelPosSet(object->model[var_r29 + 0x24], 20.0f + var_r31->unk_04.x, -10.0f + var_r31->unk_04.y, var_r31->unk_04.z);
@ -1037,7 +1058,8 @@ void fn_1_7138(omObjData *object)
for (var_r29 = 0; var_r29 < 18; var_r29++, var_r31++) { for (var_r29 = 0; var_r29 < 18; var_r29++, var_r31++) {
if (var_r31->unk_34 & 1) { if (var_r31->unk_34 & 1) {
var_f31 = lbl_1_bss_50; var_f31 = lbl_1_bss_50;
} else { }
else {
var_f31 = -lbl_1_bss_50; var_f31 = -lbl_1_bss_50;
} }
var_r31->unk_1C.x = var_f31; var_r31->unk_1C.x = var_f31;
@ -1054,7 +1076,8 @@ void fn_1_7138(omObjData *object)
var_r31->unk_04.x += 1500.0f; var_r31->unk_04.x += 1500.0f;
var_r31->unk_00_field6 = 1; var_r31->unk_00_field6 = 1;
} }
} else if (var_r31->unk_04.x > 750.0f) { }
else if (var_r31->unk_04.x > 750.0f) {
var_r31->unk_04.x -= 1500.0f; var_r31->unk_04.x -= 1500.0f;
var_r31->unk_00_field6 = 1; var_r31->unk_00_field6 = 1;
} }
@ -1085,7 +1108,7 @@ void fn_1_7494(void)
var_r31 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_EFFECT, 2), MEMORY_DEFAULT_NUM)); var_r31 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_EFFECT, 2), MEMORY_DEFAULT_NUM));
lbl_1_bss_38 = Hu3DParticleCreate(var_r31, 60); lbl_1_bss_38 = Hu3DParticleCreate(var_r31, 60);
Hu3DParticleHookSet(lbl_1_bss_38, fn_1_75A0); Hu3DParticleHookSet(lbl_1_bss_38, fn_1_75A0);
Hu3DModelAttrSet(lbl_1_bss_38, 1); Hu3DModelAttrSet(lbl_1_bss_38, HU3D_ATTR_DISPOFF);
} }
void fn_1_7520(Vec *arg0) void fn_1_7520(Vec *arg0)
@ -1120,10 +1143,10 @@ void fn_1_75A0(ModelData *model, ParticleData *particle, Mtx matrix)
var_r30 = particle->unk_48; var_r30 = particle->unk_48;
for (var_r29 = 0; var_r29 < particle->unk_02; var_r29++, var_r30++) { for (var_r29 = 0; var_r29 < particle->unk_02; var_r29++, var_r30++) {
var_r30->unk40.a = var_r28; // 43? var_r30->unk40.a = var_r28; // 43?
} }
if (--lbl_1_data_110 == 0) { if (--lbl_1_data_110 == 0) {
model->attr |= 1; model->attr |= 1;
} }
DCStoreRange(particle->unk_48, particle->unk_30 * 0x44); DCStoreRange(particle->unk_48, particle->unk_30 * 0x44);
} }
@ -1134,20 +1157,20 @@ s32 fn_1_76B8(Vec arg0, Vec arg1, u16 arg2)
s32 var_r30; s32 var_r30;
var_r31 = &var_r31[arg2 * 15]; var_r31 = &var_r31[arg2 * 15];
for(var_r30=0; var_r30<15; var_r30++, var_r31++) { for (var_r30 = 0; var_r30 < 15; var_r30++, var_r31++) {
if (!var_r31->unk_00_field0) { if (!var_r31->unk_00_field0) {
*(s16 *)var_r31 = 0; *(s16 *)var_r31 = 0;
var_r31->unk_00_field0 = 1; var_r31->unk_00_field0 = 1;
var_r31->unk_00_field2 = 1; var_r31->unk_00_field2 = 1;
var_r31->unk_04 = arg0; var_r31->unk_04 = arg0;
var_r31->unk_1C = arg1; var_r31->unk_1C = arg1;
var_r31->unk_28 = 30.000002f; var_r31->unk_28 = 30.000002f;
var_r31->unk_38 = NULL; var_r31->unk_38 = NULL;
var_r31->unk_36 = 0; var_r31->unk_36 = 0;
return 1; return 1;
} }
} }
return 0; return 0;
} }
void fn_1_77A4(u16 arg0, u16 arg1, u16 arg2) void fn_1_77A4(u16 arg0, u16 arg1, u16 arg2)
@ -1193,7 +1216,8 @@ void fn_1_7888(u16 arg0, u16 arg1, Vec *arg2)
while (sp8.x < -750.0f) { while (sp8.x < -750.0f) {
sp8.x += 1500.0f; sp8.x += 1500.0f;
} }
} else { }
else {
while (sp8.x > 750.0f) { while (sp8.x > 750.0f) {
sp8.x -= 1500.0f; sp8.x -= 1500.0f;
} }

8
src/REL/m410Dll/player.c
View file

@ -326,7 +326,7 @@ void fn_1_88D8(omObjData *object)
case 1: case 1:
if (fn_1_2834() == 1) { if (fn_1_2834() == 1) {
Hu3DModelHookReset(object->model[0]); Hu3DModelHookReset(object->model[0]);
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
if ((1 << object->work[0]) & fn_1_2864()) { if ((1 << object->work[0]) & fn_1_2864()) {
fn_1_9E0C(object, 8); fn_1_9E0C(object, 8);
} }
@ -597,7 +597,7 @@ void fn_1_96F4(omObjData *object)
if (var_r31->unk_14 && var_r31->unk_28) { if (var_r31->unk_14 && var_r31->unk_28) {
var_r31->unk_14 = 0; var_r31->unk_14 = 0;
var_r31->unk_28 = 0; var_r31->unk_28 = 0;
Hu3DModelAttrReset(object->model[1], 1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
var_r31->unk_36 = 0; var_r31->unk_36 = 0;
var_r31->unk_70.x = object->trans.x; var_r31->unk_70.x = object->trans.x;
var_r31->unk_70.y = 100.0f + object->trans.y; var_r31->unk_70.y = 100.0f + object->trans.y;
@ -647,7 +647,7 @@ s32 fn_1_9A90(omObjData *object)
return var_r29; return var_r29;
} }
if (!var_r31->unk_18) { if (!var_r31->unk_18) {
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
} }
if (var_r31->unk_18 && !var_r31->unk_1C && var_r31->unk_2C) { if (var_r31->unk_18 && !var_r31->unk_1C && var_r31->unk_2C) {
var_r31->unk_1C = 1; var_r31->unk_1C = 1;
@ -695,7 +695,7 @@ s32 fn_1_9C84(omObjData *object)
var_r31 = object->data; var_r31 = object->data;
var_r29 = 0; var_r29 = 0;
if (!var_r31->unk_18) { if (!var_r31->unk_18) {
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
} }
if (!var_r31->unk_20 && var_r31->unk_18 && !var_r31->unk_1C && var_r31->unk_30) { if (!var_r31->unk_20 && var_r31->unk_18 && !var_r31->unk_1C && var_r31->unk_30) {
fn_1_9E0C(object, 3); fn_1_9E0C(object, 3);

4
src/REL/m410Dll/stage.c
View file

@ -22,9 +22,9 @@ void fn_1_31FC(omObjData *object)
object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 14)); object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 14));
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 15)); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 15));
object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 16)); object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 16));
Hu3DModelAttrSet(object->model[3], 0x40000001); Hu3DModelAttrSet(object->model[3], HU3D_MOTATTR_LOOP);
object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 17)); object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 17));
Hu3DModelAttrSet(object->model[4], 0x40000001); Hu3DModelAttrSet(object->model[4], HU3D_MOTATTR_LOOP);
object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 18)); object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 18));
object->func = fn_1_3350; object->func = fn_1_3350;
} }

708
src/REL/m411Dll/main.c
View file

File diff suppressed because it is too large Load diff

89
src/REL/m412Dll/main.c
View file

@ -212,15 +212,15 @@ void fn_1_8BC(void)
var_r29 = Hu3DModelCreate(var_r27); var_r29 = Hu3DModelCreate(var_r27);
Hu3DModelLayerSet(var_r29, 1); Hu3DModelLayerSet(var_r29, 1);
Hu3DModelShadowMapSet(var_r29); Hu3DModelShadowMapSet(var_r29);
Hu3DModelAttrSet(var_r29, 0x40000001); Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_LOOP);
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x01), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x01), MEMORY_DEFAULT_NUM, HEAP_DATA);
lbl_1_bss_79C = Hu3DModelCreate(var_r27); lbl_1_bss_79C = Hu3DModelCreate(var_r27);
Hu3DModelAttrSet(lbl_1_bss_79C, 1); Hu3DModelAttrSet(lbl_1_bss_79C, HU3D_ATTR_DISPOFF);
MapObject[nMap++] = omAddObjEx(lbl_1_bss_274, 0x100, 1, 0, -1, fn_1_898); MapObject[nMap++] = omAddObjEx(lbl_1_bss_274, 0x100, 1, 0, -1, fn_1_898);
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x02), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x02), MEMORY_DEFAULT_NUM, HEAP_DATA);
var_r29 = Hu3DModelCreate(var_r27); var_r29 = Hu3DModelCreate(var_r27);
Hu3DModelLayerSet(var_r29, 0); Hu3DModelLayerSet(var_r29, 0);
Hu3DModelAttrSet(var_r29, 0x40000001); Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_LOOP);
for (var_r28 = 0; var_r28 < 0x20; var_r28++) { for (var_r28 = 0; var_r28 < 0x20; var_r28++) {
lbl_1_bss_278[var_r28] = NULL; lbl_1_bss_278[var_r28] = NULL;
@ -233,8 +233,8 @@ void fn_1_8BC(void)
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x1D), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x1D), MEMORY_DEFAULT_NUM, HEAP_DATA);
lbl_1_bss_798[var_r28] = var_r29 = Hu3DModelCreate(var_r27); lbl_1_bss_798[var_r28] = var_r29 = Hu3DModelCreate(var_r27);
Hu3DModelLayerSet(var_r29, 2); Hu3DModelLayerSet(var_r29, 2);
Hu3DModelAttrSet(var_r29, 0x40000002); Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(var_r29, 1); Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF);
} }
for (var_r28 = 0; var_r28 < 6; var_r28++) { for (var_r28 = 0; var_r28 < 6; var_r28++) {
@ -274,14 +274,14 @@ void fn_1_8BC(void)
Hu3DModelLayerSet(var_r29, 0); Hu3DModelLayerSet(var_r29, 0);
Hu3DModelShadowReset(var_r29); Hu3DModelShadowReset(var_r29);
Hu3DMotionSet(var_r29, temp_r31->unkC[3]); Hu3DMotionSet(var_r29, temp_r31->unkC[3]);
Hu3DModelAttrSet(var_r29, 0x800000); Hu3DModelAttrSet(var_r29, HU3D_ATTR_CULL_FRONT);
var_r27 = HuDataSelHeapReadNum(var_r28 + DATA_MAKE_NUM(DATADIR_M412, 0x10), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(var_r28 + DATA_MAKE_NUM(DATADIR_M412, 0x10), MEMORY_DEFAULT_NUM, HEAP_DATA);
temp_r31->unk4 = var_r29 = Hu3DModelCreate(var_r27); temp_r31->unk4 = var_r29 = Hu3DModelCreate(var_r27);
Hu3DModelLayerSet(var_r29, 1); Hu3DModelLayerSet(var_r29, 1);
if (var_r28 >= 3) { if (var_r28 >= 3) {
Hu3DModelAttrSet(temp_r31->unk0, 0x40000002); Hu3DModelAttrSet(temp_r31->unk0, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(temp_r31->unk2, 0x40000002); Hu3DModelAttrSet(temp_r31->unk2, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(temp_r31->unk4, 0x40000002); Hu3DModelAttrSet(temp_r31->unk4, HU3D_MOTATTR_PAUSE);
} }
if (var_r28 == 0) { if (var_r28 == 0) {
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x03), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x03), MEMORY_DEFAULT_NUM, HEAP_DATA);
@ -292,12 +292,12 @@ void fn_1_8BC(void)
} }
temp_r31->unk6 = var_r29; temp_r31->unk6 = var_r29;
Hu3DModelLayerSet(var_r29, 1); Hu3DModelLayerSet(var_r29, 1);
Hu3DModelAttrSet(var_r29, 1); Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(var_r29); Hu3DModelShadowSet(var_r29);
Hu3DModelShadowDispOff(var_r29); Hu3DModelShadowDispOff(var_r29);
temp_r31->unk8 = Hu3DModelLink(var_r19); temp_r31->unk8 = Hu3DModelLink(var_r19);
Hu3DModelLayerSet(var_r29, 0); Hu3DModelLayerSet(var_r29, 0);
Hu3DModelAttrSet(temp_r31->unk8, 1); Hu3DModelAttrSet(temp_r31->unk8, HU3D_ATTR_DISPOFF);
var_r23 = HuPrcChildCreate(fn_1_2A1C, 0x2000, 0x3000, 0, HuPrcCurrentGet()); var_r23 = HuPrcChildCreate(fn_1_2A1C, 0x2000, 0x3000, 0, HuPrcCurrentGet());
var_r23->user_data = temp_r31; var_r23->user_data = temp_r31;
} }
@ -351,22 +351,22 @@ void fn_1_8BC(void)
Hu3DModelScaleSet(var_r29, 1.0f, -1.0f, 1.0f); Hu3DModelScaleSet(var_r29, 1.0f, -1.0f, 1.0f);
Hu3DModelLayerSet(var_r29, 0); Hu3DModelLayerSet(var_r29, 0);
Hu3DModelShadowReset(var_r29); Hu3DModelShadowReset(var_r29);
Hu3DModelAttrSet(var_r29, 0x800000); Hu3DModelAttrSet(var_r29, HU3D_ATTR_CULL_FRONT);
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x04), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x04), MEMORY_DEFAULT_NUM, HEAP_DATA);
temp_r31->unk6 = var_r29 = Hu3DModelCreate(var_r27); temp_r31->unk6 = var_r29 = Hu3DModelCreate(var_r27);
Hu3DModelLayerSet(var_r29, 1); Hu3DModelLayerSet(var_r29, 1);
Hu3DModelAttrSet(var_r29, 1); Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(var_r29); Hu3DModelShadowSet(var_r29);
Hu3DModelShadowDispOff(var_r29); Hu3DModelShadowDispOff(var_r29);
temp_r31->unk8 = Hu3DModelLink(temp_r31->unk6); temp_r31->unk8 = Hu3DModelLink(temp_r31->unk6);
Hu3DModelLayerSet(temp_r31->unk8, 0); Hu3DModelLayerSet(temp_r31->unk8, 0);
Hu3DModelAttrSet(temp_r31->unk8, 1); Hu3DModelAttrSet(temp_r31->unk8, HU3D_ATTR_DISPOFF);
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x05), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x05), MEMORY_DEFAULT_NUM, HEAP_DATA);
temp_r31->unkA = var_r29 = Hu3DModelCreate(var_r27); temp_r31->unkA = var_r29 = Hu3DModelCreate(var_r27);
Hu3DModelShadowSet(var_r29); Hu3DModelShadowSet(var_r29);
Hu3DModelShadowDispOff(var_r29); Hu3DModelShadowDispOff(var_r29);
Hu3DModelLayerSet(var_r29, 1); Hu3DModelLayerSet(var_r29, 1);
Hu3DModelAttrSet(var_r29, 1); Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF);
for (var_r28 = 0; var_r28 < 0x17; var_r28++) { for (var_r28 = 0; var_r28 < 0x17; var_r28++) {
var_r17 = Hu3DModelObjPtrGet(var_r29, lbl_1_data_298[var_r28]); var_r17 = Hu3DModelObjPtrGet(var_r29, lbl_1_data_298[var_r28]);
@ -407,7 +407,7 @@ void fn_1_8BC(void)
var_r27 = HuDataSelHeapReadNum(lbl_1_data_20[GWPlayerCfg[var_r28].character], MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(lbl_1_data_20[GWPlayerCfg[var_r28].character], MEMORY_DEFAULT_NUM, HEAP_DATA);
temp_r30->unk2 = Hu3DModelCreate(var_r27); temp_r30->unk2 = Hu3DModelCreate(var_r27);
Hu3DModelScaleSet(temp_r30->unk2, 1.0f, -1.0f, 1.0f); Hu3DModelScaleSet(temp_r30->unk2, 1.0f, -1.0f, 1.0f);
Hu3DModelAttrSet(temp_r30->unk2, 0x800000); Hu3DModelAttrSet(temp_r30->unk2, HU3D_ATTR_CULL_FRONT);
Hu3DModelLayerSet(temp_r30->unk2, 0); Hu3DModelLayerSet(temp_r30->unk2, 0);
CharModelLayerSetAll(3); CharModelLayerSetAll(3);
temp_r30->unk54.x = temp_r30->unk54.z = temp_r30->unk54.y = 0.0f; temp_r30->unk54.x = temp_r30->unk54.z = temp_r30->unk54.y = 0.0f;
@ -433,26 +433,26 @@ void fn_1_8BC(void)
temp_r30->unk18[var_r26] = Hu3DJointMotion(temp_r30->unk2, var_r27); temp_r30->unk18[var_r26] = Hu3DJointMotion(temp_r30->unk2, var_r27);
} }
CharModelMotionSet(lbl_1_data_0[GWPlayerCfg[var_r28].character], temp_r30->unkC[0]); CharModelMotionSet(lbl_1_data_0[GWPlayerCfg[var_r28].character], temp_r30->unkC[0]);
Hu3DModelAttrSet(temp_r30->unk0, 0x40000001); Hu3DModelAttrSet(temp_r30->unk0, HU3D_MOTATTR_LOOP);
Hu3DMotionSet(temp_r30->unk2, temp_r30->unk18[0]); Hu3DMotionSet(temp_r30->unk2, temp_r30->unk18[0]);
Hu3DModelAttrSet(temp_r30->unk2, 0x40000001); Hu3DModelAttrSet(temp_r30->unk2, HU3D_MOTATTR_LOOP);
CharModelMotionDataClose(lbl_1_data_0[GWPlayerCfg[var_r28].character]); CharModelMotionDataClose(lbl_1_data_0[GWPlayerCfg[var_r28].character]);
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x1C), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x1C), MEMORY_DEFAULT_NUM, HEAP_DATA);
temp_r30->unk6 = var_r29 = Hu3DModelCreate(var_r27); temp_r30->unk6 = var_r29 = Hu3DModelCreate(var_r27);
Hu3DModelLayerSet(var_r29, 1); Hu3DModelLayerSet(var_r29, 1);
Hu3DModelAttrSet(var_r29, 0x40000001); Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(var_r29, 1); Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(var_r29); Hu3DModelShadowSet(var_r29);
Hu3DModelShadowDispOff(var_r29); Hu3DModelShadowDispOff(var_r29);
temp_r30->unk8 = var_r29 = Hu3DModelLink(var_r29); temp_r30->unk8 = var_r29 = Hu3DModelLink(var_r29);
Hu3DModelLayerSet(var_r29, 0); Hu3DModelLayerSet(var_r29, 0);
Hu3DModelAttrSet(var_r29, 0x40000001); Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(var_r29, 0x800001); Hu3DModelAttrSet(var_r29, 0x800001);
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x1D), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x1D), MEMORY_DEFAULT_NUM, HEAP_DATA);
temp_r30->unkA = var_r29 = Hu3DModelCreate(var_r27); temp_r30->unkA = var_r29 = Hu3DModelCreate(var_r27);
Hu3DModelLayerSet(var_r29, 3); Hu3DModelLayerSet(var_r29, 3);
Hu3DModelAttrSet(var_r29, 0x40000002); Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(var_r29, 1); Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF);
var_r23 = HuPrcChildCreate(fn_1_7C60, 0x2000, 0x4000, 0, HuPrcCurrentGet()); var_r23 = HuPrcChildCreate(fn_1_7C60, 0x2000, 0x4000, 0, HuPrcCurrentGet());
var_r23->user_data = temp_r30; var_r23->user_data = temp_r30;
} }
@ -645,8 +645,8 @@ void fn_1_2064(void)
else { else {
HuAudFXPlay(0x58C); HuAudFXPlay(0x58C);
} }
Hu3DModelAttrSet(temp_r31->unk0, 1); Hu3DModelAttrSet(temp_r31->unk0, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(temp_r31->unk2, 1); Hu3DModelAttrSet(temp_r31->unk2, HU3D_ATTR_DISPOFF);
Hu3DModelShadowDispOff(temp_r31->unk0); Hu3DModelShadowDispOff(temp_r31->unk0);
temp_r31->unkA = 1; temp_r31->unkA = 1;
if (temp_r31->unkC == 1) { if (temp_r31->unkC == 1) {
@ -657,7 +657,7 @@ void fn_1_2064(void)
} }
} }
Hu3DModelPosSet(temp_r31->unk4, temp_r31->unk10.x, temp_r31->unk10.y, temp_r31->unk10.z); Hu3DModelPosSet(temp_r31->unk4, temp_r31->unk10.x, temp_r31->unk10.y, temp_r31->unk10.z);
Hu3DModelAttrReset(temp_r31->unk4, 1); Hu3DModelAttrReset(temp_r31->unk4, HU3D_ATTR_DISPOFF);
Hu3DModelShadowDispOn(temp_r31->unk4); Hu3DModelShadowDispOn(temp_r31->unk4);
for (var_r30 = 0; var_r30 < 0x17; var_r30++) { for (var_r30 = 0; var_r30 < 0x17; var_r30++) {
@ -843,8 +843,8 @@ loop_10:
HuPrcVSleep(); HuPrcVSleep();
} }
HuPrcSleep(0x1E); HuPrcSleep(0x1E);
Hu3DModelAttrReset(temp_r31->unk6, 1); Hu3DModelAttrReset(temp_r31->unk6, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(temp_r31->unk8, 1); Hu3DModelAttrReset(temp_r31->unk8, HU3D_ATTR_DISPOFF);
Hu3DModelShadowDispOn(temp_r31->unk6); Hu3DModelShadowDispOn(temp_r31->unk6);
Hu3DModelPosSet(temp_r31->unk6, 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(temp_r31->unk6, 0.0f, 0.0f, 0.0f);
Hu3DModelPosSet(temp_r31->unk8, 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(temp_r31->unk8, 0.0f, 0.0f, 0.0f);
@ -971,8 +971,8 @@ loop_1:
Hu3DModelClusterAttrReset(temp_r31->unk0, 0, -0x3FFFFFFE); Hu3DModelClusterAttrReset(temp_r31->unk0, 0, -0x3FFFFFFE);
Hu3DModelAttrReset(temp_r31->unk2, 0x40000002); Hu3DModelAttrReset(temp_r31->unk2, 0x40000002);
Hu3DModelClusterAttrReset(temp_r31->unk2, 0, -0x3FFFFFFE); Hu3DModelClusterAttrReset(temp_r31->unk2, 0, -0x3FFFFFFE);
Hu3DModelAttrReset(temp_r31->unk6, 1); Hu3DModelAttrReset(temp_r31->unk6, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(temp_r31->unk8, 1); Hu3DModelAttrReset(temp_r31->unk8, HU3D_ATTR_DISPOFF);
Hu3DModelShadowDispOn(temp_r31->unk6); Hu3DModelShadowDispOn(temp_r31->unk6);
var_f18 = 850.0f; var_f18 = 850.0f;
temp_f31 = -217.722f; temp_f31 = -217.722f;
@ -1649,7 +1649,8 @@ loop_6:
if (temp_r31->unk60.z >= 8.0f) { if (temp_r31->unk60.z >= 8.0f) {
if (temp_r31->unk30 != 2) { if (temp_r31->unk30 != 2) {
temp_r31->unk30 = 2; temp_r31->unk30 = 2;
CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); CharModelMotionShiftSet(
lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk18[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(temp_r31->unk2, temp_r31->unk18[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
} }
} }
@ -1664,10 +1665,10 @@ loop_6:
else if (temp_r31->unk30 != 0) { else if (temp_r31->unk30 != 0) {
temp_r31->unk30 = 0; temp_r31->unk30 = 0;
CharModelMotionSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[0]); CharModelMotionSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk24].character], temp_r31->unkC[0]);
Hu3DModelAttrSet(temp_r31->unk0, 0x40000001); Hu3DModelAttrSet(temp_r31->unk0, HU3D_MOTATTR_LOOP);
Hu3DMotionSet(temp_r31->unk2, temp_r31->unk18[0]); Hu3DMotionSet(temp_r31->unk2, temp_r31->unk18[0]);
Hu3DMotionSpeedSet(temp_r31->unk2, 2.0f); Hu3DMotionSpeedSet(temp_r31->unk2, 2.0f);
Hu3DModelAttrSet(temp_r31->unk2, 0x40000001); Hu3DModelAttrSet(temp_r31->unk2, HU3D_MOTATTR_LOOP);
} }
var_f21 = sqrtf((temp_r31->unk7C.x * temp_r31->unk7C.x) + (temp_r31->unk7C.z * temp_r31->unk7C.z)); var_f21 = sqrtf((temp_r31->unk7C.x * temp_r31->unk7C.x) + (temp_r31->unk7C.z * temp_r31->unk7C.z));
if (temp_r31->unk60.z > 0.5f) { if (temp_r31->unk60.z > 0.5f) {
@ -1735,20 +1736,20 @@ loop_6:
goto loop_6; goto loop_6;
case 3: case 3:
HuAudFXPlay(0x584); HuAudFXPlay(0x584);
Hu3DModelAttrSet(temp_r31->unk0, 0x40000002); Hu3DModelAttrSet(temp_r31->unk0, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(temp_r31->unk2, 0x40000002); Hu3DModelAttrSet(temp_r31->unk2, HU3D_MOTATTR_PAUSE);
Hu3DModelPosSet(temp_r31->unkA, temp_r31->unk40.x + (100.0 * sind(lbl_1_bss_778)), 200.0f + temp_r31->unk40.y, Hu3DModelPosSet(temp_r31->unkA, temp_r31->unk40.x + (100.0 * sind(lbl_1_bss_778)), 200.0f + temp_r31->unk40.y,
temp_r31->unk40.z + (100.0 * cosd(lbl_1_bss_778))); temp_r31->unk40.z + (100.0 * cosd(lbl_1_bss_778)));
Hu3DModelAttrReset(temp_r31->unkA, 1); Hu3DModelAttrReset(temp_r31->unkA, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(temp_r31->unkA, 0x40000002); Hu3DModelAttrReset(temp_r31->unkA, 0x40000002);
HuPrcSleep(10); HuPrcSleep(10);
Hu3DModelAttrSet(temp_r31->unk0, 0x40000002); Hu3DModelAttrSet(temp_r31->unk0, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(temp_r31->unk2, 0x40000002); Hu3DModelAttrSet(temp_r31->unk2, HU3D_MOTATTR_PAUSE);
HuPrcSleep(10); HuPrcSleep(10);
Hu3DModelPosSet(temp_r31->unk6, temp_r31->unk40.x, temp_r31->unk40.y, temp_r31->unk40.z); Hu3DModelPosSet(temp_r31->unk6, temp_r31->unk40.x, temp_r31->unk40.y, temp_r31->unk40.z);
Hu3DModelPosSet(temp_r31->unk8, temp_r31->unk40.x, temp_r31->unk40.y, temp_r31->unk40.z); Hu3DModelPosSet(temp_r31->unk8, temp_r31->unk40.x, temp_r31->unk40.y, temp_r31->unk40.z);
Hu3DModelAttrReset(temp_r31->unk6, 1); Hu3DModelAttrReset(temp_r31->unk6, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(temp_r31->unk8, 1); Hu3DModelAttrReset(temp_r31->unk8, HU3D_ATTR_DISPOFF);
Hu3DModelShadowDispOn(temp_r31->unk6); Hu3DModelShadowDispOn(temp_r31->unk6);
for (sp134 = 0.0f, sp130 = 1.0f; sp134 < 1; sp134 += 0.05f, sp130 -= 0.1f) { for (sp134 = 0.0f, sp130 = 1.0f; sp134 < 1; sp134 += 0.05f, sp130 -= 0.1f) {
@ -2037,12 +2038,12 @@ void fn_1_ADC8(void)
for (; var_f31; var_r31++, var_f31--) { for (; var_f31; var_r31++, var_f31--) {
if (var_r31 == 0x33) { if (var_r31 == 0x33) {
Hu3DModelAttrReset(lbl_1_bss_798[0], 0x40000002); Hu3DModelAttrReset(lbl_1_bss_798[0], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_798[0], 1); Hu3DModelAttrReset(lbl_1_bss_798[0], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(lbl_1_bss_798[0], 1465.0f, 770.0f, -2400.0f); Hu3DModelPosSet(lbl_1_bss_798[0], 1465.0f, 770.0f, -2400.0f);
} }
if (var_r31 == 0x47) { if (var_r31 == 0x47) {
Hu3DModelAttrReset(lbl_1_bss_798[1], 0x40000002); Hu3DModelAttrReset(lbl_1_bss_798[1], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_798[1], 1); Hu3DModelAttrReset(lbl_1_bss_798[1], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(lbl_1_bss_798[1], 1531.0f, 773.0f, -2380.0f); Hu3DModelPosSet(lbl_1_bss_798[1], 1531.0f, 773.0f, -2380.0f);
} }
if (var_r31 == 0x82) { if (var_r31 == 0x82) {
@ -2110,9 +2111,9 @@ void fn_1_B1C0(void)
HuAudFXPlay(0x57F); HuAudFXPlay(0x57F);
fn_1_6EC(1465.0f, 770.0f, -2400.0f, 0x589); fn_1_6EC(1465.0f, 770.0f, -2400.0f, 0x589);
HuPrcSleep(1); HuPrcSleep(1);
Hu3DModelAttrSet(lbl_1_bss_2F8.unk0, 0x40000002); Hu3DModelAttrSet(lbl_1_bss_2F8.unk0, HU3D_MOTATTR_PAUSE);
Hu3DModelClusterAttrSet(lbl_1_bss_2F8.unk0, 0, -0x3FFFFFFE); Hu3DModelClusterAttrSet(lbl_1_bss_2F8.unk0, 0, -0x3FFFFFFE);
Hu3DModelAttrSet(lbl_1_bss_2F8.unk2, 0x40000002); Hu3DModelAttrSet(lbl_1_bss_2F8.unk2, HU3D_MOTATTR_PAUSE);
Hu3DModelClusterAttrSet(lbl_1_bss_2F8.unk2, 0, -0x3FFFFFFE); Hu3DModelClusterAttrSet(lbl_1_bss_2F8.unk2, 0, -0x3FFFFFFE);
HuPrcSleep(1.0f + wipeData.duration); HuPrcSleep(1.0f + wipeData.duration);
fn_1_ADC8(); fn_1_ADC8();

21
src/REL/m413Dll/main.c
View file

@ -1281,7 +1281,7 @@ void fn_1_52A4(s32 arg0)
lbl_1_bss_D4[lbl_1_bss_D0][1] = 1; lbl_1_bss_D4[lbl_1_bss_D0][1] = 1;
lbl_1_bss_D4[lbl_1_bss_D0][0] = 0; lbl_1_bss_D4[lbl_1_bss_D0][0] = 0;
for (temp_r19 = 0; temp_r19 < 10; temp_r19++) { for (temp_r19 = 0; temp_r19 < 10; temp_r19++) {
Hu3DModelAttrSet(lbl_1_bss_30->model[((lbl_1_bss_D0 * 10) + 13 + temp_r19)], 1); Hu3DModelAttrSet(lbl_1_bss_30->model[((lbl_1_bss_D0 * 10) + 13 + temp_r19)], HU3D_ATTR_DISPOFF);
} }
} }
for (temp_r19 = 0; temp_r19 < sp14C8[temp_r29].unk1; temp_r19++) { for (temp_r19 = 0; temp_r19 < sp14C8[temp_r29].unk1; temp_r19++) {
@ -1299,7 +1299,8 @@ void fn_1_52A4(s32 arg0)
if (lbl_1_bss_D4[lbl_1_bss_D0][0] < 10) { if (lbl_1_bss_D4[lbl_1_bss_D0][0] < 10) {
Hu3DModelPosSet(lbl_1_bss_30->model[((lbl_1_bss_D0 * 10) + 13 + lbl_1_bss_D4[lbl_1_bss_D0][0])], Hu3DModelPosSet(lbl_1_bss_30->model[((lbl_1_bss_D0 * 10) + 13 + lbl_1_bss_D4[lbl_1_bss_D0][0])],
(((temp_r26->unk18 * 100) - 500.0) - 50.0), 50.0f + ((100.0f * temp_r26->unk1C.y) - 500.0f), 120); (((temp_r26->unk18 * 100) - 500.0) - 50.0), 50.0f + ((100.0f * temp_r26->unk1C.y) - 500.0f), 120);
Hu3DModelAttrReset(lbl_1_bss_30->model[((lbl_1_bss_D0 * 10) + 13 + lbl_1_bss_D4[lbl_1_bss_D0][0])], 1); Hu3DModelAttrReset(
lbl_1_bss_30->model[((lbl_1_bss_D0 * 10) + 13 + lbl_1_bss_D4[lbl_1_bss_D0][0])], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(lbl_1_bss_30->model[((lbl_1_bss_D0 * 10) + 13 + lbl_1_bss_D4[lbl_1_bss_D0][0])], 2.0f); Hu3DMotionTimeSet(lbl_1_bss_30->model[((lbl_1_bss_D0 * 10) + 13 + lbl_1_bss_D4[lbl_1_bss_D0][0])], 2.0f);
lbl_1_bss_D4[lbl_1_bss_D0][0]++; lbl_1_bss_D4[lbl_1_bss_D0][0]++;
lbl_1_bss_B8.unk4 += 4; lbl_1_bss_B8.unk4 += 4;
@ -1652,7 +1653,7 @@ void fn_1_8C10(omObjData *object)
lbl_1_bss_D4[temp_r25][0] = 0; lbl_1_bss_D4[temp_r25][0] = 0;
lbl_1_bss_D4[temp_r25][1] = 0; lbl_1_bss_D4[temp_r25][1] = 0;
for (temp_r21 = 0; temp_r21 < 10; temp_r21++) { for (temp_r21 = 0; temp_r21 < 10; temp_r21++) {
Hu3DModelAttrSet(object->model[(temp_r25 * 10) + 13 + temp_r21], 1); Hu3DModelAttrSet(object->model[(temp_r25 * 10) + 13 + temp_r21], HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -2013,14 +2014,14 @@ void fn_1_C6E0(omObjData *object)
object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M413, 0x01)); object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M413, 0x01));
Hu3DMotionSpeedSet(object->model[1], 0); Hu3DMotionSpeedSet(object->model[1], 0);
Hu3DModelPosSet(object->model[1], 0, 0, 0); Hu3DModelPosSet(object->model[1], 0, 0, 0);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
object->model[2] = Hu3DHookFuncCreate(fn_1_B6C4); object->model[2] = Hu3DHookFuncCreate(fn_1_B6C4);
Hu3DModelLayerSet(object->model[2], 1); Hu3DModelLayerSet(object->model[2], 1);
for (temp_r30 = 0; temp_r30 < 4; temp_r30++) { for (temp_r30 = 0; temp_r30 < 4; temp_r30++) {
object->model[temp_r30 + 3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M413, 0x03) + temp_r30); object->model[temp_r30 + 3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M413, 0x03) + temp_r30);
Hu3DModelAttrSet(object->model[temp_r30 + 3], 1); Hu3DModelAttrSet(object->model[temp_r30 + 3], HU3D_ATTR_DISPOFF);
object->model[temp_r30 + 7] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M413, 0x07) + temp_r30); object->model[temp_r30 + 7] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M413, 0x07) + temp_r30);
Hu3DModelAttrSet(object->model[temp_r30 + 7], 1); Hu3DModelAttrSet(object->model[temp_r30 + 7], HU3D_ATTR_DISPOFF);
} }
for (temp_r30 = 0; temp_r30 < 2; temp_r30++) { for (temp_r30 = 0; temp_r30 < 2; temp_r30++) {
s32 temp_r28; s32 temp_r28;
@ -2031,7 +2032,7 @@ void fn_1_C6E0(omObjData *object)
temp_r28 = DATA_MAKE_NUM(DATADIR_M413, 0x0C); temp_r28 = DATA_MAKE_NUM(DATADIR_M413, 0x0C);
} }
object->model[temp_r30 + 11] = Hu3DModelCreateFile(temp_r28); object->model[temp_r30 + 11] = Hu3DModelCreateFile(temp_r28);
Hu3DModelAttrSet(object->model[temp_r30 + 11], 1); Hu3DModelAttrSet(object->model[temp_r30 + 11], HU3D_ATTR_DISPOFF);
} }
for (temp_r30 = 0; temp_r30 < 5; temp_r30++) { for (temp_r30 = 0; temp_r30 < 5; temp_r30++) {
s32 temp_r29; s32 temp_r29;
@ -2040,7 +2041,7 @@ void fn_1_C6E0(omObjData *object)
if (temp_r29 != 0) { if (temp_r29 != 0) {
object->model[(13 + (temp_r30 * 10) + temp_r29)] = Hu3DModelLink(object->model[(temp_r30 * 10) + 13]); object->model[(13 + (temp_r30 * 10) + temp_r29)] = Hu3DModelLink(object->model[(temp_r30 * 10) + 13]);
} }
Hu3DModelAttrSet(object->model[(13 + (temp_r30 * 10) + temp_r29)], 1); Hu3DModelAttrSet(object->model[(13 + (temp_r30 * 10) + temp_r29)], HU3D_ATTR_DISPOFF);
Hu3DModelLayerSet(object->model[(13 + (temp_r30 * 10) + temp_r29)], 2); Hu3DModelLayerSet(object->model[(13 + (temp_r30 * 10) + temp_r29)], 2);
} }
} }
@ -2127,7 +2128,7 @@ void fn_1_CBB4(omObjData *object)
Hu3DMotionSpeedSet(object->model[1], 0.0f); Hu3DMotionSpeedSet(object->model[1], 0.0f);
Hu3DMotionSpeedSet(object->model[2], 0.0f); Hu3DMotionSpeedSet(object->model[2], 0.0f);
Hu3DMotionSpeedSet(object->model[3], 0.0f); Hu3DMotionSpeedSet(object->model[3], 0.0f);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(object->model[0], 60.0f); Hu3DMotionTimeSet(object->model[0], 60.0f);
Hu3DMotionSpeedSet(object->model[0], 0.0f); Hu3DMotionSpeedSet(object->model[0], 0.0f);
object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M413, 0x0D) + temp_r31->unk18); object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M413, 0x0D) + temp_r31->unk18);
@ -2136,7 +2137,7 @@ void fn_1_CBB4(omObjData *object)
Hu3DMotionSpeedSet(object->model[4], 0.0f); Hu3DMotionSpeedSet(object->model[4], 0.0f);
object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M413, 0x15) + temp_r31->unk18); object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M413, 0x15) + temp_r31->unk18);
Hu3DModelPosSet(object->model[5], (temp_r31->unk10 * 300) - 450, 0, 0); Hu3DModelPosSet(object->model[5], (temp_r31->unk10 * 300) - 450, 0, 0);
Hu3DModelAttrSet(object->model[5], 0x40000001); Hu3DModelAttrSet(object->model[5], HU3D_MOTATTR_LOOP);
Hu3DMotionSpeedSet(object->model[5], 0.0f); Hu3DMotionSpeedSet(object->model[5], 0.0f);
{ {
AnimData *temp_r23 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_MGCONST, 0x38) + GWPlayerCfg[temp_r31->unk14].character); AnimData *temp_r23 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_MGCONST, 0x38) + GWPlayerCfg[temp_r31->unk14].character);

272
src/REL/m414Dll/main.c
View file

@ -240,7 +240,8 @@ void ObjectSetup(void)
if (var_r30 >= 6) { if (var_r30 >= 6) {
if (lbl_1_bss_978 == 0) { if (lbl_1_bss_978 == 0) {
var_r30 = 1; var_r30 = 1;
} else { }
else {
var_r30 = 0; var_r30 = 0;
} }
} }
@ -312,7 +313,7 @@ void fn_1_CD8(s32 arg0, s32 arg1, float arg8)
var_r30->user_data = var_r31; var_r30->user_data = var_r31;
var_r31->unk_00 = arg0; var_r31->unk_00 = arg0;
var_r31->unk_04 = arg1; var_r31->unk_04 = arg1;
var_r31->unk_08 = arg8; var_r31->unk_08 = arg8;
} }
void fn_1_D54(ModelData *arg0, ParticleData *arg1, Mtx arg2, s32 arg3) void fn_1_D54(ModelData *arg0, ParticleData *arg1, Mtx arg2, s32 arg3)
@ -572,7 +573,8 @@ void fn_1_1C48(void)
var_r31 = HuPrcCurrentGet()->user_data; var_r31 = HuPrcCurrentGet()->user_data;
if (var_r31->unk_44 & 1) { if (var_r31->unk_44 & 1) {
HuAudFXPlay(1446); HuAudFXPlay(1446);
} else { }
else {
HuAudFXPlay(1445); HuAudFXPlay(1445);
} }
var_r31->unk_54 = 1; var_r31->unk_54 = 1;
@ -620,7 +622,8 @@ void fn_1_1E04(void)
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 8), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 8), MEMORY_DEFAULT_NUM, HEAP_DATA);
var_r30 = Hu3DModelCreate(var_r27); var_r30 = Hu3DModelCreate(var_r27);
var_r22 = var_r30; var_r22 = var_r30;
} else { }
else {
var_r30 = Hu3DModelLink(var_r22); var_r30 = Hu3DModelLink(var_r22);
} }
Hu3DModelCameraSet(var_r30, 15); Hu3DModelCameraSet(var_r30, 15);
@ -630,47 +633,51 @@ void fn_1_1E04(void)
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 0), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 0), MEMORY_DEFAULT_NUM, HEAP_DATA);
var_r30 = Hu3DModelCreate(var_r27); var_r30 = Hu3DModelCreate(var_r27);
var_r24 = var_r30; var_r24 = var_r30;
} else { }
else {
var_r30 = Hu3DModelLink(var_r24); var_r30 = Hu3DModelLink(var_r24);
} }
var_r31->unk_30[var_r29] = var_r30; var_r31->unk_30[var_r29] = var_r30;
Hu3DModelCameraSet(var_r30, 1 << var_r31->unk_48); Hu3DModelCameraSet(var_r30, 1 << var_r31->unk_48);
Hu3DModelShadowMapSet(var_r30); Hu3DModelShadowMapSet(var_r30);
Hu3DModelAttrSet(var_r30, 0x4000); Hu3DModelAttrSet(var_r30, HU3D_ATTR_NOCULL);
Hu3DModelRotSet(var_r30, 0.0f, 40.0f * var_r29, 0.0f); Hu3DModelRotSet(var_r30, 0.0f, 40.0f * var_r29, 0.0f);
Hu3DModelPosSet(var_r30, 2000.0f * (var_r28 % 2), 0.0f, 2000.0f * (var_r28 / 2)); Hu3DModelPosSet(var_r30, 2000.0f * (var_r28 % 2), 0.0f, 2000.0f * (var_r28 / 2));
} }
if (!var_r28) { if (!var_r28) {
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 5), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 5), MEMORY_DEFAULT_NUM, HEAP_DATA);
var_r30 = Hu3DModelCreate(var_r27); var_r30 = Hu3DModelCreate(var_r27);
} else { }
else {
var_r30 = Hu3DModelLink(lbl_1_bss_F0[0].unk_42); var_r30 = Hu3DModelLink(lbl_1_bss_F0[0].unk_42);
} }
var_r31->unk_42 = var_r30; var_r31->unk_42 = var_r30;
Hu3DModelCameraSet(var_r30, 1 << var_r31->unk_48); Hu3DModelCameraSet(var_r30, 1 << var_r31->unk_48);
Hu3DModelShadowMapSet(var_r30); Hu3DModelShadowMapSet(var_r30);
Hu3DModelAttrSet(var_r30, 1); Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(var_r30, 2000.0f * (var_r28 % 2), 0.0f, 2000.0f * (var_r28 / 2)); Hu3DModelPosSet(var_r30, 2000.0f * (var_r28 % 2), 0.0f, 2000.0f * (var_r28 / 2));
for (var_r29 = 0; var_r29 < 9; var_r29++) { for (var_r29 = 0; var_r29 < 9; var_r29++) {
if (!var_r28) { if (!var_r28) {
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 1) + lbl_1_data_68[var_r29], MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 1) + lbl_1_data_68[var_r29], MEMORY_DEFAULT_NUM, HEAP_DATA);
var_r30 = Hu3DModelCreate(var_r27); var_r30 = Hu3DModelCreate(var_r27);
} else { }
else {
var_r30 = Hu3DModelLink(lbl_1_bss_F0->unk_00[var_r29]); var_r30 = Hu3DModelLink(lbl_1_bss_F0->unk_00[var_r29]);
} }
var_r31->unk_00[var_r29] = var_r30; var_r31->unk_00[var_r29] = var_r30;
Hu3DModelRotSet(var_r30, 0.0f, 40.0f * var_r29, 0.0f); Hu3DModelRotSet(var_r30, 0.0f, 40.0f * var_r29, 0.0f);
Hu3DModelCameraSet(var_r30, 1 << var_r31->unk_48); Hu3DModelCameraSet(var_r30, 1 << var_r31->unk_48);
Hu3DModelAttrSet(var_r30, 0x4000); Hu3DModelAttrSet(var_r30, HU3D_ATTR_NOCULL);
Hu3DModelPosSet(var_r30, 2000.0f * (var_r28 % 2), 0.0f, 2000.0f * (var_r28 / 2)); Hu3DModelPosSet(var_r30, 2000.0f * (var_r28 % 2), 0.0f, 2000.0f * (var_r28 / 2));
Hu3DModelAttrSet(var_r30, 0x40000002); Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_PAUSE);
} }
for (var_r29 = 0; var_r29 < 16; var_r29++) { for (var_r29 = 0; var_r29 < 16; var_r29++) {
if (!var_r28 && !var_r29) { if (!var_r28 && !var_r29) {
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 6), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 6), MEMORY_DEFAULT_NUM, HEAP_DATA);
var_r30 = Hu3DModelCreate(var_r27); var_r30 = Hu3DModelCreate(var_r27);
var_r23 = var_r30; var_r23 = var_r30;
} else { }
else {
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 6), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 6), MEMORY_DEFAULT_NUM, HEAP_DATA);
var_r30 = Hu3DModelCreate(var_r27); var_r30 = Hu3DModelCreate(var_r27);
var_r23 = var_r30; var_r23 = var_r30;
@ -679,7 +686,7 @@ void fn_1_1E04(void)
var_r31->unk_D4[var_r29] = var_r30; var_r31->unk_D4[var_r29] = var_r30;
Hu3DModelPosSet(var_r30, 2000.0f * (var_r28 % 2), 330.0f - (330.0f * (var_r29 & 1)), 2000.0f * (var_r28 / 2)); Hu3DModelPosSet(var_r30, 2000.0f * (var_r28 % 2), 330.0f - (330.0f * (var_r29 & 1)), 2000.0f * (var_r28 / 2));
Hu3DModelRotSet(var_r30, 0.0f, 40.0f * ((var_r29 + 2) / 2), 0.0f); Hu3DModelRotSet(var_r30, 0.0f, 40.0f * ((var_r29 + 2) / 2), 0.0f);
Hu3DModelAttrSet(var_r30, 0x4000); Hu3DModelAttrSet(var_r30, HU3D_ATTR_NOCULL);
Hu3DModelAttrSet(var_r30, 0x40000082); Hu3DModelAttrSet(var_r30, 0x40000082);
Hu3DMotionSpeedSet(var_r30, 3.0f); Hu3DMotionSpeedSet(var_r30, 3.0f);
Hu3DMotionShapeSpeedSet(var_r30, 3.0f); Hu3DMotionShapeSpeedSet(var_r30, 3.0f);
@ -687,7 +694,8 @@ void fn_1_1E04(void)
if (!var_r28) { if (!var_r28) {
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 9), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 9), MEMORY_DEFAULT_NUM, HEAP_DATA);
var_r30 = Hu3DModelCreate(var_r27); var_r30 = Hu3DModelCreate(var_r27);
} else { }
else {
var_r30 = Hu3DModelLink(lbl_1_bss_F0[0].unk_20); var_r30 = Hu3DModelLink(lbl_1_bss_F0[0].unk_20);
} }
var_r31->unk_20 = var_r30; var_r31->unk_20 = var_r30;
@ -700,7 +708,7 @@ void fn_1_1E04(void)
} }
Hu3DMotionSet(var_r30, var_r31->unk_22[0]); Hu3DMotionSet(var_r30, var_r31->unk_22[0]);
Hu3DMotionTimeSet(var_r30, 0.0f); Hu3DMotionTimeSet(var_r30, 0.0f);
Hu3DModelAttrSet(var_r30, 0x40000002); Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_PAUSE);
Hu3DMotionSpeedSet(var_r30, 2.0f); Hu3DMotionSpeedSet(var_r30, 2.0f);
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 15), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 15), MEMORY_DEFAULT_NUM, HEAP_DATA);
@ -751,22 +759,24 @@ void fn_1_1E04(void)
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 22) + lbl_1_bss_938[var_r29], MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 22) + lbl_1_bss_938[var_r29], MEMORY_DEFAULT_NUM, HEAP_DATA);
var_r30 = Hu3DModelCreate(var_r27); var_r30 = Hu3DModelCreate(var_r27);
sp18[lbl_1_bss_938[var_r29]] = var_r30; sp18[lbl_1_bss_938[var_r29]] = var_r30;
} else { }
else {
var_r30 = Hu3DModelLink(sp18[lbl_1_bss_938[var_r29]]); var_r30 = Hu3DModelLink(sp18[lbl_1_bss_938[var_r29]]);
} }
} else { }
else {
var_r30 = Hu3DModelLink(sp18[lbl_1_bss_938[var_r29]]); var_r30 = Hu3DModelLink(sp18[lbl_1_bss_938[var_r29]]);
} }
var_r31->unk_94[var_r29] = var_r30; var_r31->unk_94[var_r29] = var_r30;
var_r31->unk_F4[var_r29] = 0; var_r31->unk_F4[var_r29] = 0;
Hu3DModelCameraSet(var_r30, 1 << var_r31->unk_48); Hu3DModelCameraSet(var_r30, 1 << var_r31->unk_48);
Hu3DModelAttrSet(var_r30, 0x40000001); Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP);
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 34) + lbl_1_bss_938[var_r29], MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 34) + lbl_1_bss_938[var_r29], MEMORY_DEFAULT_NUM, HEAP_DATA);
var_r31->unk_B4[var_r29] = Hu3DJointMotion(var_r30, var_r27); var_r31->unk_B4[var_r29] = Hu3DJointMotion(var_r30, var_r27);
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 28) + lbl_1_bss_938[var_r29], MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 28) + lbl_1_bss_938[var_r29], MEMORY_DEFAULT_NUM, HEAP_DATA);
Hu3DMotionSet(var_r30, Hu3DJointMotion(var_r30, var_r27)); Hu3DMotionSet(var_r30, Hu3DJointMotion(var_r30, var_r27));
Hu3DModelAttrSet(var_r30, 0x40000001); Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(var_r30, 0x4000); Hu3DModelAttrSet(var_r30, HU3D_ATTR_NOCULL);
var_f29 = -950.0 * sind(var_f31); var_f29 = -950.0 * sind(var_f31);
var_f29 = var_f29; var_f29 = var_f29;
var_f28 = -950.0 * cosd(var_f31); var_f28 = -950.0 * cosd(var_f31);
@ -774,7 +784,8 @@ void fn_1_1E04(void)
if (var_r29 & 1) { if (var_r29 & 1) {
var_f30 = 220.0f; var_f30 = 220.0f;
var_f31 += 40.0f; var_f31 += 40.0f;
} else { }
else {
var_f30 = 570.0f; var_f30 = 570.0f;
} }
if (!lbl_1_bss_938[var_r29]) { if (!lbl_1_bss_938[var_r29]) {
@ -783,7 +794,8 @@ void fn_1_1E04(void)
HuSetVecF(&var_r31->unk_134[var_r29], var_f29, var_f30, var_f28); HuSetVecF(&var_r31->unk_134[var_r29], var_f29, var_f30, var_f28);
if (lbl_1_bss_938[var_r29]) { if (lbl_1_bss_938[var_r29]) {
(void)var_r29; (void)var_r29;
} else { }
else {
(void)var_r29; (void)var_r29;
} }
Hu3DModelPosSet(var_r30, var_f29 + (2000.0f * (var_r28 % 2)), var_f30, var_f28 + (2000.0f * (var_r28 / 2))); Hu3DModelPosSet(var_r30, var_f29 + (2000.0f * (var_r28 % 2)), var_f30, var_f28 + (2000.0f * (var_r28 / 2)));
@ -810,7 +822,7 @@ void fn_1_1E04(void)
var_r31->unk_14[var_r29] = CharModelMotionCreate(lbl_1_data_30[GWPlayerCfg[var_r28].character], lbl_1_data_50[var_r29]); var_r31->unk_14[var_r29] = CharModelMotionCreate(lbl_1_data_30[GWPlayerCfg[var_r28].character], lbl_1_data_50[var_r29]);
} }
CharModelMotionSet(lbl_1_data_30[GWPlayerCfg[var_r28].character], var_r31->unk_14[0]); CharModelMotionSet(lbl_1_data_30[GWPlayerCfg[var_r28].character], var_r31->unk_14[0]);
Hu3DModelAttrSet(var_r31->unk_12, 0x40000001); Hu3DModelAttrSet(var_r31->unk_12, HU3D_MOTATTR_LOOP);
CharModelMotionDataClose(lbl_1_data_30[GWPlayerCfg[var_r28].character]); CharModelMotionDataClose(lbl_1_data_30[GWPlayerCfg[var_r28].character]);
var_r25 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_EFFECT, 0), MEMORY_DEFAULT_NUM)); var_r25 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_EFFECT, 0), MEMORY_DEFAULT_NUM));
@ -873,7 +885,7 @@ void fn_1_1E04(void)
lbl_1_bss_A10 = var_r30; lbl_1_bss_A10 = var_r30;
Hu3DModelScaleSet(var_r30, 0.5f, 0.5f, 0.5f); Hu3DModelScaleSet(var_r30, 0.5f, 0.5f, 0.5f);
Hu3DModelCameraSet(var_r30, 16); Hu3DModelCameraSet(var_r30, 16);
Hu3DModelAttrSet(var_r30, 0x40000002); Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_PAUSE);
var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 40), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 40), MEMORY_DEFAULT_NUM, HEAP_DATA);
var_r30 = Hu3DModelCreate(var_r27); var_r30 = Hu3DModelCreate(var_r27);
@ -954,7 +966,8 @@ void fn_1_3B34(void)
var_f31 = (0.5 * var_f31) + (0.5 * (1.0f - ((1.0f - var_f31) * (1.0f - var_f31)))); var_f31 = (0.5 * var_f31) + (0.5 * (1.0f - ((1.0f - var_f31) * (1.0f - var_f31))));
if (var_f31 < 0.75) { if (var_f31 < 0.75) {
var_f29 = var_f31 / 0.75; var_f29 = var_f31 / 0.75;
} else { }
else {
var_f29 = 1.0; var_f29 = 1.0;
} }
var_f30 = var_f29; var_f30 = var_f29;
@ -982,7 +995,8 @@ void fn_1_3D48(s32 arg0, s32 arg1)
var_r28 = lbl_1_bss_97C[var_r31->unk_44]; var_r28 = lbl_1_bss_97C[var_r31->unk_44];
if (arg1 == 0) { if (arg1 == 0) {
lbl_1_bss_97C[var_r31->unk_44]++; lbl_1_bss_97C[var_r31->unk_44]++;
} else { }
else {
lbl_1_bss_97C[var_r31->unk_44]--; lbl_1_bss_97C[var_r31->unk_44]--;
} }
for (var_r30 = 0; var_r30 < 3; var_r30++) { for (var_r30 = 0; var_r30 < 3; var_r30++) {
@ -994,7 +1008,8 @@ void fn_1_3D48(s32 arg0, s32 arg1)
} }
HuSprAttrSet(var_r31->unk_2E, (var_r30 * 2) + 2, 4); HuSprAttrSet(var_r31->unk_2E, (var_r30 * 2) + 2, 4);
HuSprAttrReset(var_r31->unk_2E, (var_r30 * 2) + 3, 4); HuSprAttrReset(var_r31->unk_2E, (var_r30 * 2) + 3, 4);
} else { }
else {
HuSprAttrReset(var_r31->unk_2E, (var_r30 * 2) + 2, 4); HuSprAttrReset(var_r31->unk_2E, (var_r30 * 2) + 2, 4);
HuSprAttrSet(var_r31->unk_2E, (var_r30 * 2) + 3, 4); HuSprAttrSet(var_r31->unk_2E, (var_r30 * 2) + 3, 4);
} }
@ -1038,17 +1053,20 @@ void fn_1_3ECC(void)
var_f31 = 40.0f * ((var_r30 + 2) / 2); var_f31 = 40.0f * ((var_r30 + 2) / 2);
if (var_r31->unk_70 - var_f31 >= 0.0f) { if (var_r31->unk_70 - var_f31 >= 0.0f) {
var_f29 = var_r31->unk_70 - var_f31; var_f29 = var_r31->unk_70 - var_f31;
} else { }
else {
var_f29 = -(var_r31->unk_70 - var_f31); var_f29 = -(var_r31->unk_70 - var_f31);
} }
if (var_f29 < 45.0f || (0.0f == var_r31->unk_70 && var_r30 >= 14)) { if (var_f29 < 45.0f || (0.0f == var_r31->unk_70 && var_r30 >= 14)) {
if (var_r30 == fn_1_654C(var_r31->unk_44, 0) || var_r30 == fn_1_654C(var_r31->unk_44, 1)) { if (var_r30 == fn_1_654C(var_r31->unk_44, 0) || var_r30 == fn_1_654C(var_r31->unk_44, 1)) {
if (var_r31->unk_44 & 1) { if (var_r31->unk_44 & 1) {
HuAudFXPlay(1434); HuAudFXPlay(1434);
} else { }
else {
HuAudFXPlay(1433); HuAudFXPlay(1433);
} }
} else { }
else {
HuAudFXPlay(1450); HuAudFXPlay(1450);
} }
} }
@ -1073,17 +1091,20 @@ void fn_1_3ECC(void)
var_f30 = 40.0f * ((var_r30 + 2) / 2); var_f30 = 40.0f * ((var_r30 + 2) / 2);
if (var_r31->unk_70 - var_f30 >= 0.0f) { if (var_r31->unk_70 - var_f30 >= 0.0f) {
var_f28 = var_r31->unk_70 - var_f30; var_f28 = var_r31->unk_70 - var_f30;
} else { }
else {
var_f28 = -(var_r31->unk_70 - var_f30); var_f28 = -(var_r31->unk_70 - var_f30);
} }
if (var_f28 < 45.0f || (0.0f == var_r31->unk_70 && var_r30 >= 14)) { if (var_f28 < 45.0f || (0.0f == var_r31->unk_70 && var_r30 >= 14)) {
if (var_r30 == fn_1_654C(var_r31->unk_44, 0) || var_r30 == fn_1_654C(var_r31->unk_44, 1)) { if (var_r30 == fn_1_654C(var_r31->unk_44, 0) || var_r30 == fn_1_654C(var_r31->unk_44, 1)) {
if (var_r31->unk_44 & 1) { if (var_r31->unk_44 & 1) {
HuAudFXPlay(1436); HuAudFXPlay(1436);
} else { }
else {
HuAudFXPlay(1435); HuAudFXPlay(1435);
} }
} else { }
else {
HuAudFXPlay(1452); HuAudFXPlay(1452);
} }
} }
@ -1120,19 +1141,22 @@ void fn_1_42AC(void)
HuPrcSleep(30); HuPrcSleep(30);
if (var_r31->unk_44 & 1) { if (var_r31->unk_44 & 1) {
HuAudFXPlay(1444); HuAudFXPlay(1444);
} else { }
else {
HuAudFXPlay(1443); HuAudFXPlay(1443);
} }
if (var_r31->unk_44 & 1) { if (var_r31->unk_44 & 1) {
HuAudFXPlay(1448); HuAudFXPlay(1448);
} else { }
else {
HuAudFXPlay(1447); HuAudFXPlay(1447);
} }
if (var_r30->unk_08) { if (var_r30->unk_08) {
var_f24 = -200.0 * (sind(lbl_1_bss_920[var_r27]) * cos(0.0)); var_f24 = -200.0 * (sind(lbl_1_bss_920[var_r27]) * cos(0.0));
var_f26 = 150.0 + (-200.0 * sin(0.0)); var_f26 = 150.0 + (-200.0 * sin(0.0));
var_f23 = -200.0 * (cos(0.0) * cosd(lbl_1_bss_920[var_r27])); var_f23 = -200.0 * (cos(0.0) * cosd(lbl_1_bss_920[var_r27]));
} else { }
else {
var_f24 = -200.0 * (sind(lbl_1_bss_920[var_r27]) * cos(0.3490658503988659)); var_f24 = -200.0 * (sind(lbl_1_bss_920[var_r27]) * cos(0.3490658503988659));
var_f26 = 150.0 + (-200.0 * sin(-0.3490658503988659)); var_f26 = 150.0 + (-200.0 * sin(-0.3490658503988659));
var_f23 = -200.0 * (cos(-0.3490658503988659) * cosd(lbl_1_bss_920[var_r27])); var_f23 = -200.0 * (cos(-0.3490658503988659) * cosd(lbl_1_bss_920[var_r27]));
@ -1173,7 +1197,7 @@ void fn_1_42AC(void)
HuPrcVSleep(); HuPrcVSleep();
} }
var_r31->unk_F4[var_r30->unk_04] = 1; var_r31->unk_F4[var_r30->unk_04] = 1;
Hu3DModelAttrSet(var_r31->unk_94[var_r30->unk_04], 1); Hu3DModelAttrSet(var_r31->unk_94[var_r30->unk_04], HU3D_ATTR_DISPOFF);
for (var_r28 = 0, sp8[0] = 0; var_r28 < 4; var_r28++) { for (var_r28 = 0, sp8[0] = 0; var_r28 < 4; var_r28++) {
if (lbl_1_bss_97C[var_r28] >= 3) { if (lbl_1_bss_97C[var_r28] >= 3) {
break; break;
@ -1185,11 +1209,12 @@ void fn_1_42AC(void)
CharModelMotionSpeedSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], 1.0f); CharModelMotionSpeedSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], 1.0f);
if (var_r30->unk_08) { if (var_r30->unk_08) {
CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[1], 60.0f, 5.0f, HU3D_MOTATTR_NONE); CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[1], 60.0f, 5.0f, HU3D_MOTATTR_NONE);
} else { }
else {
CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE); CharModelMotionShiftSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], var_r31->unk_14[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
} }
HuPrcSleep(5); HuPrcSleep(5);
Hu3DModelAttrSet(var_r31->unk_12, 0x40000002); Hu3DModelAttrSet(var_r31->unk_12, HU3D_MOTATTR_PAUSE);
CharModelMotionSpeedSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], 2.0f); CharModelMotionSpeedSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], 2.0f);
var_r30->unk_0C = 0; var_r30->unk_0C = 0;
HuPrcSleep(5); HuPrcSleep(5);
@ -1251,7 +1276,8 @@ s32 fn_1_4C74(UnkM414BssF0Struct *arg0)
} }
if (var_r29 - sp8[var_r31] >= 0) { if (var_r29 - sp8[var_r31] >= 0) {
var_r25 = var_r29 - sp8[var_r31]; var_r25 = var_r29 - sp8[var_r31];
} else { }
else {
var_r25 = -(var_r29 - sp8[var_r31]); var_r25 = -(var_r29 - sp8[var_r31]);
} }
var_r27 = var_r25; var_r27 = var_r25;
@ -1303,7 +1329,7 @@ inline s32 fn_1_4C74_inline(UnkM414BssF0Struct *arg0)
if (!var_r31) { if (!var_r31) {
return 0; return 0;
} }
return var_r29 - sp8[var_r26]; return var_r29 - sp8[var_r26];
} }
@ -1352,14 +1378,17 @@ void fn_1_4E10(UnkM414BssF0Struct *arg0)
if (!(Hu3DModelMotionAttrGet(arg0->unk_D4[fn_1_654C(arg0->unk_44, 0)]) & 0x40000004)) { if (!(Hu3DModelMotionAttrGet(arg0->unk_D4[fn_1_654C(arg0->unk_44, 0)]) & 0x40000004)) {
arg0->unk_200 = 256; arg0->unk_200 = 256;
} }
} else { }
else {
arg0->unk_1FD = -50; arg0->unk_1FD = -50;
} }
} else if (lbl_1_bss_978 == lbl_1_bss_938[fn_1_654C(arg0->unk_44, 1)] && !arg0->unk_F4[fn_1_654C(arg0->unk_44, 1)]) { }
else if (lbl_1_bss_978 == lbl_1_bss_938[fn_1_654C(arg0->unk_44, 1)] && !arg0->unk_F4[fn_1_654C(arg0->unk_44, 1)]) {
if (!(Hu3DModelMotionAttrGet(arg0->unk_D4[fn_1_654C(arg0->unk_44, 1)]) & 0x40000004)) { if (!(Hu3DModelMotionAttrGet(arg0->unk_D4[fn_1_654C(arg0->unk_44, 1)]) & 0x40000004)) {
arg0->unk_200 = 256; arg0->unk_200 = 256;
} }
} else { }
else {
arg0->unk_1FD = 50; arg0->unk_1FD = 50;
} }
} }
@ -1393,7 +1422,8 @@ s8 fn_1_5554(s32 arg0, s32 arg1) // similar to m411Dll/main.c::fn_1_5D58
if (lbl_1_bss_98C < 4) { if (lbl_1_bss_98C < 4) {
if (!GWPlayerCfg[arg0].iscom) { if (!GWPlayerCfg[arg0].iscom) {
(arg1) ? (var_r30 = HuPadStkY[var_r31->unk_4C]) : (var_r30 = HuPadStkX[var_r31->unk_4C]); (arg1) ? (var_r30 = HuPadStkY[var_r31->unk_4C]) : (var_r30 = HuPadStkX[var_r31->unk_4C]);
} else { }
else {
(arg1) ? (var_r30 = var_r31->unk_1FD) : (var_r30 = var_r31->unk_1FC); (arg1) ? (var_r30 = var_r31->unk_1FD) : (var_r30 = var_r31->unk_1FC);
} }
} }
@ -1410,7 +1440,8 @@ u8 fn_1_5624(s32 arg0, s32 arg1)
if (lbl_1_bss_98C < 4) { if (lbl_1_bss_98C < 4) {
if (!GWPlayerCfg[arg0].iscom) { if (!GWPlayerCfg[arg0].iscom) {
(arg1) ? (var_r30 = HuPadTrigR[var_r31->unk_4C]) : (var_r30 = HuPadTrigL[var_r31->unk_4C]); (arg1) ? (var_r30 = HuPadTrigR[var_r31->unk_4C]) : (var_r30 = HuPadTrigL[var_r31->unk_4C]);
} else { }
else {
(arg1) ? (var_r30 = var_r31->unk_1FE) : (var_r30 = var_r31->unk_1FF); (arg1) ? (var_r30 = var_r31->unk_1FE) : (var_r30 = var_r31->unk_1FF);
} }
} }
@ -1427,7 +1458,8 @@ u16 fn_1_56FC(s32 arg0)
if (lbl_1_bss_98C < 4) { if (lbl_1_bss_98C < 4) {
if (!GWPlayerCfg[arg0].iscom) { if (!GWPlayerCfg[arg0].iscom) {
var_r30 = HuPadBtnDown[var_r31->unk_4C]; var_r30 = HuPadBtnDown[var_r31->unk_4C];
} else { }
else {
var_r30 = var_r31->unk_200; var_r30 = var_r31->unk_200;
} }
} }
@ -1457,19 +1489,22 @@ void fn_1_5780(UnkM414BssF0Struct *arg0, float arg8)
} }
if (var_f30 - var_f31 >= 0.0f) { if (var_f30 - var_f31 >= 0.0f) {
var_f27 = var_f30 - var_f31; var_f27 = var_f30 - var_f31;
} else { }
else {
var_f27 = -(var_f30 - var_f31); var_f27 = -(var_f30 - var_f31);
} }
var_f28 = var_f27; var_f28 = var_f27;
if (var_f28 < var_f29 || arg0->unk_F4[var_r31] == 1) { if (var_f28 < var_f29 || arg0->unk_F4[var_r31] == 1) {
Hu3DModelAttrSet(arg0->unk_94[var_r31], 1); Hu3DModelAttrSet(arg0->unk_94[var_r31], HU3D_ATTR_DISPOFF);
} else { }
Hu3DModelAttrReset(arg0->unk_94[var_r31], 1); else {
Hu3DModelAttrReset(arg0->unk_94[var_r31], HU3D_ATTR_DISPOFF);
} }
if (var_f28 < var_f29) { if (var_f28 < var_f29) {
Hu3DModelAttrSet(arg0->unk_D4[var_r31], 1); Hu3DModelAttrSet(arg0->unk_D4[var_r31], HU3D_ATTR_DISPOFF);
} else { }
Hu3DModelAttrReset(arg0->unk_D4[var_r31], 1); else {
Hu3DModelAttrReset(arg0->unk_D4[var_r31], HU3D_ATTR_DISPOFF);
} }
if (var_r31 & 1) { if (var_r31 & 1) {
var_f30 += 40.0f; var_f30 += 40.0f;
@ -1486,14 +1521,16 @@ void fn_1_5780(UnkM414BssF0Struct *arg0, float arg8)
} }
if (var_f30 - var_f31 >= 0.0f) { if (var_f30 - var_f31 >= 0.0f) {
var_f26 = var_f30 - var_f31; var_f26 = var_f30 - var_f31;
} else { }
else {
var_f26 = -(var_f30 - var_f31); var_f26 = -(var_f30 - var_f31);
} }
var_f28 = var_f26; var_f28 = var_f26;
if (var_f28 < var_f29) { if (var_f28 < var_f29) {
Hu3DModelAttrSet(arg0->unk_00[var_r31], 1); Hu3DModelAttrSet(arg0->unk_00[var_r31], HU3D_ATTR_DISPOFF);
} else { }
Hu3DModelAttrReset(arg0->unk_00[var_r31], 1); else {
Hu3DModelAttrReset(arg0->unk_00[var_r31], HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -1521,7 +1558,8 @@ void fn_1_5A3C(void)
if (var_r31->unk_04) { if (var_r31->unk_04) {
var_f30 = 40.0f + lbl_1_bss_920[var_r28]; var_f30 = 40.0f + lbl_1_bss_920[var_r28];
var_f29 = 40.0f; var_f29 = 40.0f;
} else { }
else {
var_f30 = lbl_1_bss_920[var_r28] - 40.0f; var_f30 = lbl_1_bss_920[var_r28] - 40.0f;
var_f29 = -40.0f; var_f29 = -40.0f;
} }
@ -1532,15 +1570,16 @@ void fn_1_5A3C(void)
var_f30 += 360.0f; var_f30 += 360.0f;
} }
for (var_r30 = 0; var_r30 < 9; var_r30++) { for (var_r30 = 0; var_r30 < 9; var_r30++) {
Hu3DModelAttrSet(var_r31->unk_00->unk_00[var_r30], 0x40000002); Hu3DModelAttrSet(var_r31->unk_00->unk_00[var_r30], HU3D_MOTATTR_PAUSE);
} }
for (var_r30 = 0, var_f28 = 0.0f; var_r30 < 10; var_r30++, var_f28 += 9.0f) { for (var_r30 = 0, var_f28 = 0.0f; var_r30 < 10; var_r30++, var_f28 += 9.0f) {
var_f27 = (var_f29/2) * (1.0 - cosd(var_f28)); var_f27 = (var_f29 / 2) * (1.0 - cosd(var_f28));
lbl_1_bss_920[var_r28] = var_f26 + var_f27; lbl_1_bss_920[var_r28] = var_f26 + var_f27;
for (var_r29 = 0; var_r29 < 9; var_r29++) { for (var_r29 = 0; var_r29 < 9; var_r29++) {
if (!var_r31->unk_04) { if (!var_r31->unk_04) {
var_f31 = (var_f27 / var_f29) * Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]); var_f31 = (var_f27 / var_f29) * Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]);
} else { }
else {
var_f31 = Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]) var_f31 = Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29])
- (var_f27 / var_f29) * Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]); - (var_f27 / var_f29) * Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]);
} }
@ -1549,12 +1588,13 @@ void fn_1_5A3C(void)
HuPrcVSleep(); HuPrcVSleep();
} }
for (var_r30 = 0, var_f28 = 0.0f; var_r30 < 10; var_r30++, var_f28 += 9.0f) { for (var_r30 = 0, var_f28 = 0.0f; var_r30 < 10; var_r30++, var_f28 += 9.0f) {
var_f27 = (var_f29/2) + ((var_f29/2) * sind(var_f28)); var_f27 = (var_f29 / 2) + ((var_f29 / 2) * sind(var_f28));
lbl_1_bss_920[var_r28] = var_f26 + var_f27; lbl_1_bss_920[var_r28] = var_f26 + var_f27;
for (var_r29 = 0; var_r29 < 9; var_r29++) { for (var_r29 = 0; var_r29 < 9; var_r29++) {
if (!var_r31->unk_04) { if (!var_r31->unk_04) {
var_f31 = (var_f27 / var_f29) * Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]); var_f31 = (var_f27 / var_f29) * Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]);
} else { }
else {
var_f31 = Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]) var_f31 = Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29])
- (var_f27 / var_f29) * Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]); - (var_f27 / var_f29) * Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]);
} }
@ -1566,7 +1606,8 @@ void fn_1_5A3C(void)
for (var_r30 = 0; var_r30 < 9; var_r30++) { for (var_r30 = 0; var_r30 < 9; var_r30++) {
Hu3DMotionTimeSet(var_r31->unk_00->unk_00[var_r30], Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r30])); Hu3DMotionTimeSet(var_r31->unk_00->unk_00[var_r30], Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r30]));
} }
} else { }
else {
for (var_r30 = 0; var_r30 < 9; var_r30++) { for (var_r30 = 0; var_r30 < 9; var_r30++) {
Hu3DMotionTimeSet(var_r31->unk_00->unk_00[var_r30], 0.0f); Hu3DMotionTimeSet(var_r31->unk_00->unk_00[var_r30], 0.0f);
} }
@ -1596,7 +1637,8 @@ void fn_1_5EE8(void)
if (var_r31->unk_04) { if (var_r31->unk_04) {
var_f31 = 40.0f + lbl_1_bss_920[var_r29]; var_f31 = 40.0f + lbl_1_bss_920[var_r29];
var_f29 = 40.0f; var_f29 = 40.0f;
} else { }
else {
var_f31 = lbl_1_bss_920[var_r29] - 40.0f; var_f31 = lbl_1_bss_920[var_r29] - 40.0f;
var_f29 = -40.0f; var_f29 = -40.0f;
} }
@ -1607,11 +1649,11 @@ void fn_1_5EE8(void)
var_f31 += 360.0f; var_f31 += 360.0f;
} }
for (var_r30 = 0, var_f30 = 0.0f; var_r30 < 15; var_r30++, var_f30 += 6.0f) { for (var_r30 = 0, var_f30 = 0.0f; var_r30 < 15; var_r30++, var_f30 += 6.0f) {
var_r31->unk_00->unk_70 = var_f28 + ((var_f29/2) * (1.0 - cosd(var_f30))); var_r31->unk_00->unk_70 = var_f28 + ((var_f29 / 2) * (1.0 - cosd(var_f30)));
HuPrcVSleep(); HuPrcVSleep();
} }
for (var_r30 = 0, var_f30 = 0.0f; var_r30 < 15; var_r30++, var_f30 += 6.0f) { for (var_r30 = 0, var_f30 = 0.0f; var_r30 < 15; var_r30++, var_f30 += 6.0f) {
var_r31->unk_00->unk_70 = (var_f29/2) + (var_f28 + ((var_f29/2) * sind(var_f30))); var_r31->unk_00->unk_70 = (var_f29 / 2) + (var_f28 + ((var_f29 / 2) * sind(var_f30)));
HuPrcVSleep(); HuPrcVSleep();
} }
var_r31->unk_00->unk_70 = var_f31; var_r31->unk_00->unk_70 = var_f31;
@ -1714,7 +1756,8 @@ void fn_1_6644(void)
if (0.0f == Hu3DMotionTimeGet(var_r31->unk_20)) { if (0.0f == Hu3DMotionTimeGet(var_r31->unk_20)) {
Hu3DMotionSet(var_r31->unk_20, var_r31->unk_22[0]); Hu3DMotionSet(var_r31->unk_20, var_r31->unk_22[0]);
var_r31->unk_1F4 = 1; var_r31->unk_1F4 = 1;
} else { }
else {
var_r31->unk_1F4 = 2; var_r31->unk_1F4 = 2;
Hu3DMotionSet(var_r31->unk_20, var_r31->unk_22[0]); Hu3DMotionSet(var_r31->unk_20, var_r31->unk_22[0]);
Hu3DMotionTimeSet(var_r31->unk_20, Hu3DMotionMaxTimeGet(var_r31->unk_20)); Hu3DMotionTimeSet(var_r31->unk_20, Hu3DMotionMaxTimeGet(var_r31->unk_20));
@ -1724,7 +1767,7 @@ void fn_1_6644(void)
var_r31->unk_1F4 = 1; var_r31->unk_1F4 = 1;
var_r31->unk_1F8 = -1; var_r31->unk_1F8 = -1;
Hu3DMotionSet(var_r31->unk_20, var_r31->unk_22[0]); Hu3DMotionSet(var_r31->unk_20, var_r31->unk_22[0]);
Hu3DModelAttrSet(var_r31->unk_20, 0x40000002); Hu3DModelAttrSet(var_r31->unk_20, HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(var_r31->unk_20, 0x40000004); Hu3DModelAttrReset(var_r31->unk_20, 0x40000004);
Hu3DMotionSpeedSet(var_r31->unk_20, 2.0f); Hu3DMotionSpeedSet(var_r31->unk_20, 2.0f);
} }
@ -1743,7 +1786,8 @@ void fn_1_6644(void)
if (!var_r31->unk_F4[var_r29]) { if (!var_r31->unk_F4[var_r29]) {
if (var_r31->unk_44 & 1) { if (var_r31->unk_44 & 1) {
HuAudFXPlay(1442); HuAudFXPlay(1442);
} else { }
else {
HuAudFXPlay(1441); HuAudFXPlay(1441);
} }
omVibrate(var_r31->unk_44, 12, 6, 6); omVibrate(var_r31->unk_44, 12, 6, 6);
@ -1756,16 +1800,17 @@ void fn_1_6644(void)
var_r30->user_data = var_r31; var_r30->user_data = var_r31;
if (lbl_1_bss_978 == lbl_1_bss_938[var_r29] && fn_1_65DC(var_r31, var_r29)) { if (lbl_1_bss_978 == lbl_1_bss_938[var_r29] && fn_1_65DC(var_r31, var_r29)) {
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000186); Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000186);
var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet()); var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = &sp8C; var_r30->user_data = &sp8C;
sp8C.unk_00 = var_r31; sp8C.unk_00 = var_r31;
sp8C.unk_08 = 0; sp8C.unk_08 = 0;
sp8C.unk_0C = 1; sp8C.unk_0C = 1;
sp8C.unk_04 = fn_1_654C(var_r31->unk_44, sp8C.unk_08); sp8C.unk_04 = fn_1_654C(var_r31->unk_44, sp8C.unk_08);
while (sp8C.unk_0C) { while (sp8C.unk_0C) {
HuPrcVSleep(); HuPrcVSleep();
} }
} else { }
else {
HuPrcSleep(10); HuPrcSleep(10);
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000082); Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000082);
Hu3DModelAttrSet(var_r31->unk_D4[var_r29], 0x40000104); Hu3DModelAttrSet(var_r31->unk_D4[var_r29], 0x40000104);
@ -1779,19 +1824,22 @@ void fn_1_6644(void)
HuPrcSleep(10); HuPrcSleep(10);
if (var_r31->unk_44 & 1) { if (var_r31->unk_44 & 1) {
HuAudFXPlay(1444); HuAudFXPlay(1444);
} else { }
else {
HuAudFXPlay(1443); HuAudFXPlay(1443);
} }
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000004); Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000004);
HuPrcSleep(10); HuPrcSleep(10);
} }
} }
} else if (var_r31->unk_1F4 == 2) { }
else if (var_r31->unk_1F4 == 2) {
var_r29 = fn_1_654C(var_r31->unk_44, 1); var_r29 = fn_1_654C(var_r31->unk_44, 1);
if (!var_r31->unk_F4[var_r29]) { if (!var_r31->unk_F4[var_r29]) {
if (var_r31->unk_44 & 1) { if (var_r31->unk_44 & 1) {
HuAudFXPlay(1442); HuAudFXPlay(1442);
} else { }
else {
HuAudFXPlay(1441); HuAudFXPlay(1441);
} }
omVibrate(var_r31->unk_44, 12, 6, 6); omVibrate(var_r31->unk_44, 12, 6, 6);
@ -1803,16 +1851,17 @@ void fn_1_6644(void)
var_r30->user_data = var_r31; var_r30->user_data = var_r31;
if (lbl_1_bss_978 == lbl_1_bss_938[var_r29] && fn_1_65DC(var_r31, var_r29)) { if (lbl_1_bss_978 == lbl_1_bss_938[var_r29] && fn_1_65DC(var_r31, var_r29)) {
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000186); Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000186);
var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet()); var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = &sp8C; var_r30->user_data = &sp8C;
sp8C.unk_00 = var_r31; sp8C.unk_00 = var_r31;
sp8C.unk_08 = 1; sp8C.unk_08 = 1;
sp8C.unk_0C = 1; sp8C.unk_0C = 1;
sp8C.unk_04 = fn_1_654C(var_r31->unk_44, sp8C.unk_08); sp8C.unk_04 = fn_1_654C(var_r31->unk_44, sp8C.unk_08);
while (sp8C.unk_0C) { while (sp8C.unk_0C) {
HuPrcVSleep(); HuPrcVSleep();
} }
} else { }
else {
HuPrcSleep(10); HuPrcSleep(10);
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000082); Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000082);
Hu3DModelAttrSet(var_r31->unk_D4[var_r29], 0x40000104); Hu3DModelAttrSet(var_r31->unk_D4[var_r29], 0x40000104);
@ -1825,7 +1874,8 @@ void fn_1_6644(void)
HuPrcSleep(15); HuPrcSleep(15);
if (var_r31->unk_44 & 1) { if (var_r31->unk_44 & 1) {
HuAudFXPlay(1444); HuAudFXPlay(1444);
} else { }
else {
HuAudFXPlay(1443); HuAudFXPlay(1443);
} }
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000004); Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000004);
@ -1861,12 +1911,15 @@ void fn_1_6644(void)
if (var_r28) { if (var_r28) {
if (var_r31->unk_44 & 1) { if (var_r31->unk_44 & 1) {
HuAudFXPlay(1440); HuAudFXPlay(1440);
} else { }
else {
HuAudFXPlay(1439); HuAudFXPlay(1439);
} }
} else if (var_r31->unk_44 & 1) { }
else if (var_r31->unk_44 & 1) {
HuAudFXPlay(1438); HuAudFXPlay(1438);
} else { }
else {
HuAudFXPlay(1437); HuAudFXPlay(1437);
} }
var_r31->unk_58 = 1; var_r31->unk_58 = 1;
@ -1912,8 +1965,8 @@ void fn_1_76F4(void)
var_f29 = Hu3DMotionMaxTimeGet(var_r31->unk_20); var_f29 = Hu3DMotionMaxTimeGet(var_r31->unk_20);
sp14.y = 220.0f + (350.0f * (1.0f - (Hu3DMotionTimeGet(var_r31->unk_20) / var_f29))); sp14.y = 220.0f + (350.0f * (1.0f - (Hu3DMotionTimeGet(var_r31->unk_20) / var_f29)));
Hu3D3Dto2D(&sp14, 1 << var_r31->unk_48, &sp8); Hu3D3Dto2D(&sp14, 1 << var_r31->unk_48, &sp8);
var_f31 = (282.0f * (var_r31->unk_44 % 2)) + (sp8.x /2); var_f31 = (282.0f * (var_r31->unk_44 % 2)) + (sp8.x / 2);
var_f30 = (225.0f * (var_r31->unk_44 / 2)) + (sp8.y /2); var_f30 = (225.0f * (var_r31->unk_44 / 2)) + (sp8.y / 2);
var_f31 += 3.0f; var_f31 += 3.0f;
var_f30 -= 15.0f; var_f30 -= 15.0f;
HuSprGrpPosSet(var_r31->unk_2C, var_f31, var_f30); HuSprGrpPosSet(var_r31->unk_2C, var_f31, var_f30);
@ -1952,7 +2005,7 @@ void fn_1_79A8(void)
} }
Hu3DCameraViewportSet(16, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f); Hu3DCameraViewportSet(16, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f);
Hu3DCameraScissorSet(16, 0, 0, 0, 0); Hu3DCameraScissorSet(16, 0, 0, 0, 0);
Hu3DModelAttrSet(lbl_1_bss_A10, 1); Hu3DModelAttrSet(lbl_1_bss_A10, HU3D_ATTR_DISPOFF);
HuPrcSleep(30); HuPrcSleep(30);
for (var_r29 = 0; var_r29 < 45; var_r29++) { for (var_r29 = 0; var_r29 < 45; var_r29++) {
for (var_r30 = 0; var_r30 < 4; var_r30++) { for (var_r30 = 0; var_r30 < 4; var_r30++) {
@ -1986,7 +2039,7 @@ void fn_1_79A8(void)
HuPrcSleep(5); HuPrcSleep(5);
for (var_r30 = 0; var_r30 < 4; var_r30++) { for (var_r30 = 0; var_r30 < 4; var_r30++) {
var_r31 = &lbl_1_bss_F0[var_r30]; var_r31 = &lbl_1_bss_F0[var_r30];
Hu3DModelAttrSet(var_r31->unk_12, 1073741826); Hu3DModelAttrSet(var_r31->unk_12, HU3D_MOTATTR_PAUSE);
} }
HuPrcChildCreate(fn_1_397C, 4096, 8192, 0, HuPrcCurrentGet()); HuPrcChildCreate(fn_1_397C, 4096, 8192, 0, HuPrcCurrentGet());
for (var_r30 = 0; var_r30 < 4; var_r30++) { for (var_r30 = 0; var_r30 < 4; var_r30++) {
@ -2047,7 +2100,7 @@ void fn_1_7FC8(s32 arg0)
if (lbl_1_bss_978 == 2) { if (lbl_1_bss_978 == 2) {
Hu3DModelScaleSet(var_r30->unk_94[var_r28], 1.0f, 1.0f, 1.0f); Hu3DModelScaleSet(var_r30->unk_94[var_r28], 1.0f, 1.0f, 1.0f);
} }
Hu3DModelAttrReset(var_r30->unk_94[var_r28], 1); Hu3DModelAttrReset(var_r30->unk_94[var_r28], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(var_r30->unk_94[var_r28]); Hu3DModelShadowSet(var_r30->unk_94[var_r28]);
if (var_r29++ >= 2) { if (var_r29++ >= 2) {
break; break;
@ -2066,13 +2119,13 @@ void fn_1_7FC8(s32 arg0)
var_r29 -= 9; var_r29 -= 9;
} }
for (var_r28 = 0; var_r28 < 6; var_r28++) { for (var_r28 = 0; var_r28 < 6; var_r28++) {
Hu3DModelAttrSet(var_r30->unk_30[var_r29], 1); Hu3DModelAttrSet(var_r30->unk_30[var_r29], HU3D_ATTR_DISPOFF);
var_r29++; var_r29++;
if (var_r29 >= 9) { if (var_r29 >= 9) {
var_r29 = 0; var_r29 = 0;
} }
} }
Hu3DModelAttrReset(var_r30->unk_42, 1); Hu3DModelAttrReset(var_r30->unk_42, HU3D_ATTR_DISPOFF);
Hu3DModelRotSet(var_r30->unk_42, 0.0f, lbl_1_bss_920[var_r30->unk_44], 0.0f); Hu3DModelRotSet(var_r30->unk_42, 0.0f, lbl_1_bss_920[var_r30->unk_44], 0.0f);
} }
for (var_r28 = 0; var_r28 < 30; var_r28++) { for (var_r28 = 0; var_r28 < 30; var_r28++) {
@ -2124,7 +2177,8 @@ void fn_1_88D4(void)
while (TRUE) { while (TRUE) {
if (var_r31->unk_1F4 == 4 || var_r31->unk_1F4 == 5 || var_r31->unk_58) { if (var_r31->unk_1F4 == 4 || var_r31->unk_1F4 == 5 || var_r31->unk_58) {
HuPrcVSleep(); HuPrcVSleep();
} else { }
else {
break; break;
} }
} }
@ -2154,7 +2208,8 @@ void fn_1_894C(void)
} }
if (var_r31 < 4) { if (var_r31 < 4) {
HuPrcVSleep(); HuPrcVSleep();
} else { }
else {
break; break;
} }
} }
@ -2272,7 +2327,8 @@ void fn_1_8A70(void)
HuAudSStreamPlay(1); HuAudSStreamPlay(1);
GWPlayerCoinWinSet(var_r29, 10); GWPlayerCoinWinSet(var_r29, 10);
var_r28 = MGSeqCreate(5, 3, GWPlayerCfg[var_r29].character, -1, -1, -1); var_r28 = MGSeqCreate(5, 3, GWPlayerCfg[var_r29].character, -1, -1, -1);
} else { }
else {
HuAudSStreamPlay(4); HuAudSStreamPlay(4);
var_r28 = MGSeqCreate(3, 2); var_r28 = MGSeqCreate(3, 2);
} }

582
src/REL/m415Dll/main.c
View file

File diff suppressed because it is too large Load diff

40
src/REL/m416Dll/main.c
View file

@ -451,7 +451,7 @@ void fn_1_156C(omObjData *object)
work->unk0E = GWPlayerCfg[work->unk02].diff; work->unk0E = GWPlayerCfg[work->unk02].diff;
work->unk10 = GWPlayerCfg[work->unk02].group; work->unk10 = GWPlayerCfg[work->unk02].group;
object->model[0] = CharModelCreate(work->unk0C, 4); object->model[0] = CharModelCreate(work->unk0C, 4);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
work->field_0_bit2 = 1; work->field_0_bit2 = 1;
work->field_0_bit4 = 1; work->field_0_bit4 = 1;
@ -480,7 +480,7 @@ void fn_1_156C(omObjData *object)
fn_1_8EB4(object->model[0]); fn_1_8EB4(object->model[0]);
fn_1_8EB4(object->model[1]); fn_1_8EB4(object->model[1]);
Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
CharModelMotionIndexSet(work->unk0C, object->motion[1], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02)); CharModelMotionIndexSet(work->unk0C, object->motion[1], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02));
CharModelMotionIndexSet(work->unk0C, object->motion[2], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02)); CharModelMotionIndexSet(work->unk0C, object->motion[2], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02));
CharModelMotionDataClose(work->unk0C); CharModelMotionDataClose(work->unk0C);
@ -488,7 +488,7 @@ void fn_1_156C(omObjData *object)
Hu3DParticleHookSet(object->model[4], fn_1_6AE8); Hu3DParticleHookSet(object->model[4], fn_1_6AE8);
Hu3DParticleBlendModeSet(object->model[4], 1); Hu3DParticleBlendModeSet(object->model[4], 1);
Hu3DModelLayerSet(object->model[4], 6); Hu3DModelLayerSet(object->model[4], 6);
Hu3DModelAttrSet(object->model[4], 1); Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF);
object->trans.x = lbl_1_data_B0[player][0]; object->trans.x = lbl_1_data_B0[player][0];
object->trans.y = lbl_1_data_B0[player][1]; object->trans.y = lbl_1_data_B0[player][1];
object->trans.z = lbl_1_data_B0[player][2]; object->trans.z = lbl_1_data_B0[player][2];
@ -540,8 +540,8 @@ void fn_1_1964(omObjData *object)
Hu3DParticleHookSet(object->model[2], fn_1_613C); Hu3DParticleHookSet(object->model[2], fn_1_613C);
Hu3DParticleBlendModeSet(object->model[2], 1); Hu3DParticleBlendModeSet(object->model[2], 1);
Hu3DModelLayerSet(object->model[2], 6); Hu3DModelLayerSet(object->model[2], 6);
Hu3DModelAttrSet(object->model[2], 2); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_ZWRITE_OFF);
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
work->unk44 = 5; work->unk44 = 5;
work->unk48 = fn_1_29DC; work->unk48 = fn_1_29DC;
} }
@ -566,13 +566,13 @@ void fn_1_1ADC(omObjData *object)
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M416, 0x02)); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M416, 0x02));
Hu3DModelLayerSet(object->model[2], 3); Hu3DModelLayerSet(object->model[2], 3);
fn_1_6DEC(object->model[2], 16); fn_1_6DEC(object->model[2], 16);
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DMotionSpeedSet(object->model[2], 0); Hu3DMotionSpeedSet(object->model[2], 0);
Hu3DAnimCreate(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M416, 0x07), MEMORY_DEFAULT_NUM), object->model[2], "sb00"); Hu3DAnimCreate(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M416, 0x07), MEMORY_DEFAULT_NUM), object->model[2], "sb00");
object->model[3] = Hu3DParticleCreate(lbl_1_bss_914, 50); object->model[3] = Hu3DParticleCreate(lbl_1_bss_914, 50);
Hu3DParticleHookSet(object->model[3], fn_1_6640); Hu3DParticleHookSet(object->model[3], fn_1_6640);
Hu3DModelLayerSet(object->model[3], 3); Hu3DModelLayerSet(object->model[3], 3);
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
work->unk4C = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Bss930Work4C), MEMORY_DEFAULT_NUM); work->unk4C = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Bss930Work4C), MEMORY_DEFAULT_NUM);
memset(work->unk4C, 0, sizeof(Bss930Work4C)); memset(work->unk4C, 0, sizeof(Bss930Work4C));
@ -809,7 +809,7 @@ void fn_1_29DC(omObjData *object)
lbl_1_bss_924 = 1; lbl_1_bss_924 = 1;
Hu3DGLightKill(lbl_1_bss_91A[1]); Hu3DGLightKill(lbl_1_bss_91A[1]);
lbl_1_bss_91A[1] = -1; lbl_1_bss_91A[1] = -1;
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
HuAudFXEmiterPlay(1469, &object->trans); HuAudFXEmiterPlay(1469, &object->trans);
HuAudCharVoicePlay(temp_r31->unk0C, 291); HuAudCharVoicePlay(temp_r31->unk0C, 291);
} }
@ -834,10 +834,10 @@ void fn_1_29DC(omObjData *object)
} }
else { else {
if ((temp_r31->unk46 & 0x2) == 0) { if ((temp_r31->unk46 & 0x2) == 0) {
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
} }
temp_r31->unk46--; temp_r31->unk46--;
} }
@ -863,10 +863,10 @@ void fn_1_29DC(omObjData *object)
Hu3DShadowPosSet(&sp14, &Hu3DShadowData.unk_2C, &sp8); Hu3DShadowPosSet(&sp14, &Hu3DShadowData.unk_2C, &sp8);
} }
object->work[0] += 10.0f; object->work[0] += 10.0f;
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
} }
} }
@ -901,13 +901,13 @@ void fn_1_2EA4(omObjData *object)
MTXConcat(sp3C, spC, sp3C); MTXConcat(sp3C, spC, sp3C);
Hu3DModelPosSet(object->model[2], sp3C[0][3], sp3C[1][3], sp3C[2][3]); Hu3DModelPosSet(object->model[2], sp3C[0][3], sp3C[1][3], sp3C[2][3]);
Hu3DModelScaleSet(object->model[2], 0.5f, 0.5f, 0.5f); Hu3DModelScaleSet(object->model[2], 0.5f, 0.5f, 0.5f);
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(object->model[2], 0); Hu3DMotionTimeSet(object->model[2], 0);
Hu3DMotionSpeedSet(object->model[2], 2.0f); Hu3DMotionSpeedSet(object->model[2], 2.0f);
Hu3DModelRotSet(object->model[2], 0, 180.0f + object->rot.y, 0); Hu3DModelRotSet(object->model[2], 0, 180.0f + object->rot.y, 0);
Hu3DData[object->model[2]].unk_94 = 0; Hu3DData[object->model[2]].unk_94 = 0;
Hu3DData[object->model[2]].unk_98 = 2; Hu3DData[object->model[2]].unk_98 = 2;
Hu3DModelAttrReset(object->model[3], 1); Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(object->model[3], sp3C[0][3], sp3C[1][3], sp3C[2][3]); Hu3DModelPosSet(object->model[3], sp3C[0][3], sp3C[1][3], sp3C[2][3]);
temp_r27 = &Hu3DData[object->model[3]]; temp_r27 = &Hu3DData[object->model[3]];
temp_r28 = temp_r27->unk_120; temp_r28 = temp_r27->unk_120;
@ -941,7 +941,7 @@ void fn_1_2EA4(omObjData *object)
case 3: case 3:
if (--temp_r30->unk60 == 0) { if (--temp_r30->unk60 == 0) {
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DData[object->model[2]].unk_0E = -1; Hu3DData[object->model[2]].unk_0E = -1;
temp_r30->field_0_bit1 = 0; temp_r30->field_0_bit1 = 0;
temp_r30->unk2C = -1; temp_r30->unk2C = -1;
@ -951,8 +951,8 @@ void fn_1_2EA4(omObjData *object)
} }
if (temp_r30->unk50 && fn_1_1240() > 6 && lbl_1_bss_924 < 0) { if (temp_r30->unk50 && fn_1_1240() > 6 && lbl_1_bss_924 < 0) {
temp_r29->field_0_bit0 = 0; temp_r29->field_0_bit0 = 0;
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
} }
if (temp_r29->field_0_bit0) { if (temp_r29->field_0_bit0) {
temp_r29->unk4 = object->trans.x + (((float)temp_r29->unk10 * (200 * sind(object->rot.y))) / 4); temp_r29->unk4 = object->trans.x + (((float)temp_r29->unk10 * (200 * sind(object->rot.y))) / 4);
@ -986,7 +986,7 @@ void fn_1_361C(omObjData *object)
Hu3DModelHookReset(object->model[0]); Hu3DModelHookReset(object->model[0]);
Hu3DModelAttrReset(object->model[1], 0x8000); Hu3DModelAttrReset(object->model[1], 0x8000);
Hu3DModelShadowReset(object->model[1]); Hu3DModelShadowReset(object->model[1]);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
} }
} }
else { else {
@ -997,9 +997,9 @@ void fn_1_361C(omObjData *object)
temp_r30->unk54.y += -1.0000001f; temp_r30->unk54.y += -1.0000001f;
temp_r29->rot.x += 30.0f; temp_r29->rot.x += 30.0f;
if (--temp_r30->unk60 == 0) { if (--temp_r30->unk60 == 0) {
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(object->model[4], temp_r29->pos.x, temp_r29->pos.y, temp_r29->pos.z); Hu3DModelPosSet(object->model[4], temp_r29->pos.x, temp_r29->pos.y, temp_r29->pos.z);
Hu3DModelAttrReset(object->model[4], 1); Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF);
if (!temp_r30->unk10) { if (!temp_r30->unk10) {
HuAudFXPlay(1468); HuAudFXPlay(1468);
} }

2
src/REL/m417Dll/water.c
View file

@ -135,7 +135,7 @@ void fn_1_3400(omObjData *object)
Hu3DModelLayerSet(object->model[3], 3); Hu3DModelLayerSet(object->model[3], 3);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M417, 2)); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M417, 2));
Hu3DModelLayerSet(object->model[2], 5); Hu3DModelLayerSet(object->model[2], 5);
Hu3DModelAttrSet(object->model[2], 0x40000001); Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_LOOP);
Hu3DMotionSpeedSet(object->model[2], 0.7f); Hu3DMotionSpeedSet(object->model[2], 0.7f);
object->data = fn_1_3574(object, 5, 3); object->data = fn_1_3574(object, 5, 3);
HuAudFXPlay(1480); HuAudFXPlay(1480);

101
src/REL/m420dll/map.c
View file

@ -467,9 +467,9 @@ s32 fn_1_5AA8(s32 arg0, float arg1)
if (lbl_1_bss_B0 == 0) { if (lbl_1_bss_B0 == 0) {
var_r31->unk_3C = 1; var_r31->unk_3C = 1;
Hu3DMotionTimeSet(lbl_1_bss_9F0[var_r30], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_9F0[var_r30], 0.0f);
Hu3DModelAttrReset(lbl_1_bss_9F0[var_r30], 1); Hu3DModelAttrReset(lbl_1_bss_9F0[var_r30], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[var_r30], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_9F0[var_r30], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(lbl_1_bss_9F0[var_r29], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[var_r29], HU3D_ATTR_DISPOFF);
} }
return 1; return 1;
} }
@ -498,14 +498,14 @@ void fn_1_5C8C(M420DllUnkMapStruct *arg0)
fn_1_7230(arg0->unk_0C, &sp8, 0x1E, 1); fn_1_7230(arg0->unk_0C, &sp8, 0x1E, 1);
Hu3DMotionTimeSet(arg0->unk_0C->unk_02, 0.0f); Hu3DMotionTimeSet(arg0->unk_0C->unk_02, 0.0f);
Hu3DModelAttrReset(arg0->unk_0C->unk_02, 1); Hu3DModelAttrReset(arg0->unk_0C->unk_02, HU3D_ATTR_DISPOFF);
sp8 = arg0->unk_10->unk_04; sp8 = arg0->unk_10->unk_04;
sp8.y = -50.0f + arg0->unk_1C; sp8.y = -50.0f + arg0->unk_1C;
fn_1_7230(arg0->unk_10, &sp8, 0x1E, 1); fn_1_7230(arg0->unk_10, &sp8, 0x1E, 1);
Hu3DMotionTimeSet(arg0->unk_10->unk_02, 0.0f); Hu3DMotionTimeSet(arg0->unk_10->unk_02, 0.0f);
Hu3DModelAttrReset(arg0->unk_10->unk_02, 1); Hu3DModelAttrReset(arg0->unk_10->unk_02, HU3D_ATTR_DISPOFF);
Hu3DMotionStartEndSet(arg0->unk_00->unk_02, 0.0f, 30.0f); Hu3DMotionStartEndSet(arg0->unk_00->unk_02, 0.0f, 30.0f);
Hu3DMotionTimeSet(arg0->unk_00->unk_02, 0.0f); Hu3DMotionTimeSet(arg0->unk_00->unk_02, 0.0f);
Hu3DModelAttrReset(arg0->unk_00->unk_02, 0x40000002); Hu3DModelAttrReset(arg0->unk_00->unk_02, 0x40000002);
@ -530,7 +530,7 @@ void fn_1_5C8C(M420DllUnkMapStruct *arg0)
else { else {
Hu3DMotionStartEndSet(arg0->unk_00->unk_02, 0.0f, 1.0f); Hu3DMotionStartEndSet(arg0->unk_00->unk_02, 0.0f, 1.0f);
Hu3DMotionTimeSet(arg0->unk_00->unk_02, 0.0f); Hu3DMotionTimeSet(arg0->unk_00->unk_02, 0.0f);
Hu3DModelAttrSet(arg0->unk_00->unk_02, 0x40000002); Hu3DModelAttrSet(arg0->unk_00->unk_02, HU3D_MOTATTR_PAUSE);
} }
} }
if (arg0->unk_24 > 0.2f) { if (arg0->unk_24 > 0.2f) {
@ -639,10 +639,10 @@ void fn_1_6554(void)
sp8.x = 480.0f; sp8.x = 480.0f;
sp8.y = 370.0f; sp8.y = 370.0f;
sp8.z = -314.0f; sp8.z = -314.0f;
Hu3DModelAttrReset(var_r31->unk_02, 1); Hu3DModelAttrReset(var_r31->unk_02, HU3D_ATTR_DISPOFF);
fn_1_7230(var_r31, &sp8, 0x14, 0); fn_1_7230(var_r31, &sp8, 0x14, 0);
Hu3DMotionTimeSet(fn_1_6660(), 0.0f); Hu3DMotionTimeSet(fn_1_6660(), 0.0f);
Hu3DModelAttrSet(fn_1_6660(), 0x40000002); Hu3DModelAttrSet(fn_1_6660(), HU3D_MOTATTR_PAUSE);
} }
s16 fn_1_6660(void) s16 fn_1_6660(void)
@ -675,7 +675,7 @@ void fn_1_6728(void)
var_r31->unk_04.y = 1000.0f; var_r31->unk_04.y = 1000.0f;
var_r31->unk_04.z = 0.0f; var_r31->unk_04.z = 0.0f;
fn_1_6DF0(var_r31); fn_1_6DF0(var_r31);
Hu3DModelAttrSet(lbl_1_bss_9F0[0x13], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[0x13], HU3D_ATTR_DISPOFF);
} }
s32 fn_1_67A4(s32 arg0) s32 fn_1_67A4(s32 arg0)
@ -700,7 +700,7 @@ void fn_1_6820(void)
while (TRUE) { while (TRUE) {
if (lbl_1_bss_B8 > 0) { if (lbl_1_bss_B8 > 0) {
if (--lbl_1_bss_B8 <= 0) { if (--lbl_1_bss_B8 <= 0) {
Hu3DModelAttrSet(lbl_1_bss_9F0[0xF], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_PAUSE);
} }
} }
HuPrcVSleep(); HuPrcVSleep();
@ -735,10 +735,10 @@ void fn_1_6950(void)
for (var_r31 = 0; var_r31 < 0x1B; var_r31++) { for (var_r31 = 0; var_r31 < 0x1B; var_r31++) {
lbl_1_bss_9F0[var_r31] = Hu3DModelCreateFile(lbl_1_rodata_360[var_r31]); lbl_1_bss_9F0[var_r31] = Hu3DModelCreateFile(lbl_1_rodata_360[var_r31]);
} }
Hu3DModelAttrSet(lbl_1_bss_9F0[1], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_9F0[1], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(lbl_1_bss_9F0[0xA], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_9F0[0xA], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(lbl_1_bss_9F0[3], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_9F0[3], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(lbl_1_bss_9F0[2], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_9F0[2], HU3D_MOTATTR_PAUSE);
Hu3DModelPosSet(lbl_1_bss_9F0[0xF], -219.0f, 300.0f, -92.0f); Hu3DModelPosSet(lbl_1_bss_9F0[0xF], -219.0f, 300.0f, -92.0f);
Hu3DModelRotSet(lbl_1_bss_9F0[0xF], 0.0f, 0.0f, 0.0f); Hu3DModelRotSet(lbl_1_bss_9F0[0xF], 0.0f, 0.0f, 0.0f);
Hu3DModelPosSet(lbl_1_bss_9F0[0x10], 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_9F0[0x10], 0.0f, 0.0f, 0.0f);
@ -752,24 +752,24 @@ void fn_1_6950(void)
Hu3DModelShadowSet(lbl_1_bss_9F0[0x10]); Hu3DModelShadowSet(lbl_1_bss_9F0[0x10]);
Hu3DModelShadowSet(lbl_1_bss_9F0[0x14]); Hu3DModelShadowSet(lbl_1_bss_9F0[0x14]);
Hu3DModelShadowSet(lbl_1_bss_9F0[0x13]); Hu3DModelShadowSet(lbl_1_bss_9F0[0x13]);
Hu3DModelAttrSet(lbl_1_bss_9F0[4], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[5], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[5], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[6], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[6], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[7], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[7], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[8], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[8], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[9], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[9], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[0xB], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[0xB], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[0xC], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[0xC], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[0x15], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[0x15], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[0x16], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[0x16], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[0x17], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[0x17], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[0x18], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[0x18], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[0x19], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[0x19], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[0x1A], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[0x1A], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[0xF], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_PAUSE);
Hu3DMotionStartEndSet(lbl_1_bss_9F0[0xF], 30.0f, 30.0f); Hu3DMotionStartEndSet(lbl_1_bss_9F0[0xF], 30.0f, 30.0f);
Hu3DMotionTimeSet(lbl_1_bss_9F0[0xF], 30.0f); Hu3DMotionTimeSet(lbl_1_bss_9F0[0xF], 30.0f);
Hu3DModelAttrSet(lbl_1_bss_9F0[0xF], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_PAUSE);
Hu3DModelHookSet(lbl_1_bss_9F0[1], "itemhook_sao", lbl_1_bss_9F0[0xA]); Hu3DModelHookSet(lbl_1_bss_9F0[1], "itemhook_sao", lbl_1_bss_9F0[0xA]);
} }
@ -940,7 +940,6 @@ void fn_1_74F8(float *arg0, float *arg1, float *arg2, float *arg3, float arg8)
} }
*arg2 = var_f30; *arg2 = var_f30;
*arg3 = var_f29; *arg3 = var_f29;
} }
void fn_1_7704(void) void fn_1_7704(void)
@ -1081,9 +1080,9 @@ void fn_1_7E24(void)
} }
if ((sp8.x < (200.0f + var_f30)) && (var_r28 == 0)) { if ((sp8.x < (200.0f + var_f30)) && (var_r28 == 0)) {
Hu3DModelHookReset(lbl_1_bss_9F0[1]); Hu3DModelHookReset(lbl_1_bss_9F0[1]);
Hu3DModelAttrSet(lbl_1_bss_9F0[0xA], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[0xA], HU3D_ATTR_DISPOFF);
Hu3DModelHookSet(lbl_1_bss_9F0[1], "itemhook_sao", lbl_1_bss_9F0[0xC]); Hu3DModelHookSet(lbl_1_bss_9F0[1], "itemhook_sao", lbl_1_bss_9F0[0xC]);
Hu3DModelAttrReset(lbl_1_bss_9F0[0xC], 1); Hu3DModelAttrReset(lbl_1_bss_9F0[0xC], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(lbl_1_bss_9F0[0xC], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_9F0[0xC], 0.0f);
var_r28 = 1; var_r28 = 1;
} }
@ -1109,24 +1108,24 @@ void fn_1_7E24(void)
void fn_1_8240(void) void fn_1_8240(void)
{ {
Hu3DModelAttrReset(lbl_1_bss_9F0[4], 1); Hu3DModelAttrReset(lbl_1_bss_9F0[4], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(lbl_1_bss_9F0[4], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_9F0[4], 0.0f);
Hu3DModelAttrReset(lbl_1_bss_9F0[6], 1); Hu3DModelAttrReset(lbl_1_bss_9F0[6], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(lbl_1_bss_9F0[6], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_9F0[6], 0.0f);
Hu3DModelAttrReset(lbl_1_bss_9F0[8], 1); Hu3DModelAttrReset(lbl_1_bss_9F0[8], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(lbl_1_bss_9F0[8], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_9F0[8], 0.0f);
HuPrcSleep(0x78); HuPrcSleep(0x78);
Hu3DModelAttrSet(lbl_1_bss_9F0[4], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[6], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[6], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[8], 1); Hu3DModelAttrSet(lbl_1_bss_9F0[8], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_9F0[5], 1); Hu3DModelAttrReset(lbl_1_bss_9F0[5], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[5], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_9F0[5], HU3D_MOTATTR_LOOP);
Hu3DMotionTimeSet(lbl_1_bss_9F0[5], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_9F0[5], 0.0f);
Hu3DModelAttrReset(lbl_1_bss_9F0[7], 1); Hu3DModelAttrReset(lbl_1_bss_9F0[7], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[7], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_9F0[7], HU3D_MOTATTR_LOOP);
Hu3DMotionTimeSet(lbl_1_bss_9F0[7], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_9F0[7], 0.0f);
Hu3DModelAttrReset(lbl_1_bss_9F0[9], 1); Hu3DModelAttrReset(lbl_1_bss_9F0[9], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_9F0[9], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_9F0[9], HU3D_MOTATTR_LOOP);
Hu3DMotionTimeSet(lbl_1_bss_9F0[9], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_9F0[9], 0.0f);
lbl_1_bss_A2C[2] = NULL; lbl_1_bss_A2C[2] = NULL;
HuPrcEnd(); HuPrcEnd();
@ -1189,25 +1188,25 @@ void fn_1_8414(void)
fn_1_7230(var_r29, &sp14, 30, 1); fn_1_7230(var_r29, &sp14, 30, 1);
Hu3DMotionTimeSet(var_r30->unk_0C->unk_02, 0.0f); Hu3DMotionTimeSet(var_r30->unk_0C->unk_02, 0.0f);
Hu3DModelAttrReset(var_r30->unk_0C->unk_02, 1); Hu3DModelAttrReset(var_r30->unk_0C->unk_02, HU3D_ATTR_DISPOFF);
sp14 = var_r30->unk_10->unk_04; sp14 = var_r30->unk_10->unk_04;
sp14.y = -50.0f + var_r30->unk_1C; sp14.y = -50.0f + var_r30->unk_1C;
sp14.x = var_f31; sp14.x = var_f31;
var_r28 = var_r30->unk_10; var_r28 = var_r30->unk_10;
fn_1_7230(var_r28, &sp14, 30, 1); fn_1_7230(var_r28, &sp14, 30, 1);
Hu3DMotionTimeSet(var_r30->unk_10->unk_02, 0.0f); Hu3DMotionTimeSet(var_r30->unk_10->unk_02, 0.0f);
Hu3DModelAttrReset(var_r30->unk_10->unk_02, 1); Hu3DModelAttrReset(var_r30->unk_10->unk_02, HU3D_ATTR_DISPOFF);
HuPrcSleep(5); HuPrcSleep(5);
lbl_1_bss_B4 = 1; lbl_1_bss_B4 = 1;
sp8.x = 0.0f; sp8.x = 0.0f;
fn_1_72C8(var_r31, &sp8, 15, 1); fn_1_72C8(var_r31, &sp8, 15, 1);
HuPrcSleep(0xF); HuPrcSleep(0xF);
var_r27->unk_04 = var_r31->unk_04; var_r27->unk_04 = var_r31->unk_04;
Hu3DModelAttrSet(var_r31->unk_02, 1); Hu3DModelAttrSet(var_r31->unk_02, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r27->unk_02, 1); Hu3DModelAttrReset(var_r27->unk_02, HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(var_r27->unk_02, 0.0f); Hu3DMotionTimeSet(var_r27->unk_02, 0.0f);
Hu3DModelAttrReset(var_r27->unk_02, 0x40000002); Hu3DModelAttrReset(var_r27->unk_02, 0x40000002);
Hu3DModelAttrSet(var_r27->unk_02, 0x40000001); Hu3DModelAttrSet(var_r27->unk_02, HU3D_MOTATTR_LOOP);
HuPrcSleep(0x78); HuPrcSleep(0x78);
lbl_1_bss_A2C[3] = NULL; lbl_1_bss_A2C[3] = NULL;
HuPrcEnd(); HuPrcEnd();
@ -1217,4 +1216,4 @@ void fn_1_8414(void)
} }
} }
const float _pad = 0; const float _pad = 0;

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

@ -270,20 +270,20 @@ void fn_1_2260(M420DllPlayerStruct *arg0)
} }
} }
#define WAITMODECHG(player, maxTime) \ #define WAITMODECHG(player, maxTime) \
do { \ do { \
s32 time; \ s32 time; \
s32 mode; \ s32 mode; \
for (time = 0; time < maxTime; time++) { \ for (time = 0; time < maxTime; time++) { \
fn_1_355C(arg0); \ fn_1_355C(arg0); \
mode = arg0->unk_48; \ mode = arg0->unk_48; \
HuPrcVSleep(); \ HuPrcVSleep(); \
if (arg0->unk_48 != mode) { \ if (arg0->unk_48 != mode) { \
return; \ return; \
} \ } \
} \ } \
} while(0) } while (0)
void fn_1_22CC(M420DllPlayerStruct *arg0) void fn_1_22CC(M420DllPlayerStruct *arg0)
{ {
float var_f31; float var_f31;
@ -341,13 +341,14 @@ void fn_1_22CC(M420DllPlayerStruct *arg0)
case 2: case 2:
if (arg0->unk_50 <= 0) { if (arg0->unk_50 <= 0) {
WAITMODECHG(arg0, 1); WAITMODECHG(arg0, 1);
} else { }
else {
Hu3DModelAttrReset(arg0->unk_AC, 0x40000002); Hu3DModelAttrReset(arg0->unk_AC, 0x40000002);
Hu3DModelAttrReset(arg0->unk_AC, 0x40000001); Hu3DModelAttrReset(arg0->unk_AC, 0x40000001);
Hu3DModelAttrSet(arg0->unk_AC, 0x40000004); Hu3DModelAttrSet(arg0->unk_AC, 0x40000004);
fn_1_63EC(); fn_1_63EC();
while(!Hu3DMotionEndCheck(arg0->unk_AC)) while (!Hu3DMotionEndCheck(arg0->unk_AC))
WAITMODECHG(arg0, 1); WAITMODECHG(arg0, 1);
for (var_r28 = 0; var_r28 < 0xA; var_r28++) { for (var_r28 = 0; var_r28 < 0xA; var_r28++) {
arg0->unk_5C[var_r28] = 0; arg0->unk_5C[var_r28] = 0;
} }
@ -411,23 +412,26 @@ void fn_1_276C(M420DllPlayerStruct *arg0)
while (arg0->unk_50 < 1) { while (arg0->unk_50 < 1) {
fn_1_326C(arg0); fn_1_326C(arg0);
do { do {
if(arg0->unk_00_field0 == 0) { if (arg0->unk_00_field0 == 0) {
var_r30 = fn_1_34AC(arg0); var_r30 = fn_1_34AC(arg0);
} else if(arg0->unk_58 > 0) { }
else if (arg0->unk_58 > 0) {
arg0->unk_58--; arg0->unk_58--;
var_r30 = 0; var_r30 = 0;
} else if(fn_1_8944() % 30) { }
else if (fn_1_8944() % 30) {
var_r30 = 1; var_r30 = 1;
} else { }
else {
var_r30 = 2; var_r30 = 2;
} }
switch (var_r30) { switch (var_r30) {
case 0: case 0:
WAITMODECHG(arg0, 1); WAITMODECHG(arg0, 1);
break; break;
case 1: case 1:
if(arg0->unk_4C != 1) { if (arg0->unk_4C != 1) {
CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[7], 0.0f, 6.0f, 0); CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[7], 0.0f, 6.0f, 0);
WAITMODECHG(arg0, 6); WAITMODECHG(arg0, 6);
fn_1_374C(arg0->unk_E8); fn_1_374C(arg0->unk_E8);
@ -435,7 +439,7 @@ void fn_1_276C(M420DllPlayerStruct *arg0)
HuAudFXPlay(0x5F2); HuAudFXPlay(0x5F2);
} }
arg0->unk_5C[arg0->unk_50++] = 1; arg0->unk_5C[arg0->unk_50++] = 1;
switch(arg0->unk_4C) { switch (arg0->unk_4C) {
case 1: case 1:
case 2: case 2:
var_f31 = 0.0f; var_f31 = 0.0f;
@ -445,15 +449,15 @@ void fn_1_276C(M420DllPlayerStruct *arg0)
Hu3DMotionTimeSet(arg0->unk_AC, var_f31); Hu3DMotionTimeSet(arg0->unk_AC, var_f31);
Hu3DMotionSpeedSet(arg0->unk_AC, 2.0f); Hu3DMotionSpeedSet(arg0->unk_AC, 2.0f);
break; break;
case 3: case 3:
arg0->unk_48 = 5; arg0->unk_48 = 5;
return; return;
} }
break; break;
case 2: case 2:
switch(arg0->unk_4C) { switch (arg0->unk_4C) {
case 1: case 1:
var_f31 = 0.0f; var_f31 = 0.0f;
var_f30 = 10.0f; var_f30 = 10.0f;
@ -470,7 +474,7 @@ void fn_1_276C(M420DllPlayerStruct *arg0)
Hu3DModelAttrReset(arg0->unk_AC, 0x40000002); Hu3DModelAttrReset(arg0->unk_AC, 0x40000002);
WAITMODECHG(arg0, 30); WAITMODECHG(arg0, 30);
break; break;
case 2: case 2:
case 3: case 3:
CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[9], 0.0f, 2.0f, 0); CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[9], 0.0f, 2.0f, 0);
@ -480,8 +484,7 @@ void fn_1_276C(M420DllPlayerStruct *arg0)
} }
break; break;
} }
} while(var_r30 == 0); } while (var_r30 == 0);
} }
fn_1_326C(arg0); fn_1_326C(arg0);
WAITMODECHG(arg0, 18); WAITMODECHG(arg0, 18);
@ -492,7 +495,7 @@ void fn_1_276C(M420DllPlayerStruct *arg0)
void fn_1_2CE0(M420DllPlayerStruct *arg0) void fn_1_2CE0(M420DllPlayerStruct *arg0)
{ {
CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[0], 0.0f, 30.0f, 0x40000001); CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[0], 0.0f, 30.0f, 0x40000001);
WAITMODECHG(arg0, 35); WAITMODECHG(arg0, 35);
arg0->unk_48 = 0; arg0->unk_48 = 0;
} }
@ -542,9 +545,9 @@ void fn_1_2EA8(M420DllPlayerStruct *arg0)
fn_1_326C(arg0); fn_1_326C(arg0);
CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[3], 0.0f, 1.0f, 0); CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[3], 0.0f, 1.0f, 0);
var_r30 = fn_1_6660(); var_r30 = fn_1_6660();
Hu3DModelAttrReset(var_r30, 0x40000002); Hu3DModelAttrReset(var_r30, 0x40000002);
Hu3DModelAttrSet(var_r30, 0x40000001); Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP);
Hu3DMotionTimeSet(var_r30, 0.0f); Hu3DMotionTimeSet(var_r30, 0.0f);
{ {
s32 var_r30; s32 var_r30;
@ -561,7 +564,7 @@ void fn_1_2EA8(M420DllPlayerStruct *arg0)
HuAudFXPlay(0x5F7); HuAudFXPlay(0x5F7);
fn_1_636C(); fn_1_636C();
fn_1_1E64(arg0, 1, 0x1E); fn_1_1E64(arg0, 1, 0x1E);
Hu3DModelAttrSet(var_r30, 0x40000002); Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_PAUSE);
fn_1_5AA8(1, 22.5f); fn_1_5AA8(1, 22.5f);
{ {
s32 var_r30; s32 var_r30;

94
src/REL/m426Dll/main.c
View file

@ -774,7 +774,7 @@ void fn_1_125C(omObjData *object)
} }
CharModelMotionDataClose(var_r31->unk_0C); CharModelMotionDataClose(var_r31->unk_0C);
CharModelMotionSet(var_r31->unk_0C, object->motion[var_r31->unk_28]); CharModelMotionSet(var_r31->unk_0C, object->motion[var_r31->unk_28]);
Hu3DModelAttrSet(var_r25, 0x40000001); Hu3DModelAttrSet(var_r25, HU3D_MOTATTR_LOOP);
HuDataDirClose(lbl_1_data_110[var_r26] & 0xFFFF0000); HuDataDirClose(lbl_1_data_110[var_r26] & 0xFFFF0000);
object->func = NULL; object->func = NULL;
} }
@ -1536,13 +1536,13 @@ void fn_1_3714(omObjData *object)
object->model[11] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M426, 17)); object->model[11] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M426, 17));
object->model[12] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M426, 18)); object->model[12] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M426, 18));
object->model[13] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M426, 19)); object->model[13] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M426, 19));
Hu3DModelAttrSet(object->model[4], 1); Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[5], 1); Hu3DModelAttrSet(object->model[5], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[6], 1); Hu3DModelAttrSet(object->model[6], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[8], 1); Hu3DModelAttrSet(object->model[8], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[9], 1); Hu3DModelAttrSet(object->model[9], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[11], 1); Hu3DModelAttrSet(object->model[11], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[13], 1); Hu3DModelAttrSet(object->model[13], HU3D_ATTR_DISPOFF);
for (var_r29 = 0; var_r29 < 14; var_r29++) { for (var_r29 = 0; var_r29 < 14; var_r29++) {
Hu3DModelLayerSet(object->model[var_r29], 2); Hu3DModelLayerSet(object->model[var_r29], 2);
} }
@ -1660,17 +1660,17 @@ void fn_1_3EFC(omObjData *object)
} }
} }
} }
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[4], 1); Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[5], 1); Hu3DModelAttrSet(object->model[5], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[6], 1); Hu3DModelAttrSet(object->model[6], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[7], 1); Hu3DModelAttrSet(object->model[7], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[8], 1); Hu3DModelAttrSet(object->model[8], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[9], 1); Hu3DModelAttrSet(object->model[9], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[10], 1); Hu3DModelAttrSet(object->model[10], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[11], 1); Hu3DModelAttrSet(object->model[11], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[12], 1); Hu3DModelAttrSet(object->model[12], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[13], 1); Hu3DModelAttrSet(object->model[13], HU3D_ATTR_DISPOFF);
if (lbl_1_bss_30) { if (lbl_1_bss_30) {
if (++object->work[0] >= 20) { if (++object->work[0] >= 20) {
@ -1704,10 +1704,10 @@ void fn_1_3EFC(omObjData *object)
if (++object->work[3] >= 20) { if (++object->work[3] >= 20) {
object->work[3] = 0; object->work[3] = 0;
} }
Hu3DModelAttrReset(object->model[(object->work[0] / 5) + 3], 1); Hu3DModelAttrReset(object->model[(object->work[0] / 5) + 3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[(object->work[1] / 5) + 7], 1); Hu3DModelAttrReset(object->model[(object->work[1] / 5) + 7], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[(object->work[2] / 10) + 10], 1); Hu3DModelAttrReset(object->model[(object->work[2] / 10) + 10], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[(object->work[3] / 10) + 12], 1); Hu3DModelAttrReset(object->model[(object->work[3] / 10) + 12], HU3D_ATTR_DISPOFF);
var_r29 = &Hu3DGlobalLight[lbl_1_bss_2C]; var_r29 = &Hu3DGlobalLight[lbl_1_bss_2C];
var_r27 = lbl_1_data_48.r + (s32)(255.0f * lbl_1_bss_28); var_r27 = lbl_1_data_48.r + (s32)(255.0f * lbl_1_bss_28);
@ -1789,20 +1789,20 @@ void fn_1_4738(s32 arg0, s32 arg1)
var_r31->unk_08 = arg1; var_r31->unk_08 = arg1;
switch (arg1) { switch (arg1) {
case 0: case 0:
Hu3DModelAttrReset(var_r31->unk_14, 1); Hu3DModelAttrReset(var_r31->unk_14, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r31->unk_1C, 1); Hu3DModelAttrReset(var_r31->unk_1C, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r31->unk_24, 1); Hu3DModelAttrReset(var_r31->unk_24, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk_18, 1); Hu3DModelAttrSet(var_r31->unk_18, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk_20, 1); Hu3DModelAttrSet(var_r31->unk_20, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk_28, 1); Hu3DModelAttrSet(var_r31->unk_28, HU3D_ATTR_DISPOFF);
break; break;
case 1: case 1:
Hu3DModelAttrSet(var_r31->unk_14, 1); Hu3DModelAttrSet(var_r31->unk_14, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk_1C, 1); Hu3DModelAttrSet(var_r31->unk_1C, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk_24, 1); Hu3DModelAttrSet(var_r31->unk_24, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r31->unk_18, 1); Hu3DModelAttrReset(var_r31->unk_18, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r31->unk_20, 1); Hu3DModelAttrReset(var_r31->unk_20, HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(var_r31->unk_28, 1); Hu3DModelAttrReset(var_r31->unk_28, HU3D_ATTR_DISPOFF);
break; break;
default: default:
break; break;
@ -1953,7 +1953,7 @@ void fn_1_4F14(omObjData *object)
var_r31->unk_3C = var_r31->unk_40 = var_r31->unk_44 = 0.0f; var_r31->unk_3C = var_r31->unk_40 = var_r31->unk_44 = 0.0f;
var_r31->unk_48 = 0.0f; var_r31->unk_48 = 0.0f;
var_r31->unk_4C = 0.0f; var_r31->unk_4C = 0.0f;
Hu3DModelAttrSet(var_r31->unk_00, 1); Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF);
Hu3DModelScaleSet(var_r31->unk_00, 0.8f, 0.8f, 0.8f); Hu3DModelScaleSet(var_r31->unk_00, 0.8f, 0.8f, 0.8f);
} }
object->func = fn_1_5134; object->func = fn_1_5134;
@ -1977,10 +1977,10 @@ void fn_1_5134(omObjData *object)
if (lbl_1_bss_38) { if (lbl_1_bss_38) {
if (--var_r31->unk_2C <= 0) { if (--var_r31->unk_2C <= 0) {
if (!var_r31->unk_38) { if (!var_r31->unk_38) {
Hu3DModelAttrReset(var_r31->unk_00, 1); Hu3DModelAttrReset(var_r31->unk_00, HU3D_ATTR_DISPOFF);
} }
Hu3DMotionSet(var_r31->unk_00, var_r31->unk_08); Hu3DMotionSet(var_r31->unk_00, var_r31->unk_08);
Hu3DModelAttrSet(var_r31->unk_00, 1073741825); Hu3DModelAttrSet(var_r31->unk_00, HU3D_MOTATTR_LOOP);
HuAudFXPlay(1607); HuAudFXPlay(1607);
var_r31->unk_2C = 0; var_r31->unk_2C = 0;
var_r31->unk_28 = 1; var_r31->unk_28 = 1;
@ -2126,7 +2126,7 @@ void fn_1_5134(omObjData *object)
Hu3DModelRotSet(var_r31->unk_00, 0.0f, var_r31->unk_48, 0.0f); Hu3DModelRotSet(var_r31->unk_00, 0.0f, var_r31->unk_48, 0.0f);
} }
else { else {
Hu3DModelAttrSet(var_r31->unk_00, 1); Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -2159,7 +2159,7 @@ void fn_1_5B88(s32 arg0) // probably gets inlined
var_r28 = var_r31->unk_38; var_r28 = var_r31->unk_38;
var_r31->unk_38 = arg0; var_r31->unk_38 = arg0;
if (var_r28 != arg0 && !arg0) { if (var_r28 != arg0 && !arg0) {
Hu3DModelAttrReset(var_r31->unk_00, 1); Hu3DModelAttrReset(var_r31->unk_00, HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_3C, var_r31->unk_40, var_r31->unk_44); Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_3C, var_r31->unk_40, var_r31->unk_44);
Hu3DModelRotSet(var_r31->unk_00, 0.0f, var_r31->unk_48, 0.0f); Hu3DModelRotSet(var_r31->unk_00, 0.0f, var_r31->unk_48, 0.0f);
} }
@ -2264,7 +2264,7 @@ void fn_1_5EBC(omObjData *object)
var_r26 = &Hu3DData[var_r31->unk_04]; var_r26 = &Hu3DData[var_r31->unk_04];
var_r27 = var_r26->unk_120; var_r27 = var_r26->unk_120;
var_r27->unk_20 = 0; var_r27->unk_20 = 0;
Hu3DModelAttrSet(var_r31->unk_04, 1); Hu3DModelAttrSet(var_r31->unk_04, HU3D_ATTR_DISPOFF);
var_r31->unk_00 = var_r30; var_r31->unk_00 = var_r30;
var_r31->unk_0C = 0; var_r31->unk_0C = 0;
var_r31->unk_10 = 0; var_r31->unk_10 = 0;
@ -2291,10 +2291,10 @@ void fn_1_6008(omObjData *object)
continue; continue;
} }
if (var_r30->unk_10 <= 0) { if (var_r30->unk_10 <= 0) {
Hu3DModelAttrSet(var_r30->unk_04, 1); Hu3DModelAttrSet(var_r30->unk_04, HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrReset(var_r30->unk_04, 1); Hu3DModelAttrReset(var_r30->unk_04, HU3D_ATTR_DISPOFF);
var_r26 = &Hu3DData[var_r30->unk_04]; var_r26 = &Hu3DData[var_r30->unk_04];
var_r29 = var_r26->unk_120; var_r29 = var_r26->unk_120;
var_r31 = var_r29->unk_3C; var_r31 = var_r29->unk_3C;
@ -2470,7 +2470,7 @@ void fn_1_65E4(omObjData *object)
var_r28 = &Hu3DData[var_r31->unk_00]; var_r28 = &Hu3DData[var_r31->unk_00];
sp8 = var_r28->hsfData; sp8 = var_r28->hsfData;
Hu3DModelLayerSet(var_r31->unk_00, 5); Hu3DModelLayerSet(var_r31->unk_00, 5);
Hu3DModelAttrSet(var_r31->unk_00, 1); Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF);
var_r31->unk_04 = 0; var_r31->unk_04 = 0;
var_r31->unk_08 = 0; var_r31->unk_08 = 0;
var_r31->unk_0C = var_r31->unk_10 = var_r31->unk_14 = 0.0f; var_r31->unk_0C = var_r31->unk_10 = var_r31->unk_14 = 0.0f;
@ -2493,7 +2493,7 @@ void fn_1_6704(omObjData *object)
Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_0C, var_r31->unk_10, var_r31->unk_14); Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_0C, var_r31->unk_10, var_r31->unk_14);
Hu3DModelRotSet(var_r31->unk_00, CRot.x, CRot.y, CRot.z); Hu3DModelRotSet(var_r31->unk_00, CRot.x, CRot.y, CRot.z);
if (++var_r31->unk_08 >= 120.0f) { if (++var_r31->unk_08 >= 120.0f) {
Hu3DModelAttrSet(var_r31->unk_00, 1); Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF);
var_r31->unk_04 = 0; var_r31->unk_04 = 0;
var_r31->unk_08 = 0; var_r31->unk_08 = 0;
} }
@ -2543,7 +2543,7 @@ s32 fn_1_6888(Vec *arg0)
Hu3DModelAttrSet(var_r31->unk_00, 0); Hu3DModelAttrSet(var_r31->unk_00, 0);
Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_0C, var_r31->unk_10, var_r31->unk_14); Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_0C, var_r31->unk_10, var_r31->unk_14);
Hu3DModelScaleSet(var_r31->unk_00, 1.0f, 1.0f, 1.0f); Hu3DModelScaleSet(var_r31->unk_00, 1.0f, 1.0f, 1.0f);
Hu3DModelAttrReset(var_r31->unk_00, 1); Hu3DModelAttrReset(var_r31->unk_00, HU3D_ATTR_DISPOFF);
return var_r30; return var_r30;
} }
@ -2603,7 +2603,7 @@ void fn_1_6A34(omObjData *object)
} }
espDispOn(var_r31->unk_14[var_r30]); espDispOn(var_r31->unk_14[var_r30]);
espDrawNoSet(var_r31->unk_14[var_r30], 0); espDrawNoSet(var_r31->unk_14[var_r30], 0);
espAttrSet(var_r31->unk_14[var_r30], 1); espAttrSet(var_r31->unk_14[var_r30], HUSPR_ATTR_NOANIM);
espPosSet(var_r31->unk_14[var_r30], var_r31->unk_00 + var_r31->unk_2C[var_r30][0], var_r31->unk_04 + var_r31->unk_2C[var_r30][1]); espPosSet(var_r31->unk_14[var_r30], var_r31->unk_00 + var_r31->unk_2C[var_r30][0], var_r31->unk_04 + var_r31->unk_2C[var_r30][1]);
} }
} }

58
src/REL/m429Dll/main.c
View file

@ -965,7 +965,7 @@ void fn_1_2684(void)
temp_r30 = frandmod(2); temp_r30 = frandmod(2);
lbl_1_bss_190 = &lbl_1_data_1340[temp_r30]; lbl_1_bss_190 = &lbl_1_data_1340[temp_r30];
temp_r30 = Hu3DModelCreateFile(lbl_1_bss_190->unk8[0]); temp_r30 = Hu3DModelCreateFile(lbl_1_bss_190->unk8[0]);
Hu3DModelAttrSet(temp_r30, 1); Hu3DModelAttrSet(temp_r30, HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(temp_r30, 0, 0, 0); Hu3DModelPosSet(temp_r30, 0, 0, 0);
Hu3DModelRotSet(temp_r30, 0, -90.f * lbl_1_bss_34, 0); Hu3DModelRotSet(temp_r30, 0, -90.f * lbl_1_bss_34, 0);
for (temp_r28 = 0; temp_r28 < lbl_1_bss_190->unk1C; temp_r28++) { for (temp_r28 = 0; temp_r28 < lbl_1_bss_190->unk1C; temp_r28++) {
@ -1129,7 +1129,7 @@ void fn_1_31A8(omObjData *object) { }
void fn_1_31AC(omObjData *object) void fn_1_31AC(omObjData *object)
{ {
object->model[0] = Hu3DModelCreateFile(lbl_1_bss_190->unk4[lbl_1_bss_34]); object->model[0] = Hu3DModelCreateFile(lbl_1_bss_190->unk4[lbl_1_bss_34]);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
omSetTra(object, 0, 0, 0); omSetTra(object, 0, 0, 0);
omSetRot(object, 0, 0, 0); omSetRot(object, 0, 0, 0);
object->func = fn_1_31A8; object->func = fn_1_31A8;
@ -1203,8 +1203,8 @@ void fn_1_33F8(omObjData *object)
object->model[1] = Hu3DModelCreateFile(*temp_r27++); object->model[1] = Hu3DModelCreateFile(*temp_r27++);
for (temp_r29 = 0; temp_r29 < 2; temp_r29++) { for (temp_r29 = 0; temp_r29 < 2; temp_r29++) {
Hu3DModelCameraSet(object->model[temp_r29], 15); Hu3DModelCameraSet(object->model[temp_r29], 15);
Hu3DModelAttrSet(object->model[temp_r29], 1); Hu3DModelAttrSet(object->model[temp_r29], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[temp_r29], 0x40000001); Hu3DModelAttrSet(object->model[temp_r29], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[temp_r29], 0x40000002); Hu3DModelAttrReset(object->model[temp_r29], 0x40000002);
Hu3DModelLayerSet(object->model[temp_r29], 3); Hu3DModelLayerSet(object->model[temp_r29], 3);
Hu3DModelPosSet(object->model[temp_r29], temp_r31->unk0.x, temp_r31->unk0.y, temp_r31->unk0.z); Hu3DModelPosSet(object->model[temp_r29], temp_r31->unk0.x, temp_r31->unk0.y, temp_r31->unk0.z);
@ -1213,7 +1213,7 @@ void fn_1_33F8(omObjData *object)
} }
omSetTra(object, temp_r31->unk0.x, temp_r31->unk0.y, temp_r31->unk0.z); omSetTra(object, temp_r31->unk0.x, temp_r31->unk0.y, temp_r31->unk0.z);
omSetRot(object, 0, 0, 0); omSetRot(object, 0, 0, 0);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_1_3284; object->func = fn_1_3284;
} }
@ -1486,11 +1486,11 @@ void fn_1_50AC(Work8F68 *arg0, omObjData *arg1)
} }
temp_r27 = lbl_1_bss_1A0[arg0->unkA0]; temp_r27 = lbl_1_bss_1A0[arg0->unkA0];
omSetTra(temp_r27, arg0->unk28.x, arg0->unk28.y, arg0->unk28.z); omSetTra(temp_r27, arg0->unk28.x, arg0->unk28.y, arg0->unk28.z);
Hu3DModelAttrReset(temp_r27->model[0], 1); Hu3DModelAttrReset(temp_r27->model[0], HU3D_ATTR_DISPOFF);
temp_r30->unk18 |= 0x1; temp_r30->unk18 |= 0x1;
Hu3DModelAttrSet(lbl_1_bss_19C[temp_r28]->model[0], 1); Hu3DModelAttrSet(lbl_1_bss_19C[temp_r28]->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_19C[temp_r28]->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_19C[temp_r28]->model[1], HU3D_ATTR_DISPOFF);
break; break;
} }
} }
@ -1938,7 +1938,7 @@ void fn_1_7D38(omObjData *object)
Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 8, HU3D_MOTATTR_NONE); Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 8, HU3D_MOTATTR_NONE);
} }
if (temp_r31->unk9C == 2008 && temp_r31->unkA0 >= 0) { if (temp_r31->unk9C == 2008 && temp_r31->unkA0 >= 0) {
Hu3DModelAttrSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[0], 1); Hu3DModelAttrSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[0], HU3D_ATTR_DISPOFF);
fn_1_1D18(object->model[0], CharModelHookNameGet(temp_r31->unk118, 8, 0), &sp8); fn_1_1D18(object->model[0], CharModelHookNameGet(temp_r31->unk118, 8, 0), &sp8);
temp_r31->unk70 = Hu3DParManLink(lbl_1_bss_8, &lbl_1_data_13E8); temp_r31->unk70 = Hu3DParManLink(lbl_1_bss_8, &lbl_1_data_13E8);
temp_r31->unk6C = 0; temp_r31->unk6C = 0;
@ -1971,9 +1971,9 @@ void fn_1_7D38(omObjData *object)
Hu3DModelTPLvlSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], 0); Hu3DModelTPLvlSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], 0);
Hu3DModelPosSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], sp8.x, sp8.y, sp8.z); Hu3DModelPosSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], sp8.x, sp8.y, sp8.z);
Hu3DModelRotSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], 0, lbl_1_bss_110, 0); Hu3DModelRotSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], 0, lbl_1_bss_110, 0);
Hu3DModelAttrReset(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], 0x40000002); Hu3DModelAttrReset(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], 0x40000002);
Hu3DModelAttrSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_1A0[temp_r31->unkA0]->model[1], HU3D_MOTATTR_LOOP);
} }
} }
break; break;
@ -2099,8 +2099,8 @@ void fn_1_8F68(omObjData *object)
CharModelMotionSet(lbl_1_data_0[temp_r31->unk118], object->motion[temp_r29]); CharModelMotionSet(lbl_1_data_0[temp_r31->unk118], object->motion[temp_r29]);
} }
Hu3DModelCameraSet(object->model[0], 15); Hu3DModelCameraSet(object->model[0], 15);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[0], 2); Hu3DModelLayerSet(object->model[0], 2);
Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
@ -2167,7 +2167,7 @@ void fn_1_8F68(omObjData *object)
} }
CharModelVoiceEnableSet(temp_r31->unk118, object->motion[4], 0); CharModelVoiceEnableSet(temp_r31->unk118, object->motion[4], 0);
fn_1_2950(temp_r31); fn_1_2950(temp_r31);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
CharModelLayerSetAll2(5); CharModelLayerSetAll2(5);
CharModelMotionDataClose(lbl_1_data_0[temp_r31->unk118]); CharModelMotionDataClose(lbl_1_data_0[temp_r31->unk118]);
object->func = fn_1_7D38; object->func = fn_1_7D38;
@ -2183,8 +2183,8 @@ void fn_1_99F0(omObjData *object)
for (temp_r30 = 0; temp_r30 < 2; temp_r30++) { for (temp_r30 = 0; temp_r30 < 2; temp_r30++) {
object->model[temp_r30] = Hu3DModelCreateFile(*temp_r29++); object->model[temp_r30] = Hu3DModelCreateFile(*temp_r29++);
Hu3DModelCameraSet(object->model[temp_r30], 15); Hu3DModelCameraSet(object->model[temp_r30], 15);
Hu3DModelAttrSet(object->model[temp_r30], 1); Hu3DModelAttrSet(object->model[temp_r30], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[temp_r30], 0x40000002); Hu3DModelAttrSet(object->model[temp_r30], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[temp_r30], 0x40000001); Hu3DModelAttrReset(object->model[temp_r30], 0x40000001);
Hu3DModelLayerSet(object->model[temp_r30], 3); Hu3DModelLayerSet(object->model[temp_r30], 3);
Hu3DModelShadowSet(object->model[temp_r30]); Hu3DModelShadowSet(object->model[temp_r30]);
@ -2228,7 +2228,7 @@ void fn_1_9BAC(omObjData *object)
if (0.0f > temp_r31[1].z && 180.0f > temp_r31[0].y) { if (0.0f > temp_r31[1].z && 180.0f > temp_r31[0].y) {
lbl_1_bss_20++; lbl_1_bss_20++;
HuAudFXPlay(7); HuAudFXPlay(7);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
CharModelCoinEffectCreate(lbl_1_data_FEC[lbl_1_bss_28], temp_r31); CharModelCoinEffectCreate(lbl_1_data_FEC[lbl_1_bss_28], temp_r31);
omDelObjEx(lbl_1_bss_33C, object); omDelObjEx(lbl_1_bss_33C, object);
} }
@ -2240,8 +2240,8 @@ void fn_1_9EEC(omObjData *object)
temp_r30 = object->data; temp_r30 = object->data;
object->model[0] = Hu3DModelLink(lbl_1_bss_1A); object->model[0] = Hu3DModelLink(lbl_1_bss_1A);
Hu3DModelCameraSet(object->model[0], lbl_1_data_FEC[lbl_1_bss_28]); Hu3DModelCameraSet(object->model[0], lbl_1_data_FEC[lbl_1_bss_28]);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000002); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[0], 4); Hu3DModelLayerSet(object->model[0], 4);
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
temp_r30[0] = lbl_1_bss_F8[0]; temp_r30[0] = lbl_1_bss_F8[0];
@ -2252,7 +2252,7 @@ void fn_1_9EEC(omObjData *object)
omSetTra(object, temp_r30[0].x, temp_r30[0].y, temp_r30[0].z); omSetTra(object, temp_r30[0].x, temp_r30[0].y, temp_r30[0].z);
omSetRot(object, 0, temp_r30[1].x, 0); omSetRot(object, 0, temp_r30[1].x, 0);
omSetSca(object, 0.4f, 0.4f, 0.4f); omSetSca(object, 0.4f, 0.4f, 0.4f);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_1_9BAC; object->func = fn_1_9BAC;
} }
@ -2539,7 +2539,7 @@ void fn_1_B8E0(omObjData *object)
if (lbl_1_bss_28 >= 0) { if (lbl_1_bss_28 >= 0) {
Hu3DModelAttrReset(object->model[0], 0x40000002); Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[3], 0x40000002); Hu3DModelAttrReset(object->model[3], 0x40000002);
Hu3DModelAttrReset(object->model[3], 1); Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF);
} }
} }
else { else {
@ -2553,8 +2553,8 @@ void fn_1_B8E0(omObjData *object)
lbl_1_bss_12C++; lbl_1_bss_12C++;
} }
if (lbl_1_bss_28 >= 0 && 60.0f == lbl_1_bss_12C) { if (lbl_1_bss_28 >= 0 && 60.0f == lbl_1_bss_12C) {
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[4], 1); Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[4], 0x40000002); Hu3DModelAttrReset(object->model[4], 0x40000002);
} }
if (60.0f < lbl_1_bss_12C && !MGSeqStatGet(lbl_1_bss_2FE)) { if (60.0f < lbl_1_bss_12C && !MGSeqStatGet(lbl_1_bss_2FE)) {
@ -2714,7 +2714,7 @@ void fn_1_D5E8(omObjData *object)
object->model[0] = Hu3DModelCreateFile(lbl_1_bss_190->unk8[1]); object->model[0] = Hu3DModelCreateFile(lbl_1_bss_190->unk8[1]);
Hu3DModelCameraSet(object->model[0], 15); Hu3DModelCameraSet(object->model[0], 15);
Hu3DModelAttrSet(object->model[0], 0x4001); Hu3DModelAttrSet(object->model[0], 0x4001);
Hu3DModelAttrSet(object->model[0], 0x40000002); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[0], 0x40000001); Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelLayerSet(object->model[0], 0); Hu3DModelLayerSet(object->model[0], 0);
Hu3DModelShadowMapSet(object->model[0]); Hu3DModelShadowMapSet(object->model[0]);
@ -2723,20 +2723,20 @@ void fn_1_D5E8(omObjData *object)
object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M429, 0x22)); object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M429, 0x22));
Hu3DModelCameraSet(object->model[1], 15); Hu3DModelCameraSet(object->model[1], 15);
Hu3DModelAttrSet(object->model[1], 0x4001); Hu3DModelAttrSet(object->model[1], 0x4001);
Hu3DModelAttrSet(object->model[1], 0x40000002); Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[1], 0); Hu3DModelLayerSet(object->model[1], 0);
Hu3DModelShadowMapSet(object->model[1]); Hu3DModelShadowMapSet(object->model[1]);
Hu3DModelPosSet(object->model[1], 0, 0, 0); Hu3DModelPosSet(object->model[1], 0, 0, 0);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M429, 0x23)); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M429, 0x23));
Hu3DModelCameraSet(object->model[2], 15); Hu3DModelCameraSet(object->model[2], 15);
Hu3DModelAttrSet(object->model[2], 0x4001); Hu3DModelAttrSet(object->model[2], 0x4001);
Hu3DModelAttrSet(object->model[2], 0x40000002); Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[2], 0); Hu3DModelLayerSet(object->model[2], 0);
Hu3DModelPosSet(object->model[2], 0, 0, 0); Hu3DModelPosSet(object->model[2], 0, 0, 0);
object->model[3] = Hu3DModelCreateFile(lbl_1_bss_190->unk8[2]); object->model[3] = Hu3DModelCreateFile(lbl_1_bss_190->unk8[2]);
Hu3DModelCameraSet(object->model[3], 15); Hu3DModelCameraSet(object->model[3], 15);
Hu3DModelAttrSet(object->model[3], 0x4001); Hu3DModelAttrSet(object->model[3], 0x4001);
Hu3DModelAttrSet(object->model[3], 0x40000002); Hu3DModelAttrSet(object->model[3], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[3], 0x40000001); Hu3DModelAttrReset(object->model[3], 0x40000001);
Hu3DModelLayerSet(object->model[3], 1); Hu3DModelLayerSet(object->model[3], 1);
Hu3DModelPosSet(object->model[3], 0, 0, 0); Hu3DModelPosSet(object->model[3], 0, 0, 0);
@ -2750,7 +2750,7 @@ void fn_1_D5E8(omObjData *object)
Hu3DModelRotSet(object->model[4], 0, -90.0f * lbl_1_bss_34, 0); Hu3DModelRotSet(object->model[4], 0, -90.0f * lbl_1_bss_34, 0);
lbl_1_bss_114 = 45; lbl_1_bss_114 = 45;
for (temp_r30 = 0; temp_r30 < 3; temp_r30++) { for (temp_r30 = 0; temp_r30 < 3; temp_r30++) {
Hu3DModelAttrReset(object->model[temp_r30], 1); Hu3DModelAttrReset(object->model[temp_r30], HU3D_ATTR_DISPOFF);
} }
object->work[0] = 1000; object->work[0] = 1000;
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
@ -2846,7 +2846,7 @@ void ObjectSetup(void)
temp_r28->work[0] = temp_r31; temp_r28->work[0] = temp_r31;
} }
lbl_1_bss_1A = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M429, 0x2F)); lbl_1_bss_1A = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M429, 0x2F));
Hu3DModelAttrSet(lbl_1_bss_1A, 1); Hu3DModelAttrSet(lbl_1_bss_1A, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_1A, 0x40000003); Hu3DModelAttrSet(lbl_1_bss_1A, 0x40000003);
omMakeGroupEx(lbl_1_bss_33C, 3, 20); omMakeGroupEx(lbl_1_bss_33C, 3, 20);
lbl_1_bss_198 = omGetGroupMemberListEx(lbl_1_bss_33C, 3); lbl_1_bss_198 = omGetGroupMemberListEx(lbl_1_bss_33C, 3);

14
src/REL/m431Dll/main.c
View file

@ -689,11 +689,11 @@ void fn_1_2110(omObjData *object)
Hu3DModelLayerSet(object->model[0], 0); Hu3DModelLayerSet(object->model[0], 0);
Hu3DModelScaleSet(object->model[0], 1.2f, 1.2f, 1.2f); Hu3DModelScaleSet(object->model[0], 1.2f, 1.2f, 1.2f);
temp_r31 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M431, 0x11)); temp_r31 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M431, 0x11));
Hu3DModelAttrSet(temp_r31, 0x40000001); Hu3DModelAttrSet(temp_r31, HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(temp_r31, 0); Hu3DModelLayerSet(temp_r31, 0);
Hu3DMotionSpeedSet(temp_r31, 0.25f); Hu3DMotionSpeedSet(temp_r31, 0.25f);
temp_r31 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M431, 0x12)); temp_r31 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M431, 0x12));
Hu3DModelAttrSet(temp_r31, 0x40000001); Hu3DModelAttrSet(temp_r31, HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(temp_r31, 0); Hu3DModelLayerSet(temp_r31, 0);
Hu3DMotionSpeedSet(temp_r31, 0.25f); Hu3DMotionSpeedSet(temp_r31, 0.25f);
temp_r31 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M431, 0x13)); temp_r31 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M431, 0x13));
@ -707,7 +707,7 @@ void fn_1_2110(omObjData *object)
object->motion[6] = Hu3DJointMotionFile(temp_r31, DATA_MAKE_NUM(DATADIR_M431, 0x19)); object->motion[6] = Hu3DJointMotionFile(temp_r31, DATA_MAKE_NUM(DATADIR_M431, 0x19));
Hu3DModelPosSet(temp_r31, 0, 0, -230); Hu3DModelPosSet(temp_r31, 0, 0, -230);
Hu3DModelShadowSet(temp_r31); Hu3DModelShadowSet(temp_r31);
Hu3DModelAttrSet(temp_r31, 0x40000001); Hu3DModelAttrSet(temp_r31, HU3D_MOTATTR_LOOP);
Hu3DMotionSet(temp_r31, object->motion[0]); Hu3DMotionSet(temp_r31, object->motion[0]);
for (temp_r31 = 0; temp_r31 < 2; temp_r31++, temp_r28++) { for (temp_r31 = 0; temp_r31 < 2; temp_r31++, temp_r28++) {
temp_r25 = Hu3DModelCreateFile(lbl_1_data_114[0][temp_r31]); temp_r25 = Hu3DModelCreateFile(lbl_1_data_114[0][temp_r31]);
@ -720,7 +720,7 @@ void fn_1_2110(omObjData *object)
temp_f31 = 0; temp_f31 = 0;
temp_f29 = 100; temp_f29 = 100;
Hu3DModelPosSet(object->model[temp_r31 + 1], temp_f30, temp_f31, temp_f29); Hu3DModelPosSet(object->model[temp_r31 + 1], temp_f30, temp_f31, temp_f29);
Hu3DModelAttrSet(object->model[temp_r31 + 1], 0x40000002); Hu3DModelAttrSet(object->model[temp_r31 + 1], HU3D_MOTATTR_PAUSE);
object->model[temp_r31 + 3] = Hu3DModelCreateFile(lbl_1_data_114[1][temp_r31]); object->model[temp_r31 + 3] = Hu3DModelCreateFile(lbl_1_data_114[1][temp_r31]);
temp_f31 = 45; temp_f31 = 45;
@ -751,7 +751,7 @@ void fn_1_2110(omObjData *object)
temp_r29->unk1C = Hu3DModelLink(temp_r28->unk4[0].unk1C); temp_r29->unk1C = Hu3DModelLink(temp_r28->unk4[0].unk1C);
} }
Hu3DData[temp_r29->unk1C].pos.y = 1000; Hu3DData[temp_r29->unk1C].pos.y = 1000;
Hu3DModelAttrSet(temp_r29->unk1C, 1); Hu3DModelAttrSet(temp_r29->unk1C, HU3D_ATTR_DISPOFF);
temp_r29->unk0 = 0; temp_r29->unk0 = 0;
temp_r29->unk4 = lbl_1_data_1D0 + (36.0f * temp_r27); temp_r29->unk4 = lbl_1_data_1D0 + (36.0f * temp_r27);
} }
@ -958,7 +958,7 @@ void fn_1_30E0(Work2110 *arg0)
temp_r31->unk0 &= ~0x1C; temp_r31->unk0 &= ~0x1C;
temp_r31->unk0 |= 8; temp_r31->unk0 |= 8;
temp_r31->unk20 = 0; temp_r31->unk20 = 0;
Hu3DModelAttrReset(temp_r31->unk1C, 1); Hu3DModelAttrReset(temp_r31->unk1C, HU3D_ATTR_DISPOFF);
} }
break; break;
@ -1164,7 +1164,7 @@ void fn_1_3D7C(Work2110 *arg0)
void fn_1_3FD0(Unk72B4Data18 *arg0) void fn_1_3FD0(Unk72B4Data18 *arg0)
{ {
Hu3DData[arg0->unk2C].pos.y = 1000; Hu3DData[arg0->unk2C].pos.y = 1000;
Hu3DModelAttrSet(arg0->unk2C, 1); Hu3DModelAttrSet(arg0->unk2C, HU3D_ATTR_DISPOFF);
} }
void fn_1_4028(Work2110 *arg0) void fn_1_4028(Work2110 *arg0)

2164
src/REL/m431Dll/object.c
View file

File diff suppressed because it is too large Load diff

1382
src/REL/m434Dll/fish.c
View file

File diff suppressed because it is too large Load diff

9
src/REL/m434Dll/main.c
View file

@ -3,8 +3,10 @@
#include "game/hsfmotion.h" #include "game/hsfmotion.h"
#include "game/object.h" #include "game/object.h"
#include "game/objsub.h" #include "game/objsub.h"
#include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "REL/m434Dll.h" #include "REL/m434Dll.h"
#include "ext_math.h" #include "ext_math.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
@ -290,7 +292,7 @@ void fn_1_E44(omObjData *object)
switch (lbl_1_bss_8[0]) { switch (lbl_1_bss_8[0]) {
case 0: case 0:
if (--lbl_1_bss_8[1] == 0) { if (--lbl_1_bss_8[1] == 0) {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
lbl_1_bss_8[0] = 1; lbl_1_bss_8[0] = 1;
} }
for (temp_r30 = 0; temp_r30 < 2u; temp_r30++) { for (temp_r30 = 0; temp_r30 < 2u; temp_r30++) {
@ -379,7 +381,8 @@ void fn_1_1150(omObjData *object)
break; break;
case 1: case 1:
temp_r31->unk6[temp_r30] = espEntry((temp_r29 == 0) ? DATA_MAKE_NUM(DATADIR_MGCONST, 0x1B) : DATA_MAKE_NUM(DATADIR_MGCONST, 0x1C), 1, 0); temp_r31->unk6[temp_r30]
= espEntry((temp_r29 == 0) ? DATA_MAKE_NUM(DATADIR_MGCONST, 0x1B) : DATA_MAKE_NUM(DATADIR_MGCONST, 0x1C), 1, 0);
espPriSet(temp_r31->unk6[temp_r30], 256); espPriSet(temp_r31->unk6[temp_r30], 256);
break; break;
@ -401,7 +404,7 @@ void fn_1_1150(omObjData *object)
} }
espDispOff(temp_r31->unk6[temp_r30]); espDispOff(temp_r31->unk6[temp_r30]);
espDrawNoSet(temp_r31->unk6[temp_r30], 0); espDrawNoSet(temp_r31->unk6[temp_r30], 0);
espAttrSet(temp_r31->unk6[temp_r30], 1); espAttrSet(temp_r31->unk6[temp_r30], HUSPR_ATTR_NOANIM);
espPosSet(temp_r31->unk6[temp_r30], lbl_1_data_F0[temp_r29][0] + lbl_1_data_C0[temp_r30][0], espPosSet(temp_r31->unk6[temp_r30], lbl_1_data_F0[temp_r29][0] + lbl_1_data_C0[temp_r30][0],
lbl_1_data_F0[temp_r29][1] + lbl_1_data_C0[temp_r30][1]); lbl_1_data_F0[temp_r29][1] + lbl_1_data_C0[temp_r30][1]);
} }

4
src/REL/m434Dll/map.c
View file

@ -177,7 +177,7 @@ void fn_1_1E64(omObjData *object)
temp_r26 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M434, 0x0B)); temp_r26 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M434, 0x0B));
object->model[10] = Hu3DParticleCreate(temp_r26, 100); object->model[10] = Hu3DParticleCreate(temp_r26, 100);
Hu3DParticleHookSet(object->model[10], fn_1_443C); Hu3DParticleHookSet(object->model[10], fn_1_443C);
Hu3DModelAttrSet(object->model[10], 1); Hu3DModelAttrSet(object->model[10], HU3D_ATTR_DISPOFF);
Hu3DModelLayerSet(object->model[10], 4); Hu3DModelLayerSet(object->model[10], 4);
Hu3DModelCameraSet(object->model[10], 8); Hu3DModelCameraSet(object->model[10], 8);
object->func = fn_1_26A4; object->func = fn_1_26A4;
@ -602,5 +602,5 @@ void fn_1_443C(ModelData *model, ParticleData *particle, Mtx matrix)
void fn_1_47EC(Vec *arg0) void fn_1_47EC(Vec *arg0)
{ {
Hu3DModelPosSet(lbl_1_bss_5868->model[10], arg0->x, arg0->y, arg0->z); Hu3DModelPosSet(lbl_1_bss_5868->model[10], arg0->x, arg0->y, arg0->z);
Hu3DModelAttrReset(lbl_1_bss_5868->model[10], 1); Hu3DModelAttrReset(lbl_1_bss_5868->model[10], HU3D_ATTR_DISPOFF);
} }

1142
src/REL/m434Dll/player.c
View file

File diff suppressed because it is too large Load diff

1221
src/REL/m437Dll/main.c
View file

File diff suppressed because it is too large Load diff

14
src/REL/m438Dll/main.c
View file

@ -1125,7 +1125,7 @@ void fn_1_2964(omObjData *object)
memset(var_r31->unk_F0, 0, sizeof(var_r31->unk_F0)); memset(var_r31->unk_F0, 0, sizeof(var_r31->unk_F0));
var_r27 = CharModelCreate(var_r31->unk_01, 8); var_r27 = CharModelCreate(var_r31->unk_01, 8);
object->model[0] = var_r27; object->model[0] = var_r27;
Hu3DModelAttrSet(var_r27, 0x40000001); Hu3DModelAttrSet(var_r27, HU3D_MOTATTR_LOOP);
Hu3DModelShadowSet(var_r27); Hu3DModelShadowSet(var_r27);
CharModelStepTypeSet(var_r31->unk_01, 0); CharModelStepTypeSet(var_r31->unk_01, 0);
var_r31->unk_A4 = -1; var_r31->unk_A4 = -1;
@ -1269,7 +1269,7 @@ void fn_1_2E4C(omObjData *object)
} }
if (var_r31->unk_10 != 0) { if (var_r31->unk_10 != 0) {
var_r31->unk_07 = 0; var_r31->unk_07 = 0;
Hu3DModelAttrSet(var_r25, 1); Hu3DModelAttrSet(var_r25, HU3D_ATTR_DISPOFF);
object->func = fn_1_35BC; object->func = fn_1_35BC;
} }
} }
@ -1439,10 +1439,10 @@ void fn_1_35C0(omObjData *object)
} }
if ((var_r31->unk_07 & 4) != 0) { if ((var_r31->unk_07 & 4) != 0) {
if ((var_r31->unk_0B & 2) != 0) { if ((var_r31->unk_0B & 2) != 0) {
Hu3DModelAttrSet(var_r25, 1); Hu3DModelAttrSet(var_r25, HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrReset(var_r25, 1); Hu3DModelAttrReset(var_r25, HU3D_ATTR_DISPOFF);
} }
if (--var_r31->unk_0B == 0) { if (--var_r31->unk_0B == 0) {
var_r31->unk_07 = var_r31->unk_07 & 0xFFFFFFFB; var_r31->unk_07 = var_r31->unk_07 & 0xFFFFFFFB;
@ -1555,7 +1555,7 @@ void fn_1_4724(omObjData *object)
Hu3DModelScaleSet(var_r29, 1.5f, 1.5f, 1.5f); Hu3DModelScaleSet(var_r29, 1.5f, 1.5f, 1.5f);
Hu3DMotionSet(var_r29, object->motion[0]); Hu3DMotionSet(var_r29, object->motion[0]);
Hu3DMotionSpeedSet(var_r29, 2.0f); Hu3DMotionSpeedSet(var_r29, 2.0f);
Hu3DModelAttrSet(var_r29, 0x40000001); Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_LOOP);
Hu3DModelShadowSet(var_r29); Hu3DModelShadowSet(var_r29);
var_r31 = fn_1_7BFC(sizeof(M438MainWork4)); var_r31 = fn_1_7BFC(sizeof(M438MainWork4));
object->data = var_r31; object->data = var_r31;
@ -1790,7 +1790,7 @@ void fn_1_4724(omObjData *object)
// if (temp_r0 == 0) { // if (temp_r0 == 0) {
// HuAudFXEmiterPlay(0x700, var_r31 + 0x10); // HuAudFXEmiterPlay(0x700, var_r31 + 0x10);
// Hu3DModelAttrReset(*var_r30->model, 0x40000002); // Hu3DModelAttrReset(*var_r30->model, 0x40000002);
// Hu3DModelAttrSet(*var_r30->model, 0x40000001); // Hu3DModelAttrSet(*var_r30->model, HU3D_MOTATTR_LOOP);
// var_r31->unk_1C = 0.0f; // var_r31->unk_1C = 0.0f;
// var_r31->unk_00 = var_r31->unk_00 + 1; // var_r31->unk_00 = var_r31->unk_00 + 1;
// } // }
@ -1888,7 +1888,7 @@ void fn_1_4724(omObjData *object)
// Hu3DModelAttrReset(*var_r30->model, 0x40000006); // Hu3DModelAttrReset(*var_r30->model, 0x40000006);
// Hu3DMotionSet(*var_r30->model, var_r30->motion->unk_02); // Hu3DMotionSet(*var_r30->model, var_r30->motion->unk_02);
// Hu3DMotionSpeedSet(*var_r30->model, 1.0f); // Hu3DMotionSpeedSet(*var_r30->model, 1.0f);
// Hu3DModelAttrSet(*var_r30->model, 0x40000001); // Hu3DModelAttrSet(*var_r30->model, HU3D_MOTATTR_LOOP);
// var_r31->unk_04 = 1; // var_r31->unk_04 = 1;
// } // }
// break; // break;

40
src/REL/m439Dll/main.c
View file

@ -441,11 +441,11 @@ void fn_1_D0C(omObjData *object)
object->motion[i] = CharModelMotionCreate(work->unkC, lbl_1_data_7694[i]); object->motion[i] = CharModelMotionCreate(work->unkC, lbl_1_data_7694[i]);
} }
Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
CharModelVoiceEnableSet(work->unkC, object->motion[4], 0); CharModelVoiceEnableSet(work->unkC, object->motion[4], 0);
CharModelDataClose(work->unkC); CharModelDataClose(work->unkC);
object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M439, 0x12)); object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M439, 0x12));
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelCameraSet(object->model[1], lbl_1_data_75E0[work->unk2]); Hu3DModelCameraSet(object->model[1], lbl_1_data_75E0[work->unk2]);
work->unk0_field3 = 1; work->unk0_field3 = 1;
work->unk44 = 0; work->unk44 = 0;
@ -456,7 +456,7 @@ void fn_1_D0C(omObjData *object)
object->rot.y = 180; object->rot.y = 180;
object->model[2] = Hu3DParticleCreate(lbl_1_bss_40, 10); object->model[2] = Hu3DParticleCreate(lbl_1_bss_40, 10);
Hu3DParticleHookSet(object->model[2], fn_1_4528); Hu3DParticleHookSet(object->model[2], fn_1_4528);
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelCameraSet(object->model[2], lbl_1_data_75E0[work->unk2]); Hu3DModelCameraSet(object->model[2], lbl_1_data_75E0[work->unk2]);
object->func = fn_1_2BB4; object->func = fn_1_2BB4;
} }
@ -774,10 +774,10 @@ s32 fn_1_62E0(float arg0);
void fn_1_2BB4(omObjData *object) void fn_1_2BB4(omObjData *object)
{ {
WorkD0C *work = object->data; WorkD0C *work = object->data;
Hu3DModelAttrReset(object->model[1], 1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(object->model[1], CenterM[work->unk2].x, CenterM[work->unk2].y, CenterM[work->unk2].z); Hu3DModelPosSet(object->model[1], CenterM[work->unk2].x, CenterM[work->unk2].y, CenterM[work->unk2].z);
if (fn_1_374() == 3) { if (fn_1_374() == 3) {
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
object->func = fn_1_2C84; object->func = fn_1_2C84;
} }
} }
@ -906,7 +906,7 @@ void fn_1_2C84(omObjData *object)
temp_r23 = Hu3DData[object->model[2]].unk_120; temp_r23 = Hu3DData[object->model[2]].unk_120;
temp_r23->unk_00 = 0; temp_r23->unk_00 = 0;
VECSubtract(&temp_r31->unk5C, &object->trans, &temp_r23->unk_04); VECSubtract(&temp_r31->unk5C, &object->trans, &temp_r23->unk_04);
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(object->model[2], object->trans.x, object->trans.y, object->trans.z); Hu3DModelPosSet(object->model[2], object->trans.x, object->trans.y, object->trans.z);
temp_r25 = omGetGroupMemberListEx(HuPrcCurrentGet(), 2); temp_r25 = omGetGroupMemberListEx(HuPrcCurrentGet(), 2);
temp_r25[temp_r31->unk2]->work[3] = 1; temp_r25[temp_r31->unk2]->work[3] = 1;
@ -1076,7 +1076,7 @@ void fn_1_3C1C(omObjData *object)
CRotM[temp_r31->unk2].x += (lbl_1_data_741C[2].rot.x - CRotM[temp_r31->unk2].x) * 0.1f; CRotM[temp_r31->unk2].x += (lbl_1_data_741C[2].rot.x - CRotM[temp_r31->unk2].x) * 0.1f;
CRotM[temp_r31->unk2].y += (lbl_1_data_741C[2].rot.y - CRotM[temp_r31->unk2].y) * 0.1f; CRotM[temp_r31->unk2].y += (lbl_1_data_741C[2].rot.y - CRotM[temp_r31->unk2].y) * 0.1f;
CRotM[temp_r31->unk2].z += (lbl_1_data_741C[2].rot.z - CRotM[temp_r31->unk2].z) * 0.1f; CRotM[temp_r31->unk2].z += (lbl_1_data_741C[2].rot.z - CRotM[temp_r31->unk2].z) * 0.1f;
Hu3DModelAttrReset(object->model[1], 1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(object->model[1], object->trans.x, object->trans.y + 200, object->trans.z); Hu3DModelPosSet(object->model[1], object->trans.x, object->trans.y + 200, object->trans.z);
} }
else { else {
@ -1189,12 +1189,12 @@ void fn_1_4AA8(omObjData *object)
work->unk2 = lbl_1_bss_140; work->unk2 = lbl_1_bss_140;
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M439, 0x13)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M439, 0x13));
Hu3DModelCameraSet(object->model[0], lbl_1_data_75E0[lbl_1_bss_140]); Hu3DModelCameraSet(object->model[0], lbl_1_data_75E0[lbl_1_bss_140]);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
for (i = 0; i < 1; i++) { for (i = 0; i < 1; i++) {
object->motion[i] = Hu3DJointMotionFile(object->model[0], lbl_1_data_7794[i]); object->motion[i] = Hu3DJointMotionFile(object->model[0], lbl_1_data_7794[i]);
} }
Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
object->trans.y = 500; object->trans.y = 500;
object->scale.x = object->scale.y = object->scale.z = 0.25f; object->scale.x = object->scale.y = object->scale.z = 0.25f;
if (work->unk2 == 0) { if (work->unk2 == 0) {
@ -1254,10 +1254,10 @@ void fn_1_4CC0(omObjData *object)
HuAudFXPanning(lbl_1_data_779C, pan); HuAudFXPanning(lbl_1_data_779C, pan);
} }
} }
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
if (fn_1_374() == 3) { if (fn_1_374() == 3) {
Hu3DMotionSpeedSet(object->model[0], 1.0f); Hu3DMotionSpeedSet(object->model[0], 1.0f);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_1_4F54; object->func = fn_1_4F54;
} }
} }
@ -1281,7 +1281,7 @@ void fn_1_4F54(omObjData *object)
object->trans.y = work->unk28.y = 2000; object->trans.y = work->unk28.y = 2000;
object->trans.z = work->unk28.z = temp_r29[work->unk2]->trans.z - 100; object->trans.z = work->unk28.z = temp_r29[work->unk2]->trans.z - 100;
object->rot.y = 180; object->rot.y = 180;
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
} }
break; break;
@ -1350,7 +1350,7 @@ void fn_1_4F54(omObjData *object)
temp_r28->unk0_field1 = 0; temp_r28->unk0_field1 = 0;
work->unk4 = 0; work->unk4 = 0;
object->work[3] = 0; object->work[3] = 0;
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
} }
if (work->unk24 == (int)(work->unk26 - 12.0f)) { if (work->unk24 == (int)(work->unk26 - 12.0f)) {
work->unk0 = 0; work->unk0 = 0;
@ -1381,7 +1381,7 @@ void fn_1_5BA0(Process *objman)
} }
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
lbl_1_bss_10[i] = Hu3DModelCreateFile(lbl_1_data_77A0[i]); lbl_1_bss_10[i] = Hu3DModelCreateFile(lbl_1_data_77A0[i]);
Hu3DModelAttrSet(lbl_1_bss_10[i], 1); Hu3DModelAttrSet(lbl_1_bss_10[i], HU3D_ATTR_DISPOFF);
} }
omAddObjEx(objman, 10, 4, 0, 1, fn_1_6520); omAddObjEx(objman, 10, 4, 0, 1, fn_1_6520);
} }
@ -1437,7 +1437,7 @@ void fn_1_5CB0(omObjData *object)
} }
object->model[i] = Hu3DModelLink(lbl_1_bss_10[temp_r26]); object->model[i] = Hu3DModelLink(lbl_1_bss_10[temp_r26]);
Hu3DModelPosSet(object->model[i], lbl_1_data_77C8[i][0], 0, lbl_1_data_77C8[i][1]); Hu3DModelPosSet(object->model[i], lbl_1_data_77C8[i][0], 0, lbl_1_data_77C8[i][1]);
Hu3DModelAttrReset(object->model[i], 1); Hu3DModelAttrReset(object->model[i], HU3D_ATTR_DISPOFF);
for (temp = 0; temp < 2; temp++) { for (temp = 0; temp < 2; temp++) {
if (sp14[temp_r26][temp]) { if (sp14[temp_r26][temp]) {
Hu3DModelShadowMapObjSet(object->model[i], sp14[temp_r26][temp]); Hu3DModelShadowMapObjSet(object->model[i], sp14[temp_r26][temp]);
@ -1557,7 +1557,7 @@ void fn_1_6520(omObjData *object)
object->model[i] = Hu3DModelCreateFile(lbl_1_data_78A0[GWPlayerCfg[i].character]); object->model[i] = Hu3DModelCreateFile(lbl_1_data_78A0[GWPlayerCfg[i].character]);
Hu3DModelCameraSet(object->model[i], lbl_1_data_75E0[i]); Hu3DModelCameraSet(object->model[i], lbl_1_data_75E0[i]);
Hu3DModelClusterAttrSet(object->model[i], 0, 0xC0000001); Hu3DModelClusterAttrSet(object->model[i], 0, 0xC0000001);
Hu3DModelAttrSet(object->model[i], 1); Hu3DModelAttrSet(object->model[i], HU3D_ATTR_DISPOFF);
} }
object->func = fn_1_661C; object->func = fn_1_661C;
} }
@ -1566,10 +1566,10 @@ void fn_1_66BC(omObjData *object);
void fn_1_661C(omObjData *object) void fn_1_661C(omObjData *object)
{ {
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(object->model[0], -2800, 0, -7700); Hu3DModelPosSet(object->model[0], -2800, 0, -7700);
if (fn_1_374() == 3) { if (fn_1_374() == 3) {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_1_66BC; object->func = fn_1_66BC;
} }
} }
@ -1583,10 +1583,10 @@ void fn_1_66BC(omObjData *object)
if (work->unk44 >= 10 && work->unk44 <= 13) { if (work->unk44 >= 10 && work->unk44 <= 13) {
s32 goalNo = work->unk44 - 10; s32 goalNo = work->unk44 - 10;
Hu3DModelPosSet(object->model[i], lbl_1_data_78C0[goalNo].x, lbl_1_data_78C0[goalNo].y, lbl_1_data_78C0[goalNo].z); Hu3DModelPosSet(object->model[i], lbl_1_data_78C0[goalNo].x, lbl_1_data_78C0[goalNo].y, lbl_1_data_78C0[goalNo].z);
Hu3DModelAttrReset(object->model[i], 1); Hu3DModelAttrReset(object->model[i], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrSet(object->model[i], 1); Hu3DModelAttrSet(object->model[i], HU3D_ATTR_DISPOFF);
} }
} }
} }

42
src/REL/m440Dll/main.c
View file

@ -179,8 +179,8 @@ void fn_1_8F0(omObjData *arg0)
for (var_r30 = 1; var_r30 < 4; var_r30++) { for (var_r30 = 1; var_r30 < 4; var_r30++) {
lbl_1_bss_10[var_r30] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x0A)); lbl_1_bss_10[var_r30] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x0A));
Hu3DModelAttrSet(lbl_1_bss_10[var_r30], 1); Hu3DModelAttrSet(lbl_1_bss_10[var_r30], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_10[var_r30], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_10[var_r30], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(lbl_1_bss_10[var_r30], 7); Hu3DModelLayerSet(lbl_1_bss_10[var_r30], 7);
Hu3DModelScaleSet(lbl_1_bss_10[var_r30], 3.0f, 3.0f, 3.0f); Hu3DModelScaleSet(lbl_1_bss_10[var_r30], 3.0f, 3.0f, 3.0f);
} }
@ -479,7 +479,7 @@ void fn_1_19B0(void)
Hu3DModelPosSet(lbl_1_bss_10[var_r31], temp_f29, 300.0f + var_f28, var_f27); Hu3DModelPosSet(lbl_1_bss_10[var_r31], temp_f29, 300.0f + var_f28, var_f27);
temp_f31 = 0.1f * ((((rand8() << 8) | rand8()) % 11) + 25); temp_f31 = 0.1f * ((((rand8() << 8) | rand8()) % 11) + 25);
Hu3DModelScaleSet(lbl_1_bss_10[var_r31], temp_f31, temp_f31, temp_f31); Hu3DModelScaleSet(lbl_1_bss_10[var_r31], temp_f31, temp_f31, temp_f31);
Hu3DModelAttrReset(lbl_1_bss_10[var_r31], 1); Hu3DModelAttrReset(lbl_1_bss_10[var_r31], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_10[var_r31], 0x40000002); Hu3DModelAttrReset(lbl_1_bss_10[var_r31], 0x40000002);
} }
} }
@ -490,8 +490,8 @@ void fn_1_1CAC(void)
for (var_r31 = 1; var_r31 < 4; var_r31++) { for (var_r31 = 1; var_r31 < 4; var_r31++) {
Hu3DMotionTimeSet(lbl_1_bss_10[var_r31], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_10[var_r31], 0.0f);
Hu3DModelAttrSet(lbl_1_bss_10[var_r31], 1); Hu3DModelAttrSet(lbl_1_bss_10[var_r31], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_10[var_r31], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_10[var_r31], HU3D_MOTATTR_PAUSE);
} }
} }
@ -612,10 +612,10 @@ void fn_1_2470(omObjData *arg0)
arg0->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x06)); arg0->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x06));
arg0->model[7] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x07)); arg0->model[7] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x07));
temp_r26 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x01)); temp_r26 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x01));
Hu3DModelAttrSet(arg0->model[0], 0x40000001); Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(arg0->model[2], 0x20000); Hu3DModelAttrSet(arg0->model[2], 0x20000);
Hu3DModelAttrSet(arg0->model[2], 0x40000002); Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(temp_r26, 1); Hu3DModelAttrSet(temp_r26, HU3D_ATTR_DISPOFF);
for (var_r30 = 0; var_r30 < 8; var_r30++) { for (var_r30 = 0; var_r30 < 8; var_r30++) {
Hu3DModelLayerSet(arg0->model[var_r30], 1); Hu3DModelLayerSet(arg0->model[var_r30], 1);
@ -650,7 +650,7 @@ void fn_1_2470(omObjData *arg0)
lbl_1_bss_64[var_r30].unk4 = var_r30; lbl_1_bss_64[var_r30].unk4 = var_r30;
fn_1_5C2C(temp_r26, temp_r28->data.children[var_r30], &lbl_1_bss_64[var_r30], 2); fn_1_5C2C(temp_r26, temp_r28->data.children[var_r30], &lbl_1_bss_64[var_r30], 2);
if (lbl_1_bss_64[var_r30].unk20 != 0) { if (lbl_1_bss_64[var_r30].unk20 != 0) {
Hu3DModelAttrSet(lbl_1_bss_64[var_r30].unk0, 1); Hu3DModelAttrSet(lbl_1_bss_64[var_r30].unk0, HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(lbl_1_bss_64[var_r30].unk0, 0.0f, 250.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_64[var_r30].unk0, 0.0f, 250.0f, 0.0f);
lbl_1_bss_64[var_r30].unk38 = &fn_1_57B4; lbl_1_bss_64[var_r30].unk38 = &fn_1_57B4;
} }
@ -698,7 +698,7 @@ void fn_1_2B04(omObjData *object)
temp_f31 = lbl_1_data_E8[0] / 360.0f; temp_f31 = lbl_1_data_E8[0] / 360.0f;
if (temp_f31 > 1.0f) { if (temp_f31 > 1.0f) {
temp_f31 = 1.0f; temp_f31 = 1.0f;
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
lbl_1_data_E8[0] = 0; lbl_1_data_E8[0] = 0;
lbl_1_data_E4[0] = 0; lbl_1_data_E4[0] = 0;
fn_1_4EEC(0x20, 0); fn_1_4EEC(0x20, 0);
@ -741,9 +741,9 @@ void fn_1_2D28(omObjData *object)
temp_r31->center.x = temp_r31->center.z = 0.0f; temp_r31->center.x = temp_r31->center.z = 0.0f;
temp_r31->center.y = 2000.0f; temp_r31->center.y = 2000.0f;
temp_r31->rot.x = temp_r31->rot.y = temp_r31->rot.z = 0.0f; temp_r31->rot.x = temp_r31->rot.y = temp_r31->rot.z = 0.0f;
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[3], 1); Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[3], 0x40000002); Hu3DModelAttrSet(object->model[3], HU3D_MOTATTR_PAUSE);
Hu3DMotionTimeSet(object->model[3], 0.0f); Hu3DMotionTimeSet(object->model[3], 0.0f);
lbl_1_data_EC[0]++; lbl_1_data_EC[0]++;
lbl_1_data_F0[0] = 0; lbl_1_data_F0[0] = 0;
@ -804,7 +804,7 @@ void fn_1_2D28(omObjData *object)
var_f31 = lbl_1_data_F0[0] / 360.0f; var_f31 = lbl_1_data_F0[0] / 360.0f;
if (var_f31 > 1.0f) { if (var_f31 > 1.0f) {
var_f31 = 1.0f; var_f31 = 1.0f;
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
lbl_1_data_F0[0] = 0; lbl_1_data_F0[0] = 0;
lbl_1_data_EC[0] = 0; lbl_1_data_EC[0] = 0;
fn_1_4EEC(7, 2); fn_1_4EEC(7, 2);
@ -876,9 +876,9 @@ void fn_1_3DD8(omObjData *object)
} }
var_f26 = Hu3DMotionMaxTimeGet(object->model[2]); var_f26 = Hu3DMotionMaxTimeGet(object->model[2]);
if (Hu3DMotionTimeGet(object->model[2]) >= var_f26) { if (Hu3DMotionTimeGet(object->model[2]) >= var_f26) {
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
for (var_r31 = 0; var_r31 < lbl_1_bss_60; var_r31++) { for (var_r31 = 0; var_r31 < lbl_1_bss_60; var_r31++) {
Hu3DModelAttrReset(lbl_1_bss_64[var_r31].unk0, 1); Hu3DModelAttrReset(lbl_1_bss_64[var_r31].unk0, HU3D_ATTR_DISPOFF);
fn_1_57B4(&lbl_1_bss_64[var_r31]); fn_1_57B4(&lbl_1_bss_64[var_r31]);
} }
lbl_1_data_F0[0] = 0; lbl_1_data_F0[0] = 0;
@ -903,7 +903,7 @@ void fn_1_3DD8(omObjData *object)
Hu3DModelPosSet(lbl_1_bss_10[var_r29], var_f27, 300.0f + var_f28, var_f29); Hu3DModelPosSet(lbl_1_bss_10[var_r29], var_f27, 300.0f + var_f28, var_f29);
var_f31 = 0.1f * ((((rand8() << 8) | rand8()) % 11) + 0x19); var_f31 = 0.1f * ((((rand8() << 8) | rand8()) % 11) + 0x19);
Hu3DModelScaleSet(lbl_1_bss_10[var_r29], var_f31, var_f31, var_f31); Hu3DModelScaleSet(lbl_1_bss_10[var_r29], var_f31, var_f31, var_f31);
Hu3DModelAttrReset(lbl_1_bss_10[var_r29], 1); Hu3DModelAttrReset(lbl_1_bss_10[var_r29], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_10[var_r29], 0x40000002); Hu3DModelAttrReset(lbl_1_bss_10[var_r29], 0x40000002);
} }
fn_1_45BC(object); fn_1_45BC(object);
@ -929,13 +929,13 @@ void fn_1_3DD8(omObjData *object)
if (lbl_1_bss_64[0].unk3C == 0) { if (lbl_1_bss_64[0].unk3C == 0) {
for (var_r27 = 1; var_r27 < 4; var_r27++) { for (var_r27 = 1; var_r27 < 4; var_r27++) {
Hu3DMotionTimeSet(lbl_1_bss_10[var_r27], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_10[var_r27], 0.0f);
Hu3DModelAttrSet(lbl_1_bss_10[var_r27], 1); Hu3DModelAttrSet(lbl_1_bss_10[var_r27], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_10[var_r27], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_10[var_r27], HU3D_MOTATTR_PAUSE);
} }
Hu3DModelAttrSet(object->model[2], 0x40000002); Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_PAUSE);
Hu3DMotionTimeSet(object->model[2], 0.0f); Hu3DMotionTimeSet(object->model[2], 0.0f);
for (var_r31 = 0; var_r31 < lbl_1_bss_60; var_r31++) { for (var_r31 = 0; var_r31 < lbl_1_bss_60; var_r31++) {
Hu3DModelAttrSet(lbl_1_bss_64[var_r31].unk0, 1); Hu3DModelAttrSet(lbl_1_bss_64[var_r31].unk0, HU3D_ATTR_DISPOFF);
} }
fn_1_4558(object); fn_1_4558(object);
if (lbl_1_data_1D8 >= 0) { if (lbl_1_data_1D8 >= 0) {

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

@ -1,16 +1,17 @@
#include "REL/m440Dll.h" #include "REL/m440Dll.h"
#include "string.h"
#include "math.h"
#include "ext_math.h" #include "ext_math.h"
#include "game/chrman.h"
#include "game/flag.h" #include "game/flag.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "game/chrman.h"
#include "game/hsfmotion.h" #include "game/hsfmotion.h"
#include "game/pad.h" #include "game/pad.h"
#include "math.h"
#include "string.h"
// bss // bss
omObjData* lbl_1_bss_C0[4]; omObjData *lbl_1_bss_C0[4];
s16 lbl_1_bss_B8[4]; s16 lbl_1_bss_B8[4];
Vec lbl_1_bss_88[4]; Vec lbl_1_bss_88[4];
f32 lbl_1_bss_84; f32 lbl_1_bss_84;
@ -22,29 +23,21 @@ s16 lbl_1_bss_70;
// data // data
s16 lbl_1_data_1D8 = 2; s16 lbl_1_data_1D8 = 2;
s16 lbl_1_data_1DA = -1; s16 lbl_1_data_1DA = -1;
u32 lbl_1_data_1DC[8][2] = { u32 lbl_1_data_1DC[8][2] = { { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), 0 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02), 0 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), 0 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03), 0 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x38), 0 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x48), 0 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02), 0 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), 0 }, { 0x47000C, 1 }, { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x36), 0 } };
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03), 0 }, f32 lbl_1_data_21C[4] = { 210.0f, 190.0f, 170.0f, 0.0f };
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x38), 0 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x48), 0 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), 0 },
{ 0x47000C, 1 },
{ DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x36), 0 }
};
f32 lbl_1_data_21C[4] = {
210.0f, 190.0f, 170.0f, 0.0f
};
// prototypes // prototypes
void fn_1_B180(omObjData*); void fn_1_B180(omObjData *);
void fn_1_AE08(Process* arg0) { void fn_1_AE08(Process *arg0)
{
s16 var_r31; s16 var_r31;
omMakeGroupEx(arg0, 0, 4); omMakeGroupEx(arg0, 0, 4);
omGetGroupMemberListEx(arg0, 0); omGetGroupMemberListEx(arg0, 0);
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
lbl_1_bss_C0[var_r31] = omAddObjEx(arg0, 0x64, 9, 8, 0, fn_1_AEE4); lbl_1_bss_C0[var_r31] = omAddObjEx(arg0, 0x64, 9, 8, 0, fn_1_AEE4);
lbl_1_bss_C0[var_r31]->work[0] = var_r31; lbl_1_bss_C0[var_r31]->work[0] = var_r31;
@ -52,14 +45,15 @@ void fn_1_AE08(Process* arg0) {
omAddObjEx(arg0, 0x65, 0, 0, -1, fn_1_B180); omAddObjEx(arg0, 0x65, 0, 0, -1, fn_1_B180);
} }
void fn_1_AEE4(omObjData* arg0) { void fn_1_AEE4(omObjData *arg0)
{
f32 var_f31; f32 var_f31;
s32 temp_r28; s32 temp_r28;
s16 var_r29; s16 var_r29;
unkObjStruct* temp_r31; unkObjStruct *temp_r31;
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x78, MEMORY_DEFAULT_NUM); arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x78, MEMORY_DEFAULT_NUM);
temp_r31 = (unkObjStruct*)arg0->data; temp_r31 = (unkObjStruct *)arg0->data;
memset(temp_r31, 0, 0x78); memset(temp_r31, 0, 0x78);
arg0->stat |= 0x100; arg0->stat |= 0x100;
temp_r31->unk4 = arg0->work[0]; temp_r31->unk4 = arg0->work[0];
@ -68,11 +62,12 @@ void fn_1_AEE4(omObjData* arg0) {
arg0->model[0] = CharModelCreate(temp_r31->unk8, 4); arg0->model[0] = CharModelCreate(temp_r31->unk8, 4);
Hu3DModelLayerSet(arg0->model[0], 1); Hu3DModelLayerSet(arg0->model[0], 1);
Hu3DModelShadowSet(arg0->model[0]); Hu3DModelShadowSet(arg0->model[0]);
for (var_r29 = 0; var_r29 < 8; var_r29++) { for (var_r29 = 0; var_r29 < 8; var_r29++) {
if (lbl_1_data_1DC[var_r29][1] == 0) { if (lbl_1_data_1DC[var_r29][1] == 0) {
arg0->motion[var_r29] = CharModelMotionCreate(temp_r31->unk8, lbl_1_data_1DC[var_r29][0]); arg0->motion[var_r29] = CharModelMotionCreate(temp_r31->unk8, lbl_1_data_1DC[var_r29][0]);
} else { }
else {
arg0->motion[var_r29] = CharModelMotionCreate(temp_r31->unk8, temp_r31->unk8 + lbl_1_data_1DC[var_r29][0]); arg0->motion[var_r29] = CharModelMotionCreate(temp_r31->unk8, temp_r31->unk8 + lbl_1_data_1DC[var_r29][0]);
} }
} }
@ -87,7 +82,8 @@ void fn_1_AEE4(omObjData* arg0) {
temp_r31->unk10 = temp_r31->unk12 = temp_r31->unk14 = 0; temp_r31->unk10 = temp_r31->unk12 = temp_r31->unk14 = 0;
if (temp_r31->unk8 == 5) { if (temp_r31->unk8 == 5) {
var_f31 = 350.0f; var_f31 = 350.0f;
} else { }
else {
var_f31 = 410.0f; var_f31 = 410.0f;
} }
temp_r31->unk5C = var_f31; temp_r31->unk5C = var_f31;
@ -98,37 +94,39 @@ void fn_1_AEE4(omObjData* arg0) {
arg0->func = fn_1_B17C; arg0->func = fn_1_B17C;
} }
void fn_1_B17C(omObjData* arg0) { void fn_1_B17C(omObjData *arg0)
{
return; return;
} }
void fn_1_B180(omObjData* arg0) { void fn_1_B180(omObjData *arg0)
{
s16 var_r29; s16 var_r29;
s16 var_r31; s16 var_r31;
s32 var_r28; s32 var_r28;
u32 temp_r0; u32 temp_r0;
u32 temp_r3; u32 temp_r3;
u32 temp_r3_2; u32 temp_r3_2;
unkObjStruct* temp_r30; unkObjStruct *temp_r30;
var_r28 = GWSystem.player_curr; var_r28 = GWSystem.player_curr;
if (var_r28 < 0) { if (var_r28 < 0) {
var_r28 = 0; var_r28 = 0;
} }
var_r29 = var_r28; var_r29 = var_r28;
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
lbl_1_bss_B8[var_r31] = var_r29; lbl_1_bss_B8[var_r31] = var_r29;
var_r29 = (var_r29 + 1) % 4; var_r29 = (var_r29 + 1) % 4;
} }
lbl_1_bss_88->x = (700.0f * cos(M_PI/2 - M_PI/9)); lbl_1_bss_88->x = (700.0f * cos(M_PI / 2 - M_PI / 9));
lbl_1_bss_88->z = (700.0f * sin(M_PI/2 - M_PI/9)); lbl_1_bss_88->z = (700.0f * sin(M_PI / 2 - M_PI / 9));
for (var_r31 = 1; var_r31 < 4; var_r31++) { for (var_r31 = 1; var_r31 < 4; var_r31++) {
lbl_1_bss_88[var_r31].x = lbl_1_bss_88[var_r31 - 1].x - 150.0f; lbl_1_bss_88[var_r31].x = lbl_1_bss_88[var_r31 - 1].x - 150.0f;
lbl_1_bss_88[var_r31].z = lbl_1_bss_88->z; lbl_1_bss_88[var_r31].z = lbl_1_bss_88->z;
} }
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
temp_r30 = lbl_1_bss_C0[lbl_1_bss_B8[var_r31]]->data; temp_r30 = lbl_1_bss_C0[lbl_1_bss_B8[var_r31]]->data;
temp_r30->unkA = var_r31; temp_r30->unkA = var_r31;
@ -139,21 +137,22 @@ void fn_1_B180(omObjData* arg0) {
arg0->func = fn_1_B3A4; arg0->func = fn_1_B3A4;
} }
void fn_1_B3A4(omObjData* arg0) { void fn_1_B3A4(omObjData *arg0)
{
f32 sp14; f32 sp14;
ModelData* sp8; ModelData *sp8;
f32 var_f31; f32 var_f31;
s16 var_r28; s16 var_r28;
s16 var_r29; s16 var_r29;
omObjData* var_r30; omObjData *var_r30;
unkObjStruct* var_r31; unkObjStruct *var_r31;
for (var_r29 = 0; var_r29 < 4; var_r29++) { for (var_r29 = 0; var_r29 < 4; var_r29++) {
if (lbl_1_bss_B8[var_r29] != -1) { if (lbl_1_bss_B8[var_r29] != -1) {
var_r30 = lbl_1_bss_C0[lbl_1_bss_B8[var_r29]]; var_r30 = lbl_1_bss_C0[lbl_1_bss_B8[var_r29]];
sp8 = &Hu3DData[var_r30->model[0]]; sp8 = &Hu3DData[var_r30->model[0]];
var_r31 = (unkObjStruct*)var_r30->data; var_r31 = (unkObjStruct *)var_r30->data;
switch(var_r31->unk0 & 0xF) { switch (var_r31->unk0 & 0xF) {
case 1: case 1:
var_r31->unkC++; var_r31->unkC++;
var_f31 = (f32)var_r31->unkC / var_r31->unkE; var_f31 = (f32)var_r31->unkC / var_r31->unkE;
@ -163,7 +162,8 @@ void fn_1_B3A4(omObjData* arg0) {
if (lbl_1_bss_72 == 0) { if (lbl_1_bss_72 == 0) {
lbl_1_bss_72 = 1; lbl_1_bss_72 = 1;
fn_1_F228(); fn_1_F228();
} else { }
else {
fn_1_F4D4(var_r31, 15, 7); fn_1_F4D4(var_r31, 15, 7);
Hu3DMotionShiftSet(var_r30->model[0], var_r30->motion[1], 0.0f, 7.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(var_r30->model[0], var_r30->motion[1], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
} }
@ -225,8 +225,9 @@ void fn_1_B3A4(omObjData* arg0) {
f32 lbl_1_data_250 = 70.0f; f32 lbl_1_data_250 = 70.0f;
void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) { void fn_1_B884(omObjData *arg0, unkObjStruct *arg1)
s16 sp8[5] = {3, 1, 0, 2, 4}; {
s16 sp8[5] = { 3, 1, 0, 2, 4 };
f32 var_f29; f32 var_f29;
f32 var_f28; f32 var_f28;
f32 var_f31; f32 var_f31;
@ -269,7 +270,7 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) {
var_f31 = 1.0f; var_f31 = 1.0f;
arg1->unkC = arg1->unkE = 0; arg1->unkC = arg1->unkE = 0;
arg1->unk68 = arg1->unk30.y; arg1->unk68 = arg1->unk30.y;
for (var_r30 = 0; var_r30 < 5; var_r30++) { for (var_r30 = 0; var_r30 < 5; var_r30++) {
if (lbl_1_data_14[sp8[var_r30]] != 0) { if (lbl_1_data_14[sp8[var_r30]] != 0) {
arg1->unk4A = arg1->unk60 = sp8[var_r30]; arg1->unk4A = arg1->unk60 = sp8[var_r30];
@ -279,8 +280,8 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) {
lbl_1_bss_74++; lbl_1_bss_74++;
} }
var_f29 = 700.0f + ((arg1->unk5C - 700.0f) * var_f31); var_f29 = 700.0f + ((arg1->unk5C - 700.0f) * var_f31);
arg1->unk18.x = (var_f29 * cos(M_PI/4)); arg1->unk18.x = (var_f29 * cos(M_PI / 4));
arg1->unk18.z = (var_f29 * sin(M_PI/4)); arg1->unk18.z = (var_f29 * sin(M_PI / 4));
var_f29 = 0.1f; var_f29 = 0.1f;
var_f28 = 0.6f; var_f28 = 0.6f;
if (var_f31 >= var_f29) { if (var_f31 >= var_f29) {
@ -311,7 +312,8 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) {
var_f31 = arg1->unkC / 10.0f; var_f31 = arg1->unkC / 10.0f;
if (var_f31 < 1.0f) { if (var_f31 < 1.0f) {
arg1->unk30.y = arg1->unk68 + (var_f31 * (var_f30 - arg1->unk68)); arg1->unk30.y = arg1->unk68 + (var_f31 * (var_f30 - arg1->unk68));
} else { }
else {
arg1->unk30.y = var_f30; arg1->unk30.y = var_f30;
} }
arg1->unk6C = arg1->unk30.y; arg1->unk6C = arg1->unk30.y;
@ -345,7 +347,8 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) {
lbl_1_data_1DA++; lbl_1_data_1DA++;
return; return;
} }
} else { }
else {
lbl_1_bss_74 = 0; lbl_1_bss_74 = 0;
lbl_1_data_250 = 70.0f; lbl_1_data_250 = 70.0f;
arg1->unk48 = 0; arg1->unk48 = 0;
@ -361,7 +364,8 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) {
} }
} }
void fn_1_C1D4(omObjData* arg0, unkObjStruct* arg1) { void fn_1_C1D4(omObjData *arg0, unkObjStruct *arg1)
{
s16 sp12[5]; s16 sp12[5];
s16 sp8[5]; s16 sp8[5];
f32 var_f28; f32 var_f28;
@ -381,18 +385,18 @@ void fn_1_C1D4(omObjData* arg0, unkObjStruct* arg1) {
HuPadTrigR[arg1->unk6] = 0; HuPadTrigR[arg1->unk6] = 0;
HuPadBtn[arg1->unk6] = 0; HuPadBtn[arg1->unk6] = 0;
switch (GWPlayerCfg[arg1->unk4].diff) { switch (GWPlayerCfg[arg1->unk4].diff) {
case 0: case 0:
var_f31 = 0.3f; var_f31 = 0.3f;
break; break;
case 1: case 1:
var_f31 = 0.3f; var_f31 = 0.3f;
break; break;
case 2: case 2:
var_f31 = 0.3f; var_f31 = 0.3f;
break; break;
case 3: case 3:
var_f31 = 0.3f; var_f31 = 0.3f;
break; break;
} }
var_f31 += (0.1f * lbl_1_bss_70); var_f31 += (0.1f * lbl_1_bss_70);
@ -405,7 +409,8 @@ void fn_1_C1D4(omObjData* arg0, unkObjStruct* arg1) {
if (arg1->unk50 == -1) { if (arg1->unk50 == -1) {
if (arg1->unk4C < var_f31) { if (arg1->unk4C < var_f31) {
arg1->unk50 = fn_1_4E54(-1); arg1->unk50 = fn_1_4E54(-1);
} else { }
else {
for (var_r30 = 0, var_r28 = 0; var_r30 < 5; var_r30++) { for (var_r30 = 0, var_r28 = 0; var_r30 < 5; var_r30++) {
if ((var_r30 != fn_1_4E54(-1)) && (lbl_1_data_14[var_r30] != 0)) { if ((var_r30 != fn_1_4E54(-1)) && (lbl_1_data_14[var_r30] != 0)) {
sp12[var_r28++] = var_r30; sp12[var_r28++] = var_r30;
@ -432,7 +437,8 @@ void fn_1_C1D4(omObjData* arg0, unkObjStruct* arg1) {
if (arg1->unk68 > lbl_1_data_0[arg1->unk50]) { if (arg1->unk68 > lbl_1_data_0[arg1->unk50]) {
HuPadStkX[arg1->unk6] = 0x2D; HuPadStkX[arg1->unk6] = 0x2D;
} }
} else { }
else {
var_f30 = ABS(arg1->unk68 - lbl_1_data_0[arg1->unk52]); var_f30 = ABS(arg1->unk68 - lbl_1_data_0[arg1->unk52]);
if (var_f30 < 5.0f) { if (var_f30 < 5.0f) {
if (arg1->unk5A != 0) { if (arg1->unk5A != 0) {
@ -445,7 +451,7 @@ void fn_1_C1D4(omObjData* arg0, unkObjStruct* arg1) {
var_r30 = (((rand8() << 8) | rand8()) % (s16)(var_r29 + 1)); var_r30 = (((rand8() << 8) | rand8()) % (s16)(var_r29 + 1));
arg1->unk52 = sp8[var_r30]; arg1->unk52 = sp8[var_r30];
} }
HuPadTrigR[arg1->unk6] = (u8) (arg1->unk58 * var_f31); HuPadTrigR[arg1->unk6] = (u8)(arg1->unk58 * var_f31);
return; return;
} }
if ((((rand8() << 8) | rand8()) % 101) < 0x32) { if ((((rand8() << 8) | rand8()) % 101) < 0x32) {
@ -470,7 +476,8 @@ void fn_1_C1D4(omObjData* arg0, unkObjStruct* arg1) {
} }
} }
void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) { void fn_1_C944(omObjData *arg0, unkObjStruct *arg1)
{
s16 sp8; s16 sp8;
f32 var_f26; f32 var_f26;
f32 var_f25; f32 var_f25;
@ -489,7 +496,8 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) {
HuPadStkY[arg1->unk6] = 0; HuPadStkY[arg1->unk6] = 0;
HuPadTrigR[arg1->unk6] = 0x96; HuPadTrigR[arg1->unk6] = 0x96;
HuPadBtn[arg1->unk6] = 0x20; HuPadBtn[arg1->unk6] = 0x20;
} else { }
else {
var_r29 = HuPadStkX[arg1->unk6]; var_r29 = HuPadStkX[arg1->unk6];
sp8 = HuPadStkY[arg1->unk6]; sp8 = HuPadStkY[arg1->unk6];
} }
@ -497,11 +505,13 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) {
var_r30 = -1; var_r30 = -1;
if (ABS(var_r29) < 7) { if (ABS(var_r29) < 7) {
var_r30 = fn_1_CFAC(arg1, 0); var_r30 = fn_1_CFAC(arg1, 0);
} else { }
else {
if (var_r29 > 0) { if (var_r29 > 0) {
arg1->unk48 = arg1->unk48 & 0xFFFFFFFD; arg1->unk48 = arg1->unk48 & 0xFFFFFFFD;
arg1->unk48 = arg1->unk48 | 1; arg1->unk48 = arg1->unk48 | 1;
} else { }
else {
arg1->unk48 = arg1->unk48 & 0xFFFFFFFE; arg1->unk48 = arg1->unk48 & 0xFFFFFFFE;
arg1->unk48 = arg1->unk48 | 2; arg1->unk48 = arg1->unk48 | 2;
} }
@ -519,7 +529,8 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) {
arg1->unk4A = var_r30; arg1->unk4A = var_r30;
arg1->unk48 = arg1->unk48 & 0xFFFFFFFE; arg1->unk48 = arg1->unk48 & 0xFFFFFFFE;
} }
} else if ((arg1->unk48 & 2) != 0) { }
else if ((arg1->unk48 & 2) != 0) {
arg1->unk68++; arg1->unk68++;
if ((var_r30 != -1) && (lbl_1_data_0[var_r30] < arg1->unk68)) { if ((var_r30 != -1) && (lbl_1_data_0[var_r30] < arg1->unk68)) {
arg1->unk68 = lbl_1_data_0[var_r30]; arg1->unk68 = lbl_1_data_0[var_r30];
@ -539,7 +550,8 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) {
var_f29 += 360.0f; var_f29 += 360.0f;
} }
fn_1_D24C(arg1, arg1->unk30.y, var_f29); fn_1_D24C(arg1, arg1->unk30.y, var_f29);
} else { }
else {
arg1->unk48 |= 4; arg1->unk48 |= 4;
var_f29 = 90.0f - lbl_1_data_0[arg1->unk4A]; var_f29 = 90.0f - lbl_1_data_0[arg1->unk4A];
fn_1_D24C(arg1, arg1->unk30.y, var_f29); fn_1_D24C(arg1, arg1->unk30.y, var_f29);
@ -551,10 +563,12 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) {
var_f28 = 1.0f; var_f28 = 1.0f;
if ((arg1->unk48 & 4) != 0) { if ((arg1->unk48 & 4) != 0) {
fn_1_ED88(arg0, 0, HU3D_MOTATTR_LOOP); fn_1_ED88(arg0, 0, HU3D_MOTATTR_LOOP);
} else { }
else {
fn_1_ED88(arg0, 2, HU3D_MOTATTR_LOOP); fn_1_ED88(arg0, 2, HU3D_MOTATTR_LOOP);
} }
} else { }
else {
fn_1_ED88(arg0, 2, HU3D_MOTATTR_LOOP); fn_1_ED88(arg0, 2, HU3D_MOTATTR_LOOP);
} }
if ((arg1->unk48 & 4) != 0) { if ((arg1->unk48 & 4) != 0) {
@ -567,13 +581,15 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) {
if (var_f31 > temp_f27) { if (var_f31 > temp_f27) {
var_f31 -= 360.0f; var_f31 -= 360.0f;
} }
} else if (((arg1->unk48 & 2) != 0) && (var_f31 < temp_f27)) { }
else if (((arg1->unk48 & 2) != 0) && (var_f31 < temp_f27)) {
var_f31 += 360.0f; var_f31 += 360.0f;
} }
var_f30 = var_f31 + (var_f28 * (temp_f27 - var_f31)); var_f30 = var_f31 + (var_f28 * (temp_f27 - var_f31));
if (var_f30 < 0.0f) { if (var_f30 < 0.0f) {
var_f30 += 360.0f; var_f30 += 360.0f;
} else { }
else {
if (var_f30 >= 360.0f) { if (var_f30 >= 360.0f) {
var_f30 -= 360.0f; var_f30 -= 360.0f;
} }
@ -582,7 +598,8 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) {
} }
} }
s16 fn_1_CFAC(unkObjStruct* arg0, u8 arg1) { s16 fn_1_CFAC(unkObjStruct *arg0, u8 arg1)
{
f32 var_f31; f32 var_f31;
s16 var_r30; s16 var_r30;
s16 var_r31; s16 var_r31;
@ -596,7 +613,8 @@ s16 fn_1_CFAC(unkObjStruct* arg0, u8 arg1) {
if (lbl_1_data_0[var_r31] > arg0->unk68) { if (lbl_1_data_0[var_r31] > arg0->unk68) {
continue; continue;
} }
} else if (lbl_1_data_0[var_r31] >= arg0->unk68) { }
else if (lbl_1_data_0[var_r31] >= arg0->unk68) {
continue; continue;
} }
if (var_f31 > (arg0->unk68 - lbl_1_data_0[var_r31])) { if (var_f31 > (arg0->unk68 - lbl_1_data_0[var_r31])) {
@ -605,14 +623,16 @@ s16 fn_1_CFAC(unkObjStruct* arg0, u8 arg1) {
} }
} }
} }
} else if ((arg0->unk48 & 2) != 0) { }
else if ((arg0->unk48 & 2) != 0) {
for (var_r31 = 0; var_r31 < 5; var_r31++) { for (var_r31 = 0; var_r31 < 5; var_r31++) {
if (lbl_1_data_14[var_r31] != 0) { if (lbl_1_data_14[var_r31] != 0) {
if (arg1 == 0) { if (arg1 == 0) {
if (lbl_1_data_0[var_r31] < arg0->unk68) { if (lbl_1_data_0[var_r31] < arg0->unk68) {
continue; continue;
} }
} else if (lbl_1_data_0[var_r31] <= arg0->unk68) { }
else if (lbl_1_data_0[var_r31] <= arg0->unk68) {
continue; continue;
} }
if (var_f31 > (lbl_1_data_0[var_r31] - arg0->unk68)) { if (var_f31 > (lbl_1_data_0[var_r31] - arg0->unk68)) {
@ -632,7 +652,8 @@ s16 fn_1_CFAC(unkObjStruct* arg0, u8 arg1) {
return var_r30; return var_r30;
} }
void fn_1_D24C(unkObjStruct* arg0, f32 arg1, f32 arg2) { void fn_1_D24C(unkObjStruct *arg0, f32 arg1, f32 arg2)
{
f32 var_f28; f32 var_f28;
f32 var_f29; f32 var_f29;
f32 var_f30; f32 var_f30;
@ -650,8 +671,9 @@ void fn_1_D24C(unkObjStruct* arg0, f32 arg1, f32 arg2) {
arg0->unkE = ((var_f28 / 90.0f) * var_f31); arg0->unkE = ((var_f28 / 90.0f) * var_f31);
} }
void fn_1_D34C(omObjData* arg0, unkObjStruct* arg1) { void fn_1_D34C(omObjData *arg0, unkObjStruct *arg1)
ModelData* temp_r30; {
ModelData *temp_r30;
f32 temp_f28; f32 temp_f28;
f32 temp_f29; f32 temp_f29;
f32 temp_f30; f32 temp_f30;
@ -672,7 +694,8 @@ void fn_1_D34C(omObjData* arg0, unkObjStruct* arg1) {
arg1->unk48 &= ~8; arg1->unk48 &= ~8;
temp_r30->unk_68 = 1.0f; temp_r30->unk_68 = 1.0f;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 7.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
} else if (temp_f30 > 10.0f) { }
else if (temp_f30 > 10.0f) {
if ((HuPadBtn[arg1->unk6] & 0x20) != 0) { if ((HuPadBtn[arg1->unk6] & 0x20) != 0) {
arg1->unk60 = 0; arg1->unk60 = 0;
arg1->unk68 = temp_f30; arg1->unk68 = temp_f30;
@ -697,7 +720,8 @@ void fn_1_D34C(omObjData* arg0, unkObjStruct* arg1) {
} }
if (temp_r30->unk_64 < var_f31) { if (temp_r30->unk_64 < var_f31) {
temp_r30->unk_64 += 1.0f; temp_r30->unk_64 += 1.0f;
} else if (temp_r30->unk_64 > var_f31) { }
else if (temp_r30->unk_64 > var_f31) {
temp_r30->unk_64 -= 1.0f; temp_r30->unk_64 -= 1.0f;
} }
var_f31 = (temp_r30->unk_64 - temp_f29) / temp_f28; var_f31 = (temp_r30->unk_64 - temp_f29) / temp_f28;
@ -709,8 +733,9 @@ void fn_1_D34C(omObjData* arg0, unkObjStruct* arg1) {
} }
} }
void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) { void fn_1_D7F8(omObjData *arg0, unkObjStruct *arg1)
ModelData* temp_r29; {
ModelData *temp_r29;
f32 temp_f28; f32 temp_f28;
f32 temp_f29; f32 temp_f29;
f32 var_f26; f32 var_f26;
@ -732,7 +757,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) {
var_f30 = 0.01f * (arg1->unk68 - 130.0f); var_f30 = 0.01f * (arg1->unk68 - 130.0f);
if (var_f30 > 0.19999999f) { if (var_f30 > 0.19999999f) {
var_f30 = 0.19999999f; var_f30 = 0.19999999f;
} else if (var_f30 < 0.0f) { }
else if (var_f30 < 0.0f) {
var_f30 = 0.0f; var_f30 = 0.0f;
} }
var_f31 += var_f30; var_f31 += var_f30;
@ -743,7 +769,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) {
} }
if (temp_r29->unk_64 < var_f31) { if (temp_r29->unk_64 < var_f31) {
temp_r29->unk_64 += 3.0f; temp_r29->unk_64 += 3.0f;
} else if (temp_r29->unk_64 > var_f31) { }
else if (temp_r29->unk_64 > var_f31) {
temp_r29->unk_64 -= 3.0f; temp_r29->unk_64 -= 3.0f;
} }
var_f31 = (temp_r29->unk_64 - temp_f29) / temp_f28; var_f31 = (temp_r29->unk_64 - temp_f29) / temp_f28;
@ -771,7 +798,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) {
Hu3DMotionSpeedSet(arg0->model[0], 2.0f); Hu3DMotionSpeedSet(arg0->model[0], 2.0f);
if ((arg1->unk6C - arg1->unk68) > 0.0f) { if ((arg1->unk6C - arg1->unk68) > 0.0f) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[7], 64.0f, 7.0f, HU3D_MOTATTR_NONE); Hu3DMotionShiftSet(arg0->model[0], arg0->motion[7], 64.0f, 7.0f, HU3D_MOTATTR_NONE);
} else { }
else {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[7], 4.0f, 7.0f, HU3D_MOTATTR_NONE); Hu3DMotionShiftSet(arg0->model[0], arg0->motion[7], 4.0f, 7.0f, HU3D_MOTATTR_NONE);
} }
Hu3DMotionShiftSpeedSet(arg0->model[0], 2.0f); Hu3DMotionShiftSpeedSet(arg0->model[0], 2.0f);
@ -788,7 +816,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) {
var_f31 = 1.0f; var_f31 = 1.0f;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 7.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
arg1->unk60++; arg1->unk60++;
} else if (((arg1->unk6C - arg1->unk68) < 0.0f) && (Hu3DMotionShiftIDGet(arg0->model[0]) < 0)) { }
else if (((arg1->unk6C - arg1->unk68) < 0.0f) && (Hu3DMotionShiftIDGet(arg0->model[0]) < 0)) {
if (Hu3DMotionTimeGet(arg0->model[0]) >= 60.0f) { if (Hu3DMotionTimeGet(arg0->model[0]) >= 60.0f) {
Hu3DMotionSpeedSet(arg0->model[0], 0.0f); Hu3DMotionSpeedSet(arg0->model[0], 0.0f);
} }
@ -799,7 +828,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) {
if (++arg1->unkC > 0x3C) { if (++arg1->unkC > 0x3C) {
if (fn_1_4E54(arg1->unk4A) == 0) { if (fn_1_4E54(arg1->unk4A) == 0) {
fn_1_4EEC(7U, 3U); fn_1_4EEC(7U, 3U);
} else { }
else {
fn_1_4EEC(7U, 4U); fn_1_4EEC(7U, 4U);
} }
arg1->unkC = 0; arg1->unkC = 0;
@ -811,7 +841,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) {
fn_1_4EEC(0x100U, 0U); fn_1_4EEC(0x100U, 0U);
if (fn_1_4E54(arg1->unk4A) == 0) { if (fn_1_4E54(arg1->unk4A) == 0) {
fn_1_F4D4(arg1, 15, 5); fn_1_F4D4(arg1, 15, 5);
} else { }
else {
fn_1_F4D4(arg1, 15, 6); fn_1_F4D4(arg1, 15, 6);
} }
arg1->unkC = arg1->unkE = 0; arg1->unkC = arg1->unkE = 0;
@ -829,8 +860,9 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) {
} }
} }
void fn_1_E034(omObjData* arg0, unkObjStruct* arg1) { void fn_1_E034(omObjData *arg0, unkObjStruct *arg1)
ModelData* temp_r27; {
ModelData *temp_r27;
f32 var_f28; f32 var_f28;
f32 var_f29; f32 var_f29;
f32 var_f30; f32 var_f30;
@ -851,7 +883,7 @@ void fn_1_E034(omObjData* arg0, unkObjStruct* arg1) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 7.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
arg1->unkC = arg1->unkE = 0; arg1->unkC = arg1->unkE = 0;
arg1->unk68 = arg1->unk30.y; arg1->unk68 = arg1->unk30.y;
for (var_r29 = 0, var_r28 = -1; var_r29 < 5; var_r29++) { for (var_r29 = 0, var_r28 = -1; var_r29 < 5; var_r29++) {
if (lbl_1_data_14[var_r29] != 0) { if (lbl_1_data_14[var_r29] != 0) {
var_r28++; var_r28++;
@ -950,8 +982,9 @@ void fn_1_E034(omObjData* arg0, unkObjStruct* arg1) {
} }
} }
u8 fn_1_E8AC(omObjData* arg0, unkObjStruct* arg1) { u8 fn_1_E8AC(omObjData *arg0, unkObjStruct *arg1)
ModelData* temp_r29; {
ModelData *temp_r29;
f32 var_f31; f32 var_f31;
s32 temp_r28; s32 temp_r28;
s16 temp_r27; s16 temp_r27;
@ -975,7 +1008,8 @@ u8 fn_1_E8AC(omObjData* arg0, unkObjStruct* arg1) {
arg1->unk24.x = (840.0000610351563 * cosd(var_f31)); arg1->unk24.x = (840.0000610351563 * cosd(var_f31));
arg1->unk24.y = 0.0f; arg1->unk24.y = 0.0f;
arg1->unk24.z = (840.0000610351563 * sind(var_f31)); arg1->unk24.z = (840.0000610351563 * sind(var_f31));
} else { }
else {
arg1->unk24.x = (1050.0 * cosd(var_f31)); arg1->unk24.x = (1050.0 * cosd(var_f31));
arg1->unk24.y = 0.0f; arg1->unk24.y = 0.0f;
arg1->unk24.z = (1050.0 * sind(var_f31)); arg1->unk24.z = (1050.0 * sind(var_f31));
@ -1004,7 +1038,7 @@ u8 fn_1_E8AC(omObjData* arg0, unkObjStruct* arg1) {
break; break;
case 3: case 3:
fn_1_F4D4(arg1, 15, 8); fn_1_F4D4(arg1, 15, 8);
Hu3DModelAttrSet(arg0->model[0], 1); Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
temp_r27 = lbl_1_data_1D8 + 1; temp_r27 = lbl_1_data_1D8 + 1;
temp_r28 = arg1->unk4; temp_r28 = arg1->unk4;
GWPlayerCoinWinSet(temp_r28, temp_r27); GWPlayerCoinWinSet(temp_r28, temp_r27);
@ -1014,7 +1048,8 @@ u8 fn_1_E8AC(omObjData* arg0, unkObjStruct* arg1) {
return 0; return 0;
} }
s32 fn_1_ED88(omObjData* arg0, s16 arg1, u32 arg2) { s32 fn_1_ED88(omObjData *arg0, s16 arg1, u32 arg2)
{
s16 var_r28; s16 var_r28;
s16 var_r29; s16 var_r29;
@ -1025,26 +1060,28 @@ s32 fn_1_ED88(omObjData* arg0, s16 arg1, u32 arg2) {
} }
} }
void fn_1_EE78(void) { void fn_1_EE78(void)
{
s16 var_r31; s16 var_r31;
unkObjStruct* var_r30; unkObjStruct *var_r30;
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
var_r30 = (unkObjStruct*)lbl_1_bss_C0[var_r31]->data; var_r30 = (unkObjStruct *)lbl_1_bss_C0[var_r31]->data;
if (fn_1_F4C0(var_r30, 15) == 8) { if (fn_1_F4C0(var_r30, 15) == 8) {
Hu3DMotionShiftSet(lbl_1_bss_C0[var_r31]->model[0], lbl_1_bss_C0[var_r31]->motion[6], 0.0f, 7.0f, HU3D_MOTATTR_NONE); Hu3DMotionShiftSet(lbl_1_bss_C0[var_r31]->model[0], lbl_1_bss_C0[var_r31]->motion[6], 0.0f, 7.0f, HU3D_MOTATTR_NONE);
} }
} }
} }
void fn_1_EF50(void) { void fn_1_EF50(void)
unkObjStruct* var_r30; {
unkObjStruct *var_r30;
s16 var_r28; s16 var_r28;
s16 var_r29; s16 var_r29;
s16 var_r31; s16 var_r31;
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
var_r30 = (unkObjStruct*)lbl_1_bss_C0[var_r31]->data; var_r30 = (unkObjStruct *)lbl_1_bss_C0[var_r31]->data;
if (fn_1_F4C0(var_r30, 15) == 8) { if (fn_1_F4C0(var_r30, 15) == 8) {
var_r28 = Hu3DData[lbl_1_bss_C0[var_r31]->model[0]].unk_08; var_r28 = Hu3DData[lbl_1_bss_C0[var_r31]->model[0]].unk_08;
var_r29 = Hu3DData[lbl_1_bss_C0[var_r31]->model[0]].unk_0C; var_r29 = Hu3DData[lbl_1_bss_C0[var_r31]->model[0]].unk_0C;
@ -1055,9 +1092,10 @@ void fn_1_EF50(void) {
} }
} }
s16 fn_1_F0FC(void) { s16 fn_1_F0FC(void)
{
s16 var_r31; s16 var_r31;
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
if (lbl_1_bss_B8[var_r31] != -1) { if (lbl_1_bss_B8[var_r31] != -1) {
return lbl_1_bss_B8[var_r31]; return lbl_1_bss_B8[var_r31];
@ -1066,21 +1104,23 @@ s16 fn_1_F0FC(void) {
return 0; return 0;
} }
void fn_1_F168(void) { void fn_1_F168(void)
omObjData* temp_r31; {
omObjData *temp_r31;
s16 var_r30; s16 var_r30;
unkObjStruct* var_r29; unkObjStruct *var_r29;
for (var_r30 = 0; var_r30 < 4; var_r30++) { for (var_r30 = 0; var_r30 < 4; var_r30++) {
temp_r31 = lbl_1_bss_C0[lbl_1_bss_B8[var_r30]]; temp_r31 = lbl_1_bss_C0[lbl_1_bss_B8[var_r30]];
var_r29 = (unkObjStruct*)temp_r31->data; var_r29 = (unkObjStruct *)temp_r31->data;
fn_1_F4D4(var_r29, 15, 1); fn_1_F4D4(var_r29, 15, 1);
Hu3DMotionShiftSet(temp_r31->model[0], temp_r31->motion[2], 0.0f, 7.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(temp_r31->model[0], temp_r31->motion[2], 0.0f, 7.0f, HU3D_MOTATTR_LOOP);
} }
} }
void fn_1_F228(void) { void fn_1_F228(void)
omObjData* temp_r30; {
omObjData *temp_r30;
s16 temp_r0; s16 temp_r0;
s16 var_r29; s16 var_r29;
s32 temp_r27; s32 temp_r27;
@ -1089,12 +1129,12 @@ void fn_1_F228(void) {
u32 temp_r0_2; u32 temp_r0_2;
u32 temp_r3; u32 temp_r3;
u32 temp_r3_2; u32 temp_r3_2;
unkObjStruct* temp_r31; unkObjStruct *temp_r31;
for (var_r29 = 0; var_r29 < 4; var_r29++) { for (var_r29 = 0; var_r29 < 4; var_r29++) {
if (lbl_1_bss_B8[var_r29] != -1) { if (lbl_1_bss_B8[var_r29] != -1) {
temp_r30 = lbl_1_bss_C0[lbl_1_bss_B8[var_r29]]; temp_r30 = lbl_1_bss_C0[lbl_1_bss_B8[var_r29]];
temp_r31 = (unkObjStruct*)temp_r30->data; temp_r31 = (unkObjStruct *)temp_r30->data;
if (temp_r31->unkA == 0) { if (temp_r31->unkA == 0) {
switch (GWPlayerCfg[temp_r31->unk4].diff) { switch (GWPlayerCfg[temp_r31->unk4].diff) {
case 0: case 0:
@ -1117,9 +1157,11 @@ void fn_1_F228(void) {
temp_r31->unkA = -1; temp_r31->unkA = -1;
temp_r31->unkC = temp_r31->unkE = 0; temp_r31->unkC = temp_r31->unkE = 0;
fn_1_F4D4(temp_r31, 15, 2); fn_1_F4D4(temp_r31, 15, 2);
} else if (temp_r31->unkA == -1) { }
else if (temp_r31->unkA == -1) {
temp_r31->unkA = lbl_1_data_1D8; temp_r31->unkA = lbl_1_data_1D8;
} else { }
else {
temp_r31->unkA--; temp_r31->unkA--;
temp_r31->unk24 = temp_r31->unk18; temp_r31->unk24 = temp_r31->unk18;
temp_r31->unkC = 0; temp_r31->unkC = 0;
@ -1134,15 +1176,18 @@ void fn_1_F228(void) {
} }
} }
u16 fn_1_F4C0(unkObjStruct* arg0, u16 arg1) { u16 fn_1_F4C0(unkObjStruct *arg0, u16 arg1)
{
return arg0->unk0 & arg1; return arg0->unk0 & arg1;
} }
void fn_1_F4D4(unkObjStruct* arg0, u16 arg1, u16 arg2) { void fn_1_F4D4(unkObjStruct *arg0, u16 arg1, u16 arg2)
{
arg0->unk0 &= ~arg1; arg0->unk0 &= ~arg1;
arg0->unk0 |= arg2; arg0->unk0 |= arg2;
} }
s32 fn_1_F4FC(s32 arg0) { s32 fn_1_F4FC(s32 arg0)
{
return lbl_1_bss_B8[arg0]; return lbl_1_bss_B8[arg0];
} }

50
src/REL/m441Dll/main.c
View file

@ -1098,7 +1098,7 @@ void fn_1_40A8(omObjData *object)
work->unk1C.x = temp_f24; work->unk1C.x = temp_f24;
work->unk1C.y = 0; work->unk1C.y = 0;
work->unk1C.z = 0; work->unk1C.z = 0;
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
work->unkE0 = Hu3DParManLink(lbl_1_bss_2C, &lbl_1_data_48C); work->unkE0 = Hu3DParManLink(lbl_1_bss_2C, &lbl_1_data_48C);
Hu3DParManPosSet(work->unkE0, work->unk28.x, work->unk28.y, work->unk28.z); Hu3DParManPosSet(work->unkE0, work->unk28.x, work->unk28.y, work->unk28.z);
Hu3DParManAttrReset(work->unkE0, 1); Hu3DParManAttrReset(work->unkE0, 1);
@ -1198,7 +1198,7 @@ void fn_1_40A8(omObjData *object)
} }
if (Hu3DMotionEndCheck(object->model[0])) { if (Hu3DMotionEndCheck(object->model[0])) {
work->unk98++; work->unk98++;
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DMotionSet(object->model[2], object->motion[14]); Hu3DMotionSet(object->model[2], object->motion[14]);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -1249,7 +1249,7 @@ void fn_1_40A8(omObjData *object)
case 2014: case 2014:
work->unk64.x++; work->unk64.x++;
if (30.0f == work->unk64.x) { if (30.0f == work->unk64.x) {
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
work->unkE0 = Hu3DParManLink(lbl_1_bss_2C, &lbl_1_data_48C); work->unkE0 = Hu3DParManLink(lbl_1_bss_2C, &lbl_1_data_48C);
Hu3DParManPosSet(work->unkE0, work->unk4C.x, work->unk4C.y + 20, work->unk4C.z); Hu3DParManPosSet(work->unkE0, work->unk4C.x, work->unk4C.y + 20, work->unk4C.z);
Hu3DParManAttrReset(work->unkE0, 1); Hu3DParManAttrReset(work->unkE0, 1);
@ -1322,15 +1322,15 @@ void fn_1_53E8(omObjData *object)
CharModelMotionIndexSet(work->unkB4, object->motion[2], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02)); CharModelMotionIndexSet(work->unkB4, object->motion[2], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02));
CharModelMotionIndexSet(work->unkB4, object->motion[7], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02)); CharModelMotionIndexSet(work->unkB4, object->motion[7], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02));
CharModelMotionIndexSet(work->unkB4, object->motion[3], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03)); CharModelMotionIndexSet(work->unkB4, object->motion[3], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03));
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[0], 2); Hu3DModelLayerSet(object->model[0], 2);
Hu3DMotionSet(object->model[0], object->motion[1]); Hu3DMotionSet(object->model[0], object->motion[1]);
object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x3F)); object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x3F));
for (i = 11; i <= 12; i++) { for (i = 11; i <= 12; i++) {
object->motion[i] = Hu3DJointMotionFile(object->model[1], lbl_1_data_2B0[i - 11]); object->motion[i] = Hu3DJointMotionFile(object->model[1], lbl_1_data_2B0[i - 11]);
} }
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[1], 0x40000001); Hu3DModelAttrReset(object->model[1], 0x40000001);
Hu3DModelLayerSet(object->model[1], 2); Hu3DModelLayerSet(object->model[1], 2);
Hu3DModelHookSet(object->model[0], CharModelHookNameGet(work->unkB4, 2, 0), object->model[1]); Hu3DModelHookSet(object->model[0], CharModelHookNameGet(work->unkB4, 2, 0), object->model[1]);
@ -1338,7 +1338,7 @@ void fn_1_53E8(omObjData *object)
for (i = 13; i <= 15; i++) { for (i = 13; i <= 15; i++) {
object->motion[i] = Hu3DJointMotionFile(object->model[2], lbl_1_data_2B8[i - 13]); object->motion[i] = Hu3DJointMotionFile(object->model[2], lbl_1_data_2B8[i - 13]);
} }
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[2], 0x40000001); Hu3DModelAttrReset(object->model[2], 0x40000001);
Hu3DModelLayerSet(object->model[2], 2); Hu3DModelLayerSet(object->model[2], 2);
Hu3DModelHookSet(object->model[0], CharModelHookNameGet(work->unkB4, 2, 4), object->model[2]); Hu3DModelHookSet(object->model[0], CharModelHookNameGet(work->unkB4, 2, 4), object->model[2]);
@ -1360,7 +1360,7 @@ void fn_1_53E8(omObjData *object)
Hu3DModelShadowSet(object->model[i]); Hu3DModelShadowSet(object->model[i]);
} }
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
Hu3DModelAttrReset(object->model[i], 1); Hu3DModelAttrReset(object->model[i], HU3D_ATTR_DISPOFF);
} }
if (GWPlayerCfg[work->unkB0].iscom) { if (GWPlayerCfg[work->unkB0].iscom) {
switch (GWPlayerCfg[work->unkB0].diff) { switch (GWPlayerCfg[work->unkB0].diff) {
@ -1399,7 +1399,7 @@ typedef struct work_713C {
void fn_1_5B2C(omObjData *object) void fn_1_5B2C(omObjData *object)
{ {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
fn_1_24(object->work[0] + 4096, object->model[0]); fn_1_24(object->work[0] + 4096, object->model[0]);
lbl_1_bss_18[object->work[0]]--; lbl_1_bss_18[object->work[0]]--;
Hu3DParManKill(((Work713C *)object->data)->unk30); Hu3DParManKill(((Work713C *)object->data)->unk30);
@ -1544,7 +1544,7 @@ void fn_1_5C04(omObjData *object)
temp_r31->unk30 = Hu3DParManLink(lbl_1_bss_34, &lbl_1_data_3EC); temp_r31->unk30 = Hu3DParManLink(lbl_1_bss_34, &lbl_1_data_3EC);
Hu3DParManPosSet(temp_r31->unk30, temp_r31->unk0.x, temp_r31->unk0.y, temp_r31->unk0.z); Hu3DParManPosSet(temp_r31->unk30, temp_r31->unk0.x, temp_r31->unk0.y, temp_r31->unk0.z);
Hu3DParManColorSet(temp_r31->unk30, object->work[0]); Hu3DParManColorSet(temp_r31->unk30, object->work[0]);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
temp_r28 = lbl_1_bss_48[temp_r22]; temp_r28 = lbl_1_bss_48[temp_r22];
temp_r29 = temp_r28->data; temp_r29 = temp_r28->data;
temp_r29->unkC4[object->work[0]]++; temp_r29->unkC4[object->work[0]]++;
@ -1570,7 +1570,7 @@ void fn_1_713C(omObjData *object)
else { else {
object->model[0] = mdlId; object->model[0] = mdlId;
} }
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000003); Hu3DModelAttrSet(object->model[0], 0x40000003);
Hu3DModelLayerSet(object->model[0], 3); Hu3DModelLayerSet(object->model[0], 3);
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
@ -1591,7 +1591,7 @@ void fn_1_713C(omObjData *object)
Hu3DModelLayerSet(Hu3DParManModelIDGet(work->unk30), 4); Hu3DModelLayerSet(Hu3DParManModelIDGet(work->unk30), 4);
} }
Hu3DModelAttrReset(object->model[0], 0x40000002); Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_1_5C04; object->func = fn_1_5C04;
} }
@ -1662,7 +1662,7 @@ void fn_1_74F4(s32 arg0)
void fn_1_7958(omObjData *object) void fn_1_7958(omObjData *object)
{ {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
fn_1_24(object->work[0] + 4096, object->model[0]); fn_1_24(object->work[0] + 4096, object->model[0]);
Hu3DParManKill(((Work713C *)object->data)->unk30); Hu3DParManKill(((Work713C *)object->data)->unk30);
omDelObjEx(lbl_1_bss_1DC, object); omDelObjEx(lbl_1_bss_1DC, object);
@ -1743,7 +1743,7 @@ void fn_1_8518(omObjData *object)
work = object->data; work = object->data;
work->unk18.y = 6.0f; work->unk18.y = 6.0f;
work->unk18.x = (frandf() * 60.0f) - 30.0f; work->unk18.x = (frandf() * 60.0f) - 30.0f;
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000003); Hu3DModelAttrSet(object->model[0], 0x40000003);
Hu3DModelLayerSet(object->model[0], 3); Hu3DModelLayerSet(object->model[0], 3);
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
@ -1764,7 +1764,7 @@ void fn_1_8518(omObjData *object)
Hu3DModelLayerSet(Hu3DParManModelIDGet(work->unk30), 4); Hu3DModelLayerSet(Hu3DParManModelIDGet(work->unk30), 4);
} }
Hu3DModelAttrReset(object->model[0], 0x40000002); Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_1_803C; object->func = fn_1_803C;
} }
@ -1804,7 +1804,7 @@ s32 fn_1_8AA0(s32 arg0)
Hu3DModelPosSet(model, ((radius * sind(angle)) + (frandf() * 20.0f)) - 10, -60.0f, radius * cosd(angle)); Hu3DModelPosSet(model, ((radius * sind(angle)) + (frandf() * 20.0f)) - 10, -60.0f, radius * cosd(angle));
Hu3DModelScaleSet(model, 2, 2, 2); Hu3DModelScaleSet(model, 2, 2, 2);
Hu3DModelAttrReset(model, 0x40000002); Hu3DModelAttrReset(model, 0x40000002);
Hu3DModelAttrReset(model, 1); Hu3DModelAttrReset(model, HU3D_ATTR_DISPOFF);
return 1; return 1;
} }
} }
@ -1861,7 +1861,7 @@ void fn_1_8D58(omObjData *object)
case 1003: case 1003:
if (lbl_1_bss_19E < 0) { if (lbl_1_bss_19E < 0) {
lbl_1_bss_19E = MGSeqStartCreate(); lbl_1_bss_19E = MGSeqStartCreate();
Hu3DModelAttrSet(lbl_1_bss_4C->model[2], 1); Hu3DModelAttrSet(lbl_1_bss_4C->model[2], HU3D_ATTR_DISPOFF);
} }
else { else {
if (lbl_1_bss_198 < 0 && (MGSeqStatGet(lbl_1_bss_19E) & 0x10)) { if (lbl_1_bss_198 < 0 && (MGSeqStatGet(lbl_1_bss_19E) & 0x10)) {
@ -1892,7 +1892,7 @@ void fn_1_8D58(omObjData *object)
lbl_1_bss_19C = -1; lbl_1_bss_19C = -1;
lbl_1_bss_19E = MGSeqFinishCreate(); lbl_1_bss_19E = MGSeqFinishCreate();
fn_1_1F58(100); fn_1_1F58(100);
Hu3DModelAttrReset(lbl_1_bss_4C->model[2], 1); Hu3DModelAttrReset(lbl_1_bss_4C->model[2], HU3D_ATTR_DISPOFF);
} }
else { else {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -2006,23 +2006,23 @@ void fn_1_9F40(omObjData *object)
object->work[0] = 1000; object->work[0] = 1000;
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x38)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x38));
Hu3DModelAttrSet(object->model[0], 0x4001); Hu3DModelAttrSet(object->model[0], 0x4001);
Hu3DModelAttrSet(object->model[0], 0x40000002); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[0], 0); Hu3DModelLayerSet(object->model[0], 0);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelShadowMapSet(object->model[0]); Hu3DModelShadowMapSet(object->model[0]);
omSetTra(object, 0, -31, 0); omSetTra(object, 0, -31, 0);
object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x39)); object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x39));
Hu3DModelAttrSet(object->model[1], 0x4001); Hu3DModelAttrSet(object->model[1], 0x4001);
Hu3DModelAttrSet(object->model[1], 0x40000002); Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[1], 0); Hu3DModelLayerSet(object->model[1], 0);
Hu3DModelPosSet(object->model[1], 0, -31, 0); Hu3DModelPosSet(object->model[1], 0, -31, 0);
Hu3DModelAttrReset(object->model[1], 1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x3A)); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x3A));
Hu3DModelAttrSet(object->model[2], 0x4001); Hu3DModelAttrSet(object->model[2], 0x4001);
Hu3DModelAttrSet(object->model[2], 0x40000002); Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[2], 0); Hu3DModelLayerSet(object->model[2], 0);
Hu3DModelPosSet(object->model[2], 0, -31, 0); Hu3DModelPosSet(object->model[2], 0, -31, 0);
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
for (singleNo = 0; singleNo < 1; singleNo++) { for (singleNo = 0; singleNo < 1; singleNo++) {
lbl_1_bss_10[singleNo] = Hu3DModelCreateFile(lbl_1_data_368[singleNo]); lbl_1_bss_10[singleNo] = Hu3DModelCreateFile(lbl_1_data_368[singleNo]);
Hu3DModelAttrSet(lbl_1_bss_10[singleNo], 0x4001); Hu3DModelAttrSet(lbl_1_bss_10[singleNo], 0x4001);
@ -2081,7 +2081,7 @@ void ObjectSetup(void)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
lbl_1_bss_18[i] = 0; lbl_1_bss_18[i] = 0;
lbl_1_bss_12[i] = Hu3DModelCreateFile(lbl_1_data_314[i]); lbl_1_bss_12[i] = Hu3DModelCreateFile(lbl_1_data_314[i]);
Hu3DModelAttrSet(lbl_1_bss_12[i], 1); Hu3DModelAttrSet(lbl_1_bss_12[i], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_12[i], 0x40000003); Hu3DModelAttrSet(lbl_1_bss_12[i], 0x40000003);
} }
for (i = 0; i < 20; i++) { for (i = 0; i < 20; i++) {

28
src/REL/m442Dll/main.c
View file

@ -514,7 +514,7 @@ void fn_1_E88(omObjData *object)
object->motion[var_r29 + var_r28] = CharModelMotionCreate(var_r30->unk_10, var_r30->unk_10 + lbl_1_data_118[var_r28]); object->motion[var_r29 + var_r28] = CharModelMotionCreate(var_r30->unk_10, var_r30->unk_10 + lbl_1_data_118[var_r28]);
} }
Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[0], object->motion[0]);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DMotionOverlaySet(object->model[0], object->motion[7]); Hu3DMotionOverlaySet(object->model[0], object->motion[7]);
CharModelVoiceEnableSet(var_r30->unk_10, object->motion[5], 0); CharModelVoiceEnableSet(var_r30->unk_10, object->motion[5], 0);
object->trans.x = lbl_1_data_120[var_r30->unk_02].x; object->trans.x = lbl_1_data_120[var_r30->unk_02].x;
@ -522,13 +522,13 @@ void fn_1_E88(omObjData *object)
object->trans.z = lbl_1_data_120[var_r30->unk_02].z; object->trans.z = lbl_1_data_120[var_r30->unk_02].z;
object->model[2] = Hu3DParticleCreate(lbl_1_bss_11F00, 0x32); object->model[2] = Hu3DParticleCreate(lbl_1_bss_11F00, 0x32);
Hu3DParticleHookSet(object->model[2], fn_1_7890); Hu3DParticleHookSet(object->model[2], fn_1_7890);
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelLayerSet(object->model[2], 1); Hu3DModelLayerSet(object->model[2], 1);
var_r30->unk_5C = -1; var_r30->unk_5C = -1;
var_r30->unk_40 = -1; var_r30->unk_40 = -1;
object->model[3] = Hu3DHookFuncCreate(fn_1_5EDC); object->model[3] = Hu3DHookFuncCreate(fn_1_5EDC);
Hu3DModelLayerSet(object->model[3], 7); Hu3DModelLayerSet(object->model[3], 7);
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
var_r27 = &Hu3DData[object->model[3]]; var_r27 = &Hu3DData[object->model[3]];
var_r27->unk_120 = var_r30; var_r27->unk_120 = var_r30;
CharModelDataClose(var_r30->unk_10); CharModelDataClose(var_r30->unk_10);
@ -899,7 +899,7 @@ void fn_1_2254(omObjData *object)
else { else {
spC = lbl_1_bss_C9F8[var_r31->unk_48].unk_00; spC = lbl_1_bss_C9F8[var_r31->unk_48].unk_00;
} }
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
if ((fn_1_3AE4(object, &spC) == 1) if ((fn_1_3AE4(object, &spC) == 1)
&& ((var_r31->unk_48 >= 0 && ((var_r31->unk_48 >= 0
&& ((lbl_1_bss_C9F8[var_r31->unk_48].unk_10 == object) || (lbl_1_bss_C9F8[var_r31->unk_48].unk_10 == NULL))) && ((lbl_1_bss_C9F8[var_r31->unk_48].unk_10 == object) || (lbl_1_bss_C9F8[var_r31->unk_48].unk_10 == NULL)))
@ -947,7 +947,7 @@ void fn_1_2254(omObjData *object)
var_r26 = Hu3DData[object->model[2]].unk_120; var_r26 = Hu3DData[object->model[2]].unk_120;
*(s16 *)var_r26 = 0; *(s16 *)var_r26 = 0;
(void)var_r26; (void)var_r26;
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(object->model[2], object->trans.x + (140.0 * sind(object->rot.y)), object->trans.y, Hu3DModelPosSet(object->model[2], object->trans.x + (140.0 * sind(object->rot.y)), object->trans.y,
object->trans.z + (140.0 * cosd(object->rot.y))); object->trans.z + (140.0 * cosd(object->rot.y)));
} }
@ -995,7 +995,7 @@ void fn_1_2254(omObjData *object)
} }
if (var_r31->unk_40 >= 0) { if (var_r31->unk_40 >= 0) {
if (var_r31->unk_0C == 0) { if (var_r31->unk_0C == 0) {
Hu3DModelAttrReset(object->model[3], 1); Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF);
} }
switch (var_r31->unk_40) { switch (var_r31->unk_40) {
case 0: case 0:
@ -1020,7 +1020,7 @@ void fn_1_2254(omObjData *object)
var_r31->unk_42++; var_r31->unk_42++;
} }
else { else {
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
} }
Hu3DModelPosSet(object->model[3], object->trans.x, 300.0f + object->trans.y, object->trans.z); Hu3DModelPosSet(object->model[3], object->trans.x, 300.0f + object->trans.y, object->trans.z);
if ((var_r29 >= 0 && var_r29 != var_r31->unk_30) || var_r28 != var_r31->unk_34) { if ((var_r29 >= 0 && var_r29 != var_r31->unk_30) || var_r28 != var_r31->unk_34) {
@ -1272,8 +1272,8 @@ void fn_1_3C20(omObjData *object)
var_r30 = object->data; var_r30 = object->data;
Hu3DMotionOverlayReset(object->model[0]); Hu3DMotionOverlayReset(object->model[0]);
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
var_r30->unk_3C = 10; var_r30->unk_3C = 10;
object->func = fn_1_3C94; object->func = fn_1_3C94;
} }
@ -1914,12 +1914,12 @@ void fn_1_6D24(omObjData *object)
var_r29->unk_18 = 1.0f; var_r29->unk_18 = 1.0f;
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M442, 0x02)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M442, 0x02));
Hu3DModelLayerSet(object->model[0], 7); Hu3DModelLayerSet(object->model[0], 7);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
object->model[1] = Hu3DParticleCreate(lbl_1_bss_11EFC, 0x64); object->model[1] = Hu3DParticleCreate(lbl_1_bss_11EFC, 0x64);
Hu3DParticleHookSet(object->model[1], fn_1_7EBC); Hu3DParticleHookSet(object->model[1], fn_1_7EBC);
Hu3DModelLayerSet(object->model[1], 7); Hu3DModelLayerSet(object->model[1], 7);
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
for (var_r27 = 0, var_r30 = 1; var_r30 < 24; var_r30++) { for (var_r27 = 0, var_r30 = 1; var_r30 < 24; var_r30++) {
for (var_r28 = 1; var_r28 < 24; var_r28++) { for (var_r28 = 1; var_r28 < 24; var_r28++) {
if (*(lbl_1_bss_11C6D + (var_r30 * 0x19) + var_r28) == 0) { if (*(lbl_1_bss_11C6D + (var_r30 * 0x19) + var_r28) == 0) {
@ -1962,8 +1962,8 @@ void fn_1_72C4(omObjData *object)
switch (var_r31->unk_02) { switch (var_r31->unk_02) {
case 0: case 0:
if (var_r31->unk_00_field0) { if (var_r31->unk_00_field0) {
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[1], 1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
var_r31->unk_02 = 1; var_r31->unk_02 = 1;
var_r31->unk_18 = 0.0f; var_r31->unk_18 = 0.0f;
var_r31->unk_0C = 60; var_r31->unk_0C = 60;

7
src/REL/m443Dll/main.c
View file

@ -8,6 +8,7 @@
#include "game/minigame_seq.h" #include "game/minigame_seq.h"
#include "game/object.h" #include "game/object.h"
#include "game/objsub.h" #include "game/objsub.h"
#include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h" #include "rel_sqrt_consts.h"
@ -630,7 +631,7 @@ void fn_1_2DD8(M443DllUnkStruct *arg0)
arg0->unk_1C[var_r30] = -1; arg0->unk_1C[var_r30] = -1;
if (lbl_1_data_108[var_r30].unk_00 != 0) { if (lbl_1_data_108[var_r30].unk_00 != 0) {
arg0->unk_1C[var_r30] = espEntry(lbl_1_data_108[var_r30].unk_00, lbl_1_data_108[var_r30].unk_04, 0); arg0->unk_1C[var_r30] = espEntry(lbl_1_data_108[var_r30].unk_00, lbl_1_data_108[var_r30].unk_04, 0);
espAttrSet(arg0->unk_1C[var_r30], 8); espAttrSet(arg0->unk_1C[var_r30], HUSPR_ATTR_LINEAR);
espDispOff(arg0->unk_1C[var_r30]); espDispOff(arg0->unk_1C[var_r30]);
} }
} }
@ -840,10 +841,10 @@ void fn_1_3770(omObjData *arg0)
break; break;
} }
if (var_r24 != 0) { if (var_r24 != 0) {
Hu3DModelAttrReset(arg0->model[0], 1); Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrSet(arg0->model[0], 1); Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
} }
for (var_r30 = 0; var_r30 < 4; var_r30++) { for (var_r30 = 0; var_r30 < 4; var_r30++) {
sp30[var_r30] = var_r28[var_r30 + 6].unk_04; sp30[var_r30] = var_r28[var_r30 + 6].unk_04;

8
src/REL/m443Dll/map.c
View file

@ -29,7 +29,7 @@ void fn_1_4AB4(omObjData *object)
Hu3DModelLayerSet(object->model[0], 2); Hu3DModelLayerSet(object->model[0], 2);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M443, 2)); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M443, 2));
Hu3DModelLayerSet(object->model[2], 2); Hu3DModelLayerSet(object->model[2], 2);
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M443, 4)); object->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M443, 4));
Hu3DModelLayerSet(object->model[3], 2); Hu3DModelLayerSet(object->model[3], 2);
Hu3DMotionSpeedSet(object->model[3], 0.0f); Hu3DMotionSpeedSet(object->model[3], 0.0f);
@ -148,7 +148,7 @@ void fn_1_4D14(omObjData *object)
} }
Hu3DMotionSpeedSet(object->model[var_r29 + 9], 0.95f); Hu3DMotionSpeedSet(object->model[var_r29 + 9], 0.95f);
if (var_r28 == 0) { if (var_r28 == 0) {
Hu3DModelAttrSet(object->model[var_r29 + 9], 1); Hu3DModelAttrSet(object->model[var_r29 + 9], HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -172,10 +172,10 @@ void fn_1_4D14(omObjData *object)
Hu3DMotionSpeedSet(object->model[3], 1.0f); Hu3DMotionSpeedSet(object->model[3], 1.0f);
} }
else if (fn_1_42E4() == 5) { else if (fn_1_42E4() == 5) {
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
} }
if (fn_1_42E4() == 5) { if (fn_1_42E4() == 5) {
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelShadowMapSet(object->model[0]); Hu3DModelShadowMapSet(object->model[0]);
Hu3DModelShadowMapSet(object->model[2]); Hu3DModelShadowMapSet(object->model[2]);
} }

443
src/REL/m443Dll/player.c
View file

@ -75,8 +75,8 @@ typedef struct M443DllWorkStruct {
Vec unkDC; Vec unkDC;
Vec unkE8; Vec unkE8;
char unkF4[0xC]; char unkF4[0xC];
M443DllCameraStruct* unk100; M443DllCameraStruct *unk100;
M443DllCameraStruct* unk104; M443DllCameraStruct *unk104;
union { union {
M443DllUnkStruct unk108s; M443DllUnkStruct unk108s;
struct { struct {
@ -94,88 +94,81 @@ typedef struct M443DllStruct8 {
u32 unk10; u32 unk10;
} M443DllStruct8; // copy of UnkM417Struct8 } M443DllStruct8; // copy of UnkM417Struct8
void fn_1_5680(omObjData* object); void fn_1_5680(omObjData *object);
void fn_1_5BD4(omObjData* object); void fn_1_5BD4(omObjData *object);
void fn_1_6458(omObjData* object); void fn_1_6458(omObjData *object);
void fn_1_6674(omObjData* object); void fn_1_6674(omObjData *object);
void fn_1_6750(omObjData* object); void fn_1_6750(omObjData *object);
void fn_1_69B4(omObjData* object); void fn_1_69B4(omObjData *object);
void fn_1_6B90(omObjData* object); void fn_1_6B90(omObjData *object);
void fn_1_6DA8(omObjData* object); void fn_1_6DA8(omObjData *object);
void fn_1_7130(omObjData* object); void fn_1_7130(omObjData *object);
void fn_1_7340(omObjData* object); void fn_1_7340(omObjData *object);
void fn_1_8138(omObjData*, u32); void fn_1_8138(omObjData *, u32);
s32 fn_1_82C4(omObjData* object); s32 fn_1_82C4(omObjData *object);
void fn_1_8508(omObjData*); void fn_1_8508(omObjData *);
void fn_1_8680(omObjData* object); void fn_1_8680(omObjData *object);
f32 fn_1_8AC8(u32, f32); f32 fn_1_8AC8(u32, f32);
f32 fn_1_8C68(f32); f32 fn_1_8C68(f32);
f32 fn_1_8C8C(s32, f32); f32 fn_1_8C8C(s32, f32);
f32 fn_1_8D00(u32, f32); f32 fn_1_8D00(u32, f32);
f32 fn_1_8D74(f32); f32 fn_1_8D74(f32);
void fn_1_8E34(s32); void fn_1_8E34(s32);
void fn_1_8FFC(u32, Vec*, f32, f32); void fn_1_8FFC(u32, Vec *, f32, f32);
void fn_1_95A4(u32); void fn_1_95A4(u32);
omObjData* lbl_1_bss_90[4]; omObjData *lbl_1_bss_90[4];
s32 lbl_1_bss_78[6]; s32 lbl_1_bss_78[6];
char* lbl_1_data_264[0x8] = { char *lbl_1_data_264[0x8] = { "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r" };
"itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r",
"itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r"
};
u32 lbl_1_data_284[8][2] = { u32 lbl_1_data_284[8][2] = {
{0x4A0005, 0x4A0006}, {0x4A0007, 0x4A0008}, { 0x4A0005, 0x4A0006 },
{0x4A0009, 0x4A000A}, {0x4A000B, 0x4A000C}, { 0x4A0007, 0x4A0008 },
{0x4A000D, 0x4A000E}, {0x4A000F, 0x4A0010}, { 0x4A0009, 0x4A000A },
{0x4A0011, 0x4A0012}, {0x4A0013, 0x4A0014}, { 0x4A000B, 0x4A000C },
}; { 0x4A000D, 0x4A000E },
u32 lbl_1_data_2C4[4] = { { 0x4A000F, 0x4A0010 },
0, 0x4A0020, 0x17, 0x72 { 0x4A0011, 0x4A0012 },
{ 0x4A0013, 0x4A0014 },
}; };
u32 lbl_1_data_2C4[4] = { 0, 0x4A0020, 0x17, 0x72 };
M443DllStruct8 lbl_1_data_2D4[4] = { M443DllStruct8 lbl_1_data_2D4[4] = { { 0x0, 0.2f, 0.0f, -1.0f, 0x40000001 }, { 0x1, 0.2f, 0.0f, -1.0f, 0x40000001 }, { 0x2, 0.2f, 0.0f, -1.0f, 0x0 },
{ 0x0, 0.2f, 0.0f, -1.0f, 0x40000001 }, { 0x3, 0.2f, 0.0f, -1.0f, 0x0 } };
{ 0x1, 0.2f, 0.0f, -1.0f, 0x40000001 },
{ 0x2, 0.2f, 0.0f, -1.0f, 0x0 },
{ 0x3, 0.2f, 0.0f, -1.0f, 0x0 }
};
s32 lbl_1_data_324[4] = { s32 lbl_1_data_324[4] = {
0x727, 0x728, 0x729, 0x72A, 0x727,
0x728,
0x729,
0x72A,
}; };
s32 lbl_1_data_334[4] = { s32 lbl_1_data_334[4] = {
0x72B, 0x72C, 0x72D, 0x72E, 0x72B,
0x72C,
0x72D,
0x72E,
}; };
s32 lbl_1_data_344[4] = { s32 lbl_1_data_344[4] = {
0x72F, 0x730, 0x731, 0x732, 0x72F,
0x730,
0x731,
0x732,
}; };
s32 lbl_1_data_354[4] = { s32 lbl_1_data_354[4] = {
0x736, 0x737, 0x738, 0x739, 0x736,
}; 0x737,
Vec lbl_1_data_364[4] = { 0x738,
{ 0.0f, 180.0f, 500.0f }, 0x739,
{ -150.0f, 110.0f, 500.0f },
{ 170.0f, 80.0f, 500.0f },
{ 350.0f, 0.0f, 500.0f }
};
Vec lbl_1_data_394[4] = {
{ -225.0f, 0.0f, 1000.0f },
{ -75.0f, 0.0f, 1000.0f },
{ 75.0f, 0.0f, 1000.0f },
{ 225.0f, 0.0f, 1000.0f }
};
Vec lbl_1_data_3C4[4] = {
{ 250.0f, 0.0f, -1000.0f },
{ -350.0f, 0.0f, -1700.0f },
{ 450.0f, 0.0f, -2200.0f },
{ 0.0f, 0.0f, -3000.0f }
}; };
Vec lbl_1_data_364[4] = { { 0.0f, 180.0f, 500.0f }, { -150.0f, 110.0f, 500.0f }, { 170.0f, 80.0f, 500.0f }, { 350.0f, 0.0f, 500.0f } };
Vec lbl_1_data_394[4] = { { -225.0f, 0.0f, 1000.0f }, { -75.0f, 0.0f, 1000.0f }, { 75.0f, 0.0f, 1000.0f }, { 225.0f, 0.0f, 1000.0f } };
Vec lbl_1_data_3C4[4] = { { 250.0f, 0.0f, -1000.0f }, { -350.0f, 0.0f, -1700.0f }, { 450.0f, 0.0f, -2200.0f }, { 0.0f, 0.0f, -3000.0f } };
void fn_1_5444(Process* arg0) { void fn_1_5444(Process *arg0)
{
u32 sp18[4]; u32 sp18[4];
u32 sp8[4]; u32 sp8[4];
omObjData* var_r28; omObjData *var_r28;
u32 var_r29; u32 var_r29;
s16 var_r30; s16 var_r30;
s16 var_r31; s16 var_r31;
@ -184,7 +177,7 @@ void fn_1_5444(Process* arg0) {
sp18[var_r31] = GWPlayerCfg[var_r31].group; sp18[var_r31] = GWPlayerCfg[var_r31].group;
sp8[var_r31] = var_r31; sp8[var_r31] = var_r31;
} }
for (var_r31 = 0; var_r31 < 3; var_r31++) { for (var_r31 = 0; var_r31 < 3; var_r31++) {
for (var_r30 = var_r31 + 1; var_r30 < 4; var_r30++) { for (var_r30 = var_r31 + 1; var_r30 < 4; var_r30++) {
if (sp18[var_r31] > sp18[var_r30]) { if (sp18[var_r31] > sp18[var_r30]) {
@ -197,33 +190,35 @@ void fn_1_5444(Process* arg0) {
} }
} }
} }
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
lbl_1_bss_78[sp8[var_r31]] = (s16)var_r31; lbl_1_bss_78[sp8[var_r31]] = (s16)var_r31;
} }
omMakeGroupEx(arg0, 0, 4); omMakeGroupEx(arg0, 0, 4);
omGetGroupMemberListEx(arg0, 0); omGetGroupMemberListEx(arg0, 0);
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
var_r28 = lbl_1_bss_90[var_r31] = omAddObjEx(arg0, 0x28, 5, 4, 0, fn_1_5680); var_r28 = lbl_1_bss_90[var_r31] = omAddObjEx(arg0, 0x28, 5, 4, 0, fn_1_5680);
var_r28->work[0] = var_r31; var_r28->work[0] = var_r31;
} }
} }
void fn_1_565C(void) { void fn_1_565C(void)
{
CharModelKill(-1); CharModelKill(-1);
} }
void fn_1_5680(omObjData* object) { void fn_1_5680(omObjData *object)
f32 spC[4] = {0.25f, 0.5f, 0.75f, 1.0f}; {
f32 spC[4] = { 0.25f, 0.5f, 0.75f, 1.0f };
s32 sp8; s32 sp8;
f32 temp_f0; f32 temp_f0;
s32 temp_r27; s32 temp_r27;
s32 temp_r3; s32 temp_r3;
s32 var_r29; s32 var_r29;
u32 temp_r25; u32 temp_r25;
M443DllWorkStruct* temp_r31; M443DllWorkStruct *temp_r31;
HsfanimStruct01* var_r28; HsfanimStruct01 *var_r28;
object->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x134, MEMORY_DEFAULT_NUM); object->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x134, MEMORY_DEFAULT_NUM);
temp_r31 = object->data; temp_r31 = object->data;
@ -244,32 +239,33 @@ void fn_1_5680(omObjData* object) {
object->model[2] = Hu3DModelCreateFile(lbl_1_data_284[temp_r27][1]); object->model[2] = Hu3DModelCreateFile(lbl_1_data_284[temp_r27][1]);
Hu3DModelLayerSet(object->model[2], 4); Hu3DModelLayerSet(object->model[2], 4);
Hu3DMotionSpeedSet(object->model[2], 0.0f); Hu3DMotionSpeedSet(object->model[2], 0.0f);
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
for (var_r29 = 0; var_r29 < 4; var_r29++) { for (var_r29 = 0; var_r29 < 4; var_r29++) {
if (lbl_1_data_2C4[var_r29] < 0x10000) { if (lbl_1_data_2C4[var_r29] < 0x10000) {
object->motion[var_r29] = CharModelMotionCreate(temp_r27, lbl_1_data_2C4[var_r29]); object->motion[var_r29] = CharModelMotionCreate(temp_r27, lbl_1_data_2C4[var_r29]);
} else { }
object->motion[var_r29] = Hu3DJointMotion(object->model[0], HuDataSelHeapReadNum(temp_r27 + lbl_1_data_2C4[var_r29], 0x10000000, HEAP_DATA)); else {
object->motion[var_r29]
= Hu3DJointMotion(object->model[0], HuDataSelHeapReadNum(temp_r27 + lbl_1_data_2C4[var_r29], 0x10000000, HEAP_DATA));
} }
} }
CharModelMotionDataClose(temp_r27); CharModelMotionDataClose(temp_r27);
temp_r3 = Hu3DParticleCreate(HuSprAnimReadFile(0x4A001D), 0xC8); temp_r3 = Hu3DParticleCreate(HuSprAnimReadFile(0x4A001D), 0xC8);
object->model[3] = temp_r3; object->model[3] = temp_r3;
Hu3DModelLayerSet(temp_r3, 4); Hu3DModelLayerSet(temp_r3, 4);
var_r28 = ((ParticleData*)Hu3DData[temp_r3].unk_120)->unk_48; var_r28 = ((ParticleData *)Hu3DData[temp_r3].unk_120)->unk_48;
for (var_r29 = 0; var_r29 < 0xC8; var_r29++, var_r28++) { for (var_r29 = 0; var_r29 < 0xC8; var_r29++, var_r28++) {
var_r28->unk2C = 0.0f; var_r28->unk2C = 0.0f;
var_r28->unk40.a = 0; var_r28->unk40.a = 0;
var_r28->unk00 = 0; var_r28->unk00 = 0;
} }
object->trans.x = temp_r31->unkC4.x = temp_r31->unkDC.x = (100.0f * (4.0f * object->work[0])) - 600.0f; object->trans.x = temp_r31->unkC4.x = temp_r31->unkDC.x = (100.0f * (4.0f * object->work[0])) - 600.0f;
object->trans.y = temp_r31->unkC4.y = temp_r31->unkDC.y = 0.0f; object->trans.y = temp_r31->unkC4.y = temp_r31->unkDC.y = 0.0f;
object->trans.z = temp_r31->unkC4.z = temp_r31->unkDC.z = 0.0f; object->trans.z = temp_r31->unkC4.z = temp_r31->unkDC.z = 0.0f;
temp_r31->unkD0.x = temp_r31->unkD0.y = temp_r31->unkD0.z = 0.0f; temp_r31->unkD0.x = temp_r31->unkD0.y = temp_r31->unkD0.z = 0.0f;
temp_r31->unkE8.x = temp_r31->unkE8.y = temp_r31->unkE8.z = 0.0f; temp_r31->unkE8.x = temp_r31->unkE8.y = temp_r31->unkE8.z = 0.0f;
temp_r31->unk48 = temp_r31->unk4C = 0.0f; temp_r31->unk48 = temp_r31->unk4C = 0.0f;
@ -300,12 +296,13 @@ void fn_1_5680(omObjData* object) {
object->func = fn_1_5BD4; object->func = fn_1_5BD4;
} }
void fn_1_5BD4(omObjData* object) { void fn_1_5BD4(omObjData *object)
{
Vec sp8; Vec sp8;
f32 var_f29; f32 var_f29;
f32 var_f30; f32 var_f30;
f32 var_f31; f32 var_f31;
M443DllWorkStruct* temp_r31; M443DllWorkStruct *temp_r31;
temp_r31 = object->data; temp_r31 = object->data;
temp_r31->unk10 = 0; temp_r31->unk10 = 0;
@ -314,7 +311,8 @@ void fn_1_5BD4(omObjData* object) {
if (temp_r31->unk108 != 0) { if (temp_r31->unk108 != 0) {
if (temp_r31->unk24 != 0) { if (temp_r31->unk24 != 0) {
fn_1_6DA8(object); fn_1_6DA8(object);
} else { }
else {
temp_r31->unk14 = HuPadBtn[GWPlayerCfg[object->work[0]].pad_idx]; temp_r31->unk14 = HuPadBtn[GWPlayerCfg[object->work[0]].pad_idx];
temp_r31->unk10 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx]; temp_r31->unk10 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx];
var_f29 = HuPadTrigR[GWPlayerCfg[object->work[0]].pad_idx]; var_f29 = HuPadTrigR[GWPlayerCfg[object->work[0]].pad_idx];
@ -361,7 +359,7 @@ void fn_1_5BD4(omObjData* object) {
sp8.y = 240.0 + (120.0 * (var_f31 * sin(M_PI * ((450.0f * var_f31) + (90.0f * object->work[0])) / 180.0))); sp8.y = 240.0 + (120.0 * (var_f31 * sin(M_PI * ((450.0f * var_f31) + (90.0f * object->work[0])) / 180.0)));
temp_r31->unk100->unk_44 = sp8.x + (var_f30 * (temp_r31->unk100->unk_78 - sp8.x)); temp_r31->unk100->unk_44 = sp8.x + (var_f30 * (temp_r31->unk100->unk_78 - sp8.x));
temp_r31->unk100->unk_48 = sp8.y + (var_f30 * (temp_r31->unk100->unk_7C - sp8.y)); temp_r31->unk100->unk_48 = sp8.y + (var_f30 * (temp_r31->unk100->unk_7C - sp8.y));
temp_r31->unk100->unk_40 = 0.01f + ((temp_r31->unk100->unk_80 - 0.01f) * var_f31); temp_r31->unk100->unk_40 = 0.01f + ((temp_r31->unk100->unk_80 - 0.01f) * var_f31);
temp_r31->unk100->unk_28.y = 90.0f + ((temp_r31->unk100->unk_70 - 90.0f) * var_f31); temp_r31->unk100->unk_28.y = 90.0f + ((temp_r31->unk100->unk_70 - 90.0f) * var_f31);
temp_r31->unk100->unk_34 = 500.0f + (-200.0f * var_f30); temp_r31->unk100->unk_34 = 500.0f + (-200.0f * var_f30);
if (var_f31 >= 1.0f) { if (var_f31 >= 1.0f) {
@ -379,7 +377,7 @@ void fn_1_5BD4(omObjData* object) {
var_f31 = 0.2f; var_f31 = 0.2f;
} }
temp_r31->unk100->unk_28.x = fn_1_488C(temp_r31->unk100->unk_28.x, -12.0f, var_f31); temp_r31->unk100->unk_28.x = fn_1_488C(temp_r31->unk100->unk_28.x, -12.0f, var_f31);
temp_r31->unk100->unk_28.y = fn_1_488C(temp_r31->unk100->unk_28.y, 0.0f, var_f31); temp_r31->unk100->unk_28.y = fn_1_488C(temp_r31->unk100->unk_28.y, 0.0f, var_f31);
temp_r31->unk100->unk_34 += ((1000.0f - temp_r31->unk100->unk_34) * (0.5f * var_f31)); temp_r31->unk100->unk_34 += ((1000.0f - temp_r31->unk100->unk_34) * (0.5f * var_f31));
break; break;
} }
@ -387,7 +385,7 @@ void fn_1_5BD4(omObjData* object) {
PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4);
fn_1_7130(object); fn_1_7130(object);
fn_1_69B4(object); fn_1_69B4(object);
if (fn_1_42CC() == 2) { if (fn_1_42CC() == 2) {
temp_r31->unk100->unk_1C = temp_r31->unkDC; temp_r31->unk100->unk_1C = temp_r31->unkDC;
temp_r31->unk100->unk_1C.y += 150.0f; temp_r31->unk100->unk_1C.y += 150.0f;
@ -400,11 +398,12 @@ void fn_1_5BD4(omObjData* object) {
} }
} }
void fn_1_6458(omObjData* object) { void fn_1_6458(omObjData *object)
{
f32 var_f31; f32 var_f31;
s32 var_r29; s32 var_r29;
M443DllWorkStruct* temp_r31; M443DllWorkStruct *temp_r31;
void* temp_r4; void *temp_r4;
temp_r31 = object->data; temp_r31 = object->data;
var_r29 = 0; var_r29 = 0;
@ -413,7 +412,8 @@ void fn_1_6458(omObjData* object) {
temp_r31->unk18 = 0.0f; temp_r31->unk18 = 0.0f;
if (temp_r31->unk24 != 0) { if (temp_r31->unk24 != 0) {
fn_1_6DA8(object); fn_1_6DA8(object);
} else { }
else {
temp_r31->unk14 = HuPadBtn[GWPlayerCfg[object->work[0]].pad_idx]; temp_r31->unk14 = HuPadBtn[GWPlayerCfg[object->work[0]].pad_idx];
temp_r31->unk10 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx]; temp_r31->unk10 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx];
var_f31 = HuPadTrigR[GWPlayerCfg[object->work[0]].pad_idx]; var_f31 = HuPadTrigR[GWPlayerCfg[object->work[0]].pad_idx];
@ -441,9 +441,10 @@ void fn_1_6458(omObjData* object) {
} }
} }
void fn_1_6674(omObjData* object) { void fn_1_6674(omObjData *object)
M443DllWorkStruct* temp_r31; {
void* temp_r4; M443DllWorkStruct *temp_r31;
void *temp_r4;
temp_r31 = object->data; temp_r31 = object->data;
temp_r31->unk10 = 0; temp_r31->unk10 = 0;
@ -462,8 +463,9 @@ void fn_1_6674(omObjData* object) {
} }
} }
void fn_1_6750(omObjData* object) { void fn_1_6750(omObjData *object)
M443DllWorkStruct* temp_r31; {
M443DllWorkStruct *temp_r31;
temp_r31 = object->data; temp_r31 = object->data;
PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4);
@ -471,8 +473,8 @@ void fn_1_6750(omObjData* object) {
fn_1_69B4(object); fn_1_69B4(object);
switch (temp_r31->unk34) { switch (temp_r31->unk34) {
case 0: case 0:
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[3], 1); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
fn_1_95A4(object->work[0]); fn_1_95A4(object->work[0]);
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
temp_r31->unk8 = -1; temp_r31->unk8 = -1;
@ -481,8 +483,9 @@ void fn_1_6750(omObjData* object) {
temp_r31->unkC4 = lbl_1_data_364[fn_1_4368(object->work[0])]; temp_r31->unkC4 = lbl_1_data_364[fn_1_4368(object->work[0])];
temp_r31->unkDC = lbl_1_data_3C4[fn_1_4368(object->work[0])]; temp_r31->unkDC = lbl_1_data_3C4[fn_1_4368(object->work[0])];
temp_r31->unk58 = 30.0f; temp_r31->unk58 = 30.0f;
} else { }
Hu3DModelAttrSet(object->model[1], 1); else {
Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
temp_r31->unkC4 = lbl_1_data_394[object->work[0]]; temp_r31->unkC4 = lbl_1_data_394[object->work[0]];
} }
temp_r31->unk34++; temp_r31->unk34++;
@ -499,7 +502,8 @@ void fn_1_6750(omObjData* object) {
if (fn_1_42FC() == 1) { if (fn_1_42FC() == 1) {
if (fn_1_4368(object->work[0]) == 0) { if (fn_1_4368(object->work[0]) == 0) {
fn_1_8138(object, 2); fn_1_8138(object, 2);
} else { }
else {
fn_1_8138(object, 3); fn_1_8138(object, 3);
} }
temp_r31->unk34++; temp_r31->unk34++;
@ -514,8 +518,9 @@ void fn_1_6750(omObjData* object) {
} }
} }
void fn_1_69B4(omObjData* object) { void fn_1_69B4(omObjData *object)
M443DllWorkStruct* temp_r31; {
M443DllWorkStruct *temp_r31;
temp_r31 = object->data; temp_r31 = object->data;
temp_r31->unk40++; temp_r31->unk40++;
@ -533,10 +538,11 @@ void fn_1_69B4(omObjData* object) {
if (temp_r31->unk20 == 0) { if (temp_r31->unk20 == 0) {
Hu3DModelHookSet(object->model[1], "hook", object->model[0]); Hu3DModelHookSet(object->model[1], "hook", object->model[0]);
} }
temp_r31->unkDC.z = temp_r31->unkC4.z= -(temp_r31->unk78 - temp_r31->unkBC); temp_r31->unkDC.z = temp_r31->unkC4.z = -(temp_r31->unk78 - temp_r31->unkBC);
fn_1_8138(object, 1); fn_1_8138(object, 1);
} else { }
else {
if (temp_r31->unk20 != 0) { if (temp_r31->unk20 != 0) {
Hu3DModelHookReset(object->model[1]); Hu3DModelHookReset(object->model[1]);
} }
@ -550,18 +556,17 @@ void fn_1_69B4(omObjData* object) {
Hu3DModelRotSet(object->model[2], 0.0f, temp_r31->unk58, 0.0f); Hu3DModelRotSet(object->model[2], 0.0f, temp_r31->unk58, 0.0f);
} }
void fn_1_6B90(omObjData* object) { void fn_1_6B90(omObjData *object)
M443DllWorkStruct* temp_r29; {
M443DllWorkStruct* temp_r27 = object->data; M443DllWorkStruct *temp_r29;
M443DllWorkStruct *temp_r27 = object->data;
s32 sp28[4][4] = { s32 sp28[4][4] = {
{ 0, 1, 2, 3 }, { 0, 1, 2, 3 },
{ 1, 0, 1, 2 }, { 1, 0, 1, 2 },
{ 2, 1, 0, 1 }, { 2, 1, 0, 1 },
{ 3, 2, 1, 0 }, { 3, 2, 1, 0 },
}; };
f32 sp18[4] = { f32 sp18[4] = { 0.0f, -700.0f, 600.0f, 1200.0f };
0.0f, -700.0f, 600.0f, 1200.0f
};
s32 sp14; s32 sp14;
s32 sp10; s32 sp10;
s32 spC; s32 spC;
@ -571,7 +576,7 @@ void fn_1_6B90(omObjData* object) {
u32 var_r30; u32 var_r30;
var_r28 = sp8[object->work[0]] | 1; var_r28 = sp8[object->work[0]] | 1;
for (var_r30 = 0; var_r30 < 4; var_r30++) { for (var_r30 = 0; var_r30 < 4; var_r30++) {
if (var_r30 != object->work[0]) { if (var_r30 != object->work[0]) {
temp_r29 = lbl_1_bss_90[var_r30]->data; temp_r29 = lbl_1_bss_90[var_r30]->data;
@ -591,9 +596,10 @@ void fn_1_6B90(omObjData* object) {
fn_1_421C(object->model[3], var_r28); fn_1_421C(object->model[3], var_r28);
} }
void fn_1_6DA8(omObjData* object) { void fn_1_6DA8(omObjData *object)
{
f32 var_f31; f32 var_f31;
M443DllWorkStruct* temp_r31; M443DllWorkStruct *temp_r31;
temp_r31 = object->data; temp_r31 = object->data;
switch (temp_r31->unk60) { switch (temp_r31->unk60) {
@ -611,7 +617,7 @@ void fn_1_6DA8(omObjData* object) {
temp_r31->unk18 = 1.0f; temp_r31->unk18 = 1.0f;
} }
if (temp_r31->unkA0 >= 1.0f) { if (temp_r31->unkA0 >= 1.0f) {
temp_r31->unk60 = (s32) (temp_r31->unk60 + 1); temp_r31->unk60 = (s32)(temp_r31->unk60 + 1);
} }
break; break;
case 2: case 2:
@ -622,7 +628,8 @@ void fn_1_6DA8(omObjData* object) {
var_f31 = 1.2f - temp_r31->unk5C; var_f31 = 1.2f - temp_r31->unk5C;
var_f31 *= (0.5f + 0.0005f * frandmod(0x3E8)); var_f31 *= (0.5f + 0.0005f * frandmod(0x3E8));
temp_r31->unk6C = 8000.0f - 1500.0f * var_f31; temp_r31->unk6C = 8000.0f - 1500.0f * var_f31;
} else { }
else {
var_f31 = 1.2f - temp_r31->unk5C; var_f31 = 1.2f - temp_r31->unk5C;
var_f31 *= (0.5f + 0.0005f * frandmod(0x3E8)); var_f31 *= (0.5f + 0.0005f * frandmod(0x3E8));
temp_r31->unk70 = 0.016666668f + var_f31; temp_r31->unk70 = 0.016666668f + var_f31;
@ -631,15 +638,16 @@ void fn_1_6DA8(omObjData* object) {
temp_r31->unk68 = temp_r31->unk80; temp_r31->unk68 = temp_r31->unk80;
if (temp_r31->unk6C > 0.0f) { if (temp_r31->unk6C > 0.0f) {
if (temp_r31->unk88 > temp_r31->unk6C) { if (temp_r31->unk88 > temp_r31->unk6C) {
temp_r31->unk10 = (s32) (temp_r31->unk10 | 0x100); temp_r31->unk10 = (s32)(temp_r31->unk10 | 0x100);
temp_r31->unk6C = 0.0f; temp_r31->unk6C = 0.0f;
break; break;
} }
} else if (temp_r31->unk70 > 0.0f) { }
else if (temp_r31->unk70 > 0.0f) {
if (temp_r31->unk88 >= 8000.0f) { if (temp_r31->unk88 >= 8000.0f) {
temp_r31->unk70 = (temp_r31->unk70 - 0.016666668f); temp_r31->unk70 = (temp_r31->unk70 - 0.016666668f);
if (temp_r31->unk70 <= 0.0f) { if (temp_r31->unk70 <= 0.0f) {
temp_r31->unk10 = (s32) (temp_r31->unk10 | 0x100); temp_r31->unk10 = (s32)(temp_r31->unk10 | 0x100);
temp_r31->unk70 = 0.0f; temp_r31->unk70 = 0.0f;
} }
} }
@ -648,20 +656,20 @@ void fn_1_6DA8(omObjData* object) {
} }
} }
void fn_1_7130(omObjData* object) { void fn_1_7130(omObjData *object)
{
Vec sp8; Vec sp8;
f32 var_f31; f32 var_f31;
s32 var_r27; s32 var_r27;
s32 var_r29; s32 var_r29;
s32 var_r28; s32 var_r28;
M443DllWorkStruct* temp_r30; M443DllWorkStruct *temp_r30;
M443DllWorkStruct* temp_r31; M443DllWorkStruct *temp_r31;
for (var_r27 = 0; var_r27 < 2; var_r27++) { for (var_r27 = 0; var_r27 < 2; var_r27++) {
for (var_r29 = 0; var_r29 < 4; var_r29++) { for (var_r29 = 0; var_r29 < 4; var_r29++) {
temp_r31 = lbl_1_bss_90[var_r29]->data; temp_r31 = lbl_1_bss_90[var_r29]->data;
for (var_r28 = 0; var_r28 < 4; var_r28++) { for (var_r28 = 0; var_r28 < 4; var_r28++) {
if (var_r29 != var_r28) { if (var_r29 != var_r28) {
temp_r30 = lbl_1_bss_90[var_r28]->data; temp_r30 = lbl_1_bss_90[var_r28]->data;
@ -671,7 +679,8 @@ void fn_1_7130(omObjData* object) {
if (var_f31 < (temp_r31->unkC0 + temp_r30->unkC0)) { if (var_f31 < (temp_r31->unkC0 + temp_r30->unkC0)) {
if (var_f31 > 0.0f) { if (var_f31 > 0.0f) {
var_f31 = 0.5f * ((temp_r31->unkC0 + temp_r30->unkC0) - var_f31); var_f31 = 0.5f * ((temp_r31->unkC0 + temp_r30->unkC0) - var_f31);
} else { }
else {
var_f31 = 0.5f * (temp_r31->unkC0 + temp_r30->unkC0); var_f31 = 0.5f * (temp_r31->unkC0 + temp_r30->unkC0);
sp8.x = (frandmod(0x3E8) - 0x1F4); sp8.x = (frandmod(0x3E8) - 0x1F4);
sp8.z = (frandmod(0x3E8) - 0x1F4); sp8.z = (frandmod(0x3E8) - 0x1F4);
@ -690,13 +699,11 @@ void fn_1_7130(omObjData* object) {
} }
} }
void fn_1_7340(omObjData* object) { void fn_1_7340(omObjData *object)
M443DllWorkStruct* temp_r31 = object->data; {
HsfObject* var_r29; M443DllWorkStruct *temp_r31 = object->data;
f32 sp28[8] = { HsfObject *var_r29;
0.0f, 40.0f, 0.0f, 0.0f, f32 sp28[8] = { 0.0f, 40.0f, 0.0f, 0.0f, -16.0f, 40.0f, -16.0f, 0.0f };
-16.0f, 40.0f, -16.0f, 0.0f
};
f32 var_f31; f32 var_f31;
f32 var_f29; f32 var_f29;
u32 temp_r24; u32 temp_r24;
@ -711,16 +718,19 @@ void fn_1_7340(omObjData* object) {
temp_r31->unk80++; temp_r31->unk80++;
temp_r31->unk84 = 30; temp_r31->unk84 = 30;
} }
} else { }
else {
if (temp_r31->unk88 >= 8000.0f) { if (temp_r31->unk88 >= 8000.0f) {
temp_r31->unk10C = 1; temp_r31->unk10C = 1;
} }
} }
} else { }
else {
temp_r31->unk84--; temp_r31->unk84--;
} }
} }
} else if ((temp_r31->unk88 < 1500.0f) && (temp_r31->unk80 != 0)) { }
else if ((temp_r31->unk88 < 1500.0f) && (temp_r31->unk80 != 0)) {
temp_r31->unk80--; temp_r31->unk80--;
temp_r31->unk84 = 30; temp_r31->unk84 = 30;
} }
@ -756,7 +766,8 @@ void fn_1_7340(omObjData* object) {
if (temp_r31->unk88 > 9500.0f) { if (temp_r31->unk88 > 9500.0f) {
temp_r31->unk88 = 9000.0f; temp_r31->unk88 = 9000.0f;
temp_r31->unk90 = fn_1_8C8C(temp_r31->unk80, temp_r31->unk88); temp_r31->unk90 = fn_1_8C8C(temp_r31->unk80, temp_r31->unk88);
} else if (temp_r31->unk88 < 1000.0f) { }
else if (temp_r31->unk88 < 1000.0f) {
temp_r31->unk88 = 1000.0f; temp_r31->unk88 = 1000.0f;
temp_r31->unk90 = fn_1_8C8C(temp_r31->unk80, temp_r31->unk88); temp_r31->unk90 = fn_1_8C8C(temp_r31->unk80, temp_r31->unk88);
} }
@ -779,7 +790,8 @@ void fn_1_7340(omObjData* object) {
if (temp_r31->unkA0 < 0.0001f) { if (temp_r31->unkA0 < 0.0001f) {
temp_r31->unkA0 = 0.0001f; temp_r31->unkA0 = 0.0001f;
} }
} else { }
else {
temp_r31->unkA0 = 1.0f; temp_r31->unkA0 = 1.0f;
} }
} }
@ -851,7 +863,8 @@ void fn_1_7340(omObjData* object) {
} }
HuAudFXVolSet(temp_r31->unkA8, var_f31); HuAudFXVolSet(temp_r31->unkA8, var_f31);
} }
} else if (fn_1_42E4() <= 2) { }
else if (fn_1_42E4() <= 2) {
if (temp_r31->unkA8 < 0) { if (temp_r31->unkA8 < 0) {
temp_r31->unkA8 = HuAudFXPlay(lbl_1_data_344[object->work[0]]); temp_r31->unkA8 = HuAudFXPlay(lbl_1_data_344[object->work[0]]);
} }
@ -863,7 +876,8 @@ void fn_1_7340(omObjData* object) {
} }
HuAudFXVolSet(temp_r31->unkA8, var_f31); HuAudFXVolSet(temp_r31->unkA8, var_f31);
} }
} else if (temp_r31->unkA8 >= 0) { }
else if (temp_r31->unkA8 >= 0) {
HuAudFXStop(temp_r31->unkA8); HuAudFXStop(temp_r31->unkA8);
temp_r31->unkA8 = -1; temp_r31->unkA8 = -1;
} }
@ -885,9 +899,10 @@ void fn_1_7340(omObjData* object) {
} }
} }
void fn_1_8138(omObjData* object, u32 arg1) { // near replica of fn_1_B8A0 of m417Dll void fn_1_8138(omObjData *object, u32 arg1)
{ // near replica of fn_1_B8A0 of m417Dll
f32 var_f31; f32 var_f31;
M443DllWorkStruct* temp_r30; M443DllWorkStruct *temp_r30;
temp_r30 = object->data; temp_r30 = object->data;
if ((temp_r30->unk8 != arg1) && (arg1 < 4)) { if ((temp_r30->unk8 != arg1) && (arg1 < 4)) {
@ -896,16 +911,18 @@ void fn_1_8138(omObjData* object, u32 arg1) { // near replica of fn_1_B8A0 of m4
var_f31 = 0.0f; var_f31 = 0.0f;
} }
temp_r30->unk8 = arg1; temp_r30->unk8 = arg1;
CharModelMotionShiftSet(temp_r30->unk0, object->motion[lbl_1_data_2D4[arg1].unk0], 60.0f * lbl_1_data_2D4[arg1].unk8, var_f31, lbl_1_data_2D4[arg1].unk10); CharModelMotionShiftSet(
temp_r30->unk0, object->motion[lbl_1_data_2D4[arg1].unk0], 60.0f * lbl_1_data_2D4[arg1].unk8, var_f31, lbl_1_data_2D4[arg1].unk10);
if (lbl_1_data_2D4[arg1].unkC >= 0.0f) { if (lbl_1_data_2D4[arg1].unkC >= 0.0f) {
Hu3DMotionShiftStartEndSet(object->model[0], 60.0f * lbl_1_data_2D4[arg1].unk8, 60.0f * lbl_1_data_2D4[arg1].unkC); Hu3DMotionShiftStartEndSet(object->model[0], 60.0f * lbl_1_data_2D4[arg1].unk8, 60.0f * lbl_1_data_2D4[arg1].unkC);
} }
} }
} }
s32 fn_1_82C4(omObjData* object) { s32 fn_1_82C4(omObjData *object)
{
s32 var_r30; s32 var_r30;
M443DllWorkStruct* temp_r31; M443DllWorkStruct *temp_r31;
temp_r31 = object->data; temp_r31 = object->data;
var_r30 = 0; var_r30 = 0;
@ -915,10 +932,11 @@ s32 fn_1_82C4(omObjData* object) {
return var_r30; return var_r30;
} }
s32 fn_1_8338(omObjData* object, u32 arg1) { s32 fn_1_8338(omObjData *object, u32 arg1)
{
s32 var_r27; s32 var_r27;
s32 var_r26; s32 var_r26;
M443DllWorkStruct* temp_r31; M443DllWorkStruct *temp_r31;
var_r27 = 0; var_r27 = 0;
temp_r31 = object->data; temp_r31 = object->data;
@ -926,7 +944,7 @@ s32 fn_1_8338(omObjData* object, u32 arg1) {
if ((CharModelMotionEndCheck(temp_r31->unk0) != 0) && (CharModelMotionShiftIDGet(temp_r31->unk0) < 0)) { if ((CharModelMotionEndCheck(temp_r31->unk0) != 0) && (CharModelMotionShiftIDGet(temp_r31->unk0) < 0)) {
var_r26 = 1; var_r26 = 1;
} }
if (var_r26 != 0) { if (var_r26 != 0) {
fn_1_8138(object, arg1); fn_1_8138(object, arg1);
var_r27 = 1; var_r27 = 1;
@ -955,15 +973,16 @@ Vec2f lbl_1_data_468[4] = {
{ 46.0f, 44.0f }, { 46.0f, 44.0f },
}; };
void fn_1_8508(omObjData* object) { void fn_1_8508(omObjData *object)
{
s32 var_r30; s32 var_r30;
M443DllWorkStruct* temp_r28; M443DllWorkStruct *temp_r28;
M443DllUnkStruct* temp_r31; M443DllUnkStruct *temp_r31;
f32* temp_r4; f32 *temp_r4;
temp_r28 = object->data; temp_r28 = object->data;
temp_r31 = &temp_r28->unk108s; temp_r31 = &temp_r28->unk108s;
for (var_r30 = 0; var_r30 < 11; var_r30++) { for (var_r30 = 0; var_r30 < 11; var_r30++) {
temp_r31->unk14[var_r30] = -1; temp_r31->unk14[var_r30] = -1;
if (lbl_1_data_410[var_r30][0] != 0) { if (lbl_1_data_410[var_r30][0] != 0) {
@ -980,42 +999,41 @@ void fn_1_8508(omObjData* object) {
} }
f32 lbl_1_data_488[][2] = { f32 lbl_1_data_488[][2] = {
{ 20.0f, 4.0f }, { 20.0f, 4.0f },
{ 18.0f, 6.0f }, { 18.0f, 6.0f },
{ 46.0f, 33.0f }, { 46.0f, 33.0f },
{ 72.0f, 32.0f }, { 72.0f, 32.0f },
{ 72.0f, 14.0f }, { 72.0f, 14.0f },
{ 72.0f, -4.0f }, { 72.0f, -4.0f },
{ 72.0f, -22.0f }, { 72.0f, -22.0f },
{ -140.0f, 32.0f }, { -140.0f, 32.0f },
{ -158.0f, 32.0f }, { -158.0f, 32.0f },
{ -176.0f, 32.0f }, { -176.0f, 32.0f },
{ -96.0f, 32.0f }, { -96.0f, 32.0f },
}; };
void fn_1_8680(omObjData* object) { void fn_1_8680(omObjData *object)
{
f32 var_f31; f32 var_f31;
s32 var_r27; s32 var_r27;
s32 var_r30; s32 var_r30;
u32 var_r28; u32 var_r28;
M443DllWorkStruct* temp_r29; M443DllWorkStruct *temp_r29;
M443DllUnkStruct* temp_r31; M443DllUnkStruct *temp_r31;
temp_r29 = object->data; temp_r29 = object->data;
temp_r31 = &temp_r29->unk108s; temp_r31 = &temp_r29->unk108s;
temp_r31->unk8++; temp_r31->unk8++;
for (var_r30 = 0; var_r30 < 11; var_r30++) { for (var_r30 = 0; var_r30 < 11; var_r30++) {
if (temp_r31->unk14[var_r30] >= 0) { if (temp_r31->unk14[var_r30] >= 0) {
if (temp_r31->unk0 == 0) { if (temp_r31->unk0 == 0) {
espDispOff(temp_r31->unk14[var_r30]); espDispOff(temp_r31->unk14[var_r30]);
} else { }
else {
espDispOn(temp_r31->unk14[var_r30]); espDispOn(temp_r31->unk14[var_r30]);
espPosSet( espPosSet(temp_r31->unk14[var_r30], 0.9f * (temp_r29->unk104->unk_44 + temp_r31->unkC.x + lbl_1_data_488[var_r30][0]),
temp_r31->unk14[var_r30], temp_r29->unk104->unk_48 + temp_r31->unkC.y + lbl_1_data_488[var_r30][1]);
0.9f * (temp_r29->unk104->unk_44 + temp_r31->unkC.x + lbl_1_data_488[var_r30][0]),
temp_r29->unk104->unk_48 + temp_r31->unkC.y + lbl_1_data_488[var_r30][1]
);
} }
} }
} }
@ -1024,12 +1042,13 @@ void fn_1_8680(omObjData* object) {
var_f31 = (0.004f * frandmod(0x3E8)) - 2.0f; var_f31 = (0.004f * frandmod(0x3E8)) - 2.0f;
} }
espZRotSet(temp_r31->unk14[2], (90.0f * (0.0001f * temp_r29->unk88)) + var_f31); espZRotSet(temp_r31->unk14[2], (90.0f * (0.0001f * temp_r29->unk88)) + var_f31);
for (var_r30 = 0; var_r30 < 4; var_r30++) { for (var_r30 = 0; var_r30 < 4; var_r30++) {
var_r27 = 0; var_r27 = 0;
if (temp_r29->unk80 == var_r30) { if (temp_r29->unk80 == var_r30) {
var_r27 = 2; var_r27 = 2;
} else if (((temp_r29->unk80 + 1) == var_r30) && (temp_r31->unk4 != 0)) { }
else if (((temp_r29->unk80 + 1) == var_r30) && (temp_r31->unk4 != 0)) {
var_r27 += (temp_r31->unk8 >> 1) & 1; var_r27 += (temp_r31->unk8 >> 1) & 1;
} }
espBankSet(temp_r31->unk14[var_r30 + 3], var_r27); espBankSet(temp_r31->unk14[var_r30 + 3], var_r27);
@ -1045,19 +1064,18 @@ void fn_1_8680(omObjData* object) {
espBankSet(temp_r31->unk14[9], var_r30); espBankSet(temp_r31->unk14[9], var_r30);
} }
f32 lbl_1_data_4E0[4] = { f32 lbl_1_data_4E0[4] = { 18.5f, 9.25f, 6.66f, 5.55f };
18.5f, 9.25f, 6.66f, 5.55f
};
f32 fn_1_8958(u32 arg0) { f32 fn_1_8958(u32 arg0)
{
if (arg0 >= 4) { if (arg0 >= 4) {
if (arg0 >= 4) { if (arg0 >= 4) { }
}
} }
return lbl_1_data_4E0[arg0]; return lbl_1_data_4E0[arg0];
} }
f32 fn_1_8990(f32 arg8) { f32 fn_1_8990(f32 arg8)
{
f32 var_f30; f32 var_f30;
f32 var_f31; f32 var_f31;
@ -1076,41 +1094,49 @@ f32 fn_1_8990(f32 arg8) {
return 55.0f * var_f30; return 55.0f * var_f30;
} }
f32 fn_1_8AC8(u32 arg0, f32 arg1) { f32 fn_1_8AC8(u32 arg0, f32 arg1)
{
return 1.7647059f * (fn_1_8990(arg1) * fn_1_8958(arg0)); return 1.7647059f * (fn_1_8990(arg1) * fn_1_8958(arg0));
} }
f32 fn_1_8C68(f32 arg0) { f32 fn_1_8C68(f32 arg0)
{
return 9.8f * (0.0012820513f * arg0); return 9.8f * (0.0012820513f * arg0);
} }
f32 fn_1_8C8C(s32 arg0, f32 arg1) { f32 fn_1_8C8C(s32 arg0, f32 arg1)
{
return 3.204422f * ((0.016666668f * arg1) / fn_1_8958(arg0)); return 3.204422f * ((0.016666668f * arg1) / fn_1_8958(arg0));
} }
f32 fn_1_8D00(u32 arg0, f32 arg1) { f32 fn_1_8D00(u32 arg0, f32 arg1)
{
return 0.31206876f * (60.0f * arg1) * fn_1_8958(arg0); return 0.31206876f * (60.0f * arg1) * fn_1_8958(arg0);
} }
f32 fn_1_8D74(f32 arg0) { f32 fn_1_8D74(f32 arg0)
{
return 0.024899999f * (arg0 * arg0); return 0.024899999f * (arg0 * arg0);
} }
f32 fn_1_8D8C(u32 arg0, f32 arg8) { f32 fn_1_8D8C(u32 arg0, f32 arg8)
{
return arg8 / fn_1_8958(arg0); return arg8 / fn_1_8958(arg0);
} }
f32 fn_1_8DE0(u32 arg0, f32 arg8) { f32 fn_1_8DE0(u32 arg0, f32 arg8)
{
return arg8 * fn_1_8958(arg0); return arg8 * fn_1_8958(arg0);
} }
void fn_1_8E34(s32 arg0) { void fn_1_8E34(s32 arg0)
{
s32 var_r29; s32 var_r29;
ParticleData* temp_r30; ParticleData *temp_r30;
HsfanimStruct01* var_r31; HsfanimStruct01 *var_r31;
temp_r30 = Hu3DData[arg0].unk_120; temp_r30 = Hu3DData[arg0].unk_120;
var_r31 = temp_r30->unk_48; var_r31 = temp_r30->unk_48;
for (var_r29 = 0; var_r29 < temp_r30->unk_30; var_r29++, var_r31++) { for (var_r29 = 0; var_r29 < temp_r30->unk_30; var_r29++, var_r31++) {
if (var_r31->unk00_s16 != 0) { if (var_r31->unk00_s16 != 0) {
PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); PSVECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34);
@ -1130,31 +1156,36 @@ void fn_1_8E34(s32 arg0) {
DCStoreRange(temp_r30->unk_48, temp_r30->unk_30 * 0x44); DCStoreRange(temp_r30->unk_48, temp_r30->unk_30 * 0x44);
} }
static inline f32 isEven(u32 arg) { static inline f32 isEven(u32 arg)
{
if ((arg & 1) != 0) { if ((arg & 1) != 0) {
return 1.0f; return 1.0f;
} else { }
else {
return -1.0f; return -1.0f;
} }
} }
void fn_1_8FFC(u32 arg0, Point3d* arg1, f32 arg2, f32 arg3) { void fn_1_8FFC(u32 arg0, Point3d *arg1, f32 arg2, f32 arg3)
{
f32 temp_f31; f32 temp_f31;
f32 var_f29; f32 var_f29;
ParticleData* temp_r29; ParticleData *temp_r29;
s32 var_r28; s32 var_r28;
u32 var_r27; u32 var_r27;
HsfanimStruct01* var_r31; HsfanimStruct01 *var_r31;
temp_r29 = Hu3DData[lbl_1_bss_90[arg0]->model[3]].unk_120; temp_r29 = Hu3DData[lbl_1_bss_90[arg0]->model[3]].unk_120;
if (frandmod(0x3E8) > 1000.0f * arg2) return; if (frandmod(0x3E8) > 1000.0f * arg2)
return;
var_r27 = 2; var_r27 = 2;
var_r31 = temp_r29->unk_48; var_r31 = temp_r29->unk_48;
for (var_r28 = 0; var_r28 < temp_r29->unk_30; var_r28++, var_r31++) { for (var_r28 = 0; var_r28 < temp_r29->unk_30; var_r28++, var_r31++) {
if (var_r31->unk00_s16 != 0) continue; if (var_r31->unk00_s16 != 0)
continue;
var_r31->unk00_s16 = (60.0f * (0.6f + (0.0005f * frandmod(0x3E8)))); var_r31->unk00_s16 = (60.0f * (0.6f + (0.0005f * frandmod(0x3E8))));
var_f29 = isEven(var_r27); var_f29 = isEven(var_r27);
temp_f31 = 0.030000001f * frandmod(0x3E8); temp_f31 = 0.030000001f * frandmod(0x3E8);
@ -1173,18 +1204,20 @@ void fn_1_8FFC(u32 arg0, Point3d* arg1, f32 arg2, f32 arg3) {
var_r31->unk40.r = (50.0f + (145.0f * temp_f31)); var_r31->unk40.r = (50.0f + (145.0f * temp_f31));
var_r31->unk40.g = (55.0f + (140.0f * temp_f31)); var_r31->unk40.g = (55.0f + (140.0f * temp_f31));
var_r31->unk40.b = (70.0f + (125.0f * temp_f31)); var_r31->unk40.b = (70.0f + (125.0f * temp_f31));
if (--var_r27 < 1) break; if (--var_r27 < 1)
break;
} }
} }
void fn_1_95A4(u32 arg0) { void fn_1_95A4(u32 arg0)
{
s32 var_r29; s32 var_r29;
ParticleData* temp_r30; ParticleData *temp_r30;
HsfanimStruct01* var_r31; HsfanimStruct01 *var_r31;
temp_r30 = Hu3DData[lbl_1_bss_90[arg0]->model[3]].unk_120; temp_r30 = Hu3DData[lbl_1_bss_90[arg0]->model[3]].unk_120;
var_r31 = temp_r30->unk_48; var_r31 = temp_r30->unk_48;
for (var_r29 = 0; var_r29 < temp_r30->unk_30; var_r29++, var_r31++) { for (var_r29 = 0; var_r29 < temp_r30->unk_30; var_r29++, var_r31++) {
var_r31->unk00 = 0; var_r31->unk00 = 0;
var_r31->unk2C = 0.0f; var_r31->unk2C = 0.0f;

70
src/REL/m444dll/main.c
View file

@ -184,7 +184,7 @@ void fn_1_470(void)
while (fn_1_82FC() > 10.0f) { while (fn_1_82FC() > 10.0f) {
HuPrcVSleep(); HuPrcVSleep();
} }
Hu3DModelAttrReset(lbl_1_bss_199C2[18], 1); Hu3DModelAttrReset(lbl_1_bss_199C2[18], HU3D_ATTR_DISPOFF);
Hu3DMotionSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[20]); Hu3DMotionSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[20]);
Hu3DModelRotSet(lbl_1_bss_199C2[18], 0, 90, 0); Hu3DModelRotSet(lbl_1_bss_199C2[18], 0, 90, 0);
for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) {
@ -233,8 +233,8 @@ void fn_1_470(void)
Hu3DModelPosSet(lbl_1_bss_199C2[18], ((1.0 - cosd(temp_r31 * 3.0)) * -200.0) + -160.0, 0, 155); Hu3DModelPosSet(lbl_1_bss_199C2[18], ((1.0 - cosd(temp_r31 * 3.0)) * -200.0) + -160.0, 0, 155);
HuPrcVSleep(); HuPrcVSleep();
} }
Hu3DModelAttrSet(lbl_1_bss_199C2[18], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[18], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_199C2[22], 1); Hu3DModelAttrReset(lbl_1_bss_199C2[22], HU3D_ATTR_DISPOFF);
Hu3DMotionSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[24]); Hu3DMotionSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[24]);
Hu3DModelRotSet(lbl_1_bss_199C2[22], 0, 90, 0); Hu3DModelRotSet(lbl_1_bss_199C2[22], 0, 90, 0);
for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) {
@ -293,7 +293,7 @@ void fn_1_470(void)
} }
HuAudFXPlay(1857); HuAudFXPlay(1857);
Hu3DMotionTimeSet(lbl_1_bss_199C2[9], lbl_1_data_140[0]); Hu3DMotionTimeSet(lbl_1_bss_199C2[9], lbl_1_data_140[0]);
Hu3DModelAttrSet(lbl_1_bss_199C2[9], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_199C2[9], HU3D_MOTATTR_PAUSE);
HuPrcSleep(20); HuPrcSleep(20);
CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 8, HU3D_MOTATTR_LOOP); CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 8, HU3D_MOTATTR_LOOP);
sp1C.x = 124; sp1C.x = 124;
@ -324,7 +324,7 @@ void fn_1_470(void)
HuPrcVSleep(); HuPrcVSleep();
} }
HuPrcSleep(40); HuPrcSleep(40);
Hu3DModelAttrSet(lbl_1_bss_199C2[64], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[64], HU3D_ATTR_DISPOFF);
fn_1_8180(9); fn_1_8180(9);
Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[24], 0, 10, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[24], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) { for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) {
@ -344,8 +344,8 @@ void fn_1_470(void)
Hu3DModelPosSet(lbl_1_bss_199C2[22], (-300.0 * (1.0 - cosd(3.0 * temp_r31))) + (-160.0), 0, 155); Hu3DModelPosSet(lbl_1_bss_199C2[22], (-300.0 * (1.0 - cosd(3.0 * temp_r31))) + (-160.0), 0, 155);
HuPrcVSleep(); HuPrcVSleep();
} }
Hu3DModelAttrSet(lbl_1_bss_199C2[22], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[22], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_199C2[26], 1); Hu3DModelAttrReset(lbl_1_bss_199C2[26], HU3D_ATTR_DISPOFF);
Hu3DMotionSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[28]); Hu3DMotionSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[28]);
Hu3DModelRotSet(lbl_1_bss_199C2[26], 0, 90, 0); Hu3DModelRotSet(lbl_1_bss_199C2[26], 0, 90, 0);
for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) {
@ -394,7 +394,7 @@ void fn_1_470(void)
} }
HuAudFXPlay(1857); HuAudFXPlay(1857);
Hu3DMotionTimeSet(lbl_1_bss_199C2[9], lbl_1_data_140[1]); Hu3DMotionTimeSet(lbl_1_bss_199C2[9], lbl_1_data_140[1]);
Hu3DModelAttrSet(lbl_1_bss_199C2[9], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_199C2[9], HU3D_MOTATTR_PAUSE);
HuPrcSleep(20); HuPrcSleep(20);
lbl_1_bss_2D4 = -1; lbl_1_bss_2D4 = -1;
fn_1_9418(1); fn_1_9418(1);
@ -407,7 +407,7 @@ void fn_1_470(void)
HuPrcVSleep(); HuPrcVSleep();
} }
HuPrcSleep(40); HuPrcSleep(40);
Hu3DModelAttrSet(lbl_1_bss_199C2[64], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[64], HU3D_ATTR_DISPOFF);
fn_1_8180(9); fn_1_8180(9);
Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[28], 0, 10, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[28], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) { for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) {
@ -427,8 +427,8 @@ void fn_1_470(void)
Hu3DModelPosSet(lbl_1_bss_199C2[26], (-400.0 * (1.0 - cosd(3.0 * temp_r31))) + (-160.0), 0, 155); Hu3DModelPosSet(lbl_1_bss_199C2[26], (-400.0 * (1.0 - cosd(3.0 * temp_r31))) + (-160.0), 0, 155);
HuPrcVSleep(); HuPrcVSleep();
} }
Hu3DModelAttrSet(lbl_1_bss_199C2[26], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[26], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_199C2[30], 1); Hu3DModelAttrReset(lbl_1_bss_199C2[30], HU3D_ATTR_DISPOFF);
Hu3DMotionSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[32]); Hu3DMotionSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[32]);
Hu3DModelRotSet(lbl_1_bss_199C2[30], 0, 90, 0); Hu3DModelRotSet(lbl_1_bss_199C2[30], 0, 90, 0);
for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) {
@ -478,7 +478,7 @@ void fn_1_470(void)
} }
HuAudFXPlay(1857); HuAudFXPlay(1857);
Hu3DMotionTimeSet(lbl_1_bss_199C2[9], lbl_1_data_140[2]); Hu3DMotionTimeSet(lbl_1_bss_199C2[9], lbl_1_data_140[2]);
Hu3DModelAttrSet(lbl_1_bss_199C2[9], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_199C2[9], HU3D_MOTATTR_PAUSE);
HuPrcSleep(20); HuPrcSleep(20);
lbl_1_bss_2D2 = -1; lbl_1_bss_2D2 = -1;
fn_1_9418(2); fn_1_9418(2);
@ -491,7 +491,7 @@ void fn_1_470(void)
HuPrcVSleep(); HuPrcVSleep();
} }
HuPrcSleep(40); HuPrcSleep(40);
Hu3DModelAttrSet(lbl_1_bss_199C2[64], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[64], HU3D_ATTR_DISPOFF);
fn_1_8180(9); fn_1_8180(9);
Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[32], 0, 10, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[32], 0, 10, HU3D_MOTATTR_LOOP);
for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) { for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) {
@ -526,7 +526,7 @@ void fn_1_470(void)
HuPrcVSleep(); HuPrcVSleep();
} }
HuAudFXPlay(1856); HuAudFXPlay(1856);
Hu3DModelAttrReset(lbl_1_bss_199C2[34], 1); Hu3DModelAttrReset(lbl_1_bss_199C2[34], HU3D_ATTR_DISPOFF);
Hu3DMotionSet(lbl_1_bss_199C2[34], lbl_1_bss_1990E[36]); Hu3DMotionSet(lbl_1_bss_199C2[34], lbl_1_bss_1990E[36]);
Hu3DModelRotSet(lbl_1_bss_199C2[34], 0, 90, 0); Hu3DModelRotSet(lbl_1_bss_199C2[34], 0, 90, 0);
for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) {
@ -657,9 +657,9 @@ void fn_1_470(void)
default: default:
break; break;
} }
HuWinInsertMesSizeGet((8+GWPlayerCfg[lbl_1_bss_2D6].character)-8, 0); HuWinInsertMesSizeGet((8 + GWPlayerCfg[lbl_1_bss_2D6].character) - 8, 0);
HuWinInsertMesSizeGet(temp_r24, 1); HuWinInsertMesSizeGet(temp_r24, 1);
HuWinInsertMesSizeGet((8+GWPlayerCfg[lbl_1_bss_2D4].character)-8, 2); HuWinInsertMesSizeGet((8 + GWPlayerCfg[lbl_1_bss_2D4].character) - 8, 2);
HuWinMesMaxSizeGet(1, sp8, temp_r28); HuWinMesMaxSizeGet(1, sp8, temp_r28);
temp_r30 = HuWinExCreateStyled(-10000, 340, sp8[0], sp8[1], -1, 1); temp_r30 = HuWinExCreateStyled(-10000, 340, sp8[0], sp8[1], -1, 1);
HuWinExAnimIn(temp_r30); HuWinExAnimIn(temp_r30);
@ -738,7 +738,7 @@ void fn_1_3B7C(void)
Hu3DMotionSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[20]); Hu3DMotionSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[20]);
temp_f31 = atan2d(400.0, 200.0) + 180.0; temp_f31 = atan2d(400.0, 200.0) + 180.0;
Hu3DModelRotSet(lbl_1_bss_199C2[18], 0, temp_f31, 0); Hu3DModelRotSet(lbl_1_bss_199C2[18], 0, temp_f31, 0);
Hu3DModelAttrReset(lbl_1_bss_199C2[18], 1); Hu3DModelAttrReset(lbl_1_bss_199C2[18], HU3D_ATTR_DISPOFF);
} }
if (temp_r31 <= 50) { if (temp_r31 <= 50) {
Hu3DModelPosSet(lbl_1_bss_199C2[18], 400.0 * (1.0 - (temp_r31 / 50.0)), 0, -553.0 + (200.0 * (1.0 - (temp_r31 / 50.0)))); Hu3DModelPosSet(lbl_1_bss_199C2[18], 400.0 * (1.0 - (temp_r31 / 50.0)), 0, -553.0 + (200.0 * (1.0 - (temp_r31 / 50.0))));
@ -757,7 +757,7 @@ void fn_1_3B7C(void)
Hu3DMotionSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[28]); Hu3DMotionSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[28]);
temp_f31 = atan2d(-300.0, 200.0) + 180.0; temp_f31 = atan2d(-300.0, 200.0) + 180.0;
Hu3DModelRotSet(lbl_1_bss_199C2[26], 0, temp_f31, 0); Hu3DModelRotSet(lbl_1_bss_199C2[26], 0, temp_f31, 0);
Hu3DModelAttrReset(lbl_1_bss_199C2[26], 1); Hu3DModelAttrReset(lbl_1_bss_199C2[26], HU3D_ATTR_DISPOFF);
} }
if (temp_r31 <= 40) { if (temp_r31 <= 40) {
Hu3DModelPosSet(lbl_1_bss_199C2[26], -100.0 + (-300.0 * (1.0 - (temp_r31 / 40.0))), 0, -478.0 + (200.0 * (1.0 - (temp_r31 / 40.0)))); Hu3DModelPosSet(lbl_1_bss_199C2[26], -100.0 + (-300.0 * (1.0 - (temp_r31 / 40.0))), 0, -478.0 + (200.0 * (1.0 - (temp_r31 / 40.0))));
@ -777,7 +777,7 @@ void fn_1_3B7C(void)
Hu3DMotionSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[32]); Hu3DMotionSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[32]);
temp_f31 = atan2d(200.0, 500.0) + 180.0; temp_f31 = atan2d(200.0, 500.0) + 180.0;
Hu3DModelRotSet(lbl_1_bss_199C2[30], 0, temp_f31, 0); Hu3DModelRotSet(lbl_1_bss_199C2[30], 0, temp_f31, 0);
Hu3DModelAttrReset(lbl_1_bss_199C2[30], 1); Hu3DModelAttrReset(lbl_1_bss_199C2[30], HU3D_ATTR_DISPOFF);
} }
if (temp_r31 <= 40) { if (temp_r31 <= 40) {
Hu3DModelPosSet(lbl_1_bss_199C2[30], 100.0 + (200.0 * (1.0 - (temp_r31 / 40.0))), 100, -478.0 + (500.0 * (1.0 - (temp_r31 / 40.0)))); Hu3DModelPosSet(lbl_1_bss_199C2[30], 100.0 + (200.0 * (1.0 - (temp_r31 / 40.0))), 100, -478.0 + (500.0 * (1.0 - (temp_r31 / 40.0))));
@ -797,7 +797,7 @@ void fn_1_3B7C(void)
Hu3DMotionSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[24]); Hu3DMotionSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[24]);
temp_f31 = atan2d(-300.0, 100.0) + 180.0; temp_f31 = atan2d(-300.0, 100.0) + 180.0;
Hu3DModelRotSet(lbl_1_bss_199C2[22], 0, temp_f31, 0); Hu3DModelRotSet(lbl_1_bss_199C2[22], 0, temp_f31, 0);
Hu3DModelAttrReset(lbl_1_bss_199C2[22], 1); Hu3DModelAttrReset(lbl_1_bss_199C2[22], HU3D_ATTR_DISPOFF);
} }
if (temp_r31 <= 40) { if (temp_r31 <= 40) {
Hu3DModelPosSet(lbl_1_bss_199C2[22], -200.0 + (-300.0 * (1.0 - (temp_r31 / 40.0))), 0, -403.0 + (100.0 * (1.0 - (temp_r31 / 40.0)))); Hu3DModelPosSet(lbl_1_bss_199C2[22], -200.0 + (-300.0 * (1.0 - (temp_r31 / 40.0))), 0, -403.0 + (100.0 * (1.0 - (temp_r31 / 40.0))));
@ -1070,10 +1070,10 @@ void fn_1_5774(void)
continue; continue;
} }
temp_r26 = lbl_1_bss_148[temp_r31->unk6[temp_r30]][0]; temp_r26 = lbl_1_bss_148[temp_r31->unk6[temp_r30]][0];
Hu3DModelAttrReset(temp_r26, 1); Hu3DModelAttrReset(temp_r26, HU3D_ATTR_DISPOFF);
temp_r31->unk2E[temp_r30]++; temp_r31->unk2E[temp_r30]++;
if (temp_r31->unk2E[temp_r30] > temp_f31) { if (temp_r31->unk2E[temp_r30] > temp_f31) {
Hu3DModelAttrSet(temp_r26, 1); Hu3DModelAttrSet(temp_r26, HU3D_ATTR_DISPOFF);
lbl_1_bss_148[temp_r31->unk6[temp_r30]][1] = 0; lbl_1_bss_148[temp_r31->unk6[temp_r30]][1] = 0;
temp_r31->unk6[temp_r30] = -1; temp_r31->unk6[temp_r30] = -1;
GWStarsSet(temp_r31->unk2, GWPlayer[temp_r31->unk2].stars + 1); GWStarsSet(temp_r31->unk2, GWPlayer[temp_r31->unk2].stars + 1);
@ -1189,10 +1189,10 @@ void fn_1_5E68(void)
continue; continue;
} }
temp_r26 = lbl_1_bss_8[temp_r31->unk6[temp_r30]][0]; temp_r26 = lbl_1_bss_8[temp_r31->unk6[temp_r30]][0];
Hu3DModelAttrReset(temp_r26, 1); Hu3DModelAttrReset(temp_r26, HU3D_ATTR_DISPOFF);
temp_r31->unk2E[temp_r30]++; temp_r31->unk2E[temp_r30]++;
if (temp_r31->unk2E[temp_r30] > temp_f31) { if (temp_r31->unk2E[temp_r30] > temp_f31) {
Hu3DModelAttrSet(temp_r26, 1); Hu3DModelAttrSet(temp_r26, HU3D_ATTR_DISPOFF);
lbl_1_bss_8[temp_r31->unk6[temp_r30]][1] = 0; lbl_1_bss_8[temp_r31->unk6[temp_r30]][1] = 0;
temp_r31->unk6[temp_r30] = -1; temp_r31->unk6[temp_r30] = -1;
GWCoinsSet(temp_r31->unk2, GWPlayer[temp_r31->unk2].coins + 1); GWCoinsSet(temp_r31->unk2, GWPlayer[temp_r31->unk2].coins + 1);
@ -1266,10 +1266,10 @@ void fn_1_655C(void)
Hu3DModelHookSet(lbl_1_bss_199C2[3], "d1_itemhook4", lbl_1_bss_199C2[50]); Hu3DModelHookSet(lbl_1_bss_199C2[3], "d1_itemhook4", lbl_1_bss_199C2[50]);
Hu3DModelHookSet(lbl_1_bss_199C2[11], "L_itemhook", lbl_1_bss_199C2[13]); Hu3DModelHookSet(lbl_1_bss_199C2[11], "L_itemhook", lbl_1_bss_199C2[13]);
Hu3DModelHookSet(lbl_1_bss_199C2[11], "R_itemhook", lbl_1_bss_199C2[14]); Hu3DModelHookSet(lbl_1_bss_199C2[11], "R_itemhook", lbl_1_bss_199C2[14]);
Hu3DModelAttrSet(lbl_1_bss_199C2[13], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_199C2[13], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(lbl_1_bss_199C2[14], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_199C2[14], HU3D_MOTATTR_LOOP);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
Hu3DModelAttrSet(lbl_1_bss_199C2[i + 51], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[i + 51], HU3D_ATTR_DISPOFF);
} }
fn_1_D1E0(lbl_1_bss_199C2[4]); fn_1_D1E0(lbl_1_bss_199C2[4]);
model = CharModelCreate(lbl_1_bss_2DA, 2); model = CharModelCreate(lbl_1_bss_2DA, 2);
@ -1280,19 +1280,19 @@ void fn_1_655C(void)
lbl_1_bss_2C0[3] = CharModelMotionCreate(lbl_1_bss_2DA, lbl_1_bss_2DA + DATA_MAKE_NUM(DATADIR_M444, 0x4D)); lbl_1_bss_2C0[3] = CharModelMotionCreate(lbl_1_bss_2DA, lbl_1_bss_2DA + DATA_MAKE_NUM(DATADIR_M444, 0x4D));
CharModelMotionSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0]); CharModelMotionSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0]);
Hu3DModelPosSet(model, 0, 0, 200); Hu3DModelPosSet(model, 0, 0, 200);
Hu3DModelAttrSet(model, 0x40000001); Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP);
Hu3DModelShadowSet(model); Hu3DModelShadowSet(model);
HuPrcChildCreate(fn_1_C214, 50, 12288, 0, lbl_1_bss_308); HuPrcChildCreate(fn_1_C214, 50, 12288, 0, lbl_1_bss_308);
HuPrcChildCreate(fn_1_A060, 50, 12288, 0, lbl_1_bss_308); HuPrcChildCreate(fn_1_A060, 50, 12288, 0, lbl_1_bss_308);
Hu3DModelAttrSet(lbl_1_bss_199C2[18], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[18], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(lbl_1_bss_199C2[18]); Hu3DModelShadowSet(lbl_1_bss_199C2[18]);
Hu3DModelAttrSet(lbl_1_bss_199C2[26], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[26], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(lbl_1_bss_199C2[26]); Hu3DModelShadowSet(lbl_1_bss_199C2[26]);
Hu3DModelAttrSet(lbl_1_bss_199C2[30], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[30], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(lbl_1_bss_199C2[30]); Hu3DModelShadowSet(lbl_1_bss_199C2[30]);
Hu3DModelAttrSet(lbl_1_bss_199C2[22], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[22], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(lbl_1_bss_199C2[22]); Hu3DModelShadowSet(lbl_1_bss_199C2[22]);
Hu3DModelAttrSet(lbl_1_bss_199C2[34], 1); Hu3DModelAttrSet(lbl_1_bss_199C2[34], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(lbl_1_bss_199C2[34]); Hu3DModelShadowSet(lbl_1_bss_199C2[34]);
Hu3DModelShadowMapSet(lbl_1_bss_199C2[15]); Hu3DModelShadowMapSet(lbl_1_bss_199C2[15]);
Hu3DModelShadowMapSet(lbl_1_bss_199C2[9]); Hu3DModelShadowMapSet(lbl_1_bss_199C2[9]);
@ -1315,7 +1315,7 @@ void fn_1_655C(void)
} }
lbl_1_bss_148[i][0] = model; lbl_1_bss_148[i][0] = model;
lbl_1_bss_148[i][1] = 0; lbl_1_bss_148[i][1] = 0;
Hu3DModelAttrSet(model, 1); Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
Hu3DModelScaleSet(model, 0.2, 0.2, 0.2); Hu3DModelScaleSet(model, 0.2, 0.2, 0.2);
Hu3DModelLayerSet(model, 7); Hu3DModelLayerSet(model, 7);
} }
@ -1328,7 +1328,7 @@ void fn_1_655C(void)
} }
lbl_1_bss_8[i][0] = model; lbl_1_bss_8[i][0] = model;
lbl_1_bss_8[i][1] = 0; lbl_1_bss_8[i][1] = 0;
Hu3DModelAttrSet(model, 1); Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
Hu3DModelScaleSet(model, 0.2, 0.2, 0.2); Hu3DModelScaleSet(model, 0.2, 0.2, 0.2);
Hu3DModelLayerSet(model, 7); Hu3DModelLayerSet(model, 7);
} }

2162
src/REL/m444dll/pinball.c
View file

File diff suppressed because it is too large Load diff

561
src/REL/m445Dll/main.c
View file

File diff suppressed because it is too large Load diff

199
src/REL/m446Dll/card.c
View file

@ -4,15 +4,16 @@
#include "math.h" #include "math.h"
// data // data
m446Func4 lbl_1_data_150[3] = {NULL, fn_1_2AA8, fn_1_2DA8}; m446Func4 lbl_1_data_150[3] = { NULL, fn_1_2AA8, fn_1_2DA8 };
static const s32 lbl_1_rodata_58[5] = {0x4D0001, 0x4D0002, 0x4D0003, 0x4D0004, 0x4D0000}; static const s32 lbl_1_rodata_58[5] = { 0x4D0001, 0x4D0002, 0x4D0003, 0x4D0004, 0x4D0000 };
static const s32 lbl_1_rodata_6C[5] = {0x4D001B, 0x4D001C, 0x4D001D, 0x4D001E, 0x4D001E}; static const s32 lbl_1_rodata_6C[5] = { 0x4D001B, 0x4D001C, 0x4D001D, 0x4D001E, 0x4D001E };
// bss // bss
unkStruct3* lbl_1_bss_18; unkStruct3 *lbl_1_bss_18;
unkStruct2* fn_1_1C64(s32 arg0) { unkStruct2 *fn_1_1C64(s32 arg0)
unkStruct2* temp_r3; {
unkStruct2 *temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM); temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM);
if (!temp_r3) { if (!temp_r3) {
@ -28,52 +29,62 @@ unkStruct2* fn_1_1C64(s32 arg0) {
return temp_r3; return temp_r3;
} }
void fn_1_1CF8(unkStruct2* arg0) { void fn_1_1CF8(unkStruct2 *arg0)
{
HuMemDirectFree(arg0->unk0); HuMemDirectFree(arg0->unk0);
HuMemDirectFree(arg0); HuMemDirectFree(arg0);
} }
s32 fn_1_1D30(unkStruct2* arg0, void* arg1) { s32 fn_1_1D30(unkStruct2 *arg0, void *arg1)
{
if (arg0->unk4 <= arg0->unk8) { if (arg0->unk4 <= arg0->unk8) {
return 0; return 0;
} else { }
else {
arg0->unk0[arg0->unk8] = arg1; arg0->unk0[arg0->unk8] = arg1;
arg0->unk8++; arg0->unk8++;
return 1; return 1;
} }
} }
s32 fn_1_1D6C(unkStruct2* arg0, unkStruct4** arg1) { s32 fn_1_1D6C(unkStruct2 *arg0, unkStruct4 **arg1)
{
if (arg0->unk8 <= 0) { if (arg0->unk8 <= 0) {
return 0; return 0;
} else { }
else {
arg0->unk8--; arg0->unk8--;
*arg1 = arg0->unk0[arg0->unk8]; *arg1 = arg0->unk0[arg0->unk8];
return 1; return 1;
} }
} }
s32 fn_1_1DA8(unkStruct2* arg0, void** arg1) { s32 fn_1_1DA8(unkStruct2 *arg0, void **arg1)
{
if (arg0->unk8 <= 0) { if (arg0->unk8 <= 0) {
return 0; return 0;
} else { }
else {
*arg1 = *(&arg0->unk0[arg0->unk8] - 1); *arg1 = *(&arg0->unk0[arg0->unk8] - 1);
return 1; return 1;
} }
} }
BOOL fn_1_1DDC(unkStruct2* arg0) { BOOL fn_1_1DDC(unkStruct2 *arg0)
{
return arg0->unk8 == 0; return arg0->unk8 == 0;
} }
s32 fn_1_1DEC(unkStruct2* arg0) { s32 fn_1_1DEC(unkStruct2 *arg0)
{
return arg0->unk8; return arg0->unk8;
} }
#pragma dont_inline on #pragma dont_inline on
unkStruct3* fn_1_1DF4(void* arg0) { unkStruct3 *fn_1_1DF4(void *arg0)
unkStruct3* temp_r3; {
unkStruct3 *temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM); temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM);
if (!temp_r3) { if (!temp_r3) {
@ -85,17 +96,20 @@ unkStruct3* fn_1_1DF4(void* arg0) {
return temp_r3; return temp_r3;
} }
void fn_1_1E5C(unkStruct3* arg0) { void fn_1_1E5C(unkStruct3 *arg0)
{
HuMemDirectFree(arg0); HuMemDirectFree(arg0);
} }
void fn_1_1E84(unkStruct3** arg0) { void fn_1_1E84(unkStruct3 **arg0)
{
unkStruct3 *temp = *arg0; unkStruct3 *temp = *arg0;
HuMemDirectFree(temp); HuMemDirectFree(temp);
*arg0 = NULL; *arg0 = NULL;
} }
void fn_1_1EC8(unkStruct3* arg0, unkStruct3* arg1) { void fn_1_1EC8(unkStruct3 *arg0, unkStruct3 *arg1)
{
if (arg0) { if (arg0) {
arg1->unk8 = arg0->unk8; arg1->unk8 = arg0->unk8;
arg1->unk4 = arg0; arg1->unk4 = arg0;
@ -103,13 +117,15 @@ void fn_1_1EC8(unkStruct3* arg0, unkStruct3* arg1) {
if (arg1->unk8) { if (arg1->unk8) {
arg1->unk8->unk4 = arg1; arg1->unk8->unk4 = arg1;
} }
} else { }
else {
arg1->unk4 = arg1; arg1->unk4 = arg1;
arg1->unk8 = arg1; arg1->unk8 = arg1;
} }
} }
void fn_1_1F04(unkStruct3* arg0) { void fn_1_1F04(unkStruct3 *arg0)
{
if (arg0->unk8) { if (arg0->unk8) {
arg0->unk8->unk4 = arg0->unk4; arg0->unk8->unk4 = arg0->unk4;
} }
@ -120,9 +136,10 @@ void fn_1_1F04(unkStruct3* arg0) {
#pragma dont_inline reset #pragma dont_inline reset
void fn_1_1F38(u8* arg0, u8* arg1, s32 arg2) { void fn_1_1F38(u8 *arg0, u8 *arg1, s32 arg2)
u8* var_r30 = arg0; {
u8* var_r31 = arg1; u8 *var_r30 = arg0;
u8 *var_r31 = arg1;
if (arg2 <= 0) { if (arg2 <= 0) {
return; return;
} }
@ -132,8 +149,9 @@ void fn_1_1F38(u8* arg0, u8* arg1, s32 arg2) {
} }
} }
void fn_1_1F84(u8* arg0, s8 arg1, s32 arg2) { void fn_1_1F84(u8 *arg0, s8 arg1, s32 arg2)
u8* var_r30 = arg0; {
u8 *var_r30 = arg0;
if (arg2 <= 0) { if (arg2 <= 0) {
return; return;
} }
@ -143,8 +161,9 @@ void fn_1_1F84(u8* arg0, s8 arg1, s32 arg2) {
} }
} }
void fn_1_1FC0(u8* arg0, s32 arg1) { void fn_1_1FC0(u8 *arg0, s32 arg1)
u8* var_r30 = arg0; {
u8 *var_r30 = arg0;
if (arg1 <= 0) { if (arg1 <= 0) {
return; return;
} }
@ -154,10 +173,11 @@ void fn_1_1FC0(u8* arg0, s32 arg1) {
} }
} }
s32 fn_1_1FFC(s8* arg0, s8* arg1, s32 arg2) { s32 fn_1_1FFC(s8 *arg0, s8 *arg1, s32 arg2)
s8* var_r30 = arg0; {
s8* var_r31 = arg1; s8 *var_r30 = arg0;
s8 *var_r31 = arg1;
if (arg2 <= 0) { if (arg2 <= 0) {
return 0; return 0;
} }
@ -168,14 +188,16 @@ s32 fn_1_1FFC(s8* arg0, s8* arg1, s32 arg2) {
return *var_r30 - *var_r31; return *var_r30 - *var_r31;
} }
s32 fn_1_2064(void) { s32 fn_1_2064(void)
{
lbl_1_bss_18 = 0; lbl_1_bss_18 = 0;
return 1; return 1;
} }
void fn_1_207C(void) { void fn_1_207C(void)
unkStruct4* var_r30; {
unkStruct3* var_r31; unkStruct4 *var_r30;
unkStruct3 *var_r31;
var_r31 = lbl_1_bss_18; var_r31 = lbl_1_bss_18;
if (var_r31) { if (var_r31) {
@ -187,12 +209,13 @@ void fn_1_207C(void) {
} }
} }
void fn_1_20D4(void) { void fn_1_20D4(void)
{
m446Func1 *temp_r4; m446Func1 *temp_r4;
f32 temp_f31; f32 temp_f31;
s32 temp_r5; s32 temp_r5;
unkStruct4* temp_r31; unkStruct4 *temp_r31;
unkStruct3* var_r30; unkStruct3 *var_r30;
var_r30 = lbl_1_bss_18; var_r30 = lbl_1_bss_18;
if (var_r30) { if (var_r30) {
@ -204,7 +227,8 @@ void fn_1_20D4(void) {
if (temp_r31->unk70 != 0) { if (temp_r31->unk70 != 0) {
if (temp_r31->unk7C > 0) { if (temp_r31->unk7C > 0) {
temp_r31->unk7C--; temp_r31->unk7C--;
} else { }
else {
temp_f31 = sin((M_PI * (90.0f * temp_r31->unk80)) / 180.0); temp_f31 = sin((M_PI * (90.0f * temp_r31->unk80)) / 180.0);
temp_r31->unk10.x = temp_r31->unk1C.x + (temp_f31 * (temp_r31->unk28.x - temp_r31->unk1C.x)); temp_r31->unk10.x = temp_r31->unk1C.x + (temp_f31 * (temp_r31->unk28.x - temp_r31->unk1C.x));
temp_r31->unk10.y = temp_r31->unk1C.y + (temp_f31 * (temp_r31->unk28.y - temp_r31->unk1C.y)); temp_r31->unk10.y = temp_r31->unk1C.y + (temp_f31 * (temp_r31->unk28.y - temp_r31->unk1C.y));
@ -246,9 +270,10 @@ void fn_1_20D4(void) {
} }
} }
unkStruct4* m446CardCreate(s32 arg0) { unkStruct4 *m446CardCreate(s32 arg0)
unkStruct4* temp_r31; {
unkStruct3* temp_r30; unkStruct4 *temp_r31;
unkStruct3 *temp_r30;
temp_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x98, MEMORY_DEFAULT_NUM); temp_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x98, MEMORY_DEFAULT_NUM);
if (!temp_r31) { if (!temp_r31) {
@ -289,14 +314,16 @@ unkStruct4* m446CardCreate(s32 arg0) {
} }
if (lbl_1_bss_18) { if (lbl_1_bss_18) {
fn_1_1EC8(lbl_1_bss_18, temp_r30); fn_1_1EC8(lbl_1_bss_18, temp_r30);
} else { }
else {
lbl_1_bss_18 = temp_r30; lbl_1_bss_18 = temp_r30;
} }
return temp_r31; return temp_r31;
} }
void fn_1_2688(unkStruct4* arg0) { void fn_1_2688(unkStruct4 *arg0)
unkStruct3* var_r31 = lbl_1_bss_18; {
unkStruct3 *var_r31 = lbl_1_bss_18;
do { do {
if (arg0 == var_r31->unk0) { if (arg0 == var_r31->unk0) {
if (var_r31 == lbl_1_bss_18) { if (var_r31 == lbl_1_bss_18) {
@ -313,7 +340,8 @@ void fn_1_2688(unkStruct4* arg0) {
} while (var_r31); } while (var_r31);
} }
void fn_1_272C(unkStruct4* arg0) { void fn_1_272C(unkStruct4 *arg0)
{
Vec sp8; Vec sp8;
sp8 = arg0->unk34; sp8 = arg0->unk34;
@ -322,7 +350,8 @@ void fn_1_272C(unkStruct4* arg0) {
fn_1_2928(arg0, &sp8, 0x1E); fn_1_2928(arg0, &sp8, 0x1E);
} }
void fn_1_2794(unkStruct4* arg0) { void fn_1_2794(unkStruct4 *arg0)
{
Vec sp8; Vec sp8;
sp8 = arg0->unk34; sp8 = arg0->unk34;
@ -331,7 +360,8 @@ void fn_1_2794(unkStruct4* arg0) {
fn_1_2928(arg0, &sp8, 0x3C); fn_1_2928(arg0, &sp8, 0x3C);
} }
void fn_1_27FC(unkStruct4* arg0, Vec* arg1, s32 arg2) { void fn_1_27FC(unkStruct4 *arg0, Vec *arg1, s32 arg2)
{
arg0->unk7C = 0; arg0->unk7C = 0;
arg0->unk28 = *arg1; arg0->unk28 = *arg1;
arg0->unk1C = arg0->unk10; arg0->unk1C = arg0->unk10;
@ -340,7 +370,8 @@ void fn_1_27FC(unkStruct4* arg0, Vec* arg1, s32 arg2) {
arg0->unk70 = 1; arg0->unk70 = 1;
} }
void fn_1_2890(unkStruct4* arg0, Vec* arg1, s32 arg2, s32 arg3) { void fn_1_2890(unkStruct4 *arg0, Vec *arg1, s32 arg2, s32 arg3)
{
arg0->unk7C = 0; arg0->unk7C = 0;
arg0->unk28 = *arg1; arg0->unk28 = *arg1;
arg0->unk1C = arg0->unk10; arg0->unk1C = arg0->unk10;
@ -350,7 +381,8 @@ void fn_1_2890(unkStruct4* arg0, Vec* arg1, s32 arg2, s32 arg3) {
arg0->unk7C = arg3; arg0->unk7C = arg3;
} }
void fn_1_2928(unkStruct4* arg0, Vec* arg1, s32 arg2) { void fn_1_2928(unkStruct4 *arg0, Vec *arg1, s32 arg2)
{
arg0->unk4C = *arg1; arg0->unk4C = *arg1;
arg0->unk40 = arg0->unk34; arg0->unk40 = arg0->unk34;
arg0->unk88 = 0.0f; arg0->unk88 = 0.0f;
@ -358,7 +390,8 @@ void fn_1_2928(unkStruct4* arg0, Vec* arg1, s32 arg2) {
arg0->unk74 = 1; arg0->unk74 = 1;
} }
void fn_1_29B4(unkStruct4* arg0, f32 arg8, s32 arg1) { void fn_1_29B4(unkStruct4 *arg0, f32 arg8, s32 arg1)
{
arg0->unk60 = arg8; arg0->unk60 = arg8;
arg0->unk5C = arg0->unk58; arg0->unk5C = arg0->unk58;
arg0->unk90 = 0.0f; arg0->unk90 = 0.0f;
@ -366,28 +399,32 @@ void fn_1_29B4(unkStruct4* arg0, f32 arg8, s32 arg1) {
arg0->unk78 = 1; arg0->unk78 = 1;
} }
void fn_1_2A1C(unkStruct4* arg0) { void fn_1_2A1C(unkStruct4 *arg0)
Hu3DModelAttrReset(arg0->unkA[1], 1); {
Hu3DModelAttrReset(arg0->unkA[1], HU3D_ATTR_DISPOFF);
arg0->unk6C = 1; arg0->unk6C = 1;
} }
void fn_1_2A58(unkStruct4* arg0) { void fn_1_2A58(unkStruct4 *arg0)
Hu3DModelAttrSet(arg0->unkA[1], 1); {
Hu3DModelAttrSet(arg0->unkA[1], HU3D_ATTR_DISPOFF);
arg0->unk6C = 0; arg0->unk6C = 0;
} }
void fn_1_2A94(unkStruct4* arg0) { void fn_1_2A94(unkStruct4 *arg0)
{
arg0->unk4 = 1; arg0->unk4 = 1;
arg0->unk8 = 0; arg0->unk8 = 0;
} }
void fn_1_2AA8(unkStruct4* arg0) { void fn_1_2AA8(unkStruct4 *arg0)
{
Vec sp8; Vec sp8;
switch (arg0->unk8) { switch (arg0->unk8) {
case 0: case 0:
arg0->unk8 = 1; arg0->unk8 = 1;
Hu3DModelAttrReset(arg0->unkA[1], 1); Hu3DModelAttrReset(arg0->unkA[1], HU3D_ATTR_DISPOFF);
arg0->unk6C = 1; arg0->unk6C = 1;
arg0->unk8 = 1; // ? arg0->unk8 = 1; // ?
case 1: case 1:
@ -398,9 +435,10 @@ void fn_1_2AA8(unkStruct4* arg0) {
arg0->unk78 = 1; arg0->unk78 = 1;
arg0->unk8 = 2; // ????? arg0->unk8 = 2; // ?????
break; break;
case 2: case 2:
if (arg0->unk78 != 0) break; if (arg0->unk78 != 0)
break;
arg0->unk8 = 3; // ?????????? arg0->unk8 = 3; // ??????????
case 3: case 3:
arg0->unk60 = 1.5f; arg0->unk60 = 1.5f;
@ -410,9 +448,10 @@ void fn_1_2AA8(unkStruct4* arg0) {
arg0->unk78 = 1; arg0->unk78 = 1;
arg0->unk8 = 4; arg0->unk8 = 4;
break; break;
case 4: case 4:
if (arg0->unk78 != 0) break; if (arg0->unk78 != 0)
break;
arg0->unk8 = 5; arg0->unk8 = 5;
case 5: case 5:
arg0->unk60 = 2.5f; arg0->unk60 = 2.5f;
@ -422,9 +461,10 @@ void fn_1_2AA8(unkStruct4* arg0) {
arg0->unk78 = 1; arg0->unk78 = 1;
arg0->unk8 = 6; arg0->unk8 = 6;
break; break;
case 6: case 6:
if (arg0->unk78 != 0) break; if (arg0->unk78 != 0)
break;
arg0->unk8 = 8; arg0->unk8 = 8;
case 7: case 7:
arg0->unk60 = 1.5f; arg0->unk60 = 1.5f;
@ -434,7 +474,8 @@ void fn_1_2AA8(unkStruct4* arg0) {
arg0->unk78 = 1; arg0->unk78 = 1;
arg0->unk8 = 8; arg0->unk8 = 8;
case 8: case 8:
if (arg0->unk78 != 0) break; if (arg0->unk78 != 0)
break;
arg0->unk8 = 9; arg0->unk8 = 9;
case 9: case 9:
sp8 = arg0->unk34; sp8 = arg0->unk34;
@ -452,24 +493,27 @@ void fn_1_2AA8(unkStruct4* arg0) {
arg0->unk8 = 10; arg0->unk8 = 10;
break; break;
case 10: case 10:
if (arg0->unk78 != 0) break; if (arg0->unk78 != 0)
break;
arg0->unk4 = 0; arg0->unk4 = 0;
arg0->unk8 = 0; arg0->unk8 = 0;
Hu3DModelAttrSet(arg0->unkA[1], 1); Hu3DModelAttrSet(arg0->unkA[1], HU3D_ATTR_DISPOFF);
arg0->unk6C = 0; arg0->unk6C = 0;
return; return;
} }
} }
void fn_1_2D94(unkStruct4* arg0) { void fn_1_2D94(unkStruct4 *arg0)
{
arg0->unk4 = 2; arg0->unk4 = 2;
arg0->unk8 = 0; arg0->unk8 = 0;
} }
void fn_1_2DA8(unkStruct4* arg0) { void fn_1_2DA8(unkStruct4 *arg0)
{
f32 var_f31; f32 var_f31;
f32 var_f30; f32 var_f30;
switch (arg0->unk8) { switch (arg0->unk8) {
case 0: case 0:
arg0->unk8 = 1; arg0->unk8 = 1;
@ -498,7 +542,8 @@ void fn_1_2DA8(unkStruct4* arg0) {
} }
} }
void fn_1_2EC0(unkStruct4* arg0, s32 arg1) { void fn_1_2EC0(unkStruct4 *arg0, s32 arg1)
{
if (arg1 != 0) { if (arg1 != 0) {
Hu3DModelShadowDispOn(arg0->unkA[0]); Hu3DModelShadowDispOn(arg0->unkA[0]);
Hu3DModelAmbSet(arg0->unkA[0], 0.0f, 0.0f, 0.0f); Hu3DModelAmbSet(arg0->unkA[0], 0.0f, 0.0f, 0.0f);
@ -508,11 +553,13 @@ void fn_1_2EC0(unkStruct4* arg0, s32 arg1) {
Hu3DModelAmbSet(arg0->unkA[0], 1.0f, 1.0f, 1.0f); Hu3DModelAmbSet(arg0->unkA[0], 1.0f, 1.0f, 1.0f);
} }
void fn_1_2F64(unkStruct4* arg0) { void fn_1_2F64(unkStruct4 *arg0)
{
if ((arg0->unk58 > 1.0f) || (arg0->unk58 < 1.0f)) { if ((arg0->unk58 > 1.0f) || (arg0->unk58 < 1.0f)) {
Hu3DModelLayerSet(arg0->unkA[0], 1); Hu3DModelLayerSet(arg0->unkA[0], 1);
Hu3DModelLayerSet(arg0->unkA[1], 1); Hu3DModelLayerSet(arg0->unkA[1], 1);
} else { }
else {
Hu3DModelLayerSet(arg0->unkA[0], 0); Hu3DModelLayerSet(arg0->unkA[0], 0);
Hu3DModelLayerSet(arg0->unkA[1], 0); Hu3DModelLayerSet(arg0->unkA[1], 0);
} }

12
src/REL/m446Dll/cursor.c
View file

@ -142,14 +142,14 @@ void fn_1_77C8(unkStruct7 *arg0, u8 arg1)
arg0->field00_bit0 = 1; arg0->field00_bit0 = 1;
arg0->unk48 = arg1; arg0->unk48 = arg1;
Hu3DModelAttrReset(arg0->unkC[0], 1); Hu3DModelAttrReset(arg0->unkC[0], HU3D_ATTR_DISPOFF);
if (arg0->unk8 == 0) { if (arg0->unk8 == 0) {
for (var_r30 = 0; var_r30 < 9; var_r30++) { for (var_r30 = 0; var_r30 < 9; var_r30++) {
if (var_r30 == arg1) { if (var_r30 == arg1) {
Hu3DModelAttrReset(arg0->unkC[var_r30 + 1], 1); Hu3DModelAttrReset(arg0->unkC[var_r30 + 1], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrSet(arg0->unkC[var_r30 + 1], 1); Hu3DModelAttrSet(arg0->unkC[var_r30 + 1], HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -160,10 +160,10 @@ void fn_1_7884(unkStruct7 *arg0)
s32 var_r30; s32 var_r30;
arg0->field00_bit0 = 0; arg0->field00_bit0 = 0;
Hu3DModelAttrSet(arg0->unkC[0], 1); Hu3DModelAttrSet(arg0->unkC[0], HU3D_ATTR_DISPOFF);
if (arg0->unk8 == 0) { if (arg0->unk8 == 0) {
for (var_r30 = 0; var_r30 < 9; var_r30++) { for (var_r30 = 0; var_r30 < 9; var_r30++) {
Hu3DModelAttrSet(arg0->unkC[var_r30 + 1], 1); Hu3DModelAttrSet(arg0->unkC[var_r30 + 1], HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -196,7 +196,7 @@ void fn_1_7A38(unkStruct7 *arg0)
if (arg0->unk8 == 0) { if (arg0->unk8 == 0) {
for (var_r31 = 0; var_r31 < 9; var_r31++) { for (var_r31 = 0; var_r31 < 9; var_r31++) {
Hu3DModelAttrSet(arg0->unkC[var_r31 + 1], 0x40000002); Hu3DModelAttrSet(arg0->unkC[var_r31 + 1], HU3D_MOTATTR_PAUSE);
} }
} }
arg0->field00_bit3 = 0; arg0->field00_bit3 = 0;

16
src/REL/m446Dll/player.c
View file

@ -258,7 +258,7 @@ unkStruct8 *m446PlayerCreate(s32 arg0, unkStruct6 *arg1)
Hu3DModelShadowSet(var_r31->unk3C[1]); Hu3DModelShadowSet(var_r31->unk3C[1]);
Hu3DModelPosSet(var_r31->unk3C[1], 0.0f, 100.0f, 0.0f); Hu3DModelPosSet(var_r31->unk3C[1], 0.0f, 100.0f, 0.0f);
Hu3DModelAttrReset(var_r31->unk3C[1], 0x40000001); Hu3DModelAttrReset(var_r31->unk3C[1], 0x40000001);
Hu3DModelAttrSet(var_r31->unk3C[1], 1); Hu3DModelAttrSet(var_r31->unk3C[1], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(var_r31->unk3C[1], 2000.0f, 2000.0f, 2000.0f); Hu3DModelPosSet(var_r31->unk3C[1], 2000.0f, 2000.0f, 2000.0f);
fn_1_637C(var_r31, 0); fn_1_637C(var_r31, 0);
@ -279,7 +279,7 @@ unkStruct8 *m446PlayerCreate(s32 arg0, unkStruct6 *arg1)
else { else {
CharModelMotionSet(var_r31->unk64, var_r31->unk40[0]); CharModelMotionSet(var_r31->unk64, var_r31->unk40[0]);
} }
Hu3DModelAttrSet(var_r31->unk3C[0], 0x40000001); Hu3DModelAttrSet(var_r31->unk3C[0], HU3D_MOTATTR_LOOP);
var_r28 = fn_1_1DF4(var_r31); var_r28 = fn_1_1DF4(var_r31);
if (!var_r28) { if (!var_r28) {
OSReport("[!] m446PlayerCreate ERROR...\n"); OSReport("[!] m446PlayerCreate ERROR...\n");
@ -756,7 +756,7 @@ void fn_1_6074(unkStruct8 *arg0)
break; break;
arg0->unk1C = 3; arg0->unk1C = 3;
case 3: case 3:
Hu3DModelAttrSet(arg0->unk3C[1], 0x40000001); Hu3DModelAttrSet(arg0->unk3C[1], HU3D_MOTATTR_LOOP);
arg0->unk1C = 4; arg0->unk1C = 4;
arg0->unk14 = 0; arg0->unk14 = 0;
break; break;
@ -813,9 +813,9 @@ void fn_1_637C(unkStruct8 *arg0, s32 arg1)
arg0->unkC8 = arg1; arg0->unkC8 = arg1;
switch (arg1) { switch (arg1) {
case 0: case 0:
Hu3DModelAttrReset(arg0->unk3C[0], 1); Hu3DModelAttrReset(arg0->unk3C[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk3C[0], 0x40000001); Hu3DModelAttrSet(arg0->unk3C[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrSet(arg0->unk3C[1], 1); Hu3DModelAttrSet(arg0->unk3C[1], HU3D_ATTR_DISPOFF);
arg0->unk48.x = 0.0f; arg0->unk48.x = 0.0f;
if (arg0->unk70 != 0) { if (arg0->unk70 != 0) {
var_f31 = 70.0f; var_f31 = 70.0f;
@ -836,8 +836,8 @@ void fn_1_637C(unkStruct8 *arg0, s32 arg1)
} }
break; break;
case 1: case 1:
Hu3DModelAttrReset(arg0->unk3C[1], 1); Hu3DModelAttrReset(arg0->unk3C[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk3C[0], 1); Hu3DModelAttrSet(arg0->unk3C[0], HU3D_ATTR_DISPOFF);
break; break;
} }
} }

106
src/REL/m446Dll/stage.c
View file

@ -4,7 +4,7 @@
#include "game/hsfmotion.h" #include "game/hsfmotion.h"
// bss // bss
unkStruct3* lbl_1_bss_A0; unkStruct3 *lbl_1_bss_A0;
// data // data
s32 lbl_1_data_410[5] = { 0x4D0008, 0x4D0007, 0x4D0006, 0x4D001F, 0x4D001F }; s32 lbl_1_data_410[5] = { 0x4D0008, 0x4D0007, 0x4D0006, 0x4D001F, 0x4D001F };
@ -15,52 +15,41 @@ Vec lbl_1_data_424[5] = {
{ 160.0f, 160.0f, 0.0f }, { 160.0f, 160.0f, 0.0f },
{ -160.0f, 160.0f, 0.0f }, { -160.0f, 160.0f, 0.0f },
}; };
unkStruct10 lbl_1_data_460[3] = { unkStruct10 lbl_1_data_460[3] = { { { 160.0f, 160.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } },
{ { { -160.0f, 160.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } },
{ 160.0f, 160.0f, 0.0f }, { { 0.0f, 160.0f, 500.0f }, { 0.0f, 0.0f, 0.0f }, { 0xB0, 0xB0, 0xB0, 0xFF } } };
{ 0.0f, 0.0f, 0.0f },
{ 0xFF, 0xFF, 0xFF, 0xFF }
},
{
{ -160.0f, 160.0f, 0.0f },
{ 0.0f, 0.0f, 0.0f },
{ 0xFF, 0xFF, 0xFF, 0xFF }
},
{
{ 0.0f, 160.0f, 500.0f },
{ 0.0f, 0.0f, 0.0f },
{ 0xB0, 0xB0, 0xB0, 0xFF }
}
};
Vec lbl_1_data_4B4[3] = { Vec lbl_1_data_4B4[3] = {
{ 1.0f, 3000.0f, 1.0f }, { 1.0f, 3000.0f, 1.0f },
{ 0.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 0.0f },
{ 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f },
}; };
s32 fn_1_7BF0(void) { s32 fn_1_7BF0(void)
{
lbl_1_bss_A0 = 0; lbl_1_bss_A0 = 0;
return 1; return 1;
} }
void fn_1_7C08(void) { void fn_1_7C08(void)
unkStruct3* var_r31; {
unkStruct9* var_r30; unkStruct3 *var_r31;
unkStruct9 *var_r30;
var_r31 = lbl_1_bss_A0; var_r31 = lbl_1_bss_A0;
if (var_r31) { if (var_r31) {
do { do {
var_r30 = var_r31->unk0; var_r30 = var_r31->unk0;
fn_1_2688((unkStruct4*)var_r30); // ??? fn_1_2688((unkStruct4 *)var_r30); // ???
var_r31 = var_r31->unk8; var_r31 = var_r31->unk8;
} while (var_r31); } while (var_r31);
} }
} }
void fn_1_7C60(void) { void fn_1_7C60(void)
{
s32 var_r30; s32 var_r30;
unkStruct3* var_r29; unkStruct3 *var_r29;
unkStruct9* temp_r31; unkStruct9 *temp_r31;
var_r29 = lbl_1_bss_A0; var_r29 = lbl_1_bss_A0;
if (var_r29) { if (var_r29) {
@ -70,7 +59,8 @@ void fn_1_7C60(void) {
if ((temp_r31->unk14 += 0.002f) > 1.0f) { if ((temp_r31->unk14 += 0.002f) > 1.0f) {
temp_r31->unk14 = 1.0f; temp_r31->unk14 = 1.0f;
} }
Hu3DGLightColorSet(temp_r31->unkA[2], lbl_1_data_460[2].unk18.r * temp_r31->unk14, lbl_1_data_460[2].unk18.g * temp_r31->unk14, lbl_1_data_460[2].unk18.b * temp_r31->unk14, lbl_1_data_460[2].unk18.a * temp_r31->unk14); Hu3DGLightColorSet(temp_r31->unkA[2], lbl_1_data_460[2].unk18.r * temp_r31->unk14, lbl_1_data_460[2].unk18.g * temp_r31->unk14,
lbl_1_data_460[2].unk18.b * temp_r31->unk14, lbl_1_data_460[2].unk18.a * temp_r31->unk14);
} }
if (temp_r31->unk24 != 0) { if (temp_r31->unk24 != 0) {
for (var_r30 = 0; var_r30 <= 1; var_r30++) { for (var_r30 = 0; var_r30 <= 1; var_r30++) {
@ -78,22 +68,24 @@ void fn_1_7C60(void) {
if ((temp_r31->unk10 += 0.002f) > 1.0f) { if ((temp_r31->unk10 += 0.002f) > 1.0f) {
temp_r31->unk10 = 1.0f; temp_r31->unk10 = 1.0f;
} }
Hu3DGLightColorSet(temp_r31->unkA[var_r30], temp_r31->unk10 * lbl_1_data_460[var_r30].unk18.r, temp_r31->unk10 * lbl_1_data_460[var_r30].unk18.g, temp_r31->unk10 * lbl_1_data_460[var_r30].unk18.b, temp_r31->unk10 * lbl_1_data_460[var_r30].unk18.a); Hu3DGLightColorSet(temp_r31->unkA[var_r30], temp_r31->unk10 * lbl_1_data_460[var_r30].unk18.r,
temp_r31->unk10 * lbl_1_data_460[var_r30].unk18.g, temp_r31->unk10 * lbl_1_data_460[var_r30].unk18.b,
temp_r31->unk10 * lbl_1_data_460[var_r30].unk18.a);
} }
} }
if ((temp_r31->unk18 == 0) && (Hu3DMotionEndCheck(temp_r31->unk0[2]) != 0)) { if ((temp_r31->unk18 == 0) && (Hu3DMotionEndCheck(temp_r31->unk0[2]) != 0)) {
Hu3DMotionStartEndSet(temp_r31->unk0[2], 180.0f, 359.0f); Hu3DMotionStartEndSet(temp_r31->unk0[2], 180.0f, 359.0f);
Hu3DModelAttrSet(temp_r31->unk0[2], 0x40000001); Hu3DModelAttrSet(temp_r31->unk0[2], HU3D_MOTATTR_LOOP);
temp_r31->unk18 = 1; temp_r31->unk18 = 1;
} }
if ((temp_r31->unk1C == 0) && (Hu3DMotionEndCheck(temp_r31->unk0[3]) != 0)) { if ((temp_r31->unk1C == 0) && (Hu3DMotionEndCheck(temp_r31->unk0[3]) != 0)) {
Hu3DMotionStartEndSet(temp_r31->unk0[3], 120.0f, 159.0f); Hu3DMotionStartEndSet(temp_r31->unk0[3], 120.0f, 159.0f);
Hu3DModelAttrSet(temp_r31->unk0[3], 0x40000001); Hu3DModelAttrSet(temp_r31->unk0[3], HU3D_MOTATTR_LOOP);
temp_r31->unk1C = 1; temp_r31->unk1C = 1;
} }
if ((temp_r31->unk20 == 0) && (Hu3DMotionEndCheck(temp_r31->unk0[4]) != 0)) { if ((temp_r31->unk20 == 0) && (Hu3DMotionEndCheck(temp_r31->unk0[4]) != 0)) {
Hu3DMotionStartEndSet(temp_r31->unk0[4], 120.0f, 159.0f); Hu3DMotionStartEndSet(temp_r31->unk0[4], 120.0f, 159.0f);
Hu3DModelAttrSet(temp_r31->unk0[4], 0x40000001); Hu3DModelAttrSet(temp_r31->unk0[4], HU3D_MOTATTR_LOOP);
temp_r31->unk20 = 1; temp_r31->unk20 = 1;
} }
} }
@ -102,11 +94,12 @@ void fn_1_7C60(void) {
} }
} }
unkStruct9* m446StageCreate(void) { unkStruct9 *m446StageCreate(void)
{
s32 var_r30; s32 var_r30;
unkStruct3* var_r29; unkStruct3 *var_r29;
unkStruct3* temp_ret; unkStruct3 *temp_ret;
unkStruct9* var_r31; unkStruct9 *var_r31;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x30, MEMORY_DEFAULT_NUM); var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x30, MEMORY_DEFAULT_NUM);
if (!var_r31) { if (!var_r31) {
@ -120,19 +113,19 @@ unkStruct9* m446StageCreate(void) {
var_r31->unk24 = 0; var_r31->unk24 = 0;
var_r31->unk28 = 0; var_r31->unk28 = 0;
var_r31->unk2C = 0; var_r31->unk2C = 0;
for (var_r30 = 0; var_r30 < 5; var_r30++) { for (var_r30 = 0; var_r30 < 5; var_r30++) {
var_r31->unk0[var_r30] = Hu3DModelCreateFile(lbl_1_data_410[var_r30]); var_r31->unk0[var_r30] = Hu3DModelCreateFile(lbl_1_data_410[var_r30]);
Hu3DModelPosSet(var_r31->unk0[var_r30], lbl_1_data_424[var_r30].x, lbl_1_data_424[var_r30].y, lbl_1_data_424[var_r30].z); Hu3DModelPosSet(var_r31->unk0[var_r30], lbl_1_data_424[var_r30].x, lbl_1_data_424[var_r30].y, lbl_1_data_424[var_r30].z);
} }
Hu3DModelAttrSet(var_r31->unk0[3], 1); Hu3DModelAttrSet(var_r31->unk0[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk0[4], 1); Hu3DModelAttrSet(var_r31->unk0[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->unk0[3], 0x40000002); Hu3DModelAttrSet(var_r31->unk0[3], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrSet(var_r31->unk0[4], 0x40000002); Hu3DModelAttrSet(var_r31->unk0[4], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(var_r31->unk0[3], 0x40000001); Hu3DModelAttrReset(var_r31->unk0[3], 0x40000001);
Hu3DModelAttrReset(var_r31->unk0[4], 0x40000001); Hu3DModelAttrReset(var_r31->unk0[4], 0x40000001);
Hu3DModelAttrReset(var_r31->unk0[2], 0x40000001); Hu3DModelAttrReset(var_r31->unk0[2], 0x40000001);
for (var_r30 = 0; var_r30 < 3; var_r30++) { for (var_r30 = 0; var_r30 < 3; var_r30++) {
var_r31->unkA[var_r30] = Hu3DGLightCreateV(&lbl_1_data_460[var_r30].unk0, &lbl_1_data_460[var_r30].unkC, &lbl_1_data_460[var_r30].unk18); var_r31->unkA[var_r30] = Hu3DGLightCreateV(&lbl_1_data_460[var_r30].unk0, &lbl_1_data_460[var_r30].unkC, &lbl_1_data_460[var_r30].unk18);
Hu3DGLightStaticSet(var_r31->unkA[var_r30], 1); Hu3DGLightStaticSet(var_r31->unkA[var_r30], 1);
@ -152,15 +145,17 @@ unkStruct9* m446StageCreate(void) {
} }
if (lbl_1_bss_A0) { if (lbl_1_bss_A0) {
fn_1_1EC8(lbl_1_bss_A0, var_r29); fn_1_1EC8(lbl_1_bss_A0, var_r29);
} else { }
else {
lbl_1_bss_A0 = var_r29; lbl_1_bss_A0 = var_r29;
} }
return var_r31; return var_r31;
} }
void fn_1_83F0(unkStruct9* arg0) { void fn_1_83F0(unkStruct9 *arg0)
{
s32 var_r30; s32 var_r30;
unkStruct3* var_r31; unkStruct3 *var_r31;
var_r31 = lbl_1_bss_A0; var_r31 = lbl_1_bss_A0;
do { do {
@ -170,20 +165,21 @@ void fn_1_83F0(unkStruct9* arg0) {
} }
fn_1_1F04(var_r31); fn_1_1F04(var_r31);
fn_1_1E5C(var_r31); fn_1_1E5C(var_r31);
for (var_r30 = 0; var_r30 < 5; var_r30++) { for (var_r30 = 0; var_r30 < 5; var_r30++) {
Hu3DModelKill(arg0->unk0[var_r30]); Hu3DModelKill(arg0->unk0[var_r30]);
} }
HuMemDirectFree(arg0); HuMemDirectFree(arg0);
return; return;
} }
var_r31 = var_r31->unk8; var_r31 = var_r31->unk8;
} while (var_r31); } while (var_r31);
} }
void fn_1_84AC(unkStruct9* arg0) { void fn_1_84AC(unkStruct9 *arg0)
Hu3DModelAttrReset(arg0->unk0[3], 1); {
Hu3DModelAttrReset(arg0->unk0[4], 1); Hu3DModelAttrReset(arg0->unk0[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->unk0[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(arg0->unk0[3], 0x40000002); Hu3DModelAttrReset(arg0->unk0[3], 0x40000002);
Hu3DModelAttrReset(arg0->unk0[4], 0x40000002); Hu3DModelAttrReset(arg0->unk0[4], 0x40000002);
arg0->unk24 = 1; arg0->unk24 = 1;
@ -192,9 +188,10 @@ void fn_1_84AC(unkStruct9* arg0) {
arg0->unk18 = 0; arg0->unk18 = 0;
} }
void fn_1_852C(unkStruct9* arg0) { void fn_1_852C(unkStruct9 *arg0)
Hu3DModelAttrSet(arg0->unk0[3], 1U); {
Hu3DModelAttrSet(arg0->unk0[4], 1U); Hu3DModelAttrSet(arg0->unk0[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk0[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk0[3], 0x40000002U); Hu3DModelAttrSet(arg0->unk0[3], 0x40000002U);
Hu3DModelAttrSet(arg0->unk0[4], 0x40000002U); Hu3DModelAttrSet(arg0->unk0[4], 0x40000002U);
Hu3DMotionStartEndSet(arg0->unk0[2], 0.0f, 359.0f); Hu3DMotionStartEndSet(arg0->unk0[2], 0.0f, 359.0f);
@ -206,6 +203,7 @@ void fn_1_852C(unkStruct9* arg0) {
arg0->unk18 = 0; arg0->unk18 = 0;
} }
void fn_1_860C(unkStruct9* arg0) { void fn_1_860C(unkStruct9 *arg0)
{
arg0->unk28 = 1; arg0->unk28 = 1;
} }

181
src/REL/m447dll/block.c
View file

@ -8,57 +8,37 @@
#include "ext_math.h" #include "ext_math.h"
void fn_1_8F7C(void* arg0); void fn_1_8F7C(void *arg0);
void fn_1_910C(void); void fn_1_910C(void);
void fn_1_9158(UnkM447Struct_01* arg0); void fn_1_9158(UnkM447Struct_01 *arg0);
void fn_1_9320(UnkM447Struct_01* arg0); void fn_1_9320(UnkM447Struct_01 *arg0);
void fn_1_9374(UnkM447Struct_01* arg0); void fn_1_9374(UnkM447Struct_01 *arg0);
void fn_1_9538(UnkM447Struct_01* arg0); void fn_1_9538(UnkM447Struct_01 *arg0);
void fn_1_953C(UnkM447Struct_01* arg0); void fn_1_953C(UnkM447Struct_01 *arg0);
void fn_1_9758(UnkM447Struct_01* arg0); void fn_1_9758(UnkM447Struct_01 *arg0);
void fn_1_991C(UnkM447Struct_01* arg0); void fn_1_991C(UnkM447Struct_01 *arg0);
void fn_1_9BCC(UnkM447Struct_01* arg0); void fn_1_9BCC(UnkM447Struct_01 *arg0);
void fn_1_9CEC(UnkM447Struct_01* arg0); void fn_1_9CEC(UnkM447Struct_01 *arg0);
void fn_1_9EEC(UnkM447Struct_01* arg0); void fn_1_9EEC(UnkM447Struct_01 *arg0);
void fn_1_9F40(ModelData* model, ParticleData* particle, Mtx matrix); void fn_1_9F40(ModelData *model, ParticleData *particle, Mtx matrix);
u32 lbl_1_bss_B8; // Maybe part of another file with fn_1_A230 and fn_1_A240. u32 lbl_1_bss_B8; // Maybe part of another file with fn_1_A230 and fn_1_A240.
UnkM447Struct_01* lbl_1_bss_A4[5]; UnkM447Struct_01 *lbl_1_bss_A4[5];
s32 lbl_1_bss_A0; s32 lbl_1_bss_A0;
const s32 lbl_1_rodata_5F8[] = { const s32 lbl_1_rodata_5F8[]
DATA_MAKE_NUM(DATADIR_M447, 12), = { DATA_MAKE_NUM(DATADIR_M447, 12), DATA_MAKE_NUM(DATADIR_M447, 13), DATA_MAKE_NUM(DATADIR_M447, 10), DATA_MAKE_NUM(DATADIR_M447, 11),
DATA_MAKE_NUM(DATADIR_M447, 13), DATA_MAKE_NUM(DATADIR_M447, 4), DATA_MAKE_NUM(DATADIR_M447, 5), DATA_MAKE_NUM(DATADIR_M447, 16), DATA_MAKE_NUM(DATADIR_M447, 17),
DATA_MAKE_NUM(DATADIR_M447, 10), DATA_MAKE_NUM(DATADIR_M447, 8), DATA_MAKE_NUM(DATADIR_M447, 9), DATA_MAKE_NUM(DATADIR_M447, 6), DATA_MAKE_NUM(DATADIR_M447, 7),
DATA_MAKE_NUM(DATADIR_M447, 11), DATA_MAKE_NUM(DATADIR_M447, 18), DATA_MAKE_NUM(DATADIR_M447, 19), DATA_MAKE_NUM(DATADIR_M447, 20), DATA_MAKE_NUM(DATADIR_M447, 21),
DATA_MAKE_NUM(DATADIR_M447, 4), DATA_MAKE_NUM(DATADIR_M447, 22), DATA_MAKE_NUM(DATADIR_M447, 23), DATA_MAKE_NUM(DATADIR_M447, 14), DATA_MAKE_NUM(DATADIR_M447, 15) };
DATA_MAKE_NUM(DATADIR_M447, 5),
DATA_MAKE_NUM(DATADIR_M447, 16),
DATA_MAKE_NUM(DATADIR_M447, 17),
DATA_MAKE_NUM(DATADIR_M447, 8),
DATA_MAKE_NUM(DATADIR_M447, 9),
DATA_MAKE_NUM(DATADIR_M447, 6),
DATA_MAKE_NUM(DATADIR_M447, 7),
DATA_MAKE_NUM(DATADIR_M447, 18),
DATA_MAKE_NUM(DATADIR_M447, 19),
DATA_MAKE_NUM(DATADIR_M447, 20),
DATA_MAKE_NUM(DATADIR_M447, 21),
DATA_MAKE_NUM(DATADIR_M447, 22),
DATA_MAKE_NUM(DATADIR_M447, 23),
DATA_MAKE_NUM(DATADIR_M447, 14),
DATA_MAKE_NUM(DATADIR_M447, 15)
};
const float lbl_1_rodata_648[20] = { const float lbl_1_rodata_648[20]
30.0f, 30.0f, 80.0f, 30.0f, = { 30.0f, 30.0f, 80.0f, 30.0f, 80.0f, 80.0f, 60.0f, 60.0f, 80.0f, 80.0f, 30.0f, 30.0f, 45.0f, 45.0f, 50.0f, 50.0f, 30.0f, 30.0f, 75.0f, 50.0f };
80.0f, 80.0f, 60.0f, 60.0f,
80.0f, 80.0f, 30.0f, 30.0f,
45.0f, 45.0f, 50.0f, 50.0f,
30.0f, 30.0f, 75.0f, 50.0f
};
UnkM447Struct_01* fn_1_8DF8(void) { UnkM447Struct_01 *fn_1_8DF8(void)
UnkM447Struct_01* temp_r3; {
UnkM447Struct_01 *temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(*temp_r3), MEMORY_DEFAULT_NUM); temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(*temp_r3), MEMORY_DEFAULT_NUM);
if (!temp_r3) { if (!temp_r3) {
@ -88,20 +68,24 @@ UnkM447Struct_01* fn_1_8DF8(void) {
return temp_r3; return temp_r3;
} }
void fn_1_8F7C(void* arg0) { void fn_1_8F7C(void *arg0)
{
fn_1_8F7C(arg0); fn_1_8F7C(arg0);
HuMemDirectFree(arg0); HuMemDirectFree(arg0);
} }
void fn_1_8FF4(UnkM447Struct_01* arg0, s32 arg1) { void fn_1_8FF4(UnkM447Struct_01 *arg0, s32 arg1)
{
arg0->unk04 = arg1; arg0->unk04 = arg1;
arg0->unk0C = 0; arg0->unk0C = 0;
} }
void fn_1_9004(UnkM447Struct_01* arg0, s32 arg1, s32 arg2) { void fn_1_9004(UnkM447Struct_01 *arg0, s32 arg1, s32 arg2)
{
if (lbl_1_bss_A0 != 0) { if (lbl_1_bss_A0 != 0) {
arg0->unk00 = arg1 * 2 + (arg2 != 0 ? 0 : 1); arg0->unk00 = arg1 * 2 + (arg2 != 0 ? 0 : 1);
} else { }
else {
arg0->unk00 = arg1 * 2 + (arg2 != 0 ? 1 : 0); arg0->unk00 = arg1 * 2 + (arg2 != 0 ? 1 : 0);
} }
arg0->unk08 = arg2; arg0->unk08 = arg2;
@ -109,25 +93,20 @@ void fn_1_9004(UnkM447Struct_01* arg0, s32 arg1, s32 arg2) {
arg0->unk4C = 1.0f; arg0->unk4C = 1.0f;
arg0->unk50 = 1.0f; arg0->unk50 = 1.0f;
arg0->unk54 = 1.0f; arg0->unk54 = 1.0f;
Hu3DModelAttrSet(arg0->unk58[arg0->unk00], 1); Hu3DModelAttrSet(arg0->unk58[arg0->unk00], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk58[21], 1); Hu3DModelAttrSet(arg0->unk58[21], HU3D_ATTR_DISPOFF);
} }
void fn_1_90FC(s32 arg0) { void fn_1_90FC(s32 arg0)
{
lbl_1_bss_A0 = arg0; lbl_1_bss_A0 = arg0;
} }
void (*lbl_1_data_294[])(UnkM447Struct_01*) = { void (*lbl_1_data_294[])(UnkM447Struct_01 *) = { fn_1_9538, fn_1_953C, fn_1_9758, fn_1_991C, fn_1_9BCC, fn_1_9CEC };
fn_1_9538,
fn_1_953C,
fn_1_9758,
fn_1_991C,
fn_1_9BCC,
fn_1_9CEC
};
void fn_1_910C(void) { void fn_1_910C(void)
UnkM447Struct_01* temp_r31; {
UnkM447Struct_01 *temp_r31;
temp_r31 = HuPrcCurrentGet()->user_data; temp_r31 = HuPrcCurrentGet()->user_data;
while (TRUE) { while (TRUE) {
@ -137,12 +116,13 @@ void fn_1_910C(void) {
} }
} }
void fn_1_9158(UnkM447Struct_01* arg0) { void fn_1_9158(UnkM447Struct_01 *arg0)
{
s32 i; s32 i;
for (i = 0; i <= 19; i++) { for (i = 0; i <= 19; i++) {
arg0->unk58[i] = Hu3DModelCreateFile(lbl_1_rodata_5F8[i]); arg0->unk58[i] = Hu3DModelCreateFile(lbl_1_rodata_5F8[i]);
Hu3DModelAttrSet(arg0->unk58[i], 2); Hu3DModelAttrSet(arg0->unk58[i], HU3D_ATTR_ZWRITE_OFF);
Hu3DModelLayerSet(arg0->unk58[i], 7); Hu3DModelLayerSet(arg0->unk58[i], 7);
} }
arg0->unk58[20] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M447, 30)); arg0->unk58[20] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M447, 30));
@ -154,19 +134,20 @@ void fn_1_9158(UnkM447Struct_01* arg0) {
Hu3DParticleHookSet(arg0->unk58[22], fn_1_9F40); Hu3DParticleHookSet(arg0->unk58[22], fn_1_9F40);
Hu3DParticleBlendModeSet(arg0->unk58[22], 1); Hu3DParticleBlendModeSet(arg0->unk58[22], 1);
Hu3DModelLayerSet(arg0->unk58[22], 6); Hu3DModelLayerSet(arg0->unk58[22], 6);
Hu3DModelAttrSet(arg0->unk58[22], 1); Hu3DModelAttrSet(arg0->unk58[22], HU3D_ATTR_DISPOFF);
for (i = 0; i <= 19; i++) { for (i = 0; i <= 19; i++) {
Hu3DModelAttrSet(arg0->unk58[i], 1); Hu3DModelAttrSet(arg0->unk58[i], HU3D_ATTR_DISPOFF);
} }
Hu3DModelAttrReset(arg0->unk58[arg0->unk00], 1); Hu3DModelAttrReset(arg0->unk58[arg0->unk00], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk58[20], 1); Hu3DModelAttrSet(arg0->unk58[20], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk58[21], 1); Hu3DModelAttrSet(arg0->unk58[21], HU3D_ATTR_DISPOFF);
for (i = 0; i <= 19; i++) { for (i = 0; i <= 19; i++) {
Hu3DModelShadowSet(arg0->unk58[i]); Hu3DModelShadowSet(arg0->unk58[i]);
} }
} }
void fn_1_9320(UnkM447Struct_01* arg0) { void fn_1_9320(UnkM447Struct_01 *arg0)
{
s32 i; s32 i;
for (i = 0; i < 23; i++) { for (i = 0; i < 23; i++) {
@ -174,8 +155,9 @@ void fn_1_9320(UnkM447Struct_01* arg0) {
} }
} }
void fn_1_9374(UnkM447Struct_01* arg0) { void fn_1_9374(UnkM447Struct_01 *arg0)
ModelData* temp_r30; {
ModelData *temp_r30;
Mtx sp8; Mtx sp8;
temp_r30 = &Hu3DData[arg0->unk58[arg0->unk00]]; temp_r30 = &Hu3DData[arg0->unk58[arg0->unk00]];
@ -195,10 +177,10 @@ void fn_1_9374(UnkM447Struct_01* arg0) {
Hu3DModelTPLvlSet(arg0->unk58[arg0->unk00], arg0->unk8C); Hu3DModelTPLvlSet(arg0->unk58[arg0->unk00], arg0->unk8C);
} }
void fn_1_9538(UnkM447Struct_01* arg0) { void fn_1_9538(UnkM447Struct_01 *arg0) { }
}
void fn_1_953C(UnkM447Struct_01* arg0) { void fn_1_953C(UnkM447Struct_01 *arg0)
{
float temp_f31; float temp_f31;
switch (arg0->unk0C) { switch (arg0->unk0C) {
@ -211,7 +193,7 @@ void fn_1_953C(UnkM447Struct_01* arg0) {
arg0->unk50 = 0.0f; arg0->unk50 = 0.0f;
arg0->unk54 = 0.0f; arg0->unk54 = 0.0f;
arg0->unk88 = -50.0f; arg0->unk88 = -50.0f;
Hu3DModelAttrReset(arg0->unk58[arg0->unk00], 1); Hu3DModelAttrReset(arg0->unk58[arg0->unk00], HU3D_ATTR_DISPOFF);
arg0->unk0C = 1; arg0->unk0C = 1;
/* fallthrough */ /* fallthrough */
case 1: case 1:
@ -239,7 +221,8 @@ void fn_1_953C(UnkM447Struct_01* arg0) {
} }
} }
void fn_1_9758(UnkM447Struct_01* arg0) { void fn_1_9758(UnkM447Struct_01 *arg0)
{
float temp_f31; float temp_f31;
switch (arg0->unk0C) { switch (arg0->unk0C) {
@ -268,7 +251,8 @@ void fn_1_9758(UnkM447Struct_01* arg0) {
} }
} }
void fn_1_991C(UnkM447Struct_01* arg0) { void fn_1_991C(UnkM447Struct_01 *arg0)
{
float temp_f31; float temp_f31;
switch (arg0->unk0C) { switch (arg0->unk0C) {
@ -308,14 +292,15 @@ void fn_1_991C(UnkM447Struct_01* arg0) {
arg0->unk0C = 2; arg0->unk0C = 2;
/* fallthrough */ /* fallthrough */
case 2: case 2:
Hu3DModelAttrReset(arg0->unk58[20], 1); Hu3DModelAttrReset(arg0->unk58[20], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(arg0->unk58[20], 0.0f); Hu3DMotionTimeSet(arg0->unk58[20], 0.0f);
fn_1_8FF4(arg0, 4); fn_1_8FF4(arg0, 4);
break; break;
} }
} }
void fn_1_9BCC(UnkM447Struct_01* arg0) { void fn_1_9BCC(UnkM447Struct_01 *arg0)
{
switch (arg0->unk0C) { switch (arg0->unk0C) {
case 0: case 0:
arg0->unk90 = 0.0f; arg0->unk90 = 0.0f;
@ -331,22 +316,23 @@ void fn_1_9BCC(UnkM447Struct_01* arg0) {
arg0->unk0C = 2; arg0->unk0C = 2;
/* fallthrough */ /* fallthrough */
case 2: case 2:
Hu3DModelAttrSet(arg0->unk58[arg0->unk00], 1); Hu3DModelAttrSet(arg0->unk58[arg0->unk00], HU3D_ATTR_DISPOFF);
fn_1_8FF4(arg0, 0); fn_1_8FF4(arg0, 0);
break; break;
} }
} }
void fn_1_9CEC(UnkM447Struct_01* arg0) { void fn_1_9CEC(UnkM447Struct_01 *arg0)
{
float temp_f31; float temp_f31;
switch (arg0->unk0C) { switch (arg0->unk0C) {
case 0: case 0:
arg0->unk90 = 0.0f; arg0->unk90 = 0.0f;
arg0->unk98 = 0.008333334f; arg0->unk98 = 0.008333334f;
Hu3DModelAttrReset(arg0->unk58[21], 1); Hu3DModelAttrReset(arg0->unk58[21], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(arg0->unk58[21], 0.0f); Hu3DMotionTimeSet(arg0->unk58[21], 0.0f);
Hu3DModelAttrSet(arg0->unk58[21], 0x40000001); Hu3DModelAttrSet(arg0->unk58[21], HU3D_MOTATTR_LOOP);
arg0->unkA8 = arg0->unk10; arg0->unkA8 = arg0->unk10;
arg0->unkB4 = 0.0f; arg0->unkB4 = 0.0f;
arg0->unkB8 = 200.0f; arg0->unkB8 = 200.0f;
@ -377,9 +363,10 @@ void fn_1_9CEC(UnkM447Struct_01* arg0) {
} }
} }
void fn_1_9EEC(UnkM447Struct_01* arg0) { void fn_1_9EEC(UnkM447Struct_01 *arg0)
ModelData* temp_r30; {
ParticleData* temp_r31; ModelData *temp_r30;
ParticleData *temp_r31;
temp_r30 = &Hu3DData[arg0->unk58[22]]; temp_r30 = &Hu3DData[arg0->unk58[22]];
temp_r31 = temp_r30->unk_120; temp_r31 = temp_r30->unk_120;
@ -389,10 +376,11 @@ void fn_1_9EEC(UnkM447Struct_01* arg0) {
temp_r31->unk_1C = arg0; temp_r31->unk_1C = arg0;
} }
void fn_1_9F40(ModelData* model, ParticleData* particle, Mtx matrix) { void fn_1_9F40(ModelData *model, ParticleData *particle, Mtx matrix)
{
GXColor sp8 = { 0xFF, 0xFF, 0xFF, 0xFF }; GXColor sp8 = { 0xFF, 0xFF, 0xFF, 0xFF };
UnkM447Struct_01* temp_r29; UnkM447Struct_01 *temp_r29;
HsfanimStruct01* var_r31; HsfanimStruct01 *var_r31;
s32 var_r27; s32 var_r27;
s32 i; s32 i;
@ -422,17 +410,20 @@ void fn_1_9F40(ModelData* model, ParticleData* particle, Mtx matrix) {
var_r31->unk34.z = temp_r29->unk10.z; var_r31->unk34.z = temp_r29->unk10.z;
var_r31->unk2C = 20.0f; var_r31->unk2C = 20.0f;
var_r31->unk02 = 1; var_r31->unk02 = 1;
} else if (var_r31->unk02 == 1) { }
else if (var_r31->unk02 == 1) {
var_r31->unk34.y -= 1.0f; var_r31->unk34.y -= 1.0f;
var_r31->unk34.z += 3.0f; var_r31->unk34.z += 3.0f;
var_r31->unk2C = 20.0f + fn_1_A240() % 60; var_r31->unk2C = 20.0f + fn_1_A240() % 60;
if (var_r31->unk40.a > 10) { if (var_r31->unk40.a > 10) {
var_r31->unk40.a -= 4; var_r31->unk40.a -= 4;
} else { }
else {
var_r31->unk40.a = 0; var_r31->unk40.a = 0;
var_r31->unk02 = 2; var_r31->unk02 = 2;
} }
} else { }
else {
var_r27++; var_r27++;
} }
} }
@ -449,10 +440,12 @@ void fn_1_9F40(ModelData* model, ParticleData* particle, Mtx matrix) {
} }
} }
void fn_1_A230(s32 arg0) { void fn_1_A230(s32 arg0)
{
lbl_1_bss_B8 = arg0; lbl_1_bss_B8 = arg0;
} }
s32 fn_1_A240(void) { s32 fn_1_A240(void)
{
return ((lbl_1_bss_B8 = lbl_1_bss_B8 * 0x41C64E6D + 0x3039) >> 16) % (1 << 15); return ((lbl_1_bss_B8 = lbl_1_bss_B8 * 0x41C64E6D + 0x3039) >> 16) % (1 << 15);
} }

462
src/REL/m447dll/player.c
View file

@ -13,162 +13,77 @@
#include "ext_math.h" #include "ext_math.h"
void fn_1_4300(UnkM447Struct_04* arg0); void fn_1_4300(UnkM447Struct_04 *arg0);
float fn_1_43DC(UnkM447Struct_04* arg0); float fn_1_43DC(UnkM447Struct_04 *arg0);
void fn_1_43F8(void); void fn_1_43F8(void);
void fn_1_4444(UnkM447Struct_04* arg0); void fn_1_4444(UnkM447Struct_04 *arg0);
void fn_1_44B0(UnkM447Struct_04* arg0); void fn_1_44B0(UnkM447Struct_04 *arg0);
void fn_1_4590(UnkM447Struct_04* arg0); void fn_1_4590(UnkM447Struct_04 *arg0);
void fn_1_4638(UnkM447Struct_04* arg0); void fn_1_4638(UnkM447Struct_04 *arg0);
void fn_1_4680(UnkM447Struct_04* arg0); void fn_1_4680(UnkM447Struct_04 *arg0);
void fn_1_470C(UnkM447Struct_04* arg0); void fn_1_470C(UnkM447Struct_04 *arg0);
void fn_1_4760(UnkM447Struct_04* arg0); void fn_1_4760(UnkM447Struct_04 *arg0);
void fn_1_4764(UnkM447Struct_04* arg0); void fn_1_4764(UnkM447Struct_04 *arg0);
void fn_1_4C84(UnkM447Struct_04* arg0); void fn_1_4C84(UnkM447Struct_04 *arg0);
float fn_1_4F7C(float arg0, float arg1, float arg2); float fn_1_4F7C(float arg0, float arg1, float arg2);
void fn_1_5080(UnkM447Struct_04* arg0); void fn_1_5080(UnkM447Struct_04 *arg0);
void fn_1_5298(UnkM447Struct_04* arg0); void fn_1_5298(UnkM447Struct_04 *arg0);
void fn_1_5520(UnkM447Struct_04* arg0); void fn_1_5520(UnkM447Struct_04 *arg0);
void fn_1_5760(UnkM447Struct_04* arg0); void fn_1_5760(UnkM447Struct_04 *arg0);
void fn_1_59D8(UnkM447Struct_04* arg0); void fn_1_59D8(UnkM447Struct_04 *arg0);
void fn_1_5AF0(UnkM447Struct_04* arg0); void fn_1_5AF0(UnkM447Struct_04 *arg0);
void fn_1_5BD0(UnkM447Struct_04* arg0); void fn_1_5BD0(UnkM447Struct_04 *arg0);
void fn_1_5C78(UnkM447Struct_04* arg0); void fn_1_5C78(UnkM447Struct_04 *arg0);
void fn_1_671C(UnkM447Struct_04* arg0); void fn_1_671C(UnkM447Struct_04 *arg0);
void fn_1_70BC(UnkM447Struct_04* arg0); void fn_1_70BC(UnkM447Struct_04 *arg0);
void fn_1_717C(UnkM447Struct_04* arg0, s32 arg1, s32 arg2); void fn_1_717C(UnkM447Struct_04 *arg0, s32 arg1, s32 arg2);
void fn_1_71FC(UnkM447Struct_04* arg0, s32 arg1, float arg2, float arg3, s32 arg4); void fn_1_71FC(UnkM447Struct_04 *arg0, s32 arg1, float arg2, float arg3, s32 arg4);
void fn_1_72A8(UnkM447Struct_04* arg0); void fn_1_72A8(UnkM447Struct_04 *arg0);
void fn_1_7688(UnkM447Struct_04* arg0); void fn_1_7688(UnkM447Struct_04 *arg0);
void fn_1_78A8(UnkM447Struct_04* arg0); void fn_1_78A8(UnkM447Struct_04 *arg0);
s32 fn_1_7984(UnkM447Struct_04* arg0); s32 fn_1_7984(UnkM447Struct_04 *arg0);
void fn_1_7A34(UnkM447Struct_04* arg0); void fn_1_7A34(UnkM447Struct_04 *arg0);
UnkM447Struct_04* lbl_1_bss_98[2]; UnkM447Struct_04 *lbl_1_bss_98[2];
const s32 lbl_1_rodata_2A0[][9] = { const s32 lbl_1_rodata_2A0[][9]
{ = { { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), DATA_MAKE_NUM(DATADIR_MARIOMOT, 3),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), DATA_MAKE_NUM(DATADIR_MARIOMOT, 113), DATA_MAKE_NUM(DATADIR_MARIOMOT, 31), DATA_MAKE_NUM(DATADIR_MARIOMOT, 28),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), DATA_MAKE_NUM(DATADIR_MARIOMOT, 72), DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) },
DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), { DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 2), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 3),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 113), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 113), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 31), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 28),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 31), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 72), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 23), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 24) },
DATA_MAKE_NUM(DATADIR_MARIOMOT, 28), { DATA_MAKE_NUM(DATADIR_PEACHMOT, 0), DATA_MAKE_NUM(DATADIR_PEACHMOT, 2), DATA_MAKE_NUM(DATADIR_PEACHMOT, 3),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 72), DATA_MAKE_NUM(DATADIR_PEACHMOT, 113), DATA_MAKE_NUM(DATADIR_PEACHMOT, 31), DATA_MAKE_NUM(DATADIR_PEACHMOT, 28),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), DATA_MAKE_NUM(DATADIR_PEACHMOT, 72), DATA_MAKE_NUM(DATADIR_PEACHMOT, 23), DATA_MAKE_NUM(DATADIR_PEACHMOT, 24) },
DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) { DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 2), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 3),
}, DATA_MAKE_NUM(DATADIR_YOSHIMOT, 113), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 31), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 28),
{ DATA_MAKE_NUM(DATADIR_YOSHIMOT, 72), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 23), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 24) },
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0), { DATA_MAKE_NUM(DATADIR_WARIOMOT, 0), DATA_MAKE_NUM(DATADIR_WARIOMOT, 2), DATA_MAKE_NUM(DATADIR_WARIOMOT, 3),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 2), DATA_MAKE_NUM(DATADIR_WARIOMOT, 113), DATA_MAKE_NUM(DATADIR_WARIOMOT, 31), DATA_MAKE_NUM(DATADIR_WARIOMOT, 28),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 3), DATA_MAKE_NUM(DATADIR_WARIOMOT, 72), DATA_MAKE_NUM(DATADIR_WARIOMOT, 23), DATA_MAKE_NUM(DATADIR_WARIOMOT, 24) },
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 113), { DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 2), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 3),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 31), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 113), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 31), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 28),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 28), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 72), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 23), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 24) },
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 72), { DATA_MAKE_NUM(DATADIR_DAISYMOT, 0), DATA_MAKE_NUM(DATADIR_DAISYMOT, 2), DATA_MAKE_NUM(DATADIR_DAISYMOT, 3),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 23), DATA_MAKE_NUM(DATADIR_DAISYMOT, 113), DATA_MAKE_NUM(DATADIR_DAISYMOT, 31), DATA_MAKE_NUM(DATADIR_DAISYMOT, 28),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 24) DATA_MAKE_NUM(DATADIR_DAISYMOT, 72), DATA_MAKE_NUM(DATADIR_DAISYMOT, 23), DATA_MAKE_NUM(DATADIR_DAISYMOT, 24) },
}, { DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 2), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 3),
{ DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 113), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 31), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 28),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 72), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 23), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 24) },
DATA_MAKE_NUM(DATADIR_PEACHMOT, 2), { DATA_MAKE_NUM(DATADIR_M447, 32), DATA_MAKE_NUM(DATADIR_M447, 33), DATA_MAKE_NUM(DATADIR_M447, 34), DATA_MAKE_NUM(DATADIR_M447, 41),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 3), DATA_MAKE_NUM(DATADIR_M447, 39), DATA_MAKE_NUM(DATADIR_M447, 38), DATA_MAKE_NUM(DATADIR_M447, 37), DATA_MAKE_NUM(DATADIR_M447, 36),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 113), DATA_MAKE_NUM(DATADIR_M447, 40) } };
DATA_MAKE_NUM(DATADIR_PEACHMOT, 31),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 28),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 72),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 23),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 24)
},
{
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 2),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 3),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 113),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 31),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 28),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 72),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 23),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 24)
},
{
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 2),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 3),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 113),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 31),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 28),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 72),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 23),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 24)
},
{
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 2),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 3),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 113),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 31),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 28),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 72),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 23),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 24)
},
{
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 2),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 3),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 113),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 31),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 28),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 72),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 23),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 24)
},
{
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 2),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 3),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 113),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 31),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 28),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 72),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 23),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 24)
},
{
DATA_MAKE_NUM(DATADIR_M447, 32),
DATA_MAKE_NUM(DATADIR_M447, 33),
DATA_MAKE_NUM(DATADIR_M447, 34),
DATA_MAKE_NUM(DATADIR_M447, 41),
DATA_MAKE_NUM(DATADIR_M447, 39),
DATA_MAKE_NUM(DATADIR_M447, 38),
DATA_MAKE_NUM(DATADIR_M447, 37),
DATA_MAKE_NUM(DATADIR_M447, 36),
DATA_MAKE_NUM(DATADIR_M447, 40)
}
};
const float lbl_1_rodata_3E4[] = { const float lbl_1_rodata_3E4[] = { 150.0f, 170.0f, 188.0f, 169.0f, 164.0f, 140.0f, 180.0f, 145.0f, 150.0f };
150.0f, 170.0f, 188.0f,
169.0f, 164.0f, 140.0f,
180.0f, 145.0f, 150.0f
};
const float lbl_1_rodata_408[][6] = { const float lbl_1_rodata_408[][6] = { { -150.0f, 0.0f, 350.0f, 0.0f, 90.0f, 0.0f }, { 150.0f, 0.0f, 350.0f, 0.0f, -90.0f, 0.0f },
{ -150.0f, 0.0f, 350.0f, 0.0f, 90.0f, 0.0f }, { -150.0f, 0.0f, -200.0f, 0.0f, 90.0f, 0.0f }, { 150.0f, 0.0f, -200.0f, 0.0f, -90.0f, 0.0f } };
{ 150.0f, 0.0f, 350.0f, 0.0f, -90.0f, 0.0f },
{ -150.0f, 0.0f, -200.0f, 0.0f, 90.0f, 0.0f },
{ 150.0f, 0.0f, -200.0f, 0.0f, -90.0f, 0.0f }
};
const u8 lbl_1_rodata_468[][5] = { const u8 lbl_1_rodata_468[][5] = { { 5, 6, 7, 8, 9 }, { 4, 5, 6, 7, 8 }, { 3, 4, 5, 6, 7 }, { 2, 3, 4, 5, 6 } };
{ 5, 6, 7, 8, 9 },
{ 4, 5, 6, 7, 8 },
{ 3, 4, 5, 6, 7 },
{ 2, 3, 4, 5, 6 }
};
void fn_1_3F84(void) { void fn_1_3F84(void)
{
s32 i; s32 i;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
@ -176,8 +91,9 @@ void fn_1_3F84(void) {
} }
} }
UnkM447Struct_04* fn_1_3FC4(s32 arg0) { UnkM447Struct_04 *fn_1_3FC4(s32 arg0)
UnkM447Struct_04* temp_r3; {
UnkM447Struct_04 *temp_r3;
s16 var_r28; s16 var_r28;
s16 var_r27; s16 var_r27;
s32 i; s32 i;
@ -192,14 +108,16 @@ UnkM447Struct_04* fn_1_3FC4(s32 arg0) {
temp_r3->unk08 = GWPlayerCfg[arg0].iscom; temp_r3->unk08 = GWPlayerCfg[arg0].iscom;
if (temp_r3->unk08 != 0) { if (temp_r3->unk08 != 0) {
var_r28 = 4; var_r28 = 4;
} else { }
else {
var_r28 = GWPlayerCfg[arg0].pad_idx; var_r28 = GWPlayerCfg[arg0].pad_idx;
} }
temp_r3->unk1A = var_r28; temp_r3->unk1A = var_r28;
temp_r3->unk1C = (GWPlayerCfg[arg0].character == 10); temp_r3->unk1C = (GWPlayerCfg[arg0].character == 10);
if (temp_r3->unk1C != 0) { if (temp_r3->unk1C != 0) {
var_r27 = 8; var_r27 = 8;
} else { }
else {
var_r27 = GWPlayerCfg[arg0].character; var_r27 = GWPlayerCfg[arg0].character;
} }
temp_r3->unk18 = var_r27; temp_r3->unk18 = var_r27;
@ -228,8 +146,8 @@ UnkM447Struct_04* fn_1_3FC4(s32 arg0) {
CharModelMotionDataClose(temp_r3->unk18); CharModelMotionDataClose(temp_r3->unk18);
} }
if (temp_r3->unk1C != 0) { if (temp_r3->unk1C != 0) {
temp_r3->unkB0 = (Process*) CharModelEffectNpcInit(temp_r3->unk68, temp_r3->unk6A[2], 1, 10); temp_r3->unkB0 = (Process *)CharModelEffectNpcInit(temp_r3->unk68, temp_r3->unk6A[2], 1, 10);
temp_r3->unkB4 = (Process*) CharModelEffectNpcInit(temp_r3->unk68, temp_r3->unk6A[1], 0, 10); temp_r3->unkB4 = (Process *)CharModelEffectNpcInit(temp_r3->unk68, temp_r3->unk6A[1], 0, 10);
} }
CharModelLayerSetAll(2); CharModelLayerSetAll(2);
temp_r3->unkAC = HuPrcChildCreate(fn_1_43F8, 102, 0x3000, 0, lbl_1_bss_4); temp_r3->unkAC = HuPrcChildCreate(fn_1_43F8, 102, 0x3000, 0, lbl_1_bss_4);
@ -243,7 +161,8 @@ UnkM447Struct_04* fn_1_3FC4(s32 arg0) {
return temp_r3; return temp_r3;
} }
void fn_1_4300(UnkM447Struct_04* arg0) { void fn_1_4300(UnkM447Struct_04 *arg0)
{
s32 i; s32 i;
if (arg0->unkB0) { if (arg0->unkB0) {
@ -265,31 +184,23 @@ void fn_1_4300(UnkM447Struct_04* arg0) {
HuMemDirectFree(arg0); HuMemDirectFree(arg0);
} }
void fn_1_43CC(UnkM447Struct_04* arg0, s32 arg1) { void fn_1_43CC(UnkM447Struct_04 *arg0, s32 arg1)
{
arg0->unk24 = arg1; arg0->unk24 = arg1;
arg0->unk20 = 0; arg0->unk20 = 0;
} }
float fn_1_43DC(UnkM447Struct_04* arg0) { float fn_1_43DC(UnkM447Struct_04 *arg0)
{
return lbl_1_rodata_3E4[arg0->unk18]; return lbl_1_rodata_3E4[arg0->unk18];
} }
void (*lbl_1_data_1CC[])(UnkM447Struct_04*) = { void (*lbl_1_data_1CC[])(UnkM447Struct_04 *)
fn_1_4760, = { fn_1_4760, fn_1_4764, fn_1_5080, fn_1_5298, fn_1_5520, fn_1_5760, fn_1_5C78, fn_1_671C, fn_1_59D8, fn_1_5AF0, fn_1_5BD0 };
fn_1_4764,
fn_1_5080,
fn_1_5298,
fn_1_5520,
fn_1_5760,
fn_1_5C78,
fn_1_671C,
fn_1_59D8,
fn_1_5AF0,
fn_1_5BD0
};
void fn_1_43F8(void) { void fn_1_43F8(void)
UnkM447Struct_04* temp_r31; {
UnkM447Struct_04 *temp_r31;
temp_r31 = HuPrcCurrentGet()->user_data; temp_r31 = HuPrcCurrentGet()->user_data;
while (TRUE) { while (TRUE) {
@ -299,30 +210,35 @@ void fn_1_43F8(void) {
} }
} }
void fn_1_4444(UnkM447Struct_04* arg0) { void fn_1_4444(UnkM447Struct_04 *arg0)
{
if (arg0->unk1C != 0) { if (arg0->unk1C != 0) {
arg0->unk68 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M447, 31)); arg0->unk68 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M447, 31));
} else { }
else {
arg0->unk68 = CharModelCreate(arg0->unk18, 2); arg0->unk68 = CharModelCreate(arg0->unk18, 2);
} }
Hu3DModelShadowSet(arg0->unk68); Hu3DModelShadowSet(arg0->unk68);
} }
void fn_1_44B0(UnkM447Struct_04* arg0) { void fn_1_44B0(UnkM447Struct_04 *arg0)
{
s32 i; s32 i;
if (arg0->unk1C != 0) { if (arg0->unk1C != 0) {
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
arg0->unk6A[i] = Hu3DJointMotionFile(arg0->unk68, lbl_1_rodata_2A0[arg0->unk18][i]); arg0->unk6A[i] = Hu3DJointMotionFile(arg0->unk68, lbl_1_rodata_2A0[arg0->unk18][i]);
} }
} else { }
else {
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
arg0->unk6A[i] = CharModelMotionCreate(arg0->unk18, lbl_1_rodata_2A0[arg0->unk18][i]); arg0->unk6A[i] = CharModelMotionCreate(arg0->unk18, lbl_1_rodata_2A0[arg0->unk18][i]);
} }
} }
} }
void fn_1_4590(UnkM447Struct_04* arg0) { void fn_1_4590(UnkM447Struct_04 *arg0)
{
arg0->unk7C[0] = espEntry(DATA_MAKE_NUM(DATADIR_M447, 42), 0, 0); arg0->unk7C[0] = espEntry(DATA_MAKE_NUM(DATADIR_M447, 42), 0, 0);
espPriSet(arg0->unk7C[0], arg0->unk00 * 10); espPriSet(arg0->unk7C[0], arg0->unk00 * 10);
arg0->unk7C[1] = espEntry(DATA_MAKE_NUM(DATADIR_M447, 43), 0, 0); arg0->unk7C[1] = espEntry(DATA_MAKE_NUM(DATADIR_M447, 43), 0, 0);
@ -332,29 +248,34 @@ void fn_1_4590(UnkM447Struct_04* arg0) {
espTPLvlSet(arg0->unk7C[1], 0.8f); espTPLvlSet(arg0->unk7C[1], 0.8f);
} }
void fn_1_4638(UnkM447Struct_04* arg0) { void fn_1_4638(UnkM447Struct_04 *arg0)
{
if (arg0->unk1C != 0) { if (arg0->unk1C != 0) {
Hu3DModelKill(arg0->unk68); Hu3DModelKill(arg0->unk68);
} else { }
else {
CharModelKill(arg0->unk18); CharModelKill(arg0->unk18);
} }
} }
void fn_1_4680(UnkM447Struct_04* arg0) { void fn_1_4680(UnkM447Struct_04 *arg0)
{
s32 i; s32 i;
if (arg0->unk1C != 0) { if (arg0->unk1C != 0) {
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
Hu3DMotionKill(arg0->unk6A[i]); Hu3DMotionKill(arg0->unk6A[i]);
} }
} else { }
else {
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
CharModelMotionKill(arg0->unk18, arg0->unk6A[i]); CharModelMotionKill(arg0->unk18, arg0->unk6A[i]);
} }
} }
} }
void fn_1_470C(UnkM447Struct_04* arg0) { void fn_1_470C(UnkM447Struct_04 *arg0)
{
s32 i; s32 i;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
@ -362,10 +283,10 @@ void fn_1_470C(UnkM447Struct_04* arg0) {
} }
} }
void fn_1_4760(UnkM447Struct_04* arg0) { void fn_1_4760(UnkM447Struct_04 *arg0) { }
}
void fn_1_4764(UnkM447Struct_04* arg0) { void fn_1_4764(UnkM447Struct_04 *arg0)
{
Vec sp8; Vec sp8;
float temp_f31; float temp_f31;
s32 var_r29; s32 var_r29;
@ -395,7 +316,8 @@ void fn_1_4764(UnkM447Struct_04* arg0) {
break; break;
} }
} }
} else { }
else {
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
var_r29 = fn_1_A240() % 5; var_r29 = fn_1_A240() % 5;
if (lbl_1_bss_10->unk54[var_r29] == 0) { if (lbl_1_bss_10->unk54[var_r29] == 0) {
@ -416,9 +338,10 @@ void fn_1_4764(UnkM447Struct_04* arg0) {
arg0->unk0C = 1; arg0->unk0C = 1;
} }
} }
} else { }
arg0->unk44 = (float) HuPadStkX[arg0->unk1A] / 4; else {
arg0->unk4C = -(float) HuPadStkY[arg0->unk1A] / 4; arg0->unk44 = (float)HuPadStkX[arg0->unk1A] / 4;
arg0->unk4C = -(float)HuPadStkY[arg0->unk1A] / 4;
} }
var_r28 = 0; var_r28 = 0;
var_r29 = fn_1_7984(arg0); var_r29 = fn_1_7984(arg0);
@ -433,7 +356,8 @@ void fn_1_4764(UnkM447Struct_04* arg0) {
if (arg0->unk64-- <= 0) { if (arg0->unk64-- <= 0) {
var_r28 = 1; var_r28 = 1;
} }
} else if (HuPadBtnDown[arg0->unk1A] & 0x100) { }
else if (HuPadBtnDown[arg0->unk1A] & 0x100) {
var_r28 = 1; var_r28 = 1;
} }
if (var_r28 != 0) { if (var_r28 != 0) {
@ -444,14 +368,16 @@ void fn_1_4764(UnkM447Struct_04* arg0) {
arg0->unk10 = 0; arg0->unk10 = 0;
} }
} }
} else { }
else {
if (arg0->unk10 != 0) { if (arg0->unk10 != 0) {
arg0->unk10 = 0; arg0->unk10 = 0;
arg0->unk0C = 0; arg0->unk0C = 0;
} }
fn_1_7A6C(arg0); fn_1_7A6C(arg0);
} }
} else { }
else {
arg0->unk44 = 0.0f; arg0->unk44 = 0.0f;
arg0->unk48 = 0.0f; arg0->unk48 = 0.0f;
arg0->unk4C = 0.0f; arg0->unk4C = 0.0f;
@ -461,7 +387,8 @@ void fn_1_4764(UnkM447Struct_04* arg0) {
} }
} }
void fn_1_4C84(UnkM447Struct_04* arg0) { void fn_1_4C84(UnkM447Struct_04 *arg0)
{
s16 var_r30; s16 var_r30;
var_r30 = 0; var_r30 = 0;
@ -477,7 +404,8 @@ void fn_1_4C84(UnkM447Struct_04* arg0) {
arg0->unk38 = fn_1_4F7C(arg0->unk38, atan2d(arg0->unk44, arg0->unk4C), 0.4f); arg0->unk38 = fn_1_4F7C(arg0->unk38, atan2d(arg0->unk44, arg0->unk4C), 0.4f);
if (8.0f <= arg0->unk40) { if (8.0f <= arg0->unk40) {
var_r30 = 2; var_r30 = 2;
} else { }
else {
var_r30 = 1; var_r30 = 1;
} }
} }
@ -500,7 +428,8 @@ void fn_1_4C84(UnkM447Struct_04* arg0) {
} }
} }
float fn_1_4F7C(float arg0, float arg1, float arg2) { float fn_1_4F7C(float arg0, float arg1, float arg2)
{
float var_f31; float var_f31;
float var_f30; float var_f30;
@ -518,7 +447,8 @@ float fn_1_4F7C(float arg0, float arg1, float arg2) {
return var_f30; return var_f30;
} }
void fn_1_5080(UnkM447Struct_04* arg0) { void fn_1_5080(UnkM447Struct_04 *arg0)
{
Vec sp14; Vec sp14;
Vec sp8; Vec sp8;
s32 var_r30; s32 var_r30;
@ -545,10 +475,11 @@ void fn_1_5080(UnkM447Struct_04* arg0) {
} }
} }
void fn_1_5298(UnkM447Struct_04* arg0) { void fn_1_5298(UnkM447Struct_04 *arg0)
{
Vec sp8; Vec sp8;
s32 temp_r29; s32 temp_r29;
UnkM447Struct_01* temp_r28; UnkM447Struct_01 *temp_r28;
s32 i; s32 i;
switch (arg0->unk20) { switch (arg0->unk20) {
@ -590,7 +521,8 @@ void fn_1_5298(UnkM447Struct_04* arg0) {
arg0->unk1B++; arg0->unk1B++;
arg0->unk14 = 1; arg0->unk14 = 1;
fn_1_43CC(arg0, 5); fn_1_43CC(arg0, 5);
} else { }
else {
fn_1_8FF4(arg0->unkA8, 3); fn_1_8FF4(arg0->unkA8, 3);
fn_1_43CC(arg0, 4); fn_1_43CC(arg0, 4);
} }
@ -602,18 +534,10 @@ void fn_1_5298(UnkM447Struct_04* arg0) {
} }
} }
const s32 lbl_1_rodata_4EC[] = { const s32 lbl_1_rodata_4EC[] = { 0x0000012A, 0x0000016A, 0x000001AA, 0x000001EA, 0x0000022A, 0x0000026A, 0x000002AA, 0x000002EA };
0x0000012A,
0x0000016A,
0x000001AA,
0x000001EA,
0x0000022A,
0x0000026A,
0x000002AA,
0x000002EA
};
void fn_1_5520(UnkM447Struct_04* arg0) { void fn_1_5520(UnkM447Struct_04 *arg0)
{
Vec sp8; Vec sp8;
float var_f31; float var_f31;
float var_f30; float var_f30;
@ -640,7 +564,8 @@ void fn_1_5520(UnkM447Struct_04* arg0) {
fn_1_7AA4(arg0, 1, 60); fn_1_7AA4(arg0, 1, 60);
if (arg0->unk18 == 8) { if (arg0->unk18 == 8) {
HuAudFXPlay(0x42); HuAudFXPlay(0x42);
} else { }
else {
HuAudFXPlay(lbl_1_rodata_4EC[arg0->unk18]); HuAudFXPlay(lbl_1_rodata_4EC[arg0->unk18]);
} }
/* fallthrough */ /* fallthrough */
@ -652,7 +577,7 @@ void fn_1_5520(UnkM447Struct_04* arg0) {
arg0->unk20 = 4; arg0->unk20 = 4;
/* fallthrough */ /* fallthrough */
case 4: case 4:
Hu3DModelAttrSet(arg0->unk68, 0x40000002); Hu3DModelAttrSet(arg0->unk68, HU3D_MOTATTR_PAUSE);
arg0->unk60 = 0; arg0->unk60 = 0;
arg0->unk20 = 5; arg0->unk20 = 5;
/* fallthrough */ /* fallthrough */
@ -680,7 +605,8 @@ void fn_1_5520(UnkM447Struct_04* arg0) {
} }
} }
void fn_1_5760(UnkM447Struct_04* arg0) { void fn_1_5760(UnkM447Struct_04 *arg0)
{
Vec sp14; Vec sp14;
Vec sp8; Vec sp8;
s32 var_r30; s32 var_r30;
@ -708,39 +634,18 @@ void fn_1_5760(UnkM447Struct_04* arg0) {
} }
} }
const s32 lbl_1_rodata_510[] = { const s32 lbl_1_rodata_510[] = { 0x00000122, 0x00000162, 0x000001A2, 0x000001E2, 0x00000222, 0x00000262, 0x000002A2, 0x000002E2, 0x00000124,
0x00000122, 0x00000164, 0x000001A4, 0x000001E4, 0x00000224, 0x00000264, 0x000002A4, 0x000002E4, 0x00000121, 0x00000161, 0x000001A1, 0x000001E1, 0x00000221,
0x00000162, 0x00000261, 0x000002A1, 0x000002E1 };
0x000001A2,
0x000001E2,
0x00000222,
0x00000262,
0x000002A2,
0x000002E2,
0x00000124,
0x00000164,
0x000001A4,
0x000001E4,
0x00000224,
0x00000264,
0x000002A4,
0x000002E4,
0x00000121,
0x00000161,
0x000001A1,
0x000001E1,
0x00000221,
0x00000261,
0x000002A1,
0x000002E1
};
void fn_1_59D8(UnkM447Struct_04* arg0) { void fn_1_59D8(UnkM447Struct_04 *arg0)
{
switch (arg0->unk20) { switch (arg0->unk20) {
case 0: case 0:
if (arg0->unk18 == 8) { if (arg0->unk18 == 8) {
HuAudFXPlay(0x40); HuAudFXPlay(0x40);
} else { }
else {
HuAudFXPlay(lbl_1_rodata_510[arg0->unk18]); HuAudFXPlay(lbl_1_rodata_510[arg0->unk18]);
} }
fn_1_71FC(arg0, 6, 0.0f, 8.0f, HU3D_MOTATTR_NONE); fn_1_71FC(arg0, 6, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
@ -760,7 +665,8 @@ void fn_1_59D8(UnkM447Struct_04* arg0) {
} }
} }
void fn_1_5AF0(UnkM447Struct_04* arg0) { void fn_1_5AF0(UnkM447Struct_04 *arg0)
{
switch (arg0->unk20) { switch (arg0->unk20) {
case 0: case 0:
if (arg0->unk1C != 0) { if (arg0->unk1C != 0) {
@ -781,7 +687,8 @@ void fn_1_5AF0(UnkM447Struct_04* arg0) {
} }
} }
void fn_1_5BD0(UnkM447Struct_04* arg0) { void fn_1_5BD0(UnkM447Struct_04 *arg0)
{
switch (arg0->unk20) { switch (arg0->unk20) {
case 0: case 0:
fn_1_71FC(arg0, 8, 0.0f, 8.0f, HU3D_MOTATTR_NONE); fn_1_71FC(arg0, 8, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
@ -799,7 +706,8 @@ void fn_1_5BD0(UnkM447Struct_04* arg0) {
} }
} }
void fn_1_5C78(UnkM447Struct_04* arg0) { void fn_1_5C78(UnkM447Struct_04 *arg0)
{
float temp_f22; float temp_f22;
float temp_f21; float temp_f21;
float temp_f25; float temp_f25;
@ -811,7 +719,8 @@ void fn_1_5C78(UnkM447Struct_04* arg0) {
temp_f21 = arg0->unk28.z - lbl_1_rodata_408[arg0->unk00][2] - 25.0f; temp_f21 = arg0->unk28.z - lbl_1_rodata_408[arg0->unk00][2] - 25.0f;
if (ABS(temp_f22) < 5.0f && ABS(temp_f21) < 5.0f && 180.0f == arg0->unk38) { if (ABS(temp_f22) < 5.0f && ABS(temp_f21) < 5.0f && 180.0f == arg0->unk38) {
arg0->unk20 = 3; arg0->unk20 = 3;
} else { }
else {
arg0->unk20 = 1; arg0->unk20 = 1;
} }
/* fallthrough */ /* fallthrough */
@ -843,7 +752,8 @@ void fn_1_5C78(UnkM447Struct_04* arg0) {
} }
} }
void fn_1_671C(UnkM447Struct_04* arg0) { void fn_1_671C(UnkM447Struct_04 *arg0)
{
float var_f25; float var_f25;
switch (arg0->unk20) { switch (arg0->unk20) {
@ -879,7 +789,8 @@ void fn_1_671C(UnkM447Struct_04* arg0) {
} }
} }
void fn_1_70BC(UnkM447Struct_04* arg0) { void fn_1_70BC(UnkM447Struct_04 *arg0)
{
Vec sp14; Vec sp14;
Vec sp8; Vec sp8;
@ -892,39 +803,37 @@ void fn_1_70BC(UnkM447Struct_04* arg0) {
espPosSet(arg0->unk7C[0], sp8.x, sp8.y); espPosSet(arg0->unk7C[0], sp8.x, sp8.y);
} }
void fn_1_717C(UnkM447Struct_04* arg0, s32 arg1, s32 arg2) { void fn_1_717C(UnkM447Struct_04 *arg0, s32 arg1, s32 arg2)
{
if (arg0->unk1C != 0) { if (arg0->unk1C != 0) {
Hu3DMotionSet(arg0->unk68, arg0->unk6A[arg1]); Hu3DMotionSet(arg0->unk68, arg0->unk6A[arg1]);
} else { }
else {
CharModelMotionSet(arg0->unk18, arg0->unk6A[arg1]); CharModelMotionSet(arg0->unk18, arg0->unk6A[arg1]);
} }
Hu3DModelAttrSet(arg0->unk68, arg2); Hu3DModelAttrSet(arg0->unk68, arg2);
arg0->unkA4 = arg1; arg0->unkA4 = arg1;
} }
void fn_1_71FC(UnkM447Struct_04* arg0, s32 arg1, float arg2, float arg3, s32 arg4) { void fn_1_71FC(UnkM447Struct_04 *arg0, s32 arg1, float arg2, float arg3, s32 arg4)
{
if (arg0->unk1C != 0) { if (arg0->unk1C != 0) {
Hu3DMotionShiftSet(arg0->unk68, arg0->unk6A[arg1], arg2, arg3, arg4); Hu3DMotionShiftSet(arg0->unk68, arg0->unk6A[arg1], arg2, arg3, arg4);
} else { }
else {
CharModelMotionShiftSet(arg0->unk18, arg0->unk6A[arg1], arg2, arg3, arg4); CharModelMotionShiftSet(arg0->unk18, arg0->unk6A[arg1], arg2, arg3, arg4);
} }
arg0->unkA4 = arg1; arg0->unkA4 = arg1;
} }
float lbl_1_data_21C[][4] = { float lbl_1_data_21C[][4] = { { -700.0f, -700.0f, -700.0f, 700.0f }, { 700.0f, -700.0f, 700.0f, 700.0f }, { -800.0f, 450.0f, 800.0f, 450.0f },
{ -700.0f, -700.0f, -700.0f, 700.0f }, { -700.0f, -700.0f, 700.0f, -700.0f } };
{ 700.0f, -700.0f, 700.0f, 700.0f },
{ -800.0f, 450.0f, 800.0f, 450.0f },
{ -700.0f, -700.0f, 700.0f, -700.0f }
};
// Vec[]? // Vec[]?
float lbl_1_data_25C[][3] = { float lbl_1_data_25C[][3] = { { -700.0f, -700.0f, 200.0f }, { 700.0f, -700.0f, 200.0f } };
{ -700.0f, -700.0f, 200.0f },
{ 700.0f, -700.0f, 200.0f }
};
void fn_1_72A8(UnkM447Struct_04* arg0) { void fn_1_72A8(UnkM447Struct_04 *arg0)
{
float sp28[3]; // Vec? float sp28[3]; // Vec?
float sp18[4]; float sp18[4];
float spC[3]; // Vec? float spC[3]; // Vec?
@ -943,13 +852,16 @@ void fn_1_72A8(UnkM447Struct_04* arg0) {
if (i / 2 == 0) { if (i / 2 == 0) {
if (lbl_1_data_21C[i][0] < 0.0f) { if (lbl_1_data_21C[i][0] < 0.0f) {
arg0->unk28.x = sp28[2] + lbl_1_data_21C[i][0]; arg0->unk28.x = sp28[2] + lbl_1_data_21C[i][0];
} else { }
else {
arg0->unk28.x = lbl_1_data_21C[i][0] - sp28[2]; arg0->unk28.x = lbl_1_data_21C[i][0] - sp28[2];
} }
} else { }
else {
if (lbl_1_data_21C[i][1] < 0.0f) { if (lbl_1_data_21C[i][1] < 0.0f) {
arg0->unk28.z = sp28[2] + lbl_1_data_21C[i][1]; arg0->unk28.z = sp28[2] + lbl_1_data_21C[i][1];
} else { }
else {
arg0->unk28.z = lbl_1_data_21C[i][1] - sp28[2]; arg0->unk28.z = lbl_1_data_21C[i][1] - sp28[2];
} }
} }
@ -978,10 +890,11 @@ void fn_1_72A8(UnkM447Struct_04* arg0) {
} }
} }
void fn_1_7688(UnkM447Struct_04* arg0) { void fn_1_7688(UnkM447Struct_04 *arg0)
{
float sp14[3]; // Vec? float sp14[3]; // Vec?
float sp8[3]; // Vec? float sp8[3]; // Vec?
UnkM447Struct_04* temp_r30; UnkM447Struct_04 *temp_r30;
s32 var_r26; s32 var_r26;
s32 i; s32 i;
@ -1027,7 +940,8 @@ void fn_1_7688(UnkM447Struct_04* arg0) {
} }
} }
void fn_1_78A8(UnkM447Struct_04* arg0) { void fn_1_78A8(UnkM447Struct_04 *arg0)
{
float sp20[3]; // Vec? float sp20[3]; // Vec?
float sp14[3]; // Vec? float sp14[3]; // Vec?
Vec sp8; Vec sp8;
@ -1052,7 +966,8 @@ void fn_1_78A8(UnkM447Struct_04* arg0) {
} }
} }
s32 fn_1_7984(UnkM447Struct_04* arg0) { s32 fn_1_7984(UnkM447Struct_04 *arg0)
{
float sp20[3]; // Vec? float sp20[3]; // Vec?
float sp14[3]; // Vec? float sp14[3]; // Vec?
Vec sp8; Vec sp8;
@ -1073,17 +988,20 @@ s32 fn_1_7984(UnkM447Struct_04* arg0) {
return 5; return 5;
} }
void fn_1_7A34(UnkM447Struct_04* arg0) { void fn_1_7A34(UnkM447Struct_04 *arg0)
{
espDispOn(arg0->unk7C[1]); espDispOn(arg0->unk7C[1]);
espDispOn(arg0->unk7C[0]); espDispOn(arg0->unk7C[0]);
} }
void fn_1_7A6C(UnkM447Struct_04* arg0) { void fn_1_7A6C(UnkM447Struct_04 *arg0)
{
espDispOff(arg0->unk7C[1]); espDispOff(arg0->unk7C[1]);
espDispOff(arg0->unk7C[0]); espDispOff(arg0->unk7C[0]);
} }
void fn_1_7AA4(UnkM447Struct_04* arg0, s32 arg1, s32 arg2) { void fn_1_7AA4(UnkM447Struct_04 *arg0, s32 arg1, s32 arg2)
{
if (arg0->unk1C == 0) { if (arg0->unk1C == 0) {
switch (arg1) { switch (arg1) {
case 0: case 0:

186
src/REL/m447dll/stage.c
View file

@ -17,61 +17,37 @@ typedef struct {
} UnkM447Struct_07; // Size 0x1C } UnkM447Struct_07; // Size 0x1C
void fn_1_1FF4(void); void fn_1_1FF4(void);
void fn_1_2164(UnkM447Struct_06* arg0); void fn_1_2164(UnkM447Struct_06 *arg0);
void fn_1_231C(UnkM447Struct_06* arg0); void fn_1_231C(UnkM447Struct_06 *arg0);
void fn_1_236C(UnkM447Struct_06* arg0); void fn_1_236C(UnkM447Struct_06 *arg0);
void fn_1_2490(UnkM447Struct_06* arg0); void fn_1_2490(UnkM447Struct_06 *arg0);
void fn_1_2494(UnkM447Struct_06* arg0); void fn_1_2494(UnkM447Struct_06 *arg0);
void fn_1_25E4(UnkM447Struct_06* arg0); void fn_1_25E4(UnkM447Struct_06 *arg0);
void fn_1_2700(UnkM447Struct_06* arg0); void fn_1_2700(UnkM447Struct_06 *arg0);
void fn_1_2A3C(UnkM447Struct_06* arg0); void fn_1_2A3C(UnkM447Struct_06 *arg0);
void fn_1_2D08(UnkM447Struct_06* arg0); void fn_1_2D08(UnkM447Struct_06 *arg0);
void fn_1_2DAC(ModelData* model, ParticleData* particle, Mtx matrix); void fn_1_2DAC(ModelData *model, ParticleData *particle, Mtx matrix);
const s32 lbl_1_rodata_138[] = { const s32 lbl_1_rodata_138[] = { DATA_MAKE_NUM(DATADIR_M447, 0), DATA_MAKE_NUM(DATADIR_M447, 2), DATA_MAKE_NUM(DATADIR_M447, 3),
DATA_MAKE_NUM(DATADIR_M447, 0), DATA_MAKE_NUM(DATADIR_M447, 1), DATA_MAKE_NUM(DATADIR_M447, 1), DATA_MAKE_NUM(DATADIR_M447, 1), DATA_MAKE_NUM(DATADIR_M447, 1),
DATA_MAKE_NUM(DATADIR_M447, 2), DATA_MAKE_NUM(DATADIR_M447, 1), DATA_MAKE_NUM(DATADIR_M447, 24), DATA_MAKE_NUM(DATADIR_M447, 24), DATA_MAKE_NUM(DATADIR_M447, 24),
DATA_MAKE_NUM(DATADIR_M447, 3), DATA_MAKE_NUM(DATADIR_M447, 24), DATA_MAKE_NUM(DATADIR_M447, 24), DATA_MAKE_NUM(DATADIR_M447, 25), DATA_MAKE_NUM(DATADIR_M447, 26),
DATA_MAKE_NUM(DATADIR_M447, 1), DATA_MAKE_NUM(DATADIR_M447, 28), DATA_MAKE_NUM(DATADIR_M447, 29), DATA_MAKE_NUM(DATADIR_M447, 29), DATA_MAKE_NUM(DATADIR_M447, 29),
DATA_MAKE_NUM(DATADIR_M447, 1), DATA_MAKE_NUM(DATADIR_M447, 29), DATA_MAKE_NUM(DATADIR_M447, 29), 0 };
DATA_MAKE_NUM(DATADIR_M447, 1),
DATA_MAKE_NUM(DATADIR_M447, 1),
DATA_MAKE_NUM(DATADIR_M447, 1),
DATA_MAKE_NUM(DATADIR_M447, 24),
DATA_MAKE_NUM(DATADIR_M447, 24),
DATA_MAKE_NUM(DATADIR_M447, 24),
DATA_MAKE_NUM(DATADIR_M447, 24),
DATA_MAKE_NUM(DATADIR_M447, 24),
DATA_MAKE_NUM(DATADIR_M447, 25),
DATA_MAKE_NUM(DATADIR_M447, 26),
DATA_MAKE_NUM(DATADIR_M447, 28),
DATA_MAKE_NUM(DATADIR_M447, 29),
DATA_MAKE_NUM(DATADIR_M447, 29),
DATA_MAKE_NUM(DATADIR_M447, 29),
DATA_MAKE_NUM(DATADIR_M447, 29),
DATA_MAKE_NUM(DATADIR_M447, 29),
0
};
const Vec lbl_1_rodata_190[] = { const Vec lbl_1_rodata_190[]
{ 0.0f, 0.1f, 0.0f }, = { { 0.0f, 0.1f, 0.0f }, { 400.0f, 0.1f, 0.0f }, { -400.0f, 0.1f, 0.0f }, { 200.0f, 0.1f, -400.0f }, { -200.0f, 0.1f, -400.0f } };
{ 400.0f, 0.1f, 0.0f },
{ -400.0f, 0.1f, 0.0f },
{ 200.0f, 0.1f, -400.0f },
{ -200.0f, 0.1f, -400.0f }
};
UnkM447Struct_07 lbl_1_data_A0[] = { UnkM447Struct_07 lbl_1_data_A0[] = { { { 0.0f, 2500.0f, 0.0f }, { 0.0f, -0.5f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } },
{ { 0.0f, 2500.0f, 0.0f }, { 0.0f, -0.5f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } }, { { 0.0f, -100.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } },
{ { 0.0f, -100.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } }, { { 400.0f, -100.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } },
{ { 400.0f, -100.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } }, { { -400.0f, -100.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } },
{ { -400.0f, -100.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } }, { { 200.0f, -100.0f, -400.0f }, { 0.0f, 1.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } },
{ { 200.0f, -100.0f, -400.0f }, { 0.0f, 1.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } }, { { -200.0f, -100.0f, -400.0f }, { 0.0f, 1.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } } };
{ { -200.0f, -100.0f, -400.0f }, { 0.0f, 1.0f, 0.0f }, { 0xFF, 0xFF, 0xFF, 0xFF } }
};
UnkM447Struct_06* fn_1_1D90(void) { UnkM447Struct_06 *fn_1_1D90(void)
UnkM447Struct_06* temp_r3; {
UnkM447Struct_06 *temp_r3;
s32 i; s32 i;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(*temp_r3), MEMORY_DEFAULT_NUM); temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(*temp_r3), MEMORY_DEFAULT_NUM);
@ -92,26 +68,31 @@ UnkM447Struct_06* fn_1_1D90(void) {
return temp_r3; return temp_r3;
} }
void fn_1_1E70(UnkM447Struct_06* arg0) { void fn_1_1E70(UnkM447Struct_06 *arg0)
{
fn_1_231C(arg0); fn_1_231C(arg0);
HuPrcKill(arg0->unk7C); HuPrcKill(arg0->unk7C);
HuMemDirectFree(arg0); HuMemDirectFree(arg0);
} }
void fn_1_1EB0(UnkM447Struct_06* arg0, s32 arg1) { void fn_1_1EB0(UnkM447Struct_06 *arg0, s32 arg1)
{
arg0->unk38 = arg1; arg0->unk38 = arg1;
arg0->unk3C = 0; arg0->unk3C = 0;
} }
BOOL fn_1_1EC0(UnkM447Struct_06* arg0) { BOOL fn_1_1EC0(UnkM447Struct_06 *arg0)
{
return arg0->unk38 != 0; return arg0->unk38 != 0;
} }
void fn_1_1ED4(s32 arg0, Vec* arg1) { void fn_1_1ED4(s32 arg0, Vec *arg1)
{
*arg1 = lbl_1_rodata_190[arg0]; *arg1 = lbl_1_rodata_190[arg0];
} }
void fn_1_1F00(UnkM447Struct_06* arg0, s32 arg1) { void fn_1_1F00(UnkM447Struct_06 *arg0, s32 arg1)
{
s16 temp_r31; s16 temp_r31;
temp_r31 = arg0->unk00[arg1 + 3]; temp_r31 = arg0->unk00[arg1 + 3];
@ -121,7 +102,8 @@ void fn_1_1F00(UnkM447Struct_06* arg0, s32 arg1) {
arg0->unk54[arg1] = 1; arg0->unk54[arg1] = 1;
} }
s32 fn_1_1F9C(UnkM447Struct_06* arg0) { s32 fn_1_1F9C(UnkM447Struct_06 *arg0)
{
s32 var_r30; s32 var_r30;
s32 i; s32 i;
@ -134,22 +116,20 @@ s32 fn_1_1F9C(UnkM447Struct_06* arg0) {
return var_r30; return var_r30;
} }
void fn_1_1FEC(UnkM447Struct_06* arg0, s32 arg1) { void fn_1_1FEC(UnkM447Struct_06 *arg0, s32 arg1)
{
arg0->unk44 = arg1; arg0->unk44 = arg1;
} }
void (*lbl_1_data_148[])(UnkM447Struct_06*) = { void (*lbl_1_data_148[])(UnkM447Struct_06 *) = {
fn_1_2490, fn_1_2490, fn_1_2494, fn_1_25E4, fn_1_2700, fn_1_2A3C,
fn_1_2494,
fn_1_25E4,
fn_1_2700,
fn_1_2A3C,
NULL // padding? NULL // padding?
}; };
void fn_1_1FF4(void) { void fn_1_1FF4(void)
{
Vec sp8; Vec sp8;
UnkM447Struct_06* temp_r31; UnkM447Struct_06 *temp_r31;
s16 temp_r29; s16 temp_r29;
s32 i; s32 i;
@ -162,14 +142,15 @@ void fn_1_1FF4(void) {
temp_r29 = temp_r31->unk00[i + 3]; temp_r29 = temp_r31->unk00[i + 3];
if (Hu3DMotionEndCheck(temp_r29)) { if (Hu3DMotionEndCheck(temp_r29)) {
Hu3DMotionStartEndSet(temp_r29, 20.0f, 40.0f); Hu3DMotionStartEndSet(temp_r29, 20.0f, 40.0f);
Hu3DModelAttrSet(temp_r29, 0x40000001); Hu3DModelAttrSet(temp_r29, HU3D_MOTATTR_LOOP);
} }
} }
if (temp_r31->unk44 > 0) { if (temp_r31->unk44 > 0) {
fn_1_351C(&sp8); fn_1_351C(&sp8);
if (--temp_r31->unk44 == 0) { if (--temp_r31->unk44 == 0) {
sp8.y = 300.0f; sp8.y = 300.0f;
} else { }
else {
sp8.y = fn_1_A240() % 20 - 10 + 300.0f; sp8.y = fn_1_A240() % 20 - 10 + 300.0f;
} }
fn_1_3540(&sp8); fn_1_3540(&sp8);
@ -178,7 +159,8 @@ void fn_1_1FF4(void) {
} }
} }
void fn_1_2164(UnkM447Struct_06* arg0) { void fn_1_2164(UnkM447Struct_06 *arg0)
{
s32 i; s32 i;
for (i = 0; i <= 20; i++) { for (i = 0; i <= 20; i++) {
@ -190,22 +172,23 @@ void fn_1_2164(UnkM447Struct_06* arg0) {
Hu3DParticleHookSet(arg0->unk00[21], fn_1_2DAC); Hu3DParticleHookSet(arg0->unk00[21], fn_1_2DAC);
Hu3DParticleBlendModeSet(arg0->unk00[21], 1); Hu3DParticleBlendModeSet(arg0->unk00[21], 1);
Hu3DModelLayerSet(arg0->unk00[21], 0); Hu3DModelLayerSet(arg0->unk00[21], 0);
Hu3DModelAttrSet(arg0->unk00[21], 1); Hu3DModelAttrSet(arg0->unk00[21], HU3D_ATTR_DISPOFF);
Hu3DModelShadowMapSet(arg0->unk00[2]); Hu3DModelShadowMapSet(arg0->unk00[2]);
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
Hu3DModelPosSet(arg0->unk00[i + 3], lbl_1_rodata_190[i].x, lbl_1_rodata_190[i].y, lbl_1_rodata_190[i].z); Hu3DModelPosSet(arg0->unk00[i + 3], lbl_1_rodata_190[i].x, lbl_1_rodata_190[i].y, lbl_1_rodata_190[i].z);
Hu3DModelAttrSet(arg0->unk00[i + 3], 0x40000002); Hu3DModelAttrSet(arg0->unk00[i + 3], HU3D_MOTATTR_PAUSE);
Hu3DModelShadowMapSet(arg0->unk00[i + 3]); Hu3DModelShadowMapSet(arg0->unk00[i + 3]);
} }
for (i = 8; i <= 15; i++) { for (i = 8; i <= 15; i++) {
Hu3DModelAttrSet(arg0->unk00[i], 1); Hu3DModelAttrSet(arg0->unk00[i], HU3D_ATTR_DISPOFF);
} }
for (i = 16; i <= 20; i++) { for (i = 16; i <= 20; i++) {
Hu3DModelAttrSet(arg0->unk00[i], 1); Hu3DModelAttrSet(arg0->unk00[i], HU3D_ATTR_DISPOFF);
} }
} }
void fn_1_231C(UnkM447Struct_06* arg0) { void fn_1_231C(UnkM447Struct_06 *arg0)
{
s32 i; s32 i;
for (i = 0; i < 22; i++) { for (i = 0; i < 22; i++) {
@ -213,7 +196,8 @@ void fn_1_231C(UnkM447Struct_06* arg0) {
} }
} }
void fn_1_236C(UnkM447Struct_06* arg0) { void fn_1_236C(UnkM447Struct_06 *arg0)
{
s32 i; s32 i;
Hu3DLighInit(); Hu3DLighInit();
@ -237,10 +221,10 @@ void fn_1_236C(UnkM447Struct_06* arg0) {
} }
} }
void fn_1_2490(UnkM447Struct_06* arg0) { void fn_1_2490(UnkM447Struct_06 *arg0) { }
}
void fn_1_2494(UnkM447Struct_06* arg0) { void fn_1_2494(UnkM447Struct_06 *arg0)
{
s32 i; s32 i;
switch (arg0->unk3C) { switch (arg0->unk3C) {
@ -250,8 +234,8 @@ void fn_1_2494(UnkM447Struct_06* arg0) {
case 1: case 1:
Hu3DModelPosSet(arg0->unk00[14], 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(arg0->unk00[14], 0.0f, 0.0f, 0.0f);
Hu3DMotionTimeSet(arg0->unk00[14], 0.0f); Hu3DMotionTimeSet(arg0->unk00[14], 0.0f);
Hu3DModelAttrReset(arg0->unk00[14], 1); Hu3DModelAttrReset(arg0->unk00[14], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk00[14], 0x40000001); Hu3DModelAttrSet(arg0->unk00[14], HU3D_MOTATTR_LOOP);
arg0->unk40 = 0; arg0->unk40 = 0;
arg0->unk3C = 2; arg0->unk3C = 2;
HuAudFXPlay(0x77E); HuAudFXPlay(0x77E);
@ -265,14 +249,15 @@ void fn_1_2494(UnkM447Struct_06* arg0) {
} }
break; break;
case 3: case 3:
Hu3DModelAttrSet(arg0->unk00[14], 1); Hu3DModelAttrSet(arg0->unk00[14], HU3D_ATTR_DISPOFF);
arg0->unk38 = 0; arg0->unk38 = 0;
arg0->unk3C = 0; arg0->unk3C = 0;
break; break;
} }
} }
void fn_1_25E4(UnkM447Struct_06* arg0) { void fn_1_25E4(UnkM447Struct_06 *arg0)
{
switch (arg0->unk3C) { switch (arg0->unk3C) {
case 0: case 0:
arg0->unk3C = 1; arg0->unk3C = 1;
@ -281,8 +266,8 @@ void fn_1_25E4(UnkM447Struct_06* arg0) {
fn_1_2D08(arg0); fn_1_2D08(arg0);
Hu3DModelPosSet(arg0->unk00[15], 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(arg0->unk00[15], 0.0f, 0.0f, 0.0f);
Hu3DMotionTimeSet(arg0->unk00[15], 0.0f); Hu3DMotionTimeSet(arg0->unk00[15], 0.0f);
Hu3DModelAttrReset(arg0->unk00[15], 1); Hu3DModelAttrReset(arg0->unk00[15], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->unk00[15], 0x40000001); Hu3DModelAttrSet(arg0->unk00[15], HU3D_MOTATTR_LOOP);
arg0->unk40 = 0; arg0->unk40 = 0;
arg0->unk3C = 2; arg0->unk3C = 2;
HuAudFXPlay(0x782); HuAudFXPlay(0x782);
@ -293,14 +278,15 @@ void fn_1_25E4(UnkM447Struct_06* arg0) {
} }
break; break;
case 3: case 3:
Hu3DModelAttrSet(arg0->unk00[15], 1); Hu3DModelAttrSet(arg0->unk00[15], HU3D_ATTR_DISPOFF);
arg0->unk38 = 0; arg0->unk38 = 0;
arg0->unk3C = 0; arg0->unk3C = 0;
break; break;
} }
} }
void fn_1_2700(UnkM447Struct_06* arg0) { void fn_1_2700(UnkM447Struct_06 *arg0)
{
float temp_f31; float temp_f31;
s16 temp_r29; s16 temp_r29;
s32 i; s32 i;
@ -323,7 +309,7 @@ void fn_1_2700(UnkM447Struct_06* arg0) {
} }
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
Hu3DMotionTimeSet(arg0->unk00[i + 3], 0.0f); Hu3DMotionTimeSet(arg0->unk00[i + 3], 0.0f);
Hu3DModelAttrSet(arg0->unk00[i + 3], 0x40000002); Hu3DModelAttrSet(arg0->unk00[i + 3], HU3D_MOTATTR_PAUSE);
arg0->unk54[i] = 0; arg0->unk54[i] = 0;
arg0->unk68[i] = 0; arg0->unk68[i] = 0;
} }
@ -334,8 +320,9 @@ void fn_1_2700(UnkM447Struct_06* arg0) {
temp_r29 = arg0->unk00[i + 8]; temp_r29 = arg0->unk00[i + 8];
Hu3DModelPosSet(temp_r29, lbl_1_rodata_190[i].x, lbl_1_rodata_190[i].y, lbl_1_rodata_190[i].z); Hu3DModelPosSet(temp_r29, lbl_1_rodata_190[i].x, lbl_1_rodata_190[i].y, lbl_1_rodata_190[i].z);
Hu3DMotionTimeSet(temp_r29, 0.0f); Hu3DMotionTimeSet(temp_r29, 0.0f);
Hu3DModelAttrReset(temp_r29, 1); Hu3DModelAttrReset(temp_r29, HU3D_ATTR_DISPOFF);
Hu3DGLightColorSet(arg0->unk2C[i + 1], lbl_1_data_A0[i + 1].unk18.r, lbl_1_data_A0[i + 1].unk18.g, lbl_1_data_A0[i + 1].unk18.b, lbl_1_data_A0[i + 1].unk18.a); Hu3DGLightColorSet(arg0->unk2C[i + 1], lbl_1_data_A0[i + 1].unk18.r, lbl_1_data_A0[i + 1].unk18.g, lbl_1_data_A0[i + 1].unk18.b,
lbl_1_data_A0[i + 1].unk18.a);
} }
arg0->unk40 = 0; arg0->unk40 = 0;
arg0->unk3C = 3; arg0->unk3C = 3;
@ -344,7 +331,7 @@ void fn_1_2700(UnkM447Struct_06* arg0) {
case 3: case 3:
if (arg0->unk40++ >= 60) { if (arg0->unk40++ >= 60) {
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
Hu3DModelAttrSet(arg0->unk00[i + 8], 1); Hu3DModelAttrSet(arg0->unk00[i + 8], HU3D_ATTR_DISPOFF);
Hu3DGLightColorSet(arg0->unk2C[i + 1], 0, 0, 0, 0); Hu3DGLightColorSet(arg0->unk2C[i + 1], 0, 0, 0, 0);
} }
arg0->unk3C = 4; arg0->unk3C = 4;
@ -357,7 +344,8 @@ void fn_1_2700(UnkM447Struct_06* arg0) {
} }
} }
void fn_1_2A3C(UnkM447Struct_06* arg0) { void fn_1_2A3C(UnkM447Struct_06 *arg0)
{
float temp_f31; float temp_f31;
s16 temp_r29; s16 temp_r29;
s32 i; s32 i;
@ -390,7 +378,7 @@ void fn_1_2A3C(UnkM447Struct_06* arg0) {
Hu3DModelPosSet(temp_r29, lbl_1_rodata_190[i].x, lbl_1_rodata_190[i].y, lbl_1_rodata_190[i].z); Hu3DModelPosSet(temp_r29, lbl_1_rodata_190[i].x, lbl_1_rodata_190[i].y, lbl_1_rodata_190[i].z);
Hu3DMotionTimeSet(temp_r29, 0.0f); Hu3DMotionTimeSet(temp_r29, 0.0f);
Hu3DModelAttrReset(temp_r29, 0x40000001); Hu3DModelAttrReset(temp_r29, 0x40000001);
Hu3DModelAttrReset(temp_r29, 1); Hu3DModelAttrReset(temp_r29, HU3D_ATTR_DISPOFF);
} }
arg0->unk40 = 0; arg0->unk40 = 0;
arg0->unk3C = 3; arg0->unk3C = 3;
@ -398,7 +386,7 @@ void fn_1_2A3C(UnkM447Struct_06* arg0) {
case 3: case 3:
if (arg0->unk40++ >= 20) { if (arg0->unk40++ >= 20) {
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
Hu3DModelAttrSet(arg0->unk00[i + 16], 1); Hu3DModelAttrSet(arg0->unk00[i + 16], HU3D_ATTR_DISPOFF);
} }
arg0->unk3C = 4; arg0->unk3C = 4;
break; break;
@ -411,9 +399,10 @@ void fn_1_2A3C(UnkM447Struct_06* arg0) {
} }
} }
void fn_1_2D08(UnkM447Struct_06* arg0) { void fn_1_2D08(UnkM447Struct_06 *arg0)
ModelData* temp_r30; {
ParticleData* temp_r31; ModelData *temp_r30;
ParticleData *temp_r31;
temp_r30 = &Hu3DData[arg0->unk00[21]]; temp_r30 = &Hu3DData[arg0->unk00[21]];
temp_r31 = temp_r30->unk_120; temp_r31 = temp_r30->unk_120;
@ -426,9 +415,10 @@ void fn_1_2D08(UnkM447Struct_06* arg0) {
HuAudFXPlay(0x780); HuAudFXPlay(0x780);
} }
void fn_1_2DAC(ModelData* model, ParticleData* particle, Mtx matrix) { void fn_1_2DAC(ModelData *model, ParticleData *particle, Mtx matrix)
{
GXColor sp8 = { 0xFF, 0xFF, 0xFF, 0xFF }; GXColor sp8 = { 0xFF, 0xFF, 0xFF, 0xFF };
HsfanimStruct01* var_r31; HsfanimStruct01 *var_r31;
s32 i; s32 i;
if (particle->unk_02 == 0) { if (particle->unk_02 == 0) {

545
src/REL/m448Dll/main.c
View file

File diff suppressed because it is too large Load diff

179
src/REL/m450Dll/main.c
View file

@ -2873,7 +2873,7 @@ void fn_1_AD58(omObjData *object)
fn_1_9F4C(var_r31, object->model[0], lbl_1_bss_4C, 0x7A); fn_1_9F4C(var_r31, object->model[0], lbl_1_bss_4C, 0x7A);
if (1000.0f > var_r31->unk_00.unk_6C.y) { if (1000.0f > var_r31->unk_00.unk_6C.y) {
var_r31->unk_150++; var_r31->unk_150++;
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
} }
break; break;
case 0xBBA: case 0xBBA:
@ -2883,7 +2883,7 @@ void fn_1_AD58(omObjData *object)
var_r31->unk_00.unk_9C = 270.0f; var_r31->unk_00.unk_9C = 270.0f;
fn_1_A470(var_r31, object, "m450mex06-s4kuppa", 2); fn_1_A470(var_r31, object, "m450mex06-s4kuppa", 2);
fn_1_4ED8(&var_r31->unk_00, 0); fn_1_4ED8(&var_r31->unk_00, 0);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
} }
break; break;
case 0xBBB: case 0xBBB:
@ -2903,7 +2903,7 @@ void fn_1_AD58(omObjData *object)
fn_1_9F4C(var_r31, object->model[0], &lbl_1_bss_4C[3], 0x78); fn_1_9F4C(var_r31, object->model[0], &lbl_1_bss_4C[3], 0x78);
if (1000.0f > var_r31->unk_00.unk_6C.y) { if (1000.0f > var_r31->unk_00.unk_6C.y) {
var_r31->unk_150++; var_r31->unk_150++;
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
lbl_1_bss_1A4->work[0] = 0x404; lbl_1_bss_1A4->work[0] = 0x404;
lbl_1_bss_128 = 0.0f; lbl_1_bss_128 = 0.0f;
} }
@ -2917,7 +2917,7 @@ void fn_1_AD58(omObjData *object)
MTXIdentity(Hu3DData[object->model[0]].unk_F0); MTXIdentity(Hu3DData[object->model[0]].unk_F0);
omSetSca(object, 1.0f, 1.0f, 1.0f); omSetSca(object, 1.0f, 1.0f, 1.0f);
Hu3DModelScaleSet(object->model[1], 1.5f, 1.5f, 1.5f); Hu3DModelScaleSet(object->model[1], 1.5f, 1.5f, 1.5f);
Hu3DModelAttrReset(object->model[1], 1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[1], 0x40000002); Hu3DModelAttrReset(object->model[1], 0x40000002);
Hu3DModelHookSet(object->model[1], "g000i00-itemhook_A", object->model[0]); Hu3DModelHookSet(object->model[1], "g000i00-itemhook_A", object->model[0]);
var_r31->unk_00.unk_6C.x = 0.0f; var_r31->unk_00.unk_6C.x = 0.0f;
@ -2927,7 +2927,7 @@ void fn_1_AD58(omObjData *object)
fn_1_4ED8(&var_r31->unk_00, 0); fn_1_4ED8(&var_r31->unk_00, 0);
var_r31->unk_00.unk_3C |= 0x2020; var_r31->unk_00.unk_3C |= 0x2020;
Hu3DMotionSet(object->model[0], object->motion[7]); Hu3DMotionSet(object->model[0], object->motion[7]);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
} }
break; break;
case 0xBBE: case 0xBBE:
@ -3020,8 +3020,8 @@ void fn_1_AD58(omObjData *object)
var_r31->unk_150++; var_r31->unk_150++;
var_r31->unk_154 &= ~2; var_r31->unk_154 &= ~2;
Hu3DModelHookObjReset(object->model[1], "g000i00-itemhook_A"); Hu3DModelHookObjReset(object->model[1], "g000i00-itemhook_A");
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
lbl_1_bss_1A4->work[0] = 0x410; lbl_1_bss_1A4->work[0] = 0x410;
lbl_1_bss_128 = 0.0f; lbl_1_bss_128 = 0.0f;
} }
@ -3034,7 +3034,7 @@ void fn_1_AD58(omObjData *object)
var_r31->unk_00.unk_9C = 0.0f; var_r31->unk_00.unk_9C = 0.0f;
fn_1_A470(var_r31, object, "m450mex06-s6kuppa01", 2); fn_1_A470(var_r31, object, "m450mex06-s6kuppa01", 2);
fn_1_4ED8(&var_r31->unk_00, 0); fn_1_4ED8(&var_r31->unk_00, 0);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
} }
break; break;
case 0xBC5: case 0xBC5:
@ -3158,7 +3158,7 @@ void fn_1_AD58(omObjData *object)
} }
if (Hu3DMotionEndCheck(object->model[0]) != 0) { if (Hu3DMotionEndCheck(object->model[0]) != 0) {
var_r31->unk_154 |= 0x40; var_r31->unk_154 |= 0x40;
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DMotionSet(object->model[0], object->motion[14]); Hu3DMotionSet(object->model[0], object->motion[14]);
} }
} }
@ -3217,7 +3217,7 @@ void fn_1_AD58(omObjData *object)
var_r31->unk_E0 = 0.0f; var_r31->unk_E0 = 0.0f;
var_r31->unk_154 &= ~0x8000; var_r31->unk_154 &= ~0x8000;
Hu3DMotionShiftSet(object->model[0], object->motion[0], 0.0f, 8.0f, 0x40000001); Hu3DMotionShiftSet(object->model[0], object->motion[0], 0.0f, 8.0f, 0x40000001);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 1); Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], HU3D_ATTR_DISPOFF);
} }
break; break;
case 0xBCF: case 0xBCF:
@ -3255,9 +3255,9 @@ void fn_1_AD58(omObjData *object)
150.0f + var_r31->unk_00.unk_6C.z); 150.0f + var_r31->unk_00.unk_6C.z);
Hu3DModelScaleSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 2.0f, 2.0f, 2.0f); Hu3DModelScaleSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 2.0f, 2.0f, 2.0f);
Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 0.0f);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 0x40000002); Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], 1); Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], HU3D_ATTR_DISPOFF);
} }
} }
if (var_r31->unk_150 != 0xBCF) { if (var_r31->unk_150 != 0xBCF) {
@ -3348,7 +3348,7 @@ void fn_1_DBF0(omObjData *object)
for (var_r29 = 0; var_r29 < 2; var_r29++) { for (var_r29 = 0; var_r29 < 2; var_r29++) {
object->model[var_r29] = Hu3DModelCreateFile(lbl_1_data_AC[var_r29]); object->model[var_r29] = Hu3DModelCreateFile(lbl_1_data_AC[var_r29]);
Hu3DModelAttrSet(object->model[var_r29], 0x4001); Hu3DModelAttrSet(object->model[var_r29], 0x4001);
Hu3DModelAttrSet(object->model[var_r29], 0x40000001); Hu3DModelAttrSet(object->model[var_r29], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[var_r29], 0x40000002); Hu3DModelAttrReset(object->model[var_r29], 0x40000002);
Hu3DModelLayerSet(object->model[var_r29], 3); Hu3DModelLayerSet(object->model[var_r29], 3);
Hu3DModelShadowSet(object->model[var_r29]); Hu3DModelShadowSet(object->model[var_r29]);
@ -3383,7 +3383,7 @@ void fn_1_DBF0(omObjData *object)
omSetTra(var_r31->unk_00.unk_00, var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, var_r31->unk_00.unk_6C.z); omSetTra(var_r31->unk_00.unk_00, var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, var_r31->unk_00.unk_6C.z);
omSetRot(var_r31->unk_00.unk_00, 0.0f, var_r31->unk_00.unk_9C, 0.0f); omSetRot(var_r31->unk_00.unk_00, 0.0f, var_r31->unk_00.unk_9C, 0.0f);
omSetSca(object, 1.5f, 1.5f, 1.5f); omSetSca(object, 1.5f, 1.5f, 1.5f);
Hu3DModelAttrReset(*object->model, 1); Hu3DModelAttrReset(*object->model, HU3D_ATTR_DISPOFF);
object->func = (omObjFunc)fn_1_AD58; object->func = (omObjFunc)fn_1_AD58;
} }
@ -3447,13 +3447,13 @@ void fn_1_E3C8(UnkM450Struct3 *arg0, omObjData *arg1, s32 arg2)
s32 var_r30; s32 var_r30;
if (arg2 != 0) { if (arg2 != 0) {
if (arg1->work[0] == 0) { if (arg1->work[0] == 0) {
Hu3DModelAttrReset(arg1->model[1], 1); Hu3DModelAttrReset(arg1->model[1], HU3D_ATTR_DISPOFF);
} }
Hu3DModelAttrReset(arg1->model[0], 1); Hu3DModelAttrReset(arg1->model[0], HU3D_ATTR_DISPOFF);
} }
else { else {
for (var_r30 = 0; var_r30 < 5; var_r30++) { for (var_r30 = 0; var_r30 < 5; var_r30++) {
Hu3DModelAttrSet(arg1->model[var_r30], 1); Hu3DModelAttrSet(arg1->model[var_r30], HU3D_ATTR_DISPOFF);
} }
} }
arg0->unk_00.unk_3C &= ~0xC00; arg0->unk_00.unk_3C &= ~0xC00;
@ -3552,14 +3552,14 @@ void fn_1_EB6C(UnkM450Struct3 *arg0, omObjData *arg1)
fn_1_1D18(arg1->model[4], "g007i03-itemhook_M", &arg0->unk_00.unk_6C); fn_1_1D18(arg1->model[4], "g007i03-itemhook_M", &arg0->unk_00.unk_6C);
Hu3DModelHookObjReset(arg1->model[4], "g007i03-itemhook_M"); Hu3DModelHookObjReset(arg1->model[4], "g007i03-itemhook_M");
Hu3DModelAttrSet(arg1->model[4], 1); Hu3DModelAttrSet(arg1->model[4], HU3D_ATTR_DISPOFF);
arg0->unk_150 = 0xFAE; arg0->unk_150 = 0xFAE;
arg0->unk_154 &= 0xFFFFFFFD; arg0->unk_154 &= 0xFFFFFFFD;
arg0->unk_108 = 19.6f; arg0->unk_108 = 19.6f;
arg0->unk_E0 = 0.0f; arg0->unk_E0 = 0.0f;
Hu3DMotionSet(arg1->model[0], arg1->motion[6]); Hu3DMotionSet(arg1->model[0], arg1->motion[6]);
Hu3DModelAttrReset(arg1->model[0], 0x40000001); Hu3DModelAttrReset(arg1->model[0], 0x40000001);
Hu3DModelAttrSet(arg1->model[0], 0x40000002); Hu3DModelAttrSet(arg1->model[0], HU3D_MOTATTR_PAUSE);
Hu3DMotionTimeSet(arg1->model[0], 1.0f); Hu3DMotionTimeSet(arg1->model[0], 1.0f);
arg0->unk_13C = Hu3DParManLink(lbl_1_bss_24, &lbl_1_data_1504); arg0->unk_13C = Hu3DParManLink(lbl_1_bss_24, &lbl_1_data_1504);
Hu3DParManPosSet(arg0->unk_13C, arg0->unk_00.unk_6C.x, arg0->unk_00.unk_6C.y, arg0->unk_00.unk_6C.z); Hu3DParManPosSet(arg0->unk_13C, arg0->unk_00.unk_6C.x, arg0->unk_00.unk_6C.y, arg0->unk_00.unk_6C.z);
@ -3662,7 +3662,7 @@ void fn_1_ED4C(omObjData *object)
var_r31->unk_E0 = 0.0f; var_r31->unk_E0 = 0.0f;
var_r31->unk_E8 = 360.0f * frandf(); var_r31->unk_E8 = 360.0f * frandf();
var_r31->unk_154 |= 2; var_r31->unk_154 |= 2;
Hu3DModelAttrReset(object->model[4], 1); Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[4], 0x40000002); Hu3DModelAttrReset(object->model[4], 0x40000002);
Hu3DModelHookSet(object->model[4], "g007i03-itemhook_M", object->model[0]); Hu3DModelHookSet(object->model[4], "g007i03-itemhook_M", object->model[0]);
var_r31->unk_00.unk_6C.x = 0.0f; var_r31->unk_00.unk_6C.x = 0.0f;
@ -3828,7 +3828,7 @@ void fn_1_ED4C(omObjData *object)
case 0xFAF: case 0xFAF:
if (lbl_1_bss_1A4->work[0] >= 0x403) { if (lbl_1_bss_1A4->work[0] >= 0x403) {
var_r31->unk_150 = var_r31->unk_150 + 1; var_r31->unk_150 = var_r31->unk_150 + 1;
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
} }
break; break;
case 0xFB0: case 0xFB0:
@ -3933,9 +3933,9 @@ void fn_1_11D5C(omObjData *object)
omSetTra(var_r31->unk_00.unk_00, var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, var_r31->unk_00.unk_6C.z); omSetTra(var_r31->unk_00.unk_00, var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, var_r31->unk_00.unk_6C.z);
omSetRot(var_r31->unk_00.unk_00, 0.0f, var_r31->unk_00.unk_9C, 0.0f); omSetRot(var_r31->unk_00.unk_00, 0.0f, var_r31->unk_00.unk_9C, 0.0f);
if (object->work[0] == 0) { if (object->work[0] == 0) {
Hu3DModelAttrReset(object->model[1], 1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
} }
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
var_r31->unk_00.unk_3C &= ~0xC00; var_r31->unk_00.unk_3C &= ~0xC00;
object->func = (omObjFunc)fn_1_ED4C; object->func = (omObjFunc)fn_1_ED4C;
} }
@ -3990,7 +3990,7 @@ void fn_1_12234(void)
for (var_r30 = 0; var_r30 < var_r27; var_r30++) { for (var_r30 = 0; var_r30 < var_r27; var_r30++) {
espDrawNoSet(var_r31->unk_18[var_r30], 0); espDrawNoSet(var_r31->unk_18[var_r30], 0);
espDispOff(var_r31->unk_18[var_r30]); espDispOff(var_r31->unk_18[var_r30]);
espAttrSet(var_r31->unk_18[var_r30], 1); espAttrSet(var_r31->unk_18[var_r30], HUSPR_ATTR_NOANIM);
espBankSet(var_r31->unk_18[var_r30], 0); espBankSet(var_r31->unk_18[var_r30], 0);
espPriSet(var_r31->unk_18[var_r30], 0x80 - var_r29); espPriSet(var_r31->unk_18[var_r30], 0x80 - var_r29);
espPosSet(var_r31->unk_18[var_r30], var_r28, 225.0f); espPosSet(var_r31->unk_18[var_r30], var_r28, 225.0f);
@ -4064,15 +4064,15 @@ void fn_1_12688(omObjData *object)
omSetRot(object, 0.0f, var_f29, 0.0f); omSetRot(object, 0.0f, var_f29, 0.0f);
omSetSca(object, var_f31, var_f30, var_f31); omSetSca(object, var_f31, var_f30, var_f31);
Hu3DMotionTimeSet(object->model[0], 0.0f); Hu3DMotionTimeSet(object->model[0], 0.0f);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[0], 0x40000002); Hu3DModelAttrReset(object->model[0], 0x40000002);
HuAudFXPlay(0x7C0); HuAudFXPlay(0x7C0);
} }
} }
else if (Hu3DMotionEndCheck(object->model[0]) != 0) { else if (Hu3DMotionEndCheck(object->model[0]) != 0) {
object->work[0] = frandmod(0x258); object->work[0] = frandmod(0x258);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000002); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
} }
} }
@ -4083,7 +4083,7 @@ void fn_1_1291C(omObjData *object)
omSetRot(object, 0.0f, 0.0f, 0.0f); omSetRot(object, 0.0f, 0.0f, 0.0f);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M450, 0x22)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M450, 0x22));
Hu3DModelAttrSet(object->model[0], 0x4001); Hu3DModelAttrSet(object->model[0], 0x4001);
Hu3DModelAttrSet(object->model[0], 0x40000002); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[0], 0x40000001); Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelLayerSet(object->model[0], 1); Hu3DModelLayerSet(object->model[0], 1);
object->func = fn_1_12688; object->func = fn_1_12688;
@ -4416,7 +4416,8 @@ s32 lbl_1_data_F00[0x17] = {
DATA_MAKE_NUM(DATADIR_M450, 0x0F), DATA_MAKE_NUM(DATADIR_M450, 0x0F),
DATA_MAKE_NUM(DATADIR_M450, 0x0F), DATA_MAKE_NUM(DATADIR_M450, 0x0F),
}; };
s32 lbl_1_data_F5C[4] = { DATA_MAKE_NUM(DATADIR_M450, 0x24), DATA_MAKE_NUM(DATADIR_M450, 0x25), DATA_MAKE_NUM(DATADIR_M450, 0x26), DATA_MAKE_NUM(DATADIR_M450, 0x27) }; s32 lbl_1_data_F5C[4]
= { DATA_MAKE_NUM(DATADIR_M450, 0x24), DATA_MAKE_NUM(DATADIR_M450, 0x25), DATA_MAKE_NUM(DATADIR_M450, 0x26), DATA_MAKE_NUM(DATADIR_M450, 0x27) };
s32 lbl_1_data_F6C[6] = { 0, 0xE10, 0x4650, 0xE10, 0x4650, 0x4650 }; s32 lbl_1_data_F6C[6] = { 0, 0xE10, 0x4650, 0xE10, 0x4650, 0x4650 };
float lbl_1_data_F84[5] = { 1200.0f, 1500.0f, 0.0f, 200.0f, 300.0f }; float lbl_1_data_F84[5] = { 1200.0f, 1500.0f, 0.0f, 200.0f, 300.0f };
float lbl_1_data_F98[5] = { 1200.0f, 1500.0f, 0.0f, 200.0f, 300.0f }; float lbl_1_data_F98[5] = { 1200.0f, 1500.0f, 0.0f, 200.0f, 300.0f };
@ -4510,15 +4511,15 @@ void fn_1_12A1C(omObjData *object)
var_f30 = (1500.0f * frandf()) - 750.0f; var_f30 = (1500.0f * frandf()) - 750.0f;
omSetTra(object, var_f31, 1380.0f, var_f30); omSetTra(object, var_f31, 1380.0f, var_f30);
Hu3DMotionTimeSet(object->model[0], 0.0f); Hu3DMotionTimeSet(object->model[0], 0.0f);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[0], 0x40000002); Hu3DModelAttrReset(object->model[0], 0x40000002);
} }
} }
} }
else if (Hu3DMotionEndCheck(object->model[0]) != 0) { else if (Hu3DMotionEndCheck(object->model[0]) != 0) {
object->work[0] = frandmod(0xB4); object->work[0] = frandmod(0xB4);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000002); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
} }
} }
@ -4533,7 +4534,7 @@ void fn_1_12B80(omObjData *object)
object->model[0] = fn_1_46C(DATA_MAKE_NUM(DATADIR_M450, 0x23)); object->model[0] = fn_1_46C(DATA_MAKE_NUM(DATADIR_M450, 0x23));
Hu3DModelAttrSet(object->model[0], 0x4001); Hu3DModelAttrSet(object->model[0], 0x4001);
Hu3DModelAttrSet(object->model[0], 0x40000002); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[0], 0x40000001); Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelLayerSet(object->model[0], 1); Hu3DModelLayerSet(object->model[0], 1);
object->func = fn_1_12A1C; object->func = fn_1_12A1C;
@ -4546,8 +4547,8 @@ void fn_1_12D7C(omObjData *object)
omSetTra(object, 0.0f, 0.0f, 0.0f); omSetTra(object, 0.0f, 0.0f, 0.0f);
omSetRot(object, 0.0f, 0.0f, 0.0f); omSetRot(object, 0.0f, 0.0f, 0.0f);
object->model[0] = Hu3DModelCreateFile(lbl_1_data_F00[object->work[0]]); object->model[0] = Hu3DModelCreateFile(lbl_1_data_F00[object->work[0]]);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000002); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
object->func = fn_1_12D78; object->func = fn_1_12D78;
} }
@ -4565,7 +4566,7 @@ void fn_1_12E5C(s32 var_r30, s32 var_r29, s32 var_r31)
lbl_1_bss_1A0->model[var_r31], 1.0f, 1.0f, VECDistance(&lbl_1_data_1450[var_r30].unk_04, &lbl_1_data_1450[var_r29].unk_04) / 1000.0f); lbl_1_bss_1A0->model[var_r31], 1.0f, 1.0f, VECDistance(&lbl_1_data_1450[var_r30].unk_04, &lbl_1_data_1450[var_r29].unk_04) / 1000.0f);
Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r31], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r31], 0.0f);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31], 0x40000003); Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31], 0x40000003);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31], 1); Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31], HU3D_ATTR_DISPOFF);
} }
void fn_1_130A4(Vec *arg0, s32 var_r30) void fn_1_130A4(Vec *arg0, s32 var_r30)
@ -4573,7 +4574,7 @@ void fn_1_130A4(Vec *arg0, s32 var_r30)
Hu3DModelPosSet(lbl_1_bss_1A0->model[var_r30], arg0->x, arg0->y, arg0->z); Hu3DModelPosSet(lbl_1_bss_1A0->model[var_r30], arg0->x, arg0->y, arg0->z);
Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r30], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r30], 0.0f);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r30], 0x40000003); Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r30], 0x40000003);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r30], 1); Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r30], HU3D_ATTR_DISPOFF);
HuAudFXPlay(0x7B7); HuAudFXPlay(0x7B7);
} }
@ -4643,7 +4644,7 @@ void fn_1_13560(UnkData1380Struct *arg0, s32 *arg1, s32 arg2)
fn_1_13174(arg0); fn_1_13174(arg0);
for (var_r30 = 0; var_r30 < arg0->unk_08; var_r30++) { for (var_r30 = 0; var_r30 < arg0->unk_08; var_r30++) {
if (arg0->unk_24[var_r30] >= 0) { if (arg0->unk_24[var_r30] >= 0) {
Hu3DModelAttrReset(lbl_1_bss_1A0->model[arg0->unk_24[var_r30]], 1); Hu3DModelAttrReset(lbl_1_bss_1A0->model[arg0->unk_24[var_r30]], HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -4984,7 +4985,7 @@ void fn_1_15308(omObjData *object)
for (var_r30 = 0; var_r30 < 0x21; var_r30++) { for (var_r30 = 0; var_r30 < 0x21; var_r30++) {
object->model[var_r30] = Hu3DModelCreateFile(lbl_1_data_E7C[var_r30]); object->model[var_r30] = Hu3DModelCreateFile(lbl_1_data_E7C[var_r30]);
Hu3DModelAttrSet(object->model[var_r30], 0x4001); Hu3DModelAttrSet(object->model[var_r30], 0x4001);
Hu3DModelAttrSet(object->model[var_r30], 0x40000001); Hu3DModelAttrSet(object->model[var_r30], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[var_r30], 0x40000002); Hu3DModelAttrReset(object->model[var_r30], 0x40000002);
Hu3DModelLayerSet(object->model[var_r30], 0); Hu3DModelLayerSet(object->model[var_r30], 0);
Hu3DModelPosSet(object->model[var_r30], 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(object->model[var_r30], 0.0f, 0.0f, 0.0f);
@ -5014,15 +5015,15 @@ void fn_1_15308(omObjData *object)
fn_1_14AB8(); fn_1_14AB8();
for (var_r30 = 0; var_r30 <= 1; var_r30++) { for (var_r30 = 0; var_r30 <= 1; var_r30++) {
Hu3DModelAttrReset(object->model[var_r30], 1); Hu3DModelAttrReset(object->model[var_r30], HU3D_ATTR_DISPOFF);
} }
Hu3DModelAttrReset(object->model[6], 1); Hu3DModelAttrReset(object->model[6], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[17], 1); Hu3DModelAttrReset(object->model[17], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[19], 1); Hu3DModelAttrReset(object->model[19], HU3D_ATTR_DISPOFF);
for (var_r30 = 0; var_r30 < 5; var_r30++) { for (var_r30 = 0; var_r30 < 5; var_r30++) {
Hu3DModelAttrSet(object->model[var_r30 + 0x14], 0x40000002); Hu3DModelAttrSet(object->model[var_r30 + 0x14], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(object->model[var_r30 + 0x14], 0x40000001); Hu3DModelAttrReset(object->model[var_r30 + 0x14], 0x40000001);
Hu3DModelAttrReset(object->model[var_r30 + 0x14], 1); Hu3DModelAttrReset(object->model[var_r30 + 0x14], HU3D_ATTR_DISPOFF);
} }
object->func = fn_1_14CE8; object->func = fn_1_14CE8;
} }
@ -5200,18 +5201,18 @@ void fn_1_16378(omObjData *object)
var_r31->unk_50 = var_r31->unk_50 - 1.0f; var_r31->unk_50 = var_r31->unk_50 - 1.0f;
if ((lbl_1_bss_308 & 1) != 0) { if ((lbl_1_bss_308 & 1) != 0) {
for (var_r30 = 0; var_r30 < 2; var_r30++) { for (var_r30 = 0; var_r30 < 2; var_r30++) {
Hu3DModelAttrSet(object->model[var_r30], 1); Hu3DModelAttrSet(object->model[var_r30], HU3D_ATTR_DISPOFF);
} }
} }
else { else {
for (var_r30 = 0; var_r30 < 2; var_r30++) { for (var_r30 = 0; var_r30 < 2; var_r30++) {
Hu3DModelAttrReset(object->model[var_r30], 1); Hu3DModelAttrReset(object->model[var_r30], HU3D_ATTR_DISPOFF);
} }
} }
if (0.0f > var_r31->unk_50) { if (0.0f > var_r31->unk_50) {
Hu3DModelShadowReset(object->model[0]); Hu3DModelShadowReset(object->model[0]);
for (var_r30 = 0; var_r30 < 2; var_r30++) { for (var_r30 = 0; var_r30 < 2; var_r30++) {
Hu3DModelAttrSet(object->model[var_r30], 1); Hu3DModelAttrSet(object->model[var_r30], HU3D_ATTR_DISPOFF);
} }
fn_1_24(0x1000, object->model[0]); fn_1_24(0x1000, object->model[0]);
fn_1_24(0x2000, object->model[1]); fn_1_24(0x2000, object->model[1]);
@ -5267,7 +5268,7 @@ void fn_1_16910(omObjData *object)
object->model[1] = var_r26; object->model[1] = var_r26;
} }
for (var_r27 = 0; var_r27 < 2; var_r27++) { for (var_r27 = 0; var_r27 < 2; var_r27++) {
Hu3DModelAttrSet(object->model[var_r27], 1); Hu3DModelAttrSet(object->model[var_r27], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[var_r27], 0x40000003); Hu3DModelAttrReset(object->model[var_r27], 0x40000003);
Hu3DModelLayerSet(object->model[var_r27], 4); Hu3DModelLayerSet(object->model[var_r27], 4);
Hu3DMotionTimeSet(object->model[var_r27], 0.0f); Hu3DMotionTimeSet(object->model[var_r27], 0.0f);
@ -5277,8 +5278,8 @@ void fn_1_16910(omObjData *object)
omSetTra(object, var_r30->unk_00.x, var_r30->unk_00.y, var_r30->unk_00.z); omSetTra(object, var_r30->unk_00.x, var_r30->unk_00.y, var_r30->unk_00.z);
omSetRot(object, 0.0f, 0.0f, 0.0f); omSetRot(object, 0.0f, 0.0f, 0.0f);
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[1], 1); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
object->func = fn_1_16378; object->func = fn_1_16378;
} }
@ -5324,7 +5325,7 @@ void fn_1_16CF4(omObjData *object)
if (var_r31->unk_78 != 0) { if (var_r31->unk_78 != 0) {
var_r31->unk_40 = var_r31->unk_40 - 0.1f; var_r31->unk_40 = var_r31->unk_40 - 0.1f;
if (0.0f > var_r31->unk_40) { if (0.0f > var_r31->unk_40) {
Hu3DModelAttrSet(*object->model, 1); Hu3DModelAttrSet(*object->model, HU3D_ATTR_DISPOFF);
fn_1_24(0x3000, object->model[0]); fn_1_24(0x3000, object->model[0]);
omDelObjEx(lbl_1_bss_33C, object); omDelObjEx(lbl_1_bss_33C, object);
return; return;
@ -5380,13 +5381,13 @@ void fn_1_171C4(omObjData *object)
else { else {
object->model[0] = var_r26; object->model[0] = var_r26;
} }
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(object->model[0], 0x40000002); Hu3DModelAttrReset(object->model[0], 0x40000002);
Hu3DModelLayerSet(object->model[0], 4); Hu3DModelLayerSet(object->model[0], 4);
omSetTra(object, var_r29->unk_00.x, var_r29->unk_00.y, var_r29->unk_00.z); omSetTra(object, var_r29->unk_00.x, var_r29->unk_00.y, var_r29->unk_00.z);
omSetRot(object, 0.0f, 0.0f, 0.0f); omSetRot(object, 0.0f, 0.0f, 0.0f);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
object->func = fn_1_16CF4; object->func = fn_1_16CF4;
} }
@ -5425,7 +5426,7 @@ void fn_1_17474(omObjData *object)
if (var_r31->unk_74 != 0) { if (var_r31->unk_74 != 0) {
fn_1_1D18(var_r31->unk_54, "g000m0-itemhook_R", &sp8); fn_1_1D18(var_r31->unk_54, "g000m0-itemhook_R", &sp8);
if (Hu3DMotionShiftIDGet(var_r31->unk_54) < 0) { if (Hu3DMotionShiftIDGet(var_r31->unk_54) < 0) {
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
if (165.0f <= Hu3DMotionTimeGet(var_r31->unk_54)) { if (165.0f <= Hu3DMotionTimeGet(var_r31->unk_54)) {
HuAudFXPlay(0x7B0); HuAudFXPlay(0x7B0);
var_r31->unk_74 = 0; var_r31->unk_74 = 0;
@ -5469,7 +5470,7 @@ void fn_1_17474(omObjData *object)
var_r31->unk_40 = var_r31->unk_40 - 0.05f; var_r31->unk_40 = var_r31->unk_40 - 0.05f;
if (0.0f > var_r31->unk_40) { if (0.0f > var_r31->unk_40) {
Hu3DModelShadowReset(object->model[0]); Hu3DModelShadowReset(object->model[0]);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
fn_1_24(0x4000, object->model[0]); fn_1_24(0x4000, object->model[0]);
omDelObjEx(lbl_1_bss_33C, object); omDelObjEx(lbl_1_bss_33C, object);
return; return;
@ -5518,8 +5519,8 @@ void fn_1_17970(s32 arg0, s32 arg1, float arg8)
else { else {
var_r31->model[0] = var_r26; var_r31->model[0] = var_r26;
} }
Hu3DModelAttrSet(var_r31->model[0], 1); Hu3DModelAttrSet(var_r31->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->model[0], 0x40000001); Hu3DModelAttrSet(var_r31->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(var_r31->model[0], 0x40000002); Hu3DModelAttrReset(var_r31->model[0], 0x40000002);
Hu3DModelLayerSet(var_r31->model[0], 4); Hu3DModelLayerSet(var_r31->model[0], 4);
omSetTra(var_r31, 0.0f, 0.0f, 0.0f); omSetTra(var_r31, 0.0f, 0.0f, 0.0f);
@ -5568,7 +5569,7 @@ void fn_1_17BBC(omObjData *object)
var_r31->unk_0C = spC; var_r31->unk_0C = spC;
if ((var_r31->unk_74 != 0) && (var_r22->unk_150 >= 0xBCE)) { if ((var_r31->unk_74 != 0) && (var_r22->unk_150 >= 0xBCE)) {
Hu3DModelShadowReset(object->model[0]); Hu3DModelShadowReset(object->model[0]);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelHookObjReset(var_r31->unk_54, "g000m0-itemhook_R"); Hu3DModelHookObjReset(var_r31->unk_54, "g000m0-itemhook_R");
fn_1_24(0x4000, object->model[0]); fn_1_24(0x4000, object->model[0]);
omDelObjEx(lbl_1_bss_33C, object); omDelObjEx(lbl_1_bss_33C, object);
@ -5608,7 +5609,7 @@ void fn_1_17BBC(omObjData *object)
var_r31->unk_40 = var_r31->unk_40 - 0.05f; var_r31->unk_40 = var_r31->unk_40 - 0.05f;
if (0.0f > var_r31->unk_40) { if (0.0f > var_r31->unk_40) {
Hu3DModelShadowReset(*object->model); Hu3DModelShadowReset(*object->model);
Hu3DModelAttrSet(*object->model, 1); Hu3DModelAttrSet(*object->model, HU3D_ATTR_DISPOFF);
fn_1_24(0x4000, object->model[0]); fn_1_24(0x4000, object->model[0]);
omDelObjEx(lbl_1_bss_33C, object); omDelObjEx(lbl_1_bss_33C, object);
return; return;
@ -5660,15 +5661,15 @@ void fn_1_18424(s32 arg0, Vec *arg1)
else { else {
var_r31->model[0] = var_r26; var_r31->model[0] = var_r26;
} }
Hu3DModelAttrSet(var_r31->model[0], 1); Hu3DModelAttrSet(var_r31->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(var_r31->model[0], 0x40000001); Hu3DModelAttrSet(var_r31->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(var_r31->model[0], 0x40000002); Hu3DModelAttrReset(var_r31->model[0], 0x40000002);
Hu3DModelLayerSet(var_r31->model[0], 4); Hu3DModelLayerSet(var_r31->model[0], 4);
omSetTra(var_r31, 0.0f, 0.0f, 0.0f); omSetTra(var_r31, 0.0f, 0.0f, 0.0f);
omSetRot(var_r31, 0.0f, 0.0f, 0.0f); omSetRot(var_r31, 0.0f, 0.0f, 0.0f);
omSetSca(var_r31, 1.0f, 1.0f, 1.0f); omSetSca(var_r31, 1.0f, 1.0f, 1.0f);
Hu3DModelHookSet(var_r30->unk_54, "g000m0-itemhook_R", var_r31->model[0]); Hu3DModelHookSet(var_r30->unk_54, "g000m0-itemhook_R", var_r31->model[0]);
Hu3DModelAttrReset(var_r31->model[0], 1); Hu3DModelAttrReset(var_r31->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(var_r31->model[0]); Hu3DModelShadowSet(var_r31->model[0]);
Hu3DModelShadowDispOff(var_r31->model[0]); Hu3DModelShadowDispOff(var_r31->model[0]);
} }
@ -5700,7 +5701,7 @@ void fn_1_186A8(void)
lbl_1_bss_C4++; lbl_1_bss_C4++;
lbl_1_bss_C8 = 0.0f; lbl_1_bss_C8 = 0.0f;
Hu3DModelPosSet(lbl_1_bss_1A0->model[28], 0.0f, 1501.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_1A0->model[28], 0.0f, 1501.0f, 0.0f);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[28], 1); Hu3DModelAttrReset(lbl_1_bss_1A0->model[28], HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[28], 0.0f); Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[28], 0.0f);
var_r26 = &Hu3DData[lbl_1_bss_1A0->model[28]]; var_r26 = &Hu3DData[lbl_1_bss_1A0->model[28]];
var_r25 = var_r26->hsfData->object; var_r25 = var_r26->hsfData->object;
@ -5765,14 +5766,14 @@ void fn_1_186A8(void)
lbl_1_bss_C8 += 1.0f; lbl_1_bss_C8 += 1.0f;
if (60.0f <= lbl_1_bss_C8) { if (60.0f <= lbl_1_bss_C8) {
lbl_1_bss_C4 = -1; lbl_1_bss_C4 = -1;
Hu3DModelAttrSet(lbl_1_bss_1A0->model[28], 1); Hu3DModelAttrSet(lbl_1_bss_1A0->model[28], HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[28], 1.0f); Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[28], 1.0f);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[29], 1); Hu3DModelAttrSet(lbl_1_bss_1A0->model[29], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[30], 1); Hu3DModelAttrSet(lbl_1_bss_1A0->model[30], HU3D_ATTR_DISPOFF);
for (var_r31 = 0; var_r31 < 3; var_r31++) { for (var_r31 = 0; var_r31 < 3; var_r31++) {
lbl_1_data_1450[lbl_1_bss_B8[0]].unk_1C = 0; lbl_1_data_1450[lbl_1_bss_B8[0]].unk_1C = 0;
fn_1_1B510(lbl_1_bss_B8[0]); fn_1_1B510(lbl_1_bss_B8[0]);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31 + 0x19], 1); Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31 + 0x19], HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[var_r31 + 0x19], 1.0f); Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[var_r31 + 0x19], 1.0f);
} }
fn_1_1B4C8(var_r30); fn_1_1B4C8(var_r30);
@ -5999,7 +6000,7 @@ void fn_1_19CE0(omObjData *object)
if (var_r31->unk_FC & 0x100) { if (var_r31->unk_FC & 0x100) {
var_r31->unk_FC |= 0x402; var_r31->unk_FC |= 0x402;
Hu3DModelAttrReset(object->model[0], 0x40000001); Hu3DModelAttrReset(object->model[0], 0x40000001);
Hu3DModelAttrSet(object->model[0], 0x40000002); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DMotionSet(object->model[0], object->motion[14]); Hu3DMotionSet(object->model[0], object->motion[14]);
Hu3DMotionTimeSet(object->model[0], 48.0f); Hu3DMotionTimeSet(object->model[0], 48.0f);
} }
@ -6013,9 +6014,9 @@ void fn_1_19CE0(omObjData *object)
Hu3DModelPosSet( Hu3DModelPosSet(
lbl_1_bss_1A0->model[var_r31->unk_110 + 2], var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, 50.0f + var_r31->unk_00.unk_6C.z); lbl_1_bss_1A0->model[var_r31->unk_110 + 2], var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, 50.0f + var_r31->unk_00.unk_6C.z);
Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 0.0f); Hu3DMotionTimeSet(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 0.0f);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], HU3D_MOTATTR_LOOP);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 0x40000002); Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 0x40000002);
Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 1); Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], HU3D_ATTR_DISPOFF);
} }
if (var_r31->unk_FC & 0x100000) { if (var_r31->unk_FC & 0x100000) {
var_r31->unk_FC |= 0x400002; var_r31->unk_FC |= 0x400002;
@ -6279,7 +6280,7 @@ void fn_1_1B510(s32 sp8)
var_r29->unk_10C--; var_r29->unk_10C--;
lbl_1_bss_B8[var_r30] = -1; lbl_1_bss_B8[var_r30] = -1;
for (var_r31 = 0; var_r31 < 3; var_r31++) { for (var_r31 = 0; var_r31 < 3; var_r31++) {
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31 + 0x19], 1); Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31 + 0x19], HU3D_ATTR_DISPOFF);
} }
for (var_r31 = var_r30; var_r31 < 2; var_r31++) { for (var_r31 = var_r30; var_r31 < 2; var_r31++) {
lbl_1_bss_B8[var_r31] = lbl_1_bss_B8[var_r31 + 1]; lbl_1_bss_B8[var_r31] = lbl_1_bss_B8[var_r31 + 1];
@ -6426,7 +6427,7 @@ void fn_1_1C434(UnkM450Struct5 *arg0, omObjData *arg1)
lbl_1_bss_1A4->work[0] += 1; lbl_1_bss_1A4->work[0] += 1;
lbl_1_bss_128 = 0.0f; lbl_1_bss_128 = 0.0f;
fn_1_4ED8(&arg0->unk_00, 0); fn_1_4ED8(&arg0->unk_00, 0);
Hu3DModelAttrReset(arg1->model[0], 1); Hu3DModelAttrReset(arg1->model[0], HU3D_ATTR_DISPOFF);
arg1->func = fn_1_20170; arg1->func = fn_1_20170;
} }
@ -6510,7 +6511,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
if (120.0f < var_r31->unk_F8) { if (120.0f < var_r31->unk_F8) {
var_r31->unk_FC &= ~0x40000; var_r31->unk_FC &= ~0x40000;
fn_1_4ED8(&var_r31->unk_00, 0); fn_1_4ED8(&var_r31->unk_00, 0);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], 1); Hu3DModelAttrSet(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], HU3D_ATTR_DISPOFF);
} }
return 0; return 0;
} }
@ -6528,10 +6529,10 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
return 0; return 0;
} }
if ((var_r31->unk_100 & 1) == 0) { if ((var_r31->unk_100 & 1) == 0) {
Hu3DModelAttrSet(var_r30->model[0], 1); Hu3DModelAttrSet(var_r30->model[0], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrReset(var_r30->model[0], 1); Hu3DModelAttrReset(var_r30->model[0], HU3D_ATTR_DISPOFF);
} }
if (--var_r31->unk_100 < 0) { if (--var_r31->unk_100 < 0) {
var_r31->unk_FC &= ~0x70; var_r31->unk_FC &= ~0x70;
@ -6540,7 +6541,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
var_r31->unk_FC &= ~0x70000; var_r31->unk_FC &= ~0x70000;
var_r31->unk_FC &= ~0x700004; var_r31->unk_FC &= ~0x700004;
var_r31->unk_FC &= ~0x2; var_r31->unk_FC &= ~0x2;
Hu3DModelAttrReset(var_r30->model[0], 1); Hu3DModelAttrReset(var_r30->model[0], HU3D_ATTR_DISPOFF);
} }
return 1; return 1;
} }
@ -6685,7 +6686,7 @@ void fn_1_1E150(omObjData *var_r29)
var_r31->unk_118 = 0x7EB; var_r31->unk_118 = 0x7EB;
Hu3DModelAttrReset(*var_r29->model, 0x40000003); Hu3DModelAttrReset(*var_r29->model, 0x40000003);
Hu3DMotionShiftSet(*var_r29->model, var_r29->motion[22], 0.0f, 8.0f, 0); Hu3DMotionShiftSet(*var_r29->model, var_r29->motion[22], 0.0f, 8.0f, 0);
Hu3DModelAttrReset(*var_r29->model, 1); Hu3DModelAttrReset(*var_r29->model, HU3D_ATTR_DISPOFF);
var_r29->func = fn_1_20170; var_r29->func = fn_1_20170;
return; return;
} }
@ -6721,7 +6722,7 @@ void fn_1_1E150(omObjData *var_r29)
var_r31->unk_00.unk_3C &= ~0x2; var_r31->unk_00.unk_3C &= ~0x2;
} }
Hu3DMotionSet(var_r29->model[0], var_r29->motion[8]); Hu3DMotionSet(var_r29->model[0], var_r29->motion[8]);
Hu3DModelAttrReset(var_r29->model[0], 1); Hu3DModelAttrReset(var_r29->model[0], HU3D_ATTR_DISPOFF);
fn_1_125C0(0, 0); fn_1_125C0(0, 0);
var_r29->func = fn_1_20170; var_r29->func = fn_1_20170;
return; return;
@ -7205,13 +7206,13 @@ void fn_1_23330(omObjData *object)
object->motion[var_r29] = CharModelMotionCreate(lbl_1_data_0[var_r31->unk_11C], lbl_1_data_64C[var_r31->unk_11C][var_r29]); object->motion[var_r29] = CharModelMotionCreate(lbl_1_data_0[var_r31->unk_11C], lbl_1_data_64C[var_r31->unk_11C][var_r29]);
CharModelMotionSet(lbl_1_data_0[var_r31->unk_11C], object->motion[var_r29]); CharModelMotionSet(lbl_1_data_0[var_r31->unk_11C], object->motion[var_r29]);
} }
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[0], 2); Hu3DModelLayerSet(object->model[0], 2);
Hu3DMotionSet(object->model[0], *object->motion); Hu3DMotionSet(object->model[0], *object->motion);
omSetTra(var_r31->unk_00.unk_00, var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, var_r31->unk_00.unk_6C.z); omSetTra(var_r31->unk_00.unk_00, var_r31->unk_00.unk_6C.x, var_r31->unk_00.unk_6C.y, var_r31->unk_00.unk_6C.z);
omSetRot(var_r31->unk_00.unk_00, 0.0f, var_r31->unk_00.unk_9C, 0.0f); omSetRot(var_r31->unk_00.unk_00, 0.0f, var_r31->unk_00.unk_9C, 0.0f);
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
CharModelLayerSetAll2(6); CharModelLayerSetAll2(6);
CharModelMotionDataClose(lbl_1_data_0[var_r31->unk_11C]); CharModelMotionDataClose(lbl_1_data_0[var_r31->unk_11C]);
object->func = fn_1_20170; object->func = fn_1_20170;
@ -7472,7 +7473,7 @@ void fn_1_24620(omObjData *var_r31)
var_f31 = 1.0f; var_f31 = 1.0f;
} }
var_r30 = &lbl_1_data_1380; var_r30 = &lbl_1_data_1380;
Hu3DModelAttrReset(lbl_1_bss_1A0->model[5], 1); Hu3DModelAttrReset(lbl_1_bss_1A0->model[5], HU3D_ATTR_DISPOFF);
Hu3DModelRotSet(lbl_1_bss_1A0->model[5], 0.0f, 90.0f, 0.0f); Hu3DModelRotSet(lbl_1_bss_1A0->model[5], 0.0f, 90.0f, 0.0f);
Hu3DModelPosSet(lbl_1_bss_1A0->model[5], var_r30->unk_30[3].x, var_r30->unk_30[3].y, var_r30->unk_30[3].z); Hu3DModelPosSet(lbl_1_bss_1A0->model[5], var_r30->unk_30[3].x, var_r30->unk_30[3].y, var_r30->unk_30[3].z);
Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[5], var_f31); Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[5], var_f31);
@ -7495,7 +7496,7 @@ void fn_1_24620(omObjData *var_r31)
} }
omVibrate(lbl_1_bss_120, 0xC, 6, 6); omVibrate(lbl_1_bss_120, 0xC, 6, 6);
lbl_1_bss_128 += 1.0f; lbl_1_bss_128 += 1.0f;
Hu3DModelAttrReset(lbl_1_bss_1A0->model[7], 1); Hu3DModelAttrReset(lbl_1_bss_1A0->model[7], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(lbl_1_bss_1A0->model[7], 0.0f, -(60.0f - (lbl_1_bss_128 / 2)), 0.0f); Hu3DModelPosSet(lbl_1_bss_1A0->model[7], 0.0f, -(60.0f - (lbl_1_bss_128 / 2)), 0.0f);
if (120.0f < lbl_1_bss_128) { if (120.0f < lbl_1_bss_128) {
var_r31->work[0] += 1; var_r31->work[0] += 1;
@ -7575,7 +7576,7 @@ void fn_1_24620(omObjData *var_r31)
var_f31 = 1.0f; var_f31 = 1.0f;
} }
var_r30 = &lbl_1_data_13B8; var_r30 = &lbl_1_data_13B8;
Hu3DModelAttrReset(lbl_1_bss_1A0->model[16], 1); Hu3DModelAttrReset(lbl_1_bss_1A0->model[16], HU3D_ATTR_DISPOFF);
Hu3DModelRotSet(lbl_1_bss_1A0->model[16], 0.0f, -90.0f, 0.0f); Hu3DModelRotSet(lbl_1_bss_1A0->model[16], 0.0f, -90.0f, 0.0f);
Hu3DModelPosSet(lbl_1_bss_1A0->model[16], var_r30->unk_30[8].x, var_r30->unk_30[8].y, var_r30->unk_30[8].z); Hu3DModelPosSet(lbl_1_bss_1A0->model[16], var_r30->unk_30[8].x, var_r30->unk_30[8].y, var_r30->unk_30[8].z);
Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[16], var_f31); Hu3DModelTPLvlSet(lbl_1_bss_1A0->model[16], var_f31);
@ -7593,7 +7594,7 @@ void fn_1_24620(omObjData *var_r31)
if (120.0f <= lbl_1_bss_128) { if (120.0f <= lbl_1_bss_128) {
lbl_1_bss_128 = 120.0f; lbl_1_bss_128 = 120.0f;
} }
Hu3DModelAttrReset(lbl_1_bss_1A0->model[18], 1); Hu3DModelAttrReset(lbl_1_bss_1A0->model[18], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(lbl_1_bss_1A0->model[18], 0.0f, -(60.0f - (lbl_1_bss_128 / 2)), 0.0f); Hu3DModelPosSet(lbl_1_bss_1A0->model[18], 0.0f, -(60.0f - (lbl_1_bss_128 / 2)), 0.0f);
fn_1_1A21C(0.0f, 0.0f); fn_1_1A21C(0.0f, 0.0f);
fn_1_1710(lbl_1_bss_128 / 120.0f, &lbl_1_data_470); fn_1_1710(lbl_1_bss_128 / 120.0f, &lbl_1_data_470);
@ -7613,7 +7614,7 @@ void fn_1_24620(omObjData *var_r31)
var_r31->work[0] += 1; var_r31->work[0] += 1;
fn_1_1350(&lbl_1_bss_324, &lbl_1_data_470, &lbl_1_bss_30C); fn_1_1350(&lbl_1_bss_324, &lbl_1_data_470, &lbl_1_bss_30C);
fn_1_6CB0(fn_1_9BA4, 5); fn_1_6CB0(fn_1_9BA4, 5);
Hu3DModelAttrSet(lbl_1_bss_1A0->model[19], 1); Hu3DModelAttrSet(lbl_1_bss_1A0->model[19], HU3D_ATTR_DISPOFF);
} }
break; break;
case 0x414: case 0x414:
@ -7742,7 +7743,7 @@ void ObjectSetup(void)
lbl_1_bss_358.unk08 = NULL; lbl_1_bss_358.unk08 = NULL;
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
lbl_1_bss_2C[var_r31] = Hu3DModelCreateFile(lbl_1_data_F5C[var_r31]); lbl_1_bss_2C[var_r31] = Hu3DModelCreateFile(lbl_1_data_F5C[var_r31]);
Hu3DModelAttrSet(lbl_1_bss_2C[var_r31], 1); Hu3DModelAttrSet(lbl_1_bss_2C[var_r31], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_2C[var_r31], 0x40000003); Hu3DModelAttrSet(lbl_1_bss_2C[var_r31], 0x40000003);
} }
lbl_1_bss_28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M450, 0x6C)); lbl_1_bss_28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M450, 0x6C));

16
src/REL/m451Dll/m451.c
View file

@ -307,15 +307,15 @@ void fn_1_7BC(void)
Bss348Data *data = &lbl_1_bss_348[0]; Bss348Data *data = &lbl_1_bss_348[0];
while (1) { while (1) {
if (omPauseChk()) { if (omPauseChk()) {
Hu3DModelAttrSet(data->unk0[0], 1); Hu3DModelAttrSet(data->unk0[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(data->unk0[1], 1); Hu3DModelAttrSet(data->unk0[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(data->unk0[2], 1); Hu3DModelAttrSet(data->unk0[2], HU3D_ATTR_DISPOFF);
HuSprAttrSet(data->unkA, 0, HUSPR_ATTR_DISPOFF); HuSprAttrSet(data->unkA, 0, HUSPR_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrReset(data->unk0[0], 1); Hu3DModelAttrReset(data->unk0[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(data->unk0[1], 1); Hu3DModelAttrReset(data->unk0[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(data->unk0[2], 1); Hu3DModelAttrReset(data->unk0[2], HU3D_ATTR_DISPOFF);
HuSprAttrReset(data->unkA, 0, HUSPR_ATTR_DISPOFF); HuSprAttrReset(data->unkA, 0, HUSPR_ATTR_DISPOFF);
} }
HuPrcVSleep(); HuPrcVSleep();
@ -399,7 +399,7 @@ void fn_1_B2C(void)
Hu3DModelCameraSet(temp_r31->unk0[0], 1 << temp_r31->unk38); Hu3DModelCameraSet(temp_r31->unk0[0], 1 << temp_r31->unk38);
Hu3DModelPosSet(temp_r31->unk0[0], 0, 0, 0); Hu3DModelPosSet(temp_r31->unk0[0], 0, 0, 0);
Hu3DModelRotSet(temp_r31->unk0[0], 0, 0, 0); Hu3DModelRotSet(temp_r31->unk0[0], 0, 0, 0);
Hu3DModelAttrSet(temp_r31->unk0[0], 0x4000); Hu3DModelAttrSet(temp_r31->unk0[0], HU3D_ATTR_NOCULL);
temp_r29 = HuDataSelHeapReadNum(lbl_1_data_54[lbl_1_bss_B5C], MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r29 = HuDataSelHeapReadNum(lbl_1_data_54[lbl_1_bss_B5C], MEMORY_DEFAULT_NUM, HEAP_DATA);
temp_r31->unk0[1] = Hu3DModelCreate(temp_r29); temp_r31->unk0[1] = Hu3DModelCreate(temp_r29);
temp_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M451, 0x0D), MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M451, 0x0D), MEMORY_DEFAULT_NUM, HEAP_DATA);
@ -413,7 +413,7 @@ void fn_1_B2C(void)
Hu3DModelPosSet(temp_r31->unk0[2], 0, 0, 0); Hu3DModelPosSet(temp_r31->unk0[2], 0, 0, 0);
Hu3DModelRotSet(temp_r31->unk0[2], 0, 0, 0); Hu3DModelRotSet(temp_r31->unk0[2], 0, 0, 0);
Hu3DModelTPLvlSet(temp_r31->unk0[2], 128); Hu3DModelTPLvlSet(temp_r31->unk0[2], 128);
Hu3DModelAttrSet(temp_r31->unk0[2], 0x4000); Hu3DModelAttrSet(temp_r31->unk0[2], HU3D_ATTR_NOCULL);
for (temp_r28 = 0; temp_r28 < lbl_1_bss_B58; temp_r28++) { for (temp_r28 = 0; temp_r28 < lbl_1_bss_B58; temp_r28++) {
temp_r31->unk6C[temp_r28] = Hu3DModelObjPtrGet(temp_r31->unk0[0], lbl_1_data_464[lbl_1_bss_B5C][temp_r28]); temp_r31->unk6C[temp_r28] = Hu3DModelObjPtrGet(temp_r31->unk0[0], lbl_1_data_464[lbl_1_bss_B5C][temp_r28]);
if (!temp_r31->unk6C[temp_r28]) { if (!temp_r31->unk6C[temp_r28]) {

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

@ -707,7 +707,7 @@ void fn_1_1BF0(omObjData *object)
} }
var_r28 = CharModelCreate(var_r31->unk_01, 4); var_r28 = CharModelCreate(var_r31->unk_01, 4);
object->model[0] = var_r28; object->model[0] = var_r28;
Hu3DModelAttrSet(var_r28, 0x40000001); Hu3DModelAttrSet(var_r28, HU3D_MOTATTR_LOOP);
Hu3DModelShadowSet(var_r28); Hu3DModelShadowSet(var_r28);
for (var_r29 = 0; var_r29 < 8; var_r29++) { for (var_r29 = 0; var_r29 < 8; var_r29++) {
object->motion[var_r29] = CharModelMotionCreate(var_r31->unk_01, lbl_1_data_C4[var_r29]); object->motion[var_r29] = CharModelMotionCreate(var_r31->unk_01, lbl_1_data_C4[var_r29]);
@ -799,7 +799,7 @@ void fn_1_20EC(omObjData *object)
HuAudFXPlay(0x523); HuAudFXPlay(0x523);
var_r31->unk_07 = 0; var_r31->unk_07 = 0;
Hu3DModelShadowReset(var_r29); Hu3DModelShadowReset(var_r29);
Hu3DModelAttrSet(var_r29, 1); Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF);
lbl_1_data_0--; lbl_1_data_0--;
var_r28 = fn_1_3E9C(0x220013, 0x64, fn_1_3F38); var_r28 = fn_1_3E9C(0x220013, 0x64, fn_1_3F38);
Hu3DModelPosSet(var_r28, var_r31->unk_2C.x, var_r31->unk_2C.y, var_r31->unk_2C.z); Hu3DModelPosSet(var_r28, var_r31->unk_2C.x, var_r31->unk_2C.y, var_r31->unk_2C.z);
@ -1075,10 +1075,10 @@ void fn_1_2E24(omObjData *object)
} }
if (var_r31->unk_07 & 4) { if (var_r31->unk_07 & 4) {
if (var_r31->unk_0A & 2) { if (var_r31->unk_0A & 2) {
Hu3DModelAttrSet(var_r25, 1); Hu3DModelAttrSet(var_r25, HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrReset(var_r25, 1); Hu3DModelAttrReset(var_r25, HU3D_ATTR_DISPOFF);
} }
if (--var_r31->unk_0A == 0) { if (--var_r31->unk_0A == 0) {
var_r31->unk_07 = var_r31->unk_07 & 0xFFFFFFFB; var_r31->unk_07 = var_r31->unk_07 & 0xFFFFFFFB;

8
src/REL/m453Dll/map.c
View file

@ -472,10 +472,10 @@ void fn_1_6C74(omObjData *object)
} }
for (var_r31 = 0; (u32)var_r31 < 0xC; var_r31++) { for (var_r31 = 0; (u32)var_r31 < 0xC; var_r31++) {
var_r29->unk_24[var_r31] = Hu3DModelCreateFile(lbl_1_data_A58[var_r31]); var_r29->unk_24[var_r31] = Hu3DModelCreateFile(lbl_1_data_A58[var_r31]);
Hu3DModelAttrSet(var_r29->unk_24[var_r31], 1); Hu3DModelAttrSet(var_r29->unk_24[var_r31], HU3D_ATTR_DISPOFF);
} }
object->model[0] = var_r29->unk_24[0]; object->model[0] = var_r29->unk_24[0];
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
var_r29->unk_00_field0 = 0; var_r29->unk_00_field0 = 0;
var_r29->unk_04 = 4 - lbl_1_bss_A0; var_r29->unk_04 = 4 - lbl_1_bss_A0;
fn_1_6FC4(object); fn_1_6FC4(object);
@ -587,12 +587,12 @@ void fn_1_6FC4(omObjData *object)
memcpy(lbl_1_bss_60, &var_r30->unk_0C, 0x18); memcpy(lbl_1_bss_60, &var_r30->unk_0C, 0x18);
for (var_r31 = 0; var_r31 < 6; var_r31++) { for (var_r31 = 0; var_r31 < 6; var_r31++) {
if (object->model[var_r31 + 1] >= 0) { if (object->model[var_r31 + 1] >= 0) {
Hu3DModelAttrSet(object->model[var_r31 + 1], 1); Hu3DModelAttrSet(object->model[var_r31 + 1], HU3D_ATTR_DISPOFF);
} }
} }
for (var_r31 = 0; var_r31 < 6; var_r31++) { for (var_r31 = 0; var_r31 < 6; var_r31++) {
object->model[var_r31 + 1] = var_r30->unk_24[var_r30->unk_0C[var_r31]]; object->model[var_r31 + 1] = var_r30->unk_24[var_r30->unk_0C[var_r31]];
Hu3DModelAttrReset(object->model[var_r31 + 1], 1); Hu3DModelAttrReset(object->model[var_r31 + 1], HU3D_ATTR_DISPOFF);
} }
} }

288
src/REL/mentDll/main.c
View file

@ -1,4 +1,5 @@
#include "game/board/main.h" #include "game/board/main.h"
#include "REL/mentDll.h"
#include "ext_math.h" #include "ext_math.h"
#include "game/armem.h" #include "game/armem.h"
#include "game/chrman.h" #include "game/chrman.h"
@ -13,7 +14,6 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "game/window.h" #include "game/window.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "REL/mentDll.h"
typedef struct MentDllUnkBssE4Struct { typedef struct MentDllUnkBssE4Struct {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
@ -514,7 +514,7 @@ void fn_1_77C0(void)
fn_1_2808(fn_1_13DEC); fn_1_2808(fn_1_13DEC);
fn_1_4B0(0xF0); fn_1_4B0(0xF0);
for (var_r31 = 0; var_r31 < 5; var_r31++) { for (var_r31 = 0; var_r31 < 5; var_r31++) {
Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
lbl_1_bss_3108[0]->work[0] = 1; lbl_1_bss_3108[0]->work[0] = 1;
fn_1_2808(fn_1_13F68); fn_1_2808(fn_1_13F68);
@ -528,7 +528,7 @@ void fn_1_7858(void)
fn_1_4B0(0x3C); fn_1_4B0(0x3C);
lbl_1_bss_14[0] = HuAudSeqPlay(0x30); lbl_1_bss_14[0] = HuAudSeqPlay(0x30);
for (var_r31 = 0; var_r31 < 5; var_r31++) { for (var_r31 = 0; var_r31 < 5; var_r31++) {
Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
WipeCreate(1, 0, -1); WipeCreate(1, 0, -1);
@ -701,17 +701,17 @@ void fn_1_824C(void)
lbl_1_bss_14[0] = HuAudSeqPlay(0x30); lbl_1_bss_14[0] = HuAudSeqPlay(0x30);
if (lbl_1_bss_A8[0] == 0) { if (lbl_1_bss_A8[0] == 0) {
for (var_r31 = 0; var_r31 < 6; var_r31++) { for (var_r31 = 0; var_r31 < 6; var_r31++) {
Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
} }
else { else {
for (var_r31 = 0; var_r31 < 5; var_r31++) { for (var_r31 = 0; var_r31 < 5; var_r31++) {
Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
} }
Hu3DModelPosSet(lbl_1_bss_33AC[0].unk_00->model[1], 0.0f, 0.0f, 560.0f); Hu3DModelPosSet(lbl_1_bss_33AC[0].unk_00->model[1], 0.0f, 0.0f, 560.0f);
fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 2, 0, 2); fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 2, 0, 2);
Hu3DModelAttrSet(lbl_1_bss_35BC[0].unk_00->model[2], 1); Hu3DModelAttrSet(lbl_1_bss_35BC[0].unk_00->model[2], HU3D_ATTR_DISPOFF);
OSReport("########### ME_MainProcFunc400\n"); OSReport("########### ME_MainProcFunc400\n");
WipeCreate(1, 0, -1); WipeCreate(1, 0, -1);
@ -730,12 +730,12 @@ void fn_1_83CC(void)
fn_1_4B0(0x5A); fn_1_4B0(0x5A);
if (lbl_1_bss_A8[0] == 0) { if (lbl_1_bss_A8[0] == 0) {
for (var_r31 = 0; var_r31 < 6; var_r31++) { for (var_r31 = 0; var_r31 < 6; var_r31++) {
Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
} }
else { else {
for (var_r31 = 0; var_r31 < 5; var_r31++) { for (var_r31 = 0; var_r31 < 5; var_r31++) {
Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
} }
fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0); fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0);
@ -746,7 +746,7 @@ void fn_1_83CC(void)
fn_1_59A0(lbl_1_bss_33AC[0].unk_00, 1, 2, 0xF, 1); fn_1_59A0(lbl_1_bss_33AC[0].unk_00, 1, 2, 0xF, 1);
fn_1_5D38(lbl_1_bss_33AC[0].unk_00, 1, sp14, 0.0f, 3.0f, 0.0f, 1, 0); fn_1_5D38(lbl_1_bss_33AC[0].unk_00, 1, sp14, 0.0f, 3.0f, 0.0f, 1, 0);
fn_1_59A0(lbl_1_bss_33AC[0].unk_00, 1, 1, 0xF, 1); fn_1_59A0(lbl_1_bss_33AC[0].unk_00, 1, 1, 0xF, 1);
Hu3DModelAttrSet(lbl_1_bss_35BC[0].unk_00->model[2], 1); Hu3DModelAttrSet(lbl_1_bss_35BC[0].unk_00->model[2], HU3D_ATTR_DISPOFF);
fn_1_4B0(0x1E); fn_1_4B0(0x1E);
} }
@ -1117,7 +1117,8 @@ s32 fn_1_92CC(void)
var_r29 = 1; var_r29 = 1;
} }
break; break;
} else if (lbl_1_bss_3114[var_r30].unk_70[0] == 1) { }
else if (lbl_1_bss_3114[var_r30].unk_70[0] == 1) {
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
if (lbl_1_bss_3114[var_r31].unk_70[0] == 0) { if (lbl_1_bss_3114[var_r31].unk_70[0] == 0) {
lbl_1_bss_3114[var_r31].unk_68 = 0; lbl_1_bss_3114[var_r31].unk_68 = 0;
@ -1153,19 +1154,22 @@ s32 fn_1_92CC(void)
if (var_r31 == 4) { if (var_r31 == 4) {
var_r29 = 3; var_r29 = 3;
break; break;
} else { }
else {
if (var_r29 == 1) { if (var_r29 == 1) {
fn_1_173FC(&lbl_1_bss_3114[var_r30]); fn_1_173FC(&lbl_1_bss_3114[var_r30]);
fn_1_17914(&lbl_1_bss_3114[var_r30]); fn_1_17914(&lbl_1_bss_3114[var_r30]);
fn_1_173FC(&lbl_1_bss_3114[lbl_1_bss_3114[var_r30].unk_70[1]]); fn_1_173FC(&lbl_1_bss_3114[lbl_1_bss_3114[var_r30].unk_70[1]]);
var_r26 = lbl_1_bss_3114[lbl_1_bss_3114[var_r30].unk_70[1]].unk_70[1]; var_r26 = lbl_1_bss_3114[lbl_1_bss_3114[var_r30].unk_70[1]].unk_70[1];
lbl_1_bss_3114[lbl_1_bss_3114[var_r30].unk_70[1]].unk_70[0] = 0; lbl_1_bss_3114[lbl_1_bss_3114[var_r30].unk_70[1]].unk_70[0] = 0;
} else if (var_r29 == 4) { }
else if (var_r29 == 4) {
} else if (var_r29 == 0) { }
else if (var_r29 == 0) {
fn_1_17914(&lbl_1_bss_3114[var_r30]); fn_1_17914(&lbl_1_bss_3114[var_r30]);
break; break;
} else { }
else {
break; break;
} }
} }
@ -1212,7 +1216,8 @@ void fn_1_99AC(void)
fn_1_1811C(); fn_1_1811C();
} }
s32 fn_1_99CC(void) { s32 fn_1_99CC(void)
{
s32 var_r26; s32 var_r26;
s32 temp_r27; s32 temp_r27;
s32 var_r28; s32 var_r28;
@ -1228,7 +1233,7 @@ s32 fn_1_99CC(void) {
0x00000004, 0x00000004,
0x00000005, 0x00000005,
}; };
var_r30 = 2; var_r30 = 2;
temp_r27 = fn_1_1434(0, 0, 0); temp_r27 = fn_1_1434(0, 0, 0);
while (1) { while (1) {
@ -1240,14 +1245,14 @@ s32 fn_1_99CC(void) {
fn_1_1968(temp_r27, 0x1A0008U, -1, -1); fn_1_1968(temp_r27, 0x1A0008U, -1, -1);
fn_1_59A0(lbl_1_bss_33AC[sp8[var_r30]].unk_00, 1, 1, 0xF, 1); fn_1_59A0(lbl_1_bss_33AC[sp8[var_r30]].unk_00, 1, 1, 0xF, 1);
fn_1_2154(0x1A0020U); fn_1_2154(0x1A0020U);
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
lbl_1_bss_33AC[i].unk_08 = 0; lbl_1_bss_33AC[i].unk_08 = 0;
lbl_1_bss_33AC[i].unk_04 = (void (*)(omObjData*, ...)) fn_1_127FC; lbl_1_bss_33AC[i].unk_04 = (void (*)(omObjData *, ...))fn_1_127FC;
} }
lbl_1_bss_33AC[sp8[var_r30]].unk_08 = 1; lbl_1_bss_33AC[sp8[var_r30]].unk_08 = 1;
lbl_1_bss_35BC->unk_04 = (void (*)(omObjData*, ...)) fn_1_18F74; lbl_1_bss_35BC->unk_04 = (void (*)(omObjData *, ...))fn_1_18F74;
while (1) { while (1) {
fn_1_4D8(); fn_1_4D8();
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
@ -1255,35 +1260,42 @@ s32 fn_1_99CC(void) {
break; break;
} }
} }
if (i == 6 && var_r28 >= 0x15) { if (i == 6 && var_r28 >= 0x15) {
if ((HuPadBtnDown[lbl_1_bss_3114->unk_6C] & 0x200)) { if ((HuPadBtnDown[lbl_1_bss_3114->unk_6C] & 0x200)) {
HuAudFXPlay(3); HuAudFXPlay(3);
var_r29 = 0; var_r29 = 0;
break; break;
} else if ((HuPadBtnDown[lbl_1_bss_3114->unk_6C] & 0x100)) { }
else if ((HuPadBtnDown[lbl_1_bss_3114->unk_6C] & 0x100)) {
HuAudFXPlay(2); HuAudFXPlay(2);
var_r29 = 2; var_r29 = 2;
break; break;
} else { }
else {
if ((HuPadStkX[lbl_1_bss_3114->unk_6C] >= 50) || ((HuPadBtn[lbl_1_bss_3114->unk_6C] & 2))) { if ((HuPadStkX[lbl_1_bss_3114->unk_6C] >= 50) || ((HuPadBtn[lbl_1_bss_3114->unk_6C] & 2))) {
if (lbl_1_bss_A8[4] == 1) { if (lbl_1_bss_A8[4] == 1) {
if (++var_r30 > 5) { if (++var_r30 > 5) {
var_r30 = 5; var_r30 = 5;
} else {
var_r28 = 0;
} }
} else { else {
if (++var_r30 > 4) {
var_r30 = 4;
} else {
var_r28 = 0; var_r28 = 0;
} }
} }
} else if ((HuPadStkX[lbl_1_bss_3114->unk_6C] <= -50) || ((HuPadBtn[lbl_1_bss_3114->unk_6C] & 1))) { else {
if (++var_r30 > 4) {
var_r30 = 4;
}
else {
var_r28 = 0;
}
}
}
else if ((HuPadStkX[lbl_1_bss_3114->unk_6C] <= -50) || ((HuPadBtn[lbl_1_bss_3114->unk_6C] & 1))) {
if (--var_r30 < 0) { if (--var_r30 < 0) {
var_r30 = 0; var_r30 = 0;
} else { }
else {
var_r28 = 0; var_r28 = 0;
} }
} }
@ -1292,7 +1304,8 @@ s32 fn_1_99CC(void) {
if (var_r28 == 0) { if (var_r28 == 0) {
if (var_r30 != 5) { if (var_r30 != 5) {
fn_1_2808(fn_1_14058); fn_1_2808(fn_1_14058);
} else { }
else {
fn_1_2808(fn_1_14148); fn_1_2808(fn_1_14148);
} }
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
@ -1304,9 +1317,10 @@ s32 fn_1_99CC(void) {
var_r28 = 0x15; var_r28 = 0x15;
fn_1_18A54(sp8[var_r30]); fn_1_18A54(sp8[var_r30]);
fn_1_1968(temp_r27, sp8[var_r30] + 0x1B0001, -1, -999); fn_1_1968(temp_r27, sp8[var_r30] + 0x1B0001, -1, -999);
if ((s32) sp8[var_r30] != 0) { if ((s32)sp8[var_r30] != 0) {
HuAudFXPlay(lbl_1_data_0[sp8[var_r30]][0]); HuAudFXPlay(lbl_1_data_0[sp8[var_r30]][0]);
} else { }
else {
HuAudFXPlay(lbl_1_data_0[sp8[var_r30]][2]); HuAudFXPlay(lbl_1_data_0[sp8[var_r30]][2]);
} }
} }
@ -1319,12 +1333,13 @@ s32 fn_1_99CC(void) {
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
lbl_1_bss_33AC[i].unk_08 = 0; lbl_1_bss_33AC[i].unk_08 = 0;
} }
lbl_1_bss_33AC[sp8[var_r30]].unk_08 = 1; lbl_1_bss_33AC[sp8[var_r30]].unk_08 = 1;
} }
fn_1_18DCC(); fn_1_18DCC();
fn_1_4B0(0x1E); fn_1_4B0(0x1E);
} else if (var_r29 == 1) { }
else if (var_r29 == 1) {
fn_1_2808(fn_1_14058); fn_1_2808(fn_1_14058);
if (var_r30 != 2) { if (var_r30 != 2) {
var_r30 = 2; var_r30 = 2;
@ -1344,31 +1359,35 @@ s32 fn_1_99CC(void) {
fn_1_C174(0); fn_1_C174(0);
} }
continue; continue;
} else if (var_r29 == 2) { }
else if (var_r29 == 2) {
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
lbl_1_bss_33AC[i].unk_04 = NULL; lbl_1_bss_33AC[i].unk_04 = NULL;
} }
lbl_1_bss_A8[2] = sp8[var_r30]; lbl_1_bss_A8[2] = sp8[var_r30];
} else { }
else {
continue; continue;
} }
break; break;
} }
fn_1_16AC(temp_r27); fn_1_16AC(temp_r27);
if (var_r29 == 0) { if (var_r29 == 0) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (lbl_1_bss_3114[i].unk_60 != 0) { if (lbl_1_bss_3114[i].unk_60 != 0) {
break; break;
} }
} }
if (i != 4) { if (i != 4) {
var_r29 = 2; var_r29 = 2;
} else { }
else {
var_r29 = 1; var_r29 = 1;
} }
} else { }
else {
var_r29 = 3; var_r29 = 3;
} }
return var_r29; return var_r29;
@ -1392,7 +1411,7 @@ void fn_1_A0C4(void)
fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 3, 0xF, 1); fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 3, 0xF, 1);
fn_1_5D38(lbl_1_bss_33AC[var_r31].unk_00, 1, sp2C, 30.0f, 6.0f, 10.0f, 1, 1); fn_1_5D38(lbl_1_bss_33AC[var_r31].unk_00, 1, sp2C, 30.0f, 6.0f, 10.0f, 1, 1);
fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 1, 0xF, 1); fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 1, 0xF, 1);
Hu3DModelAttrReset(lbl_1_bss_35BC[0].unk_00->model[2], 1); Hu3DModelAttrReset(lbl_1_bss_35BC[0].unk_00->model[2], HU3D_ATTR_DISPOFF);
fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 2, 0, 0); fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 2, 0, 0);
fn_1_5CDC(lbl_1_bss_35BC[0].unk_00, 2, 0); fn_1_5CDC(lbl_1_bss_35BC[0].unk_00, 2, 0);
} }
@ -1402,7 +1421,7 @@ void fn_1_A0C4(void)
fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 3, 0xF, 1); fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 3, 0xF, 1);
fn_1_5D38(lbl_1_bss_33AC[var_r31].unk_00, 1, sp20, 30.0f, 6.0f, 10.0f, 1, 1); fn_1_5D38(lbl_1_bss_33AC[var_r31].unk_00, 1, sp20, 30.0f, 6.0f, 10.0f, 1, 1);
fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 1, 0xF, 1); fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 1, 0xF, 1);
Hu3DModelAttrReset(lbl_1_bss_35BC[1].unk_00->model[2], 1); Hu3DModelAttrReset(lbl_1_bss_35BC[1].unk_00->model[2], HU3D_ATTR_DISPOFF);
fn_1_5818(lbl_1_bss_35BC[1].unk_00, 2, 2, 0, 0); fn_1_5818(lbl_1_bss_35BC[1].unk_00, 2, 2, 0, 0);
fn_1_5CDC(lbl_1_bss_35BC[1].unk_00, 2, 0); fn_1_5CDC(lbl_1_bss_35BC[1].unk_00, 2, 0);
} }
@ -1569,12 +1588,12 @@ void fn_1_A9B0(void)
var_r31 = 0; var_r31 = 0;
} }
for (var_r29 = 0; var_r29 < 6; var_r29++) { for (var_r29 = 0; var_r29 < 6; var_r29++) {
Hu3DModelAttrSet(lbl_1_bss_33AC[var_r29].unk_00->model[1], 1); Hu3DModelAttrSet(lbl_1_bss_33AC[var_r29].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
Hu3DModelAttrReset(lbl_1_bss_33AC[var_r30].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[var_r30].unk_00->model[1], HU3D_ATTR_DISPOFF);
fn_1_11908(lbl_1_bss_35BC[var_r31].unk_00, lbl_1_bss_A8[2]); fn_1_11908(lbl_1_bss_35BC[var_r31].unk_00, lbl_1_bss_A8[2]);
Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[4], 1); Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[5], 1); Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[5], HU3D_ATTR_DISPOFF);
lbl_1_bss_35BC[var_r31].unk_04 = (MentDllUnkFunc)fn_1_1184C; lbl_1_bss_35BC[var_r31].unk_04 = (MentDllUnkFunc)fn_1_1184C;
if (var_r30 == 5) { if (var_r30 == 5) {
sp14.x += 1200.0f; sp14.x += 1200.0f;
@ -1593,7 +1612,7 @@ void fn_1_A9B0(void)
fn_1_16AC(var_r28); fn_1_16AC(var_r28);
HuAudSeqFadeOut(lbl_1_bss_14[0], 0xBB8); HuAudSeqFadeOut(lbl_1_bss_14[0], 0xBB8);
fn_1_5CDC(lbl_1_bss_35BC[var_r31].unk_00, 2, 0); fn_1_5CDC(lbl_1_bss_35BC[var_r31].unk_00, 2, 0);
Hu3DModelAttrSet(lbl_1_bss_35BC[var_r31].unk_00->model[2], 1); Hu3DModelAttrSet(lbl_1_bss_35BC[var_r31].unk_00->model[2], HU3D_ATTR_DISPOFF);
fn_1_2808(fn_1_14418); fn_1_2808(fn_1_14418);
fn_1_4B0(0xA); fn_1_4B0(0xA);
HuAudFXPlay(GWPlayerCfg->character + 0x75); HuAudFXPlay(GWPlayerCfg->character + 0x75);
@ -1622,8 +1641,8 @@ void fn_1_AD78(void)
} }
fn_1_5818(lbl_1_bss_35BC[var_r28].unk_00, 2, 3, 0, 0); fn_1_5818(lbl_1_bss_35BC[var_r28].unk_00, 2, 3, 0, 0);
fn_1_5CDC(lbl_1_bss_35BC[var_r28].unk_00, 2, 0); fn_1_5CDC(lbl_1_bss_35BC[var_r28].unk_00, 2, 0);
Hu3DModelAttrSet(lbl_1_bss_35BC[0].unk_00->model[2], 1); Hu3DModelAttrSet(lbl_1_bss_35BC[0].unk_00->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_35BC[1].unk_00->model[2], 1); Hu3DModelAttrSet(lbl_1_bss_35BC[1].unk_00->model[2], HU3D_ATTR_DISPOFF);
if (var_r30 != 5) { if (var_r30 != 5) {
fn_1_2808(fn_1_146D0); fn_1_2808(fn_1_146D0);
} }
@ -1683,7 +1702,7 @@ void fn_1_B084(void)
} }
for (var_r31 = 0; var_r31 < 6; var_r31++) { for (var_r31 = 0; var_r31 < 6; var_r31++) {
if (var_r31 != var_r28) { if (var_r31 != var_r28) {
Hu3DModelAttrSet(lbl_1_bss_33AC[var_r31].unk_00->model[1], 1); Hu3DModelAttrSet(lbl_1_bss_33AC[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
} }
fn_1_5818(lbl_1_bss_35BC[var_r27].unk_00, 2, 3, 0, 0); fn_1_5818(lbl_1_bss_35BC[var_r27].unk_00, 2, 3, 0, 0);
@ -1706,7 +1725,7 @@ void fn_1_B084(void)
fn_1_5818(lbl_1_bss_35BC[var_r27].unk_00, 2, 2, 0, 0); fn_1_5818(lbl_1_bss_35BC[var_r27].unk_00, 2, 2, 0, 0);
fn_1_5CDC(lbl_1_bss_35BC[var_r27].unk_00, 2, 0); fn_1_5CDC(lbl_1_bss_35BC[var_r27].unk_00, 2, 0);
fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 2); fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 2);
Hu3DModelAttrReset(lbl_1_bss_35BC[0].unk_00->model[2], 1); Hu3DModelAttrReset(lbl_1_bss_35BC[0].unk_00->model[2], HU3D_ATTR_DISPOFF);
if (var_r28 == 5) { if (var_r28 == 5) {
fn_1_2808(fn_1_14058); fn_1_2808(fn_1_14058);
} }
@ -1737,14 +1756,14 @@ void fn_1_B084(void)
} }
Hu3DModelPosSet(lbl_1_bss_33AC[var_r31].unk_00->model[1], lbl_1_data_D8[var_r31].x, lbl_1_data_D8[var_r31].y, lbl_1_data_D8[var_r31].z); Hu3DModelPosSet(lbl_1_bss_33AC[var_r31].unk_00->model[1], lbl_1_data_D8[var_r31].x, lbl_1_data_D8[var_r31].y, lbl_1_data_D8[var_r31].z);
Hu3DModelRotSet(lbl_1_bss_33AC[var_r31].unk_00->model[1], 0.0f, lbl_1_data_120[var_r31], 0.0f); Hu3DModelRotSet(lbl_1_bss_33AC[var_r31].unk_00->model[1], 0.0f, lbl_1_data_120[var_r31], 0.0f);
Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
for (var_r31 = 0; var_r31 < 2; var_r31++) { for (var_r31 = 0; var_r31 < 2; var_r31++) {
var_r24 = &lbl_1_bss_35BC[var_r31]; var_r24 = &lbl_1_bss_35BC[var_r31];
for (var_r29 = 0; var_r29 < 5; var_r29++) { for (var_r29 = 0; var_r29 < 5; var_r29++) {
var_r24->unk_08[0] = var_r24->unk_08[1] = 0; var_r24->unk_08[0] = var_r24->unk_08[1] = 0;
} }
Hu3DModelAttrSet(lbl_1_bss_35BC[1].unk_00->model[2], 1); Hu3DModelAttrSet(lbl_1_bss_35BC[1].unk_00->model[2], HU3D_ATTR_DISPOFF);
} }
fn_1_14BA8(); fn_1_14BA8();
fn_1_179DC(); fn_1_179DC();
@ -1752,7 +1771,7 @@ void fn_1_B084(void)
fn_1_190E8(); fn_1_190E8();
fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0); fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0);
fn_1_5CDC(lbl_1_bss_35BC[0].unk_00, 2, 0); fn_1_5CDC(lbl_1_bss_35BC[0].unk_00, 2, 0);
Hu3DModelAttrSet(lbl_1_bss_35BC[0].unk_00->model[2], 1); Hu3DModelAttrSet(lbl_1_bss_35BC[0].unk_00->model[2], HU3D_ATTR_DISPOFF);
{ {
Vec sp20 = { 0.0f, 0.0f, 560.0f }; Vec sp20 = { 0.0f, 0.0f, 560.0f };
fn_1_59A0(lbl_1_bss_33AC[0].unk_00, 1, 2, 0xF, 1); fn_1_59A0(lbl_1_bss_33AC[0].unk_00, 1, 2, 0xF, 1);
@ -2364,10 +2383,11 @@ void fn_1_D634(void)
s32 sp8[6] = { 1, 2, 0, 3, 4, 5 }; s32 sp8[6] = { 1, 2, 0, 3, 4, 5 };
var_r28 = 0; var_r28 = 0;
var_r31 = 2; var_r31 = 2;
if (lbl_1_data_2F0 == -1) { if (lbl_1_data_2F0 == -1) {
var_r29 = fn_1_1434(0, 0, 0); var_r29 = fn_1_1434(0, 0, 0);
} else { }
else {
var_r29 = lbl_1_data_2F0; var_r29 = lbl_1_data_2F0;
lbl_1_data_2F0 = -1; lbl_1_data_2F0 = -1;
} }
@ -2399,22 +2419,26 @@ void fn_1_D634(void)
var_r26 = 2; var_r26 = 2;
break; break;
} }
if ((HuPadStkX[lbl_1_bss_3114[0].unk_6C] >= 0x32) || ((HuPadBtn[lbl_1_bss_3114[0].unk_6C] & PAD_BUTTON_RIGHT) != 0)) { if ((HuPadStkX[lbl_1_bss_3114[0].unk_6C] >= 0x32) || ((HuPadBtn[lbl_1_bss_3114[0].unk_6C] & PAD_BUTTON_RIGHT) != 0)) {
var_r31++; var_r31++;
if (var_r31 > 4) { if (var_r31 > 4) {
var_r31 = 4; var_r31 = 4;
} else { }
else {
var_r28 = 0; var_r28 = 0;
} }
} else if ((HuPadStkX[lbl_1_bss_3114[0].unk_6C] <= -50) || ((HuPadBtn[lbl_1_bss_3114[0].unk_6C] & PAD_BUTTON_LEFT) != 0)) { }
else if ((HuPadStkX[lbl_1_bss_3114[0].unk_6C] <= -50) || ((HuPadBtn[lbl_1_bss_3114[0].unk_6C] & PAD_BUTTON_LEFT) != 0)) {
var_r31--; var_r31--;
if (var_r31 < 0) { if (var_r31 < 0) {
var_r31 = 0; var_r31 = 0;
} else { }
else {
var_r28 = 0; var_r28 = 0;
} }
} else if ((HuPadBtnDown[0] & 0x200)) { }
else if ((HuPadBtnDown[0] & 0x200)) {
var_r26 = 1; var_r26 = 1;
break; break;
} }
@ -2431,7 +2455,8 @@ void fn_1_D634(void)
fn_1_1968(var_r29, sp8[var_r31] + 0x1B0001, -1, -0x3E7); fn_1_1968(var_r29, sp8[var_r31] + 0x1B0001, -1, -0x3E7);
if (sp8[var_r31] != 0) { if (sp8[var_r31] != 0) {
HuAudFXPlay(lbl_1_data_0[sp8[var_r31]][0]); HuAudFXPlay(lbl_1_data_0[sp8[var_r31]][0]);
} else { }
else {
HuAudFXPlay(lbl_1_data_0[sp8[var_r31]][2]); HuAudFXPlay(lbl_1_data_0[sp8[var_r31]][2]);
} }
} }
@ -2474,7 +2499,8 @@ void fn_1_D634(void)
lbl_1_bss_33AC[i].unk_04 = NULL; lbl_1_bss_33AC[i].unk_04 = NULL;
} }
lbl_1_bss_A8[2] = sp8[var_r31]; lbl_1_bss_A8[2] = sp8[var_r31];
} else { }
else {
if (var_r31 != 2) { if (var_r31 != 2) {
var_r31 = 2; var_r31 = 2;
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
@ -2487,7 +2513,8 @@ void fn_1_D634(void)
fn_1_4B0(0x1E); fn_1_4B0(0x1E);
continue; continue;
} }
} else { }
else {
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
lbl_1_bss_33AC[i].unk_04 = NULL; lbl_1_bss_33AC[i].unk_04 = NULL;
} }
@ -2509,7 +2536,7 @@ void fn_1_DE60(void)
fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 3, 0xF, 1); fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 3, 0xF, 1);
fn_1_5D38(lbl_1_bss_33AC[var_r31].unk_00, 1, sp14, 5.0f, 6.0f, 10.0f, 1, 1); fn_1_5D38(lbl_1_bss_33AC[var_r31].unk_00, 1, sp14, 5.0f, 6.0f, 10.0f, 1, 1);
fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 1, 0xF, 1); fn_1_5818(lbl_1_bss_33AC[var_r31].unk_00, 1, 1, 0xF, 1);
Hu3DModelAttrReset(lbl_1_bss_35BC[0].unk_00->model[2], 1); Hu3DModelAttrReset(lbl_1_bss_35BC[0].unk_00->model[2], HU3D_ATTR_DISPOFF);
fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 2, 0, 0); fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 2, 0, 0);
fn_1_5CDC(lbl_1_bss_35BC[0].unk_00, 2, 0); fn_1_5CDC(lbl_1_bss_35BC[0].unk_00, 2, 0);
fn_1_4B0(0x3C); fn_1_4B0(0x3C);
@ -2526,12 +2553,12 @@ void fn_1_DFDC(void)
var_r31 = 0; var_r31 = 0;
var_r29 = lbl_1_bss_A8[2]; var_r29 = lbl_1_bss_A8[2];
for (var_r30 = 0; var_r30 < 5; var_r30++) { for (var_r30 = 0; var_r30 < 5; var_r30++) {
Hu3DModelAttrSet(lbl_1_bss_33AC[var_r30].unk_00->model[1], 1); Hu3DModelAttrSet(lbl_1_bss_33AC[var_r30].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
Hu3DModelAttrReset(lbl_1_bss_33AC[var_r29].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[var_r29].unk_00->model[1], HU3D_ATTR_DISPOFF);
fn_1_11908(lbl_1_bss_35BC[var_r31].unk_00, lbl_1_bss_A8[2]); fn_1_11908(lbl_1_bss_35BC[var_r31].unk_00, lbl_1_bss_A8[2]);
Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[4], 1); Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[5], 1); Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[5], HU3D_ATTR_DISPOFF);
lbl_1_bss_35BC[var_r31].unk_04 = (MentDllUnkFunc)fn_1_1184C; lbl_1_bss_35BC[var_r31].unk_04 = (MentDllUnkFunc)fn_1_1184C;
HuDataDirClose(DATADIR_MENT); HuDataDirClose(DATADIR_MENT);
HuPrcChildCreate(fn_1_7218, 0x64, 0x3000, 0, lbl_1_bss_C8); HuPrcChildCreate(fn_1_7218, 0x64, 0x3000, 0, lbl_1_bss_C8);
@ -2541,7 +2568,7 @@ void fn_1_DFDC(void)
fn_1_1968(var_r28, var_r29 + 0x1E000C, -1, -1); fn_1_1968(var_r28, var_r29 + 0x1E000C, -1, -1);
fn_1_16AC(var_r28); fn_1_16AC(var_r28);
fn_1_5CDC(lbl_1_bss_35BC[var_r31].unk_00, 2, 0); fn_1_5CDC(lbl_1_bss_35BC[var_r31].unk_00, 2, 0);
Hu3DModelAttrSet(lbl_1_bss_35BC[var_r31].unk_00->model[2], 1); Hu3DModelAttrSet(lbl_1_bss_35BC[var_r31].unk_00->model[2], HU3D_ATTR_DISPOFF);
HuAudSeqFadeOut(lbl_1_bss_14[0], 0xBB8); HuAudSeqFadeOut(lbl_1_bss_14[0], 0xBB8);
fn_1_2808(fn_1_14418); fn_1_2808(fn_1_14418);
fn_1_4B0(0xA); fn_1_4B0(0xA);
@ -2563,7 +2590,7 @@ void fn_1_E244(void)
void fn_1_E2B4(void) void fn_1_E2B4(void)
{ {
Vec sp14 = { 0.0f, 0.0f, 560.0f }; Vec sp14 = { 0.0f, 0.0f, 560.0f };
Hu3DModelAttrReset(lbl_1_bss_35BC[0].unk_00->model[2], 1); Hu3DModelAttrReset(lbl_1_bss_35BC[0].unk_00->model[2], HU3D_ATTR_DISPOFF);
fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0); fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0);
fn_1_5CDC(lbl_1_bss_35BC[0].unk_00, 2, 0); fn_1_5CDC(lbl_1_bss_35BC[0].unk_00, 2, 0);
fn_1_D330(); fn_1_D330();
@ -2599,8 +2626,8 @@ void fn_1_E48C(void)
fn_1_16AC(var_r31); fn_1_16AC(var_r31);
fn_1_1FC54(); fn_1_1FC54();
fn_1_4B0(0x3C); fn_1_4B0(0x3C);
Hu3DModelAttrReset(lbl_1_bss_35BC[1].unk_00->model[4], 1); Hu3DModelAttrReset(lbl_1_bss_35BC[1].unk_00->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_35BC[1].unk_00->model[5], 1); Hu3DModelAttrReset(lbl_1_bss_35BC[1].unk_00->model[5], HU3D_ATTR_DISPOFF);
fn_1_7304(); fn_1_7304();
HuDataDirClose(DATADIR_MENT); HuDataDirClose(DATADIR_MENT);
HuPrcChildCreate(fn_1_7218, 0x64, 0x3000, 0, lbl_1_bss_C8); HuPrcChildCreate(fn_1_7218, 0x64, 0x3000, 0, lbl_1_bss_C8);
@ -2609,7 +2636,7 @@ void fn_1_E48C(void)
fn_1_4B0(0x3C); fn_1_4B0(0x3C);
HuAudFXPlay(lbl_1_data_0[6][0]); HuAudFXPlay(lbl_1_data_0[6][0]);
fn_1_5CDC(lbl_1_bss_35BC[1].unk_00, 2, 0); fn_1_5CDC(lbl_1_bss_35BC[1].unk_00, 2, 0);
Hu3DModelAttrSet(lbl_1_bss_35BC[1].unk_00->model[2], 1); Hu3DModelAttrSet(lbl_1_bss_35BC[1].unk_00->model[2], HU3D_ATTR_DISPOFF);
HuAudSeqFadeOut(lbl_1_bss_14[0], 0xBB8); HuAudSeqFadeOut(lbl_1_bss_14[0], 0xBB8);
fn_1_2808(fn_1_14418); fn_1_2808(fn_1_14418);
fn_1_4B0(0xA); fn_1_4B0(0xA);
@ -2799,7 +2826,7 @@ void fn_1_10234(void)
Vec sp20 = { -120.0f, 0.0f, 670.0f }; Vec sp20 = { -120.0f, 0.0f, 670.0f };
fn_1_2808(fn_1_13DEC); fn_1_2808(fn_1_13DEC);
fn_1_4B0(0x5A); fn_1_4B0(0x5A);
Hu3DModelAttrReset(lbl_1_bss_33AC[4].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[4].unk_00->model[1], HU3D_ATTR_DISPOFF);
fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0); fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0);
fn_1_4B0(0x96); fn_1_4B0(0x96);
lbl_1_bss_3108[0]->work[0] = 1; lbl_1_bss_3108[0]->work[0] = 1;
@ -2857,7 +2884,7 @@ void fn_1_10954(void)
Vec sp20 = { -120.0f, 0.0f, 670.0f }; Vec sp20 = { -120.0f, 0.0f, 670.0f };
fn_1_2808(fn_1_13DEC); fn_1_2808(fn_1_13DEC);
fn_1_4B0(0x5A); fn_1_4B0(0x5A);
Hu3DModelAttrReset(lbl_1_bss_33AC[2].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[2].unk_00->model[1], HU3D_ATTR_DISPOFF);
fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0); fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0);
fn_1_4B0(0x96); fn_1_4B0(0x96);
lbl_1_bss_3108[0]->work[0] = 1; lbl_1_bss_3108[0]->work[0] = 1;
@ -2915,7 +2942,7 @@ void fn_1_11074(void)
Vec sp14 = { 0.0f, 0.0f, 560.0f }; Vec sp14 = { 0.0f, 0.0f, 560.0f };
fn_1_2808(fn_1_13DEC); fn_1_2808(fn_1_13DEC);
fn_1_4B0(0x5A); fn_1_4B0(0x5A);
Hu3DModelAttrReset(lbl_1_bss_33AC[3].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_33AC[3].unk_00->model[1], HU3D_ATTR_DISPOFF);
fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0); fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 3, 0, 0);
fn_1_4B0(0x96); fn_1_4B0(0x96);
lbl_1_bss_3108[0]->work[0] = 1; lbl_1_bss_3108[0]->work[0] = 1;
@ -3053,8 +3080,8 @@ void fn_1_11908(omObjData *arg0, s32 arg1)
Hu3DModelPosSet(arg0->model[4], 1200.0f, 80.0f, 460.0f); Hu3DModelPosSet(arg0->model[4], 1200.0f, 80.0f, 460.0f);
Hu3DModelHookSet(arg0->model[4], "koopabox_fix-effect_fook2", arg0->model[5]); Hu3DModelHookSet(arg0->model[4], "koopabox_fix-effect_fook2", arg0->model[5]);
} }
Hu3DModelAttrSet(arg0->model[4], 1); Hu3DModelAttrSet(arg0->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(arg0->model[5], 1); Hu3DModelAttrSet(arg0->model[5], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(arg0->model[4]); Hu3DModelShadowSet(arg0->model[4]);
} }
@ -3104,7 +3131,7 @@ void fn_1_11DA4(omObjData *object, s32 arg1, s32 arg2, s32 arg3)
} }
else { else {
fn_1_59A0(object, 2, 2, 0, 2); fn_1_59A0(object, 2, 2, 0, 2);
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
} }
fn_1_59A0(object, 1, 1, 0, 1); fn_1_59A0(object, 1, 1, 0, 1);
Hu3DModelPosSet(object->model[1], 1200.0f, 0.0f, 0.0f); Hu3DModelPosSet(object->model[1], 1200.0f, 0.0f, 0.0f);
@ -3118,11 +3145,11 @@ void fn_1_11DA4(omObjData *object, s32 arg1, s32 arg2, s32 arg3)
fn_1_59A0(object, 5, 5, 0, 2); fn_1_59A0(object, 5, 5, 0, 2);
Hu3DModelPosSet(object->model[4], 1200.0f, 80.0f, 460.0f); Hu3DModelPosSet(object->model[4], 1200.0f, 80.0f, 460.0f);
Hu3DModelHookSet(object->model[4], "koopabox_fix-effect_fook2", object->model[5]); Hu3DModelHookSet(object->model[4], "koopabox_fix-effect_fook2", object->model[5]);
Hu3DModelAttrSet(object->model[4], 1); Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[5], 1); Hu3DModelAttrSet(object->model[5], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(object->model[4]); Hu3DModelShadowSet(object->model[4]);
Hu3DModelAttrReset(object->model[4], 1); Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(object->model[5], 1); Hu3DModelAttrReset(object->model[5], HU3D_ATTR_DISPOFF);
lbl_1_bss_35BC[1].unk_04 = (MentDllUnkFunc)fn_1_1184C; lbl_1_bss_35BC[1].unk_04 = (MentDllUnkFunc)fn_1_1184C;
} }
Hu3DModelShadowMapObjSet(object->model[1], "base_story-base"); Hu3DModelShadowMapObjSet(object->model[1], "base_story-base");
@ -3135,8 +3162,8 @@ void fn_1_11DA4(omObjData *object, s32 arg1, s32 arg2, s32 arg3)
fn_1_59A0(object, 5, 5, 0, 2); fn_1_59A0(object, 5, 5, 0, 2);
Hu3DModelPosSet(object->model[4], 1200.0f, 80.0f, 460.0f); Hu3DModelPosSet(object->model[4], 1200.0f, 80.0f, 460.0f);
Hu3DModelHookSet(object->model[4], "koopabox_fix-effect_fook2", object->model[5]); Hu3DModelHookSet(object->model[4], "koopabox_fix-effect_fook2", object->model[5]);
Hu3DModelAttrSet(object->model[4], 1); Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[5], 1); Hu3DModelAttrSet(object->model[5], HU3D_ATTR_DISPOFF);
Hu3DModelShadowSet(object->model[4]); Hu3DModelShadowSet(object->model[4]);
} }
} }
@ -3307,7 +3334,7 @@ void fn_1_12A0C(omObjData *object, s32 arg1)
} }
} }
if (lbl_1_bss_A8[0] < 0xA) { if (lbl_1_bss_A8[0] < 0xA) {
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
} }
Hu3DModelShadowSet(object->model[1]); Hu3DModelShadowSet(object->model[1]);
Hu3DModelLayerSet(object->model[1], 2); Hu3DModelLayerSet(object->model[1], 2);
@ -4069,71 +4096,76 @@ s32 fn_1_1648C(MentDllUnkBss3114Struct *arg0)
var_r28 = 0; var_r28 = 0;
var_r29 = lbl_1_bss_35BC[0].unk_30; var_r29 = lbl_1_bss_35BC[0].unk_30;
while(1) { while (1) {
fn_1_4D8(); fn_1_4D8();
var_r28 = 0; var_r28 = 0;
var_r26 = arg0->unk_64; var_r26 = arg0->unk_64;
if(HuPadStkX[lbl_1_bss_3114->unk_6C] >= 5 || (HuPadBtn[lbl_1_bss_3114->unk_6C] & PAD_BUTTON_RIGHT)) { if (HuPadStkX[lbl_1_bss_3114->unk_6C] >= 5 || (HuPadBtn[lbl_1_bss_3114->unk_6C] & PAD_BUTTON_RIGHT)) {
if(lbl_1_bss_A8[5] == 1) { if (lbl_1_bss_A8[5] == 1) {
arg0->unk_64++; arg0->unk_64++;
var_r28 = 1; var_r28 = 1;
if(arg0->unk_64 > 3) { if (arg0->unk_64 > 3) {
arg0->unk_64 = 0;
}
} else {
arg0->unk_64++;
var_r28 = 1;
if(arg0->unk_64 > 2) {
arg0->unk_64 = 0; arg0->unk_64 = 0;
} }
} }
} else if(HuPadStkX[lbl_1_bss_3114->unk_6C] <= -5 || (HuPadBtn[lbl_1_bss_3114->unk_6C] & PAD_BUTTON_LEFT)) { else {
if(lbl_1_bss_A8[5] == 1) { arg0->unk_64++;
var_r28 = 1;
if (arg0->unk_64 > 2) {
arg0->unk_64 = 0;
}
}
}
else if (HuPadStkX[lbl_1_bss_3114->unk_6C] <= -5 || (HuPadBtn[lbl_1_bss_3114->unk_6C] & PAD_BUTTON_LEFT)) {
if (lbl_1_bss_A8[5] == 1) {
arg0->unk_64--; arg0->unk_64--;
var_r28 = -1; var_r28 = -1;
if(arg0->unk_64 < 0) { if (arg0->unk_64 < 0) {
arg0->unk_64 = 3; arg0->unk_64 = 3;
} }
} else { }
else {
arg0->unk_64--; arg0->unk_64--;
var_r28 = -1; var_r28 = -1;
if(arg0->unk_64 < 0) { if (arg0->unk_64 < 0) {
arg0->unk_64 = 2; arg0->unk_64 = 2;
} }
} }
} else if(HuPadBtnDown[0] & PAD_BUTTON_A) { }
else if (HuPadBtnDown[0] & PAD_BUTTON_A) {
var_r27 = 1; var_r27 = 1;
HuAudFXPlay(2); HuAudFXPlay(2);
break; break;
} else if(HuPadBtnDown[0] & PAD_BUTTON_B) { }
else if (HuPadBtnDown[0] & PAD_BUTTON_B) {
var_r27 = 0; var_r27 = 0;
HuAudFXPlay(3); HuAudFXPlay(3);
break; break;
} }
if(arg0->unk_64 != var_r26) { if (arg0->unk_64 != var_r26) {
HuAudFXPlay(0); HuAudFXPlay(0);
for(var_r30=0; var_r30<=5; var_r30++) { for (var_r30 = 0; var_r30 <= 5; var_r30++) {
fn_1_4D8(); fn_1_4D8();
var_f31 = fn_1_32C(lbl_1_data_57C[arg0->unk_68%4][0], lbl_1_data_57C[arg0->unk_68%4][0]+(var_r28*10), var_r30, 5); var_f31 = fn_1_32C(lbl_1_data_57C[arg0->unk_68 % 4][0], lbl_1_data_57C[arg0->unk_68 % 4][0] + (var_r28 * 10), var_r30, 5);
HuSprPosSet(var_r29, arg0->unk_58+32, var_f31, lbl_1_data_57C[arg0->unk_68/4][1]+35); HuSprPosSet(var_r29, arg0->unk_58 + 32, var_f31, lbl_1_data_57C[arg0->unk_68 / 4][1] + 35);
HuSprPosSet(var_r29, arg0->unk_58+36, 1+var_f31, lbl_1_data_57C[arg0->unk_68/4][1]+37); HuSprPosSet(var_r29, arg0->unk_58 + 36, 1 + var_f31, lbl_1_data_57C[arg0->unk_68 / 4][1] + 37);
} }
HuSprBankSet(var_r29, arg0->unk_58+32, arg0->unk_64); HuSprBankSet(var_r29, arg0->unk_58 + 32, arg0->unk_64);
for(var_r30=0; var_r30<=5; var_r30++) { for (var_r30 = 0; var_r30 <= 5; var_r30++) {
fn_1_4D8(); fn_1_4D8();
var_f31 = fn_1_32C(lbl_1_data_57C[arg0->unk_68%4][0]+(var_r28*10), lbl_1_data_57C[arg0->unk_68%4][0], var_r30, 5); var_f31 = fn_1_32C(lbl_1_data_57C[arg0->unk_68 % 4][0] + (var_r28 * 10), lbl_1_data_57C[arg0->unk_68 % 4][0], var_r30, 5);
HuSprPosSet(var_r29, arg0->unk_58+32, var_f31, lbl_1_data_57C[arg0->unk_68/4][1]+35); HuSprPosSet(var_r29, arg0->unk_58 + 32, var_f31, lbl_1_data_57C[arg0->unk_68 / 4][1] + 35);
HuSprPosSet(var_r29, arg0->unk_58+36, 1+var_f31, lbl_1_data_57C[arg0->unk_68/4][1]+37); HuSprPosSet(var_r29, arg0->unk_58 + 36, 1 + var_f31, lbl_1_data_57C[arg0->unk_68 / 4][1] + 37);
} }
} }
} }
if(var_r27 == 1) { if (var_r27 == 1) {
HuSprPosSet(var_r29, arg0->unk_58+49, lbl_1_data_57C[arg0->unk_68%4][0], lbl_1_data_57C[arg0->unk_68/4][1]+35); HuSprPosSet(var_r29, arg0->unk_58 + 49, lbl_1_data_57C[arg0->unk_68 % 4][0], lbl_1_data_57C[arg0->unk_68 / 4][1] + 35);
HuSprBankSet(var_r29, arg0->unk_58+49, arg0->unk_64); HuSprBankSet(var_r29, arg0->unk_58 + 49, arg0->unk_64);
HuSprAttrReset(var_r29, arg0->unk_58+49, 4); HuSprAttrReset(var_r29, arg0->unk_58 + 49, 4);
HuSprAttrSet(var_r29, arg0->unk_58+32, 4); HuSprAttrSet(var_r29, arg0->unk_58 + 32, 4);
} }
return var_r27; return var_r27;
} }
@ -6268,7 +6300,7 @@ void fn_1_21134(omObjData *object)
} }
if (object->work[0] == 1) { if (object->work[0] == 1) {
for (var_r31 = 0xA; var_r31 < 0x8C; var_r31++) { for (var_r31 = 0xA; var_r31 < 0x8C; var_r31++) {
Hu3DModelAttrSet(object->model[var_r31], 1); Hu3DModelAttrSet(object->model[var_r31], HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -6433,7 +6465,7 @@ void fn_1_225F4(omObjData *object)
lbl_1_bss_E4[var_r30].unk_08 *= -1; lbl_1_bss_E4[var_r30].unk_08 *= -1;
} }
} }
Hu3DModelAttrReset(object->model[var_r30], 1); Hu3DModelAttrReset(object->model[var_r30], HU3D_ATTR_DISPOFF);
Hu3DData[object->model[var_r30]].pos.x += lbl_1_bss_E4[var_r30].unk_0C; Hu3DData[object->model[var_r30]].pos.x += lbl_1_bss_E4[var_r30].unk_0C;
Hu3DData[object->model[var_r30]].pos.y -= (var_r30 % 3) + 2; Hu3DData[object->model[var_r30]].pos.y -= (var_r30 % 3) + 2;
Hu3DData[object->model[var_r30]].pos.z += lbl_1_bss_E4[var_r30].unk_14; Hu3DData[object->model[var_r30]].pos.z += lbl_1_bss_E4[var_r30].unk_14;
@ -6461,7 +6493,7 @@ void fn_1_225F4(omObjData *object)
} }
break; break;
case 2: case 2:
Hu3DModelAttrSet(object->model[var_r30], 1); Hu3DModelAttrSet(object->model[var_r30], HU3D_ATTR_DISPOFF);
break; break;
} }
} }
@ -6480,7 +6512,7 @@ void fn_1_2342C(omObjData *object)
object->model[var_r30] = Hu3DModelLink(object->model[0]); object->model[var_r30] = Hu3DModelLink(object->model[0]);
} }
for (var_r30 = 0; var_r30 < 0xC8; var_r30++) { for (var_r30 = 0; var_r30 < 0xC8; var_r30++) {
Hu3DModelAttrSet(object->model[var_r30], 1); Hu3DModelAttrSet(object->model[var_r30], HU3D_ATTR_DISPOFF);
Hu3DData[object->model[var_r30]].pos.x = rand8() + rand8(); Hu3DData[object->model[var_r30]].pos.x = rand8() + rand8();
if (rand8() == 0) { if (rand8() == 0) {
Hu3DData[object->model[var_r30]].pos.x *= -1.0f; Hu3DData[object->model[var_r30]].pos.x *= -1.0f;

689
src/REL/mgmodedll/battle.c
View file

File diff suppressed because it is too large Load diff

662
src/REL/mgmodedll/main.c
View file

File diff suppressed because it is too large Load diff

2389
src/REL/mgmodedll/mgmode.c
View file

File diff suppressed because it is too large Load diff

1216
src/REL/modeltestDll/modeltest01.c
View file

File diff suppressed because it is too large Load diff

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

@ -10,7 +10,6 @@
#include "game/window.h" #include "game/window.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "math.h" #include "math.h"
#include "REL/modeseldll.h" #include "REL/modeseldll.h"
@ -190,10 +189,10 @@ repeat:
Hu3DModelPosSetV(lbl_1_bss_19A[3], &sp1C); Hu3DModelPosSetV(lbl_1_bss_19A[3], &sp1C);
Hu3DModelPosSetV(lbl_1_bss_19A[5], &sp1C); Hu3DModelPosSetV(lbl_1_bss_19A[5], &sp1C);
Hu3DModelPosSetV(lbl_1_bss_19A[1], &sp1C); Hu3DModelPosSetV(lbl_1_bss_19A[1], &sp1C);
Hu3DModelAttrReset(lbl_1_bss_19A[2], 1); Hu3DModelAttrReset(lbl_1_bss_19A[2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_19A[4], 1); Hu3DModelAttrSet(lbl_1_bss_19A[4], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_19A[3], 1); Hu3DModelAttrReset(lbl_1_bss_19A[3], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_19A[5], 1); Hu3DModelAttrSet(lbl_1_bss_19A[5], HU3D_ATTR_DISPOFF);
Hu3DModelRotSet(lbl_1_bss_19A[2], 0, 0, 0); Hu3DModelRotSet(lbl_1_bss_19A[2], 0, 0, 0);
Hu3DModelRotSet(lbl_1_bss_19A[3], 0, 0, 0); Hu3DModelRotSet(lbl_1_bss_19A[3], 0, 0, 0);
fn_1_57C8(lbl_1_bss_19A[4]); fn_1_57C8(lbl_1_bss_19A[4]);
@ -622,8 +621,8 @@ void fn_1_5850(void)
work = curr->user_data; work = curr->user_data;
index = work->index; index = work->index;
param = work->param; param = work->param;
Hu3DModelAttrSet(lbl_1_bss_19A[index + 2], 1); Hu3DModelAttrSet(lbl_1_bss_19A[index + 2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_19A[index + 4], 1); Hu3DModelAttrReset(lbl_1_bss_19A[index + 4], HU3D_ATTR_DISPOFF);
Hu3DMotionSet(lbl_1_bss_19A[index + 4], lbl_1_bss_16A[6]); Hu3DMotionSet(lbl_1_bss_19A[index + 4], lbl_1_bss_16A[6]);
Hu3DMotionSpeedSet(lbl_1_bss_19A[index + 4], 2.0f); Hu3DMotionSpeedSet(lbl_1_bss_19A[index + 4], 2.0f);
if (param) { if (param) {
@ -648,8 +647,8 @@ void fn_1_5850(void)
HuPrcVSleep(); HuPrcVSleep();
} }
if (!param) { if (!param) {
Hu3DModelAttrReset(lbl_1_bss_19A[index + 2], 1); Hu3DModelAttrReset(lbl_1_bss_19A[index + 2], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_19A[index + 4], 1); Hu3DModelAttrSet(lbl_1_bss_19A[index + 4], HU3D_ATTR_DISPOFF);
} }
HuMemDirectFree(work); HuMemDirectFree(work);
HuPrcEnd(); HuPrcEnd();
@ -677,19 +676,19 @@ s32 fn_1_5C38(void)
lbl_1_bss_14C = 0; lbl_1_bss_14C = 0;
result = HuCardSlotCheck(0); result = HuCardSlotCheck(0);
if (result == 8192) { if (result == 8192) {
Hu3DModelAttrReset(lbl_1_bss_19A[0], 1); Hu3DModelAttrReset(lbl_1_bss_19A[0], HU3D_ATTR_DISPOFF);
lbl_1_bss_14C |= 1; lbl_1_bss_14C |= 1;
} }
else { else {
Hu3DModelAttrSet(lbl_1_bss_19A[0], 1); Hu3DModelAttrSet(lbl_1_bss_19A[0], HU3D_ATTR_DISPOFF);
} }
result = HuCardSlotCheck(1); result = HuCardSlotCheck(1);
if (result == 8192) { if (result == 8192) {
Hu3DModelAttrReset(lbl_1_bss_19A[1], 1); Hu3DModelAttrReset(lbl_1_bss_19A[1], HU3D_ATTR_DISPOFF);
lbl_1_bss_14C |= 2; lbl_1_bss_14C |= 2;
} }
else { else {
Hu3DModelAttrSet(lbl_1_bss_19A[1], 1); Hu3DModelAttrSet(lbl_1_bss_19A[1], HU3D_ATTR_DISPOFF);
} }
return lbl_1_bss_14C; return lbl_1_bss_14C;
} }
@ -700,10 +699,10 @@ void fn_1_5D30(void)
Vec pos_2d; Vec pos_2d;
Vec pos_3d; Vec pos_3d;
Mtx scale; Mtx scale;
espAttrReset(lbl_1_bss_152[0], 4); espAttrReset(lbl_1_bss_152[0], HUSPR_ATTR_DISPOFF);
espDrawNoSet(lbl_1_bss_152[0], 127); espDrawNoSet(lbl_1_bss_152[0], 127);
espAttrReset(lbl_1_bss_152[1], 4); espAttrReset(lbl_1_bss_152[1], HUSPR_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_19A[2], 1); Hu3DModelAttrReset(lbl_1_bss_19A[2], HU3D_ATTR_DISPOFF);
pos_2d.x = 188; pos_2d.x = 188;
pos_2d.y = 250; pos_2d.y = 250;
pos_2d.z = 600; pos_2d.z = 600;
@ -718,7 +717,7 @@ void fn_1_5D30(void)
MTXCopy(scale, model->unk_F0); MTXCopy(scale, model->unk_F0);
model = &Hu3DData[lbl_1_bss_19A[0]]; model = &Hu3DData[lbl_1_bss_19A[0]];
MTXCopy(scale, model->unk_F0); MTXCopy(scale, model->unk_F0);
Hu3DModelAttrReset(lbl_1_bss_19A[3], 1); Hu3DModelAttrReset(lbl_1_bss_19A[3], HU3D_ATTR_DISPOFF);
pos_2d.x = 388; pos_2d.x = 388;
Hu3D2Dto3D(&pos_2d, 1, &pos_3d); Hu3D2Dto3D(&pos_2d, 1, &pos_3d);
Hu3DModelPosSetV(lbl_1_bss_19A[3], &pos_3d); Hu3DModelPosSetV(lbl_1_bss_19A[3], &pos_3d);
@ -1104,12 +1103,12 @@ void fn_1_72DC(void)
index = work->index; index = work->index;
param = work->param; param = work->param;
if (param) { if (param) {
Hu3DModelAttrReset(lbl_1_bss_19A[index + 8], 1); Hu3DModelAttrReset(lbl_1_bss_19A[index + 8], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_19A[index + 11], 1); Hu3DModelAttrSet(lbl_1_bss_19A[index + 11], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrSet(lbl_1_bss_19A[index + 8], 1); Hu3DModelAttrSet(lbl_1_bss_19A[index + 8], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_19A[index + 11], 1); Hu3DModelAttrReset(lbl_1_bss_19A[index + 11], HU3D_ATTR_DISPOFF);
} }
for (i = 0; i <= 10; i++) { for (i = 0; i <= 10; i++) {
float scale; float scale;
@ -1583,7 +1582,7 @@ s32 fn_1_8C30(s16 boxno)
HuWinMesSet(lbl_1_bss_146, MAKE_MESSID(16, 0x35)); HuWinMesSet(lbl_1_bss_146, MAKE_MESSID(16, 0x35));
HuWinDispOn(lbl_1_bss_146); HuWinDispOn(lbl_1_bss_146);
lbl_1_bss_90 = boxno; lbl_1_bss_90 = boxno;
Hu3DModelAttrReset(lbl_1_bss_19A[23], 1); Hu3DModelAttrReset(lbl_1_bss_19A[23], HU3D_ATTR_DISPOFF);
sp2C = &Hu3DData[lbl_1_bss_19A[boxno + 8]]; sp2C = &Hu3DData[lbl_1_bss_19A[boxno + 8]];
Hu3DModelPosSetV(lbl_1_bss_19A[23], &sp2C->pos); Hu3DModelPosSetV(lbl_1_bss_19A[23], &sp2C->pos);
for (temp_r30 = 1; temp_r30 <= 10; temp_r30++) { for (temp_r30 = 1; temp_r30 <= 10; temp_r30++) {
@ -1634,8 +1633,8 @@ s32 fn_1_8C30(s16 boxno)
} }
else { else {
HuAudFXPlay(3); HuAudFXPlay(3);
Hu3DModelAttrSet(lbl_1_bss_19A[23], 1); Hu3DModelAttrSet(lbl_1_bss_19A[23], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], 1); Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], HU3D_ATTR_DISPOFF);
fn_1_7628(temp_r31, 0); fn_1_7628(temp_r31, 0);
HuWinDispOff(lbl_1_bss_146); HuWinDispOff(lbl_1_bss_146);
return 1; return 1;
@ -1646,7 +1645,7 @@ s32 fn_1_8C30(s16 boxno)
fn_1_B8CC(MAKE_MESSID(16, 0x0A)); fn_1_B8CC(MAKE_MESSID(16, 0x0A));
HuWinMesSet(lbl_1_bss_148, MAKE_MESSID(16, 0x0B)); HuWinMesSet(lbl_1_bss_148, MAKE_MESSID(16, 0x0B));
HuWinMesWait(lbl_1_bss_148); HuWinMesWait(lbl_1_bss_148);
Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], 1); Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], HU3D_ATTR_DISPOFF);
OSReport("CheckSum Check\n"); OSReport("CheckSum Check\n");
if (!SLCheckSumCheck()) { if (!SLCheckSumCheck()) {
HuPrcSleep(60); HuPrcSleep(60);
@ -1666,8 +1665,8 @@ s32 fn_1_8C30(s16 boxno)
Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31 + 8], temp_f31, temp_f31, temp_f31); Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31 + 8], temp_f31, temp_f31, temp_f31);
HuPrcVSleep(); HuPrcVSleep();
} }
Hu3DModelAttrSet(lbl_1_bss_19A[23], 1); Hu3DModelAttrSet(lbl_1_bss_19A[23], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], 1); Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], HU3D_ATTR_DISPOFF);
if (UnMountCnt & (1 << curSlotNo)) { if (UnMountCnt & (1 << curSlotNo)) {
fn_1_BA20(); fn_1_BA20();
HuWinMesSet(lbl_1_bss_148, MAKE_MESSID(16, 0x50)); HuWinMesSet(lbl_1_bss_148, MAKE_MESSID(16, 0x50));
@ -1692,8 +1691,8 @@ s32 fn_1_8C30(s16 boxno)
lbl_1_bss_13A[temp_r31] = Hu3DAnimCreate(temp_r19, lbl_1_bss_19A[temp_r31 + 8], "star"); lbl_1_bss_13A[temp_r31] = Hu3DAnimCreate(temp_r19, lbl_1_bss_19A[temp_r31 + 8], "star");
temp_r19 = HuSprAnimRead(HuDataReadNum(lbl_1_data_21C[temp_r25], MEMORY_DEFAULT_NUM)); temp_r19 = HuSprAnimRead(HuDataReadNum(lbl_1_data_21C[temp_r25], MEMORY_DEFAULT_NUM));
lbl_1_bss_134[temp_r31] = Hu3DAnimCreate(temp_r19, lbl_1_bss_19A[temp_r31 + 11], "star"); lbl_1_bss_134[temp_r31] = Hu3DAnimCreate(temp_r19, lbl_1_bss_19A[temp_r31 + 11], "star");
Hu3DModelAttrReset(lbl_1_bss_19A[temp_r31 + 11], 1); Hu3DModelAttrReset(lbl_1_bss_19A[temp_r31 + 11], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_19A[temp_r31 + 8], 1); Hu3DModelAttrSet(lbl_1_bss_19A[temp_r31 + 8], HU3D_ATTR_DISPOFF);
sp60.x = 158.0f + (boxno * 130); sp60.x = 158.0f + (boxno * 130);
sp60.y = 230; sp60.y = 230;
sp60.z = 800; sp60.z = 800;
@ -1728,8 +1727,8 @@ s32 fn_1_8C30(s16 boxno)
} }
} }
fn_1_BA20(); fn_1_BA20();
Hu3DModelAttrSet(lbl_1_bss_19A[23], 1); Hu3DModelAttrSet(lbl_1_bss_19A[23], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], 1); Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], HU3D_ATTR_DISPOFF);
for (temp_r30 = 0; temp_r30 <= 10; temp_r30++) { for (temp_r30 = 0; temp_r30 <= 10; temp_r30++) {
temp_f31 = sin(M_PI * (90.0 * (temp_r30 / 10.0)) / 180.0); temp_f31 = sin(M_PI * (90.0 * (temp_r30 / 10.0)) / 180.0);
Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31 + 8], temp_f31, temp_f31, temp_f31); Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31 + 8], temp_f31, temp_f31, temp_f31);
@ -1782,8 +1781,8 @@ s32 fn_1_9E4C(void)
lbl_1_bss_F4 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATA_MAKE_NUM(DATADIR_MODESEL, 0x00), 0x25), MEMORY_DEFAULT_NUM)); lbl_1_bss_F4 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATA_MAKE_NUM(DATADIR_MODESEL, 0x00), 0x25), MEMORY_DEFAULT_NUM));
temp_r22 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATA_MAKE_NUM(DATADIR_MODESEL, 0x00), 0x24), MEMORY_DEFAULT_NUM)); temp_r22 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATA_MAKE_NUM(DATADIR_MODESEL, 0x00), 0x24), MEMORY_DEFAULT_NUM));
for (temp_r31 = 0; temp_r31 < 3; temp_r31++) { for (temp_r31 = 0; temp_r31 < 3; temp_r31++) {
Hu3DModelAttrSet(lbl_1_bss_19A[temp_r31 + 8], 1); Hu3DModelAttrSet(lbl_1_bss_19A[temp_r31 + 8], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_19A[temp_r31 + 11], 1); Hu3DModelAttrReset(lbl_1_bss_19A[temp_r31 + 11], HU3D_ATTR_DISPOFF);
temp_r27 = lbl_1_bss_E8[temp_r31]; temp_r27 = lbl_1_bss_E8[temp_r31];
if (temp_r27 < 0 || temp_r27 >= 8) { if (temp_r27 < 0 || temp_r27 >= 8) {
temp_r27 = 8; temp_r27 = 8;
@ -1849,7 +1848,7 @@ s32 fn_1_9E4C(void)
} }
MTXScale(sp24, 0.45f, 0.45f, 0.45f); MTXScale(sp24, 0.45f, 0.45f, 0.45f);
temp_r28 = &Hu3DData[lbl_1_bss_19A[23]]; temp_r28 = &Hu3DData[lbl_1_bss_19A[23]];
Hu3DModelAttrSet(lbl_1_bss_19A[23], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_19A[23], HU3D_MOTATTR_LOOP);
MTXCopy(sp24, temp_r28->unk_F0); MTXCopy(sp24, temp_r28->unk_F0);
return temp_r23; return temp_r23;
} }
@ -1900,7 +1899,7 @@ void fn_1_AAB8(void)
MTXCopy(sp48, temp_r31->unk_F0); MTXCopy(sp48, temp_r31->unk_F0);
Hu3DModelRotSet(lbl_1_bss_19A[temp_r30], 0, lbl_1_bss_8C * lbl_1_bss_108[temp_r30] * GET_ZEROSIGN(temp_r30 == 0), 0); Hu3DModelRotSet(lbl_1_bss_19A[temp_r30], 0, lbl_1_bss_8C * lbl_1_bss_108[temp_r30] * GET_ZEROSIGN(temp_r30 == 0), 0);
if (!lbl_1_bss_12C[temp_r30]) { if (!lbl_1_bss_12C[temp_r30]) {
espAttrSet(lbl_1_bss_152[temp_r30 + 2], 4); espAttrSet(lbl_1_bss_152[temp_r30 + 2], HUSPR_ATTR_DISPOFF);
} }
else { else {
temp_r31 = &Hu3DData[lbl_1_bss_19A[temp_r30 + 2]]; temp_r31 = &Hu3DData[lbl_1_bss_19A[temp_r30 + 2]];
@ -1908,10 +1907,10 @@ void fn_1_AAB8(void)
temp_r31 = &Hu3DData[lbl_1_bss_19A[temp_r30 + 4]]; temp_r31 = &Hu3DData[lbl_1_bss_19A[temp_r30 + 4]];
} }
if (temp_r31->attr & 0x1) { if (temp_r31->attr & 0x1) {
espAttrSet(lbl_1_bss_152[temp_r30 + 2], 4); espAttrSet(lbl_1_bss_152[temp_r30 + 2], HUSPR_ATTR_DISPOFF);
} }
else { else {
espAttrReset(lbl_1_bss_152[temp_r30 + 2], 4); espAttrReset(lbl_1_bss_152[temp_r30 + 2], HUSPR_ATTR_DISPOFF);
} }
sp8 = temp_r31->pos; sp8 = temp_r31->pos;
sp8.y -= 30.0f * temp_r31->scale.x; sp8.y -= 30.0f * temp_r31->scale.x;
@ -1925,16 +1924,16 @@ void fn_1_AAB8(void)
lbl_1_bss_8C -= 360; lbl_1_bss_8C -= 360;
} }
if (lbl_1_bss_11C == -1) { if (lbl_1_bss_11C == -1) {
espAttrSet(lbl_1_bss_152[4], 4); espAttrSet(lbl_1_bss_152[4], HUSPR_ATTR_DISPOFF);
} }
else { else {
temp_r31 = &Hu3DData[lbl_1_bss_19A[lbl_1_bss_11C]]; temp_r31 = &Hu3DData[lbl_1_bss_19A[lbl_1_bss_11C]];
if (temp_r31->attr & 0x1) { if (temp_r31->attr & 0x1) {
espAttrSet(lbl_1_bss_152[4], 4); espAttrSet(lbl_1_bss_152[4], HUSPR_ATTR_DISPOFF);
} }
else { else {
espBankSet(lbl_1_bss_152[4], lbl_1_bss_11C); espBankSet(lbl_1_bss_152[4], lbl_1_bss_11C);
espAttrReset(lbl_1_bss_152[4], 4); espAttrReset(lbl_1_bss_152[4], HUSPR_ATTR_DISPOFF);
sp8 = temp_r31->pos; sp8 = temp_r31->pos;
sp8.y += 5.0f * temp_r31->scale.x; sp8.y += 5.0f * temp_r31->scale.x;
Hu3D3Dto2D(&sp8, 1, &sp14); Hu3D3Dto2D(&sp8, 1, &sp14);
@ -1944,7 +1943,7 @@ void fn_1_AAB8(void)
} }
for (temp_r30 = 0; temp_r30 < 3; temp_r30++) { for (temp_r30 = 0; temp_r30 < 3; temp_r30++) {
if (!lbl_1_bss_120[temp_r30]) { if (!lbl_1_bss_120[temp_r30]) {
espAttrSet(lbl_1_bss_152[temp_r30 + 5], 4); espAttrSet(lbl_1_bss_152[temp_r30 + 5], HUSPR_ATTR_DISPOFF);
continue; continue;
} }
temp_r31 = &Hu3DData[lbl_1_bss_19A[temp_r30 + 8]]; temp_r31 = &Hu3DData[lbl_1_bss_19A[temp_r30 + 8]];
@ -1955,10 +1954,10 @@ void fn_1_AAB8(void)
temp_f29 = (temp_r31->pos.z + (50.0 * temp_r31->scale.x)) * sin(M_PI / 12); temp_f29 = (temp_r31->pos.z + (50.0 * temp_r31->scale.x)) * sin(M_PI / 12);
temp_f31 = temp_r31->scale.x * (temp_f29 / temp_f30); temp_f31 = temp_r31->scale.x * (temp_f29 / temp_f30);
if (temp_r31->attr & 0x1) { if (temp_r31->attr & 0x1) {
espAttrSet(lbl_1_bss_152[temp_r30 + 5], 4); espAttrSet(lbl_1_bss_152[temp_r30 + 5], HUSPR_ATTR_DISPOFF);
} }
else { else {
espAttrReset(lbl_1_bss_152[temp_r30 + 5], 4); espAttrReset(lbl_1_bss_152[temp_r30 + 5], HUSPR_ATTR_DISPOFF);
} }
sp8 = temp_r31->pos; sp8 = temp_r31->pos;
sp8.y += 40.0 * temp_r31->scale.x; sp8.y += 40.0 * temp_r31->scale.x;

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

@ -98,7 +98,7 @@ void fn_1_414(void)
HuSprPosSet(group, 0, 288, 240); HuSprPosSet(group, 0, 288, 240);
HuSprDrawNoSet(group, 0, 127); HuSprDrawNoSet(group, 0, 127);
HuPrcSleep(2); HuPrcSleep(2);
espAttrSet(lbl_1_bss_152[0], 4); espAttrSet(lbl_1_bss_152[0], HUSPR_ATTR_DISPOFF);
HuAudFXStop(lbl_1_data_100); HuAudFXStop(lbl_1_data_100);
while(!HuTHPEndCheck()) { while(!HuTHPEndCheck()) {
HuPrcVSleep(); HuPrcVSleep();
@ -107,7 +107,7 @@ void fn_1_414(void)
HuSprGrpKill(group); HuSprGrpKill(group);
} }
} }
espAttrReset(lbl_1_bss_152[9], 4); espAttrReset(lbl_1_bss_152[9], HUSPR_ATTR_DISPOFF);
espDrawNoSet(lbl_1_bss_152[9], 127); espDrawNoSet(lbl_1_bss_152[9], 127);
{ {
s16 result = fn_1_2490(); s16 result = fn_1_2490();

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

@ -9,11 +9,9 @@
#include "game/window.h" #include "game/window.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "REL/modeseldll.h" #include "REL/modeseldll.h"
#include "ext_math.h" #include "ext_math.h"
s16 lbl_1_data_80[] = { 16, 17, 18, 19, 20, 21 }; s16 lbl_1_data_80[] = { 16, 17, 18, 19, 20, 21 };
s32 lbl_1_data_8C[] = { DATA_MAKE_NUM(DATADIR_MODESEL, 0x30), DATA_MAKE_NUM(DATADIR_MODESEL, 0x32), DATA_MAKE_NUM(DATADIR_MODESEL, 0x34), s32 lbl_1_data_8C[] = { DATA_MAKE_NUM(DATADIR_MODESEL, 0x30), DATA_MAKE_NUM(DATADIR_MODESEL, 0x32), DATA_MAKE_NUM(DATADIR_MODESEL, 0x34),
@ -87,10 +85,10 @@ s32 fn_1_2490(void)
while (!Hu3DMotionEndCheck(lbl_1_bss_19A[15])) { while (!Hu3DMotionEndCheck(lbl_1_bss_19A[15])) {
HuPrcVSleep(); HuPrcVSleep();
} }
Hu3DModelAttrSet(lbl_1_bss_19A[15], 1); Hu3DModelAttrSet(lbl_1_bss_19A[15], HU3D_ATTR_DISPOFF);
for (temp_r31 = 0; temp_r31 < 6; temp_r31++) { for (temp_r31 = 0; temp_r31 < 6; temp_r31++) {
Hu3DModelAttrReset(lbl_1_bss_19A[lbl_1_data_80[temp_r31]], 1); Hu3DModelAttrReset(lbl_1_bss_19A[lbl_1_data_80[temp_r31]], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_19A[lbl_1_data_80[temp_r31]], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_19A[lbl_1_data_80[temp_r31]], HU3D_MOTATTR_PAUSE);
Hu3DMotionTimeSet(lbl_1_bss_19A[lbl_1_data_80[temp_r31]], 0); Hu3DMotionTimeSet(lbl_1_bss_19A[lbl_1_data_80[temp_r31]], 0);
Hu3DModelPosSet(lbl_1_bss_19A[lbl_1_data_80[temp_r31]], 0, -50, 0); Hu3DModelPosSet(lbl_1_bss_19A[lbl_1_data_80[temp_r31]], 0, -50, 0);
} }
@ -186,10 +184,10 @@ s32 fn_1_2490(void)
temp_r22 = HuSprAnimRead(HuDataReadNum(lbl_1_data_A4[lbl_1_bss_80], MEMORY_DEFAULT_NUM)); temp_r22 = HuSprAnimRead(HuDataReadNum(lbl_1_data_A4[lbl_1_bss_80], MEMORY_DEFAULT_NUM));
Hu3DAnimCreate(temp_r23, lbl_1_bss_19A[22], "ys002_a1"); Hu3DAnimCreate(temp_r23, lbl_1_bss_19A[22], "ys002_a1");
Hu3DAnimCreate(temp_r22, lbl_1_bss_19A[22], "ys002_a2"); Hu3DAnimCreate(temp_r22, lbl_1_bss_19A[22], "ys002_a2");
Hu3DModelAttrSet(lbl_1_bss_19A[lbl_1_data_80[lbl_1_bss_80]], 1); Hu3DModelAttrSet(lbl_1_bss_19A[lbl_1_data_80[lbl_1_bss_80]], HU3D_ATTR_DISPOFF);
Hu3DMotionTimeSet(lbl_1_bss_19A[22], 0); Hu3DMotionTimeSet(lbl_1_bss_19A[22], 0);
Hu3DModelAttrReset(lbl_1_bss_19A[22], 1); Hu3DModelAttrReset(lbl_1_bss_19A[22], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_19A[22], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_19A[22], HU3D_MOTATTR_PAUSE);
Hu3DModelPosSet(lbl_1_bss_19A[22], 0, 27, 50); Hu3DModelPosSet(lbl_1_bss_19A[22], 0, 27, 50);
Hu3DModelScaleSet(lbl_1_bss_19A[22], 1.0f, 1.063f, 1.0f); Hu3DModelScaleSet(lbl_1_bss_19A[22], 1.0f, 1.063f, 1.0f);
for (temp_r31 = 1; temp_r31 <= 20; temp_r31++) { for (temp_r31 = 1; temp_r31 <= 20; temp_r31++) {
@ -236,10 +234,10 @@ void fn_1_3668(void)
sp8.y = 1; sp8.y = 1;
sp8.z = 0; sp8.z = 0;
Hu3DShadowPosSet(&sp20, &sp8, &sp14); Hu3DShadowPosSet(&sp20, &sp8, &sp14);
Hu3DModelAttrReset(lbl_1_bss_19A[15], 1); Hu3DModelAttrReset(lbl_1_bss_19A[15], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_19A[15], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_19A[15], HU3D_MOTATTR_PAUSE);
Hu3DMotionTimeSet(lbl_1_bss_19A[15], 0); Hu3DMotionTimeSet(lbl_1_bss_19A[15], 0);
Hu3DModelAttrReset(lbl_1_bss_19A[14], 1); Hu3DModelAttrReset(lbl_1_bss_19A[14], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_19A[14], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_19A[14], HU3D_MOTATTR_PAUSE);
Hu3DMotionTimeSet(lbl_1_bss_19A[14], 0); Hu3DMotionTimeSet(lbl_1_bss_19A[14], 0);
} }

30
src/REL/mpexDll/mpex.c
View file

@ -263,7 +263,7 @@ void fn_1_33F8(void)
HuPrcVSleep(); HuPrcVSleep();
var_r31 = espEntry(0x860020, 0x1388, 0); var_r31 = espEntry(0x860020, 0x1388, 0);
espPosSet(var_r31, 288.0f, 240.0f); espPosSet(var_r31, 288.0f, 240.0f);
espAttrReset(var_r31, 4); espAttrReset(var_r31, HUSPR_ATTR_DISPOFF);
Hu3DBGColorSet(0, 0, 0); Hu3DBGColorSet(0, 0, 0);
WipeCreate(1, 0, 0xA); WipeCreate(1, 0, 0xA);
@ -833,7 +833,7 @@ void fn_1_4C6C(void)
Hu3DModelPosSet(lbl_1_bss_2D8[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_2D8[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f);
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
Hu3DModelPosSet(lbl_1_bss_1B8[var_r31].unk_00->model[1], -225.0f + (150.0f * var_r31), 0.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_1B8[var_r31].unk_00->model[1], -225.0f + (150.0f * var_r31), 0.0f, 0.0f);
Hu3DModelAttrReset(lbl_1_bss_1B8[var_r31].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_1B8[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
} }
@ -846,7 +846,7 @@ void fn_1_4DF8(void)
Hu3DModelPosSet(lbl_1_bss_2D8[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_2D8[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f);
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
Hu3DModelPosSet(lbl_1_bss_1B8[var_r31].unk_00->model[1], -225.0f + (150.0f * var_r31), 0.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_1B8[var_r31].unk_00->model[1], -225.0f + (150.0f * var_r31), 0.0f, 0.0f);
Hu3DModelAttrSet(lbl_1_bss_1B8[var_r31].unk_00->model[1], 1); Hu3DModelAttrSet(lbl_1_bss_1B8[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
} }
@ -917,7 +917,7 @@ void fn_1_56B8(void)
Hu3DModelPosSet(lbl_1_bss_2D8[1].unk_00->model[1], -400.0f, 0.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_2D8[1].unk_00->model[1], -400.0f, 0.0f, 0.0f);
Hu3DModelPosSet(lbl_1_bss_2D8[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_2D8[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f);
Hu3DModelPosSet(lbl_1_bss_1B8[0].unk_00->model[1], 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_1B8[0].unk_00->model[1], 0.0f, 0.0f, 0.0f);
Hu3DModelAttrReset(lbl_1_bss_1B8[0].unk_00->model[1], 1); Hu3DModelAttrReset(lbl_1_bss_1B8[0].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
s32 fn_1_57E0(void) s32 fn_1_57E0(void)
@ -960,7 +960,7 @@ void fn_1_5AF8(void)
Hu3DModelPosSet(lbl_1_bss_2D8[1].unk_00->model[1], 1000.0f, 0.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_2D8[1].unk_00->model[1], 1000.0f, 0.0f, 0.0f);
Hu3DModelPosSet(lbl_1_bss_2D8[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_2D8[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f);
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
Hu3DModelAttrSet(lbl_1_bss_1B8[var_r31].unk_00->model[1], 1); Hu3DModelAttrSet(lbl_1_bss_1B8[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
fn_1_C544(); fn_1_C544();
fn_1_D468(lbl_1_bss_1B0); fn_1_D468(lbl_1_bss_1B0);
@ -974,7 +974,7 @@ void fn_1_5C1C(void)
Hu3DModelPosSet(lbl_1_bss_2D8[1].unk_00->model[1], 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_2D8[1].unk_00->model[1], 0.0f, 0.0f, 0.0f);
Hu3DModelPosSet(lbl_1_bss_2D8[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_2D8[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f);
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
Hu3DModelAttrSet(lbl_1_bss_1B8[var_r31].unk_00->model[1], 1); Hu3DModelAttrSet(lbl_1_bss_1B8[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
fn_1_C544(); fn_1_C544();
fn_1_D468(lbl_1_bss_1B0); fn_1_D468(lbl_1_bss_1B0);
@ -1259,7 +1259,7 @@ void fn_1_7BC8(omObjData *object)
fn_1_25C4(object, 1, 1, 0, 1); fn_1_25C4(object, 1, 1, 0, 1);
for (var_r30 = 0; var_r30 < 3; var_r30++) { for (var_r30 = 0; var_r30 < 3; var_r30++) {
object->model[var_r30 + 1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_MPEX, 0x02)); object->model[var_r30 + 1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_MPEX, 0x02));
Hu3DModelAttrSet(object->model[var_r30 + 1], 1); Hu3DModelAttrSet(object->model[var_r30 + 1], HU3D_ATTR_DISPOFF);
} }
object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_MPEX, 0x01)); object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_MPEX, 0x01));
object->motion[5] = Hu3DMotionIDGet(object->model[5]); object->motion[5] = Hu3DMotionIDGet(object->model[5]);
@ -1269,7 +1269,7 @@ void fn_1_7BC8(omObjData *object)
return; return;
} }
if (omovlevtno == 1) { if (omovlevtno == 1) {
Hu3DModelAttrSet(object->model[5], 0x40000002); Hu3DModelAttrSet(object->model[5], HU3D_MOTATTR_PAUSE);
return; return;
} }
fn_1_25C4(object, 5, 5, 0, 2); fn_1_25C4(object, 5, 5, 0, 2);
@ -1325,12 +1325,12 @@ void fn_1_816C(omObjData *object, s32 arg1)
object->motion[5] = CharModelMotionCreate(var_r30, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x49)); object->motion[5] = CharModelMotionCreate(var_r30, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x49));
Hu3DModelPosSet(object->model[1], -150.0f + (100.0f * arg1), 0.0f, 0.0f); Hu3DModelPosSet(object->model[1], -150.0f + (100.0f * arg1), 0.0f, 0.0f);
Hu3DModelShadowSet(object->model[1]); Hu3DModelShadowSet(object->model[1]);
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
CharModelLayerSetAll2(2); CharModelLayerSetAll2(2);
fn_1_25C4(object, 1, 1, 0, 1); fn_1_25C4(object, 1, 1, 0, 1);
CharKill(var_r30); CharKill(var_r30);
object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_MPEX, 0x02)); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_MPEX, 0x02));
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
} }
void fn_1_8320(void) void fn_1_8320(void)
@ -1406,7 +1406,7 @@ void fn_1_89C4(omObjData *object)
object->motion[3] = Hu3DJointMotionFile(object->model[1], DATA_MAKE_NUM(DATADIR_MPEX, 0x11)); object->motion[3] = Hu3DJointMotionFile(object->model[1], DATA_MAKE_NUM(DATADIR_MPEX, 0x11));
Hu3DModelPosSet(object->model[1], 0.0f, 400.0f, 0.0f); Hu3DModelPosSet(object->model[1], 0.0f, 400.0f, 0.0f);
if (lbl_1_bss_180[0xA] == 0) { if (lbl_1_bss_180[0xA] == 0) {
Hu3DModelAttrSet(object->model[1], 1); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
} }
fn_1_25C4(object, 1, 1, 0, 1); fn_1_25C4(object, 1, 1, 0, 1);
object->func = fn_1_88EC; object->func = fn_1_88EC;
@ -1707,7 +1707,7 @@ void fn_1_A0E4(omObjData *object, MpexDllUnkStruct4 *arg_1)
float var_f30; float var_f30;
s32 var_r30; s32 var_r30;
Hu3DModelAttrReset(object->model[2], 1); Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(object->model[2], 0.0f); Hu3DModelTPLvlSet(object->model[2], 0.0f);
for (var_r30 = 0; var_r30 <= 0xF; var_r30++) { for (var_r30 = 0; var_r30 <= 0xF; var_r30++) {
fn_1_1B7D0(1); fn_1_1B7D0(1);
@ -1730,7 +1730,7 @@ void fn_1_A2AC(omObjData *object, MpexDllUnkStruct4 *arg1)
var_f31 = fn_1_1B52C(0.5f, 0.0f, var_r30, 15.0f); var_f31 = fn_1_1B52C(0.5f, 0.0f, var_r30, 15.0f);
Hu3DModelTPLvlSet(object->model[2], var_f31); Hu3DModelTPLvlSet(object->model[2], var_f31);
} }
Hu3DModelAttrSet(object->model[2], 1); Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(object->model[2], 0.0f); Hu3DModelTPLvlSet(object->model[2], 0.0f);
arg1->unk_04 = NULL; arg1->unk_04 = NULL;
} }
@ -1743,7 +1743,7 @@ void fn_1_A3A4(void)
lbl_1_bss_3B0.unk_04 = (MpexDllUnkFunc2)fn_1_9F10; lbl_1_bss_3B0.unk_04 = (MpexDllUnkFunc2)fn_1_9F10;
for (var_r31 = 0; var_r31 < 3; var_r31++) { for (var_r31 = 0; var_r31 < 3; var_r31++) {
Hu3DModelAttrReset(lbl_1_bss_3B0.unk_00->model[var_r31 + 1], 1); Hu3DModelAttrReset(lbl_1_bss_3B0.unk_00->model[var_r31 + 1], HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(lbl_1_bss_3B0.unk_00->model[var_r31 + 1], 0.0f); Hu3DModelTPLvlSet(lbl_1_bss_3B0.unk_00->model[var_r31 + 1], 0.0f);
} }
for (var_r31 = 0; var_r31 <= 0x3C; var_r31++) { for (var_r31 = 0; var_r31 <= 0x3C; var_r31++) {
@ -1762,7 +1762,7 @@ void fn_1_A3A4(void)
} }
} }
for (var_r31 = 0; var_r31 < 3; var_r31++) { for (var_r31 = 0; var_r31 < 3; var_r31++) {
Hu3DModelAttrSet(lbl_1_bss_3B0.unk_00->model[var_r31 + 1], 1); Hu3DModelAttrSet(lbl_1_bss_3B0.unk_00->model[var_r31 + 1], HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(lbl_1_bss_3B0.unk_00->model[var_r31 + 1], 0.0f); Hu3DModelTPLvlSet(lbl_1_bss_3B0.unk_00->model[var_r31 + 1], 0.0f);
} }
lbl_1_bss_3B0.unk_04 = NULL; lbl_1_bss_3B0.unk_04 = NULL;

61
src/REL/option/record.c
View file

@ -40,7 +40,7 @@ typedef struct {
/* 0x008 */ OptionWindow *window[10]; /* 0x008 */ OptionWindow *window[10];
/* 0x030 */ s32 execMode; /* 0x030 */ s32 execMode;
/* 0x034 */ s16 sprList[153]; /* 0x034 */ s16 sprList[153];
/* 0x166 */ s16 unk166[3]; /* 0x166 */ s16 unk166[3];
/* 0x16C */ s32 recordType; /* 0x16C */ s32 recordType;
/* 0x170 */ s32 board; /* 0x170 */ s32 board;
/* 0x174 */ s32 mgPage; /* 0x174 */ s32 mgPage;
@ -199,7 +199,7 @@ static void ExecRecord(omObjData *object)
OptionWinAnimIn(work->window[1]); OptionWinAnimIn(work->window[1]);
OptionWinMesSet(work->window[1], MAKE_MESSID(47, 169)); OptionWinMesSet(work->window[1], MAKE_MESSID(47, 169));
if (!work->cameraDoneF) { if (!work->cameraDoneF) {
Hu3DModelAttrReset(work->hand->model[0], 1); Hu3DModelAttrReset(work->hand->model[0], HU3D_ATTR_DISPOFF);
work->cameraDoneF = TRUE; work->cameraDoneF = TRUE;
} }
pos.x = 505.0 * -sin(305 * M_PI / 180.0); pos.x = 505.0 * -sin(305 * M_PI / 180.0);
@ -287,7 +287,7 @@ static void ExecRecord(omObjData *object)
} }
OptionWinAnimOut(work->window[0]); OptionWinAnimOut(work->window[0]);
OptionWinAnimOut(work->window[1]); OptionWinAnimOut(work->window[1]);
Hu3DModelAttrSet(work->hand->model[0], 1); Hu3DModelAttrSet(work->hand->model[0], HU3D_ATTR_DISPOFF);
object->unk10 = 6; object->unk10 = 6;
/* fallthrough */ /* fallthrough */
case 6: case 6:
@ -312,7 +312,7 @@ static omObjData *CreateSystem(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 1)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 1));
Hu3DModelAttrSet(object->model[0], 0x40000002); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[0], 0); Hu3DModelLayerSet(object->model[0], 0);
Hu3DMotionStartEndSet(object->model[0], 0.0f, 6.0f); Hu3DMotionStartEndSet(object->model[0], 0.0f, 6.0f);
Hu3DMotionTimeSet(object->model[0], 6.0f); Hu3DMotionTimeSet(object->model[0], 6.0f);
@ -352,10 +352,10 @@ static omObjData *CreateHand(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 14)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 14));
Hu3DModelLayerSet(object->model[0], 2); Hu3DModelLayerSet(object->model[0], 2);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
omSetRot(object, 30.0f, 190.0f, 0.0f); omSetRot(object, 30.0f, 190.0f, 0.0f);
omSetSca(object, 0.6f, 0.6f, 0.6f); omSetSca(object, 0.6f, 0.6f, 0.6f);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
return object; return object;
} }
@ -646,23 +646,8 @@ static void ShowBoard(omObjData *object, s32 board)
#define BOARD_SPR_HIDE_COUNT 53 #define BOARD_SPR_HIDE_COUNT 53
static const s32 boardSprHideTbl[BOARD_SPR_HIDE_COUNT] = static const s32 boardSprHideTbl[BOARD_SPR_HIDE_COUNT] = { 0, 1, 2, 3, 4, 5, 49, 50, 51, 52, 53, 54, 55, 56, 8, 9, 10, 11, 12, 13, 14, 23, 24, 25, 26,
{ 27, 28, 29, 30, 31, 32, 33, 34, 38, 39, 40, 35, 36, 37, 41, 42, 43, 44, 45, 46, 15, 16, 17, 18, 19, 20, 21, 22 };
0, 1, 2, 3, 4, 5,
49, 50, 51, 52, 53, 54, 55, 56,
8, 9, 10,
11, 12, 13, 14,
23, 24, 25,
26, 27, 28,
29, 30, 31,
32, 33, 34,
38, 39, 40,
35, 36, 37,
41, 42, 43,
44, 45, 46,
15, 16, 17, 18,
19, 20, 21, 22
};
static void HideBoard(omObjData *object) static void HideBoard(omObjData *object)
{ {
@ -709,19 +694,8 @@ static void ShowTotal(omObjData *object)
#define TOTAL_SPR_HIDE_COUNT 33 #define TOTAL_SPR_HIDE_COUNT 33
static const s32 totalSprHideTbl[TOTAL_SPR_HIDE_COUNT] = static const s32 totalSprHideTbl[TOTAL_SPR_HIDE_COUNT]
{ = { 6, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88 };
6,
57, 58, 59, 60, 61, 62, 63, 64,
65, 66, 67,
68, 69, 70,
71, 72, 73,
74, 75, 76,
77, 78, 79,
80, 81, 82,
83, 84, 85,
86, 87, 88
};
static void HideTotal(omObjData *object) static void HideTotal(omObjData *object)
{ {
@ -844,18 +818,9 @@ static void ShowMG(omObjData *object, s32 page)
#define MG_SPR_HIDE_COUNT 65 #define MG_SPR_HIDE_COUNT 65
static const s32 mgSprHideTbl[65] = static const s32 mgSprHideTbl[65] = { 7, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
{ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
7, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152 };
89, 90, 91, 92, 93, 94, 95, 96,
97, 98, 99, 100, 101, 102, 103, 104,
105, 106, 107, 108, 109, 110, 111, 112,
113, 114, 115, 116, 117, 118, 119, 120,
121, 122, 123, 124, 125, 126, 127, 128,
129, 130, 131, 132, 133, 134, 135, 136,
137, 138, 139, 140, 141, 142, 143, 144,
145, 146, 147, 148, 149, 150, 151, 152
};
static void HideMG(omObjData *object) static void HideMG(omObjData *object)
{ {

24
src/REL/option/rumble.c
View file

@ -112,7 +112,7 @@ static void ExecRumble(omObjData *object)
break; break;
} }
if (!work->cameraDoneF) { if (!work->cameraDoneF) {
Hu3DModelAttrReset(work->hand->model[0], 1); Hu3DModelAttrReset(work->hand->model[0], HU3D_ATTR_DISPOFF);
work->cameraDoneF = TRUE; work->cameraDoneF = TRUE;
Hu3DModelHookSet(work->system->model[0], "target", work->hand->model[0]); Hu3DModelHookSet(work->system->model[0], "target", work->hand->model[0]);
} }
@ -156,10 +156,10 @@ static void ExecRumble(omObjData *object)
if (work->rumbleF) { if (work->rumbleF) {
HuPadRumbleSet(0, 60, 10, 5); HuPadRumbleSet(0, 60, 10, 5);
Hu3DMotionTimeSet(work->hiliteOn->model[0], 0.0f); Hu3DMotionTimeSet(work->hiliteOn->model[0], 0.0f);
Hu3DModelAttrReset(work->hiliteOn->model[0], 1); Hu3DModelAttrReset(work->hiliteOn->model[0], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrSet(work->hiliteOn->model[0], 1); Hu3DModelAttrSet(work->hiliteOn->model[0], HU3D_ATTR_DISPOFF);
} }
object->unk10 = 1; object->unk10 = 1;
} }
@ -167,7 +167,7 @@ static void ExecRumble(omObjData *object)
case 4: case 4:
OptionWinAnimOut(work->window[1]); OptionWinAnimOut(work->window[1]);
OptionWinAnimOut(work->window[0]); OptionWinAnimOut(work->window[0]);
Hu3DModelAttrSet(work->hand->model[0], 1); Hu3DModelAttrSet(work->hand->model[0], HU3D_ATTR_DISPOFF);
OptionRumbleMotionHideStart(object); OptionRumbleMotionHideStart(object);
object->unk10 = 5; object->unk10 = 5;
/* fallthrough */ /* fallthrough */
@ -193,7 +193,7 @@ static omObjData *CreateHand(void)
hand->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 15)); hand->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 15));
Hu3DModelLayerSet(hand->model[0], 3); Hu3DModelLayerSet(hand->model[0], 3);
omSetRot(hand, 0.0f, 180.0f, 0.0f); omSetRot(hand, 0.0f, 180.0f, 0.0f);
Hu3DModelAttrSet(hand->model[0], 1); Hu3DModelAttrSet(hand->model[0], HU3D_ATTR_DISPOFF);
return hand; return hand;
} }
@ -212,7 +212,7 @@ static omObjData *CreateSystem(void)
system = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); system = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
system->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 2)); system->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 2));
Hu3DModelAttrSet(system->model[0], 0x40000002); Hu3DModelAttrSet(system->model[0], HU3D_MOTATTR_PAUSE);
if (GWRumbleGet()) { if (GWRumbleGet()) {
Hu3DMotionTimeSet(system->model[0], 60.0f); Hu3DMotionTimeSet(system->model[0], 60.0f);
} }
@ -263,7 +263,7 @@ static omObjData *CreatePad(void)
pad = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); pad = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
pad->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 9)); pad->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 9));
Hu3DModelAttrSet(pad->model[0], 0x40000001); Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_LOOP);
return pad; return pad;
} }
@ -280,10 +280,10 @@ static void ShakePad(omObjData *pad, BOOL on)
{ {
if (on) { if (on) {
Hu3DModelAttrReset(pad->model[0], 0x40000002); Hu3DModelAttrReset(pad->model[0], 0x40000002);
Hu3DModelAttrSet(pad->model[0], 0x40000001); Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_LOOP);
} }
else { else {
Hu3DModelAttrSet(pad->model[0], 0x40000002); Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelAttrReset(pad->model[0], 0x40000001); Hu3DModelAttrReset(pad->model[0], 0x40000001);
} }
} }
@ -294,7 +294,7 @@ static omObjData *CreatePadFilter(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 10)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 10));
Hu3DModelAttrSet(object->model[0], 0x40000002); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE);
Hu3DModelLayerSet(object->model[0], 2); Hu3DModelLayerSet(object->model[0], 2);
return object; return object;
@ -349,10 +349,10 @@ static omObjData *CreateHiliteOn(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 11)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 11));
if (GWRumbleGet()) { if (GWRumbleGet()) {
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
} }
else { else {
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
} }
return object; return object;
} }

9
src/REL/option/scene.c
View file

@ -52,7 +52,8 @@ void OptionFadeSprite(s16 sprite, BOOL inF, s32 duration)
if (inF) { if (inF) {
work->speed = work->speed; work->speed = work->speed;
work->tplvl = 0.0f; work->tplvl = 0.0f;
} else { }
else {
work->speed = -work->speed; work->speed = -work->speed;
work->tplvl = 1.0f; work->tplvl = 1.0f;
} }
@ -103,7 +104,7 @@ void OptionFadeModel(s16 model, BOOL inF, s32 duration)
work->speed = -work->speed; work->speed = -work->speed;
work->tplvl = 1.0f; work->tplvl = 1.0f;
} }
Hu3DModelAttrReset(work->id, 1); Hu3DModelAttrReset(work->id, HU3D_ATTR_DISPOFF);
Hu3DModelTPLvlSet(work->id, work->tplvl); Hu3DModelTPLvlSet(work->id, work->tplvl);
process = HuPrcChildCreate(FadeModel, 0x3000, 0x1500, 0, HuPrcCurrentGet()); process = HuPrcChildCreate(FadeModel, 0x3000, 0x1500, 0, HuPrcCurrentGet());
process->user_data = work; process->user_data = work;
@ -128,7 +129,7 @@ static void FadeModel(void)
} }
Hu3DModelTPLvlSet(work->id, work->tplvl); Hu3DModelTPLvlSet(work->id, work->tplvl);
if (work->tplvl <= 0.0f) { if (work->tplvl <= 0.0f) {
Hu3DModelAttrSet(work->id, 1); Hu3DModelAttrSet(work->id, HU3D_ATTR_DISPOFF);
} }
HuMemDirectFree(work); HuMemDirectFree(work);
HuPrcEnd(); HuPrcEnd();
@ -199,7 +200,7 @@ static void KillScene(void)
HuPrcVSleep(); HuPrcVSleep();
sprite = espEntry(0x860020, 0x1388, 0); sprite = espEntry(0x860020, 0x1388, 0);
espPosSet(sprite, 288.0f, 240.0f); espPosSet(sprite, 288.0f, 240.0f);
espAttrReset(sprite, 4); espAttrReset(sprite, HUSPR_ATTR_DISPOFF);
Hu3DBGColorSet(0, 0, 0); Hu3DBGColorSet(0, 0, 0);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {

43
src/REL/option/sound.c
View file

@ -624,7 +624,7 @@ static void ExecOptionSel(omObjData *object)
OptionWinAnimIn(work->window[0]); OptionWinAnimIn(work->window[0]);
OptionWinMesSet(work->window[0], choiceMess[work->cursorPos]); OptionWinMesSet(work->window[0], choiceMess[work->cursorPos]);
if (!work->cameraDoneF) { if (!work->cameraDoneF) {
Hu3DModelAttrReset(work->object[7]->model[0], 1); Hu3DModelAttrReset(work->object[7]->model[0], HU3D_ATTR_DISPOFF);
work->cameraDoneF = TRUE; work->cameraDoneF = TRUE;
} }
omSetTra(work->object[7], -34.0f + 40.0f * work->cursorPos, 120.0f, -500.0f); omSetTra(work->object[7], -34.0f + 40.0f * work->cursorPos, 120.0f, -500.0f);
@ -661,7 +661,7 @@ static void ExecOptionSel(omObjData *object)
if (!work->optionSelected) { if (!work->optionSelected) {
OptionRumbleMotionHideStart(optionRumble); OptionRumbleMotionHideStart(optionRumble);
} }
Hu3DModelAttrSet(work->object[7]->model[0], 1); Hu3DModelAttrSet(work->object[7]->model[0], HU3D_ATTR_DISPOFF);
object->unk10 = 4; object->unk10 = 4;
/* fallthrough */ /* fallthrough */
case 4: case 4:
@ -715,7 +715,7 @@ static void ExecOutputMode(omObjData *object)
OptionWinAnimIn(work->window[0]); OptionWinAnimIn(work->window[0]);
OptionWinMesSet(work->window[0], soundModeNameTbl[work->soundMode]); OptionWinMesSet(work->window[0], soundModeNameTbl[work->soundMode]);
if (!work->cameraDoneF) { if (!work->cameraDoneF) {
Hu3DModelAttrReset(work->object[8]->model[0], 1); Hu3DModelAttrReset(work->object[8]->model[0], HU3D_ATTR_DISPOFF);
work->cameraDoneF = TRUE; work->cameraDoneF = TRUE;
} }
pos.x = -38.0f; pos.x = -38.0f;
@ -768,7 +768,7 @@ static void ExecOutputMode(omObjData *object)
KillNoteSpawner(object); KillNoteSpawner(object);
OptionWinAnimOut(work->window[1]); OptionWinAnimOut(work->window[1]);
OptionWinAnimOut(work->window[0]); OptionWinAnimOut(work->window[0]);
Hu3DModelAttrSet(work->object[8]->model[0], 1); Hu3DModelAttrSet(work->object[8]->model[0], HU3D_ATTR_DISPOFF);
object->unk10 = 5; object->unk10 = 5;
/* fallthrough */ /* fallthrough */
case 5: case 5:
@ -1204,10 +1204,10 @@ static omObjData *CreateHand(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 13)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 13));
Hu3DModelLayerSet(object->model[0], 2); Hu3DModelLayerSet(object->model[0], 2);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
omSetRot(object, -80.0f, 45.0f, 0.0f); omSetRot(object, -80.0f, 45.0f, 0.0f);
omSetSca(object, 0.6f, 0.6f, 0.6f); omSetSca(object, 0.6f, 0.6f, 0.6f);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
return object; return object;
} }
@ -1227,10 +1227,10 @@ static omObjData *CreateOutputModeHand(void)
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 14)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 14));
Hu3DModelLayerSet(object->model[0], 2); Hu3DModelLayerSet(object->model[0], 2);
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
omSetRot(object, 0.0f, -90.0f, 0.0f); omSetRot(object, 0.0f, -90.0f, 0.0f);
omSetSca(object, 0.6f, 0.6f, 0.6f); omSetSca(object, 0.6f, 0.6f, 0.6f);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
return object; return object;
} }
@ -1249,7 +1249,7 @@ static omObjData *CreateSystem(void)
system = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); system = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
system->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 3)); system->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 3));
Hu3DModelAttrSet(system->model[0], 0x40000001); Hu3DModelAttrSet(system->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(system->model[0], 0); Hu3DModelLayerSet(system->model[0], 0);
return system; return system;
} }
@ -1276,7 +1276,7 @@ static omObjData *CreateLightObj(s32 id, BOOL off)
else { else {
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 4)); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 4));
} }
Hu3DModelAttrSet(object->model[0], 0x40000001); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(object->model[0], 0); Hu3DModelLayerSet(object->model[0], 0);
omSetTra(object, lightPosTbl[id].x, lightPosTbl[id].y, lightPosTbl[id].z); omSetTra(object, lightPosTbl[id].x, lightPosTbl[id].y, lightPosTbl[id].z);
return object; return object;
@ -1293,12 +1293,12 @@ static void KillLightObj(omObjData *object)
static void LightDispOff(omObjData *indicator) static void LightDispOff(omObjData *indicator)
{ {
Hu3DModelAttrReset(indicator->model[0], 1); Hu3DModelAttrReset(indicator->model[0], HU3D_ATTR_DISPOFF);
} }
static void LightDispOn(omObjData *indicator) static void LightDispOn(omObjData *indicator)
{ {
Hu3DModelAttrSet(indicator->model[0], 1); Hu3DModelAttrSet(indicator->model[0], HU3D_ATTR_DISPOFF);
} }
static s32 spriteDataTbl[] = { static s32 spriteDataTbl[] = {
@ -1392,7 +1392,7 @@ static void OptionSelDisp(omObjData *object)
static void OptionSelHide(omObjData *object) static void OptionSelHide(omObjData *object)
{ {
static const s32 sprHideTbl[] = { 12, 0, 1, 2, 3, 4, 5 }; static const s32 sprHideTbl[] = { 12, 0, 1, 2, 3, 4, 5 };
SoundWork *work = object->data; SoundWork *work = object->data;
s32 i; s32 i;
@ -1443,11 +1443,9 @@ static void OutputModeDisp(omObjData *object)
} }
} }
static void OutputModeHide(omObjData *object) static void OutputModeHide(omObjData *object)
{ {
static const s32 sprHideTbl[] = { 13, 6, 7, 8, 9 }; static const s32 sprHideTbl[] = { 13, 6, 7, 8, 9 };
SoundWork *work = object->data; SoundWork *work = object->data;
s32 i; s32 i;
@ -1474,10 +1472,9 @@ static void MusicPageDisp(omObjData *object, s32 page)
} }
} }
static void MusicPageHide(omObjData *object) static void MusicPageHide(omObjData *object)
{ {
static const s32 sprHideTbl[] = { 10 }; static const s32 sprHideTbl[] = { 10 };
SoundWork *work = object->data; SoundWork *work = object->data;
s32 i; s32 i;
@ -1508,11 +1505,9 @@ static void VoicePageDisp(omObjData *object, s32 character)
} }
} }
static void VoicePageHide(omObjData *object) static void VoicePageHide(omObjData *object)
{ {
static const s32 sprHideTbl[] = { 11, 0 }; static const s32 sprHideTbl[] = { 11, 0 };
SoundWork *work = object->data; SoundWork *work = object->data;
s32 i; s32 i;
@ -1538,7 +1533,7 @@ static omObjData *CreateNoteObj(s32 type)
noteWork->enabled = FALSE; noteWork->enabled = FALSE;
noteWork->type = type; noteWork->type = type;
note->model[0] = Hu3DModelCreateFile(noteMdlTbl[type]); note->model[0] = Hu3DModelCreateFile(noteMdlTbl[type]);
Hu3DModelAttrSet(note->model[0], 0x40000001); Hu3DModelAttrSet(note->model[0], HU3D_MOTATTR_LOOP);
Hu3DModelLayerSet(note->model[0], 2); Hu3DModelLayerSet(note->model[0], 2);
Hu3DModelAttrReset(note->model[0], 2); Hu3DModelAttrReset(note->model[0], 2);
return note; return note;
@ -1568,7 +1563,7 @@ static void HandleNote(omObjData *note)
float y; float y;
float tplvl; float tplvl;
Hu3DModelAttrReset(note->model[0], 1); Hu3DModelAttrReset(note->model[0], HU3D_ATTR_DISPOFF);
time = sind(45.0f * noteWork->pos); time = sind(45.0f * noteWork->pos);
time = time * time; time = time * time;
switch (noteWork->side) { switch (noteWork->side) {
@ -1595,7 +1590,7 @@ static void HandleNote(omObjData *note)
return; return;
} }
noteWork->enabled = FALSE; noteWork->enabled = FALSE;
Hu3DModelAttrSet(note->model[0], 1); Hu3DModelAttrSet(note->model[0], HU3D_ATTR_DISPOFF);
note->func = NULL; note->func = NULL;
note->unk10 = 0; note->unk10 = 0;
} }

8
src/REL/present/common.c
View file

@ -65,7 +65,7 @@ omObjData *PresentGuideCreate(void)
Hu3DModelShadowSet(object->model[0]); Hu3DModelShadowSet(object->model[0]);
PresentGuideExecModeSet(object, PRESENT_GUIDE_MODE_NONE); PresentGuideExecModeSet(object, PRESENT_GUIDE_MODE_NONE);
UpdateGuide(object); UpdateGuide(object);
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
return object; return object;
} }
@ -109,7 +109,7 @@ static void ExecGuideEnter(omObjData *object)
switch (object->unk10) { switch (object->unk10) {
case 0: case 0:
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
work->pos.x = -300.0f; work->pos.x = -300.0f;
work->pos.z = -180.0f; work->pos.z = -180.0f;
work->time = 0.0f; work->time = 0.0f;
@ -156,7 +156,7 @@ static void ExecGuideLeave(omObjData *object)
case 0: case 0:
work->time = 0.0f; work->time = 0.0f;
work->speed = 0.025f; work->speed = 0.025f;
Hu3DModelAttrReset(object->model[0], 1); Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
object->unk10 = 1; object->unk10 = 1;
case 1: case 1:
weight = sind(90.0f * work->time); weight = sind(90.0f * work->time);
@ -168,7 +168,7 @@ static void ExecGuideLeave(omObjData *object)
} }
object->unk10 = 2; object->unk10 = 2;
case 2: case 2:
Hu3DModelAttrSet(object->model[0], 1); Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF);
PresentGuideExecModeSet(object, PRESENT_GUIDE_MODE_NONE); PresentGuideExecModeSet(object, PRESENT_GUIDE_MODE_NONE);
break; break;
default: default:

5
src/REL/present/init.c
View file

@ -1,5 +1,6 @@
#include "game/audio.h" #include "game/audio.h"
#include "game/esprite.h" #include "game/esprite.h"
#include "game/hsfman.h"
#include "game/objsub.h" #include "game/objsub.h"
#include "game/pad.h" #include "game/pad.h"
#include "game/process.h" #include "game/process.h"
@ -109,7 +110,7 @@ void FadeSpriteWithMultiplier(s16 model, BOOL inF, float tpMultiplier, s32 durat
work->tplvl = 1.0f; work->tplvl = 1.0f;
} }
Hu3DModelTPLvlSet(work->id, work->tplvl * work->tpMultiplier); Hu3DModelTPLvlSet(work->id, work->tplvl * work->tpMultiplier);
Hu3DModelAttrReset(work->id, 1); Hu3DModelAttrReset(work->id, HU3D_ATTR_DISPOFF);
process = HuPrcChildCreate(FadeModel, 100, 5376, 0, HuPrcCurrentGet()); process = HuPrcChildCreate(FadeModel, 100, 5376, 0, HuPrcCurrentGet());
process->user_data = work; process->user_data = work;
} }
@ -135,7 +136,7 @@ static void FadeModel(void)
} }
Hu3DModelTPLvlSet(var_r31->id, var_r31->tplvl * var_r31->tpMultiplier); Hu3DModelTPLvlSet(var_r31->id, var_r31->tplvl * var_r31->tpMultiplier);
if (var_r31->speed < 0.0f) { if (var_r31->speed < 0.0f) {
Hu3DModelAttrSet(var_r31->id, 1); Hu3DModelAttrSet(var_r31->id, HU3D_ATTR_DISPOFF);
} }
HuMemDirectFree(var_r31); HuMemDirectFree(var_r31);
HuPrcEnd(); HuPrcEnd();

28
src/REL/present/present.c
View file

@ -4,8 +4,8 @@
#include "game/hsfdraw.h" #include "game/hsfdraw.h"
#include "game/hsfex.h" #include "game/hsfex.h"
#include "game/hsfman.h" #include "game/hsfman.h"
#include "game/wipe.h"
#include "game/window.h" #include "game/window.h"
#include "game/wipe.h"
#include "REL/present.h" #include "REL/present.h"
@ -392,7 +392,7 @@ omObjData *PresentCreate(void)
work->object[i] = omAddObjEx(presentObjMan, 1003, 1, 0, 1, NULL); work->object[i] = omAddObjEx(presentObjMan, 1003, 1, 0, 1, NULL);
work->object[i]->model[0] = Hu3DModelCreateFile(presentMdlTbl[i]); work->object[i]->model[0] = Hu3DModelCreateFile(presentMdlTbl[i]);
Hu3DModelLayerSet(work->object[i]->model[0], 0); Hu3DModelLayerSet(work->object[i]->model[0], 0);
Hu3DModelAttrSet(work->object[i]->model[0], 1); Hu3DModelAttrSet(work->object[i]->model[0], HU3D_ATTR_DISPOFF);
} }
for (j = 0; j < 8; j++) { for (j = 0; j < 8; j++) {
@ -886,39 +886,39 @@ static void ShowHidePresents(omObjData *object)
s32 character; s32 character;
s32 i; s32 i;
Hu3DModelAttrReset(work->object[0]->model[0], 1); Hu3DModelAttrReset(work->object[0]->model[0], HU3D_ATTR_DISPOFF);
for (character = 0; character < NUM_CHARACTERS; character++) { for (character = 0; character < NUM_CHARACTERS; character++) {
s32 j; s32 j;
if (UnlockedPresents(object, roomIdxTbl2[character]) > 0) { if (UnlockedPresents(object, roomIdxTbl2[character]) > 0) {
Hu3DModelAttrReset(work->object[character + 109]->model[0], 1); Hu3DModelAttrReset(work->object[character + 109]->model[0], HU3D_ATTR_DISPOFF);
} }
for (j = 0, i = 0; i < PRESENT_COUNT_CHAR_ROOM; i++) { for (j = 0, i = 0; i < PRESENT_COUNT_CHAR_ROOM; i++) {
if (PresentUnlocked(object, roomIdxTbl2[character], i)) { if (PresentUnlocked(object, roomIdxTbl2[character], i)) {
Hu3DModelAttrReset(work->object[character * PRESENT_COUNT_CHAR_ROOM * 2 + 2 + i]->model[0], 1); Hu3DModelAttrReset(work->object[character * PRESENT_COUNT_CHAR_ROOM * 2 + 2 + i]->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(work->object[character * PRESENT_COUNT_CHAR_ROOM * 2 + 8 + i]->model[0], 1); Hu3DModelAttrReset(work->object[character * PRESENT_COUNT_CHAR_ROOM * 2 + 8 + i]->model[0], HU3D_ATTR_DISPOFF);
j++; j++;
} }
} }
if (j >= 6) { if (j >= 6) {
Hu3DModelAttrReset(work->object[character + 118]->model[0], 1); Hu3DModelAttrReset(work->object[character + 118]->model[0], HU3D_ATTR_DISPOFF);
} }
} }
if (UnlockedPresents(object, ROOM_MG) > 0) { if (UnlockedPresents(object, ROOM_MG) > 0) {
Hu3DModelAttrReset(work->object[117]->model[0], 1); Hu3DModelAttrReset(work->object[117]->model[0], HU3D_ATTR_DISPOFF);
} }
for (i = 0; i < PRESENT_COUNT_MG_ROOM; i++) { for (i = 0; i < PRESENT_COUNT_MG_ROOM; i++) {
if (PresentUnlocked(object, ROOM_MG, i)) { if (PresentUnlocked(object, ROOM_MG, i)) {
Hu3DModelAttrReset(work->object[i + 98]->model[0], 1); Hu3DModelAttrReset(work->object[i + 98]->model[0], HU3D_ATTR_DISPOFF);
} }
} }
if (PresentUnlocked(object, ROOM_TROPHY, 0)) { if (PresentUnlocked(object, ROOM_TROPHY, 0)) {
Hu3DModelAttrReset(work->object[1]->model[0], 1); Hu3DModelAttrReset(work->object[1]->model[0], HU3D_ATTR_DISPOFF);
} }
for (i = 0; i < NUM_CHARACTERS; i++) { for (i = 0; i < NUM_CHARACTERS; i++) {
if (PresentUnlocked(object, roomIdxTbl2[i], PRESENT_CONSTELLATION)) { if (PresentUnlocked(object, roomIdxTbl2[i], PRESENT_CONSTELLATION)) {
Hu3DModelAttrReset(work->object[i + 126]->model[0], 1); Hu3DModelAttrReset(work->object[i + 126]->model[0], HU3D_ATTR_DISPOFF);
} }
} }
} }
@ -1075,9 +1075,9 @@ static void ExecPresentGet(omObjData *object)
rot = 36.0f * work->room; rot = 36.0f * work->room;
SetCameraRot(object, rot, 1); SetCameraRot(object, rot, 1);
RotateCamera(object); RotateCamera(object);
Hu3DModelAttrSet(work->object[work->idxInRoom + lbl_1_rodata_B18[work->room]]->model[0], 1); Hu3DModelAttrSet(work->object[work->idxInRoom + lbl_1_rodata_B18[work->room]]->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(work->object[roofIdxTbl[work->room]]->model[0], 1); Hu3DModelAttrSet(work->object[roofIdxTbl[work->room]]->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(work->object[constellationIdxTbl[work->room]]->model[0], 1); Hu3DModelAttrSet(work->object[constellationIdxTbl[work->room]]->model[0], HU3D_ATTR_DISPOFF);
work->presentFallingTime = 0.0f; work->presentFallingTime = 0.0f;
work->presentFallingSpeed = 1.0f / 360.0f; work->presentFallingSpeed = 1.0f / 360.0f;
object->unk10 = 1; object->unk10 = 1;

19
src/REL/resultDll/battle.c
View file

@ -74,9 +74,8 @@ Vec lbl_1_data_7F0[] = { { -300, 270, 0 }, { -100, 180, 500 }, { 100, 90, 500 },
s16 lbl_1_data_820[] = { -284, 148, -84, 233, 116, 318, 316, 403 }; s16 lbl_1_data_820[] = { -284, 148, -84, 233, 116, 318, 316, 403 };
s32 lbl_1_data_830[] = { DATA_MAKE_NUM(DATADIR_RESULT, 0x08), DATA_MAKE_NUM(DATADIR_RESULT, 0x09), s32 lbl_1_data_830[] = { DATA_MAKE_NUM(DATADIR_RESULT, 0x08), DATA_MAKE_NUM(DATADIR_RESULT, 0x09), DATA_MAKE_NUM(DATADIR_RESULT, 0x0A),
DATA_MAKE_NUM(DATADIR_RESULT, 0x0A), DATA_MAKE_NUM(DATADIR_RESULT, 0x0A) DATA_MAKE_NUM(DATADIR_RESULT, 0x0A) };
};
float lbl_1_data_840[] = { 130, 150, 170, 150, 150, 130, 170, 190 }; float lbl_1_data_840[] = { 130, 150, 170, 150, 150, 130, 170, 190 };
@ -269,7 +268,7 @@ void fn_1_6824(void)
} }
Hu3DAnimCreate(anim, lbl_1_bss_1A9C[i + 4], "ys22_a0"); Hu3DAnimCreate(anim, lbl_1_bss_1A9C[i + 4], "ys22_a0");
Hu3DAnimCreate(anim2, lbl_1_bss_1A9C[i + 4], "ys22_a1"); Hu3DAnimCreate(anim2, lbl_1_bss_1A9C[i + 4], "ys22_a1");
Hu3DModelAttrSet(lbl_1_bss_1A9C[i + 4], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_1A9C[i + 4], HU3D_MOTATTR_PAUSE);
} }
anim = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_RESULT, 0x3D), MEMORY_DEFAULT_NUM)); anim = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_RESULT, 0x3D), MEMORY_DEFAULT_NUM));
anim2 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_RESULT, 0x3B), MEMORY_DEFAULT_NUM)); anim2 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_RESULT, 0x3B), MEMORY_DEFAULT_NUM));
@ -306,7 +305,7 @@ void fn_1_6824(void)
} }
(void)anim3; (void)anim3;
Hu3DMotionSet(lbl_1_bss_1A9C[8], lbl_1_bss_1A5C[9]); Hu3DMotionSet(lbl_1_bss_1A9C[8], lbl_1_bss_1A5C[9]);
Hu3DModelAttrSet(lbl_1_bss_1A9C[8], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_1A9C[8], HU3D_MOTATTR_LOOP);
Hu3DModelShadowSet(lbl_1_bss_1A9C[8]); Hu3DModelShadowSet(lbl_1_bss_1A9C[8]);
for (i = 0; i < 180; i++) { for (i = 0; i < 180; i++) {
if (i == 0) { if (i == 0) {
@ -316,7 +315,7 @@ void fn_1_6824(void)
lbl_1_bss_1828[i] = Hu3DModelLink(lbl_1_bss_1828[0]); lbl_1_bss_1828[i] = Hu3DModelLink(lbl_1_bss_1828[0]);
} }
Hu3DModelScaleSet(lbl_1_bss_1828[i], 0.5f, 0.5f, 0.5f); Hu3DModelScaleSet(lbl_1_bss_1828[i], 0.5f, 0.5f, 0.5f);
Hu3DModelAttrSet(lbl_1_bss_1828[i], 1); Hu3DModelAttrSet(lbl_1_bss_1828[i], HU3D_ATTR_DISPOFF);
} }
fn_1_8658(); fn_1_8658();
anim = HuSprAnimRead(HuAR_ARAMtoMRAMFileRead(DATA_MAKE_NUM(DATADIR_EFFECT, 4), MEMORY_DEFAULT_NUM, HEAP_DATA)); anim = HuSprAnimRead(HuAR_ARAMtoMRAMFileRead(DATA_MAKE_NUM(DATADIR_EFFECT, 4), MEMORY_DEFAULT_NUM, HEAP_DATA));
@ -338,7 +337,7 @@ void fn_1_6824(void)
CharModelVoiceEnableSet(character, lbl_1_bss_1990[player][1], 0); CharModelVoiceEnableSet(character, lbl_1_bss_1990[player][1], 0);
CharModelMotionSet(character, lbl_1_bss_1990[player][0]); CharModelMotionSet(character, lbl_1_bss_1990[player][0]);
Hu3DModelPosSet(char_mdl, lbl_1_data_7F0[i].x, lbl_1_data_7F0[lbl_1_bss_19E8[i]].y, 0); Hu3DModelPosSet(char_mdl, lbl_1_data_7F0[i].x, lbl_1_data_7F0[lbl_1_bss_19E8[i]].y, 0);
Hu3DModelAttrSet(char_mdl, 0x40000001); Hu3DModelAttrSet(char_mdl, HU3D_MOTATTR_LOOP);
Hu3DModelShadowSet(char_mdl); Hu3DModelShadowSet(char_mdl);
} }
CharModelDataClose(-1); CharModelDataClose(-1);
@ -427,7 +426,7 @@ void fn_1_7544(void)
Hu3DModelPosSet(lbl_1_bss_1A9C[10], 0, 0, 200); Hu3DModelPosSet(lbl_1_bss_1A9C[10], 0, 0, 200);
for (i = 0; i < Hu3DMotionMaxTimeGet(lbl_1_bss_1A9C[10]); i++) { for (i = 0; i < Hu3DMotionMaxTimeGet(lbl_1_bss_1A9C[10]); i++) {
if (i > 10) { if (i > 10) {
Hu3DModelAttrSet(lbl_1_bss_1A9C[8], 1); Hu3DModelAttrSet(lbl_1_bss_1A9C[8], HU3D_ATTR_DISPOFF);
} }
Center.x = lbl_1_data_8B8[(i / 2) & 0x7].x; Center.x = lbl_1_data_8B8[(i / 2) & 0x7].x;
Center.y = 330.0f + lbl_1_data_8B8[(i / 2) & 0x7].y; Center.y = 330.0f + lbl_1_data_8B8[(i / 2) & 0x7].y;
@ -598,7 +597,7 @@ void fn_1_86DC(s16 player)
lbl_1_bss_194[i].unk10.y = frandmod(20) - 10.0f; lbl_1_bss_194[i].unk10.y = frandmod(20) - 10.0f;
lbl_1_bss_194[i].unk10.z = 0; lbl_1_bss_194[i].unk10.z = 0;
lbl_1_bss_194[i].unk1C = 10.0f; lbl_1_bss_194[i].unk1C = 10.0f;
Hu3DModelAttrReset(lbl_1_bss_1828[i], 1); Hu3DModelAttrReset(lbl_1_bss_1828[i], HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(lbl_1_bss_1828[i], 0, 100, 0); Hu3DModelPosSet(lbl_1_bss_1828[i], 0, 100, 0);
Hu3DModelRotSet(lbl_1_bss_1828[i], 0, 0, 0); Hu3DModelRotSet(lbl_1_bss_1828[i], 0, 0, 0);
} }
@ -628,7 +627,7 @@ void fn_1_8998(void)
CharModelCoinEffectCreate(1, &pos); CharModelCoinEffectCreate(1, &pos);
lbl_1_bss_194[i].unk0 = -1; lbl_1_bss_194[i].unk0 = -1;
HuAudFXPlay(7); HuAudFXPlay(7);
Hu3DModelAttrSet(lbl_1_bss_1828[i], 1); Hu3DModelAttrSet(lbl_1_bss_1828[i], HU3D_ATTR_DISPOFF);
} }
} }
HuPrcVSleep(); HuPrcVSleep();

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

@ -395,7 +395,7 @@ void fn_1_B78(void)
lbl_1_bss_5C[character][j] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_RESULT, 0x00) + j); lbl_1_bss_5C[character][j] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_RESULT, 0x00) + j);
Hu3DModelScaleSet(lbl_1_bss_5C[character][j], 1.1f, 1.1f, 1.1f); Hu3DModelScaleSet(lbl_1_bss_5C[character][j], 1.1f, 1.1f, 1.1f);
Hu3DAnimCreate(lbl_1_bss_E4[character][0], lbl_1_bss_5C[character][j], "ys22"); Hu3DAnimCreate(lbl_1_bss_E4[character][0], lbl_1_bss_5C[character][j], "ys22");
Hu3DModelAttrSet(lbl_1_bss_5C[character][j], 1); Hu3DModelAttrSet(lbl_1_bss_5C[character][j], HU3D_ATTR_DISPOFF);
} }
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -411,7 +411,7 @@ void fn_1_B78(void)
character = GWPlayerCfg[lbl_1_bss_4A[i]].character; character = GWPlayerCfg[lbl_1_bss_4A[i]].character;
Hu3D2Dto3D(&lbl_1_data_408[i], 1, &pos); Hu3D2Dto3D(&lbl_1_data_408[i], 1, &pos);
Hu3DModelPosSetV(lbl_1_bss_5C[character][lbl_1_bss_42[i]], &pos); Hu3DModelPosSetV(lbl_1_bss_5C[character][lbl_1_bss_42[i]], &pos);
Hu3DModelAttrReset(lbl_1_bss_5C[character][lbl_1_bss_42[i]], 1); Hu3DModelAttrReset(lbl_1_bss_5C[character][lbl_1_bss_42[i]], HU3D_ATTR_DISPOFF);
} }
for (i = 4; i <= 11; i++) { for (i = 4; i <= 11; i++) {
Hu3D2Dto3D(&lbl_1_data_0[i].pos, 1, &pos); Hu3D2Dto3D(&lbl_1_data_0[i].pos, 1, &pos);
@ -430,7 +430,7 @@ void fn_1_B78(void)
Hu3DModelPosSetV(j, &pos); Hu3DModelPosSetV(j, &pos);
Hu3DModelScaleSet(j, 1.5f, 1.5f, 1.5f); Hu3DModelScaleSet(j, 1.5f, 1.5f, 1.5f);
} }
Hu3DModelAttrSet(model, 1); Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
model = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_RESULT, 0x07)); model = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_RESULT, 0x07));
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
j = Hu3DModelLink(model); j = Hu3DModelLink(model);
@ -443,7 +443,7 @@ void fn_1_B78(void)
Hu3DModelPosSetV(j, &pos); Hu3DModelPosSetV(j, &pos);
Hu3DModelScaleSet(j, 1.5f, 1.5f, 1.5f); Hu3DModelScaleSet(j, 1.5f, 1.5f, 1.5f);
} }
Hu3DModelAttrSet(model, 1); Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
lbl_1_bss_E0 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_RESULT, 0x1C)); lbl_1_bss_E0 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_RESULT, 0x1C));
lbl_1_bss_9C = HuSprGrpCreate(4); lbl_1_bss_9C = HuSprGrpCreate(4);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -662,12 +662,12 @@ void fn_1_2ADC(void)
Hu3D2Dto3D(&lbl_1_data_408[i], 1, &sp48); Hu3D2Dto3D(&lbl_1_data_408[i], 1, &sp48);
Hu3DModelPosSetV(lbl_1_bss_A[i], &sp48); Hu3DModelPosSetV(lbl_1_bss_A[i], &sp48);
if (sp30[i] == lbl_1_bss_4A[i] && sp18[i] == lbl_1_bss_42[i]) { if (sp30[i] == lbl_1_bss_4A[i] && sp18[i] == lbl_1_bss_42[i]) {
Hu3DModelAttrSet(lbl_1_bss_5C[temp_r30][sp18[i]], 1); Hu3DModelAttrSet(lbl_1_bss_5C[temp_r30][sp18[i]], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(lbl_1_bss_A[i], 1); Hu3DModelAttrReset(lbl_1_bss_A[i], HU3D_ATTR_DISPOFF);
Hu3DModelScaleSet(lbl_1_bss_A[i], 1.1f, 1.1f, 1.1f); Hu3DModelScaleSet(lbl_1_bss_A[i], 1.1f, 1.1f, 1.1f);
} }
else { else {
Hu3DModelAttrSet(lbl_1_bss_A[i], 1); Hu3DModelAttrSet(lbl_1_bss_A[i], HU3D_ATTR_DISPOFF);
} }
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -702,9 +702,9 @@ void fn_1_2ADC(void)
} }
else { else {
temp_r30 = GWPlayerCfg[sp28[i]].character; temp_r30 = GWPlayerCfg[sp28[i]].character;
Hu3DModelAttrSet(lbl_1_bss_5C[temp_r30][sp18[i]], 1); Hu3DModelAttrSet(lbl_1_bss_5C[temp_r30][sp18[i]], HU3D_ATTR_DISPOFF);
temp_r30 = GWPlayerCfg[lbl_1_bss_4A[i]].character; temp_r30 = GWPlayerCfg[lbl_1_bss_4A[i]].character;
Hu3DModelAttrReset(lbl_1_bss_A[i], 1); Hu3DModelAttrReset(lbl_1_bss_A[i], HU3D_ATTR_DISPOFF);
Hu3DModelScaleSet(lbl_1_bss_A[i], 1.1f, 1.1f, 1.1f); Hu3DModelScaleSet(lbl_1_bss_A[i], 1.1f, 1.1f, 1.1f);
fn_1_3B50(lbl_1_bss_CE[(i * 2)], GWStarsGet(lbl_1_bss_4A[i])); fn_1_3B50(lbl_1_bss_CE[(i * 2)], GWStarsGet(lbl_1_bss_4A[i]));
fn_1_3B50(lbl_1_bss_CE[(i * 2) + 1], BoardPlayerCoinsGet(lbl_1_bss_4A[i])); fn_1_3B50(lbl_1_bss_CE[(i * 2) + 1], BoardPlayerCoinsGet(lbl_1_bss_4A[i]));
@ -997,7 +997,7 @@ void fn_1_461C(void)
HuPrcVSleep(); HuPrcVSleep();
sprite = espEntry(0x860020, 5000, 0); sprite = espEntry(0x860020, 5000, 0);
espPosSet(sprite, 288.0, 240.0); espPosSet(sprite, 288.0, 240.0);
espAttrReset(sprite, 4); espAttrReset(sprite, HUSPR_ATTR_DISPOFF);
Hu3DBGColorSet(0, 0, 0); Hu3DBGColorSet(0, 0, 0);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 20); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 20);
while (WipeStatGet()) { while (WipeStatGet()) {
@ -1064,26 +1064,26 @@ void fn_1_47FC(void)
while (WipeStatGet()) { while (WipeStatGet()) {
HuPrcVSleep(); HuPrcVSleep();
} }
espAttrSet(lbl_1_bss_1A1A[0], 4); espAttrSet(lbl_1_bss_1A1A[0], HUSPR_ATTR_DISPOFF);
espAttrSet(lbl_1_bss_1A1A[1], 4); espAttrSet(lbl_1_bss_1A1A[1], HUSPR_ATTR_DISPOFF);
for (temp_r31 = 0; temp_r31 < 2; temp_r31++) { for (temp_r31 = 0; temp_r31 < 2; temp_r31++) {
Hu3DModelAttrSet(lbl_1_bss_1A9C[temp_r31 + 6], 1); Hu3DModelAttrSet(lbl_1_bss_1A9C[temp_r31 + 6], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_1A9C[temp_r31 + 10], 1); Hu3DModelAttrSet(lbl_1_bss_1A9C[temp_r31 + 10], HU3D_ATTR_DISPOFF);
} }
for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { for (temp_r31 = 0; temp_r31 < 4; temp_r31++) {
espAttrSet(lbl_1_bss_1A1A[temp_r31 + 6], 4); espAttrSet(lbl_1_bss_1A1A[temp_r31 + 6], HUSPR_ATTR_DISPOFF);
} }
for (temp_r31 = 4; temp_r31 < 8; temp_r31++) { for (temp_r31 = 4; temp_r31 < 8; temp_r31++) {
Hu3DModelAttrSet(lbl_1_bss_158[temp_r31], 1); Hu3DModelAttrSet(lbl_1_bss_158[temp_r31], HU3D_ATTR_DISPOFF);
} }
for (temp_r31 = 4; temp_r31 < 8; temp_r31++) { for (temp_r31 = 4; temp_r31 < 8; temp_r31++) {
HuSprGrpTPLvlSet(lbl_1_bss_CE[temp_r31], 0.0f); HuSprGrpTPLvlSet(lbl_1_bss_CE[temp_r31], 0.0f);
} }
for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { for (temp_r31 = 0; temp_r31 < 4; temp_r31++) {
for (temp_r19 = 0; temp_r19 < 4; temp_r19++) { for (temp_r19 = 0; temp_r19 < 4; temp_r19++) {
Hu3DModelAttrSet(lbl_1_bss_5C[GWPlayerCfg[temp_r31].character][temp_r19], 1); Hu3DModelAttrSet(lbl_1_bss_5C[GWPlayerCfg[temp_r31].character][temp_r19], HU3D_ATTR_DISPOFF);
} }
Hu3DModelAttrSet(lbl_1_bss_54[temp_r31], 1); Hu3DModelAttrSet(lbl_1_bss_54[temp_r31], HU3D_ATTR_DISPOFF);
} }
HuSprGrpKill(lbl_1_bss_9C); HuSprGrpKill(lbl_1_bss_9C);
HuSprGrpKill(lbl_1_bss_52); HuSprGrpKill(lbl_1_bss_52);
@ -1159,7 +1159,7 @@ void fn_1_47FC(void)
} }
temp_r18 = lbl_1_bss_5C[sp2C[temp_r31]][sp10]; temp_r18 = lbl_1_bss_5C[sp2C[temp_r31]][sp10];
Hu3DAnimCreate(lbl_1_bss_E4[sp2C[temp_r31]][0], temp_r18, "ys22"); Hu3DAnimCreate(lbl_1_bss_E4[sp2C[temp_r31]][0], temp_r18, "ys22");
Hu3DModelAttrReset(temp_r18, 1); Hu3DModelAttrReset(temp_r18, HU3D_ATTR_DISPOFF);
Hu3D2Dto3D(&lbl_1_data_488[temp_r31], 1, &sp40); Hu3D2Dto3D(&lbl_1_data_488[temp_r31], 1, &sp40);
Hu3DModelPosSetV(temp_r18, &sp40); Hu3DModelPosSetV(temp_r18, &sp40);
Hu3DModelRotSet(temp_r18, 0, 0, 0); Hu3DModelRotSet(temp_r18, 0, 0, 0);

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

@ -576,11 +576,11 @@ static void SMCharUpdate(omObjData *object)
s16 num_players; s16 num_players;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
Hu3DModelAttrSet(charModelID[i], 0x1); Hu3DModelAttrSet(charModelID[i], HU3D_ATTR_DISPOFF);
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (!smPlayerCfg[i].iscom) { if (!smPlayerCfg[i].iscom) {
Hu3DModelAttrReset(charModelID[smPlayerCfg[i].character], 0x1); Hu3DModelAttrReset(charModelID[smPlayerCfg[i].character], HU3D_ATTR_DISPOFF);
Hu3DModelCameraSet(charModelID[smPlayerCfg[i].character], cameraMaskTbl[i]); Hu3DModelCameraSet(charModelID[smPlayerCfg[i].character], cameraMaskTbl[i]);
} }
} }

325
src/REL/w01Dll/mg_coin.c
View file

@ -2,10 +2,16 @@
#include "game/audio.h" #include "game/audio.h"
#include "game/chrman.h" #include "game/chrman.h"
#include "game/data.h" #include "game/data.h"
#include "game/frand.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "game/hsfanim.h" #include "game/hsfanim.h"
#include "game/frand.h"
#include "game/board/audio.h"
#include "game/board/com.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/board/player.h"
#include "game/board/window.h"
#include "game/hsfman.h" #include "game/hsfman.h"
#include "game/memory.h" #include "game/memory.h"
#include "game/minigame_seq.h" #include "game/minigame_seq.h"
@ -14,12 +20,6 @@
#include "game/pad.h" #include "game/pad.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/window.h" #include "game/window.h"
#include "game/board/audio.h"
#include "game/board/com.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/board/player.h"
#include "game/board/window.h"
#include "dolphin.h" #include "dolphin.h"
#include "ext_math.h" #include "ext_math.h"
@ -116,112 +116,41 @@ static omObjData *lbl_1_bss_710;
static AnimData *lbl_1_bss_70C; static AnimData *lbl_1_bss_70C;
static s16 lbl_1_bss_708; static s16 lbl_1_bss_708;
static Vec lbl_1_data_658[3] = { static Vec lbl_1_data_658[3] = { { -50.0f, 238.0f, 0.0f }, { 0.0f, 275.5f, 0.0f }, { 50.0f, 238.0f, 0.0f } };
{ -50.0f, 238.0f, 0.0f },
{ 0.0f, 275.5f, 0.0f },
{ 50.0f, 238.0f, 0.0f }
};
static u16 lbl_1_data_67C[3][3] = { static u16 lbl_1_data_67C[3][3] = { { 10, 5, 20 }, { 10, 5, 20 }, { 5, 20, 10 } };
{ 10, 5, 20 },
{ 10, 5, 20 },
{ 5, 20, 10 }
};
static Data690Block lbl_1_data_690[3] = { static Data690Block lbl_1_data_690[3]
{ = { { { { -50.0f, -12.0f, 0.0f }, 75.0f }, { { -50.0f, 63.0f, 0.0f }, 50.0f }, { { 0.0f, 63.0f, 0.0f }, 25.0f }, { { 0.0f, 88.0f, 0.0f }, 50.0f },
{ { -50.0f, -12.0f, 0.0f }, 75.0f }, { { 50.0f, 88.0f, 0.0f }, 87.5f }, { { 50.0f, 175.5f, 0.0f }, 0.0f } },
{ { -50.0f, 63.0f, 0.0f }, 50.0f }, { { { 0.0f, -12.0f, 0.0f }, 75.0f }, { { 0.0f, 63.0f, 0.0f }, 50.0f }, { { -50.0f, 63.0f, 0.0f }, 50.0f },
{ { 0.0f, 63.0f, 0.0f }, 25.0f }, { { -50.0f, 113.0f, 0.0f }, 50.0f }, { { 0.0f, 113.0f, 0.0f }, 50.0f }, { { 0.0f, 163.0f, 0.0f }, 50.0f },
{ { 0.0f, 88.0f, 0.0f }, 50.0f }, { { -50.0f, 163.0f, 0.0f }, 12.5f }, { { -50.0f, 175.5f, 0.0f }, 0.0f } },
{ { 50.0f, 88.0f, 0.0f }, 87.5f }, { { { 50.0f, -12.0f, 0.0f }, 100.0f }, { { 50.0f, 88.0f, 0.0f }, 50.0f }, { { 0.0f, 88.0f, 0.0f }, 25.0f },
{ { 50.0f, 175.5f, 0.0f }, 0.0f } { { 0.0f, 113.0f, 0.0f }, 50.0f }, { { -50.0f, 113.0f, 0.0f }, 50.0f }, { { -50.0f, 163.0f, 0.0f }, 50.0f },
}, { { 0.0f, 163.0f, 0.0f }, 50.0f }, { { 0.0f, 213.0f, 0.0f }, 0.0f } } };
{
{ { 0.0f, -12.0f, 0.0f }, 75.0f },
{ { 0.0f, 63.0f, 0.0f }, 50.0f },
{ { -50.0f, 63.0f, 0.0f }, 50.0f },
{ { -50.0f, 113.0f, 0.0f }, 50.0f },
{ { 0.0f, 113.0f, 0.0f }, 50.0f },
{ { 0.0f, 163.0f, 0.0f }, 50.0f },
{ { -50.0f, 163.0f, 0.0f }, 12.5f },
{ { -50.0f, 175.5f, 0.0f }, 0.0f }
},
{
{ { 50.0f, -12.0f, 0.0f }, 100.0f },
{ { 50.0f, 88.0f, 0.0f }, 50.0f },
{ { 0.0f, 88.0f, 0.0f }, 25.0f },
{ { 0.0f, 113.0f, 0.0f }, 50.0f },
{ { -50.0f, 113.0f, 0.0f }, 50.0f },
{ { -50.0f, 163.0f, 0.0f }, 50.0f },
{ { 0.0f, 163.0f, 0.0f }, 50.0f },
{ { 0.0f, 213.0f, 0.0f }, 0.0f }
}
};
static Data690Block lbl_1_data_960[3] = { static Data690Block lbl_1_data_960[3]
{ = { { { { -50.0f, -12.0f, 0.0f }, 125.0f }, { { -50.0f, 113.0f, 0.0f }, 50.0f }, { { 0.0f, 113.0f, 0.0f }, 25.0f },
{ { -50.0f, -12.0f, 0.0f }, 125.0f }, { { 0.0f, 138.0f, 0.0f }, 50.0f }, { { 50.0f, 138.0f, 0.0f }, 37.5f }, { { 50.0f, 175.5f, 0.0f }, 0.0f } },
{ { -50.0f, 113.0f, 0.0f }, 50.0f }, { { { 0.0f, -12.0f, 0.0f }, 75.0f }, { { 0.0f, 63.0f, 0.0f }, 50.0f }, { { 50.0f, 63.0f, 0.0f }, 75.0f },
{ { 0.0f, 113.0f, 0.0f }, 25.0f }, { { 50.0f, 138.0f, 0.0f }, 50.0f }, { { 0.0f, 138.0f, 0.0f }, 25.0f }, { { 0.0f, 163.0f, 0.0f }, 50.0f },
{ { 0.0f, 138.0f, 0.0f }, 50.0f }, { { -50.0f, 163.0f, 0.0f }, 12.5f }, { { -50.0f, 175.5f, 0.0f }, 0.0f } },
{ { 50.0f, 138.0f, 0.0f }, 37.5f }, { { { 50.0f, -12.0f, 0.0f }, 75.0f }, { { 50.0f, 63.0f, 0.0f }, 50.0f }, { { 0.0f, 63.0f, 0.0f }, 50.0f },
{ { 50.0f, 175.5f, 0.0f }, 0.0f } { { 0.0f, 113.0f, 0.0f }, 50.0f }, { { -50.0f, 113.0f, 0.0f }, 50.0f }, { { -50.0f, 163.0f, 0.0f }, 50.0f },
}, { { 0.0f, 163.0f, 0.0f }, 50.0f }, { { 0.0f, 213.0f, 0.0f }, 0.0f } } };
{
{ { 0.0f, -12.0f, 0.0f }, 75.0f },
{ { 0.0f, 63.0f, 0.0f }, 50.0f },
{ { 50.0f, 63.0f, 0.0f }, 75.0f },
{ { 50.0f, 138.0f, 0.0f }, 50.0f },
{ { 0.0f, 138.0f, 0.0f }, 25.0f },
{ { 0.0f, 163.0f, 0.0f }, 50.0f },
{ { -50.0f, 163.0f, 0.0f }, 12.5f },
{ { -50.0f, 175.5f, 0.0f }, 0.0f }
},
{
{ { 50.0f, -12.0f, 0.0f }, 75.0f },
{ { 50.0f, 63.0f, 0.0f }, 50.0f },
{ { 0.0f, 63.0f, 0.0f }, 50.0f },
{ { 0.0f, 113.0f, 0.0f }, 50.0f },
{ { -50.0f, 113.0f, 0.0f }, 50.0f },
{ { -50.0f, 163.0f, 0.0f }, 50.0f },
{ { 0.0f, 163.0f, 0.0f }, 50.0f },
{ { 0.0f, 213.0f, 0.0f }, 0.0f }
}
};
static Data690Block lbl_1_data_C30[3] = { static Data690Block lbl_1_data_C30[3]
{ = { { { { -50.0f, -12.0f, 0.0f }, 100.0f }, { { -50.0f, 88.0f, 0.0f }, 50.0f }, { { 0.0f, 88.0f, 0.0f }, 50.0f },
{ { -50.0f, -12.0f, 0.0f }, 100.0f }, { { 0.0f, 138.0f, 0.0f }, 50.0f }, { { -50.0f, 138.0f, 0.0f }, 37.5f }, { { -50.0f, 175.5f, 0.0f }, 0.0f } },
{ { -50.0f, 88.0f, 0.0f }, 50.0f }, { { { 0.0f, -12.0f, 0.0f }, 75.0f }, { { 0.0f, 63.0f, 0.0f }, 50.0f }, { { 50.0f, 63.0f, 0.0f }, 100.0f },
{ { 0.0f, 88.0f, 0.0f }, 50.0f }, { { 50.0f, 163.0f, 0.0f }, 50.0f }, { { 0.0f, 163.0f, 0.0f }, 50.0f }, { { 0.0f, 213.0f, 0.0f }, 0.0f } },
{ { 0.0f, 138.0f, 0.0f }, 50.0f }, { { { 50.0f, -12.0f, 0.0f }, 75.0f }, { { 50.0f, 63.0f, 0.0f }, 50.0f }, { { 0.0f, 63.0f, 0.0f }, 25.0f }, { { 0.0f, 88.0f, 0.0f }, 50.0f },
{ { -50.0f, 138.0f, 0.0f }, 37.5f }, { { -50.0f, 88.0f, 0.0f }, 50.0f }, { { -50.0f, 138.0f, 0.0f }, 50.0f }, { { 0.0f, 138.0f, 0.0f }, 25.0f },
{ { -50.0f, 175.5f, 0.0f }, 0.0f } { { 0.0f, 163.0f, 0.0f }, 50.0f }, { { 50.0f, 163.0f, 0.0f }, 12.5f }, { { 50.0f, 175.5f, 0.0f }, 0.0f } } };
},
{
{ { 0.0f, -12.0f, 0.0f }, 75.0f },
{ { 0.0f, 63.0f, 0.0f }, 50.0f },
{ { 50.0f, 63.0f, 0.0f }, 100.0f },
{ { 50.0f, 163.0f, 0.0f }, 50.0f },
{ { 0.0f, 163.0f, 0.0f }, 50.0f },
{ { 0.0f, 213.0f, 0.0f }, 0.0f }
},
{
{ { 50.0f, -12.0f, 0.0f }, 75.0f },
{ { 50.0f, 63.0f, 0.0f }, 50.0f },
{ { 0.0f, 63.0f, 0.0f }, 25.0f },
{ { 0.0f, 88.0f, 0.0f }, 50.0f },
{ { -50.0f, 88.0f, 0.0f }, 50.0f },
{ { -50.0f, 138.0f, 0.0f }, 50.0f },
{ { 0.0f, 138.0f, 0.0f }, 25.0f },
{ { 0.0f, 163.0f, 0.0f }, 50.0f },
{ { 50.0f, 163.0f, 0.0f }, 12.5f },
{ { 50.0f, 175.5f, 0.0f }, 0.0f }
}
};
void fn_1_9D00(s32 arg0) { void fn_1_9D00(s32 arg0)
{
s32 temp_r31; s32 temp_r31;
s32 var_r30; s32 var_r30;
@ -230,12 +159,15 @@ void fn_1_9D00(s32 arg0) {
if (lbl_1_bss_0->unk00_field0 != 0) { if (lbl_1_bss_0->unk00_field0 != 0) {
if (temp_r31 == 0 || temp_r31 == 1 || temp_r31 == 7) { if (temp_r31 == 0 || temp_r31 == 1 || temp_r31 == 7) {
var_r30 = 0; var_r30 = 0;
} else { }
else {
var_r30 = 1; var_r30 = 1;
} }
} else if (temp_r31 == 0 || temp_r31 == 1 || temp_r31 == 7) { }
else if (temp_r31 == 0 || temp_r31 == 1 || temp_r31 == 7) {
var_r30 = 1; var_r30 = 1;
} else { }
else {
var_r30 = 0; var_r30 = 0;
} }
if (BoardPlayerCoinsGet(arg0) < 5) { if (BoardPlayerCoinsGet(arg0) < 5) {
@ -243,12 +175,14 @@ void fn_1_9D00(s32 arg0) {
} }
if (var_r30 != 0) { if (var_r30 != 0) {
BoardComKeySetLeft(); BoardComKeySetLeft();
} else { }
else {
BoardComKeySetRight(); BoardComKeySetRight();
} }
} }
void fn_1_9DD8(void) { void fn_1_9DD8(void)
{
Vec sp2C[3]; Vec sp2C[3];
Vec sp20; Vec sp20;
Vec sp14; Vec sp14;
@ -295,7 +229,7 @@ void fn_1_9DD8(void) {
fn_1_CB44(&sp14, 0.0f); fn_1_CB44(&sp14, 0.0f);
fn_1_B088(lbl_1_bss_720); fn_1_B088(lbl_1_bss_720);
lbl_1_bss_750 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_W01, 19)); lbl_1_bss_750 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_W01, 19));
Hu3DModelAttrSet(lbl_1_bss_750, 1); Hu3DModelAttrSet(lbl_1_bss_750, HU3D_ATTR_DISPOFF);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
lbl_1_bss_714[i] = omAddObjEx(boardObjMan, 0x101, 0, 0, -1, fn_1_A6E0); lbl_1_bss_714[i] = omAddObjEx(boardObjMan, 0x101, 0, 0, -1, fn_1_A6E0);
lbl_1_bss_714[i]->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Bss714Data), MEMORY_DEFAULT_NUM); lbl_1_bss_714[i]->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Bss714Data), MEMORY_DEFAULT_NUM);
@ -305,7 +239,8 @@ void fn_1_9DD8(void) {
temp_r29 = lbl_1_bss_714[i]->data; temp_r29 = lbl_1_bss_714[i]->data;
if (i == lbl_1_bss_730) { if (i == lbl_1_bss_730) {
lbl_1_bss_714[i]->work[2] = 1; lbl_1_bss_714[i]->work[2] = 1;
} else { }
else {
lbl_1_bss_714[i]->work[2] = 0; lbl_1_bss_714[i]->work[2] = 0;
} }
temp_r29->unk18 = 1.0f; temp_r29->unk18 = 1.0f;
@ -325,7 +260,8 @@ void fn_1_9DD8(void) {
} }
} }
static void fn_1_A4B8(omObjData *arg0) { static void fn_1_A4B8(omObjData *arg0)
{
if (lbl_1_bss_72A == 0) { if (lbl_1_bss_72A == 0) {
return; return;
} }
@ -338,7 +274,8 @@ static void fn_1_A4B8(omObjData *arg0) {
lbl_1_bss_754 -= 1.0f; lbl_1_bss_754 -= 1.0f;
} }
static void fn_1_A554(void) { static void fn_1_A554(void)
{
float temp_f1; float temp_f1;
lbl_1_bss_72A = 1; lbl_1_bss_72A = 1;
@ -350,7 +287,8 @@ static void fn_1_A554(void) {
BoardModelMotionSpeedSet(lbl_1_bss_796, -1.0f); BoardModelMotionSpeedSet(lbl_1_bss_796, -1.0f);
} }
static void fn_1_A5FC(void) { static void fn_1_A5FC(void)
{
s32 i; s32 i;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -367,7 +305,8 @@ static void fn_1_A5FC(void) {
Hu3DModelKill(lbl_1_bss_750); Hu3DModelKill(lbl_1_bss_750);
} }
static void fn_1_A6E0(omObjData *arg0) { static void fn_1_A6E0(omObjData *arg0)
{
Bss714Data *temp_r31; Bss714Data *temp_r31;
Vec sp2C; Vec sp2C;
Vec sp20; Vec sp20;
@ -384,10 +323,12 @@ static void fn_1_A6E0(omObjData *arg0) {
sp2C.y = 1.5f; sp2C.y = 1.5f;
if (arg0->work[3] == 1) { if (arg0->work[3] == 1) {
arg0->work[2] = 0; arg0->work[2] = 0;
} else { }
else {
arg0->work[2] = 2; arg0->work[2] = 2;
} }
} else { }
else {
sp2C.y += 0.08f; sp2C.y += 0.08f;
} }
BoardModelScaleSetV(arg0->work[0], &sp2C); BoardModelScaleSetV(arg0->work[0], &sp2C);
@ -399,10 +340,12 @@ static void fn_1_A6E0(omObjData *arg0) {
if (arg0->work[1] == 1) { if (arg0->work[1] == 1) {
arg0->work[2] = 0; arg0->work[2] = 0;
arg0->work[1] = 0; arg0->work[1] = 0;
} else { }
else {
arg0->work[2] = 1; arg0->work[2] = 1;
} }
} else { }
else {
sp2C.y -= 0.08f; sp2C.y -= 0.08f;
} }
BoardModelScaleSetV(arg0->work[0], &sp2C); BoardModelScaleSetV(arg0->work[0], &sp2C);
@ -445,7 +388,7 @@ static void fn_1_A6E0(omObjData *arg0) {
Hu3DModelScaleSet(lbl_1_bss_750, temp_r31->unk20.x, temp_r31->unk20.y, temp_r31->unk20.z); Hu3DModelScaleSet(lbl_1_bss_750, temp_r31->unk20.x, temp_r31->unk20.y, temp_r31->unk20.z);
break; break;
case 4: case 4:
Hu3DModelAttrSet(lbl_1_bss_750, 1); Hu3DModelAttrSet(lbl_1_bss_750, HU3D_ATTR_DISPOFF);
arg0->work[2] = 5; arg0->work[2] = 5;
temp_r31->unk08 = 0; temp_r31->unk08 = 0;
temp_r31->unk0C = 12.0f; temp_r31->unk0C = 12.0f;
@ -476,10 +419,12 @@ static void fn_1_A6E0(omObjData *arg0) {
if (sp20.x - lbl_1_bss_738.x < -25.0f) { if (sp20.x - lbl_1_bss_738.x < -25.0f) {
temp_r31->unk40 = 0; temp_r31->unk40 = 0;
lbl_1_bss_728 = 5; lbl_1_bss_728 = 5;
} else if (sp20.x - lbl_1_bss_738.x > 25.0f) { }
else if (sp20.x - lbl_1_bss_738.x > 25.0f) {
temp_r31->unk40 = 2; temp_r31->unk40 = 2;
lbl_1_bss_728 = 10; lbl_1_bss_728 = 10;
} else { }
else {
temp_r31->unk40 = 1; temp_r31->unk40 = 1;
lbl_1_bss_728 = 20; lbl_1_bss_728 = 20;
} }
@ -492,7 +437,8 @@ static void fn_1_A6E0(omObjData *arg0) {
fn_1_C94C(&(*temp_r31->unk04)[temp_r31->unk08].unk00, &(*temp_r31->unk04)[temp_r31->unk08 + 1].unk00, &sp8); fn_1_C94C(&(*temp_r31->unk04)[temp_r31->unk08].unk00, &(*temp_r31->unk04)[temp_r31->unk08 + 1].unk00, &sp8);
sp20.x = lbl_1_bss_738.x + (sp8.x * var_f31 + (*temp_r31->unk04)[temp_r31->unk08].unk00.x); sp20.x = lbl_1_bss_738.x + (sp8.x * var_f31 + (*temp_r31->unk04)[temp_r31->unk08].unk00.x);
sp20.y = lbl_1_bss_738.y + (sp8.y * var_f31 + (*temp_r31->unk04)[temp_r31->unk08].unk00.y); sp20.y = lbl_1_bss_738.y + (sp8.y * var_f31 + (*temp_r31->unk04)[temp_r31->unk08].unk00.y);
} else { }
else {
sp20.x = lbl_1_bss_738.x + (*temp_r31->unk04)[temp_r31->unk08].unk00.x; sp20.x = lbl_1_bss_738.x + (*temp_r31->unk04)[temp_r31->unk08].unk00.x;
sp20.y = lbl_1_bss_738.y + (*temp_r31->unk04)[temp_r31->unk08].unk00.y; sp20.y = lbl_1_bss_738.y + (*temp_r31->unk04)[temp_r31->unk08].unk00.y;
} }
@ -520,7 +466,8 @@ static void fn_1_A6E0(omObjData *arg0) {
} }
} }
static float fn_1_B018(Data690Block *arg0) { static float fn_1_B018(Data690Block *arg0)
{
float var_f31; float var_f31;
s32 i; s32 i;
@ -536,7 +483,8 @@ static float fn_1_B018(Data690Block *arg0) {
return var_f31; return var_f31;
} }
static void fn_1_B088(omObjData *arg0) { static void fn_1_B088(omObjData *arg0)
{
Bss720Data *temp_r31; Bss720Data *temp_r31;
u16 sp8[] = { 20, 60, 120, 190 }; u16 sp8[] = { 20, 60, 120, 190 };
s32 i; s32 i;
@ -548,13 +496,15 @@ static void fn_1_B088(omObjData *arg0) {
temp_r31->unk26 = i; temp_r31->unk26 = i;
} }
} }
} else { }
else {
temp_r31->unk26 = rand8() % 3; temp_r31->unk26 = rand8() % 3;
} }
temp_r31->unk24 = rand8() % 20 + 20; temp_r31->unk24 = rand8() % 20 + 20;
} }
static void fn_1_B1CC(omObjData *arg0, u16 *arg1, u16 *arg2) { static void fn_1_B1CC(omObjData *arg0, u16 *arg1, u16 *arg2)
{
Bss720Data *temp_r31; Bss720Data *temp_r31;
temp_r31 = arg0->data; temp_r31 = arg0->data;
@ -566,28 +516,35 @@ static void fn_1_B1CC(omObjData *arg0, u16 *arg1, u16 *arg2) {
if (temp_r31->unk28 >= 4 || (rand8() & 1)) { if (temp_r31->unk28 >= 4 || (rand8() & 1)) {
if (temp_r31->unk26 == lbl_1_bss_730) { if (temp_r31->unk26 == lbl_1_bss_730) {
*arg2 |= 0x100; *arg2 |= 0x100;
} else if (temp_r31->unk26 < lbl_1_bss_730) { }
else if (temp_r31->unk26 < lbl_1_bss_730) {
*arg1 |= 1; *arg1 |= 1;
} else { }
else {
*arg1 |= 2; *arg1 |= 2;
} }
temp_r31->unk24 = rand8() % 10 + 10; temp_r31->unk24 = rand8() % 10 + 10;
} else { }
else {
temp_r31->unk28++; temp_r31->unk28++;
temp_r31->unk24 = rand8() % 10 + 20; temp_r31->unk24 = rand8() % 10 + 20;
if (lbl_1_bss_730 == 0) { if (lbl_1_bss_730 == 0) {
*arg1 |= 2; *arg1 |= 2;
} else if (lbl_1_bss_730 == 2) { }
else if (lbl_1_bss_730 == 2) {
*arg1 |= 1; *arg1 |= 1;
} else if (rand8() & 1) { }
else if (rand8() & 1) {
*arg1 |= 1; *arg1 |= 1;
} else { }
else {
*arg1 |= 2; *arg1 |= 2;
} }
} }
} }
static void fn_1_B3B8(omObjData *arg0) { static void fn_1_B3B8(omObjData *arg0)
{
float temp_f31; float temp_f31;
temp_f31 = BoardModelMotionMaxTimeGet(lbl_1_bss_796); temp_f31 = BoardModelMotionMaxTimeGet(lbl_1_bss_796);
@ -599,7 +556,8 @@ static void fn_1_B3B8(omObjData *arg0) {
} }
} }
static void fn_1_B478(omObjData *arg0) { static void fn_1_B478(omObjData *arg0)
{
Bss720Data *temp_r31; Bss720Data *temp_r31;
Vec sp18; Vec sp18;
Vec spC; Vec spC;
@ -616,7 +574,8 @@ static void fn_1_B478(omObjData *arg0) {
} }
if (GWPlayerCfg[lbl_1_bss_798].iscom == 1) { if (GWPlayerCfg[lbl_1_bss_798].iscom == 1) {
fn_1_B1CC(arg0, &var_r29, &var_r27); fn_1_B1CC(arg0, &var_r29, &var_r27);
} else { }
else {
var_r29 = HuPadDStkRep[lbl_1_bss_79C]; var_r29 = HuPadDStkRep[lbl_1_bss_79C];
var_r27 = HuPadBtnDown[lbl_1_bss_79C]; var_r27 = HuPadBtnDown[lbl_1_bss_79C];
} }
@ -651,7 +610,8 @@ static void fn_1_B478(omObjData *arg0) {
} }
} }
static void fn_1_BAF8(omObjData *arg0) { static void fn_1_BAF8(omObjData *arg0)
{
Bss720Data *temp_r31; Bss720Data *temp_r31;
Vec sp14; Vec sp14;
Vec sp8; Vec sp8;
@ -675,7 +635,8 @@ static void fn_1_BAF8(omObjData *arg0) {
BoardPlayerPosSetV(lbl_1_bss_798, &sp14); BoardPlayerPosSetV(lbl_1_bss_798, &sp14);
} }
static void fn_1_BCDC(omObjData *arg0) { static void fn_1_BCDC(omObjData *arg0)
{
Bss720Data *temp_r29; Bss720Data *temp_r29;
Bss714Data *temp_r31; Bss714Data *temp_r31;
Vec sp14; Vec sp14;
@ -691,7 +652,7 @@ static void fn_1_BCDC(omObjData *arg0) {
lbl_1_bss_710->work[0] = 1; lbl_1_bss_710->work[0] = 1;
lbl_1_bss_714[lbl_1_bss_730]->work[2] = 3; lbl_1_bss_714[lbl_1_bss_730]->work[2] = 3;
temp_r31 = lbl_1_bss_714[lbl_1_bss_730]->data; temp_r31 = lbl_1_bss_714[lbl_1_bss_730]->data;
Hu3DModelAttrReset(lbl_1_bss_750, 1); Hu3DModelAttrReset(lbl_1_bss_750, HU3D_ATTR_DISPOFF);
Hu3DModelPosSet(lbl_1_bss_750, sp14.x, sp14.y, sp14.z); Hu3DModelPosSet(lbl_1_bss_750, sp14.x, sp14.y, sp14.z);
temp_r31->unk20.x = 1.4f; temp_r31->unk20.x = 1.4f;
temp_r31->unk20.y = 1.4f; temp_r31->unk20.y = 1.4f;
@ -706,19 +667,22 @@ static void fn_1_BCDC(omObjData *arg0) {
} }
} }
static void fn_1_BF00(omObjData *arg0) { static void fn_1_BF00(omObjData *arg0)
{
Bss720Data *temp_r31; Bss720Data *temp_r31;
temp_r31 = arg0->data; temp_r31 = arg0->data;
if (temp_r31->unk1C == 0) { if (temp_r31->unk1C == 0) {
lbl_1_bss_714[lbl_1_bss_730]->work[2] = 4; lbl_1_bss_714[lbl_1_bss_730]->work[2] = 4;
arg0->func = fn_1_BF68; arg0->func = fn_1_BF68;
} else { }
else {
temp_r31->unk1C--; temp_r31->unk1C--;
} }
} }
static void fn_1_BF68(omObjData *arg0) { static void fn_1_BF68(omObjData *arg0)
{
Bss720Data *sp8; Bss720Data *sp8;
sp8 = arg0->data; sp8 = arg0->data;
@ -729,7 +693,8 @@ static void fn_1_BF68(omObjData *arg0) {
} }
} }
static void fn_1_C000(void) { static void fn_1_C000(void)
{
char sp8[16]; // array size may range between 1 and 16 (inclusive) char sp8[16]; // array size may range between 1 and 16 (inclusive)
omObjData *temp_r30; omObjData *temp_r30;
Bss720Data *temp_r31; Bss720Data *temp_r31;
@ -754,7 +719,8 @@ static void fn_1_C000(void) {
} }
} }
static void fn_1_C0FC(omObjData *arg0) { static void fn_1_C0FC(omObjData *arg0)
{
Bss720Data *temp_r31; Bss720Data *temp_r31;
Vec sp8; Vec sp8;
@ -774,7 +740,8 @@ static void fn_1_C0FC(omObjData *arg0) {
BoardPlayerPosSetV(lbl_1_bss_798, &sp8); BoardPlayerPosSetV(lbl_1_bss_798, &sp8);
} }
static void fn_1_C25C(void) { static void fn_1_C25C(void)
{
Vec sp11C[20]; Vec sp11C[20];
Vec sp2C[20]; Vec sp2C[20];
Vec sp20; Vec sp20;
@ -842,7 +809,8 @@ static void fn_1_C25C(void) {
} }
} }
static void fn_1_C844(void) { static void fn_1_C844(void)
{
omObjData *var_r31; omObjData *var_r31;
BoardWinCreate(2, MAKE_MESSID(11, 7), 0); BoardWinCreate(2, MAKE_MESSID(11, 7), 0);
@ -856,7 +824,8 @@ static void fn_1_C844(void) {
} }
} }
static void fn_1_C894(omObjData *arg0) { static void fn_1_C894(omObjData *arg0)
{
float temp_f31; float temp_f31;
lbl_1_bss_72A = 1; lbl_1_bss_72A = 1;
@ -869,33 +838,38 @@ static void fn_1_C894(omObjData *arg0) {
omDelObjEx(HuPrcCurrentGet(), arg0); omDelObjEx(HuPrcCurrentGet(), arg0);
} }
static void fn_1_C94C(Vec *arg0, Vec *arg1, Vec *arg2) { static void fn_1_C94C(Vec *arg0, Vec *arg1, Vec *arg2)
{
VECSubtract(arg1, arg0, arg2); VECSubtract(arg1, arg0, arg2);
VECNormalize(arg2, arg2); VECNormalize(arg2, arg2);
} }
static float fn_1_C998(Vec *arg0) { static float fn_1_C998(Vec *arg0)
{
float temp_f31; float temp_f31;
if (arg0->x || arg0->z) { if (arg0->x || arg0->z) {
if (arg0->x == 0.0f) { if (arg0->x == 0.0f) {
if (arg0->z > 0.0f) { if (arg0->z > 0.0f) {
return 0.0f; return 0.0f;
} else { }
else {
return 180.0f; return 180.0f;
} }
} }
if (arg0->z == 0.0f) { if (arg0->z == 0.0f) {
if (arg0->x > 0.0f) { if (arg0->x > 0.0f) {
return 90.0f; return 90.0f;
} else { }
else {
return 270.0f; return 270.0f;
} }
} }
temp_f31 = atan2d(arg0->z, arg0->x); temp_f31 = atan2d(arg0->z, arg0->x);
if (arg0->z < 0.0f) { if (arg0->z < 0.0f) {
temp_f31 = 90.0f - temp_f31; temp_f31 = 90.0f - temp_f31;
} else { }
else {
temp_f31 = 90.0f - temp_f31; temp_f31 = 90.0f - temp_f31;
if (temp_f31 < 0.0f) { if (temp_f31 < 0.0f) {
temp_f31 += 360.0f; temp_f31 += 360.0f;
@ -906,7 +880,8 @@ static float fn_1_C998(Vec *arg0) {
return -1.0f; return -1.0f;
} }
static u32 fn_1_CB44(Vec *arg0, float arg1) { static u32 fn_1_CB44(Vec *arg0, float arg1)
{
Vec sp24; Vec sp24;
Vec sp18; Vec sp18;
Vec spC; Vec spC;
@ -923,22 +898,27 @@ static u32 fn_1_CB44(Vec *arg0, float arg1) {
var_f30 = var_f28 - var_f31; var_f30 = var_f28 - var_f31;
if (arg1 == 0.0f) { if (arg1 == 0.0f) {
var_f31 = var_f28; var_f31 = var_f28;
} else if (fabs(var_f30) > arg1) { }
else if (fabs(var_f30) > arg1) {
if (var_f30 < 0.0f) { if (var_f30 < 0.0f) {
var_f30 += 360.0f; var_f30 += 360.0f;
} }
if (var_f30 < 180.0f) { if (var_f30 < 180.0f) {
if (var_f30 > arg1) { if (var_f30 > arg1) {
var_f31 += arg1; var_f31 += arg1;
} else { }
else {
var_f31 += var_f30; var_f31 += var_f30;
} }
} else if (360.0f - var_f30 > arg1) { }
else if (360.0f - var_f30 > arg1) {
var_f31 -= arg1; var_f31 -= arg1;
} else { }
else {
var_f31 -= 360.0f - var_f30; var_f31 -= 360.0f - var_f30;
} }
} else { }
else {
var_f31 = var_f28; var_f31 = var_f28;
} }
if (var_f31 >= 360.0f) { if (var_f31 >= 360.0f) {
@ -950,12 +930,14 @@ static u32 fn_1_CB44(Vec *arg0, float arg1) {
BoardPlayerRotYSet(lbl_1_bss_798, var_f31); BoardPlayerRotYSet(lbl_1_bss_798, var_f31);
if (var_f31 == var_f28) { if (var_f31 == var_f28) {
return 1; return 1;
} else { }
else {
return 0; return 0;
} }
} }
static void fn_1_CEC4(void) { static void fn_1_CEC4(void)
{
lbl_1_bss_70C = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_W01, 20)); lbl_1_bss_70C = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_W01, 20));
lbl_1_bss_710 = omAddObjEx(boardObjMan, 0x101, 1, 0, -1, fn_1_D07C); lbl_1_bss_710 = omAddObjEx(boardObjMan, 0x101, 1, 0, -1, fn_1_D07C);
lbl_1_bss_710->data = HuMemDirectMallocNum(HEAP_SYSTEM, 12, MEMORY_DEFAULT_NUM); lbl_1_bss_710->data = HuMemDirectMallocNum(HEAP_SYSTEM, 12, MEMORY_DEFAULT_NUM);
@ -964,16 +946,18 @@ static void fn_1_CEC4(void) {
Hu3DParticleScaleSet(lbl_1_bss_710->model[0], 5.0f); Hu3DParticleScaleSet(lbl_1_bss_710->model[0], 5.0f);
Hu3DParticleHookSet(lbl_1_bss_710->model[0], fn_1_D114); Hu3DParticleHookSet(lbl_1_bss_710->model[0], fn_1_D114);
Hu3DParticleBlendModeSet(lbl_1_bss_710->model[0], 1); Hu3DParticleBlendModeSet(lbl_1_bss_710->model[0], 1);
Hu3DModelAttrSet(lbl_1_bss_710->model[0], 1); Hu3DModelAttrSet(lbl_1_bss_710->model[0], HU3D_ATTR_DISPOFF);
lbl_1_bss_710->work[0] = 0; lbl_1_bss_710->work[0] = 0;
} }
static void fn_1_D034(void) { static void fn_1_D034(void)
{
Hu3DModelKill(lbl_1_bss_710->model[0]); Hu3DModelKill(lbl_1_bss_710->model[0]);
omDelObjEx(HuPrcCurrentGet(), lbl_1_bss_710); omDelObjEx(HuPrcCurrentGet(), lbl_1_bss_710);
} }
static void fn_1_D07C(omObjData *arg0) { static void fn_1_D07C(omObjData *arg0)
{
void *sp8; void *sp8;
sp8 = arg0->data; sp8 = arg0->data;
@ -982,7 +966,7 @@ static void fn_1_D07C(omObjData *arg0) {
break; break;
case 1: case 1:
arg0->work[0] = 2; arg0->work[0] = 2;
Hu3DModelAttrReset(arg0->model[0], 1); Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
Hu3DModelScaleSet(arg0->model[0], 10.0f, 10.0f, 10.0f); Hu3DModelScaleSet(arg0->model[0], 10.0f, 10.0f, 10.0f);
break; break;
case 2: case 2:
@ -990,7 +974,8 @@ static void fn_1_D07C(omObjData *arg0) {
} }
} }
static void fn_1_D114(ModelData *model, ParticleData *particle, Mtx matrix) { static void fn_1_D114(ModelData *model, ParticleData *particle, Mtx matrix)
{
Bss714Data *temp_r28; Bss714Data *temp_r28;
HsfanimStruct01 *var_r31; HsfanimStruct01 *var_r31;
Vec sp8; Vec sp8;
@ -1006,7 +991,7 @@ static void fn_1_D114(ModelData *model, ParticleData *particle, Mtx matrix) {
for (i = 0; i < particle->unk_30; i++, var_r31++) { for (i = 0; i < particle->unk_30; i++, var_r31++) {
var_r31->unk2C = 0.0f; var_r31->unk2C = 0.0f;
} }
particle->unk_1C = (void*) 1; particle->unk_1C = (void *)1;
} }
if (temp_r28->unk1C > 0.0f) { if (temp_r28->unk1C > 0.0f) {
for (i = 0; i < 80.0f * temp_r28->unk1C; i++) { for (i = 0; i < 80.0f * temp_r28->unk1C; i++) {

217
src/REL/w01Dll/mg_item.c
View file

@ -1,6 +1,7 @@
#include "REL/w01Dll.h" #include "REL/w01Dll.h"
#include "game/audio.h" #include "game/audio.h"
#include "game/data.h" #include "game/data.h"
#include "game/frand.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "game/hsfanim.h" #include "game/hsfanim.h"
#include "game/hsfdraw.h" #include "game/hsfdraw.h"
@ -12,15 +13,14 @@
#include "game/pad.h" #include "game/pad.h"
#include "game/process.h" #include "game/process.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/frand.h"
#include "game/window.h"
#include "game/board/audio.h" #include "game/board/audio.h"
#include "game/board/main.h" #include "game/board/main.h"
#include "game/board/model.h" #include "game/board/model.h"
#include "game/board/player.h" #include "game/board/player.h"
#include "game/board/ui.h" #include "game/board/ui.h"
#include "game/board/window.h" #include "game/board/window.h"
#include "game/window.h"
#include "dolphin.h" #include "dolphin.h"
#include "ext_math.h" #include "ext_math.h"
@ -83,46 +83,21 @@ static s16 lbl_1_bss_7A8;
static s32 lbl_1_bss_7A4; static s32 lbl_1_bss_7A4;
static AnimData *lbl_1_bss_7A0; static AnimData *lbl_1_bss_7A0;
static s32 lbl_1_data_F08[] = { static s32 lbl_1_data_F08[] = { DATA_MAKE_NUM(DATADIR_BOARD, 109), DATA_MAKE_NUM(DATADIR_BOARD, 110), DATA_MAKE_NUM(DATADIR_BOARD, 111),
DATA_MAKE_NUM(DATADIR_BOARD, 109), DATA_MAKE_NUM(DATADIR_BOARD, 112), DATA_MAKE_NUM(DATADIR_BOARD, 113), DATA_MAKE_NUM(DATADIR_BOARD, 114), DATA_MAKE_NUM(DATADIR_BOARD, 115),
DATA_MAKE_NUM(DATADIR_BOARD, 110), DATA_MAKE_NUM(DATADIR_BOARD, 116), DATA_MAKE_NUM(DATADIR_BOARD, 118), DATA_MAKE_NUM(DATADIR_BOARD, 119), DATA_MAKE_NUM(DATADIR_BOARD, 120),
DATA_MAKE_NUM(DATADIR_BOARD, 111), DATA_MAKE_NUM(DATADIR_BOARD, 121), DATA_MAKE_NUM(DATADIR_BOARD, 122), DATA_MAKE_NUM(DATADIR_BOARD, 123) };
DATA_MAKE_NUM(DATADIR_BOARD, 112),
DATA_MAKE_NUM(DATADIR_BOARD, 113),
DATA_MAKE_NUM(DATADIR_BOARD, 114),
DATA_MAKE_NUM(DATADIR_BOARD, 115),
DATA_MAKE_NUM(DATADIR_BOARD, 116),
DATA_MAKE_NUM(DATADIR_BOARD, 118),
DATA_MAKE_NUM(DATADIR_BOARD, 119),
DATA_MAKE_NUM(DATADIR_BOARD, 120),
DATA_MAKE_NUM(DATADIR_BOARD, 121),
DATA_MAKE_NUM(DATADIR_BOARD, 122),
DATA_MAKE_NUM(DATADIR_BOARD, 123)
};
static s32 lbl_1_data_F40[8] = { static s32 lbl_1_data_F40[8] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 23), DATA_MAKE_NUM(DATADIR_PEACHMOT, 23),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 23), DATA_MAKE_NUM(DATADIR_WARIOMOT, 23), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 23),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 23), DATA_MAKE_NUM(DATADIR_DAISYMOT, 23), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 23) };
DATA_MAKE_NUM(DATADIR_PEACHMOT, 23),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 23),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 23),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 23),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 23),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 23)
};
static s32 lbl_1_data_F60[8] = { static s32 lbl_1_data_F60[8] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 64), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 64), DATA_MAKE_NUM(DATADIR_PEACHMOT, 64),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 64), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 64), DATA_MAKE_NUM(DATADIR_WARIOMOT, 64), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 64),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 64), DATA_MAKE_NUM(DATADIR_DAISYMOT, 64), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 64) };
DATA_MAKE_NUM(DATADIR_PEACHMOT, 64),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 64),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 64),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 64),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 64),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 64)
};
void fn_1_D740(s16 *arg0) { void fn_1_D740(s16 *arg0)
{
s16 sp10[14]; s16 sp10[14];
s16 sp8[4]; s16 sp8[4];
float temp_f30; float temp_f30;
@ -170,14 +145,14 @@ void fn_1_D740(s16 *arg0) {
Hu3DData[lbl_1_bss_7FC[i]->model[1]].unk_F0[1][3] = -50.0f; Hu3DData[lbl_1_bss_7FC[i]->model[1]].unk_F0[1][3] = -50.0f;
} }
if (lbl_1_bss_7FC[i]->work[1] == 11) { if (lbl_1_bss_7FC[i]->work[1] == 11) {
Hu3DModelAttrSet(lbl_1_bss_7FC[i]->model[1], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_7FC[i]->model[1], HU3D_MOTATTR_LOOP);
} }
if (lbl_1_bss_7FC[i]->work[1] == 4) { if (lbl_1_bss_7FC[i]->work[1] == 4) {
Hu3DMotionSpeedSet(lbl_1_bss_7FC[i]->model[1], 0.0f); Hu3DMotionSpeedSet(lbl_1_bss_7FC[i]->model[1], 0.0f);
} }
Hu3DModelAttrReset(sp8[i], 1); Hu3DModelAttrReset(sp8[i], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_7FC[i]->model[1], 1); Hu3DModelAttrSet(lbl_1_bss_7FC[i]->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(lbl_1_bss_7FC[i]->model[1], 0x40000002); Hu3DModelAttrSet(lbl_1_bss_7FC[i]->model[1], HU3D_MOTATTR_PAUSE);
omSetTra(lbl_1_bss_7FC[i], lbl_1_bss_80C.x, lbl_1_bss_80C.y + 66.0f, lbl_1_bss_80C.z); omSetTra(lbl_1_bss_7FC[i], lbl_1_bss_80C.x, lbl_1_bss_80C.y + 66.0f, lbl_1_bss_80C.z);
var_f31 = 90.0f - 90.0f * i + 360.0f * (temp_f30 / temp_f29); var_f31 = 90.0f - 90.0f * i + 360.0f * (temp_f30 / temp_f29);
if (var_f31 >= 360.0f) { if (var_f31 >= 360.0f) {
@ -196,13 +171,15 @@ void fn_1_D740(s16 *arg0) {
} }
} }
void fn_1_DD84(void) { void fn_1_DD84(void)
{
s32 i; s32 i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (i != 0) { if (i != 0) {
Hu3DModelKill(lbl_1_bss_7FC[i]->model[0]); Hu3DModelKill(lbl_1_bss_7FC[i]->model[0]);
} else { }
else {
BoardModelVisibilitySet(lbl_1_bss_6C4[19], 0); BoardModelVisibilitySet(lbl_1_bss_6C4[19], 0);
Hu3DAnimKill(lbl_1_bss_7FC[i]->work[0]); Hu3DAnimKill(lbl_1_bss_7FC[i]->work[0]);
} }
@ -215,7 +192,8 @@ void fn_1_DD84(void) {
} }
} }
void fn_1_DE94(void) { void fn_1_DE94(void)
{
s32 i; s32 i;
BoardModelPosGet(lbl_1_bss_6C4[16], &lbl_1_bss_80C); BoardModelPosGet(lbl_1_bss_6C4[16], &lbl_1_bss_80C);
@ -237,14 +215,16 @@ void fn_1_DE94(void) {
lbl_1_bss_7B4 = 0; lbl_1_bss_7B4 = 0;
} }
static void fn_1_E100(void) { static void fn_1_E100(void)
{
lbl_1_bss_7AA = 1; lbl_1_bss_7AA = 1;
BoardMGExit(); BoardMGExit();
HuAudFXPlay(0x40F); HuAudFXPlay(0x40F);
BoardModelMotionStart(lbl_1_bss_6C4[21], 0, 0x40000004); BoardModelMotionStart(lbl_1_bss_6C4[21], 0, 0x40000004);
} }
static void fn_1_E154(void) { static void fn_1_E154(void)
{
fn_1_DD84(); fn_1_DD84();
BoardPlayerMotionKill(lbl_1_bss_7E4, lbl_1_bss_7BC); BoardPlayerMotionKill(lbl_1_bss_7E4, lbl_1_bss_7BC);
BoardPlayerMotionKill(lbl_1_bss_7E4, lbl_1_bss_7B8); BoardPlayerMotionKill(lbl_1_bss_7E4, lbl_1_bss_7B8);
@ -252,18 +232,18 @@ static void fn_1_E154(void) {
BoardMGDoneFlagSet(0); BoardMGDoneFlagSet(0);
} }
static void fn_1_E2B8(omObjData *arg0) { static void fn_1_E2B8(omObjData *arg0)
{
if (lbl_1_bss_7AA == 1 && BoardMGDoneFlagGet() == 1) { if (lbl_1_bss_7AA == 1 && BoardMGDoneFlagGet() == 1) {
fn_1_E154(); fn_1_E154();
omDelObjEx(HuPrcCurrentGet(), arg0); omDelObjEx(HuPrcCurrentGet(), arg0);
} }
} }
static char *lbl_1_data_F9C[] = { static char *lbl_1_data_F9C[] = { "uma1", "uma2", "uma3", "uma4" };
"uma1", "uma2", "uma3", "uma4"
};
static void fn_1_E44C(omObjData *arg0) { static void fn_1_E44C(omObjData *arg0)
{
Vec sp18; Vec sp18;
Vec spC; Vec spC;
float temp_f27; float temp_f27;
@ -318,7 +298,8 @@ static void fn_1_E44C(omObjData *arg0) {
BoardModelMotionSpeedSet(lbl_1_bss_6C4[17], lbl_1_bss_7EC); BoardModelMotionSpeedSet(lbl_1_bss_6C4[17], lbl_1_bss_7EC);
} }
static void fn_1_E914(omObjData *arg0) { static void fn_1_E914(omObjData *arg0)
{
Vec spC; Vec spC;
s32 i; s32 i;
@ -346,7 +327,8 @@ static void fn_1_E914(omObjData *arg0) {
BoardPlayerPosSetV(lbl_1_bss_7E4, &spC); BoardPlayerPosSetV(lbl_1_bss_7E4, &spC);
} }
static void fn_1_ECD4(omObjData *arg0) { static void fn_1_ECD4(omObjData *arg0)
{
lbl_1_bss_7EC *= 1.05f; lbl_1_bss_7EC *= 1.05f;
lbl_1_bss_7E8 *= 1.05f; lbl_1_bss_7E8 *= 1.05f;
if (lbl_1_bss_7EC > 2.0f) { if (lbl_1_bss_7EC > 2.0f) {
@ -368,16 +350,19 @@ static void fn_1_ECD4(omObjData *arg0) {
fn_1_10CF0(arg0->work[2]); fn_1_10CF0(arg0->work[2]);
} }
static void fn_1_EEA0(omObjData *arg0, u16 *arg1) { static void fn_1_EEA0(omObjData *arg0, u16 *arg1)
{
*arg1 = 0; *arg1 = 0;
if (arg0->work[3] != 0) { if (arg0->work[3] != 0) {
arg0->work[3]--; arg0->work[3]--;
} else { }
else {
*arg1 |= 0x100; *arg1 |= 0x100;
} }
} }
static void fn_1_EED8(omObjData *arg0) { static void fn_1_EED8(omObjData *arg0)
{
s16 temp_r29; s16 temp_r29;
u16 var_r30; u16 var_r30;
@ -391,7 +376,8 @@ static void fn_1_EED8(omObjData *arg0) {
} }
if (GWPlayerCfg[lbl_1_bss_7E4].iscom == 1) { if (GWPlayerCfg[lbl_1_bss_7E4].iscom == 1) {
fn_1_EEA0(arg0, &var_r30); fn_1_EEA0(arg0, &var_r30);
} else { }
else {
var_r30 = HuPadBtnDown[temp_r29]; var_r30 = HuPadBtnDown[temp_r29];
} }
if (lbl_1_bss_7D2 < 0 || (var_r30 & 0x100)) { if (lbl_1_bss_7D2 < 0 || (var_r30 & 0x100)) {
@ -402,7 +388,8 @@ static void fn_1_EED8(omObjData *arg0) {
} }
} }
static void fn_1_F09C(omObjData *arg0) { static void fn_1_F09C(omObjData *arg0)
{
float temp_f31; float temp_f31;
float var_f30; float var_f30;
@ -424,8 +411,10 @@ static void fn_1_F09C(omObjData *arg0) {
BoardModelMotionTimeSet(lbl_1_bss_6C4[18], var_f30); BoardModelMotionTimeSet(lbl_1_bss_6C4[18], var_f30);
arg0->work[0] = fn_1_1001C(arg0->work[2]); arg0->work[0] = fn_1_1001C(arg0->work[2]);
BoardModelVisibilitySet(lbl_1_bss_6C4[20], 1); BoardModelVisibilitySet(lbl_1_bss_6C4[20], 1);
BoardModelPosSet(lbl_1_bss_6C4[20], lbl_1_bss_7FC[arg0->work[0]]->trans.x, lbl_1_bss_7FC[arg0->work[0]]->trans.y + 1.0f, lbl_1_bss_7FC[arg0->work[0]]->trans.z); BoardModelPosSet(lbl_1_bss_6C4[20], lbl_1_bss_7FC[arg0->work[0]]->trans.x, lbl_1_bss_7FC[arg0->work[0]]->trans.y + 1.0f,
BoardModelRotSet(lbl_1_bss_6C4[20], lbl_1_bss_7FC[arg0->work[0]]->rot.x, lbl_1_bss_7FC[arg0->work[0]]->rot.y + 1.0f, lbl_1_bss_7FC[arg0->work[0]]->rot.z); lbl_1_bss_7FC[arg0->work[0]]->trans.z);
BoardModelRotSet(
lbl_1_bss_6C4[20], lbl_1_bss_7FC[arg0->work[0]]->rot.x, lbl_1_bss_7FC[arg0->work[0]]->rot.y + 1.0f, lbl_1_bss_7FC[arg0->work[0]]->rot.z);
arg0->work[1] = 60; arg0->work[1] = 60;
BoardAudSeqFadeOut(1, 100); BoardAudSeqFadeOut(1, 100);
arg0->func = fn_1_F348; arg0->func = fn_1_F348;
@ -433,10 +422,12 @@ static void fn_1_F09C(omObjData *arg0) {
} }
} }
static void fn_1_F348(omObjData *arg0) { static void fn_1_F348(omObjData *arg0)
{
if ((arg0->work[1] / 4) & 1) { if ((arg0->work[1] / 4) & 1) {
BoardModelVisibilitySet(lbl_1_bss_6C4[20], 0); BoardModelVisibilitySet(lbl_1_bss_6C4[20], 0);
} else { }
else {
BoardModelVisibilitySet(lbl_1_bss_6C4[20], 1); BoardModelVisibilitySet(lbl_1_bss_6C4[20], 1);
} }
if ((arg0->work[1] -= 1) == 0) { if ((arg0->work[1] -= 1) == 0) {
@ -447,7 +438,8 @@ static void fn_1_F348(omObjData *arg0) {
} }
} }
static void fn_1_F3F8(omObjData *arg0) { static void fn_1_F3F8(omObjData *arg0)
{
Vec sp18; Vec sp18;
Vec spC; Vec spC;
@ -472,7 +464,8 @@ static void fn_1_F3F8(omObjData *arg0) {
arg0->func = fn_1_F6E8; arg0->func = fn_1_F6E8;
} }
static void fn_1_F6E8(omObjData *arg0) { static void fn_1_F6E8(omObjData *arg0)
{
Vec sp8; Vec sp8;
BoardPlayerPosGet(lbl_1_bss_7E4, &sp8); BoardPlayerPosGet(lbl_1_bss_7E4, &sp8);
@ -489,7 +482,8 @@ static void fn_1_F6E8(omObjData *arg0) {
BoardPlayerPosSetV(lbl_1_bss_7E4, &sp8); BoardPlayerPosSetV(lbl_1_bss_7E4, &sp8);
} }
static void fn_1_F890(omObjData *arg0) { static void fn_1_F890(omObjData *arg0)
{
Vec sp8; Vec sp8;
BoardPlayerRotGet(lbl_1_bss_7E4, &sp8); BoardPlayerRotGet(lbl_1_bss_7E4, &sp8);
@ -498,23 +492,28 @@ static void fn_1_F890(omObjData *arg0) {
lbl_1_bss_7F0->work[0] = 0; lbl_1_bss_7F0->work[0] = 0;
lbl_1_bss_7F0->func = fn_1_10820; lbl_1_bss_7F0->func = fn_1_10820;
arg0->func = fn_1_FA1C; arg0->func = fn_1_FA1C;
} else if (sp8.y > 180.0f) { }
else if (sp8.y > 180.0f) {
if (360.0f - sp8.y < 3.0f) { if (360.0f - sp8.y < 3.0f) {
sp8.y = 0.0f; sp8.y = 0.0f;
} else { }
else {
sp8.y += 3.0f; sp8.y += 3.0f;
} }
} else { }
else {
if (sp8.y < 3.0f) { if (sp8.y < 3.0f) {
sp8.y = 0.0f; sp8.y = 0.0f;
} else { }
else {
sp8.y -= 3.0f; sp8.y -= 3.0f;
} }
} }
BoardPlayerRotSetV(lbl_1_bss_7E4, &sp8); BoardPlayerRotSetV(lbl_1_bss_7E4, &sp8);
} }
static void fn_1_FA1C(omObjData *arg0) { static void fn_1_FA1C(omObjData *arg0)
{
if (lbl_1_bss_7F0->work[0] == 1) { if (lbl_1_bss_7F0->work[0] == 1) {
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, lbl_1_bss_7BC, 0.0f, 10.0f, HU3D_MOTATTR_NONE); BoardPlayerMotionShiftSet(lbl_1_bss_7E4, lbl_1_bss_7BC, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
arg0->work[0] = 30; arg0->work[0] = 30;
@ -523,7 +522,8 @@ static void fn_1_FA1C(omObjData *arg0) {
} }
} }
static void fn_1_FABC(omObjData *arg0) { static void fn_1_FABC(omObjData *arg0)
{
Process *var_r30; Process *var_r30;
if (arg0->work[0] == 0) { if (arg0->work[0] == 0) {
@ -533,12 +533,14 @@ static void fn_1_FABC(omObjData *arg0) {
BoardAudSeqPause(0, 0, 1000); BoardAudSeqPause(0, 0, 1000);
arg0->func = NULL; arg0->func = NULL;
} }
} else { }
else {
arg0->work[0]--; arg0->work[0]--;
} }
} }
static void fn_1_FB58(void) { static void fn_1_FB58(void)
{
omObjData *temp_r31; omObjData *temp_r31;
BoardWinCreate(2, MAKE_MESSID(10, 6), 0); BoardWinCreate(2, MAKE_MESSID(10, 6), 0);
@ -558,7 +560,8 @@ static void fn_1_FB58(void) {
} }
} }
static void fn_1_FC3C(omObjData *arg0) { static void fn_1_FC3C(omObjData *arg0)
{
Process *var_r31; Process *var_r31;
if (lbl_1_bss_7F0->work[0] == 1) { if (lbl_1_bss_7F0->work[0] == 1) {
@ -570,7 +573,8 @@ static void fn_1_FC3C(omObjData *arg0) {
} }
} }
static void fn_1_FCEC(void) { static void fn_1_FCEC(void)
{
omObjData *var_r31; omObjData *var_r31;
BoardWinCreate(2, MAKE_MESSID(10, 7), 0); BoardWinCreate(2, MAKE_MESSID(10, 7), 0);
@ -584,7 +588,8 @@ static void fn_1_FCEC(void) {
} }
} }
static void fn_1_FD3C(omObjData *arg0) { static void fn_1_FD3C(omObjData *arg0)
{
BoardStatusShowSetAll(1); BoardStatusShowSetAll(1);
BoardCameraTargetModelSet(lbl_1_bss_6C4[21]); BoardCameraTargetModelSet(lbl_1_bss_6C4[21]);
BoardCameraOffsetSet(0.0f, 0.0f, 0.0f); BoardCameraOffsetSet(0.0f, 0.0f, 0.0f);
@ -597,7 +602,8 @@ static void fn_1_FD3C(omObjData *arg0) {
arg0->func = fn_1_FE44; arg0->func = fn_1_FE44;
} }
static void fn_1_FE44(omObjData *arg0) { static void fn_1_FE44(omObjData *arg0)
{
if (BoardStatusStopCheck(lbl_1_bss_7E4) && BoardCameraMotionIsDone()) { if (BoardStatusStopCheck(lbl_1_bss_7E4) && BoardCameraMotionIsDone()) {
lbl_1_bss_7AA = 1; lbl_1_bss_7AA = 1;
BoardMGExit(); BoardMGExit();
@ -607,7 +613,8 @@ static void fn_1_FE44(omObjData *arg0) {
} }
} }
static void fn_1_FED0(omObjData *arg0) { static void fn_1_FED0(omObjData *arg0)
{
float temp_f30; float temp_f30;
float var_f31; float var_f31;
float var_f29; float var_f29;
@ -624,7 +631,8 @@ static void fn_1_FED0(omObjData *arg0) {
omSetRot(arg0, 0.0f, var_f31, 0.0f); omSetRot(arg0, 0.0f, var_f31, 0.0f);
} }
static s16 fn_1_1001C(u32 arg0) { static s16 fn_1_1001C(u32 arg0)
{
float var_f29; float var_f29;
float var_f28; float var_f28;
float temp_f27; float temp_f27;
@ -649,7 +657,8 @@ static s16 fn_1_1001C(u32 arg0) {
return var_f31; return var_f31;
} }
static void fn_1_101B8(s16 arg0) { static void fn_1_101B8(s16 arg0)
{
omObjData *var_r31; omObjData *var_r31;
float *var_r30; float *var_r30;
float var_f27; float var_f27;
@ -661,7 +670,7 @@ static void fn_1_101B8(s16 arg0) {
var_r31 = lbl_1_bss_7F0 = omAddObjEx(boardObjMan, 0x165, 3, 0, -1, fn_1_10664); var_r31 = lbl_1_bss_7F0 = omAddObjEx(boardObjMan, 0x165, 3, 0, -1, fn_1_10664);
var_r31->model[0] = lbl_1_bss_7FC[arg0]->model[1]; var_r31->model[0] = lbl_1_bss_7FC[arg0]->model[1];
Hu3DModelAttrReset(var_r31->model[0], 1); Hu3DModelAttrReset(var_r31->model[0], HU3D_ATTR_DISPOFF);
lbl_1_bss_7F0->work[1] = lbl_1_bss_7FC[arg0]->work[1]; lbl_1_bss_7F0->work[1] = lbl_1_bss_7FC[arg0]->work[1];
lbl_1_bss_7F0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 3 * sizeof(float), MEMORY_DEFAULT_NUM); lbl_1_bss_7F0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 3 * sizeof(float), MEMORY_DEFAULT_NUM);
var_r30 = lbl_1_bss_7F0->data; var_r30 = lbl_1_bss_7F0->data;
@ -696,7 +705,8 @@ static void fn_1_101B8(s16 arg0) {
lbl_1_bss_7AC = HuAudFXPlay(0x35F); lbl_1_bss_7AC = HuAudFXPlay(0x35F);
} }
static void fn_1_10664(omObjData *arg0) { static void fn_1_10664(omObjData *arg0)
{
float *temp_r31; float *temp_r31;
float var_f31; float var_f31;
@ -705,7 +715,8 @@ static void fn_1_10664(omObjData *arg0) {
if (arg0->work[0] == 0) { if (arg0->work[0] == 0) {
if (var_f31 > 1.0f) { if (var_f31 > 1.0f) {
var_f31 = 1.0f; var_f31 = 1.0f;
} else { }
else {
temp_r31[0] += 0.025f; temp_r31[0] += 0.025f;
} }
arg0->trans.y += temp_r31[2]; arg0->trans.y += temp_r31[2];
@ -714,7 +725,8 @@ static void fn_1_10664(omObjData *arg0) {
arg0->work[0] = 1; arg0->work[0] = 1;
} }
omSetSca(arg0, var_f31, var_f31, var_f31); omSetSca(arg0, var_f31, var_f31, var_f31);
} else { }
else {
arg0->trans.y += sind(temp_r31[1]); arg0->trans.y += sind(temp_r31[1]);
temp_r31[1] += 4.0f; temp_r31[1] += 4.0f;
if (temp_r31[1] >= 360.0f) { if (temp_r31[1] >= 360.0f) {
@ -723,7 +735,8 @@ static void fn_1_10664(omObjData *arg0) {
} }
} }
static void fn_1_10820(omObjData *arg0) { static void fn_1_10820(omObjData *arg0)
{
Vec sp24; Vec sp24;
Vec sp18; Vec sp18;
Vec spC; Vec spC;
@ -744,7 +757,8 @@ static void fn_1_10820(omObjData *arg0) {
arg0->trans.x = sp24.x; arg0->trans.x = sp24.x;
arg0->trans.z = sp24.z; arg0->trans.z = sp24.z;
arg0->work[0] = 1; arg0->work[0] = 1;
} else { }
else {
arg0->trans.x += 8.0f * spC.x; arg0->trans.x += 8.0f * spC.x;
arg0->trans.z += 8.0f * spC.z; arg0->trans.z += 8.0f * spC.z;
} }
@ -756,7 +770,8 @@ static void fn_1_10820(omObjData *arg0) {
} }
} }
static void fn_1_10AE8(omObjData *arg0) { static void fn_1_10AE8(omObjData *arg0)
{
float *temp_r31; float *temp_r31;
temp_r31 = arg0->data; temp_r31 = arg0->data;
@ -772,7 +787,8 @@ static void fn_1_10AE8(omObjData *arg0) {
omSetSca(arg0, temp_r31[0], temp_r31[0], temp_r31[0]); omSetSca(arg0, temp_r31[0], temp_r31[0], temp_r31[0]);
} }
static float fn_1_10BB0(u32 arg0) { static float fn_1_10BB0(u32 arg0)
{
float var_f30; float var_f30;
float temp_f29; float temp_f29;
float var_f31; float var_f31;
@ -793,7 +809,8 @@ static float fn_1_10BB0(u32 arg0) {
return var_f31; return var_f31;
} }
static void fn_1_10CF0(u32 arg0) { static void fn_1_10CF0(u32 arg0)
{
float var_f30; float var_f30;
float temp_f29; float temp_f29;
float var_f31; float var_f31;
@ -818,28 +835,32 @@ static void fn_1_10CF0(u32 arg0) {
BoardPlayerRotSet(lbl_1_bss_7E4, 0.0f, var_f28, 0.0f); BoardPlayerRotSet(lbl_1_bss_7E4, 0.0f, var_f28, 0.0f);
} }
static float fn_1_10EB8(Vec *arg0) { static float fn_1_10EB8(Vec *arg0)
{
float var_f31; float var_f31;
if (arg0->x || arg0->z) { if (arg0->x || arg0->z) {
if (arg0->x == 0.0f) { if (arg0->x == 0.0f) {
if (arg0->z > 0.0f) { if (arg0->z > 0.0f) {
return 0.0f; return 0.0f;
} else { }
else {
return 180.0f; return 180.0f;
} }
} }
if (arg0->z == 0.0f) { if (arg0->z == 0.0f) {
if (arg0->x > 0.0f) { if (arg0->x > 0.0f) {
return 90.0f; return 90.0f;
} else { }
else {
return 270.0f; return 270.0f;
} }
} }
var_f31 = atan2d(arg0->z, arg0->x); var_f31 = atan2d(arg0->z, arg0->x);
if (arg0->z < 0.0f) { if (arg0->z < 0.0f) {
var_f31 = 90.0f - var_f31; var_f31 = 90.0f - var_f31;
} else { }
else {
var_f31 = 90.0f - var_f31; var_f31 = 90.0f - var_f31;
if (var_f31 < 0.0f) { if (var_f31 < 0.0f) {
var_f31 += 360.0f; var_f31 += 360.0f;
@ -850,7 +871,8 @@ static float fn_1_10EB8(Vec *arg0) {
return -1.0f; return -1.0f;
} }
static void fn_1_11064(ModelData *model, ParticleData *particle, Mtx matrix) { static void fn_1_11064(ModelData *model, ParticleData *particle, Mtx matrix)
{
HsfanimStruct01 *var_r31; HsfanimStruct01 *var_r31;
float temp_f30; float temp_f30;
float temp_f29; float temp_f29;
@ -898,7 +920,8 @@ static void fn_1_11064(ModelData *model, ParticleData *particle, Mtx matrix) {
} }
} }
static void fn_1_11484(ModelData *model, ParticleData *particle, Mtx matrix) { static void fn_1_11484(ModelData *model, ParticleData *particle, Mtx matrix)
{
HsfanimStruct01 *var_r31; HsfanimStruct01 *var_r31;
float temp_f29; float temp_f29;
float temp_f30; float temp_f30;

201
src/REL/w04Dll/boo_event.c
View file

@ -1,6 +1,14 @@
#include "REL/w04Dll.h" #include "REL/w04Dll.h"
#include "game/audio.h" #include "game/audio.h"
#include "game/board/audio.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/board/player.h"
#include "game/board/space.h"
#include "game/board/ui.h"
#include "game/board/window.h"
#include "game/data.h" #include "game/data.h"
#include "game/frand.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "game/hsfanim.h" #include "game/hsfanim.h"
#include "game/hsfdraw.h" #include "game/hsfdraw.h"
@ -12,14 +20,6 @@
#include "game/process.h" #include "game/process.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/window.h" #include "game/window.h"
#include "game/board/audio.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/board/player.h"
#include "game/board/space.h"
#include "game/board/ui.h"
#include "game/board/window.h"
#include "game/frand.h"
#include "dolphin.h" #include "dolphin.h"
#include "ext_math.h" #include "ext_math.h"
@ -94,50 +94,25 @@ static s16 lbl_1_bss_50;
static AnimData *lbl_1_bss_4C; static AnimData *lbl_1_bss_4C;
static Process *lbl_1_bss_48; static Process *lbl_1_bss_48;
static s32 lbl_1_data_2D0[8] = { static s32 lbl_1_data_2D0[8] = { DATADIR_MARIOMOT, DATADIR_LUIGIMOT, DATADIR_PEACHMOT, DATADIR_YOSHIMOT, DATADIR_WARIOMOT, DATADIR_DONKEYMOT,
DATADIR_MARIOMOT, DATADIR_DAISYMOT, DATADIR_WALUIGIMOT };
DATADIR_LUIGIMOT,
DATADIR_PEACHMOT,
DATADIR_YOSHIMOT,
DATADIR_WARIOMOT,
DATADIR_DONKEYMOT,
DATADIR_DAISYMOT,
DATADIR_WALUIGIMOT
};
static s32 lbl_1_data_2F0 = 28; static s32 lbl_1_data_2F0 = 28;
static s32 lbl_1_data_2F4[8] = { static s32 lbl_1_data_2F4[8]
DATA_MAKE_NUM(DATADIR_W04, 35), = { DATA_MAKE_NUM(DATADIR_W04, 35), DATA_MAKE_NUM(DATADIR_W04, 36), DATA_MAKE_NUM(DATADIR_W04, 37), DATA_MAKE_NUM(DATADIR_W04, 38),
DATA_MAKE_NUM(DATADIR_W04, 36), DATA_MAKE_NUM(DATADIR_W04, 39), DATA_MAKE_NUM(DATADIR_W04, 40), DATA_MAKE_NUM(DATADIR_W04, 41), DATA_MAKE_NUM(DATADIR_W04, 42) };
DATA_MAKE_NUM(DATADIR_W04, 37),
DATA_MAKE_NUM(DATADIR_W04, 38),
DATA_MAKE_NUM(DATADIR_W04, 39),
DATA_MAKE_NUM(DATADIR_W04, 40),
DATA_MAKE_NUM(DATADIR_W04, 41),
DATA_MAKE_NUM(DATADIR_W04, 42)
};
static s32 lbl_1_data_314[8] = { static s32 lbl_1_data_314[8]
DATA_MAKE_NUM(DATADIR_W04, 43), = { DATA_MAKE_NUM(DATADIR_W04, 43), DATA_MAKE_NUM(DATADIR_W04, 44), DATA_MAKE_NUM(DATADIR_W04, 45), DATA_MAKE_NUM(DATADIR_W04, 46),
DATA_MAKE_NUM(DATADIR_W04, 44), DATA_MAKE_NUM(DATADIR_W04, 47), DATA_MAKE_NUM(DATADIR_W04, 48), DATA_MAKE_NUM(DATADIR_W04, 49), DATA_MAKE_NUM(DATADIR_W04, 50) };
DATA_MAKE_NUM(DATADIR_W04, 45),
DATA_MAKE_NUM(DATADIR_W04, 46),
DATA_MAKE_NUM(DATADIR_W04, 47),
DATA_MAKE_NUM(DATADIR_W04, 48),
DATA_MAKE_NUM(DATADIR_W04, 49),
DATA_MAKE_NUM(DATADIR_W04, 50)
};
static char *lbl_1_data_348[] = { static char *lbl_1_data_348[] = { "kan1", "kan2", "kan3", "kan4" };
"kan1", "kan2", "kan3", "kan4"
};
static float lbl_1_data_358[] = { static float lbl_1_data_358[] = { -150.00001f, -170.00001f, -30.0f, -220.0f };
-150.00001f, -170.00001f, -30.0f, -220.0f
};
static void fn_1_20EC(void) { static void fn_1_20EC(void)
{
Vec sp20; Vec sp20;
Vec sp14; Vec sp14;
Vec sp8; Vec sp8;
@ -258,7 +233,8 @@ static void fn_1_20EC(void) {
HuPrcEnd(); HuPrcEnd();
} }
static void fn_1_28BC(void) { static void fn_1_28BC(void)
{
Vec sp20; Vec sp20;
Vec sp14; Vec sp14;
Vec sp8; Vec sp8;
@ -273,7 +249,7 @@ static void fn_1_28BC(void) {
var_r27 = HuPrcChildCreate(fn_1_45A8, 0x2001, 0x800, 0, boardMainProc); var_r27 = HuPrcChildCreate(fn_1_45A8, 0x2001, 0x800, 0, boardMainProc);
HuPrcDestructorSet2(var_r27, fn_1_4630); HuPrcDestructorSet2(var_r27, fn_1_4630);
var_r26 = (float*) &var_r27->user_data; var_r26 = (float *)&var_r27->user_data;
lbl_1_bss_C2 = fn_1_4680(lbl_1_bss_78); lbl_1_bss_C2 = fn_1_4680(lbl_1_bss_78);
var_r29 = 0; var_r29 = 0;
while (var_r29 == 0) { while (var_r29 == 0) {
@ -318,7 +294,8 @@ static void fn_1_28BC(void) {
} }
} }
static void fn_1_2B8C(void) { static void fn_1_2B8C(void)
{
s32 i; s32 i;
while (fn_1_2F54(4) == 0 || lbl_1_bss_7C != 0) { while (fn_1_2F54(4) == 0 || lbl_1_bss_7C != 0) {
@ -331,7 +308,8 @@ static void fn_1_2B8C(void) {
} }
} }
static void fn_1_2C10(void) { static void fn_1_2C10(void)
{
Vec sp8; Vec sp8;
BssE4Data *temp_r31; BssE4Data *temp_r31;
s32 i; s32 i;
@ -356,8 +334,9 @@ static void fn_1_2C10(void) {
temp_r31->unk0C = 0; temp_r31->unk0C = 0;
if (i == 0) { if (i == 0) {
temp_r31->unk0A = lbl_1_bss_FA; temp_r31->unk0A = lbl_1_bss_FA;
} else { }
temp_r31->unk0A = ((BssE4Data*) lbl_1_bss_E4[i - 1]->user_data)->unk04; else {
temp_r31->unk0A = ((BssE4Data *)lbl_1_bss_E4[i - 1]->user_data)->unk04;
} }
lbl_1_bss_E4[i] = HuPrcChildCreate(fn_1_30A4, 0x2003, 0x1000, 0, boardMainProc); lbl_1_bss_E4[i] = HuPrcChildCreate(fn_1_30A4, 0x2003, 0x1000, 0, boardMainProc);
lbl_1_bss_E4[i]->user_data = temp_r31; lbl_1_bss_E4[i]->user_data = temp_r31;
@ -366,7 +345,8 @@ static void fn_1_2C10(void) {
} }
} }
static void fn_1_2E60(s16 arg0) { static void fn_1_2E60(s16 arg0)
{
BssE4Data *temp_r3; BssE4Data *temp_r3;
temp_r3 = fn_1_2FBC(arg0); temp_r3 = fn_1_2FBC(arg0);
@ -376,7 +356,8 @@ static void fn_1_2E60(s16 arg0) {
HuMemDirectFree(lbl_1_bss_E4[arg0]->user_data); HuMemDirectFree(lbl_1_bss_E4[arg0]->user_data);
} }
static void fn_1_2EE8(s32 arg0) { static void fn_1_2EE8(s32 arg0)
{
s32 i; s32 i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -386,7 +367,8 @@ static void fn_1_2EE8(s32 arg0) {
} }
} }
static s32 fn_1_2F54(u32 arg0) { static s32 fn_1_2F54(u32 arg0)
{
s32 i; s32 i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -396,16 +378,19 @@ static s32 fn_1_2F54(u32 arg0) {
} }
if (i != 4) { if (i != 4) {
return 0; return 0;
} else { }
else {
return 1; return 1;
} }
} }
static BssE4Data *fn_1_2FBC(s16 arg0) { static BssE4Data *fn_1_2FBC(s16 arg0)
{
return lbl_1_bss_E4[arg0]->user_data; return lbl_1_bss_E4[arg0]->user_data;
} }
static void fn_1_2FDC(void) { static void fn_1_2FDC(void)
{
Vec sp8; Vec sp8;
BssE4Data *temp_r31; BssE4Data *temp_r31;
@ -423,7 +408,8 @@ static void fn_1_2FDC(void) {
} }
} }
static void fn_1_30A4(void) { static void fn_1_30A4(void)
{
Vec sp20; Vec sp20;
Vec sp14; Vec sp14;
float temp_f31; float temp_f31;
@ -451,7 +437,8 @@ static void fn_1_30A4(void) {
if (temp_r31->unk06 == 0) { if (temp_r31->unk06 == 0) {
BoardPlayerPosGet(GWSystem.player_curr, &temp_r31->unk20); BoardPlayerPosGet(GWSystem.player_curr, &temp_r31->unk20);
temp_r31->unk20.y += 65.0f; temp_r31->unk20.y += 65.0f;
} else { }
else {
temp_r31->unk20 = fn_1_2FBC(temp_r31->unk06 - 1)->unk20; temp_r31->unk20 = fn_1_2FBC(temp_r31->unk06 - 1)->unk20;
temp_r31->unk20.z -= 300.0f; temp_r31->unk20.z -= 300.0f;
} }
@ -513,7 +500,8 @@ static void fn_1_30A4(void) {
} }
if (temp_r31->unk06 == 0) { if (temp_r31->unk06 == 0) {
BoardModelPosGet(lbl_1_bss_FA, &temp_r31->unk20); BoardModelPosGet(lbl_1_bss_FA, &temp_r31->unk20);
} else { }
else {
BoardModelPosGet(fn_1_2FBC(temp_r31->unk06 - 1)->unk04, &temp_r31->unk20); BoardModelPosGet(fn_1_2FBC(temp_r31->unk06 - 1)->unk04, &temp_r31->unk20);
} }
temp_r31->unk00 = 0; temp_r31->unk00 = 0;
@ -565,7 +553,8 @@ static void fn_1_30A4(void) {
temp_r31->unk0E = temp_r31->unk0C; temp_r31->unk0E = temp_r31->unk0C;
if (temp_r31->unk06 == 0) { if (temp_r31->unk06 == 0) {
temp_r31->unk0C = lbl_1_bss_74; temp_r31->unk0C = lbl_1_bss_74;
} else { }
else {
temp_r31->unk0C = fn_1_2FBC(temp_r31->unk06 - 1)->unk0E; temp_r31->unk0C = fn_1_2FBC(temp_r31->unk06 - 1)->unk0E;
} }
BoardModelPosSetV(temp_r31->unk04, &temp_r31->unk20); BoardModelPosSetV(temp_r31->unk04, &temp_r31->unk20);
@ -574,14 +563,16 @@ static void fn_1_30A4(void) {
} }
if (temp_r31->unk06 == 0) { if (temp_r31->unk06 == 0) {
BoardModelPosGet(lbl_1_bss_FA, &temp_r31->unk20); BoardModelPosGet(lbl_1_bss_FA, &temp_r31->unk20);
} else { }
else {
BoardModelPosGet(fn_1_2FBC(temp_r31->unk06 - 1)->unk04, &temp_r31->unk20); BoardModelPosGet(fn_1_2FBC(temp_r31->unk06 - 1)->unk04, &temp_r31->unk20);
} }
if (var_r29 != 0) { if (var_r29 != 0) {
BoardModelVisibilitySet(temp_r31->unk04, 0); BoardModelVisibilitySet(temp_r31->unk04, 0);
temp_r31->unk02 = 0; temp_r31->unk02 = 0;
temp_r31->unk00 = 4; temp_r31->unk00 = 4;
} else { }
else {
temp_r31->unk00 = 0; temp_r31->unk00 = 0;
} }
break; break;
@ -590,7 +581,8 @@ static void fn_1_30A4(void) {
} }
} }
static void fn_1_38D8(void) { static void fn_1_38D8(void)
{
Vec sp24; Vec sp24;
Vec sp18; Vec sp18;
Vec spC; Vec spC;
@ -640,7 +632,8 @@ static void fn_1_38D8(void) {
HuPrcEnd(); HuPrcEnd();
} }
static s32 fn_1_3C9C(void) { static s32 fn_1_3C9C(void)
{
Vec sp50; Vec sp50;
Vec sp44; Vec sp44;
Vec sp38; Vec sp38;
@ -731,17 +724,20 @@ static s32 fn_1_3C9C(void) {
var_r19 = 0; var_r19 = 0;
if (var_r21 != 0) { if (var_r21 != 0) {
var_r21--; var_r21--;
} else { }
else {
var_r21 = frandmod(10) + 15; var_r21 = frandmod(10) + 15;
if (frandBool() || var_r18 == 3) { if (frandBool() || var_r18 == 3) {
var_r19 = 0x100; var_r19 = 0x100;
} else { }
else {
OSReport("com sel chg: %d \n", var_r29); OSReport("com sel chg: %d \n", var_r29);
var_r18++; var_r18++;
var_r23 = frandmod(var_r29); var_r23 = frandmod(var_r29);
} }
} }
} else { }
else {
var_r26 = HuPadStkX[temp_r20]; var_r26 = HuPadStkX[temp_r20];
var_r25 = HuPadStkY[temp_r20]; var_r25 = HuPadStkY[temp_r20];
var_r19 = HuPadBtnDown[temp_r20]; var_r19 = HuPadBtnDown[temp_r20];
@ -783,7 +779,8 @@ static s32 fn_1_3C9C(void) {
if (var_f31 > 180.0f) { if (var_f31 > 180.0f) {
var_f31 -= 180.0f; var_f31 -= 180.0f;
} }
} else { }
else {
sp38.x = sp38.y = sp38.z = 1.8f; sp38.x = sp38.y = sp38.z = 1.8f;
} }
BoardModelScaleSetV(lbl_1_bss_F4[i], &sp38); BoardModelScaleSetV(lbl_1_bss_F4[i], &sp38);
@ -798,7 +795,8 @@ static s32 fn_1_3C9C(void) {
var_r24 = sp20[var_r27]; var_r24 = sp20[var_r27];
lbl_1_bss_70 = sp18[var_r27]; lbl_1_bss_70 = sp18[var_r27];
lbl_1_bss_C2 = fn_1_4680(var_r24); lbl_1_bss_C2 = fn_1_4680(var_r24);
} else if (lbl_1_bss_70 != 0) { }
else if (lbl_1_bss_70 != 0) {
i = BoardSpaceLinkTargetListGet(0, lbl_1_bss_78, sp10); i = BoardSpaceLinkTargetListGet(0, lbl_1_bss_78, sp10);
for (i--; i >= 0; i--) { for (i--; i >= 0; i--) {
var_r28 = BoardSpaceGet(0, sp10[i]); var_r28 = BoardSpaceGet(0, sp10[i]);
@ -807,7 +805,8 @@ static s32 fn_1_3C9C(void) {
} }
} }
var_r24 = sp10[i]; var_r24 = sp10[i];
} else { }
else {
for (i = 0; i < temp_r30->link_cnt; i++) { for (i = 0; i < temp_r30->link_cnt; i++) {
var_r28 = BoardSpaceGet(0, temp_r30->link[i]); var_r28 = BoardSpaceGet(0, temp_r30->link[i]);
if (var_r28->flag & 0x200) { if (var_r28->flag & 0x200) {
@ -819,12 +818,13 @@ static s32 fn_1_3C9C(void) {
return var_r24; return var_r24;
} }
static void fn_1_45A8(void) { static void fn_1_45A8(void)
{
float *temp_r30; float *temp_r30;
s32 var_r31; s32 var_r31;
var_r31 = 15; var_r31 = 15;
temp_r30 = (float*) &HuPrcCurrentGet()->user_data; temp_r30 = (float *)&HuPrcCurrentGet()->user_data;
while (TRUE) { while (TRUE) {
if (var_r31 == 0) { if (var_r31 == 0) {
BoardCameraMoveSet(0); BoardCameraMoveSet(0);
@ -842,7 +842,8 @@ static void fn_1_45A8(void) {
} }
} }
static void fn_1_4630(void) { static void fn_1_4630(void)
{
BoardCameraMoveSet(0); BoardCameraMoveSet(0);
BoardCameraTargetPlayerSet(GWSystem.player_curr); BoardCameraTargetPlayerSet(GWSystem.player_curr);
BoardCameraViewSet(2); BoardCameraViewSet(2);
@ -850,7 +851,8 @@ static void fn_1_4630(void) {
BoardCameraMoveSet(1); BoardCameraMoveSet(1);
} }
static s32 fn_1_4680(s16 arg0) { static s32 fn_1_4680(s16 arg0)
{
BoardSpace *var_r30; BoardSpace *var_r30;
BoardSpace *var_r29; BoardSpace *var_r29;
s16 sp8[4]; s16 sp8[4];
@ -880,7 +882,8 @@ static s32 fn_1_4680(s16 arg0) {
} }
} }
arg0 = sp8[i]; arg0 = sp8[i];
} else { }
else {
for (i = 0; i < var_r30->link_cnt; i++) { for (i = 0; i < var_r30->link_cnt; i++) {
var_r29 = BoardSpaceGet(0, var_r30->link[i]); var_r29 = BoardSpaceGet(0, var_r30->link[i]);
if (var_r29->flag & 0x200) { if (var_r29->flag & 0x200) {
@ -897,7 +900,8 @@ static s32 fn_1_4680(s16 arg0) {
return var_r27; return var_r27;
} }
static void fn_1_4848(void) { static void fn_1_4848(void)
{
Vec sp20; Vec sp20;
Vec sp14; Vec sp14;
float temp_f28; float temp_f28;
@ -905,7 +909,7 @@ static void fn_1_4848(void) {
s32 temp_r30; s32 temp_r30;
s32 i; s32 i;
temp_r30 = (s32) HuPrcCurrentGet()->user_data; temp_r30 = (s32)HuPrcCurrentGet()->user_data;
BoardPlayerPosGet(temp_r30, &sp20); BoardPlayerPosGet(temp_r30, &sp20);
BoardPlayerMotBlendSet(temp_r30, BoardModelRotYGet(lbl_1_bss_FA) - 180.0f, 0xA); BoardPlayerMotBlendSet(temp_r30, BoardModelRotYGet(lbl_1_bss_FA) - 180.0f, 0xA);
while (!BoardPlayerMotBlendCheck(temp_r30)) { while (!BoardPlayerMotBlendCheck(temp_r30)) {
@ -981,7 +985,8 @@ block_A:
HuPrcEnd(); HuPrcEnd();
} }
static void fn_1_5018(void) { static void fn_1_5018(void)
{
Vec sp18; Vec sp18;
Vec spC; Vec spC;
float var_f29; float var_f29;
@ -995,13 +1000,14 @@ static void fn_1_5018(void) {
if (var_f29 < 900.0f && lbl_1_bss_B2[lbl_1_bss_BA[i]] == 0) { if (var_f29 < 900.0f && lbl_1_bss_B2[lbl_1_bss_BA[i]] == 0) {
temp_r3 = HuPrcChildCreate(fn_1_4848, 0x2003, 0x2000, 0, boardMainProc); temp_r3 = HuPrcChildCreate(fn_1_4848, 0x2003, 0x2000, 0, boardMainProc);
lbl_1_bss_D4[lbl_1_bss_BA[i]] = temp_r3; lbl_1_bss_D4[lbl_1_bss_BA[i]] = temp_r3;
temp_r3->user_data = (u8*) lbl_1_bss_BA[i]; temp_r3->user_data = (u8 *)lbl_1_bss_BA[i];
lbl_1_bss_B2[lbl_1_bss_BA[i]] = 1; lbl_1_bss_B2[lbl_1_bss_BA[i]] = 1;
} }
} }
} }
static void fn_1_52A0(s16 arg0, Vec *arg1) { static void fn_1_52A0(s16 arg0, Vec *arg1)
{
Vec sp40[4]; Vec sp40[4];
Vec sp10[4]; Vec sp10[4];
BssE4Data *var_r30; BssE4Data *var_r30;
@ -1060,11 +1066,13 @@ static void fn_1_52A0(s16 arg0, Vec *arg1) {
BoardSpacePosGet(0, lbl_1_bss_B0, &arg1[GWSystem.player_curr]); BoardSpacePosGet(0, lbl_1_bss_B0, &arg1[GWSystem.player_curr]);
} }
static void fn_1_55A0(void) { static void fn_1_55A0(void)
{
lbl_1_bss_48 = NULL; lbl_1_bss_48 = NULL;
} }
void fn_1_55B4(void) { void fn_1_55B4(void)
{
s32 sp8; s32 sp8;
sp8 = GWSystem.player_curr; sp8 = GWSystem.player_curr;
@ -1075,7 +1083,8 @@ void fn_1_55B4(void) {
} }
} }
static void fn_1_5648(void) { static void fn_1_5648(void)
{
ParticleData *var_r30; ParticleData *var_r30;
s32 i; s32 i;
@ -1087,13 +1096,14 @@ static void fn_1_5648(void) {
Hu3DParticleScaleSet(lbl_1_bss_C4[i]->model[0], 5.0f); Hu3DParticleScaleSet(lbl_1_bss_C4[i]->model[0], 5.0f);
Hu3DParticleHookSet(lbl_1_bss_C4[i]->model[0], fn_1_5A2C); Hu3DParticleHookSet(lbl_1_bss_C4[i]->model[0], fn_1_5A2C);
Hu3DParticleBlendModeSet(lbl_1_bss_C4[i]->model[0], 1); Hu3DParticleBlendModeSet(lbl_1_bss_C4[i]->model[0], 1);
Hu3DModelAttrSet(lbl_1_bss_C4[i]->model[0], 1); Hu3DModelAttrSet(lbl_1_bss_C4[i]->model[0], HU3D_ATTR_DISPOFF);
var_r30 = Hu3DData[lbl_1_bss_C4[i]->model[0]].unk_120; var_r30 = Hu3DData[lbl_1_bss_C4[i]->model[0]].unk_120;
var_r30->unk_1C = lbl_1_bss_C4[i]; var_r30->unk_1C = lbl_1_bss_C4[i];
} }
} }
static void fn_1_5828(void) { static void fn_1_5828(void)
{
s32 i; s32 i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -1102,7 +1112,8 @@ static void fn_1_5828(void) {
} }
} }
static s16 fn_1_58A4(Vec *arg0) { static s16 fn_1_58A4(Vec *arg0)
{
s16 i; s16 i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -1117,22 +1128,25 @@ static s16 fn_1_58A4(Vec *arg0) {
return -1; return -1;
} }
static void fn_1_5980(s16 arg0) { static void fn_1_5980(s16 arg0)
{
lbl_1_bss_C4[arg0]->work[1] = 1; lbl_1_bss_C4[arg0]->work[1] = 1;
lbl_1_bss_C4[arg0]->work[2] = 0; lbl_1_bss_C4[arg0]->work[2] = 0;
} }
static void fn_1_59C4(omObjData *arg0) { static void fn_1_59C4(omObjData *arg0)
{
if (arg0->work[0] != 0) { if (arg0->work[0] != 0) {
Hu3DModelAttrReset(arg0->model[0], 1); Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF);
} }
if (arg0->work[2] != 0) { if (arg0->work[2] != 0) {
arg0->work[0] = 0; arg0->work[0] = 0;
Hu3DModelAttrSet(arg0->model[0], 1); Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF);
} }
} }
static void fn_1_5A2C(ModelData *model, ParticleData *particle, Mtx matrix) { static void fn_1_5A2C(ModelData *model, ParticleData *particle, Mtx matrix)
{
s32 var_r26; s32 var_r26;
s32 i; s32 i;
s32 j; s32 j;
@ -1188,7 +1202,8 @@ static void fn_1_5A2C(ModelData *model, ParticleData *particle, Mtx matrix) {
if (var_r31->unk08.z <= 0.0f) { if (var_r31->unk08.z <= 0.0f) {
var_r31->unk08.z = 0.0f; var_r31->unk08.z = 0.0f;
} }
} else { }
else {
var_r26++; var_r26++;
} }
} }

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

@ -435,7 +435,7 @@ void fn_1_1774(void)
lbl_1_bss_3E[0] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 1)); lbl_1_bss_3E[0] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 1));
lbl_1_bss_3E[1] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 2)); lbl_1_bss_3E[1] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 2));
Hu3DMotionSet(lbl_1_bss_42, lbl_1_bss_3E[0]); Hu3DMotionSet(lbl_1_bss_42, lbl_1_bss_3E[0]);
Hu3DModelAttrSet(lbl_1_bss_42, 0x40000001); Hu3DModelAttrSet(lbl_1_bss_42, HU3D_MOTATTR_LOOP);
Hu3DModelPosSet(lbl_1_bss_42, 0.0f, 1000.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_42, 0.0f, 1000.0f, 0.0f);
lbl_1_bss_8 = HuPrcChildCreate(fn_1_1CF0, 0x64, 0x2000, 0, lbl_1_bss_68); lbl_1_bss_8 = HuPrcChildCreate(fn_1_1CF0, 0x64, 0x2000, 0, lbl_1_bss_68);
} }
@ -802,7 +802,7 @@ void fn_1_33B0(void)
lbl_1_bss_42 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_ZTAR, 0)); lbl_1_bss_42 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_ZTAR, 0));
lbl_1_bss_3E[0] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 1)); lbl_1_bss_3E[0] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 1));
lbl_1_bss_3E[1] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 2)); lbl_1_bss_3E[1] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 2));
Hu3DModelAttrSet(lbl_1_bss_42, 0x40000001); Hu3DModelAttrSet(lbl_1_bss_42, HU3D_MOTATTR_LOOP);
Hu3DModelPosSetV(lbl_1_bss_42, &sp2C); Hu3DModelPosSetV(lbl_1_bss_42, &sp2C);
Hu3DModelRotSet(lbl_1_bss_42, 0.0f, -10.0f, -15.0f); Hu3DModelRotSet(lbl_1_bss_42, 0.0f, -10.0f, -15.0f);
Hu3DMotionSet(lbl_1_bss_42, lbl_1_bss_3E[0]); Hu3DMotionSet(lbl_1_bss_42, lbl_1_bss_3E[0]);
@ -845,7 +845,7 @@ void fn_1_33B0(void)
Hu3DModelScaleSet(lbl_1_bss_36[var_r31], 0.8f, 0.8f, 0.8f); Hu3DModelScaleSet(lbl_1_bss_36[var_r31], 0.8f, 0.8f, 0.8f);
} }
Hu3DMotionSet(lbl_1_bss_36[var_r31], lbl_1_bss_E[var_r31][0]); Hu3DMotionSet(lbl_1_bss_36[var_r31], lbl_1_bss_E[var_r31][0]);
Hu3DModelAttrSet(lbl_1_bss_36[var_r31], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_36[var_r31], HU3D_MOTATTR_LOOP);
Hu3DModelPosSet(lbl_1_bss_36[var_r31], var_r26, 0.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_36[var_r31], var_r26, 0.0f, 0.0f);
Hu3DModelShadowSet(lbl_1_bss_36[var_r31]); Hu3DModelShadowSet(lbl_1_bss_36[var_r31]);
var_r26 += 0x96; var_r26 += 0x96;
@ -1048,7 +1048,7 @@ void fn_1_4948(void)
lbl_1_bss_42 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_ZTAR, 0)); lbl_1_bss_42 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_ZTAR, 0));
lbl_1_bss_3E[0] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 1)); lbl_1_bss_3E[0] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 1));
lbl_1_bss_3E[1] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 2)); lbl_1_bss_3E[1] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 2));
Hu3DModelAttrSet(lbl_1_bss_42, 0x40000001); Hu3DModelAttrSet(lbl_1_bss_42, HU3D_MOTATTR_LOOP);
Hu3DModelPosSetV(lbl_1_bss_42, &sp2C); Hu3DModelPosSetV(lbl_1_bss_42, &sp2C);
Hu3DModelRotSet(lbl_1_bss_42, 0.0f, -10.0f, -15.0f); Hu3DModelRotSet(lbl_1_bss_42, 0.0f, -10.0f, -15.0f);
Hu3DMotionSet(lbl_1_bss_42, lbl_1_bss_3E[0]); Hu3DMotionSet(lbl_1_bss_42, lbl_1_bss_3E[0]);
@ -1073,7 +1073,7 @@ void fn_1_4948(void)
Hu3DModelScaleSet(lbl_1_bss_36[var_r31], 0.8f, 0.8f, 0.8f); Hu3DModelScaleSet(lbl_1_bss_36[var_r31], 0.8f, 0.8f, 0.8f);
} }
Hu3DMotionSet(lbl_1_bss_36[var_r31], lbl_1_bss_E[var_r31][0]); Hu3DMotionSet(lbl_1_bss_36[var_r31], lbl_1_bss_E[var_r31][0]);
Hu3DModelAttrSet(lbl_1_bss_36[var_r31], 0x40000001); Hu3DModelAttrSet(lbl_1_bss_36[var_r31], HU3D_MOTATTR_LOOP);
Hu3DModelPosSet(lbl_1_bss_36[var_r31], var_r28, 0.0f, 0.0f); Hu3DModelPosSet(lbl_1_bss_36[var_r31], var_r28, 0.0f, 0.0f);
Hu3DModelShadowSet(lbl_1_bss_36[var_r31]); Hu3DModelShadowSet(lbl_1_bss_36[var_r31]);
var_r28 += 0x96; var_r28 += 0x96;

545
src/game/board/item.c
View file

File diff suppressed because it is too large Load diff

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

@ -833,7 +833,7 @@ static void LotteryInlineFunc00(s32 arg0, s32 arg1) {
temp_f30 = 4.0f; temp_f30 = 4.0f;
if (lotterySpr == -1) { if (lotterySpr == -1) {
lotterySpr = espEntry(sp20[arg0], 30001, 0); lotterySpr = espEntry(sp20[arg0], 30001, 0);
espAttrSet(lotterySpr, 1); espAttrSet(lotterySpr, HUSPR_ATTR_NOANIM);
} }
} else { } else {
sp34.y = (sp10[arg0] / 2) + 40; sp34.y = (sp10[arg0] / 2) + 40;

1813
src/game/board/model.c
View file

File diff suppressed because it is too large Load diff

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

@ -13,10 +13,11 @@
#include "game/board/ui.h" #include "game/board/ui.h"
#include "game/board/view.h" #include "game/board/view.h"
#include "game/chrman.h" #include "game/chrman.h"
#include "game/disp.h"
#include "game/hsfman.h" #include "game/hsfman.h"
#include "game/objsub.h" #include "game/objsub.h"
#include "game/pad.h" #include "game/pad.h"
#include "game/disp.h"
#include "math.h" #include "math.h"
#include "stdlib.h" #include "stdlib.h"
@ -2133,7 +2134,7 @@ static void UpdateRollSprite(omObjData *arg0)
{ {
Vec sp1C; Vec sp1C;
s32 sp14[2]; s32 sp14[2];
f32 spC[2] = { HU_DISP_CENTERX+32, HU_DISP_CENTERX-32 }; f32 spC[2] = { HU_DISP_CENTERX + 32, HU_DISP_CENTERX - 32 };
s32 var_r30; s32 var_r30;
s32 temp_r29; s32 temp_r29;
bitcopy3 *temp_r31; bitcopy3 *temp_r31;
@ -2155,10 +2156,11 @@ static void UpdateRollSprite(omObjData *arg0)
else { else {
if ((sp14[1] == 0) && (var_r30 == 0)) { if ((sp14[1] == 0) && (var_r30 == 0)) {
sp1C.x = HU_DISP_CENTERX; sp1C.x = HU_DISP_CENTERX;
} else { }
else {
sp1C.x = spC[var_r30]; sp1C.x = spC[var_r30];
} }
sp1C.y = (HU_DISP_HEIGHTF*176)/480; sp1C.y = (HU_DISP_HEIGHTF * 176) / 480;
HuSprAttrReset(temp_r31->unk_04, var_r30, 4); HuSprAttrReset(temp_r31->unk_04, var_r30, 4);
HuSprBankSet(temp_r31->unk_04, var_r30, sp14[var_r30]); HuSprBankSet(temp_r31->unk_04, var_r30, sp14[var_r30]);
HuSprPosSet(temp_r31->unk_04, var_r30, sp1C.x, sp1C.y); HuSprPosSet(temp_r31->unk_04, var_r30, sp1C.x, sp1C.y);
@ -2681,7 +2683,7 @@ void BoardPlayerResizeAnimExec(s32 player, s32 size)
frame_data[8] = steps[3]; frame_data[8] = steps[3];
model = BoardPlayerModelGet(player); model = BoardPlayerModelGet(player);
modelid = BoardModelIDGet(model); modelid = BoardModelIDGet(model);
Hu3DModelAttrSet(modelid, 0x40000002); Hu3DModelAttrSet(modelid, HU3D_MOTATTR_PAUSE);
frame = 0; frame = 0;
for (j = 0; j < 9; j++) { for (j = 0; j < 9; j++) {
float size_vel; float size_vel;

252
src/game/board/roll.c
View file

@ -1,17 +1,17 @@
#include "game/board/roll.h" #include "game/board/roll.h"
#include "game/audio.h" #include "game/audio.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/object.h"
#include "game/pad.h"
#include "game/disp.h"
#include "game/process.h"
#include "game/window.h"
#include "game/board/main.h" #include "game/board/main.h"
#include "game/board/model.h" #include "game/board/model.h"
#include "game/board/pause.h" #include "game/board/pause.h"
#include "game/board/player.h" #include "game/board/player.h"
#include "game/board/tutorial.h" #include "game/board/tutorial.h"
#include "game/disp.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/object.h"
#include "game/pad.h"
#include "game/process.h"
#include "game/window.h"
#include "ext_math.h" #include "ext_math.h"
@ -42,7 +42,6 @@ typedef struct {
float unk08; float unk08;
} DiceDigitWork; } DiceDigitWork;
static void RollMain(void); static void RollMain(void);
static void DiceCreate(s32 arg0); static void DiceCreate(s32 arg0);
static void DoInput(s32 arg0); static void DoInput(s32 arg0);
@ -84,46 +83,17 @@ static omObjData *diceObj[3] = { NULL, NULL, NULL };
static omObjData *diceDigitObj[3] = { NULL, NULL, NULL }; static omObjData *diceDigitObj[3] = { NULL, NULL, NULL };
static s32 diceSndStatus[3] = { -1, -1, -1 }; static s32 diceSndStatus[3] = { -1, -1, -1 };
static HsfanimStruct00 diceEffParam = { static HsfanimStruct00 diceEffParam = { 0x0096, { 0x00, 0x00 }, // padding?
0x0096, 50.0f, 0.0f, 65.0f, { 0.0f, -0.195f, 0.0f }, 100.0f, 0.99f, 40.0f, 0.999f, 0x0004,
{ 0x00, 0x00 }, // padding? { { 0xFF, 0xFF, 0x20, 0xFF }, { 0xFF, 0xFF, 0x00, 0xFF }, { 0xFF, 0xFF, 0x80, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF } },
50.0f, { { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 } } };
0.0f,
65.0f,
{ 0.0f, -0.195f, 0.0f },
100.0f,
0.99f,
40.0f,
0.999f,
0x0004,
{
{ 0xFF, 0xFF, 0x20, 0xFF },
{ 0xFF, 0xFF, 0x00, 0xFF },
{ 0xFF, 0xFF, 0x80, 0xFF },
{ 0xFF, 0xFF, 0xFF, 0xFF }
},
{
{ 0xFF, 0xFF, 0xFF, 0x00 },
{ 0xFF, 0xFF, 0xFF, 0x00 },
{ 0xFF, 0xFF, 0xFF, 0x00 },
{ 0xFF, 0xFF, 0xFF, 0x00 }
}
};
static s32 diceDigitMdlTbl[10] = { static s32 diceDigitMdlTbl[10] = { DATA_MAKE_NUM(DATADIR_BOARD, 0x0C), DATA_MAKE_NUM(DATADIR_BOARD, 0x0D), DATA_MAKE_NUM(DATADIR_BOARD, 0x0E),
DATA_MAKE_NUM(DATADIR_BOARD, 0x0C), DATA_MAKE_NUM(DATADIR_BOARD, 0x0F), DATA_MAKE_NUM(DATADIR_BOARD, 0x10), DATA_MAKE_NUM(DATADIR_BOARD, 0x11), DATA_MAKE_NUM(DATADIR_BOARD, 0x12),
DATA_MAKE_NUM(DATADIR_BOARD, 0x0D), DATA_MAKE_NUM(DATADIR_BOARD, 0x13), DATA_MAKE_NUM(DATADIR_BOARD, 0x14), DATA_MAKE_NUM(DATADIR_BOARD, 0x15) };
DATA_MAKE_NUM(DATADIR_BOARD, 0x0E),
DATA_MAKE_NUM(DATADIR_BOARD, 0x0F),
DATA_MAKE_NUM(DATADIR_BOARD, 0x10),
DATA_MAKE_NUM(DATADIR_BOARD, 0x11),
DATA_MAKE_NUM(DATADIR_BOARD, 0x12),
DATA_MAKE_NUM(DATADIR_BOARD, 0x13),
DATA_MAKE_NUM(DATADIR_BOARD, 0x14),
DATA_MAKE_NUM(DATADIR_BOARD, 0x15)
};
s32 BoardRollExec(s32 arg0) { s32 BoardRollExec(s32 arg0)
{
rollPlayer = arg0; rollPlayer = arg0;
inputTimer = 0; inputTimer = 0;
numDice = 1; numDice = 1;
@ -146,7 +116,8 @@ s32 BoardRollExec(s32 arg0) {
if (BoardPlayerSizeGet(arg0) == 1) { if (BoardPlayerSizeGet(arg0) == 1) {
diceSize = 1; diceSize = 1;
maxRoll = 5; maxRoll = 5;
} else if (BoardPlayerSizeGet(arg0) == 2) { }
else if (BoardPlayerSizeGet(arg0) == 2) {
diceSize = 2; diceSize = 2;
maxRoll = 10; maxRoll = 10;
if (BoardMegaDoubleDiceCheck() != 0) { if (BoardMegaDoubleDiceCheck() != 0) {
@ -168,7 +139,8 @@ s32 BoardRollExec(s32 arg0) {
return destMode; return destMode;
} }
void BoardRollKill(void) { void BoardRollKill(void)
{
if (rollProc) { if (rollProc) {
HuPrcKill(rollProc); HuPrcKill(rollProc);
} }
@ -176,7 +148,8 @@ void BoardRollKill(void) {
DiceKill(); DiceKill();
} }
void BoardRollUPauseSet(s32 arg0) { void BoardRollUPauseSet(s32 arg0)
{
if (!rollProc) { if (!rollProc) {
return; return;
} }
@ -189,18 +162,21 @@ void BoardRollUPauseSet(s32 arg0) {
DiceHideEffect(2, arg0); DiceHideEffect(2, arg0);
} }
void BoardRollWinDispSet(s32 arg0) { void BoardRollWinDispSet(s32 arg0)
{
if (rollWin == -1) { if (rollWin == -1) {
return; return;
} }
if (arg0 != 0) { if (arg0 != 0) {
HuWinDispOn(rollWin); HuWinDispOn(rollWin);
} else { }
else {
HuWinDispOff(rollWin); HuWinDispOff(rollWin);
} }
} }
static void RollMain(void) { static void RollMain(void)
{
float sp8[2]; float sp8[2];
float var_f31; float var_f31;
float var_f30; float var_f30;
@ -228,7 +204,8 @@ static void RollMain(void) {
} }
if (BoardItemPrevGet() != -1 || var_r27 == 0 || _CheckFlag(FLAG_ID_MAKE(1, 9)) || BoardMegaDoubleDiceCheck()) { if (BoardItemPrevGet() != -1 || var_r27 == 0 || _CheckFlag(FLAG_ID_MAKE(1, 9)) || BoardMegaDoubleDiceCheck()) {
var_r29 = MAKE_MESSID(0x09, 0x04); var_r29 = MAKE_MESSID(0x09, 0x04);
} else { }
else {
var_r29 = MAKE_MESSID(0x09, 0x02); var_r29 = MAKE_MESSID(0x09, 0x02);
} }
if (inputTimer != 0) { if (inputTimer != 0) {
@ -240,10 +217,10 @@ static void RollMain(void) {
var_f31 = -10000.0f; var_f31 = -10000.0f;
break; break;
case 1: case 1:
var_f31 = HU_DISP_CENTERX- (sp8[0] / 2 - 16.0f); var_f31 = HU_DISP_CENTERX - (sp8[0] / 2 - 16.0f);
break; break;
} }
var_f30 = HU_DISP_HEIGHT-176; var_f30 = HU_DISP_HEIGHT - 176;
rollWin = HuWinCreate(var_f31, var_f30, sp8[0], sp8[1], 0); rollWin = HuWinCreate(var_f31, var_f30, sp8[0], sp8[1], 0);
HuWinBGTPLvlSet(rollWin, 0.0f); HuWinBGTPLvlSet(rollWin, 0.0f);
HuWinMesSpeedSet(rollWin, 0); HuWinMesSpeedSet(rollWin, 0);
@ -306,19 +283,16 @@ static void RollMain(void) {
HuPrcEnd(); HuPrcEnd();
} }
static void DiceCreate(s32 arg0) { static void DiceCreate(s32 arg0)
{
Vec sp1C; Vec sp1C;
float temp_f30; float temp_f30;
float var_f31; float var_f31;
omObjData *temp_r31; omObjData *temp_r31;
DiceWork *temp_r30; DiceWork *temp_r30;
s32 sp8; s32 sp8;
s32 spC[4] = { s32 spC[4] = { DATA_MAKE_NUM(DATADIR_BOARD, 0x18), DATA_MAKE_NUM(DATADIR_BOARD, 0x19), DATA_MAKE_NUM(DATADIR_BOARD, 0x1A),
DATA_MAKE_NUM(DATADIR_BOARD, 0x18), DATA_MAKE_NUM(DATADIR_BOARD, 0x1B) };
DATA_MAKE_NUM(DATADIR_BOARD, 0x19),
DATA_MAKE_NUM(DATADIR_BOARD, 0x1A),
DATA_MAKE_NUM(DATADIR_BOARD, 0x1B)
};
sp8 = 0; sp8 = 0;
diceMdl[arg0] = BoardModelCreate(spC[diceSize], NULL, 0); diceMdl[arg0] = BoardModelCreate(spC[diceSize], NULL, 0);
@ -342,7 +316,8 @@ static void DiceCreate(s32 arg0) {
var_f31 = 250.0f; var_f31 = 250.0f;
if (diceSize == 2) { if (diceSize == 2) {
var_f31 = 625.0f; var_f31 = 625.0f;
} else if (GWPlayer[rollPlayer].bowser_suit != 0) { }
else if (GWPlayer[rollPlayer].bowser_suit != 0) {
var_f31 = 575.0f; var_f31 = 575.0f;
} }
sp1C.y += var_f31; sp1C.y += var_f31;
@ -355,7 +330,8 @@ static void DiceCreate(s32 arg0) {
sp1C.z += 70.0f; sp1C.z += 70.0f;
} }
static void DoInput(s32 arg0) { static void DoInput(s32 arg0)
{
s32 var_r31; s32 var_r31;
s32 var_r30; s32 var_r30;
u16 sp8[1]; u16 sp8[1];
@ -393,7 +369,8 @@ static void DoInput(s32 arg0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 9)) && GWBoardGet() == BOARD_ID_MAIN6 && *sp8 == 0x200 && var_r31 != 0) { if (_CheckFlag(FLAG_ID_MAKE(1, 9)) && GWBoardGet() == BOARD_ID_MAIN6 && *sp8 == 0x200 && var_r31 != 0) {
HuAudFXPlay(4); HuAudFXPlay(4);
} }
} else if (*sp8 == 0x200) { }
else if (*sp8 == 0x200) {
destMode = -2; destMode = -2;
HuAudFXPlay(3); HuAudFXPlay(3);
BoardPauseDisableSet(1); BoardPauseDisableSet(1);
@ -403,7 +380,8 @@ static void DoInput(s32 arg0) {
} }
} }
static void DiceWaitFull(s32 arg0) { static void DiceWaitFull(s32 arg0)
{
DiceWork *temp_r31 = OM_GET_WORK_PTR(diceObj[arg0], DiceWork); DiceWork *temp_r31 = OM_GET_WORK_PTR(diceObj[arg0], DiceWork);
while (temp_r31->unk00_field2 != 1) { while (temp_r31->unk00_field2 != 1) {
@ -411,20 +389,22 @@ static void DiceWaitFull(s32 arg0) {
} }
} }
static void DiceSetHit(s32 arg0) { static void DiceSetHit(s32 arg0)
{
DiceWork *temp_r30 = OM_GET_WORK_PTR(diceObj[arg0], DiceWork); DiceWork *temp_r30 = OM_GET_WORK_PTR(diceObj[arg0], DiceWork);
temp_r30->unk00_field2 = 2; temp_r30->unk00_field2 = 2;
temp_r30->unk04 = 0; temp_r30->unk04 = 0;
BoardModelMotionSpeedSet(diceMdl[arg0], 0.0f); BoardModelMotionSpeedSet(diceMdl[arg0], 0.0f);
diceValue[arg0] = (s32) BoardModelMotionTimeGet(diceMdl[arg0]) + 1; diceValue[arg0] = (s32)BoardModelMotionTimeGet(diceMdl[arg0]) + 1;
if (tutorialRollF != 0 && tutorialRoll[arg0] != -1) { if (tutorialRollF != 0 && tutorialRoll[arg0] != -1) {
BoardModelMotionTimeSet(diceMdl[arg0], tutorialRoll[arg0] - 1); BoardModelMotionTimeSet(diceMdl[arg0], tutorialRoll[arg0] - 1);
diceValue[arg0] = tutorialRoll[arg0]; diceValue[arg0] = tutorialRoll[arg0];
} }
} }
static void RollDestroy(void) { static void RollDestroy(void)
{
if (rollWin != -1) { if (rollWin != -1) {
HuWinKill(rollWin); HuWinKill(rollWin);
rollWin = -1; rollWin = -1;
@ -438,7 +418,8 @@ static void RollDestroy(void) {
rollProc = NULL; rollProc = NULL;
} }
static void DiceMain(omObjData *arg0) { static void DiceMain(omObjData *arg0)
{
DiceWork *temp_r29 = OM_GET_WORK_PTR(arg0, DiceWork); DiceWork *temp_r29 = OM_GET_WORK_PTR(arg0, DiceWork);
float temp_f29; float temp_f29;
float var_f28; float var_f28;
@ -470,7 +451,8 @@ static void DiceMain(omObjData *arg0) {
temp_r29->unk00_field2 = 1; temp_r29->unk00_field2 = 1;
arg0->scale.x = arg0->scale.y = arg0->scale.z = 1.0f; arg0->scale.x = arg0->scale.y = arg0->scale.z = 1.0f;
arg0->rot.y = temp_r29->unk04 = 0; arg0->rot.y = temp_r29->unk04 = 0;
} else { }
else {
if (temp_r29->unk04 == 0 && diceSndStatus[temp_r29->unk00_field3] == -1) { if (temp_r29->unk04 == 0 && diceSndStatus[temp_r29->unk00_field3] == -1) {
diceSndStatus[temp_r29->unk00_field3] = HuAudFXPlay(0x300); diceSndStatus[temp_r29->unk00_field3] = HuAudFXPlay(0x300);
} }
@ -479,17 +461,19 @@ static void DiceMain(omObjData *arg0) {
if (temp_r29->unk04 < 0xB4) { if (temp_r29->unk04 < 0xB4) {
var_f27 = 0.0f; var_f27 = 0.0f;
var_f28 = 1.0f; var_f28 = 1.0f;
} else { }
else {
var_f27 = 1.0f; var_f27 = 1.0f;
var_f28 = 0.5f; var_f28 = 0.5f;
} }
arg0->scale.x = var_f27 + var_f28 * sind((float) (temp_r29->unk04 % 180)); arg0->scale.x = var_f27 + var_f28 * sind((float)(temp_r29->unk04 % 180));
arg0->scale.y = arg0->scale.x; arg0->scale.y = arg0->scale.x;
arg0->scale.z = arg0->scale.x; arg0->scale.z = arg0->scale.x;
if (temp_r29->unk04 <= 360) { if (temp_r29->unk04 <= 360) {
if (temp_r29->unk04 < 0xB4) { if (temp_r29->unk04 < 0xB4) {
temp_r29->unk04 += 6; temp_r29->unk04 += 6;
} else { }
else {
temp_r29->unk04 += 0x12; temp_r29->unk04 += 0x12;
} }
if (temp_r29->unk04 > 360) { if (temp_r29->unk04 > 360) {
@ -521,14 +505,16 @@ static void DiceMain(omObjData *arg0) {
diceEff[temp_r29->unk00_field3] = BoardDiceEffectCreate(); diceEff[temp_r29->unk00_field3] = BoardDiceEffectCreate();
Hu3DParManPosSet(diceEff[temp_r29->unk00_field3], arg0->trans.x, arg0->trans.y, arg0->trans.z); Hu3DParManPosSet(diceEff[temp_r29->unk00_field3], arg0->trans.x, arg0->trans.y, arg0->trans.z);
BoardModelVisibilitySet(diceMdl[temp_r29->unk00_field3], 0); BoardModelVisibilitySet(diceMdl[temp_r29->unk00_field3], 0);
} else { }
else {
OSs16tof32(&temp_r29->unk04, &temp_f29); OSs16tof32(&temp_r29->unk04, &temp_f29);
if (temp_r29->unk04 < 4) { if (temp_r29->unk04 < 4) {
arg0->trans.y += 10.0f + (0.5f * temp_f29); arg0->trans.y += 10.0f + (0.5f * temp_f29);
arg0->scale.x += 0.1f * sind(4.0f * temp_f29); arg0->scale.x += 0.1f * sind(4.0f * temp_f29);
arg0->scale.y = arg0->scale.x; arg0->scale.y = arg0->scale.x;
arg0->scale.z = arg0->scale.x; arg0->scale.z = arg0->scale.x;
} else { }
else {
BoardModelAlphaSet(diceMdl[temp_r29->unk00_field3], 0xFF - (temp_r29->unk04 << 5)); BoardModelAlphaSet(diceMdl[temp_r29->unk00_field3], 0xFF - (temp_r29->unk04 << 5));
} }
arg0->trans.y += -0.49f * temp_f29 * temp_f29; arg0->trans.y += -0.49f * temp_f29 * temp_f29;
@ -556,7 +542,8 @@ static void DiceMain(omObjData *arg0) {
BoardModelScaleSet(diceMdl[temp_r29->unk00_field3], arg0->scale.x, arg0->scale.y, arg0->scale.z); BoardModelScaleSet(diceMdl[temp_r29->unk00_field3], arg0->scale.x, arg0->scale.y, arg0->scale.z);
} }
static void DicePause(s32 arg0) { static void DicePause(s32 arg0)
{
omObjData *temp_r31 = diceObj[arg0]; omObjData *temp_r31 = diceObj[arg0];
if (temp_r31) { if (temp_r31) {
@ -564,13 +551,15 @@ static void DicePause(s32 arg0) {
} }
} }
static void DicePauseAll(void) { static void DicePauseAll(void)
{
DicePause(0); DicePause(0);
DicePause(1); DicePause(1);
DicePause(2); DicePause(2);
} }
s16 BoardDiceEffectCreate(void) { s16 BoardDiceEffectCreate(void)
{
s16 temp_r31; s16 temp_r31;
s16 temp_r30; s16 temp_r30;
AnimData *temp_r29; AnimData *temp_r29;
@ -589,7 +578,8 @@ s16 BoardDiceEffectCreate(void) {
return temp_r31; return temp_r31;
} }
static void DiceHideEffect(s32 arg0, s32 arg1) { static void DiceHideEffect(s32 arg0, s32 arg1)
{
s16 temp_r31; s16 temp_r31;
if (diceEff[arg0] == -1) { if (diceEff[arg0] == -1) {
@ -597,13 +587,15 @@ static void DiceHideEffect(s32 arg0, s32 arg1) {
} }
temp_r31 = Hu3DParManModelIDGet(diceEff[arg0]); temp_r31 = Hu3DParManModelIDGet(diceEff[arg0]);
if (arg1 != 0) { if (arg1 != 0) {
Hu3DModelAttrReset(temp_r31, 1); Hu3DModelAttrReset(temp_r31, HU3D_ATTR_DISPOFF);
} else { }
Hu3DModelAttrSet(temp_r31, 1); else {
Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF);
} }
} }
void BoardDicePauseAll(void) { void BoardDicePauseAll(void)
{
DiceDigitWork *temp_r30; DiceDigitWork *temp_r30;
s32 i; s32 i;
@ -617,7 +609,8 @@ void BoardDicePauseAll(void) {
} }
} }
BOOL BoardDiceDoneCheck(void) { BOOL BoardDiceDoneCheck(void)
{
DiceDigitWork *temp_r30; DiceDigitWork *temp_r30;
s32 i; s32 i;
@ -632,7 +625,8 @@ BOOL BoardDiceDoneCheck(void) {
return TRUE; return TRUE;
} }
void BoardDiceStop(s32 arg0) { void BoardDiceStop(s32 arg0)
{
DiceDigitWork *temp_r31; DiceDigitWork *temp_r31;
if (!diceDigitObj[arg0]) { if (!diceDigitObj[arg0]) {
@ -642,7 +636,8 @@ void BoardDiceStop(s32 arg0) {
temp_r31->unk00_field0 = 1; temp_r31->unk00_field0 = 1;
} }
void BoardDiceVisibleSet(s32 arg0, s32 arg1) { void BoardDiceVisibleSet(s32 arg0, s32 arg1)
{
DiceDigitWork *temp_r31; DiceDigitWork *temp_r31;
if (!diceDigitObj[arg0]) { if (!diceDigitObj[arg0]) {
@ -651,13 +646,15 @@ void BoardDiceVisibleSet(s32 arg0, s32 arg1) {
temp_r31 = OM_GET_WORK_PTR(diceDigitObj[arg0], DiceDigitWork); temp_r31 = OM_GET_WORK_PTR(diceDigitObj[arg0], DiceDigitWork);
if ((temp_r31->unk01 / 10) == 0) { if ((temp_r31->unk01 / 10) == 0) {
BoardModelVisibilitySet(temp_r31->unk04[1], 0); BoardModelVisibilitySet(temp_r31->unk04[1], 0);
} else { }
else {
BoardModelVisibilitySet(temp_r31->unk04[1], arg1); BoardModelVisibilitySet(temp_r31->unk04[1], arg1);
} }
BoardModelVisibilitySet(temp_r31->unk04[0], arg1); BoardModelVisibilitySet(temp_r31->unk04[0], arg1);
} }
void BoardDiceValueSet(s32 arg0, s32 arg1) { void BoardDiceValueSet(s32 arg0, s32 arg1)
{
omObjData *temp_r27; omObjData *temp_r27;
DiceDigitWork *temp_r31; DiceDigitWork *temp_r31;
Vec spC; Vec spC;
@ -696,7 +693,8 @@ void BoardDiceValueSet(s32 arg0, s32 arg1) {
diceDigitObj[arg0] = temp_r27; diceDigitObj[arg0] = temp_r27;
} }
static void DiceDigitMain(omObjData *arg0) { static void DiceDigitMain(omObjData *arg0)
{
DiceDigitWork *temp_r31 = OM_GET_WORK_PTR(arg0, DiceDigitWork); DiceDigitWork *temp_r31 = OM_GET_WORK_PTR(arg0, DiceDigitWork);
if (temp_r31->unk00_field0 != 0 || BoardIsKill()) { if (temp_r31->unk00_field0 != 0 || BoardIsKill()) {
@ -709,7 +707,8 @@ static void DiceDigitMain(omObjData *arg0) {
DiceDigitRotate(temp_r31, temp_r31->unk00_field1); DiceDigitRotate(temp_r31, temp_r31->unk00_field1);
} }
static void DiceDigitKill(DiceDigitWork *arg0) { static void DiceDigitKill(DiceDigitWork *arg0)
{
s32 i; s32 i;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
@ -719,7 +718,8 @@ static void DiceDigitKill(DiceDigitWork *arg0) {
} }
} }
static void DiceKill(void) { static void DiceKill(void)
{
DiceDigitWork *temp_r29; DiceDigitWork *temp_r29;
s32 i; s32 i;
@ -731,22 +731,18 @@ static void DiceKill(void) {
} }
} }
static void DiceDigitMove(DiceDigitWork *arg0, s32 arg1) { static void DiceDigitMove(DiceDigitWork *arg0, s32 arg1)
{
s32 sp8 = 0; s32 sp8 = 0;
Vec sp30; Vec sp30;
Vec sp24; Vec sp24;
Vec sp54[2]; Vec sp54[2];
Vec sp18 = { (HU_DISP_WIDTH/2), (HU_DISP_HEIGHT*155)/480, 240.0f }; Vec sp18 = { (HU_DISP_WIDTH / 2), (HU_DISP_HEIGHT * 155) / 480, 240.0f };
Vec sp3C[2] = { Vec sp3C[2]
{ (HU_DISP_WIDTH*1)/4, (HU_DISP_HEIGHT*155)/480, 240.0f }, = { { (HU_DISP_WIDTH * 1) / 4, (HU_DISP_HEIGHT * 155) / 480, 240.0f }, { (HU_DISP_WIDTH * 3) / 4, (HU_DISP_HEIGHT * 155) / 480, 240.0f } };
{ (HU_DISP_WIDTH*3)/4, (HU_DISP_HEIGHT*155)/480, 240.0f } Vec sp6C[3] = { { (HU_DISP_WIDTH * 1) / 4, (HU_DISP_HEIGHT * 155) / 480, 240.0f },
}; { (HU_DISP_WIDTH * 3) / 4, (HU_DISP_HEIGHT * 155) / 480, 240.0f }, { (HU_DISP_WIDTH / 2), (HU_DISP_HEIGHT * 155) / 480, 240.0f } };
Vec sp6C[3] = { Vec spC = { (HU_DISP_WIDTH / 2), (HU_DISP_HEIGHT * 176) / 480, 240.0f };
{ (HU_DISP_WIDTH*1)/4, (HU_DISP_HEIGHT*155)/480, 240.0f },
{ (HU_DISP_WIDTH*3)/4, (HU_DISP_HEIGHT*155)/480, 240.0f },
{ (HU_DISP_WIDTH/2), (HU_DISP_HEIGHT*155)/480, 240.0f }
};
Vec spC = { (HU_DISP_WIDTH/2), (HU_DISP_HEIGHT*176)/480, 240.0f };
Vec *var_r29; Vec *var_r29;
float var_f31; float var_f31;
s16 var_r27; s16 var_r27;
@ -756,7 +752,8 @@ static void DiceDigitMove(DiceDigitWork *arg0, s32 arg1) {
if (arg1 != 0) { if (arg1 != 0) {
var_r29 = &spC; var_r29 = &spC;
var_f31 = -20.0f * arg0->unk00_field3; var_f31 = -20.0f * arg0->unk00_field3;
} else { }
else {
switch (numDice) { switch (numDice) {
case 1: case 1:
var_r29 = &sp18; var_r29 = &sp18;
@ -773,9 +770,11 @@ static void DiceDigitMove(DiceDigitWork *arg0, s32 arg1) {
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (var_r27 == 0) { if (var_r27 == 0) {
sp54[i].x = var_r29->x; sp54[i].x = var_r29->x;
} else if (i != 0) { }
else if (i != 0) {
sp54[i].x = var_r29->x - 30.0f; sp54[i].x = var_r29->x - 30.0f;
} else { }
else {
sp54[i].x = var_r29->x + 30.0f; sp54[i].x = var_r29->x + 30.0f;
} }
sp54[i].y = var_r29->y; sp54[i].y = var_r29->y;
@ -790,7 +789,8 @@ static void DiceDigitMove(DiceDigitWork *arg0, s32 arg1) {
if (arg1 != 0 && arg0->unk00_field3 != 0) { if (arg1 != 0 && arg0->unk00_field3 != 0) {
BoardModelVisibilitySet(arg0->unk04[i], 0); BoardModelVisibilitySet(arg0->unk04[i], 0);
} }
} else { }
else {
arg0->unk00_field2 = 1; arg0->unk00_field2 = 1;
} }
VECScale(&sp24, &sp24, arg0->unk08); VECScale(&sp24, &sp24, arg0->unk08);
@ -799,7 +799,8 @@ static void DiceDigitMove(DiceDigitWork *arg0, s32 arg1) {
} }
} }
static void DiceDigitRotate(DiceDigitWork *arg0, s32 arg1) { static void DiceDigitRotate(DiceDigitWork *arg0, s32 arg1)
{
float var_f30; float var_f30;
s32 i; s32 i;
@ -808,7 +809,8 @@ static void DiceDigitRotate(DiceDigitWork *arg0, s32 arg1) {
if (arg0->unk02 >= 360) { if (arg0->unk02 >= 360) {
arg0->unk02 = 360; arg0->unk02 = 360;
} }
} else { }
else {
arg0->unk02 -= 0x12; arg0->unk02 -= 0x12;
if (arg0->unk02 <= 0) { if (arg0->unk02 <= 0) {
arg0->unk02 = 0; arg0->unk02 = 0;
@ -822,7 +824,8 @@ static void DiceDigitRotate(DiceDigitWork *arg0, s32 arg1) {
} }
} }
static void SameRollExec(void) { static void SameRollExec(void)
{
Vec sp8; Vec sp8;
float var_f31; float var_f31;
s32 var_r28; s32 var_r28;
@ -838,7 +841,8 @@ static void SameRollExec(void) {
case 2: case 2:
if (diceValue[0] == 7) { if (diceValue[0] == 7) {
var_r31 = 0x1E; var_r31 = 0x1E;
} else { }
else {
var_r31 = 0xA; var_r31 = 0xA;
} }
break; break;
@ -846,9 +850,11 @@ static void SameRollExec(void) {
if (diceValue[0] == 7) { if (diceValue[0] == 7) {
var_r31 = 0x32; var_r31 = 0x32;
var_r28 = 0x118; var_r28 = 0x118;
} else if (diceValue[0] & 1) { }
else if (diceValue[0] & 1) {
var_r31 = 0x1E; var_r31 = 0x1E;
} else { }
else {
var_r31 = 0xA; var_r31 = 0xA;
} }
break; break;
@ -860,7 +866,8 @@ static void SameRollExec(void) {
if (BoardPlayerSizeGet(rollPlayer) == 2 || GWPlayer[rollPlayer].bowser_suit != 0) { if (BoardPlayerSizeGet(rollPlayer) == 2 || GWPlayer[rollPlayer].bowser_suit != 0) {
sp8.y += 700.0f; sp8.y += 700.0f;
var_f31 = 450.0f; var_f31 = 450.0f;
} else { }
else {
sp8.y += 600.0f; sp8.y += 600.0f;
var_f31 = 300.0f; var_f31 = 300.0f;
} }
@ -878,9 +885,11 @@ static void SameRollExec(void) {
BoardWinKill(); BoardWinKill();
if (var_r31 >= 0x32) { if (var_r31 >= 0x32) {
var_r29 = 1; var_r29 = 1;
} else if (var_r31 >= 0x14) { }
else if (var_r31 >= 0x14) {
var_r29 = 3; var_r29 = 3;
} else { }
else {
var_r29 = 6; var_r29 = 6;
} }
for (i = 0; i < var_r31; i++) { for (i = 0; i < var_r31; i++) {
@ -893,7 +902,8 @@ static void SameRollExec(void) {
BoardPauseDisableSet(0); BoardPauseDisableSet(0);
} }
static s32 GetBtnRoll(s32 arg0) { static s32 GetBtnRoll(s32 arg0)
{
s32 var_r31 = 0; s32 var_r31 = 0;
s32 var_r29; s32 var_r29;
@ -917,7 +927,8 @@ static s32 GetBtnRoll(s32 arg0) {
return var_r31; return var_r31;
} }
static s32 GetComBtnRoll(s32 arg0) { static s32 GetComBtnRoll(s32 arg0)
{
if (BoardItemPrevGet() != -1 || BoardPlayerItemCount(arg0) == 0 || BoardMegaDoubleDiceCheck() || _CheckFlag(FLAG_ID_MAKE(1, 9))) { if (BoardItemPrevGet() != -1 || BoardPlayerItemCount(arg0) == 0 || BoardMegaDoubleDiceCheck() || _CheckFlag(FLAG_ID_MAKE(1, 9))) {
return 0x100; return 0x100;
} }
@ -927,7 +938,8 @@ static s32 GetComBtnRoll(s32 arg0) {
return 0x100; return 0x100;
} }
void BoardRollTutorialSet(s16 *arg0) { void BoardRollTutorialSet(s16 *arg0)
{
s32 i; s32 i;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {

1745
src/game/board/space.c
View file

File diff suppressed because it is too large Load diff

4
src/game/chrman.c
View file

@ -1366,7 +1366,7 @@ void CharModelItemHookCreate(s16 character, char *arg1)
Hu3DModelHookObjReset(temp_r31->unk00, arg1); Hu3DModelHookObjReset(temp_r31->unk00, arg1);
var_r26 = CharModelItemHookCreateInlineFunc(); var_r26 = CharModelItemHookCreateInlineFunc();
if (!var_r26) { if (!var_r26) {
Hu3DModelAttrSet(temp_r29, 1); Hu3DModelAttrSet(temp_r29, HU3D_ATTR_DISPOFF);
return; return;
} }
var_r26->user_data = temp_r27 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkProcessData), MEMORY_DEFAULT_NUM); var_r26->user_data = temp_r27 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkProcessData), MEMORY_DEFAULT_NUM);
@ -1410,7 +1410,7 @@ static void UpdateItemHook(void)
sp8.x = PGMinPos.x + (PGMaxPos.x - PGMinPos.x) / 2; sp8.x = PGMinPos.x + (PGMaxPos.x - PGMinPos.x) / 2;
sp8.y = PGMinPos.y + (PGMaxPos.y - PGMinPos.y) / 2; sp8.y = PGMinPos.y + (PGMaxPos.y - PGMinPos.y) / 2;
sp8.z = PGMinPos.z + (PGMaxPos.z - PGMinPos.z) / 2; sp8.z = PGMinPos.z + (PGMaxPos.z - PGMinPos.z) / 2;
Hu3DModelAttrSet(temp_r31->unk02, 1); Hu3DModelAttrSet(temp_r31->unk02, HU3D_ATTR_DISPOFF);
effectDustParam.unk0C.x = 0.0f; effectDustParam.unk0C.x = 0.0f;
effectDustParam.unk0C.y = 0.0f; effectDustParam.unk0C.y = 0.0f;
effectDustParam.unk0C.z = 0.0f; effectDustParam.unk0C.z = 0.0f;

2
src/game/hsfanim.c
View file

@ -495,7 +495,7 @@ s16 Hu3DParticleCreate(AnimData *arg0, s16 arg1) {
temp_r25 = Hu3DHookFuncCreate((void*) &_Hu3DParticleAttrReset); temp_r25 = Hu3DHookFuncCreate((void*) &_Hu3DParticleAttrReset);
temp_r28 = &Hu3DData[temp_r25]; temp_r28 = &Hu3DData[temp_r25];
Hu3DModelAttrSet(temp_r25, 0x20); Hu3DModelAttrSet(temp_r25, HU3D_ATTR_PARTICLE_KILL);
temp_r31 = HuMemDirectMallocNum(HEAP_DATA, sizeof(ParticleData), temp_r28->unk_48); temp_r31 = HuMemDirectMallocNum(HEAP_DATA, sizeof(ParticleData), temp_r28->unk_48);
temp_r28->unk_120 = temp_r31; temp_r28->unk_120 = temp_r31;
temp_r31->unk_44 = arg0; temp_r31->unk_44 = arg0;

2
src/game/hsfdraw.c
View file

@ -2435,7 +2435,7 @@ static void MDObjMesh(HsfData *arg0, HsfObject *arg1) {
var_r28 = temp_r29->data; var_r28 = temp_r29->data;
if (arg1->flags & 4) { if (arg1->flags & 4) {
Hu3DObjInfoP->flags |= 0x400; Hu3DObjInfoP->flags |= 0x400;
Hu3DModelAttrSet(curModelID, 4); Hu3DModelAttrSet(curModelID, HU3D_ATTR_SHADOW);
} }
if (arg1->flags & 8) { if (arg1->flags & 8) {
Hu3DObjInfoP->flags |= 8; Hu3DObjInfoP->flags |= 8;

67
src/game/thpmain.c
View file

@ -1,10 +1,10 @@
#include "game/thpmain.h" #include "game/thpmain.h"
#include "game/THPSimple.h"
#include "game/hsfdraw.h" #include "game/hsfdraw.h"
#include "game/hsfman.h" #include "game/hsfman.h"
#include "game/init.h" #include "game/init.h"
#include "game/process.h" #include "game/process.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/THPSimple.h"
#include "string.h" #include "string.h"
@ -25,7 +25,8 @@ static u32 THPFrame;
static s16 THPStart; static s16 THPStart;
Process *THPProc; Process *THPProc;
s16 HuTHPSprCreateVol(char *path, s16 loop, s16 prio, float volume) { s16 HuTHPSprCreateVol(char *path, s16 loop, s16 prio, float volume)
{
s16 temp_r31; s16 temp_r31;
if (THPProc) { if (THPProc) {
@ -51,11 +52,13 @@ s16 HuTHPSprCreateVol(char *path, s16 loop, s16 prio, float volume) {
return temp_r31; return temp_r31;
} }
s16 HuTHPSprCreate(char *path, s16 loop, s16 prio) { s16 HuTHPSprCreate(char *path, s16 loop, s16 prio)
{
return HuTHPSprCreateVol(path, loop, prio, 110.0f); return HuTHPSprCreateVol(path, loop, prio, 110.0f);
} }
s16 HuTHP3DCreateVol(char *path, s16 loop, float volume) { s16 HuTHP3DCreateVol(char *path, s16 loop, float volume)
{
s16 temp_r31; s16 temp_r31;
if (THPProc) { if (THPProc) {
@ -75,27 +78,32 @@ s16 HuTHP3DCreateVol(char *path, s16 loop, float volume) {
THPLoopF = loop; THPLoopF = loop;
THPStat = 0; THPStat = 0;
THPFrame = 0; THPFrame = 0;
Hu3DModelAttrSet(SimpleControl.unk19E, 1); Hu3DModelAttrSet(SimpleControl.unk19E, HU3D_ATTR_DISPOFF);
return temp_r31; return temp_r31;
} }
s16 HuTHP3DCreate(char *path, s16 loop) { s16 HuTHP3DCreate(char *path, s16 loop)
{
return HuTHP3DCreateVol(path, loop, 110.0f); return HuTHP3DCreateVol(path, loop, 110.0f);
} }
void HuTHPStop(void) { void HuTHPStop(void)
{
THPStat = 1; THPStat = 1;
} }
void HuTHPClose(void) { void HuTHPClose(void)
{
THPStat = 2; THPStat = 2;
} }
void HuTHPRestart(void) { void HuTHPRestart(void)
{
THPStat = 3; THPStat = 3;
} }
BOOL HuTHPEndCheck(void) { BOOL HuTHPEndCheck(void)
{
s32 temp_r31; s32 temp_r31;
temp_r31 = THPSimpleGetTotalFrame() - 1; temp_r31 = THPSimpleGetTotalFrame() - 1;
@ -105,19 +113,23 @@ BOOL HuTHPEndCheck(void) {
return (temp_r31 <= THPFrame); return (temp_r31 <= THPFrame);
} }
s32 HuTHPFrameGet(void) { s32 HuTHPFrameGet(void)
{
return THPFrame; return THPFrame;
} }
s32 HuTHPTotalFrameGet(void) { s32 HuTHPTotalFrameGet(void)
{
return THPSimpleGetTotalFrame(); return THPSimpleGetTotalFrame();
} }
void HuTHPSetVolume(s32 left, s32 right) { void HuTHPSetVolume(s32 left, s32 right)
{
THPSimpleSetVolume(left, right); THPSimpleSetVolume(left, right);
} }
static void THPTestProc(void) { static void THPTestProc(void)
{
s32 temp_r29; s32 temp_r29;
u32 var_r28; u32 var_r28;
void *temp_r30; void *temp_r30;
@ -146,8 +158,9 @@ static void THPTestProc(void) {
decodeRate = 0; decodeRate = 0;
THPStart = 1; THPStart = 1;
if (SimpleControl.unk19C == 1) { if (SimpleControl.unk19C == 1) {
Hu3DModelAttrReset(SimpleControl.unk19E, 1); Hu3DModelAttrReset(SimpleControl.unk19E, HU3D_ATTR_DISPOFF);
} else { }
else {
HuSprAttrReset(SimpleControl.unk19E, 0, 4); HuSprAttrReset(SimpleControl.unk19E, 0, 4);
} }
while (1) { while (1) {
@ -182,7 +195,8 @@ static void THPTestProc(void) {
} }
if (SimpleControl.unk19C == 1) { if (SimpleControl.unk19C == 1) {
Hu3DModelKill(SimpleControl.unk19E); Hu3DModelKill(SimpleControl.unk19E);
} else { }
else {
HuSprKill(SimpleControl.unk19E); HuSprKill(SimpleControl.unk19E);
} }
OSCancelThread(decodeThread); OSCancelThread(decodeThread);
@ -199,18 +213,21 @@ static void THPTestProc(void) {
} }
} }
static void THPViewFunc(ModelData *arg0, Mtx arg1) { static void THPViewFunc(ModelData *arg0, Mtx arg1)
{
GXColor spC = { 0xFF, 0xFF, 0xFF, 0xFF }; GXColor spC = { 0xFF, 0xFF, 0xFF, 0xFF };
if (THPStart != 0) { if (THPStart != 0) {
GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
GXSetCullMode(GX_CULL_NONE); GXSetCullMode(GX_CULL_NONE);
THPFrame = THPSimpleDrawCurrentFrame(RenderMode, &spC, arg1, -audioTrack.unk00 / 2, audioTrack.unk04 / 2, audioTrack.unk00, -audioTrack.unk04); THPFrame
= THPSimpleDrawCurrentFrame(RenderMode, &spC, arg1, -audioTrack.unk00 / 2, audioTrack.unk04 / 2, audioTrack.unk00, -audioTrack.unk04);
THPSimpleAudioStart(); THPSimpleAudioStart();
} }
} }
static void THPViewSprFunc(HuSprite *arg0) { static void THPViewSprFunc(HuSprite *arg0)
{
Vec spC = { 0.0f, 0.0f, 1.0f }; Vec spC = { 0.0f, 0.0f, 1.0f };
GXColor sp8; GXColor sp8;
s32 temp_r30; s32 temp_r30;
@ -227,19 +244,21 @@ static void THPViewSprFunc(HuSprite *arg0) {
PSMTXRotAxisRad(sp18, &spC, MTXDegToRad(arg0->z_rot)); PSMTXRotAxisRad(sp18, &spC, MTXDegToRad(arg0->z_rot));
PSMTXScale(sp48, arg0->scale_x, arg0->scale_y, 1.0f); PSMTXScale(sp48, arg0->scale_x, arg0->scale_y, 1.0f);
PSMTXConcat(sp18, sp48, sp48); PSMTXConcat(sp18, sp48, sp48);
} else { }
else {
PSMTXScale(sp48, arg0->scale_x, arg0->scale_y, 1.0f); PSMTXScale(sp48, arg0->scale_x, arg0->scale_y, 1.0f);
} }
mtxTransCat(sp48, arg0->x, arg0->y, 0.0f); mtxTransCat(sp48, arg0->x, arg0->y, 0.0f);
PSMTXConcat(*arg0->group_mtx, sp48, sp48); PSMTXConcat(*arg0->group_mtx, sp48, sp48);
temp_r30 = -((s32) audioTrack.unk00 / 2); temp_r30 = -((s32)audioTrack.unk00 / 2);
temp_r29 = -((s32) audioTrack.unk04 / 2); temp_r29 = -((s32)audioTrack.unk04 / 2);
GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE); GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE);
THPFrame = THPSimpleDrawCurrentFrame(RenderMode, &sp8, sp48, temp_r30, temp_r29, audioTrack.unk00, audioTrack.unk04); THPFrame = THPSimpleDrawCurrentFrame(RenderMode, &sp8, sp48, temp_r30, temp_r29, audioTrack.unk00, audioTrack.unk04);
} }
} }
static void THPDecodeFunc(void *param) { static void THPDecodeFunc(void *param)
{
while (1) { while (1) {
if (THPStat == 2) { if (THPStat == 2) {
break; break;