diff --git a/src/REL/bootDll/main.c b/src/REL/bootDll/main.c index 6855ce34..85c5e263 100644 --- a/src/REL/bootDll/main.c +++ b/src/REL/bootDll/main.c @@ -1,19 +1,19 @@ -#include "game/gamework_data.h" -#include "game/process.h" +#include "ext_math.h" +#include "game/audio.h" #include "game/chrman.h" #include "game/data.h" -#include "game/sprite.h" -#include "game/object.h" -#include "game/audio.h" -#include "game/memory.h" +#include "game/gamework_data.h" #include "game/hsfman.h" -#include "game/wipe.h" -#include "game/pad.h" -#include "game/window.h" -#include "game/thpmain.h" +#include "game/memory.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 "ext_math.h" #include "rel_sqrt_consts.h" @@ -50,352 +50,360 @@ void *logoReadNintendo(void); void ObjectSetup(void) { - omOvlHisData *history; - OSReport("******* Boot ObjectSetup *********\n"); - objman[0] = omInitObjMan(50, 8192); - lbl_1_bss_3C[0].x = -67; - lbl_1_bss_3C[0].y = 40; - lbl_1_bss_3C[0].z = 0; - lbl_1_bss_24[0].x = 260; - lbl_1_bss_24[0].y = -103; - lbl_1_bss_24[0].z = -18; - lbl_1_bss_1C[0] = 2885; - Hu3DCameraCreate(1); - Hu3DCameraPerspectiveSet(1, 30, 20, 15000, 1.2); - Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); - HuPrcCreate(BootProc, 100, 12288, 0); - Hu3DBGColorSet(0, 0, 0); - history = omOvlHisGet(0); - omOvlHisChg(0, history->overlay, 1, history->stat); + omOvlHisData *history; + OSReport("******* Boot ObjectSetup *********\n"); + objman[0] = omInitObjMan(50, 8192); + lbl_1_bss_3C[0].x = -67; + lbl_1_bss_3C[0].y = 40; + lbl_1_bss_3C[0].z = 0; + lbl_1_bss_24[0].x = 260; + lbl_1_bss_24[0].y = -103; + lbl_1_bss_24[0].z = -18; + lbl_1_bss_1C[0] = 2885; + Hu3DCameraCreate(1); + Hu3DCameraPerspectiveSet(1, 30, 20, 15000, 1.2); + Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); + HuPrcCreate(BootProc, 100, 12288, 0); + Hu3DBGColorSet(0, 0, 0); + history = omOvlHisGet(0); + omOvlHisChg(0, history->overlay, 1, history->stat); } static void BootProc(void) { - AnimData *data; - s16 group; - s16 sprite_nintendo; - s16 sprite_hudson; - s16 i; - OSTick tick_prev; - Process *curr = HuPrcCurrentGet(); - if(omovlevtno == 0) { - ProgressiveProc(); - } - group = HuSprGrpCreate(2); - data = HuSprAnimRead(logoReadNintendo()); - sprite_nintendo = HuSprCreate(data, 0, 0); - HuSprGrpMemberSet(group, 0, sprite_nintendo); - HuSprPosSet(group, 0, 288, 240); - HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF); - if(omovlevtno != 0) { - HuAudSndGrpSetSet(0); - data = HuSprAnimReadFile(TITLE_HUDSON_ANM); - sprite_hudson = HuSprCreate(data, 0, 0); - HuSprGrpMemberSet(group, 1, sprite_hudson); - HuSprPosSet(group, 1, 288, 240); - HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); - HuWinInit(1); - TitleInit(); - SystemInitF = 1; - } else { - s16 group_thp; - BOOL skip_wait; - float win_size[2]; - s16 sprite_thp; - for(i=0; i<4; i++) { - GWPlayerCfg[i].pad_idx = i; - } - repeat: - HuSprAttrReset(group, 0, HUSPR_ATTR_DISPOFF); - WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); - while(WipeStatGet()) { - HuPrcVSleep(); - } - WipeColorSet(255, 255, 255); - if(!SystemInitF) { - tick_prev = OSGetTick(); - CharManInit(); - HuWindowInit(); - MGSeqInit(); - HuWinInit(1); - TitleInit(); - data = HuSprAnimReadFile(TITLE_HUDSON_ANM); - sprite_hudson = HuSprCreate(data, 0, 0); - HuSprGrpMemberSet(group, 1, sprite_hudson); - HuSprPosSet(group, 1, 288, 240); - HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); - while(OSTicksToMilliseconds(OSGetTick()-tick_prev) < 3000) { - HuPrcVSleep(); - } - } else { - for(i=0; i<180; i++) { - if(HuPadBtnDown[0] & (PAD_BUTTON_START|PAD_BUTTON_A)) { - break; - } - HuPrcVSleep(); - } - } - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); - while(WipeStatGet()) { - HuPrcVSleep(); - } - HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF); - HuSprAttrReset(group, 1, HUSPR_ATTR_DISPOFF); - HuPrcSleep(60); - WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); - while(WipeStatGet()) { - HuPrcVSleep(); - } - if(!SystemInitF) { - void *group_samp; - tick_prev = OSGetTick(); - group_samp = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(0)); - msmSysLoadGroup(0, group_samp, 0); - HuMemDirectFree(group_samp); - while(OSTicksToMilliseconds(OSGetTick()-tick_prev) < 3000) { - HuPrcVSleep(); - } - } else { - for(i=0; i<180; i++) { - if(HuPadBtnDown[0] & (PAD_BUTTON_START|PAD_BUTTON_A)) { - break; - } - HuPrcVSleep(); - } - } - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); - while(WipeStatGet()) { - HuPrcVSleep(); - } - tick_prev = OSGetTick(); - if(!SystemInitF) { - HuAudSndGrpSetSet(0); - SystemInitF = 1; - } - while(OSTicksToMilliseconds(OSGetTick()-tick_prev) < 1000) { - HuPrcVSleep(); - } - HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF); - HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); - group_thp = HuSprGrpCreate(1); - sprite_thp = HuTHPSprCreateVol("movie/opmov_a00.thp", 0, 100, 122); - HuSprGrpMemberSet(group_thp, 0, sprite_thp); - HuSprPosSet(group_thp, 0, 288, 240); - HuWinMesMaxSizeBetGet(win_size, MAKE_MESSID(54, 0), MAKE_MESSID(54, 4)); - demoWin = HuWinCreate(-10000, 448-win_size[1], win_size[0], win_size[1], 0); - HuWinMesSpeedSet(demoWin, 0); - HuWinBGTPLvlSet(demoWin, 0); - HuWinPriSet(demoWin, 10); - HuWinAttrSet(demoWin, 0x800); - HuPrcSleep(5); - WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); - while(WipeStatGet()) { - HuPrcVSleep(); - } - skip_wait = FALSE; - while(!HuTHPEndCheck()) { - UpdateDemoMess(); - if(HuPadBtnDown[0] & (PAD_BUTTON_START|PAD_BUTTON_A)) { - skip_wait = TRUE; - break; - } - HuPrcVSleep(); - } - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); - while(WipeStatGet()) { - HuPrcVSleep(); - } - HuWinKill(demoWin); - HuTHPClose(); - HuPrcVSleep(); - HuSprGrpKill(group_thp); - if(!skip_wait) { - HuPrcSleep(60); - } - skip_wait = FALSE; - } - if(!TitleProc()) { - HuPrcSleep(60); - goto repeat; - } - WipeColorSet(255, 255, 255); - HuAudSStreamAllFadeOut(500); - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); - while(WipeStatGet()) { - HuPrcVSleep(); - } - HuPrcVSleep(); - if(omSysExitReq) { - omOvlReturnEx(1, 1); - } else { - omOvlCallEx(OVL_MODESEL, 1, 0, 0); - } - for(i=0; i<4; i++) { - GWPlayerCfg[i].character = -1; - } - HuPrcEnd(); - do { - HuPrcVSleep(); - } while(1); + AnimData *data; + s16 group; + s16 sprite_nintendo; + s16 sprite_hudson; + s16 i; + OSTick tick_prev; + Process *curr = HuPrcCurrentGet(); + if (omovlevtno == 0) { + ProgressiveProc(); + } + group = HuSprGrpCreate(2); + data = HuSprAnimRead(logoReadNintendo()); + sprite_nintendo = HuSprCreate(data, 0, 0); + HuSprGrpMemberSet(group, 0, sprite_nintendo); + HuSprPosSet(group, 0, 288, 240); + HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF); + if (omovlevtno != 0) { + HuAudSndGrpSetSet(0); + data = HuSprAnimReadFile(TITLE_HUDSON_ANM); + sprite_hudson = HuSprCreate(data, 0, 0); + HuSprGrpMemberSet(group, 1, sprite_hudson); + HuSprPosSet(group, 1, 288, 240); + HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); + HuWinInit(1); + TitleInit(); + SystemInitF = 1; + } + else { + s16 group_thp; + BOOL skip_wait; + float win_size[2]; + s16 sprite_thp; + for (i = 0; i < 4; i++) { + GWPlayerCfg[i].pad_idx = i; + } + repeat: + HuSprAttrReset(group, 0, HUSPR_ATTR_DISPOFF); + WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); + while (WipeStatGet()) { + HuPrcVSleep(); + } + WipeColorSet(255, 255, 255); + if (!SystemInitF) { + tick_prev = OSGetTick(); + CharManInit(); + HuWindowInit(); + MGSeqInit(); + HuWinInit(1); + TitleInit(); + data = HuSprAnimReadFile(TITLE_HUDSON_ANM); + sprite_hudson = HuSprCreate(data, 0, 0); + HuSprGrpMemberSet(group, 1, sprite_hudson); + HuSprPosSet(group, 1, 288, 240); + HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); + while (OSTicksToMilliseconds(OSGetTick() - tick_prev) < 3000) { + HuPrcVSleep(); + } + } + else { + for (i = 0; i < 180; i++) { + if (HuPadBtnDown[0] & (PAD_BUTTON_START | PAD_BUTTON_A)) { + break; + } + HuPrcVSleep(); + } + } + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); + while (WipeStatGet()) { + HuPrcVSleep(); + } + HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF); + HuSprAttrReset(group, 1, HUSPR_ATTR_DISPOFF); + HuPrcSleep(60); + WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); + while (WipeStatGet()) { + HuPrcVSleep(); + } + if (!SystemInitF) { + void *group_samp; + tick_prev = OSGetTick(); + group_samp = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(0)); + msmSysLoadGroup(0, group_samp, 0); + HuMemDirectFree(group_samp); + while (OSTicksToMilliseconds(OSGetTick() - tick_prev) < 3000) { + HuPrcVSleep(); + } + } + else { + for (i = 0; i < 180; i++) { + if (HuPadBtnDown[0] & (PAD_BUTTON_START | PAD_BUTTON_A)) { + break; + } + HuPrcVSleep(); + } + } + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); + while (WipeStatGet()) { + HuPrcVSleep(); + } + tick_prev = OSGetTick(); + if (!SystemInitF) { + HuAudSndGrpSetSet(0); + SystemInitF = 1; + } + while (OSTicksToMilliseconds(OSGetTick() - tick_prev) < 1000) { + HuPrcVSleep(); + } + HuSprAttrSet(group, 0, HUSPR_ATTR_DISPOFF); + HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); + group_thp = HuSprGrpCreate(1); + sprite_thp = HuTHPSprCreateVol("movie/opmov_a00.thp", 0, 100, 122); + HuSprGrpMemberSet(group_thp, 0, sprite_thp); + HuSprPosSet(group_thp, 0, 288, 240); + HuWinMesMaxSizeBetGet(win_size, MAKE_MESSID(54, 0), MAKE_MESSID(54, 4)); + demoWin = HuWinCreate(-10000, 448 - win_size[1], win_size[0], win_size[1], 0); + HuWinMesSpeedSet(demoWin, 0); + HuWinBGTPLvlSet(demoWin, 0); + HuWinPriSet(demoWin, 10); + HuWinAttrSet(demoWin, 0x800); + HuPrcSleep(5); + WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); + while (WipeStatGet()) { + HuPrcVSleep(); + } + skip_wait = FALSE; + while (!HuTHPEndCheck()) { + UpdateDemoMess(); + if (HuPadBtnDown[0] & (PAD_BUTTON_START | PAD_BUTTON_A)) { + skip_wait = TRUE; + break; + } + HuPrcVSleep(); + } + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); + while (WipeStatGet()) { + HuPrcVSleep(); + } + HuWinKill(demoWin); + HuTHPClose(); + HuPrcVSleep(); + HuSprGrpKill(group_thp); + if (!skip_wait) { + HuPrcSleep(60); + } + skip_wait = FALSE; + } + if (!TitleProc()) { + HuPrcSleep(60); + goto repeat; + } + WipeColorSet(255, 255, 255); + HuAudSStreamAllFadeOut(500); + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); + while (WipeStatGet()) { + HuPrcVSleep(); + } + HuPrcVSleep(); + if (omSysExitReq) { + omOvlReturnEx(1, 1); + } + else { + omOvlCallEx(OVL_MODESEL, 1, 0, 0); + } + for (i = 0; i < 4; i++) { + GWPlayerCfg[i].character = -1; + } + HuPrcEnd(); + do { + HuPrcVSleep(); + } while (1); } static s16 demoTimingTbl[] = { - 1686, 1785, - 1850, 1936, - 1993, 2097, - 2135, 2245, - 2258, 2320, - -1, -1, + 1686, + 1785, + 1850, + 1936, + 1993, + 2097, + 2135, + 2245, + 2258, + 2320, + -1, + -1, }; static void UpdateDemoMess(void) { - int frame = HuTHPFrameGet(); - int i; - for(i=0; demoTimingTbl[i*2] != -1; i++) { - if(frame == demoTimingTbl[i*2]) { - HuWinMesSet(demoWin, MAKE_MESSID(54, i)); - } - if(frame == demoTimingTbl[(i*2)+1]) { - HuWinHomeClear(demoWin); - } - } + int frame = HuTHPFrameGet(); + int i; + for (i = 0; demoTimingTbl[i * 2] != -1; i++) { + if (frame == demoTimingTbl[i * 2]) { + HuWinMesSet(demoWin, MAKE_MESSID(54, i)); + } + if (frame == demoTimingTbl[(i * 2) + 1]) { + HuWinHomeClear(demoWin); + } + } } -static u16 progressivePosTbl[] = { - 236, 313, - 353, 313 -}; +static u16 progressivePosTbl[] = { 236, 313, 353, 313 }; static void ProgressiveProc(void) { - s16 i; - s16 option; - s16 group; - s16 sprite; - AnimData *data; - option = 0; - if(OSGetResetCode() != OS_RESET_RESTART) { - return; - } - if(VIGetDTVStatus() != VI_NON_INTERLACE) { - OSSetProgressiveMode(OS_PROGRESSIVE_MODE_OFF); - return; - } - if(OSGetProgressiveMode() == OS_PROGRESSIVE_MODE_OFF && !(HU_PAD_BTN_ALL & PAD_BUTTON_B)) { - return; - } - if(OSGetProgressiveMode() == OS_PROGRESSIVE_MODE_ON) { - VIConfigure(&GXNtsc480IntDf); - VIFlush(); - } - group = HuSprGrpCreate(3); - data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CHOOSE_ANM); - sprite = HuSprCreate(data, 0, 0); - HuSprGrpMemberSet(group, 0, sprite); - HuSprPosSet(group, 0, 288, 240); - data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_ON_ANM); - sprite = HuSprCreate(data, 0, 0); - HuSprGrpMemberSet(group, 1, sprite); - HuSprPosSet(group, 1, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]); - data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_OFF_ANM); - sprite = HuSprCreate(data, 0, 0); - HuSprGrpMemberSet(group, 2, sprite); - HuSprPosSet(group, 2, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]); - HuSprAttrSet(group, 2, HUSPR_ATTR_DISPOFF); - WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); - while(WipeStatGet()) { - HuPrcVSleep(); - } - for(i=0; i<600; i++) { - if(HU_PAD_DSTK_ALL & (PAD_BUTTON_LEFT | PAD_BUTTON_RIGHT)) { - option ^= 1; - HuSprPosSet(group, 1, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]); - i=0; - } - if(HU_PAD_BTNDOWN_ALL & PAD_BUTTON_A) { - HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); - HuSprPosSet(group, 2, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]); - HuSprAttrReset(group, 2, HUSPR_ATTR_DISPOFF); - break; - } - HuPrcVSleep(); - } - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20); - while(WipeStatGet()) { - HuPrcVSleep(); - } - if(!option) { - OSSetProgressiveMode(OS_PROGRESSIVE_MODE_ON); - VIConfigure(&GXNtsc480Prog); - VIFlush(); - HuPrcSleep(100); - } else { - OSSetProgressiveMode(OS_PROGRESSIVE_MODE_OFF); - } - HuSprGrpKill(group); - group = HuSprGrpCreate(1); - if(!option) { - data = HuSprAnimReadFile(TITLE_PROGRESSIVE_ON_ANM); - } else { - data = HuSprAnimReadFile(TITLE_PROGRESSIVE_OFF_ANM); - } - sprite = HuSprCreate(data, 0, 0); - HuSprGrpMemberSet(group, 0, sprite); - HuSprPosSet(group, 0, 288, 240); - WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 20); - while(WipeStatGet()) { - HuPrcVSleep(); - } - HuPrcSleep(60); - for(i=0; i<180; i++) { - if(HU_PAD_BTNDOWN_ALL & PAD_BUTTON_A) { - break; - } - HuPrcVSleep(); - } - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); - while(WipeStatGet()) { - HuPrcVSleep(); - } - HuSprGrpKill(group); - HuPrcSleep(30); + s16 i; + s16 option; + s16 group; + s16 sprite; + AnimData *data; + option = 0; + if (OSGetResetCode() != OS_RESET_RESTART) { + return; + } + if (VIGetDTVStatus() != VI_NON_INTERLACE) { + OSSetProgressiveMode(OS_PROGRESSIVE_MODE_OFF); + return; + } + if (OSGetProgressiveMode() == OS_PROGRESSIVE_MODE_OFF && !(HU_PAD_BTN_ALL & PAD_BUTTON_B)) { + return; + } + if (OSGetProgressiveMode() == OS_PROGRESSIVE_MODE_ON) { + VIConfigure(&GXNtsc480IntDf); + VIFlush(); + } + group = HuSprGrpCreate(3); + data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CHOOSE_ANM); + sprite = HuSprCreate(data, 0, 0); + HuSprGrpMemberSet(group, 0, sprite); + HuSprPosSet(group, 0, 288, 240); + data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_ON_ANM); + sprite = HuSprCreate(data, 0, 0); + HuSprGrpMemberSet(group, 1, sprite); + HuSprPosSet(group, 1, progressivePosTbl[option * 2], progressivePosTbl[(option * 2) + 1]); + data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_OFF_ANM); + sprite = HuSprCreate(data, 0, 0); + HuSprGrpMemberSet(group, 2, sprite); + HuSprPosSet(group, 2, progressivePosTbl[option * 2], progressivePosTbl[(option * 2) + 1]); + HuSprAttrSet(group, 2, HUSPR_ATTR_DISPOFF); + WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); + while (WipeStatGet()) { + HuPrcVSleep(); + } + for (i = 0; i < 600; i++) { + if (HU_PAD_DSTK_ALL & (PAD_BUTTON_LEFT | PAD_BUTTON_RIGHT)) { + option ^= 1; + HuSprPosSet(group, 1, progressivePosTbl[option * 2], progressivePosTbl[(option * 2) + 1]); + i = 0; + } + if (HU_PAD_BTNDOWN_ALL & PAD_BUTTON_A) { + HuSprAttrSet(group, 1, HUSPR_ATTR_DISPOFF); + HuSprPosSet(group, 2, progressivePosTbl[option * 2], progressivePosTbl[(option * 2) + 1]); + HuSprAttrReset(group, 2, HUSPR_ATTR_DISPOFF); + break; + } + HuPrcVSleep(); + } + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20); + while (WipeStatGet()) { + HuPrcVSleep(); + } + if (!option) { + OSSetProgressiveMode(OS_PROGRESSIVE_MODE_ON); + VIConfigure(&GXNtsc480Prog); + VIFlush(); + HuPrcSleep(100); + } + else { + OSSetProgressiveMode(OS_PROGRESSIVE_MODE_OFF); + } + HuSprGrpKill(group); + group = HuSprGrpCreate(1); + if (!option) { + data = HuSprAnimReadFile(TITLE_PROGRESSIVE_ON_ANM); + } + else { + data = HuSprAnimReadFile(TITLE_PROGRESSIVE_OFF_ANM); + } + sprite = HuSprCreate(data, 0, 0); + HuSprGrpMemberSet(group, 0, sprite); + HuSprPosSet(group, 0, 288, 240); + WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 20); + while (WipeStatGet()) { + HuPrcVSleep(); + } + HuPrcSleep(60); + for (i = 0; i < 180; i++) { + if (HU_PAD_BTNDOWN_ALL & PAD_BUTTON_A) { + break; + } + HuPrcVSleep(); + } + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); + while (WipeStatGet()) { + HuPrcVSleep(); + } + HuSprGrpKill(group); + HuPrcSleep(30); } -u16 lbl_1_data_58[] = { - 1, 2 -}; +u16 lbl_1_data_58[] = { 1, 2 }; void fn_1_1178(void) { - s16 i; - for(i=0; i<1; i++) { - Vec pos, target, up; - float x, y, z; - - x = lbl_1_bss_3C[i].x; - y = lbl_1_bss_3C[i].y; - 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.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; - target.x = lbl_1_bss_24[i].x; - target.y = lbl_1_bss_24[i].y; - target.z = lbl_1_bss_24[i].z; - up.x = sind(y)*sind(x); - up.y = cosd(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); - } + s16 i; + for (i = 0; i < 1; i++) { + Vec pos, target, up; + float x, y, z; + + x = lbl_1_bss_3C[i].x; + y = lbl_1_bss_3C[i].y; + 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.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; + target.x = lbl_1_bss_24[i].x; + target.y = lbl_1_bss_24[i].y; + target.z = lbl_1_bss_24[i].z; + up.x = sind(y) * sind(x); + up.y = cosd(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); + } } -void fn_1_152C(void) { +void fn_1_152C(void) +{ Vec pos; Vec offset; Vec dir; Vec y_offset; - + f32 z_rot; 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)); 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)) - + 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.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)); 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.z * (offset.y * offset.z * (1.0f - cosd(z_rot)) - offset.x * 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)); + 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.y * (offset.y * offset.z * (1.0 - cosd(z_rot)) + offset.x * 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))); VECCrossProduct(&dir, &offset, &offset); VECNormalize(&offset, &offset); @@ -452,100 +460,100 @@ void fn_1_152C(void) { static void TitleInit(void) { - s16 model; - s16 sprite; - AnimData *sprite_data; - titleModel[0] = model = Hu3DModelCreateFile(TITLE_CHAR_HSF); - Hu3DModelAttrSet(model, 1); - Hu3DModelAttrSet(model, 0x40000001); - titleModel[1] = model = Hu3DModelCreateFile(TITLE_CUBE_HSF); - Hu3DModelAttrSet(model, 1); - Hu3DModelAttrSet(model, 0x40000001); - titleModel[2] = model = Hu3DModelCreateFile(TITLE_SKY_HSF); - Hu3DModelAttrSet(model, 1); - Hu3DModelAttrSet(model, 0x40000001); - Hu3DModelCameraInfoSet(model, 1); - Hu3DModelLightInfoSet(model, 1); - titleGroup = HuSprGrpCreate(4); - sprite_data = HuSprAnimReadFile(TITLE_BG_ANM); - sprite = HuSprCreate(sprite_data, 0, 0); - HuSprGrpMemberSet(titleGroup, 0, sprite); - HuSprAttrSet(titleGroup, 0, HUSPR_ATTR_DISPOFF); - HuSprDrawNoSet(titleGroup, 0, 127); - HuSprPosSet(titleGroup, 0, 288, 240); - sprite_data = HuSprAnimReadFile(TITLE_COPYRIGHT_ANM); - sprite = HuSprCreate(sprite_data, 1, 0); - HuSprGrpMemberSet(titleGroup, 1, sprite); - HuSprAttrSet(titleGroup, 1, HUSPR_ATTR_DISPOFF); - HuSprPosSet(titleGroup, 1, 288, 420); - sprite_data = HuSprAnimReadFile(TITLE_PRESS_START_ANM); - sprite = HuSprCreate(sprite_data, 2, 0); - HuSprGrpMemberSet(titleGroup, 2, sprite); - HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF|HUSPR_ATTR_LINEAR); - HuSprPosSet(titleGroup, 2, 288, 380); - sprite_data = HuSprAnimReadFile(TITLE_LOGO_ANM); - sprite = HuSprCreate(sprite_data, 0, 0); - HuSprGrpMemberSet(titleGroup, 3, sprite); - HuSprAttrSet(titleGroup, 3, HUSPR_ATTR_DISPOFF|HUSPR_ATTR_LINEAR); - HuSprPosSet(titleGroup, 3, 288, 200); + s16 model; + s16 sprite; + AnimData *sprite_data; + titleModel[0] = model = Hu3DModelCreateFile(TITLE_CHAR_HSF); + Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP); + titleModel[1] = model = Hu3DModelCreateFile(TITLE_CUBE_HSF); + Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP); + titleModel[2] = model = Hu3DModelCreateFile(TITLE_SKY_HSF); + Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP); + Hu3DModelCameraInfoSet(model, 1); + Hu3DModelLightInfoSet(model, 1); + titleGroup = HuSprGrpCreate(4); + sprite_data = HuSprAnimReadFile(TITLE_BG_ANM); + sprite = HuSprCreate(sprite_data, 0, 0); + HuSprGrpMemberSet(titleGroup, 0, sprite); + HuSprAttrSet(titleGroup, 0, HUSPR_ATTR_DISPOFF); + HuSprDrawNoSet(titleGroup, 0, 127); + HuSprPosSet(titleGroup, 0, 288, 240); + sprite_data = HuSprAnimReadFile(TITLE_COPYRIGHT_ANM); + sprite = HuSprCreate(sprite_data, 1, 0); + HuSprGrpMemberSet(titleGroup, 1, sprite); + HuSprAttrSet(titleGroup, 1, HUSPR_ATTR_DISPOFF); + HuSprPosSet(titleGroup, 1, 288, 420); + sprite_data = HuSprAnimReadFile(TITLE_PRESS_START_ANM); + sprite = HuSprCreate(sprite_data, 2, 0); + HuSprGrpMemberSet(titleGroup, 2, sprite); + HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF | HUSPR_ATTR_LINEAR); + HuSprPosSet(titleGroup, 2, 288, 380); + sprite_data = HuSprAnimReadFile(TITLE_LOGO_ANM); + sprite = HuSprCreate(sprite_data, 0, 0); + HuSprGrpMemberSet(titleGroup, 3, sprite); + HuSprAttrSet(titleGroup, 3, HUSPR_ATTR_DISPOFF | HUSPR_ATTR_LINEAR); + HuSprPosSet(titleGroup, 3, 288, 200); } static BOOL TitleProc(void) { - float scale; - float scale_time; - s32 y_offset[32]; - s16 i; - Hu3DModelAttrReset(titleModel[0], 1); - Hu3DModelAttrReset(titleModel[1], 1); - HuSprAttrReset(titleGroup, 0, HUSPR_ATTR_DISPOFF); - HuSprAttrReset(titleGroup, 1, HUSPR_ATTR_DISPOFF); - OSReport(">>>>>>>>MSM_SE_SEL_01 %d\n", msmSeGetEntryID(2092, y_offset)); - OSReport(">>>>>>>>SE Num %d\n", msmSeGetNumPlay(0)); - HuAudSStreamPlay(20); - WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); - while(WipeStatGet()) { - HuPrcVSleep(); - } - HuSprAttrReset(titleGroup, 3, HUSPR_ATTR_DISPOFF); - for(i=1; i<=50; i++) { - scale = (cosd(i*1.8)*10.0)+1.0; - HuSprScaleSet(titleGroup, 3, scale, scale); - HuSprTPLvlSet(titleGroup, 3, i/50.0); - HuPrcVSleep(); - } - HuSprAttrReset(titleGroup, 2, HUSPR_ATTR_DISPOFF); - for(i=scale_time=0; i<1800; i++) { - if(i <= 10) { - HuSprTPLvlSet(titleGroup, 2, i/10.0); - } - if(HuPadBtnDown[0] & PAD_BUTTON_START) { - s32 ret = HuAudFXPlay(2092); - if(ret < 0) { - OSReport(">>>>>Error %d\n", ret); - } - HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF); - return 1; - } - scale = (sind(i*scale_time)*0.1)+0.9; - scale_time += 0.05; - if(scale_time > 5) { - scale_time = 5; - } - HuSprScaleSet(titleGroup, 2, scale, scale); - HuPrcVSleep(); - } - WipeColorSet(255, 255, 255); - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); - while(WipeStatGet()) { - HuPrcVSleep(); - } - Hu3DModelAttrSet(titleModel[0], 1); - Hu3DModelAttrSet(titleModel[1], 1); - Hu3DModelAttrSet(titleModel[2], 1); - HuSprAttrSet(titleGroup, 0, HUSPR_ATTR_DISPOFF); - HuSprAttrSet(titleGroup, 1, HUSPR_ATTR_DISPOFF); - HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF); - HuSprAttrSet(titleGroup, 3, HUSPR_ATTR_DISPOFF); - return 0; + float scale; + float scale_time; + s32 y_offset[32]; + s16 i; + Hu3DModelAttrReset(titleModel[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(titleModel[1], HU3D_ATTR_DISPOFF); + HuSprAttrReset(titleGroup, 0, HUSPR_ATTR_DISPOFF); + HuSprAttrReset(titleGroup, 1, HUSPR_ATTR_DISPOFF); + OSReport(">>>>>>>>MSM_SE_SEL_01 %d\n", msmSeGetEntryID(2092, y_offset)); + OSReport(">>>>>>>>SE Num %d\n", msmSeGetNumPlay(0)); + HuAudSStreamPlay(20); + WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); + while (WipeStatGet()) { + HuPrcVSleep(); + } + HuSprAttrReset(titleGroup, 3, HUSPR_ATTR_DISPOFF); + for (i = 1; i <= 50; i++) { + scale = (cosd(i * 1.8) * 10.0) + 1.0; + HuSprScaleSet(titleGroup, 3, scale, scale); + HuSprTPLvlSet(titleGroup, 3, i / 50.0); + HuPrcVSleep(); + } + HuSprAttrReset(titleGroup, 2, HUSPR_ATTR_DISPOFF); + for (i = scale_time = 0; i < 1800; i++) { + if (i <= 10) { + HuSprTPLvlSet(titleGroup, 2, i / 10.0); + } + if (HuPadBtnDown[0] & PAD_BUTTON_START) { + s32 ret = HuAudFXPlay(2092); + if (ret < 0) { + OSReport(">>>>>Error %d\n", ret); + } + HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF); + return 1; + } + scale = (sind(i * scale_time) * 0.1) + 0.9; + scale_time += 0.05; + if (scale_time > 5) { + scale_time = 5; + } + HuSprScaleSet(titleGroup, 2, scale, scale); + HuPrcVSleep(); + } + WipeColorSet(255, 255, 255); + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); + while (WipeStatGet()) { + HuPrcVSleep(); + } + Hu3DModelAttrSet(titleModel[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(titleModel[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(titleModel[2], HU3D_ATTR_DISPOFF); + HuSprAttrSet(titleGroup, 0, HUSPR_ATTR_DISPOFF); + HuSprAttrSet(titleGroup, 1, HUSPR_ATTR_DISPOFF); + HuSprAttrSet(titleGroup, 2, HUSPR_ATTR_DISPOFF); + HuSprAttrSet(titleGroup, 3, HUSPR_ATTR_DISPOFF); + return 0; } diff --git a/src/REL/instDll/main.c b/src/REL/instDll/main.c index 6cc826f2..7de22da9 100644 --- a/src/REL/instDll/main.c +++ b/src/REL/instDll/main.c @@ -1,25 +1,28 @@ +#include "game/frand.h" +#include "game/gamework_data.h" +#include "game/hsfdraw.h" +#include "game/hsfman.h" #include "game/object.h" #include "game/objsub.h" #include "game/pad.h" -#include "game/gamework_data.h" -#include "game/hsfman.h" -#include "game/hsfdraw.h" #include "game/printfunc.h" -#include "game/frand.h" + #include "game/hsfmotion.h" -#include "game/wipe.h" +#include "game/audio.h" +#include "game/chrman.h" +#include "game/data.h" #include "game/flag.h" #include "game/minigame_seq.h" -#include "game/data.h" -#include "game/audio.h" -#include "game/window.h" #include "game/sprite.h" -#include "game/chrman.h" +#include "game/window.h" +#include "game/wipe.h" + -#include "math.h" #include "ext_math.h" +#include "math.h" + #include "rel_sqrt_consts.h" @@ -54,144 +57,126 @@ static void fn_1_4528(omObjData *object); void ObjectSetup(void) { - s32 i; - omOvlHisData *his; - s32 light; - OSReport("******* INST ObjectSetup *********\n"); - lbl_1_bss_58 = omInitObjMan(50, 8192); - omGameSysInit(lbl_1_bss_58); - lbl_1_bss_8 = GWLanguageGet(); - lbl_1_bss_14 = GWSystem.mg_next; - lbl_1_bss_10 = 0; - lbl_1_bss_4 = 0; - _ClearFlag(0x1000C); - for(i=0; HuSndGrpTbl[i].ovl != OVL_INVALID; i++) { - if(HuSndGrpTbl[i].ovl == mgInfoTbl[lbl_1_bss_14].ovl) { - break; - } - } - if(HuSndGrpTbl[i].ovl != OVL_INVALID) { - HuAudSndGrpSetSet(HuSndGrpTbl[i].grpset); - } - if(mgInfoTbl[lbl_1_bss_14].ovl == OVL_M411) { - if(GWMGTypeGet() == -1) { - GWMGTypeSet(frandmod(3)); - } - } else { - GWMGTypeSet(-1); - } - HuDataDirClose(mgInfoTbl[lbl_1_bss_14].data_dir); - his = omOvlHisGet(0); - omOvlHisChg(0, OVL_RESULT, his->event, his->stat); - if(omovlevtno == 0 && mgInfoTbl[lbl_1_bss_14].ovl == OVL_M430) { - s32 team_cnt[2]; - s32 team_players[2][2]; - team_cnt[0] = team_cnt[1] = 0; - for(i=0; i<4; i++) { - team_players[GWPlayerCfg[i].group][team_cnt[GWPlayerCfg[i].group]++] = i; - } - if(frandBool()) { - GWPlayerCfg[team_players[0][0]].group = 0; - GWPlayerCfg[team_players[0][1]].group = 1; - } else { - GWPlayerCfg[team_players[0][0]].group = 1; - GWPlayerCfg[team_players[0][1]].group = 0; - } - if(frandBool()) { - GWPlayerCfg[team_players[1][0]].group = 2; - GWPlayerCfg[team_players[1][1]].group = 3; - } else { - GWPlayerCfg[team_players[1][0]].group = 3; - GWPlayerCfg[team_players[1][1]].group = 2; - } - } - if(mgInfoTbl[lbl_1_bss_14].type == 3 - || mgInfoTbl[lbl_1_bss_14].type == 5 - || mgInfoTbl[lbl_1_bss_14].type == 6 - || mgInfoTbl[lbl_1_bss_14].type == 8 - || !_CheckFlag(FLAG_ID_MAKE(0, 11))) { - HuDataDirClose(DATADIR_INST); - omSysPauseEnable(1); - omOvlCallEx(mgInfoTbl[lbl_1_bss_14].ovl, 1, 0, 0); - return; - } - lbl_1_bss_40[0].x = -67.0f; - lbl_1_bss_40[0].y = 40.0f; - lbl_1_bss_40[0].z = 0.0f; - lbl_1_bss_28[0].x = 260.0f; - lbl_1_bss_28[0].y = -103.0f; - lbl_1_bss_28[0].z = -18.0f; - lbl_1_bss_20[0] = 2885.0f; - lbl_1_bss_C = 20.0f; - lbl_1_bss_12 = GWSystem.board; - if(mgBoardHostEnableF) { - lbl_1_bss_12 = 1; - } - lbl_1_bss_40[1].x = lbl_1_bss_40[1].y = lbl_1_bss_40[1].z = 0.0f; - lbl_1_bss_28[1].x = lbl_1_bss_28[1].y = lbl_1_bss_28[1].z = 0.0f; - lbl_1_bss_20[1] = 1000.0f; - omSysPauseEnable(0); - Hu3DCameraCreate(3); - Hu3DCameraPerspectiveSet(1, 30.0f, 20.0f, 15000.0f, 1.2f); - Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); - Hu3DCameraPerspectiveSet(2, 30.0f, 20.0f, 15000.0f, 1.2f); - Hu3DCameraViewportSet(2, 0, 0, 640, 480, 0, 1); - light = Hu3DGLightCreate(0, 100, 1000, 0, -0.5, -1, 255, 255, 255); - Hu3DGLightInfinitytSet(light); - HuPrcChildCreate(fn_1_994, 100, 12288, 0, lbl_1_bss_58); - HuPrcChildCreate(fn_1_17E4, 100, 12288, 0, lbl_1_bss_58); - HuPrcChildCreate(fn_1_220C, 100, 12288, 0, lbl_1_bss_58); - HuPrcChildCreate(fn_1_2804, 100, 12288, 0, lbl_1_bss_58); - HuPrcChildCreate(fn_1_2FA0, 100, 12288, 0, lbl_1_bss_58); - lbl_1_bss_5C = omAddObjEx(lbl_1_bss_58, 32730, 0, 0, -1, fn_1_4174); - omAddObjEx(lbl_1_bss_58, 0, 32, 32, -1, fn_1_4528); - HuAudSeqPlay(59); - Hu3DBGColorSet(0, 0, 0); - HuWinInit(1); + s32 i; + omOvlHisData *his; + s32 light; + OSReport("******* INST ObjectSetup *********\n"); + lbl_1_bss_58 = omInitObjMan(50, 8192); + omGameSysInit(lbl_1_bss_58); + lbl_1_bss_8 = GWLanguageGet(); + lbl_1_bss_14 = GWSystem.mg_next; + lbl_1_bss_10 = 0; + lbl_1_bss_4 = 0; + _ClearFlag(0x1000C); + for (i = 0; HuSndGrpTbl[i].ovl != OVL_INVALID; i++) { + if (HuSndGrpTbl[i].ovl == mgInfoTbl[lbl_1_bss_14].ovl) { + break; + } + } + if (HuSndGrpTbl[i].ovl != OVL_INVALID) { + HuAudSndGrpSetSet(HuSndGrpTbl[i].grpset); + } + if (mgInfoTbl[lbl_1_bss_14].ovl == OVL_M411) { + if (GWMGTypeGet() == -1) { + GWMGTypeSet(frandmod(3)); + } + } + else { + GWMGTypeSet(-1); + } + HuDataDirClose(mgInfoTbl[lbl_1_bss_14].data_dir); + his = omOvlHisGet(0); + omOvlHisChg(0, OVL_RESULT, his->event, his->stat); + if (omovlevtno == 0 && mgInfoTbl[lbl_1_bss_14].ovl == OVL_M430) { + s32 team_cnt[2]; + s32 team_players[2][2]; + team_cnt[0] = team_cnt[1] = 0; + for (i = 0; i < 4; i++) { + team_players[GWPlayerCfg[i].group][team_cnt[GWPlayerCfg[i].group]++] = i; + } + if (frandBool()) { + GWPlayerCfg[team_players[0][0]].group = 0; + GWPlayerCfg[team_players[0][1]].group = 1; + } + else { + GWPlayerCfg[team_players[0][0]].group = 1; + GWPlayerCfg[team_players[0][1]].group = 0; + } + if (frandBool()) { + GWPlayerCfg[team_players[1][0]].group = 2; + GWPlayerCfg[team_players[1][1]].group = 3; + } + else { + GWPlayerCfg[team_players[1][0]].group = 3; + GWPlayerCfg[team_players[1][1]].group = 2; + } + } + if (mgInfoTbl[lbl_1_bss_14].type == 3 || mgInfoTbl[lbl_1_bss_14].type == 5 || mgInfoTbl[lbl_1_bss_14].type == 6 + || mgInfoTbl[lbl_1_bss_14].type == 8 || !_CheckFlag(FLAG_ID_MAKE(0, 11))) { + HuDataDirClose(DATADIR_INST); + omSysPauseEnable(1); + omOvlCallEx(mgInfoTbl[lbl_1_bss_14].ovl, 1, 0, 0); + return; + } + lbl_1_bss_40[0].x = -67.0f; + lbl_1_bss_40[0].y = 40.0f; + lbl_1_bss_40[0].z = 0.0f; + lbl_1_bss_28[0].x = 260.0f; + lbl_1_bss_28[0].y = -103.0f; + lbl_1_bss_28[0].z = -18.0f; + lbl_1_bss_20[0] = 2885.0f; + lbl_1_bss_C = 20.0f; + lbl_1_bss_12 = GWSystem.board; + if (mgBoardHostEnableF) { + lbl_1_bss_12 = 1; + } + lbl_1_bss_40[1].x = lbl_1_bss_40[1].y = lbl_1_bss_40[1].z = 0.0f; + lbl_1_bss_28[1].x = lbl_1_bss_28[1].y = lbl_1_bss_28[1].z = 0.0f; + lbl_1_bss_20[1] = 1000.0f; + omSysPauseEnable(0); + Hu3DCameraCreate(3); + Hu3DCameraPerspectiveSet(1, 30.0f, 20.0f, 15000.0f, 1.2f); + Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); + Hu3DCameraPerspectiveSet(2, 30.0f, 20.0f, 15000.0f, 1.2f); + Hu3DCameraViewportSet(2, 0, 0, 640, 480, 0, 1); + light = Hu3DGLightCreate(0, 100, 1000, 0, -0.5, -1, 255, 255, 255); + Hu3DGLightInfinitytSet(light); + HuPrcChildCreate(fn_1_994, 100, 12288, 0, lbl_1_bss_58); + HuPrcChildCreate(fn_1_17E4, 100, 12288, 0, lbl_1_bss_58); + HuPrcChildCreate(fn_1_220C, 100, 12288, 0, lbl_1_bss_58); + HuPrcChildCreate(fn_1_2804, 100, 12288, 0, lbl_1_bss_58); + HuPrcChildCreate(fn_1_2FA0, 100, 12288, 0, lbl_1_bss_58); + lbl_1_bss_5C = omAddObjEx(lbl_1_bss_58, 32730, 0, 0, -1, fn_1_4174); + omAddObjEx(lbl_1_bss_58, 0, 32, 32, -1, fn_1_4528); + HuAudSeqPlay(59); + Hu3DBGColorSet(0, 0, 0); + HuWinInit(1); } -static s8 lbl_1_data_26[] = { - 3, 2, 1, 0, - 1, 1, 1, 0, - 1, 1, 0, 0, - 0, 1, 2, 3, - 3, 2, 1, 0, - 0, -1, -1, -1, - 0, -1, -1, -1, - 3, 2, 1, 0 -}; +static s8 lbl_1_data_26[] = { 3, 2, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 2, 3, 3, 2, 1, 0, 0, -1, -1, -1, 0, -1, -1, -1, 3, 2, 1, 0 }; -static s8 lbl_1_data_46[] = { - 4, - 4, - 4, - 4, - 4, - 1, - 1, - 4 -}; +static s8 lbl_1_data_46[] = { 4, 4, 4, 4, 4, 1, 1, 4 }; static s32 lbl_1_data_50[] = { - DATA_MAKE_NUM(DATADIR_INST, 0), - DATA_MAKE_NUM(DATADIR_INST, 1), - DATA_MAKE_NUM(DATADIR_INST, 2), - DATA_MAKE_NUM(DATADIR_INST, 3), - DATA_MAKE_NUM(DATADIR_INST, 4), - DATA_MAKE_NUM(DATADIR_INST, 0), - DATA_MAKE_NUM(DATADIR_INST, 5), - DATA_MAKE_NUM(DATADIR_INST, 0), + DATA_MAKE_NUM(DATADIR_INST, 0), + DATA_MAKE_NUM(DATADIR_INST, 1), + DATA_MAKE_NUM(DATADIR_INST, 2), + DATA_MAKE_NUM(DATADIR_INST, 3), + DATA_MAKE_NUM(DATADIR_INST, 4), + DATA_MAKE_NUM(DATADIR_INST, 0), + DATA_MAKE_NUM(DATADIR_INST, 5), + DATA_MAKE_NUM(DATADIR_INST, 0), }; static s32 lbl_1_data_70[] = { - DATA_MAKE_NUM(DATADIR_INST, 9), - DATA_MAKE_NUM(DATADIR_INST, 10), - DATA_MAKE_NUM(DATADIR_INST, 11), - DATA_MAKE_NUM(DATADIR_INST, 12), - DATA_MAKE_NUM(DATADIR_INST, 13), - DATA_MAKE_NUM(DATADIR_INST, 14), - DATA_MAKE_NUM(DATADIR_INST, 14), - DATA_MAKE_NUM(DATADIR_INST, 9), + DATA_MAKE_NUM(DATADIR_INST, 9), + DATA_MAKE_NUM(DATADIR_INST, 10), + DATA_MAKE_NUM(DATADIR_INST, 11), + DATA_MAKE_NUM(DATADIR_INST, 12), + DATA_MAKE_NUM(DATADIR_INST, 13), + DATA_MAKE_NUM(DATADIR_INST, 14), + DATA_MAKE_NUM(DATADIR_INST, 14), + DATA_MAKE_NUM(DATADIR_INST, 9), }; static void fn_1_50B0(ModelData *model, Mtx mtx); @@ -199,797 +184,768 @@ static void fn_1_5B64(ModelData *model, Mtx mtx); static void fn_1_994(void) { - - Vec pos; - Vec target; - Vec up; - - Vec spC; - Process *process; - - s16 i; - s16 model; - s16 num_coms; - s16 j; - s16 btns; - s32 status; - s32 done; - s16 group; - s32 pic; - omOvlHisData *his; - s16 sprite; - AnimData *anim; - float pos_z; - float time; - float fov_vel; - float rot_x; - - - process = HuPrcCurrentGet(); - status = -1; - group = HuSprGrpCreate(1); - anim = HuSprAnimRead(HuDataReadNum(lbl_1_data_70[mgInfoTbl[lbl_1_bss_14].type], MEMORY_DEFAULT_NUM)); - sprite = HuSprCreate(anim, 0, 0); - HuSprGrpMemberSet(group, 0, sprite); - HuSprGrpDrawNoSet(group, 127); - HuSprPosSet(group, 0, 288, 240); - if(GWMGTypeGet() == -1) { - pic = mgInfoTbl[lbl_1_bss_14].inst_pic[0]; - } else { - pic = mgInfoTbl[lbl_1_bss_14].inst_pic[GWMGTypeGet()]; - } - lbl_1_bss_18 = HuSprAnimRead(HuDataReadNumHeapShortForce(pic, MEMORY_DEFAULT_NUM, HEAP_DATA)); - Hu3DShadowCreate(20, 500, 8000); - Hu3DShadowTPLvlSet(0); - Hu3DShadowSizeSet(192); - target.x = target.y = target.z = 0; - pos.x = pos.z = 100.0f; - pos.y = 7000.0f; - up.x = up.y = 0.0f; - up.z = 1.0f; - Hu3DShadowPosSet(&pos, &up, &target); - model = Hu3DModelCreateFile(lbl_1_data_50[mgInfoTbl[lbl_1_bss_14].type]); - lbl_1_bss_1C = model; - Hu3DModelPosSet(model, 0, 2000, 0); - Hu3DModelAttrSet(model, 0x40000002); - Hu3DModelCameraSet(model, 1); - Hu3DModelShadowSet(model); - i = Hu3DHookFuncCreate(fn_1_5B64); - Hu3DModelPosSet(i, 0, -200, 0); - Hu3DModelCameraSet(i, 1); - WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); - while(WipeStatGet()) { - HuPrcVSleep(); - } - pos_z = -500.0f; - for(i=0; i<=50; i++) { - Hu3DModelPosSet(model, 0.0f, 2500.0*cosd(i*1.8f)-200.0, pos_z); - Hu3DModelRotSet(model, 0, 0, 45.0f*(1.0f-(i/50.0f))); - pos_z += 50.0/7.0; - Hu3DShadowTPLvlSet(0.5*(i/50.0f)); - HuPrcVSleep(); - } - HuAudFXPlay(1211); - Hu3DModelAttrReset(model, 0x40000002); - for(i=1; i<=20; i++) { - Hu3DModelPosSet(model, 0.0f, (200.0*(sind(i*2.25f)*(1.0/sind(45))))-200.0, pos_z); - rot_x = (20-i)*cosd(i*13.5f); - Hu3DModelRotSet(model, rot_x, 0.0f, 0.0f); - pos_z += 50.0/7.0; - HuPrcVSleep(); - } - Hu3DModelPosSet(model, 0.0f, 0.0f, 0.0f); - Hu3DModelAttrSet(model, 0x40000002); - HuPrcSleep(10); - HuAudFXPlay(1212); - Hu3DModelAttrReset(model, 0x40000002); - i = Hu3DHookFuncCreate(fn_1_50B0); - - Hu3DModelCameraSet(i, 1); - Hu3DModelPosSet(i, 0, 415, 0); - lbl_1_data_0 = 0; - while(Hu3DMotionTimeGet(model) < 80.0f) { - if(Hu3DMotionTimeGet(model) > 30.0f) { - lbl_1_data_0 = 2; - } - HuPrcVSleep(); - } - Hu3DModelAttrSet(model, 0x40000002); - HuDataDirClose(DATADIR_INST); - status = HuDataDirReadAsync(mgInfoTbl[lbl_1_bss_14].data_dir); - while(lbl_1_data_0 != 1) { - HuPrcVSleep(); - } - done = 0; - for(i=num_coms=0; i<4; i++) { - if(GWPlayerCfg[i].iscom) { - num_coms++; - } - } - i=0; - while(1) { - if(!done) { - for(btns=j=0; j<4; j++) { - if(!GWPlayerCfg[j].iscom) { - btns |= HuPadBtnDown[GWPlayerCfg[j].pad_idx]; - } - } - if((btns == PAD_BUTTON_START) || omSysExitReq || (num_coms == 4 && i > 60)) { - HuAudFXPlay(2); - done = 1; - } - if(btns == PAD_TRIGGER_Z) { - HuAudFXPlay(1); - done = 1; - his = omOvlHisGet(0); - omOvlHisChg(0, OVL_INST, 1, his->stat); - _SetFlag(0x1000C); - } - if(mgInstExitEnableF && (btns & PAD_BUTTON_B)) { - HuAudFXPlay(3); - if(status != -1) { - while(!HuDataGetAsyncStat(status)) { - HuPrcVSleep(); - } - } - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); - HuAudSeqAllFadeOut(500); - while(WipeStatGet()) { - HuPrcVSleep(); - } - HuDataDirClose(mgInfoTbl[lbl_1_bss_14].data_dir); - if(mgInfoTbl[lbl_1_bss_14].ovl == OVL_M430) { - for(num_coms=0; num_coms<4; num_coms++) { - GWPlayerCfg[num_coms].group = GWPlayerCfg[num_coms].group/2; - } - } - omOvlReturnEx(1, 1); - HuPrcEnd(); - while(1) { - HuPrcVSleep(); - } - } - } - if(!lbl_1_bss_4 || !done) { - HuPrcVSleep(); - i++; - continue; - } else { - break; - } - } - if(status != -1) { - while(!HuDataGetAsyncStat(status)) { - HuPrcVSleep(); - } - } - spC = lbl_1_bss_40[0]; - pos = lbl_1_bss_28[0]; - pos_z = lbl_1_bss_20[0]; - WipeColorSet(255, 255, 255); - lbl_1_data_0 = 3; - HuPrcSleep(20); - lbl_1_data_0 = 4; - HuPrcSleep(10); - - Hu3DModelAttrReset(model, 0x40000002); - HuPrcSleep(10); - fov_vel = 0; - for(i=0; i<=60; i++) { - time = i/60.0f; - lbl_1_bss_40[0].x = spC.x+((-65.0f-spC.x)*time); - lbl_1_bss_40[0].y = spC.y+((8.0f-spC.y)*time); - lbl_1_bss_40[0].z = spC.z+(-spC.z)*time; - lbl_1_bss_28[0].x = pos.x+((17.0f-pos.x)*time); - lbl_1_bss_28[0].y = pos.y+((5.0f-pos.y)*time); - lbl_1_bss_28[0].z = pos.z+((-188.0f-pos.z)*time); - lbl_1_bss_20[0] = pos_z+((1173.0f-pos_z)*time); - if(i == 30) { - HuAudFXPlay(1210); - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); - HuAudSeqAllFadeOut(1000); - } - if(i == 40) { - Hu3DModelAttrSet(model, 0x40000002); - } - if(i > 20) { - lbl_1_bss_C += fov_vel; - fov_vel += 0.04; - } - HuPrcVSleep(); - } - while(WipeStatGet()) { - lbl_1_bss_C += fov_vel; - fov_vel += 0.04; - HuPrcVSleep(); - } - lbl_1_data_0 = 6; - HuPrcVSleep(); - omSysPauseEnable(1); - if(omSysExitReq) { - HuDataDirClose(mgInfoTbl[lbl_1_bss_14].data_dir); - omOvlReturnEx(1, 1); - } else { - omOvlCallEx(mgInfoTbl[lbl_1_bss_14].ovl, 1, 0, 0); - } - HuPrcEnd(); - while(1) { - HuPrcVSleep(); - } + + Vec pos; + Vec target; + Vec up; + + Vec spC; + Process *process; + + s16 i; + s16 model; + s16 num_coms; + s16 j; + s16 btns; + s32 status; + s32 done; + s16 group; + s32 pic; + omOvlHisData *his; + s16 sprite; + AnimData *anim; + float pos_z; + float time; + float fov_vel; + float rot_x; + + process = HuPrcCurrentGet(); + status = -1; + group = HuSprGrpCreate(1); + anim = HuSprAnimRead(HuDataReadNum(lbl_1_data_70[mgInfoTbl[lbl_1_bss_14].type], MEMORY_DEFAULT_NUM)); + sprite = HuSprCreate(anim, 0, 0); + HuSprGrpMemberSet(group, 0, sprite); + HuSprGrpDrawNoSet(group, 127); + HuSprPosSet(group, 0, 288, 240); + if (GWMGTypeGet() == -1) { + pic = mgInfoTbl[lbl_1_bss_14].inst_pic[0]; + } + else { + pic = mgInfoTbl[lbl_1_bss_14].inst_pic[GWMGTypeGet()]; + } + lbl_1_bss_18 = HuSprAnimRead(HuDataReadNumHeapShortForce(pic, MEMORY_DEFAULT_NUM, HEAP_DATA)); + Hu3DShadowCreate(20, 500, 8000); + Hu3DShadowTPLvlSet(0); + Hu3DShadowSizeSet(192); + target.x = target.y = target.z = 0; + pos.x = pos.z = 100.0f; + pos.y = 7000.0f; + up.x = up.y = 0.0f; + up.z = 1.0f; + Hu3DShadowPosSet(&pos, &up, &target); + model = Hu3DModelCreateFile(lbl_1_data_50[mgInfoTbl[lbl_1_bss_14].type]); + lbl_1_bss_1C = model; + Hu3DModelPosSet(model, 0, 2000, 0); + Hu3DModelAttrSet(model, HU3D_MOTATTR_PAUSE); + Hu3DModelCameraSet(model, 1); + Hu3DModelShadowSet(model); + i = Hu3DHookFuncCreate(fn_1_5B64); + Hu3DModelPosSet(i, 0, -200, 0); + Hu3DModelCameraSet(i, 1); + WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); + while (WipeStatGet()) { + HuPrcVSleep(); + } + pos_z = -500.0f; + for (i = 0; i <= 50; i++) { + Hu3DModelPosSet(model, 0.0f, 2500.0 * cosd(i * 1.8f) - 200.0, pos_z); + Hu3DModelRotSet(model, 0, 0, 45.0f * (1.0f - (i / 50.0f))); + pos_z += 50.0 / 7.0; + Hu3DShadowTPLvlSet(0.5 * (i / 50.0f)); + HuPrcVSleep(); + } + HuAudFXPlay(1211); + Hu3DModelAttrReset(model, 0x40000002); + for (i = 1; i <= 20; i++) { + Hu3DModelPosSet(model, 0.0f, (200.0 * (sind(i * 2.25f) * (1.0 / sind(45)))) - 200.0, pos_z); + rot_x = (20 - i) * cosd(i * 13.5f); + Hu3DModelRotSet(model, rot_x, 0.0f, 0.0f); + pos_z += 50.0 / 7.0; + HuPrcVSleep(); + } + Hu3DModelPosSet(model, 0.0f, 0.0f, 0.0f); + Hu3DModelAttrSet(model, HU3D_MOTATTR_PAUSE); + HuPrcSleep(10); + HuAudFXPlay(1212); + Hu3DModelAttrReset(model, 0x40000002); + i = Hu3DHookFuncCreate(fn_1_50B0); + + Hu3DModelCameraSet(i, 1); + Hu3DModelPosSet(i, 0, 415, 0); + lbl_1_data_0 = 0; + while (Hu3DMotionTimeGet(model) < 80.0f) { + if (Hu3DMotionTimeGet(model) > 30.0f) { + lbl_1_data_0 = 2; + } + HuPrcVSleep(); + } + Hu3DModelAttrSet(model, HU3D_MOTATTR_PAUSE); + HuDataDirClose(DATADIR_INST); + status = HuDataDirReadAsync(mgInfoTbl[lbl_1_bss_14].data_dir); + while (lbl_1_data_0 != 1) { + HuPrcVSleep(); + } + done = 0; + for (i = num_coms = 0; i < 4; i++) { + if (GWPlayerCfg[i].iscom) { + num_coms++; + } + } + i = 0; + while (1) { + if (!done) { + for (btns = j = 0; j < 4; j++) { + if (!GWPlayerCfg[j].iscom) { + btns |= HuPadBtnDown[GWPlayerCfg[j].pad_idx]; + } + } + if ((btns == PAD_BUTTON_START) || omSysExitReq || (num_coms == 4 && i > 60)) { + HuAudFXPlay(2); + done = 1; + } + if (btns == PAD_TRIGGER_Z) { + HuAudFXPlay(1); + done = 1; + his = omOvlHisGet(0); + omOvlHisChg(0, OVL_INST, 1, his->stat); + _SetFlag(0x1000C); + } + if (mgInstExitEnableF && (btns & PAD_BUTTON_B)) { + HuAudFXPlay(3); + if (status != -1) { + while (!HuDataGetAsyncStat(status)) { + HuPrcVSleep(); + } + } + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); + HuAudSeqAllFadeOut(500); + while (WipeStatGet()) { + HuPrcVSleep(); + } + HuDataDirClose(mgInfoTbl[lbl_1_bss_14].data_dir); + if (mgInfoTbl[lbl_1_bss_14].ovl == OVL_M430) { + for (num_coms = 0; num_coms < 4; num_coms++) { + GWPlayerCfg[num_coms].group = GWPlayerCfg[num_coms].group / 2; + } + } + omOvlReturnEx(1, 1); + HuPrcEnd(); + while (1) { + HuPrcVSleep(); + } + } + } + if (!lbl_1_bss_4 || !done) { + HuPrcVSleep(); + i++; + continue; + } + else { + break; + } + } + if (status != -1) { + while (!HuDataGetAsyncStat(status)) { + HuPrcVSleep(); + } + } + spC = lbl_1_bss_40[0]; + pos = lbl_1_bss_28[0]; + pos_z = lbl_1_bss_20[0]; + WipeColorSet(255, 255, 255); + lbl_1_data_0 = 3; + HuPrcSleep(20); + lbl_1_data_0 = 4; + HuPrcSleep(10); + + Hu3DModelAttrReset(model, 0x40000002); + HuPrcSleep(10); + fov_vel = 0; + for (i = 0; i <= 60; i++) { + time = i / 60.0f; + lbl_1_bss_40[0].x = spC.x + ((-65.0f - spC.x) * time); + lbl_1_bss_40[0].y = spC.y + ((8.0f - spC.y) * time); + lbl_1_bss_40[0].z = spC.z + (-spC.z) * time; + lbl_1_bss_28[0].x = pos.x + ((17.0f - pos.x) * time); + lbl_1_bss_28[0].y = pos.y + ((5.0f - pos.y) * time); + lbl_1_bss_28[0].z = pos.z + ((-188.0f - pos.z) * time); + lbl_1_bss_20[0] = pos_z + ((1173.0f - pos_z) * time); + if (i == 30) { + HuAudFXPlay(1210); + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30); + HuAudSeqAllFadeOut(1000); + } + if (i == 40) { + Hu3DModelAttrSet(model, HU3D_MOTATTR_PAUSE); + } + if (i > 20) { + lbl_1_bss_C += fov_vel; + fov_vel += 0.04; + } + HuPrcVSleep(); + } + while (WipeStatGet()) { + lbl_1_bss_C += fov_vel; + fov_vel += 0.04; + HuPrcVSleep(); + } + lbl_1_data_0 = 6; + HuPrcVSleep(); + omSysPauseEnable(1); + if (omSysExitReq) { + HuDataDirClose(mgInfoTbl[lbl_1_bss_14].data_dir); + omOvlReturnEx(1, 1); + } + else { + omOvlCallEx(mgInfoTbl[lbl_1_bss_14].ovl, 1, 0, 0); + } + HuPrcEnd(); + while (1) { + HuPrcVSleep(); + } } -static char *lbl_1_data_B0[] = { - "p_pos_a", - "p_pos_b", - "p_pos_c", - "p_pos_d" -}; +static char *lbl_1_data_B0[] = { "p_pos_a", "p_pos_b", "p_pos_c", "p_pos_d" }; -static u8 lbl_1_data_C0[] = { - 8, - 0, - 12, - 4 -}; +static u8 lbl_1_data_C0[] = { 8, 0, 12, 4 }; static void fn_1_17E4(void) { - float tplvl; - s16 i; - s16 j; - s16 time; - s16 player_cnt; - s16 order; - s16 type; - s16 group_type; - s16 group; - ModelData *model; - s16 player_mdl[4]; - s16 char_tbl[4]; - s16 platform_mdl[4]; - s16 player_order[4]; - s16 mot_tbl[4][3]; - Vec player_pos[4]; - - type = mgInfoTbl[lbl_1_bss_14].type; - player_cnt = lbl_1_data_46[type]; - for(i=0; i= 0) { - tplvl = 0.1*time; - Hu3DModelTPLvlSet(platform_mdl[j], 0.5*tplvl); - Hu3DModelScaleSet(platform_mdl[j], tplvl, tplvl, tplvl); - } - } - } - HuPrcVSleep(); - } - model = &Hu3DData[player_mdl[0]]; - while(lbl_1_data_0 != 4) { - HuPrcVSleep(); - } - for(i=0; i<=45; i++) { - for(j=0; j= 0) { + tplvl = 0.1 * time; + Hu3DModelTPLvlSet(platform_mdl[j], 0.5 * tplvl); + Hu3DModelScaleSet(platform_mdl[j], tplvl, tplvl, tplvl); + } + } + } + HuPrcVSleep(); + } + model = &Hu3DData[player_mdl[0]]; + while (lbl_1_data_0 != 4) { + HuPrcVSleep(); + } + for (i = 0; i <= 45; i++) { + for (j = 0; j < player_cnt; j++) { + time = i - lbl_1_data_C0[j]; + if (time < 0) { + continue; + } + if (time == 0) { + Hu3DModelAttrReset(player_mdl[j], 0x40000001); + CharModelVoiceEnableSet(char_tbl[i], mot_tbl[i][1], 1); + CharModelMotionSet(char_tbl[j], mot_tbl[j][1]); + } + if (time <= 30) { + Hu3DModelPosSet(player_mdl[j], player_pos[j].x, player_pos[j].y + (300.0 * sind(time * 9.0f)), player_pos[j].z - (time * 20)); + if (time <= 10) { + tplvl = 1 - (0.1 * time); + Hu3DModelTPLvlSet(platform_mdl[j], 0.5 * tplvl); + Hu3DModelScaleSet(platform_mdl[j], tplvl, tplvl, tplvl); + } + } + } + HuPrcVSleep(); + } + HuPrcEnd(); + while (1) { + HuPrcVSleep(); + } } static s32 lbl_1_data_C4[] = { - DATA_MAKE_NUM(DATADIR_INST, 19), - DATA_MAKE_NUM(DATADIR_INST, 20), - DATA_MAKE_NUM(DATADIR_INST, 21), - DATA_MAKE_NUM(DATADIR_INST, 22), - DATA_MAKE_NUM(DATADIR_INST, 23), - DATA_MAKE_NUM(DATADIR_INST, 24), - DATA_MAKE_NUM(DATADIR_INST, 25), - DATA_MAKE_NUM(DATADIR_INST, 26), - DATA_MAKE_NUM(DATADIR_INST, 27), - DATA_MAKE_NUM(DATADIR_INST, 28), - DATA_MAKE_NUM(DATADIR_INST, 29), - DATA_MAKE_NUM(DATADIR_INST, 30), - DATA_MAKE_NUM(DATADIR_INST, 31), - DATA_MAKE_NUM(DATADIR_INST, 32), - DATA_MAKE_NUM(DATADIR_INST, 33), - DATA_MAKE_NUM(DATADIR_INST, 34), - DATA_MAKE_NUM(DATADIR_INST, 35), - DATA_MAKE_NUM(DATADIR_INST, 36), + DATA_MAKE_NUM(DATADIR_INST, 19), + DATA_MAKE_NUM(DATADIR_INST, 20), + DATA_MAKE_NUM(DATADIR_INST, 21), + DATA_MAKE_NUM(DATADIR_INST, 22), + DATA_MAKE_NUM(DATADIR_INST, 23), + DATA_MAKE_NUM(DATADIR_INST, 24), + DATA_MAKE_NUM(DATADIR_INST, 25), + DATA_MAKE_NUM(DATADIR_INST, 26), + DATA_MAKE_NUM(DATADIR_INST, 27), + DATA_MAKE_NUM(DATADIR_INST, 28), + DATA_MAKE_NUM(DATADIR_INST, 29), + DATA_MAKE_NUM(DATADIR_INST, 30), + DATA_MAKE_NUM(DATADIR_INST, 31), + DATA_MAKE_NUM(DATADIR_INST, 32), + DATA_MAKE_NUM(DATADIR_INST, 33), + DATA_MAKE_NUM(DATADIR_INST, 34), + DATA_MAKE_NUM(DATADIR_INST, 35), + DATA_MAKE_NUM(DATADIR_INST, 36), }; -static u16 lbl_1_data_10C[] = { - 55, - 57, - 68, - 67, - 64, - 65, - 75, - 76, - 70, - 71, - 62, - 62 -}; +static u16 lbl_1_data_10C[] = { 55, 57, 68, 67, 64, 65, 75, 76, 70, 71, 62, 62 }; static void fn_1_220C(void) { - float ofs_x; - s16 i; - s16 model; - s16 motion[2]; - ModelData *model_ptr; - model = Hu3DModelCreateFile(lbl_1_data_C4[lbl_1_bss_12*3]); - motion[0] = Hu3DJointMotionFile(model, lbl_1_data_C4[(lbl_1_bss_12*3)+1]); - motion[1] = Hu3DJointMotionFile(model, lbl_1_data_C4[(lbl_1_bss_12*3)+2]); - Hu3DMotionSet(model, motion[1]); - if(lbl_1_bss_12 == 3) { - ofs_x = 50; - } else { - ofs_x = 0; - } - Hu3DModelPosSet(model, -353.0f+ofs_x, -150, 356); - Hu3DModelRotSet(model, 0, 90, 0); - Hu3DModelCameraSet(model, 2); - while(lbl_1_data_0 != 2) { - HuPrcVSleep(); - } - HuPrcSleep(30); - Hu3DMotionTimeSet(model, 40); - HuAudFXPlay(lbl_1_data_10C[lbl_1_bss_12*2]); - for(i=0; i<=20; i++) { - Hu3DModelPosSet(model, -153.0f-(100.0f-(100.0f*(i/20.0f))), (100.0*sind(i*9.0f)) + -150.0 + ofs_x, 356.0f); - HuPrcVSleep(); - } - for(i=0; i<=10; i++) { - Hu3DModelPosSet(model, -153.0f, (15.0*sind(i*18.0f)) + -150.f + ofs_x, 356.0f); - Hu3DModelRotSet(model, 0.0f, 90-((i/10.0f)*70), 0); - HuPrcVSleep(); - } - Hu3DMotionShiftSet(model, motion[0], 0, 10, HU3D_MOTATTR_LOOP); - model_ptr = &Hu3DData[model]; - while(1) { - fontcolor = FONT_COLOR_RED; - if(lbl_1_data_0 == 3) { - break; - } - HuPrcVSleep(); - } - Hu3DMotionSet(model, motion[1]); - HuPrcSleep(20); - HuAudFXPlay(lbl_1_data_10C[(lbl_1_bss_12*2)+1]); - for(i=0; i<=30; i++) { - Hu3DModelPosSet(model, (i*5)-153, (50.0*sind(i*9.0f)) + -150.0 + ofs_x, (i*20)+356); - HuPrcVSleep(); - } - HuPrcEnd(); - while(1) { - HuPrcVSleep(); - } + float ofs_x; + s16 i; + s16 model; + s16 motion[2]; + ModelData *model_ptr; + model = Hu3DModelCreateFile(lbl_1_data_C4[lbl_1_bss_12 * 3]); + motion[0] = Hu3DJointMotionFile(model, lbl_1_data_C4[(lbl_1_bss_12 * 3) + 1]); + motion[1] = Hu3DJointMotionFile(model, lbl_1_data_C4[(lbl_1_bss_12 * 3) + 2]); + Hu3DMotionSet(model, motion[1]); + if (lbl_1_bss_12 == 3) { + ofs_x = 50; + } + else { + ofs_x = 0; + } + Hu3DModelPosSet(model, -353.0f + ofs_x, -150, 356); + Hu3DModelRotSet(model, 0, 90, 0); + Hu3DModelCameraSet(model, 2); + while (lbl_1_data_0 != 2) { + HuPrcVSleep(); + } + HuPrcSleep(30); + Hu3DMotionTimeSet(model, 40); + HuAudFXPlay(lbl_1_data_10C[lbl_1_bss_12 * 2]); + for (i = 0; i <= 20; i++) { + Hu3DModelPosSet(model, -153.0f - (100.0f - (100.0f * (i / 20.0f))), (100.0 * sind(i * 9.0f)) + -150.0 + ofs_x, 356.0f); + HuPrcVSleep(); + } + for (i = 0; i <= 10; i++) { + Hu3DModelPosSet(model, -153.0f, (15.0 * sind(i * 18.0f)) + -150.f + ofs_x, 356.0f); + Hu3DModelRotSet(model, 0.0f, 90 - ((i / 10.0f) * 70), 0); + HuPrcVSleep(); + } + Hu3DMotionShiftSet(model, motion[0], 0, 10, HU3D_MOTATTR_LOOP); + model_ptr = &Hu3DData[model]; + while (1) { + fontcolor = FONT_COLOR_RED; + if (lbl_1_data_0 == 3) { + break; + } + HuPrcVSleep(); + } + Hu3DMotionSet(model, motion[1]); + HuPrcSleep(20); + HuAudFXPlay(lbl_1_data_10C[(lbl_1_bss_12 * 2) + 1]); + for (i = 0; i <= 30; i++) { + Hu3DModelPosSet(model, (i * 5) - 153, (50.0 * sind(i * 9.0f)) + -150.0 + ofs_x, (i * 20) + 356); + HuPrcVSleep(); + } + HuPrcEnd(); + while (1) { + HuPrcVSleep(); + } } static void fn_1_2804(void) { - float pos_x; - s16 i; - s16 window; - s16 window_other; - s16 j; - s16 insert_idx; - s16 rtrig; - s16 groupCnt[4]; - s16 charTbl[4][4]; - - window = HuWinExCreateStyled(640, 320, 412, 120, -1, 1); - while(lbl_1_data_0 != 0) { - HuPrcVSleep(); - } - HuWinDispOn(window); - HuWinMesSet(window, mgInfoTbl[lbl_1_bss_14].inst_mess[0]); - HuWinMesPalSet(window, 7, 0, 0, 192); - HuWinMesSpeedSet(window, 0); - window_other = HuWinExCreateStyled(640, 320, 412, 120, -1, 1); - HuWinDispOn(window_other); - HuWinMesSpeedSet(window_other, 0); - HuWinPosSet(window_other, 142.0f, 640.0f); - lbl_1_bss_6 = 0; - for(i=0; i<4; i++) { - groupCnt[i] = 0; - } - - for(i=0; i<4; i++) { - charTbl[GWPlayerCfg[i].group][groupCnt[GWPlayerCfg[i].group]] = GWPlayerCfg[i].character; - groupCnt[GWPlayerCfg[i].group]++; - } - for(i=insert_idx=0; i<4; i++) { - for(j=0; j= 4) { - lbl_1_bss_6 = 0; - } - HuWinMesSet(window, mgInfoTbl[lbl_1_bss_14].inst_mess[lbl_1_bss_6]); - HuWinMesPalSet(window, 7, 0, 0, 192); - HuWinPosSet(window_other, 142.0f, 320.0f); - for(i=0; i<=10; i++) { - HuWinPosSet(window_other, 30.0*sind(i*9.0f)+142.0, 160.0*(1.0-cosd(i*9.0f))+320.0); - HuPrcVSleep(); - } - HuPrcSleep(5); - } - lbl_1_bss_4 = 1; - HuPrcVSleep(); - } - for(i=0; i<=20; i++) { - pos_x = 500.0*(1.0-cosd(i*4.5f))+142.0; - HuWinPosSet(window, pos_x, 320); - HuPrcVSleep(); - } - HuWinAllKill(); - HuPrcEnd(); - while(1) { - HuPrcVSleep(); - } + float pos_x; + s16 i; + s16 window; + s16 window_other; + s16 j; + s16 insert_idx; + s16 rtrig; + s16 groupCnt[4]; + s16 charTbl[4][4]; + + window = HuWinExCreateStyled(640, 320, 412, 120, -1, 1); + while (lbl_1_data_0 != 0) { + HuPrcVSleep(); + } + HuWinDispOn(window); + HuWinMesSet(window, mgInfoTbl[lbl_1_bss_14].inst_mess[0]); + HuWinMesPalSet(window, 7, 0, 0, 192); + HuWinMesSpeedSet(window, 0); + window_other = HuWinExCreateStyled(640, 320, 412, 120, -1, 1); + HuWinDispOn(window_other); + HuWinMesSpeedSet(window_other, 0); + HuWinPosSet(window_other, 142.0f, 640.0f); + lbl_1_bss_6 = 0; + for (i = 0; i < 4; i++) { + groupCnt[i] = 0; + } + + for (i = 0; i < 4; i++) { + charTbl[GWPlayerCfg[i].group][groupCnt[GWPlayerCfg[i].group]] = GWPlayerCfg[i].character; + groupCnt[GWPlayerCfg[i].group]++; + } + for (i = insert_idx = 0; i < 4; i++) { + for (j = 0; j < groupCnt[i]; j++) { + HuWinInsertMesSet(window, charTbl[i][j], (s16)insert_idx); + insert_idx++; + } + } + while (lbl_1_data_0 != 2) { + HuPrcVSleep(); + } + HuPrcSleep(40); + for (i = 0; i <= 20; i++) { + pos_x = 500.0 * cosd(i * 4.5f) + 142.0; + HuWinPosSet(window, pos_x, 320); + HuPrcVSleep(); + } + lbl_1_data_0 = 1; + while (lbl_1_data_0 != 3) { + for (i = rtrig = 0; i < 4; i++) { + if (!GWPlayerCfg[i].iscom) { + rtrig |= HuPadTrigR[GWPlayerCfg[i].pad_idx] & 0xC0; + } + } + if (rtrig) { + HuAudFXPlay(1213); + lbl_1_bss_4 = 0; + HuWinMesSet(window_other, mgInfoTbl[lbl_1_bss_14].inst_mess[lbl_1_bss_6]); + HuWinMesPalSet(window_other, 7, 0, 0, 192); + lbl_1_bss_6++; + if (mgInfoTbl[lbl_1_bss_14].inst_mess[lbl_1_bss_6] == 0) { + lbl_1_bss_6++; + } + if (lbl_1_bss_6 >= 4) { + lbl_1_bss_6 = 0; + } + HuWinMesSet(window, mgInfoTbl[lbl_1_bss_14].inst_mess[lbl_1_bss_6]); + HuWinMesPalSet(window, 7, 0, 0, 192); + HuWinPosSet(window_other, 142.0f, 320.0f); + for (i = 0; i <= 10; i++) { + HuWinPosSet(window_other, 30.0 * sind(i * 9.0f) + 142.0, 160.0 * (1.0 - cosd(i * 9.0f)) + 320.0); + HuPrcVSleep(); + } + HuPrcSleep(5); + } + lbl_1_bss_4 = 1; + HuPrcVSleep(); + } + for (i = 0; i <= 20; i++) { + pos_x = 500.0 * (1.0 - cosd(i * 4.5f)) + 142.0; + HuWinPosSet(window, pos_x, 320); + HuPrcVSleep(); + } + HuWinAllKill(); + HuPrcEnd(); + while (1) { + HuPrcVSleep(); + } } -static float lbl_1_data_124[] = { - 420, - 70, - 488, - 186, - 476, - 242, - 400, - 292 -}; +static float lbl_1_data_124[] = { 420, 70, 488, 186, 476, 242, 400, 292 }; static void fn_1_2FA0(void) { - float temp_f31; - float temp_f30; - float temp_f29; - float temp_f28; - float temp_f27; - s16 temp_r31; - s16 temp_r30; - char *temp_r29; - AnimData *temp_r28; - s16 temp_r27; - s16 temp_r26; - s16 temp_r25; - s16 temp_r24; - s16 temp_r23; - s16 temp_r22; - u16 temp_r21; - char *temp_r20; - s16 temp_r17; - s16 spA; - s16 sp8; - - s16 spC[2]; - s16 sp10[4]; - SeqWork work; - temp_r21 = 0; - for(temp_r31=0; temp_r31<16; temp_r31++) { - work.sprite[temp_r31] = work.spr_grp[temp_r31] = -1; - } - temp_r20 = MessData_MesPtrGet(messDataPtr, mgInfoTbl[lbl_1_bss_14].name_mess); - temp_r29 = temp_r20; - temp_r31 = 0; - temp_r26 = 0; - while(1) { - if(*temp_r29 == 0 || *temp_r29 == 10) { - if(*temp_r29 == 0) { - temp_r31 = 1; - } - *temp_r29 = 0; - fn_1_5EA4(&work, temp_r20, (lbl_1_bss_8 == 0) ? 1 : 0); - HuSprGrpPosSet(work.spr_grp[temp_r26], 288.0f, 240.0f); - spC[temp_r26] = work.alt_word_len; - temp_r26++; - if(temp_r31) { - break; - } - temp_r20 = temp_r29+1; - } - - temp_r29++; - } - if(temp_r26 == 1) { - temp_r22 = spC[0]; - temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 18)); - temp_f29 = ((576.0f-temp_r22)-24.0f)-16.0f+227.0f; - temp_f28 = 78; - temp_f27 = 0.5f; - } else { - temp_r22 = (spC[0] > spC[1]) ? spC[0] : spC[1]; - temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 15)); - temp_f29 = ((576.0f-temp_r22)-24.0f)-16.0f+172.0f; - temp_f28 = 84; - temp_f27 = 1.0f; - } - temp_r25 = HuSprGrpCreate(1); - temp_r17 = HuSprCreate(temp_r28, 0, 0); - HuSprGrpMemberSet(temp_r25, 0, temp_r17); - HuSprPriSet(temp_r25, 0, 100); - HuSprGrpPosSet(temp_r25, 10000, 70); - HuSprScaleSet(temp_r25, 0, 1.0f, temp_f27); - for(temp_r31=0; temp_r31 0.0f) { - if(temp_f30 <= 20.0f) { - temp_f31 = 300.0*cosd(4.5f*temp_f30)+lbl_1_data_124[2]; - HuSprGrpPosSet(temp_r24, temp_f31, 186.0f); - temp_f31 = 300.0*cosd(4.5f*temp_f30)+(lbl_1_data_124[2]-88.0f); - HuWinPosSet(sp10[0], 16.0f+temp_f31, 168.0f); - } - } - temp_f30 = temp_r31-6; - if(temp_f30 > 0.0f) { - if(temp_f30 <= 20.0f) { - temp_f31 = 300.0*cosd(4.5f*temp_f30)+lbl_1_data_124[4]; - HuSprGrpPosSet(temp_r23, temp_f31, 242.0f); - temp_f31 = 300.0*cosd(4.5f*temp_f30)+(lbl_1_data_124[4]-100.0f); - HuWinPosSet(sp10[1], 16.0f+temp_f31, 224.0f); - } - } - temp_f30 = temp_r31-9; - if(temp_f30 > 0.0f) { - if(temp_f30 <= 20.0f) { - temp_f31 = 300.0*cosd(4.5f*temp_f30)+(lbl_1_data_124[6]-217.0f); - HuWinPosSet(sp10[2], 16.0f+temp_f31, 274.0f); - } - } - HuPrcVSleep(); - } - while(lbl_1_data_0 != 3) { - if(temp_r21 != lbl_1_bss_6) { - temp_f31 = 16.0f+(lbl_1_data_124[6]-217.0f); - HuWinMesSet(temp_r27, MAKE_MESSID(0x24, 0x02)+lbl_1_bss_10+temp_r21); - temp_r21 = lbl_1_bss_6; - if(lbl_1_bss_6 == 1) { - if(mgInfoTbl[lbl_1_bss_14].inst_mess[2]) { - HuWinMesSet(sp10[2], MAKE_MESSID(0x24, 0x02)+lbl_1_bss_10+lbl_1_bss_6); - } else { - HuWinMesSet(sp10[2], MAKE_MESSID(0x24, 0x06)+lbl_1_bss_10); - } - } else { - HuWinMesSet(sp10[2], MAKE_MESSID(0x24, 0x02)+lbl_1_bss_10+lbl_1_bss_6); - } - for(temp_r31=0; temp_r31<=10; temp_r31++) { - HuWinPosSet(temp_r27, 30.0*sind(temp_r31*9.0f)+temp_f31, 200.0*(1.0-cosd(temp_r31*9.0f))+274.0); - HuPrcVSleep(); - } - } - HuPrcVSleep(); - } - for(temp_r31=0; temp_r31<20; temp_r31++) { - temp_f30 = 1.0-cosd(temp_r31*4.5f); - temp_f31 = temp_f29+(500.0f*temp_f30); - HuSprGrpPosSet(temp_r25, temp_f31, temp_f28); - temp_f31 = ((576.0f-(work.alt_word_len/2))-24.0f)+(500.0f*temp_f30); - for(temp_r30=0; temp_r30 spC[1]) ? spC[0] : spC[1]; + temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 15)); + temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 172.0f; + temp_f28 = 84; + temp_f27 = 1.0f; + } + temp_r25 = HuSprGrpCreate(1); + temp_r17 = HuSprCreate(temp_r28, 0, 0); + HuSprGrpMemberSet(temp_r25, 0, temp_r17); + HuSprPriSet(temp_r25, 0, 100); + HuSprGrpPosSet(temp_r25, 10000, 70); + HuSprScaleSet(temp_r25, 0, 1.0f, temp_f27); + for (temp_r31 = 0; temp_r31 < temp_r26; temp_r31++) { + HuSprGrpPosSet(work.spr_grp[temp_r31], 1000, 70); + } + temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 16)); + temp_r24 = HuSprGrpCreate(1); + spA = HuSprCreate(temp_r28, 0, 0); + HuSprGrpMemberSet(temp_r24, 0, spA); + HuSprGrpPosSet(temp_r24, 1000, 186); + HuSprPriSet(temp_r24, 0, 1000); + sp10[0] = HuWinCreate(1000, 186, 456, 42, 0); + HuWinMesSet(sp10[0], MAKE_MESSID(0x24, lbl_1_bss_10)); + HuWinBGTPLvlSet(sp10[0], 0.0f); + temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 17)); + temp_r23 = HuSprGrpCreate(1); + sp8 = HuSprCreate(temp_r28, 0, 0); + HuSprGrpMemberSet(temp_r23, 0, sp8); + HuSprGrpPosSet(temp_r23, 1000, 242); + HuSprPriSet(temp_r23, 0, 1000); + sp10[1] = HuWinCreate(1000, 242, 456, 42, 0); + HuWinMesSet(sp10[1], lbl_1_bss_10 + MAKE_MESSID(0x24, 0x01)); + HuWinBGTPLvlSet(sp10[1], 0.0f); + temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 18)); + sp10[2] = HuWinCreate(1000, 292, 456, 42, 0); + HuWinMesSet(sp10[2], lbl_1_bss_10 + MAKE_MESSID(0x24, 0x02)); + HuWinBGTPLvlSet(sp10[2], 0.0f); + HuWinMesSpeedSet(sp10[2], 0); + temp_r31 = HuWinAnimSet(sp10[2], temp_r28, 0, 201, 18); + HuWinSprPriSet(sp10[2], temp_r31, 1000); + temp_r27 = HuWinCreate(1000, 292, 456, 42, 0); + HuWinBGTPLvlSet(temp_r27, 0.0f); + HuWinMesSpeedSet(temp_r27, 0); + HuWinMesSet(temp_r27, lbl_1_bss_10 + MAKE_MESSID(0x24, 0x02)); + temp_r31 = HuWinAnimSet(temp_r27, temp_r28, 0, 201, 18); + HuWinPriSet(temp_r27, 10); + HuWinSprPriSet(temp_r27, temp_r31, 11); + while (lbl_1_data_0 != 0) { + HuPrcVSleep(); + } + for (temp_r31 = 0; temp_r31 < 36; temp_r31++) { + temp_f30 = temp_r31; + if (temp_f30 <= 20.0f) { + temp_f31 = 300.0 * cosd(4.5f * temp_f30) + temp_f29; + HuSprGrpPosSet(temp_r25, temp_f31, temp_f28); + temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (576.0f - (temp_r22 / 2) - 24.0f); + for (temp_r30 = 0; temp_r30 < temp_r26; temp_r30++) { + HuSprGrpPosSet(work.spr_grp[temp_r30], temp_f31, (temp_r30 * 28) + 70); + } + } + temp_f30 = temp_r31 - 3; + if (temp_f30 > 0.0f) { + if (temp_f30 <= 20.0f) { + temp_f31 = 300.0 * cosd(4.5f * temp_f30) + lbl_1_data_124[2]; + HuSprGrpPosSet(temp_r24, temp_f31, 186.0f); + temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[2] - 88.0f); + HuWinPosSet(sp10[0], 16.0f + temp_f31, 168.0f); + } + } + temp_f30 = temp_r31 - 6; + if (temp_f30 > 0.0f) { + if (temp_f30 <= 20.0f) { + temp_f31 = 300.0 * cosd(4.5f * temp_f30) + lbl_1_data_124[4]; + HuSprGrpPosSet(temp_r23, temp_f31, 242.0f); + temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[4] - 100.0f); + HuWinPosSet(sp10[1], 16.0f + temp_f31, 224.0f); + } + } + temp_f30 = temp_r31 - 9; + if (temp_f30 > 0.0f) { + if (temp_f30 <= 20.0f) { + temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[6] - 217.0f); + HuWinPosSet(sp10[2], 16.0f + temp_f31, 274.0f); + } + } + HuPrcVSleep(); + } + while (lbl_1_data_0 != 3) { + if (temp_r21 != lbl_1_bss_6) { + temp_f31 = 16.0f + (lbl_1_data_124[6] - 217.0f); + HuWinMesSet(temp_r27, MAKE_MESSID(0x24, 0x02) + lbl_1_bss_10 + temp_r21); + temp_r21 = lbl_1_bss_6; + if (lbl_1_bss_6 == 1) { + if (mgInfoTbl[lbl_1_bss_14].inst_mess[2]) { + HuWinMesSet(sp10[2], MAKE_MESSID(0x24, 0x02) + lbl_1_bss_10 + lbl_1_bss_6); + } + else { + HuWinMesSet(sp10[2], MAKE_MESSID(0x24, 0x06) + lbl_1_bss_10); + } + } + else { + HuWinMesSet(sp10[2], MAKE_MESSID(0x24, 0x02) + lbl_1_bss_10 + lbl_1_bss_6); + } + for (temp_r31 = 0; temp_r31 <= 10; temp_r31++) { + HuWinPosSet(temp_r27, 30.0 * sind(temp_r31 * 9.0f) + temp_f31, 200.0 * (1.0 - cosd(temp_r31 * 9.0f)) + 274.0); + HuPrcVSleep(); + } + } + HuPrcVSleep(); + } + for (temp_r31 = 0; temp_r31 < 20; temp_r31++) { + temp_f30 = 1.0 - cosd(temp_r31 * 4.5f); + temp_f31 = temp_f29 + (500.0f * temp_f30); + HuSprGrpPosSet(temp_r25, temp_f31, temp_f28); + temp_f31 = ((576.0f - (work.alt_word_len / 2)) - 24.0f) + (500.0f * temp_f30); + for (temp_r30 = 0; temp_r30 < temp_r26; temp_r30++) { + HuSprGrpPosSet(work.spr_grp[temp_r30], temp_f31, (temp_r30 * 28) + 70); + } + temp_f31 = lbl_1_data_124[2] + (300.0f * temp_f30); + HuSprGrpPosSet(temp_r24, temp_f31, 186.0f); + temp_f31 = (lbl_1_data_124[2] - 88.0f) + (300.0f * temp_f30); + HuWinPosSet(sp10[0], 16.0f + temp_f31, 168); + temp_f31 = lbl_1_data_124[4] + (300.0f * temp_f30); + HuSprGrpPosSet(temp_r23, temp_f31, 242.0f); + temp_f31 = (lbl_1_data_124[4] - 100.0f) + (300.0f * temp_f30); + HuWinPosSet(sp10[1], 16.0f + temp_f31, 224); + temp_f31 = (lbl_1_data_124[6] - 184.0f) + (400.0f * temp_f30); + HuWinPosSet(sp10[2], 16.0f + temp_f31, 274); + HuPrcVSleep(); + } + MGSeqSprKill(&work); + HuPrcEnd(); + while (1) { + HuPrcVSleep(); + } } -static u16 lbl_1_data_144[2] = { - 1, - 2 -}; +static u16 lbl_1_data_144[2] = { 1, 2 }; static void fn_1_4174(omObjData *object) { - s16 i; - for(i=0; i<2; i++) { - Vec pos, target, up; - float x, y, z; - - x = lbl_1_bss_40[i].x; - y = lbl_1_bss_40[i].y; - z = lbl_1_bss_40[i].z; - - pos.x = (((sind(y)*cosd(x))*lbl_1_bss_20[i])+lbl_1_bss_28[i].x); - pos.y = (-sind(x)*lbl_1_bss_20[i])+lbl_1_bss_28[i].y; - pos.z = ((cosd(y)*cosd(x))*lbl_1_bss_20[i])+lbl_1_bss_28[i].z; - target.x = lbl_1_bss_28[i].x; - target.y = lbl_1_bss_28[i].y; - target.z = lbl_1_bss_28[i].z; - up.x = sind(y)*sind(x); - up.y = cosd(x); - up.z = cosd(y)*sind(x); - Hu3DCameraPosSet(lbl_1_data_144[i], pos.x, pos.y, pos.z, up.x, up.y, up.z, target.x, target.y, target.z); - } -} + s16 i; + for (i = 0; i < 2; i++) { + Vec pos, target, up; + float x, y, z; + x = lbl_1_bss_40[i].x; + y = lbl_1_bss_40[i].y; + z = lbl_1_bss_40[i].z; + + pos.x = (((sind(y) * cosd(x)) * lbl_1_bss_20[i]) + lbl_1_bss_28[i].x); + pos.y = (-sind(x) * lbl_1_bss_20[i]) + lbl_1_bss_28[i].y; + pos.z = ((cosd(y) * cosd(x)) * lbl_1_bss_20[i]) + lbl_1_bss_28[i].z; + target.x = lbl_1_bss_28[i].x; + target.y = lbl_1_bss_28[i].y; + target.z = lbl_1_bss_28[i].z; + up.x = sind(y) * sind(x); + up.y = cosd(x); + up.z = cosd(y) * sind(x); + Hu3DCameraPosSet(lbl_1_data_144[i], pos.x, pos.y, pos.z, up.x, up.y, up.z, target.x, target.y, target.z); + } +} static void fn_1_4528(omObjData *object) { - Vec pos; + Vec pos; Vec offset; Vec dir; Vec y_offset; - + f32 z_rot; s8 stick_pos; @@ -1001,7 +957,7 @@ static void fn_1_4528(omObjData *object) if (lbl_1_bss_20[0] < 100.0f) { lbl_1_bss_20[0] = 100.0f; } - pos.x = lbl_1_bss_28[0].x + (lbl_1_bss_20[0] * (sind(lbl_1_bss_40[0].y) * cosd(lbl_1_bss_40[0].x))); + pos.x = lbl_1_bss_28[0].x + (lbl_1_bss_20[0] * (sind(lbl_1_bss_40[0].y) * cosd(lbl_1_bss_40[0].x))); pos.y = (lbl_1_bss_28[0].y + (lbl_1_bss_20[0] * -sind(lbl_1_bss_40[0].x))); pos.z = (lbl_1_bss_28[0].z + (lbl_1_bss_20[0] * (cosd(lbl_1_bss_40[0].y) * cosd(lbl_1_bss_40[0].x)))); offset.x = lbl_1_bss_28[0].x - pos.x; @@ -1012,16 +968,16 @@ static void fn_1_4528(omObjData *object) dir.z = (cosd(lbl_1_bss_40[0].y) * sind(lbl_1_bss_40[0].x)); z_rot = lbl_1_bss_40[0].z; 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.z * (offset.x * offset.z * (1.0f - cosd(z_rot)) + offset.y * 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)); 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.z * (offset.y * offset.z * (1.0f - cosd(z_rot)) - offset.x * 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)); + 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.y * (offset.y * offset.z * (1.0 - cosd(z_rot)) + offset.x * 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))); VECCrossProduct(&dir, &offset, &offset); VECNormalize(&offset, &offset); @@ -1046,133 +1002,134 @@ static float lbl_1_data_14C = 34; static void fn_1_50B0(ModelData *model, Mtx mtx) { - Mtx final; - Mtx inv_camera; - Mtx lookatlight; - Mtx light; - Mtx lookat; - Vec pos; - Vec up; - Vec target; + Mtx final; + Mtx inv_camera; + Mtx lookatlight; + Mtx light; + Mtx lookat; + Vec pos; + Vec up; + Vec target; - s32 x; - s32 y; - u8 r; - u8 g; - u8 b; - s16 row; - - s32 sp8 = 0; - GXClearVtxDesc(); - GXSetVtxDesc(GX_VA_POS, GX_DIRECT); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); - GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGB, GX_RGB8, 0); - GXSetVtxDesc(GX_VA_NRM, GX_DIRECT); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0); - target.x = target.z = 0.0f; - target.x = lbl_1_data_14C*sind(lbl_1_bss_40[0].y); - target.z = lbl_1_data_14C*cosd(lbl_1_bss_40[0].y); - target.y = 415.0f; - pos.x = (sind(lbl_1_bss_40[0].y)*cosd(lbl_1_bss_40[0].x)*lbl_1_bss_20[0])+lbl_1_bss_28[0].x; - pos.y = (-sind(lbl_1_bss_40[0].x)*lbl_1_bss_20[0])+lbl_1_bss_28[0].y; - pos.z = (cos(M_PI*lbl_1_bss_40[0].y/180.0)*cosd(lbl_1_bss_40[0].x)*lbl_1_bss_20[0])+lbl_1_bss_28[0].z; - up.x = -sind(lbl_1_bss_40[0].y); - up.z = -cosd(lbl_1_bss_40[0].y); - up.y = 0; - MTXLookAt(lookat, &pos, &up, &target); - MTXLightPerspective(light, lbl_1_bss_C, 1.2f, 0.5f, -0.5f, 0.5f, 0.5f); - HuSprTexLoad(lbl_1_bss_18, 0, 0, GX_CLAMP, GX_CLAMP, GX_NEAR); - MTXInverse(Hu3DCameraMtx, inv_camera); - MTXConcat(inv_camera, mtx, final); - MTXConcat(light, lookat, lookatlight); - MTXConcat(lookatlight, final, final); - GXLoadTexMtxImm(final, GX_TEXMTX0, GX_MTX3x4); - GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, GX_TEXMTX0); - GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); - GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_TEXC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); - GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_KONST, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); - GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_FALSE, GX_TEVPREV); - GXSetNumTexGens(1); - GXSetNumTevStages(1); - GXSetNumChans(1); - GXSetChanCtrl(GX_COLOR0, GX_TRUE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT0, GX_DF_CLAMP, GX_AF_NONE); - GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP); - GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE); - GXLoadPosMtxImm(mtx, GX_PNMTX0); - MTXInvXpose(mtx, final); - GXLoadNrmMtxImm(final, GX_PNMTX0); - GXBegin(GX_TRIANGLES, GX_VTXFMT0, 2400); - row = 0; - for(y=-310; y<310; y += 31) { - for(x=-310; x<310; x += 31) { - if(row++ & 0x1) { - r = g = 0; - b = 255; - } else { - r = 255; - g = b = 0; - } - GXPosition3f32(x, 0.0f, y); - GXPosition3f32(0.0f, 1.0f, 0.0f); - GXColor3u8(r, g, b); - GXPosition3f32(x+31, 0.0f, y); - GXPosition3f32(0.0f, 1.0f, 0.0f); - GXColor3u8(r, g, b); - GXPosition3f32(x+31, 0.0f, y+31); - GXPosition3f32(0.0f, 1.0f, 0.0f); - GXColor3u8(r, g, b); - GXPosition3f32(x, 0.0f, y); - GXPosition3f32(0.0f, 1.0f, 0.0f); - GXColor3u8(r, g, b); - GXPosition3f32(x+31, 0.0f, y+31); - GXPosition3f32(0.0f, 1.0f, 0.0f); - GXColor3u8(r, g, b); - GXPosition3f32(x, 0.0f, y+31); - GXPosition3f32(0.0f, 1.0f, 0.0f); - GXColor3u8(r, g, b); - } - row++; - } - GXEnd(); + s32 x; + s32 y; + u8 r; + u8 g; + u8 b; + s16 row; + + s32 sp8 = 0; + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGB, GX_RGB8, 0); + GXSetVtxDesc(GX_VA_NRM, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0); + target.x = target.z = 0.0f; + target.x = lbl_1_data_14C * sind(lbl_1_bss_40[0].y); + target.z = lbl_1_data_14C * cosd(lbl_1_bss_40[0].y); + target.y = 415.0f; + pos.x = (sind(lbl_1_bss_40[0].y) * cosd(lbl_1_bss_40[0].x) * lbl_1_bss_20[0]) + lbl_1_bss_28[0].x; + pos.y = (-sind(lbl_1_bss_40[0].x) * lbl_1_bss_20[0]) + lbl_1_bss_28[0].y; + pos.z = (cos(M_PI * lbl_1_bss_40[0].y / 180.0) * cosd(lbl_1_bss_40[0].x) * lbl_1_bss_20[0]) + lbl_1_bss_28[0].z; + up.x = -sind(lbl_1_bss_40[0].y); + up.z = -cosd(lbl_1_bss_40[0].y); + up.y = 0; + MTXLookAt(lookat, &pos, &up, &target); + MTXLightPerspective(light, lbl_1_bss_C, 1.2f, 0.5f, -0.5f, 0.5f, 0.5f); + HuSprTexLoad(lbl_1_bss_18, 0, 0, GX_CLAMP, GX_CLAMP, GX_NEAR); + MTXInverse(Hu3DCameraMtx, inv_camera); + MTXConcat(inv_camera, mtx, final); + MTXConcat(light, lookat, lookatlight); + MTXConcat(lookatlight, final, final); + GXLoadTexMtxImm(final, GX_TEXMTX0, GX_MTX3x4); + GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, GX_TEXMTX0); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_TEXC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_KONST, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_FALSE, GX_TEVPREV); + GXSetNumTexGens(1); + GXSetNumTevStages(1); + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0, GX_TRUE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT0, GX_DF_CLAMP, GX_AF_NONE); + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP); + GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE); + GXLoadPosMtxImm(mtx, GX_PNMTX0); + MTXInvXpose(mtx, final); + GXLoadNrmMtxImm(final, GX_PNMTX0); + GXBegin(GX_TRIANGLES, GX_VTXFMT0, 2400); + row = 0; + for (y = -310; y < 310; y += 31) { + for (x = -310; x < 310; x += 31) { + if (row++ & 0x1) { + r = g = 0; + b = 255; + } + else { + r = 255; + g = b = 0; + } + GXPosition3f32(x, 0.0f, y); + GXPosition3f32(0.0f, 1.0f, 0.0f); + GXColor3u8(r, g, b); + GXPosition3f32(x + 31, 0.0f, y); + GXPosition3f32(0.0f, 1.0f, 0.0f); + GXColor3u8(r, g, b); + GXPosition3f32(x + 31, 0.0f, y + 31); + GXPosition3f32(0.0f, 1.0f, 0.0f); + GXColor3u8(r, g, b); + GXPosition3f32(x, 0.0f, y); + GXPosition3f32(0.0f, 1.0f, 0.0f); + GXColor3u8(r, g, b); + GXPosition3f32(x + 31, 0.0f, y + 31); + GXPosition3f32(0.0f, 1.0f, 0.0f); + GXColor3u8(r, g, b); + GXPosition3f32(x, 0.0f, y + 31); + GXPosition3f32(0.0f, 1.0f, 0.0f); + GXColor3u8(r, g, b); + } + row++; + } + GXEnd(); } static void fn_1_5B64(ModelData *model, Mtx mtx) { - s32 sp8 = 0; - GXTexObj tex; - Mtx final; - Mtx inv_camera; - Mtx shadow; - GXClearVtxDesc(); - GXSetVtxDesc(GX_VA_POS, GX_DIRECT); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); - GXInitTexObj(&tex, Hu3DShadowData.unk_04, Hu3DShadowData.unk_02, Hu3DShadowData.unk_02, GX_TF_I8, GX_CLAMP, GX_CLAMP, GX_FALSE); - GXInitTexObjLOD(&tex, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1); + s32 sp8 = 0; + GXTexObj tex; + Mtx final; + Mtx inv_camera; + Mtx shadow; + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + GXInitTexObj(&tex, Hu3DShadowData.unk_04, Hu3DShadowData.unk_02, Hu3DShadowData.unk_02, GX_TF_I8, GX_CLAMP, GX_CLAMP, GX_FALSE); + GXInitTexObjLOD(&tex, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1); GXLoadTexObj(&tex, 0); - MTXInverse(Hu3DCameraMtx, inv_camera); - MTXConcat(inv_camera, mtx, final); - MTXConcat(Hu3DShadowData.unk_68, Hu3DShadowData.unk_38, shadow); - MTXConcat(shadow, final, final); - GXLoadTexMtxImm(final, GX_TEXMTX9, GX_MTX3x4); - GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, GX_TEXMTX9); - GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); - GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_TEXC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); - GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_KONST, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); - GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_FALSE, GX_TEVPREV); - GXSetNumTexGens(1); - GXSetNumTevStages(1); - GXSetNumChans(1); - GXSetChanCtrl(GX_COLOR0, GX_TRUE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT0, GX_DF_CLAMP, GX_AF_NONE); - GXSetBlendMode(GX_BM_BLEND, GX_BL_ZERO, GX_BL_INVDSTCLR, GX_LO_NOOP); - GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE); - GXLoadPosMtxImm(mtx, GX_PNMTX0); - GXBegin(GX_QUADS, GX_VTXFMT0, 4); - GXPosition3f32(-2000.0f, 0, -2000.0f); - GXPosition3f32(2000.0f, 0, -2000.0f); - GXPosition3f32(2000.0f, 0, 2000.0f); - GXPosition3f32(-2000.0f, 0, 2000.0f); - GXEnd(); + MTXInverse(Hu3DCameraMtx, inv_camera); + MTXConcat(inv_camera, mtx, final); + MTXConcat(Hu3DShadowData.unk_68, Hu3DShadowData.unk_38, shadow); + MTXConcat(shadow, final, final); + GXLoadTexMtxImm(final, GX_TEXMTX9, GX_MTX3x4); + GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, GX_TEXMTX9); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_TEXC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_KONST, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_FALSE, GX_TEVPREV); + GXSetNumTexGens(1); + GXSetNumTevStages(1); + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0, GX_TRUE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT0, GX_DF_CLAMP, GX_AF_NONE); + GXSetBlendMode(GX_BM_BLEND, GX_BL_ZERO, GX_BL_INVDSTCLR, GX_LO_NOOP); + GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE); + GXLoadPosMtxImm(mtx, GX_PNMTX0); + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition3f32(-2000.0f, 0, -2000.0f); + GXPosition3f32(2000.0f, 0, -2000.0f); + GXPosition3f32(2000.0f, 0, 2000.0f); + GXPosition3f32(-2000.0f, 0, 2000.0f); + GXEnd(); } diff --git a/src/REL/m401Dll/main.c b/src/REL/m401Dll/main.c index 59196d4c..09b7a1cf 100644 --- a/src/REL/m401Dll/main.c +++ b/src/REL/m401Dll/main.c @@ -606,7 +606,7 @@ void fn_2_20B0(omObjData *object) Vec sp8; HsfObject *temp_r30 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[4]); temp_r30->type = 2; - Hu3DModelAttrReset(object->model[7], 1); + Hu3DModelAttrReset(object->model[7], HU3D_ATTR_DISPOFF); sp8.x = 0; sp8.y = -370; sp8.z = -43000; @@ -617,8 +617,8 @@ void fn_2_20B0(omObjData *object) sp8.z = -32000; lbl_2_bss_CC = fn_2_10A88(&sp8, 3); lbl_2_bss_90[2] = HuAudFXEmiterPlay(1291, &sp8); - Hu3DModelAttrReset(object->model[2], 1); - Hu3DModelAttrSet(object->model[2], 0xC0000001); + Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[2], HU3D_CLUSTER_ATTR_LOOP); } 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]); s32 temp_r28; temp_r29->type = 2; - Hu3DModelAttrReset(object->model[0], 1); - Hu3DModelAttrReset(object->model[1], 1); - Hu3DModelAttrSet(object->model[0], 0x40000001); - Hu3DModelAttrSet(object->model[1], 0x40000001); - Hu3DModelAttrReset(object->model[3], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_LOOP); + Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF); lbl_2_bss_44.x = 0; lbl_2_bss_44.y = 100; lbl_2_bss_44.z = 0; @@ -663,8 +663,8 @@ void fn_2_21F8(omObjData *object) sp14.z = -4720; lbl_2_bss_D4 = fn_2_10A88(&sp14, 3); lbl_2_bss_90[1] = HuAudFXEmiterPlay(1291, &sp14); - Hu3DModelAttrReset(object->model[2], 1); - Hu3DModelAttrSet(object->model[2], 0xC0000001); + Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[2], HU3D_CLUSTER_ATTR_LOOP); temp_r28 = 4; for (temp_r30 = 0; temp_r30 < temp_r28; temp_r30++) { sp8.x = -340.0f + ((1.0f / 255.0f) * (680.0f * frandu8())); @@ -690,13 +690,13 @@ void fn_2_26E0(omObjData *object) Vec sp8; Work2FA4 *temp_r30; s32 temp_r29; - Hu3DModelAttrReset(object->model[4], 1); + Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF); Hu3DModelClusterAttrSet(object->model[4], 0, 0xC0000001); - Hu3DModelAttrReset(object->model[8], 1); - Hu3DModelAttrSet(object->model[8], 0x40000001); - Hu3DModelAttrSet(object->model[4], 0x40000001); + Hu3DModelAttrReset(object->model[8], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[8], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(object->model[4], HU3D_MOTATTR_LOOP); Hu3DModelShadowMapSet(object->model[4]); - Hu3DModelAttrReset(object->model[5], 1); + Hu3DModelAttrReset(object->model[5], HU3D_ATTR_DISPOFF); Hu3DModelPosSet(object->model[4], 0, 0, 0); Hu3DModelAmbSet(object->model[4], 1, 1, 1); Hu3DModelPosSet(object->model[5], 0, 0, 0); @@ -711,7 +711,7 @@ void fn_2_26E0(omObjData *object) temp_r30->unk14[1].z = -50; 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); - 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[9], object->motion[2]); @@ -725,18 +725,18 @@ void fn_2_26E0(omObjData *object) temp_r30->unk14[1].z = -50; 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); - 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[9], object->motion[2]); } - Hu3DModelAttrSet(object->model[9], 0x40000001); - Hu3DModelAttrSet(object->model[10], 0x40000001); + Hu3DModelAttrSet(object->model[9], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(object->model[10], HU3D_MOTATTR_LOOP); Hu3DModelRotSet(object->model[9], 0, 90, 0); Hu3DModelPosSet(object->model[11], 210, 1018, 0); Hu3DModelRotSet(object->model[11], 0, 90, 0); - Hu3DModelAttrReset(object->model[11], 1); - Hu3DModelAttrSet(object->model[11], 0x40000001); + Hu3DModelAttrReset(object->model[11], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[11], HU3D_MOTATTR_LOOP); sp2C.x = 0; sp2C.y = 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]); temp_r30->type = -1; - Hu3DModelAttrSet(object->model[3], 1); + Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); 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[1]); } @@ -784,8 +784,8 @@ void fn_2_2E20(omObjData *object) { HsfObject *temp_r30 = Hu3DModelObjPtrGet(object->model[0], lbl_2_data_124[3]); temp_r30->type = -1; - Hu3DModelAttrSet(lbl_2_bss_100[0]->model[0], 1); - Hu3DModelAttrSet(lbl_2_bss_100[1]->model[0], 1); + Hu3DModelAttrSet(lbl_2_bss_100[0]->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_2_bss_100[1]->model[0], HU3D_ATTR_DISPOFF); lbl_2_bss_D0->work[0] = 1; 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]); temp_r30->type = -1; - Hu3DModelAttrSet(object->model[7], 1); - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[7], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); lbl_2_bss_8->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[2]); } @@ -823,31 +823,31 @@ void fn_2_2FA4(omObjData *object) temp_r30->unk8.z = 0; temp_r30->unk2C = 0; 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)); - Hu3DModelAttrSet(object->model[1], 1); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x07)); - Hu3DModelAttrSet(object->model[2], 1); - Hu3DModelAttrSet(object->model[2], 0x40000001); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_LOOP); 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)); - Hu3DModelAttrSet(object->model[4], 1); + Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF); 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)); - Hu3DModelAttrSet(object->model[7], 1); + Hu3DModelAttrSet(object->model[7], HU3D_ATTR_DISPOFF); 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)); - Hu3DModelAttrSet(object->model[9], 1); + Hu3DModelAttrSet(object->model[9], HU3D_ATTR_DISPOFF); 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]); 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)); - 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[1] = Hu3DJointMotionFile(object->model[10], DATA_MAKE_NUM(DATADIR_M401, 0x2A)); 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[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); Hu3DModelLayerSet(object->model[3], 7); 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]); } CharModelMotionSet(temp_r31->unk86, object->motion[2]); - Hu3DModelAttrSet(object->model[0], 0x40000001); - Hu3DModelAttrSet(object->model[2], 1); - Hu3DModelAttrSet(object->model[2], 0x40000001); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_LOOP); Hu3DModelLayerSet(object->model[2], 2); Hu3DModelAmbSet(object->model[0], 1, 1, 1); Hu3DModelShadowSet(object->model[0]); @@ -1168,7 +1168,7 @@ void fn_2_3F28(omObjData *object) temp_r31->unk30.x = object->trans.x; temp_r31->unk30.y = object->trans.y; temp_r31->unk30.z = object->trans.z; - Hu3DModelAttrReset(object->model[3], 1); + Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(object->model[3], 0x40000002); Hu3DModelClusterAttrReset(object->model[3], 0, 0xC0000002); 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 (temp_r31->unk6C == 0) { temp_r31->unk6C = 1; - Hu3DModelAttrReset(object->model[2], 1); - Hu3DModelAttrSet(object->model[2], 0x40000001); + Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_LOOP); Hu3DModelPosSet(object->model[2], object->trans.x, 950, 30 + object->trans.z); Hu3DModelScaleSet(object->model[2], 1, 1, 1); Hu3DMotionTimeSet(object->model[2], 0); @@ -1328,7 +1328,7 @@ void fn_2_48A0(omObjData *object) temp_r31->unk80 -= 360.0f; } 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); } else if (temp_r31->unk6E == 50) { @@ -1383,14 +1383,14 @@ void fn_2_48A0(omObjData *object) if (temp_r31->unk6C == 0) { temp_r31->unk6C = 1; omVibrate(temp_r31->unk4, 12, 4, 2); - Hu3DModelAttrReset(object->model[2], 1); + Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF); 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); Hu3DModelScaleSet(object->model[2], 1, 1, 1); Hu3DMotionTimeSet(object->model[2], 0); Hu3DModelAttrReset(object->model[3], 0x40000002); - Hu3DModelAttrReset(object->model[3], 1); + Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF); Hu3DModelClusterAttrReset(object->model[3], 0, 0xC0000002); Hu3DModelPosSet(object->model[3], object->trans.x, 0, 30 + object->trans.z); Hu3DMotionTimeSet(object->model[3], 0); @@ -1584,10 +1584,10 @@ void fn_2_5CC0(omObjData *object) temp_r31->unk6A = 0; } if (temp_r31->unk7A & 0x1) { - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); } } if (temp_f29 != 0) { @@ -2075,7 +2075,7 @@ void fn_2_7CB4(omObjData *object) temp_r31->unk28 = 0; object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x0B)); 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); Hu3DModelShadowSet(object->model[0]); temp_r31->unk0 = 0; @@ -2243,7 +2243,7 @@ void fn_2_8868(omObjData *object) Work7CB4 *temp_r31; temp_r31 = object->data; 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->unk2E = 0; temp_r31->unk30 = 0; @@ -2265,7 +2265,7 @@ void fn_2_8968(omObjData *object) temp_r29->unk1E = ((frand() % 15) + 22) * 0.43478262f; } if (fn_2_8450(object)) { - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); object->func = fn_2_8B58; } } @@ -2277,7 +2277,7 @@ void fn_2_8B58(omObjData *object) Work7CB4 *temp_r31; temp_r31 = object->data; 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->unk2E = 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; } if (fn_2_8450(object)) { - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); object->func = NULL; } } @@ -2326,8 +2326,8 @@ void fn_2_8E74(omObjData *object) object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M401, 0x0D)); object->motion[0] = Hu3DJointMotionFile(object->model[0], DATA_MAKE_NUM(DATADIR_M401, 0x10)); Hu3DMotionSet(object->model[0], object->motion[0]); - Hu3DModelAttrSet(object->model[0], 0x40000001); - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); omSetTra(object, -1000, 0, -23000); omSetRot(object, 0, 90, 0); 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->unk18 = *pos; 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); object->work[2] = HuAudFXEmiterPlay(1284, &pos); object->func = fn_2_9298; @@ -2377,7 +2377,7 @@ void fn_2_9298(omObjData *object) spC.z = object->trans.z; HuAudFXEmiterUpDate(object->work[2], &spC); 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]); object->func = NULL; } @@ -2393,8 +2393,8 @@ void fn_2_95E4(omObjData *object) omSetTra(object, 3000, 0, -37000); omSetRot(object, 0, 270, 0); Hu3DMotionSet(object->model[0], object->motion[0]); - Hu3DModelAttrSet(object->model[0], 0x1); - Hu3DModelAttrSet(object->model[0], 0x40000001); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); object->work[3] = 3; Hu3DModelShadowSet(object->model[0]); object->func = fn_2_979C; @@ -2403,10 +2403,10 @@ void fn_2_95E4(omObjData *object) void fn_2_9734(s32 flag) { if (flag) { - Hu3DModelAttrReset(lbl_2_bss_FC->model[0], 1); + Hu3DModelAttrReset(lbl_2_bss_FC->model[0], HU3D_ATTR_DISPOFF); } 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); omSetRot(object, 0, 125, 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; } } @@ -2447,7 +2447,7 @@ void fn_2_99A4(omObjData *object) omSetTra(object, 3000, temp_f31, -37000); omSetRot(object, 0, 270, 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; lbl_2_bss_78.x = object->trans.x; 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++) { 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); Hu3DModelShadowSet(temp_r31->model[0]); temp_r31->work[3] = 1; @@ -2510,12 +2510,12 @@ void fn_2_9E28(float arg1, float arg2) temp_f31 = arg1; for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { 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_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); 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_r30->unkC = (frand() % 30) + 30; temp_r30->unk0.z = 0; @@ -2583,7 +2583,7 @@ void fn_2_A318(omObjData *object) temp_r30->unk0.z = 0; temp_r30->unkC = (frand() % 30) + 25; 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) { @@ -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); 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; } } @@ -2927,12 +2927,12 @@ void fn_2_CAB0(omObjData *object) 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) { for (temp_r31 = 0; temp_r31 < 9; temp_r31++) { - Hu3DModelAttrSet(object->model[temp_r31], 1); + Hu3DModelAttrSet(object->model[temp_r31], HU3D_ATTR_DISPOFF); } } else { 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())); 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], 0x40000001); + Hu3DModelAttrSet(temp_r31->model[temp_r30], HU3D_ATTR_DISPOFF); + 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())); temp_r28[temp_r30] = 0; } @@ -3174,7 +3174,7 @@ void fn_2_E24C(omObjData *object) temp_r28 = lbl_2_bss_C4->data; for (temp_r30 = 0; temp_r30 < temp_r31->unk0; temp_r30++) { 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); omDelObjEx(HuPrcCurrentGet(), object); @@ -3188,13 +3188,13 @@ void fn_2_E364(omObjData *object, s16 arg1) WorkE6E8 *temp_r29 = object->data; if (arg1 == 1) { 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; } else { 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; } diff --git a/src/REL/m401Dll/main_ex.c b/src/REL/m401Dll/main_ex.c index 61f9a5ed..34dc3dab 100644 --- a/src/REL/m401Dll/main_ex.c +++ b/src/REL/m401Dll/main_ex.c @@ -78,8 +78,8 @@ void fn_2_1041C(void) lbl_2_bss_220[1][2] = lbl_2_bss_238; for (i = 0; i < 4; i++) { 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], 0x40000001); + Hu3DModelAttrSet(lbl_2_bss_136[i], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_2_bss_136[i], HU3D_MOTATTR_LOOP); Hu3DModelScaleSet(lbl_2_bss_136[i], 1.5f, 1.5f, 1.0f); 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[1] = Hu3DParticleCreate(lbl_2_bss_24C, 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[1], 1); - Hu3DModelAttrSet(lbl_2_bss_13E[i].unk2[2], 1); + Hu3DModelAttrSet(lbl_2_bss_13E[i].unk2[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_2_bss_13E[i].unk2[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_2_bss_13E[i].unk2[2], HU3D_ATTR_DISPOFF); } lbl_2_bss_134 = 0; } @@ -118,7 +118,7 @@ s16 fn_2_108C8(void) for (i = 0; i < 28; i++) { if (!lbl_2_bss_13E[i].unk0) { 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; return i; @@ -132,7 +132,7 @@ void fn_2_10980(s16 arg0) s32 i; lbl_2_bss_13E[arg0].unk0 = 0; 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); if (arg1 == 1) { 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_r27->unk1C = 1.0f; temp_r31->work[3] = 45; @@ -382,7 +382,7 @@ void fn_2_113AC(omObjData *object) } if (temp_r30->unk10 == 0) { if (object->unk10) { - Hu3DModelAttrSet(object->unk10, 1); + Hu3DModelAttrSet(object->unk10, HU3D_ATTR_DISPOFF); } fn_2_10980(temp_r30->unk12); omDelObjEx(HuPrcCurrentGet(), object); @@ -413,7 +413,7 @@ void fn_2_118B0(omObjData *object) if (temp_r30->unk10 == 0) { if (object->unk10) { - Hu3DModelAttrSet(object->unk10, 1); + Hu3DModelAttrSet(object->unk10, HU3D_ATTR_DISPOFF); } fn_2_10980(temp_r30->unk12); 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); if (object->work[0] == 1) { - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); omDelObjEx(HuPrcCurrentGet(), object); } } diff --git a/src/REL/m402Dll/main.c b/src/REL/m402Dll/main.c index 1510c061..745a4197 100755 --- a/src/REL/m402Dll/main.c +++ b/src/REL/m402Dll/main.c @@ -203,9 +203,7 @@ static float lbl_1_bss_8; static float lbl_1_bss_4; static u8 lbl_1_bss_0[4]; -static s16 lbl_1_data_0[] = { - 0, 1, 2, 3, 4, 5, 6, 7 -}; +static s16 lbl_1_data_0[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; static Vec lbl_1_data_10 = { 0.0f, 2500.0f, 2200.0f }; static Vec lbl_1_data_1C = { 0.0f, 1.0f, 0.0f }; @@ -220,185 +218,64 @@ static u8 lbl_1_data_5C_unused[] = { 0xFF, 0xFF, 0xFF, 0xFF }; static Vec lbl_1_data_60 = { 0.0f, 4000.0f, 1000.0f }; static Vec lbl_1_data_6C = { 0.0f, 0.0f, 0.0f }; -static s32 lbl_1_data_78[8][11] = { - { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 28), - DATA_MAKE_NUM(DATADIR_M402, 16), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 62), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), - DATA_MAKE_NUM(DATADIR_M402, 8), - DATA_MAKE_NUM(DATADIR_M402, 0), - DATA_MAKE_NUM(DATADIR_M402, 24), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 117), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 76) - }, - { - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 2), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 28), - DATA_MAKE_NUM(DATADIR_M402, 17), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 62), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 3), - DATA_MAKE_NUM(DATADIR_M402, 9), - DATA_MAKE_NUM(DATADIR_M402, 1), - DATA_MAKE_NUM(DATADIR_M402, 25), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 117), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 76) - }, - { - DATA_MAKE_NUM(DATADIR_PEACHMOT, 0), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 2), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 28), - DATA_MAKE_NUM(DATADIR_M402, 18), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 62), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 3), - DATA_MAKE_NUM(DATADIR_M402, 10), - DATA_MAKE_NUM(DATADIR_M402, 2), - DATA_MAKE_NUM(DATADIR_M402, 26), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 117), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 76) - }, - { - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 2), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 28), - DATA_MAKE_NUM(DATADIR_M402, 19), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 62), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 3), - DATA_MAKE_NUM(DATADIR_M402, 11), - DATA_MAKE_NUM(DATADIR_M402, 3), - DATA_MAKE_NUM(DATADIR_M402, 27), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 117), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 76) - }, - { - DATA_MAKE_NUM(DATADIR_WARIOMOT, 0), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 2), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 28), - DATA_MAKE_NUM(DATADIR_M402, 20), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 62), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 3), - DATA_MAKE_NUM(DATADIR_M402, 12), - DATA_MAKE_NUM(DATADIR_M402, 4), - DATA_MAKE_NUM(DATADIR_M402, 28), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 117), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 76) - }, - { - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 2), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 28), - DATA_MAKE_NUM(DATADIR_M402, 21), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 62), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 3), - DATA_MAKE_NUM(DATADIR_M402, 13), - DATA_MAKE_NUM(DATADIR_M402, 5), - DATA_MAKE_NUM(DATADIR_M402, 29), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 117), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 76) - }, - { - DATA_MAKE_NUM(DATADIR_DAISYMOT, 0), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 2), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 28), - DATA_MAKE_NUM(DATADIR_M402, 22), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 62), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 3), - DATA_MAKE_NUM(DATADIR_M402, 14), - DATA_MAKE_NUM(DATADIR_M402, 6), - DATA_MAKE_NUM(DATADIR_M402, 30), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 117), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 76) - }, - { - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 2), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 28), - DATA_MAKE_NUM(DATADIR_M402, 23), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 62), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 3), - DATA_MAKE_NUM(DATADIR_M402, 15), - DATA_MAKE_NUM(DATADIR_M402, 7), - DATA_MAKE_NUM(DATADIR_M402, 31), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 117), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 76) - } -}; +static s32 lbl_1_data_78[8][11] = { { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), DATA_MAKE_NUM(DATADIR_MARIOMOT, 28), + DATA_MAKE_NUM(DATADIR_M402, 16), DATA_MAKE_NUM(DATADIR_MARIOMOT, 62), DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), + DATA_MAKE_NUM(DATADIR_M402, 8), DATA_MAKE_NUM(DATADIR_M402, 0), DATA_MAKE_NUM(DATADIR_M402, 24), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 117), DATA_MAKE_NUM(DATADIR_MARIOMOT, 76) }, + { DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 2), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 28), DATA_MAKE_NUM(DATADIR_M402, 17), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 62), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 3), DATA_MAKE_NUM(DATADIR_M402, 9), DATA_MAKE_NUM(DATADIR_M402, 1), + DATA_MAKE_NUM(DATADIR_M402, 25), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 117), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 76) }, + { DATA_MAKE_NUM(DATADIR_PEACHMOT, 0), DATA_MAKE_NUM(DATADIR_PEACHMOT, 2), DATA_MAKE_NUM(DATADIR_PEACHMOT, 28), DATA_MAKE_NUM(DATADIR_M402, 18), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 62), DATA_MAKE_NUM(DATADIR_PEACHMOT, 3), DATA_MAKE_NUM(DATADIR_M402, 10), DATA_MAKE_NUM(DATADIR_M402, 2), + DATA_MAKE_NUM(DATADIR_M402, 26), DATA_MAKE_NUM(DATADIR_PEACHMOT, 117), DATA_MAKE_NUM(DATADIR_PEACHMOT, 76) }, + { DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 2), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 28), DATA_MAKE_NUM(DATADIR_M402, 19), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 62), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 3), DATA_MAKE_NUM(DATADIR_M402, 11), DATA_MAKE_NUM(DATADIR_M402, 3), + DATA_MAKE_NUM(DATADIR_M402, 27), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 117), DATA_MAKE_NUM(DATADIR_YOSHIMOT, 76) }, + { DATA_MAKE_NUM(DATADIR_WARIOMOT, 0), DATA_MAKE_NUM(DATADIR_WARIOMOT, 2), DATA_MAKE_NUM(DATADIR_WARIOMOT, 28), DATA_MAKE_NUM(DATADIR_M402, 20), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 62), DATA_MAKE_NUM(DATADIR_WARIOMOT, 3), DATA_MAKE_NUM(DATADIR_M402, 12), DATA_MAKE_NUM(DATADIR_M402, 4), + DATA_MAKE_NUM(DATADIR_M402, 28), DATA_MAKE_NUM(DATADIR_WARIOMOT, 117), DATA_MAKE_NUM(DATADIR_WARIOMOT, 76) }, + { DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 2), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 28), DATA_MAKE_NUM(DATADIR_M402, 21), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 62), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 3), DATA_MAKE_NUM(DATADIR_M402, 13), DATA_MAKE_NUM(DATADIR_M402, 5), + DATA_MAKE_NUM(DATADIR_M402, 29), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 117), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 76) }, + { DATA_MAKE_NUM(DATADIR_DAISYMOT, 0), DATA_MAKE_NUM(DATADIR_DAISYMOT, 2), DATA_MAKE_NUM(DATADIR_DAISYMOT, 28), DATA_MAKE_NUM(DATADIR_M402, 22), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 62), DATA_MAKE_NUM(DATADIR_DAISYMOT, 3), DATA_MAKE_NUM(DATADIR_M402, 14), DATA_MAKE_NUM(DATADIR_M402, 6), + DATA_MAKE_NUM(DATADIR_M402, 30), DATA_MAKE_NUM(DATADIR_DAISYMOT, 117), DATA_MAKE_NUM(DATADIR_DAISYMOT, 76) }, + { DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 2), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 28), + DATA_MAKE_NUM(DATADIR_M402, 23), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 62), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 3), DATA_MAKE_NUM(DATADIR_M402, 15), + DATA_MAKE_NUM(DATADIR_M402, 7), DATA_MAKE_NUM(DATADIR_M402, 31), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 117), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 76) } }; -static s32 lbl_1_data_1D8[] = { - DATA_MAKE_NUM(DATADIR_M402, 38), - DATA_MAKE_NUM(DATADIR_M402, 40), - DATA_MAKE_NUM(DATADIR_M402, 37), - DATA_MAKE_NUM(DATADIR_M402, 39) -}; +static s32 lbl_1_data_1D8[] + = { DATA_MAKE_NUM(DATADIR_M402, 38), DATA_MAKE_NUM(DATADIR_M402, 40), DATA_MAKE_NUM(DATADIR_M402, 37), DATA_MAKE_NUM(DATADIR_M402, 39) }; -static s32 lbl_1_data_1E8[] = { - DATA_MAKE_NUM(DATADIR_M402, 41), - DATA_MAKE_NUM(DATADIR_M402, 42), - DATA_MAKE_NUM(DATADIR_M402, 43) -}; +static s32 lbl_1_data_1E8[] = { DATA_MAKE_NUM(DATADIR_M402, 41), DATA_MAKE_NUM(DATADIR_M402, 42), DATA_MAKE_NUM(DATADIR_M402, 43) }; static s32 lbl_1_data_1F4 = DATA_MAKE_NUM(DATADIR_M402, 44); -static s32 lbl_1_data_1F8[] = { - DATA_MAKE_NUM(DATADIR_M402, 45), - DATA_MAKE_NUM(DATADIR_M402, 46) -}; +static s32 lbl_1_data_1F8[] = { DATA_MAKE_NUM(DATADIR_M402, 45), DATA_MAKE_NUM(DATADIR_M402, 46) }; -static Vec lbl_1_data_200[] = { - { 450.0f, 290.0f, 0.0f }, - { -450.0f, 290.0f, 0.0f } -}; +static Vec lbl_1_data_200[] = { { 450.0f, 290.0f, 0.0f }, { -450.0f, 290.0f, 0.0f } }; -static s32 lbl_1_data_218[] = { - DATA_MAKE_NUM(DATADIR_M402, 48), - DATA_MAKE_NUM(DATADIR_M402, 50), - DATA_MAKE_NUM(DATADIR_M402, 47), - DATA_MAKE_NUM(DATADIR_M402, 49), - DATA_MAKE_NUM(DATADIR_M402, 51), - DATA_MAKE_NUM(DATADIR_M402, 52), - DATA_MAKE_NUM(DATADIR_M402, 53) -}; +static s32 lbl_1_data_218[] = { DATA_MAKE_NUM(DATADIR_M402, 48), DATA_MAKE_NUM(DATADIR_M402, 50), DATA_MAKE_NUM(DATADIR_M402, 47), + DATA_MAKE_NUM(DATADIR_M402, 49), DATA_MAKE_NUM(DATADIR_M402, 51), DATA_MAKE_NUM(DATADIR_M402, 52), DATA_MAKE_NUM(DATADIR_M402, 53) }; -static UnkData234Struct lbl_1_data_234[] = { - { 0.0f, 0.0f, 0.0f, 0.0f, -1 }, - { 2.0f, 2.0f, 0.1f, 0.125f, 0x514 }, - { 2.0f, 2.0f, 0.2f, 0.25f, -1 }, - { 3.0f, 4.0f, 0.3f, 0.35f, 0x515 }, - { 3.0f, 4.0f, 0.4f, 0.45f, -1 }, - { 3.0f, 6.0f, 0.45f, 0.5125f, 0x516 }, - { 3.0f, 6.0f, 0.5f, 0.575f, -1 }, - { 3.0f, 6.0f, 0.55f, 0.6375f, -1 }, - { 3.0f, 6.0f, 0.6f, 0.7f, -1 }, - { 4.0f, 8.0f, 0.65f, 0.75f, 0x517 }, - { 4.0f, 8.0f, 0.7f, 0.8f, -1 }, - { 4.0f, 8.0f, 0.75f, 0.85f, -1 }, - { 4.0f, 8.0f, 0.8f, 0.9f, -1 }, - { 4.0f, 10.0f, 0.83f, 0.9166f, 0x518 }, - { 4.0f, 10.0f, 0.86f, 0.9333f, -1 }, - { 4.0f, 10.0f, 0.9f, 0.95f, -1 }, - { 4.0f, 10.0f, 0.93f, 0.9666f, -1 }, - { 4.0f, 10.0f, 0.96f, 0.9833f, -1 }, - { 4.0f, 10.0f, 1.0f, 1.0f, -1 }, - { 1.0f, 10.0f, 1.0f, 1.0f, -1 } -}; +static UnkData234Struct lbl_1_data_234[] = { { 0.0f, 0.0f, 0.0f, 0.0f, -1 }, { 2.0f, 2.0f, 0.1f, 0.125f, 0x514 }, { 2.0f, 2.0f, 0.2f, 0.25f, -1 }, + { 3.0f, 4.0f, 0.3f, 0.35f, 0x515 }, { 3.0f, 4.0f, 0.4f, 0.45f, -1 }, { 3.0f, 6.0f, 0.45f, 0.5125f, 0x516 }, { 3.0f, 6.0f, 0.5f, 0.575f, -1 }, + { 3.0f, 6.0f, 0.55f, 0.6375f, -1 }, { 3.0f, 6.0f, 0.6f, 0.7f, -1 }, { 4.0f, 8.0f, 0.65f, 0.75f, 0x517 }, { 4.0f, 8.0f, 0.7f, 0.8f, -1 }, + { 4.0f, 8.0f, 0.75f, 0.85f, -1 }, { 4.0f, 8.0f, 0.8f, 0.9f, -1 }, { 4.0f, 10.0f, 0.83f, 0.9166f, 0x518 }, { 4.0f, 10.0f, 0.86f, 0.9333f, -1 }, + { 4.0f, 10.0f, 0.9f, 0.95f, -1 }, { 4.0f, 10.0f, 0.93f, 0.9666f, -1 }, { 4.0f, 10.0f, 0.96f, 0.9833f, -1 }, { 4.0f, 10.0f, 1.0f, 1.0f, -1 }, + { 1.0f, 10.0f, 1.0f, 1.0f, -1 } }; -static s32 lbl_1_data_3C4[] = { - 0x00000514, - 0x00000515, - 0x00000516, - 0x00000517, - 0x00000518 -}; +static s32 lbl_1_data_3C4[] = { 0x00000514, 0x00000515, 0x00000516, 0x00000517, 0x00000518 }; -static void fn_1_0(void) { +static void fn_1_0(void) +{ lbl_1_bss_204.unk04 = NULL; lbl_1_bss_204.unk08 = NULL; } -static void fn_1_24(u16 arg0, s16 arg1) { +static void fn_1_24(u16 arg0, s16 arg1) +{ UnkBss204Struct *temp_r31; UnkBss204Struct *temp_r30; UnkBss204Struct *temp_r29; @@ -416,7 +293,8 @@ static void fn_1_24(u16 arg0, s16 arg1) { temp_r31->unk08 = temp_r29; } -static s16 fn_1_AC(s16 arg0) { +static s16 fn_1_AC(s16 arg0) +{ UnkBss204Struct *var_r31; UnkBss204Struct *temp_r29; UnkBss204Struct *temp_r30; @@ -440,12 +318,14 @@ static s16 fn_1_AC(s16 arg0) { return -1; } -static void fn_1_150(void) { +static void fn_1_150(void) +{ lbl_1_bss_1EC.unk10 = NULL; lbl_1_bss_1EC.unk14 = NULL; } -static void fn_1_174(s16 arg0, HsfanimStruct00 *arg1, s32 arg2, s32 arg3, s32 arg4, Vec *arg5, u8 arg6) { +static void fn_1_174(s16 arg0, HsfanimStruct00 *arg1, s32 arg2, s32 arg3, s32 arg4, Vec *arg5, u8 arg6) +{ UnkBss1ECStruct *temp_r27; UnkBss1ECStruct *var_r31; UnkBss1ECStruct *temp_r28; @@ -475,7 +355,8 @@ static void fn_1_174(s16 arg0, HsfanimStruct00 *arg1, s32 arg2, s32 arg3, s32 ar var_r31->unk14 = temp_r27; } -static void fn_1_2D8(void) { +static void fn_1_2D8(void) +{ UnkBss1ECStruct *var_r31; UnkBss1ECStruct *temp_r28; UnkBss1ECStruct *temp_r29; @@ -510,7 +391,8 @@ static void fn_1_2D8(void) { } } -static void fn_1_414(void) { +static void fn_1_414(void) +{ s32 i; for (i = 0; i < 32; i++) { @@ -519,7 +401,8 @@ static void fn_1_414(void) { } } -static s16 fn_1_46C(s32 arg0) { +static s16 fn_1_46C(s32 arg0) +{ s32 i; for (i = 0; i < 32; i++) { @@ -537,7 +420,8 @@ static s16 fn_1_46C(s32 arg0) { return Hu3DModelCreateFile(arg0); } -static void fn_1_580(s32 *arg0, s32 arg1, s32 arg2) { +static void fn_1_580(s32 *arg0, s32 arg1, s32 arg2) +{ s32 var_r30; espBankSet(arg0[arg1 + 1], 10); @@ -560,14 +444,16 @@ static void fn_1_580(s32 *arg0, s32 arg1, s32 arg2) { espBankSet(arg0[arg1 + 6], var_r30 % 10); } -static void fn_1_798(s32 arg0) { +static void fn_1_798(s32 arg0) +{ lbl_1_bss_19C = 0.0f; lbl_1_bss_1AC = lbl_1_bss_1B0; GWMGRecordSet(arg0, lbl_1_bss_1AC); fn_1_580(lbl_1_bss_15C, 7, lbl_1_bss_1B0); } -static void fn_1_9EC(void) { +static void fn_1_9EC(void) +{ s32 i; for (i = 0; i < 16; i++) { @@ -575,7 +461,8 @@ static void fn_1_9EC(void) { } } -static void fn_1_A40(void) { +static void fn_1_A40(void) +{ float temp_f31; s32 i; @@ -588,7 +475,8 @@ static void fn_1_A40(void) { } } -static void fn_1_B4C(float arg0, s32 arg1) { +static void fn_1_B4C(float arg0, s32 arg1) +{ float temp_f30; float temp_f31; s32 i; @@ -625,7 +513,8 @@ static void fn_1_B4C(float arg0, s32 arg1) { } } -static void fn_1_11F4(float arg0, Vec *arg1, Vec *arg2, Vec *arg3) { +static void fn_1_11F4(float arg0, Vec *arg1, Vec *arg2, Vec *arg3) +{ float temp_f31; if (1.0f < arg0) { @@ -637,13 +526,15 @@ static void fn_1_11F4(float arg0, Vec *arg1, Vec *arg2, Vec *arg3) { arg3->z = arg1->z + temp_f31 * (arg2->z - arg1->z); } -static void fn_1_1350(Vec *arg0, Vec *arg1, Vec *arg2) { +static void fn_1_1350(Vec *arg0, Vec *arg1, Vec *arg2) +{ Hu3DCameraPosSetV(1, arg0, arg1, arg2); lbl_1_bss_1DC = *arg0; lbl_1_bss_1C4 = *arg2; } -static s32 fn_1_13DC(float arg0, Vec *arg1) { +static s32 fn_1_13DC(float arg0, Vec *arg1) +{ Vec sp18; Vec spC; @@ -652,13 +543,15 @@ static s32 fn_1_13DC(float arg0, Vec *arg1) { Hu3DCameraPosSetV(1, &sp18, arg1, &spC); if (1.0f <= arg0) { return 1; - } else { + } + else { lbl_1_bss_1A0 = 1; return 0; } } -static void fn_1_1710(float arg0, Vec *arg1) { +static void fn_1_1710(float arg0, Vec *arg1) +{ Vec sp18; Vec spC; @@ -668,7 +561,8 @@ static void fn_1_1710(float arg0, Vec *arg1) { lbl_1_bss_1A0 = 1; } -static void fn_1_1A60(Vec *arg0, s16 arg1, Vec *arg2) { +static void fn_1_1A60(Vec *arg0, s16 arg1, Vec *arg2) +{ Mtx sp1C; Vec sp10; float temp_f30; @@ -695,7 +589,8 @@ static void fn_1_1A60(Vec *arg0, s16 arg1, Vec *arg2) { arg2->z = 0.0f; } -static void fn_1_1D18(s16 arg0, char *arg1, Vec *arg2) { +static void fn_1_1D18(s16 arg0, char *arg1, Vec *arg2) +{ Mtx sp10; Hu3DModelObjMtxGet(arg0, arg1, sp10); @@ -704,7 +599,8 @@ static void fn_1_1D18(s16 arg0, char *arg1, Vec *arg2) { arg2->z = sp10[2][3]; } -static void fn_1_1D70(s16 arg0, char *arg1, Vec *arg2, Mtx arg3) { +static void fn_1_1D70(s16 arg0, char *arg1, Vec *arg2, Mtx arg3) +{ Mtx spC; ModelData *var_r30; @@ -719,7 +615,8 @@ static void fn_1_1D70(s16 arg0, char *arg1, Vec *arg2, Mtx arg3) { arg2->z = spC[2][3]; } -static float fn_1_1E20(float arg0, float arg1, float arg2) { +static float fn_1_1E20(float arg0, float arg1, float arg2) +{ float var_f31; float var_f30; @@ -737,11 +634,13 @@ static float fn_1_1E20(float arg0, float arg1, float arg2) { return var_f30; } -static void fn_1_1F24(s32 arg0) { +static void fn_1_1F24(s32 arg0) +{ lbl_1_bss_1A4 = HuAudSeqPlay(arg0); } -static void fn_1_1F58(s32 arg0) { +static void fn_1_1F58(s32 arg0) +{ if (lbl_1_bss_1A4 >= 0) { if (arg0 < 0) { arg0 = 1000; @@ -751,7 +650,8 @@ static void fn_1_1F58(s32 arg0) { lbl_1_bss_1A4 = -1; } -static void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3) { +static void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3) +{ Vec sp18; float var_f28; s32 var_r30; @@ -760,7 +660,7 @@ static void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3) { sp18.y = 0.0f; sp18.z = 0.0f; sp18.x = arg2 / 4.0f; - sp18.z = -(float) arg3 / 4.0f; + sp18.z = -(float)arg3 / 4.0f; var_r30 = 0; var_f28 = VECMagXZ(&sp18); if (0.5f <= var_f28) { @@ -774,37 +674,42 @@ static void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3) { *arg1 = fn_1_1E20(*arg1, atan2d(sp18.x, sp18.z), 0.4f); if (8.0f <= var_f28) { var_r30 = 2; - } else { + } + else { var_r30 = 1; } } - VECAdd((Vec*) &arg0, &sp18, (Vec*) &arg0); + VECAdd((Vec *)&arg0, &sp18, (Vec *)&arg0); } #include "src/REL/executor.c" -static void fn_1_2454(void) { +static void fn_1_2454(void) +{ HuSysVWaitSet(1); if (HuPadBtnDown[0] & 0x400) { lbl_1_bss_1B0 = -1; } print8(24, 32, 1.5f, "%f COUNT:%d MES:%d WIN:%d", lbl_1_bss_38, lbl_1_bss_1B4, lbl_1_bss_1AA, lbl_1_bss_26); print8(24, 48, 1.5f, "%f %f %f", lbl_1_bss_4, lbl_1_bss_C, lbl_1_bss_8); - print8(24, 64, 1.5f, "%x %x", HuMemHeapSizeGet(HEAP_SYSTEM) - HuMemUsedMallocSizeGet(HEAP_SYSTEM), HuMemHeapSizeGet(HEAP_DATA) - HuMemUsedMallocSizeGet(HEAP_DATA)); + print8(24, 64, 1.5f, "%x %x", HuMemHeapSizeGet(HEAP_SYSTEM) - HuMemUsedMallocSizeGet(HEAP_SYSTEM), + HuMemHeapSizeGet(HEAP_DATA) - HuMemUsedMallocSizeGet(HEAP_DATA)); lbl_1_bss_8 -= HuPadSubStkX[0] / 59.0f; lbl_1_bss_C -= (HuPadSubStkY[0] / 59.0f) * 4.0f; lbl_1_bss_4 -= (HuPadTrigL[0] / 150.0f) * 4.0f; lbl_1_bss_4 += (HuPadTrigR[0] / 150.0f) * 4.0f; } -static void fn_1_2744(s16 arg0, GXColor *arg1) { +static void fn_1_2744(s16 arg0, GXColor *arg1) +{ s16 var_r30; var_r30 = Hu3DLLightCreateV(arg0, &lbl_1_data_34, &lbl_1_data_40, arg1); Hu3DLLightStaticSet(arg0, var_r30, 1); } -static u16 fn_1_27A8(UnkFn27A8Struct *arg0) { +static u16 fn_1_27A8(UnkFn27A8Struct *arg0) +{ u16 var_r30; var_r30 = 0; @@ -823,13 +728,15 @@ static u16 fn_1_27A8(UnkFn27A8Struct *arg0) { arg0->unk40 = 0; var_r30 = 0x100; } - } else { + } + else { arg0->unk40 = 0; } return var_r30; } -static void fn_1_2880(UnkFn27A8Struct *arg0, omObjData *arg1) { +static void fn_1_2880(UnkFn27A8Struct *arg0, omObjData *arg1) +{ arg0->unk4C = 2016; arg0->unk60 = 0; arg0->unk2C = 0.0f; @@ -841,11 +748,12 @@ static void fn_1_2880(UnkFn27A8Struct *arg0, omObjData *arg1) { arg0->unk0C = 0.0f; arg0->unk10 = arg0->unk0C; Hu3DModelAttrReset(arg1->model[0], 0x40000002); - Hu3DModelAttrSet(arg1->model[0], 0x40000001); + Hu3DModelAttrSet(arg1->model[0], HU3D_MOTATTR_LOOP); Hu3DMotionSet(arg1->model[0], arg1->motion[0]); } -static void fn_1_2970(UnkFn27A8Struct *arg0, omObjData *arg1, u8 arg2) { +static void fn_1_2970(UnkFn27A8Struct *arg0, omObjData *arg1, u8 arg2) +{ Vec sp18; Vec spC; float temp_f31; @@ -867,7 +775,8 @@ static void fn_1_2970(UnkFn27A8Struct *arg0, omObjData *arg1, u8 arg2) { } } -static void fn_1_2B30(UnkFn27A8Struct *arg0, omObjData *arg1, omObjData *arg2) { +static void fn_1_2B30(UnkFn27A8Struct *arg0, omObjData *arg1, omObjData *arg2) +{ arg0->unk50 = 0; arg0->unk20 = (770.0f - arg0->unk1C) / 18.0f; arg0->unk0C = Hu3DMotionTimeGet(arg2->model[0]); @@ -879,7 +788,8 @@ static void fn_1_2B30(UnkFn27A8Struct *arg0, omObjData *arg1, omObjData *arg2) { HuAudCharVoicePlay(arg0->unk58, 0x123); } -static u8 fn_1_2DBC(UnkFn27A8Struct *arg0, omObjData *arg1) { +static u8 fn_1_2DBC(UnkFn27A8Struct *arg0, omObjData *arg1) +{ Vec sp20; float var_f30; float var_f29; @@ -904,7 +814,8 @@ static u8 fn_1_2DBC(UnkFn27A8Struct *arg0, omObjData *arg1) { return 0; } -static void fn_1_313C(UnkFn27A8Struct *arg0, omObjData *arg1) { +static void fn_1_313C(UnkFn27A8Struct *arg0, omObjData *arg1) +{ Vec sp8; arg0->unk1C += arg0->unk20; @@ -915,7 +826,8 @@ static void fn_1_313C(UnkFn27A8Struct *arg0, omObjData *arg1) { arg0->unk28 = sp8.y - arg0->unk14 + 388.0f; } -static void fn_1_3204(omObjData *arg0) { +static void fn_1_3204(omObjData *arg0) +{ Vec sp48; Vec sp3C; Vec sp24; @@ -951,7 +863,8 @@ static void fn_1_3204(omObjData *arg0) { if (temp_r31->unk60 < 19) { if (GWPlayerCfg[temp_r31->unk54].iscom) { var_r26 = fn_1_27A8(temp_r31); - } else { + } + else { var_r26 = HuPadBtnDown[temp_r31->unk5C]; } if (temp_r31->unk60 == 0) { @@ -967,7 +880,8 @@ static void fn_1_3204(omObjData *arg0) { HuAudFXPlay(0x50E); Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 2.0f, HU3D_MOTATTR_LOOP); } - } else { + } + else { temp_r31->unk30 += 1.0f; } switch (temp_r31->unk4C) { @@ -1006,7 +920,8 @@ static void fn_1_3204(omObjData *arg0) { temp_r31->unk08 = 0.0f; if (lbl_1_bss_26 < 0) { lbl_1_bss_26 = temp_r31->unk54; - } else if (frandmod(100) > 50) { + } + else if (frandmod(100) > 50) { lbl_1_bss_26 = temp_r31->unk54; } } @@ -1015,7 +930,8 @@ static void fn_1_3204(omObjData *arg0) { if (60.0f <= temp_r31->unk30) { temp_r31->unk4C = 2017; fn_1_2B30(temp_r31, arg0, temp_r29); - } else { + } + else { if (temp_r31->unk1C > temp_r31->unk24) { temp_r31->unk1C += temp_r31->unk20; if (temp_r31->unk1C <= temp_r31->unk24) { @@ -1060,7 +976,8 @@ static void fn_1_3204(omObjData *arg0) { } } -static void fn_1_4190(float arg0) { +static void fn_1_4190(float arg0) +{ Vec sp8; s32 i; @@ -1073,7 +990,8 @@ static void fn_1_4190(float arg0) { } } -static void fn_1_4284(float arg0) { +static void fn_1_4284(float arg0) +{ Vec sp8; s32 i; @@ -1088,7 +1006,8 @@ static void fn_1_4284(float arg0) { } } -static void fn_1_43D8(omObjData *arg0) { +static void fn_1_43D8(omObjData *arg0) +{ Vec spE8; float temp_f31; float temp_f23; @@ -1113,9 +1032,9 @@ static void fn_1_43D8(omObjData *arg0) { temp_r31->unk04 = 2000.0f; Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 10.0f, HU3D_MOTATTR_NONE); Hu3DMotionSet(temp_r30->model[0], temp_r30->motion[0]); - Hu3DModelAttrSet(temp_r30->model[0], 0x40000002); + Hu3DModelAttrSet(temp_r30->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelAttrReset(temp_r30->model[0], 0x40000001); - Hu3DModelAttrReset(temp_r30->model[0], 1); + Hu3DModelAttrReset(temp_r30->model[0], HU3D_ATTR_DISPOFF); } break; case 2002: @@ -1187,7 +1106,7 @@ static void fn_1_43D8(omObjData *arg0) { if (670.0f > temp_r31->unk1C) { temp_f31 = (670.0f - temp_r31->unk1C) / 450.0f; Hu3DMotionTimeSet(lbl_1_bss_54[temp_r31->unk54]->model[0], 10.0f * temp_f31); - temp_r28 = (s32) (10.0f * temp_f31) >> 1; + temp_r28 = (s32)(10.0f * temp_f31) >> 1; if (temp_r28 < 5 && temp_r31->unk44 != lbl_1_data_3C4[temp_r28]) { temp_r31->unk44 = lbl_1_data_3C4[temp_r28]; HuAudFXPlay(temp_r31->unk44); @@ -1197,7 +1116,8 @@ static void fn_1_43D8(omObjData *arg0) { temp_r31->unk4C++; temp_r31->unk1C = 470.0f; fn_1_2B30(temp_r31, arg0, temp_r30); - } else { + } + else { temp_r31->unk0C += 0.7f; Hu3DMotionTimeSet(temp_r30->model[0], temp_r31->unk0C); } @@ -1232,7 +1152,8 @@ static void fn_1_43D8(omObjData *arg0) { Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[2], 20.0f, 20.0f, HU3D_MOTATTR_NONE); HuAudFXPlay(0x513); fn_1_4190(temp_r31->unk18); - } else { + } + else { temp_r31->unk4C = 2014; fn_1_2B30(temp_r31, arg0, temp_r30); } @@ -1262,7 +1183,8 @@ static void fn_1_43D8(omObjData *arg0) { temp_f31 = sind(temp_f23) * sind(temp_f23); if (180.0f > temp_r31->unk18) { temp_r31->unk24 = temp_r31->unk18 + -temp_r31->unk18 * temp_f31; - } else { + } + else { temp_r31->unk24 = temp_r31->unk18 + (360.0f - temp_r31->unk18) * temp_f31; } omSetRot(arg0, 0.0f, temp_r31->unk24, 0.0f); @@ -1303,7 +1225,8 @@ static void fn_1_43D8(omObjData *arg0) { } } -static void fn_1_63C8(omObjData *arg0) { +static void fn_1_63C8(omObjData *arg0) +{ UnkFn27A8Struct *temp_r31; s16 temp_r28; s16 var_r27; @@ -1336,8 +1259,8 @@ static void fn_1_63C8(omObjData *arg0) { temp_r28 = arg0->model[0]; var_r27 = Hu3DLLightCreateV(temp_r28, &lbl_1_data_34, &lbl_1_data_40, &lbl_1_data_4C); Hu3DLLightStaticSet(temp_r28, var_r27, 1); - Hu3DModelAttrSet(arg0->model[0], 1); - Hu3DModelAttrSet(arg0->model[0], 0x40000001); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP); Hu3DModelLayerSet(arg0->model[0], 3); Hu3DMotionSet(arg0->model[0], arg0->motion[0]); temp_r31->unk18 = 135.0f + 90.0f * temp_r31->unk54; @@ -1345,7 +1268,7 @@ static void fn_1_63C8(omObjData *arg0) { omSetTra(arg0, temp_r31->unk1C * sind(180.0f + temp_r31->unk18), temp_r31->unk28, temp_r31->unk1C * cosd(180.0f + temp_r31->unk18)); omSetRot(arg0, 0.0f, temp_r31->unk18, 0.0f); Hu3DModelShadowSet(arg0->model[0]); - Hu3DModelAttrReset(arg0->model[0], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); if (GWPlayerCfg[temp_r31->unk54].iscom) { switch (GWPlayerCfg[temp_r31->unk54].diff) { case 0: @@ -1372,10 +1295,10 @@ static void fn_1_63C8(omObjData *arg0) { arg0->func = fn_1_43D8; } -static void fn_1_6858(omObjData *arg0) { -} +static void fn_1_6858(omObjData *arg0) { } -static void fn_1_685C(omObjData *arg0) { +static void fn_1_685C(omObjData *arg0) +{ float temp_f31; float temp_f29; float temp_f30; @@ -1387,20 +1310,21 @@ static void fn_1_685C(omObjData *arg0) { for (i = 0; i < 3; i++) { arg0->motion[i] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_1E8[i]); } - Hu3DModelAttrSet(arg0->model[0], 1); - Hu3DModelAttrSet(arg0->model[0], 0x40000002); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(arg0->model[0], 4); Hu3DMotionSet(arg0->model[0], arg0->motion[0]); - temp_f31 = ((UnkFn27A8Struct*) lbl_1_bss_4C[temp_r29]->data)->unk18; - temp_f29 = ((UnkFn27A8Struct*) lbl_1_bss_4C[temp_r29]->data)->unk04; - temp_f30 = ((UnkFn27A8Struct*) lbl_1_bss_4C[temp_r29]->data)->unk00; + temp_f31 = ((UnkFn27A8Struct *)lbl_1_bss_4C[temp_r29]->data)->unk18; + temp_f29 = ((UnkFn27A8Struct *)lbl_1_bss_4C[temp_r29]->data)->unk04; + temp_f30 = ((UnkFn27A8Struct *)lbl_1_bss_4C[temp_r29]->data)->unk00; omSetTra(arg0, temp_f30 * sind(180.0f + temp_f31), temp_f29, temp_f30 * cosd(180.0f + temp_f31)); omSetRot(arg0, 0.0f, temp_f31, 0.0f); Hu3DModelShadowSet(arg0->model[0]); arg0->func = fn_1_6858; } -static void fn_1_6AB4(omObjData *arg0) { +static void fn_1_6AB4(omObjData *arg0) +{ Vec *temp_r29; UnkFn6AB4Struct *temp_r31; float temp_f31; @@ -1443,7 +1367,8 @@ static void fn_1_6AB4(omObjData *arg0) { omSetRot(arg0, 0.0f, temp_r31->unk0C, 0.0f); } -static void fn_1_6E64(omObjData *arg0) { +static void fn_1_6E64(omObjData *arg0) +{ Vec *temp_r29; UnkFn6AB4Struct *temp_r30; s32 i; @@ -1454,7 +1379,7 @@ static void fn_1_6E64(omObjData *arg0) { for (i = 0; i < 2; i++) { arg0->motion[i] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_1F8[i]); } - Hu3DModelAttrSet(arg0->model[0], 1); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); Hu3DModelLayerSet(arg0->model[0], 5); Hu3DMotionSet(arg0->model[0], arg0->motion[1]); temp_r30->unk18 = 3000; @@ -1467,18 +1392,20 @@ static void fn_1_6E64(omObjData *arg0) { omSetRot(arg0, 0.0f, temp_r30->unk0C, 0.0f); Hu3DModelShadowSet(arg0->model[0]); Hu3DModelAttrReset(arg0->model[0], 0x40000002); - Hu3DModelAttrReset(arg0->model[0], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); arg0->func = fn_1_6AB4; } -static void fn_1_7020(omObjData *arg0) { - Hu3DModelAttrSet(arg0->model[0], 1); +static void fn_1_7020(omObjData *arg0) +{ + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); fn_1_24(arg0->work[0], arg0->model[0]); omDelObjEx(lbl_1_bss_1E8, arg0); lbl_1_bss_24--; } -static void fn_1_70E4(omObjData *arg0) { +static void fn_1_70E4(omObjData *arg0) +{ Mtx sp18; Vec spC; float var_f27; @@ -1571,7 +1498,8 @@ static void fn_1_70E4(omObjData *arg0) { } } -static void fn_1_7950(omObjData *arg0) { +static void fn_1_7950(omObjData *arg0) +{ UnkFn70E4Struct *temp_r30; s16 var_r25; @@ -1581,22 +1509,24 @@ static void fn_1_7950(omObjData *arg0) { var_r25 = fn_1_AC(arg0->work[0]); if (var_r25 < 0) { arg0->model[0] = Hu3DModelLink(lbl_1_bss_16[arg0->work[0]]); - } else { + } + else { arg0->model[0] = var_r25; } Hu3DMotionTimeSet(arg0->model[0], 0.0f); - Hu3DModelAttrSet(arg0->model[0], 1); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); Hu3DModelLayerSet(arg0->model[0], 2); omSetTra(arg0, temp_r30->unk00.x, temp_r30->unk00.y, temp_r30->unk00.z); omSetRot(arg0, temp_r30->unk0C, temp_r30->unk10, temp_r30->unk14); omSetSca(arg0, temp_r30->unk18, temp_r30->unk1C, temp_r30->unk20); Hu3DModelAttrReset(arg0->model[0], 0x40000003); - Hu3DModelAttrReset(arg0->model[0], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); arg0->func = fn_1_70E4; } } -static void fn_1_7AEC(s32 arg0, Vec *arg1, Vec *arg2) { +static void fn_1_7AEC(s32 arg0, Vec *arg1, Vec *arg2) +{ omObjData *temp_r3; UnkFn70E4Struct *temp_r31; @@ -1643,46 +1573,48 @@ static void fn_1_7AEC(s32 arg0, Vec *arg1, Vec *arg2) { } } -static void fn_1_7D48(omObjData *arg0) { -} +static void fn_1_7D48(omObjData *arg0) { } -static void fn_1_7D4C(omObjData *arg0) { +static void fn_1_7D4C(omObjData *arg0) +{ arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M402, 35)); - Hu3DModelAttrSet(arg0->model[0], 1); - Hu3DModelAttrSet(arg0->model[0], 0x40000002); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(arg0->model[0], 0); omSetTra(arg0, 0.0f, 0.0f, 0.0f); omSetRot(arg0, 0.0f, 270.0f + 90.0f * arg0->work[0], 0.0f); Hu3DModelShadowMapSet(arg0->model[0]); - Hu3DModelAttrReset(arg0->model[0], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); arg0->func = fn_1_7D48; } -static void fn_1_7E80(omObjData *arg0) { -} +static void fn_1_7E80(omObjData *arg0) { } -static void fn_1_7E84(omObjData *arg0) { +static void fn_1_7E84(omObjData *arg0) +{ float temp_f31; arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M402, 36)); - Hu3DModelAttrSet(arg0->model[0], 1); - Hu3DModelAttrSet(arg0->model[0], 0x40000001); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP); Hu3DModelAttrReset(arg0->model[0], 0x40000002); Hu3DModelLayerSet(arg0->model[0], 1); temp_f31 = 135.0f + 90.0f * arg0->work[0]; omSetTra(arg0, 155.5 * sind(temp_f31), 0.0f, 155.5 * cosd(temp_f31)); omSetRot(arg0, 0.0f, 0.0f, 0.0f); - Hu3DModelAttrReset(arg0->model[0], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); arg0->func = fn_1_7E80; } -static inline void fn_1_8048InlineFunc(Vec *arg0, float arg1, float arg2, float arg3) { +static inline void fn_1_8048InlineFunc(Vec *arg0, float arg1, float arg2, float arg3) +{ arg0->x = arg1; arg0->y = arg2; arg0->z = arg3; } -static void fn_1_8048(void) { +static void fn_1_8048(void) +{ Vec sp14; Vec sp8; @@ -1700,7 +1632,8 @@ static void fn_1_8048(void) { Hu3DGLightPosSetV(lbl_1_bss_14, &sp14, &sp8); } -static void fn_1_8218(omObjData *arg0) { +static void fn_1_8218(omObjData *arg0) +{ Vec sp38; float temp_f26; omObjData *temp_r30; @@ -1725,7 +1658,8 @@ static void fn_1_8218(omObjData *arg0) { case 1005: if (lbl_1_bss_1AA < 0) { lbl_1_bss_1AA = MGSeqCreate(3, 0); - } else { + } + else { if (lbl_1_bss_1A4 < 0 && (MGSeqStatGet(lbl_1_bss_1AA) & 0x10)) { lbl_1_bss_1A4 = HuAudSeqPlay(0x46); } @@ -1761,7 +1695,8 @@ static void fn_1_8218(omObjData *arg0) { lbl_1_bss_1A8 = -1; lbl_1_bss_1AA = MGSeqCreate(3, 1); fn_1_1F58(100); - } else { + } + else { lbl_1_bss_2C += 1.0f; if (90.0f >= lbl_1_bss_2C) { fn_1_13DC(lbl_1_bss_2C / 90.0f, &lbl_1_data_1C); @@ -1778,18 +1713,20 @@ static void fn_1_8218(omObjData *arg0) { if (lbl_1_bss_26 < 0) { lbl_1_bss_1AA = MGSeqCreate(3, 2); HuAudSStreamPlay(4); - } else { + } + else { lbl_1_bss_1AA = MGSeqCreate(5, 3, GWPlayerCfg[lbl_1_bss_26].character, -1, -1, -1); temp_r30 = lbl_1_bss_4C[lbl_1_bss_26]; Hu3DMotionShiftSet(temp_r30->model[0], temp_r30->motion[10], 0.0f, 20.0f, HU3D_MOTATTR_NONE); HuAudSStreamPlay(1); } - } else { + } + else { lbl_1_bss_2C += 1.0f; if (lbl_1_bss_26 >= 0 && 110.0f == lbl_1_bss_2C) { - Hu3DModelAttrSet(arg0->model[1], 1); + Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(arg0->model[2], 0x40000002); - Hu3DModelAttrReset(arg0->model[2], 1); + Hu3DModelAttrReset(arg0->model[2], HU3D_ATTR_DISPOFF); Hu3DMotionTimeSet(arg0->model[2], 0.0f); Hu3DMotionSpeedSet(arg0->model[2], 3.0f); } @@ -1807,9 +1744,9 @@ static void fn_1_8218(omObjData *arg0) { } lbl_1_bss_30 -= 1.0f; if (0.0f == lbl_1_bss_30) { - Hu3DModelAttrSet(arg0->model[1], 1); + Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(arg0->model[2], 0x40000002); - Hu3DModelAttrReset(arg0->model[2], 1); + Hu3DModelAttrReset(arg0->model[2], HU3D_ATTR_DISPOFF); Hu3DMotionTimeSet(arg0->model[2], 0.0f); Hu3DMotionSpeedSet(arg0->model[2], 3.0f); } @@ -1817,13 +1754,14 @@ static void fn_1_8218(omObjData *arg0) { lbl_1_bss_30 = -1.0f; fn_1_8048(); if (Hu3DMotionEndCheck(arg0->model[2])) { - Hu3DModelAttrReset(arg0->model[1], 1); - Hu3DModelAttrSet(arg0->model[2], 1); + Hu3DModelAttrReset(arg0->model[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[2], HU3D_ATTR_DISPOFF); } } } -static void fn_1_9058(omObjData *arg0) { +static void fn_1_9058(omObjData *arg0) +{ s16 temp_r29; s16 temp_r28; s32 i; @@ -1833,8 +1771,8 @@ static void fn_1_9058(omObjData *arg0) { arg0->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M402, 33)); arg0->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M402, 34)); for (i = 0; i < 3; i++) { - Hu3DModelAttrSet(arg0->model[i], 1); - Hu3DModelAttrSet(arg0->model[i], 0x40000002); + Hu3DModelAttrSet(arg0->model[i], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[i], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(arg0->model[i], 0); Hu3DModelPosSet(arg0->model[i], 0.0f, 0.0f, 0.0f); } @@ -1844,15 +1782,16 @@ static void fn_1_9058(omObjData *arg0) { temp_r29 = arg0->model[0]; temp_r28 = Hu3DLLightCreateV(temp_r29, &lbl_1_data_34, &lbl_1_data_40, &lbl_1_data_4C); Hu3DLLightStaticSet(temp_r29, temp_r28, 1); - Hu3DModelAttrReset(arg0->model[0], 1); - Hu3DModelAttrReset(arg0->model[1], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(arg0->model[1], HU3D_ATTR_DISPOFF); Hu3DModelShadowMapSet(arg0->model[0]); HuAudFXPlay(0x519); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); arg0->func = fn_1_8218; } -void ObjectSetup(void) { +void ObjectSetup(void) +{ Vec sp20; omObjData *temp_r30; s32 i; @@ -1923,13 +1862,14 @@ void ObjectSetup(void) { lbl_1_bss_40 = omGetGroupMemberListEx(lbl_1_bss_1E8, 5); for (i = 0; i < 7; i++) { lbl_1_bss_16[i] = Hu3DModelCreateFile(lbl_1_data_218[i]); - Hu3DModelAttrSet(lbl_1_bss_16[i], 1); - Hu3DModelAttrSet(lbl_1_bss_16[i], 0x40000002); + Hu3DModelAttrSet(lbl_1_bss_16[i], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_16[i], HU3D_MOTATTR_PAUSE); } lbl_1_bss_58 = omAddObjEx(lbl_1_bss_1E8, 106, 3, 1, -1, fn_1_9058); } -static void fn_1_9AF4(omObjData *arg0) { +static void fn_1_9AF4(omObjData *arg0) +{ s32 i; if (WipeStatGet() == 0) { diff --git a/src/REL/m403Dll/main.c b/src/REL/m403Dll/main.c index 3d143917..d0f9003a 100755 --- a/src/REL/m403Dll/main.c +++ b/src/REL/m403Dll/main.c @@ -1,5 +1,5 @@ -#include "REL/m403Dll.h" #include "REL/executor.h" +#include "REL/m403Dll.h" #include "game/audio.h" #include "game/chrman.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 u8 lbl_1_data_38_unused[0xC] = { 0 }; -void ObjectSetup(void) { +void ObjectSetup(void) +{ LightData *var_r28; Process *temp_r31; 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; arg0->func = fn_1_444; } -static void fn_1_444(omObjData *arg0) { +static void fn_1_444(omObjData *arg0) +{ Vec sp2C; Vec sp20; Vec sp14; @@ -296,18 +299,12 @@ static void fn_1_444(omObjData *arg0) { static s32 lbl_1_data_68 = -1; -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, 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) -}; +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, 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 sp10; float var_f31; @@ -323,7 +320,8 @@ static void fn_1_82C(omObjData *arg0) { lbl_1_bss_2A = 1800; lbl_1_bss_2C = MGSeqStartCreate(); 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_30++; lbl_1_bss_28 = 0; @@ -357,10 +355,11 @@ static void fn_1_82C(omObjData *arg0) { case 6: var_r29 = 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++; } - } else if (lbl_1_data_0 <= 1 && fn_1_8264() == 0) { + } + else if (lbl_1_data_0 <= 1 && fn_1_8264() == 0) { var_r29++; } 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_data_0 != 0) { 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; } } @@ -432,12 +431,13 @@ static void fn_1_82C(omObjData *arg0) { if (lbl_1_data_0 == 0) { lbl_1_bss_2C = MGSeqDrawCreate(); HuAudSStreamPlay(4); - } else { + } + else { for (i = 0; i < 4; i++) { sp8[i] = -1; } 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); 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) { fn_1_676C(); 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(); 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); @@ -489,7 +491,8 @@ static void fn_1_1274(omObjData *arg0) { 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 sp8[] = { 1, 1, 2, 2, 2, 3, 3, 3, 3 }; 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; 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; } -static void fn_1_17DC(omObjData *arg0) { +static void fn_1_17DC(omObjData *arg0) +{ Unkm403Struct_00 *temp_r31; 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.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); - } 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->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); @@ -587,7 +593,8 @@ static void fn_1_17DC(omObjData *arg0) { 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; 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; } -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; 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); } -static void fn_1_1DA8(float arg0) { +static void fn_1_1DA8(float arg0) +{ Unkm403Struct_00 *temp_r31; temp_r31 = lbl_1_bss_48->data; temp_r31->unk140 = arg0; } -static s32 lbl_1_data_C4[] = { - 0, 2, 3, 8, 10, 9, 23, 24 -}; +static s32 lbl_1_data_C4[] = { 0, 2, 3, 8, 10, 9, 23, 24 }; -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 } -}; +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 } }; -static float lbl_1_data_114[] = { - 40.0f, 40.0f, 40.0f, 40.0f, - 40.0f, 100.0f, 40.0f, 80.0f -}; +static float lbl_1_data_114[] = { 40.0f, 40.0f, 40.0f, 40.0f, 40.0f, 100.0f, 40.0f, 80.0f }; -static float lbl_1_data_134[] = { - 160.0f, 160.0f, 180.0f, 160.0f, - 160.0f, 180.0f, 180.0f, 200.0f -}; +static float lbl_1_data_134[] = { 160.0f, 160.0f, 180.0f, 160.0f, 160.0f, 180.0f, 180.0f, 200.0f }; 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; s32 temp_r27; s32 i; @@ -715,7 +712,7 @@ static void fn_1_1DD0(omObjData *arg0) { } temp_r28 = CharModelCreate(temp_r3->unk01, 4); arg0->model[0] = temp_r28; - Hu3DModelAttrSet(temp_r28, 0x40000001); + Hu3DModelAttrSet(temp_r28, HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(temp_r28); for (i = 0; i < 8; 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; } -static void fn_1_2158(omObjData *arg0) { +static void fn_1_2158(omObjData *arg0) +{ Unkm403Struct_01 *temp_r31; s32 sp8; @@ -747,9 +745,9 @@ static void fn_1_2158(omObjData *arg0) { } /* fallthrough */ case 1: - temp_r31->unk18 = 3; - temp_r31->unk48 = 0.0f; - temp_r31->unk0C = 0; + temp_r31->unk18 = 3; + temp_r31->unk48 = 0.0f; + temp_r31->unk0C = 0; break; case 5: arg0->func = fn_1_22A4; @@ -763,7 +761,8 @@ static void fn_1_2158(omObjData *arg0) { fn_1_2FDC(arg0); } -static void fn_1_22A4(omObjData *arg0) { +static void fn_1_22A4(omObjData *arg0) +{ Unkm403Struct_01 *temp_r31; s32 temp_r29; 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 (temp_r31->unk05 != 0) { fn_1_2598(arg0); - } else { + } + else { temp_r31->unk10 = HuPadStkX[temp_r31->unk04]; temp_r31->unk12 = HuPadStkY[temp_r31->unk04]; temp_r31->unk14 = HuPadBtnDown[temp_r31->unk04]; temp_r31->unk16 = HuPadBtn[temp_r31->unk04]; } - } else { + } + else { temp_r31->unk10 = temp_r31->unk12 = 0; temp_r31->unk14 = temp_r31->unk16 = 0; } @@ -807,7 +808,7 @@ static void fn_1_22A4(omObjData *arg0) { HuAudFXPlay(0x523); temp_r31->unk07 = 0; Hu3DModelShadowReset(temp_r29); - Hu3DModelAttrSet(temp_r29, 1); + Hu3DModelAttrSet(temp_r29, HU3D_ATTR_DISPOFF); lbl_1_data_0--; 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); @@ -816,7 +817,8 @@ static void fn_1_22A4(omObjData *arg0) { } if (fn_1_8264() != 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); 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 sp14; Vec sp8; @@ -867,7 +870,7 @@ static void fn_1_2598(omObjData *arg0) { break; case 1: 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->unk64 = 200.0f * ((fn_1_4528() - 0x8000) / 32768.0f); var_r27 = temp_r31->unk10; @@ -880,10 +883,12 @@ static void fn_1_2598(omObjData *arg0) { var_f31 = fn_1_59F4(&sp8); if (var_f31 < 20.0f) { temp_r31->unk5C = 3; - } else { + } + else { if (var_f31 >= 100.0f) { var_f28 = 0.8f; - } else { + } + else { var_f28 = 0.4f; } 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) { temp_r31->unk5E = -1; } - } else if (temp_r31->unk5E >= 0) { + } + else if (temp_r31->unk5E >= 0) { if (temp_r31->unk5E == 0) { if (var_f31 < 150.0f && temp_r31->unk0E != 0) { 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; - } else { + } + else { temp_r31->unk5C = 1; } - } else { + } + else { temp_r31->unk5E--; } } @@ -916,16 +925,19 @@ static void fn_1_2598(omObjData *arg0) { sp8.z = temp_r31->unk64 - temp_r31->unk2C.z; if (fn_1_59F4(&sp8) >= 30.000002f && temp_r31->unk0E == 0) { temp_r31->unk5C = 2; - } else if (fn_1_8264() == 0) { + } + else if (fn_1_8264() == 0) { temp_r31->unk5C = 0; - } else { + } + else { if (temp_r31->unk5E > 0) { temp_r31->unk5E--; } 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; - } else { + } + else { temp_r31->unk5C = 1; } } @@ -972,7 +984,8 @@ static void fn_1_2598(omObjData *arg0) { temp_r31->unk16 = var_r20; } -static void fn_1_2FDC(omObjData *arg0) { +static void fn_1_2FDC(omObjData *arg0) +{ float var_f29; Unkm403Struct_01 *temp_r31; s32 temp_r25; @@ -1000,7 +1013,8 @@ static void fn_1_2FDC(omObjData *arg0) { if (temp_r31->unk1C >= 6.0f) { var_r28 = 2; var_r27 = 1; - } else { + } + else { var_r28 = 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->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->unk1C = 0.0f; var_r28 = 0; @@ -1024,7 +1039,8 @@ static void fn_1_2FDC(omObjData *arg0) { var_r27 = 0; if (Hu3DData[temp_r25].unk_0C == -1 && CharModelMotionEndCheck(temp_r31->unk01)) { temp_r31->unk48 += -2.4333334f; - } else { + } + else { temp_r31->unk48 = 0.0f; } if (temp_r31->unk0C != 0) { @@ -1033,7 +1049,8 @@ static void fn_1_2FDC(omObjData *arg0) { temp_r31->unk0D = 0; var_r28 = 5; var_r27 = 0; - } else { + } + else { temp_r31->unk48 *= -0.1f; temp_r31->unk0C = 0; var_r28 = 4; @@ -1062,9 +1079,10 @@ static void fn_1_2FDC(omObjData *arg0) { } if (temp_r31->unk07 & 4) { if (temp_r31->unk0A & 2) { - Hu3DModelAttrSet(temp_r25, 1); - } else { - Hu3DModelAttrReset(temp_r25, 1); + Hu3DModelAttrSet(temp_r25, HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrReset(temp_r25, HU3D_ATTR_DISPOFF); } if (--temp_r31->unk0A == 0) { 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); } -static void fn_1_3800(void) { +static void fn_1_3800(void) +{ s32 var_r29; s32 i; 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 sp8; float var_f31; float var_f30; s32 var_r26; - omObjData* temp_r25; + omObjData *temp_r25; Unkm403Struct_01 *temp_r28; Unkm403Struct_01 *temp_r27; Unkm403Struct_01 *temp_r31; @@ -1166,7 +1186,8 @@ static s32 fn_1_3894(void) { return var_r26; } -static void fn_1_3B80(omObjData *arg0) { +static void fn_1_3B80(omObjData *arg0) +{ s32 sp8[4]; s32 var_r30; s32 i; @@ -1178,22 +1199,24 @@ static void fn_1_3B80(omObjData *arg0) { for (i = 0; i < 4; i++) { fn_1_3E4C(lbl_1_bss_34[i]); } - } else { + } + else { for (i = 0, var_r30 = 0; i < 4; i++) { - ((Unkm403Struct_01*) lbl_1_bss_34[i]->data)->unk9C = 0; - if (((Unkm403Struct_01*) lbl_1_bss_34[i]->data)->unk07 != 0) { + ((Unkm403Struct_01 *)lbl_1_bss_34[i]->data)->unk9C = 0; + if (((Unkm403Struct_01 *)lbl_1_bss_34[i]->data)->unk07 != 0) { sp8[var_r30++] = i; } } if (var_r30 != 0) { - i = sp8[(s32) (var_r30 * (fn_1_4528() / 65536.0f))]; - ((Unkm403Struct_01*) lbl_1_bss_34[i]->data)->unk9C = 1; + i = sp8[(s32)(var_r30 * (fn_1_4528() / 65536.0f))]; + ((Unkm403Struct_01 *)lbl_1_bss_34[i]->data)->unk9C = 1; } } 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 spC; 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; float var_f30; float var_f31; @@ -1232,14 +1256,16 @@ static void fn_1_3E4C(omObjData *arg0) { if (fn_1_86A0(&temp_r31->unk2C, &sp8) != 0) { temp_r31->unk2C.x = sp8.x; temp_r31->unk2C.z = sp8.z; - } else { + } + else { if (fn_1_7F78(temp_r31->unk2C.x, temp_r31->unk2C.z) - 10.0f < 100.0f) { temp_r31->unk07 |= 2; } var_f31 = var_f30 / lbl_1_data_134[temp_r31->unk01]; } } - } else { + } + else { var_f31 = var_f30 / lbl_1_data_134[temp_r31->unk01]; } 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; ParticleData *temp_r31; s32 temp_r30; @@ -1263,7 +1290,8 @@ static s16 fn_1_400C(s32 arg0, s16 arg1, ParticleHook arg2) { 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_f30; 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)); } -static s32 fn_1_4528(void) { +static s32 fn_1_4528(void) +{ lbl_1_data_154 *= 0x41C64E6D; lbl_1_data_154 += 0x3039; 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; if (arg0 > 180.0f) { arg0 -= 360.0f; - } else if (arg0 <= -180.0f) { + } + else if (arg0 <= -180.0f) { arg0 += 360.0f; } if (arg1 > 180.0f) { arg1 -= 360.0f; - } else if (arg1 <= -180.0f) { + } + else if (arg1 <= -180.0f) { arg1 += 360.0f; } var_f31 = arg0 - arg1; if (var_f31 > 180.0f) { var_f31 -= 360.0f; - } else if (var_f31 <= -180.0f) { + } + else if (var_f31 <= -180.0f) { var_f31 += 360.0f; } arg0 = arg1 + var_f31 * arg2; if (arg0 > 180.0f) { arg0 -= 360.0f; - } else if (arg0 <= -180.0f) { + } + else if (arg0 <= -180.0f) { arg0 += 360.0f; } 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 sp8; if (arg3 != 0.0f) { PSMTXRotRad(arg0, 'Z', MTXDegToRad(arg3)); - } else { + } + else { PSMTXIdentity(arg0); } 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 var_f28; double var_f30; @@ -1374,7 +1411,8 @@ static void fn_1_4804(float *arg0, float *arg1) { temp_f29 = -arg0[2]; if (1.0 - temp_f29 * temp_f29 < 0.0) { var_f30 = -(1.0 - temp_f29 * temp_f29); - } else { + } + else { var_f30 = 1.0 - temp_f29 * temp_f29; } 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); } -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 var_f30; @@ -1395,7 +1434,8 @@ static float fn_1_4B10(float arg0, float arg1, float arg2, float arg3) { 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; 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); 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 var_f29; 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++) { *(arg3++) = var_f29 * spC[i]; } - } else { + } + else { *(arg3++) = 0.0f; *(arg3++) = 0.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 sp8[16]; 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]; if (sp48[i] == 0.0f) { sp8[i + 1] = 0.0f; - } else { + } + else { 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--) { if (sp8[i] == 0.0f) { arg2[i] = 0.0f; - } else { + } + else { 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_f30; 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; temp_f31 = arg1[temp_r31 + 1] - arg1[temp_r31]; 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) { var_f29 = arg2[temp_r31]; } 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; float temp_f31; 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 (i = 0; i < arg3; i++) { - spD4[i] = ((float*) &arg1[i])[j]; + spD4[i] = ((float *)&arg1[i])[j]; } fn_1_4FF4(arg0, spD4, sp94, arg3); 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 sp8[16]; 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 (j = 0; j < arg5; j++) { - sp48[j] = ((float*) &arg3[j])[i]; + sp48[j] = ((float *)&arg3[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_f29; @@ -1529,31 +1582,36 @@ static float fn_1_59F4(Vec *arg0) { arg0->x *= var_f29; arg0->y *= var_f29; arg0->z *= var_f29; - } else { + } + else { arg0->x = arg0->y = arg0->z = 0.0f; } 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) { arg2->x = arg0.x; arg2->y = arg0.y; arg2->z = arg0.z; arg3 = 0.0f; - } else if (arg3 >= 1.0f) { + } + else if (arg3 >= 1.0f) { arg2->x = arg0.x + arg1.x; arg2->y = arg0.y + arg1.y; arg2->z = arg0.z + arg1.z; arg3 = 1.0f; - } else { + } + else { arg2->x = arg0.x + arg3 * arg1.x; arg2->y = arg0.y + arg3 * arg1.y; 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 temp_f30; @@ -1565,7 +1623,8 @@ static float fn_1_5C64(Vec arg0, Vec arg1, Vec arg2) { 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; 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); } -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; if (arg2->x * arg2->x + arg2->y * arg2->y + arg2->z * arg2->z == 0.0f) { diff --git a/src/REL/m403Dll/scene.c b/src/REL/m403Dll/scene.c index ba268596..e87fd648 100755 --- a/src/REL/m403Dll/scene.c +++ b/src/REL/m403Dll/scene.c @@ -1,8 +1,8 @@ #include "REL/m403Dll.h" #include "game/audio.h" #include "game/frand.h" -#include "game/hsfman.h" #include "game/hsfdraw.h" +#include "game/hsfman.h" #include "game/hsfmotion.h" #include "game/memory.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_58[6]; -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 }, - { 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_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 }, + { 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[] = { - { 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 }, - { -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_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 }, + { 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[] = { - { 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 }, - { -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_2D8[] + = { { 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 }, + { -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[] = { - { 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 }, - { -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_350[] + = { { 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 }, + { -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[] = { - { 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 }, - { -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_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 }, + { 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[] = { - { 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 }, - { -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_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 }, + { 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[] = { - { 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 }, - { -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_548[] + = { { 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 }, + { -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[] = { - { 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 }, - { -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_5C0[] + = { { 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 }, + { -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[] = { - { 129.1f, 0.0f, 54.6f }, - { 140.0f, 0.0f, 0.0f }, - { 129.3f, 0.0f, -53.6f }, - { 99.0f, 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_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 }, + { 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[] = { - { 95.9f, 0.0f, 42.9f }, - { 106.6f, 0.0f, 0.4f }, - { 98.4f, 0.0f, -37.2f }, - { 81.7f, 0.0f, -65.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 }, - { -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_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 }, + { 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[] = { - { 110.9f, 0.0f, 45.9f }, - { 120.0f, 0.0f, 0.0f }, - { 110.9f, 0.0f, -45.8f }, - { 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_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 }, + { 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[] = { - { 80.0f, 0.0f, 31.0f }, - { 83.9f, 0.0f, -0.1f }, - { 77.2f, 0.0f, -31.7f }, - { 60.4f, 0.0f, -56.8f }, - { 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 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 }, + { 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[] = { - 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, 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 s32 lbl_1_data_A58[] + = { 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, 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[] = { - { -400.0f, 0.0f, 300.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 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 }, + { 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_ADC[] = { 7, 9, 11 }; static s32 lbl_1_data_AE8[] = { 1, 2, 3, 4, 5 }; -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 -}; +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 }; -static s32 lbl_1_data_B14[] = { - 16, 16, 10, 10, 22, 22 -}; +static s32 lbl_1_data_B14[] = { 16, 16, 10, 10, 22, 22 }; -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 }, - { 40.0f, 0.0f, -20.0f } -}; +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 }, + { 40.0f, 0.0f, -20.0f } }; -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_2D8, lbl_1_data_350 }, - { lbl_1_data_638, lbl_1_data_740 }, - { lbl_1_data_848, lbl_1_data_950 } -}; +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_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[] = { - 16, 16, 10, 10, 22, 22 -}; +static s32 lbl_1_data_BA4[] = { 16, 16, 10, 10, 22, 22 }; -void fn_1_650C(Process *arg0) { +void fn_1_650C(Process *arg0) +{ Vec sp20; Vec sp14; Vec sp8; @@ -379,21 +173,23 @@ void fn_1_650C(Process *arg0) { memset(lbl_1_bss_58, 0, sizeof(lbl_1_bss_58)); } -void fn_1_676C(void) { +void fn_1_676C(void) +{ fn_1_799C(); } -static void fn_1_678C(omObjData *arg0) { +static void fn_1_678C(omObjData *arg0) +{ arg0->stat |= 0x100; arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M403, 16)); arg0->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M403, 17)); 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->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M403, 0)); 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; } -static void fn_1_6980(omObjData *arg0) { +static void fn_1_6980(omObjData *arg0) +{ ModelData *var_r30; UnkBss9CData *var_r29; @@ -418,15 +215,18 @@ static void fn_1_6980(omObjData *arg0) { arg0->work[0]++; var_r30 = &Hu3DData[arg0->model[1]]; var_r30->rot.x = -120.0f * arg0->work[0] / 60.0f; - } else { + } + else { lbl_1_bss_78 ^= 1; lbl_1_bss_7C = 0; } - } else if (arg0->work[0] != 0) { + } + else if (arg0->work[0] != 0) { arg0->work[0]--; var_r30 = &Hu3DData[arg0->model[1]]; var_r30->rot.x = -120.0f * arg0->work[0] / 60.0f; - } else { + } + else { lbl_1_bss_78 ^= 1; 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; s32 i; @@ -464,10 +265,10 @@ static void fn_1_6C98(omObjData *arg0) { } for (i = 0; i < 12U; 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]; - Hu3DModelAttrReset(arg0->model[0], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); var_r29->unk00_field0 = 0; var_r29->unk04 = 4 - lbl_1_bss_98; fn_1_6FE8(arg0); @@ -500,7 +301,8 @@ static void fn_1_6C98(omObjData *arg0) { arg0->func = fn_1_73E8; } -static void fn_1_6ED8(omObjData *arg0) { +static void fn_1_6ED8(omObjData *arg0) +{ Mtx sp38; Mtx sp8; 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; s32 temp_r29; 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)); for (i = 0; i < 6; i++) { 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++) { 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; ModelData *var_r27; 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; break; } - } else { + } + else { return; } - } else { + } + else { switch (temp_r30->unk04) { case 0: if (lbl_1_bss_84 != 0) { @@ -635,7 +441,8 @@ static void fn_1_73E8(omObjData *arg0) { Hu3DModelShadowReset(arg0->model[i]); Hu3DModelShadowMapSet(arg0->model[i]); } - } else { + } + else { temp_r30->unk08 += lbl_1_bss_80; if (temp_r30->unk08 > 90.0f) { temp_r30->unk00_field0 = 1; @@ -669,8 +476,9 @@ static void fn_1_73E8(omObjData *arg0) { fn_1_6ED8(arg0); } -static void fn_1_799C(void) { - omObjData* temp_r30; +static void fn_1_799C(void) +{ + omObjData *temp_r30; UnkBss9CData *temp_r29; s32 i; 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; HsfData *temp_r31; 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_r30; @@ -719,37 +529,44 @@ static s32 fn_1_7B20(float arg0, float arg1) { var_r30 = (arg1 + 400.0f) / 400.0f; if (var_r31 < 0) { var_r31 = 0; - } else if (var_r31 > 2) { + } + else if (var_r31 > 2) { var_r31 = 2; } if (var_r30 < 0) { var_r30 = 0; - } else if (var_r30 > 1) { + } + else if (var_r30 > 1) { var_r30 = 1; } 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->y = lbl_1_data_A88[arg0].y; 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]; } -void fn_1_7C30(float arg0) { +void fn_1_7C30(float arg0) +{ lbl_1_bss_8C = 1; lbl_1_bss_80 = arg0; } -void fn_1_7C50(s32 arg0) { +void fn_1_7C50(s32 arg0) +{ lbl_1_bss_74 = arg0; } -void fn_1_7C60(void) { +void fn_1_7C60(void) +{ float var_f30; lbl_1_bss_7C = 1; @@ -758,7 +575,8 @@ void fn_1_7C60(void) { 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 sp1C; Vec sp10; @@ -799,7 +617,8 @@ static s32 fn_1_7D04(float arg0, float arg1, Vec *arg2) { return temp_r23; } -float fn_1_7F78(float arg0, float arg1) { +float fn_1_7F78(float arg0, float arg1) +{ float temp_f30; float var_f31; omObjData *temp_r31; @@ -808,7 +627,8 @@ float fn_1_7F78(float arg0, float arg1) { temp_f30 = -(arg1 - temp_r31->trans.z); if (cosd(temp_r31->rot.x) <= 0.0) { var_f31 = 9999.0f; - } else { + } + else { var_f31 = temp_f30 * sind(temp_r31->rot.x) / cosd(temp_r31->rot.x); if (var_f31 > 9999.0f) { var_f31 = 9999.0f; @@ -817,19 +637,23 @@ float fn_1_7F78(float arg0, float arg1) { 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); } -static s32 fn_1_8254(void) { +static s32 fn_1_8254(void) +{ return lbl_1_bss_7C; } -s32 fn_1_8264(void) { +s32 fn_1_8264(void) +{ 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 i; @@ -842,7 +666,8 @@ static s32 fn_1_8274(UnkBss9CData *arg0, s32 *arg1) { return var_r30; } -s32 fn_1_82D0(Vec *arg0) { +s32 fn_1_82D0(Vec *arg0) +{ omObjData *temp_r31; UnkBss9CData *temp_r28; s32 sp8[6]; @@ -864,10 +689,11 @@ s32 fn_1_82D0(Vec *arg0) { return var_r26; } -s32 fn_1_8470(Vec *arg0) { +s32 fn_1_8470(Vec *arg0) +{ Mtx sp50; Mtx sp20; - omObjData* temp_r30; + omObjData *temp_r30; UnkBss9CData *temp_r27; s32 sp8[6]; s32 temp_r26; @@ -896,14 +722,16 @@ s32 fn_1_8470(Vec *arg0) { return var_r25; } -void fn_1_8670(s32 arg0) { +void fn_1_8670(s32 arg0) +{ if (arg0 > lbl_1_bss_74) { arg0 = lbl_1_bss_74; } lbl_1_bss_70 = arg0; } -s32 fn_1_86A0(Vec *arg0, Vec *arg1) { +s32 fn_1_86A0(Vec *arg0, Vec *arg1) +{ Vec sp48; Vec sp3C; Vec sp30; @@ -972,14 +800,16 @@ s32 fn_1_86A0(Vec *arg0, Vec *arg1) { continue; } 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.y = temp_r30[i].y + temp_f30 * sp24.y; sp30.z = temp_r30[i].z + temp_f30 * sp24.z; VECSubtract(&sp30, &sp3C, &spC); temp_f28 = VECMag(&spC); 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.y = temp_r29[i].y + temp_f29 * sp18.y; 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); if (temp_f28 == 0.0f) { var_f31 = temp_f30; - } else if (temp_f27 == 0.0f) { + } + else if (temp_f27 == 0.0f) { var_f31 = temp_f29; - } else { + } + else { temp_f26 = 1.0f - temp_f28 / (temp_f28 + temp_f27); var_f31 = temp_f30 * temp_f26 + temp_f29 * (1.0f - temp_f26); } if (var_f31 < 0.0f) { var_f31 = 0.0f; - } else if (var_f31 > 1.0f) { + } + else if (var_f31 > 1.0f) { var_f31 = 1.0f; } sp3C.x = temp_r29[i].x + var_f31 * sp18.x; diff --git a/src/REL/m404Dll/main.c b/src/REL/m404Dll/main.c index 3f4e4e85..a5d68eb8 100644 --- a/src/REL/m404Dll/main.c +++ b/src/REL/m404Dll/main.c @@ -477,7 +477,7 @@ void fn_1_7E0(omObjData *object) } espDispOff(var_r31->unk_02[var_r30]); 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], 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; CharModelMotionSpeedSet(var_r31->unk_0C, 1.0f); Hu3DMotionOverlayReset(object->model[0]); - Hu3DModelAttrSet(object->model[1], 1); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); if (var_r31->unk_74 >= 0) { HuAudFXStop(var_r31->unk_74); 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[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)); Hu3DModelShadowMapSet(object->model[2]); diff --git a/src/REL/m405Dll/main.c b/src/REL/m405Dll/main.c index fe37d2d1..7e48a2eb 100755 --- a/src/REL/m405Dll/main.c +++ b/src/REL/m405Dll/main.c @@ -2,10 +2,10 @@ #include "game/chrman.h" #include "game/data.h" #include "game/esprite.h" -#include "game/gamework.h" -#include "game/gamework_data.h" #include "game/flag.h" #include "game/frand.h" +#include "game/gamework.h" +#include "game/gamework_data.h" #include "game/hsfanim.h" #include "game/hsfdraw.h" #include "game/hsfman.h" @@ -249,46 +249,26 @@ Vec lbl_1_bss_0[2]; s16 lbl_1_data_0[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; -UnkBss10Struct lbl_1_data_10[] = { - { NULL, 0, 640, 480, GX_FALSE }, - { NULL, 0, 640, 480, GX_FALSE }, - { NULL, 0, 320, 240, GX_TRUE } -}; +UnkBss10Struct lbl_1_data_10[] = { { NULL, 0, 640, 480, GX_FALSE }, { NULL, 0, 640, 480, GX_FALSE }, { NULL, 0, 320, 240, GX_TRUE } }; -Vec lbl_1_data_40[] = { - { -450.0f, 0.0f, 0.0f }, - { -450.0f, 0.0f, 0.0f }, - { -150.0f, 0.0f, 0.0f }, - { -150.0f, 0.0f, 0.0f }, - { 150.0f, 0.0f, 0.0f }, - { 150.0f, 0.0f, 0.0f }, - { 450.0f, 0.0f, 0.0f }, - { 450.0f, 0.0f, 0.0f } -}; +Vec lbl_1_data_40[] = { { -450.0f, 0.0f, 0.0f }, { -450.0f, 0.0f, 0.0f }, { -150.0f, 0.0f, 0.0f }, { -150.0f, 0.0f, 0.0f }, { 150.0f, 0.0f, 0.0f }, + { 150.0f, 0.0f, 0.0f }, { 450.0f, 0.0f, 0.0f }, { 450.0f, 0.0f, 0.0f } }; -float lbl_1_data_A0[] = { - -600.0f, 300.0f, - -600.0f, 300.0f, - -300.0f, 300.0f, - -300.0f, 300.0f, - 0.0f, 300.0f, - 0.0f, 300.0f, - 300.0f, 300.0f, - 300.0f, 300.0f -}; +float lbl_1_data_A0[] + = { -600.0f, 300.0f, -600.0f, 300.0f, -300.0f, 300.0f, -300.0f, 300.0f, 0.0f, 300.0f, 0.0f, 300.0f, 300.0f, 300.0f, 300.0f, 300.0f }; -u8 lbl_1_data_E0_unused[] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0x08, 0x08, 0x08, 0xFF -}; +u8 lbl_1_data_E0_unused[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x08, 0x08, 0x08, 0xFF }; GXColor lbl_1_data_E8 = { 0xD8, 0xE2, 0xE5, 0x10 }; -void fn_1_0(void) { +void fn_1_0(void) +{ lbl_1_bss_790.unk04 = NULL; lbl_1_bss_790.unk08 = NULL; } -void fn_1_24(u16 arg0, s16 arg1) { +void fn_1_24(u16 arg0, s16 arg1) +{ UnkBss790Struct *temp_r31; UnkBss790Struct *temp_r30; UnkBss790Struct *temp_r29; @@ -306,7 +286,8 @@ void fn_1_24(u16 arg0, s16 arg1) { temp_r31->unk08 = temp_r29; } -s16 fn_1_AC(s16 arg0) { +s16 fn_1_AC(s16 arg0) +{ UnkBss790Struct *var_r31; UnkBss790Struct *temp_r29; UnkBss790Struct *temp_r30; @@ -330,12 +311,14 @@ s16 fn_1_AC(s16 arg0) { return -1; } -void fn_1_150(void) { +void fn_1_150(void) +{ lbl_1_bss_778.unk10 = NULL; lbl_1_bss_778.unk14 = NULL; } -void fn_1_174(s16 arg0, HsfanimStruct00 *arg1, s32 arg2, s32 arg3, s32 arg4, Vec *arg5, u8 arg6) { +void fn_1_174(s16 arg0, HsfanimStruct00 *arg1, s32 arg2, s32 arg3, s32 arg4, Vec *arg5, u8 arg6) +{ UnkBss778Struct *temp_r27; UnkBss778Struct *var_r31; UnkBss778Struct *temp_r28; @@ -365,7 +348,8 @@ void fn_1_174(s16 arg0, HsfanimStruct00 *arg1, s32 arg2, s32 arg3, s32 arg4, Vec var_r31->unk14 = temp_r27; } -void fn_1_2D8(void) { +void fn_1_2D8(void) +{ UnkBss778Struct *var_r31; UnkBss778Struct *temp_r28; UnkBss778Struct *temp_r29; @@ -400,7 +384,8 @@ void fn_1_2D8(void) { } } -void fn_1_414(void) { +void fn_1_414(void) +{ s32 i; for (i = 0; i < 32; i++) { @@ -409,7 +394,8 @@ void fn_1_414(void) { } } -s16 fn_1_46C(s32 arg0) { +s16 fn_1_46C(s32 arg0) +{ s32 i; for (i = 0; i < 32; i++) { @@ -427,7 +413,8 @@ s16 fn_1_46C(s32 arg0) { return Hu3DModelCreateFile(arg0); } -void fn_1_580(s32 *arg0, s32 arg1, s32 arg2) { +void fn_1_580(s32 *arg0, s32 arg1, s32 arg2) +{ s32 var_r30; espBankSet(arg0[arg1 + 1], 10); @@ -450,14 +437,16 @@ void fn_1_580(s32 *arg0, s32 arg1, s32 arg2) { espBankSet(arg0[arg1 + 6], var_r30 % 10); } -void fn_1_798(s32 arg0) { +void fn_1_798(s32 arg0) +{ lbl_1_bss_728 = 0.0f; lbl_1_bss_738 = lbl_1_bss_73C; GWMGRecordSet(arg0, lbl_1_bss_738); fn_1_580(lbl_1_bss_6E8, 7, lbl_1_bss_73C); } -void fn_1_9EC(void) { +void fn_1_9EC(void) +{ s32 i; for (i = 0; i < 16; i++) { @@ -465,7 +454,8 @@ void fn_1_9EC(void) { } } -void fn_1_A40(void) { +void fn_1_A40(void) +{ float temp_f31; s32 i; @@ -478,7 +468,8 @@ void fn_1_A40(void) { } } -void fn_1_B4C(float arg0, s32 arg1) { +void fn_1_B4C(float arg0, s32 arg1) +{ float temp_f30; float temp_f31; s32 i; @@ -515,7 +506,8 @@ void fn_1_B4C(float arg0, s32 arg1) { } } -void fn_1_11F4(float arg0, Vec *arg1, Vec *arg2, Vec *arg3) { +void fn_1_11F4(float arg0, Vec *arg1, Vec *arg2, Vec *arg3) +{ float temp_f31; if (1.0f < arg0) { @@ -527,13 +519,15 @@ void fn_1_11F4(float arg0, Vec *arg1, Vec *arg2, Vec *arg3) { arg3->z = arg1->z + temp_f31 * (arg2->z - arg1->z); } -void fn_1_1350(Vec *arg0, Vec *arg1, Vec *arg2) { +void fn_1_1350(Vec *arg0, Vec *arg1, Vec *arg2) +{ Hu3DCameraPosSetV(1, arg0, arg1, arg2); lbl_1_bss_768 = *arg0; lbl_1_bss_750 = *arg2; } -s32 fn_1_13DC(float arg0, Vec *arg1) { +s32 fn_1_13DC(float arg0, Vec *arg1) +{ Vec sp18; Vec spC; @@ -542,13 +536,15 @@ s32 fn_1_13DC(float arg0, Vec *arg1) { Hu3DCameraPosSetV(1, &sp18, arg1, &spC); if (1.0f <= arg0) { return 1; - } else { + } + else { lbl_1_bss_72C = 1; return 0; } } -void fn_1_1710(float arg0, Vec *arg1) { +void fn_1_1710(float arg0, Vec *arg1) +{ Vec sp18; Vec spC; @@ -558,7 +554,8 @@ void fn_1_1710(float arg0, Vec *arg1) { lbl_1_bss_72C = 1; } -void fn_1_1A60(Vec *arg0, s16 arg1, Vec *arg2) { +void fn_1_1A60(Vec *arg0, s16 arg1, Vec *arg2) +{ Mtx sp1C; Vec sp10; float temp_f30; @@ -585,7 +582,8 @@ void fn_1_1A60(Vec *arg0, s16 arg1, Vec *arg2) { arg2->z = 0.0f; } -void fn_1_1D18(s16 arg0, char *arg1, Vec *arg2) { +void fn_1_1D18(s16 arg0, char *arg1, Vec *arg2) +{ Mtx sp10; Hu3DModelObjMtxGet(arg0, arg1, sp10); @@ -594,7 +592,8 @@ void fn_1_1D18(s16 arg0, char *arg1, Vec *arg2) { arg2->z = sp10[2][3]; } -void fn_1_1D70(s16 arg0, char *arg1, Vec *arg2, Mtx arg3) { +void fn_1_1D70(s16 arg0, char *arg1, Vec *arg2, Mtx arg3) +{ Mtx spC; ModelData *var_r30; @@ -609,7 +608,8 @@ void fn_1_1D70(s16 arg0, char *arg1, Vec *arg2, Mtx arg3) { arg2->z = spC[2][3]; } -float fn_1_1E20(float arg0, float arg1, float arg2) { +float fn_1_1E20(float arg0, float arg1, float arg2) +{ float var_f31; float var_f30; @@ -627,11 +627,13 @@ float fn_1_1E20(float arg0, float arg1, float arg2) { return var_f30; } -void fn_1_1F24(s32 arg0) { +void fn_1_1F24(s32 arg0) +{ lbl_1_bss_730 = HuAudSeqPlay(arg0); } -void fn_1_1F58(s32 arg0) { +void fn_1_1F58(s32 arg0) +{ if (lbl_1_bss_730 >= 0) { if (arg0 < 0) { arg0 = 1000; @@ -641,7 +643,8 @@ void fn_1_1F58(s32 arg0) { lbl_1_bss_730 = -1; } -void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3) { +void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3) +{ Vec sp18; float var_f28; s32 var_r30; @@ -650,7 +653,7 @@ void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3) { sp18.y = 0.0f; sp18.z = 0.0f; sp18.x = arg2 / 4.0f; - sp18.z = -(float) arg3 / 4.0f; + sp18.z = -(float)arg3 / 4.0f; var_r30 = 0; var_f28 = VECMagXZ(&sp18); if (0.5f <= var_f28) { @@ -664,14 +667,16 @@ void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3) { *arg1 = fn_1_1E20(*arg1, atan2d(sp18.x, sp18.z), 0.4f); if (8.0f <= var_f28) { var_r30 = 2; - } else { + } + else { var_r30 = 1; } } - VECAdd((Vec*) &arg0, &sp18, (Vec*) &arg0); + VECAdd((Vec *)&arg0, &sp18, (Vec *)&arg0); } -s32 fn_1_23B4(Vec *arg0) { +s32 fn_1_23B4(Vec *arg0) +{ float var_f31; float var_f30; s32 var_r31; @@ -684,7 +689,8 @@ s32 fn_1_23B4(Vec *arg0) { return var_r31 + var_r30 * 30; } -void fn_1_2480(UnkFn2480Struct *arg0, float arg1, float arg2) { +void fn_1_2480(UnkFn2480Struct *arg0, float arg1, float arg2) +{ Vec *var_r31; s32 i; @@ -698,10 +704,11 @@ void fn_1_2480(UnkFn2480Struct *arg0, float arg1, float arg2) { } } -void fn_1_2508(UnkFn2480Struct *arg0) { +void fn_1_2508(UnkFn2480Struct *arg0) +{ Vec spC; Vec *temp_r29; - float* var_r30; + float *var_r30; u16 *var_r28; u32 i; @@ -726,7 +733,8 @@ void fn_1_2508(UnkFn2480Struct *arg0) { } } -void fn_1_2714(u8 arg0, s32 arg1) { +void fn_1_2714(u8 arg0, s32 arg1) +{ GXColor sp14 = { 0x1E, 0x66, 0xA2, 0xFF }; UnkBss10Struct *temp_r31; @@ -739,7 +747,8 @@ void fn_1_2714(u8 arg0, s32 arg1) { DCFlushRange(temp_r31->unk00, temp_r31->unk04); } -void fn_1_280C(omObjData *arg0) { +void fn_1_280C(omObjData *arg0) +{ Vec sp2C; Vec sp20; Vec sp14; @@ -749,7 +758,7 @@ void fn_1_280C(omObjData *arg0) { Vec *var_r25; Vec *temp_r28; Vec *var_r30; - u16 (*var_r31)[4]; + u16(*var_r31)[4]; s32 i; var_r27 = lbl_1_bss_5AC.unk00; @@ -790,12 +799,13 @@ void fn_1_280C(omObjData *arg0) { DCStoreRangeNoSync(lbl_1_bss_5AC.unk20, 900 * sizeof(*lbl_1_bss_5AC.unk20)); } -void fn_1_2AAC(omObjData *arg0) { +void fn_1_2AAC(omObjData *arg0) +{ Vec sp28; Vec *var_r25; UnkBss10Struct *temp_r26; UnkFn2480Struct *var_r31; - u16 (*var_r28)[4]; + u16(*var_r28)[4]; s32 temp_r27; s32 i; s32 j; @@ -838,7 +848,8 @@ void fn_1_2AAC(omObjData *arg0) { (*var_r28)[1] = temp_r27 + 30; (*var_r28)[2] = temp_r27 + 1; (*var_r28)[3] = temp_r27 + 31; - } else { + } + else { temp_r27 = j + i * 30; (*var_r28)[1] = temp_r27; (*var_r28)[3] = temp_r27 + 30; @@ -906,7 +917,8 @@ void fn_1_2AAC(omObjData *arg0) { } } -void fn_1_37A4(ModelData *arg0, Mtx arg1) { +void fn_1_37A4(ModelData *arg0, Mtx arg1) +{ Mtx spEC; Mtx spBC; Mtx sp8C; @@ -964,12 +976,12 @@ void fn_1_37A4(ModelData *arg0, Mtx arg1) { GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD2, GX_TEXMAP2); GXSetIndTexCoordScale(GX_INDTEXSTAGE0, GX_ITS_1, GX_ITS_1); PSMTXScale(spBC, -0.2f, -0.2f, 0.2f); - GXSetIndTexMtx(GX_ITM_0, (float (*)[3]) spBC, -2); + GXSetIndTexMtx(GX_ITM_0, (float(*)[3])spBC, -2); GXSetTevIndWarp(GX_TEVSTAGE0, GX_INDTEXSTAGE0, GX_TRUE, GX_FALSE, GX_ITM_0); GXSetIndTexOrder(GX_INDTEXSTAGE1, GX_TEXCOORD3, GX_TEXMAP3); GXSetIndTexCoordScale(GX_INDTEXSTAGE1, GX_ITS_1, GX_ITS_1); PSMTXScale(spBC, 0.5f, 0.5f, 0.5f); - GXSetIndTexMtx(GX_ITM_1, (float (*)[3]) spBC, 0); + GXSetIndTexMtx(GX_ITM_1, (float(*)[3])spBC, 0); GXSetTevIndWarp(GX_TEVSTAGE1, GX_INDTEXSTAGE1, GX_TRUE, GX_FALSE, GX_ITM_1); GXSetNumTevStages(2); lbl_1_data_E8.a = lbl_1_bss_A8; @@ -999,15 +1011,18 @@ void fn_1_37A4(ModelData *arg0, Mtx arg1) { GXSetTevDirect(GX_TEVSTAGE1); } -void fn_1_3F1C(ModelData *arg0, Mtx arg1) { +void fn_1_3F1C(ModelData *arg0, Mtx arg1) +{ fn_1_280C(NULL); } -void fn_1_3F40(ModelData *arg0, Mtx arg1) { +void fn_1_3F40(ModelData *arg0, Mtx arg1) +{ fn_1_2714(2, GX_FALSE); } -void fn_1_4024(ModelData *arg0, Mtx arg1) { +void fn_1_4024(ModelData *arg0, Mtx arg1) +{ Mtx sp98; Mtx sp68; Mtx sp38; @@ -1065,7 +1080,8 @@ void fn_1_4024(ModelData *arg0, Mtx arg1) { GXEnd(); } -void fn_1_4700(ModelData *arg0, Mtx arg1) { +void fn_1_4700(ModelData *arg0, Mtx arg1) +{ Mtx sp60; Mtx44 sp20; float temp_f31; @@ -1149,7 +1165,8 @@ void fn_1_4700(ModelData *arg0, Mtx arg1) { fn_1_2714(0, GX_TRUE); } -void fn_1_4F28(omObjData *arg0) { +void fn_1_4F28(omObjData *arg0) +{ Vec spC; float temp_f27; float var_f29; @@ -1200,7 +1217,8 @@ void fn_1_4F28(omObjData *arg0) { } } -void fn_1_5404(omObjData *arg0) { +void fn_1_5404(omObjData *arg0) +{ lbl_1_bss_A8 = 0; omSetTra(arg0, 0.0f, 0.0f, 0.0f); fn_1_2AAC(arg0); @@ -1217,7 +1235,8 @@ void fn_1_5404(omObjData *arg0) { arg0->func = fn_1_4F28; } -void fn_1_5530(Vec *arg0, s32 arg1) { +void fn_1_5530(Vec *arg0, s32 arg1) +{ UnkBssACStruct *temp_r31; temp_r31 = &lbl_1_bss_AC[arg1]; @@ -1225,7 +1244,8 @@ void fn_1_5530(Vec *arg0, s32 arg1) { temp_r31->unk0C = 1.0f; } -void fn_1_557C(Vec *arg0, float arg1, s32 arg2, s32 arg3) { +void fn_1_557C(Vec *arg0, float arg1, s32 arg2, s32 arg3) +{ UnkFn2480Struct *temp_r31; temp_r31 = &lbl_1_bss_5AC.unk10[arg2 + (arg3 ^ 1)]; @@ -1247,7 +1267,8 @@ void fn_1_557C(Vec *arg0, float arg1, s32 arg2, s32 arg3) { } } -float fn_1_5664(Vec *arg0) { +float fn_1_5664(Vec *arg0) +{ return lbl_1_bss_5AC.unk04[fn_1_23B4(arg0)].y; } @@ -1266,191 +1287,58 @@ GXColor lbl_1_data_16C = { 0xFF, 0xFF, 0xFF, 0xFF }; Vec lbl_1_data_170 = { 0.0f, 8000.0f, 1000.0f }; Vec lbl_1_data_17C = { 0.0f, 0.0f, 0.0f }; -s32 lbl_1_data_188[8][8] = { - { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 42), - DATA_MAKE_NUM(DATADIR_M405, 0), - DATA_MAKE_NUM(DATADIR_M405, 8), - DATA_MAKE_NUM(DATADIR_M405, 16), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 43), - DATA_MAKE_NUM(DATADIR_M405, 24), - DATA_MAKE_NUM(DATADIR_M405, 32), - DATA_MAKE_NUM(DATADIR_M405, 40) - }, - { - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 42), - DATA_MAKE_NUM(DATADIR_M405, 1), - DATA_MAKE_NUM(DATADIR_M405, 9), - DATA_MAKE_NUM(DATADIR_M405, 17), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 43), - DATA_MAKE_NUM(DATADIR_M405, 25), - DATA_MAKE_NUM(DATADIR_M405, 33), - DATA_MAKE_NUM(DATADIR_M405, 41) - }, - { - DATA_MAKE_NUM(DATADIR_PEACHMOT, 42), - DATA_MAKE_NUM(DATADIR_M405, 2), - DATA_MAKE_NUM(DATADIR_M405, 10), - DATA_MAKE_NUM(DATADIR_M405, 18), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 43), - DATA_MAKE_NUM(DATADIR_M405, 26), - DATA_MAKE_NUM(DATADIR_M405, 34), - DATA_MAKE_NUM(DATADIR_M405, 42) - }, - { - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 42), - DATA_MAKE_NUM(DATADIR_M405, 3), - DATA_MAKE_NUM(DATADIR_M405, 11), - DATA_MAKE_NUM(DATADIR_M405, 19), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 43), - DATA_MAKE_NUM(DATADIR_M405, 27), - DATA_MAKE_NUM(DATADIR_M405, 35), - DATA_MAKE_NUM(DATADIR_M405, 43) - }, - { - DATA_MAKE_NUM(DATADIR_WARIOMOT, 42), - DATA_MAKE_NUM(DATADIR_M405, 4), - DATA_MAKE_NUM(DATADIR_M405, 12), - DATA_MAKE_NUM(DATADIR_M405, 20), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 43), - DATA_MAKE_NUM(DATADIR_M405, 28), - DATA_MAKE_NUM(DATADIR_M405, 36), - DATA_MAKE_NUM(DATADIR_M405, 44) - }, - { - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 42), - DATA_MAKE_NUM(DATADIR_M405, 5), - DATA_MAKE_NUM(DATADIR_M405, 13), - DATA_MAKE_NUM(DATADIR_M405, 21), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 43), - DATA_MAKE_NUM(DATADIR_M405, 29), - DATA_MAKE_NUM(DATADIR_M405, 37), - DATA_MAKE_NUM(DATADIR_M405, 45) - }, - { - DATA_MAKE_NUM(DATADIR_DAISYMOT, 42), - DATA_MAKE_NUM(DATADIR_M405, 6), - DATA_MAKE_NUM(DATADIR_M405, 14), - DATA_MAKE_NUM(DATADIR_M405, 22), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 43), - DATA_MAKE_NUM(DATADIR_M405, 30), - DATA_MAKE_NUM(DATADIR_M405, 38), - DATA_MAKE_NUM(DATADIR_M405, 46) - }, - { - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 42), - DATA_MAKE_NUM(DATADIR_M405, 7), - DATA_MAKE_NUM(DATADIR_M405, 15), - DATA_MAKE_NUM(DATADIR_M405, 23), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 43), - DATA_MAKE_NUM(DATADIR_M405, 31), - DATA_MAKE_NUM(DATADIR_M405, 39), - DATA_MAKE_NUM(DATADIR_M405, 47) - } -}; +s32 lbl_1_data_188[8][8] = { { DATA_MAKE_NUM(DATADIR_MARIOMOT, 42), DATA_MAKE_NUM(DATADIR_M405, 0), DATA_MAKE_NUM(DATADIR_M405, 8), + DATA_MAKE_NUM(DATADIR_M405, 16), DATA_MAKE_NUM(DATADIR_MARIOMOT, 43), DATA_MAKE_NUM(DATADIR_M405, 24), + DATA_MAKE_NUM(DATADIR_M405, 32), DATA_MAKE_NUM(DATADIR_M405, 40) }, + { DATA_MAKE_NUM(DATADIR_LUIGIMOT, 42), DATA_MAKE_NUM(DATADIR_M405, 1), DATA_MAKE_NUM(DATADIR_M405, 9), DATA_MAKE_NUM(DATADIR_M405, 17), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 43), DATA_MAKE_NUM(DATADIR_M405, 25), DATA_MAKE_NUM(DATADIR_M405, 33), DATA_MAKE_NUM(DATADIR_M405, 41) }, + { DATA_MAKE_NUM(DATADIR_PEACHMOT, 42), DATA_MAKE_NUM(DATADIR_M405, 2), DATA_MAKE_NUM(DATADIR_M405, 10), DATA_MAKE_NUM(DATADIR_M405, 18), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 43), DATA_MAKE_NUM(DATADIR_M405, 26), DATA_MAKE_NUM(DATADIR_M405, 34), DATA_MAKE_NUM(DATADIR_M405, 42) }, + { DATA_MAKE_NUM(DATADIR_YOSHIMOT, 42), DATA_MAKE_NUM(DATADIR_M405, 3), DATA_MAKE_NUM(DATADIR_M405, 11), DATA_MAKE_NUM(DATADIR_M405, 19), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 43), DATA_MAKE_NUM(DATADIR_M405, 27), DATA_MAKE_NUM(DATADIR_M405, 35), DATA_MAKE_NUM(DATADIR_M405, 43) }, + { DATA_MAKE_NUM(DATADIR_WARIOMOT, 42), DATA_MAKE_NUM(DATADIR_M405, 4), DATA_MAKE_NUM(DATADIR_M405, 12), DATA_MAKE_NUM(DATADIR_M405, 20), + DATA_MAKE_NUM(DATADIR_WARIOMOT, 43), DATA_MAKE_NUM(DATADIR_M405, 28), DATA_MAKE_NUM(DATADIR_M405, 36), DATA_MAKE_NUM(DATADIR_M405, 44) }, + { DATA_MAKE_NUM(DATADIR_DONKEYMOT, 42), DATA_MAKE_NUM(DATADIR_M405, 5), DATA_MAKE_NUM(DATADIR_M405, 13), DATA_MAKE_NUM(DATADIR_M405, 21), + DATA_MAKE_NUM(DATADIR_DONKEYMOT, 43), DATA_MAKE_NUM(DATADIR_M405, 29), DATA_MAKE_NUM(DATADIR_M405, 37), DATA_MAKE_NUM(DATADIR_M405, 45) }, + { DATA_MAKE_NUM(DATADIR_DAISYMOT, 42), DATA_MAKE_NUM(DATADIR_M405, 6), DATA_MAKE_NUM(DATADIR_M405, 14), DATA_MAKE_NUM(DATADIR_M405, 22), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 43), DATA_MAKE_NUM(DATADIR_M405, 30), DATA_MAKE_NUM(DATADIR_M405, 38), DATA_MAKE_NUM(DATADIR_M405, 46) }, + { DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 42), DATA_MAKE_NUM(DATADIR_M405, 7), DATA_MAKE_NUM(DATADIR_M405, 15), DATA_MAKE_NUM(DATADIR_M405, 23), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 43), DATA_MAKE_NUM(DATADIR_M405, 31), DATA_MAKE_NUM(DATADIR_M405, 39), DATA_MAKE_NUM(DATADIR_M405, 47) } }; -s32 lbl_1_data_288[] = { - DATA_MAKE_NUM(DATADIR_M405, 55), - DATA_MAKE_NUM(DATADIR_M405, 56) -}; +s32 lbl_1_data_288[] = { DATA_MAKE_NUM(DATADIR_M405, 55), DATA_MAKE_NUM(DATADIR_M405, 56) }; -s32 lbl_1_data_290[] = { - DATA_MAKE_NUM(DATADIR_MGCONST, 0), - DATA_MAKE_NUM(DATADIR_MGCONST, 1), - 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) -}; +s32 lbl_1_data_290[] = { DATA_MAKE_NUM(DATADIR_MGCONST, 0), DATA_MAKE_NUM(DATADIR_MGCONST, 1), 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) }; s32 lbl_1_data_2B0[] = { -224, -128, 128, 224 }; -s32 lbl_1_data_2C0[] = { - 0, 0, - 0, 0, - -20, -18, - 19, -18, - 0, 0, - 0, 0, - 0, 0, - 0, 0, - 0, 0, - 0, 0 -}; +s32 lbl_1_data_2C0[] = { 0, 0, 0, 0, -20, -18, 19, -18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; s32 lbl_1_data_310[] = { -24, 17, 24, 17, 0, 17 }; s32 lbl_1_data_328[] = { 1, 0, 3, 2, 4 }; -u8 lbl_1_data_33C[][3] = { - { 1, 0, 1 }, - { 2, 3, 0 }, - { 1, 0, 0 } -}; +u8 lbl_1_data_33C[][3] = { { 1, 0, 1 }, { 2, 3, 0 }, { 1, 0, 0 } }; -u16 lbl_1_data_346[] = { - 0x0100, 0x0200, 0x0040, 0x0020, 0x0000 -}; +u16 lbl_1_data_346[] = { 0x0100, 0x0200, 0x0040, 0x0020, 0x0000 }; UnkBssA4InnerStruct lbl_1_data_350 = { 3570.0f, 2 }; UnkBssA4InnerStruct lbl_1_data_358 = { 3330.0f, 2 }; UnkBssA4InnerStruct lbl_1_data_360 = { 3180.0f, 2 }; UnkBssA4InnerStruct lbl_1_data_368 = { 3060.0f, 6 }; -HsfanimStruct00 lbl_1_data_370 = { - 0x0014, - { 0x00, 0x00 }, // padding? - 1.0f, - 30.0f, - 0.0f, - { 0.0f, 0.05f, 0.0f }, - 1.0f, - 0.999f, - 30.0f, - 1.03f, - 0x0004, - { - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF } - }, - { - { 0xFF, 0xFF, 0xFF, 0x00 }, - { 0xFF, 0xFF, 0xFF, 0x00 }, - { 0xFF, 0xFF, 0xFF, 0x00 }, - { 0xFF, 0xFF, 0xFF, 0x00 } - } -}; +HsfanimStruct00 lbl_1_data_370 = { 0x0014, { 0x00, 0x00 }, // padding? + 1.0f, 30.0f, 0.0f, { 0.0f, 0.05f, 0.0f }, 1.0f, 0.999f, 30.0f, 1.03f, 0x0004, + { { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF } }, + { { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 } } }; -HsfanimStruct00 lbl_1_data_3C0 = { - 0x0014, - { 0x00, 0x00 }, // padding? - 1.0f, - 10.0f, - 360.0f, - { 0.0f, 0.1f, 0.0f }, - 1.0f, - 1.0f, - 50.0f, - 1.05f, - 0x0001, - { - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0xFF, 0xFF } - }, - { - { 0xFF, 0xFF, 0xFF, 0x00 }, - { 0xFF, 0xFF, 0xFF, 0x00 }, - { 0xFF, 0xFF, 0xFF, 0x00 }, - { 0xFF, 0xFF, 0xFF, 0x00 } - } -}; +HsfanimStruct00 lbl_1_data_3C0 = { 0x0014, { 0x00, 0x00 }, // padding? + 1.0f, 10.0f, 360.0f, { 0.0f, 0.1f, 0.0f }, 1.0f, 1.0f, 50.0f, 1.05f, 0x0001, + { { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF } }, + { { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF, 0x00 } } }; -void fn_1_57FC(void) { +void fn_1_57FC(void) +{ UnkBssA4Data *temp_r31; s32 i; @@ -1461,7 +1349,8 @@ void fn_1_57FC(void) { } } -void fn_1_58A0(omObjData *arg0) { +void fn_1_58A0(omObjData *arg0) +{ Vec sp8; s16 var_r30; @@ -1491,7 +1380,7 @@ void fn_1_58A0(omObjData *arg0) { arg0->work[0]++; Hu3DMotionSet(arg0->model[0], arg0->motion[0]); Hu3DModelAttrReset(arg0->model[0], 0x40000002); - Hu3DModelAttrSet(arg0->model[0], 0x40000001); + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP); } break; case 2: @@ -1499,7 +1388,8 @@ void fn_1_58A0(omObjData *arg0) { } } -void fn_1_5B28(omObjData *arg0) { +void fn_1_5B28(omObjData *arg0) +{ s32 i; arg0->work[0] = 0; @@ -1511,7 +1401,7 @@ void fn_1_5B28(omObjData *arg0) { arg0->motion[i] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_288[i]); } for (i = 0; i < 2; i++) { - Hu3DModelAttrSet(arg0->model[i], 1); + Hu3DModelAttrSet(arg0->model[i], HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(arg0->model[i], 0x40000003); Hu3DModelLayerSet(arg0->model[i], 5); Hu3DModelShadowSet(arg0->model[i]); @@ -1521,17 +1411,19 @@ void fn_1_5B28(omObjData *arg0) { Hu3DModelHookSet(arg0->model[0], "g001m1_021-itemhook_r", arg0->model[1]); Hu3DMotionTimeSet(arg0->model[1], 1.0f); for (i = 0; i < 2; i++) { - Hu3DModelAttrReset(arg0->model[i], 1); + Hu3DModelAttrReset(arg0->model[i], HU3D_ATTR_DISPOFF); } arg0->func = fn_1_58A0; } -void fn_1_5D3C(UnkBssA4Data *arg0, Vec *arg1) { +void fn_1_5D3C(UnkBssA4Data *arg0, Vec *arg1) +{ fn_1_5530(arg1, arg0->unk98 + arg0->unk108 * 20); arg0->unk98 = (arg0->unk98 + 1) % 20; } -void fn_1_5DCC(UnkBssA4Data *arg0) { +void fn_1_5DCC(UnkBssA4Data *arg0) +{ Vec sp8; float var_f31; UnkFn2480Struct *temp_r31; @@ -1551,7 +1443,8 @@ void fn_1_5DCC(UnkBssA4Data *arg0) { fn_1_557C(&sp8, var_f31, (3 - arg0->unk108) * 2, arg0->unk94 & 1); } -void fn_1_6040(UnkBssA4Data *arg0, omObjData *arg1) { +void fn_1_6040(UnkBssA4Data *arg0, omObjData *arg1) +{ Vec sp44[5]; s32 var_r27; s32 var_r26; @@ -1575,7 +1468,8 @@ void fn_1_6040(UnkBssA4Data *arg0, omObjData *arg1) { Hu3DParManPosSet(arg0->unkF0[i], arg0->unkA0[i].x, arg0->unkA0[i].y, arg0->unkA0[i].z); if (--arg0->unkDC[i] <= 0) { Hu3DParManAttrSet(arg0->unkF0[i], 1); - } else { + } + else { Hu3DParManAttrReset(arg0->unkF0[i], 1); } } @@ -1592,7 +1486,8 @@ void fn_1_6040(UnkBssA4Data *arg0, omObjData *arg1) { } } -void fn_1_65BC(UnkBssA4Data *arg0) { +void fn_1_65BC(UnkBssA4Data *arg0) +{ u8 *temp_r30; s32 i; @@ -1608,19 +1503,22 @@ void fn_1_65BC(UnkBssA4Data *arg0) { espDispOn(arg0->unk0C[temp_r30[2] + 4]); } -void fn_1_6828(UnkBssA4Data *arg0) { +void fn_1_6828(UnkBssA4Data *arg0) +{ s32 temp_r30; temp_r30 = (113.0f - arg0->unk68) / 10.0f - 1.0f; if (temp_r30 > 9) { espDispOff(arg0->unk0C[3]); - } else { + } + else { espDispOn(arg0->unk0C[3]); espBankSet(arg0->unk0C[3], temp_r30); } } -u16 fn_1_68CC(UnkBssA4Data *arg0) { +u16 fn_1_68CC(UnkBssA4Data *arg0) +{ u16 var_r29; u8 *temp_r30; @@ -1643,14 +1541,17 @@ u16 fn_1_68CC(UnkBssA4Data *arg0) { } if (arg0->unk44 >= 2 && 70.0f < arg0->unk68) { arg0->unk3C = 8.0f; - } else if (0.0f != arg0->unk40) { + } + else if (0.0f != arg0->unk40) { arg0->unk3C = arg0->unk40; - } else if (arg0->unk48 > 0) { + } + else if (arg0->unk48 > 0) { if ((arg0->unk48 & 1) == 1) { arg0->unk38 += 40.0f * (arg0->unk44 + 1); arg0->unk3C = 8.0f; arg0->unk48--; - } else if (frandmod(10) == 0) { + } + else if (frandmod(10) == 0) { arg0->unk3C = 8.0f; arg0->unk48--; } @@ -1662,13 +1563,15 @@ u16 fn_1_68CC(UnkBssA4Data *arg0) { if (30.0f < arg0->unk68) { arg0->unk40 = 0.0f; } - } else if (10.0f > arg0->unk68) { + } + else if (10.0f > arg0->unk68) { arg0->unk40 = 20.0f; } return var_r29; } -void fn_1_6BFC(omObjData *arg0) { +void fn_1_6BFC(omObjData *arg0) +{ float var_f31; float var_f30; UnkBssA4Data *temp_r31; @@ -1699,7 +1602,8 @@ void fn_1_6BFC(omObjData *arg0) { } if (GWPlayerCfg[temp_r31->unk108].iscom) { temp_r31->unk78 = fn_1_68CC(temp_r31); - } else { + } + else { temp_r31->unk78 |= HuPadBtnDown[temp_r31->unk110]; } var_r27 = temp_r31->unk104; @@ -1708,7 +1612,8 @@ void fn_1_6BFC(omObjData *arg0) { temp_r28 = lbl_1_data_33C[temp_r31->unk94]; if (temp_r28[2] == 1) { var_r24 = lbl_1_data_346[temp_r28[0]] | lbl_1_data_346[temp_r28[1]]; - } else { + } + else { var_r24 = lbl_1_data_346[temp_r28[temp_r31->unk90 & 1]]; } temp_r31->unk6C += 1.0f; @@ -1718,7 +1623,8 @@ void fn_1_6BFC(omObjData *arg0) { if (5.0f < temp_r31->unk74) { temp_r31->unk74 -= 1.0f; } - } else { + } + else { temp_r31->unk74 = 7.0f; } temp_r31->unk6C = 0.0f; @@ -1743,7 +1649,8 @@ void fn_1_6BFC(omObjData *arg0) { } if (temp_r31->unk94 == 1) { var_f30 = 1.0f; - } else { + } + else { var_f30 = -1.0f; } temp_r31->unk5C += var_f31 * var_f30; @@ -1769,7 +1676,8 @@ void fn_1_6BFC(omObjData *arg0) { temp_r31->unk8C = 0; } } - } else { + } + else { temp_r31->unk78 = 0; } if (1.0f > ABS(temp_r31->unk5C - temp_r31->unk4C.z)) { @@ -1777,7 +1685,8 @@ void fn_1_6BFC(omObjData *arg0) { if (30.0f == temp_r31->unk7C) { var_r27 = 0; } - } else { + } + else { temp_r31->unk7C = 0; var_r27 = temp_r31->unk94 + 2; var_f31 = 0.1f * (temp_r31->unk5C - temp_r31->unk4C.z); @@ -1789,11 +1698,13 @@ void fn_1_6BFC(omObjData *arg0) { temp_r31->unk4C.z = 1150.0f * (0.0f > temp_r31->unk4C.z ? -1 : 1); if (lbl_1_bss_7C < 0) { lbl_1_bss_7C = temp_r31->unk108; - } else if (frandmod(100) > 50) { + } + else if (frandmod(100) > 50) { lbl_1_bss_7C = temp_r31->unk108; } } - } else { + } + else { if (1150.0f < ABS(temp_r31->unk4C.z)) { temp_r31->unk100 = 2004; temp_r31->unkFC = 10.0f; @@ -1843,7 +1754,8 @@ void fn_1_6BFC(omObjData *arg0) { if (2.0f < temp_r31->unk60) { temp_r31->unk60 = 2.0f; } - } else { + } + else { temp_r31->unk60 = 1.0f; temp_r31->unk64 = 0.0f; } @@ -1854,7 +1766,8 @@ void fn_1_6BFC(omObjData *arg0) { omSetRot(arg0, 0.0f, temp_r31->unk58, 0.0f); } -void fn_1_798C(omObjData *arg0) { +void fn_1_798C(omObjData *arg0) +{ UnkBssA4Data *temp_r31; s32 i; @@ -1874,8 +1787,9 @@ void fn_1_798C(omObjData *arg0) { espDispOn(temp_r31->unk0C[i]); } fn_1_65BC(temp_r31); - } else if (30.0f == Hu3DMotionTimeGet(arg0->model[0])) { - Hu3DModelAttrSet(arg0->model[0], 0x40000002); + } + else if (30.0f == Hu3DMotionTimeGet(arg0->model[0])) { + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE); } break; case 2002: @@ -1884,7 +1798,7 @@ void fn_1_798C(omObjData *arg0) { temp_r31->unk4C.z = 900.0f; temp_r31->unk5C = temp_r31->unk4C.z; temp_r31->unk104 = 2; - Hu3DModelAttrSet(arg0->model[0], 0x40000001); + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP); Hu3DModelAttrReset(arg0->model[0], 0x40000002); Hu3DMotionSet(arg0->model[0], arg0->motion[temp_r31->unk104]); Hu3DMotionCalc(arg0->model[0]); @@ -1898,7 +1812,8 @@ void fn_1_798C(omObjData *arg0) { if (lbl_1_bss_7C == temp_r31->unk108) { temp_r31->unk58 = fn_1_1E20(temp_r31->unk58, 0.0f, 0.1f); } - if (lbl_1_bss_98->work[0] >= 1008 && temp_r31->unk104 == 0 && lbl_1_bss_7C == temp_r31->unk108 && 1.0f == Hu3DMotionTimeGet(arg0->model[0])) { + if (lbl_1_bss_98->work[0] >= 1008 && temp_r31->unk104 == 0 && lbl_1_bss_7C == temp_r31->unk108 + && 1.0f == Hu3DMotionTimeGet(arg0->model[0])) { temp_r31->unk104 = 7; Hu3DMotionOverlaySet(arg0->model[0], arg0->motion[temp_r31->unk104]); Hu3DMotionOverlayTimeSet(arg0->model[0], 0.0f); @@ -1922,7 +1837,8 @@ void fn_1_798C(omObjData *arg0) { omSetRot(arg0, 0.0f, temp_r31->unk58, 0.0f); } -void fn_1_81B4(omObjData *arg0) { +void fn_1_81B4(omObjData *arg0) +{ float var_f31; UnkBssA4Data *temp_r31; s32 i; @@ -1957,9 +1873,9 @@ void fn_1_81B4(omObjData *arg0) { arg0->motion[i] = CharModelMotionCreate(lbl_1_data_0[temp_r31->unk10C], lbl_1_data_188[temp_r31->unk10C][i]); CharModelMotionSet(lbl_1_data_0[temp_r31->unk10C], arg0->motion[i]); } - Hu3DModelAttrSet(arg0->model[0], 1); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(arg0->model[0], 0x40000001); - Hu3DModelAttrSet(arg0->model[0], 0x40000002); + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(arg0->model[0], 3); Hu3DMotionSet(arg0->model[0], arg0->motion[1]); Hu3DMotionTimeSet(arg0->model[0], 1.0f); @@ -1971,7 +1887,7 @@ void fn_1_81B4(omObjData *arg0) { omSetTra(arg0, temp_r31->unk4C.x, temp_r31->unk4C.y, temp_r31->unk4C.z); omSetRot(arg0, 0.0f, temp_r31->unk58, 0.0f); for (i = 0; i < 1; i++) { - Hu3DModelAttrReset(arg0->model[i], 1); + Hu3DModelAttrReset(arg0->model[i], HU3D_ATTR_DISPOFF); } temp_r31->unk04 = 288.0f + lbl_1_data_2B0[temp_r31->unk108]; temp_r31->unk08 = 80; @@ -1990,7 +1906,7 @@ void fn_1_81B4(omObjData *arg0) { for (i = 0; i < 10; i++) { espDrawNoSet(temp_r31->unk0C[i], 0); espDispOff(temp_r31->unk0C[i]); - espAttrSet(temp_r31->unk0C[i], 1); + espAttrSet(temp_r31->unk0C[i], HUSPR_ATTR_NOANIM); espBankSet(temp_r31->unk0C[i], 0); espPriSet(temp_r31->unk0C[i], 128 - i); espPosSet(temp_r31->unk0C[i], temp_r31->unk04 + lbl_1_data_2C0[i * 2], temp_r31->unk08 + lbl_1_data_2C0[i * 2 + 1]); @@ -2040,7 +1956,8 @@ void fn_1_81B4(omObjData *arg0) { arg0->func = fn_1_798C; } -void fn_1_8AF0(void) { +void fn_1_8AF0(void) +{ Vec sp20; Vec sp14; Vec sp8; @@ -2088,7 +2005,8 @@ void fn_1_8AF0(void) { sp14.x += 0.02f * (-1500.0f - sp14.x); sp14.y += 0.02f * (700.0f - sp14.y); sp14.z += 0.04f * (sp8.z - sp14.z); - } else { + } + else { var_f31 = 0.05f * (288.0f - (var_f29 + var_f30) / 2); if (0.0f < var_f31) { sp14.z -= var_f31; @@ -2133,7 +2051,8 @@ void fn_1_8AF0(void) { sp14.x -= 0.2f * var_f31; sp8.x += 0.01f * var_f31; } - } else { + } + else { sp14.y += 2.0f * var_f31; sp14.x -= 0.5f * var_f31; sp8.x += 0.01f * var_f31; @@ -2143,13 +2062,15 @@ void fn_1_8AF0(void) { fn_1_1350(&sp14, &lbl_1_data_100, &sp8); } -static inline void fn_1_9288_InlineFunc(Vec *arg0, float arg1, float arg2, float arg3) { +static inline void fn_1_9288_InlineFunc(Vec *arg0, float arg1, float arg2, float arg3) +{ arg0->x = arg1; arg0->y = arg2; arg0->z = arg3; } -void fn_1_9288(omObjData *arg0) { +void fn_1_9288(omObjData *arg0) +{ Vec sp18; Vec spC; float var_f27; @@ -2184,7 +2105,8 @@ void fn_1_9288(omObjData *arg0) { if (90.0f >= lbl_1_bss_80) { var_r30 = 1; var_f27 = lbl_1_bss_80; - } else { + } + else { var_r30 = 0; var_f27 = lbl_1_bss_80 - 90.0f; } @@ -2231,7 +2153,8 @@ void fn_1_9288(omObjData *arg0) { lbl_1_bss_73C++; if (lbl_1_bss_734 >= 0) { MGSeqParamSet(lbl_1_bss_734, 1, (18059 - lbl_1_bss_73C) / 60); - } else if (lbl_1_bss_73C > 16200) { + } + else if (lbl_1_bss_73C > 16200) { lbl_1_bss_734 = MGSeqTimerCreate((18059 - lbl_1_bss_73C) / 60); MGSeqPosSet(lbl_1_bss_734, 288.0f, 400.0f); } @@ -2258,7 +2181,8 @@ void fn_1_9288(omObjData *arg0) { if (lbl_1_bss_78 == 2) { fn_1_1350(&lbl_1_data_13C, &lbl_1_data_100, &lbl_1_data_148); } - } else { + } + else { fn_1_8AF0(); } lbl_1_bss_74 = lbl_1_bss_78; @@ -2274,7 +2198,8 @@ void fn_1_9288(omObjData *arg0) { if (lbl_1_bss_7C >= 0) { lbl_1_bss_60 = HuAudFXPlay(0x538); } - } else { + } + else { lbl_1_bss_80 += 1.0f; if (lbl_1_bss_7C >= 0) { fn_1_11F4(lbl_1_bss_80 / 60.0f, &lbl_1_bss_48[0], &lbl_1_bss_30[0], &sp18); @@ -2311,11 +2236,13 @@ void fn_1_9288(omObjData *arg0) { if (lbl_1_bss_7C < 0) { lbl_1_bss_736 = MGSeqDrawCreate(); HuAudSStreamPlay(4); - } else { + } + else { lbl_1_bss_736 = MGSeqWinCreate(GWPlayerCfg[lbl_1_bss_7C].character, -1, -1, -1); HuAudSStreamPlay(1); } - } else { + } + else { lbl_1_bss_80 += 1.0f; 0 <= lbl_1_bss_7C; if (210.0f < lbl_1_bss_80 && MGSeqStatGet(lbl_1_bss_736) == 0) { @@ -2333,7 +2260,8 @@ void fn_1_9288(omObjData *arg0) { fn_1_A40(); } -void fn_1_AD10(omObjData *arg0) { +void fn_1_AD10(omObjData *arg0) +{ s32 i; arg0->work[0] = 1000; @@ -2343,41 +2271,42 @@ void fn_1_AD10(omObjData *arg0) { omSetTra(arg0, 0.0f, 0.0f, 0.0f); arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M405, 48)); Hu3DModelAttrSet(arg0->model[0], 0x4001); - Hu3DModelAttrSet(arg0->model[0], 0x40000002); + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(arg0->model[0], 5); arg0->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M405, 49)); Hu3DModelAttrSet(arg0->model[1], 0x4001); - Hu3DModelAttrSet(arg0->model[1], 0x40000002); + Hu3DModelAttrSet(arg0->model[1], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(arg0->model[1], 6); Hu3DModelPosSet(arg0->model[1], 0.0f, 0.0f, 0.0f); arg0->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M405, 50)); - Hu3DModelAttrSet(arg0->model[2], 1); - Hu3DModelAttrSet(arg0->model[2], 0x40000002); + Hu3DModelAttrSet(arg0->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(arg0->model[2], 1); Hu3DModelPosSet(arg0->model[2], 0.0f, 0.0f, 0.0f); Hu3DModelShadowMapSet(arg0->model[2]); arg0->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M405, 51)); - Hu3DModelAttrSet(arg0->model[3], 1); - Hu3DModelAttrSet(arg0->model[3], 0x40000002); + Hu3DModelAttrSet(arg0->model[3], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[3], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(arg0->model[3], 1); Hu3DModelPosSet(arg0->model[3], 0.0f, -4.0f, 0.0f); Hu3DModelTPLvlSet(arg0->model[3], 0.4f); arg0->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M405, 52)); Hu3DModelAttrSet(arg0->model[4], 0x4001); - Hu3DModelAttrSet(arg0->model[4], 0x40000002); + Hu3DModelAttrSet(arg0->model[4], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(arg0->model[4], 6); Hu3DModelPosSet(arg0->model[4], 0.0f, 0.0f, 0.0f); fn_1_B4C(80.0f, DATA_MAKE_NUM(DATADIR_M405, 72)); fn_1_9EC(); for (i = 0; i < 5; i++) { - Hu3DModelAttrReset(arg0->model[i], 1); + Hu3DModelAttrReset(arg0->model[i], HU3D_ATTR_DISPOFF); } lbl_1_bss_68 = HuAudFXPlay(0x537); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); arg0->func = fn_1_9288; } -void ObjectSetup(void) { +void ObjectSetup(void) +{ Vec sp8; s32 temp_r29; s32 i; @@ -2430,7 +2359,8 @@ void ObjectSetup(void) { lbl_1_bss_98 = omAddObjEx(lbl_1_bss_774, 104, 5, 0, -1, fn_1_AD10); } -void fn_1_B5C8(omObjData *arg0) { +void fn_1_B5C8(omObjData *arg0) +{ s32 i; if (lbl_1_bss_68 >= 0) { diff --git a/src/REL/m406Dll/map.c b/src/REL/m406Dll/map.c index ef320c6a..7abe5b76 100644 --- a/src/REL/m406Dll/map.c +++ b/src/REL/m406Dll/map.c @@ -478,7 +478,7 @@ omObjData *fn_1_2308(Process *arg0) 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]); Hu3DModelShadowMapSet(var_r30); - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); if (var_r31 < 6) { 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; } if (var_r30 != -1) { - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); Hu3DModelLayerSet(var_r30, 5); } } var_r30 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 54)); lbl_1_bss_CC->model[14] = var_r30; Hu3DModelPosSet(var_r30, 0.0f, 10.0f, 0.0f); - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); Hu3DModelLayerSet(var_r30, 5); lbl_1_bss_C8 = omAddObjEx(arg0, 0x7D, 6, 0, 2, NULL); for (var_r31 = 0; var_r31 < 6; 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->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)); if (fabs(Center.z - var_f31) > 10000.0 || !lbl_1_bss_BC) { 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; if (object->model[var_r29] != -1) { - Hu3DModelAttrSet(object->model[var_r29], 1); + Hu3DModelAttrSet(object->model[var_r29], HU3D_ATTR_DISPOFF); } } else { 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; 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) { var_f31 = 25000.0f; if (fabs(Center.z - var_f31) < 15000.0) { - Hu3DModelAttrSet(object->model[var_r29], 1); + Hu3DModelAttrSet(object->model[var_r29], HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrReset(object->model[var_r29], 1); + Hu3DModelAttrReset(object->model[var_r29], HU3D_ATTR_DISPOFF); } } var_r29 = 6; 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++) { 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 { - Hu3DModelAttrReset(lbl_1_bss_C4->model[var_r30], 1); + Hu3DModelAttrReset(lbl_1_bss_C4->model[var_r30], HU3D_ATTR_DISPOFF); } } return; } for (var_r30 = 0; var_r30 < 6; var_r30++) { 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; if (object->model[var_r29] != -1) { - Hu3DModelAttrSet(object->model[var_r29], 1); + Hu3DModelAttrSet(object->model[var_r29], HU3D_ATTR_DISPOFF); } } var_r29 = 6; 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++) { - 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 { - Hu3DModelAttrSet(var_r31->unk_00, 1); + Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF); var_r31->unk_08 = -1; 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_438[var_r24], &lbl_1_data_438[var_r24 + 1], &spAC); 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 { - Hu3DModelAttrSet(var_r31->unk_00, 1); + Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF); var_r31->unk_08 = -1; continue; } @@ -1506,7 +1506,7 @@ void fn_1_67CC(ModelData *arg0) var_r31 = var_r29->unk_30; for (var_r30 = 0; var_r30 < 12; var_r30++, var_r31++) { 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--; } else { @@ -1517,9 +1517,9 @@ void fn_1_67CC(ModelData *arg0) 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); 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) { - Hu3DModelAttrSet(var_r31->unk_00, 1); + Hu3DModelAttrSet(var_r31->unk_00, HU3D_ATTR_DISPOFF); var_r31->unk_04 = 0; var_r31->unk_08 = 0; } @@ -1646,10 +1646,10 @@ void fn_1_6FFC(void) var_r30 = lbl_1_bss_B0; if (var_r30->unk_04 <= 0) { - Hu3DModelAttrSet(var_r30->unk_00, 1); + Hu3DModelAttrSet(var_r30->unk_00, HU3D_ATTR_DISPOFF); return; } - Hu3DModelAttrReset(var_r30->unk_00, 1); + Hu3DModelAttrReset(var_r30->unk_00, HU3D_ATTR_DISPOFF); var_r27 = &Hu3DData[var_r30->unk_00]; var_r29 = var_r27->unk_120; var_r31 = var_r29->unk_3C; @@ -1680,7 +1680,7 @@ void fn_1_717C(void) UnkM406Struct10 *var_r31; 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); } @@ -1805,10 +1805,10 @@ void fn_1_77F0(void) var_r30 = lbl_1_bss_AC; if (var_r30->unk_04 <= 0) { - Hu3DModelAttrSet(var_r30->unk_00, 1); + Hu3DModelAttrSet(var_r30->unk_00, HU3D_ATTR_DISPOFF); return; } - Hu3DModelAttrReset(var_r30->unk_00, 1); + Hu3DModelAttrReset(var_r30->unk_00, HU3D_ATTR_DISPOFF); var_r27 = &Hu3DData[var_r30->unk_00]; var_r29 = var_r27->unk_120; var_r31 = var_r29->unk_3C; @@ -1846,7 +1846,7 @@ void fn_1_79B0(void) UnkM406Struct10 *var_r31; 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); } @@ -1939,10 +1939,10 @@ void fn_1_7C4C(void) var_r30 = lbl_1_bss_A8; if (var_r30->unk_04 <= 0) { - Hu3DModelAttrSet(var_r30->unk_00, 1); + Hu3DModelAttrSet(var_r30->unk_00, HU3D_ATTR_DISPOFF); return; } - Hu3DModelAttrReset(var_r30->unk_00, 1); + Hu3DModelAttrReset(var_r30->unk_00, HU3D_ATTR_DISPOFF); var_r27 = &Hu3DData[var_r30->unk_00]; var_r29 = var_r27->unk_120; var_r31 = var_r29->unk_3C; @@ -2031,10 +2031,10 @@ void fn_1_7F80(void) var_r30 = lbl_1_bss_A4; if (var_r30->unk_04 <= 0) { - Hu3DModelAttrSet(var_r30->unk_00, 1); + Hu3DModelAttrSet(var_r30->unk_00, HU3D_ATTR_DISPOFF); return; } - Hu3DModelAttrReset(var_r30->unk_00, 1); + Hu3DModelAttrReset(var_r30->unk_00, HU3D_ATTR_DISPOFF); var_r27 = &Hu3DData[var_r30->unk_00]; var_r29 = var_r27->unk_120; 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); } 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++) { @@ -2254,7 +2254,7 @@ void fn_1_8F98(void) var_r31->unk_04 = Hu3DModelLink(lbl_1_bss_A0[64].unk_04); } 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]; Hu3DModelTPLvlSet(var_r31->unk_04, 1.0f - var_f30); 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_0C = 0.0f; } @@ -2306,7 +2306,7 @@ void fn_1_91E0(void) var_r30->unk_F0[2][3] = var_r31->unk_1C[2][3]; Hu3DModelTPLvlSet(var_r31->unk_04, 1.0f - var_f30); 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_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); Hu3DModelRotSet(var_r31->unk_04, 0.0f, 0.0f, 0.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; return var_r28; } @@ -2614,7 +2614,7 @@ void fn_1_ADB4(ModelData *arg0, float (*arg1)[4]) var_r31 = &Hu3DCamera[0]; var_r30 = lbl_1_bss_9C; if (var_r30->unk_28 <= 0.0f) { - Hu3DModelAttrSet(var_r30->unk_20, 1); + Hu3DModelAttrSet(var_r30->unk_20, HU3D_ATTR_DISPOFF); return; } 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->unk_24 = arg8; if (var_r31->unk_24 <= 0.0f) { - Hu3DModelAttrSet(var_r31->unk_10, 1); - Hu3DModelAttrSet(var_r31->unk_14, 1); - Hu3DModelAttrSet(var_r31->unk_18, 1); - Hu3DModelAttrSet(var_r31->unk_1C, 1); + Hu3DModelAttrSet(var_r31->unk_10, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk_14, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk_18, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk_1C, HU3D_ATTR_DISPOFF); return; } - Hu3DModelAttrReset(var_r31->unk_10, 1); - Hu3DModelAttrReset(var_r31->unk_14, 1); - Hu3DModelAttrReset(var_r31->unk_18, 1); - Hu3DModelAttrReset(var_r31->unk_1C, 1); + Hu3DModelAttrReset(var_r31->unk_10, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(var_r31->unk_14, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(var_r31->unk_18, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(var_r31->unk_1C, HU3D_ATTR_DISPOFF); } void fn_1_B1E0(float arg8) @@ -2672,10 +2672,10 @@ void fn_1_B1E0(float arg8) var_r31 = lbl_1_bss_9C; var_r31->unk_28 = arg8; if (var_r31->unk_28 <= 0.0f) { - Hu3DModelAttrSet(var_r31->unk_20, 1); + Hu3DModelAttrSet(var_r31->unk_20, HU3D_ATTR_DISPOFF); return; } - Hu3DModelAttrReset(var_r31->unk_20, 1); + Hu3DModelAttrReset(var_r31->unk_20, HU3D_ATTR_DISPOFF); } void fn_1_B25C(void) diff --git a/src/REL/m406Dll/player.c b/src/REL/m406Dll/player.c index abe01868..b484169b 100644 --- a/src/REL/m406Dll/player.c +++ b/src/REL/m406Dll/player.c @@ -380,15 +380,15 @@ void fn_1_D90C(omObjData *object) CharModelLayerSetAll(Hu3DData[object->model[0]].layer + 1); object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 32)); 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); var_r31->unk_68 = sp8[0][3]; var_r31->unk_6C = sp8[1][3]; var_r31->unk_70 = sp8[2][3]; 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]); - Hu3DModelAttrSet(object->model[7], 1); + Hu3DModelAttrSet(object->model[7], HU3D_ATTR_DISPOFF); for (var_r29 = 0; var_r29 < 10U; 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) { Hu3D3Dto2D(&object->trans, 1, &sp28); 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; @@ -653,7 +653,7 @@ void fn_1_E214(omObjData *object) } break; case 2: - Hu3DModelAttrReset(object->model[5], 1); + Hu3DModelAttrReset(object->model[5], HU3D_ATTR_DISPOFF); if (var_r31->unk_5A < 20) { 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_12 = 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; 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); - Hu3DModelAttrReset(object->model[6], 1); + Hu3DModelAttrReset(object->model[6], HU3D_ATTR_DISPOFF); PSMTXIdentity(var_r26->unk_F0); 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; } 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_F194(object); @@ -950,7 +950,7 @@ void fn_1_FA50(ModelData *model, Mtx mtx) else { 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++) { if (var_r31->unk_7C[var_r26] >= 0) { HuAudFXStop(var_r31->unk_7C[var_r26]); @@ -1146,7 +1146,7 @@ void fn_1_1065C(omObjData *object) var_r31->unk_2C.z = -20.0f; Hu3DModelShadowReset(object->model[0]); fn_1_6BB4(&object->trans); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); object->func = fn_1_10744; } @@ -1271,7 +1271,7 @@ void fn_1_11058(omObjData *object) var_r30->unk_64 = 90.0f + (frand() & 0x1F); } 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); Hu3DModelRotSet(object->model[var_r28], 0.0f, 0.0f, 0.0f); Hu3DModelScaleSet(object->model[var_r28], 1.0f, 1.0f, 1.0f); @@ -1313,8 +1313,8 @@ void fn_1_114A0(omObjData *object) case 1: if (var_r31->unk_64 != 0) { if (--var_r31->unk_64 == 0) { - Hu3DModelAttrReset(object->model[5], 1); - Hu3DModelAttrReset(object->model[7], 1); + Hu3DModelAttrReset(object->model[5], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[7], HU3D_ATTR_DISPOFF); } else { return; diff --git a/src/REL/m407dll/effect.c b/src/REL/m407dll/effect.c index cb0dd7fc..ebe9e273 100644 --- a/src/REL/m407dll/effect.c +++ b/src/REL/m407dll/effect.c @@ -1,48 +1,44 @@ -#include "game/process.h" -#include "game/object.h" -#include "game/hsfmotion.h" #include "game/hsfdraw.h" +#include "game/hsfmotion.h" +#include "game/object.h" +#include "game/process.h" #include "REL/m407dll.h" typedef struct unkDominationData4 { -/* 0x00 */ u32 unk_00; -/* 0x04 */ u32 unk_04; -/* 0x08 */ s32 unk_08; -/* 0x0C */ s32 unk_0C; -/* 0x10 */ f32 unk_10; -/* 0x14 */ f32 unk_14; -/* 0x18 */ f32 unk_18; -/* 0x1C */ s32 unk_1C; -} unkDominationData4; //size of 0x20 + /* 0x00 */ u32 unk_00; + /* 0x04 */ u32 unk_04; + /* 0x08 */ s32 unk_08; + /* 0x0C */ s32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ s32 unk_1C; +} unkDominationData4; // size of 0x20 -//function signatures -void fn_1_4858(omObjData* arg0); -void fn_1_485C(omObjData* arg0); -void fn_1_46EC(omObjData* arg0); -void fn_1_465C(omObjData* arg0, s32 arg1); -void fn_1_4808(omObjData* arg0); +// function signatures +void fn_1_4858(omObjData *arg0); +void fn_1_485C(omObjData *arg0); +void fn_1_46EC(omObjData *arg0); +void fn_1_465C(omObjData *arg0, s32 arg1); +void fn_1_4808(omObjData *arg0); -//bss -Process* lbl_1_bss_3970; -omObjData* lbl_1_bss_37E0[100]; +// bss +Process *lbl_1_bss_3970; +omObjData *lbl_1_bss_37E0[100]; -//data -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, 0x18), - DATA_MAKE_NUM(DATADIR_M407, 0x19) -}; +// data +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, 0x18), DATA_MAKE_NUM(DATADIR_M407, 0x19) }; ObjFuncs lbl_1_data_29C[] = { fn_1_4858, fn_1_485C, }; -void fn_1_41CC(Process* arg0) { - Process* sp8; +void fn_1_41CC(Process *arg0) +{ + Process *sp8; u32 i; u32 temp_r30; @@ -60,15 +56,15 @@ void fn_1_41CC(Process* arg0) { 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]->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; 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]->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; @@ -76,19 +72,20 @@ void fn_1_41CC(Process* arg0) { 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]->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; 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]->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; 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) { - omObjData* temp_r29; - unkDominationData4* temp_r31; +void fn_1_4544(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4) +{ + omObjData *temp_r29; + unkDominationData4 *temp_r31; u32 i; 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) { - unkDominationData4* temp_r31; +void fn_1_465C(omObjData *arg0, s32 arg1) +{ + unkDominationData4 *temp_r31; temp_r31 = arg0->data; temp_r31->unk_0C = arg1; temp_r31->unk_1C = 0; } -void fn_1_4680(omObjData* arg0) { - unkDominationData4* temp_r31; +void fn_1_4680(omObjData *arg0) +{ + unkDominationData4 *temp_r31; temp_r31 = arg0->data; lbl_1_data_29C[temp_r31->unk_0C](arg0); omSetTra(arg0, temp_r31->unk_10, temp_r31->unk_14, temp_r31->unk_18); } -void fn_1_46EC(omObjData* arg0) { - unkDominationData4* temp_r30; +void fn_1_46EC(omObjData *arg0) +{ + unkDominationData4 *temp_r30; arg0->func = fn_1_4680; 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_1C = 0; arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_288[temp_r30->unk_08]); - Hu3DModelAttrSet(arg0->model[0], 0x4000); - Hu3DModelAttrSet(arg0->model[0], 0x40000002); - Hu3DModelAttrSet(arg0->model[0], 1); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_NOCULL); + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); temp_r30->unk_10 = 0.0f; temp_r30->unk_14 = 0.0f; temp_r30->unk_18 = 0.0f; fn_1_465C(arg0, 0); } -void fn_1_4808(omObjData* arg0) { - unkDominationData4* sp8; +void fn_1_4808(omObjData *arg0) +{ + unkDominationData4 *sp8; sp8 = arg0->data; - + Hu3DModelKill(arg0->model[0]); 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) { - unkDominationData4* temp_r30; +void fn_1_485C(omObjData *arg0) +{ + unkDominationData4 *temp_r30; temp_r30 = arg0->data; if (temp_r30->unk_04 != 0) { temp_r30->unk_04--; } - + if (temp_r30->unk_1C == 0) { Hu3DMotionTimeSet(*arg0->model, 0.0f); - Hu3DModelAttrReset(*arg0->model, 1); + Hu3DModelAttrReset(*arg0->model, HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(*arg0->model, 0x40000002); - Hu3DModelAttrSet(*arg0->model, 0x40000001); + Hu3DModelAttrSet(*arg0->model, HU3D_MOTATTR_LOOP); temp_r30->unk_1C++; - } else if (temp_r30->unk_1C == 1) { + } + else if (temp_r30->unk_1C == 1) { Hu3DModelAttrReset(arg0->model[0], 0x40000001); temp_r30->unk_1C++; } - + if (Hu3DMotionEndCheck(*arg0->model) != 0) { - Hu3DModelAttrSet(*arg0->model, 1); + Hu3DModelAttrSet(*arg0->model, HU3D_ATTR_DISPOFF); fn_1_465C(arg0, 0); } } diff --git a/src/REL/m407dll/map.c b/src/REL/m407dll/map.c index 806579cc..3586f39a 100644 --- a/src/REL/m407dll/map.c +++ b/src/REL/m407dll/map.c @@ -76,7 +76,7 @@ void fn_1_162C(omObjData *arg0) Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f); arg0->model[1] = Hu3DModelCreateFile(lbl_1_data_198[3]); 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++) { arg0->model[i + 2] = Hu3DModelCreateFile(lbl_1_data_198[GWPlayerCfg[i].character + 4]); 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[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) { 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); } } diff --git a/src/REL/m407dll/player.c b/src/REL/m407dll/player.c index 5cd498bd..394f2885 100644 --- a/src/REL/m407dll/player.c +++ b/src/REL/m407dll/player.c @@ -363,7 +363,7 @@ void fn_1_64C(omObjData *arg0) Hu3DModelShadowSet(arg0->model[1]); CharModelMotionDataClose(temp_r31->unk_01); 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]); temp_r31->unk_10 = (600.0f - (400.0f * temp_r29)); temp_r31->unk_14 = 0.0f; diff --git a/src/REL/m407dll/whomp.c b/src/REL/m407dll/whomp.c index 25a5743a..90ef5e88 100644 --- a/src/REL/m407dll/whomp.c +++ b/src/REL/m407dll/whomp.c @@ -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))) { - Hu3DModelAttrSet(arg0->model[0], 1); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); } 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); @@ -271,7 +271,7 @@ void fn_1_2B7C(omObjData *arg0) temp_r30->unk_14.z = 0.0f; if (temp_r30->unk_00 < 80) { 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); if (temp_r30->unk_00 == 0) { 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]; } Hu3DMotionSet(arg0->model[0], arg0->motion[5]); - Hu3DModelAttrSet(arg0->model[0], 0x40000001); + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP); temp_r30->unk_04 = 1; } else { @@ -306,8 +306,8 @@ void fn_1_2B7C(omObjData *arg0) arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_228[0]); arg0->model[1] = Hu3DModelCreateFile(lbl_1_data_228[2]); arg0->model[2] = Hu3DModelCreateFile(lbl_1_data_228[3]); - Hu3DModelAttrSet(arg0->model[0], 0x4000); - Hu3DModelAttrSet(arg0->model[1], 0x4000); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_NOCULL); + Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_NOCULL); Hu3DModelAmbSet(arg0->model[0], 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]); @@ -318,11 +318,11 @@ void fn_1_2B7C(omObjData *arg0) Hu3DModelHookSet(arg0->model[0], "itemhook_r", arg0->model[1]); Hu3DModelShadowSet(arg0->model[0]); Hu3DModelShadowSet(arg0->model[1]); - Hu3DModelAttrSet(arg0->model[0], 1); - Hu3DModelAttrSet(arg0->model[1], 1); - Hu3DModelAttrSet(arg0->model[2], 1); - Hu3DModelAttrSet(arg0->model[2], 0x40000002); - Hu3DModelAttrSet(arg0->model[2], 0x40000001); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_LOOP); temp_r30->unk_04 = 1; break; } @@ -403,7 +403,7 @@ void fn_1_3364(omObjData *arg0) } temp_r31->unk_08.y = -300.0f; - Hu3DModelAttrSet(arg0->model[0], 1); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); fn_1_290C(arg0, 0); } @@ -414,11 +414,11 @@ void fn_1_34A4(omObjData *arg0) temp_r30 = arg0->data; if (temp_r30->unk_2C == 0) { if (temp_r30->unk_28 == 1) { - Hu3DModelAttrReset(arg0->model[0], 1); - Hu3DModelAttrReset(arg0->model[1], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(arg0->model[1], HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrReset(arg0->model[0], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); } Hu3DMotionSet(arg0->model[0], arg0->motion[3]); Hu3DModelAttrReset(arg0->model[0], 0x40000001); @@ -466,10 +466,10 @@ void fn_1_36D0(omObjData *arg0) sp8 = arg0->data; Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 10.0f, HU3D_MOTATTR_LOOP); Hu3DMotionSet(arg0->model[1], arg0->motion[0]); - Hu3DModelAttrSet(arg0->model[1], 0x40000001); - Hu3DModelAttrReset(arg0->model[2], 1); + Hu3DModelAttrSet(arg0->model[1], HU3D_MOTATTR_LOOP); + Hu3DModelAttrReset(arg0->model[2], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(arg0->model[2], 0x40000002); - Hu3DModelAttrSet(arg0->model[2], 0x40000001); + Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_LOOP); fn_1_290C(arg0, 0); } @@ -481,7 +481,7 @@ void fn_1_37B0(omObjData *arg0) if (temp_r31->unk_2C == 0) { temp_r31->unk_14.x = 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_14.x -= 4.0f; diff --git a/src/REL/m408Dll/camera.c b/src/REL/m408Dll/camera.c index e2b5ba0c..d0f693ea 100644 --- a/src/REL/m408Dll/camera.c +++ b/src/REL/m408Dll/camera.c @@ -191,8 +191,8 @@ void fn_1_8FAC(omObjData *object) Center.z + (cosd(CRot.y) * cosd(CRot.x) * CZoom)); fn_1_BDE0(); if (lbl_1_bss_10C == 5) { - Hu3DModelAttrSet(object->model[0], 1); - Hu3DModelAttrSet(object->model[1], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); lbl_1_bss_10C = 5; object->func = fn_1_9514; } @@ -208,7 +208,7 @@ void fn_1_9514(omObjData *object) object->work[2] = 0; } 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, 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); temp_r31 = object->data; 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); Hu3DModelShadowSet(object->model[0]); object->func = fn_1_99C8; @@ -429,8 +429,8 @@ void fn_1_99C8(omObjData *object) void fn_1_A334(omObjData *object) { - Hu3DModelAttrSet(object->model[1], 1); - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); } void fn_1_A37C(ModelData *model, ParticleData *particle, Mtx matrix) diff --git a/src/REL/m408Dll/main.c b/src/REL/m408Dll/main.c index afd909e9..32571be7 100644 --- a/src/REL/m408Dll/main.c +++ b/src/REL/m408Dll/main.c @@ -647,7 +647,7 @@ void fn_1_26E4(omObjData *object) object->model[1] = Hu3DModelCreateFile(lbl_1_data_C8[temp_r31->unk2]); Hu3DModelLayerSet(object->model[1], 6); 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->unkA0.x = temp_r31->unkA0.y = temp_r31->unkA0.z = 0; 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.z = object->trans.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); if (object->trans.y < 11940) { 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.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; - Hu3DModelAttrReset(object->model[1], 1); + Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF); ((ParticleData *)Hu3DData[object->model[2]].unk_120)->unk_00 = 0; object->func = fn_1_3E80; } @@ -983,15 +983,15 @@ void fn_1_4A58(omObjData *object) object->func = fn_1_3E80; } 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++) { - Hu3DModelAttrSet(object->model[1], 1); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); } } else { - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); 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) { GWPlayerCoinCollectAdd(object->work[0], temp_r31->unk14); if (lbl_1_bss_48) { - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); 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.y = 0; object->trans.z = lbl_1_data_144[object->work[0]].z; object->rot.x = object->rot.y = object->rot.z = 0; } else { - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); } 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; } diff --git a/src/REL/m408Dll/object.c b/src/REL/m408Dll/object.c index 817bdfce..817ec9e3 100644 --- a/src/REL/m408Dll/object.c +++ b/src/REL/m408Dll/object.c @@ -219,7 +219,7 @@ void fn_1_11960(omObjData *object) if (temp_r27 < 0) { temp_r27 = Hu3DModelCreateFile(lbl_1_data_1A0[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); temp_r28 = temp_r27; } @@ -233,7 +233,7 @@ void fn_1_11960(omObjData *object) if (temp_r26 < 0) { temp_r26 = Hu3DModelCreateFile(lbl_1_data_1A0[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); temp_r28 = temp_r26; } @@ -270,15 +270,15 @@ void fn_1_11960(omObjData *object) Hu3DModelRotSetV(object->model[temp_r29], &temp_r31->unk34); Hu3DModelScaleSet(object->model[temp_r29], 0.15f, 0.15f, 0.15f); 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) { - 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++) { temp_r28 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M408, 0x18)), 32); object->model[temp_r29] = temp_r28; - Hu3DModelAttrSet(temp_r28, 1); + Hu3DModelAttrSet(temp_r28, HU3D_ATTR_DISPOFF); Hu3DModelLayerSet(temp_r28, 6); Hu3DParticleColSet(temp_r28, 255, 255, 255); Hu3DParticleHookSet(temp_r28, fn_1_15658); @@ -403,10 +403,10 @@ void fn_1_123C8(omObjData *object) 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); 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 { - 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->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 { - Hu3DModelAttrSet(object->model[temp_r29], 1); + Hu3DModelAttrSet(object->model[temp_r29], HU3D_ATTR_DISPOFF); } } temp_r28 = fn_1_6878(); if (temp_r28 == 5) { 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; } @@ -567,7 +567,7 @@ void fn_1_12C6C(StructBssDA4 *arg0) if (arg0->unkC.y - 15.0f > Center.y + CZoom) { arg0->unk54 = 4; arg0->unk50 = 0; - Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); + Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF); } break; @@ -646,7 +646,7 @@ void fn_1_1305C(StructBssDA4 *arg0) if (arg0->unkC.y - 15.0f > Center.y + CZoom) { arg0->unk54 = 4; arg0->unk50 = 0; - Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); + Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF); } break; @@ -709,7 +709,7 @@ void fn_1_134D8(StructBssDA4 *arg0) if (arg0->unkC.y - 15.0f > Center.y + CZoom) { arg0->unk54 = 4; arg0->unk50 = 0; - Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); + Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF); } break; @@ -784,7 +784,7 @@ void fn_1_13820(StructBssDA4 *arg0) arg0->unk5C = 1; arg0->unk54 = 4; arg0->unk50 = 0; - Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); + Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF); break; case 4: @@ -833,7 +833,7 @@ void fn_1_13D88(StructBssDA4 *arg0) } if (arg0->unk5C == 1 && arg0->unkC.y - 15.0f > Center.y + CZoom) { 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) { arg0->unk34.y -= 360.0f; @@ -911,7 +911,7 @@ void fn_1_1406C(StructBssDA4 *arg0) break; 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->unk50 = 0; arg0->unk54++; @@ -1018,7 +1018,7 @@ void fn_1_144D0(StructBssDA4 *arg0) } else { 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_f29 = 50 + (40 * temp_f27); @@ -1046,7 +1046,7 @@ void fn_1_144D0(StructBssDA4 *arg0) case 4: if (arg0->unk5C == 1 && arg0->unkC.y - 15.0f > Center.y + CZoom) { arg0->unk50 = 0; - Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); + Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF); } break; } @@ -1086,7 +1086,7 @@ void fn_1_14DB4(StructBssDA4 *arg0) arg0->unk54 = 4; arg0->unk60 = 0; 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_155E0(temp_r30, 1); 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 { arg0->unk50 = 0; - Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); + Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF); } break; } @@ -1172,7 +1172,7 @@ void fn_1_151A4(StructBssDA4 *arg0) arg0->unk54 = 4; arg0->unk60 = 0; 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_155E0(temp_r30, 1); 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 { arg0->unk50 = 0; - Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], 1); + Hu3DModelAttrSet(lbl_1_bss_75A8->model[arg0->unk4], HU3D_ATTR_DISPOFF); } break; } @@ -1368,7 +1368,7 @@ void fn_1_15BCC(omObjData *object) for (temp_r29 = 0; temp_r29 < 4; temp_r29++) { temp_r30 = Hu3DParticleCreate(HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M408, 0x19)), 9); object->model[temp_r29] = temp_r30; - Hu3DModelAttrSet(temp_r30, 1); + Hu3DModelAttrSet(temp_r30, HU3D_ATTR_DISPOFF); Hu3DModelLayerSet(temp_r30, 7); Hu3DParticleColSet(temp_r30, 255, 255, 255); Hu3DParticleHookSet(temp_r30, fn_1_15D64); @@ -1391,7 +1391,7 @@ void fn_1_15CA4(omObjData *object) temp_r29 = object->model[temp_r31]; temp_r28 = &Hu3DData[temp_r29]; 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); temp_r27->unk_34 = 0; } diff --git a/src/REL/m408Dll/stage.c b/src/REL/m408Dll/stage.c index 90225c17..fcf59452 100644 --- a/src/REL/m408Dll/stage.c +++ b/src/REL/m408Dll/stage.c @@ -95,12 +95,12 @@ void fn_1_C530(omObjData *object) omSetSca(object, 0.1f, 0.1f, 0.1f); temp_r31 = object->model[0]; Hu3DModelLayerSet(temp_r31, 1); - Hu3DModelAttrSet(temp_r31, 1); + Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF); object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x1E)); temp_r31 = object->model[4]; Hu3DModelLayerSet(temp_r31, 1); 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)); temp_r31 = object->model[5]; Hu3DModelLayerSet(temp_r31, 1); @@ -110,13 +110,13 @@ void fn_1_C530(omObjData *object) Hu3DModelLayerSet(temp_r31, 1); Hu3DModelPosSet(temp_r31, -20, -10, -150); 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)); temp_r31 = object->model[3]; Hu3DModelPosSet(temp_r31, 0, -50, -500); Hu3DModelScaleSet(temp_r31, 0.15f, 0.15f, 0.15f); Hu3DModelLayerSet(temp_r31, 0); - Hu3DModelAttrSet(temp_r31, 1); + Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF); sp8 = fn_1_F4B0(temp_r31, temp_r31); object->model[9] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x1C)); temp_r31 = object->model[9]; @@ -124,19 +124,19 @@ void fn_1_C530(omObjData *object) Hu3DModelScaleSet(temp_r31, 0.11000001f, 0.1f, 0.11000001f); Hu3DModelPosSet(temp_r31, 0, 10000, 0); Hu3DModelLayerSet(temp_r31, 1); - Hu3DModelAttrSet(temp_r31, 1); + Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF); object->model[11] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M408, 0x1F)); temp_r31 = object->model[11]; Hu3DModelPosSet(temp_r31, 0, 10000, 0); Hu3DModelLayerSet(temp_r31, 1); 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)); temp_r31 = object->model[12]; Hu3DModelLayerSet(temp_r31, 3); Hu3DModelPosSet(temp_r31, 0, 5000, 0); Hu3DModelScaleSet(temp_r31, 0.1f, 0.1f, 0.1f); - Hu3DModelAttrSet(temp_r31, 1); + Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF); Hu3DMotionSpeedSet(temp_r31, 0); object->model[19] = temp_r31 = fn_1_D978(lbl_1_bss_14C[0], 80, fn_1_E310); Hu3DModelLayerSet(temp_r31, 1); @@ -153,13 +153,13 @@ void fn_1_C530(omObjData *object) Hu3DModelLayerSet(temp_r31, 3); Hu3DModelRotSet(temp_r31, 0, frandmod(360), 0); Hu3DModelScaleSet(temp_r31, 0.1f, 0.1f, 0.1f); - Hu3DModelAttrSet(temp_r31, 1); + Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF); Hu3DMotionSpeedSet(temp_r31, 0); } object->model[6] = temp_r31 = fn_1_D978(lbl_1_bss_14C[4], 1, fn_1_EEF8); Hu3DModelPosSet(temp_r31, 0, 5000, 0); Hu3DModelLayerSet(temp_r31, 3); - Hu3DModelAttrReset(temp_r31, 1); + Hu3DModelAttrReset(temp_r31, HU3D_ATTR_DISPOFF); Hu3DParticleBlendModeSet(temp_r31, 1); temp_r29 = ((ParticleData *)Hu3DData[temp_r31].unk_120)->unk_1C; temp_r29[1] = 800; @@ -243,18 +243,18 @@ void fn_1_CEEC(void) return; } lbl_1_bss_140 = 2; - Hu3DModelAttrSet(temp_r31->model[5], 1); - Hu3DModelAttrSet(temp_r31->model[9], 1); - Hu3DModelAttrSet(temp_r31->model[11], 1); - Hu3DModelAttrSet(temp_r31->model[12], 1); - Hu3DModelAttrSet(temp_r31->model[19], 1); + Hu3DModelAttrSet(temp_r31->model[5], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(temp_r31->model[9], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(temp_r31->model[11], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(temp_r31->model[12], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(temp_r31->model[19], HU3D_ATTR_DISPOFF); 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[4], 1); - Hu3DModelAttrReset(temp_r31->model[2], 1); - Hu3DModelAttrReset(temp_r31->model[3], 1); + Hu3DModelAttrReset(temp_r31->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(temp_r31->model[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(temp_r31->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(temp_r31->model[3], HU3D_ATTR_DISPOFF); } void fn_1_D6F0(omObjData *object); @@ -276,14 +276,14 @@ void fn_1_D004(omObjData *object) temp_f28 = 7000; switch (temp_r30[0]) { case 2: - Hu3DModelAttrReset(object->model[9], 1); - Hu3DModelAttrReset(object->model[11], 1); - Hu3DModelAttrReset(object->model[12], 1); - Hu3DModelAttrReset(object->model[19], 1); + Hu3DModelAttrReset(object->model[9], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[11], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[12], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[19], HU3D_ATTR_DISPOFF); 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) { lbl_1_bss_134 = HuAudFXPlay(1363); } @@ -405,7 +405,7 @@ s16 fn_1_D978(AnimData *arg0, s16 arg1, ParticleHook arg2) HsfanimStruct01 *temp_r27; temp_r28 = Hu3DParticleCreate(arg0, arg1); Hu3DParticleHookSet(temp_r28, arg2); - Hu3DModelAttrSet(temp_r28, 1); + Hu3DModelAttrSet(temp_r28, HU3D_ATTR_DISPOFF); temp_r29 = Hu3DData[temp_r28].unk_120; temp_r27 = temp_r29->unk_48; for (temp_r31 = 0; temp_r31 < temp_r29->unk_30; temp_r31++, temp_r27++) { diff --git a/src/REL/m409Dll/main.c b/src/REL/m409Dll/main.c index 805f5708..f3a5e532 100644 --- a/src/REL/m409Dll/main.c +++ b/src/REL/m409Dll/main.c @@ -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.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) { - 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); 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; if (lbl_1_bss_18 >= 1.0f) { 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; } 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].unk4 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x03)); - Hu3DModelAttrSet(var_r31[var_r29].unk2, 0x40000001); - Hu3DModelAttrSet(var_r31[var_r29].unk4, 0x40000002); + Hu3DModelAttrSet(var_r31[var_r29].unk2, HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(var_r31[var_r29].unk4, HU3D_MOTATTR_PAUSE); if (arg3) { Hu3DModelAttrSet(var_r31[var_r29].unk2, 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].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)); - 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); var_r31[var_r29].unkC = var_r29 + 3; if (arg3) { @@ -549,7 +549,7 @@ void fn_1_2484(omObjData *object) var_r29 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x0A)); Hu3DModelLayerSet(var_r29, 0); 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); 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); @@ -557,11 +557,11 @@ void fn_1_2484(omObjData *object) lbl_1_bss_24.unk14 = 0.0f; object->model[4] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M409, 0x01)); 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[1], 1660.0f, 0.0f, -1200.0f); Hu3DModelLayerSet(object->model[1], 6); - Hu3DModelAttrSet(object->model[1], 0x40000002); + Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_PAUSE); unkInline(var_r31, 0, &var_r28, 0); 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); if (Hu3DMotionTimeGet(var_r31->unk4) >= temp_f29) { Hu3DMotionSet(var_r31->unk6, var_r31->unk8); - Hu3DModelAttrSet(var_r31->unk6, 0x40000001); - Hu3DModelAttrSet(var_r31->unk4, 0x40000002); + Hu3DModelAttrSet(var_r31->unk6, HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(var_r31->unk4, HU3D_MOTATTR_PAUSE); fn_1_2414(24, 8); lbl_1_bss_24.unk1 = 0; } @@ -652,9 +652,9 @@ void fn_1_2DCC(omObjData *object) if (Hu3DMotionTimeGet(var_r31->unk4) <= 0.0f) { Hu3DMotionSet(var_r31->unk6, var_r31->unk8); Hu3DMotionSpeedSet(var_r31->unk6, 1.0f); - Hu3DModelAttrSet(var_r31->unk6, 0x40000001); + Hu3DModelAttrSet(var_r31->unk6, HU3D_MOTATTR_LOOP); Hu3DMotionSpeedSet(var_r31->unk4, 1.0f); - Hu3DModelAttrSet(var_r31->unk4, 0x40000002); + Hu3DModelAttrSet(var_r31->unk4, HU3D_MOTATTR_PAUSE); fn_1_2414(24, 0); } break; @@ -695,9 +695,9 @@ void fn_1_2DCC(omObjData *object) } var_r27 = var_r31->unkC - 1; if (var_r27 == -3) { - Hu3DModelAttrSet(var_r31->unk2, 1); - Hu3DModelAttrSet(var_r31->unk4, 1); - Hu3DModelAttrSet(var_r31->unk6, 1); + Hu3DModelAttrSet(var_r31->unk2, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk4, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk6, HU3D_ATTR_DISPOFF); var_r31->unkC = 2; 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->unkC = arg2; if ((arg0->unkC >= 2) && (fn_1_2454(7) != 2)) { - Hu3DModelAttrSet(arg0->unk2, 1U); - Hu3DModelAttrSet(arg0->unk4, 1U); - Hu3DModelAttrSet(arg0->unk6, 1U); + Hu3DModelAttrSet(arg0->unk2, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->unk4, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->unk6, HU3D_ATTR_DISPOFF); } } diff --git a/src/REL/m409Dll/player.c b/src/REL/m409Dll/player.c index 584b118b..fcf6a8c1 100644 --- a/src/REL/m409Dll/player.c +++ b/src/REL/m409Dll/player.c @@ -1,17 +1,17 @@ #include "REL/m409Dll.h" -#include "math.h" -#include "ext_math.h" #include "ext_math.h" #include "game/audio.h" #include "game/chrman.h" #include "game/gamework_data.h" -#include "game/pad.h" #include "game/hsfmotion.h" +#include "game/pad.h" +#include "game/sprite.h" +#include "math.h" // bss -omObjData* lbl_1_bss_3A0[4]; -omObjData* lbl_1_bss_39C; +omObjData *lbl_1_bss_3A0[4]; +omObjData *lbl_1_bss_39C; s32 lbl_1_bss_38C[4]; unkStruct10 lbl_1_bss_10C[8]; s16 lbl_1_bss_108; @@ -22,39 +22,26 @@ unkStruct9 lbl_1_bss_F0; // data u32 lbl_1_data_138 = 0xFFFF0000; s32 lbl_1_data_13C[7] = { 0x30, 0x2D, 0x3A, 0x2E, DATA_MAKE_NUM(DATADIR_M409, 0x32), 0x17, 0x18 }; -GXColor lbl_1_data_158[8] = { - { 0xFF, 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 } -}; +GXColor lbl_1_data_158[8] = { { 0xFF, 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] = { - { 72.0f, 80.0f }, { 504.0f, 80.0f }, - { 72.0f, 400.0f }, { 504.0f, 400.0f }, -}; -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 } + { 72.0f, 80.0f }, + { 504.0f, 80.0f }, + { 72.0f, 400.0f }, + { 504.0f, 400.0f }, }; +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 temp_r28; - omObjData* var_r30; + omObjData *var_r30; omMakeGroupEx(arg0, 0, 4); omGetGroupMemberListEx(arg0, 0); - + 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); var_r30->work[0] = var_r31; @@ -63,38 +50,27 @@ void fn_1_67E0(Process* arg0) { fn_1_BF88(0x40, 0x40); fn_1_DF20(DATA_MAKE_NUM(DATADIR_M409, 0x2C), 0x40, 0x40); temp_r28 = (u8)frand(); - + for (var_r31 = 0; var_r31 < (temp_r28 + 1); var_r31++) { fn_1_ABB4(); } } -void fn_1_6900(void) { +void fn_1_6900(void) +{ CharModelKill(-1); fn_1_C0C0(); } -void fn_1_6928(omObjData* arg0) { - 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 } - }; - 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; +void fn_1_6928(omObjData *arg0) +{ + 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 } }; + 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_r28; - + var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct7), MEMORY_DEFAULT_NUM); arg0->data = var_r31; 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_r30 = CharModelCreate(var_r31->unk1, 4); arg0->model[0] = var_r30; - Hu3DModelAttrSet(var_r30, 0x40000001); - + Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP); + for (var_r28 = 0; var_r28 < 7; var_r28++) { 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]); - } else { + } + else { 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); CharModelStepTypeSet(var_r31->unk1, 0); 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_r31->unk57 = var_r30; 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_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_E85C(var_r30, 0, var_r31->unk24.x, 100.0f + var_r31->unk24.y, -1200.0f); fn_1_ED44(var_r30, 0, 0x10); @@ -163,30 +141,31 @@ void fn_1_6928(omObjData* arg0) { espColorSet(var_r30, 0, 0, 0); espTPLvlSet(var_r30, 0.5); 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_r31->unk54 = var_r30; 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_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); - espAttrSet(var_r30, 4); - + espAttrSet(var_r30, HUSPR_ATTR_DISPOFF); + for (var_r28 = 0; var_r28 < 3; var_r28++) { var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x0A), 0, 0); 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); var_r30 = espEntry(DATA_MAKE_NUM(DATADIR_MGCONST, 0x0B), 0, 0); 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); } arg0->func = fn_1_7344; } -void fn_1_7344(omObjData* arg0) { +void fn_1_7344(omObjData *arg0) +{ s16 sp8; f32 temp_f28; f32 temp_f29; @@ -206,17 +185,18 @@ void fn_1_7344(omObjData* arg0) { s16 var_r28; s32 var_r24; s32 temp_r23; - unkStruct8Sub* temp_r30; - unkStruct7* temp_r31; + unkStruct8Sub *temp_r30; + unkStruct7 *temp_r31; var_f31 = 0.0f; - temp_r31 = (unkStruct7*)arg0->data; + temp_r31 = (unkStruct7 *)arg0->data; temp_r19 = arg0->model[0]; temp_r31->unk48 = temp_r31->unk24; var_r28 = temp_r31->unk1C; if (temp_r31->unk5 != 0) { fn_1_7FE8(arg0); - } else { + } + else { temp_r31->unkA = HuPadStkX[temp_r31->unk4]; temp_r31->unkC = HuPadStkY[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); if (fn_1_2454(7) != 3) { fn_1_ED00(temp_r31->unk57, 4); - } else { - espAttrReset(temp_r31->unk54, 4); - espAttrReset(temp_r31->unk55, 4); - + } + else { + espAttrReset(temp_r31->unk54, HUSPR_ATTR_DISPOFF); + espAttrReset(temp_r31->unk55, HUSPR_ATTR_DISPOFF); + 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); temp_f28 = (ABS(temp_r26) + ABS(temp_r25)); temp_f30 = 0.008f * (temp_f28 * temp_r26); @@ -283,7 +264,7 @@ void fn_1_7344(omObjData* arg0) { case 6: fn_1_ED44(temp_r31->unk57, 0, 4); Hu3DModelHookReset(temp_r19); - Hu3DModelAttrSet(arg0->model[1], 1); + Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF); temp_r23 = fn_1_DA48(1, 1); fn_1_DEF4(temp_r23, 0, 0); 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 (temp_r31->unk59 >= 3) { var_r28 = 5; - } else { + } + else { var_r28 = 6; } var_r27 = 0; @@ -334,7 +316,8 @@ void fn_1_7344(omObjData* arg0) { if (CharModelMotionEndCheck(temp_r31->unk1) != 0) { if (CharModelMotionTimeGet(temp_r31->unk1) <= 0.0f) { var_r28 = 0; - } else { + } + else { var_r28 = 2; } var_r27 = 1; @@ -351,7 +334,8 @@ void fn_1_7344(omObjData* arg0) { var_r27 = 0; var_f31 = 0.0f; } - } else if (CharModelMotionEndCheck(temp_r31->unk1) != 0) { + } + else if (CharModelMotionEndCheck(temp_r31->unk1) != 0) { var_r28 = 2; var_r27 = 1; var_f31 = 0.0f; @@ -370,7 +354,8 @@ void fn_1_7344(omObjData* arg0) { temp_r31->unk60 = 0; temp_r31->unk18 = -1; } - } else { + } + else { temp_r31->unk3C.y = 0.0f; } 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); } -void fn_1_7FE8(omObjData* arg0) { +void fn_1_7FE8(omObjData *arg0) +{ Vec sp20; Vec sp14; s32 sp10; f32 spC; s16 sp8; - unkStruct10* var_r30; - unkStruct8Sub* temp_r29; + unkStruct10 *var_r30; + unkStruct8Sub *temp_r29; f32 temp_f0; f32 temp_f0_2; f32 temp_f1; @@ -401,21 +387,22 @@ void fn_1_7FE8(omObjData* arg0) { f32 temp_f30; f32 var_f28; s32 var_r28; - unkStruct7* temp_r31; + unkStruct7 *temp_r31; - temp_r31 = (unkStruct7*)arg0->data; + temp_r31 = (unkStruct7 *)arg0->data; sp10 = arg0->model[0]; sp8 = temp_r31->unk1C; temp_r31->unkE = temp_r31->unk10 = 0; temp_r29 = fn_1_CCCC(temp_r31->unk57, 0); sp20.x = sp20.y = sp20.z = 0.0f; - switch (lbl_1_bss_108) { /* irregular */ + switch (lbl_1_bss_108) { /* irregular */ case 2: if (temp_r31->unk61 == 0) { var_r30 = &lbl_1_bss_10C[0]; - + 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.y += var_r30->unkC.y; sp20.z += var_r30->unkC.z; @@ -423,13 +410,15 @@ void fn_1_7FE8(omObjData* arg0) { sp20.x /= var_r28; sp20.y /= var_r28; sp20.z /= var_r28; - } else { + } + else { var_r30 = &lbl_1_bss_10C[temp_r31->unk62]; if (var_r30->unk2 != 0) { sp20.x = var_r30->unkC.x; sp20.y = var_r30->unkC.y; sp20.z = var_r30->unkC.z; - } else { + } + else { sp20.x = 0.0f; sp20.y = 800.0f; sp20.z = -1200.0f; @@ -458,7 +447,9 @@ void fn_1_7FE8(omObjData* arg0) { sp20.z = var_r30->unkC.z; temp_f29 = 100.0f * (0.5f * (4 - temp_r31->unk6)); 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)) { temp_r31->unkE = (temp_r31->unkE | 0x100); } @@ -488,17 +479,18 @@ void fn_1_7FE8(omObjData* arg0) { temp_r31->unk63--; } -void fn_1_8838(unkStruct8* arg0) { +void fn_1_8838(unkStruct8 *arg0) +{ Vec sp18; Vec spC; f32 sp8; f32 temp_f30; f32 temp_f31; - unkStruct8Sub* temp_r30; - Vec* var_r26; + unkStruct8Sub *temp_r30; + Vec *var_r26; s32 var_r28; - unkStruct10* temp_r29; - unkStruct8Sub* temp_r31; + unkStruct10 *temp_r29; + unkStruct8Sub *temp_r31; temp_r30 = &arg0->unk3C[0]; 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.y = (temp_r31->unk78 + (temp_r31->unk7C * temp_f31)); temp_r31->unk18.z = 1.0f; - } else { + } + else { temp_r31->unk0.x = temp_r29->unkC.x; temp_r31->unk0.y = temp_r29->unkC.y; temp_r31->unk0.z = temp_r29->unkC.z; @@ -584,25 +577,27 @@ void fn_1_8838(unkStruct8* arg0) { temp_r31->unk34 &= ~4; } -s8 fn_1_8D08(u8 arg0) { - unkStruct7* data; - unkStruct8Sub* var_r30; +s8 fn_1_8D08(u8 arg0) +{ + 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); return var_r30->unk70[0]; } -void fn_1_8D6C(unkStruct8* arg0) { +void fn_1_8D6C(unkStruct8 *arg0) +{ Vec sp20; Vec sp14; Vec sp8; s32 temp_r28; s32 var_r27; f32 var_f31; - unkStruct10* var_r29; - unkStruct7* temp_r30; - unkStruct8Sub* temp_r31; + unkStruct10 *var_r29; + unkStruct7 *temp_r30; + unkStruct8Sub *temp_r31; temp_r31 = &arg0->unk3C[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)) { var_r29->unk2 = 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) { - espAttrSet(temp_r30->unk5A[temp_r30->unk59][0], 4); - espAttrReset(temp_r30->unk5A[temp_r30->unk59][1], 4); + espAttrSet(temp_r30->unk5A[temp_r30->unk59][0], HUSPR_ATTR_DISPOFF); + espAttrReset(temp_r30->unk5A[temp_r30->unk59][1], HUSPR_ATTR_DISPOFF); HuAudFXPlay(9); temp_r30->unk59++; omVibrate(temp_r30->unk0, 0xC, 6, 6); if (temp_r30->unk59 < 3) { temp_r30->unk60++; } - } else if (temp_r30->unk59 != 0) { - espAttrReset(temp_r30->unk5A[temp_r30->unk59][0], 4); - espAttrSet(temp_r30->unk5A[temp_r30->unk59][1], 4); + } + else if (temp_r30->unk59 != 0) { + 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_r30; - unkStruct10* var_r31; + unkStruct10 *var_r31; lbl_1_bss_108 = 0; var_r28 = Hu3DModelCreateFile(0x20000); arg0->model[0] = var_r28; - Hu3DModelAttrSet(var_r28, 0x40000001); + Hu3DModelAttrSet(var_r28, HU3D_MOTATTR_LOOP); 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]); omSetTra(arg0, 419.99997f, 250.0f, -180.0f); omSetRot(arg0, 0.0f, -30.0f, 0.0f); - + for (var_r30 = 0; var_r30 < 4; var_r30++) { arg0->work[var_r30] = 0; } - + for (var_r30 = 0; var_r30 < 8; var_r30++) { var_r28 = Hu3DModelCreateFile(var_r30 + DATA_MAKE_NUM(DATADIR_M409, 0x1B)); arg0->model[var_r30 + 1] = var_r28; - Hu3DModelAttrSet(var_r28, 1); + Hu3DModelAttrSet(var_r28, HU3D_ATTR_DISPOFF); } lbl_1_bss_104 = 0; - - + 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_r31->unk0 = var_r28; @@ -738,15 +735,16 @@ void fn_1_91C0(omObjData* arg0) { arg0->func = fn_1_962C; } -void fn_1_962C(omObjData* arg0) { +void fn_1_962C(omObjData *arg0) +{ s32 sp8[7]; - unkStruct10* var_r31; + unkStruct10 *var_r31; s32 var_r29; s32 var_r28; s32 var_r27; s32 var_r26; f32 var_f31; - + var_r27 = 0; var_r31 = &lbl_1_bss_10C[0]; @@ -756,11 +754,14 @@ void fn_1_962C(omObjData* arg0) { lbl_1_bss_108++; } 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 (lbl_1_bss_104 == 0) break; - + if (var_r29 < 4) + break; + if (lbl_1_bss_104 == 0) + break; + lbl_1_bss_108 = 6; break; case 1: @@ -777,7 +778,7 @@ void fn_1_962C(omObjData* arg0) { lbl_1_bss_108++; break; 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); Hu3DMotionShiftSet(arg0->model[0], arg0->motion[1], 0.0f, 8.0f, HU3D_MOTATTR_NONE); HuAudFXPlay(0x558); @@ -809,12 +810,12 @@ void fn_1_962C(omObjData* arg0) { lbl_1_bss_108 = 0; Hu3DModelHookReset(arg0->model[0]); 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; case 6: 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++; break; case 7: @@ -827,7 +828,7 @@ void fn_1_962C(omObjData* arg0) { switch (var_r31->unk2) { 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; continue; 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.z = -1200.0f; 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); var_r31->unk18.z = ((fn_1_ABB4() - 0x8000) / 32768.0f) * 60.0f; 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->unk2++; case 2: - if (--var_r31->unk4 != 0) break; + if (--var_r31->unk4 != 0) + break; var_r31->unk4 = 1; var_r31->unk2++; case 3: @@ -852,7 +854,8 @@ void fn_1_962C(omObjData* arg0) { if (var_r31->unk18.z >= 0.0f) { var_r31->unk18.z = 0.0f; } - } else { + } + else { var_r31->unk18.z -= 0.08f; if (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.y += cosd(var_r31->unk18.z) * var_r31->unk8; 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) { var_r31->unk18.z = -((fn_1_ABB4() / 65536.0f) * 20.0f); @@ -877,13 +880,15 @@ void fn_1_962C(omObjData* arg0) { } break; case 4: - if (--var_r31->unk4 != 0) break; - Hu3DModelAttrSet(var_r31->unk0, 1); + if (--var_r31->unk4 != 0) + 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_EE68(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 4); if (lbl_1_bss_106 == var_r31->unk48) { HuAudFXPlay(0x557); - } else { + } + else { HuAudFXPlay(0x55A); } if (var_r31->unk48 == arg0->work[1]) { @@ -913,7 +918,8 @@ void fn_1_962C(omObjData* arg0) { if (var_r31->unkC.x <= -150.0f) { var_r31->unkC.x = -150.0f; } - } else { + } + else { 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); var_f31 = sin((var_r31->unk4C * M_PI) / 180.0); 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]) { lbl_1_bss_108++; } } -s32 fn_1_A584(unkStruct10* arg0) { +s32 fn_1_A584(unkStruct10 *arg0) +{ s32 sp20[8]; Vec sp14; Vec sp8; @@ -938,7 +946,7 @@ s32 fn_1_A584(unkStruct10* arg0) { f32 var_f31; s32 var_r28; s32 var_r29; - unkStruct10* var_r31; + unkStruct10 *var_r31; if ((arg0->unk2 == 0) || (arg0->unk2 >= 4U)) { return 0; @@ -947,7 +955,7 @@ s32 fn_1_A584(unkStruct10* arg0) { var_r28 = 0; sp14.x = sp14.y = sp14.z = 0.0f; var_r31 = lbl_1_bss_10C; - + for (var_r29 = 0; var_r29 < 8; var_r29++, var_r31++) { if ((var_r31->unk2 != 0) && (var_r31->unk2 < 4U) && (var_r31 != arg0)) { 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); var_r31 = lbl_1_bss_10C; - + for (var_r29 = 0; var_r29 < 8; var_r29++, var_r31++) { if ((var_r31 != arg0) && (var_r31->unk2 != 0) && (var_r31->unk2 < 4U)) { sp8.x = var_r31->unkC.x - arg0->unkC.x; @@ -1009,23 +1017,25 @@ s32 fn_1_A584(unkStruct10* arg0) { return 1; } -s8 fn_1_A9C0(Vec* arg0, f32* arg1) { +s8 fn_1_A9C0(Vec *arg0, f32 *arg1) +{ f32 sp8; f32 temp_f29; f32 var_f30; f32 var_f28; s32 var_r27; s32 var_r29; - unkStruct10* var_r31; + unkStruct10 *var_r31; var_r27 = -1; var_r31 = lbl_1_bss_10C; var_f30 = *arg1; var_f30 *= var_f30; - + for (var_r29 = 0; var_r29 < 8; var_r29++, var_r31++) { 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)) { var_r27 = var_r29; var_f30 = temp_f29; @@ -1038,21 +1048,23 @@ s8 fn_1_A9C0(Vec* arg0, f32* arg1) { 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 += 0x3039; 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_r30; s32 var_r31; - + for (var_r31 = 0; var_r31 < arg1; var_r31++) { arg0[var_r31] = var_r31; } - + for (var_r31 = 0; var_r31 < arg1; var_r31++) { temp_r30 = (arg1 * (fn_1_ABB4() / 65536.0f)); 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_f30; f32 var_f29; @@ -1083,7 +1096,8 @@ f32 fn_1_AD40(f32 arg0, f32 arg1, f32 arg2) { 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 var_f30; @@ -1092,7 +1106,8 @@ f32 fn_1_AE94(f32 arg8, f32 arg9, f32 argA, f32 argB) { 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; 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; var_f31 = (2.0 * ((arg8 * argB) + (((arg8 - 1.0) * arg9) + ((1.0 - (2.0 * arg8)) * argA)))); 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 var_f29; 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++) { 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]))); - + if (var_f29) { var_f29 = (1.0 / var_f29); for (var_r31 = 0; var_r31 < 3; var_r31++) { *arg3++ = var_f29 * spC[var_r31]; } - } else { + } + else { *arg3++ = 0.0f; *arg3++ = 0.0f; *arg3++ = 1.0f; } } -f32 fn_1_B378(Vec* arg0) { +f32 fn_1_B378(Vec *arg0) +{ f32 var_f30; f32 var_f29; @@ -1142,24 +1161,28 @@ f32 fn_1_B378(Vec* arg0) { arg0->x *= var_f29; arg0->y *= var_f29; arg0->z *= var_f29; - } else { + } + else { arg0->x = arg0->y = arg0->z = 0.0f; } 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) { arg2->x = arg0.x; arg2->y = arg0.y; arg2->z = arg0.z; arg8 = 0.0f; - } else if (arg8 >= 1.0f) { + } + else if (arg8 >= 1.0f) { arg2->x = (arg0.x + arg1.x); arg2->y = (arg0.y + arg1.y); arg2->z = (arg0.z + arg1.z); arg8 = 1.0f; - } else { + } + else { arg2->x = (arg0.x + (arg8 * arg1.x)); arg2->y = (arg0.y + (arg8 * arg1.y)); 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; } -f32 fn_1_B5E8(Vec arg0, Vec arg1, Vec arg2) { +f32 fn_1_B5E8(Vec arg0, Vec arg1, Vec arg2) +{ f32 temp_f30; f32 var_f31; @@ -1179,25 +1203,31 @@ f32 fn_1_B5E8(Vec arg0, Vec arg1, Vec arg2) { 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; f32 var_f31; 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))); - } else { + 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))); + } + else { var_f31 = fn_1_B5E8(*arg0, *arg1, *arg2); 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))); } } -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; - + 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))); - } else { + 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))); + } + else { var_f31 = fn_1_B5E8(*arg0, *arg1, *arg2); 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); } -void fn_1_BE90(ModelData *model, ParticleData *particle, Mtx matrix) { +void fn_1_BE90(ModelData *model, ParticleData *particle, Mtx matrix) +{ s32 var_r29; - HsfanimStruct01* var_r31; + HsfanimStruct01 *var_r31; var_r31 = particle->unk_48; 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); } -f32 fn_1_BF38(s16 arg0) { - MotionData* motionData; - HsfMotion* hsfMotionData; +f32 fn_1_BF38(s16 arg0) +{ + MotionData *motionData; + HsfMotion *hsfMotionData; f32 length; motionData = &Hu3DMotion[arg0]; diff --git a/src/REL/m410Dll/game.c b/src/REL/m410Dll/game.c index 37a73771..8a0010a8 100644 --- a/src/REL/m410Dll/game.c +++ b/src/REL/m410Dll/game.c @@ -78,7 +78,8 @@ void fn_1_34C0(omObjData *object) for (var_r30 = 0; var_r30 < 3; var_r30++) { if (!var_r30) { object->model[var_r30] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 12)); - } else { + } + else { object->model[var_r30] = Hu3DModelLink(*object->model); } 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; switch (object->work[0]) { - case 0: - if (fn_1_2804() == 1) { - object->work[0]++; - object->work[1] = 256; - } - break; - case 1: - if (!--object->work[1]) { - object->work[0]++; - object->work[1] = 90; - lbl_1_bss_50 = 0.0f; - lbl_1_bss_4C = -10.000001f; - lbl_1_bss_48 = 2.0000002f; - lbl_1_bss_34 = HuAudFXPlay(1381); - } - break; - case 2: - if (!--object->work[1]) { - object->work[0]++; - lbl_1_bss_4C = 0.0f; - lbl_1_bss_48 = 0.40000007f; - } - break; - case 3: - if (fn_1_281C() == 2) { - object->work[0]++; - lbl_1_bss_4C = -2.0000002f; - lbl_1_bss_48 = 0.05000001f; - } - break; + case 0: + if (fn_1_2804() == 1) { + object->work[0]++; + object->work[1] = 256; + } + break; + case 1: + if (!--object->work[1]) { + object->work[0]++; + object->work[1] = 90; + lbl_1_bss_50 = 0.0f; + lbl_1_bss_4C = -10.000001f; + lbl_1_bss_48 = 2.0000002f; + lbl_1_bss_34 = HuAudFXPlay(1381); + } + break; + case 2: + if (!--object->work[1]) { + object->work[0]++; + lbl_1_bss_4C = 0.0f; + lbl_1_bss_48 = 0.40000007f; + } + break; + case 3: + if (fn_1_281C() == 2) { + object->work[0]++; + lbl_1_bss_4C = -2.0000002f; + lbl_1_bss_48 = 0.05000001f; + } + break; } if (fn_1_281C() == 2) { if (!--lbl_1_data_D8) { lbl_1_bss_4C = -lbl_1_bss_4C; lbl_1_data_D8 = 900; } - } else if (fn_1_281C() > 2) { + } + else if (fn_1_281C() > 2) { lbl_1_bss_4C = 0.0f; } 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) { lbl_1_bss_50 = lbl_1_bss_4C; } - } else { + } + else { lbl_1_bss_50 -= lbl_1_bss_48; if (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; if (var_f31 < -8191.0f) { var_f31 = -8191.0f; - } else if (var_f31 > 8191.0f) { + } + else if (var_f31 > 8191.0f) { var_f31 = 8191.0f; } HuAudFXPitchSet(lbl_1_bss_34, var_f31); @@ -169,7 +173,8 @@ void fn_1_3614(omObjData *object) var_r30 = &Hu3DData[object->model[var_r29]]; if (var_r29 & 1) { var_f29 = lbl_1_bss_50; - } else { + } + else { var_f29 = -lbl_1_bss_50; } var_f30 = var_f29; @@ -178,7 +183,8 @@ void fn_1_3614(omObjData *object) if (var_r30->pos.x <= -40.0f) { var_r30->pos.x += 40.0f; } - } else { + } + else { if (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; if (omPauseChk()) { - + 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++) { 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) { var_r30->unk_00_field5 = 0; 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++) { switch (sp1B0[var_r29].unk_00) { - case 0: - 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_3C++; - break; - case 1: - 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_0C_unk->unk_40 = sp1B0[var_r29].unk_08; - sp1B0[var_r29].unk_08->unk_3C++; - sp1B0[var_r29].unk_0C_unk->unk_3C++; - break; - case 2: - 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_3C++; - break; - case 3: - 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_0C_unk->unk_40 = sp1B0[var_r29].unk_08; - sp1B0[var_r29].unk_08->unk_3C++; - sp1B0[var_r29].unk_08->unk_44 = 2; - if (VECMag(&sp1B0[var_r29].unk_08->unk_1C) > 10.0f) { - HuAudFXPlay(1377); - } - break; + case 0: + 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_3C++; + break; + case 1: + 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_0C_unk->unk_40 = sp1B0[var_r29].unk_08; + sp1B0[var_r29].unk_08->unk_3C++; + sp1B0[var_r29].unk_0C_unk->unk_3C++; + break; + case 2: + 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_3C++; + break; + case 3: + 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_0C_unk->unk_40 = sp1B0[var_r29].unk_08; + sp1B0[var_r29].unk_08->unk_3C++; + sp1B0[var_r29].unk_08->unk_44 = 2; + if (VECMag(&sp1B0[var_r29].unk_08->unk_1C) > 10.0f) { + HuAudFXPlay(1377); + } + break; } } var_f30 *= 1.0f - var_f29; var_r24++; } while (var_r24 < 100); - (void)var_r24; - + (void)var_r24; + for (var_r29 = 0; var_r29 < var_r25; var_r29++) { var_r31 = spC0[var_r29]; 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 (arg0->unk_1C.x < 0.0f) { 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_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 == var_f30) { *arg1 |= 2; - } else if (var_f31 < var_f30) { + } + else if (var_f31 < var_f30) { var_f30 = var_f31; *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 == var_f30) { *arg1 |= 4; - } else if (var_f31 < var_f30) { + } + else if (var_f31 < var_f30) { *arg1 = 4; 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 (arg0->unk_04.z < -400.0f) { HuAudFXPlay(1380); - } else { + } + else { 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; if (var_f30 < 0.001f) { arg3->x = arg3->y = arg3->z = 0.0f; - } else { + } + else { VECCrossProduct(&sp34, &sp28, &sp10); VECNormalize(&sp10, &sp10); 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.y += sp8.y * var_f30; arg0->unk_04.z += sp8.z * var_f30; - } else { + } + else { VECNormalize(&sp14, &sp14); arg0->unk_04.x -= sp14.x * 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) { fn_1_5EDC(arg1, arg0); - } else { + } + else { fn_1_5EDC(arg0, arg1); } return; @@ -823,7 +837,8 @@ void fn_1_6364(UnkM410Struct2 *arg0, UnkM410Struct2 *arg1) arg0->unk_04.x += sp8.x * var_f31; arg0->unk_04.y += sp8.y * var_f31; arg0->unk_04.z += sp8.z * var_f31; - } else { + } + else { VECNormalize(&sp14, &sp14); arg0->unk_04.x -= sp14.x * 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) { arg0->model[var_r30] = Hu3DModelCreateFile(lbl_1_data_DC[GWPlayerCfg[var_r29->unk_34].character]); var_r28 = arg0->model[var_r30]; - } else { + } + else { arg0->model[var_r30] = Hu3DModelLink(var_r28); } 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]); } 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++) { if (!var_r31->unk_00_field0) { - Hu3DModelAttrSet(var_r31->unk_30, 1); + Hu3DModelAttrSet(var_r31->unk_30, HU3D_ATTR_DISPOFF); continue; } 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.z = var_f31 * sp8.z; var_r31->unk_36--; - } else { + } + else { var_r31->unk_1C = sp8; } - } else { + } + else { 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_36 == 0) { @@ -943,14 +961,16 @@ void fn_1_6968(omObjData *object) PSMTXConcat(sp14, var_r28->unk_F0, var_r28->unk_F0); } } - } else { + } + else { var_r31->unk_44--; } } if (var_r31->unk_00_field2) { - Hu3DModelAttrReset(var_r31->unk_30, 1); - } else { - Hu3DModelAttrSet(var_r31->unk_30, 1); + Hu3DModelAttrReset(var_r31->unk_30, HU3D_ATTR_DISPOFF); + } + 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); } @@ -960,12 +980,12 @@ void fn_1_6968(omObjData *object) for (var_r30 = 0; var_r30 < 60; var_r30++, var_r31++) { if (var_r31->unk_00_field0) { 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; } } lbl_1_bss_58->func = NULL; - Hu3DModelAttrReset(lbl_1_bss_38, 1); + Hu3DModelAttrReset(lbl_1_bss_38, HU3D_ATTR_DISPOFF); fn_1_287C(4); } } @@ -992,8 +1012,8 @@ void fn_1_6DB4(omObjData *object) var_r31->unk_34 = var_r29 / 6; object->model[var_r29] = Hu3DModelCreateFile(lbl_1_data_104[var_r31->unk_34]); var_r28 = object->model[var_r29]; - (void)var_r28; - Hu3DModelAttrSet(object->model[var_r29], 0x40000002); + (void)var_r28; + Hu3DModelAttrSet(object->model[var_r29], HU3D_MOTATTR_PAUSE); Hu3DData[object->model[var_r29]].cluster_attr[0] = 0; var_r31->unk_30 = object->model[var_r29]; var_r31->unk_32 = var_r29; @@ -1010,15 +1030,16 @@ void fn_1_6DB4(omObjData *object) if (!var_r29) { object->model[var_r29 + 0x12] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 10)); - } else { + } + else { object->model[var_r29 + 0x12] = Hu3DModelLink(object->model[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); if (!var_r29) { object->model[var_r29 + 36] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 11)); - - } else { + } + else { 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); @@ -1037,7 +1058,8 @@ void fn_1_7138(omObjData *object) for (var_r29 = 0; var_r29 < 18; var_r29++, var_r31++) { if (var_r31->unk_34 & 1) { var_f31 = lbl_1_bss_50; - } else { + } + else { var_f31 = -lbl_1_bss_50; } 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_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_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)); lbl_1_bss_38 = Hu3DParticleCreate(var_r31, 60); 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) @@ -1120,10 +1143,10 @@ void fn_1_75A0(ModelData *model, ParticleData *particle, Mtx matrix) var_r30 = particle->unk_48; 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) { - model->attr |= 1; + model->attr |= 1; } 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; var_r31 = &var_r31[arg2 * 15]; - for(var_r30=0; var_r30<15; var_r30++, var_r31++) { - if (!var_r31->unk_00_field0) { - *(s16 *)var_r31 = 0; - var_r31->unk_00_field0 = 1; - var_r31->unk_00_field2 = 1; - var_r31->unk_04 = arg0; - var_r31->unk_1C = arg1; - var_r31->unk_28 = 30.000002f; - var_r31->unk_38 = NULL; - var_r31->unk_36 = 0; - return 1; - } - } - return 0; + for (var_r30 = 0; var_r30 < 15; var_r30++, var_r31++) { + if (!var_r31->unk_00_field0) { + *(s16 *)var_r31 = 0; + var_r31->unk_00_field0 = 1; + var_r31->unk_00_field2 = 1; + var_r31->unk_04 = arg0; + var_r31->unk_1C = arg1; + var_r31->unk_28 = 30.000002f; + var_r31->unk_38 = NULL; + var_r31->unk_36 = 0; + return 1; + } + } + return 0; } 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) { sp8.x += 1500.0f; } - } else { + } + else { while (sp8.x > 750.0f) { sp8.x -= 1500.0f; } diff --git a/src/REL/m410Dll/player.c b/src/REL/m410Dll/player.c index dcbed261..133a5762 100644 --- a/src/REL/m410Dll/player.c +++ b/src/REL/m410Dll/player.c @@ -326,7 +326,7 @@ void fn_1_88D8(omObjData *object) case 1: if (fn_1_2834() == 1) { Hu3DModelHookReset(object->model[0]); - Hu3DModelAttrSet(object->model[1], 1); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); if ((1 << object->work[0]) & fn_1_2864()) { fn_1_9E0C(object, 8); } @@ -597,7 +597,7 @@ void fn_1_96F4(omObjData *object) if (var_r31->unk_14 && var_r31->unk_28) { var_r31->unk_14 = 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_70.x = object->trans.x; var_r31->unk_70.y = 100.0f + object->trans.y; @@ -647,7 +647,7 @@ s32 fn_1_9A90(omObjData *object) return var_r29; } 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) { var_r31->unk_1C = 1; @@ -695,7 +695,7 @@ s32 fn_1_9C84(omObjData *object) var_r31 = object->data; var_r29 = 0; 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) { fn_1_9E0C(object, 3); diff --git a/src/REL/m410Dll/stage.c b/src/REL/m410Dll/stage.c index f4b8ac21..b7bbb218 100644 --- a/src/REL/m410Dll/stage.c +++ b/src/REL/m410Dll/stage.c @@ -22,9 +22,9 @@ void fn_1_31FC(omObjData *object) object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 14)); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 15)); 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)); - Hu3DModelAttrSet(object->model[4], 0x40000001); + Hu3DModelAttrSet(object->model[4], HU3D_MOTATTR_LOOP); object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M410, 18)); object->func = fn_1_3350; } diff --git a/src/REL/m411Dll/main.c b/src/REL/m411Dll/main.c index 039d2e6b..0c45c86f 100755 --- a/src/REL/m411Dll/main.c +++ b/src/REL/m411Dll/main.c @@ -96,12 +96,12 @@ typedef struct { /* 0x060 */ float unk60; /* 0x064 */ float unk64; /* 0x068 */ float unk68; - /* 0x06C */ UnkBss474InnerStruct6C* unk6C[10]; - /* 0x094 */ UnkBss474InnerStruct6C* unk94[10]; - /* 0x0BC */ UnkBss474InnerStruct6C* unkBC[10]; + /* 0x06C */ UnkBss474InnerStruct6C *unk6C[10]; + /* 0x094 */ UnkBss474InnerStruct6C *unk94[10]; + /* 0x0BC */ UnkBss474InnerStruct6C *unkBC[10]; /* 0x0E4 */ UnkBss474InnerStructE4 unkE4[10]; - /* 0x24C */ AnimData* unk24C; - /* 0x250 */ AnimData* unk250; + /* 0x24C */ AnimData *unk24C; + /* 0x250 */ AnimData *unk250; /* 0x254 */ s8 unk254; /* 0x255 */ s8 unk255; /* 0x256 */ s8 unk256; @@ -113,13 +113,13 @@ typedef struct { } UnkBss474Struct; // Size 0x26C typedef struct { - /* 0x00 */ UnkBss474Struct* unk00; + /* 0x00 */ UnkBss474Struct *unk00; /* 0x04 */ s32 unk04; /* 0x08 */ s32 unk08; - /* 0x0C */ s32* unk0C; + /* 0x0C */ s32 *unk0C; } UnkFn64A3Struct; // Size unknown -void fn_1_E80(omObjData* arg0); +void fn_1_E80(omObjData *arg0); void fn_1_F8C(float arg0); void fn_1_1074(void); void fn_1_1498(s16 layer); @@ -127,11 +127,11 @@ s32 fn_1_1520(void); s32 fn_1_1C4C(void); s32 fn_1_20C8(void); void fn_1_25D0(void); -void fn_1_34B0(ModelData* model, ParticleData* particle, Mtx matrix, s32 arg3); -void fn_1_3A60(ModelData* model, ParticleData* particle, Mtx matrix); -void fn_1_3A9C(ModelData* model, ParticleData* particle, Mtx matrix); -void fn_1_3AD8(ModelData* model, ParticleData* particle, Mtx matrix); -void fn_1_3B14(ModelData* model, ParticleData* particle, Mtx matrix); +void fn_1_34B0(ModelData *model, ParticleData *particle, Mtx matrix, s32 arg3); +void fn_1_3A60(ModelData *model, ParticleData *particle, Mtx matrix); +void fn_1_3A9C(ModelData *model, ParticleData *particle, Mtx matrix); +void fn_1_3AD8(ModelData *model, ParticleData *particle, Mtx matrix); +void fn_1_3B14(ModelData *model, ParticleData *particle, Mtx matrix); void fn_1_3B50(void); void fn_1_3F34(void); void fn_1_4218(void); @@ -148,14 +148,14 @@ void fn_1_5910(void); s8 fn_1_5D58(s32 arg0, s32 arg1); u8 fn_1_5E10(s32 arg0, s32 arg1); u16 fn_1_5ED0(s32 arg0); -void fn_1_5F3C(UnkBss474Struct* arg0, s32 arg1); -void fn_1_6428(UnkBss474Struct* arg0, s32 arg1); -void fn_1_6820(UnkBss474Struct* arg0, s32 arg1, s32 arg2); +void fn_1_5F3C(UnkBss474Struct *arg0, s32 arg1); +void fn_1_6428(UnkBss474Struct *arg0, s32 arg1); +void fn_1_6820(UnkBss474Struct *arg0, s32 arg1, s32 arg2); void fn_1_6A3C(void); void fn_1_6CF4(void); -void fn_1_6DD8(UnkBss474Struct* arg0, s32 arg1); +void fn_1_6DD8(UnkBss474Struct *arg0, s32 arg1); void fn_1_6E9C(s32 arg0, s32 arg1); -void fn_1_6F48(UnkBss474Struct* arg0, s32 arg1, s32 arg2); +void fn_1_6F48(UnkBss474Struct *arg0, s32 arg1, s32 arg2); void fn_1_75C8(void); void fn_1_7680(void); void fn_1_7738(void); @@ -186,102 +186,53 @@ s32 lbl_1_bss_E28; float lbl_1_bss_E24; UnkBss474Struct lbl_1_bss_474[4]; UnkBss138Struct lbl_1_bss_138; -omObjData* lbl_1_bss_134; -Process* lbl_1_bss_124[4]; +omObjData *lbl_1_bss_134; +Process *lbl_1_bss_124[4]; Vec lbl_1_bss_C4[8]; Vec lbl_1_bss_64[8]; Vec lbl_1_bss_4[8]; -void* lbl_1_bss_0; +void *lbl_1_bss_0; -float lbl_1_data_0[][7] = { - { -10.0f, 0.0f, 0.0f, 0.0f, 0.0f, -3375.0f, 7460.0f }, - { -9.5f, 0.0f, 0.0f, 0.0f, 0.0f, -510.0f, 1860.0f }, - { -5.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2870.0f, 5060.0f } -}; +float lbl_1_data_0[][7] = { { -10.0f, 0.0f, 0.0f, 0.0f, 0.0f, -3375.0f, 7460.0f }, { -9.5f, 0.0f, 0.0f, 0.0f, 0.0f, -510.0f, 1860.0f }, + { -5.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2870.0f, 5060.0f } }; -s32 lbl_1_data_54[] = { - DATA_MAKE_NUM(DATADIR_M411, 9), - DATA_MAKE_NUM(DATADIR_M411, 11), - DATA_MAKE_NUM(DATADIR_M411, 10) -}; +s32 lbl_1_data_54[] = { DATA_MAKE_NUM(DATADIR_M411, 9), DATA_MAKE_NUM(DATADIR_M411, 11), DATA_MAKE_NUM(DATADIR_M411, 10) }; -char* lbl_1_data_6C[] = { - "puzzle00", "puzzle00", "puzzle00" -}; +char *lbl_1_data_6C[] = { "puzzle00", "puzzle00", "puzzle00" }; -char* lbl_1_data_1C8[][10] = { - { - "puzzle_B1-p01", "puzzle_B1-p02", "puzzle_B1-p03", "puzzle_B1-p04", - "puzzle_B1-p05", "puzzle_B1-p06", "puzzle_B1-p07", "puzzle_B1-p08" - }, - { - "puzzle_B2-p01", "puzzle_B2-p02", "puzzle_B2-p03", "puzzle_B2-p04", - "puzzle_B2-p05", "puzzle_B2-p06", "puzzle_B2-p07", "puzzle_B2-p08" - }, - { - "puzzle_B3-p01", "puzzle_B3-p02", "puzzle_B3-p03", "puzzle_B3-p04", - "puzzle_B3-p05", "puzzle_B3-p06", "puzzle_B3-p07", "puzzle_B3-p08" - } -}; +char *lbl_1_data_1C8[][10] = { { "puzzle_B1-p01", "puzzle_B1-p02", "puzzle_B1-p03", "puzzle_B1-p04", "puzzle_B1-p05", "puzzle_B1-p06", + "puzzle_B1-p07", "puzzle_B1-p08" }, + { "puzzle_B2-p01", "puzzle_B2-p02", "puzzle_B2-p03", "puzzle_B2-p04", "puzzle_B2-p05", "puzzle_B2-p06", "puzzle_B2-p07", "puzzle_B2-p08" }, + { "puzzle_B3-p01", "puzzle_B3-p02", "puzzle_B3-p03", "puzzle_B3-p04", "puzzle_B3-p05", "puzzle_B3-p06", "puzzle_B3-p07", "puzzle_B3-p08" } }; s32 lbl_1_data_240[8] = { 0, 1, 2, 3, 4, 5, 6, 7 }; -s32 lbl_1_data_260[8] = { - DATA_MAKE_NUM(DATADIR_MARIOMDL1, 0), - DATA_MAKE_NUM(DATADIR_LUIGIMDL1, 0), - DATA_MAKE_NUM(DATADIR_PEACHMDL1, 0), - DATA_MAKE_NUM(DATADIR_YOSHIMDL1, 0), - DATA_MAKE_NUM(DATADIR_WARIOMDL1, 0), - DATA_MAKE_NUM(DATADIR_DONKEYMDL1, 0), - DATA_MAKE_NUM(DATADIR_DAISYMDL1, 0), - DATA_MAKE_NUM(DATADIR_WALUIGIMDL1, 0) -}; +s32 lbl_1_data_260[8] = { DATA_MAKE_NUM(DATADIR_MARIOMDL1, 0), DATA_MAKE_NUM(DATADIR_LUIGIMDL1, 0), DATA_MAKE_NUM(DATADIR_PEACHMDL1, 0), + DATA_MAKE_NUM(DATADIR_YOSHIMDL1, 0), DATA_MAKE_NUM(DATADIR_WARIOMDL1, 0), DATA_MAKE_NUM(DATADIR_DONKEYMDL1, 0), + DATA_MAKE_NUM(DATADIR_DAISYMDL1, 0), DATA_MAKE_NUM(DATADIR_WALUIGIMDL1, 0) }; -s32 lbl_1_data_280[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 1), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 5), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 6), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 27), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 32), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 33), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 23) -}; +s32 lbl_1_data_280[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), DATA_MAKE_NUM(DATADIR_MARIOMOT, 1), DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 5), DATA_MAKE_NUM(DATADIR_MARIOMOT, 6), DATA_MAKE_NUM(DATADIR_MARIOMOT, 27), DATA_MAKE_NUM(DATADIR_MARIOMOT, 32), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 33), DATA_MAKE_NUM(DATADIR_MARIOMOT, 23) }; -s32 lbl_1_data_2A4[8] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 0), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 0), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 0), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0) -}; +s32 lbl_1_data_2A4[8] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0), DATA_MAKE_NUM(DATADIR_PEACHMOT, 0), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0), DATA_MAKE_NUM(DATADIR_WARIOMOT, 0), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0), DATA_MAKE_NUM(DATADIR_DAISYMOT, 0), + DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0) }; -s32 lbl_1_data_2C4[] = { - DATA_MAKE_NUM(DATADIR_M411, 27), - DATA_MAKE_NUM(DATADIR_M411, 28), - DATA_MAKE_NUM(DATADIR_M411, 23) -}; +s32 lbl_1_data_2C4[] = { DATA_MAKE_NUM(DATADIR_M411, 27), DATA_MAKE_NUM(DATADIR_M411, 28), DATA_MAKE_NUM(DATADIR_M411, 23) }; -s32 lbl_1_data_2D0[] = { - DATA_MAKE_NUM(DATADIR_M411, 30), - DATA_MAKE_NUM(DATADIR_M411, 31), - DATA_MAKE_NUM(DATADIR_M411, 32), - DATA_MAKE_NUM(DATADIR_M411, 33), - DATA_MAKE_NUM(DATADIR_M411, 34) -}; +s32 lbl_1_data_2D0[] = { DATA_MAKE_NUM(DATADIR_M411, 30), DATA_MAKE_NUM(DATADIR_M411, 31), DATA_MAKE_NUM(DATADIR_M411, 32), + DATA_MAKE_NUM(DATADIR_M411, 33), DATA_MAKE_NUM(DATADIR_M411, 34) }; -void ObjectSetup(void) { +void ObjectSetup(void) +{ Vec sp24; Vec sp18; Vec spC; float temp_f31; float temp_f30; float sp8; - Process* temp_r3; + Process *temp_r3; s32 var_r29; s32 i; @@ -319,7 +270,8 @@ void ObjectSetup(void) { Hu3DCameraScissorSet(0x10, 0x142, 0xF2, 0x13E, 0xEE); if (lbl_1_bss_E40 == 0) { lbl_1_bss_134 = omAddObjEx(temp_r3, 0x7FDA, 0, 0, -1, fn_1_E80); - } else { + } + else { lbl_1_bss_134 = omAddObjEx(temp_r3, 0x7FDA, 0, 0, -1, omOutViewMulti); } lbl_1_bss_134->work[0] = 5; @@ -397,29 +349,33 @@ void ObjectSetup(void) { WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); } -void fn_1_E80(omObjData* arg0) { +void fn_1_E80(omObjData *arg0) +{ s32 i; for (i = 0; i < arg0->work[0]; i++) { - Hu3DCameraPosSet(1 << i, lbl_1_bss_C4[i].x, lbl_1_bss_C4[i].y, lbl_1_bss_C4[i].z, lbl_1_bss_4[i].x, lbl_1_bss_4[i].y, lbl_1_bss_4[i].z, lbl_1_bss_64[i].x, lbl_1_bss_64[i].y, lbl_1_bss_64[i].z); + Hu3DCameraPosSet(1 << i, lbl_1_bss_C4[i].x, lbl_1_bss_C4[i].y, lbl_1_bss_C4[i].z, lbl_1_bss_4[i].x, lbl_1_bss_4[i].y, lbl_1_bss_4[i].z, + lbl_1_bss_64[i].x, lbl_1_bss_64[i].y, lbl_1_bss_64[i].z); } } -void fn_1_F8C(float arg0) { +void fn_1_F8C(float arg0) +{ lbl_1_bss_E24 = arg0; Hu3DTexScrollPosMoveSet(lbl_1_bss_E9E, -0.01f * arg0, 0.0f, 0.0f); Hu3DTexScrollPosMoveSet(lbl_1_bss_E9C, -0.017f * arg0, 0.0f, 0.0f); HuAudFXPitchSet(lbl_1_bss_E2C[0], -8191.0f * (1.0f - arg0)); } -void fn_1_1074(void) { +void fn_1_1074(void) +{ Mtx44 sp64; Mtx sp34; Vec sp28; Vec sp1C; Vec sp10; GXColor spC; - CameraData* var_r31; + CameraData *var_r31; var_r31 = &Hu3DCamera[0]; C_MTXPerspective(sp64, var_r31->fov, var_r31->aspect, var_r31->near, var_r31->far); @@ -458,7 +414,8 @@ void fn_1_1074(void) { GXEnd(); } -void fn_1_1498(s16 layer) { +void fn_1_1498(s16 layer) +{ if (Hu3DCameraNo == 1) { GXSetTexCopySrc(0, 0, 320, 240); GXSetTexCopyDst(320, 240, GX_TF_RGB5A3, GX_FALSE); @@ -468,12 +425,13 @@ void fn_1_1498(s16 layer) { } } -s32 fn_1_1520(void) { - UnkBss138Struct* var_r30; - UnkBss138InnerStruct00* var_r31; - UnkBss138InnerStruct00* temp_r28; - Process* var_r23; - void* var_r26; +s32 fn_1_1520(void) +{ + UnkBss138Struct *var_r30; + UnkBss138InnerStruct00 *var_r31; + UnkBss138InnerStruct00 *temp_r28; + Process *var_r23; + void *var_r26; s16 var_r27; s16 var_r24; s16 var_r22; @@ -498,35 +456,37 @@ s32 fn_1_1520(void) { var_r31 = &var_r30->unkE4[0]; var_r26 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 17), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r31->unk00 = var_r27 = Hu3DModelCreate(var_r26); - Hu3DModelAttrSet(var_r27, 1); + Hu3DModelAttrSet(var_r27, HU3D_ATTR_DISPOFF); Hu3DModelCameraSet(var_r27, 1); var_r26 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 18), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r31->unk0C = var_r24 = Hu3DModelCreate(var_r26); - Hu3DModelAttrSet(var_r24, 1); + Hu3DModelAttrSet(var_r24, HU3D_ATTR_DISPOFF); Hu3DModelCameraSet(var_r24, 1); for (i = 1; i < 5; i++) { var_r31 = &var_r30->unkE4[i]; var_r31->unk00 = Hu3DModelLink(var_r27); - Hu3DModelAttrSet(var_r31->unk00, 1); + Hu3DModelAttrSet(var_r31->unk00, HU3D_ATTR_DISPOFF); Hu3DModelCameraSet(var_r31->unk00, 1); if (i == 1) { var_r26 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 19), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r31->unk0C = var_r22 = Hu3DModelCreate(var_r26); - } else if (i & 1) { + } + else if (i & 1) { var_r31->unk0C = Hu3DModelLink(var_r22); - } else { + } + else { var_r31->unk0C = Hu3DModelLink(var_r24); } - Hu3DModelAttrSet(var_r31->unk0C, 1); + Hu3DModelAttrSet(var_r31->unk0C, HU3D_ATTR_DISPOFF); Hu3DModelCameraSet(var_r31->unk0C, 1); } var_r26 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 17), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30->unk274[0].unk00 = var_r27 = Hu3DModelCreate(var_r26); - Hu3DModelAttrSet(var_r27, 1); + Hu3DModelAttrSet(var_r27, HU3D_ATTR_DISPOFF); Hu3DModelCameraSet(var_r27, 1); for (i = 1; i < 5; i++) { var_r30->unk274[i].unk00 = Hu3DModelLink(var_r27); - Hu3DModelAttrSet(var_r30->unk274[i].unk00, 1); + Hu3DModelAttrSet(var_r30->unk274[i].unk00, HU3D_ATTR_DISPOFF); Hu3DModelCameraSet(var_r30->unk274[i].unk00, 1); } var_r31 = &var_r30->unk1C[1]; @@ -546,7 +506,7 @@ s32 fn_1_1520(void) { var_r31->unk02[i] = Hu3DJointMotion(var_r27, var_r26); } Hu3DMotionSet(var_r27, var_r31->unk02[0]); - Hu3DModelAttrSet(var_r27, 0x40000001); + Hu3DModelAttrSet(var_r27, HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(var_r27); temp_r28 = &var_r30->unk1C[2]; temp_r28->unk00 = Hu3DModelLink(var_r27); @@ -557,8 +517,8 @@ s32 fn_1_1520(void) { var_r26 = HuDataSelHeapReadNum(lbl_1_data_2C4[i], MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r28->unk02[i] = Hu3DJointMotion(var_r27, var_r26); } - Hu3DModelAttrSet(temp_r28->unk00, 0x800000); - Hu3DModelAttrSet(temp_r28->unk00, 0x40000001); + Hu3DModelAttrSet(temp_r28->unk00, HU3D_ATTR_CULL_FRONT); + Hu3DModelAttrSet(temp_r28->unk00, HU3D_MOTATTR_LOOP); Hu3DModelScaleSet(temp_r28->unk00, 1.0f, -1.0f, 1.0f); for (i = 0; i < 2; i++) { var_r31 = &var_r30->unk1AC[i]; @@ -572,7 +532,7 @@ s32 fn_1_1520(void) { var_r31->unk02[j] = Hu3DJointMotion(var_r27, var_r26); } Hu3DMotionSet(var_r27, var_r31->unk02[0]); - Hu3DModelAttrSet(var_r27, 0x40000001); + Hu3DModelAttrSet(var_r27, HU3D_MOTATTR_LOOP); var_r31->unk10.x = 200.0f; var_r31->unk10.y = 0.0f; var_r31->unk10.z = -930.0f; @@ -588,8 +548,8 @@ s32 fn_1_1520(void) { temp_r28->unk02[j] = Hu3DJointMotion(temp_r28->unk00, var_r26); } Hu3DModelCameraSet(temp_r28->unk00, 1); - Hu3DModelAttrSet(temp_r28->unk00, 0x800000); - Hu3DModelAttrSet(temp_r28->unk00, 0x40000001); + Hu3DModelAttrSet(temp_r28->unk00, HU3D_ATTR_CULL_FRONT); + Hu3DModelAttrSet(temp_r28->unk00, HU3D_MOTATTR_LOOP); Hu3DModelPosSet(temp_r28->unk00, var_r31->unk10.x, var_r31->unk10.y, var_r31->unk10.z); Hu3DModelScaleSet(temp_r28->unk00, 1.0f, -1.0f, 1.0f); } @@ -597,14 +557,15 @@ s32 fn_1_1520(void) { var_r23->user_data = var_r30; } -s32 fn_1_1C4C(void) { - UnkBss138Struct* var_r30; - UnkBss138InnerStruct00* var_r29; +s32 fn_1_1C4C(void) +{ + UnkBss138Struct *var_r30; + UnkBss138InnerStruct00 *var_r29; s16 var_r31; s16 sp8; s16 temp_r27; - Process* var_r26; - void* var_r28; + Process *var_r26; + void *var_r28; var_r30 = &lbl_1_bss_138; var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 35), MEMORY_DEFAULT_NUM, HEAP_DATA); @@ -619,7 +580,7 @@ s32 fn_1_1C4C(void) { var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 36), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r29->unk00 = var_r31 = Hu3DModelCreate(var_r28); Hu3DModelCameraSet(var_r31, 1); - Hu3DModelAttrSet(var_r31, 0x40000001); + Hu3DModelAttrSet(var_r31, HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(var_r31); var_r29 = &var_r30->unk1C[1]; var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 38), MEMORY_DEFAULT_NUM, HEAP_DATA); @@ -628,7 +589,7 @@ s32 fn_1_1C4C(void) { Hu3DModelCameraSet(var_r31, 1); var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 39), MEMORY_DEFAULT_NUM, HEAP_DATA); Hu3DMotionSet(var_r31, Hu3DJointMotion(var_r31, var_r28)); - Hu3DModelAttrSet(var_r31, 0x40000001); + Hu3DModelAttrSet(var_r31, HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(var_r31); var_r29 = &var_r30->unk1C[2]; var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 38), MEMORY_DEFAULT_NUM, HEAP_DATA); @@ -636,7 +597,7 @@ s32 fn_1_1C4C(void) { Hu3DModelCameraSet(var_r31, 1); var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 40), MEMORY_DEFAULT_NUM, HEAP_DATA); Hu3DMotionSet(var_r31, Hu3DJointMotion(var_r31, var_r28)); - Hu3DModelAttrSet(var_r31, 0x40000001); + Hu3DModelAttrSet(var_r31, HU3D_MOTATTR_LOOP); Hu3DModelPosSet(var_r31, 0.0f, 60.0f, -70.0f); Hu3DModelShadowSet(var_r31); var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 37), MEMORY_DEFAULT_NUM, HEAP_DATA); @@ -652,8 +613,8 @@ s32 fn_1_1C4C(void) { var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 45), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r29->unk02[2] = Hu3DJointMotion(var_r31, var_r28); Hu3DMotionSet(var_r31, var_r29->unk02[0]); - Hu3DModelAttrSet(var_r31, 1); - Hu3DModelAttrSet(var_r31, 0x40000001); + Hu3DModelAttrSet(var_r31, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31, HU3D_MOTATTR_LOOP); Hu3DModelHookSet(var_r31, "itemhook_r", temp_r27); Hu3DModelShadowSet(var_r31); var_r29 = &var_r30->unkE4[1]; @@ -667,19 +628,20 @@ s32 fn_1_1C4C(void) { var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 46), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r29->unk02[2] = Hu3DJointMotion(var_r31, var_r28); Hu3DMotionSet(var_r31, var_r29->unk02[0]); - Hu3DModelAttrSet(var_r31, 1); - Hu3DModelAttrSet(var_r31, 0x40000001); + Hu3DModelAttrSet(var_r31, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31, HU3D_MOTATTR_LOOP); Hu3DModelHookSet(var_r31, "itemhook_l", temp_r27); Hu3DModelShadowSet(var_r31); var_r26 = HuPrcChildCreate(fn_1_5384, 0x2000, 0x2000, 0, HuPrcCurrentGet()); var_r26->user_data = var_r30; } -s32 fn_1_20C8(void) { - UnkBss138Struct* var_r31; - UnkBss138InnerStruct00* temp_r29; - Process* var_r26; - void* var_r28; +s32 fn_1_20C8(void) +{ + UnkBss138Struct *var_r31; + UnkBss138InnerStruct00 *temp_r29; + Process *var_r26; + void *var_r28; s16 var_r30; s16 var_r25; s32 i; @@ -709,7 +671,7 @@ s32 fn_1_20C8(void) { Hu3DModelCameraSet(var_r30, 1); Hu3DModelPosSet(var_r30, var_r31->unk04.x, var_r31->unk04.y, var_r31->unk04.z); Hu3DModelRotSet(var_r30, var_r31->unk10.x, var_r31->unk10.y, var_r31->unk10.z); - Hu3DModelAttrSet(var_r30, 0x40000001); + Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP); Hu3DMotionTimeSet(var_r30, Hu3DMotionMaxTimeGet(var_r30) / 4); temp_r29 = &var_r31->unk1C[1]; var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 49), MEMORY_DEFAULT_NUM, HEAP_DATA); @@ -718,14 +680,15 @@ s32 fn_1_20C8(void) { Hu3DModelCameraSet(var_r30, 1); Hu3DModelPosSet(var_r30, var_r31->unk04.x, var_r31->unk04.y, var_r31->unk04.z); Hu3DModelRotSet(var_r30, var_r31->unk10.x, var_r31->unk10.y, var_r31->unk10.z); - Hu3DModelAttrSet(var_r30, 0x40000001); + Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP); Hu3DMotionTimeSet(var_r30, Hu3DMotionMaxTimeGet(var_r30) / 4); for (i = 0; i < 3; i++) { temp_r29 = &var_r31->unk1C[i + 2]; if (i == 0) { var_r28 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M411, 50), MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r29->unk00 = var_r30 = var_r25 = Hu3DModelCreate(var_r28); - } else { + } + else { temp_r29->unk00 = Hu3DModelLink(var_r25); } var_r30 = temp_r29->unk00; @@ -744,7 +707,7 @@ s32 fn_1_20C8(void) { temp_r29->unk10.x = temp_r29->unk10.y = temp_r29->unk10.z = 0.0f; Hu3DModelPosSet(var_r30, temp_r29->unk10.x, temp_r29->unk10.y, temp_r29->unk10.z); Hu3DModelRotSet(var_r30, 0.0f, -90.0f, 0.0f); - Hu3DModelAttrSet(var_r30, 0x40000001); + Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(var_r30); Hu3DMotionSet(var_r30, temp_r29->unk02[0]); temp_r29 = &var_r31->unk1AC[0]; @@ -752,27 +715,23 @@ s32 fn_1_20C8(void) { var_r30 = Hu3DModelCreate(var_r28); temp_r29->unk00 = var_r30; Hu3DModelCameraSet(var_r30, 1); - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); var_r26 = HuPrcChildCreate(fn_1_5910, 0x2000, 0x2000, 0, HuPrcCurrentGet()); var_r26->user_data = var_r31; } -ParticleHook lbl_1_data_30C[] = { - fn_1_3A60, - fn_1_3A9C, - fn_1_3AD8, - fn_1_3B14 -}; +ParticleHook lbl_1_data_30C[] = { fn_1_3A60, fn_1_3A9C, fn_1_3AD8, fn_1_3B14 }; -void fn_1_25D0(void) { +void fn_1_25D0(void) +{ u32 temp_r24; - UnkBss474Struct* temp_r31; - void* var_r28; - UnkBss474InnerStructE4* temp_r27; - UnkBss474DoublyInnerStruct6C* temp_r26; - AnimData* var_r21; - AnimData* var_r20; - Process* var_r23; + UnkBss474Struct *temp_r31; + void *var_r28; + UnkBss474InnerStructE4 *temp_r27; + UnkBss474DoublyInnerStruct6C *temp_r26; + AnimData *var_r21; + AnimData *var_r20; + Process *var_r23; s16 temp_r25; s32 var_r22; s32 i; @@ -832,9 +791,9 @@ void fn_1_25D0(void) { Hu3DModelPosSet(temp_r31->unk06, 0.0f, 0.0f, 0.0f); Hu3DModelRotSet(temp_r31->unk06, 0.0f, 0.0f, 0.0f); Hu3DModelTPLvlSet(temp_r31->unk06, 128.0f); - Hu3DModelAttrSet(temp_r31->unk06, 0x4000); + Hu3DModelAttrSet(temp_r31->unk06, HU3D_ATTR_NOCULL); for (j = 0; j < lbl_1_bss_E38; j++) { - temp_r31->unk6C[j] = (void*) Hu3DModelObjPtrGet(temp_r31->unk00, lbl_1_data_1C8[lbl_1_bss_E3C][j]); + temp_r31->unk6C[j] = (void *)Hu3DModelObjPtrGet(temp_r31->unk00, lbl_1_data_1C8[lbl_1_bss_E3C][j]); if (!temp_r31->unk6C[j]) { OSReport("objname %s\n", lbl_1_data_1C8[lbl_1_bss_E3C][j]); OSPanic("m411.c", 908, "ObjPtr"); @@ -850,12 +809,12 @@ void fn_1_25D0(void) { temp_r27->unk18 = temp_r26->unk18; temp_r27->unk1C = temp_r26->unk1C; temp_r27->unk20 = temp_r26->unk20; - temp_r31->unk94[j] = (void*) Hu3DModelObjPtrGet(temp_r31->unk06, lbl_1_data_1C8[lbl_1_bss_E3C][j]); + temp_r31->unk94[j] = (void *)Hu3DModelObjPtrGet(temp_r31->unk06, lbl_1_data_1C8[lbl_1_bss_E3C][j]); if (!temp_r31->unk94[j]) { OSReport("objname %s\n", lbl_1_data_1C8[lbl_1_bss_E3C][j]); OSPanic("m411.c", 919, "ObjPtr"); } - temp_r31->unkBC[j] = (void*) Hu3DModelObjPtrGet(temp_r31->unk04, lbl_1_data_1C8[lbl_1_bss_E3C][j]); + temp_r31->unkBC[j] = (void *)Hu3DModelObjPtrGet(temp_r31->unk04, lbl_1_data_1C8[lbl_1_bss_E3C][j]); if (!temp_r31->unkBC[j]) { OSReport("objname %s\n", lbl_1_data_1C8[lbl_1_bss_E3C][j]); OSPanic("m411.c", 925, "ObjPtr"); @@ -900,19 +859,19 @@ void fn_1_25D0(void) { temp_r31->unk58 = 180.0f; Hu3DModelPosSet(temp_r31->unk08, temp_r31->unk48, temp_r31->unk4C, temp_r31->unk50); Hu3DModelRotSet(temp_r31->unk08, temp_r31->unk54, temp_r31->unk58, temp_r31->unk5C); - Hu3DModelAttrSet(temp_r31->unk08, 1); + Hu3DModelAttrSet(temp_r31->unk08, HU3D_ATTR_DISPOFF); for (j = 0; j < 9; j++) { temp_r31->unk0E[j] = CharModelMotionCreate(lbl_1_data_240[GWPlayerCfg[i].character], lbl_1_data_280[j]); } CharModelMotionSet(lbl_1_data_240[GWPlayerCfg[i].character], temp_r31->unk0E[0]); - Hu3DModelAttrSet(temp_r31->unk08, 0x40000001); + Hu3DModelAttrSet(temp_r31->unk08, HU3D_MOTATTR_LOOP); if (lbl_1_bss_E40 == 0) { var_r28 = HuDataSelHeapReadNum(lbl_1_data_260[GWPlayerCfg[i].character], MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r31->unk20 = Hu3DModelCreate(var_r28); Hu3DModelAttrSet(temp_r31->unk20, 0x800001); Hu3DModelCameraSet(temp_r31->unk20, 1); for (j = 0; j < 9; j++) { - var_r28 = HuDataSelHeapReadNum((u8) lbl_1_data_280[j] + lbl_1_data_2A4[GWPlayerCfg[i].character], MEMORY_DEFAULT_NUM, HEAP_DATA); + var_r28 = HuDataSelHeapReadNum((u8)lbl_1_data_280[j] + lbl_1_data_2A4[GWPlayerCfg[i].character], MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r31->unk22[j] = Hu3DJointMotion(temp_r31->unk20, var_r28); } Hu3DMotionSet(temp_r31->unk20, temp_r31->unk22[3]); @@ -948,13 +907,14 @@ void fn_1_25D0(void) { HuPrcChildCreate(fn_1_ACB0, 0x1000, 0x1000, 0, HuPrcCurrentGet()); } -void fn_1_34B0(ModelData* model, ParticleData* particle, Mtx matrix, s32 arg3) { +void fn_1_34B0(ModelData *model, ParticleData *particle, Mtx matrix, s32 arg3) +{ float var_f30; float temp_f28; float var_f31; float temp_f29; - HsfanimStruct01* var_r31; - UnkBss474Struct* temp_r28; + HsfanimStruct01 *var_r31; + UnkBss474Struct *temp_r28; s16 i; s16 j; s16 k; @@ -1032,70 +992,67 @@ void fn_1_34B0(ModelData* model, ParticleData* particle, Mtx matrix, s32 arg3) { PPCSync(); } -void fn_1_3A60(ModelData* model, ParticleData* particle, Mtx matrix) { +void fn_1_3A60(ModelData *model, ParticleData *particle, Mtx matrix) +{ fn_1_34B0(model, particle, matrix, 0); } -void fn_1_3A9C(ModelData* model, ParticleData* particle, Mtx matrix) { +void fn_1_3A9C(ModelData *model, ParticleData *particle, Mtx matrix) +{ fn_1_34B0(model, particle, matrix, 1); } -void fn_1_3AD8(ModelData* model, ParticleData* particle, Mtx matrix) { +void fn_1_3AD8(ModelData *model, ParticleData *particle, Mtx matrix) +{ fn_1_34B0(model, particle, matrix, 2); } -void fn_1_3B14(ModelData* model, ParticleData* particle, Mtx matrix) { +void fn_1_3B14(ModelData *model, ParticleData *particle, Mtx matrix) +{ fn_1_34B0(model, particle, matrix, 3); } -void fn_1_3B50(void) { +void fn_1_3B50(void) +{ float temp_f31; float temp_f30; - UnkBss138InnerStruct00* temp_r31; + UnkBss138InnerStruct00 *temp_r31; s16 temp_r30; temp_r31 = HuPrcCurrentGet()->user_data; temp_r30 = temp_r31->unk0C; Hu3DModelRotSet(temp_r30, 0.0f, 0.0f, 0.0f); - Hu3DModelAttrReset(temp_r30, 1); + Hu3DModelAttrReset(temp_r30, HU3D_ATTR_DISPOFF); temp_f31 = -15.0f; temp_f30 = -15.0f; - Hu3DModelPosSet(temp_r30, - temp_r31->unk10.x + 2.0 * sind(temp_r31->unk1C.y) + temp_f31, - temp_r31->unk10.y + temp_f30, + Hu3DModelPosSet(temp_r30, temp_r31->unk10.x + 2.0 * sind(temp_r31->unk1C.y) + temp_f31, temp_r31->unk10.y + temp_f30, temp_r31->unk10.z + 2.0 * cosd(temp_r31->unk1C.y)); HuPrcVSleep(); - Hu3DModelAttrSet(temp_r30, 1); + Hu3DModelAttrSet(temp_r30, HU3D_ATTR_DISPOFF); HuPrcSleep(4); - Hu3DModelAttrReset(temp_r30, 1); + Hu3DModelAttrReset(temp_r30, HU3D_ATTR_DISPOFF); temp_f31 = 15.0f; temp_f30 = -15.0f; - Hu3DModelPosSet(temp_r30, - temp_r31->unk10.x + 2.0 * sind(temp_r31->unk1C.y) + temp_f31, - temp_r31->unk10.y + temp_f30, + Hu3DModelPosSet(temp_r30, temp_r31->unk10.x + 2.0 * sind(temp_r31->unk1C.y) + temp_f31, temp_r31->unk10.y + temp_f30, temp_r31->unk10.z + 2.0 * cosd(temp_r31->unk1C.y)); HuPrcVSleep(); - Hu3DModelAttrSet(temp_r30, 1); + Hu3DModelAttrSet(temp_r30, HU3D_ATTR_DISPOFF); HuPrcSleep(4); - Hu3DModelAttrReset(temp_r30, 1); + Hu3DModelAttrReset(temp_r30, HU3D_ATTR_DISPOFF); temp_f31 = -15.0f; temp_f30 = 15.0f; - Hu3DModelPosSet(temp_r30, - temp_r31->unk10.x + 2.0 * sind(temp_r31->unk1C.y) + temp_f31, - temp_r31->unk10.y + temp_f30, + Hu3DModelPosSet(temp_r30, temp_r31->unk10.x + 2.0 * sind(temp_r31->unk1C.y) + temp_f31, temp_r31->unk10.y + temp_f30, temp_r31->unk10.z + 2.0 * cosd(temp_r31->unk1C.y)); HuPrcVSleep(); - Hu3DModelAttrSet(temp_r30, 1); + Hu3DModelAttrSet(temp_r30, HU3D_ATTR_DISPOFF); HuPrcSleep(4); - Hu3DModelAttrReset(temp_r30, 1); + Hu3DModelAttrReset(temp_r30, HU3D_ATTR_DISPOFF); temp_f31 = 15.0f; temp_f30 = 15.0f; - Hu3DModelPosSet(temp_r30, - temp_r31->unk10.x + 2.0 * sind(temp_r31->unk1C.y) + temp_f31, - temp_r31->unk10.y + temp_f30, + Hu3DModelPosSet(temp_r30, temp_r31->unk10.x + 2.0 * sind(temp_r31->unk1C.y) + temp_f31, temp_r31->unk10.y + temp_f30, temp_r31->unk10.z + 2.0 * cosd(temp_r31->unk1C.y)); HuPrcVSleep(); - Hu3DModelAttrSet(temp_r30, 1); + Hu3DModelAttrSet(temp_r30, HU3D_ATTR_DISPOFF); HuPrcSleep(4); HuPrcKill(HuPrcCurrentGet()); while (TRUE) { @@ -1103,20 +1060,21 @@ void fn_1_3B50(void) { } } -void fn_1_3F34(void) { +void fn_1_3F34(void) +{ float temp_f28; float var_f31; float temp_f30; float var_f29; - UnkBss138InnerStruct00* temp_r31; - Process* var_r30; + UnkBss138InnerStruct00 *temp_r31; + Process *var_r30; temp_r31 = HuPrcCurrentGet()->user_data; temp_r31->unk10.x = -500.0f + 1000.0f * frandf(); temp_r31->unk10.y = 1200.0f; temp_r31->unk10.z = 0.0f; temp_r31->unk1C.x = temp_r31->unk1C.y = temp_r31->unk1C.z = 0.0f; - Hu3DModelAttrReset(temp_r31->unk00, 1); + Hu3DModelAttrReset(temp_r31->unk00, HU3D_ATTR_DISPOFF); temp_f28 = temp_r31->unk10.x; var_f31 = 0.0f; temp_f30 = 1.0f + 2.0f * frandf(); @@ -1148,14 +1106,15 @@ void fn_1_3F34(void) { } HuPrcVSleep(); } - HuPrcCurrentGet()->user_data = (void*) 10000; + HuPrcCurrentGet()->user_data = (void *)10000; HuPrcKill(HuPrcCurrentGet()); while (TRUE) { HuPrcVSleep(); } } -void fn_1_4218(void) { +void fn_1_4218(void) +{ float temp_f28; float var_f29; float temp_f26; @@ -1166,14 +1125,14 @@ void fn_1_4218(void) { float temp_f23; float temp_f27; float temp_f22; - UnkBss138InnerStruct00* temp_r31; + UnkBss138InnerStruct00 *temp_r31; temp_r31 = HuPrcCurrentGet()->user_data; temp_f28 = -600.0f + 1200.0f * frandf(); var_f29 = 1200.0f; temp_f26 = -2900.0f; temp_f25 = var_f31 = temp_f24 = 0.0f; - Hu3DModelAttrReset(temp_r31->unk00, 1); + Hu3DModelAttrReset(temp_r31->unk00, HU3D_ATTR_DISPOFF); temp_f23 = temp_f28; var_f30 = 0.0f; temp_f27 = 1.0f + 2.0f * frandf(); @@ -1197,27 +1156,29 @@ void fn_1_4218(void) { Hu3DModelRotSet(temp_r31->unk00, temp_f25, var_f31, temp_f24); HuPrcVSleep(); } - HuPrcCurrentGet()->user_data = (void*) 10000; + HuPrcCurrentGet()->user_data = (void *)10000; HuPrcKill(HuPrcCurrentGet()); while (TRUE) { HuPrcVSleep(); } } -void fn_1_4454(void) { +void fn_1_4454(void) +{ float temp_f30; float sp8; float temp_f29; float var_f31; - UnkBss138InnerStruct00* temp_r31; - UnkBss138InnerStruct00* var_r30; + UnkBss138InnerStruct00 *temp_r31; + UnkBss138InnerStruct00 *var_r30; s32 i; temp_r31 = HuPrcCurrentGet()->user_data; if (temp_r31->unk0E == 0) { var_f31 = 0.0f; var_r30 = &lbl_1_bss_138.unk1AC[2]; - } else { + } + else { var_f31 = 180.0f; var_r30 = &lbl_1_bss_138.unk1AC[3]; } @@ -1266,7 +1227,8 @@ void fn_1_4454(void) { if (var_f31 > 180.0f) { temp_r31->unk10.x += 1.6666666f; temp_r31->unk10.z += 0.8333333f; - } else { + } + else { temp_r31->unk10.z += 0.8333333f; } Hu3DModelPosSet(temp_r31->unk00, temp_r31->unk10.x, temp_r31->unk10.y, temp_r31->unk10.z); @@ -1283,7 +1245,8 @@ void fn_1_4454(void) { if (temp_r31->unk0E == 0) { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[3], 0.0f, 5.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[3], 0.0f, 5.0f, HU3D_MOTATTR_LOOP); - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk02[4], 0.0f, 5.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSet(var_r30->unk00, var_r30->unk02[4], 0.0f, 5.0f, HU3D_MOTATTR_LOOP); } @@ -1292,9 +1255,10 @@ void fn_1_4454(void) { } } -void fn_1_4968(void) { - UnkBss138InnerStruct00* var_r31; - UnkBss138InnerStruct00* var_r30; +void fn_1_4968(void) +{ + UnkBss138InnerStruct00 *var_r31; + UnkBss138InnerStruct00 *var_r30; s32 i; var_r31 = &lbl_1_bss_138.unk1C[1]; @@ -1336,11 +1300,12 @@ void fn_1_4968(void) { } } -void fn_1_4BB0(void) { - UnkBss138Struct* temp_r28; - Process* sp24[5]; - Process* sp10[5]; - Process* sp8[2]; +void fn_1_4BB0(void) +{ + UnkBss138Struct *temp_r28; + Process *sp24[5]; + Process *sp10[5]; + Process *sp8[2]; s32 var_r30; s32 var_r29; s32 var_r27; @@ -1367,7 +1332,8 @@ void fn_1_4BB0(void) { break; } } - } else { + } + else { var_r30--; } if (var_r29 == 0) { @@ -1379,7 +1345,8 @@ void fn_1_4BB0(void) { break; } } - } else { + } + else { var_r29--; } if (lbl_1_bss_E98 == 4 && var_r27 == 0) { @@ -1391,23 +1358,24 @@ void fn_1_4BB0(void) { } HuPrcVSleep(); for (i = 0; i < 5; i++) { - if (sp24[i] && sp24[i]->user_data == (void*) 10000) { + if (sp24[i] && sp24[i]->user_data == (void *)10000) { sp24[i] = NULL; } - if (sp10[i] && sp10[i]->user_data == (void*) 10000) { + if (sp10[i] && sp10[i]->user_data == (void *)10000) { sp10[i] = NULL; } } } } -void fn_1_4E8C(void) { +void fn_1_4E8C(void) +{ float var_f31; - UnkBss138InnerStruct00* temp_r31; + UnkBss138InnerStruct00 *temp_r31; s32 temp_r29; s32 i; - temp_r29 = (s32) HuPrcCurrentGet()->user_data; + temp_r29 = (s32)HuPrcCurrentGet()->user_data; temp_r31 = &lbl_1_bss_138.unkE4[temp_r29 - 1]; temp_r31->unk10.y = 0.0f; temp_r31->unk10.z = 200.0f; @@ -1416,13 +1384,14 @@ void fn_1_4E8C(void) { temp_r31->unk1C.x = temp_r31->unk1C.z = 0.0f; temp_r31->unk1C.y = -90.0f; var_f31 = (120.0f - temp_r31->unk10.x) / 60.0f; - } else { + } + else { temp_r31->unk10.x = -500.0f; temp_r31->unk1C.x = temp_r31->unk1C.z = 0.0f; temp_r31->unk1C.y = 90.0f; var_f31 = (-120.0f - temp_r31->unk10.x) / 60.0f; } - Hu3DModelAttrReset(temp_r31->unk00, 1); + Hu3DModelAttrReset(temp_r31->unk00, HU3D_ATTR_DISPOFF); Hu3DModelRotSet(temp_r31->unk00, temp_r31->unk1C.x, temp_r31->unk1C.y, temp_r31->unk1C.z); for (i = 0; i < 60; i++) { temp_r31->unk10.x += var_f31; @@ -1440,13 +1409,14 @@ void fn_1_4E8C(void) { } } -void fn_1_507C(void) { +void fn_1_507C(void) +{ float temp_f31; s32 var_r28; s32 var_r29; - UnkBss138Struct* temp_r27; - UnkBss138InnerStruct00* temp_r31; - UnkBss138InnerStruct00* temp_r30; + UnkBss138Struct *temp_r27; + UnkBss138InnerStruct00 *temp_r31; + UnkBss138InnerStruct00 *temp_r30; temp_r27 = HuPrcCurrentGet()->user_data; temp_r31 = &temp_r27->unk1C[0]; @@ -1511,16 +1481,17 @@ void fn_1_507C(void) { HuPrcVSleep(); } } - Hu3DModelAttrSet(temp_r31->unk00, 1); - Hu3DModelAttrSet(temp_r30->unk00, 1); + Hu3DModelAttrSet(temp_r31->unk00, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(temp_r30->unk00, HU3D_ATTR_DISPOFF); while (TRUE) { HuPrcVSleep(); } } -void fn_1_5384(void) { - UnkBss138Struct* temp_r30; - Process* var_r31; +void fn_1_5384(void) +{ + UnkBss138Struct *temp_r30; + Process *var_r31; temp_r30 = HuPrcCurrentGet()->user_data; var_r31 = HuPrcChildCreate(fn_1_507C, 0x2000, 0x2000, 0, HuPrcCurrentGet()); @@ -1530,19 +1501,20 @@ void fn_1_5384(void) { } HuPrcSleep(0x122); var_r31 = HuPrcChildCreate(fn_1_4E8C, 0x2000, 0x2000, 0, HuPrcCurrentGet()); - var_r31->user_data = (void*) 1; + var_r31->user_data = (void *)1; var_r31 = HuPrcChildCreate(fn_1_4E8C, 0x2000, 0x2000, 0, HuPrcCurrentGet()); - var_r31->user_data = (void*) 2; + var_r31->user_data = (void *)2; while (TRUE) { HuPrcVSleep(); } } -void fn_1_544C(void) { - UnkBss138InnerStruct00* temp_r31; +void fn_1_544C(void) +{ + UnkBss138InnerStruct00 *temp_r31; s32 temp_r30; - temp_r30 = (s32) HuPrcCurrentGet()->user_data; + temp_r30 = (s32)HuPrcCurrentGet()->user_data; temp_r31 = &lbl_1_bss_138.unk1C[temp_r30 + 2]; switch (temp_r30) { case 0: @@ -1556,7 +1528,7 @@ void fn_1_544C(void) { break; } while (TRUE) { - Hu3DModelAttrSet(temp_r31->unk00, 0x40000001); + Hu3DModelAttrSet(temp_r31->unk00, HU3D_MOTATTR_LOOP); temp_r31->unk10.x += 2.0f * lbl_1_bss_E24; if (temp_r31->unk10.x > 650.0f) { temp_r31->unk10.x -= 1300.0f; @@ -1566,7 +1538,8 @@ void fn_1_544C(void) { } } -void fn_1_5554(void) { +void fn_1_5554(void) +{ float var_f28; float temp_f25; float temp_f27; @@ -1577,14 +1550,14 @@ void fn_1_5554(void) { float sp8; float temp_f24; UnkBss138InnerStruct00 spC; - UnkBss138InnerStruct00* var_r31; - UnkBss138InnerStruct00* var_r30; + UnkBss138InnerStruct00 *var_r31; + UnkBss138InnerStruct00 *var_r30; var_r31 = &spC; var_r30 = &lbl_1_bss_138.unk1AC[0]; var_r31->unk00 = Hu3DModelLink(var_r30->unk00); Hu3DModelCameraSet(var_r31->unk00, 1); - Hu3DModelAttrReset(var_r31->unk00, 1); + Hu3DModelAttrReset(var_r31->unk00, HU3D_ATTR_DISPOFF); var_r31->unk10.x = -500.0f + 100.0f * frandf(); var_r31->unk10.y = var_f26 = 200.0f + 500.0f * frandf(); var_r31->unk10.z = 400.0f; @@ -1630,7 +1603,8 @@ void fn_1_5554(void) { } } -void fn_1_58BC(void) { +void fn_1_58BC(void) +{ while (TRUE) { if (lbl_1_bss_E98 == 4) { break; @@ -1643,19 +1617,20 @@ void fn_1_58BC(void) { } } -void fn_1_5910(void) { +void fn_1_5910(void) +{ float var_f31; - UnkBss138Struct* spC; - Process* var_r29; - UnkBss138InnerStruct00* var_r31; - UnkBss474Struct* sp8; + UnkBss138Struct *spC; + Process *var_r29; + UnkBss138InnerStruct00 *var_r31; + UnkBss474Struct *sp8; s32 i; spC = HuPrcCurrentGet()->user_data; HuPrcChildCreate(fn_1_58BC, 0x2000, 0x2000, 0, HuPrcCurrentGet()); for (i = 0; i < 3; i++) { var_r29 = HuPrcChildCreate(fn_1_544C, 0x2000, 0x2000, 0, HuPrcCurrentGet()); - var_r29->user_data = (void*) i; + var_r29->user_data = (void *)i; } while (lbl_1_bss_E98 != 4) { HuPrcVSleep(); @@ -1693,46 +1668,53 @@ void fn_1_5910(void) { } } -s8 fn_1_5D58(s32 arg0, s32 arg1) { - UnkBss474Struct* temp_r31; +s8 fn_1_5D58(s32 arg0, s32 arg1) +{ + UnkBss474Struct *temp_r31; s8 var_r30; temp_r31 = &lbl_1_bss_474[arg0]; if (!GWPlayerCfg[arg0].iscom) { (arg1 != 0) ? (var_r30 = HuPadStkY[temp_r31->unk3C]) : (var_r30 = HuPadStkX[temp_r31->unk3C]); - } else { + } + else { (arg1 != 0) ? (var_r30 = temp_r31->unk255) : (var_r30 = temp_r31->unk254); } return var_r30; } -u8 fn_1_5E10(s32 arg0, s32 arg1) { - UnkBss474Struct* temp_r31; +u8 fn_1_5E10(s32 arg0, s32 arg1) +{ + UnkBss474Struct *temp_r31; s8 var_r30; temp_r31 = &lbl_1_bss_474[arg0]; if (!GWPlayerCfg[arg0].iscom) { (arg1 != 0) ? (var_r30 = HuPadTrigR[temp_r31->unk3C]) : (var_r30 = HuPadTrigL[temp_r31->unk3C]); - } else { + } + else { (arg1 != 0) ? (var_r30 = temp_r31->unk256) : (var_r30 = temp_r31->unk257); } return var_r30; } -u16 fn_1_5ED0(s32 arg0) { - UnkBss474Struct* temp_r31; +u16 fn_1_5ED0(s32 arg0) +{ + UnkBss474Struct *temp_r31; u16 var_r30; temp_r31 = &lbl_1_bss_474[arg0]; if (!GWPlayerCfg[arg0].iscom) { var_r30 = HuPadBtnDown[temp_r31->unk3C]; - } else { + } + else { var_r30 = temp_r31->unk258; } return var_r30; } -void fn_1_5F3C(UnkBss474Struct* arg0, s32 arg1) { +void fn_1_5F3C(UnkBss474Struct *arg0, s32 arg1) +{ Vec sp2C; Vec sp20; Vec sp14; @@ -1744,10 +1726,10 @@ void fn_1_5F3C(UnkBss474Struct* arg0, s32 arg1) { float var_f27; float var_f26; float var_f25; - UnkBss474DoublyInnerStruct6C* temp_r31; - UnkBss474DoublyInnerStruct6C* temp_r29; - UnkBss474DoublyInnerStruct6C* temp_r27; - UnkBss474InnerStructE4* temp_r28; + UnkBss474DoublyInnerStruct6C *temp_r31; + UnkBss474DoublyInnerStruct6C *temp_r29; + UnkBss474DoublyInnerStruct6C *temp_r27; + UnkBss474InnerStructE4 *temp_r28; s32 var_r25; s32 i; @@ -1782,7 +1764,8 @@ void fn_1_5F3C(UnkBss474Struct* arg0, s32 arg1) { temp_r27->unk08 += 10.0f; if (i < 14) { var_r25 += 17; - } else if (i < 28) { + } + else if (i < 28) { var_r25 -= 17; } Hu3DModelTPLvlSet(arg0->unk04, 255 - var_r25); @@ -1802,11 +1785,12 @@ void fn_1_5F3C(UnkBss474Struct* arg0, s32 arg1) { temp_r27->unk00 = 5000.0f; } -void fn_1_6428(UnkBss474Struct* arg0, s32 arg1) { +void fn_1_6428(UnkBss474Struct *arg0, s32 arg1) +{ float var_f31; - UnkBss474DoublyInnerStruct6C* temp_r31; - UnkBss474DoublyInnerStruct6C* temp_r29; - UnkBss474InnerStructE4* temp_r30; + UnkBss474DoublyInnerStruct6C *temp_r31; + UnkBss474DoublyInnerStruct6C *temp_r29; + UnkBss474InnerStructE4 *temp_r30; temp_r31 = &arg0->unk6C[arg1]->unk1C; temp_r29 = &arg0->unk94[arg1]->unk1C; @@ -1837,9 +1821,10 @@ void fn_1_6428(UnkBss474Struct* arg0, s32 arg1) { temp_r29->unk20 = 0.8f * temp_r31->unk20; } -void fn_1_6820(UnkBss474Struct* arg0, s32 arg1, s32 arg2) { - UnkBss474DoublyInnerStruct6C* temp_r30; - UnkBss474DoublyInnerStruct6C* temp_r31; +void fn_1_6820(UnkBss474Struct *arg0, s32 arg1, s32 arg2) +{ + UnkBss474DoublyInnerStruct6C *temp_r30; + UnkBss474DoublyInnerStruct6C *temp_r31; float temp_f30; float temp_f29; float temp_f28; @@ -1879,13 +1864,14 @@ void fn_1_6820(UnkBss474Struct* arg0, s32 arg1, s32 arg2) { HuSprAttrReset(arg0->unk0C, 0, HUSPR_ATTR_REVERSE); } -void fn_1_6A3C(void) { +void fn_1_6A3C(void) +{ float var_f31; float var_f30; float temp_f29; - UnkFn64A3Struct* temp_r30; - UnkBss474DoublyInnerStruct6C* temp_r31; - UnkBss474DoublyInnerStruct6C* temp_r28; + UnkFn64A3Struct *temp_r30; + UnkBss474DoublyInnerStruct6C *temp_r31; + UnkBss474DoublyInnerStruct6C *temp_r28; s32 var_r27; s32 i; @@ -1895,7 +1881,8 @@ void fn_1_6A3C(void) { HuAudFXPlay(0x56C); if (temp_r30->unk08 != 0) { var_f30 = temp_r31->unk14 + 90.0f; - } else { + } + else { var_f30 = temp_r31->unk14 - 90.0f; } if (var_f30 >= 360.0f) { @@ -1909,7 +1896,8 @@ void fn_1_6A3C(void) { for (i = 0, var_r27 = 15; i < var_r27; i++) { if (temp_r30->unk08 != 0) { temp_r31->unk14 = temp_f29 + 100.0 * sind(var_f31); - } else { + } + else { temp_r31->unk14 = temp_f29 - 100.0 * sind(var_f31); } temp_r28->unk14 = temp_r31->unk14; @@ -1921,7 +1909,8 @@ void fn_1_6A3C(void) { var_f31 -= 8.333333f; if (temp_r30->unk08 != 0) { temp_r31->unk14 = temp_f29 + 100.0 * sind(var_f31); - } else { + } + else { temp_r31->unk14 = temp_f29 - 100.0 * sind(var_f31); } temp_r28->unk14 = temp_r31->unk14; @@ -1936,10 +1925,11 @@ void fn_1_6A3C(void) { } } -void fn_1_6CF4(void) { +void fn_1_6CF4(void) +{ float temp_f30; float var_f31; - UnkBss474DoublyInnerStruct6C* temp_r31; + UnkBss474DoublyInnerStruct6C *temp_r31; temp_r31 = HuPrcCurrentGet()->user_data; HuPrcSleep(frandmod(30)); @@ -1964,8 +1954,9 @@ void fn_1_6CF4(void) { } } -void fn_1_6DD8(UnkBss474Struct* arg0, s32 arg1) { - UnkBss474DoublyInnerStruct6C* temp_r31; +void fn_1_6DD8(UnkBss474Struct *arg0, s32 arg1) +{ + UnkBss474DoublyInnerStruct6C *temp_r31; temp_r31 = &arg0->unk6C[arg1]->unk1C; if (temp_r31->unk00 > 220.0f) { @@ -1982,7 +1973,8 @@ void fn_1_6DD8(UnkBss474Struct* arg0, s32 arg1) { } } -void fn_1_6E9C(s32 arg0, s32 arg1) { +void fn_1_6E9C(s32 arg0, s32 arg1) +{ switch (GWPlayerCfg[arg0].diff) { case 0: arg1 *= 8; @@ -1999,18 +1991,20 @@ void fn_1_6E9C(s32 arg0, s32 arg1) { } if (arg1 <= 1) { HuPrcVSleep(); - } else { + } + else { HuPrcSleep(arg1 + frandmod(arg1 / 2)); } } -void fn_1_6F48(UnkBss474Struct* arg0, s32 arg1, s32 arg2) { +void fn_1_6F48(UnkBss474Struct *arg0, s32 arg1, s32 arg2) +{ Vec sp24; Vec sp18; Vec spC; float temp_f29; - UnkBss474DoublyInnerStruct6C* temp_r30; - UnkBss474InnerStructE4* temp_r25; + UnkBss474DoublyInnerStruct6C *temp_r30; + UnkBss474InnerStructE4 *temp_r25; s32 var_r27; s32 var_r23; @@ -2039,7 +2033,8 @@ void fn_1_6F48(UnkBss474Struct* arg0, s32 arg1, s32 arg2) { if (arg0->unk264 == -1) { if (frandmod(100) < var_r27 || lbl_1_bss_E38 == arg2 + 1) { arg0->unk264 = arg1; - } else { + } + else { var_r23 = frandmod(lbl_1_bss_E38 - arg2); arg0->unk264 = lbl_1_bss_E6C[arg2 + var_r23]; } @@ -2062,25 +2057,30 @@ void fn_1_6F48(UnkBss474Struct* arg0, s32 arg1, s32 arg2) { arg0->unk268 = 10; if (temp_r30->unk14 - 90.0f == 0.0f) { arg0->unk256 = 50; - } else { + } + else { arg0->unk257 = 50; } } } - } else { + } + else { fn_1_6E9C(arg0->unk34, 1); if (frandmod(100) < var_r27 || lbl_1_bss_E38 == arg2 + 1) { if (temp_r30->unk14 != 0.0f) { if (temp_r30->unk14 - 90.0f == 0.0f) { arg0->unk256 = 50; - } else { + } + else { arg0->unk257 = 50; } - } else { + } + else { arg0->unk258 = 0x100; arg0->unk264 = -1; } - } else { + } + else { switch (frandmod(3)) { case 0: arg0->unk256 = 50; @@ -2100,7 +2100,8 @@ void fn_1_6F48(UnkBss474Struct* arg0, s32 arg1, s32 arg2) { } } -void fn_1_75C8(void) { +void fn_1_75C8(void) +{ s16 var_r30; s32 var_r31; @@ -2119,7 +2120,8 @@ void fn_1_75C8(void) { } } -void fn_1_7680(void) { +void fn_1_7680(void) +{ s16 var_r30; s32 var_r31; @@ -2138,11 +2140,11 @@ void fn_1_7680(void) { } } - -static inline void m411InlineFunc(UnkBss474Struct* temp_r31, UnkBss474DoublyInnerStruct6C* temp_r30) { +static inline void m411InlineFunc(UnkBss474Struct *temp_r31, UnkBss474DoublyInnerStruct6C *temp_r30) +{ Vec sp74; Vec sp80; - + float var_f22; float var_f23; @@ -2157,16 +2159,17 @@ static inline void m411InlineFunc(UnkBss474Struct* temp_r31, UnkBss474DoublyInne #define SOME_MACRO(x) ((x) >= 0 ? (x) : (-(x) > 20)) -void fn_1_7738(void) { +void fn_1_7738(void) +{ f32 temp_f26; f32 temp_f27; - Process* var_r24; - UnkBss474Struct* temp_r31; - UnkBss474DoublyInnerStruct6C* temp_r30; + Process *var_r24; + UnkBss474Struct *temp_r31; + UnkBss474DoublyInnerStruct6C *temp_r30; s32 var_r29; - UnkBss474DoublyInnerStruct6C* temp_r28; + UnkBss474DoublyInnerStruct6C *temp_r28; s32 temp_r26; - UnkBss474InnerStructE4* temp_r25; + UnkBss474InnerStructE4 *temp_r25; s32 var_r23; Vec spCC; Vec spC0; @@ -2185,17 +2188,18 @@ void fn_1_7738(void) { while (lbl_1_bss_E98 == 0) { HuPrcVSleep(); } - Hu3DModelAttrReset(temp_r31->unk08, 1); + Hu3DModelAttrReset(temp_r31->unk08, HU3D_ATTR_DISPOFF); for (var_r29 = 0; var_r29 < 30; var_r29++) { if (lbl_1_bss_E40 == 0) { lbl_1_bss_C4[temp_r31->unk38].z += 10.0f; - } else { + } + else { CZoomM[temp_r31->unk38] += 10.0f; } HuPrcVSleep(); } - Hu3DModelAttrReset(temp_r31->unk00, 1); - Hu3DModelAttrSet(temp_r31->unk02, 1); + Hu3DModelAttrReset(temp_r31->unk00, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(temp_r31->unk02, HU3D_ATTR_DISPOFF); if (temp_r31->unk34 == 0) { HuAudFXPlay(0x56F); } @@ -2224,12 +2228,13 @@ void fn_1_7738(void) { for (var_r29 = 0; var_r29 < 30; var_r29++) { if (lbl_1_bss_E40 == 0) { lbl_1_bss_C4[temp_r31->unk38].z -= 10.0f; - } else { + } + else { CZoomM[temp_r31->unk38] -= 10.0f; } HuPrcVSleep(); } - Hu3DModelAttrSet(temp_r31->unk08, 1); + Hu3DModelAttrSet(temp_r31->unk08, HU3D_ATTR_DISPOFF); HuPrcSleep(60); lbl_1_bss_E98 = 2; for (var_r29 = 0; var_r29 < lbl_1_bss_E38; var_r29++) { @@ -2245,7 +2250,8 @@ void fn_1_7738(void) { temp_r30->unk04 = temp_r25->unk04; temp_r28->unk00 = 20.0f + temp_r30->unk00; temp_r28->unk04 = -20.0f + temp_r30->unk04; - } else { + } + else { temp_r30->unk00 = temp_r30->unk04 = 0.0f; temp_r28->unk00 = 20.0f + temp_r30->unk00; temp_r28->unk04 = -20.0f + temp_r30->unk04; @@ -2301,9 +2307,7 @@ void fn_1_7738(void) { fn_1_6428(temp_r31, temp_r26); } temp_r31->unk60 = -1.0f; - if (SOME_MACRO(fn_1_5D58(temp_r31->unk34, 0)) != 0 - || SOME_MACRO(fn_1_5D58(temp_r31->unk34, 1)) != 0) - { + if (SOME_MACRO(fn_1_5D58(temp_r31->unk34, 0)) != 0 || SOME_MACRO(fn_1_5D58(temp_r31->unk34, 1)) != 0) { temp_r31->unk60 = atan2d(fn_1_5D58(temp_r31->unk34, 0), fn_1_5D58(temp_r31->unk34, 1)); } if (-1.0f != temp_r31->unk60) { @@ -2323,7 +2327,8 @@ void fn_1_7738(void) { } } -void fn_1_8A80(float arg0, float arg1) { +void fn_1_8A80(float arg0, float arg1) +{ Hu3DCameraViewportSet(2, 10.0f, 10.0f, arg0 - 11.0f, arg1 - 11.0f, 0.0f, 1.0f); Hu3DCameraScissorSet(2, 10, 10, arg0 - 11.0f, arg1 - 11.0f); Hu3DCameraViewportSet(4, arg0 + 2.0f, 10.0f, 630.0f - arg0, arg1 - 11.0f, 0.0f, 1.0f); @@ -2334,7 +2339,8 @@ void fn_1_8A80(float arg0, float arg1) { Hu3DCameraScissorSet(16, arg0 + 2.0f, arg1 + 2.0f, 630.0f - arg0, 470.0f - arg1); } -void fn_1_8DBC(void) { +void fn_1_8DBC(void) +{ float var_f31; float var_f30; s32 i; @@ -2364,7 +2370,8 @@ void fn_1_8DBC(void) { Hu3DCameraScissorSet(16, 322, 242, 310, 230); } -void fn_1_9490(void) { +void fn_1_9490(void) +{ float var_f31; float var_f30; float var_f29; @@ -2374,7 +2381,7 @@ void fn_1_9490(void) { s32 temp_r30; s32 i; - temp_r30 = (s32) HuPrcCurrentGet()->user_data; + temp_r30 = (s32)HuPrcCurrentGet()->user_data; switch (temp_r30) { case 0: var_f31 = 645.0f; @@ -2411,14 +2418,15 @@ void fn_1_9490(void) { } } -void fn_1_9BC0(s32 arg0) { +void fn_1_9BC0(s32 arg0) +{ float var_f30; float var_f31; s32 var_r29; - UnkBss474Struct* temp_r31; - UnkBss474Struct* var_r26; - Process* var_r28; - UnkBss138InnerStruct00* var_r27; + UnkBss474Struct *temp_r31; + UnkBss474Struct *var_r26; + Process *var_r28; + UnkBss138InnerStruct00 *var_r27; s32 i; temp_r31 = &lbl_1_bss_474[arg0]; @@ -2433,10 +2441,10 @@ void fn_1_9BC0(s32 arg0) { for (i = 0; i < 4; i++) { HuSprAttrSet(lbl_1_bss_474[i].unk0C, 0, HUSPR_ATTR_DISPOFF); } - Hu3DModelAttrReset(temp_r31->unk02, 1); - Hu3DModelAttrSet(temp_r31->unk00, 1); + Hu3DModelAttrReset(temp_r31->unk02, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(temp_r31->unk00, HU3D_ATTR_DISPOFF); var_r28 = HuPrcChildCreate(fn_1_9490, 0x2000, 0x1000, 0, HuPrcCurrentGet()); - var_r28->user_data = (void*) arg0; + var_r28->user_data = (void *)arg0; while (var_r28->user_data) { HuPrcVSleep(); } @@ -2444,10 +2452,10 @@ void fn_1_9BC0(s32 arg0) { temp_r31->unk4C = -280.0f; temp_r31->unk50 = 200.0f; temp_r31->unk58 = -90.0f; - Hu3DModelAttrReset(temp_r31->unk08, 1); + Hu3DModelAttrReset(temp_r31->unk08, HU3D_ATTR_DISPOFF); Hu3DModelRotSet(temp_r31->unk08, temp_r31->unk54, temp_r31->unk58, temp_r31->unk5C); CharModelMotionSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[2]); - Hu3DModelAttrSet(temp_r31->unk08, 0x40000001); + Hu3DModelAttrSet(temp_r31->unk08, HU3D_MOTATTR_LOOP); Hu3DModelCameraSet(temp_r31->unk08, 1 << temp_r31->unk38); i = 0; while (TRUE) { @@ -2476,7 +2484,8 @@ void fn_1_9BC0(s32 arg0) { CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[3], 0.0f, 5.0f, HU3D_MOTATTR_NONE); if (lbl_1_bss_E40 == 1) { var_f31 = -20.0f; - } else { + } + else { var_f31 = -20.0f; } for (; var_f31 < 0.0f; var_f31 += 1.765f) { @@ -2487,7 +2496,8 @@ void fn_1_9BC0(s32 arg0) { Hu3DModelShadowSet(temp_r31->unk08); } -void fn_1_A004(void) { +void fn_1_A004(void) +{ s32 i; for (i = 0; i < 67; i++) { @@ -2501,8 +2511,9 @@ void fn_1_A004(void) { } } -void fn_1_A07C(void) { - UnkBss474Struct* temp_r31; +void fn_1_A07C(void) +{ + UnkBss474Struct *temp_r31; temp_r31 = &lbl_1_bss_474[lbl_1_bss_E94]; while (TRUE) { @@ -2516,10 +2527,11 @@ void fn_1_A07C(void) { } } -void fn_1_A120(s32 arg0) { +void fn_1_A120(s32 arg0) +{ float temp_f30; float var_f31; - UnkBss474Struct* temp_r31; + UnkBss474Struct *temp_r31; s32 var_r29; s32 i; @@ -2527,7 +2539,7 @@ void fn_1_A120(s32 arg0) { temp_r31->unk48 = 0.0f; temp_r31->unk4C = 930.0f; temp_r31->unk50 = 2790.0f; - Hu3DModelAttrReset(temp_r31->unk20, 1); + Hu3DModelAttrReset(temp_r31->unk20, HU3D_ATTR_DISPOFF); Hu3DModelCameraSet(temp_r31->unk08, 1); HuPrcChildCreate(fn_1_A004, 0x2000, 0x1000, 0, HuPrcCurrentGet()); temp_f30 = (-730.0f - temp_r31->unk50) / 80.0f; @@ -2567,10 +2579,11 @@ void fn_1_A120(s32 arg0) { HuPrcChildCreate(fn_1_A07C, 0x2000, 0x1000, 0, HuPrcCurrentGet()); } -void fn_1_A4B4(s32 arg0) { +void fn_1_A4B4(s32 arg0) +{ float temp_f30; float var_f31; - UnkBss474Struct* temp_r31; + UnkBss474Struct *temp_r31; s32 var_r29; s32 i; @@ -2608,12 +2621,13 @@ void fn_1_A4B4(s32 arg0) { CharModelMotionShiftSet(lbl_1_data_240[GWPlayerCfg[temp_r31->unk34].character], temp_r31->unk0E[8], 0.0f, 5.0f, HU3D_MOTATTR_NONE); } -void fn_1_A788(s32 arg0) { +void fn_1_A788(s32 arg0) +{ float temp_f30; float temp_f29; float var_f31; - UnkBss474Struct* temp_r31; - UnkBss138InnerStruct00* var_r29; + UnkBss474Struct *temp_r31; + UnkBss138InnerStruct00 *var_r29; s32 var_r28; s32 i; @@ -2680,7 +2694,8 @@ void fn_1_A788(s32 arg0) { HuAudSStreamPlay(1); } -void fn_1_ACB0(void) { +void fn_1_ACB0(void) +{ s32 i; while (TRUE) { @@ -2702,7 +2717,8 @@ void fn_1_ACB0(void) { } } -void fn_1_AD58(void) { +void fn_1_AD58(void) +{ s16 temp_r28; s16 var_r27; s16 temp_r25; @@ -2759,7 +2775,8 @@ void fn_1_AD58(void) { } } break; - } else if (var_r27 < 59) { + } + else if (var_r27 < 59) { var_r30 = -1; break; } @@ -2796,7 +2813,8 @@ void fn_1_AD58(void) { GWPlayer[var_r30].coin_win = 10; } temp_r28 = MGSeqCreate(5, 3, GWPlayerCfg[var_r30].character, -1, -1, -1); - } else { + } + else { HuAudSStreamPlay(4); temp_r28 = MGSeqCreate(3, 2); } diff --git a/src/REL/m412Dll/main.c b/src/REL/m412Dll/main.c index 63cafdee..29fbbb80 100644 --- a/src/REL/m412Dll/main.c +++ b/src/REL/m412Dll/main.c @@ -212,15 +212,15 @@ void fn_1_8BC(void) var_r29 = Hu3DModelCreate(var_r27); Hu3DModelLayerSet(var_r29, 1); 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); 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); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x02), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r29 = Hu3DModelCreate(var_r27); Hu3DModelLayerSet(var_r29, 0); - Hu3DModelAttrSet(var_r29, 0x40000001); + Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_LOOP); for (var_r28 = 0; var_r28 < 0x20; var_r28++) { 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); lbl_1_bss_798[var_r28] = var_r29 = Hu3DModelCreate(var_r27); Hu3DModelLayerSet(var_r29, 2); - Hu3DModelAttrSet(var_r29, 0x40000002); - Hu3DModelAttrSet(var_r29, 1); + Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF); } for (var_r28 = 0; var_r28 < 6; var_r28++) { @@ -274,14 +274,14 @@ void fn_1_8BC(void) Hu3DModelLayerSet(var_r29, 0); Hu3DModelShadowReset(var_r29); 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); temp_r31->unk4 = var_r29 = Hu3DModelCreate(var_r27); Hu3DModelLayerSet(var_r29, 1); if (var_r28 >= 3) { - Hu3DModelAttrSet(temp_r31->unk0, 0x40000002); - Hu3DModelAttrSet(temp_r31->unk2, 0x40000002); - Hu3DModelAttrSet(temp_r31->unk4, 0x40000002); + Hu3DModelAttrSet(temp_r31->unk0, HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(temp_r31->unk2, HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(temp_r31->unk4, HU3D_MOTATTR_PAUSE); } if (var_r28 == 0) { 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; Hu3DModelLayerSet(var_r29, 1); - Hu3DModelAttrSet(var_r29, 1); + Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF); Hu3DModelShadowSet(var_r29); Hu3DModelShadowDispOff(var_r29); temp_r31->unk8 = Hu3DModelLink(var_r19); 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->user_data = temp_r31; } @@ -351,22 +351,22 @@ void fn_1_8BC(void) Hu3DModelScaleSet(var_r29, 1.0f, -1.0f, 1.0f); Hu3DModelLayerSet(var_r29, 0); 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); temp_r31->unk6 = var_r29 = Hu3DModelCreate(var_r27); Hu3DModelLayerSet(var_r29, 1); - Hu3DModelAttrSet(var_r29, 1); + Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF); Hu3DModelShadowSet(var_r29); Hu3DModelShadowDispOff(var_r29); temp_r31->unk8 = Hu3DModelLink(temp_r31->unk6); 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); temp_r31->unkA = var_r29 = Hu3DModelCreate(var_r27); Hu3DModelShadowSet(var_r29); Hu3DModelShadowDispOff(var_r29); Hu3DModelLayerSet(var_r29, 1); - Hu3DModelAttrSet(var_r29, 1); + Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF); for (var_r28 = 0; var_r28 < 0x17; 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); temp_r30->unk2 = Hu3DModelCreate(var_r27); 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); CharModelLayerSetAll(3); 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); } 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]); - Hu3DModelAttrSet(temp_r30->unk2, 0x40000001); + Hu3DModelAttrSet(temp_r30->unk2, HU3D_MOTATTR_LOOP); CharModelMotionDataClose(lbl_1_data_0[GWPlayerCfg[var_r28].character]); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x1C), MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r30->unk6 = var_r29 = Hu3DModelCreate(var_r27); Hu3DModelLayerSet(var_r29, 1); - Hu3DModelAttrSet(var_r29, 0x40000001); - Hu3DModelAttrSet(var_r29, 1); + Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF); Hu3DModelShadowSet(var_r29); Hu3DModelShadowDispOff(var_r29); temp_r30->unk8 = var_r29 = Hu3DModelLink(var_r29); Hu3DModelLayerSet(var_r29, 0); - Hu3DModelAttrSet(var_r29, 0x40000001); + Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_LOOP); Hu3DModelAttrSet(var_r29, 0x800001); var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M412, 0x1D), MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r30->unkA = var_r29 = Hu3DModelCreate(var_r27); Hu3DModelLayerSet(var_r29, 3); - Hu3DModelAttrSet(var_r29, 0x40000002); - Hu3DModelAttrSet(var_r29, 1); + Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF); var_r23 = HuPrcChildCreate(fn_1_7C60, 0x2000, 0x4000, 0, HuPrcCurrentGet()); var_r23->user_data = temp_r30; } @@ -645,8 +645,8 @@ void fn_1_2064(void) else { HuAudFXPlay(0x58C); } - Hu3DModelAttrSet(temp_r31->unk0, 1); - Hu3DModelAttrSet(temp_r31->unk2, 1); + Hu3DModelAttrSet(temp_r31->unk0, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(temp_r31->unk2, HU3D_ATTR_DISPOFF); Hu3DModelShadowDispOff(temp_r31->unk0); temp_r31->unkA = 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); - Hu3DModelAttrReset(temp_r31->unk4, 1); + Hu3DModelAttrReset(temp_r31->unk4, HU3D_ATTR_DISPOFF); Hu3DModelShadowDispOn(temp_r31->unk4); for (var_r30 = 0; var_r30 < 0x17; var_r30++) { @@ -843,8 +843,8 @@ loop_10: HuPrcVSleep(); } HuPrcSleep(0x1E); - Hu3DModelAttrReset(temp_r31->unk6, 1); - Hu3DModelAttrReset(temp_r31->unk8, 1); + Hu3DModelAttrReset(temp_r31->unk6, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(temp_r31->unk8, HU3D_ATTR_DISPOFF); Hu3DModelShadowDispOn(temp_r31->unk6); Hu3DModelPosSet(temp_r31->unk6, 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); Hu3DModelAttrReset(temp_r31->unk2, 0x40000002); Hu3DModelClusterAttrReset(temp_r31->unk2, 0, -0x3FFFFFFE); - Hu3DModelAttrReset(temp_r31->unk6, 1); - Hu3DModelAttrReset(temp_r31->unk8, 1); + Hu3DModelAttrReset(temp_r31->unk6, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(temp_r31->unk8, HU3D_ATTR_DISPOFF); Hu3DModelShadowDispOn(temp_r31->unk6); var_f18 = 850.0f; temp_f31 = -217.722f; @@ -1649,7 +1649,8 @@ loop_6: if (temp_r31->unk60.z >= 8.0f) { if (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); } } @@ -1664,10 +1665,10 @@ loop_6: else if (temp_r31->unk30 != 0) { temp_r31->unk30 = 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]); 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)); if (temp_r31->unk60.z > 0.5f) { @@ -1735,20 +1736,20 @@ loop_6: goto loop_6; case 3: HuAudFXPlay(0x584); - Hu3DModelAttrSet(temp_r31->unk0, 0x40000002); - Hu3DModelAttrSet(temp_r31->unk2, 0x40000002); + Hu3DModelAttrSet(temp_r31->unk0, HU3D_MOTATTR_PAUSE); + 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, 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); HuPrcSleep(10); - Hu3DModelAttrSet(temp_r31->unk0, 0x40000002); - Hu3DModelAttrSet(temp_r31->unk2, 0x40000002); + Hu3DModelAttrSet(temp_r31->unk0, HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(temp_r31->unk2, HU3D_MOTATTR_PAUSE); HuPrcSleep(10); 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); - Hu3DModelAttrReset(temp_r31->unk6, 1); - Hu3DModelAttrReset(temp_r31->unk8, 1); + Hu3DModelAttrReset(temp_r31->unk6, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(temp_r31->unk8, HU3D_ATTR_DISPOFF); Hu3DModelShadowDispOn(temp_r31->unk6); 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--) { if (var_r31 == 0x33) { 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); } if (var_r31 == 0x47) { 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); } if (var_r31 == 0x82) { @@ -2110,9 +2111,9 @@ void fn_1_B1C0(void) HuAudFXPlay(0x57F); fn_1_6EC(1465.0f, 770.0f, -2400.0f, 0x589); 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); - Hu3DModelAttrSet(lbl_1_bss_2F8.unk2, 0x40000002); + Hu3DModelAttrSet(lbl_1_bss_2F8.unk2, HU3D_MOTATTR_PAUSE); Hu3DModelClusterAttrSet(lbl_1_bss_2F8.unk2, 0, -0x3FFFFFFE); HuPrcSleep(1.0f + wipeData.duration); fn_1_ADC8(); diff --git a/src/REL/m413Dll/main.c b/src/REL/m413Dll/main.c index 2041f1b1..7ae0c7e6 100644 --- a/src/REL/m413Dll/main.c +++ b/src/REL/m413Dll/main.c @@ -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][0] = 0; 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++) { @@ -1299,7 +1299,8 @@ void fn_1_52A4(s32 arg0) 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])], (((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); lbl_1_bss_D4[lbl_1_bss_D0][0]++; 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][1] = 0; 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)); Hu3DMotionSpeedSet(object->model[1], 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); Hu3DModelLayerSet(object->model[2], 1); for (temp_r30 = 0; temp_r30 < 4; 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); - 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++) { s32 temp_r28; @@ -2031,7 +2032,7 @@ void fn_1_C6E0(omObjData *object) temp_r28 = DATA_MAKE_NUM(DATADIR_M413, 0x0C); } 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++) { s32 temp_r29; @@ -2040,7 +2041,7 @@ void fn_1_C6E0(omObjData *object) if (temp_r29 != 0) { 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); } } @@ -2127,7 +2128,7 @@ void fn_1_CBB4(omObjData *object) Hu3DMotionSpeedSet(object->model[1], 0.0f); Hu3DMotionSpeedSet(object->model[2], 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); Hu3DMotionSpeedSet(object->model[0], 0.0f); 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); object->model[5] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M413, 0x15) + temp_r31->unk18); 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); { AnimData *temp_r23 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_MGCONST, 0x38) + GWPlayerCfg[temp_r31->unk14].character); diff --git a/src/REL/m414Dll/main.c b/src/REL/m414Dll/main.c index 708e82d9..4a94fa5e 100644 --- a/src/REL/m414Dll/main.c +++ b/src/REL/m414Dll/main.c @@ -240,7 +240,8 @@ void ObjectSetup(void) if (var_r30 >= 6) { if (lbl_1_bss_978 == 0) { var_r30 = 1; - } else { + } + else { var_r30 = 0; } } @@ -312,7 +313,7 @@ void fn_1_CD8(s32 arg0, s32 arg1, float arg8) var_r30->user_data = var_r31; var_r31->unk_00 = arg0; 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) @@ -572,7 +573,8 @@ void fn_1_1C48(void) var_r31 = HuPrcCurrentGet()->user_data; if (var_r31->unk_44 & 1) { HuAudFXPlay(1446); - } else { + } + else { HuAudFXPlay(1445); } 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_r30 = Hu3DModelCreate(var_r27); var_r22 = var_r30; - } else { + } + else { var_r30 = Hu3DModelLink(var_r22); } 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_r30 = Hu3DModelCreate(var_r27); var_r24 = var_r30; - } else { + } + else { var_r30 = Hu3DModelLink(var_r24); } var_r31->unk_30[var_r29] = var_r30; Hu3DModelCameraSet(var_r30, 1 << var_r31->unk_48); Hu3DModelShadowMapSet(var_r30); - Hu3DModelAttrSet(var_r30, 0x4000); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_NOCULL); 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)); } if (!var_r28) { var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 5), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30 = Hu3DModelCreate(var_r27); - } else { + } + else { var_r30 = Hu3DModelLink(lbl_1_bss_F0[0].unk_42); } var_r31->unk_42 = var_r30; Hu3DModelCameraSet(var_r30, 1 << var_r31->unk_48); 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)); for (var_r29 = 0; var_r29 < 9; var_r29++) { if (!var_r28) { 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); - } else { + } + else { var_r30 = Hu3DModelLink(lbl_1_bss_F0->unk_00[var_r29]); } var_r31->unk_00[var_r29] = var_r30; Hu3DModelRotSet(var_r30, 0.0f, 40.0f * var_r29, 0.0f); 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)); - Hu3DModelAttrSet(var_r30, 0x40000002); + Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_PAUSE); } for (var_r29 = 0; var_r29 < 16; var_r29++) { if (!var_r28 && !var_r29) { var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 6), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30 = Hu3DModelCreate(var_r27); var_r23 = var_r30; - } else { + } + else { var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 6), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30 = Hu3DModelCreate(var_r27); var_r23 = var_r30; @@ -679,7 +686,7 @@ void fn_1_1E04(void) 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)); 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); Hu3DMotionSpeedSet(var_r30, 3.0f); Hu3DMotionShapeSpeedSet(var_r30, 3.0f); @@ -687,7 +694,8 @@ void fn_1_1E04(void) if (!var_r28) { var_r27 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M414, 9), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30 = Hu3DModelCreate(var_r27); - } else { + } + else { var_r30 = Hu3DModelLink(lbl_1_bss_F0[0].unk_20); } var_r31->unk_20 = var_r30; @@ -700,7 +708,7 @@ void fn_1_1E04(void) } Hu3DMotionSet(var_r30, var_r31->unk_22[0]); Hu3DMotionTimeSet(var_r30, 0.0f); - Hu3DModelAttrSet(var_r30, 0x40000002); + Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_PAUSE); Hu3DMotionSpeedSet(var_r30, 2.0f); 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_r30 = Hu3DModelCreate(var_r27); sp18[lbl_1_bss_938[var_r29]] = var_r30; - } else { + } + else { var_r30 = Hu3DModelLink(sp18[lbl_1_bss_938[var_r29]]); } - } else { + } + else { var_r30 = Hu3DModelLink(sp18[lbl_1_bss_938[var_r29]]); } var_r31->unk_94[var_r29] = var_r30; var_r31->unk_F4[var_r29] = 0; 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_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); Hu3DMotionSet(var_r30, Hu3DJointMotion(var_r30, var_r27)); - Hu3DModelAttrSet(var_r30, 0x40000001); - Hu3DModelAttrSet(var_r30, 0x4000); + Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_NOCULL); var_f29 = -950.0 * sind(var_f31); var_f29 = var_f29; var_f28 = -950.0 * cosd(var_f31); @@ -774,7 +784,8 @@ void fn_1_1E04(void) if (var_r29 & 1) { var_f30 = 220.0f; var_f31 += 40.0f; - } else { + } + else { var_f30 = 570.0f; } 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); if (lbl_1_bss_938[var_r29]) { (void)var_r29; - } else { + } + else { (void)var_r29; } 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]); } 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]); 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; Hu3DModelScaleSet(var_r30, 0.5f, 0.5f, 0.5f); 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_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)))); if (var_f31 < 0.75) { var_f29 = var_f31 / 0.75; - } else { + } + else { var_f29 = 1.0; } 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]; if (arg1 == 0) { lbl_1_bss_97C[var_r31->unk_44]++; - } else { + } + else { lbl_1_bss_97C[var_r31->unk_44]--; } 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); HuSprAttrReset(var_r31->unk_2E, (var_r30 * 2) + 3, 4); - } else { + } + else { HuSprAttrReset(var_r31->unk_2E, (var_r30 * 2) + 2, 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); if (var_r31->unk_70 - var_f31 >= 0.0f) { var_f29 = var_r31->unk_70 - var_f31; - } else { + } + else { var_f29 = -(var_r31->unk_70 - var_f31); } 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_r31->unk_44 & 1) { HuAudFXPlay(1434); - } else { + } + else { HuAudFXPlay(1433); } - } else { + } + else { HuAudFXPlay(1450); } } @@ -1073,17 +1091,20 @@ void fn_1_3ECC(void) var_f30 = 40.0f * ((var_r30 + 2) / 2); if (var_r31->unk_70 - var_f30 >= 0.0f) { var_f28 = var_r31->unk_70 - var_f30; - } else { + } + else { var_f28 = -(var_r31->unk_70 - var_f30); } 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_r31->unk_44 & 1) { HuAudFXPlay(1436); - } else { + } + else { HuAudFXPlay(1435); } - } else { + } + else { HuAudFXPlay(1452); } } @@ -1120,19 +1141,22 @@ void fn_1_42AC(void) HuPrcSleep(30); if (var_r31->unk_44 & 1) { HuAudFXPlay(1444); - } else { + } + else { HuAudFXPlay(1443); } if (var_r31->unk_44 & 1) { HuAudFXPlay(1448); - } else { + } + else { HuAudFXPlay(1447); } if (var_r30->unk_08) { var_f24 = -200.0 * (sind(lbl_1_bss_920[var_r27]) * cos(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])); - } else { + } + else { var_f24 = -200.0 * (sind(lbl_1_bss_920[var_r27]) * cos(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])); @@ -1173,7 +1197,7 @@ void fn_1_42AC(void) HuPrcVSleep(); } 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++) { if (lbl_1_bss_97C[var_r28] >= 3) { break; @@ -1185,11 +1209,12 @@ void fn_1_42AC(void) CharModelMotionSpeedSet(lbl_1_data_30[GWPlayerCfg[var_r31->unk_44].character], 1.0f); 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); - } 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); } 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); var_r30->unk_0C = 0; HuPrcSleep(5); @@ -1251,7 +1276,8 @@ s32 fn_1_4C74(UnkM414BssF0Struct *arg0) } if (var_r29 - sp8[var_r31] >= 0) { var_r25 = var_r29 - sp8[var_r31]; - } else { + } + else { var_r25 = -(var_r29 - sp8[var_r31]); } var_r27 = var_r25; @@ -1303,7 +1329,7 @@ inline s32 fn_1_4C74_inline(UnkM414BssF0Struct *arg0) if (!var_r31) { return 0; } - + 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)) { arg0->unk_200 = 256; } - } else { + } + else { 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)) { arg0->unk_200 = 256; } - } else { + } + else { 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 (!GWPlayerCfg[arg0].iscom) { (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); } } @@ -1410,7 +1440,8 @@ u8 fn_1_5624(s32 arg0, s32 arg1) if (lbl_1_bss_98C < 4) { if (!GWPlayerCfg[arg0].iscom) { (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); } } @@ -1427,7 +1458,8 @@ u16 fn_1_56FC(s32 arg0) if (lbl_1_bss_98C < 4) { if (!GWPlayerCfg[arg0].iscom) { var_r30 = HuPadBtnDown[var_r31->unk_4C]; - } else { + } + else { 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) { var_f27 = var_f30 - var_f31; - } else { + } + else { var_f27 = -(var_f30 - var_f31); } var_f28 = var_f27; if (var_f28 < var_f29 || arg0->unk_F4[var_r31] == 1) { - Hu3DModelAttrSet(arg0->unk_94[var_r31], 1); - } else { - Hu3DModelAttrReset(arg0->unk_94[var_r31], 1); + Hu3DModelAttrSet(arg0->unk_94[var_r31], HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrReset(arg0->unk_94[var_r31], HU3D_ATTR_DISPOFF); } if (var_f28 < var_f29) { - Hu3DModelAttrSet(arg0->unk_D4[var_r31], 1); - } else { - Hu3DModelAttrReset(arg0->unk_D4[var_r31], 1); + Hu3DModelAttrSet(arg0->unk_D4[var_r31], HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrReset(arg0->unk_D4[var_r31], HU3D_ATTR_DISPOFF); } if (var_r31 & 1) { var_f30 += 40.0f; @@ -1486,14 +1521,16 @@ void fn_1_5780(UnkM414BssF0Struct *arg0, float arg8) } if (var_f30 - var_f31 >= 0.0f) { var_f26 = var_f30 - var_f31; - } else { + } + else { var_f26 = -(var_f30 - var_f31); } var_f28 = var_f26; if (var_f28 < var_f29) { - Hu3DModelAttrSet(arg0->unk_00[var_r31], 1); - } else { - Hu3DModelAttrReset(arg0->unk_00[var_r31], 1); + Hu3DModelAttrSet(arg0->unk_00[var_r31], HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrReset(arg0->unk_00[var_r31], HU3D_ATTR_DISPOFF); } } } @@ -1521,7 +1558,8 @@ void fn_1_5A3C(void) if (var_r31->unk_04) { var_f30 = 40.0f + lbl_1_bss_920[var_r28]; var_f29 = 40.0f; - } else { + } + else { var_f30 = lbl_1_bss_920[var_r28] - 40.0f; var_f29 = -40.0f; } @@ -1532,15 +1570,16 @@ void fn_1_5A3C(void) var_f30 += 360.0f; } 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) { - 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; for (var_r29 = 0; var_r29 < 9; var_r29++) { if (!var_r31->unk_04) { 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_f27 / var_f29) * Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]); } @@ -1549,12 +1588,13 @@ void fn_1_5A3C(void) HuPrcVSleep(); } 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; for (var_r29 = 0; var_r29 < 9; var_r29++) { if (!var_r31->unk_04) { 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_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++) { 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++) { 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) { var_f31 = 40.0f + lbl_1_bss_920[var_r29]; var_f29 = 40.0f; - } else { + } + else { var_f31 = lbl_1_bss_920[var_r29] - 40.0f; var_f29 = -40.0f; } @@ -1607,11 +1649,11 @@ void fn_1_5EE8(void) var_f31 += 360.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(); } 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(); } 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)) { Hu3DMotionSet(var_r31->unk_20, var_r31->unk_22[0]); var_r31->unk_1F4 = 1; - } else { + } + else { var_r31->unk_1F4 = 2; Hu3DMotionSet(var_r31->unk_20, var_r31->unk_22[0]); 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_1F8 = -1; 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); 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_44 & 1) { HuAudFXPlay(1442); - } else { + } + else { HuAudFXPlay(1441); } omVibrate(var_r31->unk_44, 12, 6, 6); @@ -1756,16 +1800,17 @@ void fn_1_6644(void) var_r30->user_data = var_r31; 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); - var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet()); - var_r30->user_data = &sp8C; - sp8C.unk_00 = var_r31; - sp8C.unk_08 = 0; - sp8C.unk_0C = 1; - sp8C.unk_04 = fn_1_654C(var_r31->unk_44, sp8C.unk_08); - while (sp8C.unk_0C) { - HuPrcVSleep(); - } - } else { + var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet()); + var_r30->user_data = &sp8C; + sp8C.unk_00 = var_r31; + sp8C.unk_08 = 0; + sp8C.unk_0C = 1; + sp8C.unk_04 = fn_1_654C(var_r31->unk_44, sp8C.unk_08); + while (sp8C.unk_0C) { + HuPrcVSleep(); + } + } + else { HuPrcSleep(10); Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000082); Hu3DModelAttrSet(var_r31->unk_D4[var_r29], 0x40000104); @@ -1779,19 +1824,22 @@ void fn_1_6644(void) HuPrcSleep(10); if (var_r31->unk_44 & 1) { HuAudFXPlay(1444); - } else { + } + else { HuAudFXPlay(1443); } Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000004); 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); if (!var_r31->unk_F4[var_r29]) { if (var_r31->unk_44 & 1) { HuAudFXPlay(1442); - } else { + } + else { HuAudFXPlay(1441); } omVibrate(var_r31->unk_44, 12, 6, 6); @@ -1803,16 +1851,17 @@ void fn_1_6644(void) var_r30->user_data = var_r31; 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); - var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet()); - var_r30->user_data = &sp8C; - sp8C.unk_00 = var_r31; - sp8C.unk_08 = 1; - sp8C.unk_0C = 1; - sp8C.unk_04 = fn_1_654C(var_r31->unk_44, sp8C.unk_08); - while (sp8C.unk_0C) { - HuPrcVSleep(); - } - } else { + var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet()); + var_r30->user_data = &sp8C; + sp8C.unk_00 = var_r31; + sp8C.unk_08 = 1; + sp8C.unk_0C = 1; + sp8C.unk_04 = fn_1_654C(var_r31->unk_44, sp8C.unk_08); + while (sp8C.unk_0C) { + HuPrcVSleep(); + } + } + else { HuPrcSleep(10); Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000082); Hu3DModelAttrSet(var_r31->unk_D4[var_r29], 0x40000104); @@ -1825,7 +1874,8 @@ void fn_1_6644(void) HuPrcSleep(15); if (var_r31->unk_44 & 1) { HuAudFXPlay(1444); - } else { + } + else { HuAudFXPlay(1443); } Hu3DModelAttrReset(var_r31->unk_D4[var_r29], 0x40000004); @@ -1861,12 +1911,15 @@ void fn_1_6644(void) if (var_r28) { if (var_r31->unk_44 & 1) { HuAudFXPlay(1440); - } else { + } + else { HuAudFXPlay(1439); } - } else if (var_r31->unk_44 & 1) { + } + else if (var_r31->unk_44 & 1) { HuAudFXPlay(1438); - } else { + } + else { HuAudFXPlay(1437); } var_r31->unk_58 = 1; @@ -1912,8 +1965,8 @@ void fn_1_76F4(void) var_f29 = Hu3DMotionMaxTimeGet(var_r31->unk_20); sp14.y = 220.0f + (350.0f * (1.0f - (Hu3DMotionTimeGet(var_r31->unk_20) / var_f29))); Hu3D3Dto2D(&sp14, 1 << var_r31->unk_48, &sp8); - 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_f31 = (282.0f * (var_r31->unk_44 % 2)) + (sp8.x / 2); + var_f30 = (225.0f * (var_r31->unk_44 / 2)) + (sp8.y / 2); var_f31 += 3.0f; var_f30 -= 15.0f; 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); Hu3DCameraScissorSet(16, 0, 0, 0, 0); - Hu3DModelAttrSet(lbl_1_bss_A10, 1); + Hu3DModelAttrSet(lbl_1_bss_A10, HU3D_ATTR_DISPOFF); HuPrcSleep(30); for (var_r29 = 0; var_r29 < 45; var_r29++) { for (var_r30 = 0; var_r30 < 4; var_r30++) { @@ -1986,7 +2039,7 @@ void fn_1_79A8(void) HuPrcSleep(5); for (var_r30 = 0; var_r30 < 4; 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()); 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) { 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]); if (var_r29++ >= 2) { break; @@ -2066,13 +2119,13 @@ void fn_1_7FC8(s32 arg0) var_r29 -= 9; } 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++; if (var_r29 >= 9) { 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); } for (var_r28 = 0; var_r28 < 30; var_r28++) { @@ -2124,7 +2177,8 @@ void fn_1_88D4(void) while (TRUE) { if (var_r31->unk_1F4 == 4 || var_r31->unk_1F4 == 5 || var_r31->unk_58) { HuPrcVSleep(); - } else { + } + else { break; } } @@ -2154,7 +2208,8 @@ void fn_1_894C(void) } if (var_r31 < 4) { HuPrcVSleep(); - } else { + } + else { break; } } @@ -2272,7 +2327,8 @@ void fn_1_8A70(void) HuAudSStreamPlay(1); GWPlayerCoinWinSet(var_r29, 10); var_r28 = MGSeqCreate(5, 3, GWPlayerCfg[var_r29].character, -1, -1, -1); - } else { + } + else { HuAudSStreamPlay(4); var_r28 = MGSeqCreate(3, 2); } diff --git a/src/REL/m415Dll/main.c b/src/REL/m415Dll/main.c index cdf5850f..a15069cf 100644 --- a/src/REL/m415Dll/main.c +++ b/src/REL/m415Dll/main.c @@ -1,11 +1,9 @@ #include "REL/m415Dll.h" -#include "rel_sqrt_consts.h" -#include "math.h" #include "ext_math.h" +#include "game/EnvelopeExec.h" #include "game/audio.h" #include "game/chrman.h" -#include "game/EnvelopeExec.h" #include "game/esprite.h" #include "game/frand.h" #include "game/hsfdraw.h" @@ -16,14 +14,16 @@ #include "game/pad.h" #include "game/sprite.h" #include "game/wipe.h" +#include "math.h" +#include "rel_sqrt_consts.h" // bss unkStruct5 lbl_1_bss_36C; -omObjData* lbl_1_bss_368; -omObjData* lbl_1_bss_364; -omObjData* lbl_1_bss_360; -omObjData* lbl_1_bss_35C; -omObjData* lbl_1_bss_34C[4]; +omObjData *lbl_1_bss_368; +omObjData *lbl_1_bss_364; +omObjData *lbl_1_bss_360; +omObjData *lbl_1_bss_35C; +omObjData *lbl_1_bss_34C[4]; u16 lbl_1_bss_34A; s16 lbl_1_bss_348; s16 lbl_1_bss_346; @@ -31,9 +31,9 @@ s16 lbl_1_bss_344; s16 lbl_1_bss_342; s16 lbl_1_bss_33A[4]; s16 lbl_1_bss_338; -u8* lbl_1_bss_334; +u8 *lbl_1_bss_334; s32 lbl_1_bss_234[4][4][4]; -void* lbl_1_bss_34[0x80]; +void *lbl_1_bss_34[0x80]; s32 lbl_1_bss_2C[2]; unkStruct lbl_1_bss_4[4]; static s32 pad_05_00000000_bss; @@ -46,11 +46,12 @@ Vec lbl_1_data_1C = { 0.0f, 3000.0f, -2000.0f }; Vec lbl_1_data_28 = { 0.0f, 1.0f, 0.0f }; Vec lbl_1_data_34 = { 0.0f, 0.0f, 0.0f }; -void ObjectSetup(void) { +void ObjectSetup(void) +{ s32 var_r31; - Process* temp_r30; - omObjData* var_r29; - LightData* var_r28; + Process *temp_r30; + omObjData *var_r29; + LightData *var_r28; s32 temp_r27; s32 var_r26; @@ -62,11 +63,11 @@ void ObjectSetup(void) { var_r28->unk_00 |= 0x8000; temp_r30 = omInitObjMan(0x32, 0x2000); temp_r27 = frand() & 0x1F; - + for (var_r31 = 0; var_r31 < temp_r27; var_r31++) { fn_1_679C(); } - + CRot.x = -55.0f; CRot.y = 0.0f; CRot.z = 0.0f; @@ -84,7 +85,7 @@ void ObjectSetup(void) { omAddObjEx(temp_r30, 0x60, 0, 0, -1, fn_1_6304); omMakeGroupEx(temp_r30, 0, 4); omGetGroupMemberListEx(temp_r30, 0); - + for (var_r31 = 0; var_r31 < 4; var_r31++) { lbl_1_bss_34C[var_r31] = var_r29 = omAddObjEx(temp_r30, 0x30, 6, 0xA, 0, fn_1_3208); var_r29->work[0] = var_r31; @@ -99,8 +100,9 @@ void ObjectSetup(void) { fn_1_8780(0x40, 0x40); } -void fn_1_43C(omObjData* object) { - CameraData* var_r31; +void fn_1_43C(omObjData *object) +{ + CameraData *var_r31; var_r31 = &Hu3DCamera[0]; lbl_1_bss_34A = 0; @@ -109,7 +111,8 @@ void fn_1_43C(omObjData* object) { object->func = fn_1_4B0; } -void fn_1_4B0(omObjData* object) { +void fn_1_4B0(omObjData *object) +{ Vec sp14; Vec sp8; s32 var_r31; @@ -167,20 +170,16 @@ void fn_1_4B0(omObjData* object) { extern s32 lbl_1_data_64 = -1; -void fn_1_7D8(omObjData* object) { - GXColor sp18[4] = { - { 0xF0, 0x00, 0x00, 0xFF }, - { 0x30, 0x60, 0xF0, 0xFF }, - { 0xE0, 0xE0, 0x00, 0xFF }, - { 0xFF, 0x80, 0x80, 0xFF } - }; +void fn_1_7D8(omObjData *object) +{ + GXColor sp18[4] = { { 0xF0, 0x00, 0x00, 0xFF }, { 0x30, 0x60, 0xF0, 0xFF }, { 0xE0, 0xE0, 0x00, 0xFF }, { 0xFF, 0x80, 0x80, 0xFF } }; s32 sp8[4]; s32 var_r31; s32 var_r30; s32 var_r29; s32 var_r28; s32 var_r27; - unkStruct2* var_r25; + unkStruct2 *var_r25; s16 temp_r24; s16 temp_r23; s16 var_r22; @@ -191,7 +190,8 @@ void fn_1_7D8(omObjData* object) { lbl_1_bss_344 = 0x708; lbl_1_bss_346 = MGSeqCreate(3, 0); MGSeqPosSet(lbl_1_bss_346, 320.0f, 240.0f); - } else { + } + else { if (MGSeqStatGet(lbl_1_bss_346) == 0) { lbl_1_bss_346 = -1; lbl_1_bss_34A++; @@ -220,7 +220,8 @@ void fn_1_7D8(omObjData* object) { MGSeqPosSet(lbl_1_bss_346, 320.0f, 240.0f); MGSeqParamSet(lbl_1_bss_348, 2, -1); HuAudSeqFadeOut(lbl_1_data_64, 0x64); - } else if (MGSeqStatGet(lbl_1_bss_346) == 0) { + } + else if (MGSeqStatGet(lbl_1_bss_346) == 0) { lbl_1_bss_346 = -1; lbl_1_bss_34A++; lbl_1_bss_342 = 0; @@ -232,28 +233,23 @@ void fn_1_7D8(omObjData* object) { lbl_1_bss_4[var_r31].unk8 = espEntry(0x2E0010, 10, 0); espColorSet(lbl_1_bss_4[var_r31].unk8, 0, 0, 0); espTPLvlSet(lbl_1_bss_4[var_r31].unk8, 0.5f); - espPosSet(lbl_1_bss_4[var_r31].unk8, - 144.0f * (((var_r31 & 1) * 2) + 1), - 120.0f * (((s16)(((var_r31 < 0) + var_r31) >> 1) << 1) + 1) - ); + espPosSet( + lbl_1_bss_4[var_r31].unk8, 144.0f * (((var_r31 & 1) * 2) + 1), 120.0f * (((s16)(((var_r31 < 0) + var_r31) >> 1) << 1) + 1)); lbl_1_bss_4[var_r31].unk6 = espEntry(0x2E000F, 10, 0); - espPosSet(lbl_1_bss_4[var_r31].unk6, - 144.0f * (((var_r31 & 1) * 2) + 1), - 120.0f * (((s16)(((var_r31 < 0) + var_r31) >> 1) << 1) + 1) - ); + espPosSet( + lbl_1_bss_4[var_r31].unk6, 144.0f * (((var_r31 & 1) * 2) + 1), 120.0f * (((s16)(((var_r31 < 0) + var_r31) >> 1) << 1) + 1)); for (var_r30 = 0; var_r30 < 3; var_r30++) { lbl_1_bss_4[var_r31].unk0[var_r30] = espEntry(0x2E0011, 10, 0); - espPosSet(lbl_1_bss_4[var_r31].unk0[var_r30], - (32.0f * var_r30) + ((144.0f * (((var_r31 & 1) * 2) + 1)) - 32.0f), - (120.0f * (((s16)(((var_r31 < 0) + var_r31) >> 1) << 1) + 1)) - ); + espPosSet(lbl_1_bss_4[var_r31].unk0[var_r30], (32.0f * var_r30) + ((144.0f * (((var_r31 & 1) * 2) + 1)) - 32.0f), + (120.0f * (((s16)(((var_r31 < 0) + var_r31) >> 1) << 1) + 1))); espColorSet(lbl_1_bss_4[var_r31].unk0[var_r30], sp18[var_r31].r, sp18[var_r31].g, sp18[var_r31].b); } espBankSet(lbl_1_bss_4[var_r31].unk0[2], 10); } lbl_1_bss_342 = 0x3C; HuAudFXPlay(0x5B4); - } else { + } + else { for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r30 = 0; var_r30 < 2; var_r30++) { espBankSet(lbl_1_bss_4[var_r31].unk0[var_r30], (s32)((fn_1_679C() / 65536.0f) * 10.0f)); @@ -282,10 +278,10 @@ void fn_1_7D8(omObjData* object) { for (var_r31 = 0; var_r31 < 4; var_r31++) { lbl_1_bss_33A[var_r31] = -1; } - + var_r31 = 0; var_r30 = 0; - for (;var_r31 < 4; var_r31++) { + for (; var_r31 < 4; var_r31++) { if (sp8[var_r31] >= var_r28) { var_r22 = GWPlayer[var_r31].coin_win; temp_r23 = var_r22 + 10; @@ -308,7 +304,8 @@ void fn_1_7D8(omObjData* object) { if (lbl_1_bss_33A[0] == -1) { lbl_1_bss_346 = MGSeqCreate(3, 2); HuAudSStreamPlay(4); - } else { + } + else { lbl_1_bss_346 = MGSeqCreate(5, 3, lbl_1_bss_33A[0], lbl_1_bss_33A[1], lbl_1_bss_33A[2], lbl_1_bss_33A[3]); HuAudSStreamPlay(1); } @@ -331,7 +328,8 @@ void fn_1_7D8(omObjData* object) { } } -void fn_1_14C0(omObjData* object) { +void fn_1_14C0(omObjData *object) +{ if (WipeStatGet() == 0) { CharModelKill(-1); fn_1_B634(); @@ -343,8 +341,9 @@ void fn_1_14C0(omObjData* object) { } } -void fn_1_1524(s16 arg0, char* arg1, f32 arg8, Mtx arg2) { - ModelData* temp_r31; +void fn_1_1524(s16 arg0, char *arg1, f32 arg8, Mtx arg2) +{ + ModelData *temp_r31; temp_r31 = &Hu3DData[arg0]; if (temp_r31->unk_08 != -1) { @@ -359,13 +358,14 @@ void fn_1_1524(s16 arg0, char* arg1, f32 arg8, Mtx arg2) { Hu3DModelObjMtxGet(arg0, arg1, arg2); } -void fn_1_15D0(omObjData* object) { +void fn_1_15D0(omObjData *object) +{ Mtx sp20; Vec sp14; Vec sp8; s32 var_r28; s32 var_r27; - ModelData* var_r29; + ModelData *var_r29; f32 temp_f31; s32 var_r31; @@ -410,9 +410,10 @@ void fn_1_15D0(omObjData* object) { object->func = fn_1_1960; } -void fn_1_1960(omObjData* object) { +void fn_1_1960(omObjData *object) +{ u32 temp_r29; - AnimData** temp_r3; + AnimData **temp_r3; switch (lbl_1_bss_34A) { case 0: @@ -437,43 +438,18 @@ void fn_1_1960(omObjData* object) { return; } -void fn_1_1A60(unkStruct3* arg0) { +void fn_1_1A60(unkStruct3 *arg0) +{ Mtx sp118; Mtx spE8; Vec spB8[4]; Vec sp88[4]; - GXColor sp68[8] = { - { 0xF0, 0x00, 0x00, 0xFF }, - { 0x00, 0x00, 0xF0, 0xFF }, - { 0xFF, 0x80, 0x80, 0xFF }, - { 0x00, 0xFF, 0x00, 0xFF }, - { 0x80, 0x00, 0xC0, 0xFF }, - { 0x80, 0x40, 0x00, 0xFF }, - { 0xE0, 0xE0, 0x00, 0xFF }, - { 0x00, 0x00, 0x00, 0xFF } - }; - GXColor sp48[8] = { - { 0xFF, 0x60, 0x60, 0xFF }, - { 0x60, 0x60, 0xFF, 0xFF }, - { 0xFF, 0xC0, 0xC0, 0xFF }, - { 0x40, 0xFF, 0x40, 0xFF }, - { 0xC0, 0x40, 0xFF, 0xFF }, - { 0xD0, 0x80, 0x40, 0xFF }, - { 0xFF, 0xFF, 0x20, 0xFF }, - { 0x80, 0x80, 0x80, 0xFF } - }; - GXColor sp38[4] = { - { 0xF0, 0x00, 0x00, 0xFF }, - { 0x00, 0x00, 0xF0, 0xFF }, - { 0xE0, 0xE0, 0x00, 0xFF }, - { 0xFF, 0x80, 0x80, 0xFF } - }; - GXColor sp28[4] = { - { 0xFF, 0x60, 0x60, 0xFF }, - { 0x60, 0x60, 0xFF, 0xFF }, - { 0xFF, 0xFF, 0x20, 0xFF }, - { 0xFF, 0xC0, 0xC0, 0xFF } - }; + GXColor sp68[8] = { { 0xF0, 0x00, 0x00, 0xFF }, { 0x00, 0x00, 0xF0, 0xFF }, { 0xFF, 0x80, 0x80, 0xFF }, { 0x00, 0xFF, 0x00, 0xFF }, + { 0x80, 0x00, 0xC0, 0xFF }, { 0x80, 0x40, 0x00, 0xFF }, { 0xE0, 0xE0, 0x00, 0xFF }, { 0x00, 0x00, 0x00, 0xFF } }; + GXColor sp48[8] = { { 0xFF, 0x60, 0x60, 0xFF }, { 0x60, 0x60, 0xFF, 0xFF }, { 0xFF, 0xC0, 0xC0, 0xFF }, { 0x40, 0xFF, 0x40, 0xFF }, + { 0xC0, 0x40, 0xFF, 0xFF }, { 0xD0, 0x80, 0x40, 0xFF }, { 0xFF, 0xFF, 0x20, 0xFF }, { 0x80, 0x80, 0x80, 0xFF } }; + GXColor sp38[4] = { { 0xF0, 0x00, 0x00, 0xFF }, { 0x00, 0x00, 0xF0, 0xFF }, { 0xE0, 0xE0, 0x00, 0xFF }, { 0xFF, 0x80, 0x80, 0xFF } }; + GXColor sp28[4] = { { 0xFF, 0x60, 0x60, 0xFF }, { 0x60, 0x60, 0xFF, 0xFF }, { 0xFF, 0xFF, 0x20, 0xFF }, { 0xFF, 0xC0, 0xC0, 0xFF } }; Vec sp1C; s32 sp18; s16 sp14; @@ -495,9 +471,9 @@ void fn_1_1A60(unkStruct3* arg0) { s32 temp_r26; s16 var_r24; s16 var_r23; - u16* temp_r22; + u16 *temp_r22; u8 temp_r21; - AnimBmpData* var_r20; + AnimBmpData *var_r20; s16 temp_r19; s16 temp_r18; s32 temp_r17; @@ -509,7 +485,7 @@ void fn_1_1A60(unkStruct3* arg0) { sp14 = 0.5f * (600.0f + sp1C.x); sp12 = 0.5f * (600.0f + sp1C.z); var_r20 = fn_1_668C(lbl_1_bss_338); - temp_r22 = (u16*)var_r20->data; + temp_r22 = (u16 *)var_r20->data; var_r27 = 0x32; var_r30 = var_r27 >> 1; spC = 0x96; @@ -524,7 +500,8 @@ void fn_1_1A60(unkStruct3* arg0) { spB8[3].x = var_r30; spB8[3].y = var_r30; spB8[0].z = spB8[1].z = spB8[2].z = spB8[3].z = 0.0f; - } else { + } + else { spB8[0].x = var_r27; spB8[0].y = var_r27; spB8[1].x = var_r27; @@ -534,8 +511,8 @@ void fn_1_1A60(unkStruct3* arg0) { spB8[3].x = -var_r27; spB8[3].y = -var_r27; spB8[0].z = spB8[1].z = spB8[2].z = spB8[3].z = 0.0f; - for (var_r31 = -1; var_r31 < 2; var_r31+=2) { - for (var_r29 = -1; var_r29 < 2; var_r29+=2) { + for (var_r31 = -1; var_r31 < 2; var_r31 += 2) { + for (var_r29 = -1; var_r29 < 2; var_r29 += 2) { MTXRotDeg(sp118, 0x59, temp_f30); PSMTXTrans(spE8, (var_r30 * var_r31), 0.0f, (var_r30 * var_r29)); PSMTXConcat(sp118, spE8, spE8); @@ -570,18 +547,20 @@ void fn_1_1A60(unkStruct3* arg0) { if (var_r31 <= spB8[1].y) { var_f31 = ((var_r31 - spB8[0].y) / sp88[0].y); var_f29 = var_f31 * sp88[0].x + spB8[0].x; - } else { + } + else { var_f31 = ((var_r31 - spB8[1].y) / sp88[2].y); var_f29 = var_f31 * sp88[2].x + spB8[1].x; } if (var_r31 <= spB8[2].y) { var_f31 = ((var_r31 - spB8[0].y) / sp88[1].y); var_f28 = var_f31 * sp88[1].x + spB8[0].x; - } else { + } + else { var_f31 = ((var_r31 - spB8[2].y) / sp88[3].y); var_f28 = var_f31 * sp88[3].x + spB8[2].x; } - + for (var_r29 = var_f29; var_r29 < var_f28; var_r29++) { var_r24 = sp14 + var_r29; if (var_r24 >= 0 && (!(var_r24 >= 600.0f))) { @@ -597,7 +576,8 @@ void fn_1_1A60(unkStruct3* arg0) { if (temp_r21 != (temp_r28 + 1)) { temp_r22[temp_r26] = ((sp28[temp_r28].r >> 3) << 10) | ((sp28[temp_r28].g >> 3) << 5) | (sp28[temp_r28].b >> 3) | 0x8000; } - } else { + } + else { temp_r22[temp_r26] = ((sp38[temp_r28].r >> 3) << 10) | ((sp38[temp_r28].g >> 3) << 5) | (sp38[temp_r28].b >> 3) | 0x8000; } if (temp_r21 != (temp_r28 + 1)) { @@ -613,8 +593,9 @@ void fn_1_1A60(unkStruct3* arg0) { DCStoreRange(temp_r22, 0xAFC80); } -void fn_1_2B18(omObjData* object) { - unkStruct4* var_r31; +void fn_1_2B18(omObjData *object) +{ + unkStruct4 *var_r31; var_r31 = fn_1_63A8(0x14C); object->data = var_r31; @@ -630,11 +611,12 @@ void fn_1_2B18(omObjData* object) { object->func = fn_1_2C14; } -void fn_1_2C14(omObjData* object) { +void fn_1_2C14(omObjData *object) +{ f32 temp_f31; - unkStruct4* temp_r31; + unkStruct4 *temp_r31; - temp_r31 = (unkStruct4*)object->data; + temp_r31 = (unkStruct4 *)object->data; if (temp_r31->unk148 > 0.0f) { temp_r31->unk148 -= temp_r31->unk140; temp_f31 = ((temp_r31->unk144 - temp_r31->unk148) / temp_r31->unk144); @@ -647,7 +629,8 @@ void fn_1_2C14(omObjData* object) { 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->unk130 = (temp_r31->unk134 + (temp_f31 * (temp_r31->unk138 - temp_r31->unk134))); - } else { + } + else { fn_1_7A54(2.0f * temp_f31, &temp_r31->unk4, temp_r31->unkF4, temp_r31->unk64, temp_r31->unk88, 3); fn_1_7A54(2.0f * temp_f31, &temp_r31->unk10, temp_r31->unk100, temp_r31->unkAC, temp_r31->unkD0, 3); temp_r31->unk130 = fn_1_7520(2.0f * temp_f31, temp_r31->unk124, temp_r31->unk10C, temp_r31->unk118, 3); @@ -662,8 +645,9 @@ void fn_1_2C14(omObjData* object) { CZoom = temp_r31->unk130; } -void fn_1_2E88(f32 arg0, Vec* arg1, Vec* arg2, f32 arg3) { - unkStruct4* temp_r31; +void fn_1_2E88(f32 arg0, Vec *arg1, Vec *arg2, f32 arg3) +{ + unkStruct4 *temp_r31; temp_r31 = lbl_1_bss_360->data; temp_r31->unk0 = 0; @@ -681,8 +665,9 @@ void fn_1_2E88(f32 arg0, Vec* arg1, Vec* arg2, f32 arg3) { temp_r31->unk138 = arg3; } -void fn_1_2F28(f32 arg8, Vec* arg0, Vec* arg1, f32 arg9, Vec* arg2, Vec* arg3, f32 argA) { - unkStruct4* temp_r31; +void fn_1_2F28(f32 arg8, Vec *arg0, Vec *arg1, f32 arg9, Vec *arg2, Vec *arg3, f32 argA) +{ + unkStruct4 *temp_r31; temp_r31 = lbl_1_bss_360->data; temp_r31->unk0 = 1; @@ -721,32 +706,25 @@ void fn_1_2F28(f32 arg8, Vec* arg0, Vec* arg1, f32 arg9, Vec* arg2, Vec* arg3, f fn_1_7268(temp_r31->unk124, temp_r31->unk10C, temp_r31->unk118, 3); } -void fn_1_31E0(f32 arg8) { - unkStruct4* data; +void fn_1_31E0(f32 arg8) +{ + unkStruct4 *data; - data = (unkStruct4*)lbl_1_bss_360->data; + data = (unkStruct4 *)lbl_1_bss_360->data; data->unk140 = arg8; } -s32 lbl_1_data_80[10] = { - 0, 3, 5, 6, - 0x2E0012, 0x2E001A, 0x2E0022, 0x2E001A, - 0x17, 0x72 -}; +s32 lbl_1_data_80[10] = { 0, 3, 5, 6, 0x2E0012, 0x2E001A, 0x2E0022, 0x2E001A, 0x17, 0x72 }; -Vec lbl_1_data_A8[4] = { - { -200.0f, 1600.0f, -200.0f }, - { 200.0f, 1600.0f, -200.0f }, - { -200.0f, 1600.0f, 200.0f }, - { 200.0f, 1600.0f, 200.0f } -}; +Vec lbl_1_data_A8[4] = { { -200.0f, 1600.0f, -200.0f }, { 200.0f, 1600.0f, -200.0f }, { -200.0f, 1600.0f, 200.0f }, { 200.0f, 1600.0f, 200.0f } }; -void fn_1_3208(omObjData* object) { +void fn_1_3208(omObjData *object) +{ s32 var_r29; s32 var_r28; u32 temp_r27; - unkStruct3* var_r31; - + unkStruct3 *var_r31; + object->data = var_r31 = fn_1_63A8(0xA0); var_r31->unk0 = object->work[0]; var_r31->unk1 = GWPlayerCfg[var_r31->unk0].character; @@ -763,7 +741,7 @@ void fn_1_3208(omObjData* object) { var_r31->unk5D = 0; var_r31->unk5C = 0; var_r31->unkE = 0; - + temp_r27 = object->work[1]; var_r31->unk2C.x = lbl_1_data_A8[temp_r27].x; var_r31->unk2C.y = lbl_1_data_A8[temp_r27].y + (400.0f * ((fn_1_679C() - 0x8000) / 32768.0f)); @@ -777,13 +755,14 @@ void fn_1_3208(omObjData* object) { memset(&var_r31->unk60, 0, 0x40); var_r29 = CharModelCreate(var_r31->unk1, 4); object->model[0] = var_r29; - Hu3DModelAttrSet(var_r29, 0x40000001); + Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(var_r29); - + for (var_r28 = 0; var_r28 < 10; var_r28++) { if ((lbl_1_data_80[var_r28] & 0xFFFF0000) != 0) { object->motion[var_r28] = CharModelMotionCreate(var_r31->unk1, var_r31->unk1 + lbl_1_data_80[var_r28]); - } else { + } + else { object->motion[var_r28] = CharModelMotionCreate(var_r31->unk1, lbl_1_data_80[var_r28]); } } @@ -802,13 +781,14 @@ void fn_1_3208(omObjData* object) { object->func = fn_1_3640; } -void fn_1_3640(omObjData* object) { +void fn_1_3640(omObjData *object) +{ s32 sp8; - unkStruct3* temp_r31; + unkStruct3 *temp_r31; sp8 = object->model[0]; - temp_r31 = (unkStruct3*)object->data; - + temp_r31 = (unkStruct3 *)object->data; + temp_r31->unk10 = temp_r31->unk12 = 0; temp_r31->unk14 = temp_r31->unk16 = 0; switch (lbl_1_bss_34A) { @@ -834,24 +814,27 @@ void fn_1_3640(omObjData* object) { fn_1_3B44(object); } -void fn_1_3764(omObjData* object) { +void fn_1_3764(omObjData *object) +{ s32 spC; s32 sp8; - unkStruct3* temp_r31; + unkStruct3 *temp_r31; spC = object->model[0]; - temp_r31 = (unkStruct3*)object->data; + temp_r31 = (unkStruct3 *)object->data; if (temp_r31->unk7 != 0) { if ((lbl_1_bss_34A == 5) && ((temp_r31->unk7 & 2) == 0)) { if (temp_r31->unk5 != 0) { fn_1_4660(object); - } else { + } + else { temp_r31->unk10 = HuPadStkX[temp_r31->unk4]; temp_r31->unk12 = HuPadStkY[temp_r31->unk4]; temp_r31->unk14 = HuPadBtnDown[temp_r31->unk4]; temp_r31->unk16 = HuPadBtn[temp_r31->unk4]; } - } else { + } + else { temp_r31->unk10 = temp_r31->unk12 = 0; temp_r31->unk14 = temp_r31->unk16 = 0; } @@ -862,7 +845,7 @@ void fn_1_3764(omObjData* object) { case 6: if ((Hu3DModelAttrGet(object->model[2]) & 1) == 0) { Hu3DModelHookReset(object->model[2]); - Hu3DModelAttrSet(object->model[2], 1); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF); omSetTra(object, temp_r31->unk2C.x, temp_r31->unk2C.y, temp_r31->unk2C.z); omSetRot(object, temp_r31->unk38.x, temp_r31->unk38.y, temp_r31->unk38.z); sp8 = fn_1_A2D0(1, 1); @@ -882,16 +865,17 @@ void fn_1_3764(omObjData* object) { temp_r31->unk2C.y += 100.65; } break; - case 7: - temp_r31->unk20 = fn_1_67F0(temp_r31->unk20, 0.0f, 0.9f); - break; - case 9: - if (temp_r31->unkE != 0) { - temp_r31->unk18 = 8; - } else { - temp_r31->unk18 = 9; - } - break; + case 7: + temp_r31->unk20 = fn_1_67F0(temp_r31->unk20, 0.0f, 0.9f); + break; + case 9: + if (temp_r31->unkE != 0) { + temp_r31->unk18 = 8; + } + else { + temp_r31->unk18 = 9; + } + break; } if (temp_r31->unk2C.y <= 0.0f) { temp_r31->unk2C.y = 0.0f; @@ -901,9 +885,10 @@ void fn_1_3764(omObjData* object) { } } -void fn_1_3B44(omObjData* object) { +void fn_1_3B44(omObjData *object) +{ s16 sp8; - unkStruct3* temp_r31; + unkStruct3 *temp_r31; s16 var_r29; s16 var_r28; s16 temp_r27; @@ -915,7 +900,7 @@ void fn_1_3B44(omObjData* object) { var_r25 = 0; temp_r23 = object->model[0]; - temp_r31 = (unkStruct3*)object->data; + temp_r31 = (unkStruct3 *)object->data; temp_r27 = temp_r31->unk10; temp_r26 = temp_r31->unk12; sp8 = temp_r31->unk14; @@ -937,7 +922,8 @@ void fn_1_3B44(omObjData* object) { 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->unk1C = 0.0f; var_r29 = 0; @@ -981,7 +967,8 @@ void fn_1_3B44(omObjData* object) { if (FABS(temp_r27) + FABS(temp_r26) > 8) { temp_r31->unk20 = atan2d(temp_r27, -temp_r26); temp_r31->unk1C = 6.0f; - } else { + } + else { temp_r31->unk1C = 0.0f; } if ((temp_r24 & 0x100) == 0) { @@ -991,9 +978,11 @@ void fn_1_3B44(omObjData* object) { var_r25 = 4; if (temp_r31->unkB < 0xC) { HuAudFXPlay(0x5B1); - } else if (temp_r31->unkB < 0x18) { + } + else if (temp_r31->unkB < 0x18) { HuAudFXPlay(0x5B2); - } else { + } + else { HuAudFXPlay(0x5B3); } } @@ -1001,7 +990,8 @@ void fn_1_3B44(omObjData* object) { case 6: if ((Hu3DMotionEndCheck(object->model[2]) == 0) && (Hu3DMotionShiftIDGet(object->model[2]) >= 0)) { temp_r31->unkC = 1; - } else { + } + else { if (temp_r31->unk44.y >= 0.0f) { temp_r31->unkC = 0U; } @@ -1010,7 +1000,8 @@ void fn_1_3B44(omObjData* object) { if ((temp_r24 & 0x100) != 0) { var_r29 = 4; var_r28 = 1; - } else { + } + else { var_r29 = 7; var_r28 = 0; } @@ -1030,11 +1021,13 @@ void fn_1_3B44(omObjData* object) { if ((temp_r24 & 0x100) != 0) { var_r29 = 4; var_r28 = 1; - } else { + } + else { if (Hu3DMotionTimeGet(temp_r23) <= 0.0f) { var_r29 = 4; var_r28 = 1; - } else { + } + else { if ((Hu3DMotionTimeGet(temp_r23) >= 10.0f) && (Hu3DMotionShiftIDGet(temp_r23) < 0)) { Hu3DModelAttrSet(temp_r23, 0x40000004); } @@ -1067,7 +1060,8 @@ void fn_1_3B44(omObjData* object) { if ((Hu3DModelAttrGet(object->model[2]) & 1) != 0) { omSetTra(object, temp_r31->unk2C.x, temp_r31->unk2C.y, temp_r31->unk2C.z); omSetRot(object, temp_r31->unk38.x, temp_r31->unk38.y, temp_r31->unk38.z); - } else { + } + else { omSetTra(object, 0.0f, 0.0f, 0.0f); omSetRot(object, 0.0f, 0.0f, 0.0f); Hu3DModelPosSet(object->model[2], temp_r31->unk2C.x, temp_r31->unk2C.y, temp_r31->unk2C.z); @@ -1075,7 +1069,8 @@ void fn_1_3B44(omObjData* object) { } } -void fn_1_4660(omObjData* object) { +void fn_1_4660(omObjData *object) +{ s16 sp3C[3][3]; Vec sp30; Vec sp24; @@ -1086,7 +1081,7 @@ void fn_1_4660(omObjData* object) { f32 var_f31; f32 temp_f30; f32 var_f29; - unkStruct3* temp_r31; + unkStruct3 *temp_r31; s32 var_r30; s32 var_r29; u8 temp_r28; @@ -1095,14 +1090,14 @@ void fn_1_4660(omObjData* object) { s32 var_r25; s16 var_r24; s16 var_r23; - unkStruct3* temp_r22; + unkStruct3 *temp_r22; u8 var_r21; u8 var_r20; s16 var_r19; s16 var_r18; s16 temp_r17; - temp_r31 = (unkStruct3*)object->data; + temp_r31 = (unkStruct3 *)object->data; sp14 = object->model[0]; spC = temp_r31->unk18; temp_r17 = temp_r31->unk6; @@ -1115,17 +1110,15 @@ void fn_1_4660(omObjData* object) { temp_r31->unk60s = temp_r28; temp_r31->unk62s = temp_r27; temp_r31->unk5D++; - } else { + } + else { var_r26 = 0x57E4; for (var_r30 = temp_r28 - 1; var_r30 <= (temp_r28 + 1); var_r30++) { if ((var_r30 >= 0) && (var_r30 < 4)) { for (var_r29 = temp_r27 - 1; var_r29 <= (temp_r27 + 1); var_r29++) { - if ((var_r29 >= 0) - && (var_r29 < 4) - && (lbl_1_bss_234[temp_r31->unk0][var_r30][var_r29] <= var_r26) - && ((var_r26 != lbl_1_bss_234[temp_r31->unk0][var_r30][var_r29]) - || ((fn_1_679C() & 1) == 0))) { - + if ((var_r29 >= 0) && (var_r29 < 4) && (lbl_1_bss_234[temp_r31->unk0][var_r30][var_r29] <= var_r26) + && ((var_r26 != lbl_1_bss_234[temp_r31->unk0][var_r30][var_r29]) || ((fn_1_679C() & 1) == 0))) { + var_r21 = var_r30; var_r20 = var_r29; var_r26 = lbl_1_bss_234[temp_r31->unk0][var_r30][var_r29]; @@ -1137,7 +1130,8 @@ void fn_1_4660(omObjData* object) { temp_r31->unk60s = var_r21; temp_r31->unk62s = var_r20; temp_r31->unk5D++; - } else { + } + else { var_r26 = 0x57E4; for (var_r30 = 0; var_r30 < 4; var_r30++) { for (var_r29 = 0; var_r29 < 4; var_r29++) { @@ -1159,13 +1153,13 @@ void fn_1_4660(omObjData* object) { sp18 = temp_r31->unk2C; sp18.x += 50.0f * sind(temp_r31->unk38.y); sp18.z += 50.0f * cosd(temp_r31->unk38.y); - + for (var_r30 = 0; var_r30 < 3.0f; var_r30++) { for (var_r29 = 0; var_r29 < 3.0f; var_r29++) { sp3C[var_r30][var_r29] = 0; } } - + for (var_r30 = 0; var_r30 < 150.0f; var_r30++) { for (var_r29 = 0; var_r29 < 150.0f; var_r29++) { sp30.x = (150.0f * temp_r31->unk60s) + var_r30; @@ -1181,12 +1175,16 @@ void fn_1_4660(omObjData* object) { var_r25 = 0; for (var_r30 = temp_r28 - 1; var_r30 <= (temp_r28 + 1); var_r30++) { if (var_r30 >= 0) { - if (var_r30 >= 3.0f) continue; + if (var_r30 >= 3.0f) + continue; for (var_r29 = temp_r27 - 1; var_r29 <= (temp_r27 + 1); var_r29++) { if (var_r29 >= 0) { - if (var_r29 >= 3.0f) continue; - if (sp3C[var_r30][var_r29] < 1250.0f) continue; - if (sp3C[var_r30][var_r29] < var_r25) continue; + if (var_r29 >= 3.0f) + continue; + if (sp3C[var_r30][var_r29] < 1250.0f) + continue; + if (sp3C[var_r30][var_r29] < var_r25) + continue; if ((var_r25 != sp3C[var_r30][var_r29]) || ((fn_1_679C() & 1) == 0)) { var_r25 = sp3C[var_r30][var_r29]; sp30.x = 25.0f + ((150.0f * temp_r31->unk60s) + (50.0f * var_r30)); @@ -1204,7 +1202,7 @@ void fn_1_4660(omObjData* object) { } if (var_r25 == 0) { var_r25 = 0; - + for (var_r30 = 0; var_r30 < 3.0f; var_r30++) { for (var_r29 = 0; var_r29 < 3.0f; var_r29++) { if (sp3C[var_r30][var_r29] >= var_r25) { @@ -1236,7 +1234,7 @@ void fn_1_4660(omObjData* object) { if (--temp_r31->unk68 == 0) { VECSubtract(&temp_r31->unk6C, &temp_r31->unk2C, &sp24); VECNormalize(&sp24, &sp24); - var_r24 = (32.0f * sp24.x); + var_r24 = (32.0f * sp24.x); var_r23 = (32.0f * -sp24.z); var_r19 = var_r18 = 0x100; temp_r31->unk66 = 0x18 + (s32)(((20 - (temp_r17 * 6)) * ((fn_1_679C() - 0x8000) / 32768.0f))); @@ -1255,19 +1253,23 @@ void fn_1_4660(omObjData* object) { if (spC != 7) { var_r24 = temp_r31->unk10; var_r23 = temp_r31->unk12; - } else { + } + else { for (var_r30 = 0; var_r30 < 4; var_r30++) { temp_r22 = lbl_1_bss_34C[var_r30]->data; - if (temp_r22 == temp_r31) continue; + if (temp_r22 == temp_r31) + continue; temp_r28 = ((0.5f * (600.0f + temp_r22->unk2C.x)) / 150.0f); temp_r27 = ((0.5f * (600.0f + temp_r22->unk2C.z)) / 150.0f); - if (temp_r31->unk60s == temp_r28 && temp_r31->unk62s == temp_r27) break; + if (temp_r31->unk60s == temp_r28 && temp_r31->unk62s == temp_r27) + break; } if (var_r30 != 4) { var_r26 = 0x57E4; for (var_r30 = 0; var_r30 < 4; var_r30++) { for (var_r29 = 0; var_r29 < 4; var_r29++) { - if ((lbl_1_bss_234[temp_r31->unk0][var_r30][var_r29] <= var_r26) && ((temp_r31->unk60s != var_r30) || (temp_r31->unk62s != var_r29))) { + if ((lbl_1_bss_234[temp_r31->unk0][var_r30][var_r29] <= var_r26) + && ((temp_r31->unk60s != var_r30) || (temp_r31->unk62s != var_r29))) { var_r21 = var_r30; var_r20 = var_r29; var_r26 = lbl_1_bss_234[temp_r31->unk0][var_r30][var_r29]; @@ -1277,8 +1279,9 @@ void fn_1_4660(omObjData* object) { temp_r31->unk60s = var_r21; temp_r31->unk62s = var_r20; temp_r31->unk5D = 1; - } else { - var_r24 = (32.0 * sind(temp_r31->unk38.y)); + } + else { + var_r24 = (32.0 * sind(temp_r31->unk38.y)); var_r23 = (32.0 * -cosd(temp_r31->unk38.y)); var_f31 = 517.5f; if ((temp_r31->unk2C.x > var_f31) || (temp_r31->unk2C.x < -var_f31)) { @@ -1292,12 +1295,14 @@ void fn_1_4660(omObjData* object) { var_r19 = var_r18 = 0x100; temp_r31->unk66 = 0x18 + (s32)(((20 - (temp_r17 * 6)) * ((fn_1_679C() - 0x8000) / 32768.0f))); temp_r31->unk5D = 3; - } else { + } + else { temp_r28 = temp_r31->unk60s; temp_r27 = temp_r31->unk62s; if (lbl_1_bss_234[temp_r31->unk0][temp_r28][temp_r27] > 16875.0f) { temp_r31->unk5D = 0; - } else { + } + else { temp_r31->unk5D = 1; } } @@ -1311,14 +1316,15 @@ void fn_1_4660(omObjData* object) { temp_r31->unk16 = var_r18; } -void fn_1_5B20(unkSubStruct2* arg0) { +void fn_1_5B20(unkSubStruct2 *arg0) +{ s16 sp8; f32 temp_f31; f32 temp_f30; f32 temp_f29; f32 temp_f28; s32 var_r29; - unkSubStruct* var_r31; + unkSubStruct *var_r31; sp8 = 0; switch (arg0->unk60) { @@ -1362,7 +1368,8 @@ void fn_1_5B20(unkSubStruct2* arg0) { } } -void fn_1_5FB0(omObjData* arg0) { +void fn_1_5FB0(omObjData *arg0) +{ Vec sp2C; Vec sp20; Vec sp14; @@ -1373,17 +1380,17 @@ void fn_1_5FB0(omObjData* arg0) { f32 var_f28; f32 temp_f27; s32 var_r29; - unkStruct3* temp_r30; - unkStruct3* temp_r31; + unkStruct3 *temp_r30; + unkStruct3 *temp_r31; - temp_r31 = (unkStruct3*)arg0->data; + temp_r31 = (unkStruct3 *)arg0->data; if (temp_r31->unk7 != 0) { VECSubtract(&temp_r31->unk2C, &temp_r31->unk50, &sp2C); var_f28 = VECMag(&sp2C); if (var_f28 != 0.0f) { for (var_r29 = 0; var_r29 < 4; var_r29++) { if (var_r29 != temp_r31->unk0) { - temp_r30 = (unkStruct3*)lbl_1_bss_34C[var_r29]->data; + temp_r30 = (unkStruct3 *)lbl_1_bss_34C[var_r29]->data; if (temp_r30->unk7 != 0) { sp14.x = temp_r31->unk2C.x; sp14.y = temp_r31->unk2C.y; @@ -1395,7 +1402,8 @@ void fn_1_5FB0(omObjData* arg0) { sp8.y = 0.0f; VECSubtract(&sp14, &sp8, &sp2C); temp_f31 = VECMag(&sp2C); - if (temp_f31 >= 109.45f) continue; + if (temp_f31 >= 109.45f) + continue; VECSubtract(&temp_r30->unk2C, &temp_r30->unk50, &sp2C); temp_f27 = VECMag(&sp2C); VECSubtract(&sp14, &sp8, &sp20); @@ -1420,7 +1428,7 @@ void fn_1_5FB0(omObjData* arg0) { if (temp_r31->unk2C.x < -var_f30) { temp_r31->unk2C.x = -var_f30; } - + var_f30 = 555.0f; if (temp_r31->unk2C.z > var_f30) { temp_r31->unk2C.z = var_f30; @@ -1432,7 +1440,8 @@ void fn_1_5FB0(omObjData* arg0) { } } -void fn_1_6304(omObjData* object) { +void fn_1_6304(omObjData *object) +{ s32 var_r31; if (lbl_1_bss_34A >= 5) { @@ -1442,19 +1451,22 @@ void fn_1_6304(omObjData* object) { } } -void fn_1_6368(void) { +void fn_1_6368(void) +{ s32 var_r31; - + for (var_r31 = 0; var_r31 < 0x80; var_r31++) { lbl_1_bss_34[var_r31] = NULL; } } -void* fn_1_63A8(s32 arg0) { +void *fn_1_63A8(s32 arg0) +{ s32 var_r31; - + for (var_r31 = 0; var_r31 < 0x80; var_r31++) { - if (!lbl_1_bss_34[var_r31]) break; + if (!lbl_1_bss_34[var_r31]) + break; } if (var_r31 == 0x80) { return NULL; @@ -1463,11 +1475,13 @@ void* fn_1_63A8(s32 arg0) { return lbl_1_bss_34[var_r31]; } -void fn_1_6448(void* arg0) { +void fn_1_6448(void *arg0) +{ s32 var_r31; for (var_r31 = 0; var_r31 < 0x80; var_r31++) { - if (lbl_1_bss_34[var_r31] == arg0) break; + if (lbl_1_bss_34[var_r31] == arg0) + break; } if (var_r31 != 0x80) { HuMemDirectFree(lbl_1_bss_34[var_r31]); @@ -1475,7 +1489,8 @@ void fn_1_6448(void* arg0) { } } -void fn_1_64DC(void) { +void fn_1_64DC(void) +{ s32 var_r31; for (var_r31 = 0; var_r31 < 0x80; var_r31++) { @@ -1487,27 +1502,28 @@ void fn_1_64DC(void) { } } -void fn_1_6584(s16 arg0, char* arg1, u8 arg2, u8 arg3, u8 arg4) { +void fn_1_6584(s16 arg0, char *arg1, u8 arg2, u8 arg3, u8 arg4) +{ char sp13[0x100]; - HsfObject* var_r31; - HsfMaterial* temp_r30; - HsfData* temp_r29; - HsfBuffer* temp_r28; - HsfObject* var_r26; + HsfObject *var_r31; + HsfMaterial *temp_r30; + HsfData *temp_r29; + HsfBuffer *temp_r28; + HsfObject *var_r26; s32 var_r25; s32 var_r27; temp_r29 = Hu3DData[arg0].hsfData; var_r26 = temp_r29->object; strcpy(&sp13, MakeObjectName(arg1)); - + for (var_r25 = 0; var_r25 < temp_r29->objectCnt; var_r25++, var_r26++) { var_r31 = var_r26; temp_r28 = var_r31->data.face; if (var_r31->constData && strcmp(&sp13, var_r31->name) == 0) { - + for (var_r27 = 0; var_r27 < temp_r28->count; var_r27++) { - temp_r30 = &var_r31->data.material[((HsfFace*)temp_r28->data)[var_r27].mat & 0xFFF]; + temp_r30 = &var_r31->data.material[((HsfFace *)temp_r28->data)[var_r27].mat & 0xFFF]; temp_r30->color[0] = arg2; temp_r30->color[1] = arg3; temp_r30->color[2] = arg4; @@ -1517,14 +1533,16 @@ void fn_1_6584(s16 arg0, char* arg1, u8 arg2, u8 arg3, u8 arg4) { } } -AnimBmpData* fn_1_668C(s16 arg0) { +AnimBmpData *fn_1_668C(s16 arg0) +{ return Hu3DTexAnimData[arg0].unk10->bmp; } -s16 fn_1_66AC(void) { - AnimBmpData* temp_r31; +s16 fn_1_66AC(void) +{ + AnimBmpData *temp_r31; s32 var_r30; - AnimData** var_r29; + AnimData **var_r29; s32 var_r28; var_r30 = fn_1_A94C(0xFFFF0000, Hu3DShadowData.unk_02, Hu3DShadowData.unk_02); @@ -1538,29 +1556,34 @@ s16 fn_1_66AC(void) { u32 lbl_1_data_110 = 0x41C64E6D; -s32 fn_1_679C(void) { +s32 fn_1_679C(void) +{ lbl_1_data_110 *= 0x41C64E6D; lbl_1_data_110 += 0x3039; return lbl_1_data_110 >> 0x10; } -f32 fn_1_67F0(f32 arg0, f32 arg1, f32 arg2) { +f32 fn_1_67F0(f32 arg0, f32 arg1, f32 arg2) +{ f32 var_f31; if (arg0 > 180.0f) { arg0 -= 360.0f; - } else if (arg0 <= -180.0f) { + } + else if (arg0 <= -180.0f) { arg0 += 360.0f; } if (arg1 > 180.0f) { arg1 -= 360.0f; - } else if (arg1 <= -180.0f) { + } + else if (arg1 <= -180.0f) { arg1 += 360.0f; } var_f31 = arg0 - arg1; if (var_f31 > 180.0f) { var_f31 -= 360.0f; - } else if (var_f31 <= -180.0f) { + } + else if (var_f31 <= -180.0f) { var_f31 += 360.0f; } arg0 = arg1 + (var_f31 * arg2); @@ -1573,13 +1596,15 @@ f32 fn_1_67F0(f32 arg0, f32 arg1, f32 arg2) { return arg0; } -void fn_1_6958(Mtx arg0, f32 arg8, f32 arg9, f32 argA) { +void fn_1_6958(Mtx arg0, f32 arg8, f32 arg9, f32 argA) +{ Mtx sp38; Mtx sp8; - + if (argA != 0.0f) { MTXRotDeg(arg0, 0x5A, argA); - } else { + } + else { PSMTXIdentity(arg0); } if (arg8 != 0.0f) { @@ -1592,7 +1617,8 @@ void fn_1_6958(Mtx arg0, f32 arg8, f32 arg9, f32 argA) { } } -void fn_1_6A78(Mtx arg0, Vec* arg1) { +void fn_1_6A78(Mtx arg0, Vec *arg1) +{ f32 temp_f29; f32 var_f28; @@ -1608,7 +1634,8 @@ void fn_1_6A78(Mtx arg0, Vec* arg1) { arg1->y = atan2d(var_f28, temp_f29); } -f32 fn_1_6D84(f32 arg8, f32 arg9, f32 argA, f32 argB) { +f32 fn_1_6D84(f32 arg8, f32 arg9, f32 argA, f32 argB) +{ f32 temp_f31; f32 var_f30; @@ -1617,22 +1644,25 @@ f32 fn_1_6D84(f32 arg8, f32 arg9, f32 argA, f32 argB) { return var_f30; } -void fn_1_6DFC(f32* arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg8) { +void fn_1_6DFC(f32 *arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 arg8) +{ s32 var_r31; - + for (var_r31 = 0; var_r31 < 3; var_r31++) { *arg3++ = fn_1_6D84(arg8, *arg0++, *arg1++, *arg2++); } } -f32 fn_1_6F18(f32 arg8, f32 arg9, f32 argA, f32 argB) { +f32 fn_1_6F18(f32 arg8, f32 arg9, f32 argA, f32 argB) +{ f32 var_f31; var_f31 = (2.0 * ((arg8 * argB) + (((arg8 - 1.0) * arg9) + ((1.0 - (2.0 * arg8)) * argA)))); return var_f31; } -void fn_1_6F90(f32* arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg8) { +void fn_1_6F90(f32 *arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 arg8) +{ f32 spC[3]; f32 var_f29; s32 var_r31; @@ -1653,7 +1683,8 @@ void fn_1_6F90(f32* arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg8) { *arg3++ = 1.0f; } -void fn_1_7268(f32* arg0, f32* arg1, f32* arg2, s32 arg3) { +void fn_1_7268(f32 *arg0, f32 *arg1, f32 *arg2, s32 arg3) +{ f32 sp48[0x10]; f32 sp8[0x10]; f32 temp_f31; @@ -1661,36 +1692,39 @@ void fn_1_7268(f32* arg0, f32* arg1, f32* arg2, s32 arg3) { arg2[0] = 0.0f; arg2[arg3 - 1] = 0.0f; - + for (var_r31 = 0; var_r31 < arg3 - 1; var_r31++) { sp48[var_r31] = arg0[var_r31 + 1] - arg0[var_r31]; if (sp48[var_r31] == 0.0f) { sp8[var_r31 + 1] = 0.0f; - } else { + } + else { sp8[var_r31 + 1] = (arg1[var_r31 + 1] - arg1[var_r31]) / sp48[var_r31]; } } arg2[1] = (sp8[2] - sp8[1]); sp8[1] = 2.0f * (arg0[2] - arg0[0]); - + for (var_r31 = 1; var_r31 < arg3 - 2; var_r31++) { temp_f31 = sp48[var_r31] / sp8[var_r31]; arg2[var_r31 + 1] = ((sp8[var_r31 + 2] - sp8[var_r31 + 1]) - (temp_f31 * (f64)arg2[var_r31])); sp8[var_r31 + 1] = ((2.0f * (arg0[var_r31 + 2] - arg0[var_r31])) - (temp_f31 * (f64)sp48[var_r31])); } - + arg2[arg3 - 2] -= sp48[arg3 - 2] * arg2[arg3 - 1]; for (var_r31 = arg3 - 2; var_r31 > 0; var_r31--) { if (0.0f == sp8[var_r31]) { arg2[var_r31] = 0.0f; - } else { + } + else { arg2[var_r31] = (arg2[var_r31] - (sp48[var_r31] * arg2[var_r31 + 1])) / sp8[var_r31]; } } } -f32 fn_1_7520(f32 arg0, f32* arg1, f32* arg2, f32* arg3, s32 arg4) { +f32 fn_1_7520(f32 arg0, f32 *arg1, f32 *arg2, f32 *arg3, s32 arg4) +{ f32 temp_f30; f32 temp_f31; f32 var_f29; @@ -1700,14 +1734,18 @@ f32 fn_1_7520(f32 arg0, f32* arg1, f32* arg2, f32* arg3, s32 arg4) { arg0 -= temp_r31; temp_f31 = arg1[temp_r31 + 1] - arg1[temp_r31]; 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) { var_f29 = arg2[temp_r31]; } return var_f29; } -void fn_1_7674(f32* arg0, Vec* arg1, Vec* arg2, s32 arg3) { +void fn_1_7674(f32 *arg0, Vec *arg1, Vec *arg2, s32 arg3) +{ f32 spD4[0x10]; f32 sp94[0x10]; f32 sp54[0x10]; @@ -1719,24 +1757,25 @@ void fn_1_7674(f32* arg0, Vec* arg1, Vec* arg2, s32 arg3) { s32 var_r31; arg0[0] = 0.0f; - + for (var_r30 = 1; var_r30 < arg3; var_r30++) { VECSubtract(&arg1[var_r30], &arg1[var_r30 - 1], &sp8); arg0[var_r30] = arg0[var_r30 - 1] + VECMag(&sp8); } - + for (var_r27 = 0; var_r27 < 3; var_r27++) { for (var_r30 = 0; var_r30 < arg3; var_r30++) { spD4[var_r30] = ((f32(*)[3])arg1)[var_r30][var_r27]; } sp94[0] = 0.0f; sp94[arg3 - 1] = 0.0f; - + for (var_r31 = 0; var_r31 < (arg3 - 1); var_r31++) { sp14[var_r31] = arg0[var_r31 + 1] - arg0[var_r31]; if (sp14[var_r31] == 0.0f) { sp54[var_r31 + 1] = 0.0f; - } else { + } + else { sp54[var_r31 + 1] = (spD4[var_r31 + 1] - spD4[var_r31]) / sp14[var_r31]; } } @@ -1752,11 +1791,12 @@ void fn_1_7674(f32* arg0, Vec* arg1, Vec* arg2, s32 arg3) { for (var_r31 = arg3 - 2; var_r31 > 0; var_r31--) { if (sp54[var_r31] == 0.0f) { sp94[var_r31] = 0.0f; - } else { + } + else { sp94[var_r31] = (sp94[var_r31] - (sp14[var_r31] * sp94[var_r31 + 1])) / sp54[var_r31]; } } - + for (var_r30 = 0; var_r30 < arg3; var_r30++) { ((f32(*)[3])arg2)[var_r30][var_r27] = sp94[var_r30]; (void)arg2; @@ -1764,8 +1804,8 @@ void fn_1_7674(f32* arg0, Vec* arg1, Vec* arg2, s32 arg3) { } } - -void fn_1_7A54(f32 arg0, Vec* arg1, f32* arg2, Vec* arg3, Vec* arg4, s32 arg5) { +void fn_1_7A54(f32 arg0, Vec *arg1, f32 *arg2, Vec *arg3, Vec *arg4, s32 arg5) +{ f32 sp48[0x10]; f32 sp8[0x10]; f32 temp_f29; @@ -1775,47 +1815,51 @@ void fn_1_7A54(f32 arg0, Vec* arg1, f32* arg2, Vec* arg3, Vec* arg4, s32 arg5) { s32 var_r29; s32 var_r30; - for (var_r29 = 0; var_r29 < 3; var_r29++) { for (var_r30 = 0; var_r30 < arg5; var_r30++) { sp48[var_r30] = ((f32(*)[3])arg3)[var_r30][var_r29]; sp8[var_r30] = ((f32(*)[3])arg4)[var_r30][var_r29]; } - + ((f32(*)[3])arg1)[0][var_r29] = fn_1_7520(arg0, arg2, sp48, sp8, 0); } } -f32 fn_1_7C68(Vec* arg0) { +f32 fn_1_7C68(Vec *arg0) +{ f32 temp_f29; f32 temp_f30; temp_f30 = (arg0->z * arg0->z) + ((arg0->x * arg0->x) + (arg0->y * arg0->y)); temp_f30 = sqrtf(temp_f30); - + if (temp_f30 != 0.0f) { temp_f29 = 1.0f / temp_f30; arg0->x *= temp_f29; arg0->y *= temp_f29; arg0->z *= temp_f29; - } else { + } + else { arg0->x = arg0->y = arg0->z = 0.0f; } return temp_f30; } -f32 fn_1_7E00(Vec arg0, Vec arg1, Vec* arg2, f32 arg8) { +f32 fn_1_7E00(Vec arg0, Vec arg1, Vec *arg2, f32 arg8) +{ if (arg8 <= 0.0f) { arg2->x = arg0.x; arg2->y = arg0.y; arg2->z = arg0.z; arg8 = 0.0f; - } else if (arg8 >= 1.0f) { + } + else if (arg8 >= 1.0f) { arg2->x = arg0.x + arg1.x; arg2->y = arg0.y + arg1.y; arg2->z = arg0.z + arg1.z; arg8 = 1.0f; - } else { + } + else { arg2->x = arg0.x + (arg8 * arg1.x); arg2->y = arg0.y + (arg8 * arg1.y); arg2->z = arg0.z + (arg8 * arg1.z); @@ -1823,7 +1867,8 @@ f32 fn_1_7E00(Vec arg0, Vec arg1, Vec* arg2, f32 arg8) { return arg8; } -f32 fn_1_7ED8(Vec arg0, Vec arg1, Vec arg2) { +f32 fn_1_7ED8(Vec arg0, Vec arg1, Vec arg2) +{ f32 temp_f30; f32 var_f31; @@ -1835,12 +1880,14 @@ f32 fn_1_7ED8(Vec arg0, Vec arg1, Vec arg2) { return var_f31; } -f32 fn_1_7F94(Vec* arg0, Vec* arg1, Vec* arg2) { +f32 fn_1_7F94(Vec *arg0, Vec *arg1, Vec *arg2) +{ Vec sp44; f32 var_f30; if (0.0f == ((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y)))) { - 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)) + + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y))); } var_f30 = fn_1_7ED8(*arg0, *arg1, *arg2); @@ -1848,20 +1895,23 @@ f32 fn_1_7F94(Vec* arg0, Vec* arg1, Vec* arg2) { 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_82D0(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) { +f32 fn_1_82D0(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, Vec *arg4) +{ f32 var_f31; f32 var_f30; if (0.0f == ((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y)))) { - 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))); - } else { + 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))); + } + else { var_f30 = fn_1_7ED8(*arg0, *arg1, *arg2); fn_1_7E00(*arg1, *arg2, arg3, var_f30); } - + arg4->x = arg3->x - arg0->x; arg4->y = arg3->y - arg0->y; arg4->z = arg3->z - arg0->z; - + return fn_1_7C68(arg4); -} \ No newline at end of file +} diff --git a/src/REL/m416Dll/main.c b/src/REL/m416Dll/main.c index 0f35575a..aa2666d5 100644 --- a/src/REL/m416Dll/main.c +++ b/src/REL/m416Dll/main.c @@ -451,7 +451,7 @@ void fn_1_156C(omObjData *object) work->unk0E = GWPlayerCfg[work->unk02].diff; work->unk10 = GWPlayerCfg[work->unk02].group; object->model[0] = CharModelCreate(work->unk0C, 4); - Hu3DModelAttrSet(object->model[0], 0x40000001); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(object->model[0]); work->field_0_bit2 = 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[1]); 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[2], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02)); CharModelMotionDataClose(work->unk0C); @@ -488,7 +488,7 @@ void fn_1_156C(omObjData *object) Hu3DParticleHookSet(object->model[4], fn_1_6AE8); Hu3DParticleBlendModeSet(object->model[4], 1); 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.y = lbl_1_data_B0[player][1]; 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); Hu3DParticleBlendModeSet(object->model[2], 1); Hu3DModelLayerSet(object->model[2], 6); - Hu3DModelAttrSet(object->model[2], 2); - Hu3DModelAttrSet(object->model[2], 1); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_ZWRITE_OFF); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF); work->unk44 = 5; 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)); Hu3DModelLayerSet(object->model[2], 3); fn_1_6DEC(object->model[2], 16); - Hu3DModelAttrSet(object->model[2], 1); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF); Hu3DMotionSpeedSet(object->model[2], 0); Hu3DAnimCreate(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M416, 0x07), MEMORY_DEFAULT_NUM), object->model[2], "sb00"); object->model[3] = Hu3DParticleCreate(lbl_1_bss_914, 50); Hu3DParticleHookSet(object->model[3], fn_1_6640); 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); memset(work->unk4C, 0, sizeof(Bss930Work4C)); @@ -809,7 +809,7 @@ void fn_1_29DC(omObjData *object) lbl_1_bss_924 = 1; Hu3DGLightKill(lbl_1_bss_91A[1]); lbl_1_bss_91A[1] = -1; - Hu3DModelAttrSet(object->model[2], 1); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF); HuAudFXEmiterPlay(1469, &object->trans); HuAudCharVoicePlay(temp_r31->unk0C, 291); } @@ -834,10 +834,10 @@ void fn_1_29DC(omObjData *object) } else { if ((temp_r31->unk46 & 0x2) == 0) { - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); } temp_r31->unk46--; } @@ -863,10 +863,10 @@ void fn_1_29DC(omObjData *object) Hu3DShadowPosSet(&sp14, &Hu3DShadowData.unk_2C, &sp8); } object->work[0] += 10.0f; - Hu3DModelAttrReset(object->model[2], 1); + Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF); } 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); Hu3DModelPosSet(object->model[2], sp3C[0][3], sp3C[1][3], sp3C[2][3]); 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); Hu3DMotionSpeedSet(object->model[2], 2.0f); Hu3DModelRotSet(object->model[2], 0, 180.0f + object->rot.y, 0); Hu3DData[object->model[2]].unk_94 = 0; 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]); temp_r27 = &Hu3DData[object->model[3]]; temp_r28 = temp_r27->unk_120; @@ -941,7 +941,7 @@ void fn_1_2EA4(omObjData *object) case 3: if (--temp_r30->unk60 == 0) { - Hu3DModelAttrSet(object->model[2], 1); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF); Hu3DData[object->model[2]].unk_0E = -1; temp_r30->field_0_bit1 = 0; 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) { temp_r29->field_0_bit0 = 0; - Hu3DModelAttrSet(object->model[2], 1); - Hu3DModelAttrSet(object->model[3], 1); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); } if (temp_r29->field_0_bit0) { 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]); Hu3DModelAttrReset(object->model[1], 0x8000); Hu3DModelShadowReset(object->model[1]); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); } } else { @@ -997,9 +997,9 @@ void fn_1_361C(omObjData *object) temp_r30->unk54.y += -1.0000001f; temp_r29->rot.x += 30.0f; 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); - Hu3DModelAttrReset(object->model[4], 1); + Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF); if (!temp_r30->unk10) { HuAudFXPlay(1468); } diff --git a/src/REL/m417Dll/water.c b/src/REL/m417Dll/water.c index 2bfef4b4..7f7bd933 100644 --- a/src/REL/m417Dll/water.c +++ b/src/REL/m417Dll/water.c @@ -135,7 +135,7 @@ void fn_1_3400(omObjData *object) Hu3DModelLayerSet(object->model[3], 3); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M417, 2)); Hu3DModelLayerSet(object->model[2], 5); - Hu3DModelAttrSet(object->model[2], 0x40000001); + Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_LOOP); Hu3DMotionSpeedSet(object->model[2], 0.7f); object->data = fn_1_3574(object, 5, 3); HuAudFXPlay(1480); diff --git a/src/REL/m420dll/map.c b/src/REL/m420dll/map.c index 94df58f0..cb884fb4 100644 --- a/src/REL/m420dll/map.c +++ b/src/REL/m420dll/map.c @@ -467,9 +467,9 @@ s32 fn_1_5AA8(s32 arg0, float arg1) if (lbl_1_bss_B0 == 0) { var_r31->unk_3C = 1; Hu3DMotionTimeSet(lbl_1_bss_9F0[var_r30], 0.0f); - Hu3DModelAttrReset(lbl_1_bss_9F0[var_r30], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[var_r30], 0x40000001); - Hu3DModelAttrSet(lbl_1_bss_9F0[var_r29], 1); + Hu3DModelAttrReset(lbl_1_bss_9F0[var_r30], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[var_r30], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(lbl_1_bss_9F0[var_r29], HU3D_ATTR_DISPOFF); } return 1; } @@ -498,14 +498,14 @@ void fn_1_5C8C(M420DllUnkMapStruct *arg0) fn_1_7230(arg0->unk_0C, &sp8, 0x1E, 1); 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.y = -50.0f + arg0->unk_1C; fn_1_7230(arg0->unk_10, &sp8, 0x1E, 1); 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); Hu3DMotionTimeSet(arg0->unk_00->unk_02, 0.0f); Hu3DModelAttrReset(arg0->unk_00->unk_02, 0x40000002); @@ -530,7 +530,7 @@ void fn_1_5C8C(M420DllUnkMapStruct *arg0) else { Hu3DMotionStartEndSet(arg0->unk_00->unk_02, 0.0f, 1.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) { @@ -639,10 +639,10 @@ void fn_1_6554(void) sp8.x = 480.0f; sp8.y = 370.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); Hu3DMotionTimeSet(fn_1_6660(), 0.0f); - Hu3DModelAttrSet(fn_1_6660(), 0x40000002); + Hu3DModelAttrSet(fn_1_6660(), HU3D_MOTATTR_PAUSE); } 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.z = 0.0f; 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) @@ -700,7 +700,7 @@ void fn_1_6820(void) while (TRUE) { 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(); @@ -735,10 +735,10 @@ void fn_1_6950(void) for (var_r31 = 0; var_r31 < 0x1B; 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[0xA], 0x40000001); - Hu3DModelAttrSet(lbl_1_bss_9F0[3], 0x40000002); - Hu3DModelAttrSet(lbl_1_bss_9F0[2], 0x40000002); + Hu3DModelAttrSet(lbl_1_bss_9F0[1], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(lbl_1_bss_9F0[0xA], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(lbl_1_bss_9F0[3], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(lbl_1_bss_9F0[2], HU3D_MOTATTR_PAUSE); Hu3DModelPosSet(lbl_1_bss_9F0[0xF], -219.0f, 300.0f, -92.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); @@ -752,24 +752,24 @@ void fn_1_6950(void) Hu3DModelShadowSet(lbl_1_bss_9F0[0x10]); Hu3DModelShadowSet(lbl_1_bss_9F0[0x14]); Hu3DModelShadowSet(lbl_1_bss_9F0[0x13]); - Hu3DModelAttrSet(lbl_1_bss_9F0[4], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[5], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[6], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[7], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[8], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[9], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[0xB], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[0xC], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[0x15], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[0x16], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[0x17], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[0x18], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[0x19], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[0x1A], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[0xF], 0x40000002); + Hu3DModelAttrSet(lbl_1_bss_9F0[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[5], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[6], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[7], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[8], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[9], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[0xB], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[0xC], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[0x15], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[0x16], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[0x17], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[0x18], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[0x19], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[0x1A], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[0xF], HU3D_MOTATTR_PAUSE); Hu3DMotionStartEndSet(lbl_1_bss_9F0[0xF], 30.0f, 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]); } @@ -940,7 +940,6 @@ void fn_1_74F8(float *arg0, float *arg1, float *arg2, float *arg3, float arg8) } *arg2 = var_f30; *arg3 = var_f29; - } void fn_1_7704(void) @@ -1081,9 +1080,9 @@ void fn_1_7E24(void) } if ((sp8.x < (200.0f + var_f30)) && (var_r28 == 0)) { 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]); - Hu3DModelAttrReset(lbl_1_bss_9F0[0xC], 1); + Hu3DModelAttrReset(lbl_1_bss_9F0[0xC], HU3D_ATTR_DISPOFF); Hu3DMotionTimeSet(lbl_1_bss_9F0[0xC], 0.0f); var_r28 = 1; } @@ -1109,24 +1108,24 @@ void fn_1_7E24(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); - Hu3DModelAttrReset(lbl_1_bss_9F0[6], 1); + Hu3DModelAttrReset(lbl_1_bss_9F0[6], HU3D_ATTR_DISPOFF); 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); HuPrcSleep(0x78); - Hu3DModelAttrSet(lbl_1_bss_9F0[4], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[6], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[8], 1); - Hu3DModelAttrReset(lbl_1_bss_9F0[5], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[5], 0x40000001); + Hu3DModelAttrSet(lbl_1_bss_9F0[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[6], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[8], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_9F0[5], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[5], HU3D_MOTATTR_LOOP); Hu3DMotionTimeSet(lbl_1_bss_9F0[5], 0.0f); - Hu3DModelAttrReset(lbl_1_bss_9F0[7], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[7], 0x40000001); + Hu3DModelAttrReset(lbl_1_bss_9F0[7], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[7], HU3D_MOTATTR_LOOP); Hu3DMotionTimeSet(lbl_1_bss_9F0[7], 0.0f); - Hu3DModelAttrReset(lbl_1_bss_9F0[9], 1); - Hu3DModelAttrSet(lbl_1_bss_9F0[9], 0x40000001); + Hu3DModelAttrReset(lbl_1_bss_9F0[9], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_9F0[9], HU3D_MOTATTR_LOOP); Hu3DMotionTimeSet(lbl_1_bss_9F0[9], 0.0f); lbl_1_bss_A2C[2] = NULL; HuPrcEnd(); @@ -1189,25 +1188,25 @@ void fn_1_8414(void) fn_1_7230(var_r29, &sp14, 30, 1); 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.y = -50.0f + var_r30->unk_1C; sp14.x = var_f31; var_r28 = var_r30->unk_10; fn_1_7230(var_r28, &sp14, 30, 1); 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); lbl_1_bss_B4 = 1; sp8.x = 0.0f; fn_1_72C8(var_r31, &sp8, 15, 1); HuPrcSleep(0xF); var_r27->unk_04 = var_r31->unk_04; - Hu3DModelAttrSet(var_r31->unk_02, 1); - Hu3DModelAttrReset(var_r27->unk_02, 1); + Hu3DModelAttrSet(var_r31->unk_02, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(var_r27->unk_02, HU3D_ATTR_DISPOFF); Hu3DMotionTimeSet(var_r27->unk_02, 0.0f); Hu3DModelAttrReset(var_r27->unk_02, 0x40000002); - Hu3DModelAttrSet(var_r27->unk_02, 0x40000001); + Hu3DModelAttrSet(var_r27->unk_02, HU3D_MOTATTR_LOOP); HuPrcSleep(0x78); lbl_1_bss_A2C[3] = NULL; HuPrcEnd(); @@ -1217,4 +1216,4 @@ void fn_1_8414(void) } } -const float _pad = 0; \ No newline at end of file +const float _pad = 0; diff --git a/src/REL/m420dll/player.c b/src/REL/m420dll/player.c index 790c43e6..39c6a5ca 100644 --- a/src/REL/m420dll/player.c +++ b/src/REL/m420dll/player.c @@ -270,20 +270,20 @@ void fn_1_2260(M420DllPlayerStruct *arg0) } } -#define WAITMODECHG(player, maxTime) \ - do { \ - s32 time; \ - s32 mode; \ - for (time = 0; time < maxTime; time++) { \ - fn_1_355C(arg0); \ - mode = arg0->unk_48; \ - HuPrcVSleep(); \ - if (arg0->unk_48 != mode) { \ - return; \ - } \ - } \ - } while(0) - +#define WAITMODECHG(player, maxTime) \ + do { \ + s32 time; \ + s32 mode; \ + for (time = 0; time < maxTime; time++) { \ + fn_1_355C(arg0); \ + mode = arg0->unk_48; \ + HuPrcVSleep(); \ + if (arg0->unk_48 != mode) { \ + return; \ + } \ + } \ + } while (0) + void fn_1_22CC(M420DllPlayerStruct *arg0) { float var_f31; @@ -341,13 +341,14 @@ void fn_1_22CC(M420DllPlayerStruct *arg0) case 2: if (arg0->unk_50 <= 0) { WAITMODECHG(arg0, 1); - } else { + } + else { Hu3DModelAttrReset(arg0->unk_AC, 0x40000002); Hu3DModelAttrReset(arg0->unk_AC, 0x40000001); Hu3DModelAttrSet(arg0->unk_AC, 0x40000004); fn_1_63EC(); - while(!Hu3DMotionEndCheck(arg0->unk_AC)) - WAITMODECHG(arg0, 1); + while (!Hu3DMotionEndCheck(arg0->unk_AC)) + WAITMODECHG(arg0, 1); for (var_r28 = 0; var_r28 < 0xA; var_r28++) { arg0->unk_5C[var_r28] = 0; } @@ -411,23 +412,26 @@ void fn_1_276C(M420DllPlayerStruct *arg0) while (arg0->unk_50 < 1) { fn_1_326C(arg0); do { - if(arg0->unk_00_field0 == 0) { + if (arg0->unk_00_field0 == 0) { var_r30 = fn_1_34AC(arg0); - } else if(arg0->unk_58 > 0) { + } + else if (arg0->unk_58 > 0) { arg0->unk_58--; var_r30 = 0; - } else if(fn_1_8944() % 30) { + } + else if (fn_1_8944() % 30) { var_r30 = 1; - } else { + } + else { var_r30 = 2; } switch (var_r30) { case 0: WAITMODECHG(arg0, 1); break; - + 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); WAITMODECHG(arg0, 6); fn_1_374C(arg0->unk_E8); @@ -435,7 +439,7 @@ void fn_1_276C(M420DllPlayerStruct *arg0) HuAudFXPlay(0x5F2); } arg0->unk_5C[arg0->unk_50++] = 1; - switch(arg0->unk_4C) { + switch (arg0->unk_4C) { case 1: case 2: var_f31 = 0.0f; @@ -445,15 +449,15 @@ void fn_1_276C(M420DllPlayerStruct *arg0) Hu3DMotionTimeSet(arg0->unk_AC, var_f31); Hu3DMotionSpeedSet(arg0->unk_AC, 2.0f); break; - + case 3: arg0->unk_48 = 5; return; } break; - + case 2: - switch(arg0->unk_4C) { + switch (arg0->unk_4C) { case 1: var_f31 = 0.0f; var_f30 = 10.0f; @@ -470,7 +474,7 @@ void fn_1_276C(M420DllPlayerStruct *arg0) Hu3DModelAttrReset(arg0->unk_AC, 0x40000002); WAITMODECHG(arg0, 30); break; - + case 2: case 3: CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[9], 0.0f, 2.0f, 0); @@ -480,8 +484,7 @@ void fn_1_276C(M420DllPlayerStruct *arg0) } break; } - } while(var_r30 == 0); - + } while (var_r30 == 0); } fn_1_326C(arg0); WAITMODECHG(arg0, 18); @@ -492,7 +495,7 @@ void fn_1_276C(M420DllPlayerStruct *arg0) void fn_1_2CE0(M420DllPlayerStruct *arg0) { CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[0], 0.0f, 30.0f, 0x40000001); - + WAITMODECHG(arg0, 35); arg0->unk_48 = 0; } @@ -542,9 +545,9 @@ void fn_1_2EA8(M420DllPlayerStruct *arg0) fn_1_326C(arg0); CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[3], 0.0f, 1.0f, 0); var_r30 = fn_1_6660(); - + Hu3DModelAttrReset(var_r30, 0x40000002); - Hu3DModelAttrSet(var_r30, 0x40000001); + Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP); Hu3DMotionTimeSet(var_r30, 0.0f); { s32 var_r30; @@ -561,7 +564,7 @@ void fn_1_2EA8(M420DllPlayerStruct *arg0) HuAudFXPlay(0x5F7); fn_1_636C(); fn_1_1E64(arg0, 1, 0x1E); - Hu3DModelAttrSet(var_r30, 0x40000002); + Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_PAUSE); fn_1_5AA8(1, 22.5f); { s32 var_r30; diff --git a/src/REL/m426Dll/main.c b/src/REL/m426Dll/main.c index 58c19263..17ae5831 100644 --- a/src/REL/m426Dll/main.c +++ b/src/REL/m426Dll/main.c @@ -774,7 +774,7 @@ void fn_1_125C(omObjData *object) } CharModelMotionDataClose(var_r31->unk_0C); 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); 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[12] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M426, 18)); object->model[13] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M426, 19)); - Hu3DModelAttrSet(object->model[4], 1); - Hu3DModelAttrSet(object->model[5], 1); - Hu3DModelAttrSet(object->model[6], 1); - Hu3DModelAttrSet(object->model[8], 1); - Hu3DModelAttrSet(object->model[9], 1); - Hu3DModelAttrSet(object->model[11], 1); - Hu3DModelAttrSet(object->model[13], 1); + Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[5], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[6], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[8], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[9], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[11], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[13], HU3D_ATTR_DISPOFF); for (var_r29 = 0; var_r29 < 14; var_r29++) { Hu3DModelLayerSet(object->model[var_r29], 2); } @@ -1660,17 +1660,17 @@ void fn_1_3EFC(omObjData *object) } } } - Hu3DModelAttrSet(object->model[3], 1); - Hu3DModelAttrSet(object->model[4], 1); - Hu3DModelAttrSet(object->model[5], 1); - Hu3DModelAttrSet(object->model[6], 1); - Hu3DModelAttrSet(object->model[7], 1); - Hu3DModelAttrSet(object->model[8], 1); - Hu3DModelAttrSet(object->model[9], 1); - Hu3DModelAttrSet(object->model[10], 1); - Hu3DModelAttrSet(object->model[11], 1); - Hu3DModelAttrSet(object->model[12], 1); - Hu3DModelAttrSet(object->model[13], 1); + Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[5], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[6], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[7], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[8], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[9], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[10], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[11], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[12], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[13], HU3D_ATTR_DISPOFF); if (lbl_1_bss_30) { if (++object->work[0] >= 20) { @@ -1704,10 +1704,10 @@ void fn_1_3EFC(omObjData *object) if (++object->work[3] >= 20) { object->work[3] = 0; } - Hu3DModelAttrReset(object->model[(object->work[0] / 5) + 3], 1); - Hu3DModelAttrReset(object->model[(object->work[1] / 5) + 7], 1); - Hu3DModelAttrReset(object->model[(object->work[2] / 10) + 10], 1); - Hu3DModelAttrReset(object->model[(object->work[3] / 10) + 12], 1); + Hu3DModelAttrReset(object->model[(object->work[0] / 5) + 3], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[(object->work[1] / 5) + 7], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[(object->work[2] / 10) + 10], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[(object->work[3] / 10) + 12], HU3D_ATTR_DISPOFF); var_r29 = &Hu3DGlobalLight[lbl_1_bss_2C]; 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; switch (arg1) { case 0: - Hu3DModelAttrReset(var_r31->unk_14, 1); - Hu3DModelAttrReset(var_r31->unk_1C, 1); - Hu3DModelAttrReset(var_r31->unk_24, 1); - Hu3DModelAttrSet(var_r31->unk_18, 1); - Hu3DModelAttrSet(var_r31->unk_20, 1); - Hu3DModelAttrSet(var_r31->unk_28, 1); + Hu3DModelAttrReset(var_r31->unk_14, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(var_r31->unk_1C, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(var_r31->unk_24, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk_18, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk_20, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk_28, HU3D_ATTR_DISPOFF); break; case 1: - Hu3DModelAttrSet(var_r31->unk_14, 1); - Hu3DModelAttrSet(var_r31->unk_1C, 1); - Hu3DModelAttrSet(var_r31->unk_24, 1); - Hu3DModelAttrReset(var_r31->unk_18, 1); - Hu3DModelAttrReset(var_r31->unk_20, 1); - Hu3DModelAttrReset(var_r31->unk_28, 1); + Hu3DModelAttrSet(var_r31->unk_14, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk_1C, HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk_24, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(var_r31->unk_18, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(var_r31->unk_20, HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(var_r31->unk_28, HU3D_ATTR_DISPOFF); break; default: 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_48 = 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); } object->func = fn_1_5134; @@ -1977,10 +1977,10 @@ void fn_1_5134(omObjData *object) if (lbl_1_bss_38) { if (--var_r31->unk_2C <= 0) { 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); - Hu3DModelAttrSet(var_r31->unk_00, 1073741825); + Hu3DModelAttrSet(var_r31->unk_00, HU3D_MOTATTR_LOOP); HuAudFXPlay(1607); var_r31->unk_2C = 0; 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); } 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_r31->unk_38 = 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); 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_r27 = var_r26->unk_120; 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_0C = 0; var_r31->unk_10 = 0; @@ -2291,10 +2291,10 @@ void fn_1_6008(omObjData *object) continue; } if (var_r30->unk_10 <= 0) { - Hu3DModelAttrSet(var_r30->unk_04, 1); + Hu3DModelAttrSet(var_r30->unk_04, HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrReset(var_r30->unk_04, 1); + Hu3DModelAttrReset(var_r30->unk_04, HU3D_ATTR_DISPOFF); var_r26 = &Hu3DData[var_r30->unk_04]; var_r29 = var_r26->unk_120; var_r31 = var_r29->unk_3C; @@ -2470,7 +2470,7 @@ void fn_1_65E4(omObjData *object) var_r28 = &Hu3DData[var_r31->unk_00]; sp8 = var_r28->hsfData; 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_08 = 0; 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); Hu3DModelRotSet(var_r31->unk_00, CRot.x, CRot.y, CRot.z); 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_08 = 0; } @@ -2543,7 +2543,7 @@ s32 fn_1_6888(Vec *arg0) Hu3DModelAttrSet(var_r31->unk_00, 0); 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); - Hu3DModelAttrReset(var_r31->unk_00, 1); + Hu3DModelAttrReset(var_r31->unk_00, HU3D_ATTR_DISPOFF); return var_r30; } @@ -2603,7 +2603,7 @@ void fn_1_6A34(omObjData *object) } espDispOn(var_r31->unk_14[var_r30]); 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]); } } diff --git a/src/REL/m429Dll/main.c b/src/REL/m429Dll/main.c index ba063799..10ef355d 100644 --- a/src/REL/m429Dll/main.c +++ b/src/REL/m429Dll/main.c @@ -965,7 +965,7 @@ void fn_1_2684(void) temp_r30 = frandmod(2); lbl_1_bss_190 = &lbl_1_data_1340[temp_r30]; 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); Hu3DModelRotSet(temp_r30, 0, -90.f * lbl_1_bss_34, 0); 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) { 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); omSetRot(object, 0, 0, 0); object->func = fn_1_31A8; @@ -1203,8 +1203,8 @@ void fn_1_33F8(omObjData *object) object->model[1] = Hu3DModelCreateFile(*temp_r27++); for (temp_r29 = 0; temp_r29 < 2; temp_r29++) { Hu3DModelCameraSet(object->model[temp_r29], 15); - Hu3DModelAttrSet(object->model[temp_r29], 1); - Hu3DModelAttrSet(object->model[temp_r29], 0x40000001); + Hu3DModelAttrSet(object->model[temp_r29], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[temp_r29], HU3D_MOTATTR_LOOP); Hu3DModelAttrReset(object->model[temp_r29], 0x40000002); Hu3DModelLayerSet(object->model[temp_r29], 3); 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); omSetRot(object, 0, 0, 0); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); 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]; 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; - Hu3DModelAttrSet(lbl_1_bss_19C[temp_r28]->model[0], 1); - Hu3DModelAttrReset(lbl_1_bss_19C[temp_r28]->model[1], 1); + Hu3DModelAttrSet(lbl_1_bss_19C[temp_r28]->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_19C[temp_r28]->model[1], HU3D_ATTR_DISPOFF); break; } } @@ -1938,7 +1938,7 @@ void fn_1_7D38(omObjData *object) Hu3DMotionShiftSet(object->model[0], object->motion[4], 0, 8, HU3D_MOTATTR_NONE); } 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); temp_r31->unk70 = Hu3DParManLink(lbl_1_bss_8, &lbl_1_data_13E8); 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); 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); - 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); - 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; @@ -2099,8 +2099,8 @@ void fn_1_8F68(omObjData *object) CharModelMotionSet(lbl_1_data_0[temp_r31->unk118], object->motion[temp_r29]); } Hu3DModelCameraSet(object->model[0], 15); - Hu3DModelAttrSet(object->model[0], 1); - Hu3DModelAttrSet(object->model[0], 0x40000001); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); Hu3DModelLayerSet(object->model[0], 2); Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DModelShadowSet(object->model[0]); @@ -2167,7 +2167,7 @@ void fn_1_8F68(omObjData *object) } CharModelVoiceEnableSet(temp_r31->unk118, object->motion[4], 0); fn_1_2950(temp_r31); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); CharModelLayerSetAll2(5); CharModelMotionDataClose(lbl_1_data_0[temp_r31->unk118]); object->func = fn_1_7D38; @@ -2183,8 +2183,8 @@ void fn_1_99F0(omObjData *object) for (temp_r30 = 0; temp_r30 < 2; temp_r30++) { object->model[temp_r30] = Hu3DModelCreateFile(*temp_r29++); Hu3DModelCameraSet(object->model[temp_r30], 15); - Hu3DModelAttrSet(object->model[temp_r30], 1); - Hu3DModelAttrSet(object->model[temp_r30], 0x40000002); + Hu3DModelAttrSet(object->model[temp_r30], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[temp_r30], HU3D_MOTATTR_PAUSE); Hu3DModelAttrReset(object->model[temp_r30], 0x40000001); Hu3DModelLayerSet(object->model[temp_r30], 3); 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) { lbl_1_bss_20++; 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); omDelObjEx(lbl_1_bss_33C, object); } @@ -2240,8 +2240,8 @@ void fn_1_9EEC(omObjData *object) temp_r30 = object->data; object->model[0] = Hu3DModelLink(lbl_1_bss_1A); Hu3DModelCameraSet(object->model[0], lbl_1_data_FEC[lbl_1_bss_28]); - Hu3DModelAttrSet(object->model[0], 1); - Hu3DModelAttrSet(object->model[0], 0x40000002); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(object->model[0], 4); Hu3DModelShadowSet(object->model[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); omSetRot(object, 0, temp_r30[1].x, 0); 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; } @@ -2539,7 +2539,7 @@ void fn_1_B8E0(omObjData *object) if (lbl_1_bss_28 >= 0) { Hu3DModelAttrReset(object->model[0], 0x40000002); Hu3DModelAttrReset(object->model[3], 0x40000002); - Hu3DModelAttrReset(object->model[3], 1); + Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF); } } else { @@ -2553,8 +2553,8 @@ void fn_1_B8E0(omObjData *object) lbl_1_bss_12C++; } if (lbl_1_bss_28 >= 0 && 60.0f == lbl_1_bss_12C) { - Hu3DModelAttrSet(object->model[3], 1); - Hu3DModelAttrReset(object->model[4], 1); + Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(object->model[4], 0x40000002); } 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]); Hu3DModelCameraSet(object->model[0], 15); Hu3DModelAttrSet(object->model[0], 0x4001); - Hu3DModelAttrSet(object->model[0], 0x40000002); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelAttrReset(object->model[0], 0x40000001); Hu3DModelLayerSet(object->model[0], 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)); Hu3DModelCameraSet(object->model[1], 15); Hu3DModelAttrSet(object->model[1], 0x4001); - Hu3DModelAttrSet(object->model[1], 0x40000002); + Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(object->model[1], 0); Hu3DModelShadowMapSet(object->model[1]); Hu3DModelPosSet(object->model[1], 0, 0, 0); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M429, 0x23)); Hu3DModelCameraSet(object->model[2], 15); Hu3DModelAttrSet(object->model[2], 0x4001); - Hu3DModelAttrSet(object->model[2], 0x40000002); + Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(object->model[2], 0); Hu3DModelPosSet(object->model[2], 0, 0, 0); object->model[3] = Hu3DModelCreateFile(lbl_1_bss_190->unk8[2]); Hu3DModelCameraSet(object->model[3], 15); Hu3DModelAttrSet(object->model[3], 0x4001); - Hu3DModelAttrSet(object->model[3], 0x40000002); + Hu3DModelAttrSet(object->model[3], HU3D_MOTATTR_PAUSE); Hu3DModelAttrReset(object->model[3], 0x40000001); Hu3DModelLayerSet(object->model[3], 1); 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); lbl_1_bss_114 = 45; 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; WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); @@ -2846,7 +2846,7 @@ void ObjectSetup(void) temp_r28->work[0] = temp_r31; } 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); omMakeGroupEx(lbl_1_bss_33C, 3, 20); lbl_1_bss_198 = omGetGroupMemberListEx(lbl_1_bss_33C, 3); diff --git a/src/REL/m431Dll/main.c b/src/REL/m431Dll/main.c index 6fe47c0a..594e6331 100644 --- a/src/REL/m431Dll/main.c +++ b/src/REL/m431Dll/main.c @@ -689,11 +689,11 @@ void fn_1_2110(omObjData *object) Hu3DModelLayerSet(object->model[0], 0); Hu3DModelScaleSet(object->model[0], 1.2f, 1.2f, 1.2f); temp_r31 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M431, 0x11)); - Hu3DModelAttrSet(temp_r31, 0x40000001); + Hu3DModelAttrSet(temp_r31, HU3D_MOTATTR_LOOP); Hu3DModelLayerSet(temp_r31, 0); Hu3DMotionSpeedSet(temp_r31, 0.25f); temp_r31 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M431, 0x12)); - Hu3DModelAttrSet(temp_r31, 0x40000001); + Hu3DModelAttrSet(temp_r31, HU3D_MOTATTR_LOOP); Hu3DModelLayerSet(temp_r31, 0); Hu3DMotionSpeedSet(temp_r31, 0.25f); 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)); Hu3DModelPosSet(temp_r31, 0, 0, -230); Hu3DModelShadowSet(temp_r31); - Hu3DModelAttrSet(temp_r31, 0x40000001); + Hu3DModelAttrSet(temp_r31, HU3D_MOTATTR_LOOP); Hu3DMotionSet(temp_r31, object->motion[0]); for (temp_r31 = 0; temp_r31 < 2; temp_r31++, temp_r28++) { temp_r25 = Hu3DModelCreateFile(lbl_1_data_114[0][temp_r31]); @@ -720,7 +720,7 @@ void fn_1_2110(omObjData *object) temp_f31 = 0; temp_f29 = 100; 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]); temp_f31 = 45; @@ -751,7 +751,7 @@ void fn_1_2110(omObjData *object) temp_r29->unk1C = Hu3DModelLink(temp_r28->unk4[0].unk1C); } 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->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 |= 8; temp_r31->unk20 = 0; - Hu3DModelAttrReset(temp_r31->unk1C, 1); + Hu3DModelAttrReset(temp_r31->unk1C, HU3D_ATTR_DISPOFF); } break; @@ -1164,7 +1164,7 @@ void fn_1_3D7C(Work2110 *arg0) void fn_1_3FD0(Unk72B4Data18 *arg0) { Hu3DData[arg0->unk2C].pos.y = 1000; - Hu3DModelAttrSet(arg0->unk2C, 1); + Hu3DModelAttrSet(arg0->unk2C, HU3D_ATTR_DISPOFF); } void fn_1_4028(Work2110 *arg0) diff --git a/src/REL/m431Dll/object.c b/src/REL/m431Dll/object.c index 59a2959c..e02be14d 100644 --- a/src/REL/m431Dll/object.c +++ b/src/REL/m431Dll/object.c @@ -1,22 +1,25 @@ +#include "game/chrman.h" #include "game/hsfman.h" #include "game/hsfmotion.h" -#include "game/chrman.h" + +#include "game/audio.h" +#include "game/gamework_data.h" +#include "game/minigame_seq.h" #include "game/object.h" #include "game/objsub.h" -#include "game/audio.h" -#include "game/wipe.h" #include "game/pad.h" #include "game/sprite.h" -#include "game/minigame_seq.h" -#include "game/gamework_data.h" +#include "game/wipe.h" + -#include "ext_math.h" #include "REL/m431Dll.h" +#include "ext_math.h" + typedef struct bss_struct_62C { - u8 unk0; - float unk4; + u8 unk0; + float unk4; } BssStruct62C; BssStruct62C lbl_1_bss_62C[10]; @@ -27,38 +30,14 @@ u32 lbl_1_bss_9C[4]; s8 lbl_1_bss_98; float lbl_1_data_1D0 = 18; -float lbl_1_data_1D4[8] = { - 30.000002f, - 0, - 20.0f, - 0, - 20.0f, - 50.0f, - 20.0f, - 30.000002f -}; +float lbl_1_data_1D4[8] = { 30.000002f, 0, 20.0f, 0, 20.0f, 50.0f, 20.0f, 30.000002f }; -u32 lbl_1_data_1F4[8] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03), - -1, - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x48), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x49), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x72) -}; +u32 lbl_1_data_1F4[8] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03), -1, + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x48), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x49), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x72) }; -char *lbl_1_data_230[8] = { - "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" -}; +char *lbl_1_data_230[8] = { "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" }; void fn_1_858C(omObjData *object); void fn_1_9440(omObjData *object); @@ -67,69 +46,68 @@ void fn_1_B384(Process *objman); void fn_1_7ABC(Process *objman) { - Vec sp20; - Vec sp14; - Vec sp8; - Bss12CStruct *temp_r31; - s16 temp_r30; - s16 temp_r29; - BssStruct62C *temp_r28; - omObjData *temp_r26; - omMakeGroupEx(objman, 0, 4); - omGetGroupMemberListEx(objman, 0); - memset(lbl_1_bss_12C, 0, sizeof(lbl_1_bss_12C)); - for(temp_r30=0, temp_r29=0; temp_r30<4; temp_r30++) { - temp_r31 = &lbl_1_bss_12C[GWPlayerCfg[temp_r30].group]; - if(GWPlayerCfg[temp_r30].group != 0 && GWPlayerCfg[temp_r30].group != 1) { - break; - } - temp_r31->unk0[temp_r31->unk8++] = temp_r30; - if(temp_r31->unk8 == 2) { - temp_r29++; - } - } - if(temp_r29 != 2) { - GWPlayerCfg[0].group = GWPlayerCfg[1].group = 0; - GWPlayerCfg[2].group = GWPlayerCfg[3].group = 1; - lbl_1_bss_12C[0].unk0[0] = 0; - lbl_1_bss_12C[0].unk0[1] = 1; - lbl_1_bss_12C[0].unk8 = 2; - lbl_1_bss_12C[1].unk0[0] = 2; - lbl_1_bss_12C[1].unk0[1] = 3; - lbl_1_bss_12C[1].unk8 = 2; - } - for(temp_r30=0, temp_r28 = &lbl_1_bss_62C[0]; temp_r30<10; temp_r30++, temp_r28++) { - temp_r28->unk0 = 1; - temp_r28->unk4 = lbl_1_data_1D0+(temp_r30*36.0f); - } - lbl_1_bss_12C[0].unkC.x = -317; - lbl_1_bss_12C[1].unkC.x = 317; - lbl_1_bss_12C[0].unkC.y = lbl_1_bss_12C[1].unkC.y = 0; - lbl_1_bss_12C[0].unkC.z = lbl_1_bss_12C[1].unkC.z = 100; - lbl_1_bss_12C[0].unk18 = lbl_1_bss_12C[1].unk18 = 230; - for(temp_r30=0, temp_r31 = &lbl_1_bss_12C[0]; temp_r30<2; temp_r30++, temp_r31++) { - sp8.x = temp_r31->unkC.x; - sp8.y = temp_r31->unkC.y; - sp8.z = temp_r31->unkC.z; - for(temp_r29=0; temp_r29<10; temp_r29++) { - sp14.x = sp20.x = (temp_r31->unk18*sind(lbl_1_bss_62C[temp_r29].unk4))+sp8.x; - sp14.z = sp20.z = (temp_r31->unk18*cosd(lbl_1_bss_62C[temp_r29].unk4))+sp8.z; - sp14.y = sp8.y; - sp20.y = sp8.y-50; - fn_1_6184(&sp8, &temp_r31->unk1C[temp_r29]); - temp_r31->unkE4[temp_r29][0] = sp14.x; - temp_r31->unkE4[temp_r29][1] = sp14.z; - } - temp_r31->unk138[0] = 0; - } - for(temp_r30=0; temp_r30<4; temp_r30++) { - OSReport("PNo:%d Grp:%d\n", temp_r30, GWPlayerCfg[temp_r30].group); - temp_r26 = omAddObjEx(objman, 99, 0, 0, -1, fn_1_858C); - lbl_1_bss_61C[temp_r30] = omAddObjEx(objman, 100, 9, 8, 0, fn_1_9440); - lbl_1_bss_61C[temp_r30]->work[0] = temp_r26->work[0] = temp_r30; - - } - fn_1_B384(objman); + Vec sp20; + Vec sp14; + Vec sp8; + Bss12CStruct *temp_r31; + s16 temp_r30; + s16 temp_r29; + BssStruct62C *temp_r28; + omObjData *temp_r26; + omMakeGroupEx(objman, 0, 4); + omGetGroupMemberListEx(objman, 0); + memset(lbl_1_bss_12C, 0, sizeof(lbl_1_bss_12C)); + for (temp_r30 = 0, temp_r29 = 0; temp_r30 < 4; temp_r30++) { + temp_r31 = &lbl_1_bss_12C[GWPlayerCfg[temp_r30].group]; + if (GWPlayerCfg[temp_r30].group != 0 && GWPlayerCfg[temp_r30].group != 1) { + break; + } + temp_r31->unk0[temp_r31->unk8++] = temp_r30; + if (temp_r31->unk8 == 2) { + temp_r29++; + } + } + if (temp_r29 != 2) { + GWPlayerCfg[0].group = GWPlayerCfg[1].group = 0; + GWPlayerCfg[2].group = GWPlayerCfg[3].group = 1; + lbl_1_bss_12C[0].unk0[0] = 0; + lbl_1_bss_12C[0].unk0[1] = 1; + lbl_1_bss_12C[0].unk8 = 2; + lbl_1_bss_12C[1].unk0[0] = 2; + lbl_1_bss_12C[1].unk0[1] = 3; + lbl_1_bss_12C[1].unk8 = 2; + } + for (temp_r30 = 0, temp_r28 = &lbl_1_bss_62C[0]; temp_r30 < 10; temp_r30++, temp_r28++) { + temp_r28->unk0 = 1; + temp_r28->unk4 = lbl_1_data_1D0 + (temp_r30 * 36.0f); + } + lbl_1_bss_12C[0].unkC.x = -317; + lbl_1_bss_12C[1].unkC.x = 317; + lbl_1_bss_12C[0].unkC.y = lbl_1_bss_12C[1].unkC.y = 0; + lbl_1_bss_12C[0].unkC.z = lbl_1_bss_12C[1].unkC.z = 100; + lbl_1_bss_12C[0].unk18 = lbl_1_bss_12C[1].unk18 = 230; + for (temp_r30 = 0, temp_r31 = &lbl_1_bss_12C[0]; temp_r30 < 2; temp_r30++, temp_r31++) { + sp8.x = temp_r31->unkC.x; + sp8.y = temp_r31->unkC.y; + sp8.z = temp_r31->unkC.z; + for (temp_r29 = 0; temp_r29 < 10; temp_r29++) { + sp14.x = sp20.x = (temp_r31->unk18 * sind(lbl_1_bss_62C[temp_r29].unk4)) + sp8.x; + sp14.z = sp20.z = (temp_r31->unk18 * cosd(lbl_1_bss_62C[temp_r29].unk4)) + sp8.z; + sp14.y = sp8.y; + sp20.y = sp8.y - 50; + fn_1_6184(&sp8, &temp_r31->unk1C[temp_r29]); + temp_r31->unkE4[temp_r29][0] = sp14.x; + temp_r31->unkE4[temp_r29][1] = sp14.z; + } + temp_r31->unk138[0] = 0; + } + for (temp_r30 = 0; temp_r30 < 4; temp_r30++) { + OSReport("PNo:%d Grp:%d\n", temp_r30, GWPlayerCfg[temp_r30].group); + temp_r26 = omAddObjEx(objman, 99, 0, 0, -1, fn_1_858C); + lbl_1_bss_61C[temp_r30] = omAddObjEx(objman, 100, 9, 8, 0, fn_1_9440); + lbl_1_bss_61C[temp_r30]->work[0] = temp_r26->work[0] = temp_r30; + } + fn_1_B384(objman); } s16 lbl_1_data_260[4] = { 0, 0, 0, 0 }; @@ -143,111 +121,118 @@ s16 fn_1_B530(s16 arg0); s32 fn_1_7FB8(s16 arg0) { - Bss61CWork *temp_r31; - Bss12CStruct *temp_r30 = &lbl_1_bss_12C[arg0]; - s16 sp18[4] = { 0, 9, 9, 0}; - - s16 sp14[2]; - s16 sp10[2]; - s16 spC[2]; - s16 spA; - s16 temp_r29; - s32 temp_r28; - if(lbl_1_bss_98 != 0) { - (void)lbl_1_bss_98; - } else { - for(temp_r29=0, temp_r28=0; temp_r29<2; temp_r29++) { - temp_r31 = lbl_1_bss_61C[temp_r30->unk0[temp_r29]]->data; - if((temp_r31->unk0 & 0xC0) || (temp_r31->unk0 & 0x600)) { - temp_r28 = 1; - } - fn_1_8CC0(lbl_1_bss_61C[temp_r30->unk0[temp_r29]]); - sp10[temp_r29] = temp_r31->unk40 = fn_1_B4F8(temp_r31->unk44.y); - spC[temp_r29] = fn_1_B530(temp_r31->unk40); - - } - if(temp_r28 != 0) { - return 0; - } - if(spC[0] != spC[1]) { - if(spC[0] == 0) { - temp_r31 = lbl_1_bss_61C[temp_r30->unk0[0]]->data; - temp_r31->unk84 = lbl_1_data_268[0]; - temp_r31->unk14->unk84 = lbl_1_data_268[1]; - } else { - temp_r31 = lbl_1_bss_61C[temp_r30->unk0[1]]->data; - temp_r31->unk84 = lbl_1_data_268[0]; - temp_r31->unk14->unk84 = lbl_1_data_268[1]; - } - } else { - if(spC[0] == 0) { - if(sp10[0] < sp10[1]) { - temp_r31 = lbl_1_bss_61C[temp_r30->unk0[0]]->data; - temp_r31->unk84 = lbl_1_data_268[1]; - temp_r31->unk14->unk84 = lbl_1_data_268[0]; - } else { - temp_r31 = lbl_1_bss_61C[temp_r30->unk0[1]]->data; - temp_r31->unk84 = lbl_1_data_268[1]; - temp_r31->unk14->unk84 = lbl_1_data_268[0]; - } - } else { - if(sp10[0] > sp10[1]) { - temp_r31 = lbl_1_bss_61C[temp_r30->unk0[0]]->data; - temp_r31->unk84 = lbl_1_data_268[0]; - temp_r31->unk14->unk84 = lbl_1_data_268[1]; - } else { - temp_r31 = lbl_1_bss_61C[temp_r30->unk0[1]]->data; - temp_r31->unk84 = lbl_1_data_268[0]; - temp_r31->unk14->unk84 = lbl_1_data_268[1]; - } - } - } - lbl_1_bss_98++; - } - for(temp_r29=0; temp_r29<2; temp_r29++) { - temp_r31 = lbl_1_bss_61C[temp_r30->unk0[temp_r29]]->data; - temp_r31->unkC = 0; - temp_r31->unk86 = 1; - temp_r31->unkB4 = 0; - temp_r31->unkB5 = 0; - sp14[temp_r29] = fn_1_8AD4(temp_r31, temp_r31->unk40, temp_r31->unk84, &spA, 0); - if(sp14[temp_r29] != 0) { - temp_r31->unkB4 = (spA == 0) ? 50 : -50; - } else { - temp_r31->unk86 = 0; - } - fn_1_8CC0(lbl_1_bss_61C[temp_r30->unk0[temp_r29]]); - sp14[temp_r29] = (temp_r31->unk0 & 0xC0) ? 1 : 0; - if(temp_r31->unk0 & 0x600) { - sp14[temp_r29] = 1; - } - } - if(sp14[0] == 0 && sp14[1] == 0) { - return 1; - } - return 0; + Bss61CWork *temp_r31; + Bss12CStruct *temp_r30 = &lbl_1_bss_12C[arg0]; + s16 sp18[4] = { 0, 9, 9, 0 }; + + s16 sp14[2]; + s16 sp10[2]; + s16 spC[2]; + s16 spA; + s16 temp_r29; + s32 temp_r28; + if (lbl_1_bss_98 != 0) { + (void)lbl_1_bss_98; + } + else { + for (temp_r29 = 0, temp_r28 = 0; temp_r29 < 2; temp_r29++) { + temp_r31 = lbl_1_bss_61C[temp_r30->unk0[temp_r29]]->data; + if ((temp_r31->unk0 & 0xC0) || (temp_r31->unk0 & 0x600)) { + temp_r28 = 1; + } + fn_1_8CC0(lbl_1_bss_61C[temp_r30->unk0[temp_r29]]); + sp10[temp_r29] = temp_r31->unk40 = fn_1_B4F8(temp_r31->unk44.y); + spC[temp_r29] = fn_1_B530(temp_r31->unk40); + } + if (temp_r28 != 0) { + return 0; + } + if (spC[0] != spC[1]) { + if (spC[0] == 0) { + temp_r31 = lbl_1_bss_61C[temp_r30->unk0[0]]->data; + temp_r31->unk84 = lbl_1_data_268[0]; + temp_r31->unk14->unk84 = lbl_1_data_268[1]; + } + else { + temp_r31 = lbl_1_bss_61C[temp_r30->unk0[1]]->data; + temp_r31->unk84 = lbl_1_data_268[0]; + temp_r31->unk14->unk84 = lbl_1_data_268[1]; + } + } + else { + if (spC[0] == 0) { + if (sp10[0] < sp10[1]) { + temp_r31 = lbl_1_bss_61C[temp_r30->unk0[0]]->data; + temp_r31->unk84 = lbl_1_data_268[1]; + temp_r31->unk14->unk84 = lbl_1_data_268[0]; + } + else { + temp_r31 = lbl_1_bss_61C[temp_r30->unk0[1]]->data; + temp_r31->unk84 = lbl_1_data_268[1]; + temp_r31->unk14->unk84 = lbl_1_data_268[0]; + } + } + else { + if (sp10[0] > sp10[1]) { + temp_r31 = lbl_1_bss_61C[temp_r30->unk0[0]]->data; + temp_r31->unk84 = lbl_1_data_268[0]; + temp_r31->unk14->unk84 = lbl_1_data_268[1]; + } + else { + temp_r31 = lbl_1_bss_61C[temp_r30->unk0[1]]->data; + temp_r31->unk84 = lbl_1_data_268[0]; + temp_r31->unk14->unk84 = lbl_1_data_268[1]; + } + } + } + lbl_1_bss_98++; + } + for (temp_r29 = 0; temp_r29 < 2; temp_r29++) { + temp_r31 = lbl_1_bss_61C[temp_r30->unk0[temp_r29]]->data; + temp_r31->unkC = 0; + temp_r31->unk86 = 1; + temp_r31->unkB4 = 0; + temp_r31->unkB5 = 0; + sp14[temp_r29] = fn_1_8AD4(temp_r31, temp_r31->unk40, temp_r31->unk84, &spA, 0); + if (sp14[temp_r29] != 0) { + temp_r31->unkB4 = (spA == 0) ? 50 : -50; + } + else { + temp_r31->unk86 = 0; + } + fn_1_8CC0(lbl_1_bss_61C[temp_r30->unk0[temp_r29]]); + sp14[temp_r29] = (temp_r31->unk0 & 0xC0) ? 1 : 0; + if (temp_r31->unk0 & 0x600) { + sp14[temp_r29] = 1; + } + } + if (sp14[0] == 0 && sp14[1] == 0) { + return 1; + } + return 0; } s32 fn_1_8474(s16 arg0) { - s32 spC[2]; - s32 temp_r31; - Bss61CWork *temp_r30; - Bss12CStruct *temp_r29; - temp_r29 = &lbl_1_bss_12C[arg0]; - for(temp_r31=0; temp_r31<2; temp_r31++) { - temp_r30 = lbl_1_bss_61C[temp_r29->unk0[temp_r31]]->data; - fn_1_8CC0(lbl_1_bss_61C[temp_r29->unk0[temp_r31]]); - if((temp_r30->unk0 & 0xC0) || (temp_r30->unk0 & 0x600) || (temp_r30->unk0 & 0x20)) { - spC[temp_r31] = 1; - } else { - spC[temp_r31] = 0; - } - } - if(spC[0] == 0 && spC[1] == 0) { - return 1; - } - return 0; + s32 spC[2]; + s32 temp_r31; + Bss61CWork *temp_r30; + Bss12CStruct *temp_r29; + temp_r29 = &lbl_1_bss_12C[arg0]; + for (temp_r31 = 0; temp_r31 < 2; temp_r31++) { + temp_r30 = lbl_1_bss_61C[temp_r29->unk0[temp_r31]]->data; + fn_1_8CC0(lbl_1_bss_61C[temp_r29->unk0[temp_r31]]); + if ((temp_r30->unk0 & 0xC0) || (temp_r30->unk0 & 0x600) || (temp_r30->unk0 & 0x20)) { + spC[temp_r31] = 1; + } + else { + spC[temp_r31] = 0; + } + } + if (spC[0] == 0 && spC[1] == 0) { + return 1; + } + return 0; } void fn_1_8790(omObjData *object); @@ -256,172 +241,180 @@ u32 fn_1_ABA0(omObjData *object, u32 arg1); void fn_1_858C(omObjData *object) { - Bss61CWork *temp_r31; - u16 temp_r29; - if(lbl_1_data_260[object->work[0]] == 0) { - return; - } - temp_r31 = lbl_1_bss_61C[object->work[0]]->data; - temp_r31->unkB0 = HuPadBtn[temp_r31->unk6]; - temp_r31->unkB2 = HuPadBtnDown[temp_r31->unk6]; - temp_r31->unkB4 = HuPadStkX[temp_r31->unk6]; - temp_r31->unkB5 = HuPadStkY[temp_r31->unk6]; - if(fn_1_2090(1) != 0) { - return; - } - temp_r29 = fn_1_2090(28); - if(temp_r29 == 12 || temp_r29 == 16) { - if(fn_1_ABA0(lbl_1_bss_61C[object->work[0]], 0x600) == 0 && lbl_1_data_260[object->work[0]] != 0) { - temp_r31 = lbl_1_bss_61C[object->work[0]]->data; - if(temp_r31->unk14 == 0) { - temp_r31->unk14 = fn_1_AAF0(lbl_1_bss_61C[object->work[0]]); - } - if(GWPlayerCfg[temp_r31->unk4].iscom) { - fn_1_8790(lbl_1_bss_61C[object->work[0]]); - } - fn_1_8CC0(lbl_1_bss_61C[object->work[0]]); - } - - } + Bss61CWork *temp_r31; + u16 temp_r29; + if (lbl_1_data_260[object->work[0]] == 0) { + return; + } + temp_r31 = lbl_1_bss_61C[object->work[0]]->data; + temp_r31->unkB0 = HuPadBtn[temp_r31->unk6]; + temp_r31->unkB2 = HuPadBtnDown[temp_r31->unk6]; + temp_r31->unkB4 = HuPadStkX[temp_r31->unk6]; + temp_r31->unkB5 = HuPadStkY[temp_r31->unk6]; + if (fn_1_2090(1) != 0) { + return; + } + temp_r29 = fn_1_2090(28); + if (temp_r29 == 12 || temp_r29 == 16) { + if (fn_1_ABA0(lbl_1_bss_61C[object->work[0]], 0x600) == 0 && lbl_1_data_260[object->work[0]] != 0) { + temp_r31 = lbl_1_bss_61C[object->work[0]]->data; + if (temp_r31->unk14 == 0) { + temp_r31->unk14 = fn_1_AAF0(lbl_1_bss_61C[object->work[0]]); + } + if (GWPlayerCfg[temp_r31->unk4].iscom) { + fn_1_8790(lbl_1_bss_61C[object->work[0]]); + } + fn_1_8CC0(lbl_1_bss_61C[object->work[0]]); + } + } } void fn_1_8790(omObjData *object) { - Bss61CWork *temp_r31; - s16 temp_r30; - s16 temp_r29; - s16 temp_r28; - u32 temp_r26; - s16 sp18[9]; - s16 sp8[8]; - temp_r31 = object->data; - temp_r31->unkB4 = temp_r31->unkB5 = 0; - temp_r31->unkB2 = 0; - if(fn_1_2090(224)) { - return; - } - sp18[8] = 999; - for(temp_r30=0, temp_r28=0, temp_r29=8; temp_r30unk6E; temp_r30++) { - temp_r26 = fn_1_4738(temp_r31->unkA, temp_r31->unk5E[temp_r30]); - if(temp_r26 & 0x1) { - temp_r31->unk5E[temp_r30] = -1; - } - sp18[temp_r30] = fn_1_8AD4(temp_r31, temp_r31->unk40, temp_r31->unk5E[temp_r30], &sp8[temp_r30], 1); - if(sp18[temp_r30] < sp18[temp_r29]) { - temp_r29 = temp_r30; - } - if(temp_r31->unk5E[temp_r30] == -1) { - temp_r28++; - } - } - if(temp_r28 == temp_r31->unk6E) { - return; - } - if(temp_r31->unk70 < temp_r31->unk72 && temp_r29 < 4) { - for(temp_r30=4; temp_r30unk6E; temp_r30++) { - if(sp18[temp_r30] < 10) { - temp_r29 = temp_r30; - break; - } - } - } - if(temp_r31->unk7C == 0) { - if(GWPlayerCfg[temp_r31->unk14->unk4].iscom) { - if(temp_r31->unk4 > temp_r31->unk14->unk4 && (temp_r31->unk0 & 0x20)) { - temp_r31->unk7C = 1; - } - } else { - if(temp_r31->unk0 & 0x20) { - temp_r31->unk7C = 1; - } - } - } - if(temp_r31->unk7C && temp_r28 == temp_r31->unk6E-1) { - if(++temp_r31->unk7C > 120) { - temp_r31->unk7C = 0; - } - if((temp_r31->unk14->unk0 & 0xC0) == 0x40) { - sp8[temp_r29] = 0; - } else { - if((temp_r31->unk14->unk0 & 0xC0) == 0x80) { - sp8[temp_r29] = 1; - } else { - temp_r31->unk7C = 0; - } - } - } - if(sp18[temp_r29] != -1) { - temp_r31->unkB4 = (sp8[temp_r29] == 0) ? 50 : -50; - } else { - if(temp_r31->unk44.z <= 15.0f) { - temp_r31->unkB2 = PAD_BUTTON_A; - } - } + Bss61CWork *temp_r31; + s16 temp_r30; + s16 temp_r29; + s16 temp_r28; + u32 temp_r26; + s16 sp18[9]; + s16 sp8[8]; + temp_r31 = object->data; + temp_r31->unkB4 = temp_r31->unkB5 = 0; + temp_r31->unkB2 = 0; + if (fn_1_2090(224)) { + return; + } + sp18[8] = 999; + for (temp_r30 = 0, temp_r28 = 0, temp_r29 = 8; temp_r30 < temp_r31->unk6E; temp_r30++) { + temp_r26 = fn_1_4738(temp_r31->unkA, temp_r31->unk5E[temp_r30]); + if (temp_r26 & 0x1) { + temp_r31->unk5E[temp_r30] = -1; + } + sp18[temp_r30] = fn_1_8AD4(temp_r31, temp_r31->unk40, temp_r31->unk5E[temp_r30], &sp8[temp_r30], 1); + if (sp18[temp_r30] < sp18[temp_r29]) { + temp_r29 = temp_r30; + } + if (temp_r31->unk5E[temp_r30] == -1) { + temp_r28++; + } + } + if (temp_r28 == temp_r31->unk6E) { + return; + } + if (temp_r31->unk70 < temp_r31->unk72 && temp_r29 < 4) { + for (temp_r30 = 4; temp_r30 < temp_r31->unk6E; temp_r30++) { + if (sp18[temp_r30] < 10) { + temp_r29 = temp_r30; + break; + } + } + } + if (temp_r31->unk7C == 0) { + if (GWPlayerCfg[temp_r31->unk14->unk4].iscom) { + if (temp_r31->unk4 > temp_r31->unk14->unk4 && (temp_r31->unk0 & 0x20)) { + temp_r31->unk7C = 1; + } + } + else { + if (temp_r31->unk0 & 0x20) { + temp_r31->unk7C = 1; + } + } + } + if (temp_r31->unk7C && temp_r28 == temp_r31->unk6E - 1) { + if (++temp_r31->unk7C > 120) { + temp_r31->unk7C = 0; + } + if ((temp_r31->unk14->unk0 & 0xC0) == 0x40) { + sp8[temp_r29] = 0; + } + else { + if ((temp_r31->unk14->unk0 & 0xC0) == 0x80) { + sp8[temp_r29] = 1; + } + else { + temp_r31->unk7C = 0; + } + } + } + if (sp18[temp_r29] != -1) { + temp_r31->unkB4 = (sp8[temp_r29] == 0) ? 50 : -50; + } + else { + if (temp_r31->unk44.z <= 15.0f) { + temp_r31->unkB2 = PAD_BUTTON_A; + } + } } s16 fn_1_8AD4(Bss61CWork *arg0, s16 arg1, s16 arg2, s16 *arg3, u8 arg4) { - s16 temp_r31; - s16 temp_r29; - s16 temp_r28; - s16 temp_r27; - s16 temp_r26; - s16 temp_r25; - - if(arg2 == -1) { - *arg3 = rand16()%2; - temp_r29 = 99; - } else if(arg1 == arg2) { - *arg3 = -1; - temp_r29 = (arg4) ? -1 : 0; - } else { - temp_r28 = temp_r27 = temp_r26 = temp_r25 = 0; - temp_r31 = arg1; - do { - temp_r31++; - temp_r28++; - if(temp_r31 >= 10) { - temp_r31 = 0; - } - if(arg4 && temp_r31 == arg0->unk14->unk40) { - temp_r26 = 99; - break; - } - } while(temp_r31 != arg2); - temp_r31 = arg1; - do { - temp_r31--; - temp_r27++; - if(temp_r31 < 0) { - temp_r31 = 9; - } - if(arg4 && temp_r31 == arg0->unk14->unk40) { - temp_r25 = 99; - break; - } - } while(temp_r31 != arg2); - if(temp_r26 != temp_r25) { - temp_r28 += temp_r26; - temp_r27 += temp_r25; - if(temp_r28 < temp_r27) { - *arg3 = 0; - temp_r29 = temp_r28; - } else { - *arg3 = 1; - temp_r29 = temp_r27; - } - } else { - if(temp_r28 < temp_r27) { - *arg3 = 0; - temp_r29 = temp_r28; - } else { - *arg3 = 1; - temp_r29 = temp_r27; - } - temp_r29 += 10; - } - } - return temp_r29; + s16 temp_r31; + s16 temp_r29; + s16 temp_r28; + s16 temp_r27; + s16 temp_r26; + s16 temp_r25; + + if (arg2 == -1) { + *arg3 = rand16() % 2; + temp_r29 = 99; + } + else if (arg1 == arg2) { + *arg3 = -1; + temp_r29 = (arg4) ? -1 : 0; + } + else { + temp_r28 = temp_r27 = temp_r26 = temp_r25 = 0; + temp_r31 = arg1; + do { + temp_r31++; + temp_r28++; + if (temp_r31 >= 10) { + temp_r31 = 0; + } + if (arg4 && temp_r31 == arg0->unk14->unk40) { + temp_r26 = 99; + break; + } + } while (temp_r31 != arg2); + temp_r31 = arg1; + do { + temp_r31--; + temp_r27++; + if (temp_r31 < 0) { + temp_r31 = 9; + } + if (arg4 && temp_r31 == arg0->unk14->unk40) { + temp_r25 = 99; + break; + } + } while (temp_r31 != arg2); + if (temp_r26 != temp_r25) { + temp_r28 += temp_r26; + temp_r27 += temp_r25; + if (temp_r28 < temp_r27) { + *arg3 = 0; + temp_r29 = temp_r28; + } + else { + *arg3 = 1; + temp_r29 = temp_r27; + } + } + else { + if (temp_r28 < temp_r27) { + *arg3 = 0; + temp_r29 = temp_r28; + } + else { + *arg3 = 1; + temp_r29 = temp_r27; + } + temp_r29 += 10; + } + } + return temp_r29; } s16 fn_1_938C(omObjData *object); @@ -429,169 +422,182 @@ void fn_1_ABC0(omObjData *object, u32 arg1, u32 arg2); void fn_1_8CC0(omObjData *object) { - float temp_f31; - float temp_f30; - float temp_f28; - - Bss61CWork *temp_r31; - s16 temp_r30; - s16 temp_r29; - s16 temp_r28; - s16 temp_r27; - s16 temp_r26; - - - Vec sp10; - u16 sp8; - Bss12CInner *temp_r25; - temp_r31 = object->data; - if(temp_r31->unk38 == 3 || temp_r31->unk38 == 5) { - return; - } - sp8 = fn_1_2090(28); - if((temp_r31->unk0 & 0x20) || (fn_1_2090(28) != 12 && temp_r31->unk86 == 0)) { - temp_r28 = temp_r26 = 0; - } else { - temp_r28 = temp_r31->unkB4; - temp_r26 = temp_r31->unkB5; - } - temp_r30 = temp_r29 = 0; - if(temp_r31->unk52 == 0) { - switch(temp_r31->unkC) { - case 0: - if(temp_r28 > 10) { - temp_r30 = 1; - } else if(temp_r28 < -10) { - temp_r29 = 1; - } - break; - - case 1: - if(ABS(temp_r28) >= 10 || ABS(temp_r26) >= 10) { - temp_r25 = &lbl_1_bss_12C[temp_r31->unkA].unk1C[temp_r31->unk40]; - sp10.x = temp_r28+lbl_1_bss_12C[temp_r31->unkA].unkE4[temp_r31->unk40][0]; - sp10.z = lbl_1_bss_12C[temp_r31->unkA].unkE4[temp_r31->unk40][1]-temp_r26; - temp_f28 = (temp_r25->unk0.x*sp10.x)+(temp_r25->unk0.z*sp10.z)-temp_r25->unkC; - if(temp_f28 > 0.0f) { - if(temp_r31->unk50 != temp_r31->unk40) { - if(temp_r31->unk54 == 128) { - temp_r31->unk52 = 1; - } - } else { - temp_r30 = 1; - } - } else { - if(temp_f28 < 0.0f) { - if(temp_r31->unk50 != temp_r31->unk40) { - if(temp_r31->unk54 == 64) { - temp_r31->unk52 = 1; - } - - } else { - temp_r29 = 1; - } - } - } - } - break; - } - } else { - if(temp_r31->unk58 != temp_r28 || temp_r31->unk5A != temp_r26) { - temp_r31->unk52 = 0; - } - } - temp_f31 = temp_r31->unk24.x-temp_r31->unk14->unk24.x; - temp_f30 = temp_r31->unk24.z-temp_r31->unk14->unk24.z; - temp_f28 = VECMagPoint(temp_f31, 0, temp_f30); - if(temp_f28 < 90 && (temp_r31->unk0 & 0x20) == 0) { - if(fn_1_938C(object) == 0) { - temp_r30 = 0; - temp_r29 = 1; - } else { - temp_r30 = 1; - temp_r29 = 0; - } - temp_r31->unk0 |= 0x20; - } else { - if(temp_r31->unk54 == 64) { - temp_r27 = temp_r31->unk42-temp_r31->unk40; - if(temp_r27 < 0) { - temp_r27 += 10; - } - if(temp_r27 > 1) { - temp_r31->unk42 = 1; - } - } else { - temp_r27 = temp_r31->unk40-temp_r31->unk42; - if(temp_r27 < 0) { - temp_r27 += 10; - } - if(temp_r27 > 1) { - temp_r31->unk42 = 9; - } - } - } - if(temp_r30) { - temp_r30 = 0; - if(temp_r31->unk54 == 64) { - if(temp_r31->unk44.z <= 2.0f) { - temp_r30 = 1; - } - } else if(temp_r31->unk54 == 128) { - if(temp_r31->unk40 != temp_r31->unk42) { - temp_r31->unk40 = temp_r31->unk42; - } - temp_r30 = 1; - } else { - temp_r30 = 1; - } - if(temp_r30) { - fn_1_ABC0(object, 192, 64); - temp_r31->unk42 = temp_r31->unk40+1; - if(temp_r31->unk42 >= 10) { - temp_r31->unk42 = 0; - } - } - } else if(temp_r29) { - temp_r29 = 0; - if(temp_r31->unk54 == 128) { - if(temp_r31->unk44.z <= 2.0f) { - temp_r29 = 1; - } - } else if(temp_r31->unk54 == 64) { - if(temp_r31->unk40 != temp_r31->unk42) { - temp_r31->unk40 = temp_r31->unk42; - } - temp_r29 = 1; - } else { - temp_r29 = 1; - } - if(temp_r29) { - fn_1_ABC0(object, 192, 128); - temp_r31->unk42 = temp_r31->unk40-1; - if(temp_r31->unk42 < 0) { - temp_r31->unk42 = 9; - } - } - } - temp_r31->unk50 = temp_r31->unk40; - temp_r31->unk54 = fn_1_ABA0(object, 192); - temp_r31->unk58 = temp_r28; - temp_r31->unk5A = temp_r26; + float temp_f31; + float temp_f30; + float temp_f28; + + Bss61CWork *temp_r31; + s16 temp_r30; + s16 temp_r29; + s16 temp_r28; + s16 temp_r27; + s16 temp_r26; + + Vec sp10; + u16 sp8; + Bss12CInner *temp_r25; + temp_r31 = object->data; + if (temp_r31->unk38 == 3 || temp_r31->unk38 == 5) { + return; + } + sp8 = fn_1_2090(28); + if ((temp_r31->unk0 & 0x20) || (fn_1_2090(28) != 12 && temp_r31->unk86 == 0)) { + temp_r28 = temp_r26 = 0; + } + else { + temp_r28 = temp_r31->unkB4; + temp_r26 = temp_r31->unkB5; + } + temp_r30 = temp_r29 = 0; + if (temp_r31->unk52 == 0) { + switch (temp_r31->unkC) { + case 0: + if (temp_r28 > 10) { + temp_r30 = 1; + } + else if (temp_r28 < -10) { + temp_r29 = 1; + } + break; + + case 1: + if (ABS(temp_r28) >= 10 || ABS(temp_r26) >= 10) { + temp_r25 = &lbl_1_bss_12C[temp_r31->unkA].unk1C[temp_r31->unk40]; + sp10.x = temp_r28 + lbl_1_bss_12C[temp_r31->unkA].unkE4[temp_r31->unk40][0]; + sp10.z = lbl_1_bss_12C[temp_r31->unkA].unkE4[temp_r31->unk40][1] - temp_r26; + temp_f28 = (temp_r25->unk0.x * sp10.x) + (temp_r25->unk0.z * sp10.z) - temp_r25->unkC; + if (temp_f28 > 0.0f) { + if (temp_r31->unk50 != temp_r31->unk40) { + if (temp_r31->unk54 == 128) { + temp_r31->unk52 = 1; + } + } + else { + temp_r30 = 1; + } + } + else { + if (temp_f28 < 0.0f) { + if (temp_r31->unk50 != temp_r31->unk40) { + if (temp_r31->unk54 == 64) { + temp_r31->unk52 = 1; + } + } + else { + temp_r29 = 1; + } + } + } + } + break; + } + } + else { + if (temp_r31->unk58 != temp_r28 || temp_r31->unk5A != temp_r26) { + temp_r31->unk52 = 0; + } + } + temp_f31 = temp_r31->unk24.x - temp_r31->unk14->unk24.x; + temp_f30 = temp_r31->unk24.z - temp_r31->unk14->unk24.z; + temp_f28 = VECMagPoint(temp_f31, 0, temp_f30); + if (temp_f28 < 90 && (temp_r31->unk0 & 0x20) == 0) { + if (fn_1_938C(object) == 0) { + temp_r30 = 0; + temp_r29 = 1; + } + else { + temp_r30 = 1; + temp_r29 = 0; + } + temp_r31->unk0 |= 0x20; + } + else { + if (temp_r31->unk54 == 64) { + temp_r27 = temp_r31->unk42 - temp_r31->unk40; + if (temp_r27 < 0) { + temp_r27 += 10; + } + if (temp_r27 > 1) { + temp_r31->unk42 = 1; + } + } + else { + temp_r27 = temp_r31->unk40 - temp_r31->unk42; + if (temp_r27 < 0) { + temp_r27 += 10; + } + if (temp_r27 > 1) { + temp_r31->unk42 = 9; + } + } + } + if (temp_r30) { + temp_r30 = 0; + if (temp_r31->unk54 == 64) { + if (temp_r31->unk44.z <= 2.0f) { + temp_r30 = 1; + } + } + else if (temp_r31->unk54 == 128) { + if (temp_r31->unk40 != temp_r31->unk42) { + temp_r31->unk40 = temp_r31->unk42; + } + temp_r30 = 1; + } + else { + temp_r30 = 1; + } + if (temp_r30) { + fn_1_ABC0(object, 192, 64); + temp_r31->unk42 = temp_r31->unk40 + 1; + if (temp_r31->unk42 >= 10) { + temp_r31->unk42 = 0; + } + } + } + else if (temp_r29) { + temp_r29 = 0; + if (temp_r31->unk54 == 128) { + if (temp_r31->unk44.z <= 2.0f) { + temp_r29 = 1; + } + } + else if (temp_r31->unk54 == 64) { + if (temp_r31->unk40 != temp_r31->unk42) { + temp_r31->unk40 = temp_r31->unk42; + } + temp_r29 = 1; + } + else { + temp_r29 = 1; + } + if (temp_r29) { + fn_1_ABC0(object, 192, 128); + temp_r31->unk42 = temp_r31->unk40 - 1; + if (temp_r31->unk42 < 0) { + temp_r31->unk42 = 9; + } + } + } + temp_r31->unk50 = temp_r31->unk40; + temp_r31->unk54 = fn_1_ABA0(object, 192); + temp_r31->unk58 = temp_r28; + temp_r31->unk5A = temp_r26; } s16 fn_1_938C(omObjData *object) { - Bss61CWork *temp_r31; - float temp_f31; - temp_r31 = object->data; - temp_f31 = temp_r31->unk44.y-temp_r31->unk14->unk44.y; - if(temp_f31 > 180.0f) { - temp_f31 -= 360.0f; - } else if(temp_f31 < -180.0f) { - temp_f31 = 360.0f+temp_f31; - } - return (temp_f31 <= 0.0f) ? 0 : 1; + Bss61CWork *temp_r31; + float temp_f31; + temp_r31 = object->data; + temp_f31 = temp_r31->unk44.y - temp_r31->unk14->unk44.y; + if (temp_f31 > 180.0f) { + temp_f31 -= 360.0f; + } + else if (temp_f31 < -180.0f) { + temp_f31 = 360.0f + temp_f31; + } + return (temp_f31 <= 0.0f) ? 0 : 1; } void fn_1_98D4(omObjData *object); @@ -600,64 +606,68 @@ void fn_1_B0E8(omObjData *object, s16 arg1, u32 arg2); void fn_1_9440(omObjData *object) { - Bss61CWork *temp_r31; - Bss12CStruct *temp_r29; - s16 temp_r28; - object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Bss61CWork), MEMORY_DEFAULT_NUM); - temp_r31 = object->data; - memset(temp_r31, 0, sizeof(Bss61CWork)); - object->stat |= 0x100; - temp_r31->unk4 = object->work[0]; - temp_r31->unk6 = GWPlayerCfg[temp_r31->unk4].pad_idx; - temp_r31->unk8 = GWPlayerCfg[temp_r31->unk4].character; - temp_r31->unkA = GWPlayerCfg[temp_r31->unk4].group; - temp_r31->unkC = (GWPlayerCfg[temp_r31->unk4].iscom) ? 0 : 1; - temp_r31->unkAC = 0; - object->model[0] = CharModelCreate(temp_r31->unk8, 2); - Hu3DModelLayerSet(object->model[0], 0); - Hu3DModelShadowSet(object->model[0]); - CharModelStepTypeSet(temp_r31->unk8, 0); - for(temp_r28=0; temp_r28<8; temp_r28++) { - if(lbl_1_data_1F4[temp_r28] != -1) { - object->motion[temp_r28] = CharModelMotionCreate(temp_r31->unk8, lbl_1_data_1F4[temp_r28]); - } else { - object->motion[temp_r28] = Hu3DJointMotionFile(object->model[0], DATA_MAKE_NUM(DATADIR_M431, 0x21)+temp_r31->unk8); - } - if(temp_r28 == 4 || temp_r28 == 5) { - CharModelVoiceEnableSet(temp_r31->unk8, object->motion[temp_r28], 0); - } - } - CharModelMotionDataClose(temp_r31->unk8); - temp_r29 = &lbl_1_bss_12C[temp_r31->unkA]; - for(temp_r28=0; temp_r28<8; temp_r28++) { - temp_r31->unk5E[temp_r28] = -1; - } - if(temp_r31->unkA == 0) { - if(temp_r29->unk0[0] == object->work[0]) { - temp_r31->unk44.y = lbl_1_bss_62C[9].unk4; - } else { - temp_r31->unk44.y = lbl_1_bss_62C[4].unk4; - } - } else { - if(temp_r29->unk0[0] == object->work[0]) { - temp_r31->unk44.y = lbl_1_bss_62C[5].unk4; - } else { - temp_r31->unk44.y = lbl_1_bss_62C[0].unk4; - } - } - temp_r31->unk40 = (temp_r31->unk44.y/360.0f)*10.0f; - temp_r31->unk42 = temp_r31->unk40; - temp_r31->unk10 = lbl_1_data_1D4[temp_r31->unk8]; - temp_r31->unk24.x = ((temp_r29->unk18+temp_r31->unk10)*sind(temp_r31->unk44.y))+temp_r29->unkC.x; - temp_r31->unk24.y = temp_r29->unkC.y; - temp_r31->unk24.z = ((temp_r29->unk18+temp_r31->unk10)*cosd(temp_r31->unk44.y))+temp_r29->unkC.z; - temp_r31->unk30 = atan2d(temp_r29->unkC.x-temp_r31->unk24.x, temp_r29->unkC.z-temp_r31->unk24.z); - Hu3DModelPosSet(object->model[0], temp_r31->unk24.x, temp_r31->unk24.y, temp_r31->unk24.z); - Hu3DModelRotSet(object->model[0], 0, temp_r31->unk30, 0); - temp_r31->unk38 = temp_r31->unk3A = -1; - fn_1_B0E8(object, 0, 10); - lbl_1_data_260[object->work[0]] = 1; - object->func = fn_1_98D4; + Bss61CWork *temp_r31; + Bss12CStruct *temp_r29; + s16 temp_r28; + object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Bss61CWork), MEMORY_DEFAULT_NUM); + temp_r31 = object->data; + memset(temp_r31, 0, sizeof(Bss61CWork)); + object->stat |= 0x100; + temp_r31->unk4 = object->work[0]; + temp_r31->unk6 = GWPlayerCfg[temp_r31->unk4].pad_idx; + temp_r31->unk8 = GWPlayerCfg[temp_r31->unk4].character; + temp_r31->unkA = GWPlayerCfg[temp_r31->unk4].group; + temp_r31->unkC = (GWPlayerCfg[temp_r31->unk4].iscom) ? 0 : 1; + temp_r31->unkAC = 0; + object->model[0] = CharModelCreate(temp_r31->unk8, 2); + Hu3DModelLayerSet(object->model[0], 0); + Hu3DModelShadowSet(object->model[0]); + CharModelStepTypeSet(temp_r31->unk8, 0); + for (temp_r28 = 0; temp_r28 < 8; temp_r28++) { + if (lbl_1_data_1F4[temp_r28] != -1) { + object->motion[temp_r28] = CharModelMotionCreate(temp_r31->unk8, lbl_1_data_1F4[temp_r28]); + } + else { + object->motion[temp_r28] = Hu3DJointMotionFile(object->model[0], DATA_MAKE_NUM(DATADIR_M431, 0x21) + temp_r31->unk8); + } + if (temp_r28 == 4 || temp_r28 == 5) { + CharModelVoiceEnableSet(temp_r31->unk8, object->motion[temp_r28], 0); + } + } + CharModelMotionDataClose(temp_r31->unk8); + temp_r29 = &lbl_1_bss_12C[temp_r31->unkA]; + for (temp_r28 = 0; temp_r28 < 8; temp_r28++) { + temp_r31->unk5E[temp_r28] = -1; + } + if (temp_r31->unkA == 0) { + if (temp_r29->unk0[0] == object->work[0]) { + temp_r31->unk44.y = lbl_1_bss_62C[9].unk4; + } + else { + temp_r31->unk44.y = lbl_1_bss_62C[4].unk4; + } + } + else { + if (temp_r29->unk0[0] == object->work[0]) { + temp_r31->unk44.y = lbl_1_bss_62C[5].unk4; + } + else { + temp_r31->unk44.y = lbl_1_bss_62C[0].unk4; + } + } + temp_r31->unk40 = (temp_r31->unk44.y / 360.0f) * 10.0f; + temp_r31->unk42 = temp_r31->unk40; + temp_r31->unk10 = lbl_1_data_1D4[temp_r31->unk8]; + temp_r31->unk24.x = ((temp_r29->unk18 + temp_r31->unk10) * sind(temp_r31->unk44.y)) + temp_r29->unkC.x; + temp_r31->unk24.y = temp_r29->unkC.y; + temp_r31->unk24.z = ((temp_r29->unk18 + temp_r31->unk10) * cosd(temp_r31->unk44.y)) + temp_r29->unkC.z; + temp_r31->unk30 = atan2d(temp_r29->unkC.x - temp_r31->unk24.x, temp_r29->unkC.z - temp_r31->unk24.z); + Hu3DModelPosSet(object->model[0], temp_r31->unk24.x, temp_r31->unk24.y, temp_r31->unk24.z); + Hu3DModelRotSet(object->model[0], 0, temp_r31->unk30, 0); + temp_r31->unk38 = temp_r31->unk3A = -1; + fn_1_B0E8(object, 0, 10); + lbl_1_data_260[object->work[0]] = 1; + object->func = fn_1_98D4; } void fn_1_9A04(omObjData *object); @@ -676,364 +686,384 @@ s32 fn_1_B494(s32 arg0, s32 arg1); void fn_1_98D4(omObjData *object) { - Vec sp8; - - Bss61CWork *temp_r31; - ModelData *temp_r29; - temp_r31 = object->data; - temp_r29 = &Hu3DData[object->model[0]]; - sp8.x = temp_r31->unk24.x-temp_r29->pos.x; - sp8.z = temp_r31->unk24.z-temp_r29->pos.z; - if((temp_r31->unk0 & 0x600) == 0 || 0.0f != sp8.x || 0.0f != sp8.z || (temp_r31->unk0 & 0x20)) { - fn_1_9A04(object); - fn_1_9C5C(object); - fn_1_A0F8(object); - } else { - fn_1_A450(object); - } - fn_1_B18C(object); - Hu3DModelPosSet(object->model[0], temp_r31->unk24.x, temp_r31->unk24.y, temp_r31->unk24.z); - Hu3DModelRotSet(object->model[0], 0, temp_r31->unk30, 0); - + Vec sp8; + + Bss61CWork *temp_r31; + ModelData *temp_r29; + temp_r31 = object->data; + temp_r29 = &Hu3DData[object->model[0]]; + sp8.x = temp_r31->unk24.x - temp_r29->pos.x; + sp8.z = temp_r31->unk24.z - temp_r29->pos.z; + if ((temp_r31->unk0 & 0x600) == 0 || 0.0f != sp8.x || 0.0f != sp8.z || (temp_r31->unk0 & 0x20)) { + fn_1_9A04(object); + fn_1_9C5C(object); + fn_1_A0F8(object); + } + else { + fn_1_A450(object); + } + fn_1_B18C(object); + Hu3DModelPosSet(object->model[0], temp_r31->unk24.x, temp_r31->unk24.y, temp_r31->unk24.z); + Hu3DModelRotSet(object->model[0], 0, temp_r31->unk30, 0); } void fn_1_9A04(omObjData *object) { - Bss61CWork *temp_r31; - ModelData *temp_r29; - - temp_r29 = &Hu3DData[object->model[0]]; - temp_r31 = object->data; - if(fn_1_2090(28) != 12 || fn_1_2090(224) != 0) { - return; - } - if(fn_1_4724() == 2) { - return; - } - if(fn_1_ABA0(object, 192) != 0) { - return; - } - if(temp_r31->unk38 == 0) { - if(temp_r29->unk_0C == -1 && temp_r31->unkB2 == PAD_BUTTON_A) { - if(fn_1_4CDC(temp_r31->unkA, temp_r31->unk40)) { - fn_1_B0E8(object, 3, 4); - fn_1_B130(object, 0, 8); - } - } - } else { - if(temp_r31->unk38 == 3) { - if(temp_r29->unk_0C == -1 && temp_r29->unk_64 == 14.0f) { - temp_r31->unk5C = fn_1_4B14(temp_r31->unkA, temp_r31->unk40, &temp_r31->unk7E); - if(temp_r31->unk5C != -1) { - if(temp_r31->unkA == 0) { - HuAudFXPlay(1668); - } else { - HuAudFXPlay(1673); - } - if(temp_r31->unk7E != 0) { - omVibrate(temp_r31->unk4, 12, 6, 6); - if(temp_r31->unkA == 0) { - fn_1_B494(1666, 30); - } else { - fn_1_B494(1671, 30); - } - } else { - if(temp_r31->unkA == 0) { - fn_1_B494(1667, 30); - } else { - fn_1_B494(1672, 30); - } - } - temp_r31->unk70++; - Hu3DModelPosSet(temp_r31->unk5C, 0, 0, 0); - Hu3DModelHookSet(object->model[0], lbl_1_data_230[temp_r31->unk8], temp_r31->unk5C); - fn_1_B150(object, fn_1_AA40); - } - } - } - } + Bss61CWork *temp_r31; + ModelData *temp_r29; + + temp_r29 = &Hu3DData[object->model[0]]; + temp_r31 = object->data; + if (fn_1_2090(28) != 12 || fn_1_2090(224) != 0) { + return; + } + if (fn_1_4724() == 2) { + return; + } + if (fn_1_ABA0(object, 192) != 0) { + return; + } + if (temp_r31->unk38 == 0) { + if (temp_r29->unk_0C == -1 && temp_r31->unkB2 == PAD_BUTTON_A) { + if (fn_1_4CDC(temp_r31->unkA, temp_r31->unk40)) { + fn_1_B0E8(object, 3, 4); + fn_1_B130(object, 0, 8); + } + } + } + else { + if (temp_r31->unk38 == 3) { + if (temp_r29->unk_0C == -1 && temp_r29->unk_64 == 14.0f) { + temp_r31->unk5C = fn_1_4B14(temp_r31->unkA, temp_r31->unk40, &temp_r31->unk7E); + if (temp_r31->unk5C != -1) { + if (temp_r31->unkA == 0) { + HuAudFXPlay(1668); + } + else { + HuAudFXPlay(1673); + } + if (temp_r31->unk7E != 0) { + omVibrate(temp_r31->unk4, 12, 6, 6); + if (temp_r31->unkA == 0) { + fn_1_B494(1666, 30); + } + else { + fn_1_B494(1671, 30); + } + } + else { + if (temp_r31->unkA == 0) { + fn_1_B494(1667, 30); + } + else { + fn_1_B494(1672, 30); + } + } + temp_r31->unk70++; + Hu3DModelPosSet(temp_r31->unk5C, 0, 0, 0); + Hu3DModelHookSet(object->model[0], lbl_1_data_230[temp_r31->unk8], temp_r31->unk5C); + fn_1_B150(object, fn_1_AA40); + } + } + } + } } void fn_1_9C5C(omObjData *object) { - float temp_f31; - Bss61CWork *temp_r31; - Bss12CStruct *temp_r30; - s8 temp_r29; - u32 temp_r27; - temp_r31 = object->data; - temp_r30 = &lbl_1_bss_12C[temp_r31->unkA]; - temp_r29 = 0; - if((temp_r27 = fn_1_ABA0(object, 192)) == 0) { - return; - } - if(temp_r27 == 192) { - temp_r29 = 1; - } else if(temp_r27 == 64) { - temp_r31->unk44.x += 0.3f; - if(temp_r31->unk44.x > 1.5f) { - temp_r31->unk44.x = 1.5f; - } - temp_r31->unk44.y += temp_r31->unk44.x; - temp_f31 = lbl_1_bss_62C[temp_r31->unk42].unk4; - if(temp_r31->unk40 == 9 && temp_r31->unk42 == 0) { - temp_f31 += 360.0f; - } else { - if(temp_r31->unk44.y >= 360.0f) { - temp_r31->unk44.y -= 360.0f; - } - } - temp_r31->unk44.z = ABS(temp_r31->unk44.y-temp_f31); - if(temp_r31->unk44.y >= temp_f31) { - temp_r29 = 1; - } - } else { - temp_r31->unk44.x -= 0.3f; - if(temp_r31->unk44.x < -1.5f) { - temp_r31->unk44.x = -1.5f; - } - temp_r31->unk44.y += temp_r31->unk44.x; - temp_f31 = lbl_1_bss_62C[temp_r31->unk42].unk4; - if(temp_r31->unk42 == 9 && temp_r31->unk40 == 0) { - if(temp_r31->unk44.y < 0.0f) { - temp_r31->unk44.y += 360.0f; - } else { - temp_f31 -= 360.0f; - } - } else { - if(temp_r31->unk42 == 0 || temp_r31->unk40 == 0) { - if(temp_r31->unk44.y < 0.0f) { - temp_r31->unk44.y += 360.0f; - temp_f31 += 360.0f; - } - } else { - if(temp_r31->unk44.y < 0.0f) { - temp_r31->unk44.y += 360.0f; - } - } - } - temp_r31->unk44.z = ABS(temp_r31->unk44.y-temp_f31); - if(temp_r31->unk44.y <= temp_f31) { - temp_r29 = 1; - } - } - if(temp_r29 != 0) { - temp_r31->unk44.x = 0; - temp_r31->unk44.y = lbl_1_bss_62C[temp_r31->unk42].unk4; - temp_r31->unk0 &= ~0xE0; - } - temp_r31->unk40 = (temp_r31->unk44.y/360.0f)*10.0f; - if(temp_r31->unk40 >= 10) { - temp_r31->unk40 -= 10; - } - temp_r31->unk24.x = ((temp_r30->unk18+temp_r31->unk10)*sind(temp_r31->unk44.y))+temp_r30->unkC.x; - temp_r31->unk24.y = temp_r30->unkC.y; - temp_r31->unk24.z = ((temp_r30->unk18+temp_r31->unk10)*cosd(temp_r31->unk44.y))+temp_r30->unkC.z; - fn_1_B0E8(object, 2, 8); + float temp_f31; + Bss61CWork *temp_r31; + Bss12CStruct *temp_r30; + s8 temp_r29; + u32 temp_r27; + temp_r31 = object->data; + temp_r30 = &lbl_1_bss_12C[temp_r31->unkA]; + temp_r29 = 0; + if ((temp_r27 = fn_1_ABA0(object, 192)) == 0) { + return; + } + if (temp_r27 == 192) { + temp_r29 = 1; + } + else if (temp_r27 == 64) { + temp_r31->unk44.x += 0.3f; + if (temp_r31->unk44.x > 1.5f) { + temp_r31->unk44.x = 1.5f; + } + temp_r31->unk44.y += temp_r31->unk44.x; + temp_f31 = lbl_1_bss_62C[temp_r31->unk42].unk4; + if (temp_r31->unk40 == 9 && temp_r31->unk42 == 0) { + temp_f31 += 360.0f; + } + else { + if (temp_r31->unk44.y >= 360.0f) { + temp_r31->unk44.y -= 360.0f; + } + } + temp_r31->unk44.z = ABS(temp_r31->unk44.y - temp_f31); + if (temp_r31->unk44.y >= temp_f31) { + temp_r29 = 1; + } + } + else { + temp_r31->unk44.x -= 0.3f; + if (temp_r31->unk44.x < -1.5f) { + temp_r31->unk44.x = -1.5f; + } + temp_r31->unk44.y += temp_r31->unk44.x; + temp_f31 = lbl_1_bss_62C[temp_r31->unk42].unk4; + if (temp_r31->unk42 == 9 && temp_r31->unk40 == 0) { + if (temp_r31->unk44.y < 0.0f) { + temp_r31->unk44.y += 360.0f; + } + else { + temp_f31 -= 360.0f; + } + } + else { + if (temp_r31->unk42 == 0 || temp_r31->unk40 == 0) { + if (temp_r31->unk44.y < 0.0f) { + temp_r31->unk44.y += 360.0f; + temp_f31 += 360.0f; + } + } + else { + if (temp_r31->unk44.y < 0.0f) { + temp_r31->unk44.y += 360.0f; + } + } + } + temp_r31->unk44.z = ABS(temp_r31->unk44.y - temp_f31); + if (temp_r31->unk44.y <= temp_f31) { + temp_r29 = 1; + } + } + if (temp_r29 != 0) { + temp_r31->unk44.x = 0; + temp_r31->unk44.y = lbl_1_bss_62C[temp_r31->unk42].unk4; + temp_r31->unk0 &= ~0xE0; + } + temp_r31->unk40 = (temp_r31->unk44.y / 360.0f) * 10.0f; + if (temp_r31->unk40 >= 10) { + temp_r31->unk40 -= 10; + } + temp_r31->unk24.x = ((temp_r30->unk18 + temp_r31->unk10) * sind(temp_r31->unk44.y)) + temp_r30->unkC.x; + temp_r31->unk24.y = temp_r30->unkC.y; + temp_r31->unk24.z = ((temp_r30->unk18 + temp_r31->unk10) * cosd(temp_r31->unk44.y)) + temp_r30->unkC.z; + fn_1_B0E8(object, 2, 8); } void fn_1_A0F8(omObjData *object) { - Vec sp8; - Bss61CWork *temp_r31; - ModelData *temp_r29; - Bss12CStruct *temp_r28; - s32 temp_r27; - temp_r29 = &Hu3DData[object->model[0]]; - temp_r31 = object->data; - temp_r28 = &lbl_1_bss_12C[temp_r31->unkA]; - temp_r27 = 0; - if(temp_r31->unk38 == 3 || temp_r31->unk38 == 5) { - return; - } - sp8.x = temp_r31->unk24.x-temp_r29->pos.x; - sp8.z = temp_r31->unk24.z-temp_r29->pos.z; - if(0.0f == sp8.x && 0.0f == sp8.z) { - if(fn_1_2090(224) == 0 && temp_r31->unk38 == 2 && (temp_r31->unkB0 & PAD_BUTTON_A)) { - temp_r31->unk7A = 1; - } - if(temp_r31->unk78 == 0) { - sp8.x = temp_r28->unkC.x-temp_r31->unk24.x; - sp8.z = temp_r28->unkC.z-temp_r31->unk24.z; - temp_r31->unk8C.x = temp_r31->unk30; - temp_r31->unk8C.y = atan2d(sp8.x, sp8.z); - temp_r31->unk8C.z = 0; - if(temp_r31->unk8C.y < 0.0f) { - temp_r31->unk8C.y += 360.0f; - } - temp_r31->unk78 = 1; - } - temp_r31->unk8C.z += 0.1f; - if(temp_r31->unk8C.z >= 1.0f) { - temp_r31->unk8C.z = 1.0f; - if(temp_r31->unk7A == 0) { - fn_1_B0E8(object, 0, 8); - } else { - if(fn_1_4CDC(temp_r31->unkA, temp_r31->unk40) && fn_1_2090(28) == 12 && fn_1_2090(224) == 0 && fn_1_4724() < 2) { - fn_1_B0E8(object, 3, 4); - fn_1_B130(object, 0, 8); - temp_r27 = 1; - } - if(temp_r27 == 0) { - fn_1_B0E8(object, 0, 8); - } - } - temp_r31->unk7A = 0; - } - temp_r31->unk30 = fn_1_6504(temp_r31->unk8C.x, temp_r31->unk8C.y, temp_r31->unk8C.z); - } else { - temp_r31->unk78 = temp_r31->unk7A = 0; - temp_r31->unk30 = atan2d(sp8.x, sp8.z); - if(temp_r31->unk30 < 0.0f) { - temp_r31->unk30 += 360.0f; - } - - } - lbl_1_bss_9C[object->work[0]] = temp_r31->unk0 & 0xC0; + Vec sp8; + Bss61CWork *temp_r31; + ModelData *temp_r29; + Bss12CStruct *temp_r28; + s32 temp_r27; + temp_r29 = &Hu3DData[object->model[0]]; + temp_r31 = object->data; + temp_r28 = &lbl_1_bss_12C[temp_r31->unkA]; + temp_r27 = 0; + if (temp_r31->unk38 == 3 || temp_r31->unk38 == 5) { + return; + } + sp8.x = temp_r31->unk24.x - temp_r29->pos.x; + sp8.z = temp_r31->unk24.z - temp_r29->pos.z; + if (0.0f == sp8.x && 0.0f == sp8.z) { + if (fn_1_2090(224) == 0 && temp_r31->unk38 == 2 && (temp_r31->unkB0 & PAD_BUTTON_A)) { + temp_r31->unk7A = 1; + } + if (temp_r31->unk78 == 0) { + sp8.x = temp_r28->unkC.x - temp_r31->unk24.x; + sp8.z = temp_r28->unkC.z - temp_r31->unk24.z; + temp_r31->unk8C.x = temp_r31->unk30; + temp_r31->unk8C.y = atan2d(sp8.x, sp8.z); + temp_r31->unk8C.z = 0; + if (temp_r31->unk8C.y < 0.0f) { + temp_r31->unk8C.y += 360.0f; + } + temp_r31->unk78 = 1; + } + temp_r31->unk8C.z += 0.1f; + if (temp_r31->unk8C.z >= 1.0f) { + temp_r31->unk8C.z = 1.0f; + if (temp_r31->unk7A == 0) { + fn_1_B0E8(object, 0, 8); + } + else { + if (fn_1_4CDC(temp_r31->unkA, temp_r31->unk40) && fn_1_2090(28) == 12 && fn_1_2090(224) == 0 && fn_1_4724() < 2) { + fn_1_B0E8(object, 3, 4); + fn_1_B130(object, 0, 8); + temp_r27 = 1; + } + if (temp_r27 == 0) { + fn_1_B0E8(object, 0, 8); + } + } + temp_r31->unk7A = 0; + } + temp_r31->unk30 = fn_1_6504(temp_r31->unk8C.x, temp_r31->unk8C.y, temp_r31->unk8C.z); + } + else { + temp_r31->unk78 = temp_r31->unk7A = 0; + temp_r31->unk30 = atan2d(sp8.x, sp8.z); + if (temp_r31->unk30 < 0.0f) { + temp_r31->unk30 += 360.0f; + } + } + lbl_1_bss_9C[object->work[0]] = temp_r31->unk0 & 0xC0; } void fn_1_A450(omObjData *object) { - float temp_f31; - Bss61CWork *temp_r31; - s32 temp_r29; - ModelData *temp_r28; - temp_r28 = &Hu3DData[object->model[0]]; - temp_r31 = object->data; - if(temp_r31->unk38 == 3) { - return; - } - temp_r31->unk7A = 0; - switch(temp_r31->unk80) { - case 0: - temp_r31->unk9C.y += 0.05f; - if(temp_r31->unk9C.y > 1.0f) { - temp_r31->unk9C.y = 1.0f; - temp_r31->unk80++; - } - temp_r29 = fn_1_2090(28); - if(temp_r29 >= 16 && lbl_1_bss_4) { - temp_f31 = CRot.y; - } else { - temp_f31 = 0.0f; - } - if(temp_f31 < 0.0f) { - temp_f31 += 360.0f; - } else if(temp_f31 >= 360.0f) { - temp_f31 -= 360.0f; - } - temp_r31->unk30 = fn_1_6504(temp_r31->unk9C.x, temp_f31, temp_r31->unk9C.y); - fn_1_B0E8(object, 2, 8); - break; - - case 1: - temp_r31->unk3A = -1; - temp_r29 = fn_1_2090(28); - if(temp_r29 >= 16 && lbl_1_bss_4) { - if(temp_r31->unkAC == 0) { - fn_1_B0E8(object, 6, 4); - } else { - fn_1_B0E8(object, 7, 4); - } - temp_r31->unk80 = 99; - } else { - fn_1_B0E8(object, 4, 4); - HuAudCharVoicePlay(temp_r31->unk8, 290); - temp_r31->unk80++; - } - break; - - case 2: - if(temp_r28->unk_0C == -1) { - if(Hu3DMotionTimeGet(object->model[0]) >= Hu3DMotionMaxTimeGet(object->model[0])-1.0f){ - fn_1_B0E8(object, 1, 8); - temp_r31->unk9C.y = 0; - temp_r31->unk80++; - } - } - break; - - case 3: - temp_r31->unk9C.y += 0.05f; - if(temp_r31->unk9C.y > 1.0f) { - if(fn_1_2090(1)) { - fn_1_2050(2, 2); - } - fn_1_B0E8(object, 0, 8); - fn_1_ABC0(object, 0x600, 0); - temp_r31->unk9C.y = 1.0f; - temp_r31->unk80++; - } - if(!temp_r31->unkAC) { - temp_r31->unk30 = fn_1_6504(0, temp_r31->unk9C.x, temp_r31->unk9C.y); - } - break; - } + float temp_f31; + Bss61CWork *temp_r31; + s32 temp_r29; + ModelData *temp_r28; + temp_r28 = &Hu3DData[object->model[0]]; + temp_r31 = object->data; + if (temp_r31->unk38 == 3) { + return; + } + temp_r31->unk7A = 0; + switch (temp_r31->unk80) { + case 0: + temp_r31->unk9C.y += 0.05f; + if (temp_r31->unk9C.y > 1.0f) { + temp_r31->unk9C.y = 1.0f; + temp_r31->unk80++; + } + temp_r29 = fn_1_2090(28); + if (temp_r29 >= 16 && lbl_1_bss_4) { + temp_f31 = CRot.y; + } + else { + temp_f31 = 0.0f; + } + if (temp_f31 < 0.0f) { + temp_f31 += 360.0f; + } + else if (temp_f31 >= 360.0f) { + temp_f31 -= 360.0f; + } + temp_r31->unk30 = fn_1_6504(temp_r31->unk9C.x, temp_f31, temp_r31->unk9C.y); + fn_1_B0E8(object, 2, 8); + break; + + case 1: + temp_r31->unk3A = -1; + temp_r29 = fn_1_2090(28); + if (temp_r29 >= 16 && lbl_1_bss_4) { + if (temp_r31->unkAC == 0) { + fn_1_B0E8(object, 6, 4); + } + else { + fn_1_B0E8(object, 7, 4); + } + temp_r31->unk80 = 99; + } + else { + fn_1_B0E8(object, 4, 4); + HuAudCharVoicePlay(temp_r31->unk8, 290); + temp_r31->unk80++; + } + break; + + case 2: + if (temp_r28->unk_0C == -1) { + if (Hu3DMotionTimeGet(object->model[0]) >= Hu3DMotionMaxTimeGet(object->model[0]) - 1.0f) { + fn_1_B0E8(object, 1, 8); + temp_r31->unk9C.y = 0; + temp_r31->unk80++; + } + } + break; + + case 3: + temp_r31->unk9C.y += 0.05f; + if (temp_r31->unk9C.y > 1.0f) { + if (fn_1_2090(1)) { + fn_1_2050(2, 2); + } + fn_1_B0E8(object, 0, 8); + fn_1_ABC0(object, 0x600, 0); + temp_r31->unk9C.y = 1.0f; + temp_r31->unk80++; + } + if (!temp_r31->unkAC) { + temp_r31->unk30 = fn_1_6504(0, temp_r31->unk9C.x, temp_r31->unk9C.y); + } + break; + } } void fn_1_A7D0(s16 arg0) { - Bss61CWork *temp_r31; - Bss12CStruct *temp_r30; - s16 temp_r29; - s16 temp_r28; - temp_r30 = &lbl_1_bss_12C[arg0]; - if(arg0 == -1) { - return; - } - for(temp_r29=0; temp_r29<1; temp_r29++) { - if(temp_r29 == 0) { - temp_r30 = &lbl_1_bss_12C[arg0]; - } else { - temp_r30 = &lbl_1_bss_12C[arg0^1]; - } - for(temp_r28=0; temp_r28unk8; temp_r28++) { - temp_r31 = lbl_1_bss_61C[temp_r30->unk0[temp_r28]]->data; - temp_r31->unk80 = 0; - temp_r31->unk9C.x = temp_r31->unk30; - temp_r31->unk9C.y = 0; - temp_r31->unk0 &= ~0x600; - - if(temp_r29 == 0) { - temp_r31->unk0 |= 0x200; - } else { - temp_r31->unk0 |= 0x400; - } - } - } + Bss61CWork *temp_r31; + Bss12CStruct *temp_r30; + s16 temp_r29; + s16 temp_r28; + temp_r30 = &lbl_1_bss_12C[arg0]; + if (arg0 == -1) { + return; + } + for (temp_r29 = 0; temp_r29 < 1; temp_r29++) { + if (temp_r29 == 0) { + temp_r30 = &lbl_1_bss_12C[arg0]; + } + else { + temp_r30 = &lbl_1_bss_12C[arg0 ^ 1]; + } + for (temp_r28 = 0; temp_r28 < temp_r30->unk8; temp_r28++) { + temp_r31 = lbl_1_bss_61C[temp_r30->unk0[temp_r28]]->data; + temp_r31->unk80 = 0; + temp_r31->unk9C.x = temp_r31->unk30; + temp_r31->unk9C.y = 0; + temp_r31->unk0 &= ~0x600; + + if (temp_r29 == 0) { + temp_r31->unk0 |= 0x200; + } + else { + temp_r31->unk0 |= 0x400; + } + } + } } void fn_1_A904(s16 arg0) { - Bss61CWork *temp_r31; - Bss12CStruct *temp_r30; - s16 temp_r29; - s16 temp_r28; - temp_r30 = &lbl_1_bss_12C[arg0]; - if(arg0 == -1) { - return; - } - for(temp_r29=0; temp_r29<1; temp_r29++) { - if(temp_r29 == 0) { - temp_r30 = &lbl_1_bss_12C[arg0]; - } else { - temp_r30 = &lbl_1_bss_12C[arg0^1]; - } - for(temp_r28=0; temp_r28unk8; temp_r28++) { - temp_r31 = lbl_1_bss_61C[temp_r30->unk0[temp_r28]]->data; - temp_r31->unk80 = 1; - temp_r31->unk9C.x = temp_r31->unk30; - temp_r31->unk9C.y = 0; - temp_r31->unk0 &= ~0x600; - - if(temp_r29 == 0) { - temp_r31->unk0 |= 0x200; - } else { - temp_r31->unk0 |= 0x400; - } - temp_r31->unkAC = 1; - } - } + Bss61CWork *temp_r31; + Bss12CStruct *temp_r30; + s16 temp_r29; + s16 temp_r28; + temp_r30 = &lbl_1_bss_12C[arg0]; + if (arg0 == -1) { + return; + } + for (temp_r29 = 0; temp_r29 < 1; temp_r29++) { + if (temp_r29 == 0) { + temp_r30 = &lbl_1_bss_12C[arg0]; + } + else { + temp_r30 = &lbl_1_bss_12C[arg0 ^ 1]; + } + for (temp_r28 = 0; temp_r28 < temp_r30->unk8; temp_r28++) { + temp_r31 = lbl_1_bss_61C[temp_r30->unk0[temp_r28]]->data; + temp_r31->unk80 = 1; + temp_r31->unk9C.x = temp_r31->unk30; + temp_r31->unk9C.y = 0; + temp_r31->unk0 &= ~0x600; + + if (temp_r29 == 0) { + temp_r31->unk0 |= 0x200; + } + else { + temp_r31->unk0 |= 0x400; + } + temp_r31->unkAC = 1; + } + } } void fn_1_AC80(omObjData *object, Vec *arg1); @@ -1041,228 +1071,232 @@ void fn_1_B16C(omObjData *object); void fn_1_AA40(omObjData *object) { - Vec sp8; - Bss61CWork *temp_r30; - temp_r30 = object->data; - fn_1_AC80(object, &sp8); - fn_1_5B70(sp8.x, sp8.y, sp8.z, 20, NULL, -1); - Hu3DModelAttrSet(temp_r30->unk5C, 1); - Hu3DModelHookReset(object->model[0]); - temp_r30->unk5C = -1; - if(temp_r30->unk7E == 0) { - fn_1_B0E8(object, 5, 4); - fn_1_B130(object, 0, 8); - } - fn_1_B16C(object); + Vec sp8; + Bss61CWork *temp_r30; + temp_r30 = object->data; + fn_1_AC80(object, &sp8); + fn_1_5B70(sp8.x, sp8.y, sp8.z, 20, NULL, -1); + Hu3DModelAttrSet(temp_r30->unk5C, HU3D_ATTR_DISPOFF); + Hu3DModelHookReset(object->model[0]); + temp_r30->unk5C = -1; + if (temp_r30->unk7E == 0) { + fn_1_B0E8(object, 5, 4); + fn_1_B130(object, 0, 8); + } + fn_1_B16C(object); } Bss61CWork *fn_1_AAF0(omObjData *object) { - Bss12CStruct *temp_r31; - s16 temp_r30; - Bss61CWork *temp_r29 = object->data; - s32 sp8 = 0; - - temp_r31= &lbl_1_bss_12C[temp_r29->unkA]; - for(temp_r30=0; temp_r30unk8; temp_r30++) { - if(object->work[temp_r30] != temp_r31->unk0[temp_r30]) { - return lbl_1_bss_61C[temp_r31->unk0[temp_r30]]->data; - } - } - return NULL; + Bss12CStruct *temp_r31; + s16 temp_r30; + Bss61CWork *temp_r29 = object->data; + s32 sp8 = 0; + + temp_r31 = &lbl_1_bss_12C[temp_r29->unkA]; + for (temp_r30 = 0; temp_r30 < temp_r31->unk8; temp_r30++) { + if (object->work[temp_r30] != temp_r31->unk0[temp_r30]) { + return lbl_1_bss_61C[temp_r31->unk0[temp_r30]]->data; + } + } + return NULL; } u32 fn_1_ABA0(omObjData *object, u32 arg1) { - Bss61CWork *temp_r31 = object->data; - return temp_r31->unk0 & arg1; + Bss61CWork *temp_r31 = object->data; + return temp_r31->unk0 & arg1; } void fn_1_ABC0(omObjData *object, u32 arg1, u32 arg2) { - Bss61CWork *temp_r31 = object->data; - temp_r31->unk0 &= ~arg1; - temp_r31->unk0 |= arg2; + Bss61CWork *temp_r31 = object->data; + temp_r31->unk0 &= ~arg1; + temp_r31->unk0 |= arg2; } void fn_1_ABF0(s16 arg0, u32 arg1, u32 arg2) { - Bss12CStruct *temp_r31; - Bss61CWork *temp_r30; - s16 temp_r29; - temp_r31= &lbl_1_bss_12C[arg0]; - for(temp_r29=0; temp_r29unk8; temp_r29++) { - temp_r30 = lbl_1_bss_61C[temp_r31->unk0[temp_r29]]->data; - temp_r30->unk0 &= ~arg1; - temp_r30->unk0 |= arg2; - } + Bss12CStruct *temp_r31; + Bss61CWork *temp_r30; + s16 temp_r29; + temp_r31 = &lbl_1_bss_12C[arg0]; + for (temp_r29 = 0; temp_r29 < temp_r31->unk8; temp_r29++) { + temp_r30 = lbl_1_bss_61C[temp_r31->unk0[temp_r29]]->data; + temp_r30->unk0 &= ~arg1; + temp_r30->unk0 |= arg2; + } } void fn_1_AC80(omObjData *object, Vec *arg1) { - Bss61CWork *temp_r31; - float temp_f31; - temp_r31 = object->data; - temp_f31 = lbl_1_bss_62C[temp_r31->unk40].unk4; - arg1->x = temp_r31->unk24.x-(50.0*sind(temp_f31)); - arg1->y = temp_r31->unk24.y+100; - arg1->z = temp_r31->unk24.z-(50.0*cosd(temp_f31)); + Bss61CWork *temp_r31; + float temp_f31; + temp_r31 = object->data; + temp_f31 = lbl_1_bss_62C[temp_r31->unk40].unk4; + arg1->x = temp_r31->unk24.x - (50.0 * sind(temp_f31)); + arg1->y = temp_r31->unk24.y + 100; + arg1->z = temp_r31->unk24.z - (50.0 * cosd(temp_f31)); } float fn_1_AD88(s8 arg0) { - float temp_f31; - if(arg0 > 65) { - arg0 = 65; - } else if(arg0 < -65) { - arg0 = -65; - } - temp_f31 = arg0; - temp_f31 /= 65.0f; - return temp_f31; + float temp_f31; + if (arg0 > 65) { + arg0 = 65; + } + else if (arg0 < -65) { + arg0 = -65; + } + temp_f31 = arg0; + temp_f31 /= 65.0f; + return temp_f31; } float fn_1_AE04(s8 arg0, s8 arg1) { - float temp_f30; - temp_f30 = 0.01539*VECMagPoint(arg0, arg1, 0); - if(temp_f30 > 1.0f) { - temp_f30 = 1.0f; - } - return temp_f30; + float temp_f30; + temp_f30 = 0.01539 * VECMagPoint(arg0, arg1, 0); + if (temp_f30 > 1.0f) { + temp_f30 = 1.0f; + } + return temp_f30; } void fn_1_B0E8(omObjData *object, s16 arg1, u32 arg2) { - Bss61CWork *temp_r31 = object->data; - if(temp_r31->unk38 != arg1) { - temp_r31->unk0 &= ~0xF; - temp_r31->unk38 = arg1; - temp_r31->unk0 |= arg2; - } + Bss61CWork *temp_r31 = object->data; + if (temp_r31->unk38 != arg1) { + temp_r31->unk0 &= ~0xF; + temp_r31->unk38 = arg1; + temp_r31->unk0 |= arg2; + } } void fn_1_B130(omObjData *object, s16 arg1, u32 arg2) { - Bss61CWork *temp_r31 = object->data; - temp_r31->unk3A = arg1; - temp_r31->unk3C = arg2; + Bss61CWork *temp_r31 = object->data; + temp_r31->unk3A = arg1; + temp_r31->unk3C = arg2; } void fn_1_B150(omObjData *object, omObjFunc arg1) { - Bss61CWork *temp_r31 = object->data; - temp_r31->unk34 = arg1; + Bss61CWork *temp_r31 = object->data; + temp_r31->unk34 = arg1; } void fn_1_B16C(omObjData *object) { - fn_1_B150(object, NULL); + fn_1_B150(object, NULL); } void fn_1_B18C(omObjData *object) { - Bss61CWork *temp_r31; - u32 temp_r28; - ModelData *temp_r27; - omObjFunc temp_r25; - temp_r27 = &Hu3DData[object->model[0]]; - temp_r31 = object->data; - if(temp_r31->unk0 & 0x1) { - if(temp_r31->unk3A != -1 && temp_r27->unk_0C == -1) { - if(Hu3DMotionTimeGet(object->model[0]) >= Hu3DMotionMaxTimeGet(object->model[0])) { - fn_1_B0E8(object, temp_r31->unk3A, temp_r31->unk3C); - temp_r31->unk3A = -1; - if(temp_r31->unk34) { - temp_r25 = temp_r31->unk34; - temp_r25(object); - } - } - } else { - return; - } - } else { - Hu3DModelAttrReset(object->model[0], 0x40000007); - switch(temp_r31->unk0 & 0xC) { - case 0: - temp_r28 = HU3D_MOTATTR_PAUSE; - break; - - case 4: - temp_r28 = HU3D_MOTATTR_NONE; - break; - - case 8: - temp_r28 = HU3D_MOTATTR_LOOP; - break; - } - if(temp_r31->unk0 & 0x2) { - Hu3DMotionSet(object->model[0], object->motion[temp_r31->unk38]); - Hu3DModelAttrSet(object->model[0], temp_r28); - } else { - Hu3DMotionShiftSet(object->model[0], object->motion[temp_r31->unk38], 0, 8, temp_r28); - } - temp_r31->unk0 |= 0x1; - } + Bss61CWork *temp_r31; + u32 temp_r28; + ModelData *temp_r27; + omObjFunc temp_r25; + temp_r27 = &Hu3DData[object->model[0]]; + temp_r31 = object->data; + if (temp_r31->unk0 & 0x1) { + if (temp_r31->unk3A != -1 && temp_r27->unk_0C == -1) { + if (Hu3DMotionTimeGet(object->model[0]) >= Hu3DMotionMaxTimeGet(object->model[0])) { + fn_1_B0E8(object, temp_r31->unk3A, temp_r31->unk3C); + temp_r31->unk3A = -1; + if (temp_r31->unk34) { + temp_r25 = temp_r31->unk34; + temp_r25(object); + } + } + } + else { + return; + } + } + else { + Hu3DModelAttrReset(object->model[0], 0x40000007); + switch (temp_r31->unk0 & 0xC) { + case 0: + temp_r28 = HU3D_MOTATTR_PAUSE; + break; + + case 4: + temp_r28 = HU3D_MOTATTR_NONE; + break; + + case 8: + temp_r28 = HU3D_MOTATTR_LOOP; + break; + } + if (temp_r31->unk0 & 0x2) { + Hu3DMotionSet(object->model[0], object->motion[temp_r31->unk38]); + Hu3DModelAttrSet(object->model[0], temp_r28); + } + else { + Hu3DMotionShiftSet(object->model[0], object->motion[temp_r31->unk38], 0, 8, temp_r28); + } + temp_r31->unk0 |= 0x1; + } } void fn_1_B404(omObjData *object); void fn_1_B384(Process *objman) { - s32 *temp_r31; - s32 temp_r30; - omAddObjEx(objman, 100, 0, 0, -1, fn_1_B404); - temp_r31 = &lbl_1_bss_AC[0][0]; - for(temp_r30=0; temp_r30<16; temp_r30++, temp_r31 += 2) { - temp_r31[0] = -1; - temp_r31[1] = -1; - } + s32 *temp_r31; + s32 temp_r30; + omAddObjEx(objman, 100, 0, 0, -1, fn_1_B404); + temp_r31 = &lbl_1_bss_AC[0][0]; + for (temp_r30 = 0; temp_r30 < 16; temp_r30++, temp_r31 += 2) { + temp_r31[0] = -1; + temp_r31[1] = -1; + } } void fn_1_B404(omObjData *object) { - s32 *temp_r31; - s32 temp_r30; - temp_r31 = &lbl_1_bss_AC[0][0]; - for(temp_r30=0; temp_r30<16; temp_r30++, temp_r31 += 2) { - if(temp_r31[0] >= 0 && temp_r31[1] > 0) { - if(--temp_r31[1] <= 0) { - HuAudFXPlay(temp_r31[0]); - temp_r31[0] = -1; - temp_r31[1] = -1; - } - } - } + s32 *temp_r31; + s32 temp_r30; + temp_r31 = &lbl_1_bss_AC[0][0]; + for (temp_r30 = 0; temp_r30 < 16; temp_r30++, temp_r31 += 2) { + if (temp_r31[0] >= 0 && temp_r31[1] > 0) { + if (--temp_r31[1] <= 0) { + HuAudFXPlay(temp_r31[0]); + temp_r31[0] = -1; + temp_r31[1] = -1; + } + } + } } s32 fn_1_B494(s32 arg0, s32 arg1) { - s32 *temp_r31; - s32 temp_r30; - temp_r31 = &lbl_1_bss_AC[0][0]; - for(temp_r30=0; temp_r30<16; temp_r30++, temp_r31 += 2) { - if(temp_r31[0] == -1) { - break; - } - } - if(temp_r30 >= 16) { - return -1; - } - temp_r31[0] = arg0; - temp_r31[1] = arg1; - return temp_r30; + s32 *temp_r31; + s32 temp_r30; + temp_r31 = &lbl_1_bss_AC[0][0]; + for (temp_r30 = 0; temp_r30 < 16; temp_r30++, temp_r31 += 2) { + if (temp_r31[0] == -1) { + break; + } + } + if (temp_r30 >= 16) { + return -1; + } + temp_r31[0] = arg0; + temp_r31[1] = arg1; + return temp_r30; } s16 fn_1_B4F8(float arg0) { - return 10.0f*(arg0/360.0f); + return 10.0f * (arg0 / 360.0f); } s16 fn_1_B530(s16 arg0) { - if(arg0 >= 0 && arg0 <= 4) { - return 0; - } - return 1; + if (arg0 >= 0 && arg0 <= 4) { + return 0; + } + return 1; } diff --git a/src/REL/m434Dll/fish.c b/src/REL/m434Dll/fish.c index 12c5df8c..37883dc7 100644 --- a/src/REL/m434Dll/fish.c +++ b/src/REL/m434Dll/fish.c @@ -1,23 +1,25 @@ -#include "game/object.h" -#include "game/objsub.h" +#include "game/audio.h" #include "game/hsfman.h" #include "game/hsfmotion.h" -#include "game/audio.h" +#include "game/object.h" +#include "game/objsub.h" #include "game/wipe.h" -#include "game/minigame_seq.h" -#include "game/gamework_data.h" + #include "REL/m434Dll.h" -#include "math.h" #include "ext_math.h" +#include "game/gamework_data.h" +#include "game/minigame_seq.h" +#include "math.h" + typedef struct bss_7480_struct { - s32 unk0; - s32 unk4; - s32 unk8; - float unkC; - float unk10; - Vec unk14; + s32 unk0; + s32 unk4; + s32 unk8; + float unkC; + float unk10; + Vec unk14; } Bss7480Struct; omObjData *lbl_1_bss_7880; @@ -32,60 +34,57 @@ void fn_1_6A88(omObjData *object); void fn_1_6860(Process *objman) { - float temp_f31; - Vec spC; - s32 temp_r31; - s32 temp_r30; - s32 temp_r29; - omObjData *temp_r28; - for(temp_r31=0; temp_r31<32; temp_r31++) { - lbl_1_bss_7480[temp_r31].unk4 = lbl_1_bss_7480[temp_r31].unk0 = 0; - lbl_1_bss_7480[temp_r31].unkC = lbl_1_bss_7480[temp_r31].unk10 = 0; - lbl_1_bss_7480[temp_r31].unk8 = -1; - } - spC.y = 0; - spC.z = -650; - for(temp_r31=0; temp_r31<32; temp_r31++) { - temp_r30 = temp_r31*32; - spC.x = -650.0f; - for(temp_r29=0; temp_r29<32; temp_r29++, temp_r30++) { - lbl_1_bss_6480[temp_r30] = 0; - lbl_1_bss_6080[temp_r30] = 0; - lbl_1_bss_5880[temp_r30] = 0; - temp_f31 = VECMag(&spC); - if(temp_f31 < 522.0f) { - lbl_1_bss_6080[temp_r30] = 1; - } - spC.x += (1300.0f/32.0f); - } - spC.z += (1300.0f/32.0f); - } - temp_r28 = lbl_1_bss_7880 = omAddObjEx(objman, 30, 1, 0, -1, fn_1_6A88); - temp_r28->work[0] = 0; + float temp_f31; + Vec spC; + s32 temp_r31; + s32 temp_r30; + s32 temp_r29; + omObjData *temp_r28; + for (temp_r31 = 0; temp_r31 < 32; temp_r31++) { + lbl_1_bss_7480[temp_r31].unk4 = lbl_1_bss_7480[temp_r31].unk0 = 0; + lbl_1_bss_7480[temp_r31].unkC = lbl_1_bss_7480[temp_r31].unk10 = 0; + lbl_1_bss_7480[temp_r31].unk8 = -1; + } + spC.y = 0; + spC.z = -650; + for (temp_r31 = 0; temp_r31 < 32; temp_r31++) { + temp_r30 = temp_r31 * 32; + spC.x = -650.0f; + for (temp_r29 = 0; temp_r29 < 32; temp_r29++, temp_r30++) { + lbl_1_bss_6480[temp_r30] = 0; + lbl_1_bss_6080[temp_r30] = 0; + lbl_1_bss_5880[temp_r30] = 0; + temp_f31 = VECMag(&spC); + if (temp_f31 < 522.0f) { + lbl_1_bss_6080[temp_r30] = 1; + } + spC.x += (1300.0f / 32.0f); + } + spC.z += (1300.0f / 32.0f); + } + temp_r28 = lbl_1_bss_7880 = omAddObjEx(objman, 30, 1, 0, -1, fn_1_6A88); + temp_r28->work[0] = 0; } -void fn_1_6A84(void) -{ - -} +void fn_1_6A84(void) { } typedef struct work_6A88 { - s16 unk0; - s16 unk2; - s16 unk4; - s16 unk6; - s16 unk8; - s16 unkA; - s16 unkC; - s16 unkE; - s32 unk10; - s32 unk14; - s32 unk18; - Vec unk1C; - Vec unk28; - Vec unk34; - Vec unk40; - float unk4C; + s16 unk0; + s16 unk2; + s16 unk4; + s16 unk6; + s16 unk8; + s16 unkA; + s16 unkC; + s16 unkE; + s32 unk10; + s32 unk14; + s32 unk18; + Vec unk1C; + Vec unk28; + Vec unk34; + Vec unk40; + float unk4C; } Work6A88; void fn_1_6D7C(ModelData *model, Mtx mtx); @@ -95,73 +94,67 @@ s32 fn_1_8254(s32 arg0, Vec *arg1); void fn_1_6A88(omObjData *object) { - float temp_f31; - float temp_f30; - s16 sp8[2]; - Work6A88 *temp_r31; - s32 temp_r30; - s32 temp_r28; - Work6A88 *temp_r27; - temp_r27 = HuMemDirectMallocNum(HEAP_SYSTEM, 20*sizeof(Work6A88), MEMORY_DEFAULT_NUM); - object->data = temp_r27; - memset(temp_r27, 0, 20*sizeof(Work6A88)); - for(temp_r30=0; temp_r30<2; temp_r30++) { - sp8[temp_r30] = Hu3DModelCreateFile(lbl_1_data_2C0[temp_r30]); - } - temp_r31 = temp_r27; - for(temp_r30=0; temp_r30<20; temp_r30++, temp_r31++) { - temp_r28 = 0; - if(temp_r30 >= 15) { - temp_r28++; - } - temp_r31->unk0 = temp_r28+1; - temp_r31->unk2 = Hu3DModelLink(sp8[temp_r28]); - Hu3DModelCameraSet(temp_r31->unk2, 4); - Hu3DModelLayerSet(temp_r31->unk2, 4); - temp_f31 = frandmod(360); - temp_f30 = frandmod(464); - temp_r31->unk4C = temp_f31; - temp_r31->unk1C.x = temp_f30*sind(temp_f31); - temp_r31->unk1C.y = -50.0f; - temp_r31->unk1C.z = temp_f30*cosd(temp_f31); - temp_r31->unk34.z = frandmod(360); - temp_r31->unk40.y = 1.0f; - temp_r31->unk40.z = 0; - temp_r31->unk10 = 1; - temp_r31->unk14 = 0; - temp_r31->unkE = -1; - temp_r31->unkC = 0; - temp_r31->unk18 = fn_1_8254(-1, &temp_r31->unk1C); - temp_r31->unkA = 20; - } - for(temp_r30=0; temp_r30<2; temp_r30++) { - if(sp8[temp_r30] > 0) { - Hu3DModelKill(sp8[temp_r30]); - } - - - } - object->work[1] = 140; - object->model[0] = Hu3DHookFuncCreate(fn_1_6D7C); - Hu3DModelCameraSet(object->model[0], 8); - Hu3DModelLayerSet(object->model[0], 7); - object->func = fn_1_6DB8; + float temp_f31; + float temp_f30; + s16 sp8[2]; + Work6A88 *temp_r31; + s32 temp_r30; + s32 temp_r28; + Work6A88 *temp_r27; + temp_r27 = HuMemDirectMallocNum(HEAP_SYSTEM, 20 * sizeof(Work6A88), MEMORY_DEFAULT_NUM); + object->data = temp_r27; + memset(temp_r27, 0, 20 * sizeof(Work6A88)); + for (temp_r30 = 0; temp_r30 < 2; temp_r30++) { + sp8[temp_r30] = Hu3DModelCreateFile(lbl_1_data_2C0[temp_r30]); + } + temp_r31 = temp_r27; + for (temp_r30 = 0; temp_r30 < 20; temp_r30++, temp_r31++) { + temp_r28 = 0; + if (temp_r30 >= 15) { + temp_r28++; + } + temp_r31->unk0 = temp_r28 + 1; + temp_r31->unk2 = Hu3DModelLink(sp8[temp_r28]); + Hu3DModelCameraSet(temp_r31->unk2, 4); + Hu3DModelLayerSet(temp_r31->unk2, 4); + temp_f31 = frandmod(360); + temp_f30 = frandmod(464); + temp_r31->unk4C = temp_f31; + temp_r31->unk1C.x = temp_f30 * sind(temp_f31); + temp_r31->unk1C.y = -50.0f; + temp_r31->unk1C.z = temp_f30 * cosd(temp_f31); + temp_r31->unk34.z = frandmod(360); + temp_r31->unk40.y = 1.0f; + temp_r31->unk40.z = 0; + temp_r31->unk10 = 1; + temp_r31->unk14 = 0; + temp_r31->unkE = -1; + temp_r31->unkC = 0; + temp_r31->unk18 = fn_1_8254(-1, &temp_r31->unk1C); + temp_r31->unkA = 20; + } + for (temp_r30 = 0; temp_r30 < 2; temp_r30++) { + if (sp8[temp_r30] > 0) { + Hu3DModelKill(sp8[temp_r30]); + } + } + object->work[1] = 140; + object->model[0] = Hu3DHookFuncCreate(fn_1_6D7C); + Hu3DModelCameraSet(object->model[0], 8); + Hu3DModelLayerSet(object->model[0], 7); + object->func = fn_1_6DB8; } void fn_1_6DBC(omObjData *object); void fn_1_6D7C(ModelData *model, Mtx mtx) { - if(!omPauseChk()) { - fn_1_6DBC(lbl_1_bss_7880); - } + if (!omPauseChk()) { + fn_1_6DBC(lbl_1_bss_7880); + } } - -void fn_1_6DB8(omObjData *object) -{ - -} +void fn_1_6DB8(omObjData *object) { } void fn_1_7DF0(void); s32 fn_1_84D0(Work6A88 *arg0); @@ -169,648 +162,613 @@ void fn_1_85C4(Work6A88 *arg0, Vec *arg1); void fn_1_6DBC(omObjData *object) { - Vec sp8; - float temp_f31; - float temp_f30; - Work6A88 *temp_r31; - s32 temp_r30; - s32 temp_r29; - s32 temp_r27; - s32 temp_r26; - s32 temp_r25; - s32 temp_r24; - Work6A88 *temp_r23; - temp_r23 = object->data; - fn_1_7DF0(); - if(object->work[1]) { - object->work[1]--; - return; - } - temp_r26 = 0; - temp_r31 = temp_r23; - for(temp_r27=0; temp_r27<20; temp_r27++, temp_r31++) { - temp_r30 = 0; - temp_r24 = 0; - switch(temp_r31->unk4) { - case 0: - if(temp_r31->unkC == 0) { - temp_r24 = fn_1_84D0(temp_r31); - if(temp_r24) { - temp_r30 = 1; - temp_r31->unkC = 60; - } - } else { - temp_r31->unkC--; - } - if(temp_r31->unkC == 0 && temp_r31->unk40.y > temp_r31->unk40.z) { - temp_r30 = 1; - } else { - VECSubtract(&temp_r31->unk28, &temp_r31->unk1C, &sp8); - temp_f31 = VECMag(&sp8); - if(temp_f31 < 50.0f) { - temp_r30 = 1; - } - } - if(temp_r30) { - if(temp_r31->unkC == 0) { - temp_f31 = frandmod(1000); - temp_f30 = frandmod(1000); - if(temp_f31 > temp_f30) { - temp_f30 = temp_f31; - } - temp_f30 = 0.53f*temp_f30; - temp_f31 = temp_r31->unk4C+((0.06f*frandmod(1000))-30); - temp_r31->unk4C = temp_f31; - temp_r31->unk28.x = temp_f30*sind(temp_f31); - temp_r31->unk28.z = temp_f30*cosd(temp_f31); - } else { - fn_1_85C4(temp_r31, &temp_r31->unk28); - } - temp_r31->unk28.y = temp_r31->unk1C.y; - temp_r31->unk40.y = 0; - temp_r31->unk40.z = frandmod(200)+100.0f; - temp_r31->unk34.y = 200; - if(temp_r31->unkC) { - temp_r31->unk34.y *= 2.0f; - } - } - VECSubtract(&temp_r31->unk28, &temp_r31->unk1C, &sp8); - temp_r31->unk40.x = atan2d(sp8.x, sp8.z); - if(temp_r31->unkC != 0) { - temp_r31->unk34.z = fn_1_6690(temp_r31->unk34.z, temp_r31->unk40.x, 0.15f); - temp_r31->unk4C = atan2d(temp_r31->unk28.x, temp_r31->unk28.z); - } else { - temp_r31->unk34.z = fn_1_6690(temp_r31->unk34.z, temp_r31->unk40.x, 0.07f); - } - if(temp_r31->unkC != 0) { - temp_r31->unk34.y += (300.0f-temp_r31->unk34.y)*0.02f; - } else { - temp_r31->unk34.y += (75.0f-temp_r31->unk34.y)*0.02f; - } - temp_r31->unk34.x += (temp_r31->unk34.y-temp_r31->unk34.x)*0.2f; - temp_r31->unk1C.x += sind(temp_r31->unk34.z)*((1.0f/60.0f)*temp_r31->unk34.x); - temp_r31->unk1C.z += cosd(temp_r31->unk34.z)*((1.0f/60.0f)*temp_r31->unk34.x); - temp_r31->unk40.y += (1.0f/60.0f)*temp_r31->unk34.x; - temp_r31->unk18 = fn_1_8254(temp_r31->unk18, &temp_r31->unk1C); - Hu3DModelPosSetV(temp_r31->unk2, &temp_r31->unk1C); - Hu3DModelRotSet(temp_r31->unk2, 0, temp_r31->unk34.z, 0); - break; - - case 1: - temp_r31->unk34.z += 3.0000002f; - Hu3DModelPosSetV(temp_r31->unk2, &temp_r31->unk1C); - Hu3DModelRotSet(temp_r31->unk2, 0, temp_r31->unk34.z, 0); - if(fn_1_1D54() == 4) { - Hu3DModelAttrSet(temp_r31->unk2, 1); - } - break; - - case 2: - if(temp_r31->unk14) { - if(temp_r31->unk8 == 0) { - sp8.x = (0.1f*frandmod(1000)+500.0f)-50.0f; - sp8.y = temp_r31->unk1C.y; - sp8.z = (0.1f*frandmod(1000)+500.0f)-50.0f; - if(temp_r31->unk1C.x < 0.0f) { - sp8.x = -sp8.x; - } - VECSubtract(&sp8, &temp_r31->unk1C, &sp8); - temp_r31->unk40.x = temp_r31->unk34.z = atan2d(sp8.x, sp8.z); - temp_r31->unk28.x = (1.0f/60.0f)*sp8.x; - temp_r31->unk28.y = 6.666667f; - temp_r31->unk28.z = (1.0f/60.0f)*sp8.z; - temp_r31->unk8++; - HuAudFXPlay(1734); - } - temp_r29 = 0; - if(temp_r31->unk1C.y <= -15.000001f) { - temp_r29 = 1; - } - temp_r31->unk28.y += -0.27222225f; - VECAdd(&temp_r31->unk1C, &temp_r31->unk28, &temp_r31->unk1C); - if(!temp_r29 && temp_r31->unk1C.y <= -15.000001f) { - fn_1_43AC(&temp_r31->unk1C); - if(temp_r31->unkE >= 0) { - omVibrate(temp_r31->unkE, 12, 6, 6); - temp_r31->unkE = -1; - } - HuAudFXPlay(1741); - } - sp8 = temp_r31->unk28; - sp8.y = 0; - temp_f31 = VECMag(&sp8); - temp_f31 = atan2d(temp_r31->unk28.y, temp_f31); - Hu3DModelPosSetV(temp_r31->unk2, &temp_r31->unk1C); - Hu3DModelRotSet(temp_r31->unk2, -temp_f31, temp_r31->unk34.z, 0); - if(temp_r31->unk1C.y <= -50.0) { - temp_r31->unk14 = 0; - temp_r31->unk40.z = 0; - temp_r31->unk40.y = 1; - temp_r31->unk4++; - } - } - - break; - - case 3: - if(temp_r31->unk40.y > temp_r31->unk40.z) { - temp_r30 = 1; - } - VECSubtract(&temp_r31->unk28, &temp_r31->unk1C, &sp8); - temp_f31 = VECMag(&sp8); - if(temp_f31 < 30.000002f) { - temp_r30 = 1; - } - if(temp_r30) { - temp_f31 = frandmod(360); - temp_f30 = (0.08f*frandmod(1000))+20; - temp_r31->unk28.x = temp_f30*sind(temp_f31); - temp_r31->unk28.z = temp_f30*cosd(temp_f31); - temp_r31->unk28.y = -50; - temp_r31->unk1C.y = temp_r31->unk28.y; - temp_r31->unk28.x += 480.00003f; - temp_r31->unk28.z += 480.00003f; - if(temp_r31->unk1C.x < 0.0f) { - temp_r31->unk28.x *= -1.0f; - } - temp_r31->unk40.y = 0; - temp_r31->unk40.z = frandmod(100)+100.0f; - temp_r31->unk34.y = 100; - if(frandmod(100) < 5) { - temp_r31->unk4++; - temp_r31->unk8 = 0; - HuAudFXPlay(1740); - } - } - VECSubtract(&temp_r31->unk28, &temp_r31->unk1C, &sp8); - temp_r31->unk40.x = atan2d(sp8.x, sp8.z); - temp_r31->unk34.z = fn_1_6690(temp_r31->unk34.z, temp_r31->unk40.x, 0.07f); - temp_r31->unk34.y += (50.0f-temp_r31->unk34.y)*0.02f; - temp_r31->unk34.x += (temp_r31->unk34.y-temp_r31->unk34.x)*0.2f; - temp_r31->unk1C.x += sind(temp_r31->unk34.z)*((1.0f/60.0f)*temp_r31->unk34.x); - temp_r31->unk1C.z += cosd(temp_r31->unk34.z)*((1.0f/60.0f)*temp_r31->unk34.x); - temp_r31->unk40.y += (1.0f/60.0f)*temp_r31->unk34.x; - Hu3DModelPosSetV(temp_r31->unk2, &temp_r31->unk1C); - Hu3DModelRotSet(temp_r31->unk2, 0, temp_r31->unk34.z, 0); - - break; - - case 4: - if(temp_r31->unk8 == 0) { - sp8.x = (0.1f*frandmod(1000)+480.00003f)-50.0f; - sp8.y = temp_r31->unk1C.y; - sp8.z = (0.1f*frandmod(1000)+480.00003f)-50.0f; - if(temp_r31->unk1C.x < 0) { - sp8.x = -sp8.x; - } - VECSubtract(&sp8, &temp_r31->unk1C, &sp8); - temp_r31->unk40.x = temp_r31->unk34.z = atan2d(sp8.x, sp8.z); - temp_r31->unk28.x = (1.0f/60.0f)*sp8.x; - temp_r31->unk28.y = 6.666667f; - temp_r31->unk28.z = (1.0f/60.0f)*sp8.z; - temp_r31->unk8++; - } - temp_r29 = temp_r25 = 0; - if(temp_r31->unk1C.y <= -15.000001f) { - temp_r29 = 1; - } - temp_r31->unk28.y += -0.27222225f; - VECAdd(&temp_r31->unk1C, &temp_r31->unk28, &temp_r31->unk1C); - if(temp_r31->unk1C.y <= -15.000001f) { - temp_r25 = 1; - } - if(temp_r29 != temp_r25) { - fn_1_43AC(&temp_r31->unk1C); - if(temp_r31->unk28.y < 0.0f) { - HuAudFXPlay(1741); - } - } - sp8 = temp_r31->unk28; - sp8.y = 0; - temp_f31 = VECMag(&sp8); - temp_f31 = atan2d(temp_r31->unk28.y*0.3f, temp_f31); - Hu3DModelPosSetV(temp_r31->unk2, &temp_r31->unk1C); - Hu3DModelRotSet(temp_r31->unk2, -temp_f31, temp_r31->unk34.z, 0); - if(temp_r31->unk1C.y <= -50.0) { - temp_r31->unk40.z = 0; - temp_r31->unk40.y = 1; - temp_r31->unk4--; - } - break; - } - if(temp_r31->unk4 < 2) { - temp_r26++; - } - } - if(temp_r26 == 0) { - fn_1_1D9C(); - } + Vec sp8; + float temp_f31; + float temp_f30; + Work6A88 *temp_r31; + s32 temp_r30; + s32 temp_r29; + s32 temp_r27; + s32 temp_r26; + s32 temp_r25; + s32 temp_r24; + Work6A88 *temp_r23; + temp_r23 = object->data; + fn_1_7DF0(); + if (object->work[1]) { + object->work[1]--; + return; + } + temp_r26 = 0; + temp_r31 = temp_r23; + for (temp_r27 = 0; temp_r27 < 20; temp_r27++, temp_r31++) { + temp_r30 = 0; + temp_r24 = 0; + switch (temp_r31->unk4) { + case 0: + if (temp_r31->unkC == 0) { + temp_r24 = fn_1_84D0(temp_r31); + if (temp_r24) { + temp_r30 = 1; + temp_r31->unkC = 60; + } + } + else { + temp_r31->unkC--; + } + if (temp_r31->unkC == 0 && temp_r31->unk40.y > temp_r31->unk40.z) { + temp_r30 = 1; + } + else { + VECSubtract(&temp_r31->unk28, &temp_r31->unk1C, &sp8); + temp_f31 = VECMag(&sp8); + if (temp_f31 < 50.0f) { + temp_r30 = 1; + } + } + if (temp_r30) { + if (temp_r31->unkC == 0) { + temp_f31 = frandmod(1000); + temp_f30 = frandmod(1000); + if (temp_f31 > temp_f30) { + temp_f30 = temp_f31; + } + temp_f30 = 0.53f * temp_f30; + temp_f31 = temp_r31->unk4C + ((0.06f * frandmod(1000)) - 30); + temp_r31->unk4C = temp_f31; + temp_r31->unk28.x = temp_f30 * sind(temp_f31); + temp_r31->unk28.z = temp_f30 * cosd(temp_f31); + } + else { + fn_1_85C4(temp_r31, &temp_r31->unk28); + } + temp_r31->unk28.y = temp_r31->unk1C.y; + temp_r31->unk40.y = 0; + temp_r31->unk40.z = frandmod(200) + 100.0f; + temp_r31->unk34.y = 200; + if (temp_r31->unkC) { + temp_r31->unk34.y *= 2.0f; + } + } + VECSubtract(&temp_r31->unk28, &temp_r31->unk1C, &sp8); + temp_r31->unk40.x = atan2d(sp8.x, sp8.z); + if (temp_r31->unkC != 0) { + temp_r31->unk34.z = fn_1_6690(temp_r31->unk34.z, temp_r31->unk40.x, 0.15f); + temp_r31->unk4C = atan2d(temp_r31->unk28.x, temp_r31->unk28.z); + } + else { + temp_r31->unk34.z = fn_1_6690(temp_r31->unk34.z, temp_r31->unk40.x, 0.07f); + } + if (temp_r31->unkC != 0) { + temp_r31->unk34.y += (300.0f - temp_r31->unk34.y) * 0.02f; + } + else { + temp_r31->unk34.y += (75.0f - temp_r31->unk34.y) * 0.02f; + } + temp_r31->unk34.x += (temp_r31->unk34.y - temp_r31->unk34.x) * 0.2f; + temp_r31->unk1C.x += sind(temp_r31->unk34.z) * ((1.0f / 60.0f) * temp_r31->unk34.x); + temp_r31->unk1C.z += cosd(temp_r31->unk34.z) * ((1.0f / 60.0f) * temp_r31->unk34.x); + temp_r31->unk40.y += (1.0f / 60.0f) * temp_r31->unk34.x; + temp_r31->unk18 = fn_1_8254(temp_r31->unk18, &temp_r31->unk1C); + Hu3DModelPosSetV(temp_r31->unk2, &temp_r31->unk1C); + Hu3DModelRotSet(temp_r31->unk2, 0, temp_r31->unk34.z, 0); + break; + + case 1: + temp_r31->unk34.z += 3.0000002f; + Hu3DModelPosSetV(temp_r31->unk2, &temp_r31->unk1C); + Hu3DModelRotSet(temp_r31->unk2, 0, temp_r31->unk34.z, 0); + if (fn_1_1D54() == 4) { + Hu3DModelAttrSet(temp_r31->unk2, HU3D_ATTR_DISPOFF); + } + break; + + case 2: + if (temp_r31->unk14) { + if (temp_r31->unk8 == 0) { + sp8.x = (0.1f * frandmod(1000) + 500.0f) - 50.0f; + sp8.y = temp_r31->unk1C.y; + sp8.z = (0.1f * frandmod(1000) + 500.0f) - 50.0f; + if (temp_r31->unk1C.x < 0.0f) { + sp8.x = -sp8.x; + } + VECSubtract(&sp8, &temp_r31->unk1C, &sp8); + temp_r31->unk40.x = temp_r31->unk34.z = atan2d(sp8.x, sp8.z); + temp_r31->unk28.x = (1.0f / 60.0f) * sp8.x; + temp_r31->unk28.y = 6.666667f; + temp_r31->unk28.z = (1.0f / 60.0f) * sp8.z; + temp_r31->unk8++; + HuAudFXPlay(1734); + } + temp_r29 = 0; + if (temp_r31->unk1C.y <= -15.000001f) { + temp_r29 = 1; + } + temp_r31->unk28.y += -0.27222225f; + VECAdd(&temp_r31->unk1C, &temp_r31->unk28, &temp_r31->unk1C); + if (!temp_r29 && temp_r31->unk1C.y <= -15.000001f) { + fn_1_43AC(&temp_r31->unk1C); + if (temp_r31->unkE >= 0) { + omVibrate(temp_r31->unkE, 12, 6, 6); + temp_r31->unkE = -1; + } + HuAudFXPlay(1741); + } + sp8 = temp_r31->unk28; + sp8.y = 0; + temp_f31 = VECMag(&sp8); + temp_f31 = atan2d(temp_r31->unk28.y, temp_f31); + Hu3DModelPosSetV(temp_r31->unk2, &temp_r31->unk1C); + Hu3DModelRotSet(temp_r31->unk2, -temp_f31, temp_r31->unk34.z, 0); + if (temp_r31->unk1C.y <= -50.0) { + temp_r31->unk14 = 0; + temp_r31->unk40.z = 0; + temp_r31->unk40.y = 1; + temp_r31->unk4++; + } + } + + break; + + case 3: + if (temp_r31->unk40.y > temp_r31->unk40.z) { + temp_r30 = 1; + } + VECSubtract(&temp_r31->unk28, &temp_r31->unk1C, &sp8); + temp_f31 = VECMag(&sp8); + if (temp_f31 < 30.000002f) { + temp_r30 = 1; + } + if (temp_r30) { + temp_f31 = frandmod(360); + temp_f30 = (0.08f * frandmod(1000)) + 20; + temp_r31->unk28.x = temp_f30 * sind(temp_f31); + temp_r31->unk28.z = temp_f30 * cosd(temp_f31); + temp_r31->unk28.y = -50; + temp_r31->unk1C.y = temp_r31->unk28.y; + temp_r31->unk28.x += 480.00003f; + temp_r31->unk28.z += 480.00003f; + if (temp_r31->unk1C.x < 0.0f) { + temp_r31->unk28.x *= -1.0f; + } + temp_r31->unk40.y = 0; + temp_r31->unk40.z = frandmod(100) + 100.0f; + temp_r31->unk34.y = 100; + if (frandmod(100) < 5) { + temp_r31->unk4++; + temp_r31->unk8 = 0; + HuAudFXPlay(1740); + } + } + VECSubtract(&temp_r31->unk28, &temp_r31->unk1C, &sp8); + temp_r31->unk40.x = atan2d(sp8.x, sp8.z); + temp_r31->unk34.z = fn_1_6690(temp_r31->unk34.z, temp_r31->unk40.x, 0.07f); + temp_r31->unk34.y += (50.0f - temp_r31->unk34.y) * 0.02f; + temp_r31->unk34.x += (temp_r31->unk34.y - temp_r31->unk34.x) * 0.2f; + temp_r31->unk1C.x += sind(temp_r31->unk34.z) * ((1.0f / 60.0f) * temp_r31->unk34.x); + temp_r31->unk1C.z += cosd(temp_r31->unk34.z) * ((1.0f / 60.0f) * temp_r31->unk34.x); + temp_r31->unk40.y += (1.0f / 60.0f) * temp_r31->unk34.x; + Hu3DModelPosSetV(temp_r31->unk2, &temp_r31->unk1C); + Hu3DModelRotSet(temp_r31->unk2, 0, temp_r31->unk34.z, 0); + + break; + + case 4: + if (temp_r31->unk8 == 0) { + sp8.x = (0.1f * frandmod(1000) + 480.00003f) - 50.0f; + sp8.y = temp_r31->unk1C.y; + sp8.z = (0.1f * frandmod(1000) + 480.00003f) - 50.0f; + if (temp_r31->unk1C.x < 0) { + sp8.x = -sp8.x; + } + VECSubtract(&sp8, &temp_r31->unk1C, &sp8); + temp_r31->unk40.x = temp_r31->unk34.z = atan2d(sp8.x, sp8.z); + temp_r31->unk28.x = (1.0f / 60.0f) * sp8.x; + temp_r31->unk28.y = 6.666667f; + temp_r31->unk28.z = (1.0f / 60.0f) * sp8.z; + temp_r31->unk8++; + } + temp_r29 = temp_r25 = 0; + if (temp_r31->unk1C.y <= -15.000001f) { + temp_r29 = 1; + } + temp_r31->unk28.y += -0.27222225f; + VECAdd(&temp_r31->unk1C, &temp_r31->unk28, &temp_r31->unk1C); + if (temp_r31->unk1C.y <= -15.000001f) { + temp_r25 = 1; + } + if (temp_r29 != temp_r25) { + fn_1_43AC(&temp_r31->unk1C); + if (temp_r31->unk28.y < 0.0f) { + HuAudFXPlay(1741); + } + } + sp8 = temp_r31->unk28; + sp8.y = 0; + temp_f31 = VECMag(&sp8); + temp_f31 = atan2d(temp_r31->unk28.y * 0.3f, temp_f31); + Hu3DModelPosSetV(temp_r31->unk2, &temp_r31->unk1C); + Hu3DModelRotSet(temp_r31->unk2, -temp_f31, temp_r31->unk34.z, 0); + if (temp_r31->unk1C.y <= -50.0) { + temp_r31->unk40.z = 0; + temp_r31->unk40.y = 1; + temp_r31->unk4--; + } + break; + } + if (temp_r31->unk4 < 2) { + temp_r26++; + } + } + if (temp_r26 == 0) { + fn_1_1D9C(); + } } void fn_1_7DF0(void) { - Vec sp14; - Vec sp8; - float temp_f31; - float temp_f30; - - Bss7480Struct *temp_r31; - s32 temp_r30; - s32 temp_r29; - s32 temp_r28; - s32 temp_r27; - s32 temp_r26; - s32 temp_r25; - s32 temp_r24; - - temp_r31 = lbl_1_bss_7480; - temp_r31 = lbl_1_bss_7480; - for(temp_r30=0; temp_r30<32; temp_r30++, temp_r31++) { - if(temp_r31->unk0 == 0) { - continue; - } - temp_r31->unk0--; - if(temp_r31->unk4) { - temp_r31->unk4--; - temp_r31->unkC += (temp_r31->unk10-temp_r31->unkC)*0.2f; - } else { - if(temp_r31->unk0 < 100.0f) { - temp_r31->unkC *= 0.98f; - } - } - } - for(temp_r30=0; temp_r30<1024; temp_r30++) { - lbl_1_bss_6480[temp_r30] = 0; - } - temp_r31 = lbl_1_bss_7480; - for(temp_r30=0; temp_r30<32; temp_r30++, temp_r31++) { - if(temp_r31->unk0 == 0) { - continue; - } - temp_r28 = (16.0f/650.0f)*(650.0f+(temp_r31->unk14.x-temp_r31->unkC)); - temp_r25 = 1.0f+(temp_r28+((16.0f/650.0f)*(2.0f*temp_r31->unkC))); - temp_r29 = (16.0f/650.0f)*(650.0f+(temp_r31->unk14.z-temp_r31->unkC)); - temp_r24 = 1.0f+(temp_r29+((16.0f/650.0f)*(2.0f*temp_r31->unkC))); - if(temp_r28 < 0) { - temp_r28 = 0; - } - if(temp_r25 > 32) { - temp_r25 = 32; - } - if(temp_r29 < 0) { - temp_r29 = 0; - } - if(temp_r24 > 32) { - temp_r24 = 32; - } - temp_f30 = 1.0f/temp_r31->unkC; - sp14.y = 0; - sp14.z = ((1300.0f/32.0f)*temp_r29)-650.0f; - while(temp_r29unk14, &sp14, &sp8); - temp_f31 = 1.0f-(temp_f30*VECMag(&sp8)); - if(temp_f31 > 0.0f) { - lbl_1_bss_6480[temp_r26] += temp_f31; - } - sp14.x += (1300.0f/32.0f); - } - sp14.z += (1300.0f/32.0f); - temp_r29++; - } - } - + Vec sp14; + Vec sp8; + float temp_f31; + float temp_f30; + + Bss7480Struct *temp_r31; + s32 temp_r30; + s32 temp_r29; + s32 temp_r28; + s32 temp_r27; + s32 temp_r26; + s32 temp_r25; + s32 temp_r24; + + temp_r31 = lbl_1_bss_7480; + temp_r31 = lbl_1_bss_7480; + for (temp_r30 = 0; temp_r30 < 32; temp_r30++, temp_r31++) { + if (temp_r31->unk0 == 0) { + continue; + } + temp_r31->unk0--; + if (temp_r31->unk4) { + temp_r31->unk4--; + temp_r31->unkC += (temp_r31->unk10 - temp_r31->unkC) * 0.2f; + } + else { + if (temp_r31->unk0 < 100.0f) { + temp_r31->unkC *= 0.98f; + } + } + } + for (temp_r30 = 0; temp_r30 < 1024; temp_r30++) { + lbl_1_bss_6480[temp_r30] = 0; + } + temp_r31 = lbl_1_bss_7480; + for (temp_r30 = 0; temp_r30 < 32; temp_r30++, temp_r31++) { + if (temp_r31->unk0 == 0) { + continue; + } + temp_r28 = (16.0f / 650.0f) * (650.0f + (temp_r31->unk14.x - temp_r31->unkC)); + temp_r25 = 1.0f + (temp_r28 + ((16.0f / 650.0f) * (2.0f * temp_r31->unkC))); + temp_r29 = (16.0f / 650.0f) * (650.0f + (temp_r31->unk14.z - temp_r31->unkC)); + temp_r24 = 1.0f + (temp_r29 + ((16.0f / 650.0f) * (2.0f * temp_r31->unkC))); + if (temp_r28 < 0) { + temp_r28 = 0; + } + if (temp_r25 > 32) { + temp_r25 = 32; + } + if (temp_r29 < 0) { + temp_r29 = 0; + } + if (temp_r24 > 32) { + temp_r24 = 32; + } + temp_f30 = 1.0f / temp_r31->unkC; + sp14.y = 0; + sp14.z = ((1300.0f / 32.0f) * temp_r29) - 650.0f; + while (temp_r29 < temp_r24) { + sp14.x = ((1300.0f / 32.0f) * temp_r28) - 650.0f; + temp_r26 = temp_r28 + (32 * temp_r29); + for (temp_r27 = temp_r28; temp_r27 < temp_r25; temp_r27++, temp_r26++) { + VECSubtract(&temp_r31->unk14, &sp14, &sp8); + temp_f31 = 1.0f - (temp_f30 * VECMag(&sp8)); + if (temp_f31 > 0.0f) { + lbl_1_bss_6480[temp_r26] += temp_f31; + } + sp14.x += (1300.0f / 32.0f); + } + sp14.z += (1300.0f / 32.0f); + temp_r29++; + } + } } void fn_1_83C8(s32 arg0); s32 fn_1_8254(s32 arg0, Vec *arg1) { - s32 temp_r31; - s32 temp_r30; - s32 temp_r29; - s32 temp_r28; - s32 temp_r27; - s32 sp8[9][2] = { - -1,-1, - 0,-1, - 1,-1, - -1,0, - 0,0, - 1,0, - -1,1, - 0,1, - 1,1 - }; - fn_1_83C8(arg0); - arg0 = -1; - temp_r29 = (16.0f/650.0f)*(650.0f+arg1->x); - temp_r30 = (16.0f/650.0f)*(650.0f+arg1->z); - if(temp_r29 >= 0 && temp_r29 < 32 && temp_r30 >= 0 && temp_r30 < 32) { - arg0 = temp_r29+(32*temp_r30); - for(temp_r31=0; temp_r31<9; temp_r31++) { - temp_r28 = temp_r29+sp8[temp_r31][0]; - temp_r27 = temp_r30+sp8[temp_r31][1]; - if(temp_r28 >= 0 && temp_r28 < 32 && temp_r27 >= 0 && temp_r27 < 32) { - lbl_1_bss_5880[temp_r28+(32*temp_r27)]++; - } - } - } - return arg0; + s32 temp_r31; + s32 temp_r30; + s32 temp_r29; + s32 temp_r28; + s32 temp_r27; + s32 sp8[9][2] = { -1, -1, 0, -1, 1, -1, -1, 0, 0, 0, 1, 0, -1, 1, 0, 1, 1, 1 }; + fn_1_83C8(arg0); + arg0 = -1; + temp_r29 = (16.0f / 650.0f) * (650.0f + arg1->x); + temp_r30 = (16.0f / 650.0f) * (650.0f + arg1->z); + if (temp_r29 >= 0 && temp_r29 < 32 && temp_r30 >= 0 && temp_r30 < 32) { + arg0 = temp_r29 + (32 * temp_r30); + for (temp_r31 = 0; temp_r31 < 9; temp_r31++) { + temp_r28 = temp_r29 + sp8[temp_r31][0]; + temp_r27 = temp_r30 + sp8[temp_r31][1]; + if (temp_r28 >= 0 && temp_r28 < 32 && temp_r27 >= 0 && temp_r27 < 32) { + lbl_1_bss_5880[temp_r28 + (32 * temp_r27)]++; + } + } + } + return arg0; } void fn_1_83C8(s32 arg0) { - s32 temp_r31; - s32 temp_r30; - s32 temp_r29; - s32 temp_r28; - s32 temp_r27; - s32 sp8[9][2] = { - -1,-1, - 0,-1, - 1,-1, - -1,0, - 0,0, - 1,0, - -1,1, - 0,1, - 1,1 - }; - if(arg0 < 0 || arg0 >= 1024) { - return; - } - temp_r28 = arg0%32; - temp_r27 = (arg0-temp_r28)/32; - for(temp_r31=0; temp_r31<9; temp_r31++) { - temp_r30 = temp_r28+sp8[temp_r31][0]; - temp_r29 = temp_r27+sp8[temp_r31][1]; - if(temp_r30 >= 0 && temp_r30 < 32 && temp_r29 >= 0 && temp_r29 < 32) { - lbl_1_bss_5880[temp_r30+(32*temp_r29)]--; - } - } + s32 temp_r31; + s32 temp_r30; + s32 temp_r29; + s32 temp_r28; + s32 temp_r27; + s32 sp8[9][2] = { -1, -1, 0, -1, 1, -1, -1, 0, 0, 0, 1, 0, -1, 1, 0, 1, 1, 1 }; + if (arg0 < 0 || arg0 >= 1024) { + return; + } + temp_r28 = arg0 % 32; + temp_r27 = (arg0 - temp_r28) / 32; + for (temp_r31 = 0; temp_r31 < 9; temp_r31++) { + temp_r30 = temp_r28 + sp8[temp_r31][0]; + temp_r29 = temp_r27 + sp8[temp_r31][1]; + if (temp_r30 >= 0 && temp_r30 < 32 && temp_r29 >= 0 && temp_r29 < 32) { + lbl_1_bss_5880[temp_r30 + (32 * temp_r29)]--; + } + } } s32 fn_1_84D0(Work6A88 *arg0) { - float temp_f31; - Vec spC; - Bss7480Struct *temp_r31; - s32 temp_r30; - s32 temp_r29; - s32 temp_r28; - temp_r31 = lbl_1_bss_7480; - temp_r28 = 0; - temp_r31 = lbl_1_bss_7480; - for(temp_r29=0; temp_r29<32; temp_r29++, temp_r31++) { - if(temp_r31->unk0 == 0) { - continue; - } - VECSubtract(&temp_r31->unk14, &arg0->unk1C, &spC); - temp_f31 = 1.0f-(VECMag(&spC)/temp_r31->unkC); - if(temp_f31 < 0.3f) { - continue; - } - temp_r30 = 1; - if(temp_r31->unk4) { - temp_r30++; - } - if(temp_r28 < temp_r30) { - temp_r28 = temp_r30; - } - } - return temp_r28; + float temp_f31; + Vec spC; + Bss7480Struct *temp_r31; + s32 temp_r30; + s32 temp_r29; + s32 temp_r28; + temp_r31 = lbl_1_bss_7480; + temp_r28 = 0; + temp_r31 = lbl_1_bss_7480; + for (temp_r29 = 0; temp_r29 < 32; temp_r29++, temp_r31++) { + if (temp_r31->unk0 == 0) { + continue; + } + VECSubtract(&temp_r31->unk14, &arg0->unk1C, &spC); + temp_f31 = 1.0f - (VECMag(&spC) / temp_r31->unkC); + if (temp_f31 < 0.3f) { + continue; + } + temp_r30 = 1; + if (temp_r31->unk4) { + temp_r30++; + } + if (temp_r28 < temp_r30) { + temp_r28 = temp_r30; + } + } + return temp_r28; } void fn_1_85C4(Work6A88 *arg0, Vec *arg1) { - Vec sp24; - Vec sp18; - Vec spC; - float temp_f31; - float temp_f30; - s32 temp_r31; - s32 temp_r30; - s32 temp_r29; - sp18.x = sp18.y = sp18.z = 0; - temp_f30 = 5000; - sp24.y = 0; - sp24.z = -650; - for(temp_r30=0; temp_r30<32; temp_r30++) { - temp_r31 = 32*temp_r30; - sp24.x = -650; - for(temp_r29=0; temp_r29<32; temp_r29++, temp_r31++) { - if(lbl_1_bss_6480[temp_r31] < 0.15f && lbl_1_bss_6080[temp_r31]) { - VECSubtract(&arg0->unk1C, &sp24, &spC); - temp_f31 = VECMag(&spC); - if(temp_f31 > 81.25f) { - temp_f31 += 162.5f*lbl_1_bss_5880[temp_r31]; - if(temp_f31 < temp_f30) { - temp_f30 = temp_f31; - sp18 = sp24; - } - } - } - sp24.x += (1300.0f/32.0f); - } - sp24.z += (1300.0f/32.0f); - } - sp18.x += ((1300.0f/32000.0f)*frandmod(1000))-(1300.0f/64.0f); - sp18.z += ((1300.0f/32000.0f)*frandmod(1000))-(1300.0f/64.0f); - *arg1 = sp18; + Vec sp24; + Vec sp18; + Vec spC; + float temp_f31; + float temp_f30; + s32 temp_r31; + s32 temp_r30; + s32 temp_r29; + sp18.x = sp18.y = sp18.z = 0; + temp_f30 = 5000; + sp24.y = 0; + sp24.z = -650; + for (temp_r30 = 0; temp_r30 < 32; temp_r30++) { + temp_r31 = 32 * temp_r30; + sp24.x = -650; + for (temp_r29 = 0; temp_r29 < 32; temp_r29++, temp_r31++) { + if (lbl_1_bss_6480[temp_r31] < 0.15f && lbl_1_bss_6080[temp_r31]) { + VECSubtract(&arg0->unk1C, &sp24, &spC); + temp_f31 = VECMag(&spC); + if (temp_f31 > 81.25f) { + temp_f31 += 162.5f * lbl_1_bss_5880[temp_r31]; + if (temp_f31 < temp_f30) { + temp_f30 = temp_f31; + sp18 = sp24; + } + } + } + sp24.x += (1300.0f / 32.0f); + } + sp24.z += (1300.0f / 32.0f); + } + sp18.x += ((1300.0f / 32000.0f) * frandmod(1000)) - (1300.0f / 64.0f); + sp18.z += ((1300.0f / 32000.0f) * frandmod(1000)) - (1300.0f / 64.0f); + *arg1 = sp18; } s32 fn_1_8884(Vec *arg0, float arg1, float arg2, float arg3, float arg4, float arg5, s32 arg6, s32 arg7) { - float temp_f31; - float temp_f30; - Vec sp24; - Work6A88 *temp_r31; - s32 temp_r30; - s32 temp_r28; - Work6A88 *temp_r23; - temp_r23 = lbl_1_bss_7880->data; - temp_r30 = -1; - temp_r31 = temp_r23; - for(temp_r28=0; temp_r28<20; temp_r28++, temp_r31++) { - if(temp_r31->unk10 == 0) { - continue; - } - VECSubtract(&temp_r31->unk1C, arg0, &sp24); - temp_f30 = VECMag(&sp24); - if(temp_f30 < arg1 || temp_f30 > arg2) { - continue; - } - temp_f31 = atan2d(sp24.x, sp24.z); - temp_f31 = fn_1_67AC(arg3, temp_f31); - if(temp_f31 < arg4 || temp_f31 > arg5) { - continue; - } - temp_r30++; - if(arg6) { - temp_r31->unk14 = 1; - temp_r31->unk10 = 0; - temp_r31->unk4 = 1; - fn_1_83C8(temp_r31->unk18); - temp_r31->unk18 = -1; - temp_r31->unkE = arg7; - HuAudFXPlay(1733); - temp_r30 = temp_r28; - break; - } - - } - if(!arg6) { - temp_r30++; - } - return temp_r30; + float temp_f31; + float temp_f30; + Vec sp24; + Work6A88 *temp_r31; + s32 temp_r30; + s32 temp_r28; + Work6A88 *temp_r23; + temp_r23 = lbl_1_bss_7880->data; + temp_r30 = -1; + temp_r31 = temp_r23; + for (temp_r28 = 0; temp_r28 < 20; temp_r28++, temp_r31++) { + if (temp_r31->unk10 == 0) { + continue; + } + VECSubtract(&temp_r31->unk1C, arg0, &sp24); + temp_f30 = VECMag(&sp24); + if (temp_f30 < arg1 || temp_f30 > arg2) { + continue; + } + temp_f31 = atan2d(sp24.x, sp24.z); + temp_f31 = fn_1_67AC(arg3, temp_f31); + if (temp_f31 < arg4 || temp_f31 > arg5) { + continue; + } + temp_r30++; + if (arg6) { + temp_r31->unk14 = 1; + temp_r31->unk10 = 0; + temp_r31->unk4 = 1; + fn_1_83C8(temp_r31->unk18); + temp_r31->unk18 = -1; + temp_r31->unkE = arg7; + HuAudFXPlay(1733); + temp_r30 = temp_r28; + break; + } + } + if (!arg6) { + temp_r30++; + } + return temp_r30; } void fn_1_8AEC(s16 arg0, Vec *arg1) { - Work6A88 *temp_r31; - Work6A88 *temp_r30 = lbl_1_bss_7880->data; - if(arg0 < 0 || arg0 >= 20) { - return; - } - temp_r31 = &temp_r30[arg0]; - temp_r31->unk1C = *arg1; + Work6A88 *temp_r31; + Work6A88 *temp_r30 = lbl_1_bss_7880->data; + if (arg0 < 0 || arg0 >= 20) { + return; + } + temp_r31 = &temp_r30[arg0]; + temp_r31->unk1C = *arg1; } void fn_1_8B58(s16 arg0) { - Work6A88 *temp_r31; - s32 temp_r30; - Work6A88 *temp_r28 = lbl_1_bss_7880->data; - if(arg0 < 0 || arg0 >= 20) { - return; - } - temp_r31 = &temp_r28[arg0]; - temp_r31->unk4 = 2; - temp_r31->unk8 = 0; - if(temp_r31->unk1C.x >= 0.0f) { - temp_r30 = 1; - } else { - temp_r30 = 0; - } - fn_1_1C44(temp_r30, temp_r31->unk0); + Work6A88 *temp_r31; + s32 temp_r30; + Work6A88 *temp_r28 = lbl_1_bss_7880->data; + if (arg0 < 0 || arg0 >= 20) { + return; + } + temp_r31 = &temp_r28[arg0]; + temp_r31->unk4 = 2; + temp_r31->unk8 = 0; + if (temp_r31->unk1C.x >= 0.0f) { + temp_r30 = 1; + } + else { + temp_r30 = 0; + } + fn_1_1C44(temp_r30, temp_r31->unk0); } void fn_1_8C14(s32 arg0, Vec *arg1, float arg2) { - Bss7480Struct *temp_r31; - s32 temp_r30; - temp_r31 = lbl_1_bss_7480; - for(temp_r30=0; temp_r30<32; temp_r30++, temp_r31++) { - if(temp_r31->unk0 && temp_r31->unk8 == arg0) { - temp_r31->unk0 *= 0.8f; - } - } - temp_r31 = lbl_1_bss_7480; - for(temp_r30=0; temp_r30<32; temp_r30++, temp_r31++) { - if(!temp_r31->unk0) { - temp_r31->unk4 = 30; - temp_r31->unk0 = (60.0f*(3.0f*arg2))+150.0f; - temp_r31->unk8 = arg0; - temp_r31->unk14 = *arg1; - temp_r31->unkC = 0; - temp_r31->unk10 = 150.0f+(250.0f*arg2); - break; - } - } + Bss7480Struct *temp_r31; + s32 temp_r30; + temp_r31 = lbl_1_bss_7480; + for (temp_r30 = 0; temp_r30 < 32; temp_r30++, temp_r31++) { + if (temp_r31->unk0 && temp_r31->unk8 == arg0) { + temp_r31->unk0 *= 0.8f; + } + } + temp_r31 = lbl_1_bss_7480; + for (temp_r30 = 0; temp_r30 < 32; temp_r30++, temp_r31++) { + if (!temp_r31->unk0) { + temp_r31->unk4 = 30; + temp_r31->unk0 = (60.0f * (3.0f * arg2)) + 150.0f; + temp_r31->unk8 = arg0; + temp_r31->unk14 = *arg1; + temp_r31->unkC = 0; + temp_r31->unk10 = 150.0f + (250.0f * arg2); + break; + } + } } s32 fn_1_8D78(Vec *arg0) { - s32 temp_r31; - s32 temp_r30; - s32 temp_r29 = -1; - temp_r31 = (16.0f/650.0f)*(670.3125f+arg0->x); - temp_r30 = (16.0f/650.0f)*(670.3125f+arg0->z); - if(temp_r31 >= 0 && temp_r31 < 32 && temp_r30 >= 0 && temp_r30 < 32) { - temp_r29 = temp_r31+(32*temp_r30); - } - return temp_r29; + s32 temp_r31; + s32 temp_r30; + s32 temp_r29 = -1; + temp_r31 = (16.0f / 650.0f) * (670.3125f + arg0->x); + temp_r30 = (16.0f / 650.0f) * (670.3125f + arg0->z); + if (temp_r31 >= 0 && temp_r31 < 32 && temp_r30 >= 0 && temp_r30 < 32) { + temp_r29 = temp_r31 + (32 * temp_r30); + } + return temp_r29; } s32 fn_1_8E2C(s32 arg0, Vec *arg1) { - s32 temp_r31; - s32 temp_r30; - if(arg0 < 0 || arg0 >= 1024) { - arg1->x = arg1->y = arg1->z = 0; - return 0; - } - temp_r31 = arg0%32; - temp_r30 = (arg0-temp_r31)/32; - arg1->x = ((1300.0f/32.0f)*temp_r31)-670.3125f; - arg1->y = 0; - arg1->z = ((1300.0f/32.0f)*temp_r30)-670.3125f; - return 1; + s32 temp_r31; + s32 temp_r30; + if (arg0 < 0 || arg0 >= 1024) { + arg1->x = arg1->y = arg1->z = 0; + return 0; + } + temp_r31 = arg0 % 32; + temp_r30 = (arg0 - temp_r31) / 32; + arg1->x = ((1300.0f / 32.0f) * temp_r31) - 670.3125f; + arg1->y = 0; + arg1->z = ((1300.0f / 32.0f) * temp_r30) - 670.3125f; + return 1; } s32 fn_1_8F3C(s32 arg0) { - s32 sp8[9][2] = { - -1,-1, - 0,-1, - 1,-1, - -1,0, - 0,0, - 1,0, - -1,1, - 0,1, - 1,1 - }; - if(arg0 < 0 || arg0 >= 1024) { - return 0; - } - return lbl_1_bss_5880[arg0]; + s32 sp8[9][2] = { -1, -1, 0, -1, 1, -1, -1, 0, 0, 0, 1, 0, -1, 1, 0, 1, 1, 1 }; + if (arg0 < 0 || arg0 >= 1024) { + return 0; + } + return lbl_1_bss_5880[arg0]; } s32 fn_1_8FA0(Vec *arg0) { - s32 sp24[9][2] = { - -1,-1, - 0,-1, - 1,-1, - -1,0, - 0,0, - 1,0, - -1,1, - 0,1, - 1,1 - }; - Vec sp18; - Vec spC; - s32 temp_r31; - s32 temp_r30; - s32 temp_r29; - s32 temp_r28; - s32 temp_r27 = -1; - float temp_f31; - float temp_f30 = 5000; - sp18.y = 0; - sp18.z = -650; - for(temp_r31=0; temp_r31<32; temp_r31++) { - temp_r30 = temp_r31*32; - sp18.x = -650; - for(temp_r29=0; temp_r29<32; temp_r29++, temp_r30++) { - temp_r28 = lbl_1_bss_5880[temp_r30]; - if(temp_r28 > 0) { - VECSubtract(arg0, &sp18, &spC); - temp_f31 = VECMag(&spC)+(0.2f*frandmod(1000)); - temp_f31 -= 50.0f*temp_r28; - if(temp_f31 < temp_f30) { - temp_f30 = temp_f31; - temp_r27 = temp_r30; - } - } - sp18.x += (1300.0f/32.0f); - } - sp18.z += (1300.0f/32.0f); - } - return temp_r27; -} \ No newline at end of file + s32 sp24[9][2] = { -1, -1, 0, -1, 1, -1, -1, 0, 0, 0, 1, 0, -1, 1, 0, 1, 1, 1 }; + Vec sp18; + Vec spC; + s32 temp_r31; + s32 temp_r30; + s32 temp_r29; + s32 temp_r28; + s32 temp_r27 = -1; + float temp_f31; + float temp_f30 = 5000; + sp18.y = 0; + sp18.z = -650; + for (temp_r31 = 0; temp_r31 < 32; temp_r31++) { + temp_r30 = temp_r31 * 32; + sp18.x = -650; + for (temp_r29 = 0; temp_r29 < 32; temp_r29++, temp_r30++) { + temp_r28 = lbl_1_bss_5880[temp_r30]; + if (temp_r28 > 0) { + VECSubtract(arg0, &sp18, &spC); + temp_f31 = VECMag(&spC) + (0.2f * frandmod(1000)); + temp_f31 -= 50.0f * temp_r28; + if (temp_f31 < temp_f30) { + temp_f30 = temp_f31; + temp_r27 = temp_r30; + } + } + sp18.x += (1300.0f / 32.0f); + } + sp18.z += (1300.0f / 32.0f); + } + return temp_r27; +} diff --git a/src/REL/m434Dll/main.c b/src/REL/m434Dll/main.c index bb2349c4..e0fcf2ac 100644 --- a/src/REL/m434Dll/main.c +++ b/src/REL/m434Dll/main.c @@ -3,8 +3,10 @@ #include "game/hsfmotion.h" #include "game/object.h" #include "game/objsub.h" +#include "game/sprite.h" #include "game/wipe.h" + #include "REL/m434Dll.h" #include "ext_math.h" #include "game/gamework_data.h" @@ -290,7 +292,7 @@ void fn_1_E44(omObjData *object) switch (lbl_1_bss_8[0]) { case 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; } for (temp_r30 = 0; temp_r30 < 2u; temp_r30++) { @@ -379,7 +381,8 @@ void fn_1_1150(omObjData *object) break; 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); break; @@ -401,7 +404,7 @@ void fn_1_1150(omObjData *object) } espDispOff(temp_r31->unk6[temp_r30]); 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], lbl_1_data_F0[temp_r29][1] + lbl_1_data_C0[temp_r30][1]); } diff --git a/src/REL/m434Dll/map.c b/src/REL/m434Dll/map.c index b34cb98b..e690b936 100644 --- a/src/REL/m434Dll/map.c +++ b/src/REL/m434Dll/map.c @@ -177,7 +177,7 @@ void fn_1_1E64(omObjData *object) temp_r26 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M434, 0x0B)); object->model[10] = Hu3DParticleCreate(temp_r26, 100); Hu3DParticleHookSet(object->model[10], fn_1_443C); - Hu3DModelAttrSet(object->model[10], 1); + Hu3DModelAttrSet(object->model[10], HU3D_ATTR_DISPOFF); Hu3DModelLayerSet(object->model[10], 4); Hu3DModelCameraSet(object->model[10], 8); 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) { 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); } diff --git a/src/REL/m434Dll/player.c b/src/REL/m434Dll/player.c index 71814f12..103d7352 100644 --- a/src/REL/m434Dll/player.c +++ b/src/REL/m434Dll/player.c @@ -1,143 +1,128 @@ -#include "game/object.h" -#include "game/objsub.h" +#include "game/audio.h" +#include "game/chrman.h" #include "game/hsfman.h" #include "game/hsfmotion.h" -#include "game/audio.h" -#include "game/wipe.h" -#include "game/chrman.h" +#include "game/object.h" +#include "game/objsub.h" #include "game/pad.h" +#include "game/wipe.h" + -#include "game/minigame_seq.h" -#include "game/gamework_data.h" #include "REL/m434Dll.h" -#include "math.h" #include "ext_math.h" +#include "game/gamework_data.h" +#include "game/minigame_seq.h" +#include "math.h" + typedef struct data_224_struct { - u16 unk0; - u16 unk2; - float unk4; - float unk8; - u32 unkC; + u16 unk0; + u16 unk2; + float unk4; + float unk8; + u32 unkC; } Data224Struct; omObjData *lbl_1_bss_5870[4]; char *lbl_1_data_190[8] = { - "dmy-itemhook-r", - "dmy-itemhook-r", - "dmy-itemhook-r", - "dmy-itemhook-r", - "dmy-itemhook-r", - "dmy-itemhook-r", - "dmy-itemhook-r", - "dmy-itemhook-r", + "dmy-itemhook-r", + "dmy-itemhook-r", + "dmy-itemhook-r", + "dmy-itemhook-r", + "dmy-itemhook-r", + "dmy-itemhook-r", + "dmy-itemhook-r", + "dmy-itemhook-r", }; char *lbl_1_data_1BC[8] = { - "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", }; -s32 lbl_1_data_1DC[2] = { - 0x410003, - 0x410004 -}; +s32 lbl_1_data_1DC[2] = { 0x410003, 0x410004 }; -Vec lbl_1_data_1E4[2] = { - { -550, 0, 550 }, - { 550, 0, 550 } -}; +Vec lbl_1_data_1E4[2] = { { -550, 0, 550 }, { 550, 0, 550 } }; -u32 lbl_1_data_1FC[10] = { - 0, - 2, - 23, - 133, - 0x41000E, - 0x410016, - 0x41001E, - 0x410026, - 0x41002E, - 0x410036 -}; +u32 lbl_1_data_1FC[10] = { 0, 2, 23, 133, 0x41000E, 0x410016, 0x41001E, 0x410026, 0x41002E, 0x410036 }; Data224Struct lbl_1_data_224[9] = { - { 0, 4, 12, 0, HU3D_MOTATTR_LOOP }, - { 1, 6, 6, 0, HU3D_MOTATTR_LOOP }, - { 0, 8, 6, 0, HU3D_MOTATTR_NONE }, - { 0, 5, 6, 0, HU3D_MOTATTR_LOOP }, - { 1, 5, 6, 0, HU3D_MOTATTR_LOOP }, - { 0, 8, 6, 30, HU3D_MOTATTR_NONE }, - { 0, 9, 6, 0, HU3D_MOTATTR_NONE }, - { 2, 0, 12, 0, HU3D_MOTATTR_NONE }, - { 3, 0, 12, 0, HU3D_MOTATTR_NONE }, + { 0, 4, 12, 0, HU3D_MOTATTR_LOOP }, + { 1, 6, 6, 0, HU3D_MOTATTR_LOOP }, + { 0, 8, 6, 0, HU3D_MOTATTR_NONE }, + { 0, 5, 6, 0, HU3D_MOTATTR_LOOP }, + { 1, 5, 6, 0, HU3D_MOTATTR_LOOP }, + { 0, 8, 6, 30, HU3D_MOTATTR_NONE }, + { 0, 9, 6, 0, HU3D_MOTATTR_NONE }, + { 2, 0, 12, 0, HU3D_MOTATTR_NONE }, + { 3, 0, 12, 0, HU3D_MOTATTR_NONE }, }; void fn_1_4988(omObjData *object); void fn_1_4854(Process *objman) { - s16 temp_r31; - omObjData *temp_r30; - s16 temp_r29; - s32 sp8[2] = { 0, 0 }; - omMakeGroupEx(objman, 0, 4); - omGetGroupMemberListEx(objman, 0); - for(temp_r31=0; temp_r31<4; temp_r31++) { - temp_r30 = lbl_1_bss_5870[temp_r31] = omAddObjEx(objman, 40, 2, 10, 0, fn_1_4988); - temp_r30->work[0] = temp_r31; - temp_r29 = fn_1_1D74(temp_r31); - temp_r30->work[1] = (temp_r29*2)+sp8[temp_r29]; - sp8[temp_r29]++; - } + s16 temp_r31; + omObjData *temp_r30; + s16 temp_r29; + s32 sp8[2] = { 0, 0 }; + omMakeGroupEx(objman, 0, 4); + omGetGroupMemberListEx(objman, 0); + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + temp_r30 = lbl_1_bss_5870[temp_r31] = omAddObjEx(objman, 40, 2, 10, 0, fn_1_4988); + temp_r30->work[0] = temp_r31; + temp_r29 = fn_1_1D74(temp_r31); + temp_r30->work[1] = (temp_r29 * 2) + sp8[temp_r29]; + sp8[temp_r29]++; + } } void fn_1_4964(void) { - CharModelKill(-1); + CharModelKill(-1); } typedef struct work_4988 { - s32 unk0; - s32 unk4; - s32 unk8; - s32 unkC; - s32 unk10; - u32 unk14; - u32 unk18; - float unk1C; - float unk20; - s32 unk24; - Vec unk28; - float unk34; - u16 unk38; - s16 unk3A; - s16 unk3C; - s16 unk3E; - float unk40; - float unk44; - float unk48; - float unk4C; - float unk50; - s32 unk54; - s16 unk58[3]; - s32 unk60; - float unk64; - s32 unk68; - u16 unk6C; - s32 unk70; - Vec unk74; - s16 unk80; - float unk84; - Vec unk88; - Vec unk94; + s32 unk0; + s32 unk4; + s32 unk8; + s32 unkC; + s32 unk10; + u32 unk14; + u32 unk18; + float unk1C; + float unk20; + s32 unk24; + Vec unk28; + float unk34; + u16 unk38; + s16 unk3A; + s16 unk3C; + s16 unk3E; + float unk40; + float unk44; + float unk48; + float unk4C; + float unk50; + s32 unk54; + s16 unk58[3]; + s32 unk60; + float unk64; + s32 unk68; + u16 unk6C; + s32 unk70; + Vec unk74; + s16 unk80; + float unk84; + Vec unk88; + Vec unk94; } Work4988; void fn_1_4DF4(omObjData *object); @@ -145,64 +130,65 @@ void fn_1_60AC(omObjData *arg0, u32 arg1); void fn_1_4988(omObjData *object) { - Work4988 *temp_r31; - s16 temp_r29; - s32 temp_r28; - s32 temp_r27; - - float sp1C[4] = { 0.5f, 0.65f, 0.8f, 1.0f }; - s32 spC[4] = { 1, 1, 2, 2 }; - s32 sp8; - object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Work4988), MEMORY_DEFAULT_NUM); - temp_r31 = object->data; - memset(temp_r31, 0, sizeof(Work4988)); - temp_r27 = object->work[0]; - temp_r28 = GWPlayerCfg[temp_r27].character; - temp_r31->unk8 = temp_r28; - sp8 = temp_r31->unkC = 0; - temp_r31->unk0 = (object->work[1] >> 1) & 0x1; - temp_r31->unk4 = object->work[1] & 0x1; - temp_r31->unk6C = 0; - temp_r31->unk64 = sp1C[GWPlayerCfg[temp_r27].diff & 0x3]; - temp_r31->unk68 = spC[GWPlayerCfg[temp_r27].diff & 0x3]; - object->model[0] = CharModelCreate(temp_r28, 8); - CharModelStepTypeSet(temp_r28, 3); - Hu3DModelCameraSet(object->model[0], 4); - Hu3DModelLayerSet(object->model[0], 4); - object->model[1] = Hu3DModelCreateFile(lbl_1_data_1DC[temp_r31->unk0]); - Hu3DModelCameraSet(object->model[1], 4); - Hu3DModelLayerSet(object->model[1], 4); - Hu3DModelHookSet(object->model[0], lbl_1_data_190[temp_r31->unkC], object->model[1]); - Hu3DModelClusterAttrSet(object->model[1], 0, 0xC0000001); - for(temp_r29=0; temp_r29<10; temp_r29++) { - if(lbl_1_data_1FC[temp_r29] < 0x10000) { - object->motion[temp_r29] = CharModelMotionCreate(temp_r28, lbl_1_data_1FC[temp_r29]); - } else { - object->motion[temp_r29] = Hu3DJointMotionFile(object->model[0], temp_r28+lbl_1_data_1FC[temp_r29]); - } - } - CharModelMotionDataClose(temp_r28); - object->trans.x = temp_r31->unk88.x = ((2.0f*object->work[1])*100.0f)-300.0f; - object->trans.y = temp_r31->unk88.y = -70; - object->trans.z = temp_r31->unk88.z = 0; - temp_r31->unk94.x = temp_r31->unk94.y = temp_r31->unk94.z = 0; - temp_r31->unk40 = temp_r31->unk44 = 0; - temp_r31->unk48 = 0; - temp_r31->unk4C = 0.02f; - temp_r31->unk84 = 55; - temp_r31->unk28 = lbl_1_data_1E4[temp_r31->unk0]; - temp_r31->unk28.y = object->trans.y; - temp_r31->unk34 = 400; - temp_r31->unk54 = 0; - for(temp_r29=0; temp_r29<3; temp_r29++) { - temp_r31->unk58[temp_r29] = -1; - } - temp_r31->unk50 = 0; - temp_r31->unk10 = -1; - temp_r31->unk60 = 0; - fn_1_60AC(object, 0); - temp_r31->unk38 = 0; - object->func = fn_1_4DF4; + Work4988 *temp_r31; + s16 temp_r29; + s32 temp_r28; + s32 temp_r27; + + float sp1C[4] = { 0.5f, 0.65f, 0.8f, 1.0f }; + s32 spC[4] = { 1, 1, 2, 2 }; + s32 sp8; + object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(Work4988), MEMORY_DEFAULT_NUM); + temp_r31 = object->data; + memset(temp_r31, 0, sizeof(Work4988)); + temp_r27 = object->work[0]; + temp_r28 = GWPlayerCfg[temp_r27].character; + temp_r31->unk8 = temp_r28; + sp8 = temp_r31->unkC = 0; + temp_r31->unk0 = (object->work[1] >> 1) & 0x1; + temp_r31->unk4 = object->work[1] & 0x1; + temp_r31->unk6C = 0; + temp_r31->unk64 = sp1C[GWPlayerCfg[temp_r27].diff & 0x3]; + temp_r31->unk68 = spC[GWPlayerCfg[temp_r27].diff & 0x3]; + object->model[0] = CharModelCreate(temp_r28, 8); + CharModelStepTypeSet(temp_r28, 3); + Hu3DModelCameraSet(object->model[0], 4); + Hu3DModelLayerSet(object->model[0], 4); + object->model[1] = Hu3DModelCreateFile(lbl_1_data_1DC[temp_r31->unk0]); + Hu3DModelCameraSet(object->model[1], 4); + Hu3DModelLayerSet(object->model[1], 4); + Hu3DModelHookSet(object->model[0], lbl_1_data_190[temp_r31->unkC], object->model[1]); + Hu3DModelClusterAttrSet(object->model[1], 0, 0xC0000001); + for (temp_r29 = 0; temp_r29 < 10; temp_r29++) { + if (lbl_1_data_1FC[temp_r29] < 0x10000) { + object->motion[temp_r29] = CharModelMotionCreate(temp_r28, lbl_1_data_1FC[temp_r29]); + } + else { + object->motion[temp_r29] = Hu3DJointMotionFile(object->model[0], temp_r28 + lbl_1_data_1FC[temp_r29]); + } + } + CharModelMotionDataClose(temp_r28); + object->trans.x = temp_r31->unk88.x = ((2.0f * object->work[1]) * 100.0f) - 300.0f; + object->trans.y = temp_r31->unk88.y = -70; + object->trans.z = temp_r31->unk88.z = 0; + temp_r31->unk94.x = temp_r31->unk94.y = temp_r31->unk94.z = 0; + temp_r31->unk40 = temp_r31->unk44 = 0; + temp_r31->unk48 = 0; + temp_r31->unk4C = 0.02f; + temp_r31->unk84 = 55; + temp_r31->unk28 = lbl_1_data_1E4[temp_r31->unk0]; + temp_r31->unk28.y = object->trans.y; + temp_r31->unk34 = 400; + temp_r31->unk54 = 0; + for (temp_r29 = 0; temp_r29 < 3; temp_r29++) { + temp_r31->unk58[temp_r29] = -1; + } + temp_r31->unk50 = 0; + temp_r31->unk10 = -1; + temp_r31->unk60 = 0; + fn_1_60AC(object, 0); + temp_r31->unk38 = 0; + object->func = fn_1_4DF4; } void fn_1_4E50(omObjData *object); @@ -210,11 +196,11 @@ void fn_1_5BEC(omObjData *object); void fn_1_4DF4(omObjData *object) { - Work4988 *temp_r31 = object->data; - fn_1_5BEC(object); - temp_r31->unk3C++; - temp_r31->unk38 = 0; - object->func = fn_1_4E50; + Work4988 *temp_r31 = object->data; + fn_1_5BEC(object); + temp_r31->unk3C++; + temp_r31->unk38 = 0; + object->func = fn_1_4E50; } void fn_1_5AB0(omObjData *object); @@ -224,453 +210,465 @@ void fn_1_64C0(omObjData *object); float fn_1_67AC(float arg0, float arg1); -//Issues with assignment of temp_f30 -//Scratch is at https://decomp.me/scratch/EqCuG +// Issues with assignment of temp_f30 +// Scratch is at https://decomp.me/scratch/EqCuG void fn_1_4E50(omObjData *object) { - float temp_f31; - float temp_f30; - float temp_f28; - Work4988 *temp_r31 = object->data; - - s32 temp_r29; - s32 temp_r28; - s32 temp_r27 = 0; - Mtx sp2C; - Vec sp20; - char *sp14[3] = { - "f0", - "f1", - "f2" - }; - float spC[2] = { 0.05, 0.02 }; - temp_r31->unk14 = 0; - temp_r31->unk18 = 0; - temp_r31->unk20 = 0; - temp_r31->unk1C = 0; - if(fn_1_1D54() == 2) { - if(GWPlayerCfg[object->work[0]].iscom) { - fn_1_5C98(object); - } else { - temp_r31->unk18 = HuPadBtn[GWPlayerCfg[object->work[0]].pad_idx]; - temp_r31->unk14 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx]; - temp_f31 = HuPadStkX[GWPlayerCfg[object->work[0]].pad_idx]; - temp_f30 = -HuPadStkY[GWPlayerCfg[object->work[0]].pad_idx]; - - temp_r31->unk20 = atan2d(temp_f31, temp_f30); - temp_r31->unk1C = (1.0f/72.0f)*VECMagPoint(temp_f31, temp_f30, 0); - if(temp_r31->unk1C > 1.0f) { - temp_r31->unk1C = 1.0f; - } - } - } - temp_r31->unk60 = 0; - switch(temp_r31->unk38) { - case 0: - temp_r27 = 1; - if(temp_r31->unk1C > spC[temp_r31->unk24]) { - temp_r31->unk24 = 1; - temp_r31->unk44 = temp_r31->unk20; - temp_r31->unk94.x += 225.0f*(temp_r31->unk1C*sind(temp_r31->unk20))*(1.0f/60.0f); - temp_r31->unk94.z += 225.0f*(temp_r31->unk1C*cosd(temp_r31->unk20))*(1.0f/60.0f); - temp_r31->unk48 = 0.2f; - temp_r31->unk4C = 0; - if(CharModelMotionShiftIDGet(temp_r31->unk8) < 0) { - fn_1_60AC(object, 1); - CharModelMotionSpeedSet(temp_r31->unk8, temp_r31->unk1C); - } - if(temp_r31->unk1C > 0.75f && (temp_r31->unk3A & 0x7) == 0) { - fn_1_8C14(object->work[0], &temp_r31->unk88, temp_r31->unk1C); - if((temp_r31->unk3A & 0xF) == 0) { - fn_1_43AC(&temp_r31->unk88); - } - } - } else { - temp_r31->unk24 = 0; - if(CharModelMotionShiftIDGet(temp_r31->unk8) < 0) { - fn_1_60AC(object, 0); - } - } - if(temp_r31->unk14 & PAD_BUTTON_A) { - temp_r31->unk38 = 1; - temp_r31->unk3C = 0; - } else if(temp_r31->unk14 & PAD_BUTTON_B) { - temp_r31->unk38 = 3; - temp_r31->unk3C = 0; - temp_r31->unk3A = 0; - } else { - temp_r31->unk60 = 1; - } - break; - - case 1: - temp_r31->unk24 = 0; - if(temp_r31->unk3C == 0) { - fn_1_60AC(object, 2); - temp_r31->unk3A = 0; - temp_r31->unk3C++; - } else if(temp_r31->unk3C == 1 && temp_r31->unk3A > 30.0f) { - if(temp_r31->unk54 < 3) { - temp_r28 = fn_1_8884(&temp_r31->unk88, 20, 150, temp_r31->unk40, -30, 30, 1, object->work[0]); - if(temp_r28 >= 0) { - temp_r31->unk58[temp_r31->unk54++] = temp_r28; - omVibrate(object->work[0], 12, 6, 6); - } - } - temp_r31->unk38 = 2; - temp_r31->unk3A = 0; - temp_r31->unk3C = 0; - } - break; - - case 2: - if(temp_r31->unk3C == 0) { - if(!(temp_r31->unk18 & PAD_BUTTON_A)) { - temp_r31->unk24 = 0; - fn_1_60AC(object, 5); - temp_r31->unk3A = 0; - temp_r31->unk3C++; - } else { - temp_f28 = fn_1_67AC(temp_r31->unk40, temp_r31->unk20); - if(temp_f28 > 10.0f) { - temp_f28 = 10.0f; - } else if(temp_f28 < -10.0f) { - temp_f28 = -10.0f; - } - if(temp_r31->unk1C > spC[temp_r31->unk24] && fabs(temp_f28) > 5.0) { - temp_r31->unk24 = 1; - temp_r31->unk44 = temp_r31->unk40+temp_f28; - temp_r31->unk48 = 0.2f; - temp_r31->unk4C = 0; - if(CharModelMotionShiftIDGet(temp_r31->unk8) < 0) { - fn_1_60AC(object, 4); - CharModelMotionSpeedSet(temp_r31->unk8, 0.5f); - } - if(temp_r31->unk54 < 3) { - temp_r28 = fn_1_8884(&temp_r31->unk88, 20, 150, temp_r31->unk40, -15, 15, 1, object->work[0]); - if(temp_r28 >= 0) { - temp_r31->unk58[temp_r31->unk54++] = temp_r28; - omVibrate(object->work[0], 12, 6, 6); - } - } - } else { - temp_r31->unk24 = 0; - if(CharModelMotionShiftIDGet(temp_r31->unk8) < 0) { - fn_1_60AC(object, 3); - } - } - } - } else { - if(temp_r31->unk3A > 30.0f) { - temp_r31->unk38 = 0; - } - } - break; - - case 3: - temp_r31->unk24 = 0; - if(temp_r31->unk3C == 0) { - temp_r31->unk3E = 0; - VECSubtract(&temp_r31->unk28, &temp_r31->unk88, &sp20); - temp_r31->unk44 = atan2d(sp20.x, sp20.z); - temp_f28 = VECMag(&sp20); - if(temp_f28 < temp_r31->unk34) { - temp_r31->unk3E++; - fn_1_60AC(object, 6); - } else { - fn_1_60AC(object, 0); - } - temp_r31->unk3A = 0; - temp_r31->unk3C++; - } - if(temp_r31->unk3E) { - if(temp_r31->unk3A > 36.0f) { - for(temp_r29=0; temp_r29unk54; temp_r29++) { - fn_1_8B58(temp_r31->unk58[temp_r29]); - } - temp_r31->unk54 = 0; - temp_r31->unk3E = 0; - } - } - if(temp_r31->unk3A > 60.0f) { - temp_r31->unk38 = 0; - } - break; - } - VECAdd(&temp_r31->unk88, &temp_r31->unk94, &temp_r31->unk88); - temp_r31->unk94.x = temp_r31->unk94.y = temp_r31->unk94.z = 0; - fn_1_64C0(object); - temp_f28 = 0; - if(temp_r31->unk54) { - temp_f28 = (temp_r31->unk54*10)+10; - } - temp_r31->unk50 += (temp_f28-temp_r31->unk50)*0.3f; - Hu3DData[object->model[1]].unk_A4[0] = temp_r31->unk50; - Hu3DModelObjMtxGet(object->model[0], lbl_1_data_190[temp_r31->unkC], sp2C); - for(temp_r29=0; temp_r29unk54; temp_r29++) { - Hu3DModelObjPosGet(object->model[1], sp14[temp_r29], &sp20); - MTXMultVec(sp2C, &sp20, &sp20); - fn_1_8AEC(temp_r31->unk58[temp_r29], &sp20); - } - fn_1_5BEC(object); - if(fn_1_1D54() == 5 && temp_r27) { - temp_r31->unk38 = 0; - object->func = fn_1_5AB0; - } + float temp_f31; + float temp_f30; + float temp_f28; + Work4988 *temp_r31 = object->data; + + s32 temp_r29; + s32 temp_r28; + s32 temp_r27 = 0; + Mtx sp2C; + Vec sp20; + char *sp14[3] = { "f0", "f1", "f2" }; + float spC[2] = { 0.05, 0.02 }; + temp_r31->unk14 = 0; + temp_r31->unk18 = 0; + temp_r31->unk20 = 0; + temp_r31->unk1C = 0; + if (fn_1_1D54() == 2) { + if (GWPlayerCfg[object->work[0]].iscom) { + fn_1_5C98(object); + } + else { + temp_r31->unk18 = HuPadBtn[GWPlayerCfg[object->work[0]].pad_idx]; + temp_r31->unk14 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx]; + temp_f31 = HuPadStkX[GWPlayerCfg[object->work[0]].pad_idx]; + temp_f30 = -HuPadStkY[GWPlayerCfg[object->work[0]].pad_idx]; + + temp_r31->unk20 = atan2d(temp_f31, temp_f30); + temp_r31->unk1C = (1.0f / 72.0f) * VECMagPoint(temp_f31, temp_f30, 0); + if (temp_r31->unk1C > 1.0f) { + temp_r31->unk1C = 1.0f; + } + } + } + temp_r31->unk60 = 0; + switch (temp_r31->unk38) { + case 0: + temp_r27 = 1; + if (temp_r31->unk1C > spC[temp_r31->unk24]) { + temp_r31->unk24 = 1; + temp_r31->unk44 = temp_r31->unk20; + temp_r31->unk94.x += 225.0f * (temp_r31->unk1C * sind(temp_r31->unk20)) * (1.0f / 60.0f); + temp_r31->unk94.z += 225.0f * (temp_r31->unk1C * cosd(temp_r31->unk20)) * (1.0f / 60.0f); + temp_r31->unk48 = 0.2f; + temp_r31->unk4C = 0; + if (CharModelMotionShiftIDGet(temp_r31->unk8) < 0) { + fn_1_60AC(object, 1); + CharModelMotionSpeedSet(temp_r31->unk8, temp_r31->unk1C); + } + if (temp_r31->unk1C > 0.75f && (temp_r31->unk3A & 0x7) == 0) { + fn_1_8C14(object->work[0], &temp_r31->unk88, temp_r31->unk1C); + if ((temp_r31->unk3A & 0xF) == 0) { + fn_1_43AC(&temp_r31->unk88); + } + } + } + else { + temp_r31->unk24 = 0; + if (CharModelMotionShiftIDGet(temp_r31->unk8) < 0) { + fn_1_60AC(object, 0); + } + } + if (temp_r31->unk14 & PAD_BUTTON_A) { + temp_r31->unk38 = 1; + temp_r31->unk3C = 0; + } + else if (temp_r31->unk14 & PAD_BUTTON_B) { + temp_r31->unk38 = 3; + temp_r31->unk3C = 0; + temp_r31->unk3A = 0; + } + else { + temp_r31->unk60 = 1; + } + break; + + case 1: + temp_r31->unk24 = 0; + if (temp_r31->unk3C == 0) { + fn_1_60AC(object, 2); + temp_r31->unk3A = 0; + temp_r31->unk3C++; + } + else if (temp_r31->unk3C == 1 && temp_r31->unk3A > 30.0f) { + if (temp_r31->unk54 < 3) { + temp_r28 = fn_1_8884(&temp_r31->unk88, 20, 150, temp_r31->unk40, -30, 30, 1, object->work[0]); + if (temp_r28 >= 0) { + temp_r31->unk58[temp_r31->unk54++] = temp_r28; + omVibrate(object->work[0], 12, 6, 6); + } + } + temp_r31->unk38 = 2; + temp_r31->unk3A = 0; + temp_r31->unk3C = 0; + } + break; + + case 2: + if (temp_r31->unk3C == 0) { + if (!(temp_r31->unk18 & PAD_BUTTON_A)) { + temp_r31->unk24 = 0; + fn_1_60AC(object, 5); + temp_r31->unk3A = 0; + temp_r31->unk3C++; + } + else { + temp_f28 = fn_1_67AC(temp_r31->unk40, temp_r31->unk20); + if (temp_f28 > 10.0f) { + temp_f28 = 10.0f; + } + else if (temp_f28 < -10.0f) { + temp_f28 = -10.0f; + } + if (temp_r31->unk1C > spC[temp_r31->unk24] && fabs(temp_f28) > 5.0) { + temp_r31->unk24 = 1; + temp_r31->unk44 = temp_r31->unk40 + temp_f28; + temp_r31->unk48 = 0.2f; + temp_r31->unk4C = 0; + if (CharModelMotionShiftIDGet(temp_r31->unk8) < 0) { + fn_1_60AC(object, 4); + CharModelMotionSpeedSet(temp_r31->unk8, 0.5f); + } + if (temp_r31->unk54 < 3) { + temp_r28 = fn_1_8884(&temp_r31->unk88, 20, 150, temp_r31->unk40, -15, 15, 1, object->work[0]); + if (temp_r28 >= 0) { + temp_r31->unk58[temp_r31->unk54++] = temp_r28; + omVibrate(object->work[0], 12, 6, 6); + } + } + } + else { + temp_r31->unk24 = 0; + if (CharModelMotionShiftIDGet(temp_r31->unk8) < 0) { + fn_1_60AC(object, 3); + } + } + } + } + else { + if (temp_r31->unk3A > 30.0f) { + temp_r31->unk38 = 0; + } + } + break; + + case 3: + temp_r31->unk24 = 0; + if (temp_r31->unk3C == 0) { + temp_r31->unk3E = 0; + VECSubtract(&temp_r31->unk28, &temp_r31->unk88, &sp20); + temp_r31->unk44 = atan2d(sp20.x, sp20.z); + temp_f28 = VECMag(&sp20); + if (temp_f28 < temp_r31->unk34) { + temp_r31->unk3E++; + fn_1_60AC(object, 6); + } + else { + fn_1_60AC(object, 0); + } + temp_r31->unk3A = 0; + temp_r31->unk3C++; + } + if (temp_r31->unk3E) { + if (temp_r31->unk3A > 36.0f) { + for (temp_r29 = 0; temp_r29 < temp_r31->unk54; temp_r29++) { + fn_1_8B58(temp_r31->unk58[temp_r29]); + } + temp_r31->unk54 = 0; + temp_r31->unk3E = 0; + } + } + if (temp_r31->unk3A > 60.0f) { + temp_r31->unk38 = 0; + } + break; + } + VECAdd(&temp_r31->unk88, &temp_r31->unk94, &temp_r31->unk88); + temp_r31->unk94.x = temp_r31->unk94.y = temp_r31->unk94.z = 0; + fn_1_64C0(object); + temp_f28 = 0; + if (temp_r31->unk54) { + temp_f28 = (temp_r31->unk54 * 10) + 10; + } + temp_r31->unk50 += (temp_f28 - temp_r31->unk50) * 0.3f; + Hu3DData[object->model[1]].unk_A4[0] = temp_r31->unk50; + Hu3DModelObjMtxGet(object->model[0], lbl_1_data_190[temp_r31->unkC], sp2C); + for (temp_r29 = 0; temp_r29 < temp_r31->unk54; temp_r29++) { + Hu3DModelObjPosGet(object->model[1], sp14[temp_r29], &sp20); + MTXMultVec(sp2C, &sp20, &sp20); + fn_1_8AEC(temp_r31->unk58[temp_r29], &sp20); + } + fn_1_5BEC(object); + if (fn_1_1D54() == 5 && temp_r27) { + temp_r31->unk38 = 0; + object->func = fn_1_5AB0; + } } s32 fn_1_6248(omObjData *object); void fn_1_5AB0(omObjData *object) { - Work4988 *temp_r31 = object->data; - s32 sp8[2] = { -1, 1 }; - fn_1_5BEC(object); - switch(temp_r31->unk38) { - case 0: - temp_r31->unk38++; - break; - - case 1: - Hu3DModelHookReset(object->model[0]); - Hu3DModelAttrSet(object->model[1], 1); - if(sp8[temp_r31->unk0] == fn_1_1D8C()) { - fn_1_60AC(object, 7); - } else { - fn_1_60AC(object, 8); - } - temp_r31->unk44 = 0; - temp_r31->unk48 = 0; - temp_r31->unk4C = 0.005f; - temp_r31->unk38++; - break; - - case 2: - if(fn_1_6248(object)) { - temp_r31->unk38++; - } - break; - } + Work4988 *temp_r31 = object->data; + s32 sp8[2] = { -1, 1 }; + fn_1_5BEC(object); + switch (temp_r31->unk38) { + case 0: + temp_r31->unk38++; + break; + + case 1: + Hu3DModelHookReset(object->model[0]); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); + if (sp8[temp_r31->unk0] == fn_1_1D8C()) { + fn_1_60AC(object, 7); + } + else { + fn_1_60AC(object, 8); + } + temp_r31->unk44 = 0; + temp_r31->unk48 = 0; + temp_r31->unk4C = 0.005f; + temp_r31->unk38++; + break; + + case 2: + if (fn_1_6248(object)) { + temp_r31->unk38++; + } + break; + } } float fn_1_6690(float arg0, float arg1, float arg2); void fn_1_5BEC(omObjData *object) { - Work4988 *temp_r31 = object->data; - temp_r31->unk3A++; - object->trans.x = temp_r31->unk88.x; - object->trans.y = temp_r31->unk88.y; - object->trans.z = temp_r31->unk88.z; - temp_r31->unk48 += temp_r31->unk4C; - if(temp_r31->unk48 > 0.45f) { - temp_r31->unk48 = 0.45f; - } - temp_r31->unk40 = fn_1_6690(temp_r31->unk40, temp_r31->unk44, temp_r31->unk48); - object->rot.y = temp_r31->unk40; + Work4988 *temp_r31 = object->data; + temp_r31->unk3A++; + object->trans.x = temp_r31->unk88.x; + object->trans.y = temp_r31->unk88.y; + object->trans.z = temp_r31->unk88.z; + temp_r31->unk48 += temp_r31->unk4C; + if (temp_r31->unk48 > 0.45f) { + temp_r31->unk48 = 0.45f; + } + temp_r31->unk40 = fn_1_6690(temp_r31->unk40, temp_r31->unk44, temp_r31->unk48); + object->rot.y = temp_r31->unk40; } void fn_1_5C98(omObjData *object) { - Vec sp8; - Work4988 *temp_r31 = object->data; - s32 temp_r30; - s32 temp_r29 = 0; - s32 temp_r28; - switch(temp_r31->unk6C) { - case 0: - if(temp_r31->unk60) { - temp_r31->unk70 = fn_1_8FA0(&temp_r31->unk88); - if(temp_r31->unk70 < 0 || temp_r31->unk54 >= temp_r31->unk68 || fn_1_1D44() < 10) { - temp_r29 = 1; - } - if(temp_r31->unk54 && temp_r29) { - temp_r31->unk6C = 3; - temp_r31->unk80 = 0; - } else if(temp_r31->unk70 >= 0) { - temp_r31->unk6C = 1; - temp_r31->unk80 = 0; - fn_1_8E2C(temp_r31->unk70, &temp_r31->unk74); - temp_r31->unk74.y = temp_r31->unk88.y; - } - } - break; - - case 1: - temp_r31->unk1C = 0.73f*temp_r31->unk64; - if(temp_r31->unk54 && fn_1_1D44() < 10) { - temp_r31->unk6C = 0; - } else { - temp_r28 = fn_1_8D78(&temp_r31->unk88); - if(fn_1_8F3C(temp_r28) > 0) { - temp_r31->unk6C = 2; - temp_r31->unk80 = 0; - } else { - VECSubtract(&temp_r31->unk74, &temp_r31->unk88, &sp8); - temp_r31->unk20 = fn_1_6690(temp_r31->unk40, atan2d(sp8.x, sp8.z), temp_r31->unk64*0.25f); - temp_r30 = 0; - if(VECMag(&sp8) < 50.0f) { - temp_r30 = 1; - } - if(temp_r30 && fn_1_8F3C(temp_r31->unk70) > 0) { - temp_r31->unk6C = 2; - temp_r31->unk80 = 0; - } else { - temp_r31->unk80++; - if(temp_r30 || temp_r31->unk80 > 60.0f) { - if(temp_r30 || frandmod(1000) < 10) { - temp_r31->unk70 = fn_1_8FA0(&temp_r31->unk88); - fn_1_8E2C(temp_r31->unk70, &temp_r31->unk74); - temp_r31->unk74.y = temp_r31->unk88.y; - temp_r31->unk80 = 0; - if(temp_r31->unk70 < 0) { - temp_r31->unk6C = 0; - } - } - } - } - } - } - break; - - case 2: - temp_r31->unk80++; - if(temp_r31->unk80 < 120*temp_r31->unk64) { - temp_r31->unk1C = 0.4f; - temp_r31->unk20 = temp_r31->unk40+10.0f; - temp_r31->unk14 = temp_r31->unk18 = PAD_BUTTON_A; - } else { - temp_r31->unk6C = 0; - } - break; - - case 3: - temp_r31->unk1C = 0.75f+(0.25f*temp_r31->unk64); - VECSubtract(&temp_r31->unk28, &temp_r31->unk88, &sp8); - temp_r31->unk20 = fn_1_6690(temp_r31->unk40, atan2d(sp8.x, sp8.z), 0.2f); - if(VECMag(&sp8) < temp_r31->unk34-30.000002f) { - temp_r31->unk14 = temp_r31->unk18 = PAD_BUTTON_B; - temp_r31->unk6C = 0; - } - break; - } + Vec sp8; + Work4988 *temp_r31 = object->data; + s32 temp_r30; + s32 temp_r29 = 0; + s32 temp_r28; + switch (temp_r31->unk6C) { + case 0: + if (temp_r31->unk60) { + temp_r31->unk70 = fn_1_8FA0(&temp_r31->unk88); + if (temp_r31->unk70 < 0 || temp_r31->unk54 >= temp_r31->unk68 || fn_1_1D44() < 10) { + temp_r29 = 1; + } + if (temp_r31->unk54 && temp_r29) { + temp_r31->unk6C = 3; + temp_r31->unk80 = 0; + } + else if (temp_r31->unk70 >= 0) { + temp_r31->unk6C = 1; + temp_r31->unk80 = 0; + fn_1_8E2C(temp_r31->unk70, &temp_r31->unk74); + temp_r31->unk74.y = temp_r31->unk88.y; + } + } + break; + + case 1: + temp_r31->unk1C = 0.73f * temp_r31->unk64; + if (temp_r31->unk54 && fn_1_1D44() < 10) { + temp_r31->unk6C = 0; + } + else { + temp_r28 = fn_1_8D78(&temp_r31->unk88); + if (fn_1_8F3C(temp_r28) > 0) { + temp_r31->unk6C = 2; + temp_r31->unk80 = 0; + } + else { + VECSubtract(&temp_r31->unk74, &temp_r31->unk88, &sp8); + temp_r31->unk20 = fn_1_6690(temp_r31->unk40, atan2d(sp8.x, sp8.z), temp_r31->unk64 * 0.25f); + temp_r30 = 0; + if (VECMag(&sp8) < 50.0f) { + temp_r30 = 1; + } + if (temp_r30 && fn_1_8F3C(temp_r31->unk70) > 0) { + temp_r31->unk6C = 2; + temp_r31->unk80 = 0; + } + else { + temp_r31->unk80++; + if (temp_r30 || temp_r31->unk80 > 60.0f) { + if (temp_r30 || frandmod(1000) < 10) { + temp_r31->unk70 = fn_1_8FA0(&temp_r31->unk88); + fn_1_8E2C(temp_r31->unk70, &temp_r31->unk74); + temp_r31->unk74.y = temp_r31->unk88.y; + temp_r31->unk80 = 0; + if (temp_r31->unk70 < 0) { + temp_r31->unk6C = 0; + } + } + } + } + } + } + break; + + case 2: + temp_r31->unk80++; + if (temp_r31->unk80 < 120 * temp_r31->unk64) { + temp_r31->unk1C = 0.4f; + temp_r31->unk20 = temp_r31->unk40 + 10.0f; + temp_r31->unk14 = temp_r31->unk18 = PAD_BUTTON_A; + } + else { + temp_r31->unk6C = 0; + } + break; + + case 3: + temp_r31->unk1C = 0.75f + (0.25f * temp_r31->unk64); + VECSubtract(&temp_r31->unk28, &temp_r31->unk88, &sp8); + temp_r31->unk20 = fn_1_6690(temp_r31->unk40, atan2d(sp8.x, sp8.z), 0.2f); + if (VECMag(&sp8) < temp_r31->unk34 - 30.000002f) { + temp_r31->unk14 = temp_r31->unk18 = PAD_BUTTON_B; + temp_r31->unk6C = 0; + } + break; + } } void fn_1_60AC(omObjData *arg0, u32 arg1) { - float temp_f31; - Work4988 *temp_r30 = arg0->data; - if(temp_r30->unk10 != arg1 && arg1 < 9) { - temp_f31 = lbl_1_data_224[arg1].unk4; - if(temp_r30->unk10 < 0) { - temp_f31 = 0; - } - temp_r30->unk10 = arg1; - CharModelMotionShiftSet(temp_r30->unk8, arg0->motion[lbl_1_data_224[arg1].unk0], 0, temp_f31, lbl_1_data_224[arg1].unkC); - CharModelMotionSpeedSet(temp_r30->unk8, 1.0f); - if(lbl_1_data_224[arg1].unk2) { - Hu3DMotionOverlaySet(arg0->model[0], arg0->motion[lbl_1_data_224[arg1].unk2]); - Hu3DMotionOverlayTimeSet(arg0->model[0], lbl_1_data_224[arg1].unk8); - Hu3DData[arg0->model[0]].unk_78 = 1.0f; - } else { - Hu3DMotionOverlayReset(arg0->model[0]); - } - } + float temp_f31; + Work4988 *temp_r30 = arg0->data; + if (temp_r30->unk10 != arg1 && arg1 < 9) { + temp_f31 = lbl_1_data_224[arg1].unk4; + if (temp_r30->unk10 < 0) { + temp_f31 = 0; + } + temp_r30->unk10 = arg1; + CharModelMotionShiftSet(temp_r30->unk8, arg0->motion[lbl_1_data_224[arg1].unk0], 0, temp_f31, lbl_1_data_224[arg1].unkC); + CharModelMotionSpeedSet(temp_r30->unk8, 1.0f); + if (lbl_1_data_224[arg1].unk2) { + Hu3DMotionOverlaySet(arg0->model[0], arg0->motion[lbl_1_data_224[arg1].unk2]); + Hu3DMotionOverlayTimeSet(arg0->model[0], lbl_1_data_224[arg1].unk8); + Hu3DData[arg0->model[0]].unk_78 = 1.0f; + } + else { + Hu3DMotionOverlayReset(arg0->model[0]); + } + } } s32 fn_1_6248(omObjData *object) { - Work4988 *temp_r31 = object->data; - s32 temp_r30 = 0; - if(CharModelMotionEndCheck(temp_r31->unk8) && CharModelMotionShiftIDGet(temp_r31->unk8) < 0) { - temp_r30 = 1; - } - return temp_r30; + Work4988 *temp_r31 = object->data; + s32 temp_r30 = 0; + if (CharModelMotionEndCheck(temp_r31->unk8) && CharModelMotionShiftIDGet(temp_r31->unk8) < 0) { + temp_r30 = 1; + } + return temp_r30; } s32 fn_1_62BC(omObjData *arg0, u32 arg1) { - s32 result = 0; - if(fn_1_6248(arg0)) { - fn_1_60AC(arg0, arg1); - result = 1; - } - return result; + s32 result = 0; + if (fn_1_6248(arg0)) { + fn_1_60AC(arg0, arg1); + result = 1; + } + return result; } s32 fn_1_649C(omObjData *object) { - Work4988 *sp8 = object->data; - s32 temp_r31 = 0; - return temp_r31; + Work4988 *sp8 = object->data; + s32 temp_r31 = 0; + return temp_r31; } - void fn_1_64C0(omObjData *object) { - float temp_f31; - Vec sp8; - Work4988 *temp_r31; - Work4988 *temp_r30; - s32 temp_r29; - s32 temp_r28; - s32 temp_r27; - for(temp_r27=0; temp_r27<2; temp_r27++) { - for(temp_r29=0; temp_r29<4; temp_r29++) { - temp_r31 = lbl_1_bss_5870[temp_r29]->data; - for(temp_r28=0; temp_r28<4; temp_r28++) { - if(temp_r29 == temp_r28) { - continue; - } - temp_r30 = lbl_1_bss_5870[temp_r28]->data; - VECSubtract(&temp_r31->unk88, &temp_r30->unk88, &sp8); - temp_f31 = VECMag(&sp8); - if(temp_f31 < temp_r31->unk84+temp_r30->unk84) { - temp_f31 = 0.5f*((temp_r31->unk84+temp_r30->unk84)-temp_f31); - VECNormalize(&sp8, &sp8); - VECScale(&sp8, &sp8, temp_f31); - VECAdd(&temp_r31->unk88, &sp8, &temp_r31->unk88); - VECSubtract(&temp_r30->unk88, &sp8, &temp_r30->unk88); - } - } - sp8 = temp_r31->unk88; - sp8.y = 0; - temp_f31 = VECMag(&sp8); - if(temp_f31 > 510.0f-temp_r31->unk84) { - VECNormalize(&sp8, &sp8); - VECScale(&sp8, &sp8, -(temp_f31-(510.0f-temp_r31->unk84))); - VECAdd(&sp8, &temp_r31->unk88, &temp_r31->unk88); - } - } - } + float temp_f31; + Vec sp8; + Work4988 *temp_r31; + Work4988 *temp_r30; + s32 temp_r29; + s32 temp_r28; + s32 temp_r27; + for (temp_r27 = 0; temp_r27 < 2; temp_r27++) { + for (temp_r29 = 0; temp_r29 < 4; temp_r29++) { + temp_r31 = lbl_1_bss_5870[temp_r29]->data; + for (temp_r28 = 0; temp_r28 < 4; temp_r28++) { + if (temp_r29 == temp_r28) { + continue; + } + temp_r30 = lbl_1_bss_5870[temp_r28]->data; + VECSubtract(&temp_r31->unk88, &temp_r30->unk88, &sp8); + temp_f31 = VECMag(&sp8); + if (temp_f31 < temp_r31->unk84 + temp_r30->unk84) { + temp_f31 = 0.5f * ((temp_r31->unk84 + temp_r30->unk84) - temp_f31); + VECNormalize(&sp8, &sp8); + VECScale(&sp8, &sp8, temp_f31); + VECAdd(&temp_r31->unk88, &sp8, &temp_r31->unk88); + VECSubtract(&temp_r30->unk88, &sp8, &temp_r30->unk88); + } + } + sp8 = temp_r31->unk88; + sp8.y = 0; + temp_f31 = VECMag(&sp8); + if (temp_f31 > 510.0f - temp_r31->unk84) { + VECNormalize(&sp8, &sp8); + VECScale(&sp8, &sp8, -(temp_f31 - (510.0f - temp_r31->unk84))); + VECAdd(&sp8, &temp_r31->unk88, &temp_r31->unk88); + } + } + } } float fn_1_6690(float arg0, float arg1, float arg2) { - float temp_f31; - temp_f31 = fmodf(arg1-arg0, 360.0); - if(temp_f31 < 0.0f) { - temp_f31 += 360.0f; - } - if(temp_f31 > 180.0f) { - temp_f31 -= 360.0f; - } - temp_f31 = fmodf((arg2*temp_f31)+arg0, 360.0); - if(temp_f31 < 0.0f) { - temp_f31 += 360.0f; - } - return temp_f31; + float temp_f31; + temp_f31 = fmodf(arg1 - arg0, 360.0); + if (temp_f31 < 0.0f) { + temp_f31 += 360.0f; + } + if (temp_f31 > 180.0f) { + temp_f31 -= 360.0f; + } + temp_f31 = fmodf((arg2 * temp_f31) + arg0, 360.0); + if (temp_f31 < 0.0f) { + temp_f31 += 360.0f; + } + return temp_f31; } float fn_1_67AC(float arg0, float arg1) { - float temp_f31; - temp_f31 = fmodf(arg1-arg0, 360.0); - if(temp_f31 < 0.0f) { - temp_f31 += 360.0f; - } - if(temp_f31 > 180.0f) { - temp_f31 -= 360.0f; - } - return temp_f31; -} \ No newline at end of file + float temp_f31; + temp_f31 = fmodf(arg1 - arg0, 360.0); + if (temp_f31 < 0.0f) { + temp_f31 += 360.0f; + } + if (temp_f31 > 180.0f) { + temp_f31 -= 360.0f; + } + return temp_f31; +} diff --git a/src/REL/m437Dll/main.c b/src/REL/m437Dll/main.c index 27345907..54af13d9 100755 --- a/src/REL/m437Dll/main.c +++ b/src/REL/m437Dll/main.c @@ -1,5 +1,4 @@ #include "REL/m437Dll.h" -#include "game/process.h" #include "game/chrman.h" #include "game/data.h" #include "game/gamework.h" @@ -11,6 +10,7 @@ #include "game/objsub.h" #include "game/pad.h" #include "game/printfunc.h" +#include "game/process.h" #include "game/sprite.h" #include "game/window.h" #include "game/wipe.h" @@ -20,7 +20,7 @@ #include "string.h" typedef struct { - /* 0x000 */ omObjData* unk00; + /* 0x000 */ omObjData *unk00; /* 0x004 */ s32 unk04; /* 0x008 */ s32 unk08; /* 0x00C */ s32 unk0C; @@ -44,7 +44,7 @@ typedef struct { } StructBss1DC; // Size 0x138 typedef struct { - /* 0x00 */ omObjData* unk00; + /* 0x00 */ omObjData *unk00; /* 0x04 */ s32 unk04; /* 0x08 */ s32 unk08; /* 0x0C */ s32 unk0C; @@ -64,7 +64,7 @@ typedef struct { } StructFn3410; // Size 0x14 typedef struct { - /* 0x00 */ omObjData* unk00; + /* 0x00 */ omObjData *unk00; /* 0x04 */ s32 unk04; /* 0x08 */ s32 unk08; /* 0x0C */ s32 unk0C; @@ -77,7 +77,7 @@ typedef struct { } StructBss8D4; // Size 0x28 typedef struct { - /* 0x000 */ omObjData* unk00; + /* 0x000 */ omObjData *unk00; /* 0x004 */ s32 unk04; /* 0x008 */ s32 unk08; /* 0x00C */ s32 unk0C; @@ -90,7 +90,7 @@ typedef struct { } StructBss6BC; // Size 0x10C typedef struct { - /* 0x00 */ omObjData* unk00; + /* 0x00 */ omObjData *unk00; /* 0x04 */ s32 unk04; /* 0x08 */ s32 unk08; /* 0x0C */ s32 unk0C; @@ -102,7 +102,7 @@ typedef struct { } StructBss8FC; // Size 0x24 typedef struct { - /* 0x00 */ omObjData* unk00; + /* 0x00 */ omObjData *unk00; /* 0x04 */ s32 unk04; /* 0x08 */ s32 unk08; /* 0x0C */ s32 unk0C; @@ -152,13 +152,13 @@ void fn_1_434(void); void fn_1_4C0(void); void fn_1_8A4(void (*arg0)(void)); void fn_1_8C4(void (*arg0)(void)); -void fn_1_8E4(omObjData* arg0); +void fn_1_8E4(omObjData *arg0); void fn_1_F8C(void); void fn_1_10C0(void); void fn_1_1184(s32 arg0); s32 fn_1_11BC(void); void fn_1_11E0(void); -void fn_1_1218(omObjData* arg0); +void fn_1_1218(omObjData *arg0); void fn_1_13E8(void); void fn_1_144C(s32 arg0, float arg1, float arg2, s32 arg3); void fn_1_1A90(void); @@ -171,59 +171,59 @@ void fn_1_27A4(s32 arg0); void fn_1_280C(s32 arg0, s32 arg1); void fn_1_28F4(s32 arg0); void fn_1_2A10(s32 arg0, s32 arg1); -void fn_1_2A94(float* arg0, s32 arg1); -void fn_1_2B04(omObjData* arg0); +void fn_1_2A94(float *arg0, s32 arg1); +void fn_1_2B04(omObjData *arg0); void fn_1_2BAC(s32 arg0); -void fn_1_2BBC(omObjData* arg0); -void fn_1_3194(omObjData* arg0); -void fn_1_3260(StructBss920* arg0); -void fn_1_3410(omObjData* arg0); +void fn_1_2BBC(omObjData *arg0); +void fn_1_3194(omObjData *arg0); +void fn_1_3260(StructBss920 *arg0); +void fn_1_3410(omObjData *arg0); float fn_1_3694(void); float fn_1_36B4(void); void fn_1_37D4(s32 arg0); -void fn_1_37E8(omObjData* arg0); +void fn_1_37E8(omObjData *arg0); s32 fn_1_3990(void); void fn_1_39C4(float arg0); -void fn_1_39E4(omObjData* arg0); +void fn_1_39E4(omObjData *arg0); void fn_1_3B50(void); -void fn_1_3B64(omObjData* arg0); +void fn_1_3B64(omObjData *arg0); void fn_1_3CB8(s32 arg0); -void fn_1_3D40(omObjData* arg0); -void fn_1_3F44(omObjData* arg0); -void fn_1_4538(StructBss8FC* arg0); -void fn_1_46C0(omObjData* arg0); +void fn_1_3D40(omObjData *arg0); +void fn_1_3F44(omObjData *arg0); +void fn_1_4538(StructBss8FC *arg0); +void fn_1_46C0(omObjData *arg0); void fn_1_4928(s32 arg0); -void fn_1_4938(omObjData* arg0); +void fn_1_4938(omObjData *arg0); void fn_1_4AF8(s32 arg0); void fn_1_4BAC(s32 arg0, s32 arg1, s32 arg2, s32 arg3); -void fn_1_4C40(omObjData* arg0); -void fn_1_4E00(StructBss8D4* arg0); -void fn_1_4EE0(omObjData* arg0); +void fn_1_4C40(omObjData *arg0); +void fn_1_4E00(StructBss8D4 *arg0); +void fn_1_4EE0(omObjData *arg0); void fn_1_5148(s32 arg0, s32 arg1, s32 arg2, s32 arg3); void fn_1_51DC(s32 arg0, s32 arg1, s32 arg2, s32 arg3); void fn_1_5270(s32 arg0, s32 arg1, s32 arg2, s32 arg3); void fn_1_5304(s32 arg0); -void fn_1_532C(omObjData* arg0); -void fn_1_5658(omObjData* arg0); -void fn_1_5984(StructBss6BC* arg0); -void fn_1_5AD8(omObjData* arg0); +void fn_1_532C(omObjData *arg0); +void fn_1_5658(omObjData *arg0); +void fn_1_5984(StructBss6BC *arg0); +void fn_1_5AD8(omObjData *arg0); void fn_1_5FBC(void); void fn_1_610C(s32 arg0, s32 arg1); -void fn_1_6134(omObjData* arg0); +void fn_1_6134(omObjData *arg0); void fn_1_6198(s32 arg0, s32 arg1); -void fn_1_6200(omObjData* arg0); +void fn_1_6200(omObjData *arg0); void fn_1_6580(s32 arg0, s32 arg1, s32 arg2); -void fn_1_65E0(omObjData* arg0); +void fn_1_65E0(omObjData *arg0); void fn_1_70F8(s32 arg0, s32 arg1); -void fn_1_7134(omObjData* arg0); -void fn_1_72CC(omObjData* arg0); -void fn_1_74B0(StructBss1DC* arg0); -void fn_1_7678(omObjData* arg0); +void fn_1_7134(omObjData *arg0); +void fn_1_72CC(omObjData *arg0); +void fn_1_74B0(StructBss1DC *arg0); +void fn_1_7678(omObjData *arg0); void fn_1_79E0(void); -void fn_1_7A14(omObjData* arg0); -void fn_1_82E0(omObjData* arg0); -void fn_1_8308(StructBss68* arg0); -void fn_1_84C4(omObjData* arg0); +void fn_1_7A14(omObjData *arg0); +void fn_1_82E0(omObjData *arg0); +void fn_1_8308(StructBss68 *arg0); +void fn_1_84C4(omObjData *arg0); void fn_1_8684(void); void fn_1_8734(void); void fn_1_8824(void); @@ -303,11 +303,11 @@ void fn_1_F590(void); s32 fn_1_F640(void); void fn_1_F6EC(void); s32 fn_1_F71C(void); -void fn_1_F7A8(omObjData* arg0); +void fn_1_F7A8(omObjData *arg0); s32 fn_1_F89C(void); void fn_1_F8AC(void); -void fn_1_1043C(omObjData* arg0); -void fn_1_108A4(omObjData* arg0); +void fn_1_1043C(omObjData *arg0); +void fn_1_108A4(omObjData *arg0); void fn_1_10B30(void); StructBss968 lbl_1_bss_968; @@ -334,25 +334,17 @@ s32 lbl_1_bss_10; s32 lbl_1_bss_C; s32 lbl_1_bss_8; s32 lbl_1_bss_4; -Process* lbl_1_bss_0; +Process *lbl_1_bss_0; - -s32 lbl_1_data_0[][5] = { - { 91, 105, 126, 141, -1 }, - { 91, 105, 126, 141, -1 }, - { 124, 137, -1, -1, -1 }, - { 85, 100, 127, -1, -1 }, - { 124, 139, -1, -1, -1 }, - { 85, 97, 127, 139, -1 }, - { 127, 137, -1, -1, -1 }, - { 79, 95, 109, 127, -1 } -}; +s32 lbl_1_data_0[][5] = { { 91, 105, 126, 141, -1 }, { 91, 105, 126, 141, -1 }, { 124, 137, -1, -1, -1 }, { 85, 100, 127, -1, -1 }, + { 124, 139, -1, -1, -1 }, { 85, 97, 127, 139, -1 }, { 127, 137, -1, -1, -1 }, { 79, 95, 109, 127, -1 } }; s32 lbl_1_data_A0 = -1; s32 lbl_1_data_A4 = -1; s32 lbl_1_data_A8 = -1; -void fn_1_0(void) { +void fn_1_0(void) +{ s32 i; while (TRUE) { @@ -370,31 +362,36 @@ void fn_1_0(void) { } } -void fn_1_1A8(void) { +void fn_1_1A8(void) +{ s32 var_r31; var_r31 = Hu3DGLightCreate(0.0f, 1000.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0xFF, 0xFF, 0xFF); Hu3DGLightInfinitytSet(var_r31); } -void fn_1_230(s32 arg0, s32 arg1, float arg2) { - StructBss160* var_r31; +void fn_1_230(s32 arg0, s32 arg1, float arg2) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk44[arg0] = arg1; if (var_r31->unk60[arg0] < 0.0f) { var_r31->unk60[arg0] = -arg2; - } else { + } + else { var_r31->unk60[arg0] = arg2; } } -void fn_1_298(s32 arg0, float arg1) { +void fn_1_298(s32 arg0, float arg1) +{ fn_1_230(arg0, -1, arg1); } -float fn_1_304(s32 arg0) { - StructBss160* var_r31; +float fn_1_304(s32 arg0) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; if (var_r31->unk60[arg0] != 0.0f) { @@ -403,7 +400,8 @@ float fn_1_304(s32 arg0) { if (var_r31->unk60[arg0] >= -0.5f && var_r31->unk60[arg0] <= 0.5f) { var_r31->unk60[arg0] = 0.0f; } - } else { + } + else { var_r31->unk44[arg0]--; if (var_r31->unk44[arg0] <= 0) { var_r31->unk44[arg0] = 0; @@ -414,8 +412,9 @@ float fn_1_304(s32 arg0) { return var_r31->unk60[arg0]; } -void fn_1_434(void) { - StructBss160* var_r31; +void fn_1_434(void) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk08 = 0.0f; @@ -427,14 +426,16 @@ void fn_1_434(void) { var_r31->unk38 = 300.0f; } -void fn_1_4C0(void) { - StructBss160* var_r31; +void fn_1_4C0(void) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; if (HuPadBtn[0] & 0x200) { if (HuPadBtn[0] & 0x100) { var_r31->unk10 -= HuPadStkY[0] / 10.0f; - } else { + } + else { var_r31->unk08 += HuPadStkX[0] / 10.0f; var_r31->unk0C += HuPadStkY[0] / 10.0f; } @@ -464,22 +465,25 @@ void fn_1_4C0(void) { print8(16, 130, 1.0f, "ZOOM : %.2f", var_r31->unk38); } -void fn_1_8A4(void (*arg0)(void)) { - StructBss160* var_r31; +void fn_1_8A4(void (*arg0)(void)) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk00 = arg0; } -void fn_1_8C4(void (*arg0)(void)) { - StructBss160* var_r31; +void fn_1_8C4(void (*arg0)(void)) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk04 = arg0; } -void fn_1_8E4(omObjData* arg0) { - StructBss160* var_r31; +void fn_1_8E4(omObjData *arg0) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; if (var_r31->unk00 != NULL) { @@ -494,7 +498,8 @@ void fn_1_8E4(omObjData* arg0) { CZoom = var_r31->unk38 + fn_1_304(6); } -void fn_1_F8C(void) { +void fn_1_F8C(void) +{ Hu3DCameraCreate(1); Hu3DCameraViewportSet(1, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); Hu3DCameraPerspectiveSet(1, 45.0f, 0.1f, 10000.0f, 1.2f); @@ -504,7 +509,8 @@ void fn_1_F8C(void) { omAddObjEx(lbl_1_bss_0, 0x7FD9, 0, 0, -1, fn_1_8E4); } -void fn_1_10C0(void) { +void fn_1_10C0(void) +{ Vec sp20 = { 0.0f, 3000.0f, 1.0f }; Vec sp14 = { 0.0f, 0.0f, 0.0f }; Vec sp8 = { 0.0f, 1.0f, 0.0f }; @@ -514,22 +520,26 @@ void fn_1_10C0(void) { Hu3DShadowPosSet(&sp20, &sp8, &sp14); } -void fn_1_1184(s32 arg0) { +void fn_1_1184(s32 arg0) +{ if (lbl_1_bss_8 == 0) { lbl_1_bss_8 = 1; lbl_1_bss_4 = arg0 * 60; } } -s32 fn_1_11BC(void) { +s32 fn_1_11BC(void) +{ if (lbl_1_bss_8 == 3) { return 1; - } else { + } + else { return 0; } } -void fn_1_11E0(void) { +void fn_1_11E0(void) +{ if (lbl_1_bss_8 == 2) { lbl_1_bss_8 = 3; lbl_1_bss_4 = 30; @@ -538,7 +548,8 @@ void fn_1_11E0(void) { s32 lbl_1_data_12C = -1; -void fn_1_1218(omObjData* arg0) { +void fn_1_1218(omObjData *arg0) +{ switch (lbl_1_bss_8) { case 1: if (lbl_1_data_12C == -1) { @@ -567,15 +578,17 @@ void fn_1_1218(omObjData* arg0) { } } -void fn_1_13E8(void) { +void fn_1_13E8(void) +{ lbl_1_bss_4 = 0; lbl_1_bss_8 = 0; omAddObjEx(lbl_1_bss_0, 0x2000, 0, 0, -1, fn_1_1218); } // Identical to mgmodedll/main.c::fn_1_245CC -void fn_1_144C(s32 arg0, float arg1, float arg2, s32 arg3) { - WindowData* temp_r29; +void fn_1_144C(s32 arg0, float arg1, float arg2, s32 arg3) +{ + WindowData *temp_r29; float temp_f29; float temp_f28; float temp_f25; @@ -599,10 +612,12 @@ void fn_1_144C(s32 arg0, float arg1, float arg2, s32 arg3) { temp_f27 = 4.0f / temp_f25; if (var_f31 + 4.0f - (temp_f29 + temp_f25) >= 0.0f) { var_f31 = temp_f29 + temp_f25 - 4.0f; - } else { + } + else { if (temp_f29 - (var_f31 - 2.0f) >= 0.0f) { var_f31 = temp_f29; - } else { + } + else { var_f31 -= 2.0f; } } @@ -610,10 +625,12 @@ void fn_1_144C(s32 arg0, float arg1, float arg2, s32 arg3) { temp_f26 = 4.0f / temp_f24; if (var_f30 + 4.0f - (temp_f28 + temp_f24) >= 0.0f) { var_f30 = temp_f28 + temp_f24 - 4.0f; - } else { + } + else { if (temp_f28 - (var_f30 - 2.0f) >= 0.0f) { var_f30 = temp_f28; - } else { + } + else { var_f30 -= 2.0f; } } @@ -624,7 +641,8 @@ void fn_1_144C(s32 arg0, float arg1, float arg2, s32 arg3) { var_f21 = temp_f27; var_f22 = var_f30; var_f20 = temp_f26; - } else { + } + else { HuWinPosSet(arg0, temp_f29, temp_f28); HuWinScaleSet(arg0, 1.0f, 1.0f); var_f23 = temp_f29; @@ -639,15 +657,18 @@ void fn_1_144C(s32 arg0, float arg1, float arg2, s32 arg3) { if (i <= 10) { var_f23 = fn_1_113B0(var_f31, temp_f29, i, 10.0f); var_f21 = fn_1_113B0(temp_f27, 1.0f, i, 10.0f); - } else { + } + else { var_f22 = fn_1_113B0(var_f30, temp_f28, i - 10, 5.0f); var_f20 = fn_1_113B0(temp_f26, 1.0f, i - 10, 5.0f); } - } else { + } + else { if (i <= 10) { var_f22 = fn_1_113B0(temp_f28, var_f30, i, 10.0f); var_f20 = fn_1_113B0(1.0f, temp_f26, i, 10.0f); - } else { + } + else { var_f23 = fn_1_113B0(temp_f29, var_f31, i - 10, 5.0f); var_f21 = fn_1_113B0(1.0f, temp_f27, i - 10, 5.0f); } @@ -658,19 +679,22 @@ void fn_1_144C(s32 arg0, float arg1, float arg2, s32 arg3) { if (arg3 != 0) { HuWinPosSet(arg0, temp_f29, temp_f28); HuWinScaleSet(arg0, 1.0f, 1.0f); - } else { + } + else { HuWinPosSet(arg0, var_f31, var_f30); HuWinScaleSet(arg0, temp_f27, temp_f26); } HuPrcVSleep(); } -void fn_1_1A90(void) { +void fn_1_1A90(void) +{ HuWinInit(1); } -void fn_1_1AB4(s32 arg0, float arg1, float arg2) { - WindowData* temp_r31; +void fn_1_1AB4(s32 arg0, float arg1, float arg2) +{ + WindowData *temp_r31; float temp_f29; float temp_f28; float temp_f27; @@ -694,10 +718,12 @@ void fn_1_1AB4(s32 arg0, float arg1, float arg2) { temp_f25 = 4.0f / temp_f27; if (var_f31 + 4.0f - (temp_f29 + temp_f27) >= 0.0f) { var_f31 = temp_f29 + temp_f27 - 4.0f; - } else { + } + else { if (temp_f29 - (var_f31 - 2.0f) >= 0.0f) { var_f31 = temp_f29; - } else { + } + else { var_f31 = var_f31 - 2.0f; } } @@ -705,10 +731,12 @@ void fn_1_1AB4(s32 arg0, float arg1, float arg2) { temp_f24 = 4.0f / temp_f26; if (var_f30 + 4.0f - (temp_f28 + temp_f26) >= 0.0f) { var_f30 = temp_f28 + temp_f26 - 4.0f; - } else { + } + else { if (temp_f28 - (var_f30 - 2.0f) >= 0.0f) { var_f30 = temp_f28; - } else { + } + else { var_f30 = var_f30 - 2.0f; } } @@ -729,13 +757,10 @@ void fn_1_1AB4(s32 arg0, float arg1, float arg2) { HuPrcVSleep(); } -s32 fn_1_1F0C(float arg0, float arg1, float arg2, float arg3, s32 arg4) { +s32 fn_1_1F0C(float arg0, float arg1, float arg2, float arg3, s32 arg4) +{ s32 var_r31; - s32 sp18[][6] = { - { 0xFF, 0xFF, 0xCC, 0x00, 0x09, 0x09 }, - { 0xCC, 0xFF, 0xFF, 0x00, 0x09, 0x09 }, - { 0xFF, 0xCC, 0xFF, 0x00, 0x09, 0x09 } - }; + s32 sp18[][6] = { { 0xFF, 0xFF, 0xCC, 0x00, 0x09, 0x09 }, { 0xCC, 0xFF, 0xFF, 0x00, 0x09, 0x09 }, { 0xFF, 0xCC, 0xFF, 0x00, 0x09, 0x09 } }; var_r31 = HuWinCreate(arg0, arg1, arg2, arg3, 1); HuSprColorSet(winData[var_r31].group, 0, sp18[arg4][0], sp18[arg4][1], sp18[arg4][2]); @@ -748,12 +773,14 @@ s32 fn_1_1F0C(float arg0, float arg1, float arg2, float arg3, s32 arg4) { return var_r31; } -s32 fn_1_20F8(float arg0, float arg1, float arg2, float arg3, s32 arg4) { +s32 fn_1_20F8(float arg0, float arg1, float arg2, float arg3, s32 arg4) +{ return fn_1_1F0C(arg0, arg1, arg2, arg3, arg4); } -void fn_1_22E4(s32 arg0, float arg1, float arg2) { - WindowData* temp_r31; +void fn_1_22E4(s32 arg0, float arg1, float arg2) +{ + WindowData *temp_r31; float temp_f29; float temp_f28; float temp_f27; @@ -777,10 +804,12 @@ void fn_1_22E4(s32 arg0, float arg1, float arg2) { temp_f25 = 4.0f / temp_f27; if (var_f31 + 4.0f - (temp_f29 + temp_f27) >= 0.0f) { var_f31 = temp_f29 + temp_f27 - 4.0f; - } else { + } + else { if (temp_f29 - (var_f31 - 2.0f) >= 0.0f) { var_f31 = temp_f29; - } else { + } + else { var_f31 = var_f31 - 2.0f; } } @@ -788,10 +817,12 @@ void fn_1_22E4(s32 arg0, float arg1, float arg2) { temp_f24 = 4.0f / temp_f26; if (var_f30 + 4.0f - (temp_f28 + temp_f26) >= 0.0f) { var_f30 = temp_f28 + temp_f26 - 4.0f; - } else { + } + else { if (temp_f28 - (var_f30 - 2.0f) >= 0.0f) { var_f30 = temp_f28; - } else { + } + else { var_f30 = var_f30 - 2.0f; } } @@ -812,18 +843,21 @@ void fn_1_22E4(s32 arg0, float arg1, float arg2) { HuPrcVSleep(); } -void fn_1_273C(s32 arg0) { +void fn_1_273C(s32 arg0) +{ HuWinMesSet(arg0, MAKE_MESSID(29, 22)); HuPrcVSleep(); fn_1_144C(arg0, 0.5f, 0.5f, 0); HuWinKill(arg0); } -void fn_1_27A4(s32 arg0) { +void fn_1_27A4(s32 arg0) +{ fn_1_273C(arg0); } -void fn_1_280C(s32 arg0, s32 arg1) { +void fn_1_280C(s32 arg0, s32 arg1) +{ s32 var_r30; s32 temp_r28; s32 i; @@ -849,7 +883,8 @@ void fn_1_280C(s32 arg0, s32 arg1) { HuWinComKeyReset(); } -void fn_1_28F4(s32 arg0) { +void fn_1_28F4(s32 arg0) +{ s32 var_r31; s32 temp_r28; s32 i; @@ -870,20 +905,23 @@ void fn_1_28F4(s32 arg0) { var_r31 = HuWinChoiceGet(arg0, 1); if (var_r31 == -1 || var_r31 == 1) { lbl_1_bss_10 = 0; - } else { + } + else { lbl_1_bss_10 = 1; } HuWinComKeyReset(); } -void fn_1_2A10(s32 arg0, s32 arg1) { +void fn_1_2A10(s32 arg0, s32 arg1) +{ winData[arg0].mess_color = 0; winData[arg0].mess_shadow_color = 9; winData[arg0].attr |= 0x80; HuWinMesSet(arg0, arg1); } -void fn_1_2A94(float* arg0, s32 arg1) { +void fn_1_2A94(float *arg0, s32 arg1) +{ float spC[2]; HuWinMesMaxSizeGet(1, spC, arg1); @@ -895,7 +933,8 @@ void fn_1_2A94(float* arg0, s32 arg1) { } } -void fn_1_2B04(omObjData* arg0) { +void fn_1_2B04(omObjData *arg0) +{ s32 i; for (i = 0; i < 3; i++) { @@ -903,18 +942,20 @@ void fn_1_2B04(omObjData* arg0) { } } -void fn_1_2BAC(s32 arg0) { +void fn_1_2BAC(s32 arg0) +{ lbl_1_bss_920.unk04 = arg0; } -void fn_1_2BBC(omObjData* arg0) { - StructBss920* temp_r30; +void fn_1_2BBC(omObjData *arg0) +{ + StructBss920 *temp_r30; temp_r30 = arg0->data; switch (temp_r30->unk04) { case 2: fn_1_119A0(arg0, 9, 9, 1, 0); - Hu3DModelAttrReset(arg0->model[9], 1); + Hu3DModelAttrReset(arg0->model[9], HU3D_ATTR_DISPOFF); temp_r30->unk1C = 0; fn_1_230(1, 10, 4.0f); HuAudFXPlay(0x6CF); @@ -942,8 +983,8 @@ void fn_1_2BBC(omObjData* arg0) { fn_1_119A0(arg0, 6, 6, 1, 0); fn_1_119A0(arg0, 7, 7, 1, 0); fn_1_119A0(arg0, 8, 8, 0, 0); - Hu3DModelAttrReset(arg0->model[8], 1); - Hu3DModelAttrReset(arg0->model[9], 1); + Hu3DModelAttrReset(arg0->model[8], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(arg0->model[9], HU3D_ATTR_DISPOFF); HuAudFXPlay(0x6D0); break; case 10: @@ -951,8 +992,8 @@ void fn_1_2BBC(omObjData* arg0) { temp_r30->unk04 = 0; fn_1_119A0(arg0, 3, 13, 1, 1); fn_1_119A0(arg0, 4, 14, 1, 1); - Hu3DModelAttrSet(arg0->model[8], 1); - Hu3DModelAttrSet(arg0->model[9], 1); + Hu3DModelAttrSet(arg0->model[8], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[9], HU3D_ATTR_DISPOFF); } break; case 30: @@ -972,7 +1013,8 @@ void fn_1_2BBC(omObjData* arg0) { if (Hu3DMotionTimeGet(arg0->model[9]) >= 25.0f && temp_r30->unk1C == 0) { temp_r30->unk1C = 1; fn_1_230(1, 10, 4.0f); - } else if (Hu3DMotionTimeGet(arg0->model[9]) >= 40.0f && temp_r30->unk1C == 1) { + } + else if (Hu3DMotionTimeGet(arg0->model[9]) >= 40.0f && temp_r30->unk1C == 1) { temp_r30->unk1C = 2; fn_1_230(1, 10, 4.0f); } @@ -986,47 +1028,30 @@ void fn_1_2BBC(omObjData* arg0) { } } -void fn_1_3194(omObjData* arg0) { +void fn_1_3194(omObjData *arg0) +{ fn_1_2B04(arg0); fn_1_2BBC(arg0); } -void fn_1_3260(StructBss920* arg0) { - omObjData* temp_r29 = arg0->unk00; - s32 sp80[][3] = { - { 2, -1, 0 }, - { 2, -1, 0 }, - { 2, -1, 0 }, - { 1, 1, 0 }, - { 1, 1, 0 }, - { 2, -1, 0 }, - { 2, -1, 0 }, - { 2, -1, 0 }, - { 2, -1, 1 }, - { 2, -1, 1 } - }; - Vec sp8[] = { - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, -680.0f }, - { 0.0f, 0.0f, -680.0f }, - { 525.0f, 0.0f, -1150.0f }, - { -525.0f, 0.0f, -1150.0f }, - { 0.0f, 150.0f, 50.0f }, - { 0.0f, 150.0f, 0.0f }, - { 0.0f, 150.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f } - }; +void fn_1_3260(StructBss920 *arg0) +{ + omObjData *temp_r29 = arg0->unk00; + s32 sp80[][3] = { { 2, -1, 0 }, { 2, -1, 0 }, { 2, -1, 0 }, { 1, 1, 0 }, { 1, 1, 0 }, { 2, -1, 0 }, { 2, -1, 0 }, { 2, -1, 0 }, { 2, -1, 1 }, + { 2, -1, 1 } }; + Vec sp8[] = { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, -680.0f }, { 0.0f, 0.0f, -680.0f }, { 525.0f, 0.0f, -1150.0f }, { -525.0f, 0.0f, -1150.0f }, + { 0.0f, 150.0f, 50.0f }, { 0.0f, 150.0f, 0.0f }, { 0.0f, 150.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } }; s32 i; for (i = 0; i < 10; i++) { Hu3DModelPosSet(temp_r29->model[i], sp8[i].x, sp8[i].y, sp8[i].z); if (sp80[i][2] == 1) { - Hu3DModelAttrSet(temp_r29->model[i], 1); + Hu3DModelAttrSet(temp_r29->model[i], HU3D_ATTR_DISPOFF); } if (sp80[i][1] != -1) { fn_1_119A0(temp_r29, i, i + 10, 1, sp80[i][1]); - } else { + } + else { fn_1_119A0(temp_r29, i, i, 1, sp80[i][1]); } } @@ -1035,31 +1060,15 @@ void fn_1_3260(StructBss920* arg0) { arg0->unk04 = arg0->unk08 = arg0->unk0C = arg0->unk10 = 0; } -void fn_1_3410(omObjData* arg0) { - StructFn3410 sp80[] = { - { DATA_MAKE_NUM(DATADIR_M437, 36), 2, -1, 1, 0 }, - { DATA_MAKE_NUM(DATADIR_M437, 37), 2, -1, 1, 0 }, - { DATA_MAKE_NUM(DATADIR_M437, 38), 2, -1, 2, 0 }, - { DATA_MAKE_NUM(DATADIR_M437, 39), 1, DATA_MAKE_NUM(DATADIR_M437, 41), 2, 0 }, - { DATA_MAKE_NUM(DATADIR_M437, 40), 1, DATA_MAKE_NUM(DATADIR_M437, 42), 2, 0 }, - { DATA_MAKE_NUM(DATADIR_M437, 33), 2, -1, 0, 0 }, - { DATA_MAKE_NUM(DATADIR_M437, 34), 2, -1, 0, 0 }, - { DATA_MAKE_NUM(DATADIR_M437, 35), 2, -1, 0, 0 }, - { DATA_MAKE_NUM(DATADIR_M437, 43), 2, -1, 0, 1 }, - { DATA_MAKE_NUM(DATADIR_M437, 44), 2, -1, 0, 1 } - }; - Vec sp8[] = { - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, -680.0f }, - { 0.0f, 0.0f, -680.0f }, - { 525.0f, 0.0f, -1150.0f }, - { -525.0f, 0.0f, -1150.0f }, - { 0.0f, 150.0f, 50.0f }, - { 0.0f, 150.0f, 0.0f }, - { 0.0f, 150.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f } - }; +void fn_1_3410(omObjData *arg0) +{ + StructFn3410 sp80[] = { { DATA_MAKE_NUM(DATADIR_M437, 36), 2, -1, 1, 0 }, { DATA_MAKE_NUM(DATADIR_M437, 37), 2, -1, 1, 0 }, + { DATA_MAKE_NUM(DATADIR_M437, 38), 2, -1, 2, 0 }, { DATA_MAKE_NUM(DATADIR_M437, 39), 1, DATA_MAKE_NUM(DATADIR_M437, 41), 2, 0 }, + { DATA_MAKE_NUM(DATADIR_M437, 40), 1, DATA_MAKE_NUM(DATADIR_M437, 42), 2, 0 }, { DATA_MAKE_NUM(DATADIR_M437, 33), 2, -1, 0, 0 }, + { DATA_MAKE_NUM(DATADIR_M437, 34), 2, -1, 0, 0 }, { DATA_MAKE_NUM(DATADIR_M437, 35), 2, -1, 0, 0 }, + { DATA_MAKE_NUM(DATADIR_M437, 43), 2, -1, 0, 1 }, { DATA_MAKE_NUM(DATADIR_M437, 44), 2, -1, 0, 1 } }; + Vec sp8[] = { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, -680.0f }, { 0.0f, 0.0f, -680.0f }, { 525.0f, 0.0f, -1150.0f }, { -525.0f, 0.0f, -1150.0f }, + { 0.0f, 150.0f, 50.0f }, { 0.0f, 150.0f, 0.0f }, { 0.0f, 150.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } }; s32 i; for (i = 0; i < 10; i++) { @@ -1071,16 +1080,18 @@ void fn_1_3410(omObjData* arg0) { Hu3DModelPosSet(arg0->model[i], sp8[i].x, sp8[i].y, sp8[i].z); if (sp80[i].unk0C == 1) { Hu3DModelShadowMapSet(arg0->model[i]); - } else if (sp80[i].unk0C == 2) { + } + else if (sp80[i].unk0C == 2) { Hu3DModelShadowSet(arg0->model[i]); } if (sp80[i].unk10 == 1) { - Hu3DModelAttrSet(arg0->model[i], 1); + Hu3DModelAttrSet(arg0->model[i], HU3D_ATTR_DISPOFF); Hu3DModelLayerSet(arg0->model[i], 1); } if (sp80[i].unk08 != -1) { fn_1_119A0(arg0, i, i + 10, 1, sp80[i].unk04); - } else { + } + else { fn_1_119A0(arg0, i, i, 1, sp80[i].unk04); } } @@ -1088,13 +1099,15 @@ void fn_1_3410(omObjData* arg0) { arg0->func = fn_1_3194; } -float fn_1_3694(void) { +float fn_1_3694(void) +{ return lbl_1_bss_150 / lbl_1_bss_154; } -float fn_1_36B4(void) { +float fn_1_36B4(void) +{ float temp_f31; - StructBss6BC* sp8; + StructBss6BC *sp8; temp_f31 = lbl_1_bss_150 / lbl_1_bss_154; sp8 = &lbl_1_bss_6BC[1]; @@ -1104,13 +1117,16 @@ float fn_1_36B4(void) { fn_1_5304(3); fn_1_5148(3, 5, 0, 0); fn_1_5270(5, 10, 2, 1); - } else if (temp_f31 > 0.75f) { + } + else if (temp_f31 > 0.75f) { fn_1_4AF8(2); fn_1_5304(2); - } else if (temp_f31 > 0.5f) { + } + else if (temp_f31 > 0.5f) { fn_1_4AF8(1); fn_1_5304(1); - } else { + } + else { fn_1_4AF8(0); fn_1_5304(0); } @@ -1118,21 +1134,23 @@ float fn_1_36B4(void) { return temp_f31; } -void fn_1_37D4(s32 arg0) { +void fn_1_37D4(s32 arg0) +{ lbl_1_bss_8FC.unk04 = 1; } -void fn_1_37E8(omObjData* arg0) { +void fn_1_37E8(omObjData *arg0) +{ Mtx sp8; - StructBss8FC* var_r30; + StructBss8FC *var_r30; var_r30 = &lbl_1_bss_8FC; switch (var_r30->unk04) { case 1: var_r30->unk04 = 2; - Hu3DModelAttrReset(arg0->model[0], 1); - Hu3DModelAttrReset(arg0->model[1], 1); - Hu3DModelAttrReset(arg0->model[2], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(arg0->model[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(arg0->model[2], HU3D_ATTR_DISPOFF); fn_1_119A0(arg0, 0, 3, 1, 0); fn_1_119A0(arg0, 2, 10, 1, 0); break; @@ -1156,24 +1174,29 @@ void fn_1_37E8(omObjData* arg0) { } } -s32 fn_1_3990(void) { +s32 fn_1_3990(void) +{ if (lbl_1_bss_15C <= lbl_1_bss_158) { return 1; - } else { + } + else { return 0; } } -void fn_1_39C4(float arg0) { +void fn_1_39C4(float arg0) +{ lbl_1_bss_158 += arg0; } -void fn_1_39E4(omObjData* arg0) { +void fn_1_39E4(omObjData *arg0) +{ if (lbl_1_bss_15C > lbl_1_bss_158) { lbl_1_bss_150 = lbl_1_bss_158 * (lbl_1_bss_154 / lbl_1_bss_15C); lbl_1_bss_14C = fn_1_11370(lbl_1_bss_14C, lbl_1_bss_150, 5.0f); Hu3DMotionTimeSet(arg0->model[1], lbl_1_bss_14C); - } else { + } + else { lbl_1_bss_158 = lbl_1_bss_15C; lbl_1_bss_150 = lbl_1_bss_158 * (lbl_1_bss_154 / lbl_1_bss_15C); lbl_1_bss_14C = fn_1_11370(lbl_1_bss_14C, lbl_1_bss_150, 5.0f); @@ -1181,19 +1204,21 @@ void fn_1_39E4(omObjData* arg0) { } } -void fn_1_3B50(void) { +void fn_1_3B50(void) +{ lbl_1_bss_8FC.unk08 = 1; } -void fn_1_3B64(omObjData* arg0) { +void fn_1_3B64(omObjData *arg0) +{ Mtx sp8; - StructBss8FC* var_r30; + StructBss8FC *var_r30; var_r30 = &lbl_1_bss_8FC; if (var_r30->unk08 == 1) { var_r30->unk08 = 0; - Hu3DModelAttrReset(arg0->model[3], 1); - Hu3DModelAttrSet(arg0->model[1], 1); + Hu3DModelAttrReset(arg0->model[3], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[1], HU3D_ATTR_DISPOFF); Hu3DModelObjMtxGet(arg0->model[0], "m437a01-balloon-point", sp8); Hu3DModelPosSet(arg0->model[3], sp8[0][3], 0.0f, -250.0f); fn_1_119A0(arg0, 3, 6, 1, 0); @@ -1206,16 +1231,18 @@ void fn_1_3B64(omObjData* arg0) { } } -void fn_1_3CB8(s32 arg0) { +void fn_1_3CB8(s32 arg0) +{ lbl_1_bss_14 += arg0; if (lbl_1_bss_14 >= 3.0f) { lbl_1_bss_14 = 3.0f; } } -void fn_1_3D40(omObjData* arg0) { +void fn_1_3D40(omObjData *arg0) +{ float temp_f31; - StructBss8FC* sp8; + StructBss8FC *sp8; s32 temp_r31; sp8 = &lbl_1_bss_8FC; @@ -1233,32 +1260,35 @@ void fn_1_3D40(omObjData* arg0) { } } -void fn_1_3F44(omObjData* arg0) { +void fn_1_3F44(omObjData *arg0) +{ fn_1_37E8(arg0); fn_1_39E4(arg0); fn_1_3D40(arg0); fn_1_3B64(arg0); } -void fn_1_4538(StructBss8FC* arg0) { - omObjData* temp_r31; +void fn_1_4538(StructBss8FC *arg0) +{ + omObjData *temp_r31; temp_r31 = arg0->unk00; omSetTra(temp_r31, 0.0f, 210.0f, -250.0f); - Hu3DModelAttrSet(temp_r31->model[0], 1); - Hu3DModelAttrSet(temp_r31->model[1], 1); + Hu3DModelAttrSet(temp_r31->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(temp_r31->model[1], HU3D_ATTR_DISPOFF); lbl_1_bss_150 = 0.0f; lbl_1_bss_154 = Hu3DMotionMaxTimeGet(temp_r31->model[1]); lbl_1_bss_14C = 0.0f; lbl_1_bss_158 = 0.0f; lbl_1_bss_15C = rand8() % 7 + 30; - Hu3DModelAttrSet(temp_r31->model[2], 1); + Hu3DModelAttrSet(temp_r31->model[2], HU3D_ATTR_DISPOFF); temp_r31->work[0] = temp_r31->work[1] = temp_r31->work[2] = temp_r31->work[3] = 0; arg0->unk14 = arg0->unk18 = arg0->unk1C = arg0->unk20 = 0; arg0->unk04 = arg0->unk08 = arg0->unk0C = arg0->unk10 = 0; } -void fn_1_46C0(omObjData* arg0) { +void fn_1_46C0(omObjData *arg0) +{ arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M437, 24)); arg0->motion[0] = Hu3DJointMotionFile(arg0->model[0], DATA_MAKE_NUM(DATADIR_M437, 28)); arg0->motion[1] = Hu3DJointMotionFile(arg0->model[0], DATA_MAKE_NUM(DATADIR_M437, 29)); @@ -1278,17 +1308,19 @@ void fn_1_46C0(omObjData* arg0) { arg0->model[3] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M437, 27)); arg0->motion[6] = Hu3DMotionIDGet(arg0->model[3]); Hu3DModelLayerSet(arg0->model[3], 2); - Hu3DModelAttrSet(arg0->model[3], 1); + Hu3DModelAttrSet(arg0->model[3], HU3D_ATTR_DISPOFF); arg0->func = fn_1_3F44; } -void fn_1_4928(s32 arg0) { +void fn_1_4928(s32 arg0) +{ lbl_1_bss_8D4.unk04 = arg0; } -void fn_1_4938(omObjData* arg0) { +void fn_1_4938(omObjData *arg0) +{ float sp8; - StructBss8D4* temp_r31; + StructBss8D4 *temp_r31; sp8 = 0.0f; temp_r31 = arg0->data; @@ -1323,30 +1355,36 @@ void fn_1_4938(omObjData* arg0) { } } -void fn_1_4AF8(s32 arg0) { +void fn_1_4AF8(s32 arg0) +{ s32 sp8[] = { 4, 5, 6, 7, 8 }; if (arg0 <= 3) { fn_1_11B18(lbl_1_bss_8D4.unk00, 0, sp8[arg0], 120, 1); - } else { + } + else { fn_1_11B18(lbl_1_bss_8D4.unk00, 0, sp8[arg0], 5, 0); } } -void fn_1_4BAC(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { +void fn_1_4BAC(s32 arg0, s32 arg1, s32 arg2, s32 arg3) +{ if (arg3 != 0) { fn_1_119A0(lbl_1_bss_8D4.unk00, 0, arg0, arg1, arg2); - } else { + } + else { fn_1_11B18(lbl_1_bss_8D4.unk00, 0, arg0, arg1, arg2); } } -void fn_1_4C40(omObjData* arg0) { +void fn_1_4C40(omObjData *arg0) +{ fn_1_4938(arg0); } -void fn_1_4E00(StructBss8D4* arg0) { - omObjData* temp_r30; +void fn_1_4E00(StructBss8D4 *arg0) +{ + omObjData *temp_r30; temp_r30 = arg0->unk00; omSetTra(temp_r30, 0.0f, 37.0f, -565.0f); @@ -1357,7 +1395,8 @@ void fn_1_4E00(StructBss8D4* arg0) { arg0->unk04 = arg0->unk08 = arg0->unk0C = arg0->unk10 = 0; } -void fn_1_4EE0(omObjData* arg0) { +void fn_1_4EE0(omObjData *arg0) +{ arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M437, 45)); arg0->motion[0] = Hu3DJointMotionFile(arg0->model[0], DATA_MAKE_NUM(DATADIR_M437, 46)); arg0->motion[1] = Hu3DJointMotionFile(arg0->model[0], DATA_MAKE_NUM(DATADIR_M437, 47)); @@ -1376,45 +1415,48 @@ void fn_1_4EE0(omObjData* arg0) { arg0->func = fn_1_4C40; } -void fn_1_5148(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { +void fn_1_5148(s32 arg0, s32 arg1, s32 arg2, s32 arg3) +{ if (arg3 != 0) { fn_1_119A0(lbl_1_bss_6BC[0].unk00, 0, arg0, arg1, arg2); - } else { + } + else { fn_1_11B18(lbl_1_bss_6BC[0].unk00, 0, arg0, arg1, arg2); } } -void fn_1_51DC(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { +void fn_1_51DC(s32 arg0, s32 arg1, s32 arg2, s32 arg3) +{ if (arg3 != 0) { fn_1_119A0(lbl_1_bss_6BC[1].unk00, 0, arg0, arg1, arg2); - } else { + } + else { fn_1_11B18(lbl_1_bss_6BC[1].unk00, 0, arg0, arg1, arg2); } } -void fn_1_5270(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { +void fn_1_5270(s32 arg0, s32 arg1, s32 arg2, s32 arg3) +{ if (arg3 != 0) { fn_1_119A0(lbl_1_bss_6BC[0].unk00, 1, arg0, arg1, arg2); - } else { + } + else { fn_1_11B18(lbl_1_bss_6BC[0].unk00, 1, arg0, arg1, arg2); } } -void fn_1_5304(s32 arg0) { - StructBss6BC* var_r31; +void fn_1_5304(s32 arg0) +{ + StructBss6BC *var_r31; var_r31 = &lbl_1_bss_6BC[1]; var_r31->unk04 = arg0 + 1; } -void fn_1_532C(omObjData* arg0) { - StructBss6BC* temp_r31 = arg0->data; - Vec sp38[] = { - { 480.0f, 0.0f, -1250.0f }, - { 400.0f, 37.0f, -850.0f }, - { 400.0f, 37.0f, -600.0f }, - { 400.0f, 37.0f, -425.0f } - }; +void fn_1_532C(omObjData *arg0) +{ + StructBss6BC *temp_r31 = arg0->data; + Vec sp38[] = { { 480.0f, 0.0f, -1250.0f }, { 400.0f, 37.0f, -850.0f }, { 400.0f, 37.0f, -600.0f }, { 400.0f, 37.0f, -425.0f } }; if (arg0->work[0] == 0) { return; @@ -1456,13 +1498,15 @@ void fn_1_532C(omObjData* arg0) { } } -void fn_1_5658(omObjData* arg0) { +void fn_1_5658(omObjData *arg0) +{ fn_1_532C(arg0); } -void fn_1_5984(StructBss6BC* arg0) { +void fn_1_5984(StructBss6BC *arg0) +{ s32 var_r29; - omObjData* temp_r30; + omObjData *temp_r30; var_r29 = arg0->unk00->work[0]; temp_r30 = arg0->unk00; @@ -1470,7 +1514,8 @@ void fn_1_5984(StructBss6BC* arg0) { omSetTra(temp_r30, 400.0f, 37.0f, -425.0f); omSetRot(temp_r30, 0.0f, -15.0f, 0.0f); fn_1_119A0(temp_r30, 0, 0, 1, 1); - } else { + } + else { omSetTra(temp_r30, -400.0f, 37.0f, -425.0f); fn_1_119A0(temp_r30, 0, 0, 1, 1); fn_1_119A0(temp_r30, 1, 5, 1, 1); @@ -1480,8 +1525,9 @@ void fn_1_5984(StructBss6BC* arg0) { arg0->unk04 = arg0->unk08 = arg0->unk0C = arg0->unk10 = 0; } -void fn_1_5AD8(omObjData* arg0) { - StructBss6BC* temp_r29; +void fn_1_5AD8(omObjData *arg0) +{ + StructBss6BC *temp_r29; s32 temp_r30; temp_r30 = arg0->work[0]; @@ -1503,7 +1549,8 @@ void fn_1_5AD8(omObjData* arg0) { fn_1_119A0(arg0, 0, 0, 1, 1); fn_1_164B0(lbl_1_bss_0, &temp_r29->unk24, arg0->model[0], "g007m0-skl_at"); fn_1_15DC8(&temp_r29->unk24); - } else { + } + else { arg0->motion[0] = Hu3DJointMotionFile(arg0->model[0], DATA_MAKE_NUM(DATADIR_M437, 60)); arg0->motion[1] = Hu3DJointMotionFile(arg0->model[0], DATA_MAKE_NUM(DATADIR_M437, 61)); arg0->motion[2] = Hu3DJointMotionFile(arg0->model[0], DATA_MAKE_NUM(DATADIR_M437, 62)); @@ -1524,8 +1571,9 @@ void fn_1_5AD8(omObjData* arg0) { arg0->func = fn_1_5658; } -void fn_1_5FBC(void) { - StructBss1DC* temp_r31; +void fn_1_5FBC(void) +{ + StructBss1DC *temp_r31; s32 sp8[4]; s32 i; @@ -1547,26 +1595,30 @@ void fn_1_5FBC(void) { } } -void fn_1_610C(s32 arg0, s32 arg1) { - StructBss1DC* temp_r31; +void fn_1_610C(s32 arg0, s32 arg1) +{ + StructBss1DC *temp_r31; temp_r31 = &lbl_1_bss_1DC[arg0]; temp_r31->unk04 = arg1; } -void fn_1_6134(omObjData* arg0) { - StructBss1DC* var_r30; +void fn_1_6134(omObjData *arg0) +{ + StructBss1DC *var_r30; var_r30 = arg0->data; if (var_r30->unk04 != 0) { - Hu3DModelAttrReset(arg0->model[0], 1); - } else { - Hu3DModelAttrSet(arg0->model[0], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); } } -void fn_1_6198(s32 arg0, s32 arg1) { - StructBss1DC* temp_r31; +void fn_1_6198(s32 arg0, s32 arg1) +{ + StructBss1DC *temp_r31; temp_r31 = &lbl_1_bss_1DC[arg0]; temp_r31->unk08 = arg1; @@ -1574,15 +1626,16 @@ void fn_1_6198(s32 arg0, s32 arg1) { fn_1_11B18(temp_r31->unk00, 0, 2, 10, 0); } -void fn_1_6200(omObjData* arg0) { - StructBss1DC* temp_r30; - HsfMaterial* var_r31; - HsfData* temp_r28; - char** temp_r27; +void fn_1_6200(omObjData *arg0) +{ + StructBss1DC *temp_r30; + HsfMaterial *var_r31; + HsfData *temp_r28; + char **temp_r27; s32 var_r23; s32 i, j; - ModelData* temp_r25; - HsfAttribute* temp_r24; + ModelData *temp_r25; + HsfAttribute *temp_r24; temp_r30 = &lbl_1_bss_1DC[arg0->work[0]]; if (temp_r30->unk08 != 1) { @@ -1610,7 +1663,8 @@ void fn_1_6200(omObjData* arg0) { var_r31->color[2] = 0; } } - } else { + } + else { temp_r27 = CharModelTexNameGet(temp_r30->unk3C, 2); for (i = 0; i < temp_r28->materialCnt; i++, var_r31++) { var_r23 = 1; @@ -1644,15 +1698,17 @@ void fn_1_6200(omObjData* arg0) { } } -void fn_1_6580(s32 arg0, s32 arg1, s32 arg2) { - StructBss1DC* temp_r31; +void fn_1_6580(s32 arg0, s32 arg1, s32 arg2) +{ + StructBss1DC *temp_r31; temp_r31 = &lbl_1_bss_1DC[arg0]; if (temp_r31->unk0C == 0) { temp_r31->unk0C = arg1; temp_r31->unk10 = arg2; temp_r31->unk28 = 0; - } else if (temp_r31->unk0C == 2) { + } + else if (temp_r31->unk0C == 2) { temp_r31->unk10 = 0; temp_r31->unk28 = 1; } @@ -1661,13 +1717,14 @@ void fn_1_6580(s32 arg0, s32 arg1, s32 arg2) { float lbl_1_data_188 = -1.0f; // TODO: https://decomp.me/scratch/dek39 -void fn_1_65E0(omObjData* arg0) { +void fn_1_65E0(omObjData *arg0) +{ Mtx sp60; - StructBss1DC* temp_r31; - StructBss1DC* var_r26; - StructBss1DC* temp_r27; - StructBss8FC* var_r28; - StructBss8FC* spC; + StructBss1DC *temp_r31; + StructBss1DC *var_r26; + StructBss1DC *temp_r27; + StructBss8FC *var_r28; + StructBss8FC *spC; s32 var_r29; temp_r31 = arg0->data; @@ -1740,9 +1797,11 @@ void fn_1_65E0(omObjData* arg0) { var_r28 = &lbl_1_bss_8FC; if (lbl_1_data_188 <= 135.0f) { fn_1_119A0(var_r28->unk00, 0, 2, 5, 0); - } else if (lbl_1_data_188 <= 245.0f) { + } + else if (lbl_1_data_188 <= 245.0f) { fn_1_119A0(var_r28->unk00, 0, 1, 5, 0); - } else { + } + else { fn_1_119A0(var_r28->unk00, 0, 0, 5, 0); } HuAudFXPlay(0x6F5); @@ -1758,11 +1817,13 @@ void fn_1_65E0(omObjData* arg0) { fn_1_39C4(1.0f); fn_1_3CB8(1.0f); HuAudFXPlay(0x6F6); - } else if (lbl_1_data_188 <= 245.0f) { + } + else if (lbl_1_data_188 <= 245.0f) { fn_1_39C4(2.0f); fn_1_3CB8(2.0f); HuAudFXPlay(0x6F7); - } else { + } + else { fn_1_39C4(3.0f); fn_1_3CB8(3.0f); HuAudFXPlay(0x6F8); @@ -1779,8 +1840,9 @@ void fn_1_65E0(omObjData* arg0) { } } -void fn_1_70F8(s32 arg0, s32 arg1) { - StructBss1DC* temp_r31; +void fn_1_70F8(s32 arg0, s32 arg1) +{ + StructBss1DC *temp_r31; temp_r31 = &lbl_1_bss_1DC[arg0]; temp_r31->unk14 = arg1; @@ -1788,14 +1850,10 @@ void fn_1_70F8(s32 arg0, s32 arg1) { temp_r31->unk28 = 0; } -void fn_1_7134(omObjData* arg0) { - StructBss1DC* temp_r31 = &lbl_1_bss_1DC[arg0->work[0]]; - Vec sp14[] = { - { 0.0f, 0.0f, 0.0f }, - { -1000.0f, 0.0f, 800.0f }, - { -200.0f, 0.0f, 800.0f }, - { 1000.0f, 0.0f, 800.0f } - }; +void fn_1_7134(omObjData *arg0) +{ + StructBss1DC *temp_r31 = &lbl_1_bss_1DC[arg0->work[0]]; + Vec sp14[] = { { 0.0f, 0.0f, 0.0f }, { -1000.0f, 0.0f, 800.0f }, { -200.0f, 0.0f, 800.0f }, { 1000.0f, 0.0f, 800.0f } }; if (temp_r31->unk14 < 1) { return; @@ -1809,16 +1867,18 @@ void fn_1_7134(omObjData* arg0) { } } -void fn_1_72CC(omObjData* arg0) { +void fn_1_72CC(omObjData *arg0) +{ fn_1_6134(arg0); fn_1_6200(arg0); fn_1_65E0(arg0); fn_1_7134(arg0); } -void fn_1_74B0(StructBss1DC* arg0) { +void fn_1_74B0(StructBss1DC *arg0) +{ s32 var_r29; - omObjData* temp_r30; + omObjData *temp_r30; var_r29 = arg0->unk00->work[0]; temp_r30 = arg0->unk00; @@ -1834,8 +1894,9 @@ void fn_1_74B0(StructBss1DC* arg0) { arg0->unk14 = 0; } -void fn_1_7678(omObjData* arg0) { - StructBss1DC* temp_r30; +void fn_1_7678(omObjData *arg0) +{ + StructBss1DC *temp_r30; s32 temp_r29; temp_r29 = arg0->work[0]; @@ -1866,17 +1927,19 @@ void fn_1_7678(omObjData* arg0) { arg0->func = fn_1_72CC; } -void fn_1_79E0(void) { +void fn_1_79E0(void) +{ lbl_1_bss_68.unk04 = 1; lbl_1_bss_68.unk08 = 1; lbl_1_bss_68.unk14 = 0; } -void fn_1_7A14(omObjData* arg0) { +void fn_1_7A14(omObjData *arg0) +{ Mtx sp8; - StructBss68* temp_r31; - StructBss8D4* var_r29; - StructBss6BC* var_r25; + StructBss68 *temp_r31; + StructBss8D4 *var_r29; + StructBss6BC *var_r25; s32 var_r24; s32 i; @@ -1928,9 +1991,11 @@ void fn_1_7A14(omObjData* arg0) { } if (temp_r31->unkC4[i] < 8.0f) { temp_r31->unkA4[i] += 0.025f; - } else if (temp_r31->unkC4[i] < 23.0f) { + } + else if (temp_r31->unkC4[i] < 23.0f) { temp_r31->unkA4[i] = 0.7f; - } else if (temp_r31->unkC4[i] < 31.0f) { + } + else if (temp_r31->unkC4[i] < 31.0f) { temp_r31->unkA4[i] -= 0.1f; if (temp_r31->unkA4[i] < 0.0f) { temp_r31->unkA4[i] = 0.0f; @@ -1953,7 +2018,8 @@ void fn_1_7A14(omObjData* arg0) { if (temp_r31->unk14++ == 120) { temp_r31->unk08 = 0; Hu3DMotionSpeedSet(var_r29->unk00->model[0], 1.0f); - } else if (temp_r31->unk14 >= 180) { + } + else if (temp_r31->unk14 >= 180) { temp_r31->unk04 = 4; } break; @@ -1967,12 +2033,14 @@ void fn_1_7A14(omObjData* arg0) { } } -void fn_1_82E0(omObjData* arg0) { +void fn_1_82E0(omObjData *arg0) +{ fn_1_7A14(arg0); } -void fn_1_8308(StructBss68* arg0) { - omObjData* temp_r29; +void fn_1_8308(StructBss68 *arg0) +{ + omObjData *temp_r29; s32 i; temp_r29 = arg0->unk00; @@ -1992,14 +2060,16 @@ void fn_1_8308(StructBss68* arg0) { arg0->unk14 = arg0->unk18 = arg0->unk1C = arg0->unk20 = 0; } -void fn_1_84C4(omObjData* arg0) { +void fn_1_84C4(omObjData *arg0) +{ s32 i; for (i = 1; i < 7; i++) { if (i % 2 == 0) { arg0->model[i] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M437, 55)); arg0->motion[i] = Hu3DMotionIDGet(arg0->model[i]); - } else { + } + else { arg0->model[i] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M437, 56)); arg0->motion[i] = Hu3DMotionIDGet(arg0->model[i]); } @@ -2013,8 +2083,9 @@ void fn_1_84C4(omObjData* arg0) { arg0->func = fn_1_82E0; } -void fn_1_8684(void) { - StructBss160* var_r31; +void fn_1_8684(void) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk14 = 0.0f; @@ -2027,8 +2098,9 @@ void fn_1_8684(void) { fn_1_12E14(var_r31, 200.0f); } -void fn_1_8734(void) { - StructBss160* var_r31; +void fn_1_8734(void) +{ + StructBss160 *var_r31; StructBss160 sp8; var_r31 = &lbl_1_bss_160; @@ -2042,8 +2114,9 @@ void fn_1_8734(void) { fn_1_15544(var_r31, &sp8, var_r31->unk40++, 30.0f, 5.0f); } -void fn_1_8824(void) { - StructBss160* var_r31; +void fn_1_8824(void) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk14 = 0.0f; @@ -2056,8 +2129,9 @@ void fn_1_8824(void) { fn_1_12E14(var_r31, 200.0f); } -void fn_1_88D4(void) { - StructBss160* var_r31; +void fn_1_88D4(void) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk14 = 0.0f; @@ -2070,8 +2144,9 @@ void fn_1_88D4(void) { fn_1_12E14(var_r31, 45.0f); } -void fn_1_8984(void) { - StructBss160* var_r31; +void fn_1_8984(void) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk14 = 0.0f; @@ -2084,8 +2159,9 @@ void fn_1_8984(void) { fn_1_12E14(var_r31, 30.0f); } -void fn_1_8A34(void) { - StructBss160* var_r31; +void fn_1_8A34(void) +{ + StructBss160 *var_r31; StructBss160 sp8; var_r31 = &lbl_1_bss_160; @@ -2099,8 +2175,9 @@ void fn_1_8A34(void) { fn_1_13658(var_r31, &sp8, var_r31->unk40++, 30.0f, 10.0f); } -void fn_1_8B24(void) { - StructBss160* var_r31; +void fn_1_8B24(void) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk14 = 0.0f; @@ -2113,8 +2190,9 @@ void fn_1_8B24(void) { fn_1_12E14(var_r31, 20.0f); } -void fn_1_8BD4(void) { - StructBss160* var_r31; +void fn_1_8BD4(void) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk14 = 0.0f; @@ -2127,8 +2205,9 @@ void fn_1_8BD4(void) { fn_1_12E14(var_r31, 20.0f); } -void fn_1_8C84(s32 arg0) { - StructBss160* var_r23; +void fn_1_8C84(s32 arg0) +{ + StructBss160 *var_r23; var_r23 = &lbl_1_bss_160; fn_1_12ABC(var_r23); @@ -2160,7 +2239,8 @@ void fn_1_8C84(s32 arg0) { } } -void fn_1_8DA4(void) { +void fn_1_8DA4(void) +{ float sp18[] = { 0.0f, 0.0f }; s32 var_r31; @@ -2181,7 +2261,8 @@ void fn_1_8DA4(void) { HuPrcEnd(); } -void fn_1_9320(void) { +void fn_1_9320(void) +{ float sp10[] = { 0.0f, 0.0f }; s32 var_r31; @@ -2200,7 +2281,8 @@ void fn_1_9320(void) { HuPrcEnd(); } -void fn_1_96D8(void) { +void fn_1_96D8(void) +{ float sp10[] = { 0.0f, 0.0f }; s32 var_r31; @@ -2217,18 +2299,11 @@ void fn_1_96D8(void) { HuPrcEnd(); } -void fn_1_9B2C(s32 arg0) { +void fn_1_9B2C(s32 arg0) +{ float sp10[2] = { 0.0f, 0.0f }; - s32 sp18[] = { - MAKE_MESSID(29, 6), - MAKE_MESSID(29, 66), - MAKE_MESSID(29, 68), - MAKE_MESSID(29, 70), - MAKE_MESSID(29, 72), - MAKE_MESSID(29, 74), - MAKE_MESSID(29, 76), - -1 - }; + s32 sp18[] = { MAKE_MESSID(29, 6), MAKE_MESSID(29, 66), MAKE_MESSID(29, 68), MAKE_MESSID(29, 70), MAKE_MESSID(29, 72), MAKE_MESSID(29, 74), + MAKE_MESSID(29, 76), -1 }; s32 var_r31; if (sp18[arg0] == -1) { @@ -2246,18 +2321,11 @@ void fn_1_9B2C(s32 arg0) { fn_1_27A4(var_r31); } -void fn_1_9FA0(void) { +void fn_1_9FA0(void) +{ float sp10[2] = { 0.0f, 0.0f }; - s32 sp18[] = { - MAKE_MESSID(29, 5), - MAKE_MESSID(29, 65), - MAKE_MESSID(29, 67), - MAKE_MESSID(29, 69), - MAKE_MESSID(29, 71), - MAKE_MESSID(29, 73), - MAKE_MESSID(29, 75), - MAKE_MESSID(29, 77) - }; + s32 sp18[] = { MAKE_MESSID(29, 5), MAKE_MESSID(29, 65), MAKE_MESSID(29, 67), MAKE_MESSID(29, 69), MAKE_MESSID(29, 71), MAKE_MESSID(29, 73), + MAKE_MESSID(29, 75), MAKE_MESSID(29, 77) }; s32 i; s32 var_r30; @@ -2279,7 +2347,8 @@ void fn_1_9FA0(void) { HuPrcEnd(); } -void fn_1_A440(void) { +void fn_1_A440(void) +{ float sp10[] = { 0.0f, 0.0f }; s32 var_r31; @@ -2296,10 +2365,10 @@ void fn_1_A440(void) { HuPrcEnd(); } -void fn_1_A860(void) { -} +void fn_1_A860(void) { } -s32 fn_1_A864(void) { +s32 fn_1_A864(void) +{ if (fn_1_11854(&lbl_1_bss_50, 0) == 80) { fn_1_8C84(1); lbl_1_bss_968.unk00 = HuAudSeqPlay(6); @@ -2322,93 +2391,109 @@ s32 fn_1_A864(void) { return 0; } -void fn_1_A9E8(void) { +void fn_1_A9E8(void) +{ HuPrcChildCreate(fn_1_8DA4, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_AA24(void) { +s32 fn_1_AA24(void) +{ if (lbl_1_bss_C != 0 && fn_1_11854(&lbl_1_bss_50, 1) != 0) { return fn_1_116C4(&lbl_1_bss_50); } return 0; } -void fn_1_AA80(void) { +void fn_1_AA80(void) +{ HuPrcChildCreate(fn_1_9320, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_AABC(void) { +s32 fn_1_AABC(void) +{ if (lbl_1_bss_C != 0 && fn_1_11854(&lbl_1_bss_50, 1) != 0) { return fn_1_116C4(&lbl_1_bss_50); } return 0; } -void fn_1_AB18(void) { +void fn_1_AB18(void) +{ fn_1_8C84(10); } -s32 fn_1_AB68(void) { +s32 fn_1_AB68(void) +{ if (fn_1_11854(&lbl_1_bss_50, 1) != 0) { return fn_1_116C4(&lbl_1_bss_50); } return 0; } -void fn_1_ABB0(void) { +void fn_1_ABB0(void) +{ HuPrcChildCreate(fn_1_96D8, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_ABEC(void) { +s32 fn_1_ABEC(void) +{ if (lbl_1_bss_C != 0 && fn_1_11854(&lbl_1_bss_50, 1) != 0) { if (lbl_1_bss_10 != 0) { return fn_1_116C4(&lbl_1_bss_50); - } else { + } + else { return fn_1_117C0(&lbl_1_bss_50, 6); } } return 0; } -void fn_1_AC70(void) { +void fn_1_AC70(void) +{ fn_1_4BAC(4, 60, 1, 1); HuPrcChildCreate(fn_1_9FA0, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_ACCC(void) { +s32 fn_1_ACCC(void) +{ if (lbl_1_bss_C != 0 && fn_1_11854(&lbl_1_bss_50, 1) != 0) { return fn_1_116C4(&lbl_1_bss_50); } return 0; } -void fn_1_AD28(void) { +void fn_1_AD28(void) +{ fn_1_8C84(11); fn_1_4BAC(0, 60, 1, 0); } -s32 fn_1_AD98(void) { +s32 fn_1_AD98(void) +{ if (fn_1_11854(&lbl_1_bss_50, 1) != 0) { return fn_1_116C4(&lbl_1_bss_50); } return 0; } -void fn_1_ADE0(void) { +void fn_1_ADE0(void) +{ HuPrcChildCreate(fn_1_A440, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_AE1C(void) { +s32 fn_1_AE1C(void) +{ if (lbl_1_bss_C != 0 && fn_1_11854(&lbl_1_bss_50, 1) != 0) { return fn_1_116C4(&lbl_1_bss_50); } return 0; } -void fn_1_AE78(void) { - StructBss6BC* var_r30; - StructBss1DC* sp8; - StructBss8FC* var_r29; +void fn_1_AE78(void) +{ + StructBss6BC *var_r30; + StructBss1DC *sp8; + StructBss8FC *var_r29; s32 i; fn_1_8C84(5); @@ -2423,19 +2508,16 @@ void fn_1_AE78(void) { HuAudSeqFadeOut(lbl_1_bss_968.unk00, 1000); } -s32 fn_1_AF4C(void) { - Vec sp20[] = { - { -200.0f, 0.0f, -250.0f }, - { -340.0f, 0.0f, -250.0f }, - { -490.0f, 0.0f, -250.0f }, - { -640.0f, 0.0f, -250.0f } - }; +s32 fn_1_AF4C(void) +{ + Vec sp20[] = { { -200.0f, 0.0f, -250.0f }, { -340.0f, 0.0f, -250.0f }, { -490.0f, 0.0f, -250.0f }, { -640.0f, 0.0f, -250.0f } }; s32 i; for (i = 0; i < 4; i++) { if (lbl_1_bss_1DC[i].unk3C == 7) { fn_1_11CE0(lbl_1_bss_1DC[i].unk00, sp20[i], 90.0f, 9.0f, 30.0f, 15.0f, 3); - } else { + } + else { fn_1_11CE0(lbl_1_bss_1DC[i].unk00, sp20[i], 90.0f, 9.0f, 30.0f, 15.0f, 1); } } @@ -2449,24 +2531,17 @@ s32 fn_1_AF4C(void) { return 0; } -StructData204 lbl_1_data_204[] = { - { fn_1_A860, fn_1_A864, 300 }, - { fn_1_A9E8, fn_1_AA24, 60 }, - { fn_1_AA80, fn_1_AABC, 60 }, - { fn_1_AB18, fn_1_AB68, 45 }, - { fn_1_ABB0, fn_1_ABEC, 60 }, - { fn_1_AC70, fn_1_ACCC, 60 }, - { fn_1_AD28, fn_1_AD98, 45 }, - { fn_1_ADE0, fn_1_AE1C, 60 }, - { fn_1_AE78, fn_1_AF4C, 120 }, - { NULL, NULL, -1 } -}; +StructData204 lbl_1_data_204[] = { { fn_1_A860, fn_1_A864, 300 }, { fn_1_A9E8, fn_1_AA24, 60 }, { fn_1_AA80, fn_1_AABC, 60 }, + { fn_1_AB18, fn_1_AB68, 45 }, { fn_1_ABB0, fn_1_ABEC, 60 }, { fn_1_AC70, fn_1_ACCC, 60 }, { fn_1_AD28, fn_1_AD98, 45 }, + { fn_1_ADE0, fn_1_AE1C, 60 }, { fn_1_AE78, fn_1_AF4C, 120 }, { NULL, NULL, -1 } }; -void fn_1_B194(void) { +void fn_1_B194(void) +{ fn_1_11668(&lbl_1_bss_50, lbl_1_data_204); } -s32 fn_1_B1C4(void) { +s32 fn_1_B1C4(void) +{ if (lbl_1_bss_50.unk08 != NULL) { lbl_1_bss_50.unk08(); lbl_1_bss_50.unk08 = NULL; @@ -2477,13 +2552,15 @@ s32 fn_1_B1C4(void) { return 0; } -float fn_1_B250(void) { +float fn_1_B250(void) +{ return lbl_1_bss_15C - lbl_1_bss_158; } -void fn_1_B270(void) { - StructBss944* var_r30; - StructBss1DC* temp_r31; +void fn_1_B270(void) +{ + StructBss944 *var_r30; + StructBss1DC *temp_r31; var_r30 = &lbl_1_bss_944; temp_r31 = &lbl_1_bss_1DC[var_r30->unk10]; @@ -2492,16 +2569,18 @@ void fn_1_B270(void) { if (temp_r31->unk00->work[1] == 0) { temp_r31->unk00->work[1] = rand8() % 3 + 1; } - } else { + } + else { temp_r31->unk00->work[1] = rand8() % 3 + 1; } temp_r31->unk00->work[2] = 0; temp_r31->unk00->work[3] = rand8() % 60 + 60; } -s32 fn_1_B3F0(s32 arg0) { - StructBss944* var_r30; - StructBss1DC* temp_r31; +s32 fn_1_B3F0(s32 arg0) +{ + StructBss944 *var_r30; + StructBss1DC *temp_r31; float temp_f31; var_r30 = &lbl_1_bss_944; @@ -2527,8 +2606,9 @@ s32 fn_1_B3F0(s32 arg0) { return 0; } -float fn_1_B4F4(s32 arg0, s32 arg1) { - StructBss1DC* temp_r31; +float fn_1_B4F4(s32 arg0, s32 arg1) +{ + StructBss1DC *temp_r31; temp_r31 = &lbl_1_bss_1DC[arg0]; if (temp_r31->unk34 != 0) { @@ -2536,18 +2616,21 @@ float fn_1_B4F4(s32 arg0, s32 arg1) { if (temp_r31->unk00->work[2] == 0) { temp_r31->unk00->work[2] = 1; fn_1_6580(arg0, 1, 1); - } else if (fn_1_B3F0(temp_r31->unk00->work[1]) != 0) { + } + else if (fn_1_B3F0(temp_r31->unk00->work[1]) != 0) { fn_1_6580(arg0, 1, 0); } } - } else if ((HuPadBtnDown[temp_r31->unk40] & 0x100) || ((HuPadBtnDown[temp_r31->unk40] & 0x40) && temp_r31->unk0C == 2)) { + } + else if ((HuPadBtnDown[temp_r31->unk40] & 0x100) || ((HuPadBtnDown[temp_r31->unk40] & 0x40) && temp_r31->unk0C == 2)) { fn_1_6580(arg0, 1, 0); } return temp_r31->unk0C; } -void fn_1_B7E0(void) { - StructBss160* var_r31; +void fn_1_B7E0(void) +{ + StructBss160 *var_r31; StructBss160 sp8; var_r31 = &lbl_1_bss_160; @@ -2561,8 +2644,9 @@ void fn_1_B7E0(void) { fn_1_13658(var_r31, &sp8, var_r31->unk40++, 30.0f, 10.0f); } -void fn_1_B8D0(void) { - StructBss160* var_r31; +void fn_1_B8D0(void) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk14 = 0.0f; @@ -2575,8 +2659,9 @@ void fn_1_B8D0(void) { fn_1_12E14(var_r31, 10.0f); } -void fn_1_BC18(void) { - StructBss160* var_r31; +void fn_1_BC18(void) +{ + StructBss160 *var_r31; var_r31 = &lbl_1_bss_160; var_r31->unk14 = 0.0f; @@ -2589,8 +2674,9 @@ void fn_1_BC18(void) { fn_1_12E14(var_r31, 5.0f); } -void fn_1_BCC8(void) { - StructBss160* var_r31; +void fn_1_BCC8(void) +{ + StructBss160 *var_r31; StructBss160 sp8; var_r31 = &lbl_1_bss_160; @@ -2604,8 +2690,9 @@ void fn_1_BCC8(void) { fn_1_15544(var_r31, &sp8, var_r31->unk40++, 30.0f, 10.0f); } -void fn_1_BDB8(s32 arg0) { - StructBss160* var_r27; +void fn_1_BDB8(s32 arg0) +{ + StructBss160 *var_r27; var_r27 = &lbl_1_bss_160; fn_1_12ABC(var_r27); @@ -2625,13 +2712,9 @@ void fn_1_BDB8(s32 arg0) { } } -void fn_1_BE80(void) { - s32 sp1C[] = { - MAKE_MESSID(29, 79), - MAKE_MESSID(29, 80), - MAKE_MESSID(29, 81), - MAKE_MESSID(29, 82) - }; +void fn_1_BE80(void) +{ + s32 sp1C[] = { MAKE_MESSID(29, 79), MAKE_MESSID(29, 80), MAKE_MESSID(29, 81), MAKE_MESSID(29, 82) }; float sp14[2] = { 0.0f, 0.0f }; s32 temp_r27; s32 var_r30; @@ -2650,12 +2733,9 @@ void fn_1_BE80(void) { HuPrcEnd(); } -void fn_1_C248(void) { - s32 sp1C[] = { - MAKE_MESSID(29, 83), - MAKE_MESSID(29, 84), - MAKE_MESSID(29, 85) - }; +void fn_1_C248(void) +{ + s32 sp1C[] = { MAKE_MESSID(29, 83), MAKE_MESSID(29, 84), MAKE_MESSID(29, 85) }; float sp14[2] = { 0.0f, 0.0f }; s32 temp_r27; s32 var_r31; @@ -2674,7 +2754,8 @@ void fn_1_C248(void) { HuPrcEnd(); } -void fn_1_C610(void) { +void fn_1_C610(void) +{ float sp14[2] = { 0.0f, 0.0f }; s32 var_r31; @@ -2691,7 +2772,8 @@ void fn_1_C610(void) { HuPrcEnd(); } -void fn_1_C9C4(void) { +void fn_1_C9C4(void) +{ float sp10[] = { 0.0f, 0.0f }; s32 var_r31; @@ -2705,7 +2787,8 @@ void fn_1_C9C4(void) { HuPrcEnd(); } -void fn_1_CD20(void) { +void fn_1_CD20(void) +{ float sp10[] = { 0.0f, 0.0f }; s32 var_r31; @@ -2719,12 +2802,9 @@ void fn_1_CD20(void) { HuPrcEnd(); } -void fn_1_D03C(void) { - s32 sp18[] = { - MAKE_MESSID(29, 89), - MAKE_MESSID(29, 90), - MAKE_MESSID(29, 91) - }; +void fn_1_D03C(void) +{ + s32 sp18[] = { MAKE_MESSID(29, 89), MAKE_MESSID(29, 90), MAKE_MESSID(29, 91) }; float sp10[2] = { 0.0f, 0.0f }; s32 temp_r28; s32 var_r31; @@ -2739,7 +2819,8 @@ void fn_1_D03C(void) { HuPrcEnd(); } -void fn_1_D3C0(void) { +void fn_1_D3C0(void) +{ float sp10[] = { 0.0f, 0.0f }; s32 var_r31; @@ -2756,15 +2837,16 @@ void fn_1_D3C0(void) { HuPrcEnd(); } -void fn_1_D754(void) { +void fn_1_D754(void) +{ Mtx sp8; s32 var_r26; s32 i; - StructBss944* var_r29; - StructBss8FC* var_r24; - StructBss1DC* temp_r27; - StructBss1DC* temp_r25; - StructBss1DC* var_r23; + StructBss944 *var_r29; + StructBss8FC *var_r24; + StructBss1DC *temp_r27; + StructBss1DC *temp_r25; + StructBss1DC *var_r23; var_r29 = &lbl_1_bss_944; var_r24 = &lbl_1_bss_8FC; @@ -2775,7 +2857,8 @@ void fn_1_D754(void) { fn_1_15DC8(&temp_r25->unk50); fn_1_15CD0(&temp_r25->unk50, temp_r27->unk00->model[0]); temp_r25->unk50.unkE4->trans.z = 10.0f; - } else { + } + else { fn_1_15DC8(&temp_r27->unk50); } } @@ -2794,17 +2877,13 @@ void fn_1_D754(void) { fn_1_6580(var_r29->unk10, 1, 1); } -s32 fn_1_D930(void) { +s32 fn_1_D930(void) +{ s32 var_r25 = 4; - StructBss944* var_r31 = &lbl_1_bss_944; - Vec sp5C[] = { - { 5.0f, 0.0f, -250.0f }, - { -175.0f, 0.0f, -250.0f }, - { -325.0f, 0.0f, -250.0f }, - { -490.0f, 0.0f, -250.0f } - }; - StructBss1DC* temp_r27; - StructBss1DC* temp_r30; + StructBss944 *var_r31 = &lbl_1_bss_944; + Vec sp5C[] = { { 5.0f, 0.0f, -250.0f }, { -175.0f, 0.0f, -250.0f }, { -325.0f, 0.0f, -250.0f }, { -490.0f, 0.0f, -250.0f } }; + StructBss1DC *temp_r27; + StructBss1DC *temp_r30; s32 var_r28; s32 var_r26; s32 i; @@ -2817,7 +2896,8 @@ s32 fn_1_D930(void) { temp_r27 = &lbl_1_bss_1DC[var_r28]; if (i == 0) { fn_1_11CE0(temp_r27->unk00, sp5C[i], 0.0f, 4.5f, 10.0f, 5.0f, 0); - } else if (fn_1_11854(&lbl_1_bss_38, 0) >= i * 5 + 10) { + } + else if (fn_1_11854(&lbl_1_bss_38, 0) >= i * 5 + 10) { fn_1_11CE0(temp_r27->unk00, sp5C[i], 90.0f, 9.0f, 30.0f, 15.0f, 2); } var_r28++; @@ -2826,10 +2906,7 @@ s32 fn_1_D930(void) { } } if (var_r31->unk20 != 0) { - Vec sp44[] = { - { 0.0f, 0.0f, -50.0f }, - { -510.0f, 0.0f, -250.0f } - }; + Vec sp44[] = { { 0.0f, 0.0f, -50.0f }, { -510.0f, 0.0f, -250.0f } }; var_r26 = var_r31->unk10 - 1; if (var_r26 < 0) { @@ -2838,9 +2915,11 @@ s32 fn_1_D930(void) { temp_r30 = &lbl_1_bss_1DC[var_r26]; if (fn_1_11854(&lbl_1_bss_38, 0) <= 60) { fn_1_11CE0(temp_r30->unk00, sp44[0], -1.0f, 9.0f, 10.0f, 15.0f, 0); - } else if (temp_r30->unk3C == 7) { + } + else if (temp_r30->unk3C == 7) { fn_1_11CE0(temp_r30->unk00, sp44[1], 90.0f, 9.0f, 30.0f, 15.0f, 3); - } else { + } + else { fn_1_11CE0(temp_r30->unk00, sp44[1], 90.0f, 9.0f, 30.0f, 15.0f, 1); } } @@ -2850,14 +2929,16 @@ s32 fn_1_D930(void) { } } -void fn_1_DCEC(void) { +void fn_1_DCEC(void) +{ fn_1_B270(); fn_1_BDB8(1); fn_1_1184(5); } -s32 fn_1_DEC4(void) { - StructBss944* var_r24; +s32 fn_1_DEC4(void) +{ + StructBss944 *var_r24; var_r24 = &lbl_1_bss_944; fn_1_11854(&lbl_1_bss_38, 1); @@ -2874,43 +2955,51 @@ s32 fn_1_DEC4(void) { return 0; } -void fn_1_E2A8(void) { +void fn_1_E2A8(void) +{ if (fn_1_36B4() < 0.75f) { lbl_1_bss_38.unk14 = 60; - } else { + } + else { lbl_1_bss_38.unk14 = 120; } } -s32 fn_1_E598(void) { +s32 fn_1_E598(void) +{ if (fn_1_11854(&lbl_1_bss_38, 1) != 0) { if (fn_1_3990()) { return fn_1_117C0(&lbl_1_bss_38, 5); - } else { + } + else { return fn_1_116C4(&lbl_1_bss_38); } } return 0; } -void fn_1_E634(void) { +void fn_1_E634(void) +{ if (fn_1_36B4() < 0.75f) { HuPrcChildCreate(fn_1_BE80, 100, 0x2000, 0, HuPrcCurrentGet()); - } else { + } + else { HuPrcChildCreate(fn_1_C248, 100, 0x2000, 0, HuPrcCurrentGet()); } } -s32 fn_1_E944(void) { +s32 fn_1_E944(void) +{ if (lbl_1_bss_C != 0 && fn_1_11854(&lbl_1_bss_38, 1) != 0) { return fn_1_116C4(&lbl_1_bss_38); } return 0; } -void fn_1_E9A0(void) { - StructBss944* var_r30; - StructBss1DC* temp_r29; +void fn_1_E9A0(void) +{ + StructBss944 *var_r30; + StructBss1DC *temp_r29; s32 i; var_r30 = &lbl_1_bss_944; @@ -2918,7 +3007,7 @@ void fn_1_E9A0(void) { fn_1_BDB8(0); for (i = 0; i < 4; i++) { if (i != var_r30->unk10) { - StructBss1DC* var_r28 = &lbl_1_bss_1DC[i]; + StructBss1DC *var_r28 = &lbl_1_bss_1DC[i]; fn_1_15DC8(&temp_r29->unk50); fn_1_15CD0(&temp_r29->unk50, var_r28->unk00->model[0]); @@ -2926,16 +3015,17 @@ void fn_1_E9A0(void) { } for (i = 0; i < 4; i++) { if (i != temp_r29->unk00->work[0]) { - StructBss1DC* var_r27 = &lbl_1_bss_1DC[i]; + StructBss1DC *var_r27 = &lbl_1_bss_1DC[i]; fn_1_11B18(var_r27->unk00, 0, 0, 15, 0); } } } -s32 fn_1_EAA4(void) { - StructBss944* var_r30; - StructBss1DC* sp8; +s32 fn_1_EAA4(void) +{ + StructBss944 *var_r30; + StructBss1DC *sp8; var_r30 = &lbl_1_bss_944; sp8 = &lbl_1_bss_1DC[var_r30->unk10]; @@ -2949,9 +3039,10 @@ s32 fn_1_EAA4(void) { return 0; } -void fn_1_EB38(void) { - StructBss8D4* sp8; - StructBss6BC* var_r31; +void fn_1_EB38(void) +{ + StructBss8D4 *sp8; + StructBss6BC *var_r31; lbl_1_bss_8D4.unk08 = 1; var_r31 = &lbl_1_bss_6BC[1]; @@ -2965,9 +3056,10 @@ void fn_1_EB38(void) { HuPrcChildCreate(fn_1_CD20, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_EC10(void) { - StructBss1DC* var_r29; - StructBss8D4* var_r31; +s32 fn_1_EC10(void) +{ + StructBss1DC *var_r29; + StructBss8D4 *var_r31; s32 i; if (lbl_1_bss_C == 1) { @@ -2991,10 +3083,11 @@ s32 fn_1_EC10(void) { return 0; } -void fn_1_EDD4(void) { - StructBss944* var_r30; - StructBss8D4* var_r29; - StructBss1DC* temp_r31; +void fn_1_EDD4(void) +{ + StructBss944 *var_r30; + StructBss8D4 *var_r29; + StructBss1DC *temp_r31; var_r30 = &lbl_1_bss_944; var_r29 = &lbl_1_bss_8D4; @@ -3006,15 +3099,17 @@ void fn_1_EDD4(void) { fn_1_BDB8(3); } -s32 fn_1_EEA0(void) { - StructBss944* var_r30; - StructBss1DC* temp_r31; +s32 fn_1_EEA0(void) +{ + StructBss944 *var_r30; + StructBss1DC *temp_r31; var_r30 = &lbl_1_bss_944; temp_r31 = &lbl_1_bss_1DC[var_r30->unk10]; if (temp_r31->unk1C++ == 0) { fn_1_11B18(temp_r31->unk00, 0, 10, 30, 1); - } else if (temp_r31->unk1C > 0) { + } + else if (temp_r31->unk1C > 0) { temp_r31->unk00->rot.y = fn_1_11348(0.0f, 180.0f, temp_r31->unk1C, 30.0f); if (temp_r31->unk1C >= 30) { fn_1_11B18(temp_r31->unk00, 0, 0, 30, 1); @@ -3026,8 +3121,9 @@ s32 fn_1_EEA0(void) { return 0; } -void fn_1_EFCC(void) { - StructBss944* var_r28; +void fn_1_EFCC(void) +{ + StructBss944 *var_r28; s32 var_r29; s32 i; @@ -3046,28 +3142,32 @@ void fn_1_EFCC(void) { HuPrcChildCreate(fn_1_D03C, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_F0B8(void) { +s32 fn_1_F0B8(void) +{ if (fn_1_11854(&lbl_1_bss_38, 1) != 0) { return 1; } return 0; } -void fn_1_F0F8(void) { +void fn_1_F0F8(void) +{ lbl_1_bss_8D4.unk08 = 1; fn_1_4BAC(0, 60, 1, 1); } -s32 fn_1_F144(void) { +s32 fn_1_F144(void) +{ if (fn_1_11854(&lbl_1_bss_38, 1) != 0) { return fn_1_116C4(&lbl_1_bss_38); } return 0; } -void fn_1_F18C(void) { - StructBss944* var_r30; - StructBss1DC* temp_r31; +void fn_1_F18C(void) +{ + StructBss944 *var_r30; + StructBss1DC *temp_r31; var_r30 = &lbl_1_bss_944; temp_r31 = &lbl_1_bss_1DC[var_r30->unk10]; @@ -3080,15 +3180,17 @@ void fn_1_F18C(void) { fn_1_BDB8(3); } -s32 fn_1_F294(void) { - StructBss944* var_r30; - StructBss1DC* temp_r31; +s32 fn_1_F294(void) +{ + StructBss944 *var_r30; + StructBss1DC *temp_r31; var_r30 = &lbl_1_bss_944; temp_r31 = &lbl_1_bss_1DC[var_r30->unk10]; if (temp_r31->unk1C++ == 60) { fn_1_11B18(temp_r31->unk00, 0, 10, 30, 1); - } else if (temp_r31->unk1C > 60) { + } + else if (temp_r31->unk1C > 60) { temp_r31->unk00->rot.y = fn_1_11348(0.0f, 180.0f, temp_r31->unk1C - 60, 30.0f); if (temp_r31->unk1C >= 90) { fn_1_11B18(temp_r31->unk00, 0, 0, 30, 1); @@ -3100,8 +3202,9 @@ s32 fn_1_F294(void) { return 0; } -void fn_1_F3D8(void) { - StructBss944* var_r28; +void fn_1_F3D8(void) +{ + StructBss944 *var_r28; s32 var_r29; s32 i; @@ -3119,33 +3222,25 @@ void fn_1_F3D8(void) { } } -s32 fn_1_F494(void) { +s32 fn_1_F494(void) +{ if (fn_1_11854(&lbl_1_bss_38, 1) != 0) { return 1; } return 0; } -StructData204 lbl_1_data_27C[] = { - { fn_1_D754, fn_1_D930, 60 }, - { fn_1_DCEC, fn_1_DEC4, 60 }, - { fn_1_E2A8, fn_1_E598, 60 }, - { fn_1_E634, fn_1_E944, 10 }, - { fn_1_E9A0, fn_1_EAA4, 30 }, - { fn_1_EB38, fn_1_EC10, 60 }, - { fn_1_EDD4, fn_1_EEA0, 60 }, - { fn_1_EFCC, fn_1_F0B8, 90 }, - { fn_1_F0F8, fn_1_F144, 60 }, - { fn_1_F18C, fn_1_F294, 60 }, - { fn_1_F3D8, fn_1_F494, 90 }, - { NULL, NULL, -1 } -}; +StructData204 lbl_1_data_27C[] = { { fn_1_D754, fn_1_D930, 60 }, { fn_1_DCEC, fn_1_DEC4, 60 }, { fn_1_E2A8, fn_1_E598, 60 }, + { fn_1_E634, fn_1_E944, 10 }, { fn_1_E9A0, fn_1_EAA4, 30 }, { fn_1_EB38, fn_1_EC10, 60 }, { fn_1_EDD4, fn_1_EEA0, 60 }, + { fn_1_EFCC, fn_1_F0B8, 90 }, { fn_1_F0F8, fn_1_F144, 60 }, { fn_1_F18C, fn_1_F294, 60 }, { fn_1_F3D8, fn_1_F494, 90 }, { NULL, NULL, -1 } }; -void fn_1_F4D4(void) { +void fn_1_F4D4(void) +{ fn_1_11668(&lbl_1_bss_38, lbl_1_data_27C); } -s32 fn_1_F504(void) { +s32 fn_1_F504(void) +{ if (lbl_1_bss_38.unk08 != NULL) { lbl_1_bss_38.unk08(); lbl_1_bss_38.unk08 = NULL; @@ -3156,9 +3251,10 @@ s32 fn_1_F504(void) { return 0; } -void fn_1_F590(void) { - StructBss944* var_r30; - StructBss1DC* temp_r31; +void fn_1_F590(void) +{ + StructBss944 *var_r30; + StructBss1DC *temp_r31; var_r30 = &lbl_1_bss_944; temp_r31 = &lbl_1_bss_1DC[var_r30->unk10]; @@ -3169,9 +3265,10 @@ void fn_1_F590(void) { HuPrcChildCreate(fn_1_0, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_F640(void) { - StructBss944* var_r31; - StructBss1DC* temp_r30; +s32 fn_1_F640(void) +{ + StructBss944 *var_r31; + StructBss1DC *temp_r30; var_r31 = &lbl_1_bss_944; temp_r30 = &lbl_1_bss_1DC[var_r31->unk10]; @@ -3185,16 +3282,15 @@ s32 fn_1_F640(void) { return 0; } -StructData204 lbl_1_data_30C[] = { - { fn_1_F590, fn_1_F640, 360 }, - { NULL, NULL, -1 } -}; +StructData204 lbl_1_data_30C[] = { { fn_1_F590, fn_1_F640, 360 }, { NULL, NULL, -1 } }; -void fn_1_F6EC(void) { +void fn_1_F6EC(void) +{ fn_1_11668(&lbl_1_bss_20, lbl_1_data_30C); } -s32 fn_1_F71C(void) { +s32 fn_1_F71C(void) +{ if (lbl_1_bss_20.unk08 != NULL) { lbl_1_bss_20.unk08(); lbl_1_bss_20.unk08 = NULL; @@ -3205,9 +3301,10 @@ s32 fn_1_F71C(void) { return 0; } -void fn_1_F7A8(omObjData* arg0) { - StructBss944* var_r30; - StructBss1DC* temp_r29; +void fn_1_F7A8(omObjData *arg0) +{ + StructBss944 *var_r30; + StructBss1DC *temp_r29; s32 i; if (WipeStatGet() == 0) { @@ -3225,12 +3322,14 @@ void fn_1_F7A8(omObjData* arg0) { } } -s32 fn_1_F89C(void) { +s32 fn_1_F89C(void) +{ return omSysExitReq; } -void fn_1_F8AC(void) { - StructBss944* var_r29; +void fn_1_F8AC(void) +{ + StructBss944 *var_r29; s32 i; fn_1_3260(&lbl_1_bss_920); @@ -3253,8 +3352,9 @@ void fn_1_F8AC(void) { HuAudFXPlay(0x6D7); } -void fn_1_1043C(omObjData* arg0) { - StructBss920* var_r30; +void fn_1_1043C(omObjData *arg0) +{ + StructBss920 *var_r30; switch (lbl_1_bss_18) { case 0: @@ -3322,7 +3422,8 @@ void fn_1_1043C(omObjData* arg0) { } } -void fn_1_108A4(omObjData* arg0) { +void fn_1_108A4(omObjData *arg0) +{ s32 i; lbl_1_bss_920.unk00 = omAddObjEx(lbl_1_bss_0, 0x100, 16, 16, -1, fn_1_3410); @@ -3343,7 +3444,8 @@ void fn_1_108A4(omObjData* arg0) { #include "src/REL/executor.c" -void fn_1_10B30(void) { +void fn_1_10B30(void) +{ lbl_1_bss_0 = omInitObjMan(62, 0x2000); omGameSysInit(lbl_1_bss_0); fn_1_1A8(); @@ -3355,6 +3457,7 @@ void fn_1_10B30(void) { omAddObjEx(lbl_1_bss_0, 0x1000, 0, 0, -1, fn_1_108A4); } -void ObjectSetup(void) { +void ObjectSetup(void) +{ fn_1_10B30(); } diff --git a/src/REL/m438Dll/main.c b/src/REL/m438Dll/main.c index 84193a27..82a43f93 100644 --- a/src/REL/m438Dll/main.c +++ b/src/REL/m438Dll/main.c @@ -1125,7 +1125,7 @@ void fn_1_2964(omObjData *object) memset(var_r31->unk_F0, 0, sizeof(var_r31->unk_F0)); var_r27 = CharModelCreate(var_r31->unk_01, 8); object->model[0] = var_r27; - Hu3DModelAttrSet(var_r27, 0x40000001); + Hu3DModelAttrSet(var_r27, HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(var_r27); CharModelStepTypeSet(var_r31->unk_01, 0); var_r31->unk_A4 = -1; @@ -1269,7 +1269,7 @@ void fn_1_2E4C(omObjData *object) } if (var_r31->unk_10 != 0) { var_r31->unk_07 = 0; - Hu3DModelAttrSet(var_r25, 1); + Hu3DModelAttrSet(var_r25, HU3D_ATTR_DISPOFF); 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_0B & 2) != 0) { - Hu3DModelAttrSet(var_r25, 1); + Hu3DModelAttrSet(var_r25, HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrReset(var_r25, 1); + Hu3DModelAttrReset(var_r25, HU3D_ATTR_DISPOFF); } if (--var_r31->unk_0B == 0) { 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); Hu3DMotionSet(var_r29, object->motion[0]); Hu3DMotionSpeedSet(var_r29, 2.0f); - Hu3DModelAttrSet(var_r29, 0x40000001); + Hu3DModelAttrSet(var_r29, HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(var_r29); var_r31 = fn_1_7BFC(sizeof(M438MainWork4)); object->data = var_r31; @@ -1790,7 +1790,7 @@ void fn_1_4724(omObjData *object) // if (temp_r0 == 0) { // HuAudFXEmiterPlay(0x700, var_r31 + 0x10); // 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_00 = var_r31->unk_00 + 1; // } @@ -1888,7 +1888,7 @@ void fn_1_4724(omObjData *object) // Hu3DModelAttrReset(*var_r30->model, 0x40000006); // Hu3DMotionSet(*var_r30->model, var_r30->motion->unk_02); // Hu3DMotionSpeedSet(*var_r30->model, 1.0f); -// Hu3DModelAttrSet(*var_r30->model, 0x40000001); +// Hu3DModelAttrSet(*var_r30->model, HU3D_MOTATTR_LOOP); // var_r31->unk_04 = 1; // } // break; diff --git a/src/REL/m439Dll/main.c b/src/REL/m439Dll/main.c index dbc4a59b..f89c03d4 100644 --- a/src/REL/m439Dll/main.c +++ b/src/REL/m439Dll/main.c @@ -441,11 +441,11 @@ void fn_1_D0C(omObjData *object) object->motion[i] = CharModelMotionCreate(work->unkC, lbl_1_data_7694[i]); } 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); CharModelDataClose(work->unkC); 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]); work->unk0_field3 = 1; work->unk44 = 0; @@ -456,7 +456,7 @@ void fn_1_D0C(omObjData *object) object->rot.y = 180; object->model[2] = Hu3DParticleCreate(lbl_1_bss_40, 10); 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]); object->func = fn_1_2BB4; } @@ -774,10 +774,10 @@ s32 fn_1_62E0(float arg0); void fn_1_2BB4(omObjData *object) { 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); if (fn_1_374() == 3) { - Hu3DModelAttrSet(object->model[1], 1); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); 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->unk_00 = 0; 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); temp_r25 = omGetGroupMemberListEx(HuPrcCurrentGet(), 2); 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].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; - 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); } else { @@ -1189,12 +1189,12 @@ void fn_1_4AA8(omObjData *object) work->unk2 = lbl_1_bss_140; object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M439, 0x13)); 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++) { object->motion[i] = Hu3DJointMotionFile(object->model[0], lbl_1_data_7794[i]); } Hu3DMotionSet(object->model[0], object->motion[0]); - Hu3DModelAttrSet(object->model[0], 0x40000001); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); object->trans.y = 500; object->scale.x = object->scale.y = object->scale.z = 0.25f; if (work->unk2 == 0) { @@ -1254,10 +1254,10 @@ void fn_1_4CC0(omObjData *object) HuAudFXPanning(lbl_1_data_779C, pan); } } - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); if (fn_1_374() == 3) { Hu3DMotionSpeedSet(object->model[0], 1.0f); - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); object->func = fn_1_4F54; } } @@ -1281,7 +1281,7 @@ void fn_1_4F54(omObjData *object) object->trans.y = work->unk28.y = 2000; object->trans.z = work->unk28.z = temp_r29[work->unk2]->trans.z - 100; object->rot.y = 180; - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); } break; @@ -1350,7 +1350,7 @@ void fn_1_4F54(omObjData *object) temp_r28->unk0_field1 = 0; work->unk4 = 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)) { work->unk0 = 0; @@ -1381,7 +1381,7 @@ void fn_1_5BA0(Process *objman) } for (i = 0; i < 10; 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); } @@ -1437,7 +1437,7 @@ void fn_1_5CB0(omObjData *object) } 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]); - Hu3DModelAttrReset(object->model[i], 1); + Hu3DModelAttrReset(object->model[i], HU3D_ATTR_DISPOFF); for (temp = 0; temp < 2; temp++) { if (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]); Hu3DModelCameraSet(object->model[i], lbl_1_data_75E0[i]); Hu3DModelClusterAttrSet(object->model[i], 0, 0xC0000001); - Hu3DModelAttrSet(object->model[i], 1); + Hu3DModelAttrSet(object->model[i], HU3D_ATTR_DISPOFF); } object->func = fn_1_661C; } @@ -1566,10 +1566,10 @@ void fn_1_66BC(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); if (fn_1_374() == 3) { - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); object->func = fn_1_66BC; } } @@ -1583,10 +1583,10 @@ void fn_1_66BC(omObjData *object) if (work->unk44 >= 10 && work->unk44 <= 13) { 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); - Hu3DModelAttrReset(object->model[i], 1); + Hu3DModelAttrReset(object->model[i], HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrSet(object->model[i], 1); + Hu3DModelAttrSet(object->model[i], HU3D_ATTR_DISPOFF); } } } diff --git a/src/REL/m440Dll/main.c b/src/REL/m440Dll/main.c index 0169ada7..2cb135b1 100644 --- a/src/REL/m440Dll/main.c +++ b/src/REL/m440Dll/main.c @@ -179,8 +179,8 @@ void fn_1_8F0(omObjData *arg0) for (var_r30 = 1; var_r30 < 4; var_r30++) { 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], 0x40000002); + Hu3DModelAttrSet(lbl_1_bss_10[var_r30], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_10[var_r30], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(lbl_1_bss_10[var_r30], 7); 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); temp_f31 = 0.1f * ((((rand8() << 8) | rand8()) % 11) + 25); 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); } } @@ -490,8 +490,8 @@ void fn_1_1CAC(void) for (var_r31 = 1; var_r31 < 4; var_r31++) { Hu3DMotionTimeSet(lbl_1_bss_10[var_r31], 0.0f); - Hu3DModelAttrSet(lbl_1_bss_10[var_r31], 1); - Hu3DModelAttrSet(lbl_1_bss_10[var_r31], 0x40000002); + Hu3DModelAttrSet(lbl_1_bss_10[var_r31], HU3D_ATTR_DISPOFF); + 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[7] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x07)); 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], 0x40000002); - Hu3DModelAttrSet(temp_r26, 1); + Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(temp_r26, HU3D_ATTR_DISPOFF); for (var_r30 = 0; var_r30 < 8; var_r30++) { 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; 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) { - 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); 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; if (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_E4[0] = 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.y = 2000.0f; temp_r31->rot.x = temp_r31->rot.y = temp_r31->rot.z = 0.0f; - Hu3DModelAttrReset(object->model[2], 1); - Hu3DModelAttrReset(object->model[3], 1); - Hu3DModelAttrSet(object->model[3], 0x40000002); + Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[3], HU3D_MOTATTR_PAUSE); Hu3DMotionTimeSet(object->model[3], 0.0f); lbl_1_data_EC[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; if (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_EC[0] = 0; fn_1_4EEC(7, 2); @@ -876,9 +876,9 @@ void fn_1_3DD8(omObjData *object) } var_f26 = Hu3DMotionMaxTimeGet(object->model[2]); 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++) { - 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]); } 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); var_f31 = 0.1f * ((((rand8() << 8) | rand8()) % 11) + 0x19); 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); } fn_1_45BC(object); @@ -929,13 +929,13 @@ void fn_1_3DD8(omObjData *object) if (lbl_1_bss_64[0].unk3C == 0) { for (var_r27 = 1; var_r27 < 4; var_r27++) { Hu3DMotionTimeSet(lbl_1_bss_10[var_r27], 0.0f); - Hu3DModelAttrSet(lbl_1_bss_10[var_r27], 1); - Hu3DModelAttrSet(lbl_1_bss_10[var_r27], 0x40000002); + Hu3DModelAttrSet(lbl_1_bss_10[var_r27], HU3D_ATTR_DISPOFF); + 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); 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); if (lbl_1_data_1D8 >= 0) { diff --git a/src/REL/m440Dll/object.c b/src/REL/m440Dll/object.c index afc791c7..5e94301f 100644 --- a/src/REL/m440Dll/object.c +++ b/src/REL/m440Dll/object.c @@ -1,16 +1,17 @@ #include "REL/m440Dll.h" -#include "string.h" -#include "math.h" #include "ext_math.h" +#include "game/chrman.h" #include "game/flag.h" #include "game/gamework_data.h" -#include "game/chrman.h" #include "game/hsfmotion.h" #include "game/pad.h" +#include "math.h" +#include "string.h" + // bss -omObjData* lbl_1_bss_C0[4]; +omObjData *lbl_1_bss_C0[4]; s16 lbl_1_bss_B8[4]; Vec lbl_1_bss_88[4]; f32 lbl_1_bss_84; @@ -22,29 +23,21 @@ s16 lbl_1_bss_70; // data s16 lbl_1_data_1D8 = 2; s16 lbl_1_data_1DA = -1; -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, 0x03), 0 }, - { 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 -}; +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, 0x03), 0 }, { 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 -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; omMakeGroupEx(arg0, 0, 4); omGetGroupMemberListEx(arg0, 0); - + 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]->work[0] = var_r31; @@ -52,14 +45,15 @@ void fn_1_AE08(Process* arg0) { omAddObjEx(arg0, 0x65, 0, 0, -1, fn_1_B180); } -void fn_1_AEE4(omObjData* arg0) { +void fn_1_AEE4(omObjData *arg0) +{ f32 var_f31; s32 temp_r28; s16 var_r29; - unkObjStruct* temp_r31; + unkObjStruct *temp_r31; arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x78, MEMORY_DEFAULT_NUM); - temp_r31 = (unkObjStruct*)arg0->data; + temp_r31 = (unkObjStruct *)arg0->data; memset(temp_r31, 0, 0x78); arg0->stat |= 0x100; temp_r31->unk4 = arg0->work[0]; @@ -68,11 +62,12 @@ void fn_1_AEE4(omObjData* arg0) { arg0->model[0] = CharModelCreate(temp_r31->unk8, 4); Hu3DModelLayerSet(arg0->model[0], 1); Hu3DModelShadowSet(arg0->model[0]); - + for (var_r29 = 0; var_r29 < 8; var_r29++) { if (lbl_1_data_1DC[var_r29][1] == 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]); } } @@ -87,7 +82,8 @@ void fn_1_AEE4(omObjData* arg0) { temp_r31->unk10 = temp_r31->unk12 = temp_r31->unk14 = 0; if (temp_r31->unk8 == 5) { var_f31 = 350.0f; - } else { + } + else { var_f31 = 410.0f; } temp_r31->unk5C = var_f31; @@ -98,37 +94,39 @@ void fn_1_AEE4(omObjData* arg0) { arg0->func = fn_1_B17C; } -void fn_1_B17C(omObjData* arg0) { +void fn_1_B17C(omObjData *arg0) +{ return; } -void fn_1_B180(omObjData* arg0) { +void fn_1_B180(omObjData *arg0) +{ s16 var_r29; s16 var_r31; s32 var_r28; u32 temp_r0; u32 temp_r3; u32 temp_r3_2; - unkObjStruct* temp_r30; + unkObjStruct *temp_r30; var_r28 = GWSystem.player_curr; if (var_r28 < 0) { var_r28 = 0; } var_r29 = var_r28; - + for (var_r31 = 0; var_r31 < 4; var_r31++) { lbl_1_bss_B8[var_r31] = var_r29; var_r29 = (var_r29 + 1) % 4; } - 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->x = (700.0f * cos(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++) { 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; } - + for (var_r31 = 0; var_r31 < 4; var_r31++) { temp_r30 = lbl_1_bss_C0[lbl_1_bss_B8[var_r31]]->data; temp_r30->unkA = var_r31; @@ -139,21 +137,22 @@ void fn_1_B180(omObjData* arg0) { arg0->func = fn_1_B3A4; } -void fn_1_B3A4(omObjData* arg0) { +void fn_1_B3A4(omObjData *arg0) +{ f32 sp14; - ModelData* sp8; + ModelData *sp8; f32 var_f31; s16 var_r28; s16 var_r29; - omObjData* var_r30; - unkObjStruct* var_r31; - + omObjData *var_r30; + unkObjStruct *var_r31; + for (var_r29 = 0; var_r29 < 4; var_r29++) { if (lbl_1_bss_B8[var_r29] != -1) { var_r30 = lbl_1_bss_C0[lbl_1_bss_B8[var_r29]]; sp8 = &Hu3DData[var_r30->model[0]]; - var_r31 = (unkObjStruct*)var_r30->data; - switch(var_r31->unk0 & 0xF) { + var_r31 = (unkObjStruct *)var_r30->data; + switch (var_r31->unk0 & 0xF) { case 1: var_r31->unkC++; 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) { lbl_1_bss_72 = 1; fn_1_F228(); - } else { + } + else { fn_1_F4D4(var_r31, 15, 7); 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; -void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) { - s16 sp8[5] = {3, 1, 0, 2, 4}; +void fn_1_B884(omObjData *arg0, unkObjStruct *arg1) +{ + s16 sp8[5] = { 3, 1, 0, 2, 4 }; f32 var_f29; f32 var_f28; f32 var_f31; @@ -269,7 +270,7 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) { var_f31 = 1.0f; arg1->unkC = arg1->unkE = 0; arg1->unk68 = arg1->unk30.y; - + for (var_r30 = 0; var_r30 < 5; var_r30++) { if (lbl_1_data_14[sp8[var_r30]] != 0) { arg1->unk4A = arg1->unk60 = sp8[var_r30]; @@ -279,8 +280,8 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) { lbl_1_bss_74++; } var_f29 = 700.0f + ((arg1->unk5C - 700.0f) * var_f31); - arg1->unk18.x = (var_f29 * cos(M_PI/4)); - arg1->unk18.z = (var_f29 * sin(M_PI/4)); + arg1->unk18.x = (var_f29 * cos(M_PI / 4)); + arg1->unk18.z = (var_f29 * sin(M_PI / 4)); var_f29 = 0.1f; var_f28 = 0.6f; if (var_f31 >= var_f29) { @@ -311,7 +312,8 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) { var_f31 = arg1->unkC / 10.0f; if (var_f31 < 1.0f) { arg1->unk30.y = arg1->unk68 + (var_f31 * (var_f30 - arg1->unk68)); - } else { + } + else { arg1->unk30.y = var_f30; } arg1->unk6C = arg1->unk30.y; @@ -345,7 +347,8 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) { lbl_1_data_1DA++; return; } - } else { + } + else { lbl_1_bss_74 = 0; lbl_1_data_250 = 70.0f; 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 sp8[5]; f32 var_f28; @@ -381,18 +385,18 @@ void fn_1_C1D4(omObjData* arg0, unkObjStruct* arg1) { HuPadTrigR[arg1->unk6] = 0; HuPadBtn[arg1->unk6] = 0; switch (GWPlayerCfg[arg1->unk4].diff) { - case 0: - var_f31 = 0.3f; - break; - case 1: - var_f31 = 0.3f; - break; - case 2: - var_f31 = 0.3f; - break; - case 3: - var_f31 = 0.3f; - break; + case 0: + var_f31 = 0.3f; + break; + case 1: + var_f31 = 0.3f; + break; + case 2: + var_f31 = 0.3f; + break; + case 3: + var_f31 = 0.3f; + break; } 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->unk4C < var_f31) { arg1->unk50 = fn_1_4E54(-1); - } else { + } + else { 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)) { 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]) { HuPadStkX[arg1->unk6] = 0x2D; } - } else { + } + else { var_f30 = ABS(arg1->unk68 - lbl_1_data_0[arg1->unk52]); if (var_f30 < 5.0f) { 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)); arg1->unk52 = sp8[var_r30]; } - HuPadTrigR[arg1->unk6] = (u8) (arg1->unk58 * var_f31); + HuPadTrigR[arg1->unk6] = (u8)(arg1->unk58 * var_f31); return; } 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; f32 var_f26; f32 var_f25; @@ -489,7 +496,8 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) { HuPadStkY[arg1->unk6] = 0; HuPadTrigR[arg1->unk6] = 0x96; HuPadBtn[arg1->unk6] = 0x20; - } else { + } + else { var_r29 = HuPadStkX[arg1->unk6]; sp8 = HuPadStkY[arg1->unk6]; } @@ -497,11 +505,13 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) { var_r30 = -1; if (ABS(var_r29) < 7) { var_r30 = fn_1_CFAC(arg1, 0); - } else { + } + else { if (var_r29 > 0) { arg1->unk48 = arg1->unk48 & 0xFFFFFFFD; arg1->unk48 = arg1->unk48 | 1; - } else { + } + else { arg1->unk48 = arg1->unk48 & 0xFFFFFFFE; arg1->unk48 = arg1->unk48 | 2; } @@ -519,7 +529,8 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) { arg1->unk4A = var_r30; arg1->unk48 = arg1->unk48 & 0xFFFFFFFE; } - } else if ((arg1->unk48 & 2) != 0) { + } + else if ((arg1->unk48 & 2) != 0) { arg1->unk68++; if ((var_r30 != -1) && (lbl_1_data_0[var_r30] < arg1->unk68)) { arg1->unk68 = lbl_1_data_0[var_r30]; @@ -539,7 +550,8 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) { var_f29 += 360.0f; } fn_1_D24C(arg1, arg1->unk30.y, var_f29); - } else { + } + else { arg1->unk48 |= 4; var_f29 = 90.0f - lbl_1_data_0[arg1->unk4A]; 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; if ((arg1->unk48 & 4) != 0) { fn_1_ED88(arg0, 0, HU3D_MOTATTR_LOOP); - } else { + } + else { fn_1_ED88(arg0, 2, HU3D_MOTATTR_LOOP); } - } else { + } + else { fn_1_ED88(arg0, 2, HU3D_MOTATTR_LOOP); } if ((arg1->unk48 & 4) != 0) { @@ -567,13 +581,15 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) { if (var_f31 > temp_f27) { 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_f30 = var_f31 + (var_f28 * (temp_f27 - var_f31)); if (var_f30 < 0.0f) { var_f30 += 360.0f; - } else { + } + else { if (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; s16 var_r30; s16 var_r31; @@ -596,7 +613,8 @@ s16 fn_1_CFAC(unkObjStruct* arg0, u8 arg1) { if (lbl_1_data_0[var_r31] > arg0->unk68) { continue; } - } else if (lbl_1_data_0[var_r31] >= arg0->unk68) { + } + else if (lbl_1_data_0[var_r31] >= arg0->unk68) { continue; } 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++) { if (lbl_1_data_14[var_r31] != 0) { if (arg1 == 0) { if (lbl_1_data_0[var_r31] < arg0->unk68) { continue; } - } else if (lbl_1_data_0[var_r31] <= arg0->unk68) { + } + else if (lbl_1_data_0[var_r31] <= arg0->unk68) { continue; } 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; } -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_f29; 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); } -void fn_1_D34C(omObjData* arg0, unkObjStruct* arg1) { - ModelData* temp_r30; +void fn_1_D34C(omObjData *arg0, unkObjStruct *arg1) +{ + ModelData *temp_r30; f32 temp_f28; f32 temp_f29; f32 temp_f30; @@ -672,7 +694,8 @@ void fn_1_D34C(omObjData* arg0, unkObjStruct* arg1) { arg1->unk48 &= ~8; temp_r30->unk_68 = 1.0f; 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) { arg1->unk60 = 0; arg1->unk68 = temp_f30; @@ -697,7 +720,8 @@ void fn_1_D34C(omObjData* arg0, unkObjStruct* arg1) { } if (temp_r30->unk_64 < var_f31) { 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; } 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) { - ModelData* temp_r29; +void fn_1_D7F8(omObjData *arg0, unkObjStruct *arg1) +{ + ModelData *temp_r29; f32 temp_f28; f32 temp_f29; f32 var_f26; @@ -732,7 +757,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) { var_f30 = 0.01f * (arg1->unk68 - 130.0f); if (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_f31 += var_f30; @@ -743,7 +769,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) { } if (temp_r29->unk_64 < var_f31) { 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; } 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); if ((arg1->unk6C - arg1->unk68) > 0.0f) { 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); } Hu3DMotionShiftSpeedSet(arg0->model[0], 2.0f); @@ -788,7 +816,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) { var_f31 = 1.0f; Hu3DMotionShiftSet(arg0->model[0], arg0->motion[0], 0.0f, 7.0f, HU3D_MOTATTR_LOOP); 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) { Hu3DMotionSpeedSet(arg0->model[0], 0.0f); } @@ -799,7 +828,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) { if (++arg1->unkC > 0x3C) { if (fn_1_4E54(arg1->unk4A) == 0) { fn_1_4EEC(7U, 3U); - } else { + } + else { fn_1_4EEC(7U, 4U); } arg1->unkC = 0; @@ -811,7 +841,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) { fn_1_4EEC(0x100U, 0U); if (fn_1_4E54(arg1->unk4A) == 0) { fn_1_F4D4(arg1, 15, 5); - } else { + } + else { fn_1_F4D4(arg1, 15, 6); } 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) { - ModelData* temp_r27; +void fn_1_E034(omObjData *arg0, unkObjStruct *arg1) +{ + ModelData *temp_r27; f32 var_f28; f32 var_f29; 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); arg1->unkC = arg1->unkE = 0; arg1->unk68 = arg1->unk30.y; - + for (var_r29 = 0, var_r28 = -1; var_r29 < 5; var_r29++) { if (lbl_1_data_14[var_r29] != 0) { var_r28++; @@ -950,8 +982,9 @@ void fn_1_E034(omObjData* arg0, unkObjStruct* arg1) { } } -u8 fn_1_E8AC(omObjData* arg0, unkObjStruct* arg1) { - ModelData* temp_r29; +u8 fn_1_E8AC(omObjData *arg0, unkObjStruct *arg1) +{ + ModelData *temp_r29; f32 var_f31; s32 temp_r28; 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.y = 0.0f; arg1->unk24.z = (840.0000610351563 * sind(var_f31)); - } else { + } + else { arg1->unk24.x = (1050.0 * cosd(var_f31)); arg1->unk24.y = 0.0f; arg1->unk24.z = (1050.0 * sind(var_f31)); @@ -1004,7 +1038,7 @@ u8 fn_1_E8AC(omObjData* arg0, unkObjStruct* arg1) { break; case 3: 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_r28 = arg1->unk4; GWPlayerCoinWinSet(temp_r28, temp_r27); @@ -1014,7 +1048,8 @@ u8 fn_1_E8AC(omObjData* arg0, unkObjStruct* arg1) { 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_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; - unkObjStruct* var_r30; - + unkObjStruct *var_r30; + 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) { 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) { - unkObjStruct* var_r30; +void fn_1_EF50(void) +{ + unkObjStruct *var_r30; s16 var_r28; s16 var_r29; s16 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) { 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; @@ -1055,9 +1092,10 @@ void fn_1_EF50(void) { } } -s16 fn_1_F0FC(void) { +s16 fn_1_F0FC(void) +{ s16 var_r31; - + for (var_r31 = 0; var_r31 < 4; var_r31++) { if (lbl_1_bss_B8[var_r31] != -1) { return lbl_1_bss_B8[var_r31]; @@ -1066,21 +1104,23 @@ s16 fn_1_F0FC(void) { return 0; } -void fn_1_F168(void) { - omObjData* temp_r31; +void fn_1_F168(void) +{ + omObjData *temp_r31; s16 var_r30; - unkObjStruct* var_r29; - + unkObjStruct *var_r29; + for (var_r30 = 0; var_r30 < 4; 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); Hu3DMotionShiftSet(temp_r31->model[0], temp_r31->motion[2], 0.0f, 7.0f, HU3D_MOTATTR_LOOP); } } -void fn_1_F228(void) { - omObjData* temp_r30; +void fn_1_F228(void) +{ + omObjData *temp_r30; s16 temp_r0; s16 var_r29; s32 temp_r27; @@ -1089,12 +1129,12 @@ void fn_1_F228(void) { u32 temp_r0_2; u32 temp_r3; u32 temp_r3_2; - unkObjStruct* temp_r31; - + unkObjStruct *temp_r31; + for (var_r29 = 0; var_r29 < 4; var_r29++) { if (lbl_1_bss_B8[var_r29] != -1) { 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) { switch (GWPlayerCfg[temp_r31->unk4].diff) { case 0: @@ -1117,9 +1157,11 @@ void fn_1_F228(void) { temp_r31->unkA = -1; temp_r31->unkC = temp_r31->unkE = 0; 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; - } else { + } + else { temp_r31->unkA--; temp_r31->unk24 = temp_r31->unk18; 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; } -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 |= arg2; } -s32 fn_1_F4FC(s32 arg0) { +s32 fn_1_F4FC(s32 arg0) +{ return lbl_1_bss_B8[arg0]; } diff --git a/src/REL/m441Dll/main.c b/src/REL/m441Dll/main.c index 1bc97759..d1a44ae5 100644 --- a/src/REL/m441Dll/main.c +++ b/src/REL/m441Dll/main.c @@ -1098,7 +1098,7 @@ void fn_1_40A8(omObjData *object) work->unk1C.x = temp_f24; work->unk1C.y = 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); Hu3DParManPosSet(work->unkE0, work->unk28.x, work->unk28.y, work->unk28.z); Hu3DParManAttrReset(work->unkE0, 1); @@ -1198,7 +1198,7 @@ void fn_1_40A8(omObjData *object) } if (Hu3DMotionEndCheck(object->model[0])) { work->unk98++; - Hu3DModelAttrSet(object->model[0], 0x40000001); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DMotionSet(object->model[2], object->motion[14]); for (i = 0; i < 4; i++) { @@ -1249,7 +1249,7 @@ void fn_1_40A8(omObjData *object) case 2014: 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); Hu3DParManPosSet(work->unkE0, work->unk4C.x, work->unk4C.y + 20, work->unk4C.z); 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[7], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02)); CharModelMotionIndexSet(work->unkB4, object->motion[3], DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03)); - Hu3DModelAttrSet(object->model[0], 1); - Hu3DModelAttrSet(object->model[0], 0x40000001); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); Hu3DModelLayerSet(object->model[0], 2); Hu3DMotionSet(object->model[0], object->motion[1]); object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x3F)); for (i = 11; i <= 12; i++) { 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); Hu3DModelLayerSet(object->model[1], 2); 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++) { 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); Hu3DModelLayerSet(object->model[2], 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]); } for (i = 0; i < 3; i++) { - Hu3DModelAttrReset(object->model[i], 1); + Hu3DModelAttrReset(object->model[i], HU3D_ATTR_DISPOFF); } if (GWPlayerCfg[work->unkB0].iscom) { switch (GWPlayerCfg[work->unkB0].diff) { @@ -1399,7 +1399,7 @@ typedef struct work_713C { 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]); lbl_1_bss_18[object->work[0]]--; 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); Hu3DParManPosSet(temp_r31->unk30, temp_r31->unk0.x, temp_r31->unk0.y, temp_r31->unk0.z); 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_r29 = temp_r28->data; temp_r29->unkC4[object->work[0]]++; @@ -1570,7 +1570,7 @@ void fn_1_713C(omObjData *object) else { object->model[0] = mdlId; } - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(object->model[0], 0x40000003); Hu3DModelLayerSet(object->model[0], 3); Hu3DModelShadowSet(object->model[0]); @@ -1591,7 +1591,7 @@ void fn_1_713C(omObjData *object) Hu3DModelLayerSet(Hu3DParManModelIDGet(work->unk30), 4); } Hu3DModelAttrReset(object->model[0], 0x40000002); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); object->func = fn_1_5C04; } @@ -1662,7 +1662,7 @@ void fn_1_74F4(s32 arg0) 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]); Hu3DParManKill(((Work713C *)object->data)->unk30); omDelObjEx(lbl_1_bss_1DC, object); @@ -1743,7 +1743,7 @@ void fn_1_8518(omObjData *object) work = object->data; work->unk18.y = 6.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); Hu3DModelLayerSet(object->model[0], 3); Hu3DModelShadowSet(object->model[0]); @@ -1764,7 +1764,7 @@ void fn_1_8518(omObjData *object) Hu3DModelLayerSet(Hu3DParManModelIDGet(work->unk30), 4); } Hu3DModelAttrReset(object->model[0], 0x40000002); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); 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)); Hu3DModelScaleSet(model, 2, 2, 2); Hu3DModelAttrReset(model, 0x40000002); - Hu3DModelAttrReset(model, 1); + Hu3DModelAttrReset(model, HU3D_ATTR_DISPOFF); return 1; } } @@ -1861,7 +1861,7 @@ void fn_1_8D58(omObjData *object) case 1003: if (lbl_1_bss_19E < 0) { lbl_1_bss_19E = MGSeqStartCreate(); - Hu3DModelAttrSet(lbl_1_bss_4C->model[2], 1); + Hu3DModelAttrSet(lbl_1_bss_4C->model[2], HU3D_ATTR_DISPOFF); } else { 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_19E = MGSeqFinishCreate(); fn_1_1F58(100); - Hu3DModelAttrReset(lbl_1_bss_4C->model[2], 1); + Hu3DModelAttrReset(lbl_1_bss_4C->model[2], HU3D_ATTR_DISPOFF); } else { for (i = 0; i < 4; i++) { @@ -2006,23 +2006,23 @@ void fn_1_9F40(omObjData *object) object->work[0] = 1000; object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x38)); Hu3DModelAttrSet(object->model[0], 0x4001); - Hu3DModelAttrSet(object->model[0], 0x40000002); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(object->model[0], 0); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); Hu3DModelShadowMapSet(object->model[0]); omSetTra(object, 0, -31, 0); object->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M441, 0x39)); Hu3DModelAttrSet(object->model[1], 0x4001); - Hu3DModelAttrSet(object->model[1], 0x40000002); + Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(object->model[1], 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)); Hu3DModelAttrSet(object->model[2], 0x4001); - Hu3DModelAttrSet(object->model[2], 0x40000002); + Hu3DModelAttrSet(object->model[2], HU3D_MOTATTR_PAUSE); Hu3DModelLayerSet(object->model[2], 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++) { lbl_1_bss_10[singleNo] = Hu3DModelCreateFile(lbl_1_data_368[singleNo]); Hu3DModelAttrSet(lbl_1_bss_10[singleNo], 0x4001); @@ -2081,7 +2081,7 @@ void ObjectSetup(void) for (i = 0; i < 3; i++) { lbl_1_bss_18[i] = 0; 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); } for (i = 0; i < 20; i++) { diff --git a/src/REL/m442Dll/main.c b/src/REL/m442Dll/main.c index 2e05e637..468d8998 100644 --- a/src/REL/m442Dll/main.c +++ b/src/REL/m442Dll/main.c @@ -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]); } 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]); CharModelVoiceEnableSet(var_r30->unk_10, object->motion[5], 0); 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->model[2] = Hu3DParticleCreate(lbl_1_bss_11F00, 0x32); Hu3DParticleHookSet(object->model[2], fn_1_7890); - Hu3DModelAttrSet(object->model[2], 1); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF); Hu3DModelLayerSet(object->model[2], 1); var_r30->unk_5C = -1; var_r30->unk_40 = -1; object->model[3] = Hu3DHookFuncCreate(fn_1_5EDC); 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->unk_120 = var_r30; CharModelDataClose(var_r30->unk_10); @@ -899,7 +899,7 @@ void fn_1_2254(omObjData *object) else { 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) && ((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))) @@ -947,7 +947,7 @@ void fn_1_2254(omObjData *object) var_r26 = Hu3DData[object->model[2]].unk_120; *(s16 *)var_r26 = 0; (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, 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_0C == 0) { - Hu3DModelAttrReset(object->model[3], 1); + Hu3DModelAttrReset(object->model[3], HU3D_ATTR_DISPOFF); } switch (var_r31->unk_40) { case 0: @@ -1020,7 +1020,7 @@ void fn_1_2254(omObjData *object) var_r31->unk_42++; } 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); 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; Hu3DMotionOverlayReset(object->model[0]); - Hu3DModelAttrSet(object->model[1], 1); - Hu3DModelAttrSet(object->model[3], 1); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); var_r30->unk_3C = 10; object->func = fn_1_3C94; } @@ -1914,12 +1914,12 @@ void fn_1_6D24(omObjData *object) var_r29->unk_18 = 1.0f; object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M442, 0x02)); Hu3DModelLayerSet(object->model[0], 7); - Hu3DModelAttrSet(object->model[0], 0x40000001); - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); object->model[1] = Hu3DParticleCreate(lbl_1_bss_11EFC, 0x64); Hu3DParticleHookSet(object->model[1], fn_1_7EBC); 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_r28 = 1; var_r28 < 24; var_r28++) { 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) { case 0: if (var_r31->unk_00_field0) { - Hu3DModelAttrReset(object->model[0], 1); - Hu3DModelAttrReset(object->model[1], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF); var_r31->unk_02 = 1; var_r31->unk_18 = 0.0f; var_r31->unk_0C = 60; diff --git a/src/REL/m443Dll/main.c b/src/REL/m443Dll/main.c index f949fe1f..e79d3c0c 100644 --- a/src/REL/m443Dll/main.c +++ b/src/REL/m443Dll/main.c @@ -8,6 +8,7 @@ #include "game/minigame_seq.h" #include "game/object.h" #include "game/objsub.h" +#include "game/sprite.h" #include "game/wipe.h" #include "math.h" #include "rel_sqrt_consts.h" @@ -630,7 +631,7 @@ void fn_1_2DD8(M443DllUnkStruct *arg0) arg0->unk_1C[var_r30] = -1; 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); - espAttrSet(arg0->unk_1C[var_r30], 8); + espAttrSet(arg0->unk_1C[var_r30], HUSPR_ATTR_LINEAR); espDispOff(arg0->unk_1C[var_r30]); } } @@ -840,10 +841,10 @@ void fn_1_3770(omObjData *arg0) break; } if (var_r24 != 0) { - Hu3DModelAttrReset(arg0->model[0], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrSet(arg0->model[0], 1); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); } for (var_r30 = 0; var_r30 < 4; var_r30++) { sp30[var_r30] = var_r28[var_r30 + 6].unk_04; diff --git a/src/REL/m443Dll/map.c b/src/REL/m443Dll/map.c index bab11988..48aef505 100644 --- a/src/REL/m443Dll/map.c +++ b/src/REL/m443Dll/map.c @@ -29,7 +29,7 @@ void fn_1_4AB4(omObjData *object) Hu3DModelLayerSet(object->model[0], 2); object->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M443, 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)); Hu3DModelLayerSet(object->model[3], 2); Hu3DMotionSpeedSet(object->model[3], 0.0f); @@ -148,7 +148,7 @@ void fn_1_4D14(omObjData *object) } Hu3DMotionSpeedSet(object->model[var_r29 + 9], 0.95f); 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); } else if (fn_1_42E4() == 5) { - Hu3DModelAttrSet(object->model[3], 1); + Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); } if (fn_1_42E4() == 5) { - Hu3DModelAttrReset(object->model[2], 1); + Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF); Hu3DModelShadowMapSet(object->model[0]); Hu3DModelShadowMapSet(object->model[2]); } diff --git a/src/REL/m443Dll/player.c b/src/REL/m443Dll/player.c index a251d1bd..d54072a6 100644 --- a/src/REL/m443Dll/player.c +++ b/src/REL/m443Dll/player.c @@ -75,8 +75,8 @@ typedef struct M443DllWorkStruct { Vec unkDC; Vec unkE8; char unkF4[0xC]; - M443DllCameraStruct* unk100; - M443DllCameraStruct* unk104; + M443DllCameraStruct *unk100; + M443DllCameraStruct *unk104; union { M443DllUnkStruct unk108s; struct { @@ -94,88 +94,81 @@ typedef struct M443DllStruct8 { u32 unk10; } M443DllStruct8; // copy of UnkM417Struct8 -void fn_1_5680(omObjData* object); -void fn_1_5BD4(omObjData* object); -void fn_1_6458(omObjData* object); -void fn_1_6674(omObjData* object); -void fn_1_6750(omObjData* object); -void fn_1_69B4(omObjData* object); -void fn_1_6B90(omObjData* object); -void fn_1_6DA8(omObjData* object); -void fn_1_7130(omObjData* object); -void fn_1_7340(omObjData* object); -void fn_1_8138(omObjData*, u32); -s32 fn_1_82C4(omObjData* object); -void fn_1_8508(omObjData*); -void fn_1_8680(omObjData* object); +void fn_1_5680(omObjData *object); +void fn_1_5BD4(omObjData *object); +void fn_1_6458(omObjData *object); +void fn_1_6674(omObjData *object); +void fn_1_6750(omObjData *object); +void fn_1_69B4(omObjData *object); +void fn_1_6B90(omObjData *object); +void fn_1_6DA8(omObjData *object); +void fn_1_7130(omObjData *object); +void fn_1_7340(omObjData *object); +void fn_1_8138(omObjData *, u32); +s32 fn_1_82C4(omObjData *object); +void fn_1_8508(omObjData *); +void fn_1_8680(omObjData *object); f32 fn_1_8AC8(u32, f32); f32 fn_1_8C68(f32); f32 fn_1_8C8C(s32, f32); f32 fn_1_8D00(u32, f32); f32 fn_1_8D74(f32); 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); -omObjData* lbl_1_bss_90[4]; +omObjData *lbl_1_bss_90[4]; s32 lbl_1_bss_78[6]; -char* lbl_1_data_264[0x8] = { - "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", - "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r" -}; +char *lbl_1_data_264[0x8] = { "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r", "itemhook-r" }; u32 lbl_1_data_284[8][2] = { - {0x4A0005, 0x4A0006}, {0x4A0007, 0x4A0008}, - {0x4A0009, 0x4A000A}, {0x4A000B, 0x4A000C}, - {0x4A000D, 0x4A000E}, {0x4A000F, 0x4A0010}, - {0x4A0011, 0x4A0012}, {0x4A0013, 0x4A0014}, -}; -u32 lbl_1_data_2C4[4] = { - 0, 0x4A0020, 0x17, 0x72 + { 0x4A0005, 0x4A0006 }, + { 0x4A0007, 0x4A0008 }, + { 0x4A0009, 0x4A000A }, + { 0x4A000B, 0x4A000C }, + { 0x4A000D, 0x4A000E }, + { 0x4A000F, 0x4A0010 }, + { 0x4A0011, 0x4A0012 }, + { 0x4A0013, 0x4A0014 }, }; +u32 lbl_1_data_2C4[4] = { 0, 0x4A0020, 0x17, 0x72 }; -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 }, - { 0x3, 0.2f, 0.0f, -1.0f, 0x0 } -}; +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 }, + { 0x3, 0.2f, 0.0f, -1.0f, 0x0 } }; s32 lbl_1_data_324[4] = { - 0x727, 0x728, 0x729, 0x72A, + 0x727, + 0x728, + 0x729, + 0x72A, }; s32 lbl_1_data_334[4] = { - 0x72B, 0x72C, 0x72D, 0x72E, + 0x72B, + 0x72C, + 0x72D, + 0x72E, }; s32 lbl_1_data_344[4] = { - 0x72F, 0x730, 0x731, 0x732, + 0x72F, + 0x730, + 0x731, + 0x732, }; s32 lbl_1_data_354[4] = { - 0x736, 0x737, 0x738, 0x739, -}; -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 } + 0x736, + 0x737, + 0x738, + 0x739, }; +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 sp8[4]; - omObjData* var_r28; + omObjData *var_r28; u32 var_r29; s16 var_r30; s16 var_r31; @@ -184,7 +177,7 @@ void fn_1_5444(Process* arg0) { sp18[var_r31] = GWPlayerCfg[var_r31].group; sp8[var_r31] = var_r31; } - + for (var_r31 = 0; var_r31 < 3; var_r31++) { for (var_r30 = var_r31 + 1; var_r30 < 4; 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++) { lbl_1_bss_78[sp8[var_r31]] = (s16)var_r31; } omMakeGroupEx(arg0, 0, 4); omGetGroupMemberListEx(arg0, 0); - + 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->work[0] = var_r31; } } -void fn_1_565C(void) { +void fn_1_565C(void) +{ CharModelKill(-1); } -void fn_1_5680(omObjData* object) { - f32 spC[4] = {0.25f, 0.5f, 0.75f, 1.0f}; +void fn_1_5680(omObjData *object) +{ + f32 spC[4] = { 0.25f, 0.5f, 0.75f, 1.0f }; s32 sp8; f32 temp_f0; s32 temp_r27; s32 temp_r3; s32 var_r29; u32 temp_r25; - M443DllWorkStruct* temp_r31; - HsfanimStruct01* var_r28; + M443DllWorkStruct *temp_r31; + HsfanimStruct01 *var_r28; object->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x134, MEMORY_DEFAULT_NUM); 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]); Hu3DModelLayerSet(object->model[2], 4); 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++) { if (lbl_1_data_2C4[var_r29] < 0x10000) { 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); temp_r3 = Hu3DParticleCreate(HuSprAnimReadFile(0x4A001D), 0xC8); object->model[3] = temp_r3; 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++) { var_r28->unk2C = 0.0f; var_r28->unk40.a = 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.y = temp_r31->unkC4.y = temp_r31->unkDC.y = 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->unkE8.x = temp_r31->unkE8.y = temp_r31->unkE8.z = 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; } -void fn_1_5BD4(omObjData* object) { +void fn_1_5BD4(omObjData *object) +{ Vec sp8; f32 var_f29; f32 var_f30; f32 var_f31; - M443DllWorkStruct* temp_r31; + M443DllWorkStruct *temp_r31; temp_r31 = object->data; temp_r31->unk10 = 0; @@ -314,7 +311,8 @@ void fn_1_5BD4(omObjData* object) { if (temp_r31->unk108 != 0) { if (temp_r31->unk24 != 0) { fn_1_6DA8(object); - } else { + } + else { temp_r31->unk14 = HuPadBtn[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]; @@ -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))); 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_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_34 = 500.0f + (-200.0f * var_f30); if (var_f31 >= 1.0f) { @@ -379,7 +377,7 @@ void fn_1_5BD4(omObjData* object) { 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.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)); break; } @@ -387,7 +385,7 @@ void fn_1_5BD4(omObjData* object) { PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); fn_1_7130(object); fn_1_69B4(object); - + if (fn_1_42CC() == 2) { temp_r31->unk100->unk_1C = temp_r31->unkDC; 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; s32 var_r29; - M443DllWorkStruct* temp_r31; - void* temp_r4; + M443DllWorkStruct *temp_r31; + void *temp_r4; temp_r31 = object->data; var_r29 = 0; @@ -413,7 +412,8 @@ void fn_1_6458(omObjData* object) { temp_r31->unk18 = 0.0f; if (temp_r31->unk24 != 0) { fn_1_6DA8(object); - } else { + } + else { temp_r31->unk14 = HuPadBtn[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]; @@ -441,9 +441,10 @@ void fn_1_6458(omObjData* object) { } } -void fn_1_6674(omObjData* object) { - M443DllWorkStruct* temp_r31; - void* temp_r4; +void fn_1_6674(omObjData *object) +{ + M443DllWorkStruct *temp_r31; + void *temp_r4; temp_r31 = object->data; temp_r31->unk10 = 0; @@ -462,8 +463,9 @@ void fn_1_6674(omObjData* object) { } } -void fn_1_6750(omObjData* object) { - M443DllWorkStruct* temp_r31; +void fn_1_6750(omObjData *object) +{ + M443DllWorkStruct *temp_r31; temp_r31 = object->data; PSVECAdd(&temp_r31->unkC4, &temp_r31->unkD0, &temp_r31->unkC4); @@ -471,8 +473,8 @@ void fn_1_6750(omObjData* object) { fn_1_69B4(object); switch (temp_r31->unk34) { case 0: - Hu3DModelAttrSet(object->model[2], 1); - Hu3DModelAttrSet(object->model[3], 1); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); fn_1_95A4(object->work[0]); Hu3DModelShadowSet(object->model[0]); 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->unkDC = lbl_1_data_3C4[fn_1_4368(object->work[0])]; 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->unk34++; @@ -499,7 +502,8 @@ void fn_1_6750(omObjData* object) { if (fn_1_42FC() == 1) { if (fn_1_4368(object->work[0]) == 0) { fn_1_8138(object, 2); - } else { + } + else { fn_1_8138(object, 3); } temp_r31->unk34++; @@ -514,8 +518,9 @@ void fn_1_6750(omObjData* object) { } } -void fn_1_69B4(omObjData* object) { - M443DllWorkStruct* temp_r31; +void fn_1_69B4(omObjData *object) +{ + M443DllWorkStruct *temp_r31; temp_r31 = object->data; temp_r31->unk40++; @@ -533,10 +538,11 @@ void fn_1_69B4(omObjData* object) { if (temp_r31->unk20 == 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); - } else { + } + else { if (temp_r31->unk20 != 0) { 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); } -void fn_1_6B90(omObjData* object) { - M443DllWorkStruct* temp_r29; - M443DllWorkStruct* temp_r27 = object->data; +void fn_1_6B90(omObjData *object) +{ + M443DllWorkStruct *temp_r29; + M443DllWorkStruct *temp_r27 = object->data; s32 sp28[4][4] = { - { 0, 1, 2, 3 }, + { 0, 1, 2, 3 }, { 1, 0, 1, 2 }, { 2, 1, 0, 1 }, { 3, 2, 1, 0 }, }; - f32 sp18[4] = { - 0.0f, -700.0f, 600.0f, 1200.0f - }; + f32 sp18[4] = { 0.0f, -700.0f, 600.0f, 1200.0f }; s32 sp14; s32 sp10; s32 spC; @@ -571,7 +576,7 @@ void fn_1_6B90(omObjData* object) { u32 var_r30; var_r28 = sp8[object->work[0]] | 1; - + for (var_r30 = 0; var_r30 < 4; var_r30++) { if (var_r30 != object->work[0]) { 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); } -void fn_1_6DA8(omObjData* object) { +void fn_1_6DA8(omObjData *object) +{ f32 var_f31; - M443DllWorkStruct* temp_r31; + M443DllWorkStruct *temp_r31; temp_r31 = object->data; switch (temp_r31->unk60) { @@ -611,7 +617,7 @@ void fn_1_6DA8(omObjData* object) { temp_r31->unk18 = 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; case 2: @@ -622,7 +628,8 @@ void fn_1_6DA8(omObjData* object) { var_f31 = 1.2f - temp_r31->unk5C; var_f31 *= (0.5f + 0.0005f * frandmod(0x3E8)); temp_r31->unk6C = 8000.0f - 1500.0f * var_f31; - } else { + } + else { var_f31 = 1.2f - temp_r31->unk5C; var_f31 *= (0.5f + 0.0005f * frandmod(0x3E8)); temp_r31->unk70 = 0.016666668f + var_f31; @@ -631,15 +638,16 @@ void fn_1_6DA8(omObjData* object) { temp_r31->unk68 = temp_r31->unk80; if (temp_r31->unk6C > 0.0f) { 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; break; } - } else if (temp_r31->unk70 > 0.0f) { + } + else if (temp_r31->unk70 > 0.0f) { if (temp_r31->unk88 >= 8000.0f) { temp_r31->unk70 = (temp_r31->unk70 - 0.016666668f); 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; } } @@ -648,20 +656,20 @@ void fn_1_6DA8(omObjData* object) { } } -void fn_1_7130(omObjData* object) { +void fn_1_7130(omObjData *object) +{ Vec sp8; f32 var_f31; s32 var_r27; s32 var_r29; s32 var_r28; - M443DllWorkStruct* temp_r30; - M443DllWorkStruct* temp_r31; + M443DllWorkStruct *temp_r30; + M443DllWorkStruct *temp_r31; - for (var_r27 = 0; var_r27 < 2; var_r27++) { for (var_r29 = 0; var_r29 < 4; var_r29++) { temp_r31 = lbl_1_bss_90[var_r29]->data; - + for (var_r28 = 0; var_r28 < 4; var_r28++) { if (var_r29 != var_r28) { 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 > 0.0f) { var_f31 = 0.5f * ((temp_r31->unkC0 + temp_r30->unkC0) - var_f31); - } else { + } + else { var_f31 = 0.5f * (temp_r31->unkC0 + temp_r30->unkC0); sp8.x = (frandmod(0x3E8) - 0x1F4); sp8.z = (frandmod(0x3E8) - 0x1F4); @@ -690,13 +699,11 @@ void fn_1_7130(omObjData* object) { } } -void fn_1_7340(omObjData* object) { - M443DllWorkStruct* temp_r31 = object->data; - HsfObject* var_r29; - f32 sp28[8] = { - 0.0f, 40.0f, 0.0f, 0.0f, - -16.0f, 40.0f, -16.0f, 0.0f - }; +void fn_1_7340(omObjData *object) +{ + M443DllWorkStruct *temp_r31 = object->data; + HsfObject *var_r29; + f32 sp28[8] = { 0.0f, 40.0f, 0.0f, 0.0f, -16.0f, 40.0f, -16.0f, 0.0f }; f32 var_f31; f32 var_f29; u32 temp_r24; @@ -711,16 +718,19 @@ void fn_1_7340(omObjData* object) { temp_r31->unk80++; temp_r31->unk84 = 30; } - } else { + } + else { if (temp_r31->unk88 >= 8000.0f) { temp_r31->unk10C = 1; } } - } else { + } + else { 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->unk84 = 30; } @@ -756,7 +766,8 @@ void fn_1_7340(omObjData* object) { if (temp_r31->unk88 > 9500.0f) { temp_r31->unk88 = 9000.0f; 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->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) { temp_r31->unkA0 = 0.0001f; } - } else { + } + else { temp_r31->unkA0 = 1.0f; } } @@ -851,7 +863,8 @@ void fn_1_7340(omObjData* object) { } HuAudFXVolSet(temp_r31->unkA8, var_f31); } - } else if (fn_1_42E4() <= 2) { + } + else if (fn_1_42E4() <= 2) { if (temp_r31->unkA8 < 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); } - } else if (temp_r31->unkA8 >= 0) { + } + else if (temp_r31->unkA8 >= 0) { HuAudFXStop(temp_r31->unkA8); 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; - M443DllWorkStruct* temp_r30; + M443DllWorkStruct *temp_r30; temp_r30 = object->data; 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; } 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) { 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; - M443DllWorkStruct* temp_r31; + M443DllWorkStruct *temp_r31; temp_r31 = object->data; var_r30 = 0; @@ -915,10 +932,11 @@ s32 fn_1_82C4(omObjData* object) { return var_r30; } -s32 fn_1_8338(omObjData* object, u32 arg1) { +s32 fn_1_8338(omObjData *object, u32 arg1) +{ s32 var_r27; s32 var_r26; - M443DllWorkStruct* temp_r31; + M443DllWorkStruct *temp_r31; var_r27 = 0; 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)) { var_r26 = 1; } - + if (var_r26 != 0) { fn_1_8138(object, arg1); var_r27 = 1; @@ -955,15 +973,16 @@ Vec2f lbl_1_data_468[4] = { { 46.0f, 44.0f }, }; -void fn_1_8508(omObjData* object) { +void fn_1_8508(omObjData *object) +{ s32 var_r30; - M443DllWorkStruct* temp_r28; - M443DllUnkStruct* temp_r31; - f32* temp_r4; + M443DllWorkStruct *temp_r28; + M443DllUnkStruct *temp_r31; + f32 *temp_r4; temp_r28 = object->data; temp_r31 = &temp_r28->unk108s; - + for (var_r30 = 0; var_r30 < 11; var_r30++) { temp_r31->unk14[var_r30] = -1; 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] = { - { 20.0f, 4.0f }, - { 18.0f, 6.0f }, - { 46.0f, 33.0f }, - { 72.0f, 32.0f }, - { 72.0f, 14.0f }, - { 72.0f, -4.0f }, - { 72.0f, -22.0f }, - { -140.0f, 32.0f }, - { -158.0f, 32.0f }, - { -176.0f, 32.0f }, - { -96.0f, 32.0f }, + { 20.0f, 4.0f }, + { 18.0f, 6.0f }, + { 46.0f, 33.0f }, + { 72.0f, 32.0f }, + { 72.0f, 14.0f }, + { 72.0f, -4.0f }, + { 72.0f, -22.0f }, + { -140.0f, 32.0f }, + { -158.0f, 32.0f }, + { -176.0f, 32.0f }, + { -96.0f, 32.0f }, }; -void fn_1_8680(omObjData* object) { +void fn_1_8680(omObjData *object) +{ f32 var_f31; s32 var_r27; s32 var_r30; u32 var_r28; - M443DllWorkStruct* temp_r29; - M443DllUnkStruct* temp_r31; + M443DllWorkStruct *temp_r29; + M443DllUnkStruct *temp_r31; temp_r29 = object->data; temp_r31 = &temp_r29->unk108s; temp_r31->unk8++; - + for (var_r30 = 0; var_r30 < 11; var_r30++) { if (temp_r31->unk14[var_r30] >= 0) { if (temp_r31->unk0 == 0) { espDispOff(temp_r31->unk14[var_r30]); - } else { + } + else { espDispOn(temp_r31->unk14[var_r30]); - 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_r29->unk104->unk_48 + temp_r31->unkC.y + lbl_1_data_488[var_r30][1] - ); + 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_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; } espZRotSet(temp_r31->unk14[2], (90.0f * (0.0001f * temp_r29->unk88)) + var_f31); - + for (var_r30 = 0; var_r30 < 4; var_r30++) { var_r27 = 0; if (temp_r29->unk80 == var_r30) { 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; } 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); } -f32 lbl_1_data_4E0[4] = { - 18.5f, 9.25f, 6.66f, 5.55f -}; +f32 lbl_1_data_4E0[4] = { 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) { } } return lbl_1_data_4E0[arg0]; } -f32 fn_1_8990(f32 arg8) { +f32 fn_1_8990(f32 arg8) +{ f32 var_f30; f32 var_f31; @@ -1076,41 +1094,49 @@ f32 fn_1_8990(f32 arg8) { 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)); } -f32 fn_1_8C68(f32 arg0) { +f32 fn_1_8C68(f32 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)); } -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); } -f32 fn_1_8D74(f32 arg0) { +f32 fn_1_8D74(f32 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); } -f32 fn_1_8DE0(u32 arg0, f32 arg8) { +f32 fn_1_8DE0(u32 arg0, f32 arg8) +{ return arg8 * fn_1_8958(arg0); } -void fn_1_8E34(s32 arg0) { +void fn_1_8E34(s32 arg0) +{ s32 var_r29; - ParticleData* temp_r30; - HsfanimStruct01* var_r31; + ParticleData *temp_r30; + HsfanimStruct01 *var_r31; temp_r30 = Hu3DData[arg0].unk_120; var_r31 = temp_r30->unk_48; - + for (var_r29 = 0; var_r29 < temp_r30->unk_30; var_r29++, var_r31++) { if (var_r31->unk00_s16 != 0) { 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); } -static inline f32 isEven(u32 arg) { +static inline f32 isEven(u32 arg) +{ if ((arg & 1) != 0) { return 1.0f; - } else { + } + else { 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 var_f29; - ParticleData* temp_r29; + ParticleData *temp_r29; s32 var_r28; u32 var_r27; - HsfanimStruct01* var_r31; + HsfanimStruct01 *var_r31; 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_r31 = temp_r29->unk_48; - + 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_f29 = isEven(var_r27); 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.g = (55.0f + (140.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; - ParticleData* temp_r30; - HsfanimStruct01* var_r31; + ParticleData *temp_r30; + HsfanimStruct01 *var_r31; temp_r30 = Hu3DData[lbl_1_bss_90[arg0]->model[3]].unk_120; var_r31 = temp_r30->unk_48; - + for (var_r29 = 0; var_r29 < temp_r30->unk_30; var_r29++, var_r31++) { var_r31->unk00 = 0; var_r31->unk2C = 0.0f; diff --git a/src/REL/m444dll/main.c b/src/REL/m444dll/main.c index 2617028a..d7312f98 100644 --- a/src/REL/m444dll/main.c +++ b/src/REL/m444dll/main.c @@ -184,7 +184,7 @@ void fn_1_470(void) while (fn_1_82FC() > 10.0f) { 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]); Hu3DModelRotSet(lbl_1_bss_199C2[18], 0, 90, 0); 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); HuPrcVSleep(); } - Hu3DModelAttrSet(lbl_1_bss_199C2[18], 1); - Hu3DModelAttrReset(lbl_1_bss_199C2[22], 1); + Hu3DModelAttrSet(lbl_1_bss_199C2[18], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_199C2[22], HU3D_ATTR_DISPOFF); Hu3DMotionSet(lbl_1_bss_199C2[22], lbl_1_bss_1990E[24]); Hu3DModelRotSet(lbl_1_bss_199C2[22], 0, 90, 0); for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { @@ -293,7 +293,7 @@ void fn_1_470(void) } HuAudFXPlay(1857); 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); CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[1], 0, 8, HU3D_MOTATTR_LOOP); sp1C.x = 124; @@ -324,7 +324,7 @@ void fn_1_470(void) HuPrcVSleep(); } HuPrcSleep(40); - Hu3DModelAttrSet(lbl_1_bss_199C2[64], 1); + Hu3DModelAttrSet(lbl_1_bss_199C2[64], HU3D_ATTR_DISPOFF); fn_1_8180(9); 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++) { @@ -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); HuPrcVSleep(); } - Hu3DModelAttrSet(lbl_1_bss_199C2[22], 1); - Hu3DModelAttrReset(lbl_1_bss_199C2[26], 1); + Hu3DModelAttrSet(lbl_1_bss_199C2[22], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_199C2[26], HU3D_ATTR_DISPOFF); Hu3DMotionSet(lbl_1_bss_199C2[26], lbl_1_bss_1990E[28]); Hu3DModelRotSet(lbl_1_bss_199C2[26], 0, 90, 0); for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { @@ -394,7 +394,7 @@ void fn_1_470(void) } HuAudFXPlay(1857); 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); lbl_1_bss_2D4 = -1; fn_1_9418(1); @@ -407,7 +407,7 @@ void fn_1_470(void) HuPrcVSleep(); } HuPrcSleep(40); - Hu3DModelAttrSet(lbl_1_bss_199C2[64], 1); + Hu3DModelAttrSet(lbl_1_bss_199C2[64], HU3D_ATTR_DISPOFF); fn_1_8180(9); 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++) { @@ -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); HuPrcVSleep(); } - Hu3DModelAttrSet(lbl_1_bss_199C2[26], 1); - Hu3DModelAttrReset(lbl_1_bss_199C2[30], 1); + Hu3DModelAttrSet(lbl_1_bss_199C2[26], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_199C2[30], HU3D_ATTR_DISPOFF); Hu3DMotionSet(lbl_1_bss_199C2[30], lbl_1_bss_1990E[32]); Hu3DModelRotSet(lbl_1_bss_199C2[30], 0, 90, 0); for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { @@ -478,7 +478,7 @@ void fn_1_470(void) } HuAudFXPlay(1857); 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); lbl_1_bss_2D2 = -1; fn_1_9418(2); @@ -491,7 +491,7 @@ void fn_1_470(void) HuPrcVSleep(); } HuPrcSleep(40); - Hu3DModelAttrSet(lbl_1_bss_199C2[64], 1); + Hu3DModelAttrSet(lbl_1_bss_199C2[64], HU3D_ATTR_DISPOFF); fn_1_8180(9); 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++) { @@ -526,7 +526,7 @@ void fn_1_470(void) HuPrcVSleep(); } 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]); Hu3DModelRotSet(lbl_1_bss_199C2[34], 0, 90, 0); for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { @@ -657,9 +657,9 @@ void fn_1_470(void) default: 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((8+GWPlayerCfg[lbl_1_bss_2D4].character)-8, 2); + HuWinInsertMesSizeGet((8 + GWPlayerCfg[lbl_1_bss_2D4].character) - 8, 2); HuWinMesMaxSizeGet(1, sp8, temp_r28); temp_r30 = HuWinExCreateStyled(-10000, 340, sp8[0], sp8[1], -1, 1); HuWinExAnimIn(temp_r30); @@ -738,7 +738,7 @@ void fn_1_3B7C(void) Hu3DMotionSet(lbl_1_bss_199C2[18], lbl_1_bss_1990E[20]); temp_f31 = atan2d(400.0, 200.0) + 180.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) { 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]); temp_f31 = atan2d(-300.0, 200.0) + 180.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) { 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]); temp_f31 = atan2d(200.0, 500.0) + 180.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) { 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]); temp_f31 = atan2d(-300.0, 100.0) + 180.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) { 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; } 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]++; 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; temp_r31->unk6[temp_r30] = -1; GWStarsSet(temp_r31->unk2, GWPlayer[temp_r31->unk2].stars + 1); @@ -1189,10 +1189,10 @@ void fn_1_5E68(void) continue; } 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]++; 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; temp_r31->unk6[temp_r30] = -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[11], "L_itemhook", lbl_1_bss_199C2[13]); 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[14], 0x40000001); + Hu3DModelAttrSet(lbl_1_bss_199C2[13], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(lbl_1_bss_199C2[14], HU3D_MOTATTR_LOOP); 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]); 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)); CharModelMotionSet(lbl_1_bss_2DA, lbl_1_bss_2C0[0]); Hu3DModelPosSet(model, 0, 0, 200); - Hu3DModelAttrSet(model, 0x40000001); + Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(model); HuPrcChildCreate(fn_1_C214, 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]); - Hu3DModelAttrSet(lbl_1_bss_199C2[26], 1); + Hu3DModelAttrSet(lbl_1_bss_199C2[26], HU3D_ATTR_DISPOFF); 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]); - Hu3DModelAttrSet(lbl_1_bss_199C2[22], 1); + Hu3DModelAttrSet(lbl_1_bss_199C2[22], HU3D_ATTR_DISPOFF); 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]); Hu3DModelShadowMapSet(lbl_1_bss_199C2[15]); 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][1] = 0; - Hu3DModelAttrSet(model, 1); + Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF); Hu3DModelScaleSet(model, 0.2, 0.2, 0.2); Hu3DModelLayerSet(model, 7); } @@ -1328,7 +1328,7 @@ void fn_1_655C(void) } lbl_1_bss_8[i][0] = model; lbl_1_bss_8[i][1] = 0; - Hu3DModelAttrSet(model, 1); + Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF); Hu3DModelScaleSet(model, 0.2, 0.2, 0.2); Hu3DModelLayerSet(model, 7); } diff --git a/src/REL/m444dll/pinball.c b/src/REL/m444dll/pinball.c index d2ddb6bc..7b4873ec 100644 --- a/src/REL/m444dll/pinball.c +++ b/src/REL/m444dll/pinball.c @@ -1,22 +1,22 @@ -#include "game/object.h" -#include "game/objsub.h" -#include "game/hsfman.h" #include "game/hsfdraw.h" #include "game/hsfex.h" +#include "game/hsfman.h" +#include "game/object.h" +#include "game/objsub.h" #include "game/hsfmotion.h" #include "game/pad.h" +#include "game/audio.h" +#include "game/chrman.h" +#include "game/esprite.h" #include "game/window.h" #include "game/wipe.h" -#include "game/audio.h" -#include "game/esprite.h" -#include "game/chrman.h" #include "game/board/ui.h" -#include "game/gamework_data.h" #include "game/gamework.h" +#include "game/gamework_data.h" #include "REL/m444dll.h" #include "ext_math.h" @@ -45,125 +45,117 @@ Vec lbl_1_bss_314; s16 lbl_1_bss_312; u8 lbl_1_bss_310; -float lbl_1_data_258[3] = { - 90, 250, 420 -}; +float lbl_1_data_258[3] = { 90, 250, 420 }; -Vec lbl_1_data_264[5] = { - { -75, -300, 0 }, - { 25, -300, 0 }, - { -75, -300, 0 }, - { 25, -300, 0 }, - { -25, -400, 0 } -}; +Vec lbl_1_data_264[5] = { { -75, -300, 0 }, { 25, -300, 0 }, { -75, -300, 0 }, { 25, -300, 0 }, { -25, -400, 0 } }; -float lbl_1_data_2A0[5*2] = { - -100, -60, - 10, 50, - -100, -60, - 10, 50, - -50, 0 -}; +float lbl_1_data_2A0[5 * 2] = { -100, -60, 10, 50, -100, -60, 10, 50, -50, 0 }; s16 lbl_1_data_2C8[5] = { - 1, 1, 2, 2, 2, + 1, + 1, + 2, + 2, + 2, }; void fn_1_8424(void) { - s16 i; - for(i=0; i<5; i++) { - lbl_1_bss_18B4[i] = lbl_1_data_264[i]; - lbl_1_bss_824[i].x = lbl_1_bss_18B4[i].x; - lbl_1_bss_824[i].y = 215; - lbl_1_bss_824[i].z = lbl_1_bss_18B4[i].y; - lbl_1_bss_198F0[i][0] = 10; - lbl_1_bss_198F0[i][1] = 0; - } - for(i=0; i<3; i++) { - lbl_1_bss_860[i].x = 128; - lbl_1_bss_860[i].y = 230; - lbl_1_bss_860[i].z = -100; - MTXIdentity(lbl_1_bss_794[i]); - lbl_1_bss_788[i] = 0; - } + s16 i; + for (i = 0; i < 5; i++) { + lbl_1_bss_18B4[i] = lbl_1_data_264[i]; + lbl_1_bss_824[i].x = lbl_1_bss_18B4[i].x; + lbl_1_bss_824[i].y = 215; + lbl_1_bss_824[i].z = lbl_1_bss_18B4[i].y; + lbl_1_bss_198F0[i][0] = 10; + lbl_1_bss_198F0[i][1] = 0; + } + for (i = 0; i < 3; i++) { + lbl_1_bss_860[i].x = 128; + lbl_1_bss_860[i].y = 230; + lbl_1_bss_860[i].z = -100; + MTXIdentity(lbl_1_bss_794[i]); + lbl_1_bss_788[i] = 0; + } } void fn_1_861C(s16 arg0) { - s16 temp_r31; - s16 temp_r29; - s16 temp_r28; - s16 temp_r27; - lbl_1_bss_312 = 0; - for(temp_r31=0; temp_r31<256; temp_r31++) { - lbl_1_bss_370[temp_r31] = 1000000.0f; - } - lbl_1_bss_1894.x = 128; - lbl_1_bss_1894.y = -100; - lbl_1_bss_1894.z = 0; - lbl_1_bss_1888.x = lbl_1_bss_1888.z = 0; - lbl_1_bss_1888.y = -30; - lbl_1_bss_860[arg0].x = lbl_1_bss_1894.x; - lbl_1_bss_860[arg0].y = 230; - lbl_1_bss_860[arg0].z = lbl_1_bss_1894.y; - fn_1_D1E0(lbl_1_bss_199C2[(arg0*2)+4]); - if(arg0 == 0) { - for(temp_r31=0; temp_r31<4; temp_r31++) { - lbl_1_bss_320[temp_r31] = temp_r31; - } - for(temp_r31=0; temp_r31<20; temp_r31++) { - temp_r29 = frandmod(4); - temp_r28 = frandmod(4); - temp_r27 = lbl_1_bss_320[temp_r29]; - lbl_1_bss_320[temp_r29] = lbl_1_bss_320[temp_r28]; - lbl_1_bss_320[temp_r28] = temp_r27; - } - Hu3DModelHookSet(lbl_1_bss_199C2[3], "d1_itemhook1", lbl_1_bss_199C2[lbl_1_bss_320[0]+47]); - Hu3DModelHookSet(lbl_1_bss_199C2[3], "d1_itemhook2", lbl_1_bss_199C2[lbl_1_bss_320[1]+47]); - Hu3DModelHookSet(lbl_1_bss_199C2[3], "d1_itemhook3", lbl_1_bss_199C2[lbl_1_bss_320[2]+47]); - Hu3DModelHookSet(lbl_1_bss_199C2[3], "d1_itemhook4", lbl_1_bss_199C2[lbl_1_bss_320[3]+47]); - for(temp_r31=0; temp_r31<4; temp_r31++) { - Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31+51], 1); - } - } else if(arg0 == 1) { - for(temp_r31=temp_r29=0; temp_r31<4; temp_r31++) { - if(temp_r31 != lbl_1_bss_2D6) { - lbl_1_bss_320[temp_r29] = temp_r31; - temp_r29++; - } - } - for(temp_r31=0; temp_r31<20; temp_r31++) { - temp_r29 = frandmod(3); - temp_r28 = frandmod(3); - temp_r27 = lbl_1_bss_320[temp_r29]; - lbl_1_bss_320[temp_r29] = lbl_1_bss_320[temp_r28]; - lbl_1_bss_320[temp_r28] = temp_r27; - } - Hu3DModelAttrReset(lbl_1_bss_199C2[lbl_1_bss_320[0]+51], 1); - Hu3DModelAttrReset(lbl_1_bss_199C2[lbl_1_bss_320[1]+51], 1); - Hu3DModelAttrReset(lbl_1_bss_199C2[lbl_1_bss_320[2]+51], 1); - Hu3DModelAttrSet(lbl_1_bss_199C2[lbl_1_bss_2D6+51], 1); - Hu3DModelHookSet(lbl_1_bss_199C2[5], "d2_itemhook1", lbl_1_bss_199C2[lbl_1_bss_320[0]+51]); - Hu3DModelHookSet(lbl_1_bss_199C2[5], "d2_itemhook2", lbl_1_bss_199C2[lbl_1_bss_320[1]+51]); - Hu3DModelHookSet(lbl_1_bss_199C2[5], "d2_itemhook3", lbl_1_bss_199C2[lbl_1_bss_320[2]+51]); - } - Hu3DModelAttrSet(lbl_1_bss_199C2[arg0+65], 0x40000002); - Hu3DMotionTimeSet(lbl_1_bss_199C2[arg0+65], 0); - Hu3DModelAttrSet(lbl_1_bss_199C2[arg0+55], 0x40000002); - Hu3DMotionTimeSet(lbl_1_bss_199C2[arg0+55], 0); - Hu3DMotionSpeedSet(lbl_1_bss_199C2[arg0+55], 2); - Hu3DMotionSet(lbl_1_bss_199C2[arg0+58], lbl_1_bss_1990E[61]); - Hu3DModelAttrSet(lbl_1_bss_199C2[arg0+58], 0x40000001); - for(temp_r31=0; temp_r31<5; temp_r31++) { - if(arg0 == lbl_1_data_2C8[temp_r31]) { - lbl_1_bss_18A0[temp_r31] = 1; - } else { - lbl_1_bss_18A0[temp_r31] = 0; - } - lbl_1_bss_198F0[temp_r31][0] = 10; - lbl_1_bss_198F0[temp_r31][1] = 0; - } + s16 temp_r31; + s16 temp_r29; + s16 temp_r28; + s16 temp_r27; + lbl_1_bss_312 = 0; + for (temp_r31 = 0; temp_r31 < 256; temp_r31++) { + lbl_1_bss_370[temp_r31] = 1000000.0f; + } + lbl_1_bss_1894.x = 128; + lbl_1_bss_1894.y = -100; + lbl_1_bss_1894.z = 0; + lbl_1_bss_1888.x = lbl_1_bss_1888.z = 0; + lbl_1_bss_1888.y = -30; + lbl_1_bss_860[arg0].x = lbl_1_bss_1894.x; + lbl_1_bss_860[arg0].y = 230; + lbl_1_bss_860[arg0].z = lbl_1_bss_1894.y; + fn_1_D1E0(lbl_1_bss_199C2[(arg0 * 2) + 4]); + if (arg0 == 0) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + lbl_1_bss_320[temp_r31] = temp_r31; + } + for (temp_r31 = 0; temp_r31 < 20; temp_r31++) { + temp_r29 = frandmod(4); + temp_r28 = frandmod(4); + temp_r27 = lbl_1_bss_320[temp_r29]; + lbl_1_bss_320[temp_r29] = lbl_1_bss_320[temp_r28]; + lbl_1_bss_320[temp_r28] = temp_r27; + } + Hu3DModelHookSet(lbl_1_bss_199C2[3], "d1_itemhook1", lbl_1_bss_199C2[lbl_1_bss_320[0] + 47]); + Hu3DModelHookSet(lbl_1_bss_199C2[3], "d1_itemhook2", lbl_1_bss_199C2[lbl_1_bss_320[1] + 47]); + Hu3DModelHookSet(lbl_1_bss_199C2[3], "d1_itemhook3", lbl_1_bss_199C2[lbl_1_bss_320[2] + 47]); + Hu3DModelHookSet(lbl_1_bss_199C2[3], "d1_itemhook4", lbl_1_bss_199C2[lbl_1_bss_320[3] + 47]); + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31 + 51], HU3D_ATTR_DISPOFF); + } + } + else if (arg0 == 1) { + for (temp_r31 = temp_r29 = 0; temp_r31 < 4; temp_r31++) { + if (temp_r31 != lbl_1_bss_2D6) { + lbl_1_bss_320[temp_r29] = temp_r31; + temp_r29++; + } + } + for (temp_r31 = 0; temp_r31 < 20; temp_r31++) { + temp_r29 = frandmod(3); + temp_r28 = frandmod(3); + temp_r27 = lbl_1_bss_320[temp_r29]; + lbl_1_bss_320[temp_r29] = lbl_1_bss_320[temp_r28]; + lbl_1_bss_320[temp_r28] = temp_r27; + } + Hu3DModelAttrReset(lbl_1_bss_199C2[lbl_1_bss_320[0] + 51], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_199C2[lbl_1_bss_320[1] + 51], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_199C2[lbl_1_bss_320[2] + 51], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_199C2[lbl_1_bss_2D6 + 51], HU3D_ATTR_DISPOFF); + Hu3DModelHookSet(lbl_1_bss_199C2[5], "d2_itemhook1", lbl_1_bss_199C2[lbl_1_bss_320[0] + 51]); + Hu3DModelHookSet(lbl_1_bss_199C2[5], "d2_itemhook2", lbl_1_bss_199C2[lbl_1_bss_320[1] + 51]); + Hu3DModelHookSet(lbl_1_bss_199C2[5], "d2_itemhook3", lbl_1_bss_199C2[lbl_1_bss_320[2] + 51]); + } + Hu3DModelAttrSet(lbl_1_bss_199C2[arg0 + 65], HU3D_MOTATTR_PAUSE); + Hu3DMotionTimeSet(lbl_1_bss_199C2[arg0 + 65], 0); + Hu3DModelAttrSet(lbl_1_bss_199C2[arg0 + 55], HU3D_MOTATTR_PAUSE); + Hu3DMotionTimeSet(lbl_1_bss_199C2[arg0 + 55], 0); + Hu3DMotionSpeedSet(lbl_1_bss_199C2[arg0 + 55], 2); + Hu3DMotionSet(lbl_1_bss_199C2[arg0 + 58], lbl_1_bss_1990E[61]); + Hu3DModelAttrSet(lbl_1_bss_199C2[arg0 + 58], HU3D_MOTATTR_LOOP); + for (temp_r31 = 0; temp_r31 < 5; temp_r31++) { + if (arg0 == lbl_1_data_2C8[temp_r31]) { + lbl_1_bss_18A0[temp_r31] = 1; + } + else { + lbl_1_bss_18A0[temp_r31] = 0; + } + lbl_1_bss_198F0[temp_r31][0] = 10; + lbl_1_bss_198F0[temp_r31][1] = 0; + } } void fn_1_ABD0(s16 arg0, s16 arg1); @@ -171,552 +163,550 @@ s16 fn_1_B1E8(Vec *arg0, Vec *arg1, s16 arg2); s16 fn_1_8DD0(s16 arg0) { - s16 temp_r30; - s16 temp_r29; - s32 temp_r28; - s16 temp_r27; - Mtx sp24; - Vec sp18; - Vec spC; - float sp8 = 0; - Hu3DMotionTimeSet(lbl_1_bss_199C2[9], lbl_1_data_258[arg0]); - Hu3DModelAttrSet(lbl_1_bss_199C2[9], 0x40000002); - Hu3DModelAttrReset(lbl_1_bss_199C2[arg0+65], 0x40000002); - Hu3DMotionSpeedSet(lbl_1_bss_199C2[arg0+65], 0.1*(-lbl_1_bss_1888.y-14.0f)+1.0); - temp_r28 = 0; - spC.z = spC.y = spC.x = 0; - fn_1_8180(1); - while(1) { - temp_r27 = fn_1_B1E8(&lbl_1_bss_1894, &lbl_1_bss_1888, arg0); - lbl_1_bss_860[arg0].x = lbl_1_bss_1894.x; - lbl_1_bss_860[arg0].y = 230; - lbl_1_bss_860[arg0].z = lbl_1_bss_1894.y; - if(VECMag(&lbl_1_bss_1888)) { - sp18.x = 0; - sp18.y = 0; - sp18.z = 1; - VECCrossProduct(&sp18, &lbl_1_bss_1888, &sp18); - sp18.z = sp18.y; - sp18.y = 0; - MTXRotAxisDeg(sp24, &sp18, 360.0*(VECMag(&lbl_1_bss_1888)/81.68140899333463)); - MTXConcat(lbl_1_bss_794[arg0], sp24, lbl_1_bss_794[arg0]); - } - lbl_1_bss_2E4.z = lbl_1_bss_860[arg0].z; - for(temp_r30=temp_r29=0; temp_r30<5; temp_r30++) { - if(arg0 == lbl_1_data_2C8[temp_r30]) { - fn_1_ABD0(temp_r30, arg0); - if(lbl_1_bss_198F0[temp_r30][1] & 0x2) { - temp_r29++; - } - } - } - if(temp_r29) { - if(Hu3DMotionIDGet(lbl_1_bss_199C2[arg0+58]) != lbl_1_bss_1990E[62]) { - Hu3DMotionSet(lbl_1_bss_199C2[arg0+58], lbl_1_bss_1990E[62]); - } - } else { - if(Hu3DMotionIDGet(lbl_1_bss_199C2[arg0+58]) != lbl_1_bss_1990E[61]) { - Hu3DMotionSet(lbl_1_bss_199C2[arg0+58], lbl_1_bss_1990E[61]); - } - } - if(temp_r27 != -1) { - break; - } - if(lbl_1_bss_1894.x < 85.0f && temp_r28 == 0) { - lbl_1_bss_D8F0[lbl_1_bss_1884].x = 100; - lbl_1_bss_D8F0[lbl_1_bss_1884].y = 100; - lbl_1_bss_D8F0[lbl_1_bss_1884].z = 0; - lbl_1_bss_18F0[lbl_1_bss_1884].x = 100; - lbl_1_bss_18F0[lbl_1_bss_1884].y = -500; - lbl_1_bss_18F0[lbl_1_bss_1884].z = 0; - lbl_1_bss_1884++; - Hu3DModelAttrReset(lbl_1_bss_199C2[arg0+55], 0x40000002); - Hu3DMotionTimeSet(lbl_1_bss_199C2[arg0+55], 0); - temp_r28 = 1; - } - HuPrcVSleep(); - } - for(temp_r30=0; temp_r30<5; temp_r30++) { - if(arg0 == lbl_1_data_2C8[temp_r30]) { - lbl_1_bss_198F0[temp_r30][1] = 4; - fn_1_ABD0(temp_r30, arg0); - } - } - HuAudFXPlay(1851); - return temp_r27; + s16 temp_r30; + s16 temp_r29; + s32 temp_r28; + s16 temp_r27; + Mtx sp24; + Vec sp18; + Vec spC; + float sp8 = 0; + Hu3DMotionTimeSet(lbl_1_bss_199C2[9], lbl_1_data_258[arg0]); + Hu3DModelAttrSet(lbl_1_bss_199C2[9], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrReset(lbl_1_bss_199C2[arg0 + 65], 0x40000002); + Hu3DMotionSpeedSet(lbl_1_bss_199C2[arg0 + 65], 0.1 * (-lbl_1_bss_1888.y - 14.0f) + 1.0); + temp_r28 = 0; + spC.z = spC.y = spC.x = 0; + fn_1_8180(1); + while (1) { + temp_r27 = fn_1_B1E8(&lbl_1_bss_1894, &lbl_1_bss_1888, arg0); + lbl_1_bss_860[arg0].x = lbl_1_bss_1894.x; + lbl_1_bss_860[arg0].y = 230; + lbl_1_bss_860[arg0].z = lbl_1_bss_1894.y; + if (VECMag(&lbl_1_bss_1888)) { + sp18.x = 0; + sp18.y = 0; + sp18.z = 1; + VECCrossProduct(&sp18, &lbl_1_bss_1888, &sp18); + sp18.z = sp18.y; + sp18.y = 0; + MTXRotAxisDeg(sp24, &sp18, 360.0 * (VECMag(&lbl_1_bss_1888) / 81.68140899333463)); + MTXConcat(lbl_1_bss_794[arg0], sp24, lbl_1_bss_794[arg0]); + } + lbl_1_bss_2E4.z = lbl_1_bss_860[arg0].z; + for (temp_r30 = temp_r29 = 0; temp_r30 < 5; temp_r30++) { + if (arg0 == lbl_1_data_2C8[temp_r30]) { + fn_1_ABD0(temp_r30, arg0); + if (lbl_1_bss_198F0[temp_r30][1] & 0x2) { + temp_r29++; + } + } + } + if (temp_r29) { + if (Hu3DMotionIDGet(lbl_1_bss_199C2[arg0 + 58]) != lbl_1_bss_1990E[62]) { + Hu3DMotionSet(lbl_1_bss_199C2[arg0 + 58], lbl_1_bss_1990E[62]); + } + } + else { + if (Hu3DMotionIDGet(lbl_1_bss_199C2[arg0 + 58]) != lbl_1_bss_1990E[61]) { + Hu3DMotionSet(lbl_1_bss_199C2[arg0 + 58], lbl_1_bss_1990E[61]); + } + } + if (temp_r27 != -1) { + break; + } + if (lbl_1_bss_1894.x < 85.0f && temp_r28 == 0) { + lbl_1_bss_D8F0[lbl_1_bss_1884].x = 100; + lbl_1_bss_D8F0[lbl_1_bss_1884].y = 100; + lbl_1_bss_D8F0[lbl_1_bss_1884].z = 0; + lbl_1_bss_18F0[lbl_1_bss_1884].x = 100; + lbl_1_bss_18F0[lbl_1_bss_1884].y = -500; + lbl_1_bss_18F0[lbl_1_bss_1884].z = 0; + lbl_1_bss_1884++; + Hu3DModelAttrReset(lbl_1_bss_199C2[arg0 + 55], 0x40000002); + Hu3DMotionTimeSet(lbl_1_bss_199C2[arg0 + 55], 0); + temp_r28 = 1; + } + HuPrcVSleep(); + } + for (temp_r30 = 0; temp_r30 < 5; temp_r30++) { + if (arg0 == lbl_1_data_2C8[temp_r30]) { + lbl_1_bss_198F0[temp_r30][1] = 4; + fn_1_ABD0(temp_r30, arg0); + } + } + HuAudFXPlay(1851); + return temp_r27; } void fn_1_9418(s16 arg0) { - float temp_f31; - float temp_f30; - float temp_f29; - float temp_f28; - - s16 temp_r31; - s16 temp_r29; - s16 temp_r28; - s16 temp_r27; - s16 temp_r26; - s16 temp_r25; - s16 temp_r24; - s16 temp_r23; - float sp8[2]; - temp_f31 = 0; - fn_1_8180(0); - Hu3DModelPosSet(lbl_1_bss_2D0, 124, 0, 70); - Hu3DModelRotSet(lbl_1_bss_2D0, 0, 180, 0); - CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[3], 0, 4, HU3D_MOTATTR_SHIFT_REV); - HuPrcSleep(12); - HuWinMesMaxSizeGet(1, sp8, MAKE_MESSID(0x1C, 0x0F)); - temp_r29 = HuWinCreate(-10000, 340, sp8[0], sp8[1], 1); - HuWinMesSpeedSet(temp_r29, 0); - HuWinBGTPLvlSet(temp_r29, 0); - HuWinMesSet(temp_r29, MAKE_MESSID(0x1C, 0x0F)); - CharModelMotionSet(lbl_1_bss_2DA, lbl_1_bss_2C0[2]); - Hu3DModelAttrSet(lbl_1_bss_2D0, 0x40000002); - temp_f29 = Hu3DMotionTimeGet(lbl_1_bss_2D0); - temp_f28 = Hu3DMotionMaxTimeGet(lbl_1_bss_2D0); - if(GWPlayerCfg[lbl_1_bss_2DC].iscom) { - temp_r27 = frandmod(100)+20; - } - while(1) { - temp_r26 = HuPadBtnDown[lbl_1_bss_2D8]; - temp_r23 = HuPadBtn[lbl_1_bss_2D8]; - temp_r25 = HuPadStkY[lbl_1_bss_2D8]; - if(GWPlayerCfg[lbl_1_bss_2DC].iscom) { - temp_r23 = 0; - if(temp_r27 != 0) { - temp_r27--; - temp_r25 = -72; - } else { - temp_r26 = PAD_BUTTON_A; - } - } - if((temp_r26 & PAD_BUTTON_A) && lbl_1_bss_788[arg0] > 0) { - break; - } - if(HuPadTrigR[lbl_1_bss_2D8] > 10) { - if(temp_f31 < 90.0f) { - temp_f31 += 5.0f; - } - fn_1_8180(arg0+2); - } else { - fn_1_8180(0); - if(temp_f31 > 0.0f) { - temp_f31 -= 5.0f; - } - } - for(temp_r31=0; temp_r31<3; temp_r31++) { - lbl_1_bss_34C[temp_r31].y = 80.0-(150.0*sind(temp_f31)); - } - temp_f30 = -(temp_r25 >> 3); - temp_f30 /= 20.0f; - if(temp_f30) { - if(temp_f30+lbl_1_bss_788[arg0] < 0.0f) { - temp_f30 = -lbl_1_bss_788[arg0]; - } else { - if(temp_f30+lbl_1_bss_788[arg0] > 50.0f) { - temp_f30 = 50.0f-lbl_1_bss_788[arg0]; - } - } - temp_f29 += temp_f30; - if(temp_f29 >= temp_f28) { - temp_f29 -= temp_f28; - } - } else { - temp_f30 = -0.3f; - if(temp_f30+lbl_1_bss_788[arg0] < 0.0f) { - temp_f30 = -lbl_1_bss_788[arg0]; - } - } - Hu3DMotionTimeSet(lbl_1_bss_2D0, temp_f29); - lbl_1_bss_788[arg0] += temp_f30; - Hu3DModelPosSet(lbl_1_bss_2D0, 124, 0, 70+lbl_1_bss_788[arg0]); - for(temp_r31=0; temp_r31<5; temp_r31++) { - if(arg0 == lbl_1_data_2C8[temp_r31]) { - fn_1_ABD0(temp_r31, arg0); - } - } - HuPrcVSleep(); - } - if(temp_f31 > 0) { - fn_1_8180(0); - for(temp_r28=0; temp_r28<10; temp_r28++) { - temp_f31 -= 10.0f; - if(temp_f31 < 0.0f) { - temp_f31 = 0.0f; - } - for(temp_r31=0; temp_r31<3; temp_r31++) { - lbl_1_bss_34C[temp_r31].y = 80.0-(150.0*sind(temp_f31)); - } - if(temp_f31 == 0.0f) { - break; - } - HuPrcVSleep(); - } - } - CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[3], 0, 8, HU3D_MOTATTR_NONE); - HuPrcSleep(4); - temp_r24 = lbl_1_bss_788[arg0]/4; - lbl_1_bss_1888.y = (-15-temp_r24)+(0.1*(float)frandmod(10)); - lbl_1_bss_788[arg0] = 0; - HuWinExCleanup(temp_r29); - HuAudFXPlay(1852); + float temp_f31; + float temp_f30; + float temp_f29; + float temp_f28; + + s16 temp_r31; + s16 temp_r29; + s16 temp_r28; + s16 temp_r27; + s16 temp_r26; + s16 temp_r25; + s16 temp_r24; + s16 temp_r23; + float sp8[2]; + temp_f31 = 0; + fn_1_8180(0); + Hu3DModelPosSet(lbl_1_bss_2D0, 124, 0, 70); + Hu3DModelRotSet(lbl_1_bss_2D0, 0, 180, 0); + CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[3], 0, 4, HU3D_MOTATTR_SHIFT_REV); + HuPrcSleep(12); + HuWinMesMaxSizeGet(1, sp8, MAKE_MESSID(0x1C, 0x0F)); + temp_r29 = HuWinCreate(-10000, 340, sp8[0], sp8[1], 1); + HuWinMesSpeedSet(temp_r29, 0); + HuWinBGTPLvlSet(temp_r29, 0); + HuWinMesSet(temp_r29, MAKE_MESSID(0x1C, 0x0F)); + CharModelMotionSet(lbl_1_bss_2DA, lbl_1_bss_2C0[2]); + Hu3DModelAttrSet(lbl_1_bss_2D0, HU3D_MOTATTR_PAUSE); + temp_f29 = Hu3DMotionTimeGet(lbl_1_bss_2D0); + temp_f28 = Hu3DMotionMaxTimeGet(lbl_1_bss_2D0); + if (GWPlayerCfg[lbl_1_bss_2DC].iscom) { + temp_r27 = frandmod(100) + 20; + } + while (1) { + temp_r26 = HuPadBtnDown[lbl_1_bss_2D8]; + temp_r23 = HuPadBtn[lbl_1_bss_2D8]; + temp_r25 = HuPadStkY[lbl_1_bss_2D8]; + if (GWPlayerCfg[lbl_1_bss_2DC].iscom) { + temp_r23 = 0; + if (temp_r27 != 0) { + temp_r27--; + temp_r25 = -72; + } + else { + temp_r26 = PAD_BUTTON_A; + } + } + if ((temp_r26 & PAD_BUTTON_A) && lbl_1_bss_788[arg0] > 0) { + break; + } + if (HuPadTrigR[lbl_1_bss_2D8] > 10) { + if (temp_f31 < 90.0f) { + temp_f31 += 5.0f; + } + fn_1_8180(arg0 + 2); + } + else { + fn_1_8180(0); + if (temp_f31 > 0.0f) { + temp_f31 -= 5.0f; + } + } + for (temp_r31 = 0; temp_r31 < 3; temp_r31++) { + lbl_1_bss_34C[temp_r31].y = 80.0 - (150.0 * sind(temp_f31)); + } + temp_f30 = -(temp_r25 >> 3); + temp_f30 /= 20.0f; + if (temp_f30) { + if (temp_f30 + lbl_1_bss_788[arg0] < 0.0f) { + temp_f30 = -lbl_1_bss_788[arg0]; + } + else { + if (temp_f30 + lbl_1_bss_788[arg0] > 50.0f) { + temp_f30 = 50.0f - lbl_1_bss_788[arg0]; + } + } + temp_f29 += temp_f30; + if (temp_f29 >= temp_f28) { + temp_f29 -= temp_f28; + } + } + else { + temp_f30 = -0.3f; + if (temp_f30 + lbl_1_bss_788[arg0] < 0.0f) { + temp_f30 = -lbl_1_bss_788[arg0]; + } + } + Hu3DMotionTimeSet(lbl_1_bss_2D0, temp_f29); + lbl_1_bss_788[arg0] += temp_f30; + Hu3DModelPosSet(lbl_1_bss_2D0, 124, 0, 70 + lbl_1_bss_788[arg0]); + for (temp_r31 = 0; temp_r31 < 5; temp_r31++) { + if (arg0 == lbl_1_data_2C8[temp_r31]) { + fn_1_ABD0(temp_r31, arg0); + } + } + HuPrcVSleep(); + } + if (temp_f31 > 0) { + fn_1_8180(0); + for (temp_r28 = 0; temp_r28 < 10; temp_r28++) { + temp_f31 -= 10.0f; + if (temp_f31 < 0.0f) { + temp_f31 = 0.0f; + } + for (temp_r31 = 0; temp_r31 < 3; temp_r31++) { + lbl_1_bss_34C[temp_r31].y = 80.0 - (150.0 * sind(temp_f31)); + } + if (temp_f31 == 0.0f) { + break; + } + HuPrcVSleep(); + } + } + CharModelMotionShiftSet(lbl_1_bss_2DA, lbl_1_bss_2C0[3], 0, 8, HU3D_MOTATTR_NONE); + HuPrcSleep(4); + temp_r24 = lbl_1_bss_788[arg0] / 4; + lbl_1_bss_1888.y = (-15 - temp_r24) + (0.1 * (float)frandmod(10)); + lbl_1_bss_788[arg0] = 0; + HuWinExCleanup(temp_r29); + HuAudFXPlay(1852); } void fn_1_9CAC(s16 arg0, s16 arg1) { - Mtx sp38; - Mtx sp8; - ModelData *temp_r29; - - Hu3DMotionSet(lbl_1_bss_199C2[arg0+58], lbl_1_bss_1990E[63]); - Hu3DModelAttrSet(lbl_1_bss_199C2[arg0+58], 0x40000001); - Hu3DModelAttrReset(lbl_1_bss_199C2[64], 0x1); - Hu3DModelAttrSet(lbl_1_bss_199C2[64], 0x40000001); - Hu3DMotionTimeSet(lbl_1_bss_199C2[64], 0); - MTXTrans(sp8, 0, -150, 0); - if(arg0 == 0) { - switch(arg1) { - case 0: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[3], "d1_itemhook1", sp38); - break; - - case 1: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[3], "d1_itemhook2", sp38); - break; - - case 2: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[3], "d1_itemhook3", sp38); - break; - - case 3: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[3], "d1_itemhook4", sp38); - break; - } - } else if(arg0 == 1) { - switch(arg1) { - case 0: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[5], "d2_itemhook1", sp38); - break; - - case 1: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[5], "d2_itemhook2", sp38); - break; - - case 2: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[5], "d2_itemhook3", sp38); - break; - } - } else { - switch(arg1) { - case 0: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook1", sp38); - break; - - case 1: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook4", sp38); - break; - - case 2: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook2", sp38); - break; - - case 3: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook7", sp38); - break; - - case 4: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook6", sp38); - break; - - case 5: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook3", sp38); - break; - - case 6: - Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook5", sp38); - break; - } - mtxScaleCat(sp8, 0.8, 1, 0.8); - } - temp_r29 = &Hu3DData[lbl_1_bss_199C2[64]]; - MTXConcat(sp38, sp8, sp38); - MTXCopy(sp38, temp_r29->unk_F0); + Mtx sp38; + Mtx sp8; + ModelData *temp_r29; + + Hu3DMotionSet(lbl_1_bss_199C2[arg0 + 58], lbl_1_bss_1990E[63]); + Hu3DModelAttrSet(lbl_1_bss_199C2[arg0 + 58], HU3D_MOTATTR_LOOP); + Hu3DModelAttrReset(lbl_1_bss_199C2[64], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_199C2[64], HU3D_MOTATTR_LOOP); + Hu3DMotionTimeSet(lbl_1_bss_199C2[64], 0); + MTXTrans(sp8, 0, -150, 0); + if (arg0 == 0) { + switch (arg1) { + case 0: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[3], "d1_itemhook1", sp38); + break; + + case 1: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[3], "d1_itemhook2", sp38); + break; + + case 2: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[3], "d1_itemhook3", sp38); + break; + + case 3: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[3], "d1_itemhook4", sp38); + break; + } + } + else if (arg0 == 1) { + switch (arg1) { + case 0: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[5], "d2_itemhook1", sp38); + break; + + case 1: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[5], "d2_itemhook2", sp38); + break; + + case 2: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[5], "d2_itemhook3", sp38); + break; + } + } + else { + switch (arg1) { + case 0: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook1", sp38); + break; + + case 1: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook4", sp38); + break; + + case 2: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook2", sp38); + break; + + case 3: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook7", sp38); + break; + + case 4: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook6", sp38); + break; + + case 5: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook3", sp38); + break; + + case 6: + Hu3DModelObjMtxGet(lbl_1_bss_199C2[7], "d3_itemhook5", sp38); + break; + } + mtxScaleCat(sp8, 0.8, 1, 0.8); + } + temp_r29 = &Hu3DData[lbl_1_bss_199C2[64]]; + MTXConcat(sp38, sp8, sp38); + MTXCopy(sp38, temp_r29->unk_F0); } void fn_1_A060(void) { - s16 temp_r31; - s16 temp_r30; - s16 temp_r29; - s16 temp_r28; - s16 temp_r27; - Vec sp20; - Vec sp14; - float sp8[3] = { 0, 40, 60 }; - for(temp_r30=0; temp_r30<3; temp_r30++) { - lbl_1_bss_34C[temp_r30].y = -100; - lbl_1_bss_34C[temp_r30].z = 200; - lbl_1_bss_328[temp_r30].x = lbl_1_bss_328[temp_r30].y = lbl_1_bss_328[temp_r30].z = 0.3f; - Hu3DModelAttrReset(lbl_1_bss_199C2[temp_r30+71], 1); - Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r30+71], 0x40000001); - } - lbl_1_bss_34C[0].x = 188; - lbl_1_bss_34C[1].x = 388; - lbl_1_bss_34C[2].x = 288; - temp_r29 = temp_r27 = 0; - while(1) { - for(temp_r30=0; temp_r30<3; temp_r30++) { - sp14 = lbl_1_bss_34C[temp_r30]; - sp14.y += 5.0*sind(sp8[temp_r30]); - Hu3D2Dto3D(&sp14, 1, &sp20); - Hu3DModelPosSet(lbl_1_bss_199C2[temp_r30+71], sp20.x, sp20.y, sp20.z); - Hu3DModelRotSet(lbl_1_bss_199C2[temp_r30+71], lbl_1_bss_2A8[0].x , lbl_1_bss_2A8[0].y, lbl_1_bss_2A8[0].z); - Hu3DModelScaleSet(lbl_1_bss_199C2[temp_r30+71], lbl_1_bss_328[temp_r30].x/2.0, lbl_1_bss_328[temp_r30].y/2.0, lbl_1_bss_328[temp_r30].z/2.0); - switch(temp_r30) { - case 0: - for(temp_r31=0; temp_r31<4; temp_r31++) { - Hu3DModelScaleSet(lbl_1_bss_199C2[temp_r31+74], lbl_1_bss_328[temp_r30].x*1.2, lbl_1_bss_328[temp_r30].y*1.2, lbl_1_bss_328[temp_r30].z*1.2); - } - if(lbl_1_bss_2D6 != -2) { - if(lbl_1_bss_2D6 == -1) { - if((temp_r27 & 0x7) == 0 && (++temp_r29) >= 4) { - temp_r29 = 0; - } - temp_r27++; - temp_r28 = lbl_1_bss_199C2[temp_r29+74]; - for(temp_r31=0; temp_r31<4; temp_r31++) { - Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31+74], 1); - } - Hu3DModelAttrReset(temp_r28, 1); - } else { - temp_r28 = lbl_1_bss_199C2[lbl_1_bss_2D6+74]; - for(temp_r31=0; temp_r31<4; temp_r31++) { - Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31+74], 1); - } - Hu3DModelAttrReset(temp_r28, 1); - } - Hu3DModelPosSet(temp_r28, sp20.x, sp20.y, sp20.z); - Hu3DModelRotSet(temp_r28, 90.0f+lbl_1_bss_2A8[0].x , lbl_1_bss_2A8[0].y, lbl_1_bss_2A8[0].z); - } - break; - - case 1: - for(temp_r31=0; temp_r31<4; temp_r31++) { - if(temp_r31 == lbl_1_bss_2D6) { - continue; - } - Hu3DModelScaleSet(lbl_1_bss_199C2[temp_r31+74], lbl_1_bss_328[temp_r30].x*1.2, lbl_1_bss_328[temp_r30].y*1.2, lbl_1_bss_328[temp_r30].z*1.2); - } - if(lbl_1_bss_2D4 != -2) { - if(lbl_1_bss_2D4 == -1) { - if((temp_r27 & 0x7) == 0) { - temp_r29++; - if(temp_r29 == lbl_1_bss_2D6) { - temp_r29++; - } - if(temp_r29 >= 4) { - temp_r29 = 0; - if(lbl_1_bss_2D6 == 0) { - temp_r29++; - } - } - - } else { - if(temp_r29 == lbl_1_bss_2D6) { - temp_r29++; - if(temp_r29 >= 4) { - temp_r29 = 0; - } - } - } - temp_r27++; - temp_r28 = lbl_1_bss_199C2[temp_r29+74]; - for(temp_r31=0; temp_r31<4; temp_r31++) { - if(temp_r31 != lbl_1_bss_2D6) { - Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31+74], 1); - } - - } - Hu3DModelAttrReset(temp_r28, 1); - } else { - temp_r28 = lbl_1_bss_199C2[lbl_1_bss_2D4+74]; - for(temp_r31=0; temp_r31<4; temp_r31++) { - if(temp_r31 != lbl_1_bss_2D6) { - Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31+74], 1); - } - - } - Hu3DModelAttrReset(temp_r28, 1); - } - Hu3DModelPosSet(temp_r28, sp20.x, sp20.y, sp20.z); - Hu3DModelRotSet(temp_r28, 90.0f+lbl_1_bss_2A8[0].x , lbl_1_bss_2A8[0].y, lbl_1_bss_2A8[0].z); - } - break; - - case 2: - for(temp_r31=0; temp_r31<7; temp_r31++) { - Hu3DModelScaleSet(lbl_1_bss_199C2[temp_r31+78], lbl_1_bss_328[temp_r30].x*1.2, lbl_1_bss_328[temp_r30].y*1.2, lbl_1_bss_328[temp_r30].z*1.2); - } - if(lbl_1_bss_2D2 != -2) { - if(lbl_1_bss_2D2 == -1) { - if((temp_r27 & 0x7) == 0 && (++temp_r29) >= 7) { - temp_r29 = 0; - } - temp_r27++; - temp_r28 = lbl_1_bss_199C2[temp_r29+78]; - for(temp_r31=0; temp_r31<7; temp_r31++) { - Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31+78], 1); - } - Hu3DModelAttrReset(temp_r28, 1); - } else { - temp_r28 = lbl_1_bss_199C2[lbl_1_bss_2D2+78]; - for(temp_r31=0; temp_r31<7; temp_r31++) { - Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31+78], 1); - } - Hu3DModelAttrReset(temp_r28, 1); - } - Hu3DModelPosSet(temp_r28, sp20.x, sp20.y, sp20.z); - Hu3DModelRotSet(temp_r28, 90.0f+lbl_1_bss_2A8[0].x , lbl_1_bss_2A8[0].y, lbl_1_bss_2A8[0].z); - } - break; - } - sp8[temp_r30] += 4.0*(1.0+(temp_r30*0.05)); - if(sp8[temp_r30] > 360.0f) { - sp8[temp_r30] -= 360.0f; - } - } - HuPrcVSleep(); - } - + s16 temp_r31; + s16 temp_r30; + s16 temp_r29; + s16 temp_r28; + s16 temp_r27; + Vec sp20; + Vec sp14; + float sp8[3] = { 0, 40, 60 }; + for (temp_r30 = 0; temp_r30 < 3; temp_r30++) { + lbl_1_bss_34C[temp_r30].y = -100; + lbl_1_bss_34C[temp_r30].z = 200; + lbl_1_bss_328[temp_r30].x = lbl_1_bss_328[temp_r30].y = lbl_1_bss_328[temp_r30].z = 0.3f; + Hu3DModelAttrReset(lbl_1_bss_199C2[temp_r30 + 71], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r30 + 71], HU3D_MOTATTR_LOOP); + } + lbl_1_bss_34C[0].x = 188; + lbl_1_bss_34C[1].x = 388; + lbl_1_bss_34C[2].x = 288; + temp_r29 = temp_r27 = 0; + while (1) { + for (temp_r30 = 0; temp_r30 < 3; temp_r30++) { + sp14 = lbl_1_bss_34C[temp_r30]; + sp14.y += 5.0 * sind(sp8[temp_r30]); + Hu3D2Dto3D(&sp14, 1, &sp20); + Hu3DModelPosSet(lbl_1_bss_199C2[temp_r30 + 71], sp20.x, sp20.y, sp20.z); + Hu3DModelRotSet(lbl_1_bss_199C2[temp_r30 + 71], lbl_1_bss_2A8[0].x, lbl_1_bss_2A8[0].y, lbl_1_bss_2A8[0].z); + Hu3DModelScaleSet( + lbl_1_bss_199C2[temp_r30 + 71], lbl_1_bss_328[temp_r30].x / 2.0, lbl_1_bss_328[temp_r30].y / 2.0, lbl_1_bss_328[temp_r30].z / 2.0); + switch (temp_r30) { + case 0: + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + Hu3DModelScaleSet(lbl_1_bss_199C2[temp_r31 + 74], lbl_1_bss_328[temp_r30].x * 1.2, lbl_1_bss_328[temp_r30].y * 1.2, + lbl_1_bss_328[temp_r30].z * 1.2); + } + if (lbl_1_bss_2D6 != -2) { + if (lbl_1_bss_2D6 == -1) { + if ((temp_r27 & 0x7) == 0 && (++temp_r29) >= 4) { + temp_r29 = 0; + } + temp_r27++; + temp_r28 = lbl_1_bss_199C2[temp_r29 + 74]; + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31 + 74], HU3D_ATTR_DISPOFF); + } + Hu3DModelAttrReset(temp_r28, HU3D_ATTR_DISPOFF); + } + else { + temp_r28 = lbl_1_bss_199C2[lbl_1_bss_2D6 + 74]; + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31 + 74], HU3D_ATTR_DISPOFF); + } + Hu3DModelAttrReset(temp_r28, HU3D_ATTR_DISPOFF); + } + Hu3DModelPosSet(temp_r28, sp20.x, sp20.y, sp20.z); + Hu3DModelRotSet(temp_r28, 90.0f + lbl_1_bss_2A8[0].x, lbl_1_bss_2A8[0].y, lbl_1_bss_2A8[0].z); + } + break; + + case 1: + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + if (temp_r31 == lbl_1_bss_2D6) { + continue; + } + Hu3DModelScaleSet(lbl_1_bss_199C2[temp_r31 + 74], lbl_1_bss_328[temp_r30].x * 1.2, lbl_1_bss_328[temp_r30].y * 1.2, + lbl_1_bss_328[temp_r30].z * 1.2); + } + if (lbl_1_bss_2D4 != -2) { + if (lbl_1_bss_2D4 == -1) { + if ((temp_r27 & 0x7) == 0) { + temp_r29++; + if (temp_r29 == lbl_1_bss_2D6) { + temp_r29++; + } + if (temp_r29 >= 4) { + temp_r29 = 0; + if (lbl_1_bss_2D6 == 0) { + temp_r29++; + } + } + } + else { + if (temp_r29 == lbl_1_bss_2D6) { + temp_r29++; + if (temp_r29 >= 4) { + temp_r29 = 0; + } + } + } + temp_r27++; + temp_r28 = lbl_1_bss_199C2[temp_r29 + 74]; + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + if (temp_r31 != lbl_1_bss_2D6) { + Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31 + 74], HU3D_ATTR_DISPOFF); + } + } + Hu3DModelAttrReset(temp_r28, HU3D_ATTR_DISPOFF); + } + else { + temp_r28 = lbl_1_bss_199C2[lbl_1_bss_2D4 + 74]; + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + if (temp_r31 != lbl_1_bss_2D6) { + Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31 + 74], HU3D_ATTR_DISPOFF); + } + } + Hu3DModelAttrReset(temp_r28, HU3D_ATTR_DISPOFF); + } + Hu3DModelPosSet(temp_r28, sp20.x, sp20.y, sp20.z); + Hu3DModelRotSet(temp_r28, 90.0f + lbl_1_bss_2A8[0].x, lbl_1_bss_2A8[0].y, lbl_1_bss_2A8[0].z); + } + break; + + case 2: + for (temp_r31 = 0; temp_r31 < 7; temp_r31++) { + Hu3DModelScaleSet(lbl_1_bss_199C2[temp_r31 + 78], lbl_1_bss_328[temp_r30].x * 1.2, lbl_1_bss_328[temp_r30].y * 1.2, + lbl_1_bss_328[temp_r30].z * 1.2); + } + if (lbl_1_bss_2D2 != -2) { + if (lbl_1_bss_2D2 == -1) { + if ((temp_r27 & 0x7) == 0 && (++temp_r29) >= 7) { + temp_r29 = 0; + } + temp_r27++; + temp_r28 = lbl_1_bss_199C2[temp_r29 + 78]; + for (temp_r31 = 0; temp_r31 < 7; temp_r31++) { + Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31 + 78], HU3D_ATTR_DISPOFF); + } + Hu3DModelAttrReset(temp_r28, HU3D_ATTR_DISPOFF); + } + else { + temp_r28 = lbl_1_bss_199C2[lbl_1_bss_2D2 + 78]; + for (temp_r31 = 0; temp_r31 < 7; temp_r31++) { + Hu3DModelAttrSet(lbl_1_bss_199C2[temp_r31 + 78], HU3D_ATTR_DISPOFF); + } + Hu3DModelAttrReset(temp_r28, HU3D_ATTR_DISPOFF); + } + Hu3DModelPosSet(temp_r28, sp20.x, sp20.y, sp20.z); + Hu3DModelRotSet(temp_r28, 90.0f + lbl_1_bss_2A8[0].x, lbl_1_bss_2A8[0].y, lbl_1_bss_2A8[0].z); + } + break; + } + sp8[temp_r30] += 4.0 * (1.0 + (temp_r30 * 0.05)); + if (sp8[temp_r30] > 360.0f) { + sp8[temp_r30] -= 360.0f; + } + } + HuPrcVSleep(); + } } void fn_1_ABD0(s16 arg0, s16 arg1) { - float temp_f31; - float temp_f30; - float temp_f29; - s16 *temp_r31; - s16 temp_r29; - s16 temp_r28; - Vec sp14; - Vec sp8; - temp_r31 = &lbl_1_bss_198F0[arg0][0]; - temp_r29 = lbl_1_bss_199C2[arg0+38]; - if(temp_r31[1] & 0x2) { - if(temp_r31[0] == 85) { - if(Hu3DMotionIDGet(temp_r29) != lbl_1_bss_1990E[45] && Hu3DMotionShiftIDGet(temp_r29) != lbl_1_bss_1990E[45]) { - Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[45], 0, 8, HU3D_MOTATTR_NONE); - } - } else { - if(Hu3DMotionIDGet(temp_r29) != lbl_1_bss_1990E[46] && Hu3DMotionShiftIDGet(temp_r29) != lbl_1_bss_1990E[46]) { - Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[46], 0, 8, HU3D_MOTATTR_LOOP); - } - } - temp_r31[0]--; - if(temp_r31[0] <= 0) { - temp_r31[1] &= ~0x2; - temp_r31[1] |= 0x4; - temp_r31[0] = 20; - } - } else { - if(temp_r31[1] & 0x4) { - if(Hu3DMotionIDGet(temp_r29) != lbl_1_bss_1990E[43] && Hu3DMotionShiftIDGet(temp_r29) != lbl_1_bss_1990E[43]) { - Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[43], 0, 16, HU3D_MOTATTR_LOOP); - } - temp_r31[0]--; - if(temp_r31[0] <= 0) { - temp_r31[1] &= ~0x4; - temp_r31[0] = frandmod(30)+30; - } - } else { - temp_r31[0]--; - if(temp_r31[0] <= 0) { - temp_r31[1] |= 4; - temp_r31[0] = 60; - } else { - if(Hu3DMotionIDGet(temp_r29) != lbl_1_bss_1990E[44] ) { - Hu3DMotionSet(temp_r29, lbl_1_bss_1990E[44]); - } - if(temp_r31[1] & 0x1) { - temp_f31 = -1; - temp_f30 = -90; - } else { - temp_f31 = 1; - temp_f30 = 90; - } - sp8 = lbl_1_bss_18B4[arg0]; - sp8.x += temp_f31; - for(temp_r28=0; temp_r28<5; temp_r28++) { - if(temp_r28 == arg0 || lbl_1_bss_18A0[temp_r28] == 0) { - continue; - } - VECSubtract(&sp8, &lbl_1_bss_18B4[temp_r28], &sp14); - if(VECMag(&sp14) < 55.0f) { - break; - } - } - if(temp_r28 == 5) { - lbl_1_bss_18B4[arg0].x += temp_f31; - if(lbl_1_bss_18B4[arg0].x < lbl_1_data_2A0[(arg0*2)]) { - lbl_1_bss_18B4[arg0].x = lbl_1_data_2A0[(arg0*2)]; - temp_r31[1] ^= 0x1; - temp_r31[1] |= 0x4; - temp_r31[0] = 60; - } - if(lbl_1_bss_18B4[arg0].x > lbl_1_data_2A0[(arg0*2)+1]) { - lbl_1_bss_18B4[arg0].x = lbl_1_data_2A0[(arg0*2)+1]; - temp_r31[1] ^= 0x1; - temp_r31[1] |= 0x4; - temp_r31[0] = 60; - } - } else { - temp_r31[1] ^= 0x1; - temp_r31[1] |= 0x4; - temp_r31[0] = 60; - } - } - } - } - lbl_1_bss_824[arg0].x = lbl_1_bss_18B4[arg0].x; - lbl_1_bss_824[arg0].y = 215; - lbl_1_bss_824[arg0].z = lbl_1_bss_18B4[arg0].y; + float temp_f31; + float temp_f30; + float temp_f29; + s16 *temp_r31; + s16 temp_r29; + s16 temp_r28; + Vec sp14; + Vec sp8; + temp_r31 = &lbl_1_bss_198F0[arg0][0]; + temp_r29 = lbl_1_bss_199C2[arg0 + 38]; + if (temp_r31[1] & 0x2) { + if (temp_r31[0] == 85) { + if (Hu3DMotionIDGet(temp_r29) != lbl_1_bss_1990E[45] && Hu3DMotionShiftIDGet(temp_r29) != lbl_1_bss_1990E[45]) { + Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[45], 0, 8, HU3D_MOTATTR_NONE); + } + } + else { + if (Hu3DMotionIDGet(temp_r29) != lbl_1_bss_1990E[46] && Hu3DMotionShiftIDGet(temp_r29) != lbl_1_bss_1990E[46]) { + Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[46], 0, 8, HU3D_MOTATTR_LOOP); + } + } + temp_r31[0]--; + if (temp_r31[0] <= 0) { + temp_r31[1] &= ~0x2; + temp_r31[1] |= 0x4; + temp_r31[0] = 20; + } + } + else { + if (temp_r31[1] & 0x4) { + if (Hu3DMotionIDGet(temp_r29) != lbl_1_bss_1990E[43] && Hu3DMotionShiftIDGet(temp_r29) != lbl_1_bss_1990E[43]) { + Hu3DMotionShiftSet(temp_r29, lbl_1_bss_1990E[43], 0, 16, HU3D_MOTATTR_LOOP); + } + temp_r31[0]--; + if (temp_r31[0] <= 0) { + temp_r31[1] &= ~0x4; + temp_r31[0] = frandmod(30) + 30; + } + } + else { + temp_r31[0]--; + if (temp_r31[0] <= 0) { + temp_r31[1] |= 4; + temp_r31[0] = 60; + } + else { + if (Hu3DMotionIDGet(temp_r29) != lbl_1_bss_1990E[44]) { + Hu3DMotionSet(temp_r29, lbl_1_bss_1990E[44]); + } + if (temp_r31[1] & 0x1) { + temp_f31 = -1; + temp_f30 = -90; + } + else { + temp_f31 = 1; + temp_f30 = 90; + } + sp8 = lbl_1_bss_18B4[arg0]; + sp8.x += temp_f31; + for (temp_r28 = 0; temp_r28 < 5; temp_r28++) { + if (temp_r28 == arg0 || lbl_1_bss_18A0[temp_r28] == 0) { + continue; + } + VECSubtract(&sp8, &lbl_1_bss_18B4[temp_r28], &sp14); + if (VECMag(&sp14) < 55.0f) { + break; + } + } + if (temp_r28 == 5) { + lbl_1_bss_18B4[arg0].x += temp_f31; + if (lbl_1_bss_18B4[arg0].x < lbl_1_data_2A0[(arg0 * 2)]) { + lbl_1_bss_18B4[arg0].x = lbl_1_data_2A0[(arg0 * 2)]; + temp_r31[1] ^= 0x1; + temp_r31[1] |= 0x4; + temp_r31[0] = 60; + } + if (lbl_1_bss_18B4[arg0].x > lbl_1_data_2A0[(arg0 * 2) + 1]) { + lbl_1_bss_18B4[arg0].x = lbl_1_data_2A0[(arg0 * 2) + 1]; + temp_r31[1] ^= 0x1; + temp_r31[1] |= 0x4; + temp_r31[0] = 60; + } + } + else { + temp_r31[1] ^= 0x1; + temp_r31[1] |= 0x4; + temp_r31[0] = 60; + } + } + } + } + lbl_1_bss_824[arg0].x = lbl_1_bss_18B4[arg0].x; + lbl_1_bss_824[arg0].y = 215; + lbl_1_bss_824[arg0].z = lbl_1_bss_18B4[arg0].y; } -s16 lbl_1_data_3A4[] = { - 4, 3, 7 -}; +s16 lbl_1_data_3A4[] = { 4, 3, 7 }; -Vec lbl_1_data_3AC[] = { - { -118.75, -70, 0}, - { -56.25, -70, 0 }, - { 6.25, -70, 0 }, - { 68.75, -70, 0} -}; +Vec lbl_1_data_3AC[] = { { -118.75, -70, 0 }, { -56.25, -70, 0 }, { 6.25, -70, 0 }, { 68.75, -70, 0 } }; Vec lbl_1_data_3DC[] = { - { -108.35, -70, 0}, - { -25.05, -70, 0 }, - { 58.25, -70, 0 }, + { -108.35, -70, 0 }, + { -25.05, -70, 0 }, + { 58.25, -70, 0 }, }; -Vec lbl_1_data_400[] = { - { -125, -70, 0 }, - { -75, -70, 0 }, - { -25, -70, 0 }, - { 25, -70, 0 }, - { 75, -70, 0 }, - { -85, -190, 0 }, - { 35, -190, 0 } -}; +Vec lbl_1_data_400[] = { { -125, -70, 0 }, { -75, -70, 0 }, { -25, -70, 0 }, { 25, -70, 0 }, { 75, -70, 0 }, { -85, -190, 0 }, { 35, -190, 0 } }; -Vec *lbl_1_data_454[] = { - lbl_1_data_3AC, - lbl_1_data_3DC, - lbl_1_data_400 -}; +Vec *lbl_1_data_454[] = { lbl_1_data_3AC, lbl_1_data_3DC, lbl_1_data_400 }; Vec *fn_1_CA30(Vec *arg0, Vec *arg1, Vec *arg2); @@ -724,478 +714,488 @@ float fn_1_CB70(Vec *arg0, Vec *arg1, Vec *arg2); s16 fn_1_B1E8(Vec *arg0, Vec *arg1, s16 arg2) { - float temp_f31; - float temp_f30; - float temp_f28; - float temp_f27; - - s16 temp_r30; - Vec *temp_r28; - s32 temp_r27; - Vec *temp_r25; - u8 temp_r24; - s16 temp_r23; - Vec sp4C; - - Vec sp40; - Vec sp34; - Vec sp28; - Vec sp1C; - Vec sp10; - s32 spC; - - temp_r23 = -1; - spC = 1; - temp_f28 = VECMag(arg1); - sp1C = *arg1; - temp_r27 = 0; - sp10 = *arg0; - temp_r24 = lbl_1_bss_310-120; - for(temp_r30=temp_f30=0; temp_r30<120; temp_r30++, temp_r24++) { - temp_f30 += lbl_1_bss_370[temp_r24]; - } - if(temp_f30 < 120.0f*sqrtf(6.0f)) { - lbl_1_bss_312 = 10; - } - while(temp_f28 > 0.0f) { - if(temp_f28 > 3.0f) { - temp_f28 -= 3.0f; - temp_f31 = 3.0f; - } else { - temp_f31 = temp_f28; - temp_f28 = 0; - } - VECNormalize(&sp1C, &sp1C); - VECScale(&sp1C, &sp1C, temp_f31); - VECAdd(arg0, &sp1C, &sp4C); - temp_f31 = VECMag(&sp1C); - if(lbl_1_bss_312 == 0) { - for(temp_r30=0; temp_r30<5; temp_r30++) { - if(lbl_1_bss_18A0[temp_r30] == 0) { - continue; - } - VECSubtract(&sp4C, &lbl_1_bss_18B4[temp_r30], &sp34); - temp_f30 = VECMag(&sp34); - if(temp_f30 < 33.0) { - VECNormalize(&sp34, &sp34); - VECScale(&sp34, &sp28, 33.0f); - VECAdd(&lbl_1_bss_18B4[temp_r30], &sp28, &sp4C); - VECScale(&sp1C, &sp28, -1.0f); - temp_f27 = (sp28.x*sp34.x)+(sp28.y*sp34.y); - sp34.x = (2.0*sp34.x*temp_f27)-sp28.x; - sp34.y = (2.0*sp34.y*temp_f27)-sp28.y; - sp34.z = 0; - VECNormalize(&sp34, &sp34); - VECScale(&sp34, &sp1C, temp_f31); - VECAdd(&sp4C, &sp1C, &sp34); - temp_f30 = VECSquareDistance(&sp34, &lbl_1_bss_18B4[temp_r30]); - if(temp_f30 < 1089.0) { - VECScale(&sp1C, &sp1C, -1.0f); - } - lbl_1_bss_198F0[temp_r30][1] = 2; - lbl_1_bss_198F0[temp_r30][0] = 100; - temp_r27 = 1; - } - } - } else { - lbl_1_bss_312--; - } - for(temp_r30=0; temp_r30= 169.0f && VECSquareDistance(&lbl_1_bss_18F0[temp_r30], &sp4C) >= 169.0f) { - VECSubtract(temp_r25, &lbl_1_bss_D8F0[temp_r30], &sp34); - if(VECMag2Point(&sp34) > VECMag2Point(&sp40)) { - continue; - } - VECSubtract(temp_r25, &lbl_1_bss_18F0[temp_r30], &sp34); - if(VECMag2Point(&sp34) > VECMag2Point(&sp40)) { - continue; - } - } - VECSubtract(&sp4C, temp_r25, &sp34); - VECNormalize(&sp34, &sp34); - VECScale(&sp34, &sp34, 13.0f); - VECAdd(temp_r25, &sp34, &sp4C); - VECSubtract(arg0, &sp4C, &sp34); - *arg0 = sp4C; - temp_f31 -= VECMag(&sp34); - if(temp_f31 < 0.0f) { - temp_f28 -= temp_f31; - temp_f31 = ABS(temp_f31); - } - sp34 = sp40; - sp34.z = 1; - VECCrossProduct(&sp34, &sp40, &sp34); - VECNormalize(&sp34, &sp34); - VECScale(&sp1C, &sp28, -1.0f); - temp_f27 = (sp28.x*sp34.x)+(sp28.y*sp34.y); - sp34.x = (1.5*sp34.x*temp_f27)-sp28.x; - sp34.y = (1.5*sp34.y*temp_f27)-sp28.y; - sp34.z = 0; - VECNormalize(&sp34, &sp34); - VECScale(&sp34, &sp1C, temp_f31); - lbl_1_bss_884[temp_r30] = 10; - VECScale(arg1, arg1, 0.96f); - VECNormalize(&sp1C, &sp34); - VECNormalize(arg1, &sp28); - if(VECDotProduct(&sp34, &sp28) < 0.5) { - temp_r27 = 1; - } - } - } - VECAdd(arg0, &sp1C, arg0); - if(arg0->x >= lbl_1_bss_77C.x-13.0f) { - arg0->x = lbl_1_bss_77C.x-13.0f-1.0f; - } - if(arg0->y >= lbl_1_bss_77C.y-13.0f) { - arg0->y = lbl_1_bss_77C.y-13.0f-1.0f; - } - if(arg0->x <= lbl_1_bss_770.x+13.0f) { - arg0->x = lbl_1_bss_770.x+13.0f+1.0f; - } - if(arg0->y <= lbl_1_bss_770.y+13.0f) { - arg0->y = lbl_1_bss_770.y+13.0f+1.0f; - } - } - temp_f31 = VECMag(arg1); - VECNormalize(&sp1C, &sp1C); - VECScale(&sp1C, arg1, temp_f31); - if(temp_r27 != 0) { - HuAudFXPlay(1853); - } - if(arg2 < 0 || arg2 >= 3) { - arg2 = 0; - } - temp_r28 = lbl_1_data_454[arg2]; - for(temp_r30=0; temp_r30x = arg1->y = arg1->z = 0; - *arg0 = *temp_r28; - temp_r23= temp_r30; - break; - } - if(temp_f30 < 20.0f) { - VECScale(arg1, arg1, 0.9f); - VECNormalize(&sp34, &sp34); - VECScale(&sp34, &sp34, 0.1*(20.0f-temp_f30)); - VECAdd(arg1, &sp34, arg1); - break; - } - } - if(temp_r30 == lbl_1_data_3A4[arg2]) { - arg1->y += 0.3; - } - if(arg0->x >= lbl_1_bss_77C.x-13.0f) { - arg0->x = lbl_1_bss_77C.x-13.0f-1.0f; - } - if(arg0->y >= lbl_1_bss_77C.y-13.0f) { - arg0->y = lbl_1_bss_77C.y-13.0f-1.0f; - } - if(arg0->x <= lbl_1_bss_770.x+13.0f) { - arg0->x = lbl_1_bss_770.x+13.0f+1.0f; - } - if(arg0->y <= lbl_1_bss_770.y+13.0f) { - arg0->y = lbl_1_bss_770.y+13.0f+1.0f; - } - VECSubtract(arg0, &sp10, &sp34); - lbl_1_bss_370[lbl_1_bss_310++] = VECMag(&sp34); - return temp_r23; + float temp_f31; + float temp_f30; + float temp_f28; + float temp_f27; + + s16 temp_r30; + Vec *temp_r28; + s32 temp_r27; + Vec *temp_r25; + u8 temp_r24; + s16 temp_r23; + Vec sp4C; + + Vec sp40; + Vec sp34; + Vec sp28; + Vec sp1C; + Vec sp10; + s32 spC; + + temp_r23 = -1; + spC = 1; + temp_f28 = VECMag(arg1); + sp1C = *arg1; + temp_r27 = 0; + sp10 = *arg0; + temp_r24 = lbl_1_bss_310 - 120; + for (temp_r30 = temp_f30 = 0; temp_r30 < 120; temp_r30++, temp_r24++) { + temp_f30 += lbl_1_bss_370[temp_r24]; + } + if (temp_f30 < 120.0f * sqrtf(6.0f)) { + lbl_1_bss_312 = 10; + } + while (temp_f28 > 0.0f) { + if (temp_f28 > 3.0f) { + temp_f28 -= 3.0f; + temp_f31 = 3.0f; + } + else { + temp_f31 = temp_f28; + temp_f28 = 0; + } + VECNormalize(&sp1C, &sp1C); + VECScale(&sp1C, &sp1C, temp_f31); + VECAdd(arg0, &sp1C, &sp4C); + temp_f31 = VECMag(&sp1C); + if (lbl_1_bss_312 == 0) { + for (temp_r30 = 0; temp_r30 < 5; temp_r30++) { + if (lbl_1_bss_18A0[temp_r30] == 0) { + continue; + } + VECSubtract(&sp4C, &lbl_1_bss_18B4[temp_r30], &sp34); + temp_f30 = VECMag(&sp34); + if (temp_f30 < 33.0) { + VECNormalize(&sp34, &sp34); + VECScale(&sp34, &sp28, 33.0f); + VECAdd(&lbl_1_bss_18B4[temp_r30], &sp28, &sp4C); + VECScale(&sp1C, &sp28, -1.0f); + temp_f27 = (sp28.x * sp34.x) + (sp28.y * sp34.y); + sp34.x = (2.0 * sp34.x * temp_f27) - sp28.x; + sp34.y = (2.0 * sp34.y * temp_f27) - sp28.y; + sp34.z = 0; + VECNormalize(&sp34, &sp34); + VECScale(&sp34, &sp1C, temp_f31); + VECAdd(&sp4C, &sp1C, &sp34); + temp_f30 = VECSquareDistance(&sp34, &lbl_1_bss_18B4[temp_r30]); + if (temp_f30 < 1089.0) { + VECScale(&sp1C, &sp1C, -1.0f); + } + lbl_1_bss_198F0[temp_r30][1] = 2; + lbl_1_bss_198F0[temp_r30][0] = 100; + temp_r27 = 1; + } + } + } + else { + lbl_1_bss_312--; + } + for (temp_r30 = 0; temp_r30 < lbl_1_bss_1884; temp_r30++) { + if (VECSquareDistance(&lbl_1_bss_D8F0[temp_r30], &sp4C) <= 169.0f) { + VECSubtract(&sp4C, &lbl_1_bss_D8F0[temp_r30], &sp34); + VECNormalize(&sp34, &sp34); + VECScale(&sp34, &sp34, 13.05f); + VECAdd(&lbl_1_bss_D8F0[temp_r30], &sp34, &sp4C); + VECScale(arg1, arg1, 0.96f); + temp_r27 = 1; + } + else { + if (VECSquareDistance(&lbl_1_bss_18F0[temp_r30], &sp4C) <= 169.0f) { + VECSubtract(&sp4C, &lbl_1_bss_18F0[temp_r30], &sp34); + VECNormalize(&sp34, &sp34); + VECScale(&sp34, &sp34, 13.05f); + VECAdd(&lbl_1_bss_18F0[temp_r30], &sp34, &sp4C); + VECScale(arg1, arg1, 0.96f); + temp_r27 = 1; + } + else { + continue; + } + } + *arg0 = sp4C; + break; + } + if (temp_f31 == 0.0) { + continue; + } + for (temp_r30 = 0; temp_r30 < lbl_1_bss_1884; temp_r30++) { + VECSubtract(&lbl_1_bss_18F0[temp_r30], &lbl_1_bss_D8F0[temp_r30], &sp40); + temp_f30 = fn_1_CB70(&sp4C, &lbl_1_bss_D8F0[temp_r30], &sp40); + if (temp_f30 < 13.0f) { + temp_r25 = fn_1_CA30(&sp4C, &lbl_1_bss_D8F0[temp_r30], &sp40); + if (VECSquareDistance(&lbl_1_bss_D8F0[temp_r30], &sp4C) >= 169.0f && VECSquareDistance(&lbl_1_bss_18F0[temp_r30], &sp4C) >= 169.0f) { + VECSubtract(temp_r25, &lbl_1_bss_D8F0[temp_r30], &sp34); + if (VECMag2Point(&sp34) > VECMag2Point(&sp40)) { + continue; + } + VECSubtract(temp_r25, &lbl_1_bss_18F0[temp_r30], &sp34); + if (VECMag2Point(&sp34) > VECMag2Point(&sp40)) { + continue; + } + } + VECSubtract(&sp4C, temp_r25, &sp34); + VECNormalize(&sp34, &sp34); + VECScale(&sp34, &sp34, 13.0f); + VECAdd(temp_r25, &sp34, &sp4C); + VECSubtract(arg0, &sp4C, &sp34); + *arg0 = sp4C; + temp_f31 -= VECMag(&sp34); + if (temp_f31 < 0.0f) { + temp_f28 -= temp_f31; + temp_f31 = ABS(temp_f31); + } + sp34 = sp40; + sp34.z = 1; + VECCrossProduct(&sp34, &sp40, &sp34); + VECNormalize(&sp34, &sp34); + VECScale(&sp1C, &sp28, -1.0f); + temp_f27 = (sp28.x * sp34.x) + (sp28.y * sp34.y); + sp34.x = (1.5 * sp34.x * temp_f27) - sp28.x; + sp34.y = (1.5 * sp34.y * temp_f27) - sp28.y; + sp34.z = 0; + VECNormalize(&sp34, &sp34); + VECScale(&sp34, &sp1C, temp_f31); + lbl_1_bss_884[temp_r30] = 10; + VECScale(arg1, arg1, 0.96f); + VECNormalize(&sp1C, &sp34); + VECNormalize(arg1, &sp28); + if (VECDotProduct(&sp34, &sp28) < 0.5) { + temp_r27 = 1; + } + } + } + VECAdd(arg0, &sp1C, arg0); + if (arg0->x >= lbl_1_bss_77C.x - 13.0f) { + arg0->x = lbl_1_bss_77C.x - 13.0f - 1.0f; + } + if (arg0->y >= lbl_1_bss_77C.y - 13.0f) { + arg0->y = lbl_1_bss_77C.y - 13.0f - 1.0f; + } + if (arg0->x <= lbl_1_bss_770.x + 13.0f) { + arg0->x = lbl_1_bss_770.x + 13.0f + 1.0f; + } + if (arg0->y <= lbl_1_bss_770.y + 13.0f) { + arg0->y = lbl_1_bss_770.y + 13.0f + 1.0f; + } + } + temp_f31 = VECMag(arg1); + VECNormalize(&sp1C, &sp1C); + VECScale(&sp1C, arg1, temp_f31); + if (temp_r27 != 0) { + HuAudFXPlay(1853); + } + if (arg2 < 0 || arg2 >= 3) { + arg2 = 0; + } + temp_r28 = lbl_1_data_454[arg2]; + for (temp_r30 = 0; temp_r30 < lbl_1_data_3A4[arg2]; temp_r30++, temp_r28++) { + VECSubtract(temp_r28, arg0, &sp34); + temp_f30 = VECMag(&sp34); + if (temp_f30 < 3.0f && VECMag(arg1) < 1.0f) { + arg1->x = arg1->y = arg1->z = 0; + *arg0 = *temp_r28; + temp_r23 = temp_r30; + break; + } + if (temp_f30 < 20.0f) { + VECScale(arg1, arg1, 0.9f); + VECNormalize(&sp34, &sp34); + VECScale(&sp34, &sp34, 0.1 * (20.0f - temp_f30)); + VECAdd(arg1, &sp34, arg1); + break; + } + } + if (temp_r30 == lbl_1_data_3A4[arg2]) { + arg1->y += 0.3; + } + if (arg0->x >= lbl_1_bss_77C.x - 13.0f) { + arg0->x = lbl_1_bss_77C.x - 13.0f - 1.0f; + } + if (arg0->y >= lbl_1_bss_77C.y - 13.0f) { + arg0->y = lbl_1_bss_77C.y - 13.0f - 1.0f; + } + if (arg0->x <= lbl_1_bss_770.x + 13.0f) { + arg0->x = lbl_1_bss_770.x + 13.0f + 1.0f; + } + if (arg0->y <= lbl_1_bss_770.y + 13.0f) { + arg0->y = lbl_1_bss_770.y + 13.0f + 1.0f; + } + VECSubtract(arg0, &sp10, &sp34); + lbl_1_bss_370[lbl_1_bss_310++] = VECMag(&sp34); + return temp_r23; } void fn_1_C214(void) { - Mtx sp98; - Mtx sp68; - Mtx sp38; - Mtx sp8; - ModelData *temp_r31; - s16 temp_r30; - s16 temp_r29; - MTXRotDeg(sp8, 'z', 120); - while(1) { - temp_r31 = &Hu3DData[lbl_1_bss_199C2[9]]; - Hu3DMotionExec(lbl_1_bss_199C2[9], temp_r31->unk_08, temp_r31->unk_64, 0); - Hu3DModelObjMtxGet(lbl_1_bss_199C2[9], "kaitendai-r_dai", sp38); - for(temp_r30=0; temp_r30<3; temp_r30++) { - temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r30]]; - MTXTrans(sp68, lbl_1_bss_860[temp_r30].x, lbl_1_bss_860[temp_r30].y, lbl_1_bss_860[temp_r30].z); - MTXConcat(sp68, lbl_1_bss_794[temp_r30], sp68); - MTXConcat(sp38, sp68, sp98); - MTXCopy(sp98, temp_r31->unk_F0); - temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r30+55]]; - MTXTrans(sp68, 0, 150, 0); - MTXConcat(sp38, sp68, sp98); - MTXCopy(sp98, temp_r31->unk_F0); - temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r30+58]]; - MTXTrans(sp68, 0, 150, 0); - MTXConcat(sp38, sp68, sp98); - MTXCopy(sp98, temp_r31->unk_F0); - temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r30+65]]; - MTXTrans(sp68, 0, 150, 0); - MTXConcat(sp38, sp68, sp98); - MTXCopy(sp98, temp_r31->unk_F0); - temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r30+68]]; - MTXTrans(sp68, 0, 150, lbl_1_bss_788[temp_r30]-5.0f); - MTXConcat(sp38, sp68, sp98); - MTXCopy(sp98, temp_r31->unk_F0); - for(temp_r29=0; temp_r29<5; temp_r29++) { - if(temp_r30 != lbl_1_data_2C8[temp_r29]) { - continue; - } - temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r29+38]]; - MTXTrans(sp68, lbl_1_bss_824[temp_r29].x, lbl_1_bss_824[temp_r29].y, lbl_1_bss_824[temp_r29].z); - mtxScaleCat(sp68, 0.35f, 0.35f, 0.35f); - MTXConcat(sp38, sp68, sp98); - MTXCopy(sp98, temp_r31->unk_F0); - temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r29+85]]; - MTXTrans(sp68, lbl_1_bss_824[temp_r29].x, lbl_1_bss_824[temp_r29].y+1.0f, lbl_1_bss_824[temp_r29].z); - mtxScaleCat(sp68, 0.5f, 0.5f, 0.5f); - MTXConcat(sp38, sp68, sp98); - MTXCopy(sp98, temp_r31->unk_F0); - } - MTXConcat(sp38, sp8, sp38); - } - HuPrcVSleep(); - } - + Mtx sp98; + Mtx sp68; + Mtx sp38; + Mtx sp8; + ModelData *temp_r31; + s16 temp_r30; + s16 temp_r29; + MTXRotDeg(sp8, 'z', 120); + while (1) { + temp_r31 = &Hu3DData[lbl_1_bss_199C2[9]]; + Hu3DMotionExec(lbl_1_bss_199C2[9], temp_r31->unk_08, temp_r31->unk_64, 0); + Hu3DModelObjMtxGet(lbl_1_bss_199C2[9], "kaitendai-r_dai", sp38); + for (temp_r30 = 0; temp_r30 < 3; temp_r30++) { + temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r30]]; + MTXTrans(sp68, lbl_1_bss_860[temp_r30].x, lbl_1_bss_860[temp_r30].y, lbl_1_bss_860[temp_r30].z); + MTXConcat(sp68, lbl_1_bss_794[temp_r30], sp68); + MTXConcat(sp38, sp68, sp98); + MTXCopy(sp98, temp_r31->unk_F0); + temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r30 + 55]]; + MTXTrans(sp68, 0, 150, 0); + MTXConcat(sp38, sp68, sp98); + MTXCopy(sp98, temp_r31->unk_F0); + temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r30 + 58]]; + MTXTrans(sp68, 0, 150, 0); + MTXConcat(sp38, sp68, sp98); + MTXCopy(sp98, temp_r31->unk_F0); + temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r30 + 65]]; + MTXTrans(sp68, 0, 150, 0); + MTXConcat(sp38, sp68, sp98); + MTXCopy(sp98, temp_r31->unk_F0); + temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r30 + 68]]; + MTXTrans(sp68, 0, 150, lbl_1_bss_788[temp_r30] - 5.0f); + MTXConcat(sp38, sp68, sp98); + MTXCopy(sp98, temp_r31->unk_F0); + for (temp_r29 = 0; temp_r29 < 5; temp_r29++) { + if (temp_r30 != lbl_1_data_2C8[temp_r29]) { + continue; + } + temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r29 + 38]]; + MTXTrans(sp68, lbl_1_bss_824[temp_r29].x, lbl_1_bss_824[temp_r29].y, lbl_1_bss_824[temp_r29].z); + mtxScaleCat(sp68, 0.35f, 0.35f, 0.35f); + MTXConcat(sp38, sp68, sp98); + MTXCopy(sp98, temp_r31->unk_F0); + temp_r31 = &Hu3DData[lbl_1_bss_199C2[temp_r29 + 85]]; + MTXTrans(sp68, lbl_1_bss_824[temp_r29].x, lbl_1_bss_824[temp_r29].y + 1.0f, lbl_1_bss_824[temp_r29].z); + mtxScaleCat(sp68, 0.5f, 0.5f, 0.5f); + MTXConcat(sp38, sp68, sp98); + MTXCopy(sp98, temp_r31->unk_F0); + } + MTXConcat(sp38, sp8, sp38); + } + HuPrcVSleep(); + } } void fn_1_C73C(ModelData *model, Mtx matrix) { - s16 temp_r31; - u8 temp_r30; - u8 temp_r29; - u8 temp_r28; - - GXClearVtxDesc(); - GXSetVtxDesc(GX_VA_POS, GX_DIRECT); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); - GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGB, GX_S8, 0); - GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); - GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_RASC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); - GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_KONST, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); - GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - GXSetNumTexGens(0); - GXSetNumTevStages(1); - GXSetNumChans(1); - GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); - GXLoadPosMtxImm(matrix, GX_PNMTX0); - temp_r30 = temp_r29 = temp_r28 = 255; - for(temp_r31=0; temp_r31x*(b)->x)-((a)->x*(c)->x))+(((a)->y*(b)->y)-((a)->y*(c)->y))+(((a)->z*(b)->z)-((a)->z*(c)->z))) +#define VECDistance2XYZ3(a, b, c) \ + ((((a)->x * (b)->x) - ((a)->x * (c)->x)) + (((a)->y * (b)->y) - ((a)->y * (c)->y)) + (((a)->z * (b)->z) - ((a)->z * (c)->z))) Vec *fn_1_CA30(Vec *arg0, Vec *arg1, Vec *arg2) { - float temp_f31; - Vec spC; - VECNormalize(arg2, &spC); - temp_f31 = -VECDistance2XYZ3(&spC, arg1, arg0); - temp_f31 /= VECMag2Point(&spC); - lbl_1_bss_314.x = (arg1->x+(spC.x*temp_f31)); - lbl_1_bss_314.y = (arg1->y+(spC.y*temp_f31)); - lbl_1_bss_314.z = (arg1->z+(spC.z*temp_f31)); - return &lbl_1_bss_314; + float temp_f31; + Vec spC; + VECNormalize(arg2, &spC); + temp_f31 = -VECDistance2XYZ3(&spC, arg1, arg0); + temp_f31 /= VECMag2Point(&spC); + lbl_1_bss_314.x = (arg1->x + (spC.x * temp_f31)); + lbl_1_bss_314.y = (arg1->y + (spC.y * temp_f31)); + lbl_1_bss_314.z = (arg1->z + (spC.z * temp_f31)); + return &lbl_1_bss_314; } float fn_1_CB70(Vec *arg0, Vec *arg1, Vec *arg2) { - Vec *temp_r31 = fn_1_CA30(arg0, arg1, arg2); - temp_r31->x -= arg0->x; - temp_r31->y -= arg0->y; - temp_r31->z -= arg0->z; - return sqrtf(VECMag2Point(temp_r31)); - + Vec *temp_r31 = fn_1_CA30(arg0, arg1, arg2); + temp_r31->x -= arg0->x; + temp_r31->y -= arg0->y; + temp_r31->z -= arg0->z; + return sqrtf(VECMag2Point(temp_r31)); } s32 fn_1_CE08(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, Vec *arg4) { - float temp_f31; - float temp_f30; - s32 sp8 = 1; - temp_f31 = (arg1->x*(arg2->y-arg0->y))-(arg1->y*(arg2->x-arg0->x)); - if(0.0f != (arg3->x*arg1->y)-(arg3->y*arg1->x)) { - temp_f31 /= (arg3->x*arg1->y)-(arg3->y*arg1->x); - } else { - return 0; - } - if(arg1->x != 0.0) { - temp_f30 = (((temp_f31*arg3->x)+arg2->x)-arg0->x)/arg1->x; - } else if(arg1->y != 0.0) { - temp_f30 = (((temp_f31*arg3->y)+arg2->y)-arg0->y)/arg1->y; - } else { - temp_f30 = (((temp_f31*arg3->z)+arg2->z)-arg0->z)/arg1->z; - } - arg4->x = (temp_f30*arg1->x)+arg0->x; - arg4->y = (temp_f30*arg1->y)+arg0->y; - arg4->z = (temp_f30*arg1->z)+arg0->z; - return 1; + float temp_f31; + float temp_f30; + s32 sp8 = 1; + temp_f31 = (arg1->x * (arg2->y - arg0->y)) - (arg1->y * (arg2->x - arg0->x)); + if (0.0f != (arg3->x * arg1->y) - (arg3->y * arg1->x)) { + temp_f31 /= (arg3->x * arg1->y) - (arg3->y * arg1->x); + } + else { + return 0; + } + if (arg1->x != 0.0) { + temp_f30 = (((temp_f31 * arg3->x) + arg2->x) - arg0->x) / arg1->x; + } + else if (arg1->y != 0.0) { + temp_f30 = (((temp_f31 * arg3->y) + arg2->y) - arg0->y) / arg1->y; + } + else { + temp_f30 = (((temp_f31 * arg3->z) + arg2->z) - arg0->z) / arg1->z; + } + arg4->x = (temp_f30 * arg1->x) + arg0->x; + arg4->y = (temp_f30 * arg1->y) + arg0->y; + arg4->z = (temp_f30 * arg1->z) + arg0->z; + return 1; } s32 fn_1_CF9C(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, Vec *arg4) { - float temp_f31; - float temp_f30; - Vec sp14; - Vec sp8; - sp14.x = arg1->x-arg0->x; - sp14.y = arg1->y-arg0->y; - sp14.z = arg1->z-arg0->z; - sp8.x = arg3->x-arg2->x; - sp8.y = arg3->y-arg2->y; - sp8.z = arg3->z-arg2->z; - temp_f31 = (sp14.x*(arg2->y-arg0->y))-(sp14.y*(arg2->x-arg0->x)); - if(0.0f != (sp8.x*sp14.y)-(sp8.y*sp14.x)) { - temp_f31 /= (sp8.x*sp14.y)-(sp8.y*sp14.x); - } else { - return 0; - } - if(sp14.x != 0.0) { - temp_f30 = (((temp_f31*sp8.x)+arg2->x)-arg0->x)/sp14.x; - } else if(sp14.y != 0.0) { - temp_f30 = (((temp_f31*sp8.y)+arg2->y)-arg0->y)/sp14.y; - } else { - temp_f30 = (((temp_f31*sp8.z)+arg2->z)-arg0->z)/sp14.z; - } - if(temp_f30 < 0.0f || temp_f30 > 1.0f || temp_f31 < 0.0f || temp_f31 > 1.0f) { - return 0; - } - arg4->x = (temp_f30*sp14.x)+arg0->x; - arg4->y = (temp_f30*sp14.y)+arg0->y; - arg4->z = (temp_f30*sp14.z)+arg0->z; - return 1; + float temp_f31; + float temp_f30; + Vec sp14; + Vec sp8; + sp14.x = arg1->x - arg0->x; + sp14.y = arg1->y - arg0->y; + sp14.z = arg1->z - arg0->z; + sp8.x = arg3->x - arg2->x; + sp8.y = arg3->y - arg2->y; + sp8.z = arg3->z - arg2->z; + temp_f31 = (sp14.x * (arg2->y - arg0->y)) - (sp14.y * (arg2->x - arg0->x)); + if (0.0f != (sp8.x * sp14.y) - (sp8.y * sp14.x)) { + temp_f31 /= (sp8.x * sp14.y) - (sp8.y * sp14.x); + } + else { + return 0; + } + if (sp14.x != 0.0) { + temp_f30 = (((temp_f31 * sp8.x) + arg2->x) - arg0->x) / sp14.x; + } + else if (sp14.y != 0.0) { + temp_f30 = (((temp_f31 * sp8.y) + arg2->y) - arg0->y) / sp14.y; + } + else { + temp_f30 = (((temp_f31 * sp8.z) + arg2->z) - arg0->z) / sp14.z; + } + if (temp_f30 < 0.0f || temp_f30 > 1.0f || temp_f31 < 0.0f || temp_f31 > 1.0f) { + return 0; + } + arg4->x = (temp_f30 * sp14.x) + arg0->x; + arg4->y = (temp_f30 * sp14.y) + arg0->y; + arg4->z = (temp_f30 * sp14.z) + arg0->z; + return 1; } void fn_1_D1E0(s16 model) { - Vec sp14[4]; - Vec sp8; - s32 temp_r31; - s32 temp_r30; - HsfData *temp_r29; - HsfBuffer *temp_r28; - HsfFace *temp_r27; - s32 temp_r26; - s32 temp_r25; - s32 temp_r24; - s32 temp_r23; - HsfBuffer *temp_r22; - temp_r29 = Hu3DData[model].hsfData; - lbl_1_bss_77C.x = lbl_1_bss_77C.y = -100000; - lbl_1_bss_770.x = lbl_1_bss_770.y = 100000; - temp_r28 = temp_r29->face; - for(temp_r24=temp_r31=0; temp_r24faceCnt; temp_r24++, temp_r28++) { - temp_r27 = temp_r28->data; - for(temp_r23=0; temp_r23count; temp_r23++, temp_r27++) { - switch(temp_r27->type & 0x7) { - case 0: - case 1: - case 2: - break; - - case 3: - temp_r22 = temp_r29->vertex; - for(temp_r26=temp_r25=0; temp_r26<4; temp_r26++) { - sp8 = ((Vec *)temp_r22->data)[temp_r27->indices[temp_r26][0]]; - for(temp_r30=0; temp_r30 lbl_1_bss_77C.x) { - lbl_1_bss_77C.x = sp14[0].x; - } - if(sp14[0].z > lbl_1_bss_77C.y) { - lbl_1_bss_77C.y = sp14[0].z; - } - if(sp14[0].x < lbl_1_bss_770.x) { - lbl_1_bss_770.x = sp14[0].x; - } - if(sp14[0].z < lbl_1_bss_770.y) { - lbl_1_bss_770.y = sp14[0].z; - } - lbl_1_bss_18F0[temp_r31].x = sp14[1].x; - lbl_1_bss_18F0[temp_r31].y = sp14[1].z; - lbl_1_bss_18F0[temp_r31].z = 0; - - if(sp14[1].x > lbl_1_bss_77C.x) { - lbl_1_bss_77C.x = sp14[1].x; - } - if(sp14[1].z > lbl_1_bss_77C.y) { - lbl_1_bss_77C.y = sp14[1].z; - } - if(sp14[1].x < lbl_1_bss_770.x) { - lbl_1_bss_770.x = sp14[1].x; - } - if(sp14[1].z < lbl_1_bss_770.y) { - lbl_1_bss_770.y = sp14[1].z; - } - temp_r31++; - break; - - case 4: - break; - - default: - break; - } - } - } - lbl_1_bss_1884 = temp_r31; + Vec sp14[4]; + Vec sp8; + s32 temp_r31; + s32 temp_r30; + HsfData *temp_r29; + HsfBuffer *temp_r28; + HsfFace *temp_r27; + s32 temp_r26; + s32 temp_r25; + s32 temp_r24; + s32 temp_r23; + HsfBuffer *temp_r22; + temp_r29 = Hu3DData[model].hsfData; + lbl_1_bss_77C.x = lbl_1_bss_77C.y = -100000; + lbl_1_bss_770.x = lbl_1_bss_770.y = 100000; + temp_r28 = temp_r29->face; + for (temp_r24 = temp_r31 = 0; temp_r24 < temp_r29->faceCnt; temp_r24++, temp_r28++) { + temp_r27 = temp_r28->data; + for (temp_r23 = 0; temp_r23 < temp_r28->count; temp_r23++, temp_r27++) { + switch (temp_r27->type & 0x7) { + case 0: + case 1: + case 2: + break; + + case 3: + temp_r22 = temp_r29->vertex; + for (temp_r26 = temp_r25 = 0; temp_r26 < 4; temp_r26++) { + sp8 = ((Vec *)temp_r22->data)[temp_r27->indices[temp_r26][0]]; + for (temp_r30 = 0; temp_r30 < temp_r25; temp_r30++) { + if (sp8.y != sp14[temp_r30].y) { + break; + } + } + if (temp_r30 == temp_r25) { + sp14[temp_r30].x = sp8.x; + sp14[temp_r30].y = sp8.y; + sp14[temp_r30].z = sp8.z; + temp_r25++; + } + } + lbl_1_bss_D8F0[temp_r31].x = sp14[0].x; + lbl_1_bss_D8F0[temp_r31].y = sp14[0].z; + lbl_1_bss_D8F0[temp_r31].z = 0; + if (sp14[0].x > lbl_1_bss_77C.x) { + lbl_1_bss_77C.x = sp14[0].x; + } + if (sp14[0].z > lbl_1_bss_77C.y) { + lbl_1_bss_77C.y = sp14[0].z; + } + if (sp14[0].x < lbl_1_bss_770.x) { + lbl_1_bss_770.x = sp14[0].x; + } + if (sp14[0].z < lbl_1_bss_770.y) { + lbl_1_bss_770.y = sp14[0].z; + } + lbl_1_bss_18F0[temp_r31].x = sp14[1].x; + lbl_1_bss_18F0[temp_r31].y = sp14[1].z; + lbl_1_bss_18F0[temp_r31].z = 0; + + if (sp14[1].x > lbl_1_bss_77C.x) { + lbl_1_bss_77C.x = sp14[1].x; + } + if (sp14[1].z > lbl_1_bss_77C.y) { + lbl_1_bss_77C.y = sp14[1].z; + } + if (sp14[1].x < lbl_1_bss_770.x) { + lbl_1_bss_770.x = sp14[1].x; + } + if (sp14[1].z < lbl_1_bss_770.y) { + lbl_1_bss_770.y = sp14[1].z; + } + temp_r31++; + break; + + case 4: + break; + + default: + break; + } + } + } + lbl_1_bss_1884 = temp_r31; } diff --git a/src/REL/m445Dll/main.c b/src/REL/m445Dll/main.c index 51193130..2d4a8a0c 100755 --- a/src/REL/m445Dll/main.c +++ b/src/REL/m445Dll/main.c @@ -108,7 +108,7 @@ typedef struct { } UnkM445Struct_03; // Size unknown typedef struct { - /* 0x00 */ UnkM445Struct_03* unk00; + /* 0x00 */ UnkM445Struct_03 *unk00; /* 0x04 */ s32 unk04; /* 0x08 */ s32 unk08; /* 0x0C */ s32 unk0C; @@ -116,35 +116,35 @@ typedef struct { void ObjectSetup(void); void fn_1_4B8(float arg0, float arg1, s32 arg2); -void fn_1_50C(omObjData* arg0); -void fn_1_510(omObjData* arg0); +void fn_1_50C(omObjData *arg0); +void fn_1_510(omObjData *arg0); BOOL fn_1_520(s32 arg0); void fn_1_550(void); float fn_1_1858(float arg0); -UnkM445Struct_01* fn_1_18D8(void); +UnkM445Struct_01 *fn_1_18D8(void); void fn_1_1934(void); void fn_1_1968(void); s32 fn_1_1AD0(s32 arg0); void fn_1_1B0C(void); void fn_1_1C64(void); s8 fn_1_2BF4(s32 arg0, s32 arg1); -void fn_1_2CAC(Vec* arg0, float arg1, float arg2); +void fn_1_2CAC(Vec *arg0, float arg1, float arg2); s8 fn_1_2E68(s32 arg0, s32 arg1); u8 fn_1_2F38(s32 arg0, s32 arg1); u16 fn_1_3010(s32 arg0); u16 fn_1_3094(s32 arg0); -s32 fn_1_3114(UnkM445Struct_02* arg0, float arg1, float arg2, float arg3); -s32 fn_1_3334(UnkM445Struct_02* arg0, s32* arg1); -void fn_1_3548(UnkM445Struct_02* arg0); +s32 fn_1_3114(UnkM445Struct_02 *arg0, float arg1, float arg2, float arg3); +s32 fn_1_3334(UnkM445Struct_02 *arg0, s32 *arg1); +void fn_1_3548(UnkM445Struct_02 *arg0); float fn_1_42A0(float arg0, float arg1, float arg2); -BOOL fn_1_43A4(UnkM445Struct_02* arg0, float arg1, float arg2); -void fn_1_45D0(UnkM445Struct_02* arg0); +BOOL fn_1_43A4(UnkM445Struct_02 *arg0, float arg1, float arg2); +void fn_1_45D0(UnkM445Struct_02 *arg0); void fn_1_557C(void); void fn_1_55F0(void); -void fn_1_5664(UnkM445Struct_02* arg0, s32 arg1); -void fn_1_5700(UnkM445Struct_02* arg0); +void fn_1_5664(UnkM445Struct_02 *arg0, s32 arg1); +void fn_1_5700(UnkM445Struct_02 *arg0); void fn_1_6268(void); -void fn_1_7FC0(ModelData* model, ParticleData* particle, Mtx matrix); +void fn_1_7FC0(ModelData *model, ParticleData *particle, Mtx matrix); void fn_1_8320(void); void fn_1_8938(void); void fn_1_89B8(void); @@ -163,9 +163,9 @@ char lbl_1_bss_6C0_pad[4]; // Unused. UnkM445Struct_02 lbl_1_bss_588[2]; UnkM445Struct_00 lbl_1_bss_288[8]; UnkM445Struct_01 lbl_1_bss_58[10]; -Process* lbl_1_bss_54; +Process *lbl_1_bss_54; char lbl_1_bss_30_pad[0x24]; // Unused. -omObjData* lbl_1_bss_2C; +omObjData *lbl_1_bss_2C; Vec lbl_1_bss_20; Vec lbl_1_bss_14; Vec lbl_1_bss_8; @@ -175,85 +175,33 @@ float lbl_1_bss_0; s32 lbl_1_data_0[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; // Unused. -s32 lbl_1_data_20[] = { - DATADIR_MARIOMOT, - DATADIR_LUIGIMOT, - DATADIR_PEACHMOT, - DATADIR_YOSHIMOT, - DATADIR_WARIOMOT, - DATADIR_DONKEYMOT, - DATADIR_DAISYMOT, - DATADIR_WALUIGIMOT -}; +s32 lbl_1_data_20[] = { DATADIR_MARIOMOT, DATADIR_LUIGIMOT, DATADIR_PEACHMOT, DATADIR_YOSHIMOT, DATADIR_WARIOMOT, DATADIR_DONKEYMOT, DATADIR_DAISYMOT, + DATADIR_WALUIGIMOT }; -s32 lbl_1_data_40[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), - DATA_MAKE_NUM(DATADIR_M445, 0), - DATA_MAKE_NUM(DATADIR_M445, 8), - DATA_MAKE_NUM(DATADIR_M445, 16), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 75), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) -}; +s32 lbl_1_data_40[] + = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), DATA_MAKE_NUM(DATADIR_M445, 0), + DATA_MAKE_NUM(DATADIR_M445, 8), DATA_MAKE_NUM(DATADIR_M445, 16), DATA_MAKE_NUM(DATADIR_MARIOMOT, 75), DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) }; -Vec lbl_1_data_60[] = { - { -100.0f, 75.0f, 60.0f }, - { 100.0f, 75.0f, -60.0f } -}; +Vec lbl_1_data_60[] = { { -100.0f, 75.0f, 60.0f }, { 100.0f, 75.0f, -60.0f } }; -Vec lbl_1_data_78[] = { - { 0.0f, 0.0f, -79.5f }, - { 180.0f, 0.0f, -100.5f } -}; +Vec lbl_1_data_78[] = { { 0.0f, 0.0f, -79.5f }, { 180.0f, 0.0f, -100.5f } }; -float lbl_1_data_90[][2] = { - { 471.0f, 280.0f }, - { -461.5f, 299.5f }, - { 271.7f, -482.6f }, - { -373.1f, -457.1f }, - { 462.8f, -128.5f }, - { 0.0f, -495.4f }, - { -40.8f, 632.3f }, - { -477.7f, -110.0f } -}; +float lbl_1_data_90[][2] = { { 471.0f, 280.0f }, { -461.5f, 299.5f }, { 271.7f, -482.6f }, { -373.1f, -457.1f }, { 462.8f, -128.5f }, + { 0.0f, -495.4f }, { -40.8f, 632.3f }, { -477.7f, -110.0f } }; -float lbl_1_data_D0[][2] = { - { 467.0f, 393.0f }, - { -461.5f, 395.5f }, - { 367.7f, -492.1f }, - { -268.9f, -467.0f }, - { 462.8f, -128.5f }, - { 0.0f, -495.4f }, - { -40.8f, 632.3f }, - { -477.7f, -110.0f } -}; +float lbl_1_data_D0[][2] = { { 467.0f, 393.0f }, { -461.5f, 395.5f }, { 367.7f, -492.1f }, { -268.9f, -467.0f }, { 462.8f, -128.5f }, + { 0.0f, -495.4f }, { -40.8f, 632.3f }, { -477.7f, -110.0f } }; -s32 lbl_1_data_110[][2] = { - { 360, 306 }, - { -360, 341 }, - { 326, -360 }, - { -326, -360 }, - { 321, -122 }, - { 0, -332 }, - { -50, 500 }, - { -334, -110 } -}; +s32 lbl_1_data_110[][2] = { { 360, 306 }, { -360, 341 }, { 326, -360 }, { -326, -360 }, { 321, -122 }, { 0, -332 }, { -50, 500 }, { -334, -110 } }; -char* lbl_1_data_220[][2] = { - { "tansu_w_itemhook1" , "tansu_w_itemhook2" }, - { "sidebord_itemhook1" , "sidebord_itemhook2" }, - { "pinkshelf_itemhook1", "pinkshelf_itemhook2" }, - { "green_itemhook1" , "green_itemhook2" }, - { "bookshelf_itemhook" , "bookshelf_itemhook" }, - { "clock_itemhook" , "clock_itemhook" }, - { "book_itemhook" , "book_itemhook" }, - { "tv_itemhook" , "tv_itemhook" } -}; +char *lbl_1_data_220[][2] = { { "tansu_w_itemhook1", "tansu_w_itemhook2" }, { "sidebord_itemhook1", "sidebord_itemhook2" }, + { "pinkshelf_itemhook1", "pinkshelf_itemhook2" }, { "green_itemhook1", "green_itemhook2" }, { "bookshelf_itemhook", "bookshelf_itemhook" }, + { "clock_itemhook", "clock_itemhook" }, { "book_itemhook", "book_itemhook" }, { "tv_itemhook", "tv_itemhook" } }; s32 lbl_1_data_260[] = { 2, 2, 2, 2, 1, 1, 1, 1 }; -void ObjectSetup(void) { +void ObjectSetup(void) +{ lbl_1_bss_54 = omInitObjMan(50, 0x2000); omGameSysInit(lbl_1_bss_54); HuWinInit(1); @@ -291,7 +239,8 @@ void ObjectSetup(void) { WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1); } -void fn_1_4B8(float arg0, float arg1, s32 arg2) { +void fn_1_4B8(float arg0, float arg1, s32 arg2) +{ Vec sp14; sp14.x = arg0; @@ -300,29 +249,31 @@ void fn_1_4B8(float arg0, float arg1, s32 arg2) { HuAudFXEmiterPlay(arg2, &sp14); } -void fn_1_50C(omObjData* arg0) { -} +void fn_1_50C(omObjData *arg0) { } -void fn_1_510(omObjData* arg0) { +void fn_1_510(omObjData *arg0) +{ arg0->func = fn_1_50C; } -BOOL fn_1_520(s32 arg0) { +BOOL fn_1_520(s32 arg0) +{ return (GWPlayerCfg[arg0].character == 9); } -void fn_1_550(void) { +void fn_1_550(void) +{ float var_f31; float var_f30; float var_f29; - UnkM445Struct_00* temp_r26; - UnkM445Struct_01* temp_r25; - UnkM445Struct_02* temp_r31; - omObjData* temp_r24; - Process* var_r22; - AnimData* var_r20; - AnimData* sp38[4]; - void* var_r29; + UnkM445Struct_00 *temp_r26; + UnkM445Struct_01 *temp_r25; + UnkM445Struct_02 *temp_r31; + omObjData *temp_r24; + Process *var_r22; + AnimData *var_r20; + AnimData *sp38[4]; + void *var_r29; s16 var_r30; s32 var_r23; s32 var_r21; @@ -346,7 +297,7 @@ void fn_1_550(void) { Hu3DModelShadowMapSet(var_r30); var_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M445, 25), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30 = Hu3DModelCreate(var_r29); - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); temp_r24 = omAddObjEx(lbl_1_bss_54, 0x100, 1, 0, -1, fn_1_510); MapObject[nMap++] = temp_r24; temp_r24->model[0] = var_r30; @@ -360,13 +311,13 @@ void fn_1_550(void) { Hu3DModelShadowMapSet(var_r30); var_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M445, 28), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30 = Hu3DModelCreate(var_r29); - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); temp_r24 = omAddObjEx(lbl_1_bss_54, 0x100, 1, 0, -1, fn_1_510); MapObject[nMap++] = temp_r24; temp_r24->model[0] = var_r30; var_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M445, 100), MEMORY_DEFAULT_NUM, HEAP_DATA); lbl_1_bss_6E0 = Hu3DModelCreate(var_r29); - Hu3DModelAttrSet(lbl_1_bss_6E0, 1); + Hu3DModelAttrSet(lbl_1_bss_6E0, HU3D_ATTR_DISPOFF); for (i = 0; i < 8; i++) { temp_r26 = &lbl_1_bss_288[i]; temp_r26->unk14 = i; @@ -381,7 +332,7 @@ void fn_1_550(void) { } Hu3DModelShadowSet(var_r30); Hu3DMotionSet(var_r30, temp_r26->unk02[0]); - Hu3DModelAttrSet(var_r30, 0x40000001); + Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_LOOP); temp_r26->unk48 = lbl_1_data_110[i][0]; temp_r26->unk4C = lbl_1_data_110[i][1]; temp_r26->unk50[0] = lbl_1_data_90[i][0]; @@ -393,7 +344,7 @@ void fn_1_550(void) { lbl_1_bss_6E2 = Hu3DJointMotion(var_r30, var_r29); Hu3DMotionSet(var_r30, lbl_1_bss_6E2); Hu3DMotionTimeSet(var_r30, 61.0f); - Hu3DModelAttrSet(var_r30, 0x40000002); + Hu3DModelAttrSet(var_r30, HU3D_MOTATTR_PAUSE); } if (i == 6) { var_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M445, 78), MEMORY_DEFAULT_NUM, HEAP_DATA); @@ -408,7 +359,7 @@ void fn_1_550(void) { temp_r26->unk18 = nMap; var_r29 = HuDataSelHeapReadNum(var_r23, MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30 = Hu3DModelCreate(var_r29); - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); temp_r24 = MapObject[nMap++] = omAddObjEx(lbl_1_bss_54, 0x100, 1, 0, -1, fn_1_510); temp_r24->model[0] = var_r30; temp_r24->trans.x = temp_r26->unk48; @@ -429,7 +380,7 @@ void fn_1_550(void) { var_r29 = HuDataSelHeapReadNum(j + DATA_MAKE_NUM(DATADIR_M445, 83), MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r25->unk08[j] = Hu3DJointMotion(var_r30, var_r29); } - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); var_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M445, 82), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30 = Hu3DModelCreate(var_r29); temp_r25->unk04 = var_r30; @@ -437,7 +388,7 @@ void fn_1_550(void) { var_r29 = HuDataSelHeapReadNum(j + DATA_MAKE_NUM(DATADIR_M445, 87), MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r25->unk08[j + 4] = Hu3DJointMotion(var_r30, var_r29); } - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); var_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M445, 91), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30 = Hu3DModelCreate(var_r29); temp_r25->unk02 = var_r30; @@ -445,7 +396,7 @@ void fn_1_550(void) { var_r29 = HuDataSelHeapReadNum(j + DATA_MAKE_NUM(DATADIR_M445, 92), MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r25->unk08[j + 8] = Hu3DJointMotion(var_r30, var_r29); } - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); var_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M445, 91), MEMORY_DEFAULT_NUM, HEAP_DATA); var_r30 = Hu3DModelCreate(var_r29); temp_r25->unk06 = var_r30; @@ -453,7 +404,7 @@ void fn_1_550(void) { var_r29 = HuDataSelHeapReadNum(j + DATA_MAKE_NUM(DATADIR_M445, 96), MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r25->unk08[j + 12] = Hu3DJointMotion(var_r30, var_r29); } - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); } for (i = 0; i < 2; i++) { temp_r31 = &lbl_1_bss_588[i]; @@ -462,7 +413,8 @@ void fn_1_550(void) { temp_r31->unk20 = GWPlayerCfg[i].pad_idx; if (fn_1_520(temp_r31->unk18) == FALSE) { temp_r31->unk00 = CharModelCreate(lbl_1_data_0[GWPlayerCfg[i].character], 2); - } else { + } + else { var_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M445, 29), MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r31->unk00 = Hu3DModelCreate(var_r29); } @@ -472,19 +424,22 @@ void fn_1_550(void) { temp_r31->unk48 = temp_r31->unk50 = 0.0f; if (i != 0) { var_f31 = temp_r31->unk4C = fn_1_1858(-90.0f); - } else { + } + else { temp_r31->unk4C = var_f31 = 90.0f; } temp_r31->unk60 = temp_r31->unk4C; if (i != 0) { var_f30 = temp_r31->unk34 = 160.0f; - } else { + } + else { var_f30 = temp_r31->unk34 = -160.0f; } temp_r31->unk38 = 0.0f; if (i != 0) { var_f29 = temp_r31->unk3C = -45.0f; - } else { + } + else { var_f29 = temp_r31->unk3C = 45.0f; } temp_r31->unk54 = 50.0f; @@ -505,7 +460,7 @@ void fn_1_550(void) { temp_r31->unk02 = var_r30; Hu3DMotionSpeedSet(var_r30, 1.4f); Hu3DModelLayerSet(var_r30, 1); - Hu3DModelAttrSet(var_r30, 1); + Hu3DModelAttrSet(var_r30, HU3D_ATTR_DISPOFF); if (fn_1_520(temp_r31->unk18) == FALSE) { for (j = 0; j < 8; j++) { var_r21 = lbl_1_data_40[j]; @@ -515,7 +470,8 @@ void fn_1_550(void) { temp_r31->unk08[j] = CharModelMotionCreate(lbl_1_data_0[GWPlayerCfg[i].character], var_r21); } CharModelMotionSet(lbl_1_data_0[GWPlayerCfg[i].character], temp_r31->unk08[0]); - } else { + } + else { for (j = 0; j < 7; j++) { var_r29 = HuDataSelHeapReadNum(j + DATA_MAKE_NUM(DATADIR_M445, 30), MEMORY_DEFAULT_NUM, HEAP_DATA); temp_r31->unk08[j] = Hu3DJointMotion(temp_r31->unk00, var_r29); @@ -524,7 +480,7 @@ void fn_1_550(void) { CharModelEffectNpcInit(temp_r31->unk00, temp_r31->unk08[1], 0, 9); CharModelEffectNpcInit(temp_r31->unk00, temp_r31->unk08[2], 1, 9); } - Hu3DModelAttrSet(temp_r31->unk00, 0x40000001); + Hu3DModelAttrSet(temp_r31->unk00, HU3D_MOTATTR_LOOP); if (i == 0) { var_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_MGCONST, 22), MEMORY_DEFAULT_NUM, HEAP_DATA); sp38[0] = HuSprAnimRead(var_r29); @@ -535,7 +491,8 @@ void fn_1_550(void) { } if (fn_1_520(temp_r31->unk18) == FALSE) { var_r29 = HuDataSelHeapReadNum(GWPlayerCfg[i].character + DATADIR_MGCONST, MEMORY_DEFAULT_NUM, HEAP_DATA); - } else { + } + else { var_r29 = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_M445, 102), MEMORY_DEFAULT_NUM, HEAP_DATA); } sp38[2] = HuSprAnimRead(var_r29); @@ -582,7 +539,8 @@ void fn_1_550(void) { HuPrcChildCreate(fn_1_89B8, 0x1000, 0x1000, 0, HuPrcCurrentGet()); } -float fn_1_1858(float arg0) { +float fn_1_1858(float arg0) +{ while (arg0 >= 360.0f || arg0 < 0.0f) { if (arg0 >= 360.0f) { arg0 -= 360.0f; @@ -594,8 +552,9 @@ float fn_1_1858(float arg0) { return arg0; } -UnkM445Struct_01* fn_1_18D8(void) { - UnkM445Struct_01* var_r30; +UnkM445Struct_01 *fn_1_18D8(void) +{ + UnkM445Struct_01 *var_r30; s32 i; for (i = 0; i < 10; i++) { @@ -610,17 +569,19 @@ UnkM445Struct_01* fn_1_18D8(void) { return var_r30; } -void fn_1_1934(void) { - UnkM445Struct_04* var_r31; +void fn_1_1934(void) +{ + UnkM445Struct_04 *var_r31; var_r31 = HuPrcCurrentGet()->user_data; HuMemDirectFree(var_r31); } -void fn_1_1968(void) { +void fn_1_1968(void) +{ float var_f31; float var_f30; - UnkM445Struct_04* temp_r31; + UnkM445Struct_04 *temp_r31; s32 i; temp_r31 = HuPrcCurrentGet()->user_data; @@ -654,21 +615,25 @@ void fn_1_1968(void) { } } -s32 fn_1_1AD0(s32 arg0) { +s32 fn_1_1AD0(s32 arg0) +{ s32 var_r31; if (arg0 < 20) { var_r31 = 3; - } else if (arg0 < 40) { + } + else if (arg0 < 40) { var_r31 = 4; - } else { + } + else { var_r31 = 5; } return var_r31; } -void fn_1_1B0C(void) { - UnkM445Struct_00* temp_r30; +void fn_1_1B0C(void) +{ + UnkM445Struct_00 *temp_r30; s32 spC; s32 sp8; s32 var_r29; @@ -717,10 +682,11 @@ void fn_1_1B0C(void) { } } -void fn_1_1C64(void) { - UnkM445Struct_00* temp_r31; - UnkM445Struct_01* var_r25; - UnkM445Struct_01* var_r29; +void fn_1_1C64(void) +{ + UnkM445Struct_00 *temp_r31; + UnkM445Struct_01 *var_r25; + UnkM445Struct_01 *var_r29; s32 var_r23; s32 var_r26; @@ -748,19 +714,22 @@ void fn_1_1C64(void) { } if (temp_r31->unk14 == 5 || temp_r31->unk14 == 7) { var_r25->unk28 = var_r25->unk04; - } else { + } + else { var_r25->unk28 = var_r25->unk00; } - } else { + } + else { temp_r31->unk38 = 0; if (temp_r31->unk14 == 5 || temp_r31->unk14 == 7) { var_r25->unk28 = var_r25->unk06; - } else { + } + else { var_r25->unk28 = var_r25->unk02; } temp_r31->unk0C += 8; } - Hu3DModelAttrReset(var_r25->unk28, 1); + Hu3DModelAttrReset(var_r25->unk28, HU3D_ATTR_DISPOFF); Hu3DModelHookSet(temp_r31->unk00, lbl_1_data_220[temp_r31->unk14][0], var_r25->unk28); Hu3DMotionSet(var_r25->unk28, var_r25->unk08[temp_r31->unk0C]); if (lbl_1_data_260[temp_r31->unk14] > 1) { @@ -772,17 +741,20 @@ void fn_1_1C64(void) { lbl_1_bss_6C8++; if (temp_r31->unk14 == 5 || temp_r31->unk14 == 7) { var_r29->unk28 = var_r29->unk04; - } else { + } + else { var_r29->unk28 = var_r29->unk00; } - } else { + } + else { if (temp_r31->unk14 == 5 || temp_r31->unk14 == 7) { var_r29->unk28 = var_r29->unk06; - } else { + } + else { var_r29->unk28 = var_r29->unk02; } } - Hu3DModelAttrReset(var_r29->unk28, 1); + Hu3DModelAttrReset(var_r29->unk28, HU3D_ATTR_DISPOFF); Hu3DModelHookSet(temp_r31->unk00, lbl_1_data_220[temp_r31->unk14][1], var_r29->unk28); Hu3DMotionSet(var_r29->unk28, var_r29->unk08[temp_r31->unk0C]); } @@ -803,7 +775,8 @@ void fn_1_1C64(void) { } if (temp_r31->unk14 == 7 && temp_r31->unk38 == 0) { Hu3DMotionSet(temp_r31->unk00, temp_r31->unk0E); - } else { + } + else { Hu3DMotionSet(temp_r31->unk00, temp_r31->unk02[1]); } Hu3DModelAttrReset(temp_r31->unk00, 0x40000005); @@ -816,20 +789,23 @@ void fn_1_1C64(void) { } if (temp_r31->unk14 == 7 && temp_r31->unk38 == 0) { Hu3DMotionSet(temp_r31->unk00, temp_r31->unk10); - } else if (temp_r31->unk14 == 6 && temp_r31->unk38 == 0) { + } + else if (temp_r31->unk14 == 6 && temp_r31->unk38 == 0) { Hu3DMotionSet(temp_r31->unk00, temp_r31->unk0E); - } else { + } + else { Hu3DMotionSet(temp_r31->unk00, temp_r31->unk02[2]); } var_r23 = 150; Hu3DMotionSet(var_r25->unk28, var_r25->unk08[temp_r31->unk0C + 1]); - Hu3DModelAttrSet(var_r25->unk28, 0x40000002); + Hu3DModelAttrSet(var_r25->unk28, HU3D_MOTATTR_PAUSE); if (temp_r31->unk14 == 6) { HuPrcSleep(12); Hu3DModelAttrReset(var_r25->unk28, 0x40000006); if (temp_r31->unk38 != 0) { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x758); - } else { + } + else { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x757); } } @@ -837,7 +813,7 @@ void fn_1_1C64(void) { HuPrcSleep(11); Hu3DModelAttrReset(var_r25->unk28, 0x40000006); fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x754); - Hu3DModelAttrReset(lbl_1_bss_6E0, 1); + Hu3DModelAttrReset(lbl_1_bss_6E0, HU3D_ATTR_DISPOFF); Hu3DMotionTimeSet(lbl_1_bss_6E0, 0.0f); } while (!Hu3DMotionEndCheck(temp_r31->unk00)) { @@ -847,7 +823,8 @@ void fn_1_1C64(void) { if (temp_r31->unk14 != 6) { if (temp_r31->unk38 != 0) { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x758); - } else { + } + else { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x757); } Hu3DModelAttrReset(var_r25->unk28, 0x40000006); @@ -861,11 +838,11 @@ void fn_1_1C64(void) { } var_r25->unk34 = 1; Hu3DMotionSet(var_r25->unk28, var_r25->unk08[temp_r31->unk0C + 2]); - Hu3DModelAttrSet(var_r25->unk28, 0x40000001); + Hu3DModelAttrSet(var_r25->unk28, HU3D_MOTATTR_LOOP); if (lbl_1_data_260[temp_r31->unk14] > 1) { var_r29->unk34 = 1; Hu3DMotionSet(var_r29->unk28, var_r29->unk08[temp_r31->unk0C + 2]); - Hu3DModelAttrSet(var_r29->unk28, 0x40000001); + Hu3DModelAttrSet(var_r29->unk28, HU3D_MOTATTR_LOOP); } temp_r31->unk1C = 2; var_r26 = var_r23; @@ -877,13 +854,16 @@ void fn_1_1C64(void) { if (temp_r31->unk38 != 0) { if (temp_r31->unk28 != 0) { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x75C); - } else { + } + else { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x75A); } - } else { + } + else { if (temp_r31->unk28 != 0) { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x75B); - } else { + } + else { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x759); } } @@ -895,13 +875,16 @@ void fn_1_1C64(void) { if (temp_r31->unk38 != 0) { if (temp_r31->unk2C != 0) { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x75C); - } else { + } + else { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x75A); } - } else { + } + else { if (temp_r31->unk2C != 0) { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x75B); - } else { + } + else { fn_1_4B8(temp_r31->unk48, temp_r31->unk4C, 0x759); } } @@ -916,7 +899,8 @@ void fn_1_1C64(void) { if (Hu3DMotionEndCheck(var_r25->unk28) && Hu3DMotionEndCheck(var_r29->unk28)) { break; } - } else { + } + else { if (var_r26 <= 0) { break; } @@ -949,7 +933,8 @@ void fn_1_1C64(void) { while (!Hu3DMotionEndCheck(var_r25->unk28) || !Hu3DMotionEndCheck(var_r29->unk28)) { HuPrcVSleep(); } - } else { + } + else { while (!Hu3DMotionEndCheck(var_r25->unk28)) { HuPrcVSleep(); } @@ -972,34 +957,37 @@ void fn_1_1C64(void) { HuPrcVSleep(); } var_r25->unk30 = -1; - Hu3DModelAttrSet(var_r25->unk28, 1); + Hu3DModelAttrSet(var_r25->unk28, HU3D_ATTR_DISPOFF); if (lbl_1_data_260[temp_r31->unk14] > 1) { var_r29->unk30 = -1; - Hu3DModelAttrSet(var_r29->unk28, 1); + Hu3DModelAttrSet(var_r29->unk28, HU3D_ATTR_DISPOFF); } Hu3DModelHookReset(temp_r31->unk00); Hu3DMotionSet(temp_r31->unk00, temp_r31->unk02[0]); - Hu3DModelAttrSet(temp_r31->unk00, 0x40000001); + Hu3DModelAttrSet(temp_r31->unk00, HU3D_MOTATTR_LOOP); temp_r31->unk34 = 0; HuPrcVSleep(); } } // identical to m411Dll/main.c::fn_1_5D58 -s8 fn_1_2BF4(s32 arg0, s32 arg1) { - UnkM445Struct_02* temp_r31; +s8 fn_1_2BF4(s32 arg0, s32 arg1) +{ + UnkM445Struct_02 *temp_r31; s8 var_r30; temp_r31 = &lbl_1_bss_588[arg0]; if (!GWPlayerCfg[arg0].iscom) { (arg1 != 0) ? (var_r30 = HuPadStkY[temp_r31->unk20]) : (var_r30 = HuPadStkX[temp_r31->unk20]); - } else { + } + else { (arg1 != 0) ? (var_r30 = temp_r31->unk7D) : (var_r30 = temp_r31->unk7C); } return var_r30; } -void fn_1_2CAC(Vec* arg0, float arg1, float arg2) { +void fn_1_2CAC(Vec *arg0, float arg1, float arg2) +{ float temp_f29; temp_f29 = sqrtf(arg0->x * arg0->x + arg0->z * arg0->z); @@ -1010,22 +998,25 @@ void fn_1_2CAC(Vec* arg0, float arg1, float arg2) { // similar to m414Dll/main.c::fn_1_5554 // TODO: update other files (m414 and m411). -s8 fn_1_2E68(s32 arg0, s32 arg1) { - UnkM445Struct_02* temp_r31; +s8 fn_1_2E68(s32 arg0, s32 arg1) +{ + UnkM445Struct_02 *temp_r31; s8 var_r30; temp_r31 = &lbl_1_bss_588[arg0]; var_r30 = 0; if (!GWPlayerCfg[arg0].iscom && lbl_1_bss_6DC < 4) { (arg1 != 0) ? (var_r30 = HuPadStkY[temp_r31->unk20]) : (var_r30 = HuPadStkX[temp_r31->unk20]); - } else { + } + else { (arg1 != 0) ? (var_r30 = temp_r31->unk7D) : (var_r30 = temp_r31->unk7C); } return var_r30; } -u8 fn_1_2F38(s32 arg0, s32 arg1) { - UnkM445Struct_02* temp_r31; +u8 fn_1_2F38(s32 arg0, s32 arg1) +{ + UnkM445Struct_02 *temp_r31; s8 var_r30; temp_r31 = &lbl_1_bss_588[arg0]; @@ -1033,15 +1024,17 @@ u8 fn_1_2F38(s32 arg0, s32 arg1) { if (lbl_1_bss_6DC < 4) { if (!GWPlayerCfg[arg0].iscom) { (arg1 != 0) ? (var_r30 = HuPadTrigR[temp_r31->unk20]) : (var_r30 = HuPadTrigL[temp_r31->unk20]); - } else { + } + else { (arg1 != 0) ? (var_r30 = temp_r31->unk7E) : (var_r30 = temp_r31->unk7F); } } return var_r30; } -u16 fn_1_3010(s32 arg0) { - UnkM445Struct_02* temp_r31; +u16 fn_1_3010(s32 arg0) +{ + UnkM445Struct_02 *temp_r31; u16 var_r30; temp_r31 = &lbl_1_bss_588[arg0]; @@ -1049,36 +1042,40 @@ u16 fn_1_3010(s32 arg0) { if (lbl_1_bss_6DC < 4) { if (!GWPlayerCfg[arg0].iscom) { var_r30 = HuPadBtnDown[temp_r31->unk20]; - } else { + } + else { var_r30 = temp_r31->unk82; } } return var_r30; } -u16 fn_1_3094(s32 arg0) { - UnkM445Struct_02* temp_r31; +u16 fn_1_3094(s32 arg0) +{ + UnkM445Struct_02 *temp_r31; u16 var_r30; temp_r31 = &lbl_1_bss_588[arg0]; if (lbl_1_bss_6DC < 4) { if (!GWPlayerCfg[arg0].iscom) { var_r30 = HuPadBtn[temp_r31->unk20]; - } else { + } + else { var_r30 = temp_r31->unk80; } } return var_r30; } -s32 fn_1_3114(UnkM445Struct_02* arg0, float arg1, float arg2, float arg3) { +s32 fn_1_3114(UnkM445Struct_02 *arg0, float arg1, float arg2, float arg3) +{ Vec sp30; Vec sp24; Vec sp18; s32 var_r28; float var_f27; float var_f28; - UnkM445Struct_02* temp_r31; + UnkM445Struct_02 *temp_r31; s32 i; var_r28 = -1; @@ -1098,13 +1095,14 @@ s32 fn_1_3114(UnkM445Struct_02* arg0, float arg1, float arg2, float arg3) { return var_r28; } -s32 fn_1_3334(UnkM445Struct_02* arg0, s32* arg1) { +s32 fn_1_3334(UnkM445Struct_02 *arg0, s32 *arg1) +{ Vec sp30; Vec sp24; Vec sp18; float var_f27; float var_f28; - UnkM445Struct_02* temp_r31; + UnkM445Struct_02 *temp_r31; s32 var_r27; s32 var_r28; s32 i; @@ -1130,7 +1128,8 @@ s32 fn_1_3334(UnkM445Struct_02* arg0, s32* arg1) { return var_r27; } -void fn_1_3548(UnkM445Struct_02* arg0) { +void fn_1_3548(UnkM445Struct_02 *arg0) +{ Vec spA8; Vec sp9C; Vec sp90; @@ -1148,8 +1147,8 @@ void fn_1_3548(UnkM445Struct_02* arg0) { float var_f27; float var_f26; float var_f25; - UnkM445Struct_02* var_r30; - UnkM445Struct_02* temp_r27; + UnkM445Struct_02 *var_r30; + UnkM445Struct_02 *temp_r27; s32 i; temp_r24 = fn_1_3334(arg0, &sp68); @@ -1193,7 +1192,8 @@ void fn_1_3548(UnkM445Struct_02* arg0) { sp60 = var_f20 - var_f25; if (sp60 > 0.0f) { sp5C = -0.5f; - } else { + } + else { sp5C = 0.5f; } if (ABS_INV(var_f20 - var_f25) > 180.0f) { @@ -1241,7 +1241,8 @@ block_end: arg0->unk3C = sp54; } -float fn_1_42A0(float arg0, float arg1, float arg2) { +float fn_1_42A0(float arg0, float arg1, float arg2) +{ float var_f31; float var_f30; @@ -1259,7 +1260,8 @@ float fn_1_42A0(float arg0, float arg1, float arg2) { return var_f30; } -BOOL fn_1_43A4(UnkM445Struct_02* arg0, float arg1, float arg2) { +BOOL fn_1_43A4(UnkM445Struct_02 *arg0, float arg1, float arg2) +{ Vec sp2C; Vec sp20; Vec sp14; @@ -1275,7 +1277,8 @@ BOOL fn_1_43A4(UnkM445Struct_02* arg0, float arg1, float arg2) { return var_r30; } -void fn_1_45D0(UnkM445Struct_02* arg0) { +void fn_1_45D0(UnkM445Struct_02 *arg0) +{ Vec spC8; Vec spBC; Vec spB0; @@ -1285,8 +1288,8 @@ void fn_1_45D0(UnkM445Struct_02* arg0) { float sp58; float sp54; float var_f24; - UnkM445Struct_00* temp_r30; - UnkM445Struct_02* var_r28; + UnkM445Struct_00 *temp_r30; + UnkM445Struct_02 *var_r28; u32 var_r27; s32 i; @@ -1295,7 +1298,8 @@ void fn_1_45D0(UnkM445Struct_02* arg0) { arg0->unk80 = arg0->unk82 = 0; if (arg0->unk18 != 0) { var_r28 = &lbl_1_bss_588[0]; - } else { + } + else { var_r28 = &lbl_1_bss_588[1]; } switch (GWPlayerCfg[arg0->unk18].diff) { @@ -1330,7 +1334,8 @@ void fn_1_45D0(UnkM445Struct_02* arg0) { sp60 = sqrtf(arg0->unk34 * arg0->unk34 + arg0->unk3C * arg0->unk3C); if (sp60 < 200.0f) { sp60 = 400.0f; - } else { + } + else { sp60 = 600.0f; } if (sp5C > var_f24 && var_f24 < sp60) { @@ -1370,7 +1375,8 @@ void fn_1_45D0(UnkM445Struct_02* arg0) { sp64 = atan2d(arg0->unk84 - arg0->unk34, arg0->unk88 - arg0->unk3C); arg0->unk7C = 50.0 * sind(sp64) * sp54; arg0->unk7D = -50.0 * cosd(sp64) * sp54; - } else { + } + else { if (temp_r30->unk1C == 2) { for (i = 0; i < lbl_1_data_260[temp_r30->unk14]; i++) { if (temp_r30->unk20[i] == 0) { @@ -1396,7 +1402,8 @@ void fn_1_45D0(UnkM445Struct_02* arg0) { } } -void fn_1_557C(void) { +void fn_1_557C(void) +{ s32 j; s32 i; @@ -1407,7 +1414,8 @@ void fn_1_557C(void) { } } -void fn_1_55F0(void) { +void fn_1_55F0(void) +{ s32 j; s32 i; @@ -1418,13 +1426,15 @@ void fn_1_55F0(void) { } } -void fn_1_5664(UnkM445Struct_02* arg0, s32 arg1) { +void fn_1_5664(UnkM445Struct_02 *arg0, s32 arg1) +{ HuSprBankSet(arg0->unk04, 3, arg1 % 10); HuSprBankSet(arg0->unk04, 4, arg1 / 10); HuSprAttrReset(arg0->unk04, 4, 4); } -void fn_1_5700(UnkM445Struct_02* arg0) { +void fn_1_5700(UnkM445Struct_02 *arg0) +{ Vec sp38; Vec sp2C; Vec sp20; @@ -1432,7 +1442,7 @@ void fn_1_5700(UnkM445Struct_02* arg0) { float var_f26; float var_f21; float var_f20; - UnkM445Struct_02* var_r27; + UnkM445Struct_02 *var_r27; s32 i; s32 var_r28; @@ -1442,7 +1452,7 @@ void fn_1_5700(UnkM445Struct_02* arg0) { Hu3DModelScaleSet(arg0->unk06, var_f21, var_f21, var_f21); HuPrcVSleep(); } - Hu3DModelAttrSet(arg0->unk06, 1); + Hu3DModelAttrSet(arg0->unk06, HU3D_ATTR_DISPOFF); arg0->unk06 = -1; Hu3DMotionOverlayReset(arg0->unk00); if (lbl_1_bss_588[0].unk06 == -1 && lbl_1_bss_588[1].unk06 == -1) { @@ -1460,30 +1470,37 @@ void fn_1_5700(UnkM445Struct_02* arg0) { arg0->unk84 = -230.0f; arg0->unk88 = 45.0f; var_r28 = 1; - } else if (arg0->unk3C > 203.0f || arg0->unk3C < -203.0f) { + } + else if (arg0->unk3C > 203.0f || arg0->unk3C < -203.0f) { arg0->unk84 = -170.0f; arg0->unk88 = arg0->unk3C; - } else { + } + else { arg0->unk84 = arg0->unk34; if (arg0->unk3C > 0.0f) { arg0->unk88 = 210.0f; - } else { + } + else { arg0->unk88 = -210.0f; } } - } else { + } + else { if (arg0->unk34 >= 152.0f) { arg0->unk84 = 230.0f; arg0->unk88 = -45.0f; var_r28 = 1; - } else if (arg0->unk3C > 203.0f || arg0->unk3C < -203.0f) { + } + else if (arg0->unk3C > 203.0f || arg0->unk3C < -203.0f) { arg0->unk84 = 170.0f; arg0->unk88 = arg0->unk3C; - } else { + } + else { arg0->unk84 = arg0->unk34; if (arg0->unk3C > 0.0f) { arg0->unk88 = 210.0f; - } else { + } + else { arg0->unk88 = -210.0f; } } @@ -1505,7 +1522,8 @@ void fn_1_5700(UnkM445Struct_02* arg0) { arg0->unk84 = arg0->unk34 + 100.0 * sind(temp_f27); arg0->unk88 = arg0->unk3C + 100.0 * cosd(temp_f27); } - } else { + } + else { if (var_f26 < var_f20) { temp_f27 += 180.0f; lbl_1_bss_4 = arg0->unk18; @@ -1514,7 +1532,8 @@ void fn_1_5700(UnkM445Struct_02* arg0) { arg0->unk88 = arg0->unk3C + 100.0 * cosd(temp_f27); } } - } else if (arg0->unk18 == lbl_1_bss_4) { + } + else if (arg0->unk18 == lbl_1_bss_4) { OSReport("pno %d dir %f\n", arg0->unk18, lbl_1_bss_0); arg0->unk84 = arg0->unk34 + 100.0 * sind(lbl_1_bss_0); arg0->unk88 = arg0->unk3C + 100.0 * cosd(lbl_1_bss_0); @@ -1532,13 +1551,14 @@ void fn_1_5700(UnkM445Struct_02* arg0) { arg0->unk7D = -50.0 * cosd(temp_f27); } -void fn_1_6268(void) { +void fn_1_6268(void) +{ Vec sp1D8; s32 sp120; float sp11C; float var_f19; - UnkM445Struct_02* temp_r31; - UnkM445Struct_00* temp_r30; + UnkM445Struct_02 *temp_r31; + UnkM445Struct_00 *temp_r30; u32 var_r24; s32 var_r26; s32 var_r28; @@ -1574,7 +1594,8 @@ void fn_1_6268(void) { if (fn_1_520(temp_r31->unk18) == FALSE) { Hu3DMotionOverlayReset(temp_r31->unk00); CharModelMotionSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[5]); - } else { + } + else { Hu3DMotionSet(temp_r31->unk00, temp_r31->unk08[4]); Hu3DMotionSpeedSet(temp_r31->unk00, 1.0f); } @@ -1582,7 +1603,8 @@ void fn_1_6268(void) { HuPrcSleep(15); if (temp_r31->unk18 != 0) { fn_1_4B8(temp_r31->unk34, temp_r31->unk3C, 0x75F); - } else { + } + else { fn_1_4B8(temp_r31->unk34, temp_r31->unk3C, 0x75E); } HuPrcSleep(15); @@ -1597,33 +1619,38 @@ void fn_1_6268(void) { temp_r30->unk28 = temp_r31->unk18; if (temp_r31->unk18 != 0) { fn_1_4B8(temp_r30->unk48, temp_r30->unk4C, 0x75D); - } else { + } + else { fn_1_4B8(temp_r30->unk48, temp_r30->unk4C, 0x750); } - Hu3DModelAttrReset(temp_r31->unk02, 1); + Hu3DModelAttrReset(temp_r31->unk02, HU3D_ATTR_DISPOFF); Hu3DMotionTimeSet(temp_r31->unk02, 0.0f); Hu3DModelPosSet(temp_r31->unk02, sp1D8.x, 160.0f, sp1D8.z + 100.0f); if (temp_r30->unk38 != 0) { temp_r31->unk30 += 2; - } else { + } + else { temp_r31->unk30++; } fn_1_5664(temp_r31, temp_r31->unk30); } - if (lbl_1_data_260[temp_r30->unk14] > 1 && fn_1_43A4(temp_r31, temp_r30->unk50[1], temp_r30->unk58[1]) && temp_r30->unk20[1] == 0) { + if (lbl_1_data_260[temp_r30->unk14] > 1 && fn_1_43A4(temp_r31, temp_r30->unk50[1], temp_r30->unk58[1]) + && temp_r30->unk20[1] == 0) { temp_r30->unk20[1] = 1; temp_r30->unk2C = temp_r31->unk18; if (temp_r31->unk18 != 0) { fn_1_4B8(temp_r30->unk48, temp_r30->unk4C, 0x75D); - } else { + } + else { fn_1_4B8(temp_r30->unk48, temp_r30->unk4C, 0x750); } - Hu3DModelAttrReset(temp_r31->unk02, 1); + Hu3DModelAttrReset(temp_r31->unk02, HU3D_ATTR_DISPOFF); Hu3DMotionTimeSet(temp_r31->unk02, 0.0f); Hu3DModelPosSet(temp_r31->unk02, sp1D8.x, 160.0f, sp1D8.z + 100.0f); if (temp_r30->unk38 != 0) { temp_r31->unk30 += 2; - } else { + } + else { temp_r31->unk30++; } fn_1_5664(temp_r31, temp_r31->unk30); @@ -1641,11 +1668,13 @@ void fn_1_6268(void) { Hu3DMotionOverlaySet(temp_r31->unk00, temp_r31->unk08[4]); Hu3DModelAttrSet(temp_r31->unk00, 0x40000200); } - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 1.0f); } - } else { + } + else { HuSetVecF(&sp1D8, fn_1_2E68(temp_r31->unk18, 0) / 4.0f, 0.0, -fn_1_2E68(temp_r31->unk18, 1) / 4.0f); temp_r31->unk5C = sqrtf(sp1D8.x * sp1D8.x + sp1D8.y * sp1D8.y + sp1D8.z * sp1D8.z); if (temp_r31->unk5C >= 0.5f) { @@ -1661,30 +1690,36 @@ void fn_1_6268(void) { if (temp_r31->unk24 != 2) { temp_r31->unk24 = 2; if (fn_1_520(temp_r31->unk18) == FALSE) { - CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); + CharModelMotionShiftSet( + lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); if (lbl_1_bss_6DC < 5) { Hu3DMotionOverlaySet(temp_r31->unk00, temp_r31->unk08[4]); Hu3DModelAttrSet(temp_r31->unk00, 0x40000200); } - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f); } } - } else if (temp_r31->unk24 != 1) { + } + else if (temp_r31->unk24 != 1) { temp_r31->unk24 = 1; if (fn_1_520(temp_r31->unk18) == FALSE) { - CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); + CharModelMotionShiftSet( + lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); if (lbl_1_bss_6DC < 5) { Hu3DMotionOverlaySet(temp_r31->unk00, temp_r31->unk08[4]); Hu3DModelAttrSet(temp_r31->unk00, 0x40000200); } - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[1], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 2.0f); } } - } else if (temp_r31->unk24 != 0) { + } + else if (temp_r31->unk24 != 0) { temp_r31->unk24 = 0; if (fn_1_520(temp_r31->unk18) == FALSE) { CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[0], 0.0f, 0.0f, HU3D_MOTATTR_LOOP); @@ -1692,7 +1727,8 @@ void fn_1_6268(void) { Hu3DMotionOverlaySet(temp_r31->unk00, temp_r31->unk08[4]); Hu3DModelAttrSet(temp_r31->unk00, 0x40000200); } - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 0.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 1.0f); } @@ -1719,7 +1755,8 @@ block_exit_loop: lbl_1_bss_6DC = 6; if (fn_1_520(temp_r31->unk18) == FALSE) { CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[0], 0.0f, 2.0f, HU3D_MOTATTR_LOOP); - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 0.0f, HU3D_MOTATTR_LOOP); Hu3DMotionShiftSpeedSet(temp_r31->unk00, 1.0f); } @@ -1752,13 +1789,16 @@ block_exit_loop: if (fn_1_520(1) == FALSE) { if (var_r26 != -1) { HuAudSStreamPlay(1); - } else { + } + else { HuAudSStreamPlay(4); } - } else { + } + else { if (var_r26 == 0) { HuAudSStreamPlay(1); - } else { + } + else { HuAudSStreamPlay(3); } } @@ -1766,24 +1806,29 @@ block_exit_loop: if (var_r26 == -1) { if (fn_1_520(temp_r31->unk18) == FALSE) { var_r28 = 7; - } else { + } + else { var_r28 = 6; } - } else { + } + else { GWPlayerCoinWinSet(var_r26, 10); if (var_r26 == temp_r31->unk18) { var_r28 = 6; - } else { + } + else { var_r28 = 7; } } if (fn_1_520(temp_r31->unk18) == FALSE) { CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[var_r28], 0.0f, 8.0f, var_r24); - } else { + } + else { if (var_r28 == 6) { var_r28 = 5; var_r24 = HU3D_MOTATTR_LOOP; - } else { + } + else { var_r28 = 6; var_r24 = HU3D_MOTATTR_NONE; } @@ -1801,9 +1846,10 @@ block_exit_loop: } } -void fn_1_7FC0(ModelData* model, ParticleData* particle, Mtx matrix) { - HsfanimStruct01* var_r31; - UnkM445Struct_02* temp_r29; +void fn_1_7FC0(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; + UnkM445Struct_02 *temp_r29; float var_f31; s16 var_r27; s16 var_r28; @@ -1861,11 +1907,12 @@ void fn_1_7FC0(ModelData* model, ParticleData* particle, Mtx matrix) { } } -void fn_1_8320(void) { +void fn_1_8320(void) +{ float sp20[2]; GXColor sp1C; - WindowData* var_r26; - UnkM445Struct_02* temp_r31; + WindowData *var_r26; + UnkM445Struct_02 *temp_r31; s16 temp_r25; s16 var_r29; u32 var_r27; @@ -1882,7 +1929,7 @@ void fn_1_8320(void) { } HuAudFXPlay(0x756); Hu3DMotionSet(temp_r28, lbl_1_bss_288[5].unk02[0]); - Hu3DModelAttrSet(temp_r28, 0x40000001); + Hu3DModelAttrSet(temp_r28, HU3D_MOTATTR_LOOP); HuPrcSleep(30); for (i = 30; i != 0; i--) { CRotM[0].x += -0.55f; @@ -1892,9 +1939,8 @@ void fn_1_8320(void) { } if (fn_1_520(1) == TRUE) { temp_r25 = HuAudSeqPlay(0x3D); - HuWinMesMaxSizeGet(8, sp20, - MAKE_MESSID(41, 1), MAKE_MESSID(41, 2), MAKE_MESSID(41, 3), MAKE_MESSID(41, 4), - MAKE_MESSID(41, 5), MAKE_MESSID(41, 6), MAKE_MESSID(41, 7), MAKE_MESSID(41, 8)); + HuWinMesMaxSizeGet(8, sp20, MAKE_MESSID(41, 1), MAKE_MESSID(41, 2), MAKE_MESSID(41, 3), MAKE_MESSID(41, 4), MAKE_MESSID(41, 5), + MAKE_MESSID(41, 6), MAKE_MESSID(41, 7), MAKE_MESSID(41, 8)); var_r29 = HuWinCreate(-10000.0f, 40.0f, sp20[0], sp20[1], 1); HuWinPriSet(var_r29, 0x100); sp1C.r = sp1C.g = sp1C.b = 0xFF; @@ -1914,7 +1960,8 @@ void fn_1_8320(void) { if (var_r24 == 0) { i = 5; var_r27 = MAKE_MESSID(41, 3); - } else { + } + else { i = 1; var_r27 = MAKE_MESSID(41, 8); } @@ -1931,7 +1978,8 @@ void fn_1_8320(void) { temp_r31 = &lbl_1_bss_588[i]; if (fn_1_520(temp_r31->unk18) == FALSE) { CharModelMotionSet(lbl_1_data_0[GWPlayerCfg[i].character], temp_r31->unk08[3]); - } else { + } + else { Hu3DMotionSet(temp_r31->unk00, temp_r31->unk08[3]); } Hu3DModelAttrReset(temp_r31->unk00, 0x40000001); @@ -1943,7 +1991,8 @@ void fn_1_8320(void) { Hu3DModelRotSet(temp_r31->unk06, 0.0f, 0.0f, 0.0f); if (fn_1_520(temp_r31->unk18) == FALSE) { Hu3DModelHookSet(temp_r31->unk00, CharModelHookNameGet(GWPlayerCfg[i].character, 2, 0), temp_r31->unk06); - } else { + } + else { Hu3DModelHookSet(temp_r31->unk00, "itemhook_r", temp_r31->unk06); } } @@ -1953,13 +2002,15 @@ void fn_1_8320(void) { if (fn_1_520(temp_r31->unk18) == FALSE) { CharModelMotionShiftSet(lbl_1_data_0[GWPlayerCfg[temp_r31->unk18].character], temp_r31->unk08[0], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); Hu3DMotionOverlaySet(temp_r31->unk00, temp_r31->unk08[4]); - } else { + } + else { Hu3DMotionShiftSet(temp_r31->unk00, temp_r31->unk08[0], 0.0f, 8.0f, HU3D_MOTATTR_LOOP); } } } -void fn_1_8938(void) { +void fn_1_8938(void) +{ s32 i; while (lbl_1_bss_6DC < 6) { @@ -1971,7 +2022,8 @@ void fn_1_8938(void) { } } -void fn_1_89B8(void) { +void fn_1_89B8(void) +{ while (TRUE) { if (omSysExitReq == 1) { WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); @@ -1987,7 +2039,8 @@ void fn_1_89B8(void) { } } -void fn_1_8A18(void) { +void fn_1_8A18(void) +{ s16 temp_r28; s16 var_r31; s16 temp_r26; diff --git a/src/REL/m446Dll/card.c b/src/REL/m446Dll/card.c index 724bb2eb..769ad6a2 100644 --- a/src/REL/m446Dll/card.c +++ b/src/REL/m446Dll/card.c @@ -4,15 +4,16 @@ #include "math.h" // data -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_6C[5] = {0x4D001B, 0x4D001C, 0x4D001D, 0x4D001E, 0x4D001E}; +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_6C[5] = { 0x4D001B, 0x4D001C, 0x4D001D, 0x4D001E, 0x4D001E }; // bss -unkStruct3* lbl_1_bss_18; +unkStruct3 *lbl_1_bss_18; -unkStruct2* fn_1_1C64(s32 arg0) { - unkStruct2* temp_r3; +unkStruct2 *fn_1_1C64(s32 arg0) +{ + unkStruct2 *temp_r3; temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM); if (!temp_r3) { @@ -28,52 +29,62 @@ unkStruct2* fn_1_1C64(s32 arg0) { return temp_r3; } -void fn_1_1CF8(unkStruct2* arg0) { +void fn_1_1CF8(unkStruct2 *arg0) +{ HuMemDirectFree(arg0->unk0); HuMemDirectFree(arg0); } -s32 fn_1_1D30(unkStruct2* arg0, void* arg1) { +s32 fn_1_1D30(unkStruct2 *arg0, void *arg1) +{ if (arg0->unk4 <= arg0->unk8) { return 0; - } else { + } + else { arg0->unk0[arg0->unk8] = arg1; arg0->unk8++; return 1; } } -s32 fn_1_1D6C(unkStruct2* arg0, unkStruct4** arg1) { +s32 fn_1_1D6C(unkStruct2 *arg0, unkStruct4 **arg1) +{ if (arg0->unk8 <= 0) { return 0; - } else { + } + else { arg0->unk8--; *arg1 = arg0->unk0[arg0->unk8]; return 1; } } -s32 fn_1_1DA8(unkStruct2* arg0, void** arg1) { +s32 fn_1_1DA8(unkStruct2 *arg0, void **arg1) +{ if (arg0->unk8 <= 0) { return 0; - } else { + } + else { *arg1 = *(&arg0->unk0[arg0->unk8] - 1); return 1; } } -BOOL fn_1_1DDC(unkStruct2* arg0) { +BOOL fn_1_1DDC(unkStruct2 *arg0) +{ return arg0->unk8 == 0; } -s32 fn_1_1DEC(unkStruct2* arg0) { +s32 fn_1_1DEC(unkStruct2 *arg0) +{ return arg0->unk8; } #pragma dont_inline on -unkStruct3* fn_1_1DF4(void* arg0) { - unkStruct3* temp_r3; +unkStruct3 *fn_1_1DF4(void *arg0) +{ + unkStruct3 *temp_r3; temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM); if (!temp_r3) { @@ -85,17 +96,20 @@ unkStruct3* fn_1_1DF4(void* arg0) { return temp_r3; } -void fn_1_1E5C(unkStruct3* arg0) { +void fn_1_1E5C(unkStruct3 *arg0) +{ HuMemDirectFree(arg0); } -void fn_1_1E84(unkStruct3** arg0) { +void fn_1_1E84(unkStruct3 **arg0) +{ unkStruct3 *temp = *arg0; HuMemDirectFree(temp); *arg0 = NULL; } -void fn_1_1EC8(unkStruct3* arg0, unkStruct3* arg1) { +void fn_1_1EC8(unkStruct3 *arg0, unkStruct3 *arg1) +{ if (arg0) { arg1->unk8 = arg0->unk8; arg1->unk4 = arg0; @@ -103,13 +117,15 @@ void fn_1_1EC8(unkStruct3* arg0, unkStruct3* arg1) { if (arg1->unk8) { arg1->unk8->unk4 = arg1; } - } else { + } + else { arg1->unk4 = arg1; arg1->unk8 = arg1; } } -void fn_1_1F04(unkStruct3* arg0) { +void fn_1_1F04(unkStruct3 *arg0) +{ if (arg0->unk8) { arg0->unk8->unk4 = arg0->unk4; } @@ -120,9 +136,10 @@ void fn_1_1F04(unkStruct3* arg0) { #pragma dont_inline reset -void fn_1_1F38(u8* arg0, u8* arg1, s32 arg2) { - u8* var_r30 = arg0; - u8* var_r31 = arg1; +void fn_1_1F38(u8 *arg0, u8 *arg1, s32 arg2) +{ + u8 *var_r30 = arg0; + u8 *var_r31 = arg1; if (arg2 <= 0) { 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) { - u8* var_r30 = arg0; +void fn_1_1F84(u8 *arg0, s8 arg1, s32 arg2) +{ + u8 *var_r30 = arg0; if (arg2 <= 0) { return; } @@ -143,8 +161,9 @@ void fn_1_1F84(u8* arg0, s8 arg1, s32 arg2) { } } -void fn_1_1FC0(u8* arg0, s32 arg1) { - u8* var_r30 = arg0; +void fn_1_1FC0(u8 *arg0, s32 arg1) +{ + u8 *var_r30 = arg0; if (arg1 <= 0) { return; } @@ -154,10 +173,11 @@ void fn_1_1FC0(u8* arg0, s32 arg1) { } } -s32 fn_1_1FFC(s8* arg0, s8* arg1, s32 arg2) { - s8* var_r30 = arg0; - s8* var_r31 = arg1; - +s32 fn_1_1FFC(s8 *arg0, s8 *arg1, s32 arg2) +{ + s8 *var_r30 = arg0; + s8 *var_r31 = arg1; + if (arg2 <= 0) { return 0; } @@ -168,14 +188,16 @@ s32 fn_1_1FFC(s8* arg0, s8* arg1, s32 arg2) { return *var_r30 - *var_r31; } -s32 fn_1_2064(void) { +s32 fn_1_2064(void) +{ lbl_1_bss_18 = 0; return 1; } -void fn_1_207C(void) { - unkStruct4* var_r30; - unkStruct3* var_r31; +void fn_1_207C(void) +{ + unkStruct4 *var_r30; + unkStruct3 *var_r31; var_r31 = lbl_1_bss_18; 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; f32 temp_f31; s32 temp_r5; - unkStruct4* temp_r31; - unkStruct3* var_r30; + unkStruct4 *temp_r31; + unkStruct3 *var_r30; var_r30 = lbl_1_bss_18; if (var_r30) { @@ -204,7 +227,8 @@ void fn_1_20D4(void) { if (temp_r31->unk70 != 0) { if (temp_r31->unk7C > 0) { temp_r31->unk7C--; - } else { + } + else { 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.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* temp_r31; - unkStruct3* temp_r30; +unkStruct4 *m446CardCreate(s32 arg0) +{ + unkStruct4 *temp_r31; + unkStruct3 *temp_r30; temp_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x98, MEMORY_DEFAULT_NUM); if (!temp_r31) { @@ -289,14 +314,16 @@ unkStruct4* m446CardCreate(s32 arg0) { } if (lbl_1_bss_18) { fn_1_1EC8(lbl_1_bss_18, temp_r30); - } else { + } + else { lbl_1_bss_18 = temp_r30; } return temp_r31; } -void fn_1_2688(unkStruct4* arg0) { - unkStruct3* var_r31 = lbl_1_bss_18; +void fn_1_2688(unkStruct4 *arg0) +{ + unkStruct3 *var_r31 = lbl_1_bss_18; do { if (arg0 == var_r31->unk0) { if (var_r31 == lbl_1_bss_18) { @@ -313,7 +340,8 @@ void fn_1_2688(unkStruct4* arg0) { } while (var_r31); } -void fn_1_272C(unkStruct4* arg0) { +void fn_1_272C(unkStruct4 *arg0) +{ Vec sp8; sp8 = arg0->unk34; @@ -322,7 +350,8 @@ void fn_1_272C(unkStruct4* arg0) { fn_1_2928(arg0, &sp8, 0x1E); } -void fn_1_2794(unkStruct4* arg0) { +void fn_1_2794(unkStruct4 *arg0) +{ Vec sp8; sp8 = arg0->unk34; @@ -331,7 +360,8 @@ void fn_1_2794(unkStruct4* arg0) { 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->unk28 = *arg1; arg0->unk1C = arg0->unk10; @@ -340,7 +370,8 @@ void fn_1_27FC(unkStruct4* arg0, Vec* arg1, s32 arg2) { 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->unk28 = *arg1; arg0->unk1C = arg0->unk10; @@ -350,7 +381,8 @@ void fn_1_2890(unkStruct4* arg0, Vec* arg1, s32 arg2, s32 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->unk40 = arg0->unk34; arg0->unk88 = 0.0f; @@ -358,7 +390,8 @@ void fn_1_2928(unkStruct4* arg0, Vec* arg1, s32 arg2) { 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->unk5C = arg0->unk58; arg0->unk90 = 0.0f; @@ -366,28 +399,32 @@ void fn_1_29B4(unkStruct4* arg0, f32 arg8, s32 arg1) { arg0->unk78 = 1; } -void fn_1_2A1C(unkStruct4* arg0) { - Hu3DModelAttrReset(arg0->unkA[1], 1); +void fn_1_2A1C(unkStruct4 *arg0) +{ + Hu3DModelAttrReset(arg0->unkA[1], HU3D_ATTR_DISPOFF); arg0->unk6C = 1; } -void fn_1_2A58(unkStruct4* arg0) { - Hu3DModelAttrSet(arg0->unkA[1], 1); +void fn_1_2A58(unkStruct4 *arg0) +{ + Hu3DModelAttrSet(arg0->unkA[1], HU3D_ATTR_DISPOFF); arg0->unk6C = 0; } -void fn_1_2A94(unkStruct4* arg0) { +void fn_1_2A94(unkStruct4 *arg0) +{ arg0->unk4 = 1; arg0->unk8 = 0; } -void fn_1_2AA8(unkStruct4* arg0) { +void fn_1_2AA8(unkStruct4 *arg0) +{ Vec sp8; - + switch (arg0->unk8) { case 0: arg0->unk8 = 1; - Hu3DModelAttrReset(arg0->unkA[1], 1); + Hu3DModelAttrReset(arg0->unkA[1], HU3D_ATTR_DISPOFF); arg0->unk6C = 1; arg0->unk8 = 1; // ? case 1: @@ -398,9 +435,10 @@ void fn_1_2AA8(unkStruct4* arg0) { arg0->unk78 = 1; arg0->unk8 = 2; // ????? break; - + case 2: - if (arg0->unk78 != 0) break; + if (arg0->unk78 != 0) + break; arg0->unk8 = 3; // ?????????? case 3: arg0->unk60 = 1.5f; @@ -410,9 +448,10 @@ void fn_1_2AA8(unkStruct4* arg0) { arg0->unk78 = 1; arg0->unk8 = 4; break; - + case 4: - if (arg0->unk78 != 0) break; + if (arg0->unk78 != 0) + break; arg0->unk8 = 5; case 5: arg0->unk60 = 2.5f; @@ -422,9 +461,10 @@ void fn_1_2AA8(unkStruct4* arg0) { arg0->unk78 = 1; arg0->unk8 = 6; break; - + case 6: - if (arg0->unk78 != 0) break; + if (arg0->unk78 != 0) + break; arg0->unk8 = 8; case 7: arg0->unk60 = 1.5f; @@ -434,7 +474,8 @@ void fn_1_2AA8(unkStruct4* arg0) { arg0->unk78 = 1; arg0->unk8 = 8; case 8: - if (arg0->unk78 != 0) break; + if (arg0->unk78 != 0) + break; arg0->unk8 = 9; case 9: sp8 = arg0->unk34; @@ -452,24 +493,27 @@ void fn_1_2AA8(unkStruct4* arg0) { arg0->unk8 = 10; break; case 10: - if (arg0->unk78 != 0) break; + if (arg0->unk78 != 0) + break; arg0->unk4 = 0; arg0->unk8 = 0; - Hu3DModelAttrSet(arg0->unkA[1], 1); + Hu3DModelAttrSet(arg0->unkA[1], HU3D_ATTR_DISPOFF); arg0->unk6C = 0; return; } } -void fn_1_2D94(unkStruct4* arg0) { +void fn_1_2D94(unkStruct4 *arg0) +{ arg0->unk4 = 2; arg0->unk8 = 0; } -void fn_1_2DA8(unkStruct4* arg0) { +void fn_1_2DA8(unkStruct4 *arg0) +{ f32 var_f31; f32 var_f30; - + switch (arg0->unk8) { case 0: 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) { Hu3DModelShadowDispOn(arg0->unkA[0]); 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); } -void fn_1_2F64(unkStruct4* arg0) { +void fn_1_2F64(unkStruct4 *arg0) +{ if ((arg0->unk58 > 1.0f) || (arg0->unk58 < 1.0f)) { Hu3DModelLayerSet(arg0->unkA[0], 1); Hu3DModelLayerSet(arg0->unkA[1], 1); - } else { + } + else { Hu3DModelLayerSet(arg0->unkA[0], 0); Hu3DModelLayerSet(arg0->unkA[1], 0); } diff --git a/src/REL/m446Dll/cursor.c b/src/REL/m446Dll/cursor.c index 0c08a160..f183dfbf 100644 --- a/src/REL/m446Dll/cursor.c +++ b/src/REL/m446Dll/cursor.c @@ -142,14 +142,14 @@ void fn_1_77C8(unkStruct7 *arg0, u8 arg1) arg0->field00_bit0 = 1; arg0->unk48 = arg1; - Hu3DModelAttrReset(arg0->unkC[0], 1); + Hu3DModelAttrReset(arg0->unkC[0], HU3D_ATTR_DISPOFF); if (arg0->unk8 == 0) { for (var_r30 = 0; var_r30 < 9; var_r30++) { if (var_r30 == arg1) { - Hu3DModelAttrReset(arg0->unkC[var_r30 + 1], 1); + Hu3DModelAttrReset(arg0->unkC[var_r30 + 1], HU3D_ATTR_DISPOFF); } 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; arg0->field00_bit0 = 0; - Hu3DModelAttrSet(arg0->unkC[0], 1); + Hu3DModelAttrSet(arg0->unkC[0], HU3D_ATTR_DISPOFF); if (arg0->unk8 == 0) { 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) { 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; diff --git a/src/REL/m446Dll/player.c b/src/REL/m446Dll/player.c index 7613a306..abd8e0fc 100644 --- a/src/REL/m446Dll/player.c +++ b/src/REL/m446Dll/player.c @@ -258,7 +258,7 @@ unkStruct8 *m446PlayerCreate(s32 arg0, unkStruct6 *arg1) Hu3DModelShadowSet(var_r31->unk3C[1]); Hu3DModelPosSet(var_r31->unk3C[1], 0.0f, 100.0f, 0.0f); 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); fn_1_637C(var_r31, 0); @@ -279,7 +279,7 @@ unkStruct8 *m446PlayerCreate(s32 arg0, unkStruct6 *arg1) else { 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); if (!var_r28) { OSReport("[!] m446PlayerCreate ERROR...\n"); @@ -756,7 +756,7 @@ void fn_1_6074(unkStruct8 *arg0) break; arg0->unk1C = 3; case 3: - Hu3DModelAttrSet(arg0->unk3C[1], 0x40000001); + Hu3DModelAttrSet(arg0->unk3C[1], HU3D_MOTATTR_LOOP); arg0->unk1C = 4; arg0->unk14 = 0; break; @@ -813,9 +813,9 @@ void fn_1_637C(unkStruct8 *arg0, s32 arg1) arg0->unkC8 = arg1; switch (arg1) { case 0: - Hu3DModelAttrReset(arg0->unk3C[0], 1); - Hu3DModelAttrSet(arg0->unk3C[0], 0x40000001); - Hu3DModelAttrSet(arg0->unk3C[1], 1); + Hu3DModelAttrReset(arg0->unk3C[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->unk3C[0], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(arg0->unk3C[1], HU3D_ATTR_DISPOFF); arg0->unk48.x = 0.0f; if (arg0->unk70 != 0) { var_f31 = 70.0f; @@ -836,8 +836,8 @@ void fn_1_637C(unkStruct8 *arg0, s32 arg1) } break; case 1: - Hu3DModelAttrReset(arg0->unk3C[1], 1); - Hu3DModelAttrSet(arg0->unk3C[0], 1); + Hu3DModelAttrReset(arg0->unk3C[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->unk3C[0], HU3D_ATTR_DISPOFF); break; } } diff --git a/src/REL/m446Dll/stage.c b/src/REL/m446Dll/stage.c index ad0a83b7..87fa0397 100644 --- a/src/REL/m446Dll/stage.c +++ b/src/REL/m446Dll/stage.c @@ -4,7 +4,7 @@ #include "game/hsfmotion.h" // bss -unkStruct3* lbl_1_bss_A0; +unkStruct3 *lbl_1_bss_A0; // data 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 }, }; -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 } - }, - { - { 0.0f, 160.0f, 500.0f }, - { 0.0f, 0.0f, 0.0f }, - { 0xB0, 0xB0, 0xB0, 0xFF } - } -}; +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 } }, + { { 0.0f, 160.0f, 500.0f }, { 0.0f, 0.0f, 0.0f }, { 0xB0, 0xB0, 0xB0, 0xFF } } }; Vec lbl_1_data_4B4[3] = { { 1.0f, 3000.0f, 1.0f }, { 0.0f, 1.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, }; -s32 fn_1_7BF0(void) { +s32 fn_1_7BF0(void) +{ lbl_1_bss_A0 = 0; return 1; } -void fn_1_7C08(void) { - unkStruct3* var_r31; - unkStruct9* var_r30; +void fn_1_7C08(void) +{ + unkStruct3 *var_r31; + unkStruct9 *var_r30; var_r31 = lbl_1_bss_A0; if (var_r31) { do { var_r30 = var_r31->unk0; - fn_1_2688((unkStruct4*)var_r30); // ??? + fn_1_2688((unkStruct4 *)var_r30); // ??? var_r31 = var_r31->unk8; } while (var_r31); } } -void fn_1_7C60(void) { +void fn_1_7C60(void) +{ s32 var_r30; - unkStruct3* var_r29; - unkStruct9* temp_r31; + unkStruct3 *var_r29; + unkStruct9 *temp_r31; var_r29 = lbl_1_bss_A0; if (var_r29) { @@ -70,7 +59,8 @@ void fn_1_7C60(void) { if ((temp_r31->unk14 += 0.002f) > 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) { 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) { 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)) { 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; } if ((temp_r31->unk1C == 0) && (Hu3DMotionEndCheck(temp_r31->unk0[3]) != 0)) { 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; } if ((temp_r31->unk20 == 0) && (Hu3DMotionEndCheck(temp_r31->unk0[4]) != 0)) { 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; } } @@ -102,11 +94,12 @@ void fn_1_7C60(void) { } } -unkStruct9* m446StageCreate(void) { +unkStruct9 *m446StageCreate(void) +{ s32 var_r30; - unkStruct3* var_r29; - unkStruct3* temp_ret; - unkStruct9* var_r31; + unkStruct3 *var_r29; + unkStruct3 *temp_ret; + unkStruct9 *var_r31; var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x30, MEMORY_DEFAULT_NUM); if (!var_r31) { @@ -120,19 +113,19 @@ unkStruct9* m446StageCreate(void) { var_r31->unk24 = 0; var_r31->unk28 = 0; var_r31->unk2C = 0; - + for (var_r30 = 0; var_r30 < 5; 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); } - Hu3DModelAttrSet(var_r31->unk0[3], 1); - Hu3DModelAttrSet(var_r31->unk0[4], 1); - Hu3DModelAttrSet(var_r31->unk0[3], 0x40000002); - Hu3DModelAttrSet(var_r31->unk0[4], 0x40000002); + Hu3DModelAttrSet(var_r31->unk0[3], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk0[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->unk0[3], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(var_r31->unk0[4], HU3D_MOTATTR_PAUSE); Hu3DModelAttrReset(var_r31->unk0[3], 0x40000001); Hu3DModelAttrReset(var_r31->unk0[4], 0x40000001); Hu3DModelAttrReset(var_r31->unk0[2], 0x40000001); - + 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); Hu3DGLightStaticSet(var_r31->unkA[var_r30], 1); @@ -152,15 +145,17 @@ unkStruct9* m446StageCreate(void) { } if (lbl_1_bss_A0) { fn_1_1EC8(lbl_1_bss_A0, var_r29); - } else { + } + else { lbl_1_bss_A0 = var_r29; } return var_r31; } -void fn_1_83F0(unkStruct9* arg0) { +void fn_1_83F0(unkStruct9 *arg0) +{ s32 var_r30; - unkStruct3* var_r31; + unkStruct3 *var_r31; var_r31 = lbl_1_bss_A0; do { @@ -170,20 +165,21 @@ void fn_1_83F0(unkStruct9* arg0) { } fn_1_1F04(var_r31); fn_1_1E5C(var_r31); - + for (var_r30 = 0; var_r30 < 5; var_r30++) { Hu3DModelKill(arg0->unk0[var_r30]); } HuMemDirectFree(arg0); return; - } - var_r31 = var_r31->unk8; + } + var_r31 = var_r31->unk8; } while (var_r31); } -void fn_1_84AC(unkStruct9* arg0) { - Hu3DModelAttrReset(arg0->unk0[3], 1); - Hu3DModelAttrReset(arg0->unk0[4], 1); +void fn_1_84AC(unkStruct9 *arg0) +{ + Hu3DModelAttrReset(arg0->unk0[3], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(arg0->unk0[4], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(arg0->unk0[3], 0x40000002); Hu3DModelAttrReset(arg0->unk0[4], 0x40000002); arg0->unk24 = 1; @@ -192,9 +188,10 @@ void fn_1_84AC(unkStruct9* arg0) { arg0->unk18 = 0; } -void fn_1_852C(unkStruct9* arg0) { - Hu3DModelAttrSet(arg0->unk0[3], 1U); - Hu3DModelAttrSet(arg0->unk0[4], 1U); +void fn_1_852C(unkStruct9 *arg0) +{ + Hu3DModelAttrSet(arg0->unk0[3], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->unk0[4], HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(arg0->unk0[3], 0x40000002U); Hu3DModelAttrSet(arg0->unk0[4], 0x40000002U); Hu3DMotionStartEndSet(arg0->unk0[2], 0.0f, 359.0f); @@ -206,6 +203,7 @@ void fn_1_852C(unkStruct9* arg0) { arg0->unk18 = 0; } -void fn_1_860C(unkStruct9* arg0) { +void fn_1_860C(unkStruct9 *arg0) +{ arg0->unk28 = 1; } diff --git a/src/REL/m447dll/block.c b/src/REL/m447dll/block.c index 15ce223d..fcd1280b 100755 --- a/src/REL/m447dll/block.c +++ b/src/REL/m447dll/block.c @@ -8,57 +8,37 @@ #include "ext_math.h" -void fn_1_8F7C(void* arg0); +void fn_1_8F7C(void *arg0); void fn_1_910C(void); -void fn_1_9158(UnkM447Struct_01* arg0); -void fn_1_9320(UnkM447Struct_01* arg0); -void fn_1_9374(UnkM447Struct_01* arg0); -void fn_1_9538(UnkM447Struct_01* arg0); -void fn_1_953C(UnkM447Struct_01* arg0); -void fn_1_9758(UnkM447Struct_01* arg0); -void fn_1_991C(UnkM447Struct_01* arg0); -void fn_1_9BCC(UnkM447Struct_01* arg0); -void fn_1_9CEC(UnkM447Struct_01* arg0); -void fn_1_9EEC(UnkM447Struct_01* arg0); -void fn_1_9F40(ModelData* model, ParticleData* particle, Mtx matrix); +void fn_1_9158(UnkM447Struct_01 *arg0); +void fn_1_9320(UnkM447Struct_01 *arg0); +void fn_1_9374(UnkM447Struct_01 *arg0); +void fn_1_9538(UnkM447Struct_01 *arg0); +void fn_1_953C(UnkM447Struct_01 *arg0); +void fn_1_9758(UnkM447Struct_01 *arg0); +void fn_1_991C(UnkM447Struct_01 *arg0); +void fn_1_9BCC(UnkM447Struct_01 *arg0); +void fn_1_9CEC(UnkM447Struct_01 *arg0); +void fn_1_9EEC(UnkM447Struct_01 *arg0); +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. -UnkM447Struct_01* lbl_1_bss_A4[5]; +UnkM447Struct_01 *lbl_1_bss_A4[5]; s32 lbl_1_bss_A0; -const s32 lbl_1_rodata_5F8[] = { - 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, 4), - 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 s32 lbl_1_rodata_5F8[] + = { 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, 4), 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] = { - 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 -}; +const float lbl_1_rodata_648[20] + = { 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 }; -UnkM447Struct_01* fn_1_8DF8(void) { - UnkM447Struct_01* temp_r3; +UnkM447Struct_01 *fn_1_8DF8(void) +{ + UnkM447Struct_01 *temp_r3; temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(*temp_r3), MEMORY_DEFAULT_NUM); if (!temp_r3) { @@ -88,20 +68,24 @@ UnkM447Struct_01* fn_1_8DF8(void) { return temp_r3; } -void fn_1_8F7C(void* arg0) { +void fn_1_8F7C(void *arg0) +{ fn_1_8F7C(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->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) { arg0->unk00 = arg1 * 2 + (arg2 != 0 ? 0 : 1); - } else { + } + else { arg0->unk00 = arg1 * 2 + (arg2 != 0 ? 1 : 0); } arg0->unk08 = arg2; @@ -109,25 +93,20 @@ void fn_1_9004(UnkM447Struct_01* arg0, s32 arg1, s32 arg2) { arg0->unk4C = 1.0f; arg0->unk50 = 1.0f; arg0->unk54 = 1.0f; - Hu3DModelAttrSet(arg0->unk58[arg0->unk00], 1); - Hu3DModelAttrSet(arg0->unk58[21], 1); + Hu3DModelAttrSet(arg0->unk58[arg0->unk00], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->unk58[21], HU3D_ATTR_DISPOFF); } -void fn_1_90FC(s32 arg0) { +void fn_1_90FC(s32 arg0) +{ lbl_1_bss_A0 = arg0; } -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 -}; +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 }; -void fn_1_910C(void) { - UnkM447Struct_01* temp_r31; +void fn_1_910C(void) +{ + UnkM447Struct_01 *temp_r31; temp_r31 = HuPrcCurrentGet()->user_data; 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; for (i = 0; i <= 19; 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); } 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); Hu3DParticleBlendModeSet(arg0->unk58[22], 1); Hu3DModelLayerSet(arg0->unk58[22], 6); - Hu3DModelAttrSet(arg0->unk58[22], 1); + Hu3DModelAttrSet(arg0->unk58[22], HU3D_ATTR_DISPOFF); for (i = 0; i <= 19; i++) { - Hu3DModelAttrSet(arg0->unk58[i], 1); + Hu3DModelAttrSet(arg0->unk58[i], HU3D_ATTR_DISPOFF); } - Hu3DModelAttrReset(arg0->unk58[arg0->unk00], 1); - Hu3DModelAttrSet(arg0->unk58[20], 1); - Hu3DModelAttrSet(arg0->unk58[21], 1); + Hu3DModelAttrReset(arg0->unk58[arg0->unk00], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->unk58[20], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->unk58[21], HU3D_ATTR_DISPOFF); for (i = 0; i <= 19; i++) { Hu3DModelShadowSet(arg0->unk58[i]); } } -void fn_1_9320(UnkM447Struct_01* arg0) { +void fn_1_9320(UnkM447Struct_01 *arg0) +{ s32 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) { - ModelData* temp_r30; +void fn_1_9374(UnkM447Struct_01 *arg0) +{ + ModelData *temp_r30; Mtx sp8; 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); } -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; switch (arg0->unk0C) { @@ -211,7 +193,7 @@ void fn_1_953C(UnkM447Struct_01* arg0) { arg0->unk50 = 0.0f; arg0->unk54 = 0.0f; arg0->unk88 = -50.0f; - Hu3DModelAttrReset(arg0->unk58[arg0->unk00], 1); + Hu3DModelAttrReset(arg0->unk58[arg0->unk00], HU3D_ATTR_DISPOFF); arg0->unk0C = 1; /* fallthrough */ 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; 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; switch (arg0->unk0C) { @@ -308,14 +292,15 @@ void fn_1_991C(UnkM447Struct_01* arg0) { arg0->unk0C = 2; /* fallthrough */ case 2: - Hu3DModelAttrReset(arg0->unk58[20], 1); + Hu3DModelAttrReset(arg0->unk58[20], HU3D_ATTR_DISPOFF); Hu3DMotionTimeSet(arg0->unk58[20], 0.0f); fn_1_8FF4(arg0, 4); break; } } -void fn_1_9BCC(UnkM447Struct_01* arg0) { +void fn_1_9BCC(UnkM447Struct_01 *arg0) +{ switch (arg0->unk0C) { case 0: arg0->unk90 = 0.0f; @@ -331,22 +316,23 @@ void fn_1_9BCC(UnkM447Struct_01* arg0) { arg0->unk0C = 2; /* fallthrough */ case 2: - Hu3DModelAttrSet(arg0->unk58[arg0->unk00], 1); + Hu3DModelAttrSet(arg0->unk58[arg0->unk00], HU3D_ATTR_DISPOFF); fn_1_8FF4(arg0, 0); break; } } -void fn_1_9CEC(UnkM447Struct_01* arg0) { +void fn_1_9CEC(UnkM447Struct_01 *arg0) +{ float temp_f31; switch (arg0->unk0C) { case 0: arg0->unk90 = 0.0f; arg0->unk98 = 0.008333334f; - Hu3DModelAttrReset(arg0->unk58[21], 1); + Hu3DModelAttrReset(arg0->unk58[21], HU3D_ATTR_DISPOFF); Hu3DMotionTimeSet(arg0->unk58[21], 0.0f); - Hu3DModelAttrSet(arg0->unk58[21], 0x40000001); + Hu3DModelAttrSet(arg0->unk58[21], HU3D_MOTATTR_LOOP); arg0->unkA8 = arg0->unk10; arg0->unkB4 = 0.0f; arg0->unkB8 = 200.0f; @@ -377,9 +363,10 @@ void fn_1_9CEC(UnkM447Struct_01* arg0) { } } -void fn_1_9EEC(UnkM447Struct_01* arg0) { - ModelData* temp_r30; - ParticleData* temp_r31; +void fn_1_9EEC(UnkM447Struct_01 *arg0) +{ + ModelData *temp_r30; + ParticleData *temp_r31; temp_r30 = &Hu3DData[arg0->unk58[22]]; temp_r31 = temp_r30->unk_120; @@ -389,10 +376,11 @@ void fn_1_9EEC(UnkM447Struct_01* 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 }; - UnkM447Struct_01* temp_r29; - HsfanimStruct01* var_r31; + UnkM447Struct_01 *temp_r29; + HsfanimStruct01 *var_r31; s32 var_r27; 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->unk2C = 20.0f; 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.z += 3.0f; var_r31->unk2C = 20.0f + fn_1_A240() % 60; if (var_r31->unk40.a > 10) { var_r31->unk40.a -= 4; - } else { + } + else { var_r31->unk40.a = 0; var_r31->unk02 = 2; } - } else { + } + else { 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; } -s32 fn_1_A240(void) { +s32 fn_1_A240(void) +{ return ((lbl_1_bss_B8 = lbl_1_bss_B8 * 0x41C64E6D + 0x3039) >> 16) % (1 << 15); } diff --git a/src/REL/m447dll/player.c b/src/REL/m447dll/player.c index 86d33628..e004c77d 100755 --- a/src/REL/m447dll/player.c +++ b/src/REL/m447dll/player.c @@ -13,162 +13,77 @@ #include "ext_math.h" -void fn_1_4300(UnkM447Struct_04* arg0); -float fn_1_43DC(UnkM447Struct_04* arg0); +void fn_1_4300(UnkM447Struct_04 *arg0); +float fn_1_43DC(UnkM447Struct_04 *arg0); void fn_1_43F8(void); -void fn_1_4444(UnkM447Struct_04* arg0); -void fn_1_44B0(UnkM447Struct_04* arg0); -void fn_1_4590(UnkM447Struct_04* arg0); -void fn_1_4638(UnkM447Struct_04* arg0); -void fn_1_4680(UnkM447Struct_04* arg0); -void fn_1_470C(UnkM447Struct_04* arg0); -void fn_1_4760(UnkM447Struct_04* arg0); -void fn_1_4764(UnkM447Struct_04* arg0); -void fn_1_4C84(UnkM447Struct_04* arg0); +void fn_1_4444(UnkM447Struct_04 *arg0); +void fn_1_44B0(UnkM447Struct_04 *arg0); +void fn_1_4590(UnkM447Struct_04 *arg0); +void fn_1_4638(UnkM447Struct_04 *arg0); +void fn_1_4680(UnkM447Struct_04 *arg0); +void fn_1_470C(UnkM447Struct_04 *arg0); +void fn_1_4760(UnkM447Struct_04 *arg0); +void fn_1_4764(UnkM447Struct_04 *arg0); +void fn_1_4C84(UnkM447Struct_04 *arg0); float fn_1_4F7C(float arg0, float arg1, float arg2); -void fn_1_5080(UnkM447Struct_04* arg0); -void fn_1_5298(UnkM447Struct_04* arg0); -void fn_1_5520(UnkM447Struct_04* arg0); -void fn_1_5760(UnkM447Struct_04* arg0); -void fn_1_59D8(UnkM447Struct_04* arg0); -void fn_1_5AF0(UnkM447Struct_04* arg0); -void fn_1_5BD0(UnkM447Struct_04* arg0); -void fn_1_5C78(UnkM447Struct_04* arg0); -void fn_1_671C(UnkM447Struct_04* arg0); -void fn_1_70BC(UnkM447Struct_04* arg0); -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_72A8(UnkM447Struct_04* arg0); -void fn_1_7688(UnkM447Struct_04* arg0); -void fn_1_78A8(UnkM447Struct_04* arg0); -s32 fn_1_7984(UnkM447Struct_04* arg0); -void fn_1_7A34(UnkM447Struct_04* arg0); +void fn_1_5080(UnkM447Struct_04 *arg0); +void fn_1_5298(UnkM447Struct_04 *arg0); +void fn_1_5520(UnkM447Struct_04 *arg0); +void fn_1_5760(UnkM447Struct_04 *arg0); +void fn_1_59D8(UnkM447Struct_04 *arg0); +void fn_1_5AF0(UnkM447Struct_04 *arg0); +void fn_1_5BD0(UnkM447Struct_04 *arg0); +void fn_1_5C78(UnkM447Struct_04 *arg0); +void fn_1_671C(UnkM447Struct_04 *arg0); +void fn_1_70BC(UnkM447Struct_04 *arg0); +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_72A8(UnkM447Struct_04 *arg0); +void fn_1_7688(UnkM447Struct_04 *arg0); +void fn_1_78A8(UnkM447Struct_04 *arg0); +s32 fn_1_7984(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] = { - { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 113), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 31), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 28), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 72), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) - }, - { - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 2), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 3), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 113), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 31), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 28), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 72), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 23), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 24) - }, - { - DATA_MAKE_NUM(DATADIR_PEACHMOT, 0), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 2), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 3), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 113), - 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 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, 113), DATA_MAKE_NUM(DATADIR_MARIOMOT, 31), DATA_MAKE_NUM(DATADIR_MARIOMOT, 28), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 72), DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) }, + { DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 2), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 3), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 113), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 31), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 28), + DATA_MAKE_NUM(DATADIR_LUIGIMOT, 72), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 23), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 24) }, + { DATA_MAKE_NUM(DATADIR_PEACHMOT, 0), DATA_MAKE_NUM(DATADIR_PEACHMOT, 2), DATA_MAKE_NUM(DATADIR_PEACHMOT, 3), + DATA_MAKE_NUM(DATADIR_PEACHMOT, 113), 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[] = { - 150.0f, 170.0f, 188.0f, - 169.0f, 164.0f, 140.0f, - 180.0f, 145.0f, 150.0f -}; +const float lbl_1_rodata_3E4[] = { 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] = { - { -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 } -}; +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, -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] = { - { 5, 6, 7, 8, 9 }, - { 4, 5, 6, 7, 8 }, - { 3, 4, 5, 6, 7 }, - { 2, 3, 4, 5, 6 } -}; +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 } }; -void fn_1_3F84(void) { +void fn_1_3F84(void) +{ s32 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* temp_r3; +UnkM447Struct_04 *fn_1_3FC4(s32 arg0) +{ + UnkM447Struct_04 *temp_r3; s16 var_r28; s16 var_r27; s32 i; @@ -192,14 +108,16 @@ UnkM447Struct_04* fn_1_3FC4(s32 arg0) { temp_r3->unk08 = GWPlayerCfg[arg0].iscom; if (temp_r3->unk08 != 0) { var_r28 = 4; - } else { + } + else { var_r28 = GWPlayerCfg[arg0].pad_idx; } temp_r3->unk1A = var_r28; temp_r3->unk1C = (GWPlayerCfg[arg0].character == 10); if (temp_r3->unk1C != 0) { var_r27 = 8; - } else { + } + else { var_r27 = GWPlayerCfg[arg0].character; } temp_r3->unk18 = var_r27; @@ -228,8 +146,8 @@ UnkM447Struct_04* fn_1_3FC4(s32 arg0) { CharModelMotionDataClose(temp_r3->unk18); } if (temp_r3->unk1C != 0) { - 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->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); } CharModelLayerSetAll(2); 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; } -void fn_1_4300(UnkM447Struct_04* arg0) { +void fn_1_4300(UnkM447Struct_04 *arg0) +{ s32 i; if (arg0->unkB0) { @@ -265,31 +184,23 @@ void fn_1_4300(UnkM447Struct_04* 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->unk20 = 0; } -float fn_1_43DC(UnkM447Struct_04* arg0) { +float fn_1_43DC(UnkM447Struct_04 *arg0) +{ return lbl_1_rodata_3E4[arg0->unk18]; } -void (*lbl_1_data_1CC[])(UnkM447Struct_04*) = { - 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 -}; +void (*lbl_1_data_1CC[])(UnkM447Struct_04 *) + = { 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 }; -void fn_1_43F8(void) { - UnkM447Struct_04* temp_r31; +void fn_1_43F8(void) +{ + UnkM447Struct_04 *temp_r31; temp_r31 = HuPrcCurrentGet()->user_data; 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) { arg0->unk68 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M447, 31)); - } else { + } + else { arg0->unk68 = CharModelCreate(arg0->unk18, 2); } Hu3DModelShadowSet(arg0->unk68); } -void fn_1_44B0(UnkM447Struct_04* arg0) { +void fn_1_44B0(UnkM447Struct_04 *arg0) +{ s32 i; if (arg0->unk1C != 0) { for (i = 0; i < 9; i++) { arg0->unk6A[i] = Hu3DJointMotionFile(arg0->unk68, lbl_1_rodata_2A0[arg0->unk18][i]); } - } else { + } + else { for (i = 0; i < 9; 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); espPriSet(arg0->unk7C[0], arg0->unk00 * 10); 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); } -void fn_1_4638(UnkM447Struct_04* arg0) { +void fn_1_4638(UnkM447Struct_04 *arg0) +{ if (arg0->unk1C != 0) { Hu3DModelKill(arg0->unk68); - } else { + } + else { CharModelKill(arg0->unk18); } } -void fn_1_4680(UnkM447Struct_04* arg0) { +void fn_1_4680(UnkM447Struct_04 *arg0) +{ s32 i; if (arg0->unk1C != 0) { for (i = 0; i < 9; i++) { Hu3DMotionKill(arg0->unk6A[i]); } - } else { + } + else { for (i = 0; i < 9; i++) { CharModelMotionKill(arg0->unk18, arg0->unk6A[i]); } } } -void fn_1_470C(UnkM447Struct_04* arg0) { +void fn_1_470C(UnkM447Struct_04 *arg0) +{ s32 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; float temp_f31; s32 var_r29; @@ -395,7 +316,8 @@ void fn_1_4764(UnkM447Struct_04* arg0) { break; } } - } else { + } + else { for (i = 0; i < 10; i++) { var_r29 = fn_1_A240() % 5; if (lbl_1_bss_10->unk54[var_r29] == 0) { @@ -416,9 +338,10 @@ void fn_1_4764(UnkM447Struct_04* arg0) { arg0->unk0C = 1; } } - } else { - arg0->unk44 = (float) HuPadStkX[arg0->unk1A] / 4; - arg0->unk4C = -(float) HuPadStkY[arg0->unk1A] / 4; + } + else { + arg0->unk44 = (float)HuPadStkX[arg0->unk1A] / 4; + arg0->unk4C = -(float)HuPadStkY[arg0->unk1A] / 4; } var_r28 = 0; var_r29 = fn_1_7984(arg0); @@ -433,7 +356,8 @@ void fn_1_4764(UnkM447Struct_04* arg0) { if (arg0->unk64-- <= 0) { var_r28 = 1; } - } else if (HuPadBtnDown[arg0->unk1A] & 0x100) { + } + else if (HuPadBtnDown[arg0->unk1A] & 0x100) { var_r28 = 1; } if (var_r28 != 0) { @@ -444,14 +368,16 @@ void fn_1_4764(UnkM447Struct_04* arg0) { arg0->unk10 = 0; } } - } else { + } + else { if (arg0->unk10 != 0) { arg0->unk10 = 0; arg0->unk0C = 0; } fn_1_7A6C(arg0); } - } else { + } + else { arg0->unk44 = 0.0f; arg0->unk48 = 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; 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); if (8.0f <= arg0->unk40) { var_r30 = 2; - } else { + } + else { 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_f30; @@ -518,7 +447,8 @@ float fn_1_4F7C(float arg0, float arg1, float arg2) { return var_f30; } -void fn_1_5080(UnkM447Struct_04* arg0) { +void fn_1_5080(UnkM447Struct_04 *arg0) +{ Vec sp14; Vec sp8; 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; s32 temp_r29; - UnkM447Struct_01* temp_r28; + UnkM447Struct_01 *temp_r28; s32 i; switch (arg0->unk20) { @@ -590,7 +521,8 @@ void fn_1_5298(UnkM447Struct_04* arg0) { arg0->unk1B++; arg0->unk14 = 1; fn_1_43CC(arg0, 5); - } else { + } + else { fn_1_8FF4(arg0->unkA8, 3); fn_1_43CC(arg0, 4); } @@ -602,18 +534,10 @@ void fn_1_5298(UnkM447Struct_04* arg0) { } } -const s32 lbl_1_rodata_4EC[] = { - 0x0000012A, - 0x0000016A, - 0x000001AA, - 0x000001EA, - 0x0000022A, - 0x0000026A, - 0x000002AA, - 0x000002EA -}; +const s32 lbl_1_rodata_4EC[] = { 0x0000012A, 0x0000016A, 0x000001AA, 0x000001EA, 0x0000022A, 0x0000026A, 0x000002AA, 0x000002EA }; -void fn_1_5520(UnkM447Struct_04* arg0) { +void fn_1_5520(UnkM447Struct_04 *arg0) +{ Vec sp8; float var_f31; float var_f30; @@ -640,7 +564,8 @@ void fn_1_5520(UnkM447Struct_04* arg0) { fn_1_7AA4(arg0, 1, 60); if (arg0->unk18 == 8) { HuAudFXPlay(0x42); - } else { + } + else { HuAudFXPlay(lbl_1_rodata_4EC[arg0->unk18]); } /* fallthrough */ @@ -652,7 +577,7 @@ void fn_1_5520(UnkM447Struct_04* arg0) { arg0->unk20 = 4; /* fallthrough */ case 4: - Hu3DModelAttrSet(arg0->unk68, 0x40000002); + Hu3DModelAttrSet(arg0->unk68, HU3D_MOTATTR_PAUSE); arg0->unk60 = 0; arg0->unk20 = 5; /* 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 sp8; s32 var_r30; @@ -708,39 +634,18 @@ void fn_1_5760(UnkM447Struct_04* arg0) { } } -const s32 lbl_1_rodata_510[] = { - 0x00000122, - 0x00000162, - 0x000001A2, - 0x000001E2, - 0x00000222, - 0x00000262, - 0x000002A2, - 0x000002E2, - 0x00000124, - 0x00000164, - 0x000001A4, - 0x000001E4, - 0x00000224, - 0x00000264, - 0x000002A4, - 0x000002E4, - 0x00000121, - 0x00000161, - 0x000001A1, - 0x000001E1, - 0x00000221, - 0x00000261, - 0x000002A1, - 0x000002E1 -}; +const s32 lbl_1_rodata_510[] = { 0x00000122, 0x00000162, 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) { case 0: if (arg0->unk18 == 8) { HuAudFXPlay(0x40); - } else { + } + else { HuAudFXPlay(lbl_1_rodata_510[arg0->unk18]); } 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) { case 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) { case 0: 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_f21; 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; if (ABS(temp_f22) < 5.0f && ABS(temp_f21) < 5.0f && 180.0f == arg0->unk38) { arg0->unk20 = 3; - } else { + } + else { arg0->unk20 = 1; } /* 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; 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 sp8; @@ -892,39 +803,37 @@ void fn_1_70BC(UnkM447Struct_04* arg0) { 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) { Hu3DMotionSet(arg0->unk68, arg0->unk6A[arg1]); - } else { + } + else { CharModelMotionSet(arg0->unk18, arg0->unk6A[arg1]); } Hu3DModelAttrSet(arg0->unk68, arg2); 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) { Hu3DMotionShiftSet(arg0->unk68, arg0->unk6A[arg1], arg2, arg3, arg4); - } else { + } + else { CharModelMotionShiftSet(arg0->unk18, arg0->unk6A[arg1], arg2, arg3, arg4); } arg0->unkA4 = arg1; } -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 } -}; +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 } }; // Vec[]? -float lbl_1_data_25C[][3] = { - { -700.0f, -700.0f, 200.0f }, - { 700.0f, -700.0f, 200.0f } -}; +float lbl_1_data_25C[][3] = { { -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 sp18[4]; float spC[3]; // Vec? @@ -943,13 +852,16 @@ void fn_1_72A8(UnkM447Struct_04* arg0) { if (i / 2 == 0) { if (lbl_1_data_21C[i][0] < 0.0f) { arg0->unk28.x = sp28[2] + lbl_1_data_21C[i][0]; - } else { + } + else { arg0->unk28.x = lbl_1_data_21C[i][0] - sp28[2]; } - } else { + } + else { if (lbl_1_data_21C[i][1] < 0.0f) { arg0->unk28.z = sp28[2] + lbl_1_data_21C[i][1]; - } else { + } + else { 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 sp8[3]; // Vec? - UnkM447Struct_04* temp_r30; + UnkM447Struct_04 *temp_r30; s32 var_r26; 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 sp14[3]; // Vec? 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 sp14[3]; // Vec? Vec sp8; @@ -1073,17 +988,20 @@ s32 fn_1_7984(UnkM447Struct_04* arg0) { return 5; } -void fn_1_7A34(UnkM447Struct_04* arg0) { +void fn_1_7A34(UnkM447Struct_04 *arg0) +{ espDispOn(arg0->unk7C[1]); 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[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) { switch (arg1) { case 0: diff --git a/src/REL/m447dll/stage.c b/src/REL/m447dll/stage.c index ea976882..4a71f38a 100755 --- a/src/REL/m447dll/stage.c +++ b/src/REL/m447dll/stage.c @@ -17,61 +17,37 @@ typedef struct { } UnkM447Struct_07; // Size 0x1C void fn_1_1FF4(void); -void fn_1_2164(UnkM447Struct_06* arg0); -void fn_1_231C(UnkM447Struct_06* arg0); -void fn_1_236C(UnkM447Struct_06* arg0); -void fn_1_2490(UnkM447Struct_06* arg0); -void fn_1_2494(UnkM447Struct_06* arg0); -void fn_1_25E4(UnkM447Struct_06* arg0); -void fn_1_2700(UnkM447Struct_06* arg0); -void fn_1_2A3C(UnkM447Struct_06* arg0); -void fn_1_2D08(UnkM447Struct_06* arg0); -void fn_1_2DAC(ModelData* model, ParticleData* particle, Mtx matrix); +void fn_1_2164(UnkM447Struct_06 *arg0); +void fn_1_231C(UnkM447Struct_06 *arg0); +void fn_1_236C(UnkM447Struct_06 *arg0); +void fn_1_2490(UnkM447Struct_06 *arg0); +void fn_1_2494(UnkM447Struct_06 *arg0); +void fn_1_25E4(UnkM447Struct_06 *arg0); +void fn_1_2700(UnkM447Struct_06 *arg0); +void fn_1_2A3C(UnkM447Struct_06 *arg0); +void fn_1_2D08(UnkM447Struct_06 *arg0); +void fn_1_2DAC(ModelData *model, ParticleData *particle, Mtx matrix); -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, 1), - 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, 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 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, 1), 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, 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[] = { - { 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 } -}; +const Vec lbl_1_rodata_190[] + = { { 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 } }; -UnkM447Struct_07 lbl_1_data_A0[] = { - { { 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 } }, - { { 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 } } -}; +UnkM447Struct_07 lbl_1_data_A0[] = { { { 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 } }, + { { 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 } } }; -UnkM447Struct_06* fn_1_1D90(void) { - UnkM447Struct_06* temp_r3; +UnkM447Struct_06 *fn_1_1D90(void) +{ + UnkM447Struct_06 *temp_r3; s32 i; temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(*temp_r3), MEMORY_DEFAULT_NUM); @@ -92,26 +68,31 @@ UnkM447Struct_06* fn_1_1D90(void) { return temp_r3; } -void fn_1_1E70(UnkM447Struct_06* arg0) { +void fn_1_1E70(UnkM447Struct_06 *arg0) +{ fn_1_231C(arg0); HuPrcKill(arg0->unk7C); HuMemDirectFree(arg0); } -void fn_1_1EB0(UnkM447Struct_06* arg0, s32 arg1) { +void fn_1_1EB0(UnkM447Struct_06 *arg0, s32 arg1) +{ arg0->unk38 = arg1; arg0->unk3C = 0; } -BOOL fn_1_1EC0(UnkM447Struct_06* arg0) { +BOOL fn_1_1EC0(UnkM447Struct_06 *arg0) +{ 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]; } -void fn_1_1F00(UnkM447Struct_06* arg0, s32 arg1) { +void fn_1_1F00(UnkM447Struct_06 *arg0, s32 arg1) +{ s16 temp_r31; temp_r31 = arg0->unk00[arg1 + 3]; @@ -121,7 +102,8 @@ void fn_1_1F00(UnkM447Struct_06* arg0, s32 arg1) { arg0->unk54[arg1] = 1; } -s32 fn_1_1F9C(UnkM447Struct_06* arg0) { +s32 fn_1_1F9C(UnkM447Struct_06 *arg0) +{ s32 var_r30; s32 i; @@ -134,22 +116,20 @@ s32 fn_1_1F9C(UnkM447Struct_06* arg0) { return var_r30; } -void fn_1_1FEC(UnkM447Struct_06* arg0, s32 arg1) { +void fn_1_1FEC(UnkM447Struct_06 *arg0, s32 arg1) +{ arg0->unk44 = arg1; } -void (*lbl_1_data_148[])(UnkM447Struct_06*) = { - fn_1_2490, - fn_1_2494, - fn_1_25E4, - fn_1_2700, - fn_1_2A3C, +void (*lbl_1_data_148[])(UnkM447Struct_06 *) = { + fn_1_2490, fn_1_2494, fn_1_25E4, fn_1_2700, fn_1_2A3C, NULL // padding? }; -void fn_1_1FF4(void) { +void fn_1_1FF4(void) +{ Vec sp8; - UnkM447Struct_06* temp_r31; + UnkM447Struct_06 *temp_r31; s16 temp_r29; s32 i; @@ -162,14 +142,15 @@ void fn_1_1FF4(void) { temp_r29 = temp_r31->unk00[i + 3]; if (Hu3DMotionEndCheck(temp_r29)) { Hu3DMotionStartEndSet(temp_r29, 20.0f, 40.0f); - Hu3DModelAttrSet(temp_r29, 0x40000001); + Hu3DModelAttrSet(temp_r29, HU3D_MOTATTR_LOOP); } } if (temp_r31->unk44 > 0) { fn_1_351C(&sp8); if (--temp_r31->unk44 == 0) { sp8.y = 300.0f; - } else { + } + else { sp8.y = fn_1_A240() % 20 - 10 + 300.0f; } 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; for (i = 0; i <= 20; i++) { @@ -190,22 +172,23 @@ void fn_1_2164(UnkM447Struct_06* arg0) { Hu3DParticleHookSet(arg0->unk00[21], fn_1_2DAC); Hu3DParticleBlendModeSet(arg0->unk00[21], 1); Hu3DModelLayerSet(arg0->unk00[21], 0); - Hu3DModelAttrSet(arg0->unk00[21], 1); + Hu3DModelAttrSet(arg0->unk00[21], HU3D_ATTR_DISPOFF); Hu3DModelShadowMapSet(arg0->unk00[2]); 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); - Hu3DModelAttrSet(arg0->unk00[i + 3], 0x40000002); + Hu3DModelAttrSet(arg0->unk00[i + 3], HU3D_MOTATTR_PAUSE); Hu3DModelShadowMapSet(arg0->unk00[i + 3]); } for (i = 8; i <= 15; i++) { - Hu3DModelAttrSet(arg0->unk00[i], 1); + Hu3DModelAttrSet(arg0->unk00[i], HU3D_ATTR_DISPOFF); } 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; 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; 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; switch (arg0->unk3C) { @@ -250,8 +234,8 @@ void fn_1_2494(UnkM447Struct_06* arg0) { case 1: Hu3DModelPosSet(arg0->unk00[14], 0.0f, 0.0f, 0.0f); Hu3DMotionTimeSet(arg0->unk00[14], 0.0f); - Hu3DModelAttrReset(arg0->unk00[14], 1); - Hu3DModelAttrSet(arg0->unk00[14], 0x40000001); + Hu3DModelAttrReset(arg0->unk00[14], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->unk00[14], HU3D_MOTATTR_LOOP); arg0->unk40 = 0; arg0->unk3C = 2; HuAudFXPlay(0x77E); @@ -265,14 +249,15 @@ void fn_1_2494(UnkM447Struct_06* arg0) { } break; case 3: - Hu3DModelAttrSet(arg0->unk00[14], 1); + Hu3DModelAttrSet(arg0->unk00[14], HU3D_ATTR_DISPOFF); arg0->unk38 = 0; arg0->unk3C = 0; break; } } -void fn_1_25E4(UnkM447Struct_06* arg0) { +void fn_1_25E4(UnkM447Struct_06 *arg0) +{ switch (arg0->unk3C) { case 0: arg0->unk3C = 1; @@ -281,8 +266,8 @@ void fn_1_25E4(UnkM447Struct_06* arg0) { fn_1_2D08(arg0); Hu3DModelPosSet(arg0->unk00[15], 0.0f, 0.0f, 0.0f); Hu3DMotionTimeSet(arg0->unk00[15], 0.0f); - Hu3DModelAttrReset(arg0->unk00[15], 1); - Hu3DModelAttrSet(arg0->unk00[15], 0x40000001); + Hu3DModelAttrReset(arg0->unk00[15], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->unk00[15], HU3D_MOTATTR_LOOP); arg0->unk40 = 0; arg0->unk3C = 2; HuAudFXPlay(0x782); @@ -293,14 +278,15 @@ void fn_1_25E4(UnkM447Struct_06* arg0) { } break; case 3: - Hu3DModelAttrSet(arg0->unk00[15], 1); + Hu3DModelAttrSet(arg0->unk00[15], HU3D_ATTR_DISPOFF); arg0->unk38 = 0; arg0->unk3C = 0; break; } } -void fn_1_2700(UnkM447Struct_06* arg0) { +void fn_1_2700(UnkM447Struct_06 *arg0) +{ float temp_f31; s16 temp_r29; s32 i; @@ -323,7 +309,7 @@ void fn_1_2700(UnkM447Struct_06* arg0) { } for (i = 0; i < 5; i++) { 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->unk68[i] = 0; } @@ -334,8 +320,9 @@ void fn_1_2700(UnkM447Struct_06* arg0) { 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); Hu3DMotionTimeSet(temp_r29, 0.0f); - Hu3DModelAttrReset(temp_r29, 1); - 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); + 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); } arg0->unk40 = 0; arg0->unk3C = 3; @@ -344,7 +331,7 @@ void fn_1_2700(UnkM447Struct_06* arg0) { case 3: if (arg0->unk40++ >= 60) { 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); } 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; s16 temp_r29; 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); Hu3DMotionTimeSet(temp_r29, 0.0f); Hu3DModelAttrReset(temp_r29, 0x40000001); - Hu3DModelAttrReset(temp_r29, 1); + Hu3DModelAttrReset(temp_r29, HU3D_ATTR_DISPOFF); } arg0->unk40 = 0; arg0->unk3C = 3; @@ -398,7 +386,7 @@ void fn_1_2A3C(UnkM447Struct_06* arg0) { case 3: if (arg0->unk40++ >= 20) { for (i = 0; i < 5; i++) { - Hu3DModelAttrSet(arg0->unk00[i + 16], 1); + Hu3DModelAttrSet(arg0->unk00[i + 16], HU3D_ATTR_DISPOFF); } arg0->unk3C = 4; break; @@ -411,9 +399,10 @@ void fn_1_2A3C(UnkM447Struct_06* arg0) { } } -void fn_1_2D08(UnkM447Struct_06* arg0) { - ModelData* temp_r30; - ParticleData* temp_r31; +void fn_1_2D08(UnkM447Struct_06 *arg0) +{ + ModelData *temp_r30; + ParticleData *temp_r31; temp_r30 = &Hu3DData[arg0->unk00[21]]; temp_r31 = temp_r30->unk_120; @@ -426,9 +415,10 @@ void fn_1_2D08(UnkM447Struct_06* arg0) { 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 }; - HsfanimStruct01* var_r31; + HsfanimStruct01 *var_r31; s32 i; if (particle->unk_02 == 0) { diff --git a/src/REL/m448Dll/main.c b/src/REL/m448Dll/main.c index 8ea12e5f..86a0d2a5 100755 --- a/src/REL/m448Dll/main.c +++ b/src/REL/m448Dll/main.c @@ -64,30 +64,30 @@ typedef struct { void fn_1_A0(void); void fn_1_38C(void); void fn_1_478(void); -void fn_1_4FC(ModelData* model, Mtx matrix); -void fn_1_1338(omObjData* arg0); -void fn_1_4310(omObjData* arg0); +void fn_1_4FC(ModelData *model, Mtx matrix); +void fn_1_1338(omObjData *arg0); +void fn_1_4310(omObjData *arg0); void fn_1_6DAC(void); -void fn_1_7148(omObjData* arg0); -void fn_1_7DC4(ModelData* model, ParticleData* particle, Mtx matrix); -void fn_1_81C0(omObjData* arg0); -void fn_1_8DD0(omObjData* arg0); -void fn_1_9508(omObjData* arg0); +void fn_1_7148(omObjData *arg0); +void fn_1_7DC4(ModelData *model, ParticleData *particle, Mtx matrix); +void fn_1_81C0(omObjData *arg0); +void fn_1_8DD0(omObjData *arg0); +void fn_1_9508(omObjData *arg0); void ObjectSetup(void); -void fn_1_9B00(omObjData* arg0); +void fn_1_9B00(omObjData *arg0); UnkM448Struct_01 lbl_1_bss_16C[20]; UnkM448Struct_02 lbl_1_bss_9C[13]; -omObjData* lbl_1_bss_98; -omObjData* lbl_1_bss_94; -omObjData* lbl_1_bss_8C[2]; -omObjData* lbl_1_bss_88; +omObjData *lbl_1_bss_98; +omObjData *lbl_1_bss_94; +omObjData *lbl_1_bss_8C[2]; +omObjData *lbl_1_bss_88; s32 lbl_1_bss_84; s32 lbl_1_bss_80; s32 lbl_1_bss_7C; s32 lbl_1_bss_78; s32 lbl_1_bss_74; -Process* lbl_1_bss_70; +Process *lbl_1_bss_70; s32 lbl_1_bss_6C; s32 lbl_1_bss_68; s32 lbl_1_bss_64; @@ -97,8 +97,8 @@ char lbl_1_bss_3C_pad[4]; float lbl_1_bss_38; s32 lbl_1_bss_34; char lbl_1_bss_30_pad[4]; -void* lbl_1_bss_2C; -void* lbl_1_bss_28; +void *lbl_1_bss_2C; +void *lbl_1_bss_28; s32 lbl_1_bss_24; s32 lbl_1_bss_20; s32 lbl_1_bss_1C; @@ -109,48 +109,20 @@ char lbl_1_bss_8_pad[8]; s32 lbl_1_bss_4; s32 lbl_1_bss_0; -s32 lbl_1_data_0[] = { - DATA_MAKE_NUM(DATADIR_MGCONST, 23), - DATA_MAKE_NUM(DATADIR_MGCONST, 22), - DATA_MAKE_NUM(DATADIR_MGCONST, 51), - DATA_MAKE_NUM(DATADIR_MGCONST, 51), - DATADIR_MGCONST, - DATA_MAKE_NUM(DATADIR_MGCONST, 23), - DATA_MAKE_NUM(DATADIR_MGCONST, 22), - DATA_MAKE_NUM(DATADIR_MGCONST, 51), - DATA_MAKE_NUM(DATADIR_MGCONST, 51), - DATADIR_MGCONST -}; +s32 lbl_1_data_0[] = { DATA_MAKE_NUM(DATADIR_MGCONST, 23), DATA_MAKE_NUM(DATADIR_MGCONST, 22), DATA_MAKE_NUM(DATADIR_MGCONST, 51), + DATA_MAKE_NUM(DATADIR_MGCONST, 51), DATADIR_MGCONST, DATA_MAKE_NUM(DATADIR_MGCONST, 23), DATA_MAKE_NUM(DATADIR_MGCONST, 22), + DATA_MAKE_NUM(DATADIR_MGCONST, 51), DATA_MAKE_NUM(DATADIR_MGCONST, 51), DATADIR_MGCONST }; s32 lbl_1_data_28[10] = { 0 }; -s32 lbl_1_data_50[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 5), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 6), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 8), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 10), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 9), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 26), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) -}; +s32 lbl_1_data_50[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), DATA_MAKE_NUM(DATADIR_MARIOMOT, 2), DATA_MAKE_NUM(DATADIR_MARIOMOT, 3), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 5), DATA_MAKE_NUM(DATADIR_MARIOMOT, 6), DATA_MAKE_NUM(DATADIR_MARIOMOT, 8), DATA_MAKE_NUM(DATADIR_MARIOMOT, 10), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 9), DATA_MAKE_NUM(DATADIR_MARIOMOT, 26), DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) }; -s32 lbl_1_data_7C[] = { - DATA_MAKE_NUM(DATADIR_M448, 19), - DATA_MAKE_NUM(DATADIR_M448, 20), - DATA_MAKE_NUM(DATADIR_M448, 21), - DATA_MAKE_NUM(DATADIR_M448, 24), - DATA_MAKE_NUM(DATADIR_M448, 25), - DATA_MAKE_NUM(DATADIR_M448, 26), - DATA_MAKE_NUM(DATADIR_M448, 27), - DATA_MAKE_NUM(DATADIR_M448, 28), - DATA_MAKE_NUM(DATADIR_M448, 19), - DATA_MAKE_NUM(DATADIR_M448, 22), - DATA_MAKE_NUM(DATADIR_M448, 23) -}; +s32 lbl_1_data_7C[] = { DATA_MAKE_NUM(DATADIR_M448, 19), DATA_MAKE_NUM(DATADIR_M448, 20), DATA_MAKE_NUM(DATADIR_M448, 21), + DATA_MAKE_NUM(DATADIR_M448, 24), DATA_MAKE_NUM(DATADIR_M448, 25), DATA_MAKE_NUM(DATADIR_M448, 26), DATA_MAKE_NUM(DATADIR_M448, 27), + DATA_MAKE_NUM(DATADIR_M448, 28), DATA_MAKE_NUM(DATADIR_M448, 19), DATA_MAKE_NUM(DATADIR_M448, 22), DATA_MAKE_NUM(DATADIR_M448, 23) }; u8 lbl_1_data_A8[11] = { 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1 }; u8 lbl_1_data_B3[11] = { 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1 }; @@ -168,14 +140,12 @@ s32 lbl_1_data_1A4[2] = { 0 }; s32 lbl_1_data_1AC[2] = { 0 }; s32 lbl_1_data_1B4[2] = { 0 }; -float lbl_1_data_1BC[][4] = { - { -90.0f, 2.0f, 525.0f, 180.0f }, - { 90.0f, 2.0f, 525.0f, 180.0f } -}; +float lbl_1_data_1BC[][4] = { { -90.0f, 2.0f, 525.0f, 180.0f }, { 90.0f, 2.0f, 525.0f, 180.0f } }; float lbl_1_data_1DC[] = { 0.0f, 0.0f, 0.0f, 1.0f }; -void fn_1_A0(void) { +void fn_1_A0(void) +{ Center.x += 10.0 * (((HuPadBtn[0] & 2) != 0) - ((HuPadBtn[0] & 1) != 0)); Center.z -= 10.0 * (((HuPadBtn[0] & 8) != 0) - ((HuPadBtn[0] & 4) != 0)); Center.y += 30.0 * ((HuPadTrigL[0] - HuPadTrigR[0]) / 128.0); @@ -184,7 +154,8 @@ void fn_1_A0(void) { CRot.x += HuPadSubStkY[0] / -16.0; } -void fn_1_38C(void) { +void fn_1_38C(void) +{ lbl_1_bss_64 = GXGetTexBufferSize(640, 480, GX_TF_RGB565, GX_FALSE, 0); lbl_1_bss_60 = GXGetTexBufferSize(160, 120, GX_TF_RGB565, GX_FALSE, 0); lbl_1_bss_28 = HuMemDirectMallocNum(HEAP_SYSTEM, lbl_1_bss_64, MEMORY_DEFAULT_NUM); @@ -193,7 +164,8 @@ void fn_1_38C(void) { memset(lbl_1_bss_2C, 0, lbl_1_bss_60); } -void fn_1_478(void) { +void fn_1_478(void) +{ if (lbl_1_bss_28) { HuMemDirectFree(lbl_1_bss_28); } @@ -204,7 +176,8 @@ void fn_1_478(void) { lbl_1_bss_2C = NULL; } -void fn_1_4FC(ModelData* model, Mtx matrix) { +void fn_1_4FC(ModelData *model, Mtx matrix) +{ Mtx spC8; Mtx sp98; float temp_f31; @@ -212,10 +185,10 @@ void fn_1_4FC(ModelData* model, Mtx matrix) { float temp_f30; float temp_f28; s32 sp10; - void* spC; + void *spC; s32 var_r29; s32 var_r20; - void* var_r28; + void *var_r28; s32 i; s32 j; @@ -264,10 +237,7 @@ void fn_1_4FC(ModelData* model, Mtx matrix) { if (sp70[i] > 0.0f) { GXSetTexCopySrc(0, 0, 640.0f / sp70[i], 480.0f / sp70[i]); GXSetTexCopyDst( - (sp84[i] == 0 ? 640 : 320) / sp70[i], - (sp84[i] == 0 ? 480 : 240) / sp70[i], - GX_TF_RGB565, - sp84[i] == 0 ? GX_FALSE : GX_TRUE); + (sp84[i] == 0 ? 640 : 320) / sp70[i], (sp84[i] == 0 ? 480 : 240) / sp70[i], GX_TF_RGB565, sp84[i] == 0 ? GX_FALSE : GX_TRUE); GXSetCopyClear(BGColor, 0xFFFFFF); GXCopyTex(var_r28, GX_FALSE); DCFlushRange(var_r28, var_r20); @@ -294,13 +264,15 @@ void fn_1_4FC(ModelData* model, Mtx matrix) { GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_TEXC, GX_CC_ZERO); GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_ZERO, GX_LO_NOOP); - } else if (i == 4) { + } + else if (i == 4) { GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_SUBHALF, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_TEXC, GX_CC_RASC, GX_CC_ZERO); GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_ONE, GX_LO_NOOP); GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); GXSetBlendMode(GX_BM_BLEND, GX_BL_ONE, GX_BL_ONE, GX_LO_NOOP); - } else { + } + else { GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_TEXC, GX_CC_ZERO); GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_ZERO, GX_LO_NOOP); @@ -313,28 +285,16 @@ void fn_1_4FC(ModelData* model, Mtx matrix) { temp_f28 += 0.5 * (1.0f / (640.0f / sp5C[i])); temp_f31 = temp_f30 = temp_f29 = temp_f28 = 0.0f; GXBegin(GX_QUADS, GX_VTXFMT0, 4); - GXPosition3f32( - temp_f31 + 1.25 * (0.0f / sp48[i]), - temp_f30 + 1.25 * (0.0f / sp48[i]), - 0.0f); + GXPosition3f32(temp_f31 + 1.25 * (0.0f / sp48[i]), temp_f30 + 1.25 * (0.0f / sp48[i]), 0.0f); GXColor4u8(0xFF, 0xFF, 0xFF, var_r29); GXPosition2f32(temp_f29 + 0.0, temp_f28 + 0.0); - GXPosition3f32( - temp_f31 + 1.25 * (1.0f / sp48[i]), - temp_f30 + 1.25 * (0.0f / sp48[i]), - 0.0f); + GXPosition3f32(temp_f31 + 1.25 * (1.0f / sp48[i]), temp_f30 + 1.25 * (0.0f / sp48[i]), 0.0f); GXColor4u8(0xFF, 0xFF, 0xFF, var_r29); GXPosition2f32(temp_f29 + 1.25, temp_f28 + 0.0); - GXPosition3f32( - temp_f31 + 1.25 * (1.0f / sp48[i]), - temp_f30 + 1.25 * (1.0f / sp48[i]), - 0.0f); + GXPosition3f32(temp_f31 + 1.25 * (1.0f / sp48[i]), temp_f30 + 1.25 * (1.0f / sp48[i]), 0.0f); GXColor4u8(0xFF, 0xFF, 0xFF, var_r29); GXPosition2f32(temp_f29 + 1.25, temp_f28 + 1.25); - GXPosition3f32( - temp_f31 + 1.25 * (0.0f / sp48[i]), - temp_f30 + 1.25 * (1.0f / sp48[i]), - 0.0f); + GXPosition3f32(temp_f31 + 1.25 * (0.0f / sp48[i]), temp_f30 + 1.25 * (1.0f / sp48[i]), 0.0f); GXColor4u8(0xFF, 0xFF, 0xFF, var_r29); GXPosition2f32(temp_f29 + 0.0, temp_f28 + 1.25); GXEnd(); @@ -345,16 +305,17 @@ void fn_1_4FC(ModelData* model, Mtx matrix) { const Vec lbl_1_rodata_100 = { 0.0f, 0.0f, 0.0f }; -void fn_1_1338(omObjData* arg0) { +void fn_1_1338(omObjData *arg0) +{ Mtx sp184; Vec sp178; s32 var_r24; - UnkM448Struct_00* temp_r31; - UnkM448Struct_00* sp11C; - UnkM448Struct_00* temp_r23; - UnkM448Struct_00* temp_r25; - UnkM448Struct_01* temp_r28; - UnkM448Struct_01* temp_r27; + UnkM448Struct_00 *temp_r31; + UnkM448Struct_00 *sp11C; + UnkM448Struct_00 *temp_r23; + UnkM448Struct_00 *temp_r25; + UnkM448Struct_01 *temp_r28; + UnkM448Struct_01 *temp_r27; float var_f29; float var_f20; float sp118; @@ -431,8 +392,7 @@ void fn_1_1338(omObjData* arg0) { break; case 1: if (temp_r31->unk38 == 1 && temp_r31->unk08 != -1) { - Hu3DMotionNoMotReset(arg0->model[0], "ske_head", - (lbl_1_data_178[temp_r31->unk08] != 0) ? 0x100 : 0x80); + Hu3DMotionNoMotReset(arg0->model[0], "ske_head", (lbl_1_data_178[temp_r31->unk08] != 0) ? 0x100 : 0x80); } sp118 = (lbl_1_bss_1C < 90) ? 0 : 0x48; if (arg0->trans.z < 250.0f) { @@ -474,8 +434,7 @@ void fn_1_1338(omObjData* arg0) { var_f20 = 0.0f; } if (arg0->trans.z >= lbl_1_data_1BC[temp_r31->unk00][2]) { - temp_r31->unk34 = (lbl_1_bss_80 < 1005) ? 0 - : ((lbl_1_bss_68 == -1) ? 3 : 7); + temp_r31->unk34 = (lbl_1_bss_80 < 1005) ? 0 : ((lbl_1_bss_68 == -1) ? 3 : 7); temp_r31->unk38 = 0; if (temp_r31->unk34 == 0) { arg0->rot.y = 180.0f; @@ -499,11 +458,13 @@ void fn_1_1338(omObjData* arg0) { PSMTXMultVec(sp184, &sp178, &sp178); var_f20 = sp178.x; sp118 = -sp178.z; - } else { + } + else { if (temp_r31->unk20 == 3) { if (temp_r31->unk44 < 0.0f && temp_r31->unk08 != -1) { sp110 = sp114 = 1.0f; - } else { + } + else { sp114 = 1.0f; } } @@ -514,37 +475,35 @@ void fn_1_1338(omObjData* arg0) { if (temp_r31->unk08 != -1 && temp_r31->unk20 != 3) { if (sp10C < 60.0f) { sp110 = sp114 = 1.0f; - } else { + } + else { var_f20 = temp_f26; sp118 = -temp_f25; } - } else if (sp10C < 277.5) { + } + else if (sp10C < 277.5) { if (temp_r31->unk20 != 3) { sp110 = sp114 = 1.0f; } var_f20 = (temp_f26 / 37.0) / 0.25; sp118 = (-temp_f25 / 37.0) / 0.25; - } else { + } + else { var_f20 = temp_f26; sp118 = -temp_f25; } } } } - arg0->trans.x = (arg0->trans.x < -450.0f) ? -450.0f - : (arg0->trans.x > 450.0f) ? 450.0f - : arg0->trans.x; - arg0->trans.z = (arg0->trans.z < -350.0f) ? -350.0f - : (arg0->trans.z > 350.0f) ? 350.0f - : arg0->trans.z; + arg0->trans.x = (arg0->trans.x < -450.0f) ? -450.0f : (arg0->trans.x > 450.0f) ? 450.0f : arg0->trans.x; + arg0->trans.z = (arg0->trans.z < -350.0f) ? -350.0f : (arg0->trans.z > 350.0f) ? 350.0f : arg0->trans.z; if ((lbl_1_bss_0 <= 0 || lbl_1_bss_18 >= 18000) && temp_r31->unk20 == 0) { temp_r31->unk34 = 5; temp_r31->unk38 = 0; lbl_1_bss_1C = 0; if (lbl_1_bss_18 >= 18000) { temp_r23 = lbl_1_bss_8C[1 - temp_r31->unk00]->data; - lbl_1_bss_68 = (temp_r31->unk08 == -1) ? temp_r31->unk00 - : (temp_r23->unk08 == -1) ? temp_r23->unk00 : 4; + lbl_1_bss_68 = (temp_r31->unk08 == -1) ? temp_r31->unk00 : (temp_r23->unk08 == -1) ? temp_r23->unk00 : 4; temp_r23->unk34 = 7; temp_r23->unk38 = 0; } @@ -557,8 +516,7 @@ void fn_1_1338(omObjData* arg0) { sp108 = atan2d(sp104 - arg0->trans.x, sp100 - arg0->trans.z); arg0->rot.y = 0.3 * (arg0->rot.y + spFC) - spFC; if (temp_r31->unk08 != -1) { - Hu3DMotionForceSet(arg0->model[0], "ske_head", - (lbl_1_data_178[temp_r31->unk08] != 0) ? 0x100 : 0x80, + Hu3DMotionForceSet(arg0->model[0], "ske_head", (lbl_1_data_178[temp_r31->unk08] != 0) ? 0x100 : 0x80, (lbl_1_data_178[temp_r31->unk08] != 0) ? 180.0f + -sp108 : 180.0f + sp108); } break; @@ -572,14 +530,15 @@ void fn_1_1338(omObjData* arg0) { temp_r25->unk34 = 1; temp_r25->unk38 = 0; if (temp_r25->unk08 != -1) { - Hu3DMotionForceSet(lbl_1_bss_8C[1 - temp_r31->unk00]->model[0], "ske_head", - (lbl_1_data_178[temp_r25->unk08] != 0) ? 0x100 : 0x80, 180.0f); - Hu3DMotionNoMotReset(lbl_1_bss_8C[1 - temp_r31->unk00]->model[0], "ske_head", - (lbl_1_data_178[temp_r25->unk08] != 0) ? 0x100 : 0x80); + Hu3DMotionForceSet( + lbl_1_bss_8C[1 - temp_r31->unk00]->model[0], "ske_head", (lbl_1_data_178[temp_r25->unk08] != 0) ? 0x100 : 0x80, 180.0f); + Hu3DMotionNoMotReset( + lbl_1_bss_8C[1 - temp_r31->unk00]->model[0], "ske_head", (lbl_1_data_178[temp_r25->unk08] != 0) ? 0x100 : 0x80); } } lbl_1_bss_14 = 1 - lbl_1_bss_14; - } else { + } + else { spF8 = lbl_1_data_1BC[temp_r31->unk00][0] - arg0->trans.x; spF4 = 400.0f - arg0->trans.z; spF0 = atan2d(lbl_1_data_1BC[temp_r31->unk00][0] - arg0->trans.x, 400.0f - arg0->trans.z); @@ -592,10 +551,8 @@ void fn_1_1338(omObjData* arg0) { break; case 7: if (temp_r31->unk38 == 1 && temp_r31->unk08 != -1) { - Hu3DMotionForceSet(arg0->model[0], "ske_head", - (lbl_1_data_178[temp_r31->unk08] != 0) ? 0x100 : 0x80, 180.0f); - Hu3DMotionNoMotReset(arg0->model[0], "ske_head", - (lbl_1_data_178[temp_r31->unk08] != 0) ? 0x100 : 0x80); + Hu3DMotionForceSet(arg0->model[0], "ske_head", (lbl_1_data_178[temp_r31->unk08] != 0) ? 0x100 : 0x80, 180.0f); + Hu3DMotionNoMotReset(arg0->model[0], "ske_head", (lbl_1_data_178[temp_r31->unk08] != 0) ? 0x100 : 0x80); } arg0->rot.y *= 0.3; if (lbl_1_bss_80 == 1007 && temp_r31->unk20 == 0) { @@ -607,10 +564,7 @@ void fn_1_1338(omObjData* arg0) { case 4: case 7: case 8: - if ((temp_r31->unk08 != -1) - ? CharModelMotionEndCheck(temp_r31->unk08) - : Hu3DMotionEndCheck(arg0->model[0])) - { + if ((temp_r31->unk08 != -1) ? CharModelMotionEndCheck(temp_r31->unk08) : Hu3DMotionEndCheck(arg0->model[0])) { var_r29 = 0; } /* fallthrough */ @@ -624,14 +578,16 @@ void fn_1_1338(omObjData* arg0) { if (var_f29 < 10.0f) { temp_r31->unk40 = temp_f31; temp_r31->unk48 += temp_f30; - } else { + } + else { temp_f31 = temp_f31 / var_f29; temp_f30 = temp_f30 / var_f29; var_f29 = 10.0f; if (temp_r31->unk20 != 3) { temp_r31->unk40 = temp_f31 * var_f29; temp_r31->unk48 = temp_f30 * var_f29; - } else { + } + else { temp_r31->unk40 = 0.875 * temp_r31->unk40 + temp_f31 * var_f29 * 0.125; temp_r31->unk48 = 0.875 * temp_r31->unk48 + temp_f30 * var_f29 * 0.125; } @@ -640,10 +596,12 @@ void fn_1_1338(omObjData* arg0) { arg0->rot.y = atan2d(temp_r31->unk40, temp_r31->unk48); if (temp_r31->unk3C >= 8.0f) { var_r29 = 2; - } else { + } + else { var_r29 = 1; } - } else if (temp_r31->unk20 != 7 && temp_r31->unk20 != 4 && temp_r31->unk20 != 8) { + } + else if (temp_r31->unk20 != 7 && temp_r31->unk20 != 4 && temp_r31->unk20 != 8) { var_r29 = 0; } temp_r31->unk44 = 0.0f; @@ -663,21 +621,24 @@ void fn_1_1338(omObjData* arg0) { if (var_f29 < 10.0f) { temp_r31->unk40 = temp_f31; temp_r31->unk48 = temp_f30; - } else { + } + else { temp_f31 = temp_f31 / var_f29; temp_f30 = temp_f30 / var_f29; var_f29 = 10.0f; if (temp_r31->unk20 != 3) { temp_r31->unk40 = temp_f31 * var_f29; temp_r31->unk48 = temp_f30 * var_f29; - } else { + } + else { temp_r31->unk40 = 0.875 * temp_r31->unk40 + temp_f31 * var_f29 * 0.125; temp_r31->unk48 = 0.875 * temp_r31->unk48 + temp_f30 * var_f29 * 0.125; } } temp_r31->unk3C = var_f29; arg0->rot.y = atan2d(temp_r31->unk40, temp_r31->unk48); - } else { + } + else { // Required to match. 0.875 * temp_r31->unk40; 0.875 * temp_r31->unk48; @@ -687,10 +648,12 @@ void fn_1_1338(omObjData* arg0) { if (sp114) { if (++temp_r31->unk28 > 4) { temp_r31->unk28 = 0; - } else { + } + else { temp_r31->unk44 += 4.866667f; } - } else { + } + else { temp_r31->unk28 = 0; } } @@ -725,19 +688,19 @@ void fn_1_1338(omObjData* arg0) { lbl_1_bss_1C = 0; } } - } else if (sp110) { + } + else if (sp110) { temp_r31->unk44 = 0.0f; temp_r31->unk30 = 0; var_r29 = 5; } break; case 5: - if ((Hu3DData[arg0->model[0]].unk_0C == -1 && temp_r31->unk08 != -1) - ? CharModelMotionEndCheck(temp_r31->unk08) - : Hu3DMotionEndCheck(arg0->model[0])) - { + if ((Hu3DData[arg0->model[0]].unk_0C == -1 && temp_r31->unk08 != -1) ? CharModelMotionEndCheck(temp_r31->unk08) + : Hu3DMotionEndCheck(arg0->model[0])) { temp_r31->unk44 += -2.4333334f; - } else { + } + else { temp_r31->unk44 = 0.0f; } if (temp_r31->unk44 < 0.0f && temp_r31->unk2C != 0) { @@ -745,7 +708,8 @@ void fn_1_1338(omObjData* arg0) { temp_r31->unk44 = 0.0f; temp_r31->unk30 = 0; var_r29 = 7; - } else { + } + else { temp_r31->unk44 = 9.733334f; temp_r31->unk2C = 0; var_r29 = 6; @@ -776,10 +740,7 @@ void fn_1_1338(omObjData* arg0) { case 6: temp_r31->unk44 += -2.4333334f; if (temp_r31->unk2C != 0) { - if ((temp_r31->unk08 != -1) - ? CharModelMotionEndCheck(temp_r31->unk08) - : Hu3DMotionEndCheck(arg0->model[0])) - { + if ((temp_r31->unk08 != -1) ? CharModelMotionEndCheck(temp_r31->unk08) : Hu3DMotionEndCheck(arg0->model[0])) { var_r29 = 7; } } @@ -821,7 +782,8 @@ void fn_1_1338(omObjData* arg0) { if (temp_r31->unk08 != -1) { Hu3DMotionShiftSet(arg0->model[0], arg0->motion[var_r18], lbl_1_data_EC[var_r18], lbl_1_data_C0[var_r18], (lbl_1_data_A8[var_r18] != 0) ? HU3D_MOTATTR_NONE : HU3D_MOTATTR_LOOP); - } else { + } + else { Hu3DMotionShiftSet(arg0->model[0], arg0->motion[var_r29], lbl_1_data_EC[var_r29], lbl_1_data_118[var_r29], (lbl_1_data_B3[var_r29] != 0) ? HU3D_MOTATTR_NONE : HU3D_MOTATTR_LOOP); if (var_r29 == 3) { @@ -840,22 +802,20 @@ void fn_1_1338(omObjData* arg0) { spCC = 0.0f; for (var_r21 = 0; var_r21 < 2; var_r21++) { if (lbl_1_data_1AC[temp_r31->unk00] > 0) { - float sp1B4[21] = { - 0.0f, 0.0f, 0.0f, 5.0f, 0.0f, 7.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 10.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 15.0f - }; + float sp1B4[21] = { 0.0f, 0.0f, 0.0f, 5.0f, 0.0f, 7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 15.0f }; - spD8 = (lbl_1_data_1B4[temp_r31->unk00] < 10) - ? 1.0 - lbl_1_data_1B4[temp_r31->unk00] / 10.0 : 0.0; + spD8 = (lbl_1_data_1B4[temp_r31->unk00] < 10) ? 1.0 - lbl_1_data_1B4[temp_r31->unk00] / 10.0 : 0.0; spD4 = 1.0 + (spD8 * 0.5 + spD8 * spD8 * 0.5) * sp1B4[lbl_1_data_1AC[temp_r31->unk00]] / 10.0; espScaleSet(lbl_1_data_28[(var_r21 == 0 ? 2 : 3) + temp_r31->unk00 * 5], spD4, spD4); - } else if (lbl_1_data_1AC[temp_r31->unk00] < 0) { + } + else if (lbl_1_data_1AC[temp_r31->unk00] < 0) { s32 sp168[4] = { 100, 485, 16, -4 }; spD0 = spD8 * lbl_1_data_1AC[temp_r31->unk00] * (rand8() / 255.0 - 0.5); spCC = spD8 * lbl_1_data_1AC[temp_r31->unk00] * (rand8() / 255.0 - 0.5); - espPosSet(lbl_1_data_28[(var_r21 == 0 ? 2 : 3) + temp_r31->unk00 * 5], (&sp168[var_r21])[2] + sp168[temp_r31->unk00] + spD0, 72.0f + spCC); + espPosSet( + lbl_1_data_28[(var_r21 == 0 ? 2 : 3) + temp_r31->unk00 * 5], (&sp168[var_r21])[2] + sp168[temp_r31->unk00] + spD0, 72.0f + spCC); } } } @@ -867,8 +827,9 @@ float lbl_1_data_264 = 314.0f; float lbl_1_data_268 = -100.0f; float lbl_1_data_26C = -38.75f; -void fn_1_4310(omObjData* arg0) { - UnkM448Struct_00* spC8[2]; +void fn_1_4310(omObjData *arg0) +{ + UnkM448Struct_00 *spC8[2]; float spB0; float spAC; float temp_f19; @@ -889,11 +850,11 @@ void fn_1_4310(omObjData* arg0) { float sp74; float sp70; float sp6C; - ModelData* temp_r23; - ModelData* temp_r22; - ModelData* temp_r26; - ModelData* temp_r29; - UnkM448Struct_01* temp_r31; + ModelData *temp_r23; + ModelData *temp_r22; + ModelData *temp_r26; + ModelData *temp_r29; + UnkM448Struct_01 *temp_r31; float temp_f21; float temp_f20; float temp_f26; @@ -1140,9 +1101,7 @@ void fn_1_4310(omObjData* arg0) { sp98 = 1.0f - temp_f26; var_f18 = temp_f30 * sp98 + var_f28 * temp_f26; spA8 = temp_f29 * sp98 + var_f27 * temp_f26; - var_f31 = (temp_r31->unk08 * 10 < temp_r31->unk1C * spA0) - ? temp_r31->unk08 * 10 - : temp_r31->unk1C * spA0; + var_f31 = (temp_r31->unk08 * 10 < temp_r31->unk1C * spA0) ? temp_r31->unk08 * 10 : temp_r31->unk1C * spA0; temp_f19 = 4.0f * (temp_r31->unk1C / temp_f19) - 2.0f; temp_f19 = 4.0f - temp_f19 * temp_f19; var_f31 = temp_f19 / 4.0 * temp_f26 * 0.5 * (temp_r31->unk08 * 10 + 100) + temp_f26 * temp_r31->unk08 * 10.0f; @@ -1166,7 +1125,7 @@ void fn_1_4310(omObjData* arg0) { sp88 = -300.0f; temp_f21 = (temp_r31->unk1C - 60) / 50.0; // Cast required to match. - temp_f21 = (double) (1.0f - (1.0f - temp_f21) * (1.0f - temp_f21)); + temp_f21 = (double)(1.0f - (1.0f - temp_f21) * (1.0f - temp_f21)); sp84 = 1.0f - temp_f21; var_f18 = sp8C * sp84 + sp94 * temp_f21; spA8 = sp88 * sp84 + sp90 * temp_f21; @@ -1212,9 +1171,7 @@ void fn_1_4310(omObjData* arg0) { lbl_1_data_1A4[temp_r31->unk0C] += temp_r31->unk20; lbl_1_data_1AC[temp_r31->unk0C] = temp_r31->unk20; lbl_1_data_1B4[temp_r31->unk0C] = 0; - lbl_1_data_1A4[temp_r31->unk0C] = - (lbl_1_data_1A4[temp_r31->unk0C] < 0) ? 0 - : lbl_1_data_1A4[temp_r31->unk0C]; + lbl_1_data_1A4[temp_r31->unk0C] = (lbl_1_data_1A4[temp_r31->unk0C] < 0) ? 0 : lbl_1_data_1A4[temp_r31->unk0C]; spC8[temp_r31->unk0C]->unk34 = 5; spC8[temp_r31->unk0C]->unk38 = 0; temp_r31->unk18 = 9; @@ -1224,10 +1181,10 @@ void fn_1_4310(omObjData* arg0) { lbl_1_bss_9C[(temp_r31->unk20) > 0 ? 5 : 6].unk00++; } if (lbl_1_data_1A4[temp_r31->unk0C] >= 50 || lbl_1_data_170[0] + lbl_1_data_170[1] >= 20) { - lbl_1_bss_68 = - (lbl_1_data_1A4[temp_r31->unk0C] >= 50) ? temp_r31->unk0C - : (lbl_1_data_1A4[0] > lbl_1_data_1A4[1]) ? 0 - : (lbl_1_data_1A4[0] < lbl_1_data_1A4[1]) ? 1: 4; + lbl_1_bss_68 = (lbl_1_data_1A4[temp_r31->unk0C] >= 50) ? temp_r31->unk0C + : (lbl_1_data_1A4[0] > lbl_1_data_1A4[1]) ? 0 + : (lbl_1_data_1A4[0] < lbl_1_data_1A4[1]) ? 1 + : 4; spC8[1 - temp_r31->unk0C]->unk34 = 7; spC8[1 - temp_r31->unk0C]->unk38 = 0; } @@ -1240,23 +1197,19 @@ void fn_1_4310(omObjData* arg0) { temp_r29->rot.x = temp_r26->rot.x = var_f23; temp_r29->rot.y = spA4; if (temp_r29->pos.y <= 0.0f || temp_r31->unk18 == 9) { - Hu3DModelAttrSet(arg0->model[i + 7], 1); - Hu3DModelAttrReset(arg0->model[i + 27], 1); + Hu3DModelAttrSet(arg0->model[i + 7], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(arg0->model[i + 27], HU3D_ATTR_DISPOFF); temp_r26->pos.y = (temp_r31->unk18 != 9) ? 0.0f : temp_r29->pos.y; - } else { - Hu3DModelAttrReset(arg0->model[i + 7], 1); - Hu3DModelAttrSet(arg0->model[i + 27], 1); + } + else { + Hu3DModelAttrReset(arg0->model[i + 7], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[i + 27], HU3D_ATTR_DISPOFF); } } { s32 var_r18 = lbl_1_data_25C; - float spD0[][4] = { - { 2500.0f, 0.0f, -100.0f, -40.0f }, - { 2775.0f, 314.0f, -100.0f, -38.75f }, - { 875.0f, 116.0f, -100.0f, -15.0f }, - { 1625.0f, -416.0f, -340.0f, -30.25f }, - { 875.0f, 116.0f, -100.0f, -30.0f } - }; + float spD0[][4] = { { 2500.0f, 0.0f, -100.0f, -40.0f }, { 2775.0f, 314.0f, -100.0f, -38.75f }, { 875.0f, 116.0f, -100.0f, -15.0f }, + { 1625.0f, -416.0f, -340.0f, -30.25f }, { 875.0f, 116.0f, -100.0f, -30.0f } }; if (lbl_1_data_25C == -1) { lbl_1_data_25C = 1; @@ -1288,7 +1241,8 @@ void fn_1_4310(omObjData* arg0) { if (lbl_1_bss_34 == 0) { lbl_1_bss_38 = 1.0 - 0.95 * (1.0f - lbl_1_bss_38); var_f22 = lbl_1_bss_38; - } else { + } + else { lbl_1_bss_38 += 0.011111111111111112; lbl_1_bss_38 = (lbl_1_bss_38 > 1.0f) ? 1.0f : lbl_1_bss_38; var_f22 = 0.5 + -0.5 * cosd(180.0f * lbl_1_bss_38); @@ -1302,20 +1256,12 @@ void fn_1_4310(omObjData* arg0) { } } -const s32 lbl_1_rodata_408[] = { - MAKE_MESSID(43, 3), - MAKE_MESSID(43, 4), - MAKE_MESSID(43, 5), - MAKE_MESSID(43, 6), - MAKE_MESSID(43, 7), - MAKE_MESSID(43, 8), - MAKE_MESSID(43, 9), - MAKE_MESSID(43, 10), - 0 -}; +const s32 lbl_1_rodata_408[] = { MAKE_MESSID(43, 3), MAKE_MESSID(43, 4), MAKE_MESSID(43, 5), MAKE_MESSID(43, 6), MAKE_MESSID(43, 7), + MAKE_MESSID(43, 8), MAKE_MESSID(43, 9), MAKE_MESSID(43, 10), 0 }; -void fn_1_6DAC(void) { - UnkM448Struct_00* sp8[2]; +void fn_1_6DAC(void) +{ + UnkM448Struct_00 *sp8[2]; s16 var_r29; s16 temp_r31; u32 temp_r26; @@ -1331,9 +1277,8 @@ void fn_1_6DAC(void) { HuWinExAnimIn(temp_r31); HuWinBGTPLvlSet(temp_r31, 0.8f); HuWinMesSpeedSet(temp_r31, 1); - HuWinDisablePlayerSet(temp_r31, 0xF - & ((sp8[0]->unk0C != -1) ? ~(1 << sp8[0]->unk0C) : 0xF) - & ((sp8[1]->unk0C != -1) ? ~(1 << sp8[1]->unk0C) : 0xF)); + HuWinDisablePlayerSet( + temp_r31, 0xF & ((sp8[0]->unk0C != -1) ? ~(1 << sp8[0]->unk0C) : 0xF) & ((sp8[1]->unk0C != -1) ? ~(1 << sp8[1]->unk0C) : 0xF)); HuWinMesColSet(temp_r31, 0); HuWinMesSet(temp_r31, MAKE_MESSID(43, 1)); if (((sp8[0]->unk0C == -1) || (sp8[0]->unk08 == -1)) && ((sp8[1]->unk0C == -1) || (sp8[1]->unk08 == -1))) { @@ -1346,10 +1291,12 @@ void fn_1_6DAC(void) { if (sp8[0]->unk0C == -1 && sp8[1]->unk0C == -1) { HuPrcSleep(60); var_r29 = 1; - } else { + } + else { var_r29 = HuWinChoiceGet(temp_r31, 0); } - } else { + } + else { var_r29 = 1; } if (var_r29 == 0) { @@ -1362,7 +1309,8 @@ void fn_1_6DAC(void) { } HuWinMesWait(temp_r31); } - } else { + } + else { HuWinMesColSet(temp_r31, 0); HuWinMesSet(temp_r31, MAKE_MESSID(43, 10)); if ((sp8[0]->unk0C == -1 || sp8[0]->unk08 == -1) && (sp8[1]->unk0C == -1 || sp8[1]->unk08 == -1)) { @@ -1376,28 +1324,16 @@ void fn_1_6DAC(void) { HuPrcEnd(); } -void fn_1_7148(omObjData* arg0) { +void fn_1_7148(omObjData *arg0) +{ float temp_f31; - UnkM448Struct_00* spC[2]; + UnkM448Struct_00 *spC[2]; s32 sp8; s32 i; for (i = 0; i < 13; i++) { - s32 sp14[] = { - 0x0000078E, - 0x0000078F, - 0x00000790, - 0x00000791, - 0x00000792, - 0x00000793, - 0x00000794, - 0x00000795, - 0x00000796, - 0x00000797, - 0x00000798, - 0x00000799, - 0x0000079A - }; + s32 sp14[] = { 0x0000078E, 0x0000078F, 0x00000790, 0x00000791, 0x00000792, 0x00000793, 0x00000794, 0x00000795, 0x00000796, 0x00000797, + 0x00000798, 0x00000799, 0x0000079A }; if (lbl_1_bss_9C[i].unk00 > 3) { lbl_1_bss_9C[i].unk00 = 3; @@ -1447,9 +1383,9 @@ void fn_1_7148(omObjData* arg0) { if (lbl_1_bss_84 > 240) { lbl_1_bss_80++; lbl_1_bss_84 = 0; - Hu3DModelAttrSet(lbl_1_bss_88->model[1], 1); - Hu3DModelAttrSet(lbl_1_bss_88->model[2], 1); - Hu3DModelAttrReset(lbl_1_bss_88->model[0], 1); + Hu3DModelAttrSet(lbl_1_bss_88->model[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_88->model[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_88->model[0], HU3D_ATTR_DISPOFF); Hu3DModelAmbSet(lbl_1_bss_8C[0]->model[0], 1.0f, 1.0f, 1.0f); Hu3DModelAmbSet(lbl_1_bss_8C[1]->model[0], 1.0f, 1.0f, 1.0f); } @@ -1473,7 +1409,8 @@ void fn_1_7148(omObjData* arg0) { if (lbl_1_bss_84 == 1) { HuPrcChildCreate(fn_1_6DAC, 100, 0x2000, 0, HuPrcCurrentGet()); lbl_1_bss_10 = 1; - } else if (lbl_1_bss_10 == 0) { + } + else if (lbl_1_bss_10 == 0) { lbl_1_bss_80++; lbl_1_bss_84 = 0; } @@ -1522,7 +1459,8 @@ void fn_1_7148(omObjData* arg0) { } HuAudSeqFadeOut(lbl_1_data_1A0, 100); lbl_1_data_1A0 = -1; - } else if (MGSeqStatGet(lbl_1_data_198) == 0) { + } + else if (MGSeqStatGet(lbl_1_data_198) == 0) { lbl_1_bss_80++; lbl_1_bss_84 = 0; } @@ -1533,11 +1471,13 @@ void fn_1_7148(omObjData* arg0) { if (lbl_1_bss_68 != 4) { if (spC[lbl_1_bss_68]->unk08 != -1) { HuAudSStreamPlay(1); - } else { + } + else { HuAudSStreamPlay(3); } GWPlayerCoinWinSet(spC[lbl_1_bss_68]->unk04, 10); - } else if (lbl_1_bss_68 == 4) { + } + else if (lbl_1_bss_68 == 4) { HuAudSStreamPlay(4); } } @@ -1550,8 +1490,9 @@ void fn_1_7148(omObjData* arg0) { } } -void fn_1_7DC4(ModelData* model, ParticleData* particle, Mtx matrix) { - HsfanimStruct01* var_r31; +void fn_1_7DC4(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; s16 i; if (particle->unk_34 == 0) { @@ -1584,8 +1525,7 @@ void fn_1_7DC4(ModelData* model, ParticleData* particle, Mtx matrix) { } if (var_r31->unk00_s16 <= 100) { var_r31->unk34.y -= 3.0f; - var_r31->unk2C = ((var_r31->unk00_s16 > 50) ? (var_r31->unk00_s16 - 50) / 50.0 : 0.0) - * (rand8() * 80 / 255.0); + var_r31->unk2C = ((var_r31->unk00_s16 > 50) ? (var_r31->unk00_s16 - 50) / 50.0 : 0.0) * (rand8() * 80 / 255.0); } if (var_r31->unk00_s16 == 0) { var_r31->unk2C = 0.0f; @@ -1594,9 +1534,10 @@ void fn_1_7DC4(ModelData* model, ParticleData* particle, Mtx matrix) { } } -void fn_1_81C0(omObjData* arg0) { - UnkM448Struct_00* temp_r26; - UnkM448Struct_00* temp_r23; +void fn_1_81C0(omObjData *arg0) +{ + UnkM448Struct_00 *temp_r26; + UnkM448Struct_00 *temp_r23; s32 temp_r29; s32 temp_r25; s32 i, j, k; @@ -1605,34 +1546,26 @@ void fn_1_81C0(omObjData* arg0) { memset(lbl_1_bss_16C, 0, sizeof(lbl_1_bss_16C)); arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M448, 0)); Hu3DModelShadowMapSet(arg0->model[0]); - Hu3DModelAttrSet(arg0->model[0], 0x40000001); + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP); Hu3DModelLayerSet(arg0->model[0], 0); Hu3DMotionTimeSet(arg0->model[0], 20.0f); - Hu3DModelAttrSet(arg0->model[0], 1); + Hu3DModelAttrSet(arg0->model[0], HU3D_ATTR_DISPOFF); arg0->model[6] = Hu3DHookFuncCreate(fn_1_4FC); Hu3DModelLayerSet(arg0->model[6], 6); arg0->model[1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M448, 1)); Hu3DModelShadowMapSet(arg0->model[1]); Hu3DModelLayerSet(arg0->model[1], 0); Hu3DModelPosSet(arg0->model[1], 0.0f, 0.0f, 0.0f); - Hu3DModelAttrSet(arg0->model[1], 0x40000002); + Hu3DModelAttrSet(arg0->model[1], HU3D_MOTATTR_PAUSE); arg0->model[2] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M448, 2)); Hu3DModelShadowMapSet(arg0->model[2]); Hu3DModelLayerSet(arg0->model[2], 0); Hu3DModelPosSet(arg0->model[2], 0.0f, 0.0f, 0.0f); - Hu3DModelAttrSet(arg0->model[2], 0x40000002); + Hu3DModelAttrSet(arg0->model[2], HU3D_MOTATTR_PAUSE); { - s32 sp9C[] = { - DATA_MAKE_NUM(DATADIR_M448, 9), - DATA_MAKE_NUM(DATADIR_M448, 10), - DATA_MAKE_NUM(DATADIR_M448, 11), - DATA_MAKE_NUM(DATADIR_M448, 12), - DATA_MAKE_NUM(DATADIR_M448, 13), - DATA_MAKE_NUM(DATADIR_M448, 14), - DATA_MAKE_NUM(DATADIR_M448, 16), - DATA_MAKE_NUM(DATADIR_M448, 15), - DATA_MAKE_NUM(DATADIR_M448, 17) - }; + s32 sp9C[] = { DATA_MAKE_NUM(DATADIR_M448, 9), DATA_MAKE_NUM(DATADIR_M448, 10), DATA_MAKE_NUM(DATADIR_M448, 11), + DATA_MAKE_NUM(DATADIR_M448, 12), DATA_MAKE_NUM(DATADIR_M448, 13), DATA_MAKE_NUM(DATADIR_M448, 14), DATA_MAKE_NUM(DATADIR_M448, 16), + DATA_MAKE_NUM(DATADIR_M448, 15), DATA_MAKE_NUM(DATADIR_M448, 17) }; for (i = 0; i < 2; i++) { temp_r26 = lbl_1_bss_8C[i]->data; @@ -1643,22 +1576,10 @@ void fn_1_81C0(omObjData* arg0) { } } { - s32 sp110[] = { - -10, -5, -5, 3, 3, 3, 3, 3, 5, 5, - 5, 5, 5, 10, 10, 10, 10, 10, 20, 20 - }; - s32 spC0[] = { - 0, 1, 1, 2, 2, 2, 2, 2, 3, 3, - 3, 3, 3, 4, 4, 4, 4, 4, 5, 5 - }; - s32 sp34[] = { - DATA_MAKE_NUM(DATADIR_M448, 3), - DATA_MAKE_NUM(DATADIR_M448, 4), - DATA_MAKE_NUM(DATADIR_M448, 5), - DATA_MAKE_NUM(DATADIR_M448, 6), - DATA_MAKE_NUM(DATADIR_M448, 7), - DATA_MAKE_NUM(DATADIR_M448, 8) - }; + s32 sp110[] = { -10, -5, -5, 3, 3, 3, 3, 3, 5, 5, 5, 5, 5, 10, 10, 10, 10, 10, 20, 20 }; + s32 spC0[] = { 0, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5 }; + s32 sp34[] = { DATA_MAKE_NUM(DATADIR_M448, 3), DATA_MAKE_NUM(DATADIR_M448, 4), DATA_MAKE_NUM(DATADIR_M448, 5), DATA_MAKE_NUM(DATADIR_M448, 6), + DATA_MAKE_NUM(DATADIR_M448, 7), DATA_MAKE_NUM(DATADIR_M448, 8) }; s32 sp1C[] = { -1, -1, -1, -1, -1, -1 }; for (i = 0; i < 4; i++) { @@ -1680,17 +1601,17 @@ void fn_1_81C0(omObjData* arg0) { sp1C[spC0[temp_r25]] = temp_r29; } arg0->model[var_r27 + temp_r29] = Hu3DModelCreateFile(sp34[spC0[temp_r25]]); - } else { + } + else { arg0->model[var_r27 + temp_r29] = Hu3DModelLink(arg0->model[var_r27 + sp1C[spC0[temp_r25]]]); } - Hu3DModelPosSet(arg0->model[var_r27 + temp_r29], - 100.0 + 200.0 * (lbl_1_bss_16C[temp_r29].unk00 - 2.5), - (k == 0) ? 4000 : 0, + Hu3DModelPosSet(arg0->model[var_r27 + temp_r29], 100.0 + 200.0 * (lbl_1_bss_16C[temp_r29].unk00 - 2.5), (k == 0) ? 4000 : 0, 100.0 + 200.0 * (lbl_1_bss_16C[temp_r29].unk04 - 2.0)); if (k == 0) { Hu3DModelShadowSet(arg0->model[var_r27 + temp_r29]); - } else { - Hu3DModelAttrSet(arg0->model[var_r27 + temp_r29], 1); + } + else { + Hu3DModelAttrSet(arg0->model[var_r27 + temp_r29], HU3D_ATTR_DISPOFF); Hu3DModelShadowMapSet(arg0->model[var_r27 + temp_r29]); } } @@ -1701,7 +1622,7 @@ void fn_1_81C0(omObjData* arg0) { Hu3DModelPosSet(arg0->model[5], 0.0f, 0.0f, 0.0f); Hu3DModelScaleSet(arg0->model[5], 1.0f, 1.0f, 1.0f); Hu3DModelLayerSet(arg0->model[5], 3); - Hu3DModelAttrReset(arg0->model[5], 1); + Hu3DModelAttrReset(arg0->model[5], HU3D_ATTR_DISPOFF); Hu3DParticleColSet(arg0->model[5], 0xFF, 0xFF, 0xFF); Hu3DParticleScaleSet(arg0->model[5], 1.0f); Hu3DParticleHookSet(arg0->model[5], fn_1_7DC4); @@ -1714,18 +1635,21 @@ void fn_1_81C0(omObjData* arg0) { if (lbl_1_data_0[i] == DATADIR_MGCONST) { temp_r23 = lbl_1_bss_8C[i == 4 ? 0 : (i == 9 ? 1 : 0)]->data; - lbl_1_data_28[i] = espEntry((temp_r23->unk08 == -1) ? DATA_MAKE_NUM(DATADIR_M448, 29) : DATA_MAKE_NUM(lbl_1_data_0[i], temp_r23->unk08), 0, 0); - } else { + lbl_1_data_28[i] + = espEntry((temp_r23->unk08 == -1) ? DATA_MAKE_NUM(DATADIR_M448, 29) : DATA_MAKE_NUM(lbl_1_data_0[i], temp_r23->unk08), 0, 0); + } + else { lbl_1_data_28[i] = espEntry(lbl_1_data_0[i], 0, 0); } espDrawNoSet(lbl_1_data_28[i], 0); - espAttrSet(lbl_1_data_28[i], 5); + espAttrSet(lbl_1_data_28[i], HUSPR_ATTR_NOANIM | HUSPR_ATTR_DISPOFF); espBankSet(lbl_1_data_28[i], 0); espPriSet(lbl_1_data_28[i], 128 - i); espPosSet(lbl_1_data_28[i], sp74[i] + sp14[i < 5 ? 0 : 1], sp4C[i] + 70); if (((i >= 5) ? i - 5 : i) != 0) { - (void) 1; // Required to match. - } else { + (void)1; // Required to match. + } + else { espTPLvlSet(lbl_1_data_28[i], 0.5f); espColorSet(lbl_1_data_28[i], 0, 0, 0); } @@ -1733,11 +1657,12 @@ void fn_1_81C0(omObjData* arg0) { arg0->func = fn_1_4310; } -void fn_1_8DD0(omObjData* arg0) { +void fn_1_8DD0(omObjData *arg0) +{ s32 var_r28; s32 var_r27; - UnkM448Struct_00* temp_r31; - UnkM448Struct_00* sp30; + UnkM448Struct_00 *temp_r31; + UnkM448Struct_00 *sp30; s32 var_r26; s32 i; @@ -1757,34 +1682,36 @@ void fn_1_8DD0(omObjData* arg0) { if (temp_r31->unk00 == 0) { temp_r31->unk04 = var_r27; var_r26 = var_r28; - } else { + } + else { temp_r31->unk04 = var_r28; var_r26 = var_r27; } - } else { + } + else { temp_r31->unk04 = (GWPlayerCfg[0].group == temp_r31->unk00) ? 0 - : GWPlayerCfg[1].group == temp_r31->unk00 ? 1 - : GWPlayerCfg[2].group == temp_r31->unk00 ? 2 - : GWPlayerCfg[3].group == temp_r31->unk00 ? 3 : 4; + : GWPlayerCfg[1].group == temp_r31->unk00 ? 1 + : GWPlayerCfg[2].group == temp_r31->unk00 ? 2 + : GWPlayerCfg[3].group == temp_r31->unk00 ? 3 + : 4; var_r26 = (GWPlayerCfg[0].group == 1 - temp_r31->unk00) ? 0 - : (GWPlayerCfg[1].group == 1 - temp_r31->unk00) ? 1 - : (GWPlayerCfg[2].group == 1 - temp_r31->unk00) ? 2 - : (GWPlayerCfg[3].group == 1 - temp_r31->unk00) ? 3 : 4; + : (GWPlayerCfg[1].group == 1 - temp_r31->unk00) ? 1 + : (GWPlayerCfg[2].group == 1 - temp_r31->unk00) ? 2 + : (GWPlayerCfg[3].group == 1 - temp_r31->unk00) ? 3 + : 4; } if (temp_r31->unk04 == 4) { OSReport("m448:wrong player group\n"); temp_r31->unk04 = temp_r31->unk00; } - temp_r31->unk08 = (var_r28 != -1 && temp_r31->unk00 == 1) ? -1 - : GWPlayerCfg[temp_r31->unk04].character; - temp_r31->unk0C = (temp_r31->unk08 == -1 || GWPlayerCfg[temp_r31->unk04].iscom) ? -1 - : GWPlayerCfg[temp_r31->unk04].pad_idx; - temp_r31->unk10 = (temp_r31->unk0C != -1) ? 0 - : GWPlayerCfg[temp_r31->unk04].diff; + temp_r31->unk08 = (var_r28 != -1 && temp_r31->unk00 == 1) ? -1 : GWPlayerCfg[temp_r31->unk04].character; + temp_r31->unk0C = (temp_r31->unk08 == -1 || GWPlayerCfg[temp_r31->unk04].iscom) ? -1 : GWPlayerCfg[temp_r31->unk04].pad_idx; + temp_r31->unk10 = (temp_r31->unk0C != -1) ? 0 : GWPlayerCfg[temp_r31->unk04].diff; temp_r31->unk34 = 0; if (temp_r31->unk08 != -1) { arg0->model[0] = CharModelCreate(temp_r31->unk08, 2); - } else { + } + else { arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M448, 18)); } Hu3DModelLayerSet(arg0->model[0], 0); @@ -1794,7 +1721,8 @@ void fn_1_8DD0(omObjData* arg0) { for (i = 0; i < 11; i++) { if (temp_r31->unk08 != -1) { arg0->motion[i] = CharModelMotionCreate(temp_r31->unk08, lbl_1_data_50[i]); - } else { + } + else { arg0->motion[i] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_7C[i]); } } @@ -1803,8 +1731,9 @@ void fn_1_8DD0(omObjData* arg0) { Hu3DMotionSet(arg0->model[0], arg0->motion[temp_r31->unk20]); if (temp_r31->unk08 != -1) { Hu3DMotionTimeSet(arg0->model[0], (temp_r31->unk00 == 0) ? 0 : 80); - Hu3DModelAttrSet(arg0->model[0], 0x40000001); - } else { + Hu3DModelAttrSet(arg0->model[0], HU3D_MOTATTR_LOOP); + } + else { lbl_1_bss_20 = CharModelEffectNpcInit(arg0->model[0], arg0->motion[2], 1, 14); lbl_1_bss_24 = CharModelEffectNpcInit(arg0->model[0], arg0->motion[6], 5, 14); } @@ -1812,14 +1741,14 @@ void fn_1_8DD0(omObjData* arg0) { arg0->trans.y = lbl_1_data_1BC[temp_r31->unk00][1]; arg0->trans.z = 0.0f; arg0->rot.y = (temp_r31->unk00 == 0) ? 90 : 270; - arg0->rot.y = (temp_r31->unk08 != -1) ? 0 - : (temp_r31->unk00 == 0) ? 90 : 270; + arg0->rot.y = (temp_r31->unk08 != -1) ? 0 : (temp_r31->unk00 == 0) ? 90 : 270; arg0->scale.x = arg0->scale.y = arg0->scale.z = 1.0f; arg0->rot.x = arg0->rot.z = 0.0f; arg0->func = fn_1_1338; } -void fn_1_9508(omObjData* arg0) { +void fn_1_9508(omObjData *arg0) +{ lbl_1_bss_80 = 1000; lbl_1_bss_84 = 0; lbl_1_bss_78 = 0; @@ -1834,8 +1763,9 @@ void fn_1_9508(omObjData* arg0) { arg0->func = fn_1_7148; } -void ObjectSetup(void) { - omObjData* var_r30; +void ObjectSetup(void) +{ + omObjData *var_r30; s32 i; OSReport("******* M448 ObjectSetup *********\n"); @@ -1894,9 +1824,10 @@ void ObjectSetup(void) { lbl_1_bss_98 = omAddObjEx(lbl_1_bss_70, 103, 0, 0, -1, fn_1_9508); } -void fn_1_9B00(omObjData* arg0) { +void fn_1_9B00(omObjData *arg0) +{ s32 i; - UnkM448Struct_00* temp_r30; + UnkM448Struct_00 *temp_r30; if (WipeStatGet() != 0) { return; diff --git a/src/REL/m450Dll/main.c b/src/REL/m450Dll/main.c index 6876625f..95a4b79a 100644 --- a/src/REL/m450Dll/main.c +++ b/src/REL/m450Dll/main.c @@ -2873,7 +2873,7 @@ void fn_1_AD58(omObjData *object) fn_1_9F4C(var_r31, object->model[0], lbl_1_bss_4C, 0x7A); if (1000.0f > var_r31->unk_00.unk_6C.y) { var_r31->unk_150++; - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); } break; case 0xBBA: @@ -2883,7 +2883,7 @@ void fn_1_AD58(omObjData *object) var_r31->unk_00.unk_9C = 270.0f; fn_1_A470(var_r31, object, "m450mex06-s4kuppa", 2); fn_1_4ED8(&var_r31->unk_00, 0); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); } break; 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); if (1000.0f > var_r31->unk_00.unk_6C.y) { 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_128 = 0.0f; } @@ -2917,7 +2917,7 @@ void fn_1_AD58(omObjData *object) MTXIdentity(Hu3DData[object->model[0]].unk_F0); omSetSca(object, 1.0f, 1.0f, 1.0f); 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); Hu3DModelHookSet(object->model[1], "g000i00-itemhook_A", object->model[0]); 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); var_r31->unk_00.unk_3C |= 0x2020; Hu3DMotionSet(object->model[0], object->motion[7]); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); } break; case 0xBBE: @@ -3020,8 +3020,8 @@ void fn_1_AD58(omObjData *object) var_r31->unk_150++; var_r31->unk_154 &= ~2; Hu3DModelHookObjReset(object->model[1], "g000i00-itemhook_A"); - Hu3DModelAttrSet(object->model[0], 1); - Hu3DModelAttrSet(object->model[1], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); lbl_1_bss_1A4->work[0] = 0x410; lbl_1_bss_128 = 0.0f; } @@ -3034,7 +3034,7 @@ void fn_1_AD58(omObjData *object) var_r31->unk_00.unk_9C = 0.0f; fn_1_A470(var_r31, object, "m450mex06-s6kuppa01", 2); fn_1_4ED8(&var_r31->unk_00, 0); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); } break; case 0xBC5: @@ -3158,7 +3158,7 @@ void fn_1_AD58(omObjData *object) } if (Hu3DMotionEndCheck(object->model[0]) != 0) { var_r31->unk_154 |= 0x40; - Hu3DModelAttrSet(object->model[0], 0x40000001); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); 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_154 &= ~0x8000; 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; case 0xBCF: @@ -3255,9 +3255,9 @@ void fn_1_AD58(omObjData *object) 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); 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], 1); + Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_10C + 2], HU3D_ATTR_DISPOFF); } } 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++) { object->model[var_r29] = Hu3DModelCreateFile(lbl_1_data_AC[var_r29]); 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); Hu3DModelLayerSet(object->model[var_r29], 3); 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); 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); - Hu3DModelAttrReset(*object->model, 1); + Hu3DModelAttrReset(*object->model, HU3D_ATTR_DISPOFF); object->func = (omObjFunc)fn_1_AD58; } @@ -3447,13 +3447,13 @@ void fn_1_E3C8(UnkM450Struct3 *arg0, omObjData *arg1, s32 arg2) s32 var_r30; if (arg2 != 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 { 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; @@ -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); 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_154 &= 0xFFFFFFFD; arg0->unk_108 = 19.6f; arg0->unk_E0 = 0.0f; Hu3DMotionSet(arg1->model[0], arg1->motion[6]); Hu3DModelAttrReset(arg1->model[0], 0x40000001); - Hu3DModelAttrSet(arg1->model[0], 0x40000002); + Hu3DModelAttrSet(arg1->model[0], HU3D_MOTATTR_PAUSE); Hu3DMotionTimeSet(arg1->model[0], 1.0f); 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); @@ -3662,7 +3662,7 @@ void fn_1_ED4C(omObjData *object) var_r31->unk_E0 = 0.0f; var_r31->unk_E8 = 360.0f * frandf(); var_r31->unk_154 |= 2; - Hu3DModelAttrReset(object->model[4], 1); + Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(object->model[4], 0x40000002); Hu3DModelHookSet(object->model[4], "g007i03-itemhook_M", object->model[0]); var_r31->unk_00.unk_6C.x = 0.0f; @@ -3828,7 +3828,7 @@ void fn_1_ED4C(omObjData *object) case 0xFAF: if (lbl_1_bss_1A4->work[0] >= 0x403) { var_r31->unk_150 = var_r31->unk_150 + 1; - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); } break; 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); omSetRot(var_r31->unk_00.unk_00, 0.0f, var_r31->unk_00.unk_9C, 0.0f); 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; 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++) { espDrawNoSet(var_r31->unk_18[var_r30], 0); 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); espPriSet(var_r31->unk_18[var_r30], 0x80 - var_r29); 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); omSetSca(object, var_f31, var_f30, var_f31); Hu3DMotionTimeSet(object->model[0], 0.0f); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(object->model[0], 0x40000002); HuAudFXPlay(0x7C0); } } else if (Hu3DMotionEndCheck(object->model[0]) != 0) { object->work[0] = frandmod(0x258); - Hu3DModelAttrSet(object->model[0], 1); - Hu3DModelAttrSet(object->model[0], 0x40000002); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); + 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); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M450, 0x22)); Hu3DModelAttrSet(object->model[0], 0x4001); - Hu3DModelAttrSet(object->model[0], 0x40000002); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelAttrReset(object->model[0], 0x40000001); Hu3DModelLayerSet(object->model[0], 1); 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), }; -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 }; 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 }; @@ -4510,15 +4511,15 @@ void fn_1_12A1C(omObjData *object) var_f30 = (1500.0f * frandf()) - 750.0f; omSetTra(object, var_f31, 1380.0f, var_f30); Hu3DMotionTimeSet(object->model[0], 0.0f); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(object->model[0], 0x40000002); } } } else if (Hu3DMotionEndCheck(object->model[0]) != 0) { object->work[0] = frandmod(0xB4); - Hu3DModelAttrSet(object->model[0], 1); - Hu3DModelAttrSet(object->model[0], 0x40000002); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); + 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)); Hu3DModelAttrSet(object->model[0], 0x4001); - Hu3DModelAttrSet(object->model[0], 0x40000002); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelAttrReset(object->model[0], 0x40000001); Hu3DModelLayerSet(object->model[0], 1); object->func = fn_1_12A1C; @@ -4546,8 +4547,8 @@ void fn_1_12D7C(omObjData *object) omSetTra(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]]); - Hu3DModelAttrSet(object->model[0], 1); - Hu3DModelAttrSet(object->model[0], 0x40000002); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE); 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); 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], 1); + Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31], HU3D_ATTR_DISPOFF); } 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); 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], 1); + Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r30], HU3D_ATTR_DISPOFF); HuAudFXPlay(0x7B7); } @@ -4643,7 +4644,7 @@ void fn_1_13560(UnkData1380Struct *arg0, s32 *arg1, s32 arg2) fn_1_13174(arg0); for (var_r30 = 0; var_r30 < arg0->unk_08; var_r30++) { 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++) { object->model[var_r30] = Hu3DModelCreateFile(lbl_1_data_E7C[var_r30]); 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); Hu3DModelLayerSet(object->model[var_r30], 0); Hu3DModelPosSet(object->model[var_r30], 0.0f, 0.0f, 0.0f); @@ -5014,15 +5015,15 @@ void fn_1_15308(omObjData *object) fn_1_14AB8(); 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[17], 1); - Hu3DModelAttrReset(object->model[19], 1); + Hu3DModelAttrReset(object->model[6], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[17], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[19], HU3D_ATTR_DISPOFF); 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], 1); + Hu3DModelAttrReset(object->model[var_r30 + 0x14], HU3D_ATTR_DISPOFF); } 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; if ((lbl_1_bss_308 & 1) != 0) { for (var_r30 = 0; var_r30 < 2; var_r30++) { - Hu3DModelAttrSet(object->model[var_r30], 1); + Hu3DModelAttrSet(object->model[var_r30], HU3D_ATTR_DISPOFF); } } else { 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) { Hu3DModelShadowReset(object->model[0]); 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(0x2000, object->model[1]); @@ -5267,7 +5268,7 @@ void fn_1_16910(omObjData *object) object->model[1] = var_r26; } 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); Hu3DModelLayerSet(object->model[var_r27], 4); 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); omSetRot(object, 0.0f, 0.0f, 0.0f); Hu3DModelShadowSet(object->model[0]); - Hu3DModelAttrReset(object->model[0], 1); - Hu3DModelAttrReset(object->model[1], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF); object->func = fn_1_16378; } @@ -5324,7 +5325,7 @@ void fn_1_16CF4(omObjData *object) if (var_r31->unk_78 != 0) { var_r31->unk_40 = var_r31->unk_40 - 0.1f; if (0.0f > var_r31->unk_40) { - Hu3DModelAttrSet(*object->model, 1); + Hu3DModelAttrSet(*object->model, HU3D_ATTR_DISPOFF); fn_1_24(0x3000, object->model[0]); omDelObjEx(lbl_1_bss_33C, object); return; @@ -5380,13 +5381,13 @@ void fn_1_171C4(omObjData *object) else { object->model[0] = var_r26; } - Hu3DModelAttrSet(object->model[0], 1); - Hu3DModelAttrSet(object->model[0], 0x40000001); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); Hu3DModelAttrReset(object->model[0], 0x40000002); Hu3DModelLayerSet(object->model[0], 4); 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); - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); object->func = fn_1_16CF4; } @@ -5425,7 +5426,7 @@ void fn_1_17474(omObjData *object) if (var_r31->unk_74 != 0) { fn_1_1D18(var_r31->unk_54, "g000m0-itemhook_R", &sp8); 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)) { HuAudFXPlay(0x7B0); 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; if (0.0f > var_r31->unk_40) { Hu3DModelShadowReset(object->model[0]); - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); fn_1_24(0x4000, object->model[0]); omDelObjEx(lbl_1_bss_33C, object); return; @@ -5518,8 +5519,8 @@ void fn_1_17970(s32 arg0, s32 arg1, float arg8) else { var_r31->model[0] = var_r26; } - Hu3DModelAttrSet(var_r31->model[0], 1); - Hu3DModelAttrSet(var_r31->model[0], 0x40000001); + Hu3DModelAttrSet(var_r31->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->model[0], HU3D_MOTATTR_LOOP); Hu3DModelAttrReset(var_r31->model[0], 0x40000002); Hu3DModelLayerSet(var_r31->model[0], 4); omSetTra(var_r31, 0.0f, 0.0f, 0.0f); @@ -5568,7 +5569,7 @@ void fn_1_17BBC(omObjData *object) var_r31->unk_0C = spC; if ((var_r31->unk_74 != 0) && (var_r22->unk_150 >= 0xBCE)) { Hu3DModelShadowReset(object->model[0]); - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); Hu3DModelHookObjReset(var_r31->unk_54, "g000m0-itemhook_R"); fn_1_24(0x4000, object->model[0]); 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; if (0.0f > var_r31->unk_40) { Hu3DModelShadowReset(*object->model); - Hu3DModelAttrSet(*object->model, 1); + Hu3DModelAttrSet(*object->model, HU3D_ATTR_DISPOFF); fn_1_24(0x4000, object->model[0]); omDelObjEx(lbl_1_bss_33C, object); return; @@ -5660,15 +5661,15 @@ void fn_1_18424(s32 arg0, Vec *arg1) else { var_r31->model[0] = var_r26; } - Hu3DModelAttrSet(var_r31->model[0], 1); - Hu3DModelAttrSet(var_r31->model[0], 0x40000001); + Hu3DModelAttrSet(var_r31->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(var_r31->model[0], HU3D_MOTATTR_LOOP); Hu3DModelAttrReset(var_r31->model[0], 0x40000002); Hu3DModelLayerSet(var_r31->model[0], 4); omSetTra(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); 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]); Hu3DModelShadowDispOff(var_r31->model[0]); } @@ -5700,7 +5701,7 @@ void fn_1_186A8(void) lbl_1_bss_C4++; lbl_1_bss_C8 = 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); var_r26 = &Hu3DData[lbl_1_bss_1A0->model[28]]; var_r25 = var_r26->hsfData->object; @@ -5765,14 +5766,14 @@ void fn_1_186A8(void) lbl_1_bss_C8 += 1.0f; if (60.0f <= lbl_1_bss_C8) { 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); - Hu3DModelAttrSet(lbl_1_bss_1A0->model[29], 1); - Hu3DModelAttrSet(lbl_1_bss_1A0->model[30], 1); + Hu3DModelAttrSet(lbl_1_bss_1A0->model[29], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_1A0->model[30], HU3D_ATTR_DISPOFF); for (var_r31 = 0; var_r31 < 3; var_r31++) { lbl_1_data_1450[lbl_1_bss_B8[0]].unk_1C = 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); } fn_1_1B4C8(var_r30); @@ -5999,7 +6000,7 @@ void fn_1_19CE0(omObjData *object) if (var_r31->unk_FC & 0x100) { var_r31->unk_FC |= 0x402; Hu3DModelAttrReset(object->model[0], 0x40000001); - Hu3DModelAttrSet(object->model[0], 0x40000002); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_PAUSE); Hu3DMotionSet(object->model[0], object->motion[14]); Hu3DMotionTimeSet(object->model[0], 48.0f); } @@ -6013,9 +6014,9 @@ void fn_1_19CE0(omObjData *object) 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); 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], 1); + Hu3DModelAttrReset(lbl_1_bss_1A0->model[var_r31->unk_110 + 2], HU3D_ATTR_DISPOFF); } if (var_r31->unk_FC & 0x100000) { var_r31->unk_FC |= 0x400002; @@ -6279,7 +6280,7 @@ void fn_1_1B510(s32 sp8) var_r29->unk_10C--; lbl_1_bss_B8[var_r30] = -1; 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++) { 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_128 = 0.0f; fn_1_4ED8(&arg0->unk_00, 0); - Hu3DModelAttrReset(arg1->model[0], 1); + Hu3DModelAttrReset(arg1->model[0], HU3D_ATTR_DISPOFF); 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) { var_r31->unk_FC &= ~0x40000; 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; } @@ -6528,10 +6529,10 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30) return 0; } if ((var_r31->unk_100 & 1) == 0) { - Hu3DModelAttrSet(var_r30->model[0], 1); + Hu3DModelAttrSet(var_r30->model[0], HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrReset(var_r30->model[0], 1); + Hu3DModelAttrReset(var_r30->model[0], HU3D_ATTR_DISPOFF); } if (--var_r31->unk_100 < 0) { 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 &= ~0x700004; var_r31->unk_FC &= ~0x2; - Hu3DModelAttrReset(var_r30->model[0], 1); + Hu3DModelAttrReset(var_r30->model[0], HU3D_ATTR_DISPOFF); } return 1; } @@ -6685,7 +6686,7 @@ void fn_1_1E150(omObjData *var_r29) var_r31->unk_118 = 0x7EB; Hu3DModelAttrReset(*var_r29->model, 0x40000003); 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; return; } @@ -6721,7 +6722,7 @@ void fn_1_1E150(omObjData *var_r29) var_r31->unk_00.unk_3C &= ~0x2; } 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); var_r29->func = fn_1_20170; 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]); CharModelMotionSet(lbl_1_data_0[var_r31->unk_11C], object->motion[var_r29]); } - Hu3DModelAttrSet(object->model[0], 1); - Hu3DModelAttrSet(object->model[0], 0x40000001); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); Hu3DModelLayerSet(object->model[0], 2); 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); 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); CharModelMotionDataClose(lbl_1_data_0[var_r31->unk_11C]); object->func = fn_1_20170; @@ -7472,7 +7473,7 @@ void fn_1_24620(omObjData *var_r31) var_f31 = 1.0f; } 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); 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); @@ -7495,7 +7496,7 @@ void fn_1_24620(omObjData *var_r31) } omVibrate(lbl_1_bss_120, 0xC, 6, 6); 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); if (120.0f < lbl_1_bss_128) { var_r31->work[0] += 1; @@ -7575,7 +7576,7 @@ void fn_1_24620(omObjData *var_r31) var_f31 = 1.0f; } 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); 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); @@ -7593,7 +7594,7 @@ void fn_1_24620(omObjData *var_r31) if (120.0f <= lbl_1_bss_128) { 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); fn_1_1A21C(0.0f, 0.0f); 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; fn_1_1350(&lbl_1_bss_324, &lbl_1_data_470, &lbl_1_bss_30C); 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; case 0x414: @@ -7742,7 +7743,7 @@ void ObjectSetup(void) lbl_1_bss_358.unk08 = NULL; for (var_r31 = 0; var_r31 < 4; 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); } lbl_1_bss_28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_M450, 0x6C)); diff --git a/src/REL/m451Dll/m451.c b/src/REL/m451Dll/m451.c index a9e56657..280fe651 100644 --- a/src/REL/m451Dll/m451.c +++ b/src/REL/m451Dll/m451.c @@ -307,15 +307,15 @@ void fn_1_7BC(void) Bss348Data *data = &lbl_1_bss_348[0]; while (1) { if (omPauseChk()) { - Hu3DModelAttrSet(data->unk0[0], 1); - Hu3DModelAttrSet(data->unk0[1], 1); - Hu3DModelAttrSet(data->unk0[2], 1); + Hu3DModelAttrSet(data->unk0[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(data->unk0[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(data->unk0[2], HU3D_ATTR_DISPOFF); HuSprAttrSet(data->unkA, 0, HUSPR_ATTR_DISPOFF); } else { - Hu3DModelAttrReset(data->unk0[0], 1); - Hu3DModelAttrReset(data->unk0[1], 1); - Hu3DModelAttrReset(data->unk0[2], 1); + Hu3DModelAttrReset(data->unk0[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(data->unk0[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(data->unk0[2], HU3D_ATTR_DISPOFF); HuSprAttrReset(data->unkA, 0, HUSPR_ATTR_DISPOFF); } HuPrcVSleep(); @@ -399,7 +399,7 @@ void fn_1_B2C(void) Hu3DModelCameraSet(temp_r31->unk0[0], 1 << temp_r31->unk38); Hu3DModelPosSet(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_r31->unk0[1] = Hu3DModelCreate(temp_r29); 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); Hu3DModelRotSet(temp_r31->unk0[2], 0, 0, 0); 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++) { 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]) { diff --git a/src/REL/m453Dll/main.c b/src/REL/m453Dll/main.c index 586fc75a..7aa9f8f5 100644 --- a/src/REL/m453Dll/main.c +++ b/src/REL/m453Dll/main.c @@ -707,7 +707,7 @@ void fn_1_1BF0(omObjData *object) } var_r28 = CharModelCreate(var_r31->unk_01, 4); object->model[0] = var_r28; - Hu3DModelAttrSet(var_r28, 0x40000001); + Hu3DModelAttrSet(var_r28, HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(var_r28); for (var_r29 = 0; var_r29 < 8; 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); var_r31->unk_07 = 0; Hu3DModelShadowReset(var_r29); - Hu3DModelAttrSet(var_r29, 1); + Hu3DModelAttrSet(var_r29, HU3D_ATTR_DISPOFF); lbl_1_data_0--; 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); @@ -1075,10 +1075,10 @@ void fn_1_2E24(omObjData *object) } if (var_r31->unk_07 & 4) { if (var_r31->unk_0A & 2) { - Hu3DModelAttrSet(var_r25, 1); + Hu3DModelAttrSet(var_r25, HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrReset(var_r25, 1); + Hu3DModelAttrReset(var_r25, HU3D_ATTR_DISPOFF); } if (--var_r31->unk_0A == 0) { var_r31->unk_07 = var_r31->unk_07 & 0xFFFFFFFB; diff --git a/src/REL/m453Dll/map.c b/src/REL/m453Dll/map.c index 60b92749..86a363d1 100644 --- a/src/REL/m453Dll/map.c +++ b/src/REL/m453Dll/map.c @@ -472,10 +472,10 @@ void fn_1_6C74(omObjData *object) } for (var_r31 = 0; (u32)var_r31 < 0xC; 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]; - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); var_r29->unk_00_field0 = 0; var_r29->unk_04 = 4 - lbl_1_bss_A0; fn_1_6FC4(object); @@ -587,12 +587,12 @@ void fn_1_6FC4(omObjData *object) memcpy(lbl_1_bss_60, &var_r30->unk_0C, 0x18); for (var_r31 = 0; var_r31 < 6; var_r31++) { 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++) { 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); } } diff --git a/src/REL/mentDll/main.c b/src/REL/mentDll/main.c index 2fe946cc..2a776a88 100644 --- a/src/REL/mentDll/main.c +++ b/src/REL/mentDll/main.c @@ -1,4 +1,5 @@ #include "game/board/main.h" +#include "REL/mentDll.h" #include "ext_math.h" #include "game/armem.h" #include "game/chrman.h" @@ -13,7 +14,6 @@ #include "game/sprite.h" #include "game/window.h" #include "game/wipe.h" -#include "REL/mentDll.h" typedef struct MentDllUnkBssE4Struct { /* 0x00 */ s32 unk_00; @@ -514,7 +514,7 @@ void fn_1_77C0(void) fn_1_2808(fn_1_13DEC); fn_1_4B0(0xF0); 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; fn_1_2808(fn_1_13F68); @@ -528,7 +528,7 @@ void fn_1_7858(void) fn_1_4B0(0x3C); lbl_1_bss_14[0] = HuAudSeqPlay(0x30); 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); @@ -701,17 +701,17 @@ void fn_1_824C(void) lbl_1_bss_14[0] = HuAudSeqPlay(0x30); if (lbl_1_bss_A8[0] == 0) { 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 { 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); 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"); WipeCreate(1, 0, -1); @@ -730,12 +730,12 @@ void fn_1_83CC(void) fn_1_4B0(0x5A); if (lbl_1_bss_A8[0] == 0) { 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 { 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); @@ -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_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); - 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); } @@ -1117,7 +1117,8 @@ s32 fn_1_92CC(void) var_r29 = 1; } 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++) { if (lbl_1_bss_3114[var_r31].unk_70[0] == 0) { lbl_1_bss_3114[var_r31].unk_68 = 0; @@ -1153,19 +1154,22 @@ s32 fn_1_92CC(void) if (var_r31 == 4) { var_r29 = 3; break; - } else { + } + else { if (var_r29 == 1) { fn_1_173FC(&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]]); 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; - } else if (var_r29 == 4) { - - } else if (var_r29 == 0) { + } + else if (var_r29 == 4) { + } + else if (var_r29 == 0) { fn_1_17914(&lbl_1_bss_3114[var_r30]); break; - } else { + } + else { break; } } @@ -1212,7 +1216,8 @@ void fn_1_99AC(void) fn_1_1811C(); } -s32 fn_1_99CC(void) { +s32 fn_1_99CC(void) +{ s32 var_r26; s32 temp_r27; s32 var_r28; @@ -1228,7 +1233,7 @@ s32 fn_1_99CC(void) { 0x00000004, 0x00000005, }; - + var_r30 = 2; temp_r27 = fn_1_1434(0, 0, 0); while (1) { @@ -1240,14 +1245,14 @@ s32 fn_1_99CC(void) { 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_2154(0x1A0020U); - + for (i = 0; i < 6; i++) { 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_35BC->unk_04 = (void (*)(omObjData*, ...)) fn_1_18F74; + lbl_1_bss_35BC->unk_04 = (void (*)(omObjData *, ...))fn_1_18F74; while (1) { fn_1_4D8(); for (i = 0; i < 6; i++) { @@ -1255,35 +1260,42 @@ s32 fn_1_99CC(void) { break; } } - + if (i == 6 && var_r28 >= 0x15) { if ((HuPadBtnDown[lbl_1_bss_3114->unk_6C] & 0x200)) { HuAudFXPlay(3); var_r29 = 0; break; - } else if ((HuPadBtnDown[lbl_1_bss_3114->unk_6C] & 0x100)) { + } + else if ((HuPadBtnDown[lbl_1_bss_3114->unk_6C] & 0x100)) { HuAudFXPlay(2); var_r29 = 2; break; - } else { + } + else { 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 (++var_r30 > 5) { var_r30 = 5; - } else { - var_r28 = 0; } - } else { - if (++var_r30 > 4) { - var_r30 = 4; - } else { + else { 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) { var_r30 = 0; - } else { + } + else { var_r28 = 0; } } @@ -1292,7 +1304,8 @@ s32 fn_1_99CC(void) { if (var_r28 == 0) { if (var_r30 != 5) { fn_1_2808(fn_1_14058); - } else { + } + else { fn_1_2808(fn_1_14148); } for (i = 0; i < 6; i++) { @@ -1304,9 +1317,10 @@ s32 fn_1_99CC(void) { var_r28 = 0x15; fn_1_18A54(sp8[var_r30]); 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]); - } else { + } + else { HuAudFXPlay(lbl_1_data_0[sp8[var_r30]][2]); } } @@ -1319,12 +1333,13 @@ s32 fn_1_99CC(void) { for (i = 0; i < 6; i++) { lbl_1_bss_33AC[i].unk_08 = 0; } - + lbl_1_bss_33AC[sp8[var_r30]].unk_08 = 1; } fn_1_18DCC(); fn_1_4B0(0x1E); - } else if (var_r29 == 1) { + } + else if (var_r29 == 1) { fn_1_2808(fn_1_14058); if (var_r30 != 2) { var_r30 = 2; @@ -1344,31 +1359,35 @@ s32 fn_1_99CC(void) { fn_1_C174(0); } continue; - } else if (var_r29 == 2) { + } + else if (var_r29 == 2) { for (i = 0; i < 6; i++) { lbl_1_bss_33AC[i].unk_04 = NULL; } lbl_1_bss_A8[2] = sp8[var_r30]; - } else { + } + else { continue; } break; } - + fn_1_16AC(temp_r27); - + if (var_r29 == 0) { for (i = 0; i < 4; i++) { if (lbl_1_bss_3114[i].unk_60 != 0) { break; - } + } } if (i != 4) { var_r29 = 2; - } else { + } + else { var_r29 = 1; } - } else { + } + else { var_r29 = 3; } 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_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); - 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_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_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); - 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_5CDC(lbl_1_bss_35BC[1].unk_00, 2, 0); } @@ -1569,12 +1588,12 @@ void fn_1_A9B0(void) var_r31 = 0; } 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]); - Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[4], 1); - Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[5], 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], HU3D_ATTR_DISPOFF); lbl_1_bss_35BC[var_r31].unk_04 = (MentDllUnkFunc)fn_1_1184C; if (var_r30 == 5) { sp14.x += 1200.0f; @@ -1593,7 +1612,7 @@ void fn_1_A9B0(void) fn_1_16AC(var_r28); HuAudSeqFadeOut(lbl_1_bss_14[0], 0xBB8); 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_4B0(0xA); 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_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[1].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], HU3D_ATTR_DISPOFF); if (var_r30 != 5) { fn_1_2808(fn_1_146D0); } @@ -1683,7 +1702,7 @@ void fn_1_B084(void) } for (var_r31 = 0; var_r31 < 6; var_r31++) { 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); @@ -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_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); - 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) { 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); 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++) { var_r24 = &lbl_1_bss_35BC[var_r31]; for (var_r29 = 0; var_r29 < 5; var_r29++) { 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_179DC(); @@ -1752,7 +1771,7 @@ void fn_1_B084(void) fn_1_190E8(); 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); - 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 }; 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 }; var_r28 = 0; var_r31 = 2; - + if (lbl_1_data_2F0 == -1) { var_r29 = fn_1_1434(0, 0, 0); - } else { + } + else { var_r29 = lbl_1_data_2F0; lbl_1_data_2F0 = -1; } @@ -2399,22 +2419,26 @@ void fn_1_D634(void) var_r26 = 2; break; } - + if ((HuPadStkX[lbl_1_bss_3114[0].unk_6C] >= 0x32) || ((HuPadBtn[lbl_1_bss_3114[0].unk_6C] & PAD_BUTTON_RIGHT) != 0)) { var_r31++; if (var_r31 > 4) { var_r31 = 4; - } else { + } + else { 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--; if (var_r31 < 0) { var_r31 = 0; - } else { + } + else { var_r28 = 0; } - } else if ((HuPadBtnDown[0] & 0x200)) { + } + else if ((HuPadBtnDown[0] & 0x200)) { var_r26 = 1; break; } @@ -2431,7 +2455,8 @@ void fn_1_D634(void) fn_1_1968(var_r29, sp8[var_r31] + 0x1B0001, -1, -0x3E7); if (sp8[var_r31] != 0) { HuAudFXPlay(lbl_1_data_0[sp8[var_r31]][0]); - } else { + } + else { 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_A8[2] = sp8[var_r31]; - } else { + } + else { if (var_r31 != 2) { var_r31 = 2; for (i = 0; i < 5; i++) { @@ -2487,7 +2513,8 @@ void fn_1_D634(void) fn_1_4B0(0x1E); continue; } - } else { + } + else { for (i = 0; i < 5; i++) { 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_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); - 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_5CDC(lbl_1_bss_35BC[0].unk_00, 2, 0); fn_1_4B0(0x3C); @@ -2526,12 +2553,12 @@ void fn_1_DFDC(void) var_r31 = 0; var_r29 = lbl_1_bss_A8[2]; 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]); - Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[4], 1); - Hu3DModelAttrReset(lbl_1_bss_35BC[var_r31].unk_00->model[5], 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], HU3D_ATTR_DISPOFF); lbl_1_bss_35BC[var_r31].unk_04 = (MentDllUnkFunc)fn_1_1184C; HuDataDirClose(DATADIR_MENT); 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_16AC(var_r28); 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); fn_1_2808(fn_1_14418); fn_1_4B0(0xA); @@ -2563,7 +2590,7 @@ void fn_1_E244(void) void fn_1_E2B4(void) { 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_5CDC(lbl_1_bss_35BC[0].unk_00, 2, 0); fn_1_D330(); @@ -2599,8 +2626,8 @@ void fn_1_E48C(void) fn_1_16AC(var_r31); fn_1_1FC54(); fn_1_4B0(0x3C); - Hu3DModelAttrReset(lbl_1_bss_35BC[1].unk_00->model[4], 1); - Hu3DModelAttrReset(lbl_1_bss_35BC[1].unk_00->model[5], 1); + Hu3DModelAttrReset(lbl_1_bss_35BC[1].unk_00->model[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_35BC[1].unk_00->model[5], HU3D_ATTR_DISPOFF); fn_1_7304(); HuDataDirClose(DATADIR_MENT); HuPrcChildCreate(fn_1_7218, 0x64, 0x3000, 0, lbl_1_bss_C8); @@ -2609,7 +2636,7 @@ void fn_1_E48C(void) fn_1_4B0(0x3C); HuAudFXPlay(lbl_1_data_0[6][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); fn_1_2808(fn_1_14418); fn_1_4B0(0xA); @@ -2799,7 +2826,7 @@ void fn_1_10234(void) Vec sp20 = { -120.0f, 0.0f, 670.0f }; fn_1_2808(fn_1_13DEC); 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_4B0(0x96); 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 }; fn_1_2808(fn_1_13DEC); 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_4B0(0x96); 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 }; fn_1_2808(fn_1_13DEC); 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_4B0(0x96); 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); Hu3DModelHookSet(arg0->model[4], "koopabox_fix-effect_fook2", arg0->model[5]); } - Hu3DModelAttrSet(arg0->model[4], 1); - Hu3DModelAttrSet(arg0->model[5], 1); + Hu3DModelAttrSet(arg0->model[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(arg0->model[5], HU3D_ATTR_DISPOFF); Hu3DModelShadowSet(arg0->model[4]); } @@ -3104,7 +3131,7 @@ void fn_1_11DA4(omObjData *object, s32 arg1, s32 arg2, s32 arg3) } else { 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); 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); Hu3DModelPosSet(object->model[4], 1200.0f, 80.0f, 460.0f); Hu3DModelHookSet(object->model[4], "koopabox_fix-effect_fook2", object->model[5]); - Hu3DModelAttrSet(object->model[4], 1); - Hu3DModelAttrSet(object->model[5], 1); + Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[5], HU3D_ATTR_DISPOFF); Hu3DModelShadowSet(object->model[4]); - Hu3DModelAttrReset(object->model[4], 1); - Hu3DModelAttrReset(object->model[5], 1); + Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(object->model[5], HU3D_ATTR_DISPOFF); lbl_1_bss_35BC[1].unk_04 = (MentDllUnkFunc)fn_1_1184C; } 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); Hu3DModelPosSet(object->model[4], 1200.0f, 80.0f, 460.0f); Hu3DModelHookSet(object->model[4], "koopabox_fix-effect_fook2", object->model[5]); - Hu3DModelAttrSet(object->model[4], 1); - Hu3DModelAttrSet(object->model[5], 1); + Hu3DModelAttrSet(object->model[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(object->model[5], HU3D_ATTR_DISPOFF); Hu3DModelShadowSet(object->model[4]); } } @@ -3307,7 +3334,7 @@ void fn_1_12A0C(omObjData *object, s32 arg1) } } if (lbl_1_bss_A8[0] < 0xA) { - Hu3DModelAttrSet(object->model[1], 1); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); } Hu3DModelShadowSet(object->model[1]); Hu3DModelLayerSet(object->model[1], 2); @@ -4069,71 +4096,76 @@ s32 fn_1_1648C(MentDllUnkBss3114Struct *arg0) var_r28 = 0; var_r29 = lbl_1_bss_35BC[0].unk_30; - while(1) { + while (1) { fn_1_4D8(); var_r28 = 0; 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(lbl_1_bss_A8[5] == 1) { + 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) { arg0->unk_64++; var_r28 = 1; - if(arg0->unk_64 > 3) { - arg0->unk_64 = 0; - } - } else { - arg0->unk_64++; - var_r28 = 1; - if(arg0->unk_64 > 2) { + if (arg0->unk_64 > 3) { 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) { + else { + 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--; var_r28 = -1; - if(arg0->unk_64 < 0) { + if (arg0->unk_64 < 0) { arg0->unk_64 = 3; } - } else { + } + else { arg0->unk_64--; var_r28 = -1; - if(arg0->unk_64 < 0) { + if (arg0->unk_64 < 0) { arg0->unk_64 = 2; } } - } else if(HuPadBtnDown[0] & PAD_BUTTON_A) { + } + else if (HuPadBtnDown[0] & PAD_BUTTON_A) { var_r27 = 1; HuAudFXPlay(2); break; - } else if(HuPadBtnDown[0] & PAD_BUTTON_B) { + } + else if (HuPadBtnDown[0] & PAD_BUTTON_B) { var_r27 = 0; HuAudFXPlay(3); break; } - if(arg0->unk_64 != var_r26) { + if (arg0->unk_64 != var_r26) { HuAudFXPlay(0); - for(var_r30=0; var_r30<=5; var_r30++) { + for (var_r30 = 0; var_r30 <= 5; var_r30++) { 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); - 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); + 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 + 36, 1 + var_f31, lbl_1_data_57C[arg0->unk_68 / 4][1] + 37); } - HuSprBankSet(var_r29, arg0->unk_58+32, arg0->unk_64); - for(var_r30=0; var_r30<=5; var_r30++) { + HuSprBankSet(var_r29, arg0->unk_58 + 32, arg0->unk_64); + for (var_r30 = 0; var_r30 <= 5; var_r30++) { 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); - 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); + 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 + 36, 1 + var_f31, lbl_1_data_57C[arg0->unk_68 / 4][1] + 37); } } } - 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); - HuSprBankSet(var_r29, arg0->unk_58+49, arg0->unk_64); - HuSprAttrReset(var_r29, arg0->unk_58+49, 4); - HuSprAttrSet(var_r29, arg0->unk_58+32, 4); + 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); + HuSprBankSet(var_r29, arg0->unk_58 + 49, arg0->unk_64); + HuSprAttrReset(var_r29, arg0->unk_58 + 49, 4); + HuSprAttrSet(var_r29, arg0->unk_58 + 32, 4); } - + return var_r27; } @@ -6268,7 +6300,7 @@ void fn_1_21134(omObjData *object) } if (object->work[0] == 1) { 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; } } - 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.y -= (var_r30 % 3) + 2; 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; case 2: - Hu3DModelAttrSet(object->model[var_r30], 1); + Hu3DModelAttrSet(object->model[var_r30], HU3D_ATTR_DISPOFF); break; } } @@ -6480,7 +6512,7 @@ void fn_1_2342C(omObjData *object) object->model[var_r30] = Hu3DModelLink(object->model[0]); } 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(); if (rand8() == 0) { Hu3DData[object->model[var_r30]].pos.x *= -1.0f; diff --git a/src/REL/mgmodedll/battle.c b/src/REL/mgmodedll/battle.c index 75aa11b7..a78bdc8a 100644 --- a/src/REL/mgmodedll/battle.c +++ b/src/REL/mgmodedll/battle.c @@ -2,12 +2,12 @@ #include "game/gamework.h" #include "game/audio.h" +#include "game/chrman.h" #include "game/esprite.h" #include "game/gamework_data.h" +#include "game/minigame_seq.h" #include "game/saveload.h" #include "game/wipe.h" -#include "game/chrman.h" -#include "game/minigame_seq.h" #include "ext_math.h" @@ -44,9 +44,9 @@ s32 fn_1_E72C(void) temp_r29 = 0; fn_1_279FC(0); fn_1_FF5C(); - if(lbl_1_bss_4 == 3) { + if (lbl_1_bss_4 == 3) { mgTypeCurr = mgInfoTbl[GWSystem.mg_next].type; - if(mgTypeCurr >= 4) { + if (mgTypeCurr >= 4) { mgTypeCurr = 3; } HuSprGrpPosSet(lbl_1_bss_388, 288, 240); @@ -54,95 +54,100 @@ s32 fn_1_E72C(void) Hu3DModelPosSet(lbl_1_bss_2C80[5], -350, 0, 680); Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, 20, 0); fn_1_27418(); - for(temp_r31=0; temp_r31<4; temp_r31++) { - Hu3DModelPosSet(lbl_1_bss_2C14[temp_r31], (temp_r31*130)-195, 0, 750); + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + Hu3DModelPosSet(lbl_1_bss_2C14[temp_r31], (temp_r31 * 130) - 195, 0, 750); Hu3DMotionSet(lbl_1_bss_2C14[temp_r31], lbl_1_bss_2BC4[temp_r31][0]); - Hu3DModelAttrSet(lbl_1_bss_2C14[temp_r31], 0x40000001); + Hu3DModelAttrSet(lbl_1_bss_2C14[temp_r31], HU3D_MOTATTR_LOOP); } - for(temp_r31=0; temp_r31<4; temp_r31++) { - HuSprAttrSet(lbl_1_bss_388, (temp_r31*2)+2, HUSPR_ATTR_DISPOFF); - HuSprAttrSet(lbl_1_bss_388, (temp_r31*2)+3, HUSPR_ATTR_DISPOFF); + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + HuSprAttrSet(lbl_1_bss_388, (temp_r31 * 2) + 2, HUSPR_ATTR_DISPOFF); + HuSprAttrSet(lbl_1_bss_388, (temp_r31 * 2) + 3, HUSPR_ATTR_DISPOFF); } - HuSprAttrReset(lbl_1_bss_388, mgTypeCurr+19, HUSPR_ATTR_DISPOFF); - HuSprPosSet(lbl_1_bss_388, mgTypeCurr+19, 0, -155); + HuSprAttrReset(lbl_1_bss_388, mgTypeCurr + 19, HUSPR_ATTR_DISPOFF); + HuSprPosSet(lbl_1_bss_388, mgTypeCurr + 19, 0, -155); HuSprPosSet(lbl_1_bss_388, 1, 0, -180); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); - if(fn_1_1129C() && !fn_1_11E68()) { + if (fn_1_1129C() && !fn_1_11E68()) { return 1; } - } else { + } + else { CharModelDataClose(-1); - if(HuDataReadChk(DATADIR_INSTPIC) == -1) { + if (HuDataReadChk(DATADIR_INSTPIC) == -1) { temp_r26 = HuDataDirReadAsync(DATADIR_INSTPIC); - } else { + } + else { temp_r26 = -1; } - for(temp_r31=0; temp_r31<=60; temp_r31++) { - if(temp_r31 <= 50) { - temp_f31 = temp_r31/50.0; - HuSprGrpPosSet(lbl_1_bss_388, 288, -400.0+(656.0*sind(temp_f31*90.0f))); - } else { - temp_f31 = (temp_r31-50)/10.0; - HuSprGrpPosSet(lbl_1_bss_388, 288, 240.0+(16.0*cosd(temp_f31*90.0f))); + for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { + if (temp_r31 <= 50) { + temp_f31 = temp_r31 / 50.0; + HuSprGrpPosSet(lbl_1_bss_388, 288, -400.0 + (656.0 * sind(temp_f31 * 90.0f))); + } + else { + temp_f31 = (temp_r31 - 50) / 10.0; + HuSprGrpPosSet(lbl_1_bss_388, 288, 240.0 + (16.0 * cosd(temp_f31 * 90.0f))); } HuPrcVSleep(); } - for(temp_r31=0; temp_r31<=5; temp_r31++) { - for(temp_r30=0; temp_r30<4; temp_r30++) { - if(temp_r30 != temp_r29) { - HuSprTPLvlSet(lbl_1_bss_388, (temp_r30*2)+2, 1-(temp_r31/5.0)); + for (temp_r31 = 0; temp_r31 <= 5; temp_r31++) { + for (temp_r30 = 0; temp_r30 < 4; temp_r30++) { + if (temp_r30 != temp_r29) { + HuSprTPLvlSet(lbl_1_bss_388, (temp_r30 * 2) + 2, 1 - (temp_r31 / 5.0)); } } HuPrcVSleep(); } - if(temp_r26 != -1) { - while(!HuDataGetAsyncStat(temp_r26)) { + if (temp_r26 != -1) { + while (!HuDataGetAsyncStat(temp_r26)) { HuPrcVSleep(); } } - repeat_mode: - if(lbl_1_bss_20AA == 0) { + repeat_mode: + if (lbl_1_bss_20AA == 0) { HuPrcChildCreate(fn_1_27080, 100, 12288, 0, lbl_1_bss_2D8); lbl_1_bss_20AA = 1; } lbl_1_bss_3A4 = fn_1_25CA8(0x1A0020); - if(lbl_1_data_148 == -1) { + if (lbl_1_data_148 == -1) { lbl_1_data_148 = fn_1_2530C(0, 0, 0); } HuWinMesSpeedSet(lbl_1_data_148, 1); fn_1_25838(lbl_1_data_148, 0x28000F, -1, -1); - while(1) { + while (1) { temp_r28 = 0; - if((HuPadDStkRep[0] & PAD_BUTTON_UP) && temp_r29 > 0) { + if ((HuPadDStkRep[0] & PAD_BUTTON_UP) && temp_r29 > 0) { temp_r28 = -1; - } else if((HuPadDStkRep[0] & PAD_BUTTON_DOWN) && temp_r29 < 3) { + } + else if ((HuPadDStkRep[0] & PAD_BUTTON_DOWN) && temp_r29 < 3) { temp_r28 = 1; } - if(temp_r28 != 0) { - HuSprAttrReset(lbl_1_bss_388, (temp_r29*2)+3, HUSPR_ATTR_DISPOFF); - for(temp_r31=0; temp_r31<=10; temp_r31++) { - HuSprTPLvlSet(lbl_1_bss_388, (temp_r29*2)+2, 1-(temp_r31/10.0)); - if(temp_r31 == 5) { + if (temp_r28 != 0) { + HuSprAttrReset(lbl_1_bss_388, (temp_r29 * 2) + 3, HUSPR_ATTR_DISPOFF); + for (temp_r31 = 0; temp_r31 <= 10; temp_r31++) { + HuSprTPLvlSet(lbl_1_bss_388, (temp_r29 * 2) + 2, 1 - (temp_r31 / 10.0)); + if (temp_r31 == 5) { HuAudFXPlay(0); - HuSprTPLvlSet(lbl_1_bss_388, ((temp_r29+temp_r28)*2)+2, 1); - HuSprAttrReset(lbl_1_bss_388, ((temp_r29+temp_r28)*2)+2, HUSPR_ATTR_DISPOFF); + HuSprTPLvlSet(lbl_1_bss_388, ((temp_r29 + temp_r28) * 2) + 2, 1); + HuSprAttrReset(lbl_1_bss_388, ((temp_r29 + temp_r28) * 2) + 2, HUSPR_ATTR_DISPOFF); } HuPrcVSleep(); } temp_r29 += temp_r28; } - if(HuPadBtnDown[0] & PAD_BUTTON_B) { + if (HuPadBtnDown[0] & PAD_BUTTON_B) { HuAudFXPlay(3); fn_1_25E74(lbl_1_bss_3A4); fn_1_25584(lbl_1_data_148); lbl_1_data_148 = -1; - for(temp_r31=0; temp_r31<=60; temp_r31++) { - if(temp_r31 <= 10) { - temp_f31 = temp_r31/10.0; - HuSprGrpPosSet(lbl_1_bss_388, 288, 240.0+(16.0*sind(temp_f31*90.0f))); - } else { - temp_f31 = (temp_r31-10)/50.0; - HuSprGrpPosSet(lbl_1_bss_388, 288, -400.0+(656.0*cosd(temp_f31*90.0f))); + for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { + if (temp_r31 <= 10) { + temp_f31 = temp_r31 / 10.0; + HuSprGrpPosSet(lbl_1_bss_388, 288, 240.0 + (16.0 * sind(temp_f31 * 90.0f))); + } + else { + temp_f31 = (temp_r31 - 10) / 50.0; + HuSprGrpPosSet(lbl_1_bss_388, 288, -400.0 + (656.0 * cosd(temp_f31 * 90.0f))); } HuPrcVSleep(); } @@ -150,9 +155,9 @@ s32 fn_1_E72C(void) lbl_1_bss_388 = 0; return 0; } - if(HuPadBtnDown[0] & PAD_BUTTON_A) { + if (HuPadBtnDown[0] & PAD_BUTTON_A) { HuAudFXPlay(1); - if(lbl_1_bss_20AC[lbl_1_data_A2[temp_r29]]) { + if (lbl_1_bss_20AC[lbl_1_data_A2[temp_r29]]) { break; } fn_1_25838(lbl_1_data_148, 0x28002E, -1, -1); @@ -165,101 +170,103 @@ s32 fn_1_E72C(void) fn_1_25584(lbl_1_data_148); lbl_1_data_148 = lbl_1_bss_3A4 = -1; mgTypeCurr = temp_r29; - if(temp_r29 == 1 || temp_r29 == 2) { - if(fn_1_C0C8(1) == 0) { + if (temp_r29 == 1 || temp_r29 == 2) { + if (fn_1_C0C8(1) == 0) { goto repeat_mode; } - } else { - for(temp_r31=0; temp_r31<4; temp_r31++) { + } + else { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { GWPlayerCfg[temp_r31].group = temp_r31; } } - for(temp_r31=0; temp_r31<=10; temp_r31++) { - for(temp_r30=0; temp_r30<4; temp_r30++) { - HuSprTPLvlSet(lbl_1_bss_388, (temp_r30*2)+3, 1-(temp_r31/10.0)); + for (temp_r31 = 0; temp_r31 <= 10; temp_r31++) { + for (temp_r30 = 0; temp_r30 < 4; temp_r30++) { + HuSprTPLvlSet(lbl_1_bss_388, (temp_r30 * 2) + 3, 1 - (temp_r31 / 10.0)); } HuPrcVSleep(); } Hu3DMotionTimeSet(lbl_1_bss_2C80[5], 0); HuPrcVSleep(); - temp_r28 = (temp_r29*40)-110; + temp_r28 = (temp_r29 * 40) - 110; temp_r25 = &Hu3DData[lbl_1_bss_2C80[5]]; sp20 = temp_r25->pos; sp14.x = -350; sp14.y = 0; sp14.z = 680; VECSubtract(&sp14, &sp20, &sp14); - temp_f30 = (180+atan2d(sp14.z, sp14.x))-360; + temp_f30 = (180 + atan2d(sp14.z, sp14.x)) - 360; Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[7], 0, 8, HU3D_MOTATTR_LOOP); - for(temp_r31=0; temp_r31<=30; temp_r31++) { - if(temp_r31 <= 20) { - temp_f31 = temp_r31/20.0; - HuSprPosSet(lbl_1_bss_388, (temp_r29*2)+2, 0, (sind(temp_f31*90.0f)*(-150-temp_r28))+temp_r28); + for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) { + if (temp_r31 <= 20) { + temp_f31 = temp_r31 / 20.0; + HuSprPosSet(lbl_1_bss_388, (temp_r29 * 2) + 2, 0, (sind(temp_f31 * 90.0f) * (-150 - temp_r28)) + temp_r28); } - temp_f31 = temp_r31/30.0; + temp_f31 = temp_r31 / 30.0; VECScale(&sp14, &sp8, temp_f31); VECAdd(&sp20, &sp8, &sp8); Hu3DModelPosSetV(lbl_1_bss_2C80[5], &sp8); - if(temp_r31 <= 10) { - temp_f31 = temp_r31/10.0; - Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f30*temp_f31, 0); + if (temp_r31 <= 10) { + temp_f31 = temp_r31 / 10.0; + Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f30 * temp_f31, 0); } HuPrcVSleep(); } HuSprGrpDrawNoSet(lbl_1_bss_388, 64); Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 8, HU3D_MOTATTR_LOOP); - for(temp_r31=0; temp_r31<=10; temp_r31++) { - temp_f31 = temp_r31/10.0; - Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f30+((20-temp_f30)*temp_f31), 0); + for (temp_r31 = 0; temp_r31 <= 10; temp_r31++) { + temp_f31 = temp_r31 / 10.0; + Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f30 + ((20 - temp_f30) * temp_f31), 0); HuPrcVSleep(); } - while(lbl_1_bss_20AA) { + while (lbl_1_bss_20AA) { HuPrcVSleep(); } Hu3DMotionTimeSet(lbl_1_bss_2C80[5], 0); HuPrcVSleep(); fn_1_27418(); - for(temp_r31=0; temp_r31<4; temp_r31++) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { CharModelMotionSet(lbl_1_bss_2C24[temp_r31], lbl_1_bss_2BC4[temp_r31][2]); - Hu3DModelAttrSet(lbl_1_bss_2C14[temp_r31], 0x40000001); + Hu3DModelAttrSet(lbl_1_bss_2C14[temp_r31], HU3D_MOTATTR_LOOP); Hu3DModelRotSet(lbl_1_bss_2C14[temp_r31], 0, -90, 0); } - for(temp_r31=0; temp_r31<=30; temp_r31++) { - temp_f31 = temp_r31/30.0f; - for(temp_r30=0; temp_r30<4; temp_r30++) { - Hu3DModelPosSet(lbl_1_bss_2C14[temp_r30], (sind(temp_f31*90.0f)*(((temp_r30*130)-195)-((temp_r30*130)+400)))+((temp_r30*130)+400), 0, 750); - if((temp_r31+(temp_r30*2))%5 == 0) { - HuAudFXPlay(GWPlayerCfg[temp_r30].character+213); + for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) { + temp_f31 = temp_r31 / 30.0f; + for (temp_r30 = 0; temp_r30 < 4; temp_r30++) { + Hu3DModelPosSet(lbl_1_bss_2C14[temp_r30], + (sind(temp_f31 * 90.0f) * (((temp_r30 * 130) - 195) - ((temp_r30 * 130) + 400))) + ((temp_r30 * 130) + 400), 0, 750); + if ((temp_r31 + (temp_r30 * 2)) % 5 == 0) { + HuAudFXPlay(GWPlayerCfg[temp_r30].character + 213); } } HuPrcVSleep(); } - for(temp_r31=0; temp_r31<4; temp_r31++) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { Hu3DMotionShiftSet(lbl_1_bss_2C14[temp_r31], lbl_1_bss_2BC4[temp_r31][0], 0, 10, HU3D_MOTATTR_LOOP); } - for(temp_r31=0; temp_r31<=10; temp_r31++) { - temp_f31 = temp_r31/10.0f; - for(temp_r30=0; temp_r30<4; temp_r30++) { - Hu3DModelRotSet(lbl_1_bss_2C14[temp_r30], 0, -90.0*(1.0-temp_f31), 0); + for (temp_r31 = 0; temp_r31 <= 10; temp_r31++) { + temp_f31 = temp_r31 / 10.0f; + for (temp_r30 = 0; temp_r30 < 4; temp_r30++) { + Hu3DModelRotSet(lbl_1_bss_2C14[temp_r30], 0, -90.0 * (1.0 - temp_f31), 0); } HuPrcVSleep(); } - for(temp_r31=0; temp_r31<4; temp_r31++) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { mgBattleStar[temp_r31] = 0; } } - if(lbl_1_data_148 == -1) { + if (lbl_1_data_148 == -1) { lbl_1_data_148 = fn_1_2530C(0, 0, 0); } fn_1_25838(lbl_1_data_148, 0x280010, -1, -1); HuSprTPLvlSet(lbl_1_bss_388, 10, 1); - for(temp_r30=0; temp_r30<35;) { - for(temp_r31=0; temp_r31= 35) { + if (temp_r30 >= 35) { break; } } @@ -270,34 +277,36 @@ s32 fn_1_E72C(void) HuWinAttrSet(lbl_1_data_148, 0x10); HuWinInsertMesSet(lbl_1_data_148, mgInfoTbl[lbl_1_bss_2E4].name_mess, 0); fn_1_25838(lbl_1_data_148, 0x280011, -1, -1); - repeat_mess: +repeat_mess: fn_1_25838(lbl_1_data_148, 0x280029, -1, -1); temp_r27 = HuWinChoiceGet(lbl_1_data_148, 0); - if(temp_r27 == 0) { + if (temp_r27 == 0) { _ClearFlag(11); - } else if(temp_r27 == 1) { + } + else if (temp_r27 == 1) { HuWinInsertMesSet(lbl_1_data_148, MAKE_MESSID(0x28, 39), 0); fn_1_25838(lbl_1_data_148, 0x280026, -1, -1); temp_r27 = HuWinChoiceGet(lbl_1_data_148, 1); - if(temp_r27 == 1) { + if (temp_r27 == 1) { goto repeat_mess; } fn_1_271B4(-1, 0, 0); - for(temp_r31=1; temp_r31<=10; temp_r31++) { - HuSprTPLvlSet(lbl_1_bss_388, 10, 1-(temp_r31/10.0)); + for (temp_r31 = 1; temp_r31 <= 10; temp_r31++) { + HuSprTPLvlSet(lbl_1_bss_388, 10, 1 - (temp_r31 / 10.0)); HuPrcVSleep(); } fn_1_25584(lbl_1_data_148); lbl_1_data_148 = lbl_1_bss_3A4 = -1; fn_1_1222C(); return 1; - } else { + } + else { _SetFlag(11); } GWSystem.mg_next = lbl_1_bss_2E4; HuDataDirClose(DATADIR_INSTPIC); fn_1_2783C(3); - while(1) { + while (1) { HuPrcVSleep(); } } @@ -318,7 +327,7 @@ void fn_1_FF5C(void) AnimData *temp_r28; s16 temp_r27; AnimData *temp_r26; - if(lbl_1_bss_388 == 0) { + if (lbl_1_bss_388 == 0) { temp_r30 = HuSprGrpCreate(23); lbl_1_bss_388 = temp_r30; temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 125), MEMORY_DEFAULT_NUM)); @@ -326,28 +335,30 @@ void fn_1_FF5C(void) HuSprGrpMemberSet(temp_r30, 0, temp_r29); HuSprTPLvlSet(temp_r30, 0, 0.8f); temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 54), MEMORY_DEFAULT_NUM)); - if(mgBattleStarMax == 3) { + if (mgBattleStarMax == 3) { temp_r27 = 0; - } else if(mgBattleStarMax == 5) { + } + else if (mgBattleStarMax == 5) { temp_r27 = 1; - } else { + } + else { temp_r27 = 2; } temp_r29 = HuSprCreate(temp_r28, 190, temp_r27); HuSprGrpMemberSet(temp_r30, 1, temp_r29); HuSprPosSet(temp_r30, 1, 0, -180); - for(temp_r31=0; temp_r31<4; temp_r31++) { - temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 55)+(lbl_1_data_14A[temp_r31]*3), MEMORY_DEFAULT_NUM)); + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 55) + (lbl_1_data_14A[temp_r31] * 3), MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r28, 190, 0); - HuSprGrpMemberSet(temp_r30, (2*temp_r31)+2, temp_r29); - HuSprPosSet(temp_r30, (2*temp_r31)+2, 0, (temp_r31*40)-110); - temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 56)+(lbl_1_data_14A[temp_r31]*3), MEMORY_DEFAULT_NUM)); + HuSprGrpMemberSet(temp_r30, (2 * temp_r31) + 2, temp_r29); + HuSprPosSet(temp_r30, (2 * temp_r31) + 2, 0, (temp_r31 * 40) - 110); + temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 56) + (lbl_1_data_14A[temp_r31] * 3), MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r28, 195, 0); - HuSprGrpMemberSet(temp_r30, (2*temp_r31)+3, temp_r29); - HuSprPosSet(temp_r30, (2*temp_r31)+3, 0, (temp_r31*40)-110); - temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 57)+(lbl_1_data_14A[temp_r31]*3), MEMORY_DEFAULT_NUM)); + HuSprGrpMemberSet(temp_r30, (2 * temp_r31) + 3, temp_r29); + HuSprPosSet(temp_r30, (2 * temp_r31) + 3, 0, (temp_r31 * 40) - 110); + temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 57) + (lbl_1_data_14A[temp_r31] * 3), MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r28, 195, 0); - HuSprGrpMemberSet(temp_r30, temp_r31+19, temp_r29); + HuSprGrpMemberSet(temp_r30, temp_r31 + 19, temp_r29); } temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 37), MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r28, 195, 0); @@ -357,19 +368,19 @@ void fn_1_FF5C(void) HuSprTPLvlSet(temp_r30, 10, 0); temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 101), MEMORY_DEFAULT_NUM)); temp_r26 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 102), MEMORY_DEFAULT_NUM)); - for(temp_r31=0; temp_r31<4; temp_r31++) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { temp_r29 = HuSprCreate(temp_r28, 180, temp_r31); - HuSprGrpMemberSet(temp_r30, (temp_r31*2)+11, temp_r29); - HuSprPosSet(temp_r30, (temp_r31*2)+11, ((temp_r31%2)*350)-175, ((temp_r31/2)*220)-180); + HuSprGrpMemberSet(temp_r30, (temp_r31 * 2) + 11, temp_r29); + HuSprPosSet(temp_r30, (temp_r31 * 2) + 11, ((temp_r31 % 2) * 350) - 175, ((temp_r31 / 2) * 220) - 180); temp_r29 = HuSprCreate(temp_r26, 190, temp_r31); - HuSprGrpMemberSet(temp_r30, (temp_r31*2)+12, temp_r29); - HuSprTPLvlSet(temp_r30, (temp_r31*2)+12, 0.5f); - HuSprPosSet(temp_r30, (temp_r31*2)+12, ((temp_r31%2)*350)-175, ((temp_r31/2)*220)-172); + HuSprGrpMemberSet(temp_r30, (temp_r31 * 2) + 12, temp_r29); + HuSprTPLvlSet(temp_r30, (temp_r31 * 2) + 12, 0.5f); + HuSprPosSet(temp_r30, (temp_r31 * 2) + 12, ((temp_r31 % 2) * 350) - 175, ((temp_r31 / 2) * 220) - 172); } } - for(temp_r31=0; temp_r31<4; temp_r31++) { - HuSprTPLvlSet(lbl_1_bss_388, (temp_r31*2)+2, 1); - HuSprAttrSet(lbl_1_bss_388, temp_r31+19, HUSPR_ATTR_DISPOFF); + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + HuSprTPLvlSet(lbl_1_bss_388, (temp_r31 * 2) + 2, 1); + HuSprAttrSet(lbl_1_bss_388, temp_r31 + 19, HUSPR_ATTR_DISPOFF); } HuSprGrpDrawNoSet(lbl_1_bss_388, 0); } @@ -387,16 +398,18 @@ void fn_1_10564(void) s16 temp_r23; AnimData *temp_r22; s16 sp8[4]; - if(mgBattleStarMax == 3) { + if (mgBattleStarMax == 3) { temp_r25 = 0; - } else if(mgBattleStarMax == 5) { + } + else if (mgBattleStarMax == 5) { temp_r25 = 1; - } else { + } + else { temp_r25 = 2; } temp_r30 = HuSprGrpCreate(35); lbl_1_bss_38A = temp_r30; - temp_r24 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 70)+temp_r25, MEMORY_DEFAULT_NUM)); + temp_r24 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 70) + temp_r25, MEMORY_DEFAULT_NUM)); temp_r27 = HuSprCreate(temp_r24, 195, 0); HuSprGrpMemberSet(temp_r30, 33, temp_r27); HuSprAttrSet(temp_r30, 33, HUSPR_ATTR_DISPOFF); @@ -404,83 +417,88 @@ void fn_1_10564(void) HuSprGrpMemberSet(temp_r30, 34, temp_r27); HuSprAttrSet(temp_r30, 34, HUSPR_ATTR_DISPOFF); temp_r22 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 73), MEMORY_DEFAULT_NUM)); - temp_r28 = -(((mgBattleStarMax+1)*42)/2)+20; + temp_r28 = -(((mgBattleStarMax + 1) * 42) / 2) + 20; temp_r26 = -64; - for(temp_r31=0; temp_r31<4; temp_r31++) { - temp_r24 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 74)+lbl_1_bss_2C24[temp_r31], MEMORY_DEFAULT_NUM)); + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + temp_r24 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 74) + lbl_1_bss_2C24[temp_r31], MEMORY_DEFAULT_NUM)); temp_r27 = HuSprCreate(temp_r24, 190, 0); - HuSprGrpMemberSet(temp_r30, (temp_r31*8)+0, temp_r27); - HuSprPosSet(temp_r30, (temp_r31*8)+0, temp_r28, temp_r26+(temp_r31*42)); - for(temp_r29=0; temp_r29<7; temp_r29++) { + HuSprGrpMemberSet(temp_r30, (temp_r31 * 8) + 0, temp_r27); + HuSprPosSet(temp_r30, (temp_r31 * 8) + 0, temp_r28, temp_r26 + (temp_r31 * 42)); + for (temp_r29 = 0; temp_r29 < 7; temp_r29++) { temp_r27 = HuSprCreate(temp_r22, 190, 0); - HuSprGrpMemberSet(temp_r30, 1+(temp_r31*8)+temp_r29, temp_r27); - HuSprPosSet(temp_r30, 1+(temp_r31*8)+temp_r29, 42+temp_r28+(temp_r29*42), temp_r26+(temp_r31*42)); - if(mgBattleStar[lbl_1_bss_2C1C[temp_r31]] <= temp_r29) { - HuSprScaleSet(temp_r30, 1+(temp_r31*8)+temp_r29, 0, 0); - } else { - HuSprScaleSet(temp_r30, 1+(temp_r31*8)+temp_r29, 1, 1); + HuSprGrpMemberSet(temp_r30, 1 + (temp_r31 * 8) + temp_r29, temp_r27); + HuSprPosSet(temp_r30, 1 + (temp_r31 * 8) + temp_r29, 42 + temp_r28 + (temp_r29 * 42), temp_r26 + (temp_r31 * 42)); + if (mgBattleStar[lbl_1_bss_2C1C[temp_r31]] <= temp_r29) { + HuSprScaleSet(temp_r30, 1 + (temp_r31 * 8) + temp_r29, 0, 0); } - if(mgTypeCurr == 1) { - if(temp_r31 > 2) { - HuSprAttrSet(temp_r30, 1+(temp_r31*8)+temp_r29, HUSPR_ATTR_DISPOFF); + else { + HuSprScaleSet(temp_r30, 1 + (temp_r31 * 8) + temp_r29, 1, 1); + } + if (mgTypeCurr == 1) { + if (temp_r31 > 2) { + HuSprAttrSet(temp_r30, 1 + (temp_r31 * 8) + temp_r29, HUSPR_ATTR_DISPOFF); } - if(temp_r31 == 1) { - HuSprPosSet(temp_r30, 1+(temp_r31*8)+temp_r29, 42+temp_r28+(temp_r29*42), temp_r26+84); + if (temp_r31 == 1) { + HuSprPosSet(temp_r30, 1 + (temp_r31 * 8) + temp_r29, 42 + temp_r28 + (temp_r29 * 42), temp_r26 + 84); } - } else if(mgTypeCurr == 2) { - if(temp_r31%2 == 1) { - HuSprAttrSet(temp_r30, 1+(temp_r31*8)+temp_r29, HUSPR_ATTR_DISPOFF); + } + else if (mgTypeCurr == 2) { + if (temp_r31 % 2 == 1) { + HuSprAttrSet(temp_r30, 1 + (temp_r31 * 8) + temp_r29, HUSPR_ATTR_DISPOFF); } - if(temp_r31 == 0) { - HuSprPosSet(temp_r30, 1+(temp_r31*8)+temp_r29, 42+temp_r28+(temp_r29*42), temp_r26+21); + if (temp_r31 == 0) { + HuSprPosSet(temp_r30, 1 + (temp_r31 * 8) + temp_r29, 42 + temp_r28 + (temp_r29 * 42), temp_r26 + 21); } - if(temp_r31 == 2) { - HuSprPosSet(temp_r30, 1+(temp_r31*8)+temp_r29, 42+temp_r28+(temp_r29*42), temp_r26+105); + if (temp_r31 == 2) { + HuSprPosSet(temp_r30, 1 + (temp_r31 * 8) + temp_r29, 42 + temp_r28 + (temp_r29 * 42), temp_r26 + 105); } } } } - temp_r28 = -(((mgBattleStarMax+1)*42)/2)+22; - if(temp_r25 == 0) { + temp_r28 = -(((mgBattleStarMax + 1) * 42) / 2) + 22; + if (temp_r25 == 0) { temp_r28 += 63; - } else if(temp_r25 == 1) { + } + else if (temp_r25 == 1) { temp_r28 += 105; - } else { + } + else { temp_r28 += 146; } - if(mgTypeCurr == 1) { - HuSprPosSet(temp_r30, 33, temp_r28+21, temp_r26+63); + if (mgTypeCurr == 1) { + HuSprPosSet(temp_r30, 33, temp_r28 + 21, temp_r26 + 63); HuSprAttrReset(temp_r30, 33, HUSPR_ATTR_DISPOFF); - HuSprPosSet(temp_r30, 34, temp_r28+21, temp_r26+105); - HuSprAttrReset(temp_r30, 34, HUSPR_ATTR_DISPOFF); - } else if(mgTypeCurr == 2) { - HuSprPosSet(temp_r30, 33, temp_r28+21, temp_r26+21); - HuSprAttrReset(temp_r30, 33, HUSPR_ATTR_DISPOFF); - HuSprPosSet(temp_r30, 34, temp_r28+21, temp_r26+105); + HuSprPosSet(temp_r30, 34, temp_r28 + 21, temp_r26 + 105); HuSprAttrReset(temp_r30, 34, HUSPR_ATTR_DISPOFF); } - temp_r24 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 67)+temp_r25, MEMORY_DEFAULT_NUM)); + else if (mgTypeCurr == 2) { + HuSprPosSet(temp_r30, 33, temp_r28 + 21, temp_r26 + 21); + HuSprAttrReset(temp_r30, 33, HUSPR_ATTR_DISPOFF); + HuSprPosSet(temp_r30, 34, temp_r28 + 21, temp_r26 + 105); + HuSprAttrReset(temp_r30, 34, HUSPR_ATTR_DISPOFF); + } + temp_r24 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 67) + temp_r25, MEMORY_DEFAULT_NUM)); temp_r27 = HuSprCreate(temp_r24, 200, 0); HuSprGrpMemberSet(temp_r30, 32, temp_r27); HuSprGrpPosSet(temp_r30, 288, 185); HuSprGrpDrawNoSet(temp_r30, 64); HuSprGrpScaleSet(temp_r30, 1, 0); - for(temp_r31=0; temp_r31<4; temp_r31++) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { lbl_1_bss_38C[temp_r31] = 0; } - switch(mgTypeCurr) { + switch (mgTypeCurr) { case 0: temp_r23 = -1; - for(temp_r31=0; temp_r31<4; temp_r31++) { - sp8[temp_r31] = GWPlayerCoinWinGet(temp_r31)+GWPlayerCoinCollectGet(temp_r31); - if(temp_r23 < sp8[temp_r31]) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + sp8[temp_r31] = GWPlayerCoinWinGet(temp_r31) + GWPlayerCoinCollectGet(temp_r31); + if (temp_r23 < sp8[temp_r31]) { temp_r23 = sp8[temp_r31]; } } lbl_1_bss_394 = 0; - if(temp_r23 != 0) { - for(temp_r31=0; temp_r31<4; temp_r31++) { - if(temp_r23 == sp8[temp_r31]) { + if (temp_r23 != 0) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + if (temp_r23 == sp8[temp_r31]) { lbl_1_bss_396[lbl_1_bss_394] = temp_r31; lbl_1_bss_38C[temp_r31] = 1; lbl_1_bss_394++; @@ -488,33 +506,35 @@ void fn_1_10564(void) } } break; - + case 1: case 2: sp8[0] = sp8[1] = 0; - for(temp_r31=0; temp_r31<4; temp_r31++) { - sp8[GWPlayerCfg[temp_r31].group] += GWPlayerCoinWinGet(temp_r31)+GWPlayerCoinCollectGet(temp_r31); + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + sp8[GWPlayerCfg[temp_r31].group] += GWPlayerCoinWinGet(temp_r31) + GWPlayerCoinCollectGet(temp_r31); } - if(mgInfoTbl[GWSystem.mg_next].ovl == OVL_M422) { + if (mgInfoTbl[GWSystem.mg_next].ovl == OVL_M422) { sp8[1] /= 3; } lbl_1_bss_394 = 0; - if(sp8[0] != 0 || sp8[1] != 0) { - if(sp8[0] != sp8[1]) { - if(sp8[0] > sp8[1]) { + if (sp8[0] != 0 || sp8[1] != 0) { + if (sp8[0] != sp8[1]) { + if (sp8[0] > sp8[1]) { temp_r29 = 0; - } else { + } + else { temp_r29 = 1; } - for(temp_r31=0; temp_r31<4; temp_r31++) { - if(temp_r29 == GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].group) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + if (temp_r29 == GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].group) { lbl_1_bss_396[lbl_1_bss_394] = temp_r31; lbl_1_bss_38C[temp_r31] = 1; lbl_1_bss_394++; } } - } else { - for(temp_r31=0; temp_r31<4; temp_r31++) { + } + else { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { lbl_1_bss_396[lbl_1_bss_394] = temp_r31; lbl_1_bss_38C[temp_r31] = 1; lbl_1_bss_394++; @@ -522,17 +542,17 @@ void fn_1_10564(void) } } break; - + case 3: - for(temp_r31=lbl_1_bss_394=0; temp_r31<4; temp_r31++) { - if(!GWPlayerCoinWinGet(lbl_1_bss_2C1C[temp_r31])) { + for (temp_r31 = lbl_1_bss_394 = 0; temp_r31 < 4; temp_r31++) { + if (!GWPlayerCoinWinGet(lbl_1_bss_2C1C[temp_r31])) { lbl_1_bss_396[lbl_1_bss_394] = temp_r31; lbl_1_bss_38C[temp_r31] = 1; lbl_1_bss_394++; } } break; - + default: break; } @@ -547,122 +567,135 @@ s32 fn_1_1129C(void) s16 temp_r29; s16 temp_r28; float temp_f31; - + s16 sp18[4]; s16 sp10[4]; s16 sp8[4]; - + HuSprTPLvlSet(lbl_1_bss_388, 10, 0); - while(WipeStatGet()) { + while (WipeStatGet()) { HuPrcVSleep(); } fn_1_10564(); - for(temp_r31=0; temp_r31<=30; temp_r31++) { - if(temp_r31 <= 20) { - temp_f31 = temp_r31/20.0f; - HuSprGrpScaleSet(lbl_1_bss_38A, 1, 1.1*sind(temp_f31*90.0f)); - } else { - temp_f31 = (temp_r31-20)/10.0f; - HuSprGrpScaleSet(lbl_1_bss_38A, 1, 1.0+(0.1*cosd(temp_f31*90.0f))); + for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) { + if (temp_r31 <= 20) { + temp_f31 = temp_r31 / 20.0f; + HuSprGrpScaleSet(lbl_1_bss_38A, 1, 1.1 * sind(temp_f31 * 90.0f)); + } + else { + temp_f31 = (temp_r31 - 20) / 10.0f; + HuSprGrpScaleSet(lbl_1_bss_38A, 1, 1.0 + (0.1 * cosd(temp_f31 * 90.0f))); } HuPrcVSleep(); } HuPrcSleep(30); - if(lbl_1_data_148 == -1) { + if (lbl_1_data_148 == -1) { lbl_1_data_148 = fn_1_2530C(0, 0, 0); } - if(lbl_1_bss_394) { - for(temp_r31=0; temp_r31= mgBattleStarMax) { + if (mgBattleStar[lbl_1_bss_2C1C[lbl_1_bss_396[temp_r30]]] >= mgBattleStarMax) { sp18[temp_r29] = lbl_1_bss_396[temp_r30]; sp10[lbl_1_bss_396[temp_r30]] = 1; temp_r29++; } } - if(temp_r29 != 0) { - for(temp_r31=0; temp_r31= 20) { - weight = (i-20)/10.0; - Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, 20.0f+((angle-20.0f)*weight), 0); + if (i >= 20) { + weight = (i - 20) / 10.0; + Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, 20.0f + ((angle - 20.0f) * weight), 0); } HuPrcVSleep(); } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { Hu3DMotionShiftSet(lbl_1_bss_2C14[i], lbl_1_bss_2BC4[i][0], 0, 10, HU3D_MOTATTR_LOOP); } - for(i=0; i<=30; i++) { - weight = i/30.0; + for (i = 0; i <= 30; i++) { + weight = i / 30.0; VECScale(&posEnd, &posModel, weight); VECAdd(&pos, &posModel, &posModel); Hu3DModelPosSetV(lbl_1_bss_2C80[5], &posModel); HuPrcVSleep(); } Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 10, HU3D_MOTATTR_LOOP); - for(i=0; i<=10; i++) { - weight = 1.0-(i/10.0); - Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, angle*weight, 0); + for (i = 0; i <= 10; i++) { + weight = 1.0 - (i / 10.0); + Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, angle * weight, 0); HuPrcVSleep(); } - for(i=0; i<=60; i++) { - if(i <= 10) { - weight = i/10.0; - HuSprGrpPosSet(lbl_1_bss_388, 288, 240.0+(16.0*sind(weight*90.0f))); - if(lbl_1_bss_38A) { - HuSprGrpPosSet(lbl_1_bss_38A, 288, 185.0+(16.0*sind(weight*90.0f))); - } - } else { - weight = (i-10)/50.0; - weight = (1-cosd(weight*90.0f))*400; - HuSprGrpPosSet(lbl_1_bss_388, 288, 256-weight); - if(lbl_1_bss_38A) { - HuSprGrpPosSet(lbl_1_bss_38A, 288, 201-weight); + for (i = 0; i <= 60; i++) { + if (i <= 10) { + weight = i / 10.0; + HuSprGrpPosSet(lbl_1_bss_388, 288, 240.0 + (16.0 * sind(weight * 90.0f))); + if (lbl_1_bss_38A) { + HuSprGrpPosSet(lbl_1_bss_38A, 288, 185.0 + (16.0 * sind(weight * 90.0f))); } } - + else { + weight = (i - 10) / 50.0; + weight = (1 - cosd(weight * 90.0f)) * 400; + HuSprGrpPosSet(lbl_1_bss_388, 288, 256 - weight); + if (lbl_1_bss_38A) { + HuSprGrpPosSet(lbl_1_bss_38A, 288, 201 - weight); + } + } + HuPrcVSleep(); } HuDataDirClose(DATADIR_INSTPIC); - if(lbl_1_bss_388) { + if (lbl_1_bss_388) { HuSprGrpKill(lbl_1_bss_388); } - if(lbl_1_bss_38A) { + if (lbl_1_bss_38A) { HuSprGrpKill(lbl_1_bss_38A); } lbl_1_bss_388 = lbl_1_bss_38A = 0; - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { CharModelKill(GWPlayerCfg[i].character); } } @@ -832,20 +867,20 @@ void fn_1_12BEC(void) float temp_f31; Vec sp44[30]; s16 sp8[30]; - + temp_r21 = HuPrcCurrentGet(); temp_r28 = temp_r21->user_data; temp_r27 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_MGMODE, 82)); Hu3DModelLayerSet(temp_r27, 3); - Hu3DModelPosSet(temp_r27, (*temp_r28*130)-195, 300, 750); + Hu3DModelPosSet(temp_r27, (*temp_r28 * 130) - 195, 300, 750); Hu3DModelScaleSet(temp_r27, 0.8f, 0.8f, 0.8f); - for(temp_r31=0; temp_r31<30; temp_r31++) { - if(temp_r31 < 4) { + for (temp_r31 = 0; temp_r31 < 30; temp_r31++) { + if (temp_r31 < 4) { temp_r26 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_MGMODE, 83)); sp8[temp_r31] = temp_r26; temp_r30 = &Hu3DData[temp_r26]; temp_r29 = temp_r30->hsfData->material; - for(temp_r24=0; temp_r24hsfData->materialCnt; temp_r24++, temp_r29++) { + for (temp_r24 = 0; temp_r24 < temp_r30->hsfData->materialCnt; temp_r24++, temp_r29++) { temp_r29->color[0] = lbl_1_data_152[temp_r31].r; temp_r29->color[1] = lbl_1_data_152[temp_r31].g; temp_r29->color[2] = lbl_1_data_152[temp_r31].b; @@ -853,57 +888,61 @@ void fn_1_12BEC(void) temp_r29->litColor[1] = lbl_1_data_152[temp_r31].g; temp_r29->litColor[2] = lbl_1_data_152[temp_r31].b; } - } else { - temp_r26 = Hu3DModelLink(sp8[temp_r31%4]); + } + else { + temp_r26 = Hu3DModelLink(sp8[temp_r31 % 4]); sp8[temp_r31] = temp_r26; } - Hu3DModelPosSet(temp_r26, (frandmod(50)-220+(*temp_r28*130)), (temp_r31*12)+350, 750); + Hu3DModelPosSet(temp_r26, (frandmod(50) - 220 + (*temp_r28 * 130)), (temp_r31 * 12) + 350, 750); Hu3DModelScaleSet(temp_r26, 2.0f, 2.0f, 2.0f); - Hu3DModelAttrSet(temp_r26, 1); + Hu3DModelAttrSet(temp_r26, HU3D_ATTR_DISPOFF); Hu3DModelLayerSet(temp_r26, 3); - sp44[temp_r31].x = (float)(frandmod(50)-25)*0.05; - sp44[temp_r31].z = (float)(frandmod(50)-25)*0.05; + sp44[temp_r31].x = (float)(frandmod(50) - 25) * 0.05; + sp44[temp_r31].z = (float)(frandmod(50) - 25) * 0.05; } HuPrcSleep(45); temp_r25 = 0; - while(1) { - for(temp_r31=temp_r22=0; temp_r31<30; temp_r31++) { + while (1) { + for (temp_r31 = temp_r22 = 0; temp_r31 < 30; temp_r31++) { temp_r30 = &Hu3DData[sp8[temp_r31]]; - if(temp_r30->pos.y > 350.0f) { - Hu3DModelAttrSet(sp8[temp_r31], 1); - } else { - Hu3DModelAttrReset(sp8[temp_r31], 1); + if (temp_r30->pos.y > 350.0f) { + Hu3DModelAttrSet(sp8[temp_r31], HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrReset(sp8[temp_r31], HU3D_ATTR_DISPOFF); temp_r30->pos.x += sp44[temp_r31].x; temp_r30->pos.z += sp44[temp_r31].z; } temp_r30->pos.y -= 3.0f; - temp_r30->rot.x += ((temp_r31%3)+1)*5; - temp_r30->rot.y += ((temp_r31%5)+1)*5; - if(temp_r30->pos.y < 0.0f) { - if(lbl_1_bss_3A0 == 0) { - Hu3DModelAttrSet(sp8[temp_r31], 1); + temp_r30->rot.x += ((temp_r31 % 3) + 1) * 5; + temp_r30->rot.y += ((temp_r31 % 5) + 1) * 5; + if (temp_r30->pos.y < 0.0f) { + if (lbl_1_bss_3A0 == 0) { + Hu3DModelAttrSet(sp8[temp_r31], HU3D_ATTR_DISPOFF); temp_r22++; - } else { + } + else { temp_r30->pos.y = 350; - temp_r23 = frandmod(50)-25; - temp_r30->pos.x = (-195+(*temp_r28*130))+temp_r23; + temp_r23 = frandmod(50) - 25; + temp_r30->pos.x = (-195 + (*temp_r28 * 130)) + temp_r23; temp_r30->pos.z = 750; - sp44[temp_r31].x = ((float)frandmod(50)*0.02)*((temp_r23 < 0) ? -1 : (temp_r23 > 0) ? 1: 0); - sp44[temp_r31].z = (float)(frandmod(50)-25)*0.05; + sp44[temp_r31].x = ((float)frandmod(50) * 0.02) * ((temp_r23 < 0) ? -1 : (temp_r23 > 0) ? 1 : 0); + sp44[temp_r31].z = (float)(frandmod(50) - 25) * 0.05; } } } - if(lbl_1_bss_3A0 || temp_r22 != 30) { - if(lbl_1_bss_3A0 == 0 && temp_r25 <= 10) { - temp_f31 = 1-sind((temp_r25/10.0)*90.0); - if(0.0 == temp_f31) { - Hu3DModelAttrSet(temp_r27, 1); + if (lbl_1_bss_3A0 || temp_r22 != 30) { + if (lbl_1_bss_3A0 == 0 && temp_r25 <= 10) { + temp_f31 = 1 - sind((temp_r25 / 10.0) * 90.0); + if (0.0 == temp_f31) { + Hu3DModelAttrSet(temp_r27, HU3D_ATTR_DISPOFF); } Hu3DModelScaleSet(temp_r27, temp_f31, 1, 1); temp_r25++; } HuPrcVSleep(); - } else { + } + else { break; } } @@ -914,7 +953,7 @@ void fn_1_12BEC(void) Hu3DModelKill(temp_r27); HuPrcVSleep(); HuPrcEnd(); - while(1) { + while (1) { HuPrcVSleep(); } -} \ No newline at end of file +} diff --git a/src/REL/mgmodedll/main.c b/src/REL/mgmodedll/main.c index 0af8a0a6..dd6b1b72 100755 --- a/src/REL/mgmodedll/main.c +++ b/src/REL/mgmodedll/main.c @@ -5,8 +5,8 @@ #include "ext_math.h" typedef struct { - /* 0x00 */ omObjData* unk00; - /* 0x04 */ void (*unk04)(omObjData*, ...); + /* 0x00 */ omObjData *unk00; + /* 0x04 */ void (*unk04)(omObjData *, ...); /* 0x08 */ s32 unk08[4]; /* 0x18 */ char unk18[4]; /* 0x1C */ s32 unk1C[4]; @@ -41,32 +41,32 @@ typedef struct { /* 0x2C */ float unk2C; } StructBss3CC; // Size 0x30 -void fn_1_19A30(StructBss8* arg0); +void fn_1_19A30(StructBss8 *arg0); void fn_1_19B8C(void); void fn_1_19D00(void); void fn_1_19E94(void); -void fn_1_19F5C(omObjData* arg0); +void fn_1_19F5C(omObjData *arg0); void fn_1_1A564(void); void fn_1_1A6A0(void); void fn_1_1A8E8(void); void fn_1_1AA28(void); void fn_1_1AB58(void); -void fn_1_1AC88(StructBss2050* arg0, s32 arg1, s32 arg2, s32 arg3); +void fn_1_1AC88(StructBss2050 *arg0, s32 arg1, s32 arg2, s32 arg3); void fn_1_1B260(s32 arg0); void fn_1_1BCEC(void); void fn_1_1BECC(void); -void fn_1_1C09C(StructBss2050* arg0, s32 arg1, s32 arg2, s32 arg3); +void fn_1_1C09C(StructBss2050 *arg0, s32 arg1, s32 arg2, s32 arg3); void fn_1_1CB4C(void); -void fn_1_1CEB0(omObjData* arg0, StructBss8_24* arg1); -void fn_1_1D49C(StructBss8_24* arg0); -s32 fn_1_1D688(StructBss8_24* arg0); -void fn_1_1DD74(s32 arg0, StructBss8_24* arg1); -void fn_1_1E608(StructBss8_24* arg0); -void fn_1_1EB20(StructBss8_24* arg0); +void fn_1_1CEB0(omObjData *arg0, StructBss8_24 *arg1); +void fn_1_1D49C(StructBss8_24 *arg0); +s32 fn_1_1D688(StructBss8_24 *arg0); +void fn_1_1DD74(s32 arg0, StructBss8_24 *arg1); +void fn_1_1E608(StructBss8_24 *arg0); +void fn_1_1EB20(StructBss8_24 *arg0); void fn_1_1EBE8(void); void fn_1_1ED20(void); -void fn_1_1EE58(s32 arg0, UnkFunc1EE58Struct* arg1); -void fn_1_1F32C(omObjData* arg0); +void fn_1_1EE58(s32 arg0, UnkFunc1EE58Struct *arg1); +void fn_1_1F32C(omObjData *arg0); void fn_1_1FABC(void); void fn_1_1FC44(s32 arg0); void fn_1_20728(void); @@ -78,8 +78,8 @@ s32 fn_1_214A4(void); s32 fn_1_21CA4(void); s32 fn_1_2228C(s32 arg0); void fn_1_22728(void); -void fn_1_22C08(omObjData* arg0); -void fn_1_231F0(omObjData* arg0); +void fn_1_22C08(omObjData *arg0); +void fn_1_231F0(omObjData *arg0); float fn_1_240E4(float arg0, float arg1, float arg2, float arg3); float fn_1_2410C(float arg0, float arg1, float arg2); float fn_1_2412C(float arg0, float arg1, float arg2, float arg3); @@ -105,15 +105,16 @@ void fn_1_26790(s32 arg0, s32 arg1, float arg2, float arg3); char lbl_1_bss_209C_pad[8]; // Could be part of StructBss2050. StructBss2050 lbl_1_bss_2050; StructBss8_24 lbl_1_bss_1E10[4]; -omObjData* lbl_1_bss_1E0C; +omObjData *lbl_1_bss_1E0C; StructBss3CC lbl_1_bss_3CC[140]; s32 lbl_1_bss_3C8; -StructBss8* lbl_1_bss_3C4; -Process* lbl_1_bss_3C0; +StructBss8 *lbl_1_bss_3C4; +Process *lbl_1_bss_3C0; s32 lbl_1_data_1E0 = 1; // Unused. -void fn_1_18DF8(Process* arg0, StructBss8* arg1) { +void fn_1_18DF8(Process *arg0, StructBss8 *arg1) +{ s32 i; lbl_1_bss_3C0 = arg0; @@ -138,7 +139,8 @@ void fn_1_18DF8(Process* arg0, StructBss8* arg1) { } } -void fn_1_19018(void) { +void fn_1_19018(void) +{ Vec sp14 = { 0.0f, 0.0f, 640.0f }; float temp_f31; s32 temp_r30; @@ -146,7 +148,7 @@ void fn_1_19018(void) { fn_1_243B0(); for (i = 1; i < 140; i++) { - Hu3DModelAttrReset(lbl_1_bss_1E0C->model[i], 1); + Hu3DModelAttrReset(lbl_1_bss_1E0C->model[i], HU3D_ATTR_DISPOFF); } WipeColorSet(0xFF, 0xFF, 0xFF); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1); @@ -182,7 +184,8 @@ void fn_1_19018(void) { fn_1_24388(60); } -s32 fn_1_194C8(s32 arg0) { +s32 fn_1_194C8(s32 arg0) +{ s32 var_r30; s32 var_r29; s32 var_r28; @@ -202,13 +205,16 @@ s32 fn_1_194C8(s32 arg0) { } if (i != 4) { var_r29 = 2; - } else { + } + else { var_r29 = 1; } - } else { + } + else { var_r29 = 3; } - } else { + } + else { lbl_1_bss_3C4->unk1C = arg0; fn_1_19B8C(); } @@ -239,9 +245,11 @@ s32 fn_1_194C8(s32 arg0) { case 3: if (lbl_1_bss_3C4->unk1C == 0 || lbl_1_bss_3C4->unk1C == 3) { var_r29 = 5; - } else if (lbl_1_bss_3C4->unk1C == 2) { + } + else if (lbl_1_bss_3C4->unk1C == 2) { var_r29 = fn_1_21CA4(); - } else { + } + else { var_r29 = fn_1_2228C(var_r28); var_r28 = 0; } @@ -250,7 +258,8 @@ s32 fn_1_194C8(s32 arg0) { if (var_r29 == 0) { var_r30 = 10; break; - } else if (var_r29 == 5) { + } + else if (var_r29 == 5) { var_r30 = 99; break; } @@ -264,7 +273,8 @@ s32 fn_1_194C8(s32 arg0) { } if (var_r30 == -99) { var_r30 = 0; - } else { + } + else { for (i = 0; i < 4; i++) { lbl_1_bss_3C4->unk24[i].unk5C = lbl_1_bss_1E10[i].unk5C; lbl_1_bss_3C4->unk24[i].unk60 = lbl_1_bss_1E10[i].unk60; @@ -292,7 +302,8 @@ s32 fn_1_194C8(s32 arg0) { lbl_1_bss_3C4->unk24[2].unk5C = lbl_1_bss_3C4->unk24[3].unk5C = 1; break; } - } else if (lbl_1_bss_3C4->unk1C == 2) { + } + else if (lbl_1_bss_3C4->unk1C == 2) { switch (lbl_1_bss_2050.unk1C[0]) { case 0: lbl_1_bss_3C4->unk20 = 3; @@ -314,7 +325,8 @@ s32 fn_1_194C8(s32 arg0) { return var_r30; } -void fn_1_19A30(StructBss8* arg0) { +void fn_1_19A30(StructBss8 *arg0) +{ s32 i; OSReport("\n\n>>>>>>>>>>>>>>>>>>>> ENTRANCE HELP\n\n"); @@ -337,12 +349,14 @@ void fn_1_19A30(StructBss8* arg0) { } OSReport("\nNO) GRP:COM:DIF:CHR:PAD\n"); for (i = 0; i < 4; i++) { - OSReport("%2d) %3d:%3d:%3d:%3d:%3d\n", i, arg0->unk24[i].unk5C, arg0->unk24[i].unk60, arg0->unk24[i].unk64, arg0->unk24[i].unk68, arg0->unk24[i].unk6C); + OSReport("%2d) %3d:%3d:%3d:%3d:%3d\n", i, arg0->unk24[i].unk5C, arg0->unk24[i].unk60, arg0->unk24[i].unk64, arg0->unk24[i].unk68, + arg0->unk24[i].unk6C); } OSReport("\n>>>>>>>>>>>>>>>>>>>> ENTRANCE HELP\n\n"); } -void fn_1_19B8C(void) { +void fn_1_19B8C(void) +{ s32 i; s32 j; @@ -365,8 +379,9 @@ void fn_1_19B8C(void) { } } -void fn_1_19D00(void) { - omObjData* temp_r30; +void fn_1_19D00(void) +{ + omObjData *temp_r30; s32 temp_r31; temp_r31 = lbl_1_bss_3C8++; @@ -390,8 +405,9 @@ void fn_1_19D00(void) { } } -void fn_1_19E94(void) { - omObjData* temp_r3; +void fn_1_19E94(void) +{ + omObjData *temp_r3; temp_r3 = omAddObjEx(lbl_1_bss_3C0, 0x100, 16, 16, -1, NULL); lbl_1_bss_2050.unk00 = temp_r3; @@ -406,40 +422,22 @@ void fn_1_19E94(void) { } } -s32 lbl_1_data_32C[][4] = { - { 177, 104, 120, 55 }, - { 251, 104, 458, 55 }, - { 325, 104, 120, 142 }, - { 399, 104, 458, 142 } -}; +s32 lbl_1_data_32C[][4] = { { 177, 104, 120, 55 }, { 251, 104, 458, 55 }, { 325, 104, 120, 142 }, { 399, 104, 458, 142 } }; -s32 lbl_1_data_36C[][6] = { - { 168, 90, 120, 51, 112, 55 }, - { 248, 190, 458, 51, 466, 55 }, - { 328, 90, 120, 222, 112, 282 }, - { 408, 190, 458, 222, 466, 282 } -}; +s32 lbl_1_data_36C[][6] + = { { 168, 90, 120, 51, 112, 55 }, { 248, 190, 458, 51, 466, 55 }, { 328, 90, 120, 222, 112, 282 }, { 408, 190, 458, 222, 466, 282 } }; s32 lbl_1_data_3CC[] = { 224, 456, 272, 292, 468, 282 }; -float lbl_1_data_3E4[][5] = { - { 262.0f, 119.0f, 1.3f, 227.0f, 455.0f }, - { 314.0f, 168.0f, 0.75f, 265.0f, 416.0f }, - { 366.0f, 204.0f, 0.75f, 230.0f, 450.0f }, - { 418.0f, 240.0f, 0.75f, 300.0f, 381.0f }, - { -1.0f, 289.0f, 1.3f, 220.0f, 460.0f } -}; +float lbl_1_data_3E4[][5] = { { 262.0f, 119.0f, 1.3f, 227.0f, 455.0f }, { 314.0f, 168.0f, 0.75f, 265.0f, 416.0f }, + { 366.0f, 204.0f, 0.75f, 230.0f, 450.0f }, { 418.0f, 240.0f, 0.75f, 300.0f, 381.0f }, { -1.0f, 289.0f, 1.3f, 220.0f, 460.0f } }; -s32 lbl_1_data_448[][4] = { - { 262, 262, 262, 262 }, - { 314, 307, 373, 373 }, - { 366, 373, 307, 418 }, - { 418, 418, 418, 307 } -}; +s32 lbl_1_data_448[][4] = { { 262, 262, 262, 262 }, { 314, 307, 373, 373 }, { 366, 373, 307, 418 }, { 418, 418, 418, 307 } }; s32 lbl_1_data_488 = -1; -void fn_1_19F5C(omObjData* arg0) { +void fn_1_19F5C(omObjData *arg0) +{ float var_f30; float var_f31; s32 temp_r28; @@ -470,20 +468,24 @@ void fn_1_19F5C(omObjData* arg0) { if (HuPadStkX[lbl_1_bss_1E10->unk6C] >= 5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 2)) { var_r29++; var_r26 = 1; - } else if (HuPadStkX[lbl_1_bss_1E10->unk6C] <= -5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 1)) { + } + else if (HuPadStkX[lbl_1_bss_1E10->unk6C] <= -5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 1)) { var_r29--; var_r26 = -1; } - } else { + } + else { fn_1_1AB58(); } if (var_r29 < 1) { var_r29 = var_r27; - } else if (var_r29 > var_r27) { + } + else if (var_r29 > var_r27) { if (var_r26 == 0) { var_r29 = var_r27; var_r25 = 1; - } else { + } + else { var_r29 = 1; } } @@ -494,13 +496,15 @@ void fn_1_19F5C(omObjData* arg0) { if (i <= 5) { var_f30 = fn_1_24204(0.0f, 10.0f, i, 5.0f); var_f31 = fn_1_24204(1.0f, 0.0f, i, 5.0f); - } else { + } + else { var_f30 = fn_1_24204(10.0f, 0.0f, i - 5, 5.0f); var_f31 = fn_1_24204(0.0f, 1.0f, i - 5, 5.0f); } if (var_r26 == 1) { HuSprPosSet(temp_r28, 9, lbl_1_data_32C[3][0] + 50 + var_f30, lbl_1_data_32C[0][1]); - } else if (var_r26 == -1) { + } + else if (var_r26 == -1) { HuSprPosSet(temp_r28, 8, lbl_1_data_32C[0][0] - 50 - var_f30, lbl_1_data_32C[0][1]); } for (j = 0; j < 4; j++) { @@ -511,7 +515,8 @@ void fn_1_19F5C(omObjData* arg0) { if (i == 5) { HuSprBankSet(temp_r28, j, 0); } - } else if (j >= var_r29 && lbl_1_bss_1E10[j].unk60 == 0) { + } + else if (j >= var_r29 && lbl_1_bss_1E10[j].unk60 == 0) { lbl_1_bss_1E10[j].unk70[3] = 1; HuSprScaleSet(temp_r28, j, var_f31, 1.0f); HuSprScaleSet(temp_r28, j + 4, var_f31, 1.0f); @@ -525,7 +530,8 @@ void fn_1_19F5C(omObjData* arg0) { for (j = 0; j < 4; j++) { if (j < var_r29) { lbl_1_bss_1E10[j].unk60 = 0; - } else { + } + else { lbl_1_bss_1E10[j].unk60 = 1; } } @@ -533,7 +539,8 @@ void fn_1_19F5C(omObjData* arg0) { lbl_1_bss_2050.unk1C[0] = 0; } -void fn_1_1A564(void) { +void fn_1_1A564(void) +{ s32 temp_r30; s32 i; @@ -555,7 +562,8 @@ void fn_1_1A564(void) { HuSprGrpPosSet(temp_r30, 0.0f, -500.0f); } -void fn_1_1A6A0(void) { +void fn_1_1A6A0(void) +{ float var_f31; s32 temp_r28; s32 i; @@ -566,14 +574,16 @@ void fn_1_1A6A0(void) { fn_1_243B0(); if (i <= 50) { var_f31 = fn_1_24204(-500.0f, 10.0f, i, 50.0f); - } else { + } + else { var_f31 = fn_1_2412C(10.0f, 2.06f, i - 50, 10.0f); } HuSprGrpPosSet(temp_r28, 0.0f, var_f31); } } -void fn_1_1A8E8(void) { +void fn_1_1A8E8(void) +{ float var_f31; s32 spC; s32 sp8; @@ -587,7 +597,8 @@ void fn_1_1A8E8(void) { fn_1_243B0(); if (i <= 10) { var_f31 = fn_1_24204(2.06f, 10.0f, i, 10.0f); - } else { + } + else { var_f31 = fn_1_2412C(10.0f, -500.0f, i - 10, 50.0f); } HuSprGrpPosSet(temp_r30, 0.0f, var_f31); @@ -595,7 +606,8 @@ void fn_1_1A8E8(void) { fn_1_1B260(0); } -void fn_1_1AA28(void) { +void fn_1_1AA28(void) +{ s32 temp_r31; temp_r31 = lbl_1_bss_2050.unk34; @@ -605,7 +617,8 @@ void fn_1_1AA28(void) { HuSprPosSet(temp_r31, 9, lbl_1_data_32C[3][0] + 50, lbl_1_data_32C[0][1]); } -void fn_1_1AB58(void) { +void fn_1_1AB58(void) +{ s32 temp_r31; temp_r31 = lbl_1_bss_2050.unk34; @@ -615,9 +628,10 @@ void fn_1_1AB58(void) { HuSprPosSet(temp_r31, 9, lbl_1_data_32C[3][0] + 50, lbl_1_data_32C[0][1]); } -void fn_1_1AC88(StructBss2050* arg0, s32 arg1, s32 arg2, s32 arg3) { - AnimData* temp_r26; - AnimData* temp_r25; +void fn_1_1AC88(StructBss2050 *arg0, s32 arg1, s32 arg2, s32 arg3) +{ + AnimData *temp_r26; + AnimData *temp_r25; s32 var_r29; s32 var_r28; s32 i; @@ -660,7 +674,8 @@ void fn_1_1AC88(StructBss2050* arg0, s32 arg1, s32 arg2, s32 arg3) { fn_1_1A564(); } -void fn_1_1B260(s32 arg0) { +void fn_1_1B260(s32 arg0) +{ s32 temp_r30; s32 i; @@ -672,16 +687,15 @@ void fn_1_1B260(s32 arg0) { if (lbl_1_bss_1E10[i].unk60 != 0) { HuSprAttrSet(temp_r30, 16 + lbl_1_bss_1E10[i].unk58, HUSPR_ATTR_DISPOFF); HuSprAttrSet(temp_r30, 20 + lbl_1_bss_1E10[i].unk58, HUSPR_ATTR_DISPOFF); - } else { + } + else { HuSprAttrReset(temp_r30, 16 + lbl_1_bss_1E10[i].unk58, HUSPR_ATTR_DISPOFF); HuSprAttrReset(temp_r30, 20 + lbl_1_bss_1E10[i].unk58, HUSPR_ATTR_DISPOFF); } - HuSprPosSet(temp_r30, 16 + lbl_1_bss_1E10[i].unk58, - lbl_1_data_36C[lbl_1_bss_1E10[i].unk68 % 4][0], - lbl_1_data_36C[lbl_1_bss_1E10[i].unk68 / 4][1]); - HuSprPosSet(temp_r30, 20 + lbl_1_bss_1E10[i].unk58, - lbl_1_data_36C[lbl_1_bss_1E10[i].unk68 % 4][0], - lbl_1_data_36C[lbl_1_bss_1E10[i].unk68 / 4][1]); + HuSprPosSet( + temp_r30, 16 + lbl_1_bss_1E10[i].unk58, lbl_1_data_36C[lbl_1_bss_1E10[i].unk68 % 4][0], lbl_1_data_36C[lbl_1_bss_1E10[i].unk68 / 4][1]); + HuSprPosSet( + temp_r30, 20 + lbl_1_bss_1E10[i].unk58, lbl_1_data_36C[lbl_1_bss_1E10[i].unk68 % 4][0], lbl_1_data_36C[lbl_1_bss_1E10[i].unk68 / 4][1]); } for (i = 0; i < 8; i++) { HuSprBankSet(temp_r30, i, 0); @@ -715,7 +729,8 @@ void fn_1_1B260(s32 arg0) { HuSprPosSet(temp_r30, 65 + i, lbl_1_data_3E4[i][0] + 1.0f, lbl_1_data_3CC[2] + 2); } HuWinDispOn(lbl_1_bss_2050.unk44[0]); - } else if (arg0 == 2) { + } + else if (arg0 == 2) { HuSprAttrSet(temp_r30, 40, HUSPR_ATTR_DISPOFF); HuSprAttrReset(temp_r30, 53, HUSPR_ATTR_DISPOFF); HuSprAttrReset(temp_r30, 56, HUSPR_ATTR_DISPOFF); @@ -733,7 +748,8 @@ void fn_1_1B260(s32 arg0) { HuSprGrpPosSet(temp_r30, 0.0f, -500.0f); } -void fn_1_1BCEC(void) { +void fn_1_1BCEC(void) +{ float var_f31; s32 sp8; s32 i; @@ -743,7 +759,8 @@ void fn_1_1BCEC(void) { fn_1_243B0(); if (i <= 50) { var_f31 = fn_1_24204(-500.0f, 10.0f, i, 50.0f); - } else { + } + else { var_f31 = fn_1_2412C(10.0f, 2.06f, i - 50, 10.0f); } HuSprGrpPosSet(lbl_1_bss_2050.unk30, 0.0f, var_f31); @@ -752,7 +769,8 @@ void fn_1_1BCEC(void) { } } -void fn_1_1BECC(void) { +void fn_1_1BECC(void) +{ float var_f31; s32 i; @@ -760,7 +778,8 @@ void fn_1_1BECC(void) { fn_1_243B0(); if (i <= 10) { var_f31 = fn_1_24204(2.06f, 10.0f, i, 10.0f); - } else { + } + else { var_f31 = fn_1_2412C(10.0f, -500.0f, i - 10, 50.0f); } HuSprGrpPosSet(lbl_1_bss_2050.unk30, 0.0f, var_f31); @@ -769,12 +788,13 @@ void fn_1_1BECC(void) { } } -void fn_1_1C09C(StructBss2050* arg0, s32 arg1, s32 arg2, s32 arg3) { - AnimData* temp_r28; - AnimData* temp_r26; - AnimData* temp_r25; - AnimData* temp_r24; - AnimData* temp_r23; +void fn_1_1C09C(StructBss2050 *arg0, s32 arg1, s32 arg2, s32 arg3) +{ + AnimData *temp_r28; + AnimData *temp_r26; + AnimData *temp_r25; + AnimData *temp_r24; + AnimData *temp_r23; s32 var_r29; s32 var_r30; s32 i; @@ -878,8 +898,9 @@ void fn_1_1C09C(StructBss2050* arg0, s32 arg1, s32 arg2, s32 arg3) { fn_1_1B260(0); } -void fn_1_1CB4C(void) { - StructBss8_24* temp_r30; +void fn_1_1CB4C(void) +{ + StructBss8_24 *temp_r30; float temp_f31; float temp_f30; s32 temp_r29; @@ -913,7 +934,8 @@ void fn_1_1CB4C(void) { } } -void fn_1_1CEB0(omObjData* arg0, StructBss8_24* arg1) { +void fn_1_1CEB0(omObjData *arg0, StructBss8_24 *arg1) +{ float temp_f31; float temp_f30; s32 temp_r25; @@ -937,14 +959,16 @@ void fn_1_1CEB0(omObjData* arg0, StructBss8_24* arg1) { HuSprBankSet(temp_r25, 16 + arg1->unk58, 1); HuSprBankSet(temp_r25, 20 + arg1->unk58, 1); HuAudFXPlay(0x6D + arg1->unk68); - } else { + } + else { if (HuPadStkX[arg1->unk6C] >= 5 || (HuPadBtn[arg1->unk6C] & 2)) { var_r30++; var_r27 = 1; if (var_r30 > 3) { var_r30 = 3; } - } else if (HuPadStkX[arg1->unk6C] <= -5 || (HuPadBtn[arg1->unk6C] & 1)) { + } + else if (HuPadStkX[arg1->unk6C] <= -5 || (HuPadBtn[arg1->unk6C] & 1)) { var_r30--; var_r27 = -1; if (var_r30 < 0) { @@ -957,7 +981,8 @@ void fn_1_1CEB0(omObjData* arg0, StructBss8_24* arg1) { if (var_r29 > 1) { var_r29 = 1; } - } else if (HuPadStkY[arg1->unk6C] >= 5 || (HuPadBtn[arg1->unk6C] & 8)) { + } + else if (HuPadStkY[arg1->unk6C] >= 5 || (HuPadBtn[arg1->unk6C] & 8)) { var_r29--; var_r26 = -1; if (var_r29 < 0) { @@ -965,7 +990,8 @@ void fn_1_1CEB0(omObjData* arg0, StructBss8_24* arg1) { } } } - } else if (HuPadBtnDown[arg1->unk6C] & 0x200) { + } + else if (HuPadBtnDown[arg1->unk6C] & 0x200) { arg1->unk70[0] = 0; HuSprBankSet(temp_r25, arg1->unk68, 0); HuSprBankSet(temp_r25, 16 + arg1->unk58, 0); @@ -979,20 +1005,25 @@ void fn_1_1CEB0(omObjData* arg0, StructBss8_24* arg1) { if (var_r27 == 0 || var_r26 == 0) { if (var_r30 + var_r27 > 3 || var_r30 + var_r27 < 0) { var_r30 = temp_r24; - } else { + } + else { var_r30 += var_r27; } if (var_r29 + var_r26 > 1 || var_r29 + var_r26 < 0) { var_r29 = temp_r23; - } else { + } + else { var_r29 += var_r26; } - } else { + } + else { if (var_r30 + var_r27 <= 3 && var_r30 + var_r27 >= 0) { var_r30 += var_r27; - } else if (var_r29 + var_r26 <= 1 && var_r29 + var_r26 >= 0) { + } + else if (var_r29 + var_r26 <= 1 && var_r29 + var_r26 >= 0) { var_r29 += var_r26; - } else { + } + else { var_r30 = temp_r24; var_r29 = temp_r23; } @@ -1015,7 +1046,8 @@ void fn_1_1CEB0(omObjData* arg0, StructBss8_24* arg1) { } } -void fn_1_1D49C(StructBss8_24* arg0) { +void fn_1_1D49C(StructBss8_24 *arg0) +{ s32 temp_r30; temp_r30 = lbl_1_bss_2050.unk30; @@ -1027,7 +1059,8 @@ void fn_1_1D49C(StructBss8_24* arg0) { HuSprAttrReset(temp_r30, 36 + arg0->unk58, HUSPR_ATTR_DISPOFF); } -s32 fn_1_1D688(StructBss8_24* arg0) { +s32 fn_1_1D688(StructBss8_24 *arg0) +{ float var_f31; s32 i; s32 temp_r29; @@ -1048,32 +1081,37 @@ s32 fn_1_1D688(StructBss8_24* arg0) { if (arg0->unk64 > 3) { arg0->unk64 = 0; } - } else { + } + else { arg0->unk64++; var_r28 = 1; if (arg0->unk64 > 2) { arg0->unk64 = 0; } } - } else if (HuPadStkX[lbl_1_bss_1E10->unk6C] <= -5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 1)) { + } + else if (HuPadStkX[lbl_1_bss_1E10->unk6C] <= -5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 1)) { if (GWGameStat.field10E_bit4 == 1) { arg0->unk64--; var_r28 = -1; if (arg0->unk64 < 0) { arg0->unk64 = 3; } - } else { + } + else { arg0->unk64--; var_r28 = -1; if (arg0->unk64 < 0) { arg0->unk64 = 2; } } - } else if (HuPadBtnDown[0] & 0x100) { + } + else if (HuPadBtnDown[0] & 0x100) { var_r27 = 1; HuAudFXPlay(2); break; - } else if (HuPadBtnDown[0] & 0x200) { + } + else if (HuPadBtnDown[0] & 0x200) { var_r27 = 0; HuAudFXPlay(3); break; @@ -1104,7 +1142,8 @@ s32 fn_1_1D688(StructBss8_24* arg0) { return var_r27; } -void fn_1_1DD74(s32 arg0, StructBss8_24* arg1) { +void fn_1_1DD74(s32 arg0, StructBss8_24 *arg1) +{ float temp_f31; float var_f30; s32 temp_r27; @@ -1131,14 +1170,16 @@ void fn_1_1DD74(s32 arg0, StructBss8_24* arg1) { HuSprBankSet(temp_r27, 28 + arg1->unk58, 1); HuAudFXPlay(0x6D + arg1->unk68); fn_1_1D49C(arg1); - } else { + } + else { if (HuPadStkX[lbl_1_bss_1E10->unk6C] >= 5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 2)) { var_r30++; var_r26 = 1; if (var_r30 > 3) { var_r30 = 3; } - } else if (HuPadStkX[lbl_1_bss_1E10->unk6C] <= -5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 1)) { + } + else if (HuPadStkX[lbl_1_bss_1E10->unk6C] <= -5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 1)) { var_r30--; var_r26 = -1; if (var_r30 < 0) { @@ -1151,7 +1192,8 @@ void fn_1_1DD74(s32 arg0, StructBss8_24* arg1) { if (var_r29 > 1) { var_r29 = 1; } - } else if (HuPadStkY[lbl_1_bss_1E10->unk6C] >= 5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 8)) { + } + else if (HuPadStkY[lbl_1_bss_1E10->unk6C] >= 5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 8)) { var_r29--; var_r25 = -1; if (var_r29 < 0) { @@ -1159,7 +1201,8 @@ void fn_1_1DD74(s32 arg0, StructBss8_24* arg1) { } } } - } else if (HuPadBtnDown[lbl_1_bss_1E10->unk6C] & 0x200) { + } + else if (HuPadBtnDown[lbl_1_bss_1E10->unk6C] & 0x200) { arg1->unk70[0] = arg1->unk70[2] = 0; HuSprBankSet(temp_r27, arg1->unk68, 0); HuSprBankSet(temp_r27, 24 + arg1->unk58, 0); @@ -1177,20 +1220,25 @@ void fn_1_1DD74(s32 arg0, StructBss8_24* arg1) { if (var_r26 == 0 || var_r25 == 0) { if (var_r30 + var_r26 > 3 || var_r30 + var_r26 < 0) { var_r30 = temp_r23; - } else { + } + else { var_r30 += var_r26; } if (var_r29 + var_r25 > 1 || var_r29 + var_r25 < 0) { var_r29 = temp_r22; - } else { + } + else { var_r29 += var_r25; } - } else { + } + else { if (var_r30 + var_r26 <= 3 && var_r30 + var_r26 >= 0) { var_r30 += var_r26; - } else if (var_r29 + var_r25 <= 1 && var_r29 + var_r25 >= 0) { + } + else if (var_r29 + var_r25 <= 1 && var_r29 + var_r25 >= 0) { var_r29 += var_r25; - } else { + } + else { var_r30 = temp_r23; var_r29 = temp_r22; } @@ -1214,7 +1262,8 @@ void fn_1_1DD74(s32 arg0, StructBss8_24* arg1) { } } -void fn_1_1E608(StructBss8_24* arg0) { +void fn_1_1E608(StructBss8_24 *arg0) +{ s32 temp_r30; s32 i; @@ -1249,7 +1298,8 @@ void fn_1_1E608(StructBss8_24* arg0) { HuSprAttrSet(temp_r30, 49 + arg0->unk58, HUSPR_ATTR_DISPOFF); } -void fn_1_1EB20(StructBss8_24* arg0) { +void fn_1_1EB20(StructBss8_24 *arg0) +{ s32 temp_r30; temp_r30 = lbl_1_bss_2050.unk30; @@ -1261,7 +1311,8 @@ void fn_1_1EB20(StructBss8_24* arg0) { HuSprAttrSet(temp_r30, 49 + arg0->unk58, HUSPR_ATTR_DISPOFF); } -void fn_1_1EBE8(void) { +void fn_1_1EBE8(void) +{ s32 temp_r30; s32 i; @@ -1273,7 +1324,8 @@ void fn_1_1EBE8(void) { } } -void fn_1_1ED20(void) { +void fn_1_1ED20(void) +{ s32 temp_r30; s32 i; @@ -1285,7 +1337,8 @@ void fn_1_1ED20(void) { } } -void fn_1_1EE58(s32 arg0, UnkFunc1EE58Struct* arg1) { +void fn_1_1EE58(s32 arg0, UnkFunc1EE58Struct *arg1) +{ float var_f31; float var_f30; s32 temp_r29; @@ -1304,7 +1357,8 @@ void fn_1_1EE58(s32 arg0, UnkFunc1EE58Struct* arg1) { if (arg1->unk1C > 2) { arg1->unk1C = 0; } - } else if (HuPadStkX[lbl_1_bss_1E10->unk6C] <= -5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 1)) { + } + else if (HuPadStkX[lbl_1_bss_1E10->unk6C] <= -5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 1)) { var_r28 = -1; arg1->unk1C--; if (arg1->unk1C < 0) { @@ -1319,14 +1373,16 @@ void fn_1_1EE58(s32 arg0, UnkFunc1EE58Struct* arg1) { if (i <= 5) { var_f31 = fn_1_24204(0.0f, 10.0f, i, 5.0f); var_f30 = fn_1_24204(1.0f, 0.0f, i, 5.0f); - } else { + } + else { var_f31 = fn_1_24204(10.0f, 0.0f, i - 5, 5.0f); var_f30 = fn_1_24204(0.0f, 1.0f, i - 5, 5.0f); } if (var_r28 == 1) { HuSprPosSet(temp_r29, 55, lbl_1_data_3CC[4] + var_f31, lbl_1_data_3CC[2]); HuSprPosSet(temp_r29, 56, 380.0f + var_f31, lbl_1_data_3CC[2]); - } else { + } + else { HuSprPosSet(temp_r29, 54, lbl_1_data_3CC[3] - var_f31, lbl_1_data_3CC[2]); HuSprPosSet(temp_r29, 56, 380.0f - var_f31, lbl_1_data_3CC[2]); } @@ -1339,7 +1395,8 @@ void fn_1_1EE58(s32 arg0, UnkFunc1EE58Struct* arg1) { lbl_1_bss_2050.unk1C[3] = 0; } -void fn_1_1F32C(omObjData* arg0) { +void fn_1_1F32C(omObjData *arg0) +{ float var_f31; float var_f30; s32 temp_r29; @@ -1354,7 +1411,8 @@ void fn_1_1F32C(omObjData* arg0) { var_r28 = lbl_1_bss_2050.unk1C[0] - var_r27; if (var_r28 > 3) { var_r28 = 0; - } else if (var_r28 < 0) { + } + else if (var_r28 < 0) { var_r28 = 3; } if (HuPadStkX[lbl_1_bss_1E10->unk6C] >= 5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 2)) { @@ -1365,7 +1423,8 @@ void fn_1_1F32C(omObjData* arg0) { if (lbl_1_bss_2050.unk1C[0] > 3) { lbl_1_bss_2050.unk1C[0] = 1; } - } else if (HuPadStkX[lbl_1_bss_1E10->unk6C] <= -5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 1)) { + } + else if (HuPadStkX[lbl_1_bss_1E10->unk6C] <= -5 || (HuPadBtn[lbl_1_bss_1E10->unk6C] & 1)) { var_r27 = -1; lbl_1_bss_2050.unk1C[3] = 1; HuAudFXPlay(0); @@ -1380,28 +1439,33 @@ void fn_1_1F32C(omObjData* arg0) { if (i <= 5) { var_f31 = fn_1_24204(0.0f, 10.0f, i, 5.0f); var_f30 = fn_1_24204(1.0f, 0.0f, i, 5.0f); - } else { + } + else { var_f31 = fn_1_24204(10.0f, 0.0f, i - 5, 5.0f); var_f30 = fn_1_24204(0.0f, 1.0f, i - 5, 5.0f); } if (var_r27 == 1) { HuSprPosSet(temp_r29, 55, lbl_1_data_3CC[1] + var_f31, lbl_1_data_3CC[2]); - } else { + } + else { HuSprPosSet(temp_r29, 54, lbl_1_data_3CC[0] - var_f31, lbl_1_data_3CC[2]); } if (lbl_1_bss_2050.unk1C[0] != 0) { var_f30 = fn_1_24204(0.0f, 1.0f, i, 10.0f); - } else { + } + else { var_f30 = fn_1_24204(1.0f, 0.0f, i, 10.0f); } HuSprScaleSet(temp_r29, 85, var_f30, var_f30); for (j = 0; j < 4; j++) { - var_f31 = fn_1_24204(lbl_1_data_448[lbl_1_bss_1E10[j].unk58][var_r28], lbl_1_data_448[lbl_1_bss_1E10[j].unk58][lbl_1_bss_2050.unk1C[0]], i, 10.0f); + var_f31 = fn_1_24204( + lbl_1_data_448[lbl_1_bss_1E10[j].unk58][var_r28], lbl_1_data_448[lbl_1_bss_1E10[j].unk58][lbl_1_bss_2050.unk1C[0]], i, 10.0f); HuSprPosSet(temp_r29, 57 + lbl_1_bss_1E10[j].unk68, var_f31, lbl_1_data_3CC[2]); HuSprPosSet(temp_r29, 65 + j, var_f31 + 1.0f, lbl_1_data_3CC[2] + 2); if (lbl_1_bss_1E10[j].unk60 != 0) { HuSprPosSet(temp_r29, 77 + j, var_f31, lbl_1_data_3CC[2] + 21); - } else { + } + else { HuSprPosSet(temp_r29, 73 + j, var_f31 - 8.0f, lbl_1_data_3CC[2] - 21); } } @@ -1410,7 +1474,8 @@ void fn_1_1F32C(omObjData* arg0) { lbl_1_bss_2050.unk1C[3] = 0; } -void fn_1_1FABC(void) { +void fn_1_1FABC(void) +{ s32 temp_r30; s32 i; @@ -1428,7 +1493,8 @@ void fn_1_1FABC(void) { } } -void fn_1_1FC44(s32 arg0) { +void fn_1_1FC44(s32 arg0) +{ float var_f31; float var_f30; s32 temp_r30; @@ -1448,7 +1514,8 @@ void fn_1_1FC44(s32 arg0) { HuSprPosSet(temp_r30, 57 + lbl_1_bss_1E10[i].unk68, lbl_1_data_3E4[lbl_1_bss_1E10[i].unk58][0], lbl_1_data_3CC[2]); if (arg0 == 0) { HuSprScaleSet(temp_r30, 57 + lbl_1_bss_1E10[i].unk68, 0.0f, 1.0f); - } else { + } + else { HuSprScaleSet(temp_r30, 57 + lbl_1_bss_1E10[i].unk68, 1.0f, 1.0f); } if (lbl_1_bss_1E10[i].unk60 != 0) { @@ -1457,16 +1524,19 @@ void fn_1_1FC44(s32 arg0) { HuSprPosSet(temp_r30, 77 + i, lbl_1_data_3E4[lbl_1_bss_1E10[i].unk58][0], lbl_1_data_3CC[2] + 21); if (arg0 == 0) { HuSprScaleSet(temp_r30, 77 + i, 0.0f, 1.0f); - } else { + } + else { HuSprScaleSet(temp_r30, 77 + i, 1.0f, 1.0f); } - } else { + } + else { HuSprAttrReset(temp_r30, 73 + i, HUSPR_ATTR_DISPOFF); HuSprBankSet(temp_r30, 73 + i, lbl_1_bss_1E10[i].unk58); HuSprPosSet(temp_r30, 73 + i, lbl_1_data_3E4[lbl_1_bss_1E10[i].unk58][0] - 8.0f, lbl_1_data_3CC[2] - 21); if (arg0 == 0) { HuSprScaleSet(temp_r30, 73 + i, 0.0f, 1.0f); - } else { + } + else { HuSprScaleSet(temp_r30, 73 + i, 1.0f, 1.0f); } } @@ -1477,14 +1547,16 @@ void fn_1_1FC44(s32 arg0) { if (arg0 == 0) { lbl_1_bss_2050.unk1C[0] = 1; var_r27 = 0; - } else { + } + else { var_r27 = lbl_1_bss_2050.unk1C[0]; lbl_1_bss_2050.unk1C[0] = 0; } for (i = 0; i <= 10; i++) { if (i <= 5) { var_f31 = fn_1_24204(1.0f, 0.0f, i, 5.0f); - } else { + } + else { var_f31 = fn_1_24204(0.0f, 1.0f, i - 5, 5.0f); } for (j = 0; j < 4; j++) { @@ -1493,24 +1565,29 @@ void fn_1_1FC44(s32 arg0) { HuSprScaleSet(temp_r30, 57 + lbl_1_bss_1E10[j].unk68, var_f31, 1.0f); if (lbl_1_bss_1E10[j].unk60 != 0) { HuSprScaleSet(temp_r30, 77 + j, var_f31, 1.0f); - } else { + } + else { HuSprScaleSet(temp_r30, 73 + j, var_f31, 1.0f); } - } else { + } + else { HuSprScaleSet(temp_r30, 81 + j, var_f31, 1.0f); } - var_f30 = fn_1_24204(lbl_1_data_448[lbl_1_bss_1E10[j].unk58][var_r27], lbl_1_data_448[lbl_1_bss_1E10[j].unk58][lbl_1_bss_2050.unk1C[0]], i, 10.0f); + var_f30 = fn_1_24204( + lbl_1_data_448[lbl_1_bss_1E10[j].unk58][var_r27], lbl_1_data_448[lbl_1_bss_1E10[j].unk58][lbl_1_bss_2050.unk1C[0]], i, 10.0f); HuSprPosSet(temp_r30, 57 + lbl_1_bss_1E10[j].unk68, var_f30, lbl_1_data_3CC[2]); HuSprPosSet(temp_r30, 65 + j, var_f30 + 1.0f, lbl_1_data_3CC[2] + 2); if (lbl_1_bss_1E10[j].unk60 != 0) { HuSprPosSet(temp_r30, 77 + j, var_f30, lbl_1_data_3CC[2] + 21); - } else { + } + else { HuSprPosSet(temp_r30, 73 + j, var_f30 - 8.0f, lbl_1_data_3CC[2] - 21); } } if (lbl_1_bss_2050.unk1C[0] != 0) { var_f31 = fn_1_24204(0.0f, 1.0f, i, 10.0f); - } else { + } + else { var_f31 = fn_1_24204(1.0f, 0.0f, i, 10.0f); } HuSprScaleSet(temp_r30, 85, var_f31, var_f31); @@ -1522,18 +1599,21 @@ void fn_1_1FC44(s32 arg0) { for (i = 0; i < 2; i++) { HuSprAttrReset(temp_r30, 54 + i, HUSPR_ATTR_DISPOFF); } - } else { + } + else { for (i = 0; i < 2; i++) { HuSprAttrSet(temp_r30, 54 + i, HUSPR_ATTR_DISPOFF); } } } -void fn_1_20728(void) { +void fn_1_20728(void) +{ fn_1_1A6A0(); } -s32 fn_1_20970(void) { +s32 fn_1_20970(void) +{ s32 var_r23; s32 temp_r26; s32 temp_r28; @@ -1556,7 +1636,7 @@ s32 fn_1_20970(void) { HuSprPosSet(temp_r28, 8, lbl_1_data_32C[0][0] - 50, lbl_1_data_32C[0][1]); HuSprAttrReset(temp_r28, 9, HUSPR_ATTR_DISPOFF); HuSprPosSet(temp_r28, 9, lbl_1_data_32C[3][0] + 50, lbl_1_data_32C[0][1]); - lbl_1_bss_2050.unk04 = (void*) fn_1_19F5C; + lbl_1_bss_2050.unk04 = (void *)fn_1_19F5C; var_r24 = 99; var_r23 = 0; while (TRUE) { @@ -1590,13 +1670,15 @@ s32 fn_1_20970(void) { if (HuPadStatGet(i) != -1) { var_r30++; lbl_1_bss_1E10[i].unk60 = 0; - } else { + } + else { lbl_1_bss_1E10[i].unk60 = 1; } } } break; - } else if (HuPadBtnDown[lbl_1_bss_1E10->unk6C] & 0x200) { + } + else if (HuPadBtnDown[lbl_1_bss_1E10->unk6C] & 0x200) { var_r29 = -99; HuAudFXPlay(3); break; @@ -1619,14 +1701,16 @@ s32 fn_1_20970(void) { } if (var_r30 == 0) { var_r29 = 2; - } else { + } + else { var_r29 = 1; } } return var_r29; } -void fn_1_20E84(s32 arg0) { +void fn_1_20E84(s32 arg0) +{ float var_f31; s32 sp10; s32 spC; @@ -1640,7 +1724,8 @@ void fn_1_20E84(s32 arg0) { fn_1_243B0(); if (i <= 10) { var_f31 = fn_1_24204(2.06f, 10.0f, i, 10.0f); - } else { + } + else { var_f31 = fn_1_2412C(10.0f, -500.0f, i - 10, 50.0f); } HuSprGrpPosSet(temp_r30, 0.0f, var_f31); @@ -1650,11 +1735,13 @@ void fn_1_20E84(s32 arg0) { fn_1_1B260(arg0); } -void fn_1_20FD4(s32 arg0) { - fn_1_1BCEC(); +void fn_1_20FD4(s32 arg0) +{ + fn_1_1BCEC(); } -s32 fn_1_211B4(void) { +s32 fn_1_211B4(void) +{ s32 var_r27; s32 sp8; s32 var_r29; @@ -1674,7 +1761,7 @@ s32 fn_1_211B4(void) { fn_1_25CA8(MAKE_MESSID(26, 32)); for (i = 0; i < 4; i++) { if (lbl_1_bss_1E10[i].unk60 == 0) { - lbl_1_bss_1E10[i].unk4 = (void*) fn_1_1CEB0; + lbl_1_bss_1E10[i].unk4 = (void *)fn_1_1CEB0; } } while (TRUE) { @@ -1688,7 +1775,8 @@ s32 fn_1_211B4(void) { HuAudFXPlay(3); var_r30 = 0; break; - } else { + } + else { for (i = 0; i < 4; i++) { if (lbl_1_bss_1E10[i].unk60 == 0 && lbl_1_bss_1E10[i].unk70[0] != 1) { break; @@ -1715,16 +1803,19 @@ s32 fn_1_211B4(void) { } if (var_r29 == 0) { var_r30 = 3; - } else { + } + else { var_r30 = 2; } - } else { + } + else { var_r30 = 0; } return var_r30; } -s32 fn_1_214A4(void) { +s32 fn_1_214A4(void) +{ s32 var_r30; s32 var_r24; s32 var_r23; @@ -1764,7 +1855,7 @@ s32 fn_1_214A4(void) { var_r30 = i; lbl_1_bss_1E10[i].unk70[1] = var_r24; fn_1_1E608(&lbl_1_bss_1E10[i]); - lbl_1_bss_1E10[i].unk4 = (void*) fn_1_1DD74; + lbl_1_bss_1E10[i].unk4 = (void *)fn_1_1DD74; break; } } @@ -1775,11 +1866,13 @@ s32 fn_1_214A4(void) { if (var_r24 == -1) { var_r29 = 0; break; - } else { + } + else { var_r29 = 1; break; } - } else if (lbl_1_bss_1E10[var_r30].unk70[0] == 1) { + } + else if (lbl_1_bss_1E10[var_r30].unk70[0] == 1) { for (i = 0; i < 4; i++) { if (lbl_1_bss_1E10[i].unk70[0] == 0) { lbl_1_bss_1E10[i].unk68 = 0; @@ -1793,7 +1886,8 @@ s32 fn_1_214A4(void) { lbl_1_bss_1E10[var_r30].unk70[2] = 1; var_r29 = 4; var_r24 = var_r30; - } else { + } + else { lbl_1_bss_1E10[var_r30].unk70[2] = 0; var_r29 = 4; lbl_1_bss_1E10[var_r30].unk70[0] = 0; @@ -1814,14 +1908,16 @@ s32 fn_1_214A4(void) { if (i == 4) { var_r29 = 3; break; - } else { + } + else { if (var_r29 == 1) { fn_1_1E608(&lbl_1_bss_1E10[var_r30]); fn_1_1EB20(&lbl_1_bss_1E10[var_r30]); fn_1_1E608(&lbl_1_bss_1E10[lbl_1_bss_1E10[var_r30].unk70[1]]); var_r24 = lbl_1_bss_1E10[lbl_1_bss_1E10[var_r30].unk70[1]].unk70[1]; lbl_1_bss_1E10[lbl_1_bss_1E10[var_r30].unk70[1]].unk70[0] = 0; - } else if (var_r29 != 4) { + } + else if (var_r29 != 4) { if (var_r29 == 0) { fn_1_1EB20(&lbl_1_bss_1E10[var_r30]); } @@ -1841,14 +1937,16 @@ s32 fn_1_214A4(void) { } if (var_r28 != 0) { var_r29 = 1; - } else { + } + else { var_r29 = 0; } } return var_r29; } -s32 fn_1_21CA4(void) { +s32 fn_1_21CA4(void) +{ s32 sp8; s32 temp_r27; s32 var_r22; @@ -1864,7 +1962,7 @@ s32 fn_1_21CA4(void) { fn_1_243B0(); fn_1_25CA8(MAKE_MESSID(26, 33)); fn_1_1EBE8(); - lbl_1_bss_2050.unk04 = (void*) fn_1_1EE58; + lbl_1_bss_2050.unk04 = (void *)fn_1_1EE58; var_r22 = 99; while (TRUE) { fn_1_243B0(); @@ -1880,7 +1978,8 @@ s32 fn_1_21CA4(void) { var_r28 = 5; HuAudFXPlay(2); break; - } else if (HuPadBtnDown[lbl_1_bss_1E10->unk6C] & 0x200) { + } + else if (HuPadBtnDown[lbl_1_bss_1E10->unk6C] & 0x200) { var_r28 = -99; HuAudFXPlay(3); for (i = 0; i < 4; i++) { @@ -1909,14 +2008,16 @@ s32 fn_1_21CA4(void) { } if (j == 0) { var_r28 = 1; - } else { + } + else { var_r28 = 2; } } return var_r28; } -s32 fn_1_2228C(s32 arg0) { +s32 fn_1_2228C(s32 arg0) +{ s32 sp8; s32 temp_r30; s32 var_r26; @@ -1932,7 +2033,7 @@ s32 fn_1_2228C(s32 arg0) { fn_1_243B0(); fn_1_25CA8(MAKE_MESSID(26, 33)); fn_1_1FC44(0); - lbl_1_bss_2050.unk04 = (void*) fn_1_1F32C; + lbl_1_bss_2050.unk04 = (void *)fn_1_1F32C; var_r26 = 99; while (TRUE) { fn_1_243B0(); @@ -1964,7 +2065,8 @@ s32 fn_1_2228C(s32 arg0) { var_r27 = 5; HuAudFXPlay(2); break; - } else if (HuPadBtnDown[lbl_1_bss_1E10->unk6C] & 0x200) { + } + else if (HuPadBtnDown[lbl_1_bss_1E10->unk6C] & 0x200) { var_r27 = -99; HuAudFXPlay(3); fn_1_1FC44(1); @@ -1993,14 +2095,16 @@ s32 fn_1_2228C(s32 arg0) { } if (j == 0) { var_r27 = 1; - } else { + } + else { var_r27 = 2; } } return var_r27; } -void fn_1_22728(void) { +void fn_1_22728(void) +{ s32 i; s32 j; @@ -2019,7 +2123,8 @@ void fn_1_22728(void) { } } -void fn_1_22C08(omObjData* arg0) { +void fn_1_22C08(omObjData *arg0) +{ float var_f31; s32 i; @@ -2033,7 +2138,8 @@ void fn_1_22C08(omObjData* arg0) { } var_f31 = fn_1_2412C(lbl_1_bss_3CC[i].unk10, 1000.0f, lbl_1_bss_3CC[i].unk00++, lbl_1_bss_3CC[i].unk04); Hu3DData[arg0->model[i]].pos.y = fn_1_2410C(Hu3DData[arg0->model[i]].pos.y, var_f31, 30.0f); - Hu3DData[arg0->model[i]].pos.x = fn_1_2410C(Hu3DData[arg0->model[i]].pos.x, lbl_1_bss_3CC[i].unk18 + Hu3DData[arg0->model[i]].pos.x, 5.0f); + Hu3DData[arg0->model[i]].pos.x + = fn_1_2410C(Hu3DData[arg0->model[i]].pos.x, lbl_1_bss_3CC[i].unk18 + Hu3DData[arg0->model[i]].pos.x, 5.0f); } } for (i = 10; i < 140; i++) { @@ -2043,10 +2149,12 @@ void fn_1_22C08(omObjData* arg0) { } } for (i = 10; i < 140; i++) { - if (0.0f == lbl_1_bss_3CC[i].unk24 && lbl_1_bss_3CC[i].unk14 > CZoom - 400.0f && lbl_1_bss_3CC[i].unk0C < 200.0f && lbl_1_bss_3CC[i].unk0C > -200.0f) { + if (0.0f == lbl_1_bss_3CC[i].unk24 && lbl_1_bss_3CC[i].unk14 > CZoom - 400.0f && lbl_1_bss_3CC[i].unk0C < 200.0f + && lbl_1_bss_3CC[i].unk0C > -200.0f) { if (0.0f >= lbl_1_bss_3CC[i].unk0C) { lbl_1_bss_3CC[i].unk24 = -300.0f; - } else { + } + else { lbl_1_bss_3CC[i].unk24 = 300.0f; } } @@ -2056,12 +2164,13 @@ void fn_1_22C08(omObjData* arg0) { } if (arg0->work[0] == 1) { for (i = 10; i < 140; i++) { - Hu3DModelAttrSet(arg0->model[i], 1); + Hu3DModelAttrSet(arg0->model[i], HU3D_ATTR_DISPOFF); } } } -void fn_1_231F0(omObjData* arg0) { +void fn_1_231F0(omObjData *arg0) +{ float temp_f31; float temp_f30; float temp_f29; @@ -2137,13 +2246,15 @@ void fn_1_231F0(omObjData* arg0) { lbl_1_bss_3CC[i].unk14 = lbl_1_bss_3CC[i].unk20 = Hu3DData[arg0->model[i]].pos.z; if (rand8() % 2 == 0) { lbl_1_bss_3CC[i].unk18 += rand8() % 30; - } else { + } + else { lbl_1_bss_3CC[i].unk18 -= rand8() % 30; } lbl_1_bss_3CC[i].unk1C += rand8() % 30 + 10; if (rand8() % 2 == 0) { lbl_1_bss_3CC[i].unk20 += rand8() % 30; - } else { + } + else { lbl_1_bss_3CC[i].unk20 -= rand8() % 30; } lbl_1_bss_3CC[i].unk24 = lbl_1_bss_3CC[i].unk28 = lbl_1_bss_3CC[i].unk2C = 0.0f; @@ -2151,58 +2262,67 @@ void fn_1_231F0(omObjData* arg0) { lbl_1_bss_3CC[i].unk00 = rand8(); } for (i = 1; i < 140; i++) { - Hu3DModelAttrSet(arg0->model[i], 1); + Hu3DModelAttrSet(arg0->model[i], HU3D_ATTR_DISPOFF); } arg0->func = fn_1_22C08; } -float fn_1_240E4(float arg0, float arg1, float arg2, float arg3) { +float fn_1_240E4(float arg0, float arg1, float arg2, float arg3) +{ if (arg3 <= arg2) { return arg1; } return arg0 + (arg2 / arg3) * (arg1 - arg0); } -float fn_1_2410C(float arg0, float arg1, float arg2) { +float fn_1_2410C(float arg0, float arg1, float arg2) +{ return (arg1 + arg0 * (arg2 - 1.0f)) / arg2; } -float fn_1_2412C(float arg0, float arg1, float arg2, float arg3) { +float fn_1_2412C(float arg0, float arg1, float arg2, float arg3) +{ if (arg2 >= arg3) { return arg1; } return arg0 + (arg1 - arg0) * (1.0 - cosd((90.0f / arg3) * arg2)); } -float fn_1_24204(float arg0, float arg1, float arg2, float arg3) { +float fn_1_24204(float arg0, float arg1, float arg2, float arg3) +{ if (arg2 >= arg3) { return arg1; } return arg0 + (arg1 - arg0) * sind((90.0f / arg3) * arg2); } -float fn_1_242CC(float arg0, float arg1, float arg2, float arg3) { +float fn_1_242CC(float arg0, float arg1, float arg2, float arg3) +{ if (arg2 >= arg3) { return arg0; } return arg0 + (arg1 - arg0) * sind((360.0f / arg3) * arg2); } -void fn_1_24388(s32 arg0) { +void fn_1_24388(s32 arg0) +{ HuPrcSleep(arg0); } -void fn_1_243B0(void) { +void fn_1_243B0(void) +{ HuPrcVSleep(); } -void fn_1_243D0(void) { +void fn_1_243D0(void) +{ while (TRUE) { HuPrcVSleep(); } } -void fn_1_243E4(void) { +void fn_1_243E4(void) +{ s32 var_r31; var_r31 = 0; @@ -2211,7 +2331,8 @@ void fn_1_243E4(void) { Hu3DGLightInfinitytSet(var_r31); } -void fn_1_244C0(s32 arg0) { +void fn_1_244C0(s32 arg0) +{ Vec sp24 = { 0.0f, 3000.0f, 800.0f }; Vec sp18 = { 0.0f, 0.0f, 640.0f }; Vec spC = { 0.0f, 1.0f, 0.0f }; @@ -2224,12 +2345,14 @@ void fn_1_244C0(s32 arg0) { Hu3DShadowPosSet(&sp24, &spC, &sp18); } -void fn_1_245A8(void) { +void fn_1_245A8(void) +{ HuWinInit(1); } -void fn_1_245CC(s32 arg0, float arg1, float arg2, s32 arg3) { - WindowData* temp_r29; +void fn_1_245CC(s32 arg0, float arg1, float arg2, s32 arg3) +{ + WindowData *temp_r29; float temp_f29; float temp_f28; float temp_f25; @@ -2253,10 +2376,12 @@ void fn_1_245CC(s32 arg0, float arg1, float arg2, s32 arg3) { temp_f27 = 4.0f / temp_f25; if (var_f31 + 4.0f - (temp_f29 + temp_f25) >= 0.0f) { var_f31 = temp_f29 + temp_f25 - 4.0f; - } else { + } + else { if (temp_f29 - (var_f31 - 2.0f) >= 0.0f) { var_f31 = temp_f29; - } else { + } + else { var_f31 = var_f31 - 2.0f; } } @@ -2264,10 +2389,12 @@ void fn_1_245CC(s32 arg0, float arg1, float arg2, s32 arg3) { temp_f26 = 4.0f / temp_f24; if (var_f30 + 4.0f - (temp_f28 + temp_f24) >= 0.0f) { var_f30 = temp_f28 + temp_f24 - 4.0f; - } else { + } + else { if (temp_f28 - (var_f30 - 2.0f) >= 0.0f) { var_f30 = temp_f28; - } else { + } + else { var_f30 = var_f30 - 2.0f; } } @@ -2278,7 +2405,8 @@ void fn_1_245CC(s32 arg0, float arg1, float arg2, s32 arg3) { var_f21 = temp_f27; var_f22 = var_f30; var_f20 = temp_f26; - } else { + } + else { HuWinPosSet(arg0, temp_f29, temp_f28); HuWinScaleSet(arg0, 1.0f, 1.0f); var_f23 = temp_f29; @@ -2293,15 +2421,18 @@ void fn_1_245CC(s32 arg0, float arg1, float arg2, s32 arg3) { if (i <= 10) { var_f23 = fn_1_24204(var_f31, temp_f29, i, 10.0f); var_f21 = fn_1_24204(temp_f27, 1.0f, i, 10.0f); - } else { + } + else { var_f22 = fn_1_24204(var_f30, temp_f28, i - 10, 5.0f); var_f20 = fn_1_24204(temp_f26, 1.0f, i - 10, 5.0f); } - } else { + } + else { if (i <= 10) { var_f22 = fn_1_24204(temp_f28, var_f30, i, 10.0f); var_f20 = fn_1_24204(1.0f, temp_f26, i, 10.0f); - } else { + } + else { var_f23 = fn_1_24204(temp_f29, var_f31, i - 10, 5.0f); var_f21 = fn_1_24204(1.0f, temp_f27, i - 10, 5.0f); } @@ -2312,14 +2443,16 @@ void fn_1_245CC(s32 arg0, float arg1, float arg2, s32 arg3) { if (arg3 != 0) { HuWinPosSet(arg0, temp_f29, temp_f28); HuWinScaleSet(arg0, 1.0f, 1.0f); - } else { + } + else { HuWinPosSet(arg0, var_f31, var_f30); HuWinScaleSet(arg0, temp_f27, temp_f26); } HuPrcVSleep(); } -s32 fn_1_25014(s32 arg0, s32 arg1, s32 arg2, s32 arg3, float arg4, float arg5, s32 arg6, s32 arg7, s32 arg8) { +s32 fn_1_25014(s32 arg0, s32 arg1, s32 arg2, s32 arg3, float arg4, float arg5, s32 arg6, s32 arg7, s32 arg8) +{ float sp14[2]; s32 temp_r30; @@ -2338,7 +2471,8 @@ s32 fn_1_25014(s32 arg0, s32 arg1, s32 arg2, s32 arg3, float arg4, float arg5, s arg0 = 556.0f - arg2; break; } - } else { + } + else { HuWinMesMaxSizeGet(1, sp14, arg8); arg2 = sp14[0]; arg3 = sp14[1]; @@ -2355,22 +2489,26 @@ s32 fn_1_25014(s32 arg0, s32 arg1, s32 arg2, s32 arg3, float arg4, float arg5, s return temp_r30; } -s32 fn_1_2530C(s32 arg0, s32 arg1, s32 arg2) { +s32 fn_1_2530C(s32 arg0, s32 arg1, s32 arg2) +{ return fn_1_25014(arg0, 0, 21, 2, 0.5f, 0.5f, 0, 0, 0); } -void fn_1_25524(s32 arg0, float arg1, float arg2) { +void fn_1_25524(s32 arg0, float arg1, float arg2) +{ HuWinMesSet(arg0, MAKE_MESSID(37, 4)); HuPrcVSleep(); fn_1_245CC(arg0, arg1, arg2, 0); HuWinExCleanup(arg0); } -void fn_1_25584(s32 arg0) { +void fn_1_25584(s32 arg0) +{ fn_1_25524(arg0, 0.5f, 0.5f); } -void fn_1_255EC(s32 arg0, s32 arg1) { +void fn_1_255EC(s32 arg0, s32 arg1) +{ if (arg1 == -999 || arg1 == 0) { return; } @@ -2389,7 +2527,8 @@ void fn_1_255EC(s32 arg0, s32 arg1) { HuWinComKeyReset(); } -void fn_1_2567C(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { +void fn_1_2567C(s32 arg0, s32 arg1, s32 arg2, s32 arg3) +{ s32 i; s32 temp_r28; s32 var_r30; @@ -2415,13 +2554,15 @@ void fn_1_2567C(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { if (var_r30 != 0) { if (var_r30 == 1 && HuWinStatGet(arg0) != 1) { var_r30 = 2; - } else if (var_r30 == 2) { + } + else if (var_r30 == 2) { HuPrcSleep(arg3); HuWinAttrReset(arg0, 0x400); HuWinKeyWaitEntry(arg0); break; } - } else if (HuWinStatGet(arg0) != 1) { + } + else if (HuWinStatGet(arg0) != 1) { break; } } @@ -2430,7 +2571,8 @@ void fn_1_2567C(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { HuWinComKeyReset(); } -s32 fn_1_257B0(s32 arg0) { +s32 fn_1_257B0(s32 arg0) +{ s32 temp_r31; HuWinComKeyReset(); @@ -2439,25 +2581,30 @@ s32 fn_1_257B0(s32 arg0) { return temp_r31; } -void fn_1_257F8(s32 arg0, s32 arg1, s32 arg2) { +void fn_1_257F8(s32 arg0, s32 arg1, s32 arg2) +{ HuWinInsertMesSet(arg0, arg1, arg2); } -void fn_1_25838(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { +void fn_1_25838(s32 arg0, s32 arg1, s32 arg2, s32 arg3) +{ if (arg3 == -999) { HuWinMesSpeedSet(arg0, 0); - } else { + } + else { HuWinMesSpeedSet(arg0, 1); } HuWinMesSet(arg0, arg1); if (arg2 == -1) { fn_1_255EC(arg0, arg3); - } else { + } + else { fn_1_2567C(arg0, arg1, arg2, arg3); } } -s32 fn_1_2592C(s32 arg0, s32 arg1, s32 arg2) { +s32 fn_1_2592C(s32 arg0, s32 arg1, s32 arg2) +{ s32 var_r25; s32 temp_r27; @@ -2469,7 +2616,8 @@ s32 fn_1_2592C(s32 arg0, s32 arg1, s32 arg2) { return var_r25; } -s32 fn_1_25CA8(s32 arg0) { +s32 fn_1_25CA8(s32 arg0) +{ float sp8[2]; float temp_f31; float temp_f30; @@ -2484,7 +2632,8 @@ s32 fn_1_25CA8(s32 arg0) { temp_f28 = 385.0f - temp_f30; if (lbl_1_data_488 == -1) { var_r31 = lbl_1_data_488 = HuWinExCreateStyled(temp_f29, temp_f28, temp_f31, temp_f30, -1, 1); - } else { + } + else { fn_1_25E74(lbl_1_data_488); var_r31 = lbl_1_data_488 = HuWinExCreateStyled(temp_f29, temp_f28, temp_f31, temp_f30, -1, 1); } @@ -2495,14 +2644,16 @@ s32 fn_1_25CA8(s32 arg0) { return lbl_1_data_488; } -void fn_1_25E74(s32 arg0) { +void fn_1_25E74(s32 arg0) +{ if (lbl_1_data_488 != -1) { HuWinExCleanup(lbl_1_data_488); lbl_1_data_488 = -1; } } -void fn_1_25EC8(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { +void fn_1_25EC8(s32 arg0, s32 arg1, s32 arg2, s32 arg3) +{ switch (arg3) { case 0: Hu3DMotionShiftSet(arg0, arg1, 0.0f, arg2, HU3D_MOTATTR_NONE); @@ -2516,7 +2667,8 @@ void fn_1_25EC8(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { } } -void fn_1_26004(s32 arg0, Vec arg1, float arg2, float arg3, float arg4, s32 arg5, s32 arg6) { +void fn_1_26004(s32 arg0, Vec arg1, float arg2, float arg3, float arg4, s32 arg5, s32 arg6) +{ Vec sp4C; Vec sp40; Vec sp34; @@ -2543,12 +2695,14 @@ void fn_1_26004(s32 arg0, Vec arg1, float arg2, float arg3, float arg4, s32 arg5 sp10.z = 0.0f; if (sp34.x - sp40.x >= 0.0f) { var_r30 = 1; - } else { + } + else { var_r30 = 0; } if (sp34.z - sp40.z >= 0.0f) { var_r29 = 1; - } else { + } + else { var_r29 = 0; } while (arg5 != 0) { @@ -2556,7 +2710,8 @@ void fn_1_26004(s32 arg0, Vec arg1, float arg2, float arg3, float arg4, s32 arg5 sp28.y = -(atan2d(sp34.z - sp40.z, sp34.x - sp40.x) - 90.0); if (sp28.y < 0.0f) { sp28.y += 360.0f; - } else if (sp28.y >= 360.0f) { + } + else if (sp28.y >= 360.0f) { sp28.y -= 360.0f; } if (arg6 != 0) { @@ -2567,7 +2722,8 @@ void fn_1_26004(s32 arg0, Vec arg1, float arg2, float arg3, float arg4, s32 arg5 if (sp1C.y - sp28.y < -180.0f) { sp1C.y += 360.0f; } - } else { + } + else { if (sp1C.y - sp28.y > 180.0f) { sp1C.y -= 360.0f; } @@ -2583,7 +2739,8 @@ void fn_1_26004(s32 arg0, Vec arg1, float arg2, float arg3, float arg4, s32 arg5 sp4C.x = sp40.x = sp34.x; var_r30 = 2; } - } else if (var_r30 == 0) { + } + else if (var_r30 == 0) { if (sp40.x <= sp34.x) { sp4C.x = sp40.x = sp34.x; var_r30 = 2; @@ -2594,7 +2751,8 @@ void fn_1_26004(s32 arg0, Vec arg1, float arg2, float arg3, float arg4, s32 arg5 sp4C.z = sp40.z = sp34.z; var_r29 = 2; } - } else if (var_r29 == 0) { + } + else if (var_r29 == 0) { if (sp40.z <= sp34.z) { sp4C.z = sp40.z = sp34.z; var_r29 = 2; @@ -2620,7 +2778,8 @@ void fn_1_26004(s32 arg0, Vec arg1, float arg2, float arg3, float arg4, s32 arg5 if (sp1C.y - sp10.y < -180.0f) { sp1C.y += 360.0f; } - } else { + } + else { if (sp1C.y - sp10.y > 180.0f) { sp1C.y -= 360.0f; } @@ -2634,6 +2793,7 @@ void fn_1_26004(s32 arg0, Vec arg1, float arg2, float arg3, float arg4, s32 arg5 } } -void fn_1_26790(s32 arg0, s32 arg1, float arg2, float arg3) { +void fn_1_26790(s32 arg0, s32 arg1, float arg2, float arg3) +{ HuSprPosSet(arg0, arg1, arg2, arg3 + 0.5f); } diff --git a/src/REL/mgmodedll/mgmode.c b/src/REL/mgmodedll/mgmode.c index 110cbe9b..0d7c22ee 100644 --- a/src/REL/mgmodedll/mgmode.c +++ b/src/REL/mgmodedll/mgmode.c @@ -1,26 +1,20 @@ #include "REL/mgmodedll.h" -#include "game/gamework_data.h" -#include "game/esprite.h" #include "game/audio.h" -#include "game/wipe.h" +#include "game/esprite.h" +#include "game/gamework_data.h" #include "game/saveload.h" +#include "game/wipe.h" -#include "rel_sqrt_consts.h" #include "ext_math.h" +#include "rel_sqrt_consts.h" typedef struct camera_view_params { - Vec rot; - Vec pos; - float zoom; + Vec rot; + Vec pos; + float zoom; } CameraViewParams; -CameraViewParams lbl_1_data_0[1] = { - { - { -5, 0, 0 }, - { 0, 125, 0 }, - 1750 - } -}; +CameraViewParams lbl_1_data_0[1] = { { { -5, 0, 0 }, { 0, 125, 0 }, 1750 } }; omObjData *lbl_1_bss_2DC; Process *lbl_1_bss_2D8; @@ -46,43 +40,43 @@ void fn_1_54F4(void); void ObjectSetup(void) { - s32 glight; - - OSReport("******* MG ObjectSetup *********\n"); - lbl_1_bss_2D8 = omInitObjMan(50, 8192); - lbl_1_bss_28C[0].x = -70; - lbl_1_bss_28C[0].y = 0; - lbl_1_bss_28C[0].z = 0; - lbl_1_bss_274[0].x = 0; - lbl_1_bss_274[0].y = 130; - lbl_1_bss_274[0].z = -186; - lbl_1_bss_26C[0] = 1360; - lbl_1_bss_2C0 = lbl_1_bss_28C[0]; - lbl_1_bss_2B4 = lbl_1_bss_274[0]; - lbl_1_bss_2B0 = lbl_1_bss_26C[0]; - lbl_1_bss_2D0 = 0; - _ClearFlag(0x10000); - _ClearFlag(0x10008); - GWSystem.mg_type = -1; - GWSystem.player_curr = 0; - lbl_1_bss_4 = omovlevtno; - if(lbl_1_bss_4 == 0) { - mgGameStatBackup = GWGameStat; - } - lbl_1_bss_2CE = -1; - mgBoardHostEnableF = 1; - mgPracticeEnableF = 0; - Hu3DCameraCreate(1); - Hu3DCameraPerspectiveSet(1, 42, 20, 15000, 1.2f); - Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); - glight = Hu3DGLightCreate(0, 100, 1000, 0, -0.5, -1, 255, 255, 255); - Hu3DGLightInfinitytSet(glight); - HuPrcChildCreate(fn_1_464, 100, 12288, 0, lbl_1_bss_2D8); - HuPrcChildCreate(fn_1_54F4, 200, 4096, 0, lbl_1_bss_2D8); - lbl_1_bss_2DC = omAddObjEx(lbl_1_bss_2D8, 32730, 0, 0, -1, omOutView); - Hu3DBGColorSet(0, 0, 0); - HuWinInit(1); - fn_1_279FC(0); + s32 glight; + + OSReport("******* MG ObjectSetup *********\n"); + lbl_1_bss_2D8 = omInitObjMan(50, 8192); + lbl_1_bss_28C[0].x = -70; + lbl_1_bss_28C[0].y = 0; + lbl_1_bss_28C[0].z = 0; + lbl_1_bss_274[0].x = 0; + lbl_1_bss_274[0].y = 130; + lbl_1_bss_274[0].z = -186; + lbl_1_bss_26C[0] = 1360; + lbl_1_bss_2C0 = lbl_1_bss_28C[0]; + lbl_1_bss_2B4 = lbl_1_bss_274[0]; + lbl_1_bss_2B0 = lbl_1_bss_26C[0]; + lbl_1_bss_2D0 = 0; + _ClearFlag(0x10000); + _ClearFlag(0x10008); + GWSystem.mg_type = -1; + GWSystem.player_curr = 0; + lbl_1_bss_4 = omovlevtno; + if (lbl_1_bss_4 == 0) { + mgGameStatBackup = GWGameStat; + } + lbl_1_bss_2CE = -1; + mgBoardHostEnableF = 1; + mgPracticeEnableF = 0; + Hu3DCameraCreate(1); + Hu3DCameraPerspectiveSet(1, 42, 20, 15000, 1.2f); + Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); + glight = Hu3DGLightCreate(0, 100, 1000, 0, -0.5, -1, 255, 255, 255); + Hu3DGLightInfinitytSet(glight); + HuPrcChildCreate(fn_1_464, 100, 12288, 0, lbl_1_bss_2D8); + HuPrcChildCreate(fn_1_54F4, 200, 4096, 0, lbl_1_bss_2D8); + lbl_1_bss_2DC = omAddObjEx(lbl_1_bss_2D8, 32730, 0, 0, -1, omOutView); + Hu3DBGColorSet(0, 0, 0); + HuWinInit(1); + fn_1_279FC(0); } void fn_1_52DC(void); @@ -91,44 +85,45 @@ void fn_1_6F8(void); void fn_1_464(void) { - s16 i; - fn_1_52DC(); - if(lbl_1_bss_4 == 0) { - HuAudSStreamPlay(12); - fn_1_19018(); - } else { - HuAudSeqPlay(44); - for(i=0; i<4; i++) { - lbl_1_bss_8.unk24[i].unk68 = GWPlayerCfg[i].character; - lbl_1_bss_8.unk24[i].unk60 = GWPlayerCfg[i].iscom; - lbl_1_bss_8.unk24[i].unk6C = GWPlayerCfg[i].pad_idx; - lbl_1_bss_8.unk24[i].unk64 = GWPlayerCfg[i].diff; - } - CZoom = 1600; - Center.x = Center.z = 0; - Center.y = 215; - CRot.x = 0; - CRot.y = CRot.z = 0; - if(lbl_1_bss_4 == 1 || lbl_1_bss_4 == 2 || lbl_1_bss_4 == 3 || lbl_1_bss_4 == 4) { - Hu3DModelPosSet(lbl_1_bss_2C80[5], 0, 0, 640); - Hu3DMotionSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6]); - Hu3DModelAttrSet(lbl_1_bss_2C80[5], 0x40000001); - HuPrcVSleep(); - } - } - fn_1_6F8(); - fn_1_2592C(0x1E0035, 3, 0); - fn_1_25584(lbl_1_bss_2CE); - while(1) { - HuPrcVSleep(); - } + s16 i; + fn_1_52DC(); + if (lbl_1_bss_4 == 0) { + HuAudSStreamPlay(12); + fn_1_19018(); + } + else { + HuAudSeqPlay(44); + for (i = 0; i < 4; i++) { + lbl_1_bss_8.unk24[i].unk68 = GWPlayerCfg[i].character; + lbl_1_bss_8.unk24[i].unk60 = GWPlayerCfg[i].iscom; + lbl_1_bss_8.unk24[i].unk6C = GWPlayerCfg[i].pad_idx; + lbl_1_bss_8.unk24[i].unk64 = GWPlayerCfg[i].diff; + } + CZoom = 1600; + Center.x = Center.z = 0; + Center.y = 215; + CRot.x = 0; + CRot.y = CRot.z = 0; + if (lbl_1_bss_4 == 1 || lbl_1_bss_4 == 2 || lbl_1_bss_4 == 3 || lbl_1_bss_4 == 4) { + Hu3DModelPosSet(lbl_1_bss_2C80[5], 0, 0, 640); + Hu3DMotionSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6]); + Hu3DModelAttrSet(lbl_1_bss_2C80[5], HU3D_MOTATTR_LOOP); + HuPrcVSleep(); + } + } + fn_1_6F8(); + fn_1_2592C(0x1E0035, 3, 0); + fn_1_25584(lbl_1_bss_2CE); + while (1) { + HuPrcVSleep(); + } } Vec lbl_1_data_40[4] = { - { 108, 190, 0 }, - { 228, 190, 0 }, - { 348, 190, 0 }, - { 468, 190, 0 }, + { 108, 190, 0 }, + { 228, 190, 0 }, + { 348, 190, 0 }, + { 468, 190, 0 }, }; void fn_1_DF0(void); @@ -140,104 +135,106 @@ void fn_1_4ADC(void); void fn_1_6F8(void) { - s16 i; - s16 time; - if(lbl_1_bss_4 == 1 || lbl_1_bss_4 == 2 || lbl_1_bss_4 == 3 || lbl_1_bss_4 == 4) { - lbl_1_bss_2A6 = 0; - goto freeplay; - } - Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000002); - Hu3DMotionTimeSet(lbl_1_bss_2C80[9], 0); - for(time=0; time<=30; time++) { - for(i=0; i<4; i++) { - if(time > i*2 && time < (i*2)+20) { - float weight = (time-(i*2))/20.0; - Vec pos2D = lbl_1_data_40[i]; - Vec pos3D; - pos2D.z = 800; - pos2D.y -= (1.0-sind(weight*90.0f))*300.0; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[i+9], &pos3D); - Hu3DModelAttrReset(lbl_1_bss_2C80[i+9], 1); - } - } - HuPrcVSleep(); - } - while(1) { - if(lbl_1_bss_2CE == -1) { - lbl_1_bss_2CE = fn_1_2530C(0, 0, 0); - } - HuWinPushKeySet(lbl_1_bss_2CE, PAD_BUTTON_A|PAD_BUTTON_B); - HuWinMesSpeedSet(lbl_1_bss_2CE, 1); - HuAudFXPlay(68); - fn_1_25838(lbl_1_bss_2CE, 0x280001, -1, -1); - lbl_1_bss_2CC = fn_1_25CA8(0x280018); - lbl_1_bss_2A6 = 0; - espPosSet(lbl_1_bss_2C2C[0], -20+lbl_1_data_40[lbl_1_bss_2A6].x, -10+lbl_1_data_40[lbl_1_bss_2A6].y); - espAttrReset(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - HuWinMesSpeedSet(lbl_1_bss_2CE, 0); - fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A6+0x280002, -1, -999); - while(1) { - s16 delta = 0; - if((HuPadDStkRep[0] & PAD_BUTTON_LEFT) && lbl_1_bss_2A6 > 0) { - delta = -1; - } else if((HuPadDStkRep[0] & PAD_BUTTON_RIGHT) && lbl_1_bss_2A6 < 3) { - delta = 1; - } - if(delta != 0) { - HuAudFXPlay(0); - lbl_1_bss_2A6 += delta; - espPosSet(lbl_1_bss_2C2C[0], -20+lbl_1_data_40[lbl_1_bss_2A6].x, -10+lbl_1_data_40[lbl_1_bss_2A6].y); - fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A6+0x280002, -1, -999); - } - if(HuPadBtnDown[0] & PAD_BUTTON_A) { - HuAudFXPlay(2); - if(lbl_1_bss_2A6 != 2) { - break; - } - if(fn_1_487C() == 0) { - continue; - } - break; - } - if(HuPadBtnDown[0] & PAD_BUTTON_B) { - s16 choice; - espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - fn_1_25838(lbl_1_bss_2CE, 0x280006, -1, -1); - choice = HuWinChoiceGet(lbl_1_bss_2CE, 1); - if(choice != 0) { - fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A6+0x280002, -1, -999); - espAttrReset(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - continue; - } else { - fn_1_25E74(lbl_1_bss_2CC); - fn_1_25584(lbl_1_bss_2CE); - lbl_1_bss_2D0 = 1; - while(1) { - HuPrcVSleep(); - } - } - } - HuPrcVSleep(); - } - fn_1_25E74(lbl_1_bss_2CC); - lbl_1_bss_4 = 0; - espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - if(lbl_1_bss_2A6 == 0) { - freeplay: - fn_1_DF0(); - } else if(lbl_1_bss_2A6 == 1) { - fn_1_38D8(); - } else if(lbl_1_bss_2A6 == 2) { - fn_1_4010(); - } else if(lbl_1_bss_2A6 == 3) { - fn_1_4ADC(); - } - - } - - + s16 i; + s16 time; + if (lbl_1_bss_4 == 1 || lbl_1_bss_4 == 2 || lbl_1_bss_4 == 3 || lbl_1_bss_4 == 4) { + lbl_1_bss_2A6 = 0; + goto freeplay; + } + Hu3DModelAttrSet(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE); + Hu3DMotionTimeSet(lbl_1_bss_2C80[9], 0); + for (time = 0; time <= 30; time++) { + for (i = 0; i < 4; i++) { + if (time > i * 2 && time < (i * 2) + 20) { + float weight = (time - (i * 2)) / 20.0; + Vec pos2D = lbl_1_data_40[i]; + Vec pos3D; + pos2D.z = 800; + pos2D.y -= (1.0 - sind(weight * 90.0f)) * 300.0; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[i + 9], &pos3D); + Hu3DModelAttrReset(lbl_1_bss_2C80[i + 9], HU3D_ATTR_DISPOFF); + } + } + HuPrcVSleep(); + } + while (1) { + if (lbl_1_bss_2CE == -1) { + lbl_1_bss_2CE = fn_1_2530C(0, 0, 0); + } + HuWinPushKeySet(lbl_1_bss_2CE, PAD_BUTTON_A | PAD_BUTTON_B); + HuWinMesSpeedSet(lbl_1_bss_2CE, 1); + HuAudFXPlay(68); + fn_1_25838(lbl_1_bss_2CE, 0x280001, -1, -1); + lbl_1_bss_2CC = fn_1_25CA8(0x280018); + lbl_1_bss_2A6 = 0; + espPosSet(lbl_1_bss_2C2C[0], -20 + lbl_1_data_40[lbl_1_bss_2A6].x, -10 + lbl_1_data_40[lbl_1_bss_2A6].y); + espAttrReset(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + HuWinMesSpeedSet(lbl_1_bss_2CE, 0); + fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A6 + 0x280002, -1, -999); + while (1) { + s16 delta = 0; + if ((HuPadDStkRep[0] & PAD_BUTTON_LEFT) && lbl_1_bss_2A6 > 0) { + delta = -1; + } + else if ((HuPadDStkRep[0] & PAD_BUTTON_RIGHT) && lbl_1_bss_2A6 < 3) { + delta = 1; + } + if (delta != 0) { + HuAudFXPlay(0); + lbl_1_bss_2A6 += delta; + espPosSet(lbl_1_bss_2C2C[0], -20 + lbl_1_data_40[lbl_1_bss_2A6].x, -10 + lbl_1_data_40[lbl_1_bss_2A6].y); + fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A6 + 0x280002, -1, -999); + } + if (HuPadBtnDown[0] & PAD_BUTTON_A) { + HuAudFXPlay(2); + if (lbl_1_bss_2A6 != 2) { + break; + } + if (fn_1_487C() == 0) { + continue; + } + break; + } + if (HuPadBtnDown[0] & PAD_BUTTON_B) { + s16 choice; + espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + fn_1_25838(lbl_1_bss_2CE, 0x280006, -1, -1); + choice = HuWinChoiceGet(lbl_1_bss_2CE, 1); + if (choice != 0) { + fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A6 + 0x280002, -1, -999); + espAttrReset(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + continue; + } + else { + fn_1_25E74(lbl_1_bss_2CC); + fn_1_25584(lbl_1_bss_2CE); + lbl_1_bss_2D0 = 1; + while (1) { + HuPrcVSleep(); + } + } + } + HuPrcVSleep(); + } + fn_1_25E74(lbl_1_bss_2CC); + lbl_1_bss_4 = 0; + espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + if (lbl_1_bss_2A6 == 0) { + freeplay: + fn_1_DF0(); + } + else if (lbl_1_bss_2A6 == 1) { + fn_1_38D8(); + } + else if (lbl_1_bss_2A6 == 2) { + fn_1_4010(); + } + else if (lbl_1_bss_2A6 == 3) { + fn_1_4ADC(); + } + } } s32 fn_1_1B0C(void); @@ -247,1094 +244,1110 @@ s32 fn_1_3150(void); void fn_1_DF0(void) { - s16 exitF = 0; - s16 time; - s16 i; - ModelData *modelP; - Vec pos2D; - Vec pos3D; - - Vec posModel; - float weight; - - if(lbl_1_bss_4 == 1) { - lbl_1_bss_2A4 = 0; - goto freeplay; - } - if(lbl_1_bss_4 == 2) { - lbl_1_bss_2A4 = 1; - goto teamplay; - } - if(lbl_1_bss_4 == 3) { - lbl_1_bss_2A4 = 2; - goto battle; - } - if(lbl_1_bss_4 == 4) { - lbl_1_bss_2A4 = 3; - goto tictactoe; - } - pos2D.x = 168; - pos2D.y = 190; - pos2D.z = 800; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50; - modelP = &Hu3DData[lbl_1_bss_2C80[9]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - for(time=0; time<=30; time++) { - for(i=1; i<4; i++) { - if(time > i*2 && time < (i*2)+10) { - Vec pos; - weight = (time-(i*2))/10.0; - pos = lbl_1_data_40[i]; - pos.z = 800; - pos.x += (1.0-cosd(weight*90.0f))*500.0; - Hu3D2Dto3D(&pos, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[i+9], &pos3D); - Hu3DModelAttrReset(lbl_1_bss_2C80[i+9], 1); - } - } - if(time > 10) { - weight = (time-10)/20.0; - VECScale(&pos2D, &pos3D, sind(weight*90.0f)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - } - if(time == 20) { - HuAudFXPlay(2173); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006); - } - HuPrcVSleep(); - } - while(Hu3DMotionEndCheck(lbl_1_bss_2C80[9]) == 0) { - HuPrcVSleep(); - } - while(1) { - HuWinMesSpeedSet(lbl_1_bss_2CE, 1); - HuAudFXPlay(68); - fn_1_25838(lbl_1_bss_2CE, 0x280007, -1, -1); - lbl_1_bss_2CC = fn_1_25CA8(0x1A0020); - fn_1_25838(lbl_1_bss_2CE, 0x280008, -1, -999); - espAttrReset(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - lbl_1_bss_2A4 = 0; - espPosSet(lbl_1_bss_2C2C[0], -20+(168.0f+(lbl_1_bss_2A4*80)), 180); - while(1) { - s16 delta = 0; - if((HuPadDStkRep[0] & PAD_BUTTON_LEFT) && lbl_1_bss_2A4 > 0) { - delta = -1; - } else if((HuPadDStkRep[0] & PAD_BUTTON_RIGHT) && lbl_1_bss_2A4 < 3) { - delta = 1; - } - if(delta != 0) { - HuAudFXPlay(0); - lbl_1_bss_2A4 += delta; - espPosSet(lbl_1_bss_2C2C[0], -20+(168.0f+(lbl_1_bss_2A4*80)), 180); - fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A4+0x280008, -1, -999); - } - if(HuPadBtnDown[0] & PAD_BUTTON_A) { - HuAudFXPlay(2); - if(lbl_1_bss_2A4 == 0 && lbl_1_bss_20AC[0] == 0 && lbl_1_bss_20AC[1] == 0 && lbl_1_bss_20AC[2] == 0 && lbl_1_bss_20AC[3] == 0 && lbl_1_bss_20AC[4] == 0) { - fn_1_25838(lbl_1_bss_2CE, 0x280031, -1, -1); - fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A4+0x280008, -1, -999); - continue; - } - if(lbl_1_bss_2A4 == 2 && lbl_1_bss_20AC[0] == 0 && lbl_1_bss_20AC[1] == 0 && lbl_1_bss_20AC[2] == 0 && lbl_1_bss_20AC[4] == 0) { - fn_1_25838(lbl_1_bss_2CE, 0x280033, -1, -1); - fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A4+0x280008, -1, -999); - continue; - } - if((lbl_1_bss_2A4 == 1 || lbl_1_bss_2A4 == 3) && lbl_1_bss_20AC[2] == 0) { - if(lbl_1_bss_2A4 == 1) { - fn_1_25838(lbl_1_bss_2CE, 0x280032, -1, -1); - } else { - fn_1_25838(lbl_1_bss_2CE, 0x28002F, -1, -1); - } - fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A4+0x280008, -1, -999); - continue; - } - break; - } - if(HuPadBtnDown[0] & PAD_BUTTON_B) { - HuAudFXPlay(3); - exitF = 1; - break; - } - HuPrcVSleep(); - } - fn_1_25E74(lbl_1_bss_2CC); - if(exitF != 0) { - break; - } - if(lbl_1_bss_2A4 == 0) { - freeplay: - fn_1_1B0C(); - } else if(lbl_1_bss_2A4 == 1) { - teamplay: - fn_1_21C4(); - } else if(lbl_1_bss_2A4 == 2) { - battle: - fn_1_2940(); - } else if(lbl_1_bss_2A4 == 3) { - tictactoe: - fn_1_3150(); - } - if(lbl_1_bss_2CE == -1) { - lbl_1_bss_2CE = fn_1_2530C(0, 0, 0); - } - HuWinPushKeySet(lbl_1_bss_2CE, PAD_BUTTON_A|PAD_BUTTON_B); - } - lbl_1_bss_4 = 0; - pos2D = lbl_1_data_40[0]; - pos2D.z = 800; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50; - modelP = &Hu3DData[lbl_1_bss_2C80[9]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004); - espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - HuAudFXPlay(2174); - for(time=0; time<=20; time++) { - VECScale(&pos2D, &pos3D, sind(time*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - HuPrcVSleep(); - } - for(time=0; time<=20; time++) { - for(i=1; i<4; i++) { - if(time > i*2 && time < (i*2)+10) { - weight = (time-(i*2))/10.0; - pos2D = lbl_1_data_40[i]; - pos2D.z = 800; - pos2D.x += (1.0-sind(weight*90.0f))*500.0; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[i+9], &pos3D); - Hu3DModelAttrReset(lbl_1_bss_2C80[i+9], 1); - } - } - HuPrcVSleep(); - } + s16 exitF = 0; + s16 time; + s16 i; + ModelData *modelP; + Vec pos2D; + Vec pos3D; + + Vec posModel; + float weight; + + if (lbl_1_bss_4 == 1) { + lbl_1_bss_2A4 = 0; + goto freeplay; + } + if (lbl_1_bss_4 == 2) { + lbl_1_bss_2A4 = 1; + goto teamplay; + } + if (lbl_1_bss_4 == 3) { + lbl_1_bss_2A4 = 2; + goto battle; + } + if (lbl_1_bss_4 == 4) { + lbl_1_bss_2A4 = 3; + goto tictactoe; + } + pos2D.x = 168; + pos2D.y = 190; + pos2D.z = 800; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50; + modelP = &Hu3DData[lbl_1_bss_2C80[9]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + for (time = 0; time <= 30; time++) { + for (i = 1; i < 4; i++) { + if (time > i * 2 && time < (i * 2) + 10) { + Vec pos; + weight = (time - (i * 2)) / 10.0; + pos = lbl_1_data_40[i]; + pos.z = 800; + pos.x += (1.0 - cosd(weight * 90.0f)) * 500.0; + Hu3D2Dto3D(&pos, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[i + 9], &pos3D); + Hu3DModelAttrReset(lbl_1_bss_2C80[i + 9], HU3D_ATTR_DISPOFF); + } + } + if (time > 10) { + weight = (time - 10) / 20.0; + VECScale(&pos2D, &pos3D, sind(weight * 90.0f)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + } + if (time == 20) { + HuAudFXPlay(2173); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006); + } + HuPrcVSleep(); + } + while (Hu3DMotionEndCheck(lbl_1_bss_2C80[9]) == 0) { + HuPrcVSleep(); + } + while (1) { + HuWinMesSpeedSet(lbl_1_bss_2CE, 1); + HuAudFXPlay(68); + fn_1_25838(lbl_1_bss_2CE, 0x280007, -1, -1); + lbl_1_bss_2CC = fn_1_25CA8(0x1A0020); + fn_1_25838(lbl_1_bss_2CE, 0x280008, -1, -999); + espAttrReset(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + lbl_1_bss_2A4 = 0; + espPosSet(lbl_1_bss_2C2C[0], -20 + (168.0f + (lbl_1_bss_2A4 * 80)), 180); + while (1) { + s16 delta = 0; + if ((HuPadDStkRep[0] & PAD_BUTTON_LEFT) && lbl_1_bss_2A4 > 0) { + delta = -1; + } + else if ((HuPadDStkRep[0] & PAD_BUTTON_RIGHT) && lbl_1_bss_2A4 < 3) { + delta = 1; + } + if (delta != 0) { + HuAudFXPlay(0); + lbl_1_bss_2A4 += delta; + espPosSet(lbl_1_bss_2C2C[0], -20 + (168.0f + (lbl_1_bss_2A4 * 80)), 180); + fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A4 + 0x280008, -1, -999); + } + if (HuPadBtnDown[0] & PAD_BUTTON_A) { + HuAudFXPlay(2); + if (lbl_1_bss_2A4 == 0 && lbl_1_bss_20AC[0] == 0 && lbl_1_bss_20AC[1] == 0 && lbl_1_bss_20AC[2] == 0 && lbl_1_bss_20AC[3] == 0 + && lbl_1_bss_20AC[4] == 0) { + fn_1_25838(lbl_1_bss_2CE, 0x280031, -1, -1); + fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A4 + 0x280008, -1, -999); + continue; + } + if (lbl_1_bss_2A4 == 2 && lbl_1_bss_20AC[0] == 0 && lbl_1_bss_20AC[1] == 0 && lbl_1_bss_20AC[2] == 0 && lbl_1_bss_20AC[4] == 0) { + fn_1_25838(lbl_1_bss_2CE, 0x280033, -1, -1); + fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A4 + 0x280008, -1, -999); + continue; + } + if ((lbl_1_bss_2A4 == 1 || lbl_1_bss_2A4 == 3) && lbl_1_bss_20AC[2] == 0) { + if (lbl_1_bss_2A4 == 1) { + fn_1_25838(lbl_1_bss_2CE, 0x280032, -1, -1); + } + else { + fn_1_25838(lbl_1_bss_2CE, 0x28002F, -1, -1); + } + fn_1_25838(lbl_1_bss_2CE, lbl_1_bss_2A4 + 0x280008, -1, -999); + continue; + } + break; + } + if (HuPadBtnDown[0] & PAD_BUTTON_B) { + HuAudFXPlay(3); + exitF = 1; + break; + } + HuPrcVSleep(); + } + fn_1_25E74(lbl_1_bss_2CC); + if (exitF != 0) { + break; + } + if (lbl_1_bss_2A4 == 0) { + freeplay: + fn_1_1B0C(); + } + else if (lbl_1_bss_2A4 == 1) { + teamplay: + fn_1_21C4(); + } + else if (lbl_1_bss_2A4 == 2) { + battle: + fn_1_2940(); + } + else if (lbl_1_bss_2A4 == 3) { + tictactoe: + fn_1_3150(); + } + if (lbl_1_bss_2CE == -1) { + lbl_1_bss_2CE = fn_1_2530C(0, 0, 0); + } + HuWinPushKeySet(lbl_1_bss_2CE, PAD_BUTTON_A | PAD_BUTTON_B); + } + lbl_1_bss_4 = 0; + pos2D = lbl_1_data_40[0]; + pos2D.z = 800; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50; + modelP = &Hu3DData[lbl_1_bss_2C80[9]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004); + espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + HuAudFXPlay(2174); + for (time = 0; time <= 20; time++) { + VECScale(&pos2D, &pos3D, sind(time * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + HuPrcVSleep(); + } + for (time = 0; time <= 20; time++) { + for (i = 1; i < 4; i++) { + if (time > i * 2 && time < (i * 2) + 10) { + weight = (time - (i * 2)) / 10.0; + pos2D = lbl_1_data_40[i]; + pos2D.z = 800; + pos2D.x += (1.0 - sind(weight * 90.0f)) * 500.0; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[i + 9], &pos3D); + Hu3DModelAttrReset(lbl_1_bss_2C80[i + 9], HU3D_ATTR_DISPOFF); + } + } + HuPrcVSleep(); + } } s32 fn_1_1B0C(void) { - Vec pos2D; - Vec posModel; - Vec pos3D; - s16 i; - ModelData *modelP; - s16 temp_r29 = 0; - - if(lbl_1_bss_4 == 1) { - pos2D.x = 60; - pos2D.y = 70; - pos2D.z = 1000; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], -90, 0, 0); - Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000002); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 1); - } else { - Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002); - espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - fn_1_25E74(lbl_1_bss_2CC); - fn_1_25584(lbl_1_bss_2CE); - lbl_1_bss_2CE = lbl_1_bss_2CC = -1; - HuAudFXPlay(2174); - HuPrcSleep(40); - pos2D.x = 60; - pos2D.y = 70; - pos2D.z = 1000; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - modelP = &Hu3DData[lbl_1_bss_2C80[9]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - for(i=0; i<=20; i++) { - VECScale(&pos2D, &pos3D, sind(i*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], -90.0*(i/20.0), 0, 0); - HuPrcVSleep(); - } - while(!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { - HuPrcVSleep(); - } - charsel: - if(fn_1_194C8(temp_r29) == 0) { - goto exit; - } - temp_r29 = 4; - for(i=0; i<4; i++) { - GWPlayerCfg[i].character = lbl_1_bss_8.unk24[i].unk68; - GWPlayerCfg[i].iscom = lbl_1_bss_8.unk24[i].unk60; - GWPlayerCfg[i].diff = lbl_1_bss_8.unk24[i].unk64; - } - } - mgPracticeEnableF = 1; - if(fn_1_6D28()) { - lbl_1_bss_4 = 0; - goto charsel; - } - exit: - mgPracticeEnableF = 0; - lbl_1_bss_4 = 0; - pos2D.x = 168; - pos2D.y = 190; - pos2D.z = 800; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50; - modelP = &Hu3DData[lbl_1_bss_2C80[9]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006); - for(i=0; i<=20; i++) { - if(i == 10) { - HuAudFXPlay(2173); - } - VECScale(&pos2D, &pos3D, sind(i*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], -90.0*(1-(i/20.0)), 0, 0); - HuPrcVSleep(); - } - while(!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { - HuPrcVSleep(); - } + Vec pos2D; + Vec posModel; + Vec pos3D; + s16 i; + ModelData *modelP; + s16 temp_r29 = 0; + + if (lbl_1_bss_4 == 1) { + pos2D.x = 60; + pos2D.y = 70; + pos2D.z = 1000; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], -90, 0, 0); + Hu3DModelAttrSet(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002); + espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + fn_1_25E74(lbl_1_bss_2CC); + fn_1_25584(lbl_1_bss_2CE); + lbl_1_bss_2CE = lbl_1_bss_2CC = -1; + HuAudFXPlay(2174); + HuPrcSleep(40); + pos2D.x = 60; + pos2D.y = 70; + pos2D.z = 1000; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + modelP = &Hu3DData[lbl_1_bss_2C80[9]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + for (i = 0; i <= 20; i++) { + VECScale(&pos2D, &pos3D, sind(i * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], -90.0 * (i / 20.0), 0, 0); + HuPrcVSleep(); + } + while (!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { + HuPrcVSleep(); + } + charsel: + if (fn_1_194C8(temp_r29) == 0) { + goto exit; + } + temp_r29 = 4; + for (i = 0; i < 4; i++) { + GWPlayerCfg[i].character = lbl_1_bss_8.unk24[i].unk68; + GWPlayerCfg[i].iscom = lbl_1_bss_8.unk24[i].unk60; + GWPlayerCfg[i].diff = lbl_1_bss_8.unk24[i].unk64; + } + } + mgPracticeEnableF = 1; + if (fn_1_6D28()) { + lbl_1_bss_4 = 0; + goto charsel; + } +exit: + mgPracticeEnableF = 0; + lbl_1_bss_4 = 0; + pos2D.x = 168; + pos2D.y = 190; + pos2D.z = 800; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50; + modelP = &Hu3DData[lbl_1_bss_2C80[9]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006); + for (i = 0; i <= 20; i++) { + if (i == 10) { + HuAudFXPlay(2173); + } + VECScale(&pos2D, &pos3D, sind(i * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], -90.0 * (1 - (i / 20.0)), 0, 0); + HuPrcVSleep(); + } + while (!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { + HuPrcVSleep(); + } } s32 fn_1_21C4(void) { - Vec pos2D; - Vec posModel; - Vec pos3D; - s16 i; - ModelData *modelP; - s16 temp_r29 = 1; - if(lbl_1_bss_4 == 2) { - pos2D.x = 60; - pos2D.y = 70; - pos2D.z = 1000; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], 0, -90, 90); - Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000002); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 1); - } else { - Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002); - espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - fn_1_25E74(lbl_1_bss_2CC); - fn_1_25584(lbl_1_bss_2CE); - lbl_1_bss_2CE = lbl_1_bss_2CC = -1; - HuAudFXPlay(2174); - HuPrcSleep(40); - pos2D.x = 60; - pos2D.y = 70; - pos2D.z = 1000; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - modelP = &Hu3DData[lbl_1_bss_2C80[9]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - for(i=0; i<=20; i++) { - VECScale(&pos2D, &pos3D, sind(i*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], 0, -90.0*(i/20.0), 90.0*(i/20.0)); - HuPrcVSleep(); - } - while(!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { - HuPrcVSleep(); - } - charsel: - if(fn_1_194C8(temp_r29) == 0) { - goto exit; - } - temp_r29 = 4; - for(i=0; i<4; i++) { - GWPlayerCfg[i].character = lbl_1_bss_8.unk24[i].unk68; - GWPlayerCfg[i].group = lbl_1_bss_8.unk24[i].unk5C; - GWPlayerCfg[i].diff = lbl_1_bss_8.unk24[i].unk64; - GWPlayerCfg[i].iscom = lbl_1_bss_8.unk24[i].unk60; - - } - } - mgPracticeEnableF = 1; - if(fn_1_6D28()) { - lbl_1_bss_4 = 0; - goto charsel; - } - exit: - mgPracticeEnableF = 0; - lbl_1_bss_4 = 0; - pos2D.x = 168; - pos2D.y = 190; - pos2D.z = 800; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50; - modelP = &Hu3DData[lbl_1_bss_2C80[9]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006); - for(i=0; i<=20; i++) { - if(i == 10) { - HuAudFXPlay(2173); - } - VECScale(&pos2D, &pos3D, sind(i*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], 0, -90.0*(1.0-(i/20.0)), 90.0*(1.0-(i/20.0))); - HuPrcVSleep(); - } - while(!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { - HuPrcVSleep(); - } + Vec pos2D; + Vec posModel; + Vec pos3D; + s16 i; + ModelData *modelP; + s16 temp_r29 = 1; + if (lbl_1_bss_4 == 2) { + pos2D.x = 60; + pos2D.y = 70; + pos2D.z = 1000; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], 0, -90, 90); + Hu3DModelAttrSet(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002); + espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + fn_1_25E74(lbl_1_bss_2CC); + fn_1_25584(lbl_1_bss_2CE); + lbl_1_bss_2CE = lbl_1_bss_2CC = -1; + HuAudFXPlay(2174); + HuPrcSleep(40); + pos2D.x = 60; + pos2D.y = 70; + pos2D.z = 1000; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + modelP = &Hu3DData[lbl_1_bss_2C80[9]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + for (i = 0; i <= 20; i++) { + VECScale(&pos2D, &pos3D, sind(i * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], 0, -90.0 * (i / 20.0), 90.0 * (i / 20.0)); + HuPrcVSleep(); + } + while (!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { + HuPrcVSleep(); + } + charsel: + if (fn_1_194C8(temp_r29) == 0) { + goto exit; + } + temp_r29 = 4; + for (i = 0; i < 4; i++) { + GWPlayerCfg[i].character = lbl_1_bss_8.unk24[i].unk68; + GWPlayerCfg[i].group = lbl_1_bss_8.unk24[i].unk5C; + GWPlayerCfg[i].diff = lbl_1_bss_8.unk24[i].unk64; + GWPlayerCfg[i].iscom = lbl_1_bss_8.unk24[i].unk60; + } + } + mgPracticeEnableF = 1; + if (fn_1_6D28()) { + lbl_1_bss_4 = 0; + goto charsel; + } +exit: + mgPracticeEnableF = 0; + lbl_1_bss_4 = 0; + pos2D.x = 168; + pos2D.y = 190; + pos2D.z = 800; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50; + modelP = &Hu3DData[lbl_1_bss_2C80[9]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006); + for (i = 0; i <= 20; i++) { + if (i == 10) { + HuAudFXPlay(2173); + } + VECScale(&pos2D, &pos3D, sind(i * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], 0, -90.0 * (1.0 - (i / 20.0)), 90.0 * (1.0 - (i / 20.0))); + HuPrcVSleep(); + } + while (!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { + HuPrcVSleep(); + } } s32 fn_1_2940(void) { - Vec pos2D; - Vec posModel; - Vec pos3D; - s16 temp_r29 = 2; - s16 i; - ModelData *modelP; - for(i=0; i<4; i++) { - Hu3DModelLayerSet(lbl_1_bss_2C80[i+9], 2); - } - if(lbl_1_bss_4 == 3) { - OSReport("Eliminate Play STart\n"); - pos2D.x = 50; - pos2D.y = 70; - pos2D.z = 1000; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], -90, 180, 0); - Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000002); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 1); - } else { - Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002); - espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - fn_1_25E74(lbl_1_bss_2CC); - fn_1_25584(lbl_1_bss_2CE); - lbl_1_bss_2CE = lbl_1_bss_2CC = -1; - HuAudFXPlay(2174); - HuPrcSleep(40); - pos2D.x = 50; - pos2D.y = 70; - pos2D.z = 1000; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - modelP = &Hu3DData[lbl_1_bss_2C80[9]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - for(i=0; i<=20; i++) { - VECScale(&pos2D, &pos3D, sind(i*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], 90.0*-(i/20.0), 180.0*(i/20.0), 0); - HuPrcVSleep(); - } - while(!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { - HuPrcVSleep(); - } - charsel: - if(fn_1_194C8(temp_r29) == 0) { - goto exit; - } - temp_r29 = 4; - for(i=0; i<4; i++) { - GWPlayerCfg[i].character = lbl_1_bss_8.unk24[i].unk68; - GWPlayerCfg[i].group = lbl_1_bss_8.unk24[i].unk5C; - GWPlayerCfg[i].iscom = lbl_1_bss_8.unk24[i].unk60; - GWPlayerCfg[i].diff = lbl_1_bss_8.unk24[i].unk64; - } - mgBattleStarMax = lbl_1_bss_8.unk20; - } - - if(fn_1_E72C() == 0) { - lbl_1_bss_4 = 0; - goto charsel; - } - exit: - HuDataDirClose(DATADIR_INSTPIC); - for(i=0; i<4; i++) { - Hu3DModelLayerSet(lbl_1_bss_2C80[i+9], 3); - } - lbl_1_bss_4 = 0; - pos2D.x = 168; - pos2D.y = 190; - pos2D.z = 800; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50; - modelP = &Hu3DData[lbl_1_bss_2C80[9]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006); - for(i=0; i<=20; i++) { - if(i == 10) { - HuAudFXPlay(2173); - } - VECScale(&pos2D, &pos3D, sind(i*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], 90.0*-(1-(i/20.0)), 180.0*(1-(i/20.0)), 0); - HuPrcVSleep(); - } - while(!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { - HuPrcVSleep(); - } + Vec pos2D; + Vec posModel; + Vec pos3D; + s16 temp_r29 = 2; + s16 i; + ModelData *modelP; + for (i = 0; i < 4; i++) { + Hu3DModelLayerSet(lbl_1_bss_2C80[i + 9], 2); + } + if (lbl_1_bss_4 == 3) { + OSReport("Eliminate Play STart\n"); + pos2D.x = 50; + pos2D.y = 70; + pos2D.z = 1000; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], -90, 180, 0); + Hu3DModelAttrSet(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002); + espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + fn_1_25E74(lbl_1_bss_2CC); + fn_1_25584(lbl_1_bss_2CE); + lbl_1_bss_2CE = lbl_1_bss_2CC = -1; + HuAudFXPlay(2174); + HuPrcSleep(40); + pos2D.x = 50; + pos2D.y = 70; + pos2D.z = 1000; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + modelP = &Hu3DData[lbl_1_bss_2C80[9]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + for (i = 0; i <= 20; i++) { + VECScale(&pos2D, &pos3D, sind(i * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], 90.0 * -(i / 20.0), 180.0 * (i / 20.0), 0); + HuPrcVSleep(); + } + while (!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { + HuPrcVSleep(); + } + charsel: + if (fn_1_194C8(temp_r29) == 0) { + goto exit; + } + temp_r29 = 4; + for (i = 0; i < 4; i++) { + GWPlayerCfg[i].character = lbl_1_bss_8.unk24[i].unk68; + GWPlayerCfg[i].group = lbl_1_bss_8.unk24[i].unk5C; + GWPlayerCfg[i].iscom = lbl_1_bss_8.unk24[i].unk60; + GWPlayerCfg[i].diff = lbl_1_bss_8.unk24[i].unk64; + } + mgBattleStarMax = lbl_1_bss_8.unk20; + } + + if (fn_1_E72C() == 0) { + lbl_1_bss_4 = 0; + goto charsel; + } +exit: + HuDataDirClose(DATADIR_INSTPIC); + for (i = 0; i < 4; i++) { + Hu3DModelLayerSet(lbl_1_bss_2C80[i + 9], 3); + } + lbl_1_bss_4 = 0; + pos2D.x = 168; + pos2D.y = 190; + pos2D.z = 800; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50; + modelP = &Hu3DData[lbl_1_bss_2C80[9]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006); + for (i = 0; i <= 20; i++) { + if (i == 10) { + HuAudFXPlay(2173); + } + VECScale(&pos2D, &pos3D, sind(i * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], 90.0 * -(1 - (i / 20.0)), 180.0 * (1 - (i / 20.0)), 0); + HuPrcVSleep(); + } + while (!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { + HuPrcVSleep(); + } } s32 fn_1_3150(void) { - Vec pos2D; - Vec posModel; - Vec pos3D; - s16 i; - ModelData *modelP; - s16 temp_r29 = 1; - if(lbl_1_bss_4 == 4) { - pos2D.x = 60; - pos2D.y = 70; - pos2D.z = 1000; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], -90, 90, 0); - Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000002); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 1); - } else { - Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002); - espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - fn_1_25E74(lbl_1_bss_2CC); - fn_1_25584(lbl_1_bss_2CE); - lbl_1_bss_2CE = lbl_1_bss_2CC = -1; - HuAudFXPlay(2174); - HuPrcSleep(40); - pos2D.x = 60; - pos2D.y = 70; - pos2D.z = 1000; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - modelP = &Hu3DData[lbl_1_bss_2C80[9]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - for(i=0; i<=20; i++) { - VECScale(&pos2D, &pos3D, sind(i*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], 90.0*-(i/20.0), 90.0*(i/20.0), 0); - HuPrcVSleep(); - } - while(!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { - HuPrcVSleep(); - } - charsel: - if(fn_1_194C8(temp_r29) == 0) { - goto exit; - } - temp_r29 = 4; - for(i=0; i<4; i++) { - GWPlayerCfg[i].character = lbl_1_bss_8.unk24[i].unk68; - GWPlayerCfg[i].group = lbl_1_bss_8.unk24[i].unk5C; - GWPlayerCfg[i].iscom = lbl_1_bss_8.unk24[i].unk60; - GWPlayerCfg[i].diff = lbl_1_bss_8.unk24[i].unk64; - } - mgBattleStarMax = lbl_1_bss_8.unk20; - } - - if(fn_1_13418() == 0) { - lbl_1_bss_4 = 0; - goto charsel; - } - exit: - HuDataDirClose(DATADIR_INSTPIC); - lbl_1_bss_4 = 0; - pos2D.x = 168; - pos2D.y = 190; - pos2D.z = 800; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50; - modelP = &Hu3DData[lbl_1_bss_2C80[9]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006); - for(i=0; i<=20; i++) { - if(i == 10) { - HuAudFXPlay(2173); - } - VECScale(&pos2D, &pos3D, sind(i*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); - Hu3DModelRotSet(lbl_1_bss_2C80[9], 90.0*-(1-(i/20.0)), 90.0*(1-(i/20.0)), 0); - HuPrcVSleep(); - } - while(!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { - HuPrcVSleep(); - } + Vec pos2D; + Vec posModel; + Vec pos3D; + s16 i; + ModelData *modelP; + s16 temp_r29 = 1; + if (lbl_1_bss_4 == 4) { + pos2D.x = 60; + pos2D.y = 70; + pos2D.z = 1000; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], -90, 90, 0); + Hu3DModelAttrSet(lbl_1_bss_2C80[9], HU3D_MOTATTR_PAUSE); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrSet(lbl_1_bss_2C80[9], 0x40000004); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000002); + espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + fn_1_25E74(lbl_1_bss_2CC); + fn_1_25584(lbl_1_bss_2CE); + lbl_1_bss_2CE = lbl_1_bss_2CC = -1; + HuAudFXPlay(2174); + HuPrcSleep(40); + pos2D.x = 60; + pos2D.y = 70; + pos2D.z = 1000; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + modelP = &Hu3DData[lbl_1_bss_2C80[9]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + for (i = 0; i <= 20; i++) { + VECScale(&pos2D, &pos3D, sind(i * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], 90.0 * -(i / 20.0), 90.0 * (i / 20.0), 0); + HuPrcVSleep(); + } + while (!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { + HuPrcVSleep(); + } + charsel: + if (fn_1_194C8(temp_r29) == 0) { + goto exit; + } + temp_r29 = 4; + for (i = 0; i < 4; i++) { + GWPlayerCfg[i].character = lbl_1_bss_8.unk24[i].unk68; + GWPlayerCfg[i].group = lbl_1_bss_8.unk24[i].unk5C; + GWPlayerCfg[i].iscom = lbl_1_bss_8.unk24[i].unk60; + GWPlayerCfg[i].diff = lbl_1_bss_8.unk24[i].unk64; + } + mgBattleStarMax = lbl_1_bss_8.unk20; + } + + if (fn_1_13418() == 0) { + lbl_1_bss_4 = 0; + goto charsel; + } +exit: + HuDataDirClose(DATADIR_INSTPIC); + lbl_1_bss_4 = 0; + pos2D.x = 168; + pos2D.y = 190; + pos2D.z = 800; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50; + modelP = &Hu3DData[lbl_1_bss_2C80[9]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + Hu3DModelAttrReset(lbl_1_bss_2C80[9], 0x40000006); + for (i = 0; i <= 20; i++) { + if (i == 10) { + HuAudFXPlay(2173); + } + VECScale(&pos2D, &pos3D, sind(i * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[9], &pos3D); + Hu3DModelRotSet(lbl_1_bss_2C80[9], 90.0 * -(1 - (i / 20.0)), 90.0 * (1 - (i / 20.0)), 0); + HuPrcVSleep(); + } + while (!Hu3DMotionEndCheck(lbl_1_bss_2C80[9])) { + HuPrcVSleep(); + } } void fn_1_38D8(void) { - Vec pos2D; - Vec pos3D; - Vec posModel; - - s16 sp8 = 0; - s16 time; - s16 i; - float weight; - ModelData *modelP; - - fn_1_25E74(lbl_1_bss_2CC); - fn_1_25584(lbl_1_bss_2CE); - lbl_1_bss_2CE = lbl_1_bss_2CC = -1; - pos2D.x = 60; - pos2D.y = 70; - pos2D.z = 1000; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - modelP = &Hu3DData[lbl_1_bss_2C80[10]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - for(time=0; time<=30; time++) { - for(i=0; i<4; i++) { - if(i == 1) { - continue; - } - if(time > i*2 && time < (i*2)+10) { - Vec posBox; - weight = (time-(i*2))/10.0; - posBox = lbl_1_data_40[i]; - posBox.z = 800; - posBox.x += ((i < 2) ? -1 : 1)*(500.0*(1.0-cosd(90.0f*weight))); - Hu3D2Dto3D(&posBox, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[i+9], &pos3D); - Hu3DModelAttrReset(lbl_1_bss_2C80[i+9], 1); - } - } - if(time > 10) { - weight = (time-10)/20.0; - VECScale(&pos2D, &pos3D, sind(weight*90.0f)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[10], &pos3D); - } - HuPrcVSleep(); - } - fn_1_6D28(); - pos2D = lbl_1_data_40[1]; - pos2D.z = 800; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - modelP = &Hu3DData[lbl_1_bss_2C80[10]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - for(time=0; time<=20; time++) { - VECScale(&pos2D, &pos3D, sind(time*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[10], &pos3D); - HuPrcVSleep(); - } - for(time=0; time<=20; time++) { - for(i=0; i<4; i++) { - if(i == 1) { - continue; - } - if(time > i*2 && time < (i*2)+10) { - weight = (time-(i*2))/10.0; - pos2D = lbl_1_data_40[i]; - pos2D.z = 800; - pos2D.x += ((i < 2) ? -1 : 1)*((1.0-sind(weight*90.0f))*500.0); - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[i+9], &pos3D); - Hu3DModelAttrReset(lbl_1_bss_2C80[i+9], 1); - } - } - HuPrcVSleep(); - } + Vec pos2D; + Vec pos3D; + Vec posModel; + + s16 sp8 = 0; + s16 time; + s16 i; + float weight; + ModelData *modelP; + + fn_1_25E74(lbl_1_bss_2CC); + fn_1_25584(lbl_1_bss_2CE); + lbl_1_bss_2CE = lbl_1_bss_2CC = -1; + pos2D.x = 60; + pos2D.y = 70; + pos2D.z = 1000; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + modelP = &Hu3DData[lbl_1_bss_2C80[10]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + for (time = 0; time <= 30; time++) { + for (i = 0; i < 4; i++) { + if (i == 1) { + continue; + } + if (time > i * 2 && time < (i * 2) + 10) { + Vec posBox; + weight = (time - (i * 2)) / 10.0; + posBox = lbl_1_data_40[i]; + posBox.z = 800; + posBox.x += ((i < 2) ? -1 : 1) * (500.0 * (1.0 - cosd(90.0f * weight))); + Hu3D2Dto3D(&posBox, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[i + 9], &pos3D); + Hu3DModelAttrReset(lbl_1_bss_2C80[i + 9], HU3D_ATTR_DISPOFF); + } + } + if (time > 10) { + weight = (time - 10) / 20.0; + VECScale(&pos2D, &pos3D, sind(weight * 90.0f)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[10], &pos3D); + } + HuPrcVSleep(); + } + fn_1_6D28(); + pos2D = lbl_1_data_40[1]; + pos2D.z = 800; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + modelP = &Hu3DData[lbl_1_bss_2C80[10]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + for (time = 0; time <= 20; time++) { + VECScale(&pos2D, &pos3D, sind(time * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[10], &pos3D); + HuPrcVSleep(); + } + for (time = 0; time <= 20; time++) { + for (i = 0; i < 4; i++) { + if (i == 1) { + continue; + } + if (time > i * 2 && time < (i * 2) + 10) { + weight = (time - (i * 2)) / 10.0; + pos2D = lbl_1_data_40[i]; + pos2D.z = 800; + pos2D.x += ((i < 2) ? -1 : 1) * ((1.0 - sind(weight * 90.0f)) * 500.0); + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[i + 9], &pos3D); + Hu3DModelAttrReset(lbl_1_bss_2C80[i + 9], HU3D_ATTR_DISPOFF); + } + } + HuPrcVSleep(); + } } void fn_1_4010(void) { - Vec pos2D; - Vec pos3D; - Vec posModel; - - s16 spA[4]; - s16 sp8 = 0; - s16 time; - s16 i; - float weight; - ModelData *modelP; - fn_1_25E74(lbl_1_bss_2CC); - fn_1_25584(lbl_1_bss_2CE); - lbl_1_bss_2CE = lbl_1_bss_2CC = -1; - pos2D.x = 60; - pos2D.y = 70; - pos2D.z = 1000; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - modelP = &Hu3DData[lbl_1_bss_2C80[11]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - for(time=0; time<=30; time++) { - for(i=0; i<4; i++) { - if(i == 2) { - continue; - } - if(time > i*2 && time < (i*2)+10) { - Vec posBox; - weight = (time-(i*2))/10.0; - posBox = lbl_1_data_40[i]; - posBox.z = 800; - posBox.x += ((i < 3) ? -1 : 1)*(500.0*(1.0-cosd(90.0f*weight))); - Hu3D2Dto3D(&posBox, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[i+9], &pos3D); - Hu3DModelAttrReset(lbl_1_bss_2C80[i+9], 1); - } - } - if(time > 10) { - weight = (time-10)/20.0; - VECScale(&pos2D, &pos3D, sind(weight*90.0f)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[11], &pos3D); - } - HuPrcVSleep(); - } - fn_1_6D28(); - for(i=0; i<4; i++) { - spA[i] = 0; - for(time=0; time= 4 && spA[1] >= 3 && spA[2] >= 3 && spA[3] >= 2) { - GWGameStat.field10E_bit5 = 1; - } else { - GWGameStat.field10E_bit5 = 0; - } - pos2D = lbl_1_data_40[2]; - pos2D.z = 800; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - modelP = &Hu3DData[lbl_1_bss_2C80[11]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - for(time=0; time<=20; time++) { - VECScale(&pos2D, &pos3D, sind(time*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[11], &pos3D); - HuPrcVSleep(); - } - for(time=0; time<=20; time++) { - for(i=0; i<4; i++) { - if(i == 2) { - continue; - } - if(time > i*2 && time < (i*2)+10) { - weight = (time-(i*2))/10.0; - pos2D = lbl_1_data_40[i]; - pos2D.z = 800; - pos2D.x += ((i < 3) ? -1 : 1)*((1.0-sind(weight*90.0f))*500.0); - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[i+9], &pos3D); - Hu3DModelAttrReset(lbl_1_bss_2C80[i+9], 1); - } - } - HuPrcVSleep(); - } + Vec pos2D; + Vec pos3D; + Vec posModel; + + s16 spA[4]; + s16 sp8 = 0; + s16 time; + s16 i; + float weight; + ModelData *modelP; + fn_1_25E74(lbl_1_bss_2CC); + fn_1_25584(lbl_1_bss_2CE); + lbl_1_bss_2CE = lbl_1_bss_2CC = -1; + pos2D.x = 60; + pos2D.y = 70; + pos2D.z = 1000; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + modelP = &Hu3DData[lbl_1_bss_2C80[11]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + for (time = 0; time <= 30; time++) { + for (i = 0; i < 4; i++) { + if (i == 2) { + continue; + } + if (time > i * 2 && time < (i * 2) + 10) { + Vec posBox; + weight = (time - (i * 2)) / 10.0; + posBox = lbl_1_data_40[i]; + posBox.z = 800; + posBox.x += ((i < 3) ? -1 : 1) * (500.0 * (1.0 - cosd(90.0f * weight))); + Hu3D2Dto3D(&posBox, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[i + 9], &pos3D); + Hu3DModelAttrReset(lbl_1_bss_2C80[i + 9], HU3D_ATTR_DISPOFF); + } + } + if (time > 10) { + weight = (time - 10) / 20.0; + VECScale(&pos2D, &pos3D, sind(weight * 90.0f)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[11], &pos3D); + } + HuPrcVSleep(); + } + fn_1_6D28(); + for (i = 0; i < 4; i++) { + spA[i] = 0; + for (time = 0; time < lbl_1_bss_20AC[lbl_1_data_A2[i]]; time++) { + if (GWMGCustomGet(lbl_1_bss_20C0[lbl_1_data_A2[i]][time] + 401)) { + spA[i]++; + } + } + } + if (spA[0] >= 4 && spA[1] >= 3 && spA[2] >= 3 && spA[3] >= 2) { + GWGameStat.field10E_bit5 = 1; + } + else { + GWGameStat.field10E_bit5 = 0; + } + pos2D = lbl_1_data_40[2]; + pos2D.z = 800; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + modelP = &Hu3DData[lbl_1_bss_2C80[11]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + for (time = 0; time <= 20; time++) { + VECScale(&pos2D, &pos3D, sind(time * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[11], &pos3D); + HuPrcVSleep(); + } + for (time = 0; time <= 20; time++) { + for (i = 0; i < 4; i++) { + if (i == 2) { + continue; + } + if (time > i * 2 && time < (i * 2) + 10) { + weight = (time - (i * 2)) / 10.0; + pos2D = lbl_1_data_40[i]; + pos2D.z = 800; + pos2D.x += ((i < 3) ? -1 : 1) * ((1.0 - sind(weight * 90.0f)) * 500.0); + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[i + 9], &pos3D); + Hu3DModelAttrReset(lbl_1_bss_2C80[i + 9], HU3D_ATTR_DISPOFF); + } + } + HuPrcVSleep(); + } } s32 fn_1_487C(void) { - s16 i; - char str[4][6]; - - for(i=0; i<4; i++) { - strcpy(&str[i][0], "\x1E\x03""0""\x1E\x08"); - } - if(lbl_1_bss_20AC[0] >= 4 && lbl_1_bss_20AC[1] >= 3 && lbl_1_bss_20AC[2] >= 3 && lbl_1_bss_20AC[4] >= 2) { - return 1; - } - if(lbl_1_bss_20AC[0] >= 4) { - str[0][1] = 5; - } else { - str[0][2] = '4'-lbl_1_bss_20AC[0]; - } - HuWinInsertMesSet(lbl_1_bss_2CE, MAKE_MESSID_PTR(&str[0][0]), 0); - if(lbl_1_bss_20AC[1] >= 3) { - str[1][1] = 5; - } else { - str[1][2] = '3'-lbl_1_bss_20AC[1]; - } - HuWinInsertMesSet(lbl_1_bss_2CE, MAKE_MESSID_PTR(&str[1][0]), 1); - if(lbl_1_bss_20AC[2] >= 3) { - str[2][1] = 5; - } else { - str[2][2] = '3'-lbl_1_bss_20AC[2]; - } - HuWinInsertMesSet(lbl_1_bss_2CE, MAKE_MESSID_PTR(&str[2][0]), 2); - if(lbl_1_bss_20AC[4] >= 2) { - str[3][1] = 5; - } else { - str[3][2] = '2'-lbl_1_bss_20AC[4]; - } - HuWinInsertMesSet(lbl_1_bss_2CE, MAKE_MESSID_PTR(&str[3][0]), 3); - fn_1_25838(lbl_1_bss_2CE, 0x28002A, -1, -1); - fn_1_25838(lbl_1_bss_2CE, 0x28002B, -1, -1); - fn_1_25838(lbl_1_bss_2CE, 0x280002+lbl_1_bss_2A6, -1, -999); - return 0; + s16 i; + char str[4][6]; + + for (i = 0; i < 4; i++) { + strcpy(&str[i][0], + "\x1E\x03" + "0" + "\x1E\x08"); + } + if (lbl_1_bss_20AC[0] >= 4 && lbl_1_bss_20AC[1] >= 3 && lbl_1_bss_20AC[2] >= 3 && lbl_1_bss_20AC[4] >= 2) { + return 1; + } + if (lbl_1_bss_20AC[0] >= 4) { + str[0][1] = 5; + } + else { + str[0][2] = '4' - lbl_1_bss_20AC[0]; + } + HuWinInsertMesSet(lbl_1_bss_2CE, MAKE_MESSID_PTR(&str[0][0]), 0); + if (lbl_1_bss_20AC[1] >= 3) { + str[1][1] = 5; + } + else { + str[1][2] = '3' - lbl_1_bss_20AC[1]; + } + HuWinInsertMesSet(lbl_1_bss_2CE, MAKE_MESSID_PTR(&str[1][0]), 1); + if (lbl_1_bss_20AC[2] >= 3) { + str[2][1] = 5; + } + else { + str[2][2] = '3' - lbl_1_bss_20AC[2]; + } + HuWinInsertMesSet(lbl_1_bss_2CE, MAKE_MESSID_PTR(&str[2][0]), 2); + if (lbl_1_bss_20AC[4] >= 2) { + str[3][1] = 5; + } + else { + str[3][2] = '2' - lbl_1_bss_20AC[4]; + } + HuWinInsertMesSet(lbl_1_bss_2CE, MAKE_MESSID_PTR(&str[3][0]), 3); + fn_1_25838(lbl_1_bss_2CE, 0x28002A, -1, -1); + fn_1_25838(lbl_1_bss_2CE, 0x28002B, -1, -1); + fn_1_25838(lbl_1_bss_2CE, 0x280002 + lbl_1_bss_2A6, -1, -999); + return 0; } void fn_1_4ADC(void) { - Vec pos2D; - Vec pos3D; - Vec posModel; - - s16 spA[4]; - s16 sp8 = 0; - s16 time; - s16 i; - float weight; - ModelData *modelP; - fn_1_25E74(lbl_1_bss_2CC); - fn_1_25584(lbl_1_bss_2CE); - lbl_1_bss_2CE = lbl_1_bss_2CC = -1; - pos2D.x = 50; - pos2D.y = 64; - pos2D.z = 1000; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - modelP = &Hu3DData[lbl_1_bss_2C80[11]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - for(time=0; time<=30; time++) { - for(i=0; i<4; i++) { - if(i == 3) { - continue; - } - if(time > i*2 && time < (i*2)+10) { - Vec posBox; - weight = (time-(i*2))/10.0; - posBox = lbl_1_data_40[i]; - posBox.z = 800; - posBox.x += ((i < 3) ? -1 : 1)*(500.0*(1.0-cosd(90.0f*weight))); - Hu3D2Dto3D(&posBox, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[i+9], &pos3D); - Hu3DModelAttrReset(lbl_1_bss_2C80[i+9], 1); - } - } - if(time > 10) { - weight = (time-10)/20.0; - VECScale(&pos2D, &pos3D, sind(weight*90.0f)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[12], &pos3D); - weight = (1.0-(weight*0.1)); - Hu3DModelScaleSet(lbl_1_bss_2C80[12], weight, weight, weight); - } - HuPrcVSleep(); - } - fn_1_D8D0(); - pos2D = lbl_1_data_40[3]; - pos2D.z = 800; - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - modelP = &Hu3DData[lbl_1_bss_2C80[12]]; - posModel = modelP->pos; - VECSubtract(&pos3D, &posModel, &pos2D); - espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); - for(time=0; time<=20; time++) { - VECScale(&pos2D, &pos3D, sind(time*4.5)); - VECAdd(&posModel, &pos3D, &pos3D); - Hu3DModelPosSetV(lbl_1_bss_2C80[12], &pos3D); - weight = 1.0-(0.1*(1.0-(time/20.0))); - Hu3DModelScaleSet(lbl_1_bss_2C80[12], weight, weight, weight); - HuPrcVSleep(); - } - for(time=0; time<=20; time++) { - for(i=0; i<4; i++) { - if(i == 3) { - continue; - } - if(time > i*2 && time < (i*2)+10) { - weight = (time-(i*2))/10.0; - pos2D = lbl_1_data_40[i]; - pos2D.z = 800; - pos2D.x += ((i < 3) ? -1 : 1)*((1.0-sind(weight*90.0f))*500.0); - Hu3D2Dto3D(&pos2D, 1, &pos3D); - pos3D.z -= 50.0f; - Hu3DModelPosSetV(lbl_1_bss_2C80[i+9], &pos3D); - Hu3DModelAttrReset(lbl_1_bss_2C80[i+9], 1); - } - } - HuPrcVSleep(); - } + Vec pos2D; + Vec pos3D; + Vec posModel; + + s16 spA[4]; + s16 sp8 = 0; + s16 time; + s16 i; + float weight; + ModelData *modelP; + fn_1_25E74(lbl_1_bss_2CC); + fn_1_25584(lbl_1_bss_2CE); + lbl_1_bss_2CE = lbl_1_bss_2CC = -1; + pos2D.x = 50; + pos2D.y = 64; + pos2D.z = 1000; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + modelP = &Hu3DData[lbl_1_bss_2C80[11]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + for (time = 0; time <= 30; time++) { + for (i = 0; i < 4; i++) { + if (i == 3) { + continue; + } + if (time > i * 2 && time < (i * 2) + 10) { + Vec posBox; + weight = (time - (i * 2)) / 10.0; + posBox = lbl_1_data_40[i]; + posBox.z = 800; + posBox.x += ((i < 3) ? -1 : 1) * (500.0 * (1.0 - cosd(90.0f * weight))); + Hu3D2Dto3D(&posBox, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[i + 9], &pos3D); + Hu3DModelAttrReset(lbl_1_bss_2C80[i + 9], HU3D_ATTR_DISPOFF); + } + } + if (time > 10) { + weight = (time - 10) / 20.0; + VECScale(&pos2D, &pos3D, sind(weight * 90.0f)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[12], &pos3D); + weight = (1.0 - (weight * 0.1)); + Hu3DModelScaleSet(lbl_1_bss_2C80[12], weight, weight, weight); + } + HuPrcVSleep(); + } + fn_1_D8D0(); + pos2D = lbl_1_data_40[3]; + pos2D.z = 800; + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + modelP = &Hu3DData[lbl_1_bss_2C80[12]]; + posModel = modelP->pos; + VECSubtract(&pos3D, &posModel, &pos2D); + espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); + for (time = 0; time <= 20; time++) { + VECScale(&pos2D, &pos3D, sind(time * 4.5)); + VECAdd(&posModel, &pos3D, &pos3D); + Hu3DModelPosSetV(lbl_1_bss_2C80[12], &pos3D); + weight = 1.0 - (0.1 * (1.0 - (time / 20.0))); + Hu3DModelScaleSet(lbl_1_bss_2C80[12], weight, weight, weight); + HuPrcVSleep(); + } + for (time = 0; time <= 20; time++) { + for (i = 0; i < 4; i++) { + if (i == 3) { + continue; + } + if (time > i * 2 && time < (i * 2) + 10) { + weight = (time - (i * 2)) / 10.0; + pos2D = lbl_1_data_40[i]; + pos2D.z = 800; + pos2D.x += ((i < 3) ? -1 : 1) * ((1.0 - sind(weight * 90.0f)) * 500.0); + Hu3D2Dto3D(&pos2D, 1, &pos3D); + pos3D.z -= 50.0f; + Hu3DModelPosSetV(lbl_1_bss_2C80[i + 9], &pos3D); + Hu3DModelAttrReset(lbl_1_bss_2C80[i + 9], HU3D_ATTR_DISPOFF); + } + } + HuPrcVSleep(); + } } void fn_1_65EC(void); void fn_1_52DC(void) { - s16 i; - fn_1_65EC(); - fn_1_267E8(lbl_1_data_490); - fn_1_26A78(lbl_1_data_768); - Hu3DMotionSet(lbl_1_bss_2C80[2], lbl_1_bss_2C66[4]); - Hu3DMotionTimeSet(lbl_1_bss_2C80[0], 0); - Hu3DModelAttrSet(lbl_1_bss_2C80[0], 0x40000002); - HuSprExecLayerSet(64, 3); - espDrawNoSet(lbl_1_bss_2C2C[3], 64); - for(i=0; i<4; i++) { - Hu3DModelLayerSet(lbl_1_bss_2C80[i+9], 3); - } - fn_1_26C28(); - espDrawNoSet(lbl_1_bss_2C2C[28], 64); - Hu3DModelPosSet(lbl_1_bss_2C80[5], 0, 0, 500); - lbl_1_bss_8.unk0 = lbl_1_bss_2C80[2]; - lbl_1_bss_8.unk8 = lbl_1_bss_2C66[4]; - lbl_1_bss_8.unk4 = lbl_1_bss_2C66[3]; - lbl_1_bss_8.unkC = lbl_1_bss_2C80[5]; - lbl_1_bss_8.unk10 = lbl_1_bss_2C66[6]; - lbl_1_bss_8.unk14 = lbl_1_bss_2C66[7]; - lbl_1_bss_8.unk18 = lbl_1_bss_2C66[6]; - fn_1_18DF8(lbl_1_bss_2D8, &lbl_1_bss_8); - Hu3DModelShadowSet(lbl_1_bss_2C80[5]); - Hu3DModelShadowMapSet(lbl_1_bss_2C80[0]); + s16 i; + fn_1_65EC(); + fn_1_267E8(lbl_1_data_490); + fn_1_26A78(lbl_1_data_768); + Hu3DMotionSet(lbl_1_bss_2C80[2], lbl_1_bss_2C66[4]); + Hu3DMotionTimeSet(lbl_1_bss_2C80[0], 0); + Hu3DModelAttrSet(lbl_1_bss_2C80[0], HU3D_MOTATTR_PAUSE); + HuSprExecLayerSet(64, 3); + espDrawNoSet(lbl_1_bss_2C2C[3], 64); + for (i = 0; i < 4; i++) { + Hu3DModelLayerSet(lbl_1_bss_2C80[i + 9], 3); + } + fn_1_26C28(); + espDrawNoSet(lbl_1_bss_2C2C[28], 64); + Hu3DModelPosSet(lbl_1_bss_2C80[5], 0, 0, 500); + lbl_1_bss_8.unk0 = lbl_1_bss_2C80[2]; + lbl_1_bss_8.unk8 = lbl_1_bss_2C66[4]; + lbl_1_bss_8.unk4 = lbl_1_bss_2C66[3]; + lbl_1_bss_8.unkC = lbl_1_bss_2C80[5]; + lbl_1_bss_8.unk10 = lbl_1_bss_2C66[6]; + lbl_1_bss_8.unk14 = lbl_1_bss_2C66[7]; + lbl_1_bss_8.unk18 = lbl_1_bss_2C66[6]; + fn_1_18DF8(lbl_1_bss_2D8, &lbl_1_bss_8); + Hu3DModelShadowSet(lbl_1_bss_2C80[5]); + Hu3DModelShadowMapSet(lbl_1_bss_2C80[0]); } void fn_1_6C18(void); void fn_1_54F4(void) { - while(1) { - if(lbl_1_bss_2D0) { - break; - } - if(omSysExitReq) { - break; - } - HuPrcVSleep(); - } - WipeColorSet(255, 255, 255); - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); - HuAudSeqAllFadeOut(1000); - while(WipeStatGet()) { - HuPrcVSleep(); - } - HuDataDirClose(DATADIR_INSTPIC); - if(memcmp(&mgGameStatBackup, &GWGameStat, sizeof(GWGameStat))) { - fn_1_6C18(); - } - BoardStatusKill(); - omOvlReturnEx(1, 1); - HuPrcEnd(); + while (1) { + if (lbl_1_bss_2D0) { + break; + } + if (omSysExitReq) { + break; + } + HuPrcVSleep(); + } + WipeColorSet(255, 255, 255); + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); + HuAudSeqAllFadeOut(1000); + while (WipeStatGet()) { + HuPrcVSleep(); + } + HuDataDirClose(DATADIR_INSTPIC); + if (memcmp(&mgGameStatBackup, &GWGameStat, sizeof(GWGameStat))) { + fn_1_6C18(); + } + BoardStatusKill(); + omOvlReturnEx(1, 1); + HuPrcEnd(); } - -static u16 lbl_1_data_8C[2] = { - 1, - 2 -}; +static u16 lbl_1_data_8C[2] = { 1, 2 }; void fn_1_55C0(omObjData *object) { - s16 i; - for(i=0; i<1; i++) { - Vec pos, target, up; - float x, y, z; - - x = lbl_1_bss_28C[i].x; - y = lbl_1_bss_28C[i].y; - z = lbl_1_bss_28C[i].z; - - pos.x = (((sind(y)*cosd(x))*lbl_1_bss_26C[i])+lbl_1_bss_274[i].x); - pos.y = (-sind(x)*lbl_1_bss_26C[i])+lbl_1_bss_274[i].y; - pos.z = ((cosd(y)*cosd(x))*lbl_1_bss_26C[i])+lbl_1_bss_274[i].z; - target.x = lbl_1_bss_274[i].x; - target.y = lbl_1_bss_274[i].y; - target.z = lbl_1_bss_274[i].z; - up.x = sind(y)*sind(x); - up.y = cosd(x); - up.z = cosd(y)*sind(x); - Hu3DCameraPosSet(lbl_1_data_8C[i], pos.x, pos.y, pos.z, up.x, up.y, up.z, target.x, target.y, target.z); - } + s16 i; + for (i = 0; i < 1; i++) { + Vec pos, target, up; + float x, y, z; + + x = lbl_1_bss_28C[i].x; + y = lbl_1_bss_28C[i].y; + z = lbl_1_bss_28C[i].z; + + pos.x = (((sind(y) * cosd(x)) * lbl_1_bss_26C[i]) + lbl_1_bss_274[i].x); + pos.y = (-sind(x) * lbl_1_bss_26C[i]) + lbl_1_bss_274[i].y; + pos.z = ((cosd(y) * cosd(x)) * lbl_1_bss_26C[i]) + lbl_1_bss_274[i].z; + target.x = lbl_1_bss_274[i].x; + target.y = lbl_1_bss_274[i].y; + target.z = lbl_1_bss_274[i].z; + up.x = sind(y) * sind(x); + up.y = cosd(x); + up.z = cosd(y) * sind(x); + Hu3DCameraPosSet(lbl_1_data_8C[i], pos.x, pos.y, pos.z, up.x, up.y, up.z, target.x, target.y, target.z); + } } void fn_1_66B0(void); void fn_1_5974(omObjData *object) { - Vec pos; + Vec pos; Vec offset; Vec dir; Vec y_offset; - + f32 z_rot; s8 stick_pos; - if(HuPadBtnDown[0] & PAD_BUTTON_Y) { - lbl_1_bss_0 = (lbl_1_bss_0) ? 0 : 1; - } - if(lbl_1_bss_0 == 0) { - fn_1_66B0(); - return; - } - lbl_1_bss_28C[0].y += 0.1f * HuPadStkX[0]; - lbl_1_bss_28C[0].x += 0.1f * HuPadStkY[0]; - lbl_1_bss_26C[0] += HuPadTrigL[0] / 2; - lbl_1_bss_26C[0] -= HuPadTrigR[0] / 2; - if(HuPadBtnDown[0] & PAD_BUTTON_B) { - OSReport("%f,%f,%f\n", lbl_1_bss_28C[0].x, lbl_1_bss_28C[0].y, lbl_1_bss_28C[0].z); - OSReport("%f,%f,%f\n", lbl_1_bss_274[0].x, lbl_1_bss_274[0].y, lbl_1_bss_274[0].z); - OSReport("%f\n", lbl_1_bss_26C[0]); - } - if (lbl_1_bss_26C[0] < 100.0f) { - lbl_1_bss_26C[0] = 100.0f; - } - pos.x = lbl_1_bss_274[0].x + (lbl_1_bss_26C[0] * (sind(lbl_1_bss_28C[0].y) * cosd(lbl_1_bss_28C[0].x))); - pos.y = (lbl_1_bss_274[0].y + (lbl_1_bss_26C[0] * -sind(lbl_1_bss_28C[0].x))); - pos.z = (lbl_1_bss_274[0].z + (lbl_1_bss_26C[0] * (cosd(lbl_1_bss_28C[0].y) * cosd(lbl_1_bss_28C[0].x)))); - offset.x = lbl_1_bss_274[0].x - pos.x; - offset.y = lbl_1_bss_274[0].y - pos.y; - offset.z = lbl_1_bss_274[0].z - pos.z; - dir.x = (sind(lbl_1_bss_28C[0].y) * sind(lbl_1_bss_28C[0].x)); - dir.y = cosd(lbl_1_bss_28C[0].x); - dir.z = (cosd(lbl_1_bss_28C[0].y) * sind(lbl_1_bss_28C[0].x)); - z_rot = lbl_1_bss_28C[0].z; - 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.z * (offset.x * offset.z * (1.0f - cosd(z_rot)) + offset.y * sind(z_rot)); + if (HuPadBtnDown[0] & PAD_BUTTON_Y) { + lbl_1_bss_0 = (lbl_1_bss_0) ? 0 : 1; + } + if (lbl_1_bss_0 == 0) { + fn_1_66B0(); + return; + } + lbl_1_bss_28C[0].y += 0.1f * HuPadStkX[0]; + lbl_1_bss_28C[0].x += 0.1f * HuPadStkY[0]; + lbl_1_bss_26C[0] += HuPadTrigL[0] / 2; + lbl_1_bss_26C[0] -= HuPadTrigR[0] / 2; + if (HuPadBtnDown[0] & PAD_BUTTON_B) { + OSReport("%f,%f,%f\n", lbl_1_bss_28C[0].x, lbl_1_bss_28C[0].y, lbl_1_bss_28C[0].z); + OSReport("%f,%f,%f\n", lbl_1_bss_274[0].x, lbl_1_bss_274[0].y, lbl_1_bss_274[0].z); + OSReport("%f\n", lbl_1_bss_26C[0]); + } + if (lbl_1_bss_26C[0] < 100.0f) { + lbl_1_bss_26C[0] = 100.0f; + } + pos.x = lbl_1_bss_274[0].x + (lbl_1_bss_26C[0] * (sind(lbl_1_bss_28C[0].y) * cosd(lbl_1_bss_28C[0].x))); + pos.y = (lbl_1_bss_274[0].y + (lbl_1_bss_26C[0] * -sind(lbl_1_bss_28C[0].x))); + pos.z = (lbl_1_bss_274[0].z + (lbl_1_bss_26C[0] * (cosd(lbl_1_bss_28C[0].y) * cosd(lbl_1_bss_28C[0].x)))); + offset.x = lbl_1_bss_274[0].x - pos.x; + offset.y = lbl_1_bss_274[0].y - pos.y; + offset.z = lbl_1_bss_274[0].z - pos.z; + dir.x = (sind(lbl_1_bss_28C[0].y) * sind(lbl_1_bss_28C[0].x)); + dir.y = cosd(lbl_1_bss_28C[0].x); + dir.z = (cosd(lbl_1_bss_28C[0].y) * sind(lbl_1_bss_28C[0].x)); + z_rot = lbl_1_bss_28C[0].z; + 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.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)) - + 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)); - - 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.y * (offset.y * offset.z * (1.0 - cosd(z_rot)) + offset.x * sind(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.z * (offset.y * offset.z * (1.0f - cosd(z_rot)) - offset.x * sind(z_rot)); - VECCrossProduct(&dir, &offset, &offset); - VECNormalize(&offset, &offset); - stick_pos = (HuPadSubStkX[0] & 0xF8); - if (stick_pos != 0) { - lbl_1_bss_274[0].x += 0.05f * (offset.x * stick_pos); - lbl_1_bss_274[0].y += 0.05f * (offset.y * stick_pos); - lbl_1_bss_274[0].z += 0.05f * (offset.z * stick_pos); - } - VECNormalize(&y_offset, &offset); - stick_pos = -(HuPadSubStkY[0] & 0xF8); - if (stick_pos != 0) { - lbl_1_bss_274[0].x += 0.05f * (offset.x * stick_pos); - lbl_1_bss_274[0].y += 0.05f * (offset.y * stick_pos); - lbl_1_bss_274[0].z += 0.05f * (offset.z * stick_pos); - } + 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.y * (offset.y * offset.z * (1.0 - cosd(z_rot)) + offset.x * sind(z_rot))); + + VECCrossProduct(&dir, &offset, &offset); + VECNormalize(&offset, &offset); + stick_pos = (HuPadSubStkX[0] & 0xF8); + if (stick_pos != 0) { + lbl_1_bss_274[0].x += 0.05f * (offset.x * stick_pos); + lbl_1_bss_274[0].y += 0.05f * (offset.y * stick_pos); + lbl_1_bss_274[0].z += 0.05f * (offset.z * stick_pos); + } + VECNormalize(&y_offset, &offset); + stick_pos = -(HuPadSubStkY[0] & 0xF8); + if (stick_pos != 0) { + lbl_1_bss_274[0].x += 0.05f * (offset.x * stick_pos); + lbl_1_bss_274[0].y += 0.05f * (offset.y * stick_pos); + lbl_1_bss_274[0].z += 0.05f * (offset.z * stick_pos); + } } void fn_1_65EC(void) { - Vec pos = { 0, 3000, 800 }; - Vec target = { 0, 0, 640 }; - Vec up = { 0, 1, 0 }; - Hu3DShadowCreate(45, 2000, 25000); - Hu3DShadowTPLvlSet(0.8f); - Hu3DShadowPosSet(&pos, &up, &target); + Vec pos = { 0, 3000, 800 }; + Vec target = { 0, 0, 640 }; + Vec up = { 0, 1, 0 }; + Hu3DShadowCreate(45, 2000, 25000); + Hu3DShadowTPLvlSet(0.8f); + Hu3DShadowPosSet(&pos, &up, &target); } void fn_1_66B0(void) { - Vec deltaVec; - float delta; - - if(lbl_1_bss_2D0) { - return; - } - VECSubtract(&lbl_1_bss_2C0, &lbl_1_bss_28C[0], &deltaVec); - if(VECMag(&deltaVec) > 0.2) { - VECScale(&deltaVec, &deltaVec, 0.05f); - VECAdd(&lbl_1_bss_28C[0], &deltaVec, &lbl_1_bss_28C[0]); - } else { - lbl_1_bss_28C[0] = lbl_1_bss_2C0; - } - VECSubtract(&lbl_1_bss_2B4, &lbl_1_bss_274[0], &deltaVec); - if(VECMag(&deltaVec) > 0.2) { - VECScale(&deltaVec, &deltaVec, 0.05f); - VECAdd(&lbl_1_bss_274[0], &deltaVec, &lbl_1_bss_274[0]); - } else { - lbl_1_bss_274[0] = lbl_1_bss_2B4; - } - delta = lbl_1_bss_2B0-lbl_1_bss_26C[0]; - if(sqrtf(delta*delta) > 0.2) { - delta *= 0.05f; - lbl_1_bss_26C[0] += delta; - } else { - lbl_1_bss_26C[0] = lbl_1_bss_2B0; - } + Vec deltaVec; + float delta; + + if (lbl_1_bss_2D0) { + return; + } + VECSubtract(&lbl_1_bss_2C0, &lbl_1_bss_28C[0], &deltaVec); + if (VECMag(&deltaVec) > 0.2) { + VECScale(&deltaVec, &deltaVec, 0.05f); + VECAdd(&lbl_1_bss_28C[0], &deltaVec, &lbl_1_bss_28C[0]); + } + else { + lbl_1_bss_28C[0] = lbl_1_bss_2C0; + } + VECSubtract(&lbl_1_bss_2B4, &lbl_1_bss_274[0], &deltaVec); + if (VECMag(&deltaVec) > 0.2) { + VECScale(&deltaVec, &deltaVec, 0.05f); + VECAdd(&lbl_1_bss_274[0], &deltaVec, &lbl_1_bss_274[0]); + } + else { + lbl_1_bss_274[0] = lbl_1_bss_2B4; + } + delta = lbl_1_bss_2B0 - lbl_1_bss_26C[0]; + if (sqrtf(delta * delta) > 0.2) { + delta *= 0.05f; + lbl_1_bss_26C[0] += delta; + } + else { + lbl_1_bss_26C[0] = lbl_1_bss_2B0; + } } void fn_1_6974(s16 arg0) { - lbl_1_bss_2C0 = lbl_1_data_0[arg0].rot; - lbl_1_bss_2B4 = lbl_1_data_0[arg0].pos; - lbl_1_bss_2B0 = lbl_1_data_0[arg0].zoom; + lbl_1_bss_2C0 = lbl_1_data_0[arg0].rot; + lbl_1_bss_2B4 = lbl_1_data_0[arg0].pos; + lbl_1_bss_2B0 = lbl_1_data_0[arg0].zoom; } void fn_1_6A04(s16 arg0) { - lbl_1_bss_2C0 = lbl_1_bss_28C[0] = lbl_1_data_0[arg0].rot; - lbl_1_bss_2B4 = lbl_1_bss_274[0] = lbl_1_data_0[arg0].pos; - lbl_1_bss_2B0 = lbl_1_bss_26C[0] = lbl_1_data_0[arg0].zoom; + lbl_1_bss_2C0 = lbl_1_bss_28C[0] = lbl_1_data_0[arg0].rot; + lbl_1_bss_2B4 = lbl_1_bss_274[0] = lbl_1_data_0[arg0].pos; + lbl_1_bss_2B0 = lbl_1_bss_26C[0] = lbl_1_data_0[arg0].zoom; } float fn_1_6AF0(void) { - float delta = lbl_1_bss_2B0-lbl_1_bss_26C[0]; - return sqrtf(delta*delta); + float delta = lbl_1_bss_2B0 - lbl_1_bss_26C[0]; + return sqrtf(delta * delta); } void fn_1_6C18(void) { - s16 sprite; - if(!SLSaveFlagGet()) { - return; - } - Hu3DAllKill(); - HuSprClose(); - HuSprInit(); - espInit(); - HuPrcVSleep(); - sprite = espEntry(DATA_MAKE_NUM(DATADIR_WIN, 0x20), 5000, 0); - espPosSet(sprite, 288.0, 240.0); - espAttrReset(sprite, 4); - Hu3DBGColorSet(0, 0, 0); - WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); - while(WipeStatGet()) { - HuPrcVSleep(); - } - SLCommonSet(); - if(!SLSave()) { - GWSaveModeSet(1); - } - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20); - while(WipeStatGet()) { - HuPrcVSleep(); - } + s16 sprite; + if (!SLSaveFlagGet()) { + return; + } + Hu3DAllKill(); + HuSprClose(); + HuSprInit(); + espInit(); + HuPrcVSleep(); + sprite = espEntry(DATA_MAKE_NUM(DATADIR_WIN, 0x20), 5000, 0); + espPosSet(sprite, 288.0, 240.0); + espAttrReset(sprite, HUSPR_ATTR_DISPOFF); + Hu3DBGColorSet(0, 0, 0); + WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); + while (WipeStatGet()) { + HuPrcVSleep(); + } + SLCommonSet(); + if (!SLSave()) { + GWSaveModeSet(1); + } + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20); + while (WipeStatGet()) { + HuPrcVSleep(); + } } diff --git a/src/REL/modeltestDll/modeltest01.c b/src/REL/modeltestDll/modeltest01.c index 20e4cff3..8f77b253 100644 --- a/src/REL/modeltestDll/modeltest01.c +++ b/src/REL/modeltestDll/modeltest01.c @@ -1,26 +1,26 @@ -#include "game/object.h" -#include "game/hsfman.h" -#include "game/hsfload.h" #include "game/hsfdraw.h" +#include "game/hsfload.h" +#include "game/hsfman.h" +#include "game/object.h" #include "game/printfunc.h" #include "game/hsfmotion.h" -#include "game/wipe.h" #include "game/audio.h" +#include "game/gamework_data.h" #include "game/msm.h" #include "game/pad.h" #include "game/process.h" -#include "game/gamework_data.h" +#include "game/wipe.h" -#include "math.h" #include "ext_math.h" +#include "math.h" typedef struct unk_bss_a18 { - u32 unk0; - Vec unk4; - Vec unk10; - u8 unk1C[0x88]; + u32 unk0; + Vec unk4; + Vec unk10; + u8 unk1C[0x88]; } UnkBssA18; omObjData *lbl_1_bss_AC4; @@ -40,714 +40,610 @@ void fn_1_5DA8(void); void fn_1_6AE0(ModelData *model, Mtx mtx); void fn_1_83B4(void); - -static const Vec lbl_1_rodata_1C8 = {0.0f, 0.0f, 0.0f}; -static const Vec lbl_1_rodata_1D4 = {0.0f, 0.0f, -1.0f}; +static const Vec lbl_1_rodata_1C8 = { 0.0f, 0.0f, 0.0f }; +static const Vec lbl_1_rodata_1D4 = { 0.0f, 0.0f, -1.0f }; void fn_1_4AC8(void) { - Vec sp14; - Vec sp8; - Process *objman; - OSReport("******* MODELTESTObjectSetup *********\n"); - objman = omInitObjMan(50, 8192); - CRot.x = -22; - CRot.y = 0; - CRot.z = 0; - Center.x = 0; - Center.y = 100; - Center.z = 0; - CZoom = 400; - Hu3DCameraCreate(1); - lbl_1_bss_A0C = 45; - Hu3DCameraPerspectiveSet(1, lbl_1_bss_A0C, 20, 5000, 1.2f); - Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); - Hu3DCameraScissorSet(1, 0, 0, 640, 480); - lbl_1_bss_ABC = omAddObjEx(objman, 0, 32, 32, -1, fn_1_4DF8); - lbl_1_bss_AC0 = omAddObjEx(objman, 32730, 0, 0, -1, fn_1_5A60); - lbl_1_bss_A00 = HuPrcCreate(fn_1_5DA8, 100, 8192, 0); - Hu3DBGColorSet(16, 16, 16); - Hu3DHookFuncCreate(fn_1_6AE0); - HuPrcChildCreate(fn_1_83B4, 100, 12288, 0, objman); - WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); - sp14 = lbl_1_rodata_1C8; - sp8 = lbl_1_rodata_1D4; - lbl_1_bss_A18.unk0 = 64; - lbl_1_bss_A18.unk10.x = 0; - lbl_1_bss_A18.unk10.y = 0; - lbl_1_bss_A18.unk10.z = 0; - msmSeSetListener(&sp14, &sp8, 2000, 1000, 0); + Vec sp14; + Vec sp8; + Process *objman; + OSReport("******* MODELTESTObjectSetup *********\n"); + objman = omInitObjMan(50, 8192); + CRot.x = -22; + CRot.y = 0; + CRot.z = 0; + Center.x = 0; + Center.y = 100; + Center.z = 0; + CZoom = 400; + Hu3DCameraCreate(1); + lbl_1_bss_A0C = 45; + Hu3DCameraPerspectiveSet(1, lbl_1_bss_A0C, 20, 5000, 1.2f); + Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); + Hu3DCameraScissorSet(1, 0, 0, 640, 480); + lbl_1_bss_ABC = omAddObjEx(objman, 0, 32, 32, -1, fn_1_4DF8); + lbl_1_bss_AC0 = omAddObjEx(objman, 32730, 0, 0, -1, fn_1_5A60); + lbl_1_bss_A00 = HuPrcCreate(fn_1_5DA8, 100, 8192, 0); + Hu3DBGColorSet(16, 16, 16); + Hu3DHookFuncCreate(fn_1_6AE0); + HuPrcChildCreate(fn_1_83B4, 100, 12288, 0, objman); + WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30); + sp14 = lbl_1_rodata_1C8; + sp8 = lbl_1_rodata_1D4; + lbl_1_bss_A18.unk0 = 64; + lbl_1_bss_A18.unk10.x = 0; + lbl_1_bss_A18.unk10.y = 0; + lbl_1_bss_A18.unk10.z = 0; + msmSeSetListener(&sp14, &sp8, 2000, 1000, 0); } void fn_1_4DF8(omObjData *object) { - float temp_f31; - Vec pos; + float temp_f31; + Vec pos; Vec offset; Vec dir; Vec y_offset; - s8 temp_r31; - - if(HuPadBtnDown[0] & PAD_BUTTON_START) { - if(lbl_1_bss_A00) { - HuPrcKill(lbl_1_bss_A00); - } - if(lbl_1_bss_A04) { - HuPrcKill(lbl_1_bss_A04); - } - HuAudFXListnerKill(); - omOvlReturnEx(1, 1); - return; - } - CRot.y += 0.1f*HuPadStkX[0]; - CRot.x += 0.1f*HuPadStkY[0]; - CZoom += HuPadTrigL[0]/2; - CZoom -= HuPadTrigR[0]/2; - if(CZoom < 100) { - CZoom = 100; - } - if(CZoom > 2000) { - CZoom = 2000; - } - pos.x = Center.x + (CZoom * (sind(CRot.y) * cosd(CRot.x))); - pos.y = (Center.y + (CZoom * -sind(CRot.x))); - pos.z = (Center.z + (CZoom * (cosd(CRot.y) * cosd(CRot.x)))); - offset.x = Center.x - pos.x; - offset.y = Center.y - pos.y; - offset.z = Center.z - pos.z; - dir.x = (sind(CRot.y) * sind(CRot.x)); - dir.y = cosd(CRot.x); - dir.z = (cosd(CRot.y) * sind(CRot.x)); - temp_f31 = CRot.z; - y_offset.x = dir.x * (offset.x * offset.x + (1.0f - offset.x * offset.x) * cosd(temp_f31)) - + dir.y * (offset.x * offset.y * (1.0f - cosd(temp_f31)) - offset.z * sind(temp_f31)) - + dir.z * (offset.x * offset.z * (1.0f - cosd(temp_f31)) + offset.y * sind(temp_f31)); + s8 temp_r31; - y_offset.y = dir.y * (offset.y * offset.y + (1.0f - offset.y * offset.y) * cosd(temp_f31)) - + dir.x * (offset.x * offset.y * (1.0f - cosd(temp_f31)) + offset.z * sind(temp_f31)) - + dir.z * (offset.y * offset.z * (1.0f - cosd(temp_f31)) - offset.x * sind(temp_f31)); - - y_offset.z = dir.z * (offset.z * offset.z + (1.0f - offset.z * offset.z) * cosd(temp_f31)) - + (dir.x * (offset.x * offset.z * (1.0 - cosd(temp_f31)) - offset.y * sind(temp_f31)) - + dir.y * (offset.y * offset.z * (1.0 - cosd(temp_f31)) + offset.x * sind(temp_f31))); - VECCrossProduct(&dir, &offset, &offset); - VECNormalize(&offset, &offset); - temp_r31 = (HuPadSubStkX[0] & 0xF8); - if (temp_r31 != 0) { - Center.x += 0.05f * (offset.x * temp_r31); - Center.y += 0.05f * (offset.y * temp_r31); - Center.z += 0.05f * (offset.z * temp_r31); - } - VECNormalize(&y_offset, &offset); - temp_r31 = -(HuPadSubStkY[0] & 0xF8); - if (temp_r31 != 0) { - Center.x += 0.05f * (offset.x * temp_r31); - Center.y += 0.05f * (offset.y * temp_r31); - Center.z += 0.05f * (offset.z * temp_r31); - } - Hu3DCameraPerspectiveSet(1, lbl_1_bss_A0C, 20, 5000, 1.2f); + if (HuPadBtnDown[0] & PAD_BUTTON_START) { + if (lbl_1_bss_A00) { + HuPrcKill(lbl_1_bss_A00); + } + if (lbl_1_bss_A04) { + HuPrcKill(lbl_1_bss_A04); + } + HuAudFXListnerKill(); + omOvlReturnEx(1, 1); + return; + } + CRot.y += 0.1f * HuPadStkX[0]; + CRot.x += 0.1f * HuPadStkY[0]; + CZoom += HuPadTrigL[0] / 2; + CZoom -= HuPadTrigR[0] / 2; + if (CZoom < 100) { + CZoom = 100; + } + if (CZoom > 2000) { + CZoom = 2000; + } + pos.x = Center.x + (CZoom * (sind(CRot.y) * cosd(CRot.x))); + pos.y = (Center.y + (CZoom * -sind(CRot.x))); + pos.z = (Center.z + (CZoom * (cosd(CRot.y) * cosd(CRot.x)))); + offset.x = Center.x - pos.x; + offset.y = Center.y - pos.y; + offset.z = Center.z - pos.z; + dir.x = (sind(CRot.y) * sind(CRot.x)); + dir.y = cosd(CRot.x); + dir.z = (cosd(CRot.y) * sind(CRot.x)); + temp_f31 = CRot.z; + y_offset.x = dir.x * (offset.x * offset.x + (1.0f - offset.x * offset.x) * cosd(temp_f31)) + + dir.y * (offset.x * offset.y * (1.0f - cosd(temp_f31)) - offset.z * sind(temp_f31)) + + dir.z * (offset.x * offset.z * (1.0f - cosd(temp_f31)) + offset.y * sind(temp_f31)); + + y_offset.y = dir.y * (offset.y * offset.y + (1.0f - offset.y * offset.y) * cosd(temp_f31)) + + dir.x * (offset.x * offset.y * (1.0f - cosd(temp_f31)) + offset.z * sind(temp_f31)) + + dir.z * (offset.y * offset.z * (1.0f - cosd(temp_f31)) - offset.x * sind(temp_f31)); + + y_offset.z = dir.z * (offset.z * offset.z + (1.0f - offset.z * offset.z) * cosd(temp_f31)) + + (dir.x * (offset.x * offset.z * (1.0 - cosd(temp_f31)) - offset.y * sind(temp_f31)) + + dir.y * (offset.y * offset.z * (1.0 - cosd(temp_f31)) + offset.x * sind(temp_f31))); + VECCrossProduct(&dir, &offset, &offset); + VECNormalize(&offset, &offset); + temp_r31 = (HuPadSubStkX[0] & 0xF8); + if (temp_r31 != 0) { + Center.x += 0.05f * (offset.x * temp_r31); + Center.y += 0.05f * (offset.y * temp_r31); + Center.z += 0.05f * (offset.z * temp_r31); + } + VECNormalize(&y_offset, &offset); + temp_r31 = -(HuPadSubStkY[0] & 0xF8); + if (temp_r31 != 0) { + Center.x += 0.05f * (offset.x * temp_r31); + Center.y += 0.05f * (offset.y * temp_r31); + Center.z += 0.05f * (offset.z * temp_r31); + } + Hu3DCameraPerspectiveSet(1, lbl_1_bss_A0C, 20, 5000, 1.2f); } void fn_1_5A60(omObjData *object) { - Mtx rotAxis; - Vec pos, target, up; - float x, y, z; - - x = CRot.x; - y = CRot.y; - z = CRot.z; - - pos.x = (((sind(y)*cosd(x))*CZoom)+Center.x); - pos.y = (-sind(x)*CZoom)+Center.y; - pos.z = ((cosd(y)*cosd(x))*CZoom)+Center.z; - target.x = Center.x; - target.y = Center.y; - target.z = Center.z; - up.x = sind(y)*sind(x); - up.y = cosd(x); - up.z = cosd(y)*sind(x); - Hu3DCameraPosSet(1, pos.x, pos.y, pos.z, up.x, up.y, up.z, target.x, target.y, target.z); - MTXRotDeg(rotAxis, 'y', -y); - MTXMultVec(rotAxis, &pos, &up); - VECSubtract(&target, &pos, &up); - VECNormalize(&up, &up); - HuAudFXListnerUpdate(&pos, &up); + Mtx rotAxis; + Vec pos, target, up; + float x, y, z; + + x = CRot.x; + y = CRot.y; + z = CRot.z; + + pos.x = (((sind(y) * cosd(x)) * CZoom) + Center.x); + pos.y = (-sind(x) * CZoom) + Center.y; + pos.z = ((cosd(y) * cosd(x)) * CZoom) + Center.z; + target.x = Center.x; + target.y = Center.y; + target.z = Center.z; + up.x = sind(y) * sind(x); + up.y = cosd(x); + up.z = cosd(y) * sind(x); + Hu3DCameraPosSet(1, pos.x, pos.y, pos.z, up.x, up.y, up.z, target.x, target.y, target.z); + MTXRotDeg(rotAxis, 'y', -y); + MTXMultVec(rotAxis, &pos, &up); + VECSubtract(&target, &pos, &up); + VECNormalize(&up, &up); + HuAudFXListnerUpdate(&pos, &up); } -u32 lbl_1_data_3B0[] = { - DATA_MAKE_NUM(DATADIR_MARIOMDL0, 0x00), 0x00000000, - DATA_MAKE_NUM(DATADIR_MARIOMDL1, 0x00), 0x00000000, - DATA_MAKE_NUM(DATADIR_MARIOMDL1, 0x01), 0x00000000, - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x06), 0x00000001, - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), 0x00000001, - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02), 0x00000001, - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03), 0x00000001, - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05), 0x00000000, - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), 0x00000000, - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18), 0x00000000, - 0x00000000, 0x00000000 -}; +u32 lbl_1_data_3B0[] = { DATA_MAKE_NUM(DATADIR_MARIOMDL0, 0x00), 0x00000000, DATA_MAKE_NUM(DATADIR_MARIOMDL1, 0x00), 0x00000000, + DATA_MAKE_NUM(DATADIR_MARIOMDL1, 0x01), 0x00000000, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x06), 0x00000001, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), + 0x00000001, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02), 0x00000001, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03), 0x00000001, + DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05), 0x00000000, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), 0x00000000, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18), + 0x00000000, 0x00000000, 0x00000000 }; -u32 lbl_1_data_408[] = { - DATA_MAKE_NUM(DATADIR_LUIGI, 0x00), 0x00000000, - DATA_MAKE_NUM(DATADIR_LUIGI, 0x02), 0x00000000, - DATA_MAKE_NUM(DATADIR_LUIGI, 0x03), 0x00000000, - DATA_MAKE_NUM(DATADIR_LUIGI, 0x0D), 0x00000001, - DATA_MAKE_NUM(DATADIR_LUIGI, 0x05), 0x00000001, - DATA_MAKE_NUM(DATADIR_LUIGI, 0x07), 0x00000001, - DATA_MAKE_NUM(DATADIR_LUIGI, 0x08), 0x00000001, - DATA_MAKE_NUM(DATADIR_LUIGI, 0x0C), 0x00000000, - DATA_MAKE_NUM(DATADIR_LUIGI, 0x28), 0x00000000, - DATA_MAKE_NUM(DATADIR_LUIGI, 0x29), 0x00000000, - 0x00000000, 0x00000000 -}; +u32 lbl_1_data_408[] = { DATA_MAKE_NUM(DATADIR_LUIGI, 0x00), 0x00000000, DATA_MAKE_NUM(DATADIR_LUIGI, 0x02), 0x00000000, + DATA_MAKE_NUM(DATADIR_LUIGI, 0x03), 0x00000000, DATA_MAKE_NUM(DATADIR_LUIGI, 0x0D), 0x00000001, DATA_MAKE_NUM(DATADIR_LUIGI, 0x05), 0x00000001, + DATA_MAKE_NUM(DATADIR_LUIGI, 0x07), 0x00000001, DATA_MAKE_NUM(DATADIR_LUIGI, 0x08), 0x00000001, DATA_MAKE_NUM(DATADIR_LUIGI, 0x0C), 0x00000000, + DATA_MAKE_NUM(DATADIR_LUIGI, 0x28), 0x00000000, DATA_MAKE_NUM(DATADIR_LUIGI, 0x29), 0x00000000, 0x00000000, 0x00000000 }; -u32 lbl_1_data_460[] = { - DATA_MAKE_NUM(DATADIR_PEACH, 0x00), 0x00000000, - DATA_MAKE_NUM(DATADIR_PEACH, 0x02), 0x00000000, - DATA_MAKE_NUM(DATADIR_PEACH, 0x03), 0x00000000, - DATA_MAKE_NUM(DATADIR_PEACH, 0x0D), 0x00000001, - DATA_MAKE_NUM(DATADIR_PEACH, 0x05), 0x00000001, - DATA_MAKE_NUM(DATADIR_PEACH, 0x07), 0x00000001, - DATA_MAKE_NUM(DATADIR_PEACH, 0x08), 0x00000001, - DATA_MAKE_NUM(DATADIR_PEACH, 0x0C), 0x00000000, - DATA_MAKE_NUM(DATADIR_PEACH, 0x28), 0x00000000, - DATA_MAKE_NUM(DATADIR_PEACH, 0x29), 0x00000000, - 0x00000000, 0x00000000 -}; +u32 lbl_1_data_460[] = { DATA_MAKE_NUM(DATADIR_PEACH, 0x00), 0x00000000, DATA_MAKE_NUM(DATADIR_PEACH, 0x02), 0x00000000, + DATA_MAKE_NUM(DATADIR_PEACH, 0x03), 0x00000000, DATA_MAKE_NUM(DATADIR_PEACH, 0x0D), 0x00000001, DATA_MAKE_NUM(DATADIR_PEACH, 0x05), 0x00000001, + DATA_MAKE_NUM(DATADIR_PEACH, 0x07), 0x00000001, DATA_MAKE_NUM(DATADIR_PEACH, 0x08), 0x00000001, DATA_MAKE_NUM(DATADIR_PEACH, 0x0C), 0x00000000, + DATA_MAKE_NUM(DATADIR_PEACH, 0x28), 0x00000000, DATA_MAKE_NUM(DATADIR_PEACH, 0x29), 0x00000000, 0x00000000, 0x00000000 }; -u32 lbl_1_data_4B8[] = { - DATA_MAKE_NUM(DATADIR_YOSHI, 0x00), 0x00000000, - DATA_MAKE_NUM(DATADIR_YOSHI, 0x02), 0x00000000, - DATA_MAKE_NUM(DATADIR_YOSHI, 0x03), 0x00000000, - DATA_MAKE_NUM(DATADIR_YOSHI, 0x0D), 0x00000001, - DATA_MAKE_NUM(DATADIR_YOSHI, 0x05), 0x00000001, - DATA_MAKE_NUM(DATADIR_YOSHI, 0x07), 0x00000001, - DATA_MAKE_NUM(DATADIR_YOSHI, 0x08), 0x00000001, - DATA_MAKE_NUM(DATADIR_YOSHI, 0x0C), 0x00000000, - DATA_MAKE_NUM(DATADIR_YOSHI, 0x28), 0x00000000, - DATA_MAKE_NUM(DATADIR_YOSHI, 0x29), 0x00000000, - 0x00000000, 0x00000000 -}; +u32 lbl_1_data_4B8[] = { DATA_MAKE_NUM(DATADIR_YOSHI, 0x00), 0x00000000, DATA_MAKE_NUM(DATADIR_YOSHI, 0x02), 0x00000000, + DATA_MAKE_NUM(DATADIR_YOSHI, 0x03), 0x00000000, DATA_MAKE_NUM(DATADIR_YOSHI, 0x0D), 0x00000001, DATA_MAKE_NUM(DATADIR_YOSHI, 0x05), 0x00000001, + DATA_MAKE_NUM(DATADIR_YOSHI, 0x07), 0x00000001, DATA_MAKE_NUM(DATADIR_YOSHI, 0x08), 0x00000001, DATA_MAKE_NUM(DATADIR_YOSHI, 0x0C), 0x00000000, + DATA_MAKE_NUM(DATADIR_YOSHI, 0x28), 0x00000000, DATA_MAKE_NUM(DATADIR_YOSHI, 0x29), 0x00000000, 0x00000000, 0x00000000 }; -u32 lbl_1_data_510[] = { - DATA_MAKE_NUM(DATADIR_WARIO, 0x00), 0x00000000, - DATA_MAKE_NUM(DATADIR_WARIO, 0x02), 0x00000000, - DATA_MAKE_NUM(DATADIR_WARIO, 0x03), 0x00000000, - DATA_MAKE_NUM(DATADIR_WARIO, 0x0D), 0x00000001, - DATA_MAKE_NUM(DATADIR_WARIO, 0x05), 0x00000001, - DATA_MAKE_NUM(DATADIR_WARIO, 0x07), 0x00000001, - DATA_MAKE_NUM(DATADIR_WARIO, 0x08), 0x00000001, - DATA_MAKE_NUM(DATADIR_WARIO, 0x0C), 0x00000000, - DATA_MAKE_NUM(DATADIR_WARIO, 0x28), 0x00000000, - DATA_MAKE_NUM(DATADIR_WARIO, 0x29), 0x00000000, - 0x00000000, 0x00000000 -}; +u32 lbl_1_data_510[] = { DATA_MAKE_NUM(DATADIR_WARIO, 0x00), 0x00000000, DATA_MAKE_NUM(DATADIR_WARIO, 0x02), 0x00000000, + DATA_MAKE_NUM(DATADIR_WARIO, 0x03), 0x00000000, DATA_MAKE_NUM(DATADIR_WARIO, 0x0D), 0x00000001, DATA_MAKE_NUM(DATADIR_WARIO, 0x05), 0x00000001, + DATA_MAKE_NUM(DATADIR_WARIO, 0x07), 0x00000001, DATA_MAKE_NUM(DATADIR_WARIO, 0x08), 0x00000001, DATA_MAKE_NUM(DATADIR_WARIO, 0x0C), 0x00000000, + DATA_MAKE_NUM(DATADIR_WARIO, 0x28), 0x00000000, DATA_MAKE_NUM(DATADIR_WARIO, 0x29), 0x00000000, 0x00000000, 0x00000000 }; -u32 lbl_1_data_568[] = { - DATA_MAKE_NUM(DATADIR_DONKEY, 0x00), 0x00000000, - DATA_MAKE_NUM(DATADIR_DONKEY, 0x02), 0x00000000, - DATA_MAKE_NUM(DATADIR_DONKEY, 0x03), 0x00000000, - DATA_MAKE_NUM(DATADIR_DONKEY, 0x0D), 0x00000001, - DATA_MAKE_NUM(DATADIR_DONKEY, 0x05), 0x00000001, - DATA_MAKE_NUM(DATADIR_DONKEY, 0x07), 0x00000001, - DATA_MAKE_NUM(DATADIR_DONKEY, 0x08), 0x00000001, - DATA_MAKE_NUM(DATADIR_DONKEY, 0x0C), 0x00000000, - DATA_MAKE_NUM(DATADIR_DONKEY, 0x28), 0x00000000, - DATA_MAKE_NUM(DATADIR_DONKEY, 0x29), 0x00000000, - 0x00000000, 0x00000000 -}; +u32 lbl_1_data_568[] = { DATA_MAKE_NUM(DATADIR_DONKEY, 0x00), 0x00000000, DATA_MAKE_NUM(DATADIR_DONKEY, 0x02), 0x00000000, + DATA_MAKE_NUM(DATADIR_DONKEY, 0x03), 0x00000000, DATA_MAKE_NUM(DATADIR_DONKEY, 0x0D), 0x00000001, DATA_MAKE_NUM(DATADIR_DONKEY, 0x05), 0x00000001, + DATA_MAKE_NUM(DATADIR_DONKEY, 0x07), 0x00000001, DATA_MAKE_NUM(DATADIR_DONKEY, 0x08), 0x00000001, DATA_MAKE_NUM(DATADIR_DONKEY, 0x0C), 0x00000000, + DATA_MAKE_NUM(DATADIR_DONKEY, 0x28), 0x00000000, DATA_MAKE_NUM(DATADIR_DONKEY, 0x29), 0x00000000, 0x00000000, 0x00000000 }; -u32 lbl_1_data_5C0[] = { - DATA_MAKE_NUM(DATADIR_DAISY, 0x00), 0x00000000, - DATA_MAKE_NUM(DATADIR_DAISY, 0x02), 0x00000000, - DATA_MAKE_NUM(DATADIR_DAISY, 0x03), 0x00000000, - DATA_MAKE_NUM(DATADIR_DAISY, 0x0D), 0x00000001, - DATA_MAKE_NUM(DATADIR_DAISY, 0x05), 0x00000001, - DATA_MAKE_NUM(DATADIR_DAISY, 0x07), 0x00000001, - DATA_MAKE_NUM(DATADIR_DAISY, 0x08), 0x00000001, - DATA_MAKE_NUM(DATADIR_DAISY, 0x0C), 0x00000000, - DATA_MAKE_NUM(DATADIR_DAISY, 0x28), 0x00000000, - DATA_MAKE_NUM(DATADIR_DAISY, 0x29), 0x00000000, - 0x00000000, 0x00000000 -}; +u32 lbl_1_data_5C0[] = { DATA_MAKE_NUM(DATADIR_DAISY, 0x00), 0x00000000, DATA_MAKE_NUM(DATADIR_DAISY, 0x02), 0x00000000, + DATA_MAKE_NUM(DATADIR_DAISY, 0x03), 0x00000000, DATA_MAKE_NUM(DATADIR_DAISY, 0x0D), 0x00000001, DATA_MAKE_NUM(DATADIR_DAISY, 0x05), 0x00000001, + DATA_MAKE_NUM(DATADIR_DAISY, 0x07), 0x00000001, DATA_MAKE_NUM(DATADIR_DAISY, 0x08), 0x00000001, DATA_MAKE_NUM(DATADIR_DAISY, 0x0C), 0x00000000, + DATA_MAKE_NUM(DATADIR_DAISY, 0x28), 0x00000000, DATA_MAKE_NUM(DATADIR_DAISY, 0x29), 0x00000000, 0x00000000, 0x00000000 }; -u32 lbl_1_data_618[] = { - DATA_MAKE_NUM(DATADIR_WALUIGI, 0x00), 0x00000000, - DATA_MAKE_NUM(DATADIR_WALUIGI, 0x02), 0x00000000, - DATA_MAKE_NUM(DATADIR_WALUIGI, 0x03), 0x00000000, - DATA_MAKE_NUM(DATADIR_WALUIGI, 0x0D), 0x00000001, - DATA_MAKE_NUM(DATADIR_WALUIGI, 0x05), 0x00000001, - DATA_MAKE_NUM(DATADIR_WALUIGI, 0x07), 0x00000001, - DATA_MAKE_NUM(DATADIR_WALUIGI, 0x08), 0x00000001, - DATA_MAKE_NUM(DATADIR_WALUIGI, 0x0C), 0x00000000, - DATA_MAKE_NUM(DATADIR_WALUIGI, 0x28), 0x00000000, - DATA_MAKE_NUM(DATADIR_WALUIGI, 0x29), 0x00000000, - 0x00000000, 0x00000000 -}; +u32 lbl_1_data_618[] + = { DATA_MAKE_NUM(DATADIR_WALUIGI, 0x00), 0x00000000, DATA_MAKE_NUM(DATADIR_WALUIGI, 0x02), 0x00000000, DATA_MAKE_NUM(DATADIR_WALUIGI, 0x03), + 0x00000000, DATA_MAKE_NUM(DATADIR_WALUIGI, 0x0D), 0x00000001, DATA_MAKE_NUM(DATADIR_WALUIGI, 0x05), 0x00000001, + DATA_MAKE_NUM(DATADIR_WALUIGI, 0x07), 0x00000001, DATA_MAKE_NUM(DATADIR_WALUIGI, 0x08), 0x00000001, DATA_MAKE_NUM(DATADIR_WALUIGI, 0x0C), + 0x00000000, DATA_MAKE_NUM(DATADIR_WALUIGI, 0x28), 0x00000000, DATA_MAKE_NUM(DATADIR_WALUIGI, 0x29), 0x00000000, 0x00000000, 0x00000000 }; -u32 *lbl_1_data_670[] = { - lbl_1_data_3B0, - lbl_1_data_408, - lbl_1_data_460, - lbl_1_data_4B8, - lbl_1_data_510, - lbl_1_data_568, - lbl_1_data_5C0, - lbl_1_data_618 -}; +u32 *lbl_1_data_670[] + = { lbl_1_data_3B0, lbl_1_data_408, lbl_1_data_460, lbl_1_data_4B8, lbl_1_data_510, lbl_1_data_568, lbl_1_data_5C0, lbl_1_data_618 }; void fn_1_69C8(s16 arg0, s16 arg1, s16 arg2); void fn_1_5DA8(void) { - u32 *temp_r31; - s16 temp_r30; - s16 temp_r29; - s16 temp_r28; - s16 temp_r27; - s16 temp_r26; - s16 temp_r25; - - s32 temp_r24 = 0; - s16 sp40[3][32]; - Vec sp34; - - Vec sp28 = { 0, 0, 0 }; - Vec sp1C = { 0, 1, 0 }; - s16 sp16[3]; - s16 sp10[3]; - float spC; - s16 sp8 = 0; - Hu3DGLightCreate(0, 500, 1000, 0, -0.5, -1, 255, 255, 255); - temp_r28 = GWPlayerCfg[0].character; - temp_r31 = lbl_1_data_670[temp_r28]; - sp16[0] = Hu3DModelCreateFile(temp_r31[0]); - sp16[1] = Hu3DModelCreateFile(temp_r31[2]); - sp16[2] = Hu3DModelCreateFile(temp_r31[4]); - HuDataDirClose(temp_r31[0]); - HuDataDirClose(temp_r31[2]); - HuDataDirClose(temp_r31[4]); - temp_r27 = 0; - temp_r29 = 0; - while(1) { - if(temp_r31[(temp_r29*2)+8] == 0) { - if(temp_r27 == 0) { - temp_r27 = temp_r29; - } - break; - } - if(temp_r31[(temp_r29*2)+8] == 0xFFFFFFFF) { - temp_r27 = temp_r29; - } else { - sp40[0][temp_r29] = Hu3DJointMotionFile(sp16[0], temp_r31[(temp_r29*2)+8]); - sp40[1][temp_r29] = Hu3DJointMotionFile(sp16[1], temp_r31[(temp_r29*2)+8]); - sp40[2][temp_r29] = Hu3DJointMotionFile(sp16[2], temp_r31[(temp_r29*2)+8]); - } - temp_r29++; - } - sp10[0] = Hu3DJointMotionFile(sp16[0], temp_r31[6]); - sp10[1] = Hu3DJointMotionFile(sp16[1], temp_r31[6]); - sp10[2] = Hu3DJointMotionFile(sp16[2], temp_r31[6]); - temp_r26 = 0; - temp_r30 = 0; - Hu3DMotionSet(sp16[0], sp40[0][temp_r30]); - Hu3DModelAttrSet(sp16[0], 0x40000001); - Hu3DMotionSet(sp16[1], sp40[1][temp_r30]); - Hu3DModelAttrSet(sp16[1], 0x40000001); - Hu3DMotionSet(sp16[2], sp40[2][temp_r30]); - Hu3DModelAttrSet(sp16[2], 0x40000001); - Hu3DModelAttrSet(sp16[1], 0x1); - Hu3DModelAttrSet(sp16[2], 0x1); - while(1) { - temp_r25 = 0; - if(HuPadBtnDown[0] & PAD_BUTTON_X) { - temp_r30++; - if(temp_r30 >= temp_r27) { - temp_r30 = 0; - } - Hu3DMotionSet(sp16[0], sp40[0][temp_r30]); - Hu3DMotionSet(sp16[1], sp40[1][temp_r30]); - Hu3DMotionSet(sp16[2], sp40[2][temp_r30]); - if(temp_r31[(temp_r30*2)+9] != 0) { - Hu3DModelAttrSet(sp16[0], 0x40000001); - Hu3DModelAttrSet(sp16[1], 0x40000001); - Hu3DModelAttrSet(sp16[2], 0x40000001); - } else { - Hu3DModelAttrReset(sp16[0], 0x40000001); - Hu3DModelAttrReset(sp16[1], 0x40000001); - Hu3DModelAttrReset(sp16[2], 0x40000001); - } - fn_1_69C8(temp_r28, sp16[0], 0); - fn_1_69C8(temp_r28, sp16[1], 1); - fn_1_69C8(temp_r28, sp16[2], 2); - temp_r25 = 1; - } - if(HuPadBtnDown[0] & PAD_BUTTON_Y) { - temp_r30--; - if(temp_r30 < 0) { - temp_r30 = temp_r27-1; - } - Hu3DMotionSet(sp16[0], sp40[0][temp_r30]); - Hu3DMotionSet(sp16[1], sp40[1][temp_r30]); - Hu3DMotionSet(sp16[2], sp40[2][temp_r30]); - if(temp_r31[(temp_r30*2)+9] != 0) { - Hu3DModelAttrSet(sp16[0], 0x40000001); - Hu3DModelAttrSet(sp16[1], 0x40000001); - Hu3DModelAttrSet(sp16[2], 0x40000001); - } else { - Hu3DModelAttrReset(sp16[0], 0x40000001); - Hu3DModelAttrReset(sp16[1], 0x40000001); - Hu3DModelAttrReset(sp16[2], 0x40000001); - } - fn_1_69C8(temp_r28, sp16[0], 0); - fn_1_69C8(temp_r28, sp16[1], 1); - fn_1_69C8(temp_r28, sp16[2], 2); - temp_r25 = 1; - } - if(temp_r31[(temp_r30*2)+9] == 0) { - if(HuPadBtn[0] & PAD_BUTTON_A) { - Hu3DModelAttrSet(sp16[0], 0x40000001); - Hu3DModelAttrSet(sp16[1], 0x40000001); - Hu3DModelAttrSet(sp16[2], 0x40000001); - temp_r25 = 1; - } else { - if(temp_r30 != 3 && temp_r30 != 2) { - Hu3DModelAttrReset(sp16[0], 0x40000001); - Hu3DModelAttrReset(sp16[1], 0x40000001); - Hu3DModelAttrReset(sp16[2], 0x40000001); - } - } - } - if(temp_r25 != 0) { - if(temp_r30 == 3) { - Hu3DMotionSet(sp16[0], sp40[0][temp_r30]); - Hu3DMotionSet(sp16[1], sp40[1][temp_r30]); - Hu3DMotionSet(sp16[2], sp40[2][temp_r30]); - Hu3DModelAttrReset(sp16[0], 0x40000001); - Hu3DModelAttrReset(sp16[1], 0x40000001); - Hu3DModelAttrReset(sp16[2], 0x40000001); - for(temp_r29=0; temp_r29<=30; temp_r29++) { - Hu3DModelPosSet(sp16[0], 0, sind(temp_r29*6.0f)*150, 0); - Hu3DModelPosSet(sp16[1], 0, sind(temp_r29*6.0f)*150, 0); - Hu3DModelPosSet(sp16[2], 0, sind(temp_r29*6.0f)*150, 0); - if(temp_r29 == 25) { - Hu3DMotionSet(sp16[0], sp10[0]); - Hu3DMotionSet(sp16[1], sp10[1]); - Hu3DMotionSet(sp16[2], sp10[2]); - } - HuPrcVSleep(); - } - while(!Hu3DMotionEndCheck(sp16[0])) { - HuPrcVSleep(); - } - fn_1_69C8(temp_r28, sp16[0], 0); - fn_1_69C8(temp_r28, sp16[1], 1); - fn_1_69C8(temp_r28, sp16[2], 2); - Hu3DMotionShiftSet(sp16[0], sp40[0][0], 0, 16, HU3D_MOTATTR_LOOP); - Hu3DMotionShiftSet(sp16[1], sp40[1][0], 0, 16, HU3D_MOTATTR_LOOP); - Hu3DMotionShiftSet(sp16[2], sp40[2][0], 0, 16, HU3D_MOTATTR_LOOP); - } - temp_r24 = 0; - } - sp34.x = Center.x + (CZoom * (sind(CRot.y) * cosd(CRot.x))); - sp34.y = (Center.y + (CZoom * -sind(CRot.x))); - sp34.z = (Center.z + (CZoom * (cosd(CRot.y) * cosd(CRot.x)))); - - spC = VECMag(&sp34); - if(HuPadBtnDown[0] & PAD_BUTTON_B) { - temp_r26++; - if(temp_r26 >= 3) { - temp_r26 = 0; - } - } - Hu3DModelAttrSet(sp16[0], 1); - Hu3DModelAttrSet(sp16[1], 1); - Hu3DModelAttrSet(sp16[2], 1); - switch(temp_r26) { - case 0: - Hu3DModelAttrReset(sp16[0], 1); - break; - - case 1: - Hu3DModelAttrReset(sp16[1], 1); - break; - - case 2: - Hu3DModelAttrReset(sp16[2], 1); - break; - } - HuPrcVSleep(); - } + u32 *temp_r31; + s16 temp_r30; + s16 temp_r29; + s16 temp_r28; + s16 temp_r27; + s16 temp_r26; + s16 temp_r25; + + s32 temp_r24 = 0; + s16 sp40[3][32]; + Vec sp34; + + Vec sp28 = { 0, 0, 0 }; + Vec sp1C = { 0, 1, 0 }; + s16 sp16[3]; + s16 sp10[3]; + float spC; + s16 sp8 = 0; + Hu3DGLightCreate(0, 500, 1000, 0, -0.5, -1, 255, 255, 255); + temp_r28 = GWPlayerCfg[0].character; + temp_r31 = lbl_1_data_670[temp_r28]; + sp16[0] = Hu3DModelCreateFile(temp_r31[0]); + sp16[1] = Hu3DModelCreateFile(temp_r31[2]); + sp16[2] = Hu3DModelCreateFile(temp_r31[4]); + HuDataDirClose(temp_r31[0]); + HuDataDirClose(temp_r31[2]); + HuDataDirClose(temp_r31[4]); + temp_r27 = 0; + temp_r29 = 0; + while (1) { + if (temp_r31[(temp_r29 * 2) + 8] == 0) { + if (temp_r27 == 0) { + temp_r27 = temp_r29; + } + break; + } + if (temp_r31[(temp_r29 * 2) + 8] == 0xFFFFFFFF) { + temp_r27 = temp_r29; + } + else { + sp40[0][temp_r29] = Hu3DJointMotionFile(sp16[0], temp_r31[(temp_r29 * 2) + 8]); + sp40[1][temp_r29] = Hu3DJointMotionFile(sp16[1], temp_r31[(temp_r29 * 2) + 8]); + sp40[2][temp_r29] = Hu3DJointMotionFile(sp16[2], temp_r31[(temp_r29 * 2) + 8]); + } + temp_r29++; + } + sp10[0] = Hu3DJointMotionFile(sp16[0], temp_r31[6]); + sp10[1] = Hu3DJointMotionFile(sp16[1], temp_r31[6]); + sp10[2] = Hu3DJointMotionFile(sp16[2], temp_r31[6]); + temp_r26 = 0; + temp_r30 = 0; + Hu3DMotionSet(sp16[0], sp40[0][temp_r30]); + Hu3DModelAttrSet(sp16[0], HU3D_MOTATTR_LOOP); + Hu3DMotionSet(sp16[1], sp40[1][temp_r30]); + Hu3DModelAttrSet(sp16[1], HU3D_MOTATTR_LOOP); + Hu3DMotionSet(sp16[2], sp40[2][temp_r30]); + Hu3DModelAttrSet(sp16[2], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(sp16[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(sp16[2], HU3D_ATTR_DISPOFF); + while (1) { + temp_r25 = 0; + if (HuPadBtnDown[0] & PAD_BUTTON_X) { + temp_r30++; + if (temp_r30 >= temp_r27) { + temp_r30 = 0; + } + Hu3DMotionSet(sp16[0], sp40[0][temp_r30]); + Hu3DMotionSet(sp16[1], sp40[1][temp_r30]); + Hu3DMotionSet(sp16[2], sp40[2][temp_r30]); + if (temp_r31[(temp_r30 * 2) + 9] != 0) { + Hu3DModelAttrSet(sp16[0], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(sp16[1], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(sp16[2], HU3D_MOTATTR_LOOP); + } + else { + Hu3DModelAttrReset(sp16[0], 0x40000001); + Hu3DModelAttrReset(sp16[1], 0x40000001); + Hu3DModelAttrReset(sp16[2], 0x40000001); + } + fn_1_69C8(temp_r28, sp16[0], 0); + fn_1_69C8(temp_r28, sp16[1], 1); + fn_1_69C8(temp_r28, sp16[2], 2); + temp_r25 = 1; + } + if (HuPadBtnDown[0] & PAD_BUTTON_Y) { + temp_r30--; + if (temp_r30 < 0) { + temp_r30 = temp_r27 - 1; + } + Hu3DMotionSet(sp16[0], sp40[0][temp_r30]); + Hu3DMotionSet(sp16[1], sp40[1][temp_r30]); + Hu3DMotionSet(sp16[2], sp40[2][temp_r30]); + if (temp_r31[(temp_r30 * 2) + 9] != 0) { + Hu3DModelAttrSet(sp16[0], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(sp16[1], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(sp16[2], HU3D_MOTATTR_LOOP); + } + else { + Hu3DModelAttrReset(sp16[0], 0x40000001); + Hu3DModelAttrReset(sp16[1], 0x40000001); + Hu3DModelAttrReset(sp16[2], 0x40000001); + } + fn_1_69C8(temp_r28, sp16[0], 0); + fn_1_69C8(temp_r28, sp16[1], 1); + fn_1_69C8(temp_r28, sp16[2], 2); + temp_r25 = 1; + } + if (temp_r31[(temp_r30 * 2) + 9] == 0) { + if (HuPadBtn[0] & PAD_BUTTON_A) { + Hu3DModelAttrSet(sp16[0], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(sp16[1], HU3D_MOTATTR_LOOP); + Hu3DModelAttrSet(sp16[2], HU3D_MOTATTR_LOOP); + temp_r25 = 1; + } + else { + if (temp_r30 != 3 && temp_r30 != 2) { + Hu3DModelAttrReset(sp16[0], 0x40000001); + Hu3DModelAttrReset(sp16[1], 0x40000001); + Hu3DModelAttrReset(sp16[2], 0x40000001); + } + } + } + if (temp_r25 != 0) { + if (temp_r30 == 3) { + Hu3DMotionSet(sp16[0], sp40[0][temp_r30]); + Hu3DMotionSet(sp16[1], sp40[1][temp_r30]); + Hu3DMotionSet(sp16[2], sp40[2][temp_r30]); + Hu3DModelAttrReset(sp16[0], 0x40000001); + Hu3DModelAttrReset(sp16[1], 0x40000001); + Hu3DModelAttrReset(sp16[2], 0x40000001); + for (temp_r29 = 0; temp_r29 <= 30; temp_r29++) { + Hu3DModelPosSet(sp16[0], 0, sind(temp_r29 * 6.0f) * 150, 0); + Hu3DModelPosSet(sp16[1], 0, sind(temp_r29 * 6.0f) * 150, 0); + Hu3DModelPosSet(sp16[2], 0, sind(temp_r29 * 6.0f) * 150, 0); + if (temp_r29 == 25) { + Hu3DMotionSet(sp16[0], sp10[0]); + Hu3DMotionSet(sp16[1], sp10[1]); + Hu3DMotionSet(sp16[2], sp10[2]); + } + HuPrcVSleep(); + } + while (!Hu3DMotionEndCheck(sp16[0])) { + HuPrcVSleep(); + } + fn_1_69C8(temp_r28, sp16[0], 0); + fn_1_69C8(temp_r28, sp16[1], 1); + fn_1_69C8(temp_r28, sp16[2], 2); + Hu3DMotionShiftSet(sp16[0], sp40[0][0], 0, 16, HU3D_MOTATTR_LOOP); + Hu3DMotionShiftSet(sp16[1], sp40[1][0], 0, 16, HU3D_MOTATTR_LOOP); + Hu3DMotionShiftSet(sp16[2], sp40[2][0], 0, 16, HU3D_MOTATTR_LOOP); + } + temp_r24 = 0; + } + sp34.x = Center.x + (CZoom * (sind(CRot.y) * cosd(CRot.x))); + sp34.y = (Center.y + (CZoom * -sind(CRot.x))); + sp34.z = (Center.z + (CZoom * (cosd(CRot.y) * cosd(CRot.x)))); + + spC = VECMag(&sp34); + if (HuPadBtnDown[0] & PAD_BUTTON_B) { + temp_r26++; + if (temp_r26 >= 3) { + temp_r26 = 0; + } + } + Hu3DModelAttrSet(sp16[0], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(sp16[1], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(sp16[2], HU3D_ATTR_DISPOFF); + switch (temp_r26) { + case 0: + Hu3DModelAttrReset(sp16[0], HU3D_ATTR_DISPOFF); + break; + + case 1: + Hu3DModelAttrReset(sp16[1], HU3D_ATTR_DISPOFF); + break; + + case 2: + Hu3DModelAttrReset(sp16[2], HU3D_ATTR_DISPOFF); + break; + } + HuPrcVSleep(); + } } char *lbl_1_data_6F4[] = { - "s3_mario_eyes_1", - "mario_eyes_2", - "mario_eyes_2", - "S3c001m0_eye", - "S3c001m1_eye", - "c001m3_eye", - "GC-eyes", - "s3tc_GC-eyes_2", - "s3tc_GC-eyes_2", - "S3c003m1", - "S3c003m1", - "S3c003m1", - "GC-eyes", - "s3tc_GC-eyes_2", - "s3tc_GC-eyes_2", - "GC-eyes", - "s3tc_GC-eyes_2", - "s3tc_GC-eyes_2", - "GC-eyes", - "s3tc_GC-eyes_2", - "s3tc_GC-eyes_2", - "GC-eyes", - "s3tc_GC-eyes_2", - "s3tc_GC-eyes_2", + "s3_mario_eyes_1", + "mario_eyes_2", + "mario_eyes_2", + "S3c001m0_eye", + "S3c001m1_eye", + "c001m3_eye", + "GC-eyes", + "s3tc_GC-eyes_2", + "s3tc_GC-eyes_2", + "S3c003m1", + "S3c003m1", + "S3c003m1", + "GC-eyes", + "s3tc_GC-eyes_2", + "s3tc_GC-eyes_2", + "GC-eyes", + "s3tc_GC-eyes_2", + "s3tc_GC-eyes_2", + "GC-eyes", + "s3tc_GC-eyes_2", + "s3tc_GC-eyes_2", + "GC-eyes", + "s3tc_GC-eyes_2", + "s3tc_GC-eyes_2", }; void fn_1_69C8(s16 arg0, s16 arg1, s16 arg2) { - HsfdrawStruct01 *temp_r31; - HsfAttribute *temp_r30; - ModelData *temp_r29; - s16 temp_r28; - char *temp_r27; - temp_r29 = &Hu3DData[arg1]; - temp_r30 = temp_r29->hsfData->attribute; - temp_r27 = MakeObjectName(lbl_1_data_6F4[arg2+(arg0*3)]); - for(temp_r28=0; temp_r28hsfData->attributeCnt; temp_r28++, temp_r30++) { - if(temp_r30->bitmap->name[0] == temp_r27[0] && strcmp(temp_r30->bitmap->name, temp_r27) == 0 && temp_r30->unk04) { - temp_r31 = temp_r30->unk04; - temp_r31->unk08 = temp_r31->unk0C = temp_r31->unk10 = 0; - temp_r31->unk14 = temp_r31->unk18 = temp_r31->unk1C = 0; - } - } + HsfdrawStruct01 *temp_r31; + HsfAttribute *temp_r30; + ModelData *temp_r29; + s16 temp_r28; + char *temp_r27; + temp_r29 = &Hu3DData[arg1]; + temp_r30 = temp_r29->hsfData->attribute; + temp_r27 = MakeObjectName(lbl_1_data_6F4[arg2 + (arg0 * 3)]); + for (temp_r28 = 0; temp_r28 < temp_r29->hsfData->attributeCnt; temp_r28++, temp_r30++) { + if (temp_r30->bitmap->name[0] == temp_r27[0] && strcmp(temp_r30->bitmap->name, temp_r27) == 0 && temp_r30->unk04) { + temp_r31 = temp_r30->unk04; + temp_r31->unk08 = temp_r31->unk0C = temp_r31->unk10 = 0; + temp_r31->unk14 = temp_r31->unk18 = temp_r31->unk1C = 0; + } + } } s32 lbl_1_data_754 = 20; void fn_1_6AE0(ModelData *model, Mtx mtx) { - s32 temp_r31; - u8 temp_r30, temp_r29, temp_r28; - s32 sp84 = 0; - GXClearVtxDesc(); - GXSetVtxDesc(GX_VA_POS, GX_DIRECT); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); - GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGB, GX_RGB8, 0); - GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); - GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_RASC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); - GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_KONST, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); - GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - GXSetNumTexGens(0); - GXSetNumTevStages(1); - GXSetNumChans(1); - GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); - GXLoadPosMtxImm(mtx, GX_PNMTX0); - GXBegin(GX_LINES, GX_VTXFMT0, (lbl_1_data_754+1)*4); - for(temp_r31=0; temp_r31<=lbl_1_data_754; temp_r31++) { - temp_r30 = temp_r29 = temp_r28 = 255; - GXPosition3f32((temp_r31*100)-((lbl_1_data_754/2)*100), 0, (-(lbl_1_data_754/2))*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32((temp_r31*100)-((lbl_1_data_754/2)*100), 0, (lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32(-(lbl_1_data_754/2)*100, 0, (temp_r31*100)-((lbl_1_data_754/2)*100)); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32((lbl_1_data_754/2)*100, 0, (temp_r31*100)-((lbl_1_data_754/2)*100)); - GXColor3u8(temp_r30, temp_r29, temp_r28); - } - GXBegin(GX_LINES, GX_VTXFMT0, (lbl_1_data_754+1)*4); - for(temp_r31=0; temp_r31<=lbl_1_data_754; temp_r31++) { - temp_r30 = temp_r29 = temp_r28 = 255; - GXPosition3f32((temp_r31*100)-((lbl_1_data_754/2)*100), lbl_1_data_754*100, (-(lbl_1_data_754/2))*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32((temp_r31*100)-((lbl_1_data_754/2)*100), 0, -(lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32(-(lbl_1_data_754/2)*100, temp_r31*100, -(lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32((lbl_1_data_754/2)*100, temp_r31*100, -(lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - } - GXBegin(GX_LINES, GX_VTXFMT0, (lbl_1_data_754+1)*4); - for(temp_r31=0; temp_r31<=lbl_1_data_754; temp_r31++) { - temp_r30 = temp_r29 = temp_r28 = 255; - GXPosition3f32((temp_r31*100)-((lbl_1_data_754/2)*100), lbl_1_data_754*100, (lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32((temp_r31*100)-((lbl_1_data_754/2)*100), 0, (lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32(-(lbl_1_data_754/2)*100, temp_r31*100, (lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32((lbl_1_data_754/2)*100, temp_r31*100, (lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - } - GXBegin(GX_LINES, GX_VTXFMT0, (lbl_1_data_754+1)*4); - for(temp_r31=0; temp_r31<=lbl_1_data_754; temp_r31++) { - temp_r30 = temp_r29 = temp_r28 = 255; - GXPosition3f32((lbl_1_data_754/2)*100, lbl_1_data_754*100, (temp_r31*100)-((lbl_1_data_754/2)*100)); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32((lbl_1_data_754/2)*100, 0, (temp_r31*100)-((lbl_1_data_754/2)*100)); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32((lbl_1_data_754/2)*100, temp_r31*100, -(lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32((lbl_1_data_754/2)*100, temp_r31*100, (lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - } - GXBegin(GX_LINES, GX_VTXFMT0, (lbl_1_data_754+1)*4); - for(temp_r31=0; temp_r31<=lbl_1_data_754; temp_r31++) { - temp_r30 = temp_r29 = temp_r28 = 255; - GXPosition3f32(-(lbl_1_data_754/2)*100, lbl_1_data_754*100, (temp_r31*100)-((lbl_1_data_754/2)*100)); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32(-(lbl_1_data_754/2)*100, 0, (temp_r31*100)-((lbl_1_data_754/2)*100)); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32(-(lbl_1_data_754/2)*100, temp_r31*100, -(lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - GXPosition3f32(-(lbl_1_data_754/2)*100, temp_r31*100, (lbl_1_data_754/2)*100); - GXColor3u8(temp_r30, temp_r29, temp_r28); - } + s32 temp_r31; + u8 temp_r30, temp_r29, temp_r28; + s32 sp84 = 0; + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGB, GX_RGB8, 0); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_RASC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_KONST, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetNumTexGens(0); + GXSetNumTevStages(1); + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); + GXLoadPosMtxImm(mtx, GX_PNMTX0); + GXBegin(GX_LINES, GX_VTXFMT0, (lbl_1_data_754 + 1) * 4); + for (temp_r31 = 0; temp_r31 <= lbl_1_data_754; temp_r31++) { + temp_r30 = temp_r29 = temp_r28 = 255; + GXPosition3f32((temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100), 0, (-(lbl_1_data_754 / 2)) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32((temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100), 0, (lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32(-(lbl_1_data_754 / 2) * 100, 0, (temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100)); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32((lbl_1_data_754 / 2) * 100, 0, (temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100)); + GXColor3u8(temp_r30, temp_r29, temp_r28); + } + GXBegin(GX_LINES, GX_VTXFMT0, (lbl_1_data_754 + 1) * 4); + for (temp_r31 = 0; temp_r31 <= lbl_1_data_754; temp_r31++) { + temp_r30 = temp_r29 = temp_r28 = 255; + GXPosition3f32((temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100), lbl_1_data_754 * 100, (-(lbl_1_data_754 / 2)) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32((temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100), 0, -(lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32(-(lbl_1_data_754 / 2) * 100, temp_r31 * 100, -(lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32((lbl_1_data_754 / 2) * 100, temp_r31 * 100, -(lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + } + GXBegin(GX_LINES, GX_VTXFMT0, (lbl_1_data_754 + 1) * 4); + for (temp_r31 = 0; temp_r31 <= lbl_1_data_754; temp_r31++) { + temp_r30 = temp_r29 = temp_r28 = 255; + GXPosition3f32((temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100), lbl_1_data_754 * 100, (lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32((temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100), 0, (lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32(-(lbl_1_data_754 / 2) * 100, temp_r31 * 100, (lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32((lbl_1_data_754 / 2) * 100, temp_r31 * 100, (lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + } + GXBegin(GX_LINES, GX_VTXFMT0, (lbl_1_data_754 + 1) * 4); + for (temp_r31 = 0; temp_r31 <= lbl_1_data_754; temp_r31++) { + temp_r30 = temp_r29 = temp_r28 = 255; + GXPosition3f32((lbl_1_data_754 / 2) * 100, lbl_1_data_754 * 100, (temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100)); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32((lbl_1_data_754 / 2) * 100, 0, (temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100)); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32((lbl_1_data_754 / 2) * 100, temp_r31 * 100, -(lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32((lbl_1_data_754 / 2) * 100, temp_r31 * 100, (lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + } + GXBegin(GX_LINES, GX_VTXFMT0, (lbl_1_data_754 + 1) * 4); + for (temp_r31 = 0; temp_r31 <= lbl_1_data_754; temp_r31++) { + temp_r30 = temp_r29 = temp_r28 = 255; + GXPosition3f32(-(lbl_1_data_754 / 2) * 100, lbl_1_data_754 * 100, (temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100)); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32(-(lbl_1_data_754 / 2) * 100, 0, (temp_r31 * 100) - ((lbl_1_data_754 / 2) * 100)); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32(-(lbl_1_data_754 / 2) * 100, temp_r31 * 100, -(lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + GXPosition3f32(-(lbl_1_data_754 / 2) * 100, temp_r31 * 100, (lbl_1_data_754 / 2) * 100); + GXColor3u8(temp_r30, temp_r29, temp_r28); + } } -s16 lbl_1_data_758[] = { - 1, - 3, - 2, - 13, - 14, - 15, - 16, - 68, - -1 -}; +s16 lbl_1_data_758[] = { 1, 3, 2, 13, 14, 15, 16, 68, -1 }; -s16 lbl_1_data_76A[] = { - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - -1 -}; +s16 lbl_1_data_76A[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, -1 }; void fn_1_814C(void) { - s16 temp_r31 = 0; - s16 temp_r30 = 0; - s16 temp_r29 = 0; - s16 temp_r28; - Vec sp8 = { 0, 0, 0 }; - while(1) { - lbl_1_bss_A14 = HuAudFXEmiterPlay(1282, &sp8); - HuPrcSleep(60); - if(HuPadBtnDown[1] & PAD_BUTTON_A) { - HuAudSeqFadeOut(temp_r28, 60); - temp_r28 = HuAudSeqPlay(lbl_1_data_758[temp_r31]); - temp_r31++; - if(lbl_1_data_758[temp_r31] == -1) { - temp_r31 = 0; - } - temp_r29 = 30; - } - if(HuPadBtnDown[1] & PAD_BUTTON_B) { - HuAudFXPlay(lbl_1_data_76A[temp_r30]); - temp_r30++; - if(lbl_1_data_76A[temp_r30] == -1) { - temp_r30 = 0; - } - temp_r29 = 30; - } - if(temp_r29) { - temp_r29--; - print8(16, 430, 2.0f, "MusicNo:%d SENo:%d", temp_r31, temp_r30); - } - HuPrcVSleep(); - } + s16 temp_r31 = 0; + s16 temp_r30 = 0; + s16 temp_r29 = 0; + s16 temp_r28; + Vec sp8 = { 0, 0, 0 }; + while (1) { + lbl_1_bss_A14 = HuAudFXEmiterPlay(1282, &sp8); + HuPrcSleep(60); + if (HuPadBtnDown[1] & PAD_BUTTON_A) { + HuAudSeqFadeOut(temp_r28, 60); + temp_r28 = HuAudSeqPlay(lbl_1_data_758[temp_r31]); + temp_r31++; + if (lbl_1_data_758[temp_r31] == -1) { + temp_r31 = 0; + } + temp_r29 = 30; + } + if (HuPadBtnDown[1] & PAD_BUTTON_B) { + HuAudFXPlay(lbl_1_data_76A[temp_r30]); + temp_r30++; + if (lbl_1_data_76A[temp_r30] == -1) { + temp_r30 = 0; + } + temp_r29 = 30; + } + if (temp_r29) { + temp_r29--; + print8(16, 430, 2.0f, "MusicNo:%d SENo:%d", temp_r31, temp_r30); + } + HuPrcVSleep(); + } } s16 lbl_1_data_7AC = -1; u32 fn_1_82C8(void) { - s16 temp_r31; - temp_r31 = HuPadBtn[0]; - if(lbl_1_bss_A08) { - lbl_1_bss_A08--; - if(!temp_r31) { - lbl_1_bss_A08 = 0; - } else { - temp_r31 = 0; - } - } else if(temp_r31) { - if(lbl_1_data_7AC == temp_r31) { - lbl_1_bss_A08 = 3; - } else { - lbl_1_bss_A08 = 20; - } - lbl_1_data_7AC = temp_r31; - } else { - lbl_1_data_7AC = 0; - } - return temp_r31; + s16 temp_r31; + temp_r31 = HuPadBtn[0]; + if (lbl_1_bss_A08) { + lbl_1_bss_A08--; + if (!temp_r31) { + lbl_1_bss_A08 = 0; + } + else { + temp_r31 = 0; + } + } + else if (temp_r31) { + if (lbl_1_data_7AC == temp_r31) { + lbl_1_bss_A08 = 3; + } + else { + lbl_1_bss_A08 = 20; + } + lbl_1_data_7AC = temp_r31; + } + else { + lbl_1_data_7AC = 0; + } + return temp_r31; } void fn_1_83B4(void) { - u32 temp_r29; - Process *temp_r28; - temp_r28 = HuPrcCurrentGet(); - HuPrcSetStat(temp_r28, 0xC); - while(1) { - temp_r29 = fn_1_82C8(); - if(HuPadBtn[0] & PAD_BUTTON_RIGHT) { - while(1) { - temp_r29 = fn_1_82C8(); - if(HuPadBtn[0] & PAD_BUTTON_LEFT) { - break; - } - if(!temp_r29) { - HuPrcAllPause(1); - Hu3DPauseSet(1); - } else { - HuPrcAllPause(0); - Hu3DPauseSet(0); - } - HuPrcVSleep(); - } - HuPrcAllPause(0); - Hu3DPauseSet(0); - } - if(temp_r29 & PAD_BUTTON_UP) { - if(lbl_1_bss_A0C < 120.0f) { - lbl_1_bss_A0C++; - } - } - if(temp_r29 & PAD_BUTTON_DOWN) { - if(lbl_1_bss_A0C > 5.0f) { - lbl_1_bss_A0C--; - } - } - HuPrcVSleep(); - } + u32 temp_r29; + Process *temp_r28; + temp_r28 = HuPrcCurrentGet(); + HuPrcSetStat(temp_r28, 0xC); + while (1) { + temp_r29 = fn_1_82C8(); + if (HuPadBtn[0] & PAD_BUTTON_RIGHT) { + while (1) { + temp_r29 = fn_1_82C8(); + if (HuPadBtn[0] & PAD_BUTTON_LEFT) { + break; + } + if (!temp_r29) { + HuPrcAllPause(1); + Hu3DPauseSet(1); + } + else { + HuPrcAllPause(0); + Hu3DPauseSet(0); + } + HuPrcVSleep(); + } + HuPrcAllPause(0); + Hu3DPauseSet(0); + } + if (temp_r29 & PAD_BUTTON_UP) { + if (lbl_1_bss_A0C < 120.0f) { + lbl_1_bss_A0C++; + } + } + if (temp_r29 & PAD_BUTTON_DOWN) { + if (lbl_1_bss_A0C > 5.0f) { + lbl_1_bss_A0C--; + } + } + HuPrcVSleep(); + } } diff --git a/src/REL/modeseldll/filesel.c b/src/REL/modeseldll/filesel.c index 8bf2afb7..d19a8592 100644 --- a/src/REL/modeseldll/filesel.c +++ b/src/REL/modeseldll/filesel.c @@ -10,7 +10,6 @@ #include "game/window.h" #include "game/wipe.h" - #include "math.h" #include "REL/modeseldll.h" @@ -190,10 +189,10 @@ repeat: Hu3DModelPosSetV(lbl_1_bss_19A[3], &sp1C); Hu3DModelPosSetV(lbl_1_bss_19A[5], &sp1C); Hu3DModelPosSetV(lbl_1_bss_19A[1], &sp1C); - Hu3DModelAttrReset(lbl_1_bss_19A[2], 1); - Hu3DModelAttrSet(lbl_1_bss_19A[4], 1); - Hu3DModelAttrReset(lbl_1_bss_19A[3], 1); - Hu3DModelAttrSet(lbl_1_bss_19A[5], 1); + Hu3DModelAttrReset(lbl_1_bss_19A[2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_19A[4], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_19A[3], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_19A[5], HU3D_ATTR_DISPOFF); Hu3DModelRotSet(lbl_1_bss_19A[2], 0, 0, 0); Hu3DModelRotSet(lbl_1_bss_19A[3], 0, 0, 0); fn_1_57C8(lbl_1_bss_19A[4]); @@ -622,8 +621,8 @@ void fn_1_5850(void) work = curr->user_data; index = work->index; param = work->param; - Hu3DModelAttrSet(lbl_1_bss_19A[index + 2], 1); - Hu3DModelAttrReset(lbl_1_bss_19A[index + 4], 1); + Hu3DModelAttrSet(lbl_1_bss_19A[index + 2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_19A[index + 4], HU3D_ATTR_DISPOFF); Hu3DMotionSet(lbl_1_bss_19A[index + 4], lbl_1_bss_16A[6]); Hu3DMotionSpeedSet(lbl_1_bss_19A[index + 4], 2.0f); if (param) { @@ -648,8 +647,8 @@ void fn_1_5850(void) HuPrcVSleep(); } if (!param) { - Hu3DModelAttrReset(lbl_1_bss_19A[index + 2], 1); - Hu3DModelAttrSet(lbl_1_bss_19A[index + 4], 1); + Hu3DModelAttrReset(lbl_1_bss_19A[index + 2], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_19A[index + 4], HU3D_ATTR_DISPOFF); } HuMemDirectFree(work); HuPrcEnd(); @@ -677,19 +676,19 @@ s32 fn_1_5C38(void) lbl_1_bss_14C = 0; result = HuCardSlotCheck(0); if (result == 8192) { - Hu3DModelAttrReset(lbl_1_bss_19A[0], 1); + Hu3DModelAttrReset(lbl_1_bss_19A[0], HU3D_ATTR_DISPOFF); lbl_1_bss_14C |= 1; } else { - Hu3DModelAttrSet(lbl_1_bss_19A[0], 1); + Hu3DModelAttrSet(lbl_1_bss_19A[0], HU3D_ATTR_DISPOFF); } result = HuCardSlotCheck(1); if (result == 8192) { - Hu3DModelAttrReset(lbl_1_bss_19A[1], 1); + Hu3DModelAttrReset(lbl_1_bss_19A[1], HU3D_ATTR_DISPOFF); lbl_1_bss_14C |= 2; } else { - Hu3DModelAttrSet(lbl_1_bss_19A[1], 1); + Hu3DModelAttrSet(lbl_1_bss_19A[1], HU3D_ATTR_DISPOFF); } return lbl_1_bss_14C; } @@ -700,10 +699,10 @@ void fn_1_5D30(void) Vec pos_2d; Vec pos_3d; 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); - espAttrReset(lbl_1_bss_152[1], 4); - Hu3DModelAttrReset(lbl_1_bss_19A[2], 1); + espAttrReset(lbl_1_bss_152[1], HUSPR_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_19A[2], HU3D_ATTR_DISPOFF); pos_2d.x = 188; pos_2d.y = 250; pos_2d.z = 600; @@ -718,7 +717,7 @@ void fn_1_5D30(void) MTXCopy(scale, model->unk_F0); model = &Hu3DData[lbl_1_bss_19A[0]]; 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; Hu3D2Dto3D(&pos_2d, 1, &pos_3d); Hu3DModelPosSetV(lbl_1_bss_19A[3], &pos_3d); @@ -1104,12 +1103,12 @@ void fn_1_72DC(void) index = work->index; param = work->param; if (param) { - Hu3DModelAttrReset(lbl_1_bss_19A[index + 8], 1); - Hu3DModelAttrSet(lbl_1_bss_19A[index + 11], 1); + Hu3DModelAttrReset(lbl_1_bss_19A[index + 8], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_19A[index + 11], HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrSet(lbl_1_bss_19A[index + 8], 1); - Hu3DModelAttrReset(lbl_1_bss_19A[index + 11], 1); + Hu3DModelAttrSet(lbl_1_bss_19A[index + 8], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_19A[index + 11], HU3D_ATTR_DISPOFF); } for (i = 0; i <= 10; i++) { float scale; @@ -1583,7 +1582,7 @@ s32 fn_1_8C30(s16 boxno) HuWinMesSet(lbl_1_bss_146, MAKE_MESSID(16, 0x35)); HuWinDispOn(lbl_1_bss_146); 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]]; Hu3DModelPosSetV(lbl_1_bss_19A[23], &sp2C->pos); for (temp_r30 = 1; temp_r30 <= 10; temp_r30++) { @@ -1634,8 +1633,8 @@ s32 fn_1_8C30(s16 boxno) } else { HuAudFXPlay(3); - Hu3DModelAttrSet(lbl_1_bss_19A[23], 1); - Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], 1); + Hu3DModelAttrSet(lbl_1_bss_19A[23], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], HU3D_ATTR_DISPOFF); fn_1_7628(temp_r31, 0); HuWinDispOff(lbl_1_bss_146); return 1; @@ -1646,7 +1645,7 @@ s32 fn_1_8C30(s16 boxno) fn_1_B8CC(MAKE_MESSID(16, 0x0A)); HuWinMesSet(lbl_1_bss_148, MAKE_MESSID(16, 0x0B)); 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"); if (!SLCheckSumCheck()) { 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); HuPrcVSleep(); } - Hu3DModelAttrSet(lbl_1_bss_19A[23], 1); - Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], 1); + Hu3DModelAttrSet(lbl_1_bss_19A[23], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], HU3D_ATTR_DISPOFF); if (UnMountCnt & (1 << curSlotNo)) { fn_1_BA20(); 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"); 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"); - Hu3DModelAttrReset(lbl_1_bss_19A[temp_r31 + 11], 1); - Hu3DModelAttrSet(lbl_1_bss_19A[temp_r31 + 8], 1); + Hu3DModelAttrReset(lbl_1_bss_19A[temp_r31 + 11], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_19A[temp_r31 + 8], HU3D_ATTR_DISPOFF); sp60.x = 158.0f + (boxno * 130); sp60.y = 230; sp60.z = 800; @@ -1728,8 +1727,8 @@ s32 fn_1_8C30(s16 boxno) } } fn_1_BA20(); - Hu3DModelAttrSet(lbl_1_bss_19A[23], 1); - Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], 1); + Hu3DModelAttrSet(lbl_1_bss_19A[23], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_19A[boxno + 8], HU3D_ATTR_DISPOFF); for (temp_r30 = 0; temp_r30 <= 10; temp_r30++) { 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); @@ -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)); 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++) { - Hu3DModelAttrSet(lbl_1_bss_19A[temp_r31 + 8], 1); - Hu3DModelAttrReset(lbl_1_bss_19A[temp_r31 + 11], 1); + Hu3DModelAttrSet(lbl_1_bss_19A[temp_r31 + 8], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_19A[temp_r31 + 11], HU3D_ATTR_DISPOFF); temp_r27 = lbl_1_bss_E8[temp_r31]; if (temp_r27 < 0 || temp_r27 >= 8) { temp_r27 = 8; @@ -1849,7 +1848,7 @@ s32 fn_1_9E4C(void) } MTXScale(sp24, 0.45f, 0.45f, 0.45f); 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); return temp_r23; } @@ -1900,7 +1899,7 @@ void fn_1_AAB8(void) 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); 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 { 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]]; } 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 { - 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.y -= 30.0f * temp_r31->scale.x; @@ -1925,16 +1924,16 @@ void fn_1_AAB8(void) lbl_1_bss_8C -= 360; } if (lbl_1_bss_11C == -1) { - espAttrSet(lbl_1_bss_152[4], 4); + espAttrSet(lbl_1_bss_152[4], HUSPR_ATTR_DISPOFF); } else { temp_r31 = &Hu3DData[lbl_1_bss_19A[lbl_1_bss_11C]]; if (temp_r31->attr & 0x1) { - espAttrSet(lbl_1_bss_152[4], 4); + espAttrSet(lbl_1_bss_152[4], HUSPR_ATTR_DISPOFF); } else { 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.y += 5.0f * temp_r31->scale.x; Hu3D3Dto2D(&sp8, 1, &sp14); @@ -1944,7 +1943,7 @@ void fn_1_AAB8(void) } for (temp_r30 = 0; temp_r30 < 3; 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; } 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_f31 = temp_r31->scale.x * (temp_f29 / temp_f30); 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 { - 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.y += 40.0 * temp_r31->scale.x; diff --git a/src/REL/modeseldll/main.c b/src/REL/modeseldll/main.c index 7a9b949c..fc10e07b 100644 --- a/src/REL/modeseldll/main.c +++ b/src/REL/modeseldll/main.c @@ -98,7 +98,7 @@ void fn_1_414(void) HuSprPosSet(group, 0, 288, 240); HuSprDrawNoSet(group, 0, 127); HuPrcSleep(2); - espAttrSet(lbl_1_bss_152[0], 4); + espAttrSet(lbl_1_bss_152[0], HUSPR_ATTR_DISPOFF); HuAudFXStop(lbl_1_data_100); while(!HuTHPEndCheck()) { HuPrcVSleep(); @@ -107,7 +107,7 @@ void fn_1_414(void) 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); { s16 result = fn_1_2490(); diff --git a/src/REL/modeseldll/modesel.c b/src/REL/modeseldll/modesel.c index 31253f9a..13d41db6 100644 --- a/src/REL/modeseldll/modesel.c +++ b/src/REL/modeseldll/modesel.c @@ -9,11 +9,9 @@ #include "game/window.h" #include "game/wipe.h" - #include "REL/modeseldll.h" #include "ext_math.h" - 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), @@ -87,10 +85,10 @@ s32 fn_1_2490(void) while (!Hu3DMotionEndCheck(lbl_1_bss_19A[15])) { 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++) { - Hu3DModelAttrReset(lbl_1_bss_19A[lbl_1_data_80[temp_r31]], 1); - Hu3DModelAttrSet(lbl_1_bss_19A[lbl_1_data_80[temp_r31]], 0x40000002); + 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]], HU3D_MOTATTR_PAUSE); 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); } @@ -186,10 +184,10 @@ s32 fn_1_2490(void) 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_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); - Hu3DModelAttrReset(lbl_1_bss_19A[22], 1); - Hu3DModelAttrSet(lbl_1_bss_19A[22], 0x40000002); + Hu3DModelAttrReset(lbl_1_bss_19A[22], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_19A[22], HU3D_MOTATTR_PAUSE); Hu3DModelPosSet(lbl_1_bss_19A[22], 0, 27, 50); Hu3DModelScaleSet(lbl_1_bss_19A[22], 1.0f, 1.063f, 1.0f); for (temp_r31 = 1; temp_r31 <= 20; temp_r31++) { @@ -236,10 +234,10 @@ void fn_1_3668(void) sp8.y = 1; sp8.z = 0; Hu3DShadowPosSet(&sp20, &sp8, &sp14); - Hu3DModelAttrReset(lbl_1_bss_19A[15], 1); - Hu3DModelAttrSet(lbl_1_bss_19A[15], 0x40000002); + Hu3DModelAttrReset(lbl_1_bss_19A[15], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_19A[15], HU3D_MOTATTR_PAUSE); Hu3DMotionTimeSet(lbl_1_bss_19A[15], 0); - Hu3DModelAttrReset(lbl_1_bss_19A[14], 1); - Hu3DModelAttrSet(lbl_1_bss_19A[14], 0x40000002); + Hu3DModelAttrReset(lbl_1_bss_19A[14], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_19A[14], HU3D_MOTATTR_PAUSE); Hu3DMotionTimeSet(lbl_1_bss_19A[14], 0); } diff --git a/src/REL/mpexDll/mpex.c b/src/REL/mpexDll/mpex.c index 5931ebd8..1dcc056a 100644 --- a/src/REL/mpexDll/mpex.c +++ b/src/REL/mpexDll/mpex.c @@ -263,7 +263,7 @@ void fn_1_33F8(void) HuPrcVSleep(); var_r31 = espEntry(0x860020, 0x1388, 0); espPosSet(var_r31, 288.0f, 240.0f); - espAttrReset(var_r31, 4); + espAttrReset(var_r31, HUSPR_ATTR_DISPOFF); Hu3DBGColorSet(0, 0, 0); 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); 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); - 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); 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); - 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[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); - 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) @@ -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[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f); 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_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[2].unk_00->model[1], 0.0f, 1000.0f, 0.0f); 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_D468(lbl_1_bss_1B0); @@ -1259,7 +1259,7 @@ void fn_1_7BC8(omObjData *object) fn_1_25C4(object, 1, 1, 0, 1); for (var_r30 = 0; var_r30 < 3; var_r30++) { 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->motion[5] = Hu3DMotionIDGet(object->model[5]); @@ -1269,7 +1269,7 @@ void fn_1_7BC8(omObjData *object) return; } if (omovlevtno == 1) { - Hu3DModelAttrSet(object->model[5], 0x40000002); + Hu3DModelAttrSet(object->model[5], HU3D_MOTATTR_PAUSE); return; } 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)); Hu3DModelPosSet(object->model[1], -150.0f + (100.0f * arg1), 0.0f, 0.0f); Hu3DModelShadowSet(object->model[1]); - Hu3DModelAttrSet(object->model[1], 1); + Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); CharModelLayerSetAll2(2); fn_1_25C4(object, 1, 1, 0, 1); CharKill(var_r30); 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) @@ -1406,7 +1406,7 @@ void fn_1_89C4(omObjData *object) object->motion[3] = Hu3DJointMotionFile(object->model[1], DATA_MAKE_NUM(DATADIR_MPEX, 0x11)); Hu3DModelPosSet(object->model[1], 0.0f, 400.0f, 0.0f); 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); object->func = fn_1_88EC; @@ -1707,7 +1707,7 @@ void fn_1_A0E4(omObjData *object, MpexDllUnkStruct4 *arg_1) float var_f30; s32 var_r30; - Hu3DModelAttrReset(object->model[2], 1); + Hu3DModelAttrReset(object->model[2], HU3D_ATTR_DISPOFF); Hu3DModelTPLvlSet(object->model[2], 0.0f); for (var_r30 = 0; var_r30 <= 0xF; var_r30++) { 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); Hu3DModelTPLvlSet(object->model[2], var_f31); } - Hu3DModelAttrSet(object->model[2], 1); + Hu3DModelAttrSet(object->model[2], HU3D_ATTR_DISPOFF); Hu3DModelTPLvlSet(object->model[2], 0.0f); arg1->unk_04 = NULL; } @@ -1743,7 +1743,7 @@ void fn_1_A3A4(void) lbl_1_bss_3B0.unk_04 = (MpexDllUnkFunc2)fn_1_9F10; 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); } 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++) { - 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); } lbl_1_bss_3B0.unk_04 = NULL; diff --git a/src/REL/option/record.c b/src/REL/option/record.c index d625d764..fc17d924 100755 --- a/src/REL/option/record.c +++ b/src/REL/option/record.c @@ -40,7 +40,7 @@ typedef struct { /* 0x008 */ OptionWindow *window[10]; /* 0x030 */ s32 execMode; /* 0x034 */ s16 sprList[153]; - /* 0x166 */ s16 unk166[3]; + /* 0x166 */ s16 unk166[3]; /* 0x16C */ s32 recordType; /* 0x170 */ s32 board; /* 0x174 */ s32 mgPage; @@ -199,7 +199,7 @@ static void ExecRecord(omObjData *object) OptionWinAnimIn(work->window[1]); OptionWinMesSet(work->window[1], MAKE_MESSID(47, 169)); if (!work->cameraDoneF) { - Hu3DModelAttrReset(work->hand->model[0], 1); + Hu3DModelAttrReset(work->hand->model[0], HU3D_ATTR_DISPOFF); work->cameraDoneF = TRUE; } 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[1]); - Hu3DModelAttrSet(work->hand->model[0], 1); + Hu3DModelAttrSet(work->hand->model[0], HU3D_ATTR_DISPOFF); object->unk10 = 6; /* fallthrough */ case 6: @@ -312,7 +312,7 @@ static omObjData *CreateSystem(void) object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); 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); Hu3DMotionStartEndSet(object->model[0], 0.0f, 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->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 14)); 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); omSetSca(object, 0.6f, 0.6f, 0.6f); - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); return object; } @@ -646,23 +646,8 @@ static void ShowBoard(omObjData *object, s32 board) #define BOARD_SPR_HIDE_COUNT 53 -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 -}; +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 }; static void HideBoard(omObjData *object) { @@ -709,19 +694,8 @@ static void ShowTotal(omObjData *object) #define TOTAL_SPR_HIDE_COUNT 33 -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 -}; +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 }; static void HideTotal(omObjData *object) { @@ -844,18 +818,9 @@ static void ShowMG(omObjData *object, s32 page) #define MG_SPR_HIDE_COUNT 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, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 151, 152 -}; +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, + 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152 }; static void HideMG(omObjData *object) { diff --git a/src/REL/option/rumble.c b/src/REL/option/rumble.c index af0397ff..16d5ebc5 100755 --- a/src/REL/option/rumble.c +++ b/src/REL/option/rumble.c @@ -112,7 +112,7 @@ static void ExecRumble(omObjData *object) break; } if (!work->cameraDoneF) { - Hu3DModelAttrReset(work->hand->model[0], 1); + Hu3DModelAttrReset(work->hand->model[0], HU3D_ATTR_DISPOFF); work->cameraDoneF = TRUE; Hu3DModelHookSet(work->system->model[0], "target", work->hand->model[0]); } @@ -156,10 +156,10 @@ static void ExecRumble(omObjData *object) if (work->rumbleF) { HuPadRumbleSet(0, 60, 10, 5); Hu3DMotionTimeSet(work->hiliteOn->model[0], 0.0f); - Hu3DModelAttrReset(work->hiliteOn->model[0], 1); + Hu3DModelAttrReset(work->hiliteOn->model[0], HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrSet(work->hiliteOn->model[0], 1); + Hu3DModelAttrSet(work->hiliteOn->model[0], HU3D_ATTR_DISPOFF); } object->unk10 = 1; } @@ -167,7 +167,7 @@ static void ExecRumble(omObjData *object) case 4: OptionWinAnimOut(work->window[1]); OptionWinAnimOut(work->window[0]); - Hu3DModelAttrSet(work->hand->model[0], 1); + Hu3DModelAttrSet(work->hand->model[0], HU3D_ATTR_DISPOFF); OptionRumbleMotionHideStart(object); object->unk10 = 5; /* fallthrough */ @@ -193,7 +193,7 @@ static omObjData *CreateHand(void) hand->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 15)); Hu3DModelLayerSet(hand->model[0], 3); omSetRot(hand, 0.0f, 180.0f, 0.0f); - Hu3DModelAttrSet(hand->model[0], 1); + Hu3DModelAttrSet(hand->model[0], HU3D_ATTR_DISPOFF); return hand; } @@ -212,7 +212,7 @@ static omObjData *CreateSystem(void) system = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); system->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 2)); - Hu3DModelAttrSet(system->model[0], 0x40000002); + Hu3DModelAttrSet(system->model[0], HU3D_MOTATTR_PAUSE); if (GWRumbleGet()) { Hu3DMotionTimeSet(system->model[0], 60.0f); } @@ -263,7 +263,7 @@ static omObjData *CreatePad(void) pad = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); pad->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 9)); - Hu3DModelAttrSet(pad->model[0], 0x40000001); + Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_LOOP); return pad; } @@ -280,10 +280,10 @@ static void ShakePad(omObjData *pad, BOOL on) { if (on) { Hu3DModelAttrReset(pad->model[0], 0x40000002); - Hu3DModelAttrSet(pad->model[0], 0x40000001); + Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_LOOP); } else { - Hu3DModelAttrSet(pad->model[0], 0x40000002); + Hu3DModelAttrSet(pad->model[0], HU3D_MOTATTR_PAUSE); Hu3DModelAttrReset(pad->model[0], 0x40000001); } } @@ -294,7 +294,7 @@ static omObjData *CreatePadFilter(void) object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); 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); return object; @@ -349,10 +349,10 @@ static omObjData *CreateHiliteOn(void) object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 11)); if (GWRumbleGet()) { - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); } else { - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); } return object; } diff --git a/src/REL/option/scene.c b/src/REL/option/scene.c index 91e400d7..0edd9959 100755 --- a/src/REL/option/scene.c +++ b/src/REL/option/scene.c @@ -52,7 +52,8 @@ void OptionFadeSprite(s16 sprite, BOOL inF, s32 duration) if (inF) { work->speed = work->speed; work->tplvl = 0.0f; - } else { + } + else { work->speed = -work->speed; work->tplvl = 1.0f; } @@ -103,7 +104,7 @@ void OptionFadeModel(s16 model, BOOL inF, s32 duration) work->speed = -work->speed; work->tplvl = 1.0f; } - Hu3DModelAttrReset(work->id, 1); + Hu3DModelAttrReset(work->id, HU3D_ATTR_DISPOFF); Hu3DModelTPLvlSet(work->id, work->tplvl); process = HuPrcChildCreate(FadeModel, 0x3000, 0x1500, 0, HuPrcCurrentGet()); process->user_data = work; @@ -128,7 +129,7 @@ static void FadeModel(void) } Hu3DModelTPLvlSet(work->id, work->tplvl); if (work->tplvl <= 0.0f) { - Hu3DModelAttrSet(work->id, 1); + Hu3DModelAttrSet(work->id, HU3D_ATTR_DISPOFF); } HuMemDirectFree(work); HuPrcEnd(); @@ -199,7 +200,7 @@ static void KillScene(void) HuPrcVSleep(); sprite = espEntry(0x860020, 0x1388, 0); espPosSet(sprite, 288.0f, 240.0f); - espAttrReset(sprite, 4); + espAttrReset(sprite, HUSPR_ATTR_DISPOFF); Hu3DBGColorSet(0, 0, 0); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); while (WipeStatGet() != 0) { diff --git a/src/REL/option/sound.c b/src/REL/option/sound.c index 64d2e379..e859c58e 100755 --- a/src/REL/option/sound.c +++ b/src/REL/option/sound.c @@ -624,7 +624,7 @@ static void ExecOptionSel(omObjData *object) OptionWinAnimIn(work->window[0]); OptionWinMesSet(work->window[0], choiceMess[work->cursorPos]); if (!work->cameraDoneF) { - Hu3DModelAttrReset(work->object[7]->model[0], 1); + Hu3DModelAttrReset(work->object[7]->model[0], HU3D_ATTR_DISPOFF); work->cameraDoneF = TRUE; } 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) { OptionRumbleMotionHideStart(optionRumble); } - Hu3DModelAttrSet(work->object[7]->model[0], 1); + Hu3DModelAttrSet(work->object[7]->model[0], HU3D_ATTR_DISPOFF); object->unk10 = 4; /* fallthrough */ case 4: @@ -715,7 +715,7 @@ static void ExecOutputMode(omObjData *object) OptionWinAnimIn(work->window[0]); OptionWinMesSet(work->window[0], soundModeNameTbl[work->soundMode]); if (!work->cameraDoneF) { - Hu3DModelAttrReset(work->object[8]->model[0], 1); + Hu3DModelAttrReset(work->object[8]->model[0], HU3D_ATTR_DISPOFF); work->cameraDoneF = TRUE; } pos.x = -38.0f; @@ -768,7 +768,7 @@ static void ExecOutputMode(omObjData *object) KillNoteSpawner(object); OptionWinAnimOut(work->window[1]); OptionWinAnimOut(work->window[0]); - Hu3DModelAttrSet(work->object[8]->model[0], 1); + Hu3DModelAttrSet(work->object[8]->model[0], HU3D_ATTR_DISPOFF); object->unk10 = 5; /* fallthrough */ case 5: @@ -1204,10 +1204,10 @@ static omObjData *CreateHand(void) object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 13)); 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); omSetSca(object, 0.6f, 0.6f, 0.6f); - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); return object; } @@ -1227,10 +1227,10 @@ static omObjData *CreateOutputModeHand(void) object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 14)); 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); omSetSca(object, 0.6f, 0.6f, 0.6f); - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); return object; } @@ -1249,7 +1249,7 @@ static omObjData *CreateSystem(void) system = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL); 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); return system; } @@ -1276,7 +1276,7 @@ static omObjData *CreateLightObj(s32 id, BOOL off) else { 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); omSetTra(object, lightPosTbl[id].x, lightPosTbl[id].y, lightPosTbl[id].z); return object; @@ -1293,12 +1293,12 @@ static void KillLightObj(omObjData *object) static void LightDispOff(omObjData *indicator) { - Hu3DModelAttrReset(indicator->model[0], 1); + Hu3DModelAttrReset(indicator->model[0], HU3D_ATTR_DISPOFF); } static void LightDispOn(omObjData *indicator) { - Hu3DModelAttrSet(indicator->model[0], 1); + Hu3DModelAttrSet(indicator->model[0], HU3D_ATTR_DISPOFF); } static s32 spriteDataTbl[] = { @@ -1392,7 +1392,7 @@ static void OptionSelDisp(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; s32 i; @@ -1443,11 +1443,9 @@ static void OutputModeDisp(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; s32 i; @@ -1474,10 +1472,9 @@ static void MusicPageDisp(omObjData *object, s32 page) } } - static void MusicPageHide(omObjData *object) { - static const s32 sprHideTbl[] = { 10 }; + static const s32 sprHideTbl[] = { 10 }; SoundWork *work = object->data; s32 i; @@ -1508,11 +1505,9 @@ static void VoicePageDisp(omObjData *object, s32 character) } } - - static void VoicePageHide(omObjData *object) { - static const s32 sprHideTbl[] = { 11, 0 }; + static const s32 sprHideTbl[] = { 11, 0 }; SoundWork *work = object->data; s32 i; @@ -1538,7 +1533,7 @@ static omObjData *CreateNoteObj(s32 type) noteWork->enabled = FALSE; noteWork->type = type; note->model[0] = Hu3DModelCreateFile(noteMdlTbl[type]); - Hu3DModelAttrSet(note->model[0], 0x40000001); + Hu3DModelAttrSet(note->model[0], HU3D_MOTATTR_LOOP); Hu3DModelLayerSet(note->model[0], 2); Hu3DModelAttrReset(note->model[0], 2); return note; @@ -1568,7 +1563,7 @@ static void HandleNote(omObjData *note) float y; float tplvl; - Hu3DModelAttrReset(note->model[0], 1); + Hu3DModelAttrReset(note->model[0], HU3D_ATTR_DISPOFF); time = sind(45.0f * noteWork->pos); time = time * time; switch (noteWork->side) { @@ -1595,7 +1590,7 @@ static void HandleNote(omObjData *note) return; } noteWork->enabled = FALSE; - Hu3DModelAttrSet(note->model[0], 1); + Hu3DModelAttrSet(note->model[0], HU3D_ATTR_DISPOFF); note->func = NULL; note->unk10 = 0; } diff --git a/src/REL/present/common.c b/src/REL/present/common.c index adaae0e2..7ccf1f02 100644 --- a/src/REL/present/common.c +++ b/src/REL/present/common.c @@ -65,7 +65,7 @@ omObjData *PresentGuideCreate(void) Hu3DModelShadowSet(object->model[0]); PresentGuideExecModeSet(object, PRESENT_GUIDE_MODE_NONE); UpdateGuide(object); - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); return object; } @@ -109,7 +109,7 @@ static void ExecGuideEnter(omObjData *object) switch (object->unk10) { case 0: - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); work->pos.x = -300.0f; work->pos.z = -180.0f; work->time = 0.0f; @@ -156,7 +156,7 @@ static void ExecGuideLeave(omObjData *object) case 0: work->time = 0.0f; work->speed = 0.025f; - Hu3DModelAttrReset(object->model[0], 1); + Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF); object->unk10 = 1; case 1: weight = sind(90.0f * work->time); @@ -168,7 +168,7 @@ static void ExecGuideLeave(omObjData *object) } object->unk10 = 2; case 2: - Hu3DModelAttrSet(object->model[0], 1); + Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); PresentGuideExecModeSet(object, PRESENT_GUIDE_MODE_NONE); break; default: diff --git a/src/REL/present/init.c b/src/REL/present/init.c index bdc5f551..71813938 100644 --- a/src/REL/present/init.c +++ b/src/REL/present/init.c @@ -1,5 +1,6 @@ #include "game/audio.h" #include "game/esprite.h" +#include "game/hsfman.h" #include "game/objsub.h" #include "game/pad.h" #include "game/process.h" @@ -109,7 +110,7 @@ void FadeSpriteWithMultiplier(s16 model, BOOL inF, float tpMultiplier, s32 durat work->tplvl = 1.0f; } 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->user_data = work; } @@ -135,7 +136,7 @@ static void FadeModel(void) } Hu3DModelTPLvlSet(var_r31->id, var_r31->tplvl * var_r31->tpMultiplier); if (var_r31->speed < 0.0f) { - Hu3DModelAttrSet(var_r31->id, 1); + Hu3DModelAttrSet(var_r31->id, HU3D_ATTR_DISPOFF); } HuMemDirectFree(var_r31); HuPrcEnd(); diff --git a/src/REL/present/present.c b/src/REL/present/present.c index b13a9e34..263194b5 100644 --- a/src/REL/present/present.c +++ b/src/REL/present/present.c @@ -4,8 +4,8 @@ #include "game/hsfdraw.h" #include "game/hsfex.h" #include "game/hsfman.h" -#include "game/wipe.h" #include "game/window.h" +#include "game/wipe.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]->model[0] = Hu3DModelCreateFile(presentMdlTbl[i]); 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++) { @@ -886,39 +886,39 @@ static void ShowHidePresents(omObjData *object) s32 character; 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++) { s32 j; 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++) { 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 + 8 + 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], HU3D_ATTR_DISPOFF); j++; } } 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) { - 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++) { 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)) { - Hu3DModelAttrReset(work->object[1]->model[0], 1); + Hu3DModelAttrReset(work->object[1]->model[0], HU3D_ATTR_DISPOFF); } for (i = 0; i < NUM_CHARACTERS; i++) { 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; SetCameraRot(object, rot, 1); RotateCamera(object); - Hu3DModelAttrSet(work->object[work->idxInRoom + lbl_1_rodata_B18[work->room]]->model[0], 1); - Hu3DModelAttrSet(work->object[roofIdxTbl[work->room]]->model[0], 1); - Hu3DModelAttrSet(work->object[constellationIdxTbl[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], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(work->object[constellationIdxTbl[work->room]]->model[0], HU3D_ATTR_DISPOFF); work->presentFallingTime = 0.0f; work->presentFallingSpeed = 1.0f / 360.0f; object->unk10 = 1; diff --git a/src/REL/resultDll/battle.c b/src/REL/resultDll/battle.c index 41a977d4..f5130e05 100644 --- a/src/REL/resultDll/battle.c +++ b/src/REL/resultDll/battle.c @@ -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 }; -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) -}; +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) }; 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(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)); anim2 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_RESULT, 0x3B), MEMORY_DEFAULT_NUM)); @@ -306,7 +305,7 @@ void fn_1_6824(void) } (void)anim3; 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]); for (i = 0; i < 180; i++) { if (i == 0) { @@ -316,7 +315,7 @@ void fn_1_6824(void) lbl_1_bss_1828[i] = Hu3DModelLink(lbl_1_bss_1828[0]); } 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(); 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); 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); - Hu3DModelAttrSet(char_mdl, 0x40000001); + Hu3DModelAttrSet(char_mdl, HU3D_MOTATTR_LOOP); Hu3DModelShadowSet(char_mdl); } CharModelDataClose(-1); @@ -427,7 +426,7 @@ void fn_1_7544(void) Hu3DModelPosSet(lbl_1_bss_1A9C[10], 0, 0, 200); for (i = 0; i < Hu3DMotionMaxTimeGet(lbl_1_bss_1A9C[10]); i++) { 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.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.z = 0; 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); Hu3DModelRotSet(lbl_1_bss_1828[i], 0, 0, 0); } @@ -628,7 +627,7 @@ void fn_1_8998(void) CharModelCoinEffectCreate(1, &pos); lbl_1_bss_194[i].unk0 = -1; HuAudFXPlay(7); - Hu3DModelAttrSet(lbl_1_bss_1828[i], 1); + Hu3DModelAttrSet(lbl_1_bss_1828[i], HU3D_ATTR_DISPOFF); } } HuPrcVSleep(); diff --git a/src/REL/resultDll/main.c b/src/REL/resultDll/main.c index 7c27ee4c..afe551d5 100644 --- a/src/REL/resultDll/main.c +++ b/src/REL/resultDll/main.c @@ -395,7 +395,7 @@ void fn_1_B78(void) 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); 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++) { @@ -411,7 +411,7 @@ void fn_1_B78(void) character = GWPlayerCfg[lbl_1_bss_4A[i]].character; Hu3D2Dto3D(&lbl_1_data_408[i], 1, &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++) { Hu3D2Dto3D(&lbl_1_data_0[i].pos, 1, &pos); @@ -430,7 +430,7 @@ void fn_1_B78(void) Hu3DModelPosSetV(j, &pos); Hu3DModelScaleSet(j, 1.5f, 1.5f, 1.5f); } - Hu3DModelAttrSet(model, 1); + Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF); model = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_RESULT, 0x07)); for (i = 0; i < 8; i++) { j = Hu3DModelLink(model); @@ -443,7 +443,7 @@ void fn_1_B78(void) Hu3DModelPosSetV(j, &pos); 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_9C = HuSprGrpCreate(4); for (i = 0; i < 4; i++) { @@ -662,12 +662,12 @@ void fn_1_2ADC(void) Hu3D2Dto3D(&lbl_1_data_408[i], 1, &sp48); Hu3DModelPosSetV(lbl_1_bss_A[i], &sp48); 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); - Hu3DModelAttrReset(lbl_1_bss_A[i], 1); + Hu3DModelAttrSet(lbl_1_bss_5C[temp_r30][sp18[i]], HU3D_ATTR_DISPOFF); + Hu3DModelAttrReset(lbl_1_bss_A[i], HU3D_ATTR_DISPOFF); Hu3DModelScaleSet(lbl_1_bss_A[i], 1.1f, 1.1f, 1.1f); } else { - Hu3DModelAttrSet(lbl_1_bss_A[i], 1); + Hu3DModelAttrSet(lbl_1_bss_A[i], HU3D_ATTR_DISPOFF); } } for (i = 0; i < 4; i++) { @@ -702,9 +702,9 @@ void fn_1_2ADC(void) } else { 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; - 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); 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])); @@ -997,7 +997,7 @@ void fn_1_461C(void) HuPrcVSleep(); sprite = espEntry(0x860020, 5000, 0); espPosSet(sprite, 288.0, 240.0); - espAttrReset(sprite, 4); + espAttrReset(sprite, HUSPR_ATTR_DISPOFF); Hu3DBGColorSet(0, 0, 0); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 20); while (WipeStatGet()) { @@ -1064,26 +1064,26 @@ void fn_1_47FC(void) while (WipeStatGet()) { HuPrcVSleep(); } - espAttrSet(lbl_1_bss_1A1A[0], 4); - espAttrSet(lbl_1_bss_1A1A[1], 4); + espAttrSet(lbl_1_bss_1A1A[0], HUSPR_ATTR_DISPOFF); + espAttrSet(lbl_1_bss_1A1A[1], HUSPR_ATTR_DISPOFF); 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 + 10], 1); + Hu3DModelAttrSet(lbl_1_bss_1A9C[temp_r31 + 6], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_1A9C[temp_r31 + 10], HU3D_ATTR_DISPOFF); } 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++) { - 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++) { HuSprGrpTPLvlSet(lbl_1_bss_CE[temp_r31], 0.0f); } for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { 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_52); @@ -1159,7 +1159,7 @@ void fn_1_47FC(void) } temp_r18 = lbl_1_bss_5C[sp2C[temp_r31]][sp10]; 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); Hu3DModelPosSetV(temp_r18, &sp40); Hu3DModelRotSet(temp_r18, 0, 0, 0); diff --git a/src/REL/selmenuDll/main.c b/src/REL/selmenuDll/main.c index 75831f13..6b2c1a2f 100644 --- a/src/REL/selmenuDll/main.c +++ b/src/REL/selmenuDll/main.c @@ -576,11 +576,11 @@ static void SMCharUpdate(omObjData *object) s16 num_players; for (i = 0; i < 8; i++) { - Hu3DModelAttrSet(charModelID[i], 0x1); + Hu3DModelAttrSet(charModelID[i], HU3D_ATTR_DISPOFF); } for (i = 0; i < 4; i++) { 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]); } } diff --git a/src/REL/w01Dll/mg_coin.c b/src/REL/w01Dll/mg_coin.c index db91a124..6a7c12b8 100755 --- a/src/REL/w01Dll/mg_coin.c +++ b/src/REL/w01Dll/mg_coin.c @@ -2,10 +2,16 @@ #include "game/audio.h" #include "game/chrman.h" #include "game/data.h" +#include "game/frand.h" #include "game/gamework_data.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/memory.h" #include "game/minigame_seq.h" @@ -14,12 +20,6 @@ #include "game/pad.h" #include "game/sprite.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 "ext_math.h" @@ -116,112 +116,41 @@ static omObjData *lbl_1_bss_710; static AnimData *lbl_1_bss_70C; static s16 lbl_1_bss_708; -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 } -}; +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 } }; -static u16 lbl_1_data_67C[3][3] = { - { 10, 5, 20 }, - { 10, 5, 20 }, - { 5, 20, 10 } -}; +static u16 lbl_1_data_67C[3][3] = { { 10, 5, 20 }, { 10, 5, 20 }, { 5, 20, 10 } }; -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, 88.0f, 0.0f }, 87.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 }, 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_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, 88.0f, 0.0f }, 87.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 }, 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] = { - { - { { -50.0f, -12.0f, 0.0f }, 125.0f }, - { { -50.0f, 113.0f, 0.0f }, 50.0f }, - { { 0.0f, 113.0f, 0.0f }, 25.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 } - }, - { - { { 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_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 }, + { { 0.0f, 138.0f, 0.0f }, 50.0f }, { { 50.0f, 138.0f, 0.0f }, 37.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 }, 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] = { - { - { { -50.0f, -12.0f, 0.0f }, 100.0f }, - { { -50.0f, 88.0f, 0.0f }, 50.0f }, - { { 0.0f, 88.0f, 0.0f }, 50.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 } - }, - { - { { 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 } - } -}; +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 }, + { { 0.0f, 138.0f, 0.0f }, 50.0f }, { { -50.0f, 138.0f, 0.0f }, 37.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 var_r30; @@ -230,12 +159,15 @@ void fn_1_9D00(s32 arg0) { if (lbl_1_bss_0->unk00_field0 != 0) { if (temp_r31 == 0 || temp_r31 == 1 || temp_r31 == 7) { var_r30 = 0; - } else { + } + else { 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; - } else { + } + else { var_r30 = 0; } if (BoardPlayerCoinsGet(arg0) < 5) { @@ -243,12 +175,14 @@ void fn_1_9D00(s32 arg0) { } if (var_r30 != 0) { BoardComKeySetLeft(); - } else { + } + else { BoardComKeySetRight(); } } -void fn_1_9DD8(void) { +void fn_1_9DD8(void) +{ Vec sp2C[3]; Vec sp20; Vec sp14; @@ -295,7 +229,7 @@ void fn_1_9DD8(void) { fn_1_CB44(&sp14, 0.0f); fn_1_B088(lbl_1_bss_720); 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++) { 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); @@ -305,7 +239,8 @@ void fn_1_9DD8(void) { temp_r29 = lbl_1_bss_714[i]->data; if (i == lbl_1_bss_730) { lbl_1_bss_714[i]->work[2] = 1; - } else { + } + else { lbl_1_bss_714[i]->work[2] = 0; } 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) { return; } @@ -338,7 +274,8 @@ static void fn_1_A4B8(omObjData *arg0) { lbl_1_bss_754 -= 1.0f; } -static void fn_1_A554(void) { +static void fn_1_A554(void) +{ float temp_f1; lbl_1_bss_72A = 1; @@ -350,7 +287,8 @@ static void fn_1_A554(void) { BoardModelMotionSpeedSet(lbl_1_bss_796, -1.0f); } -static void fn_1_A5FC(void) { +static void fn_1_A5FC(void) +{ s32 i; for (i = 0; i < 3; i++) { @@ -367,7 +305,8 @@ static void fn_1_A5FC(void) { Hu3DModelKill(lbl_1_bss_750); } -static void fn_1_A6E0(omObjData *arg0) { +static void fn_1_A6E0(omObjData *arg0) +{ Bss714Data *temp_r31; Vec sp2C; Vec sp20; @@ -384,10 +323,12 @@ static void fn_1_A6E0(omObjData *arg0) { sp2C.y = 1.5f; if (arg0->work[3] == 1) { arg0->work[2] = 0; - } else { + } + else { arg0->work[2] = 2; } - } else { + } + else { sp2C.y += 0.08f; } BoardModelScaleSetV(arg0->work[0], &sp2C); @@ -399,10 +340,12 @@ static void fn_1_A6E0(omObjData *arg0) { if (arg0->work[1] == 1) { arg0->work[2] = 0; arg0->work[1] = 0; - } else { + } + else { arg0->work[2] = 1; } - } else { + } + else { sp2C.y -= 0.08f; } 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); break; case 4: - Hu3DModelAttrSet(lbl_1_bss_750, 1); + Hu3DModelAttrSet(lbl_1_bss_750, HU3D_ATTR_DISPOFF); arg0->work[2] = 5; temp_r31->unk08 = 0; 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) { temp_r31->unk40 = 0; 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; lbl_1_bss_728 = 10; - } else { + } + else { temp_r31->unk40 = 1; 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); 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); - } else { + } + else { 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; } @@ -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; s32 i; @@ -536,7 +483,8 @@ static float fn_1_B018(Data690Block *arg0) { return var_f31; } -static void fn_1_B088(omObjData *arg0) { +static void fn_1_B088(omObjData *arg0) +{ Bss720Data *temp_r31; u16 sp8[] = { 20, 60, 120, 190 }; s32 i; @@ -548,13 +496,15 @@ static void fn_1_B088(omObjData *arg0) { temp_r31->unk26 = i; } } - } else { + } + else { temp_r31->unk26 = rand8() % 3; } 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; 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->unk26 == lbl_1_bss_730) { *arg2 |= 0x100; - } else if (temp_r31->unk26 < lbl_1_bss_730) { + } + else if (temp_r31->unk26 < lbl_1_bss_730) { *arg1 |= 1; - } else { + } + else { *arg1 |= 2; } temp_r31->unk24 = rand8() % 10 + 10; - } else { + } + else { temp_r31->unk28++; temp_r31->unk24 = rand8() % 10 + 20; if (lbl_1_bss_730 == 0) { *arg1 |= 2; - } else if (lbl_1_bss_730 == 2) { + } + else if (lbl_1_bss_730 == 2) { *arg1 |= 1; - } else if (rand8() & 1) { + } + else if (rand8() & 1) { *arg1 |= 1; - } else { + } + else { *arg1 |= 2; } } } -static void fn_1_B3B8(omObjData *arg0) { +static void fn_1_B3B8(omObjData *arg0) +{ float temp_f31; 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; Vec sp18; Vec spC; @@ -616,7 +574,8 @@ static void fn_1_B478(omObjData *arg0) { } if (GWPlayerCfg[lbl_1_bss_798].iscom == 1) { fn_1_B1CC(arg0, &var_r29, &var_r27); - } else { + } + else { var_r29 = HuPadDStkRep[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; Vec sp14; Vec sp8; @@ -675,7 +635,8 @@ static void fn_1_BAF8(omObjData *arg0) { BoardPlayerPosSetV(lbl_1_bss_798, &sp14); } -static void fn_1_BCDC(omObjData *arg0) { +static void fn_1_BCDC(omObjData *arg0) +{ Bss720Data *temp_r29; Bss714Data *temp_r31; Vec sp14; @@ -691,7 +652,7 @@ static void fn_1_BCDC(omObjData *arg0) { lbl_1_bss_710->work[0] = 1; lbl_1_bss_714[lbl_1_bss_730]->work[2] = 3; 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); temp_r31->unk20.x = 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; temp_r31 = arg0->data; if (temp_r31->unk1C == 0) { lbl_1_bss_714[lbl_1_bss_730]->work[2] = 4; arg0->func = fn_1_BF68; - } else { + } + else { temp_r31->unk1C--; } } -static void fn_1_BF68(omObjData *arg0) { +static void fn_1_BF68(omObjData *arg0) +{ Bss720Data *sp8; 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) omObjData *temp_r30; 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; Vec sp8; @@ -774,7 +740,8 @@ static void fn_1_C0FC(omObjData *arg0) { BoardPlayerPosSetV(lbl_1_bss_798, &sp8); } -static void fn_1_C25C(void) { +static void fn_1_C25C(void) +{ Vec sp11C[20]; Vec sp2C[20]; 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; 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; lbl_1_bss_72A = 1; @@ -869,33 +838,38 @@ static void fn_1_C894(omObjData *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); VECNormalize(arg2, arg2); } -static float fn_1_C998(Vec *arg0) { +static float fn_1_C998(Vec *arg0) +{ float temp_f31; if (arg0->x || arg0->z) { if (arg0->x == 0.0f) { if (arg0->z > 0.0f) { return 0.0f; - } else { + } + else { return 180.0f; } } if (arg0->z == 0.0f) { if (arg0->x > 0.0f) { return 90.0f; - } else { + } + else { return 270.0f; } } temp_f31 = atan2d(arg0->z, arg0->x); if (arg0->z < 0.0f) { temp_f31 = 90.0f - temp_f31; - } else { + } + else { temp_f31 = 90.0f - temp_f31; if (temp_f31 < 0.0f) { temp_f31 += 360.0f; @@ -906,7 +880,8 @@ static float fn_1_C998(Vec *arg0) { return -1.0f; } -static u32 fn_1_CB44(Vec *arg0, float arg1) { +static u32 fn_1_CB44(Vec *arg0, float arg1) +{ Vec sp24; Vec sp18; Vec spC; @@ -923,22 +898,27 @@ static u32 fn_1_CB44(Vec *arg0, float arg1) { var_f30 = var_f28 - var_f31; if (arg1 == 0.0f) { var_f31 = var_f28; - } else if (fabs(var_f30) > arg1) { + } + else if (fabs(var_f30) > arg1) { if (var_f30 < 0.0f) { var_f30 += 360.0f; } if (var_f30 < 180.0f) { if (var_f30 > arg1) { var_f31 += arg1; - } else { + } + else { var_f31 += var_f30; } - } else if (360.0f - var_f30 > arg1) { + } + else if (360.0f - var_f30 > arg1) { var_f31 -= arg1; - } else { + } + else { var_f31 -= 360.0f - var_f30; } - } else { + } + else { var_f31 = var_f28; } 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); if (var_f31 == var_f28) { return 1; - } else { + } + else { 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_710 = omAddObjEx(boardObjMan, 0x101, 1, 0, -1, fn_1_D07C); 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); Hu3DParticleHookSet(lbl_1_bss_710->model[0], fn_1_D114); 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; } -static void fn_1_D034(void) { +static void fn_1_D034(void) +{ Hu3DModelKill(lbl_1_bss_710->model[0]); omDelObjEx(HuPrcCurrentGet(), lbl_1_bss_710); } -static void fn_1_D07C(omObjData *arg0) { +static void fn_1_D07C(omObjData *arg0) +{ void *sp8; sp8 = arg0->data; @@ -982,7 +966,7 @@ static void fn_1_D07C(omObjData *arg0) { break; case 1: 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); break; 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; HsfanimStruct01 *var_r31; 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++) { var_r31->unk2C = 0.0f; } - particle->unk_1C = (void*) 1; + particle->unk_1C = (void *)1; } if (temp_r28->unk1C > 0.0f) { for (i = 0; i < 80.0f * temp_r28->unk1C; i++) { diff --git a/src/REL/w01Dll/mg_item.c b/src/REL/w01Dll/mg_item.c index e0dabf97..ab932863 100755 --- a/src/REL/w01Dll/mg_item.c +++ b/src/REL/w01Dll/mg_item.c @@ -1,6 +1,7 @@ #include "REL/w01Dll.h" #include "game/audio.h" #include "game/data.h" +#include "game/frand.h" #include "game/gamework_data.h" #include "game/hsfanim.h" #include "game/hsfdraw.h" @@ -12,15 +13,14 @@ #include "game/pad.h" #include "game/process.h" #include "game/sprite.h" -#include "game/frand.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/ui.h" #include "game/board/window.h" +#include "game/window.h" #include "dolphin.h" #include "ext_math.h" @@ -83,46 +83,21 @@ static s16 lbl_1_bss_7A8; static s32 lbl_1_bss_7A4; static AnimData *lbl_1_bss_7A0; -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, 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_F08[] = { DATA_MAKE_NUM(DATADIR_BOARD, 109), DATA_MAKE_NUM(DATADIR_BOARD, 110), DATA_MAKE_NUM(DATADIR_BOARD, 111), + 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] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 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_F40[8] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 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] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 64), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 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) -}; +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_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 sp8[4]; 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; } 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) { Hu3DMotionSpeedSet(lbl_1_bss_7FC[i]->model[1], 0.0f); } - Hu3DModelAttrReset(sp8[i], 1); - Hu3DModelAttrSet(lbl_1_bss_7FC[i]->model[1], 1); - Hu3DModelAttrSet(lbl_1_bss_7FC[i]->model[1], 0x40000002); + Hu3DModelAttrReset(sp8[i], HU3D_ATTR_DISPOFF); + Hu3DModelAttrSet(lbl_1_bss_7FC[i]->model[1], HU3D_ATTR_DISPOFF); + 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); var_f31 = 90.0f - 90.0f * i + 360.0f * (temp_f30 / temp_f29); 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; for (i = 0; i < 4; i++) { if (i != 0) { Hu3DModelKill(lbl_1_bss_7FC[i]->model[0]); - } else { + } + else { BoardModelVisibilitySet(lbl_1_bss_6C4[19], 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; BoardModelPosGet(lbl_1_bss_6C4[16], &lbl_1_bss_80C); @@ -237,14 +215,16 @@ void fn_1_DE94(void) { lbl_1_bss_7B4 = 0; } -static void fn_1_E100(void) { +static void fn_1_E100(void) +{ lbl_1_bss_7AA = 1; BoardMGExit(); HuAudFXPlay(0x40F); BoardModelMotionStart(lbl_1_bss_6C4[21], 0, 0x40000004); } -static void fn_1_E154(void) { +static void fn_1_E154(void) +{ fn_1_DD84(); BoardPlayerMotionKill(lbl_1_bss_7E4, lbl_1_bss_7BC); BoardPlayerMotionKill(lbl_1_bss_7E4, lbl_1_bss_7B8); @@ -252,18 +232,18 @@ static void fn_1_E154(void) { BoardMGDoneFlagSet(0); } -static void fn_1_E2B8(omObjData *arg0) { +static void fn_1_E2B8(omObjData *arg0) +{ if (lbl_1_bss_7AA == 1 && BoardMGDoneFlagGet() == 1) { fn_1_E154(); omDelObjEx(HuPrcCurrentGet(), arg0); } } -static char *lbl_1_data_F9C[] = { - "uma1", "uma2", "uma3", "uma4" -}; +static char *lbl_1_data_F9C[] = { "uma1", "uma2", "uma3", "uma4" }; -static void fn_1_E44C(omObjData *arg0) { +static void fn_1_E44C(omObjData *arg0) +{ Vec sp18; Vec spC; float temp_f27; @@ -318,7 +298,8 @@ static void fn_1_E44C(omObjData *arg0) { 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; s32 i; @@ -346,7 +327,8 @@ static void fn_1_E914(omObjData *arg0) { 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_7E8 *= 1.05f; if (lbl_1_bss_7EC > 2.0f) { @@ -368,16 +350,19 @@ static void fn_1_ECD4(omObjData *arg0) { 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; if (arg0->work[3] != 0) { arg0->work[3]--; - } else { + } + else { *arg1 |= 0x100; } } -static void fn_1_EED8(omObjData *arg0) { +static void fn_1_EED8(omObjData *arg0) +{ s16 temp_r29; u16 var_r30; @@ -391,7 +376,8 @@ static void fn_1_EED8(omObjData *arg0) { } if (GWPlayerCfg[lbl_1_bss_7E4].iscom == 1) { fn_1_EEA0(arg0, &var_r30); - } else { + } + else { var_r30 = HuPadBtnDown[temp_r29]; } 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 var_f30; @@ -424,8 +411,10 @@ static void fn_1_F09C(omObjData *arg0) { BoardModelMotionTimeSet(lbl_1_bss_6C4[18], var_f30); arg0->work[0] = fn_1_1001C(arg0->work[2]); 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); - 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); + 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); + 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; BoardAudSeqFadeOut(1, 100); 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) { BoardModelVisibilitySet(lbl_1_bss_6C4[20], 0); - } else { + } + else { BoardModelVisibilitySet(lbl_1_bss_6C4[20], 1); } 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 spC; @@ -472,7 +464,8 @@ static void fn_1_F3F8(omObjData *arg0) { arg0->func = fn_1_F6E8; } -static void fn_1_F6E8(omObjData *arg0) { +static void fn_1_F6E8(omObjData *arg0) +{ Vec sp8; BoardPlayerPosGet(lbl_1_bss_7E4, &sp8); @@ -489,7 +482,8 @@ static void fn_1_F6E8(omObjData *arg0) { BoardPlayerPosSetV(lbl_1_bss_7E4, &sp8); } -static void fn_1_F890(omObjData *arg0) { +static void fn_1_F890(omObjData *arg0) +{ Vec 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->func = fn_1_10820; arg0->func = fn_1_FA1C; - } else if (sp8.y > 180.0f) { + } + else if (sp8.y > 180.0f) { if (360.0f - sp8.y < 3.0f) { sp8.y = 0.0f; - } else { + } + else { sp8.y += 3.0f; } - } else { + } + else { if (sp8.y < 3.0f) { sp8.y = 0.0f; - } else { + } + else { sp8.y -= 3.0f; } } 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) { BoardPlayerMotionShiftSet(lbl_1_bss_7E4, lbl_1_bss_7BC, 0.0f, 10.0f, HU3D_MOTATTR_NONE); 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; if (arg0->work[0] == 0) { @@ -533,12 +533,14 @@ static void fn_1_FABC(omObjData *arg0) { BoardAudSeqPause(0, 0, 1000); arg0->func = NULL; } - } else { + } + else { arg0->work[0]--; } } -static void fn_1_FB58(void) { +static void fn_1_FB58(void) +{ omObjData *temp_r31; 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; 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; 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); BoardCameraTargetModelSet(lbl_1_bss_6C4[21]); BoardCameraOffsetSet(0.0f, 0.0f, 0.0f); @@ -597,7 +602,8 @@ static void fn_1_FD3C(omObjData *arg0) { 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()) { lbl_1_bss_7AA = 1; 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 var_f31; float var_f29; @@ -624,7 +631,8 @@ static void fn_1_FED0(omObjData *arg0) { 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_f28; float temp_f27; @@ -649,7 +657,8 @@ static s16 fn_1_1001C(u32 arg0) { return var_f31; } -static void fn_1_101B8(s16 arg0) { +static void fn_1_101B8(s16 arg0) +{ omObjData *var_r31; float *var_r30; 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->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->data = HuMemDirectMallocNum(HEAP_SYSTEM, 3 * sizeof(float), MEMORY_DEFAULT_NUM); var_r30 = lbl_1_bss_7F0->data; @@ -696,7 +705,8 @@ static void fn_1_101B8(s16 arg0) { lbl_1_bss_7AC = HuAudFXPlay(0x35F); } -static void fn_1_10664(omObjData *arg0) { +static void fn_1_10664(omObjData *arg0) +{ float *temp_r31; float var_f31; @@ -705,7 +715,8 @@ static void fn_1_10664(omObjData *arg0) { if (arg0->work[0] == 0) { if (var_f31 > 1.0f) { var_f31 = 1.0f; - } else { + } + else { temp_r31[0] += 0.025f; } arg0->trans.y += temp_r31[2]; @@ -714,7 +725,8 @@ static void fn_1_10664(omObjData *arg0) { arg0->work[0] = 1; } omSetSca(arg0, var_f31, var_f31, var_f31); - } else { + } + else { arg0->trans.y += sind(temp_r31[1]); temp_r31[1] += 4.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 sp18; Vec spC; @@ -744,7 +757,8 @@ static void fn_1_10820(omObjData *arg0) { arg0->trans.x = sp24.x; arg0->trans.z = sp24.z; arg0->work[0] = 1; - } else { + } + else { arg0->trans.x += 8.0f * spC.x; 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; 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]); } -static float fn_1_10BB0(u32 arg0) { +static float fn_1_10BB0(u32 arg0) +{ float var_f30; float temp_f29; float var_f31; @@ -793,7 +809,8 @@ static float fn_1_10BB0(u32 arg0) { return var_f31; } -static void fn_1_10CF0(u32 arg0) { +static void fn_1_10CF0(u32 arg0) +{ float var_f30; float temp_f29; 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); } -static float fn_1_10EB8(Vec *arg0) { +static float fn_1_10EB8(Vec *arg0) +{ float var_f31; if (arg0->x || arg0->z) { if (arg0->x == 0.0f) { if (arg0->z > 0.0f) { return 0.0f; - } else { + } + else { return 180.0f; } } if (arg0->z == 0.0f) { if (arg0->x > 0.0f) { return 90.0f; - } else { + } + else { return 270.0f; } } var_f31 = atan2d(arg0->z, arg0->x); if (arg0->z < 0.0f) { var_f31 = 90.0f - var_f31; - } else { + } + else { var_f31 = 90.0f - var_f31; if (var_f31 < 0.0f) { var_f31 += 360.0f; @@ -850,7 +871,8 @@ static float fn_1_10EB8(Vec *arg0) { 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; float temp_f30; 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; float temp_f29; float temp_f30; diff --git a/src/REL/w04Dll/boo_event.c b/src/REL/w04Dll/boo_event.c index c3cc3e8f..2913f005 100755 --- a/src/REL/w04Dll/boo_event.c +++ b/src/REL/w04Dll/boo_event.c @@ -1,6 +1,14 @@ #include "REL/w04Dll.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/frand.h" #include "game/gamework_data.h" #include "game/hsfanim.h" #include "game/hsfdraw.h" @@ -12,14 +20,6 @@ #include "game/process.h" #include "game/sprite.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 "ext_math.h" @@ -94,50 +94,25 @@ static s16 lbl_1_bss_50; static AnimData *lbl_1_bss_4C; static Process *lbl_1_bss_48; -static s32 lbl_1_data_2D0[8] = { - DATADIR_MARIOMOT, - DATADIR_LUIGIMOT, - DATADIR_PEACHMOT, - DATADIR_YOSHIMOT, - DATADIR_WARIOMOT, - DATADIR_DONKEYMOT, - DATADIR_DAISYMOT, - DATADIR_WALUIGIMOT -}; +static s32 lbl_1_data_2D0[8] = { DATADIR_MARIOMOT, 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_2F4[8] = { - 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, 39), - DATA_MAKE_NUM(DATADIR_W04, 40), - DATA_MAKE_NUM(DATADIR_W04, 41), - DATA_MAKE_NUM(DATADIR_W04, 42) -}; +static s32 lbl_1_data_2F4[8] + = { 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, 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] = { - 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, 47), - DATA_MAKE_NUM(DATADIR_W04, 48), - DATA_MAKE_NUM(DATADIR_W04, 49), - DATA_MAKE_NUM(DATADIR_W04, 50) -}; +static s32 lbl_1_data_314[8] + = { 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, 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[] = { - "kan1", "kan2", "kan3", "kan4" -}; +static char *lbl_1_data_348[] = { "kan1", "kan2", "kan3", "kan4" }; -static float lbl_1_data_358[] = { - -150.00001f, -170.00001f, -30.0f, -220.0f -}; +static float lbl_1_data_358[] = { -150.00001f, -170.00001f, -30.0f, -220.0f }; -static void fn_1_20EC(void) { +static void fn_1_20EC(void) +{ Vec sp20; Vec sp14; Vec sp8; @@ -258,7 +233,8 @@ static void fn_1_20EC(void) { HuPrcEnd(); } -static void fn_1_28BC(void) { +static void fn_1_28BC(void) +{ Vec sp20; Vec sp14; Vec sp8; @@ -273,7 +249,7 @@ static void fn_1_28BC(void) { var_r27 = HuPrcChildCreate(fn_1_45A8, 0x2001, 0x800, 0, boardMainProc); 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); 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; 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; BssE4Data *temp_r31; s32 i; @@ -356,8 +334,9 @@ static void fn_1_2C10(void) { temp_r31->unk0C = 0; if (i == 0) { 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]->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; 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); } -static void fn_1_2EE8(s32 arg0) { +static void fn_1_2EE8(s32 arg0) +{ s32 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; for (i = 0; i < 4; i++) { @@ -396,16 +378,19 @@ static s32 fn_1_2F54(u32 arg0) { } if (i != 4) { return 0; - } else { + } + else { return 1; } } -static BssE4Data *fn_1_2FBC(s16 arg0) { +static BssE4Data *fn_1_2FBC(s16 arg0) +{ return lbl_1_bss_E4[arg0]->user_data; } -static void fn_1_2FDC(void) { +static void fn_1_2FDC(void) +{ Vec sp8; 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 sp14; float temp_f31; @@ -451,7 +437,8 @@ static void fn_1_30A4(void) { if (temp_r31->unk06 == 0) { BoardPlayerPosGet(GWSystem.player_curr, &temp_r31->unk20); temp_r31->unk20.y += 65.0f; - } else { + } + else { temp_r31->unk20 = fn_1_2FBC(temp_r31->unk06 - 1)->unk20; temp_r31->unk20.z -= 300.0f; } @@ -513,7 +500,8 @@ static void fn_1_30A4(void) { } if (temp_r31->unk06 == 0) { BoardModelPosGet(lbl_1_bss_FA, &temp_r31->unk20); - } else { + } + else { BoardModelPosGet(fn_1_2FBC(temp_r31->unk06 - 1)->unk04, &temp_r31->unk20); } temp_r31->unk00 = 0; @@ -565,7 +553,8 @@ static void fn_1_30A4(void) { temp_r31->unk0E = temp_r31->unk0C; if (temp_r31->unk06 == 0) { temp_r31->unk0C = lbl_1_bss_74; - } else { + } + else { temp_r31->unk0C = fn_1_2FBC(temp_r31->unk06 - 1)->unk0E; } BoardModelPosSetV(temp_r31->unk04, &temp_r31->unk20); @@ -574,14 +563,16 @@ static void fn_1_30A4(void) { } if (temp_r31->unk06 == 0) { BoardModelPosGet(lbl_1_bss_FA, &temp_r31->unk20); - } else { + } + else { BoardModelPosGet(fn_1_2FBC(temp_r31->unk06 - 1)->unk04, &temp_r31->unk20); } if (var_r29 != 0) { BoardModelVisibilitySet(temp_r31->unk04, 0); temp_r31->unk02 = 0; temp_r31->unk00 = 4; - } else { + } + else { temp_r31->unk00 = 0; } 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 sp18; Vec spC; @@ -640,7 +632,8 @@ static void fn_1_38D8(void) { HuPrcEnd(); } -static s32 fn_1_3C9C(void) { +static s32 fn_1_3C9C(void) +{ Vec sp50; Vec sp44; Vec sp38; @@ -731,17 +724,20 @@ static s32 fn_1_3C9C(void) { var_r19 = 0; if (var_r21 != 0) { var_r21--; - } else { + } + else { var_r21 = frandmod(10) + 15; if (frandBool() || var_r18 == 3) { var_r19 = 0x100; - } else { + } + else { OSReport("com sel chg: %d \n", var_r29); var_r18++; var_r23 = frandmod(var_r29); } } - } else { + } + else { var_r26 = HuPadStkX[temp_r20]; var_r25 = HuPadStkY[temp_r20]; var_r19 = HuPadBtnDown[temp_r20]; @@ -783,7 +779,8 @@ static s32 fn_1_3C9C(void) { if (var_f31 > 180.0f) { var_f31 -= 180.0f; } - } else { + } + else { sp38.x = sp38.y = sp38.z = 1.8f; } BoardModelScaleSetV(lbl_1_bss_F4[i], &sp38); @@ -798,7 +795,8 @@ static s32 fn_1_3C9C(void) { var_r24 = sp20[var_r27]; lbl_1_bss_70 = sp18[var_r27]; 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); for (i--; i >= 0; i--) { var_r28 = BoardSpaceGet(0, sp10[i]); @@ -807,7 +805,8 @@ static s32 fn_1_3C9C(void) { } } var_r24 = sp10[i]; - } else { + } + else { for (i = 0; i < temp_r30->link_cnt; i++) { var_r28 = BoardSpaceGet(0, temp_r30->link[i]); if (var_r28->flag & 0x200) { @@ -819,12 +818,13 @@ static s32 fn_1_3C9C(void) { return var_r24; } -static void fn_1_45A8(void) { +static void fn_1_45A8(void) +{ float *temp_r30; s32 var_r31; var_r31 = 15; - temp_r30 = (float*) &HuPrcCurrentGet()->user_data; + temp_r30 = (float *)&HuPrcCurrentGet()->user_data; while (TRUE) { if (var_r31 == 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); BoardCameraTargetPlayerSet(GWSystem.player_curr); BoardCameraViewSet(2); @@ -850,7 +851,8 @@ static void fn_1_4630(void) { BoardCameraMoveSet(1); } -static s32 fn_1_4680(s16 arg0) { +static s32 fn_1_4680(s16 arg0) +{ BoardSpace *var_r30; BoardSpace *var_r29; s16 sp8[4]; @@ -880,7 +882,8 @@ static s32 fn_1_4680(s16 arg0) { } } arg0 = sp8[i]; - } else { + } + else { for (i = 0; i < var_r30->link_cnt; i++) { var_r29 = BoardSpaceGet(0, var_r30->link[i]); if (var_r29->flag & 0x200) { @@ -897,7 +900,8 @@ static s32 fn_1_4680(s16 arg0) { return var_r27; } -static void fn_1_4848(void) { +static void fn_1_4848(void) +{ Vec sp20; Vec sp14; float temp_f28; @@ -905,7 +909,7 @@ static void fn_1_4848(void) { s32 temp_r30; s32 i; - temp_r30 = (s32) HuPrcCurrentGet()->user_data; + temp_r30 = (s32)HuPrcCurrentGet()->user_data; BoardPlayerPosGet(temp_r30, &sp20); BoardPlayerMotBlendSet(temp_r30, BoardModelRotYGet(lbl_1_bss_FA) - 180.0f, 0xA); while (!BoardPlayerMotBlendCheck(temp_r30)) { @@ -981,7 +985,8 @@ block_A: HuPrcEnd(); } -static void fn_1_5018(void) { +static void fn_1_5018(void) +{ Vec sp18; Vec spC; 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) { temp_r3 = HuPrcChildCreate(fn_1_4848, 0x2003, 0x2000, 0, boardMainProc); 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; } } } -static void fn_1_52A0(s16 arg0, Vec *arg1) { +static void fn_1_52A0(s16 arg0, Vec *arg1) +{ Vec sp40[4]; Vec sp10[4]; 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]); } -static void fn_1_55A0(void) { +static void fn_1_55A0(void) +{ lbl_1_bss_48 = NULL; } -void fn_1_55B4(void) { +void fn_1_55B4(void) +{ s32 sp8; 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; s32 i; @@ -1087,13 +1096,14 @@ static void fn_1_5648(void) { Hu3DParticleScaleSet(lbl_1_bss_C4[i]->model[0], 5.0f); Hu3DParticleHookSet(lbl_1_bss_C4[i]->model[0], fn_1_5A2C); 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->unk_1C = lbl_1_bss_C4[i]; } } -static void fn_1_5828(void) { +static void fn_1_5828(void) +{ s32 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; for (i = 0; i < 4; i++) { @@ -1117,22 +1128,25 @@ static s16 fn_1_58A4(Vec *arg0) { 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[2] = 0; } -static void fn_1_59C4(omObjData *arg0) { +static void fn_1_59C4(omObjData *arg0) +{ if (arg0->work[0] != 0) { - Hu3DModelAttrReset(arg0->model[0], 1); + Hu3DModelAttrReset(arg0->model[0], HU3D_ATTR_DISPOFF); } if (arg0->work[2] != 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 i; s32 j; @@ -1188,7 +1202,8 @@ static void fn_1_5A2C(ModelData *model, ParticleData *particle, Mtx matrix) { if (var_r31->unk08.z <= 0.0f) { var_r31->unk08.z = 0.0f; } - } else { + } + else { var_r26++; } } diff --git a/src/REL/ztardll/main.c b/src/REL/ztardll/main.c index 52cc07a9..be8b5a53 100644 --- a/src/REL/ztardll/main.c +++ b/src/REL/ztardll/main.c @@ -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[1] = Hu3DJointMotionFile(lbl_1_bss_42, DATA_MAKE_NUM(DATADIR_ZTAR, 2)); 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); 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_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)); - Hu3DModelAttrSet(lbl_1_bss_42, 0x40000001); + Hu3DModelAttrSet(lbl_1_bss_42, HU3D_MOTATTR_LOOP); Hu3DModelPosSetV(lbl_1_bss_42, &sp2C); Hu3DModelRotSet(lbl_1_bss_42, 0.0f, -10.0f, -15.0f); 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); } 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); Hu3DModelShadowSet(lbl_1_bss_36[var_r31]); 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_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)); - Hu3DModelAttrSet(lbl_1_bss_42, 0x40000001); + Hu3DModelAttrSet(lbl_1_bss_42, HU3D_MOTATTR_LOOP); Hu3DModelPosSetV(lbl_1_bss_42, &sp2C); Hu3DModelRotSet(lbl_1_bss_42, 0.0f, -10.0f, -15.0f); 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); } 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); Hu3DModelShadowSet(lbl_1_bss_36[var_r31]); var_r28 += 0x96; diff --git a/src/game/board/item.c b/src/game/board/item.c index 87d9a1ab..4309da32 100755 --- a/src/game/board/item.c +++ b/src/game/board/item.c @@ -1,17 +1,5 @@ #include "game/board/item.h" #include "game/audio.h" -#include "game/chrman.h" -#include "game/data.h" -#include "game/gamework.h" -#include "game/gamework_data.h" -#include "game/hsfanim.h" -#include "game/hsfman.h" -#include "game/objsub.h" -#include "game/pad.h" -#include "game/process.h" -#include "game/sprite.h" -#include "game/window.h" -#include "game/wipe.h" #include "game/board/audio.h" #include "game/board/boo.h" #include "game/board/char_wheel.h" @@ -22,9 +10,22 @@ #include "game/board/space.h" #include "game/board/star.h" #include "game/board/ui.h" -#include "game/board/window.h" #include "game/board/view.h" +#include "game/board/window.h" +#include "game/chrman.h" +#include "game/data.h" #include "game/frand.h" +#include "game/gamework.h" +#include "game/gamework_data.h" +#include "game/hsfanim.h" +#include "game/hsfman.h" +#include "game/objsub.h" +#include "game/pad.h" +#include "game/process.h" +#include "game/sprite.h" +#include "game/window.h" +#include "game/wipe.h" + #include "ext_math.h" @@ -112,118 +113,46 @@ static AnimData *genieParticleAnim; static s16 geniePlayerMot[3]; static Process *itemProc; -s32 lbl_801D37A0[2] = { - DATA_MAKE_NUM(DATADIR_BOARD, 117), - -1 -}; +s32 lbl_801D37A0[2] = { DATA_MAKE_NUM(DATADIR_BOARD, 117), -1 }; -static void (*itemFuncTbl[])(void) = { - ExecItemMini, - ExecItemMega, - ExecItemMiniSuper, - ExecItemMegaSuper, - ExecItemHammer, - ExecItemPipe, - ExecItemSwap, - ExecItemSpark, - ExecItemLight, - ExecItemWhistle, - ExecItemBowser, - ExecItemBooBall, - ExecItemGenie, - ExecItemBag -}; +static void (*itemFuncTbl[])(void) = { ExecItemMini, ExecItemMega, ExecItemMiniSuper, ExecItemMegaSuper, ExecItemHammer, ExecItemPipe, ExecItemSwap, + ExecItemSpark, ExecItemLight, ExecItemWhistle, ExecItemBowser, ExecItemBooBall, ExecItemGenie, ExecItemBag }; -static void (*itemRestoreFuncTbl[])(void) = { - RestoreItemMini, - RestoreItemMega, - RestoreItemMiniSuper, - RestoreItemMegaSuper, - RestoreItemNull, - RestoreItemNull, - RestoreItemNull, - RestoreItemNull, - RestoreItemNull, - RestoreItemNull, - RestoreItemBowser, - RestoreItemNull, - RestoreItemNull, - RestoreItemNull -}; +static void (*itemRestoreFuncTbl[])(void) + = { RestoreItemMini, RestoreItemMega, RestoreItemMiniSuper, RestoreItemMegaSuper, RestoreItemNull, RestoreItemNull, RestoreItemNull, + RestoreItemNull, RestoreItemNull, RestoreItemNull, RestoreItemBowser, RestoreItemNull, RestoreItemNull, RestoreItemNull }; -static s32 itemMdlTbl[] = { - DATA_MAKE_NUM(DATADIR_BOARD, 109), - DATA_MAKE_NUM(DATADIR_BOARD, 110), - DATA_MAKE_NUM(DATADIR_BOARD, 111), - 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 itemMdlTbl[] = { DATA_MAKE_NUM(DATADIR_BOARD, 109), DATA_MAKE_NUM(DATADIR_BOARD, 110), DATA_MAKE_NUM(DATADIR_BOARD, 111), + 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 forceMoveSfxTbl[] = { - 0x38, 0x45, 0x42, 0x4D, 0x48, 0x3F -}; +static s32 forceMoveSfxTbl[] = { 0x38, 0x45, 0x42, 0x4D, 0x48, 0x3F }; -static s32 callMotTbl[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 82), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 82), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 82), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 82), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 82), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 82), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 82), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 82) -}; +static s32 callMotTbl[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 82), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 82), DATA_MAKE_NUM(DATADIR_PEACHMOT, 82), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 82), DATA_MAKE_NUM(DATADIR_WARIOMOT, 82), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 82), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 82), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 82) }; -static char *callHookTbl[] = { - "c000m01-itemhook-r", - "c001m01-itemhook-r", - "c002m01-itemhook-r", - "c003m01-itemhook-r", - "c004m01-itemhook-r", - "c005m01-itemhook-r", - "c006m01-itemhook-r", - "c007m01-itemhook-r" -}; +static char *callHookTbl[] = { "c000m01-itemhook-r", "c001m01-itemhook-r", "c002m01-itemhook-r", "c003m01-itemhook-r", "c004m01-itemhook-r", + "c005m01-itemhook-r", "c006m01-itemhook-r", "c007m01-itemhook-r" }; -static s32 callAttackMotTbl[] = { - DATA_MAKE_NUM(DATADIR_W01, 31), - DATA_MAKE_NUM(DATADIR_W02, 5), - DATA_MAKE_NUM(DATADIR_W03, 29), - DATA_MAKE_NUM(DATADIR_W04, 9), - DATA_MAKE_NUM(DATADIR_W05, 7), - DATA_MAKE_NUM(DATADIR_W06, 19) -}; +static s32 callAttackMotTbl[] = { DATA_MAKE_NUM(DATADIR_W01, 31), DATA_MAKE_NUM(DATADIR_W02, 5), DATA_MAKE_NUM(DATADIR_W03, 29), + DATA_MAKE_NUM(DATADIR_W04, 9), DATA_MAKE_NUM(DATADIR_W05, 7), DATA_MAKE_NUM(DATADIR_W06, 19) }; -static s32 callAttackMotTbl2[] = { - DATA_MAKE_NUM(DATADIR_W01, 32), - DATA_MAKE_NUM(DATADIR_W02, 6), - DATA_MAKE_NUM(DATADIR_W03, 30), - DATA_MAKE_NUM(DATADIR_W04, 10), - DATA_MAKE_NUM(DATADIR_W05, 8), - DATA_MAKE_NUM(DATADIR_W06, 20) -}; +static s32 callAttackMotTbl2[] = { DATA_MAKE_NUM(DATADIR_W01, 32), DATA_MAKE_NUM(DATADIR_W02, 6), DATA_MAKE_NUM(DATADIR_W03, 30), + DATA_MAKE_NUM(DATADIR_W04, 10), DATA_MAKE_NUM(DATADIR_W05, 8), DATA_MAKE_NUM(DATADIR_W06, 20) }; -static s32 suitMotTbl[][2] = { - { DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 1), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 2) }, +static s32 suitMotTbl[][2] = { { DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 1), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 2) }, { DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 4), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 5) }, { DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 7), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 8) }, { DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 10), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 11) }, { DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 13), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 14) }, { DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 16), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 17) }, { DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 19), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 20) }, - { DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 22), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 23) } -}; + { DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 22), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 23) } }; -void BoardItemStart(s32 arg0, s32 arg1) { +void BoardItemStart(s32 arg0, s32 arg1) +{ currItemRestore = arg0; currItem = arg1; suitMdl = -1; @@ -231,22 +160,26 @@ void BoardItemStart(s32 arg0, s32 arg1) { HuPrcDestructorSet2(itemProc, ItemDestroy); } -BOOL BoardItemDoneCheck(void) { +BOOL BoardItemDoneCheck(void) +{ if (itemProc) { return FALSE; - } else { + } + else { return TRUE; } } -void BoardItemPlayerRestore(s32 arg0, s32 arg1) { +void BoardItemPlayerRestore(s32 arg0, s32 arg1) +{ currItemRestore = arg0; currItem = arg1; itemProc = HuPrcChildCreate(RestoreProcess, 0x2004, 0x1000, 0, boardMainProc); HuPrcDestructorSet2(itemProc, RestoreDestroy); } -static void ItemProcess(void) { +static void ItemProcess(void) +{ void (*temp_r31)(void) = itemFuncTbl[currItem]; HuPrcChildCreate(temp_r31, 0x2003, 0x1000, 0, HuPrcCurrentGet()); @@ -254,7 +187,8 @@ static void ItemProcess(void) { HuPrcEnd(); } -static void RestoreProcess(void) { +static void RestoreProcess(void) +{ void (*temp_r31)(void) = itemRestoreFuncTbl[currItem]; HuPrcChildCreate(temp_r31, 0x2003, 0x1000, 0, HuPrcCurrentGet()); @@ -262,15 +196,18 @@ static void RestoreProcess(void) { HuPrcEnd(); } -static void ItemDestroy(void) { +static void ItemDestroy(void) +{ itemProc = NULL; } -static void RestoreDestroy(void) { +static void RestoreDestroy(void) +{ itemProc = NULL; } -static void ItemSizeShowAnim(void) { +static void ItemSizeShowAnim(void) +{ Vec sp24; Vec sp18; Vec spC; @@ -307,7 +244,8 @@ static void ItemSizeShowAnim(void) { BoardModelKill(suitMdl); } -static void ItemRotProc(void) { +static void ItemRotProc(void) +{ Vec sp20; Vec sp14; Vec sp8; @@ -354,7 +292,8 @@ static void ItemRotProc(void) { // TODO: needs the inline keyword to be inlined into ExecItemHammer, but adding it messes up sdata2. // sdata2 order should be: 1000.0f, 0.15f, then 20.0f. // With the inline keyword, it becomes 0.15f, 20.0f, then 1000.0f (workaround in BoardUiInlineFunc02 below). -static inline void BoardUiInlineFunc01(Vec *arg0) { +static inline void BoardUiInlineFunc01(Vec *arg0) +{ Vec sp30; Vec sp3C; Vec sp48; @@ -386,11 +325,11 @@ static inline void BoardUiInlineFunc01(Vec *arg0) { BoardModelPosSetV(suitMdl, &sp3C); VECAdd(&sp48, arg0, &sp48); for (i = 0; i < 3; i++) { - if (((float*) &sp48)[i] < 0.0f) { - ((float*) &sp48)[i] += 360.0f; + if (((float *)&sp48)[i] < 0.0f) { + ((float *)&sp48)[i] += 360.0f; } - if (((float*) &sp48)[i] >= 360.0f) { - ((float*) &sp48)[i] -= 360.0f; + if (((float *)&sp48)[i] >= 360.0f) { + ((float *)&sp48)[i] -= 360.0f; } } BoardModelRotSetV(suitMdl, &sp48); @@ -400,13 +339,14 @@ static inline void BoardUiInlineFunc01(Vec *arg0) { BoardModelPosSetV(suitMdl, &sp3C); } -static void BoardUiInlineFunc02(void) { +static void BoardUiInlineFunc02(void) +{ Vec sp18; Vec sp24; float sp8; float var_f30; - (void) 1000.0f; // TODO: fix this. + (void)1000.0f; // TODO: fix this. sp8 = 1.0f; BoardModelPosGet(suitMdl, &sp24); BoardPlayerPosGet(currItemRestore, &sp18); @@ -429,7 +369,8 @@ static void BoardUiInlineFunc02(void) { BoardModelPosSetV(suitMdl, &sp24); } -static inline void BoardUiInlineFunc03(s32 arg0) { +static inline void BoardUiInlineFunc03(s32 arg0) +{ Vec sp8; Vec sp14; s32 space = GWPlayer[arg0].space_curr; @@ -447,13 +388,15 @@ static inline void BoardUiInlineFunc03(s32 arg0) { BoardPlayerIdleSet(arg0); } -static inline void BoardUiInlineFunc04(Process *arg0, s32 arg1) { +static inline void BoardUiInlineFunc04(Process *arg0, s32 arg1) +{ UnkItemShowProcStruct *temp_r19 = arg0->user_data; temp_r19->unk00 = arg1; } -static inline Process *BoardUiInlineFunc05(UnkItemShowProcStruct *arg0) { +static inline Process *BoardUiInlineFunc05(UnkItemShowProcStruct *arg0) +{ Process *temp_r27; temp_r27 = HuPrcCreate(ItemRotProc, 0x2004, 0x1000, 0); @@ -462,7 +405,8 @@ static inline Process *BoardUiInlineFunc05(UnkItemShowProcStruct *arg0) { return temp_r27; } -static Process *ItemShowProc(UnkItemShowProcStruct *arg0, Vec *arg1) { +static Process *ItemShowProc(UnkItemShowProcStruct *arg0, Vec *arg1) +{ Vec sp20; Vec sp14; Vec sp8; @@ -477,7 +421,8 @@ static Process *ItemShowProc(UnkItemShowProcStruct *arg0, Vec *arg1) { } if (arg1 == NULL) { sp8.x = sp8.y = sp8.z = 1.0f; - } else { + } + else { sp8 = *arg1; } if (suitMdl >= 0) { @@ -506,7 +451,8 @@ static Process *ItemShowProc(UnkItemShowProcStruct *arg0, Vec *arg1) { return var_r29; } -static s16 ItemGetTarget(void) { +static s16 ItemGetTarget(void) +{ s32 sp20[4]; s32 sp10[4]; float sp8[2]; @@ -542,7 +488,8 @@ static s16 ItemGetTarget(void) { HuWinMesSet(temp_r29, MAKE_MESSID(18, 14)); if (GWPlayer[currItemRestore].com) { var_r26 = 0xF; - } else { + } + else { var_r26 = 0; for (var_r31 = 0; var_r31 < 4; var_r31++) { if (var_r31 != currItemRestore) { @@ -575,7 +522,8 @@ static s16 ItemGetTarget(void) { return temp_r22; } -static void ItemSizeSet(s32 arg0) { +static void ItemSizeSet(s32 arg0) +{ float sp24[9]; float sp14[4]; float sp8[3] = { 1.0f, 0.3f, 2.5f }; @@ -603,7 +551,7 @@ static void ItemSizeSet(s32 arg0) { sp24[8] = sp14[3]; temp_r26 = BoardPlayerModelGet(currItemRestore); temp_r28 = BoardModelIDGet(temp_r26); - Hu3DModelAttrSet(temp_r28, 0x40000002); + Hu3DModelAttrSet(temp_r28, HU3D_MOTATTR_PAUSE); var_r27 = 0; for (i = 0; i < 9; i++) { temp_f30 = (sp24[var_r27++] - var_f31) / 10.0f; @@ -617,7 +565,8 @@ static void ItemSizeSet(s32 arg0) { BoardPlayerSizeSet(currItemRestore, arg0); } -static void ExecItemMini(void) { +static void ExecItemMini(void) +{ suitMdl = BoardModelCreate(itemMdlTbl[currItem], NULL, 0); BoardModelLayerSet(suitMdl, 2); HuAudFXPlay(0x350); @@ -634,7 +583,8 @@ static void ExecItemMini(void) { } } -static void ExecItemMega(void) { +static void ExecItemMega(void) +{ suitMdl = BoardModelCreate(itemMdlTbl[currItem], NULL, 0); BoardModelLayerSet(suitMdl, 2); HuAudFXPlay(0x350); @@ -651,7 +601,8 @@ static void ExecItemMega(void) { } } -static void ExecItemMiniSuper(void) { +static void ExecItemMiniSuper(void) +{ suitMdl = BoardModelCreate(itemMdlTbl[currItem], NULL, 0); BoardModelLayerSet(suitMdl, 2); HuAudFXPlay(0x350); @@ -668,7 +619,8 @@ static void ExecItemMiniSuper(void) { } } -static void ExecItemMegaSuper(void) { +static void ExecItemMegaSuper(void) +{ suitMdl = BoardModelCreate(itemMdlTbl[currItem], NULL, 0); BoardModelLayerSet(suitMdl, 2); HuAudFXPlay(0x350); @@ -685,7 +637,8 @@ static void ExecItemMegaSuper(void) { } } -static void ExecItemHammer(void) { +static void ExecItemHammer(void) +{ Vec sp6C; Vec sp60; float sp10[2]; @@ -703,7 +656,8 @@ static void ExecItemHammer(void) { var_r30 = frandBool(); if (var_r30 != 0) { BoardModelMotionTimeSet(suitMdl, 1.5f); - } else { + } + else { BoardModelMotionTimeSet(suitMdl, 0.0f); } BoardModelAttrSet(suitMdl, 0x40000002); @@ -725,7 +679,8 @@ static void ExecItemHammer(void) { var_r30 ^= 1; if (var_r30 != 0) { BoardModelMotionTimeSet(suitMdl, 1.5f); - } else { + } + else { BoardModelMotionTimeSet(suitMdl, 0.0f); } } @@ -734,7 +689,8 @@ static void ExecItemHammer(void) { if (var_r26 == 0) { break; } - } else { + } + else { if (HuPadBtnDown[GWPlayerCfg[currItemRestore].pad_idx] & 0x100) { break; } @@ -747,7 +703,8 @@ static void ExecItemHammer(void) { omVibrate(temp_r27, 12, 6, 6); if (var_r30 != 0) { BoardPlayerAutoSizeSet(temp_r27, 2); - } else { + } + else { BoardPlayerAutoSizeSet(temp_r27, 1); } HuPrcSleep(30); @@ -759,7 +716,8 @@ static void ExecItemHammer(void) { } } -static void ExecItemPipe(void) { +static void ExecItemPipe(void) +{ Vec spE4[2]; Vec spCC[2]; Vec spB4[2]; @@ -816,7 +774,8 @@ static void ExecItemPipe(void) { HuWinMesWait(temp_r28); HuPrcSleep(180); HuWinKill(temp_r28); - } else { + } + else { BoardUiInlineFunc03(sp2C[1]); HuAudFXPlay(0x318); for (var_r31 = 0; var_r31 < 2; var_r31++) { @@ -910,7 +869,8 @@ static void ExecItemPipe(void) { if (GWPlayer[sp2C[var_r31]].character == 5) { if (var_r27 != 0) { var_r27--; - } else { + } + else { var_f31 += 0.05f; if (var_f31 > 1.0f) { var_f31 = 1.0f; @@ -923,13 +883,15 @@ static void ExecItemPipe(void) { if (fabs(spCC[var_r31].x - spE4[var_r31].x) <= fabs(spB4[var_r31].x)) { spCC[var_r31].x = spE4[var_r31].x; var_r30++; - } else { + } + else { spCC[var_r31].x += spB4[var_r31].x; } if (fabs(spCC[var_r31].z - spE4[var_r31].z) <= fabs(spB4[var_r31].z)) { spCC[var_r31].z = spE4[var_r31].z; var_r30++; - } else { + } + else { spCC[var_r31].z += spB4[var_r31].z; } if (spCC[var_r31].y < spE4[var_r31].y) { @@ -979,7 +941,8 @@ static void ExecItemPipe(void) { } } -static void ExecItemSwap(void) { +static void ExecItemSwap(void) +{ Vec sp1A4[3]; Vec sp180[3]; Vec sp15C[3]; @@ -1026,22 +989,22 @@ static void ExecItemSwap(void) { BoardModelPosGet(suitMdl, &spB4); BoardPlayerRotGet(currItemRestore, &sp90); for (var_r27 = 0; var_r27 < 3; var_r27++) { - if (((float*) &sp90)[var_r27] < 0.0f) { - ((float*) &sp90)[var_r27] += 360.0f; + if (((float *)&sp90)[var_r27] < 0.0f) { + ((float *)&sp90)[var_r27] += 360.0f; } - if (((float*) &sp90)[var_r27] >= 360.0f) { - ((float*) &sp90)[var_r27] -= 360.0f; + if (((float *)&sp90)[var_r27] >= 360.0f) { + ((float *)&sp90)[var_r27] -= 360.0f; } } BoardModelRotGet(suitMdl, &spA8); while (1) { VECAdd(&spA8, &sp9C, &spA8); for (var_r26 = 0; var_r26 < 3; var_r26++) { - if (((float*) &spA8)[var_r26] < 0.0f) { - ((float*) &spA8)[var_r26] += 360.0f; + if (((float *)&spA8)[var_r26] < 0.0f) { + ((float *)&spA8)[var_r26] += 360.0f; } - if (((float*) &spA8)[var_r26] >= 360.0f) { - ((float*) &spA8)[var_r26] -= 360.0f; + if (((float *)&spA8)[var_r26] >= 360.0f) { + ((float *)&spA8)[var_r26] -= 360.0f; } } sp9C.y *= 0.94f; @@ -1067,7 +1030,8 @@ static void ExecItemSwap(void) { } if (var_r23 >= var_r22) { var_r28 = var_r23 * 2; - } else { + } + else { var_r28 = var_r22 * 2; } BoardModelRotGet(suitMdl, &sp3C); @@ -1200,7 +1164,8 @@ static void ExecItemSwap(void) { } } -static void ExecItemSpark(void) { +static void ExecItemSpark(void) +{ Vec sp68; Vec sp5C; Vec sp50; @@ -1299,7 +1264,8 @@ static void ExecItemSpark(void) { } } -static void ExecItemLight(void) { +static void ExecItemLight(void) +{ s16 temp_r31; HuAudFXPlay(0x350); @@ -1321,7 +1287,8 @@ static void ExecItemLight(void) { } } -static void ExecItemWhistle(void) { +static void ExecItemWhistle(void) +{ Vec spF0[4]; Vec spC0[4]; Vec spB4; @@ -1414,8 +1381,7 @@ static void ExecItemWhistle(void) { BoardModelPosSetV(suitMdl, &sp84); BoardModelHookSet(sp8, temp_r22, suitMdl); while (BoardPlayerMotionTimeGet(currItemRestore) < BoardPlayerMotionMaxTimeGet(currItemRestore)) { - if (BoardPlayerMotionTimeGet(currItemRestore) == 95.0f - || BoardPlayerMotionTimeGet(currItemRestore) == 185.0f + if (BoardPlayerMotionTimeGet(currItemRestore) == 95.0f || BoardPlayerMotionTimeGet(currItemRestore) == 185.0f || BoardPlayerMotionTimeGet(currItemRestore) == 275.0f) { HuAudFXPlay(0x31F); } @@ -1563,7 +1529,8 @@ static void ExecItemWhistle(void) { } } -static void ExecItemBowser(void) { +static void ExecItemBowser(void) +{ Vec sp2C; Vec sp20; Vec sp14; @@ -1637,13 +1604,10 @@ static void ExecItemBowser(void) { } } -static s32 booMotTbl[3] = { - DATA_MAKE_NUM(DATADIR_BGUEST, 24), - DATA_MAKE_NUM(DATADIR_BGUEST, 22), - -1 -}; +static s32 booMotTbl[3] = { DATA_MAKE_NUM(DATADIR_BGUEST, 24), DATA_MAKE_NUM(DATADIR_BGUEST, 22), -1 }; -static inline void ExecItemBooBallInlineFunc01(s32 speed) { +static inline void ExecItemBooBallInlineFunc01(s32 speed) +{ Vec sp20; s32 var_r20; @@ -1655,14 +1619,14 @@ static inline void ExecItemBooBallInlineFunc01(s32 speed) { BoardModelAlphaSet(booBallMdl, booBallAlpha); BoardModelVisibilitySet(booBallMdl, 1); for (var_r20 = 0; var_r20 < speed; var_r20++) { - booBallAlpha -= (255.0f/speed); + booBallAlpha -= (255.0f / speed); if (booBallAlpha < 0.0f) { booBallAlpha = 0.0f; } - booBallScale.x -= (1.0f/speed); - booBallScale.y -= (1.0f/speed); - booBallScale.z -= (1.0f/speed); - booBallPos.y -= (20.0f/speed); + booBallScale.x -= (1.0f / speed); + booBallScale.y -= (1.0f / speed); + booBallScale.z -= (1.0f / speed); + booBallPos.y -= (20.0f / speed); BoardModelAlphaSet(booBallMdl, booBallAlpha); BoardModelScaleSetV(booBallMdl, &booBallScale); BoardModelPosSetV(booBallMdl, &booBallPos); @@ -1674,7 +1638,8 @@ static inline void ExecItemBooBallInlineFunc01(s32 speed) { BoardModelAlphaSet(booBallMdl, booBallAlpha); } -static inline void ExecItemBooBallInlineFunc02(s32 speed) { +static inline void ExecItemBooBallInlineFunc02(s32 speed) +{ Vec sp20; s32 var_r20; @@ -1686,14 +1651,14 @@ static inline void ExecItemBooBallInlineFunc02(s32 speed) { BoardModelAlphaSet(booBallMdl, booBallAlpha); BoardModelVisibilitySet(booBallMdl, 1); for (var_r20 = 0; var_r20 < speed; var_r20++) { - booBallAlpha += (255.0f/speed); + booBallAlpha += (255.0f / speed); if (booBallAlpha > 255.0f) { booBallAlpha = 255.0f; } - booBallScale.x += (1.0f/speed); - booBallScale.y += (1.0f/speed); - booBallScale.z += (1.0f/speed); - booBallPos.y += (20.0f/speed); + booBallScale.x += (1.0f / speed); + booBallScale.y += (1.0f / speed); + booBallScale.z += (1.0f / speed); + booBallPos.y += (20.0f / speed); BoardModelAlphaSet(booBallMdl, booBallAlpha); BoardModelScaleSetV(booBallMdl, &booBallScale); BoardModelPosSetV(booBallMdl, &booBallPos); @@ -1707,7 +1672,8 @@ static inline void ExecItemBooBallInlineFunc02(s32 speed) { BoardModelAlphaSet(booBallMdl, booBallAlpha); } -static void ExecItemBooBall(void) { +static void ExecItemBooBall(void) +{ UnkItemShowProcStruct spA0; UnkItemShowProcStruct sp80; Vec sp74; @@ -1754,7 +1720,8 @@ static void ExecItemBooBall(void) { BoardWinCreate(2, MAKE_MESSID(18, 22), 3); BoardWinWait(); BoardWinKill(); - } else { + } + else { var_r28 = 0; for (var_r31 = 0; var_r31 < 4; var_r31++) { if (var_r31 != currItemRestore) { @@ -1779,7 +1746,8 @@ static void ExecItemBooBall(void) { if (GWPlayer[currItemRestore].com) { if (var_r28 != 0 && BoardPlayerCoinsGet(currItemRestore) >= 50) { BoardComKeySetDown(); - } else { + } + else { BoardComKeySetUp(); } } @@ -1809,15 +1777,20 @@ static void ExecItemBooBall(void) { var_r29 = BoardBooStealValueGet(&spC, &spA); if (var_r29 == 0) { var_r30 = MAKE_MESSID(7, 11); - } else if (spA == 0) { + } + else if (spA == 0) { var_r30 = MAKE_MESSID(7, 9); - } else if (spA >= 1 && spA <= 3) { + } + else if (spA >= 1 && spA <= 3) { var_r30 = MAKE_MESSID(7, 8); - } else if (spA >= 4 && spA <= 6) { + } + else if (spA >= 4 && spA <= 6) { var_r30 = MAKE_MESSID(7, 7); - } else if (spA >= 7 && spA <= 8) { + } + else if (spA >= 7 && spA <= 8) { var_r30 = MAKE_MESSID(7, 6); - } else { + } + else { var_r30 = MAKE_MESSID(7, 5); } sprintf(booCoinStr, "%d", spC); @@ -1861,7 +1834,8 @@ static void ExecItemBooBall(void) { ExecItemBooBallInlineFunc02(30); if (var_r29 != 0) { var_r30 = MAKE_MESSID(7, 10); - } else { + } + else { var_r30 = MAKE_MESSID(7, 11); } HuAudFXPlay(0x4C); @@ -1928,7 +1902,8 @@ static void ForceConsts(void) (void)125.0f; } -static void LampParticleUpdate(ModelData *model, ParticleData *particle, Mtx matrix) { +static void LampParticleUpdate(ModelData *model, ParticleData *particle, Mtx matrix) +{ HsfanimStruct01 *var_r31; Vec spC; float sp8; @@ -1971,7 +1946,8 @@ static void LampParticleUpdate(ModelData *model, ParticleData *particle, Mtx mat var_r31->unk00_s16 = 0; } } - } else { + } + else { particle->unk_00--; } var_r31 = particle->unk_48; @@ -1991,7 +1967,8 @@ static void LampParticleUpdate(ModelData *model, ParticleData *particle, Mtx mat var_r31->unk00_s16 = 1; } var_r31->unk40.a = var_r31->unk14.y; - } else { + } + else { VECAdd(&var_r31->unk34, &var_r31->unk08, &var_r31->unk34); var_r31->unk2C += 0.2f; var_r31->unk14.y -= 1.8214285f; @@ -2005,8 +1982,9 @@ static void LampParticleUpdate(ModelData *model, ParticleData *particle, Mtx mat } } -static void GenieParticleUpdate(ModelData *model, ParticleData *particle, Mtx matrix) { - HsfanimStruct01* var_r31; +static void GenieParticleUpdate(ModelData *model, ParticleData *particle, Mtx matrix) +{ + HsfanimStruct01 *var_r31; float temp_f31; float temp_f30; s32 var_r28; @@ -2054,11 +2032,13 @@ static Vec shadowPos = { 0.0f, 4500.0f, 500.0f }; static Vec shadowTarget = { 0.0f, 0.9f, -0.1f }; static Vec shadowUp = { 0.0f, 0.0f, 500.0f }; -static void GenieCameraProcInlineFunc(void) { +static void GenieCameraProcInlineFunc(void) +{ Hu3DShadowPosSet(&shadowPos, &shadowTarget, &shadowUp); } -static void GenieCameraProc(void) { +static void GenieCameraProc(void) +{ while (1) { Hu3DCameraPerspectiveSet(2, genieFov, 10.0f, 20000.0f, 1.2f); Hu3DCameraPosSetV(2, &booCamPos, &booCamTarget, &booCamUp); @@ -2070,7 +2050,8 @@ static void GenieCameraProc(void) { } } -static void GenieCameraCalc(UnkGenieCameraStruct *arg0, s32 arg1, float arg2, Vec *arg3, Vec *arg4) { +static void GenieCameraCalc(UnkGenieCameraStruct *arg0, s32 arg1, float arg2, Vec *arg3, Vec *arg4) +{ Vec spC = { 0.0f, 0.0f, 0.0f }; float temp_f31 = arg2 * arg2; float sp8 = temp_f31 * arg2; @@ -2090,13 +2071,26 @@ static void GenieCameraCalc(UnkGenieCameraStruct *arg0, s32 arg1, float arg2, Ve temp_r30 = &arg0[arg1].unk10; temp_r27 = &arg0[arg1 + 1].unk10; temp_r26 = &arg0[arg1 + 2].unk10; - arg3->x = 0.5f * ((temp_r31->x - temp_r29->x * 2.0f + temp_r28->x) * temp_f31 + (temp_r31->x * -3.0f + temp_r29->x * 4.0f - temp_r28->x) * arg2 + temp_r31->x * 2.0f); - arg3->y = 0.5f * ((temp_r31->y - temp_r29->y * 2.0f + temp_r28->y) * temp_f31 + (temp_r31->y * -3.0f + temp_r29->y * 4.0f - temp_r28->y) * arg2 + temp_r31->y * 2.0f); - arg3->z = 0.5f * ((temp_r31->z - temp_r29->z * 2.0f + temp_r28->z) * temp_f31 + (temp_r31->z * -3.0f + temp_r29->z * 4.0f - temp_r28->z) * arg2 + temp_r31->z * 2.0f); - arg4->x = 0.5f * ((temp_r30->x - temp_r27->x * 2.0f + temp_r26->x) * temp_f31 + (temp_r30->x * -3.0f + temp_r27->x * 4.0f - temp_r26->x) * arg2 + temp_r30->x * 2.0f); - arg4->y = 0.5f * ((temp_r30->y - temp_r27->y * 2.0f + temp_r26->y) * temp_f31 + (temp_r30->y * -3.0f + temp_r27->y * 4.0f - temp_r26->y) * arg2 + temp_r30->y * 2.0f); - arg4->z = 0.5f * ((temp_r30->z - temp_r27->z * 2.0f + temp_r26->z) * temp_f31 + (temp_r30->z * -3.0f + temp_r27->z * 4.0f - temp_r26->z) * arg2 + temp_r30->z * 2.0f); - } else { + arg3->x = 0.5f + * ((temp_r31->x - temp_r29->x * 2.0f + temp_r28->x) * temp_f31 + (temp_r31->x * -3.0f + temp_r29->x * 4.0f - temp_r28->x) * arg2 + + temp_r31->x * 2.0f); + arg3->y = 0.5f + * ((temp_r31->y - temp_r29->y * 2.0f + temp_r28->y) * temp_f31 + (temp_r31->y * -3.0f + temp_r29->y * 4.0f - temp_r28->y) * arg2 + + temp_r31->y * 2.0f); + arg3->z = 0.5f + * ((temp_r31->z - temp_r29->z * 2.0f + temp_r28->z) * temp_f31 + (temp_r31->z * -3.0f + temp_r29->z * 4.0f - temp_r28->z) * arg2 + + temp_r31->z * 2.0f); + arg4->x = 0.5f + * ((temp_r30->x - temp_r27->x * 2.0f + temp_r26->x) * temp_f31 + (temp_r30->x * -3.0f + temp_r27->x * 4.0f - temp_r26->x) * arg2 + + temp_r30->x * 2.0f); + arg4->y = 0.5f + * ((temp_r30->y - temp_r27->y * 2.0f + temp_r26->y) * temp_f31 + (temp_r30->y * -3.0f + temp_r27->y * 4.0f - temp_r26->y) * arg2 + + temp_r30->y * 2.0f); + arg4->z = 0.5f + * ((temp_r30->z - temp_r27->z * 2.0f + temp_r26->z) * temp_f31 + (temp_r30->z * -3.0f + temp_r27->z * 4.0f - temp_r26->z) * arg2 + + temp_r30->z * 2.0f); + } + else { temp_r31 = &arg0[arg1 - 1].unk04; temp_r29 = &arg0[arg1].unk04; temp_r28 = &arg0[arg1 + 1].unk04; @@ -2105,70 +2099,56 @@ static void GenieCameraCalc(UnkGenieCameraStruct *arg0, s32 arg1, float arg2, Ve temp_r27 = &arg0[arg1].unk10; temp_r26 = &arg0[arg1 + 1].unk10; temp_r24 = &arg0[arg1 + 2].unk10; - arg3->x = 0.5f * ((-temp_r31->x + temp_r29->x * 3.0f - temp_r28->x * 3.0f + temp_r25->x) * temp_f31 * arg2 + (temp_r31->x * 2.0f - temp_r29->x * 5.0f + temp_r28->x * 4.0f - temp_r25->x) * temp_f31 + (-temp_r31->x + temp_r28->x) * arg2 + temp_r29->x * 2.0f); - arg3->y = 0.5f * ((-temp_r31->y + temp_r29->y * 3.0f - temp_r28->y * 3.0f + temp_r25->y) * temp_f31 * arg2 + (temp_r31->y * 2.0f - temp_r29->y * 5.0f + temp_r28->y * 4.0f - temp_r25->y) * temp_f31 + (-temp_r31->y + temp_r28->y) * arg2 + temp_r29->y * 2.0f); - arg3->z = 0.5f * ((-temp_r31->z + temp_r29->z * 3.0f - temp_r28->z * 3.0f + temp_r25->z) * temp_f31 * arg2 + (temp_r31->z * 2.0f - temp_r29->z * 5.0f + temp_r28->z * 4.0f - temp_r25->z) * temp_f31 + (-temp_r31->z + temp_r28->z) * arg2 + temp_r29->z * 2.0f); - arg4->x = 0.5f * ((-temp_r30->x + temp_r27->x * 3.0f - temp_r26->x * 3.0f + temp_r24->x) * temp_f31 * arg2 + (temp_r30->x * 2.0f - temp_r27->x * 5.0f + temp_r26->x * 4.0f - temp_r24->x) * temp_f31 + (-temp_r30->x + temp_r26->x) * arg2 + temp_r27->x * 2.0f); - arg4->y = 0.5f * ((-temp_r30->y + temp_r27->y * 3.0f - temp_r26->y * 3.0f + temp_r24->y) * temp_f31 * arg2 + (temp_r30->y * 2.0f - temp_r27->y * 5.0f + temp_r26->y * 4.0f - temp_r24->y) * temp_f31 + (-temp_r30->y + temp_r26->y) * arg2 + temp_r27->y * 2.0f); - arg4->z = 0.5f * ((-temp_r30->z + temp_r27->z * 3.0f - temp_r26->z * 3.0f + temp_r24->z) * temp_f31 * arg2 + (temp_r30->z * 2.0f - temp_r27->z * 5.0f + temp_r26->z * 4.0f - temp_r24->z) * temp_f31 + (-temp_r30->z + temp_r26->z) * arg2 + temp_r27->z * 2.0f); + arg3->x = 0.5f + * ((-temp_r31->x + temp_r29->x * 3.0f - temp_r28->x * 3.0f + temp_r25->x) * temp_f31 * arg2 + + (temp_r31->x * 2.0f - temp_r29->x * 5.0f + temp_r28->x * 4.0f - temp_r25->x) * temp_f31 + (-temp_r31->x + temp_r28->x) * arg2 + + temp_r29->x * 2.0f); + arg3->y = 0.5f + * ((-temp_r31->y + temp_r29->y * 3.0f - temp_r28->y * 3.0f + temp_r25->y) * temp_f31 * arg2 + + (temp_r31->y * 2.0f - temp_r29->y * 5.0f + temp_r28->y * 4.0f - temp_r25->y) * temp_f31 + (-temp_r31->y + temp_r28->y) * arg2 + + temp_r29->y * 2.0f); + arg3->z = 0.5f + * ((-temp_r31->z + temp_r29->z * 3.0f - temp_r28->z * 3.0f + temp_r25->z) * temp_f31 * arg2 + + (temp_r31->z * 2.0f - temp_r29->z * 5.0f + temp_r28->z * 4.0f - temp_r25->z) * temp_f31 + (-temp_r31->z + temp_r28->z) * arg2 + + temp_r29->z * 2.0f); + arg4->x = 0.5f + * ((-temp_r30->x + temp_r27->x * 3.0f - temp_r26->x * 3.0f + temp_r24->x) * temp_f31 * arg2 + + (temp_r30->x * 2.0f - temp_r27->x * 5.0f + temp_r26->x * 4.0f - temp_r24->x) * temp_f31 + (-temp_r30->x + temp_r26->x) * arg2 + + temp_r27->x * 2.0f); + arg4->y = 0.5f + * ((-temp_r30->y + temp_r27->y * 3.0f - temp_r26->y * 3.0f + temp_r24->y) * temp_f31 * arg2 + + (temp_r30->y * 2.0f - temp_r27->y * 5.0f + temp_r26->y * 4.0f - temp_r24->y) * temp_f31 + (-temp_r30->y + temp_r26->y) * arg2 + + temp_r27->y * 2.0f); + arg4->z = 0.5f + * ((-temp_r30->z + temp_r27->z * 3.0f - temp_r26->z * 3.0f + temp_r24->z) * temp_f31 * arg2 + + (temp_r30->z * 2.0f - temp_r27->z * 5.0f + temp_r26->z * 4.0f - temp_r24->z) * temp_f31 + (-temp_r30->z + temp_r26->z) * arg2 + + temp_r27->z * 2.0f); } } -static s32 armUpMotTbl[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 92), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 92), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 92), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 92), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 92), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 92), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 92), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 92) -}; +static s32 armUpMotTbl[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 92), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 92), DATA_MAKE_NUM(DATADIR_PEACHMOT, 92), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 92), DATA_MAKE_NUM(DATADIR_WARIOMOT, 92), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 92), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 92), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 92) }; -static s32 scareMotTbl[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 28), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 28), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 28), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 28), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 28), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 28), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 28), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 28) -}; +static s32 scareMotTbl[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 28), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 28), DATA_MAKE_NUM(DATADIR_PEACHMOT, 28), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 28), DATA_MAKE_NUM(DATADIR_WARIOMOT, 28), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 28), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 28), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 28) }; -static s32 impactMotTbl[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 94), - DATA_MAKE_NUM(DATADIR_LUIGIMOT, 94), - DATA_MAKE_NUM(DATADIR_PEACHMOT, 94), - DATA_MAKE_NUM(DATADIR_YOSHIMOT, 94), - DATA_MAKE_NUM(DATADIR_WARIOMOT, 94), - DATA_MAKE_NUM(DATADIR_DONKEYMOT, 94), - DATA_MAKE_NUM(DATADIR_DAISYMOT, 94), - DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 94) -}; +static s32 impactMotTbl[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 94), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 94), DATA_MAKE_NUM(DATADIR_PEACHMOT, 94), + DATA_MAKE_NUM(DATADIR_YOSHIMOT, 94), DATA_MAKE_NUM(DATADIR_WARIOMOT, 94), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 94), + DATA_MAKE_NUM(DATADIR_DAISYMOT, 94), DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 94) }; -static UnkGenieCameraStruct cameraDataTbl[] = { - 60.0f, { 0.0f, 100.0f, 950.0f }, { 0.0f, 100.0f, 600.0f }, - 60.0f, { -353.0f, 100.0f, 662.5f }, { 0.0f, 100.0f, 600.0f }, - 60.0f, { -500.0f, 100.0f, 375.0f }, { 0.0f, 100.0f, 600.0f }, - 60.0f, { -353.0f, 100.0f, 87.5f }, { 0.0f, 100.0f, 600.0f }, - 1.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 100.0f, 600.0f }, - 89.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 100.0f, 600.0f }, - 1.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 100.0f, 600.0f }, - 9.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 100.0f, 600.0f }, - 1.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 500.0f, 600.0f }, - 5.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 500.0f, 600.0f }, - 5.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 500.0f, 600.0f } -}; +static UnkGenieCameraStruct cameraDataTbl[] = { 60.0f, { 0.0f, 100.0f, 950.0f }, { 0.0f, 100.0f, 600.0f }, 60.0f, { -353.0f, 100.0f, 662.5f }, + { 0.0f, 100.0f, 600.0f }, 60.0f, { -500.0f, 100.0f, 375.0f }, { 0.0f, 100.0f, 600.0f }, 60.0f, { -353.0f, 100.0f, 87.5f }, + { 0.0f, 100.0f, 600.0f }, 1.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 100.0f, 600.0f }, 89.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 100.0f, 600.0f }, + 1.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 100.0f, 600.0f }, 9.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 100.0f, 600.0f }, 1.0f, + { 0.0f, 100.0f, -200.0f }, { 0.0f, 500.0f, 600.0f }, 5.0f, { 0.0f, 100.0f, -200.0f }, { 0.0f, 500.0f, 600.0f }, 5.0f, { 0.0f, 100.0f, -200.0f }, + { 0.0f, 500.0f, 600.0f } }; -static s32 genieMotTbl[] = { - DATA_MAKE_NUM(DATADIR_BOARD, 125), - DATA_MAKE_NUM(DATADIR_BOARD, 126), - DATA_MAKE_NUM(DATADIR_BOARD, 127), - -1 -}; +static s32 genieMotTbl[] = { DATA_MAKE_NUM(DATADIR_BOARD, 125), DATA_MAKE_NUM(DATADIR_BOARD, 126), DATA_MAKE_NUM(DATADIR_BOARD, 127), -1 }; -static void GenieSceneExec(void) { +static void GenieSceneExec(void) +{ GXColor sp1C = { 0xFF, 0xFF, 0xFF, 0xFF }; Vec sp50; Vec sp44; @@ -2366,7 +2346,8 @@ static void GenieSceneExec(void) { HuAudFXPauseAll(0); } -static void ExecItemGenie(void) { +static void ExecItemGenie(void) +{ UnkItemShowProcStruct sp24; Vec sp18; Vec spC; @@ -2498,7 +2479,8 @@ static void ExecItemGenie(void) { } } -void BoardItemBagItemSet(s16 *arg0) { +void BoardItemBagItemSet(s16 *arg0) +{ s32 i; for (i = 0; i < 3; i++) { @@ -2506,7 +2488,8 @@ void BoardItemBagItemSet(s16 *arg0) { } } -static void ExecItemBagJump(void) { +static void ExecItemBagJump(void) +{ Vec sp20; Vec sp14; Vec sp8; @@ -2515,7 +2498,7 @@ static void ExecItemBagJump(void) { float var_f31; s16 temp_r31; - temp_r31 = (s16) HuPrcCurrentGet()->user_data; + temp_r31 = (s16)HuPrcCurrentGet()->user_data; BoardModelScaleGet(temp_r31, &sp20); BoardModelPosGet(temp_r31, &sp14); sp8 = sp14; @@ -2549,7 +2532,8 @@ static void ExecItemBagJump(void) { } } -static void ExecItemBagShow(void) { +static void ExecItemBagShow(void) +{ Vec sp14; Vec sp8; float var_f31; @@ -2581,7 +2565,8 @@ static void ExecItemBagShow(void) { } } -static void ExecItemBag(void) { +static void ExecItemBag(void) +{ UnkItemShowProcStruct sp3C; Vec sp30; Vec sp24; @@ -2644,12 +2629,14 @@ static void ExecItemBag(void) { var_r25 = 0x100; var_r26 = frandmod(40) + 30; } - } else { + } + else { var_r25 = HuPadBtnDown[temp_r23]; } if (!(var_r25 & 0x100)) { HuPrcVSleep(); - } else { + } + else { BoardPlayerDiceJumpStart(currItemRestore); while (!BoardPlayerDiceJumpCheck(currItemRestore)) { HuPrcVSleep(); @@ -2660,7 +2647,7 @@ static void ExecItemBag(void) { BoardModelScaleSetV(sp8[var_r30], &sp24); BoardModelVisibilitySet(sp8[var_r30], 1); temp_r29 = HuPrcChildCreate(ExecItemBagJump, 0x2004, 0x1000, 0, HuPrcCurrentGet()); - temp_r29->user_data = (void*) sp8[var_r30]; + temp_r29->user_data = (void *)sp8[var_r30]; temp_r29 = HuPrcChildCreate(ExecItemBagShow, 0x2004, 0x1000, 0, HuPrcCurrentGet()); temp_r29->user_data = temp_r24; while (GWPlayer[currItemRestore].jump) { @@ -2691,14 +2678,16 @@ static void ExecItemBag(void) { } } -static void RestoreItemNull(void) { +static void RestoreItemNull(void) +{ HuPrcKill(NULL); while (1) { HuPrcVSleep(); } } -static void RestoreItemMini(void) { +static void RestoreItemMini(void) +{ HuAudFXPlay(0x311); ItemSizeSet(0); HuPrcKill(NULL); @@ -2707,7 +2696,8 @@ static void RestoreItemMini(void) { } } -static void RestoreItemMega(void) { +static void RestoreItemMega(void) +{ HuAudFXPlay(0x313); ItemSizeSet(0); HuPrcKill(NULL); @@ -2716,7 +2706,8 @@ static void RestoreItemMega(void) { } } -static void RestoreItemMiniSuper(void) { +static void RestoreItemMiniSuper(void) +{ HuAudFXPlay(0x311); ItemSizeSet(0); HuPrcKill(NULL); @@ -2725,7 +2716,8 @@ static void RestoreItemMiniSuper(void) { } } -static void RestoreItemMegaSuper(void) { +static void RestoreItemMegaSuper(void) +{ HuAudFXPlay(0x313); ItemSizeSet(0); HuPrcKill(NULL); @@ -2734,7 +2726,8 @@ static void RestoreItemMegaSuper(void) { } } -static void RestoreItemBowser(void) { +static void RestoreItemBowser(void) +{ Vec sp20; Vec sp14; Vec sp8; diff --git a/src/game/board/lottery.c b/src/game/board/lottery.c index 72bffb14..f64992f4 100755 --- a/src/game/board/lottery.c +++ b/src/game/board/lottery.c @@ -833,7 +833,7 @@ static void LotteryInlineFunc00(s32 arg0, s32 arg1) { temp_f30 = 4.0f; if (lotterySpr == -1) { lotterySpr = espEntry(sp20[arg0], 30001, 0); - espAttrSet(lotterySpr, 1); + espAttrSet(lotterySpr, HUSPR_ATTR_NOANIM); } } else { sp34.y = (sp10[arg0] / 2) + 40; diff --git a/src/game/board/model.c b/src/game/board/model.c index b621f1fd..d7ee3353 100644 --- a/src/game/board/model.c +++ b/src/game/board/model.c @@ -1,5 +1,5 @@ -#include "game/board/main.h" #include "game/board/model.h" +#include "game/board/main.h" #include "game/chrman.h" #include "game/hsfman.h" #include "game/hsfmotion.h" @@ -10,31 +10,31 @@ #define BOARD_MOT_MAX 32 typedef struct board_model { - struct { - u8 visible : 1; - u8 visible_old : 1; - u8 field00_bit2 : 1; - u8 field00_bit3 : 1; - u8 field00_bit4 : 1; - }; - s8 mot_count; - s8 character; - u8 alpha; - u8 layer; - u16 camera; - s16 index; - s16 id; - s16 mot_id[BOARD_MOT_MAX]; - s16 curr_mot; - HsfData *data; - HsfData *mot_data[BOARD_MOT_MAX]; - float unk_D4; - s32 data_num; - float mot_start; - float mot_end; - Vec pos; - Vec rot; - Vec scale; + struct { + u8 visible : 1; + u8 visible_old : 1; + u8 field00_bit2 : 1; + u8 field00_bit3 : 1; + u8 field00_bit4 : 1; + }; + s8 mot_count; + s8 character; + u8 alpha; + u8 layer; + u16 camera; + s16 index; + s16 id; + s16 mot_id[BOARD_MOT_MAX]; + s16 curr_mot; + HsfData *data; + HsfData *mot_data[BOARD_MOT_MAX]; + float unk_D4; + s32 data_num; + float mot_start; + float mot_end; + Vec pos; + Vec rot; + Vec scale; } BoardModel; static s16 modelDataNum; @@ -52,1132 +52,1199 @@ void BoardModelDummyUpdate(void); void BoardModelVisibilityUpdate(void); typedef struct modelmgr_work { - u8 kill : 1; + u8 kill : 1; } ModelMgrWork; void BoardModelInit(void) { - ModelMgrWork *work; - s32 i; - modelDataList = HuMemDirectMallocNum(HEAP_SYSTEM, BOARD_MODEL_MAX*sizeof(BoardModel), MEMORY_DEFAULT_NUM); - reflectMapNo = 0; - modelDataNum = 0; - memset(modelDataList, 0, BOARD_MODEL_MAX*sizeof(BoardModel)); - for(i=0; ikill = 0; - omSetStatBit(modelMgrObj, OM_STAT_NOPAUSE|0x80); + ModelMgrWork *work; + s32 i; + modelDataList = HuMemDirectMallocNum(HEAP_SYSTEM, BOARD_MODEL_MAX * sizeof(BoardModel), MEMORY_DEFAULT_NUM); + reflectMapNo = 0; + modelDataNum = 0; + memset(modelDataList, 0, BOARD_MODEL_MAX * sizeof(BoardModel)); + for (i = 0; i < BOARD_MODEL_MAX; i++) { + modelDataList[i].index = -1; + modelDataList[i].visible = 0; + } + modelMgrObj = omAddObjEx(boardObjMan, 32258, 0, 0, -1, ModelMgrFunc); + work = OM_GET_WORK_PTR(modelMgrObj, ModelMgrWork); + work->kill = 0; + omSetStatBit(modelMgrObj, OM_STAT_NOPAUSE | 0x80); } void BoardModelKillAll(void) { - if(modelMgrObj) { - ModelMgrWork *work = OM_GET_WORK_PTR(modelMgrObj, ModelMgrWork); - work->kill = 1; - } - if(modelDataList) { - BoardModel *model; - for(model=modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { - KillBoardModel(model); - } - if(modelDataList) { - HuMemDirectFree(modelDataList); - modelDataList = NULL; - } - - } + if (modelMgrObj) { + ModelMgrWork *work = OM_GET_WORK_PTR(modelMgrObj, ModelMgrWork); + work->kill = 1; + } + if (modelDataList) { + BoardModel *model; + for (model = modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { + KillBoardModel(model); + } + if (modelDataList) { + HuMemDirectFree(modelDataList); + modelDataList = NULL; + } + } } static void ModelMgrFunc(omObjData *object) { - ModelMgrWork *work = OM_GET_WORK_PTR(modelMgrObj, ModelMgrWork); - if(work->kill || BoardIsKill()) { - modelMgrObj = NULL; - omDelObjEx(HuPrcCurrentGet(), object); - return; - } - BoardModelDummyUpdate(); - BoardModelVisibilityUpdate(); + ModelMgrWork *work = OM_GET_WORK_PTR(modelMgrObj, ModelMgrWork); + if (work->kill || BoardIsKill()) { + modelMgrObj = NULL; + omDelObjEx(HuPrcCurrentGet(), object); + return; + } + BoardModelDummyUpdate(); + BoardModelVisibilityUpdate(); } -void BoardModelDummyUpdate(void) -{ - -} +void BoardModelDummyUpdate(void) { } void BoardModelVisibilityUpdate(void) { - s32 i; - BoardModel *model; - u32 temp[2]; - Vec pos, target; - temp[1] = temp[0] = 0; - BoardCameraPosGet(&pos); - BoardCameraTargetGet(&target); - for(i=0, model = modelDataList; iindex == -1) { - continue; - } - attr = Hu3DModelAttrGet(model->id); - if(!model->visible) { - if(!(attr & 0x1)) { - Hu3DModelAttrSet(model->id, 1); - } - } else { - if(attr & 0x1) { - Hu3DModelAttrReset(model->id, 1); - } - } - } + s32 i; + BoardModel *model; + u32 temp[2]; + Vec pos, target; + temp[1] = temp[0] = 0; + BoardCameraPosGet(&pos); + BoardCameraTargetGet(&target); + for (i = 0, model = modelDataList; i < BOARD_MODEL_MAX; i++, model++) { + u32 attr; + if (model->index == -1) { + continue; + } + attr = Hu3DModelAttrGet(model->id); + if (!model->visible) { + if (!(attr & 0x1)) { + Hu3DModelAttrSet(model->id, HU3D_ATTR_DISPOFF); + } + } + else { + if (attr & 0x1) { + Hu3DModelAttrReset(model->id, HU3D_ATTR_DISPOFF); + } + } + } } void BoardModelHideSetAll(s32 flag) { - BoardModel *model; - if(!modelDataList) { - return; - } - - for(model=modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { - if(model->index == -1) { - continue; - } - if(flag) { - model->visible_old = model->visible; - model->visible = 0; - } else { - model->visible = model->visible_old; - } - } + BoardModel *model; + if (!modelDataList) { + return; + } + + for (model = modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { + if (model->index == -1) { + continue; + } + if (flag) { + model->visible_old = model->visible; + model->visible = 0; + } + else { + model->visible = model->visible_old; + } + } } void BoardModelAmbSetAll(float r, float g, float b) { - BoardModel *model; - for(model=modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { - if(model->index == -1) { - continue; - } - BoardModelAmbSet(model->index, r, g, b); - } + BoardModel *model; + for (model = modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { + if (model->index == -1) { + continue; + } + BoardModelAmbSet(model->index, r, g, b); + } } void BoardModelCameraSetAll(u16 camera) { - BoardModel *model; - for(model=modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { - if(model->index == -1) { - continue; - } - if(model->character != -1) { - continue; - } - Hu3DModelCameraSet(model->id, camera); - model->camera = camera; - } + BoardModel *model; + for (model = modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { + if (model->index == -1) { + continue; + } + if (model->character != -1) { + continue; + } + Hu3DModelCameraSet(model->id, camera); + model->camera = camera; + } } static s16 CreateInstance(s32 character, s32 data_num, s32 *mot_list, s32 link, s32 arg4) { - BoardModel *model; - s32 i; - model = NULL; - for(i=0; iindex = i+1; - model->character = character; - modelDataNum++; - if(CreateBoardModel(model, data_num, link) == 0) { - s32 count; - count = 0; - if(mot_list) { - for(count=0; mot_list[count] >= 0; count++); - if(count >= BOARD_MOT_MAX) { - count = BOARD_MOT_MAX; - } - } - for(i=0; imot_id[i] = -1; - } - if(CreateBoardModelMotion(model, count, mot_list) == 0) { - model->visible = 1; - model->visible_old = model->visible; - model->field00_bit2 = 0; - model->field00_bit4 = 0; - model->unk_D4 = 100.0f; - model->scale.x = model->scale.y = model->scale.z = 1.0f; - model->curr_mot = 0; - Hu3DModelCameraSet(model->id, 1); - Hu3DModelLayerSet(model->id, 0); - model->field00_bit3 = 0; - model->alpha = 255; - BoardModelPosSet(model->index, 0.0f, 0.0f, 0.0f); - BoardModelRotSet(model->index, 0.0f, 0.0f, 0.0f); - BoardModelScaleSet(model->index, 1.0f, 1.0f, 1.0f); - BoardModelAmbSet(model->index, 1.0f, 1.0f, 1.0f); - return model->index; - } - } - BoardModelKill(model->index); - return -1; + BoardModel *model; + s32 i; + model = NULL; + for (i = 0; i < BOARD_MODEL_MAX; i++) { + if (modelDataList[i].index == -1) { + model = &modelDataList[i]; + break; + } + } + if (!model) { + return -1; + } + memset(model, 0, sizeof(BoardModel)); + model->index = i + 1; + model->character = character; + modelDataNum++; + if (CreateBoardModel(model, data_num, link) == 0) { + s32 count; + count = 0; + if (mot_list) { + for (count = 0; mot_list[count] >= 0; count++) + ; + if (count >= BOARD_MOT_MAX) { + count = BOARD_MOT_MAX; + } + } + for (i = 0; i < BOARD_MOT_MAX; i++) { + model->mot_id[i] = -1; + } + if (CreateBoardModelMotion(model, count, mot_list) == 0) { + model->visible = 1; + model->visible_old = model->visible; + model->field00_bit2 = 0; + model->field00_bit4 = 0; + model->unk_D4 = 100.0f; + model->scale.x = model->scale.y = model->scale.z = 1.0f; + model->curr_mot = 0; + Hu3DModelCameraSet(model->id, 1); + Hu3DModelLayerSet(model->id, 0); + model->field00_bit3 = 0; + model->alpha = 255; + BoardModelPosSet(model->index, 0.0f, 0.0f, 0.0f); + BoardModelRotSet(model->index, 0.0f, 0.0f, 0.0f); + BoardModelScaleSet(model->index, 1.0f, 1.0f, 1.0f); + BoardModelAmbSet(model->index, 1.0f, 1.0f, 1.0f); + return model->index; + } + } + BoardModelKill(model->index); + return -1; } s16 BoardModelCreate(s32 data_num, s32 *mot_list, s32 link) { - return CreateInstance(-1, data_num, mot_list, link, 0); + return CreateInstance(-1, data_num, mot_list, link, 0); } s16 BoardModelCreateCharacter(s32 character, s32 data_num, s32 *mot_list, s32 link) { - return CreateInstance(character, data_num, mot_list, link, 0); + return CreateInstance(character, data_num, mot_list, link, 0); } s16 BoardModelCreateParam(BoardModelParam *param, Vec *pos, Vec *rot) { - float unk_param; - s16 model = BoardModelCreate(param->data_num, NULL, param->unk4.link); - if(model == -1) { - return -1; - } - BoardModelMotionStart(model, 0, (param->unk4.pause) ? 0x40000001 : 0); - if(!param->unk4.start_mot) { - BoardModelMotionSpeedSet(model, 0.0f); - } - BoardModelExistDupe(model, param->unk4.field04_bit0); - BoardModelVisibilitySet(model, param->unk4.visible); - if(pos) { - BoardModelPosSetV(model, pos); - } - if(rot) { - BoardModelRotSetV(model, rot); - } - OSs16tof32(¶m->unk6, &unk_param); - fn_8006DDE8(model, unk_param); - return model; + float unk_param; + s16 model = BoardModelCreate(param->data_num, NULL, param->unk4.link); + if (model == -1) { + return -1; + } + BoardModelMotionStart(model, 0, (param->unk4.pause) ? 0x40000001 : 0); + if (!param->unk4.start_mot) { + BoardModelMotionSpeedSet(model, 0.0f); + } + BoardModelExistDupe(model, param->unk4.field04_bit0); + BoardModelVisibilitySet(model, param->unk4.visible); + if (pos) { + BoardModelPosSetV(model, pos); + } + if (rot) { + BoardModelRotSetV(model, rot); + } + OSs16tof32(¶m->unk6, &unk_param); + fn_8006DDE8(model, unk_param); + return model; } void BoardModelKill(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(model_ptr) { - KillBoardModel(model_ptr); - } + BoardModel *model_ptr = SearchBoardModel(model); + if (model_ptr) { + KillBoardModel(model_ptr); + } } s16 BoardModelIDGet(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - return model_ptr->id; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + return model_ptr->id; + } } s32 fn_8006DC1C(s16 model, s32 arg1) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - model_ptr->field00_bit3 = arg1; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + model_ptr->field00_bit3 = arg1; + return 0; + } } s32 BoardModelPassSet(s16 model, s32 pass) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - if(pass != 0) { - Hu3DModelAttrSet(model_ptr->id, 2); - } else { - Hu3DModelAttrReset(model_ptr->id, 2); - } - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + if (pass != 0) { + Hu3DModelAttrSet(model_ptr->id, HU3D_ATTR_ZWRITE_OFF); + } + else { + Hu3DModelAttrReset(model_ptr->id, 2); + } + return 0; + } } s32 BoardModelAmbSet(s16 model, float r, float g, float b) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - Hu3DModelAmbSet(model_ptr->id, r, g, b); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + Hu3DModelAmbSet(model_ptr->id, r, g, b); + return 0; + } } s32 BoardModelExistCheck(s16 model, s32 arg1) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + return 0; + } } s32 BoardModelExistDupe(s16 model, s32 arg1) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + return 0; + } } s32 fn_8006DDE8(s16 model, float arg1) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - if(arg1 < 0) { - arg1 = -1; - } - model_ptr->unk_D4 = arg1; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + if (arg1 < 0) { + arg1 = -1; + } + model_ptr->unk_D4 = arg1; + return 0; + } } s32 BoardModelMotionCreate(s16 model, s32 data_num) { - BoardModel *model_ptr = SearchBoardModel(model); - s32 i; - if(!model_ptr) { - return -1; - } else { - s16 id; - if(model_ptr->mot_count >= BOARD_MOT_MAX) { - return -1; - } - for(i=1; imot_id[i] == -1) { - break; - } - } - if(model_ptr->character == -1) { - model_ptr->mot_data[i] = HuDataSelHeapReadNum(data_num, MEMORY_DEFAULT_NUM, HEAP_DATA); - if(!model_ptr->mot_data[i]) { - return -1; - } - model = Hu3DJointMotion(model_ptr->id, model_ptr->mot_data[i]); - } else { - model = CharModelMotionCreate(model_ptr->character, data_num); - CharModelMotionDataClose(model_ptr->character); - } - model_ptr->mot_id[i] = model; - model_ptr->mot_count++; - return i; - } + BoardModel *model_ptr = SearchBoardModel(model); + s32 i; + if (!model_ptr) { + return -1; + } + else { + s16 id; + if (model_ptr->mot_count >= BOARD_MOT_MAX) { + return -1; + } + for (i = 1; i < BOARD_MOT_MAX; i++) { + if (model_ptr->mot_id[i] == -1) { + break; + } + } + if (model_ptr->character == -1) { + model_ptr->mot_data[i] = HuDataSelHeapReadNum(data_num, MEMORY_DEFAULT_NUM, HEAP_DATA); + if (!model_ptr->mot_data[i]) { + return -1; + } + model = Hu3DJointMotion(model_ptr->id, model_ptr->mot_data[i]); + } + else { + model = CharModelMotionCreate(model_ptr->character, data_num); + CharModelMotionDataClose(model_ptr->character); + } + model_ptr->mot_id[i] = model; + model_ptr->mot_count++; + return i; + } } s32 BoardModelMotionKill(s16 model, s32 motion) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - if(motion >= BOARD_MOT_MAX || motion <= 0) { - return -1; - } - if(motion == model_ptr->curr_mot && model_ptr->curr_mot != 0) { - BoardModelMotionStart(model, 0, 0); - } - if(model_ptr->mot_id[motion] > 0) { - if(model_ptr->character == -1) { - Hu3DMotionKill(model_ptr->mot_id[motion]); - } else { - CharModelMotionKill(model_ptr->character, model_ptr->mot_id[motion]); - } - model_ptr->mot_id[motion] = -1; - } - model_ptr->mot_data[motion] = NULL; - model_ptr->mot_count--; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + if (motion >= BOARD_MOT_MAX || motion <= 0) { + return -1; + } + if (motion == model_ptr->curr_mot && model_ptr->curr_mot != 0) { + BoardModelMotionStart(model, 0, 0); + } + if (model_ptr->mot_id[motion] > 0) { + if (model_ptr->character == -1) { + Hu3DMotionKill(model_ptr->mot_id[motion]); + } + else { + CharModelMotionKill(model_ptr->character, model_ptr->mot_id[motion]); + } + model_ptr->mot_id[motion] = -1; + } + model_ptr->mot_data[motion] = NULL; + model_ptr->mot_count--; + return 0; + } } s32 BoardModelMotionStartEndSet(s16 model, s16 start, s16 end) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - if(start >= 0) { - OSs16tof32(&start, &model_ptr->mot_start); - } - if(end >= 0) { - OSs16tof32(&end, &model_ptr->mot_end); - } - Hu3DMotionStartEndSet(model_ptr->id, model_ptr->mot_start, model_ptr->mot_end); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + if (start >= 0) { + OSs16tof32(&start, &model_ptr->mot_start); + } + if (end >= 0) { + OSs16tof32(&end, &model_ptr->mot_end); + } + Hu3DMotionStartEndSet(model_ptr->id, model_ptr->mot_start, model_ptr->mot_end); + return 0; + } } s32 BoardModelMotionUpdateSet(s16 model, s32 flag) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - if(flag) { - Hu3DModelAttrSet(model_ptr->id, 0x40000001); - } else { - Hu3DModelAttrReset(model_ptr->id, 0x40000001); - } - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + if (flag) { + Hu3DModelAttrSet(model_ptr->id, HU3D_MOTATTR_LOOP); + } + else { + Hu3DModelAttrReset(model_ptr->id, 0x40000001); + } + return 0; + } } s32 BoardModelVoiceEnableSet(s16 model, s32 motion, s32 flag) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - if(motion >= BOARD_MOT_MAX || motion < 0) { - return 0; - } - if(model_ptr->character == -1) { - return 0; - } - CharModelVoiceEnableSet(model_ptr->character, model_ptr->mot_id[motion], flag); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + if (motion >= BOARD_MOT_MAX || motion < 0) { + return 0; + } + if (model_ptr->character == -1) { + return 0; + } + CharModelVoiceEnableSet(model_ptr->character, model_ptr->mot_id[motion], flag); + return 0; + } } s32 BoardModelMotionStart(s16 model, s32 motion, u32 attr) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - if(motion >= BOARD_MOT_MAX || motion < 0) { - return 0; - } - Hu3DMotionSpeedSet(model_ptr->id, 1.0f); - if(model_ptr->character == -1) { - Hu3DMotionSet(model_ptr->id, model_ptr->mot_id[motion]); - } else { - CharModelMotionSet(model_ptr->character, model_ptr->mot_id[motion]); - } - model_ptr->mot_start = 0.0f; - if(model_ptr->character == -1) { - model_ptr->mot_end = Hu3DMotionMaxTimeGet(model_ptr->id); - } else { - model_ptr->mot_end = CharModelMotionMaxTimeGet(model_ptr->character); - } - model_ptr->field00_bit4 = 0; - if(attr & 0x40000024) { - if(model_ptr->character == -1) { - Hu3DMotionTimeSet(model_ptr->id, model_ptr->mot_end); - } else { - CharModelMotionTimeSet(model_ptr->character, model_ptr->mot_end); - } - } - Hu3DModelAttrReset(model_ptr->id, 0x40000003); - Hu3DModelAttrSet(model_ptr->id, attr); - model_ptr->curr_mot = motion; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + if (motion >= BOARD_MOT_MAX || motion < 0) { + return 0; + } + Hu3DMotionSpeedSet(model_ptr->id, 1.0f); + if (model_ptr->character == -1) { + Hu3DMotionSet(model_ptr->id, model_ptr->mot_id[motion]); + } + else { + CharModelMotionSet(model_ptr->character, model_ptr->mot_id[motion]); + } + model_ptr->mot_start = 0.0f; + if (model_ptr->character == -1) { + model_ptr->mot_end = Hu3DMotionMaxTimeGet(model_ptr->id); + } + else { + model_ptr->mot_end = CharModelMotionMaxTimeGet(model_ptr->character); + } + model_ptr->field00_bit4 = 0; + if (attr & 0x40000024) { + if (model_ptr->character == -1) { + Hu3DMotionTimeSet(model_ptr->id, model_ptr->mot_end); + } + else { + CharModelMotionTimeSet(model_ptr->character, model_ptr->mot_end); + } + } + Hu3DModelAttrReset(model_ptr->id, 0x40000003); + Hu3DModelAttrSet(model_ptr->id, attr); + model_ptr->curr_mot = motion; + return 0; + } } s32 BoardModelMotionShiftIDGet(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - return Hu3DMotionShiftIDGet(model_ptr->id); - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + return Hu3DMotionShiftIDGet(model_ptr->id); + } } s32 BoardModelMotionShiftSet(s16 model, s32 motion, float time, float shift_time, u32 attr) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - if(motion >= BOARD_MOT_MAX || motion < 0) { - return -1; - } - model_ptr->mot_start = 0.0f; - if(model_ptr->character == -1) { - model_ptr->mot_end = Hu3DMotionMaxTimeGet(model_ptr->id); - } else { - model_ptr->mot_end = CharModelMotionMaxTimeGet(model_ptr->character); - } - model_ptr->field00_bit4 = 0; - if(model_ptr->character == -1) { - Hu3DMotionShiftSet(model_ptr->id, model_ptr->mot_id[motion], time, shift_time, attr); - } else { - CharModelMotionShiftSet(model_ptr->character, model_ptr->mot_id[motion], time, shift_time, attr); - } - model_ptr->curr_mot = motion; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + if (motion >= BOARD_MOT_MAX || motion < 0) { + return -1; + } + model_ptr->mot_start = 0.0f; + if (model_ptr->character == -1) { + model_ptr->mot_end = Hu3DMotionMaxTimeGet(model_ptr->id); + } + else { + model_ptr->mot_end = CharModelMotionMaxTimeGet(model_ptr->character); + } + model_ptr->field00_bit4 = 0; + if (model_ptr->character == -1) { + Hu3DMotionShiftSet(model_ptr->id, model_ptr->mot_id[motion], time, shift_time, attr); + } + else { + CharModelMotionShiftSet(model_ptr->character, model_ptr->mot_id[motion], time, shift_time, attr); + } + model_ptr->curr_mot = motion; + return 0; + } } s32 BoardModelAttrSet(s16 model, u32 attr) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - Hu3DModelAttrSet(model_ptr->id, attr); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + Hu3DModelAttrSet(model_ptr->id, attr); + return 0; + } } s32 BoardModelAttrReset(s16 model, u32 attr) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - Hu3DModelAttrReset(model_ptr->id, attr); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + Hu3DModelAttrReset(model_ptr->id, attr); + return 0; + } } s32 BoardModelMotionTimeSet(s16 model, float time) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - if(model_ptr->character == -1) { - Hu3DMotionTimeSet(model_ptr->id, time); - } else { - CharModelMotionTimeSet(model_ptr->character, time); - } - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + if (model_ptr->character == -1) { + Hu3DMotionTimeSet(model_ptr->id, time); + } + else { + CharModelMotionTimeSet(model_ptr->character, time); + } + return 0; + } } float BoardModelMotionTimeGet(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - float time; - if(model_ptr->character == -1) { - time = Hu3DData[model_ptr->id].unk_64; - } else { - time = CharModelMotionTimeGet(model_ptr->character); - } - return time; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + float time; + if (model_ptr->character == -1) { + time = Hu3DData[model_ptr->id].unk_64; + } + else { + time = CharModelMotionTimeGet(model_ptr->character); + } + return time; + } } float BoardModelMotionMaxTimeGet(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - float time; - if(model_ptr->character == -1) { - time = Hu3DMotionMaxTimeGet(model_ptr->id); - } else { - time = CharModelMotionMaxTimeGet(model_ptr->character); - } - return time; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + float time; + if (model_ptr->character == -1) { + time = Hu3DMotionMaxTimeGet(model_ptr->id); + } + else { + time = CharModelMotionMaxTimeGet(model_ptr->character); + } + return time; + } } float BoardModelMotionSpeedGet(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - ModelData *hsf_model = &Hu3DData[model_ptr->id]; - return hsf_model->unk_68; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + ModelData *hsf_model = &Hu3DData[model_ptr->id]; + return hsf_model->unk_68; + } } s32 BoardModelMotionSpeedSet(s16 model, float speed) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - ModelData *hsf_model; - if(model_ptr->character == -1) { - Hu3DMotionSpeedSet(model_ptr->id, speed); - } else { - CharModelMotionSpeedSet(model_ptr->character, speed); - } - hsf_model = &Hu3DData[model_ptr->id]; - hsf_model->unk_88 = speed; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + ModelData *hsf_model; + if (model_ptr->character == -1) { + Hu3DMotionSpeedSet(model_ptr->id, speed); + } + else { + CharModelMotionSpeedSet(model_ptr->character, speed); + } + hsf_model = &Hu3DData[model_ptr->id]; + hsf_model->unk_88 = speed; + return 0; + } } s32 BoardModelMotionEndCheck(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return 1; - } else { - s32 result; - if(model_ptr->character == -1) { - result = Hu3DMotionEndCheck(model_ptr->id); - } else { - result = CharModelMotionEndCheck(model_ptr->character); - } - return result; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return 1; + } + else { + s32 result; + if (model_ptr->character == -1) { + result = Hu3DMotionEndCheck(model_ptr->id); + } + else { + result = CharModelMotionEndCheck(model_ptr->character); + } + return result; + } } s32 BoardModelMotionShapeSet(s16 model, s32 motion, u32 attr) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - ModelData *hsf_model; - if(model_ptr->character != -1) { - return -1; - } - if(motion >= BOARD_MOT_MAX) { - return -1; - } - hsf_model = &Hu3DData[model_ptr->id]; - hsf_model->unk_98 = 1.0f; - Hu3DMotionShapeSet(model_ptr->id, model_ptr->mot_id[motion]); - if(attr & 0x40000100) { - float max_time = Hu3DMotionMaxTimeGet(model_ptr->id); - hsf_model->unk_94 = max_time; - } - Hu3DModelAttrSet(model_ptr->id, attr); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + ModelData *hsf_model; + if (model_ptr->character != -1) { + return -1; + } + if (motion >= BOARD_MOT_MAX) { + return -1; + } + hsf_model = &Hu3DData[model_ptr->id]; + hsf_model->unk_98 = 1.0f; + Hu3DMotionShapeSet(model_ptr->id, model_ptr->mot_id[motion]); + if (attr & 0x40000100) { + float max_time = Hu3DMotionMaxTimeGet(model_ptr->id); + hsf_model->unk_94 = max_time; + } + Hu3DModelAttrSet(model_ptr->id, attr); + return 0; + } } float BoardModelMotionShapeTimeGet(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - ModelData *hsf_model; - if(model_ptr->character != -1) { - return -1; - } - hsf_model = &Hu3DData[model_ptr->id]; - return hsf_model->unk_94; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + ModelData *hsf_model; + if (model_ptr->character != -1) { + return -1; + } + hsf_model = &Hu3DData[model_ptr->id]; + return hsf_model->unk_94; + } } float BoardModelMotionShapeMaxTimeGet(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - ModelData *hsf_model; - MotionData *motion; - HsfMotion *motion_hsf; - if(model_ptr->character != -1) { - return -1; - } - hsf_model = &Hu3DData[model_ptr->id]; - if(hsf_model->unk_0E == -1) { - return 0; - } - motion = &Hu3DMotion[hsf_model->unk_0E]; - motion_hsf = motion->unk_04->motion; - return motion_hsf->len; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + ModelData *hsf_model; + MotionData *motion; + HsfMotion *motion_hsf; + if (model_ptr->character != -1) { + return -1; + } + hsf_model = &Hu3DData[model_ptr->id]; + if (hsf_model->unk_0E == -1) { + return 0; + } + motion = &Hu3DMotion[hsf_model->unk_0E]; + motion_hsf = motion->unk_04->motion; + return motion_hsf->len; + } } s32 BoardModelMotionShapeSpeedSet(s16 model, float speed) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - ModelData *hsf_model; - if(model_ptr->character != -1) { - return -1; - } - hsf_model = &Hu3DData[model_ptr->id]; - hsf_model->unk_98 = speed; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + ModelData *hsf_model; + if (model_ptr->character != -1) { + return -1; + } + hsf_model = &Hu3DData[model_ptr->id]; + hsf_model->unk_98 = speed; + return 0; + } } float BoardModelMotionShapeSpeedGet(s16 model, float speed) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - ModelData *hsf_model; - hsf_model = &Hu3DData[model_ptr->id]; - return hsf_model->unk_98; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + ModelData *hsf_model; + hsf_model = &Hu3DData[model_ptr->id]; + return hsf_model->unk_98; + } } s32 BoardModelMotionShapeEndCheck(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return 1; - } else { - ModelData *hsf_model; - if(model_ptr->character != -1) { - return 1; - } - hsf_model = &Hu3DData[model_ptr->id]; - if(hsf_model->attr & 0x40000100) { - return hsf_model->unk_94 <= 0.0f; - } - return BoardModelMotionShapeMaxTimeGet(model) <= hsf_model->unk_94; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return 1; + } + else { + ModelData *hsf_model; + if (model_ptr->character != -1) { + return 1; + } + hsf_model = &Hu3DData[model_ptr->id]; + if (hsf_model->attr & 0x40000100) { + return hsf_model->unk_94 <= 0.0f; + } + return BoardModelMotionShapeMaxTimeGet(model) <= hsf_model->unk_94; + } } s32 BoardModelMotionShapeStartEndSet(s16 model, s16 start, s16 end) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - if(model_ptr->character != -1) { - return -1; - } - if(start >= 0) { - OSs16tof32(&start, &model_ptr->mot_start); - } - if(end >= 0) { - OSs16tof32(&end, &model_ptr->mot_end); - } - Hu3DMotionShapeStartEndSet(model_ptr->id, model_ptr->mot_start, model_ptr->mot_end); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + if (model_ptr->character != -1) { + return -1; + } + if (start >= 0) { + OSs16tof32(&start, &model_ptr->mot_start); + } + if (end >= 0) { + OSs16tof32(&end, &model_ptr->mot_end); + } + Hu3DMotionShapeStartEndSet(model_ptr->id, model_ptr->mot_start, model_ptr->mot_end); + return 0; + } } s32 BoardModelAlphaSet(s16 model, u8 alpha) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - float tp_lvl; - model_ptr->alpha = alpha; - OSu8tof32(&alpha, &tp_lvl); - tp_lvl = tp_lvl*(1.0f/255.0f); - Hu3DModelTPLvlSet(model_ptr->id, tp_lvl); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + float tp_lvl; + model_ptr->alpha = alpha; + OSu8tof32(&alpha, &tp_lvl); + tp_lvl = tp_lvl * (1.0f / 255.0f); + Hu3DModelTPLvlSet(model_ptr->id, tp_lvl); + return 0; + } } s32 BoardModelMtxSet(s16 model, Mtx *src) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - ModelData *hsf_model; - if(!src) { - return -1; - } - hsf_model = &Hu3DData[model_ptr->id]; - MTXCopy(*src, hsf_model->unk_F0); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + ModelData *hsf_model; + if (!src) { + return -1; + } + hsf_model = &Hu3DData[model_ptr->id]; + MTXCopy(*src, hsf_model->unk_F0); + return 0; + } } s32 BoardModelMtxGet(s16 model, Mtx *dst) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - ModelData *hsf_model; - if(!dst) { - return -1; - } - hsf_model = &Hu3DData[model_ptr->id]; - MTXCopy(hsf_model->unk_F0, *dst); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + ModelData *hsf_model; + if (!dst) { + return -1; + } + hsf_model = &Hu3DData[model_ptr->id]; + MTXCopy(hsf_model->unk_F0, *dst); + return 0; + } } s32 BoardModelRotYSet(s16 model, float rot) { - Vec rot_orig; - BoardModelRotGet(model, &rot_orig); - return BoardModelRotSet(model, rot_orig.x, BoardDAngleCalc(rot), rot_orig.z); + Vec rot_orig; + BoardModelRotGet(model, &rot_orig); + return BoardModelRotSet(model, rot_orig.x, BoardDAngleCalc(rot), rot_orig.z); } float BoardModelRotYGet(s16 model) { - Vec rot; - BoardModelRotGet(model, &rot); - return rot.y; + Vec rot; + BoardModelRotGet(model, &rot); + return rot.y; } s32 BoardModelPosSetV(s16 model, Vec *pos) { - if(!pos) { - return -1; - } else { - return BoardModelPosSet(model, pos->x, pos->y, pos->z); - } + if (!pos) { + return -1; + } + else { + return BoardModelPosSet(model, pos->x, pos->y, pos->z); + } } - s32 BoardModelPosSet(s16 model, float x, float y, float z) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - model_ptr->pos.x = x; - model_ptr->pos.y = y; - model_ptr->pos.z = z; - Hu3DModelPosSetV(model_ptr->id, &model_ptr->pos); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + model_ptr->pos.x = x; + model_ptr->pos.y = y; + model_ptr->pos.z = z; + Hu3DModelPosSetV(model_ptr->id, &model_ptr->pos); + return 0; + } } s32 BoardModelRotSetV(s16 model, Vec *pos) { - if(!pos) { - return -1; - } else { - return BoardModelRotSet(model, pos->x, pos->y, pos->z); - } + if (!pos) { + return -1; + } + else { + return BoardModelRotSet(model, pos->x, pos->y, pos->z); + } } s32 BoardModelRotSet(s16 model, float x, float y, float z) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - model_ptr->rot.x = x; - model_ptr->rot.y = y; - model_ptr->rot.z = z; - Hu3DModelRotSetV(model_ptr->id, &model_ptr->rot); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + model_ptr->rot.x = x; + model_ptr->rot.y = y; + model_ptr->rot.z = z; + Hu3DModelRotSetV(model_ptr->id, &model_ptr->rot); + return 0; + } } s32 BoardModelScaleSetV(s16 model, Vec *pos) { - if(!pos) { - return -1; - } else { - return BoardModelScaleSet(model, pos->x, pos->y, pos->z); - } + if (!pos) { + return -1; + } + else { + return BoardModelScaleSet(model, pos->x, pos->y, pos->z); + } } s32 BoardModelScaleSet(s16 model, float x, float y, float z) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - model_ptr->scale.x = x; - model_ptr->scale.y = y; - model_ptr->scale.z = z; - Hu3DModelScaleSetV(model_ptr->id, &model_ptr->scale); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + model_ptr->scale.x = x; + model_ptr->scale.y = y; + model_ptr->scale.z = z; + Hu3DModelScaleSetV(model_ptr->id, &model_ptr->scale); + return 0; + } } s32 BoardModelPosGet(s16 model, Vec *dst) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr || !dst) { - return -1; - } else { - *dst = model_ptr->pos; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr || !dst) { + return -1; + } + else { + *dst = model_ptr->pos; + return 0; + } } s32 BoardModelRotGet(s16 model, Vec *dst) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr || !dst) { - return -1; - } else { - *dst = model_ptr->rot; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr || !dst) { + return -1; + } + else { + *dst = model_ptr->rot; + return 0; + } } s32 BoardModelScaleGet(s16 model, Vec *dst) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr || !dst) { - return -1; - } else { - *dst = model_ptr->scale; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr || !dst) { + return -1; + } + else { + *dst = model_ptr->scale; + return 0; + } } s32 BoardModelVisibilitySet(s16 model, s32 visible) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - model_ptr->visible = visible; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + model_ptr->visible = visible; + return 0; + } } s32 BoardModelVisibilityGet(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return 0; - } else { - return model_ptr->visible; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return 0; + } + else { + return model_ptr->visible; + } } s32 BoardModelCameraSet(s16 model, u16 camera) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - Hu3DModelCameraSet(model_ptr->id, camera); - model_ptr->camera = camera; - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + Hu3DModelCameraSet(model_ptr->id, camera); + model_ptr->camera = camera; + return 0; + } } s32 BoardModelLayerSet(s16 model, u8 layer) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - model_ptr->layer = layer; - Hu3DModelLayerSet(model_ptr->id, layer); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + model_ptr->layer = layer; + Hu3DModelLayerSet(model_ptr->id, layer); + return 0; + } } s32 BoardModelLayerGet(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - return model_ptr->layer; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + return model_ptr->layer; + } } void BoardModelLayerSetAll(s32 layer) { - BoardModel *model; - for(model=modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { - if(model->index == -1 || model->character != -1) { - continue; - } - Hu3DModelLayerSet(model->id, layer); - } + BoardModel *model; + for (model = modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { + if (model->index == -1 || model->character != -1) { + continue; + } + Hu3DModelLayerSet(model->id, layer); + } } s32 BoardModelHookSet(s16 model, char *name, s16 hook) { - BoardModel *model_ptr = SearchBoardModel(model); + BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - BoardModel *hook_ptr = SearchBoardModel(hook); - if(!hook_ptr || !name) { - return -1; - } - Hu3DModelHookSet(model_ptr->id, name, hook_ptr->id); - BoardModelPosSet(hook, 0, 0, 0); - return 0; - } + if (!model_ptr) { + return -1; + } + else { + BoardModel *hook_ptr = SearchBoardModel(hook); + if (!hook_ptr || !name) { + return -1; + } + Hu3DModelHookSet(model_ptr->id, name, hook_ptr->id); + BoardModelPosSet(hook, 0, 0, 0); + return 0; + } } s32 BoardModelHookReset(s16 model) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - Hu3DModelHookReset(model_ptr->id); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + Hu3DModelHookReset(model_ptr->id); + return 0; + } } s32 BoardModelHookObjReset(s16 model, char *name) { - BoardModel *model_ptr = SearchBoardModel(model); - if(!model_ptr) { - return -1; - } else { - Hu3DModelHookObjReset(model_ptr->id, name); - return 0; - } + BoardModel *model_ptr = SearchBoardModel(model); + if (!model_ptr) { + return -1; + } + else { + Hu3DModelHookObjReset(model_ptr->id, name); + return 0; + } } static BoardModel *SearchBoardModel(s16 id) { - BoardModel *model; - if(id <= 0 || id > BOARD_MODEL_MAX || !modelDataList || BoardIsKill()) { - return NULL; - } - model = &modelDataList[id-1]; - if(model->index != id) { - return NULL; - } - return model; + BoardModel *model; + if (id <= 0 || id > BOARD_MODEL_MAX || !modelDataList || BoardIsKill()) { + return NULL; + } + model = &modelDataList[id - 1]; + if (model->index != id) { + return NULL; + } + return model; } static void KillBoardModel(BoardModel *model) { - s32 i; - if(model->index == -1) { - return; - } - if(model->character == -1) { - model->mot_id[0] = -1; - if(model->id >= 0) { - Hu3DModelKill(model->id); - model->id = -1; - } - for(i=1; imot_id[i] >= 0) { - if(i != 0) { - Hu3DMotionKill(model->mot_id[i]); - } - model->mot_id[i] = -1; - } - model->mot_data[i] = NULL; - } - model->data = NULL; - model->data_num = 0; - } else { - for(i=0; imot_id[i] = -1; - model->mot_data[i] = NULL; - } - if(model->data) { - if(model->id >= 0) { - model->id = -1; - } - model->data = NULL; - } - CharModelKill(model->character); - model->character = -1; - } - modelDataNum--; - model->index = -1; - model->visible = 0; + s32 i; + if (model->index == -1) { + return; + } + if (model->character == -1) { + model->mot_id[0] = -1; + if (model->id >= 0) { + Hu3DModelKill(model->id); + model->id = -1; + } + for (i = 1; i < BOARD_MOT_MAX; i++) { + if (model->mot_id[i] >= 0) { + if (i != 0) { + Hu3DMotionKill(model->mot_id[i]); + } + model->mot_id[i] = -1; + } + model->mot_data[i] = NULL; + } + model->data = NULL; + model->data_num = 0; + } + else { + for (i = 0; i < BOARD_MOT_MAX; i++) { + model->mot_id[i] = -1; + model->mot_data[i] = NULL; + } + if (model->data) { + if (model->id >= 0) { + model->id = -1; + } + model->data = NULL; + } + CharModelKill(model->character); + model->character = -1; + } + modelDataNum--; + model->index = -1; + model->visible = 0; } static BoardModel *FindLinkModel(s32 data_num) { - BoardModel *model; - for(model=modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { - if(model->data_num == data_num) { - return model; - } - } - return NULL; + BoardModel *model; + for (model = modelDataList; model < &modelDataList[BOARD_MODEL_MAX]; model++) { + if (model->data_num == data_num) { + return model; + } + } + return NULL; } static s32 CreateBoardModel(BoardModel *model, s32 data_num, s32 link) { - BoardModel *linked_mdl = NULL; - if(link && model->character == -1) { - linked_mdl = FindLinkModel(data_num); - if(linked_mdl) { - model->id = Hu3DModelLink(linked_mdl->id); - model->data = NULL; - model->data_num = 0; - return 0; - } - } - if(model->character == -1) { - model->data = HuDataSelHeapReadNum(data_num, MEMORY_DEFAULT_NUM, HEAP_DATA); - if(!model->data) { - s32 size_data, size_dvd; - size_data = HuMemHeapSizeGet(HEAP_DATA)-HuMemUsedMallocSizeGet(HEAP_DATA); - size_dvd = HuMemHeapSizeGet(HEAP_DVD)-HuMemUsedMallocSizeGet(HEAP_DVD); - return -1; - } - } else { - model->data = NULL; - } - if(model->character == -1) { - model->id = Hu3DModelCreate(model->data); - } else { - model->id = CharModelCreate(model->character, 2); - } - Hu3DModelAttrSet(model->id, 0x4000); - if(model->id < 0) { - return -1; - } else { - model->data_num = data_num; - return 0; - } + BoardModel *linked_mdl = NULL; + if (link && model->character == -1) { + linked_mdl = FindLinkModel(data_num); + if (linked_mdl) { + model->id = Hu3DModelLink(linked_mdl->id); + model->data = NULL; + model->data_num = 0; + return 0; + } + } + if (model->character == -1) { + model->data = HuDataSelHeapReadNum(data_num, MEMORY_DEFAULT_NUM, HEAP_DATA); + if (!model->data) { + s32 size_data, size_dvd; + size_data = HuMemHeapSizeGet(HEAP_DATA) - HuMemUsedMallocSizeGet(HEAP_DATA); + size_dvd = HuMemHeapSizeGet(HEAP_DVD) - HuMemUsedMallocSizeGet(HEAP_DVD); + return -1; + } + } + else { + model->data = NULL; + } + if (model->character == -1) { + model->id = Hu3DModelCreate(model->data); + } + else { + model->id = CharModelCreate(model->character, 2); + } + Hu3DModelAttrSet(model->id, HU3D_ATTR_NOCULL); + if (model->id < 0) { + return -1; + } + else { + model->data_num = data_num; + return 0; + } } static s32 CreateBoardModelMotion(BoardModel *model, s32 count, s32 *data_num) { - void *data; - s32 i; - model->mot_id[0] = Hu3DData[model->id].unk_08; - if(!data_num) { - model->mot_count = 1; - return 0; - } - data = NULL; - for(i=0; icharacter == -1) { - data = HuDataSelHeapReadNum(data_num[i], MEMORY_DEFAULT_NUM, HEAP_DATA); - if(!data) { - return -1; - } - index = Hu3DJointMotion(model->id, data); - } else { - index = CharModelMotionCreate(model->character, data_num[i]); - } - if(index < 0) { - return -1; - } - model->mot_id[i+1] = index; - model->mot_data[i+1] = data; - } - model->mot_count = count+1; - return 0; -} \ No newline at end of file + void *data; + s32 i; + model->mot_id[0] = Hu3DData[model->id].unk_08; + if (!data_num) { + model->mot_count = 1; + return 0; + } + data = NULL; + for (i = 0; i < count; i++) { + s16 index; + if (model->character == -1) { + data = HuDataSelHeapReadNum(data_num[i], MEMORY_DEFAULT_NUM, HEAP_DATA); + if (!data) { + return -1; + } + index = Hu3DJointMotion(model->id, data); + } + else { + index = CharModelMotionCreate(model->character, data_num[i]); + } + if (index < 0) { + return -1; + } + model->mot_id[i + 1] = index; + model->mot_data[i + 1] = data; + } + model->mot_count = count + 1; + return 0; +} diff --git a/src/game/board/player.c b/src/game/board/player.c index 792a65af..3259ce6f 100644 --- a/src/game/board/player.c +++ b/src/game/board/player.c @@ -13,10 +13,11 @@ #include "game/board/ui.h" #include "game/board/view.h" #include "game/chrman.h" +#include "game/disp.h" #include "game/hsfman.h" #include "game/objsub.h" #include "game/pad.h" -#include "game/disp.h" + #include "math.h" #include "stdlib.h" @@ -2133,7 +2134,7 @@ static void UpdateRollSprite(omObjData *arg0) { Vec sp1C; 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 temp_r29; bitcopy3 *temp_r31; @@ -2155,10 +2156,11 @@ static void UpdateRollSprite(omObjData *arg0) else { if ((sp14[1] == 0) && (var_r30 == 0)) { sp1C.x = HU_DISP_CENTERX; - } else { + } + else { 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); HuSprBankSet(temp_r31->unk_04, var_r30, sp14[var_r30]); 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]; model = BoardPlayerModelGet(player); modelid = BoardModelIDGet(model); - Hu3DModelAttrSet(modelid, 0x40000002); + Hu3DModelAttrSet(modelid, HU3D_MOTATTR_PAUSE); frame = 0; for (j = 0; j < 9; j++) { float size_vel; diff --git a/src/game/board/roll.c b/src/game/board/roll.c index f2c80503..fecf6dd3 100755 --- a/src/game/board/roll.c +++ b/src/game/board/roll.c @@ -1,17 +1,17 @@ #include "game/board/roll.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/model.h" #include "game/board/pause.h" #include "game/board/player.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" @@ -42,7 +42,6 @@ typedef struct { float unk08; } DiceDigitWork; - static void RollMain(void); static void DiceCreate(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 s32 diceSndStatus[3] = { -1, -1, -1 }; -static HsfanimStruct00 diceEffParam = { - 0x0096, - { 0x00, 0x00 }, // padding? - 50.0f, - 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 HsfanimStruct00 diceEffParam = { 0x0096, { 0x00, 0x00 }, // padding? + 50.0f, 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] = { - DATA_MAKE_NUM(DATADIR_BOARD, 0x0C), - DATA_MAKE_NUM(DATADIR_BOARD, 0x0D), - 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) -}; +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, 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; inputTimer = 0; numDice = 1; @@ -146,7 +116,8 @@ s32 BoardRollExec(s32 arg0) { if (BoardPlayerSizeGet(arg0) == 1) { diceSize = 1; maxRoll = 5; - } else if (BoardPlayerSizeGet(arg0) == 2) { + } + else if (BoardPlayerSizeGet(arg0) == 2) { diceSize = 2; maxRoll = 10; if (BoardMegaDoubleDiceCheck() != 0) { @@ -168,7 +139,8 @@ s32 BoardRollExec(s32 arg0) { return destMode; } -void BoardRollKill(void) { +void BoardRollKill(void) +{ if (rollProc) { HuPrcKill(rollProc); } @@ -176,7 +148,8 @@ void BoardRollKill(void) { DiceKill(); } -void BoardRollUPauseSet(s32 arg0) { +void BoardRollUPauseSet(s32 arg0) +{ if (!rollProc) { return; } @@ -189,18 +162,21 @@ void BoardRollUPauseSet(s32 arg0) { DiceHideEffect(2, arg0); } -void BoardRollWinDispSet(s32 arg0) { +void BoardRollWinDispSet(s32 arg0) +{ if (rollWin == -1) { return; } if (arg0 != 0) { HuWinDispOn(rollWin); - } else { + } + else { HuWinDispOff(rollWin); } } -static void RollMain(void) { +static void RollMain(void) +{ float sp8[2]; float var_f31; float var_f30; @@ -228,7 +204,8 @@ static void RollMain(void) { } if (BoardItemPrevGet() != -1 || var_r27 == 0 || _CheckFlag(FLAG_ID_MAKE(1, 9)) || BoardMegaDoubleDiceCheck()) { var_r29 = MAKE_MESSID(0x09, 0x04); - } else { + } + else { var_r29 = MAKE_MESSID(0x09, 0x02); } if (inputTimer != 0) { @@ -240,10 +217,10 @@ static void RollMain(void) { var_f31 = -10000.0f; break; case 1: - var_f31 = HU_DISP_CENTERX- (sp8[0] / 2 - 16.0f); + var_f31 = HU_DISP_CENTERX - (sp8[0] / 2 - 16.0f); break; } - var_f30 = HU_DISP_HEIGHT-176; + var_f30 = HU_DISP_HEIGHT - 176; rollWin = HuWinCreate(var_f31, var_f30, sp8[0], sp8[1], 0); HuWinBGTPLvlSet(rollWin, 0.0f); HuWinMesSpeedSet(rollWin, 0); @@ -306,19 +283,16 @@ static void RollMain(void) { HuPrcEnd(); } -static void DiceCreate(s32 arg0) { +static void DiceCreate(s32 arg0) +{ Vec sp1C; float temp_f30; float var_f31; omObjData *temp_r31; DiceWork *temp_r30; s32 sp8; - 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, 0x1B) - }; + 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, 0x1B) }; sp8 = 0; diceMdl[arg0] = BoardModelCreate(spC[diceSize], NULL, 0); @@ -342,7 +316,8 @@ static void DiceCreate(s32 arg0) { var_f31 = 250.0f; if (diceSize == 2) { var_f31 = 625.0f; - } else if (GWPlayer[rollPlayer].bowser_suit != 0) { + } + else if (GWPlayer[rollPlayer].bowser_suit != 0) { var_f31 = 575.0f; } sp1C.y += var_f31; @@ -355,7 +330,8 @@ static void DiceCreate(s32 arg0) { sp1C.z += 70.0f; } -static void DoInput(s32 arg0) { +static void DoInput(s32 arg0) +{ s32 var_r31; s32 var_r30; 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) { HuAudFXPlay(4); } - } else if (*sp8 == 0x200) { + } + else if (*sp8 == 0x200) { destMode = -2; HuAudFXPlay(3); 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); 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); temp_r30->unk00_field2 = 2; temp_r30->unk04 = 0; 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) { BoardModelMotionTimeSet(diceMdl[arg0], tutorialRoll[arg0] - 1); diceValue[arg0] = tutorialRoll[arg0]; } } -static void RollDestroy(void) { +static void RollDestroy(void) +{ if (rollWin != -1) { HuWinKill(rollWin); rollWin = -1; @@ -438,7 +418,8 @@ static void RollDestroy(void) { rollProc = NULL; } -static void DiceMain(omObjData *arg0) { +static void DiceMain(omObjData *arg0) +{ DiceWork *temp_r29 = OM_GET_WORK_PTR(arg0, DiceWork); float temp_f29; float var_f28; @@ -470,7 +451,8 @@ static void DiceMain(omObjData *arg0) { temp_r29->unk00_field2 = 1; arg0->scale.x = arg0->scale.y = arg0->scale.z = 1.0f; arg0->rot.y = temp_r29->unk04 = 0; - } else { + } + else { if (temp_r29->unk04 == 0 && diceSndStatus[temp_r29->unk00_field3] == -1) { diceSndStatus[temp_r29->unk00_field3] = HuAudFXPlay(0x300); } @@ -479,17 +461,19 @@ static void DiceMain(omObjData *arg0) { if (temp_r29->unk04 < 0xB4) { var_f27 = 0.0f; var_f28 = 1.0f; - } else { + } + else { var_f27 = 1.0f; 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.z = arg0->scale.x; if (temp_r29->unk04 <= 360) { if (temp_r29->unk04 < 0xB4) { temp_r29->unk04 += 6; - } else { + } + else { temp_r29->unk04 += 0x12; } if (temp_r29->unk04 > 360) { @@ -521,14 +505,16 @@ static void DiceMain(omObjData *arg0) { diceEff[temp_r29->unk00_field3] = BoardDiceEffectCreate(); Hu3DParManPosSet(diceEff[temp_r29->unk00_field3], arg0->trans.x, arg0->trans.y, arg0->trans.z); BoardModelVisibilitySet(diceMdl[temp_r29->unk00_field3], 0); - } else { + } + else { OSs16tof32(&temp_r29->unk04, &temp_f29); if (temp_r29->unk04 < 4) { arg0->trans.y += 10.0f + (0.5f * temp_f29); arg0->scale.x += 0.1f * sind(4.0f * temp_f29); arg0->scale.y = arg0->scale.x; arg0->scale.z = arg0->scale.x; - } else { + } + else { BoardModelAlphaSet(diceMdl[temp_r29->unk00_field3], 0xFF - (temp_r29->unk04 << 5)); } 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); } -static void DicePause(s32 arg0) { +static void DicePause(s32 arg0) +{ omObjData *temp_r31 = diceObj[arg0]; if (temp_r31) { @@ -564,13 +551,15 @@ static void DicePause(s32 arg0) { } } -static void DicePauseAll(void) { +static void DicePauseAll(void) +{ DicePause(0); DicePause(1); DicePause(2); } -s16 BoardDiceEffectCreate(void) { +s16 BoardDiceEffectCreate(void) +{ s16 temp_r31; s16 temp_r30; AnimData *temp_r29; @@ -589,7 +578,8 @@ s16 BoardDiceEffectCreate(void) { return temp_r31; } -static void DiceHideEffect(s32 arg0, s32 arg1) { +static void DiceHideEffect(s32 arg0, s32 arg1) +{ s16 temp_r31; if (diceEff[arg0] == -1) { @@ -597,13 +587,15 @@ static void DiceHideEffect(s32 arg0, s32 arg1) { } temp_r31 = Hu3DParManModelIDGet(diceEff[arg0]); if (arg1 != 0) { - Hu3DModelAttrReset(temp_r31, 1); - } else { - Hu3DModelAttrSet(temp_r31, 1); + Hu3DModelAttrReset(temp_r31, HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrSet(temp_r31, HU3D_ATTR_DISPOFF); } } -void BoardDicePauseAll(void) { +void BoardDicePauseAll(void) +{ DiceDigitWork *temp_r30; s32 i; @@ -617,7 +609,8 @@ void BoardDicePauseAll(void) { } } -BOOL BoardDiceDoneCheck(void) { +BOOL BoardDiceDoneCheck(void) +{ DiceDigitWork *temp_r30; s32 i; @@ -632,7 +625,8 @@ BOOL BoardDiceDoneCheck(void) { return TRUE; } -void BoardDiceStop(s32 arg0) { +void BoardDiceStop(s32 arg0) +{ DiceDigitWork *temp_r31; if (!diceDigitObj[arg0]) { @@ -642,7 +636,8 @@ void BoardDiceStop(s32 arg0) { temp_r31->unk00_field0 = 1; } -void BoardDiceVisibleSet(s32 arg0, s32 arg1) { +void BoardDiceVisibleSet(s32 arg0, s32 arg1) +{ DiceDigitWork *temp_r31; if (!diceDigitObj[arg0]) { @@ -651,13 +646,15 @@ void BoardDiceVisibleSet(s32 arg0, s32 arg1) { temp_r31 = OM_GET_WORK_PTR(diceDigitObj[arg0], DiceDigitWork); if ((temp_r31->unk01 / 10) == 0) { BoardModelVisibilitySet(temp_r31->unk04[1], 0); - } else { + } + else { BoardModelVisibilitySet(temp_r31->unk04[1], arg1); } BoardModelVisibilitySet(temp_r31->unk04[0], arg1); } -void BoardDiceValueSet(s32 arg0, s32 arg1) { +void BoardDiceValueSet(s32 arg0, s32 arg1) +{ omObjData *temp_r27; DiceDigitWork *temp_r31; Vec spC; @@ -696,7 +693,8 @@ void BoardDiceValueSet(s32 arg0, s32 arg1) { diceDigitObj[arg0] = temp_r27; } -static void DiceDigitMain(omObjData *arg0) { +static void DiceDigitMain(omObjData *arg0) +{ DiceDigitWork *temp_r31 = OM_GET_WORK_PTR(arg0, DiceDigitWork); if (temp_r31->unk00_field0 != 0 || BoardIsKill()) { @@ -709,7 +707,8 @@ static void DiceDigitMain(omObjData *arg0) { DiceDigitRotate(temp_r31, temp_r31->unk00_field1); } -static void DiceDigitKill(DiceDigitWork *arg0) { +static void DiceDigitKill(DiceDigitWork *arg0) +{ s32 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; 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; Vec sp30; Vec sp24; Vec sp54[2]; - Vec sp18 = { (HU_DISP_WIDTH/2), (HU_DISP_HEIGHT*155)/480, 240.0f }; - Vec sp3C[2] = { - { (HU_DISP_WIDTH*1)/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 spC = { (HU_DISP_WIDTH/2), (HU_DISP_HEIGHT*176)/480, 240.0f }; + Vec sp18 = { (HU_DISP_WIDTH / 2), (HU_DISP_HEIGHT * 155) / 480, 240.0f }; + Vec sp3C[2] + = { { (HU_DISP_WIDTH * 1) / 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 spC = { (HU_DISP_WIDTH / 2), (HU_DISP_HEIGHT * 176) / 480, 240.0f }; Vec *var_r29; float var_f31; s16 var_r27; @@ -756,7 +752,8 @@ static void DiceDigitMove(DiceDigitWork *arg0, s32 arg1) { if (arg1 != 0) { var_r29 = &spC; var_f31 = -20.0f * arg0->unk00_field3; - } else { + } + else { switch (numDice) { case 1: var_r29 = &sp18; @@ -773,9 +770,11 @@ static void DiceDigitMove(DiceDigitWork *arg0, s32 arg1) { for (i = 0; i < 2; i++) { if (var_r27 == 0) { sp54[i].x = var_r29->x; - } else if (i != 0) { + } + else if (i != 0) { sp54[i].x = var_r29->x - 30.0f; - } else { + } + else { sp54[i].x = var_r29->x + 30.0f; } sp54[i].y = var_r29->y; @@ -790,7 +789,8 @@ static void DiceDigitMove(DiceDigitWork *arg0, s32 arg1) { if (arg1 != 0 && arg0->unk00_field3 != 0) { BoardModelVisibilitySet(arg0->unk04[i], 0); } - } else { + } + else { arg0->unk00_field2 = 1; } 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; s32 i; @@ -808,7 +809,8 @@ static void DiceDigitRotate(DiceDigitWork *arg0, s32 arg1) { if (arg0->unk02 >= 360) { arg0->unk02 = 360; } - } else { + } + else { arg0->unk02 -= 0x12; if (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; float var_f31; s32 var_r28; @@ -838,7 +841,8 @@ static void SameRollExec(void) { case 2: if (diceValue[0] == 7) { var_r31 = 0x1E; - } else { + } + else { var_r31 = 0xA; } break; @@ -846,9 +850,11 @@ static void SameRollExec(void) { if (diceValue[0] == 7) { var_r31 = 0x32; var_r28 = 0x118; - } else if (diceValue[0] & 1) { + } + else if (diceValue[0] & 1) { var_r31 = 0x1E; - } else { + } + else { var_r31 = 0xA; } break; @@ -860,7 +866,8 @@ static void SameRollExec(void) { if (BoardPlayerSizeGet(rollPlayer) == 2 || GWPlayer[rollPlayer].bowser_suit != 0) { sp8.y += 700.0f; var_f31 = 450.0f; - } else { + } + else { sp8.y += 600.0f; var_f31 = 300.0f; } @@ -878,9 +885,11 @@ static void SameRollExec(void) { BoardWinKill(); if (var_r31 >= 0x32) { var_r29 = 1; - } else if (var_r31 >= 0x14) { + } + else if (var_r31 >= 0x14) { var_r29 = 3; - } else { + } + else { var_r29 = 6; } for (i = 0; i < var_r31; i++) { @@ -893,7 +902,8 @@ static void SameRollExec(void) { BoardPauseDisableSet(0); } -static s32 GetBtnRoll(s32 arg0) { +static s32 GetBtnRoll(s32 arg0) +{ s32 var_r31 = 0; s32 var_r29; @@ -917,7 +927,8 @@ static s32 GetBtnRoll(s32 arg0) { 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))) { return 0x100; } @@ -927,7 +938,8 @@ static s32 GetComBtnRoll(s32 arg0) { return 0x100; } -void BoardRollTutorialSet(s16 *arg0) { +void BoardRollTutorialSet(s16 *arg0) +{ s32 i; for (i = 0; i < 3; i++) { diff --git a/src/game/board/space.c b/src/game/board/space.c index 505f2678..052f2bca 100644 --- a/src/game/board/space.c +++ b/src/game/board/space.c @@ -1,39 +1,30 @@ -#include "game/gamework_data.h" -#include "game/flag.h" +#include "game/board/space.h" #include "game/board/battle.h" #include "game/board/lottery.h" #include "game/board/main.h" #include "game/board/model.h" #include "game/board/player.h" #include "game/board/shop.h" -#include "game/board/space.h" #include "game/board/star.h" #include "game/board/tutorial.h" -#include "game/hsfman.h" #include "game/data.h" -#include "game/sprite.h" +#include "game/flag.h" +#include "game/gamework_data.h" +#include "game/hsfman.h" #include "game/objsub.h" +#include "game/sprite.h" #include "math.h" #include "string.h" - static BoardSpace spaceData[2][256]; s16 boardSpaceStarTbl[8]; static GXTexObj spaceHiliteTex; static GXTexObj spaceTex; -static s8 spaceImgIdx[12] = { - 0, 1, 2, 7, - 6, 5, 3, 4, - 9, 10, 11, 0 -}; +static s8 spaceImgIdx[12] = { 0, 1, 2, 7, 6, 5, 3, 4, 9, 10, 11, 0 }; -static s8 spaceHiliteImgIdx[12] = { - -1, 0, 1, 1, - 2, 2, 2, 2, - -1, 3, -1, -1 -}; +static s8 spaceHiliteImgIdx[12] = { -1, 0, 1, 1, 2, 2, 2, 2, -1, 3, -1, -1 }; static s16 spaceCnt[2]; static u32 spaceAttr[2]; @@ -53,723 +44,737 @@ static s16 starPlatMdl = -1; static s32 ExecPipeSpace(s32 player, s32 space); - void BoardSpaceWalkEventFuncSet(BoardSpaceEventFunc func) { - walkEventFunc = func; + walkEventFunc = func; } void BoardSpaceWalkMiniEventFuncSet(BoardSpaceEventFunc func) { - walkMiniEventFunc = func; + walkMiniEventFunc = func; } void BoardSpaceLandEventFuncSet(BoardSpaceEventFunc func) { - landEventFunc = func; + landEventFunc = func; } s32 BoardSpaceWalkEventExec(void) { - s32 ret = -1; - if(walkEventFunc) { - ret = walkEventFunc(); - } - return ret; + s32 ret = -1; + if (walkEventFunc) { + ret = walkEventFunc(); + } + return ret; } s32 BoardSpaceWalkMiniEventExec(void) { - s32 ret = -1; - if(walkMiniEventFunc) { - _SetFlag(FLAG_ID_MAKE(1, 8)); - ret = walkMiniEventFunc(); - _ClearFlag(FLAG_ID_MAKE(1, 8)); - } - return ret; + s32 ret = -1; + if (walkMiniEventFunc) { + _SetFlag(FLAG_ID_MAKE(1, 8)); + ret = walkMiniEventFunc(); + _ClearFlag(FLAG_ID_MAKE(1, 8)); + } + return ret; } s32 BoardSpaceCountGet(s32 layer) { - return spaceCnt[layer]; + return spaceCnt[layer]; } BoardSpace *BoardSpaceGet(s32 layer, s32 index) { - if(index <= 0 || index > spaceCnt[layer]) { - return NULL; - } else { - return &spaceData[layer][index-1]; - } + if (index <= 0 || index > spaceCnt[layer]) { + return NULL; + } + else { + return &spaceData[layer][index - 1]; + } } void BoardSpaceAttrSet(s32 layer, u32 attr) { - spaceAttr[layer] |= attr; + spaceAttr[layer] |= attr; } void BoardSpaceAttrReset(s32 layer, u32 attr) { - spaceAttr[layer] &= ~attr; + spaceAttr[layer] &= ~attr; } u32 BoardSpaceFlagGet(s32 layer, s32 index) { - if(index <= 0 || index > spaceCnt[layer]) { - return 0; - } else { - return spaceData[layer][index-1].flag; - } + if (index <= 0 || index > spaceCnt[layer]) { + return 0; + } + else { + return spaceData[layer][index - 1].flag; + } } s32 BoardSpaceTypeGet(s32 layer, s32 index) { - if(index <= 0 || index > spaceCnt[layer]) { - return 0; - } else { - return spaceData[layer][index-1].type; - } + if (index <= 0 || index > spaceCnt[layer]) { + return 0; + } + else { + return spaceData[layer][index - 1].type; + } } void BoardSpaceTypeSet(s32 layer, s32 index, s32 type) { - if(index <= 0 || index > spaceCnt[layer]) { - return; - } else { - spaceData[layer][index-1].type = type; - } + if (index <= 0 || index > spaceCnt[layer]) { + return; + } + else { + spaceData[layer][index - 1].type = type; + } } s32 BoardSpacePosGet(s32 layer, s32 index, Vec *pos) { - BoardSpace *space = BoardSpaceGet(layer, index); - if(!space) { - return -1; - } else { - *pos = space->pos; - return 0; - } + BoardSpace *space = BoardSpaceGet(layer, index); + if (!space) { + return -1; + } + else { + *pos = space->pos; + return 0; + } } void BoardSpaceCornerPosGet(s32 index, s32 corner, Vec *pos) { - Vec corner_ofs; - Vec rot; - s8 corner_pos[4][2] = {{-1, -1}, {1, -1}, {-1, 1}, {1, 1}}; - BoardSpaceRotGet(0, index, &rot); - BoardSpacePosGet(0, index, pos); - corner_ofs.x = corner_pos[corner][0]*80.0f; - corner_ofs.y = 0; - corner_ofs.z = corner_pos[corner][1]*80.0f; - corner_ofs.x = (cos((M_PI*rot.z)/180)*corner_ofs.x)+(sin((M_PI*rot.z)/180)*corner_ofs.y); - corner_ofs.y = (cos((M_PI*rot.x)/180)*cos((M_PI*rot.z)/180)*corner_ofs.y) - +(sin((M_PI*rot.z)/180)*corner_ofs.x) - +(sin((M_PI*-rot.x)/180)*corner_ofs.z); - corner_ofs.z = (sin((M_PI*rot.x)/180)*corner_ofs.y)+(cos((M_PI*rot.x)/180)*corner_ofs.z); - pos->x += corner_ofs.x; - pos->y += corner_ofs.y; - pos->z += corner_ofs.z; + Vec corner_ofs; + Vec rot; + s8 corner_pos[4][2] = { { -1, -1 }, { 1, -1 }, { -1, 1 }, { 1, 1 } }; + BoardSpaceRotGet(0, index, &rot); + BoardSpacePosGet(0, index, pos); + corner_ofs.x = corner_pos[corner][0] * 80.0f; + corner_ofs.y = 0; + corner_ofs.z = corner_pos[corner][1] * 80.0f; + corner_ofs.x = (cos((M_PI * rot.z) / 180) * corner_ofs.x) + (sin((M_PI * rot.z) / 180) * corner_ofs.y); + corner_ofs.y = (cos((M_PI * rot.x) / 180) * cos((M_PI * rot.z) / 180) * corner_ofs.y) + (sin((M_PI * rot.z) / 180) * corner_ofs.x) + + (sin((M_PI * -rot.x) / 180) * corner_ofs.z); + corner_ofs.z = (sin((M_PI * rot.x) / 180) * corner_ofs.y) + (cos((M_PI * rot.x) / 180) * corner_ofs.z); + pos->x += corner_ofs.x; + pos->y += corner_ofs.y; + pos->z += corner_ofs.z; } s32 BoardSpaceRotGet(s32 layer, s32 index, Vec *rot) { - BoardSpace *space = BoardSpaceGet(layer, index); - if(!space) { - return -1; - } else { - *rot = space->rot; - return 0; - } + BoardSpace *space = BoardSpaceGet(layer, index); + if (!space) { + return -1; + } + else { + *rot = space->rot; + return 0; + } } s32 BoardSpaceFlagSearch(s32 layer, u32 flag) { - s32 i; - for(i=0; iflag & flag) == flag) { - return space-(&spaceData[layer][0])+1; - } - } - return -1; + s32 i; + for (i = 0; i < spaceCnt[layer]; i++) { + BoardSpace *space = &spaceData[layer][i]; + if ((space->flag & flag) == flag) { + return space - (&spaceData[layer][0]) + 1; + } + } + return -1; } s32 BoardSpaceFlagPosGet(s32 layer, u32 flag, Vec *pos) { - s32 space = BoardSpaceFlagSearch(layer, flag); - if(space == -1) { - return -1; - } - if(pos) { - BoardSpacePosGet(layer, space, pos); - } - return space; + s32 space = BoardSpaceFlagSearch(layer, flag); + if (space == -1) { + return -1; + } + if (pos) { + BoardSpacePosGet(layer, space, pos); + } + return space; } s32 BoardSpaceLinkFlagSearch(s32 layer, s32 index, u32 flag) { - BoardSpace *link_space; - BoardSpace *space = BoardSpaceGet(layer, index); - s32 i; - if(!space) { - return -1; - } - for(i=0; ilink_cnt; i++) { - link_space = BoardSpaceGet(layer, space->link[i]); - if(link_space->flag & flag) { - return link_space-&spaceData[layer][0]+1; - } - } - return -1; + BoardSpace *link_space; + BoardSpace *space = BoardSpaceGet(layer, index); + s32 i; + if (!space) { + return -1; + } + for (i = 0; i < space->link_cnt; i++) { + link_space = BoardSpaceGet(layer, space->link[i]); + if (link_space->flag & flag) { + return link_space - &spaceData[layer][0] + 1; + } + } + return -1; } s32 BoardSpaceLinkTypeListGet(s32 layer, s32 index, s32 type, s16 *list) { - s32 count; - BoardSpace *space = BoardSpaceGet(layer, index); - s32 i; - if(!space) { - return -1; - } - for(count=i=0; ilink_cnt; i++) { - BoardSpace *link_space = BoardSpaceGet(layer, space->link[i]); - if(link_space->type == type && count < BOARD_SPACE_LINKMAX) { - list[count] = link_space-&spaceData[layer][0]+1; - count++; - } - } - return count; + s32 count; + BoardSpace *space = BoardSpaceGet(layer, index); + s32 i; + if (!space) { + return -1; + } + for (count = i = 0; i < space->link_cnt; i++) { + BoardSpace *link_space = BoardSpaceGet(layer, space->link[i]); + if (link_space->type == type && count < BOARD_SPACE_LINKMAX) { + list[count] = link_space - &spaceData[layer][0] + 1; + count++; + } + } + return count; } s32 BoardSpaceLinkTargetListGet(s32 layer, s32 target, s16 *list) { - s32 i, j; - s32 count; - BoardSpace *space; - memset(list, 0, BOARD_SPACE_LINKMAX*sizeof(s16)); - space = &spaceData[layer][0]; - for(count=i=0; ilink_cnt; j++) { - if(space->link[j] == target && count < BOARD_SPACE_LINKMAX) { - list[count++] = space-&spaceData[layer][0]+1; - } - } - } - return count; + s32 i, j; + s32 count; + BoardSpace *space; + memset(list, 0, BOARD_SPACE_LINKMAX * sizeof(s16)); + space = &spaceData[layer][0]; + for (count = i = 0; i < spaceCnt[layer]; i++, space++) { + for (j = 0; j < space->link_cnt; j++) { + if (space->link[j] == target && count < BOARD_SPACE_LINKMAX) { + list[count++] = space - &spaceData[layer][0] + 1; + } + } + } + return count; } s32 BoardSpaceLinkTypeSearch(s32 layer, s32 target, u16 type) { - s32 i; - BoardSpace *space = BoardSpaceGet(layer, target); - if(!space) { - return -1; - } - for(i=0; ilink_cnt; i++) { - BoardSpace *link_space = BoardSpaceGet(layer, space->link[i]); - if(link_space->type == type) { - return space->link[i]; - } - } - return -1; + s32 i; + BoardSpace *space = BoardSpaceGet(layer, target); + if (!space) { + return -1; + } + for (i = 0; i < space->link_cnt; i++) { + BoardSpace *link_space = BoardSpaceGet(layer, space->link[i]); + if (link_space->type == type) { + return space->link[i]; + } + } + return -1; } s32 BoardSpaceLinkTransformGet(s32 flag, Vec *pos, Vec *rot, Vec *scale) { - s32 i; - s32 space_flag = BoardSpaceFlagSearch(0, flag); - BoardSpace *space = BoardSpaceGet(0, space_flag); - - for(i=0; ilink_cnt; i++) { - BoardSpace *link_space = BoardSpaceGet(0, space->link[i]); - BoardSpace *src_space; - if(!(link_space->flag & 0x2000000)) { - continue; - } - src_space = BoardSpaceGet(0, link_space->link[0]); - if(pos) { - *pos = src_space->pos; - } - if(rot) { - *rot = src_space->rot; - } - if(scale) { - *scale = src_space->scale; - } - return 0; - } - return -1; + s32 i; + s32 space_flag = BoardSpaceFlagSearch(0, flag); + BoardSpace *space = BoardSpaceGet(0, space_flag); + + for (i = 0; i < space->link_cnt; i++) { + BoardSpace *link_space = BoardSpaceGet(0, space->link[i]); + BoardSpace *src_space; + if (!(link_space->flag & 0x2000000)) { + continue; + } + src_space = BoardSpaceGet(0, link_space->link[0]); + if (pos) { + *pos = src_space->pos; + } + if (rot) { + *rot = src_space->rot; + } + if (scale) { + *scale = src_space->scale; + } + return 0; + } + return -1; } void BoardSpaceHostSet(s32 space) { - s16 host_space; - Vec pos; - BoardSpace *space_plat; - BoardSpaceTypeSet(0, space, 8); - host_space = BoardSpaceLinkFlagSearch(0, space, 0x04000000); - BoardSpacePosGet(0, host_space, &pos); - BoardModelPosSetV(BoardStarHostMdlGet(), &pos); + s16 host_space; + Vec pos; + BoardSpace *space_plat; + BoardSpaceTypeSet(0, space, 8); + host_space = BoardSpaceLinkFlagSearch(0, space, 0x04000000); + BoardSpacePosGet(0, host_space, &pos); + BoardModelPosSetV(BoardStarHostMdlGet(), &pos); } static inline s16 StarPlatGetMdl(void) { - return starPlatMdl; + return starPlatMdl; } static inline s32 BoardStarSpaceTypeGet(s16 index) { - return BoardSpaceTypeGet(0, BoardSpaceStarGet(index)); + return BoardSpaceTypeGet(0, BoardSpaceStarGet(index)); } void BoardSpaceStarSetIndex(s32 index) { - Vec pos; - Vec rot; - s16 space; - if(_CheckFlag(FLAG_ID_MAKE(1, 1))) { - BoardSpaceTypeSet(0, boardSpaceStarTbl[GWSystem.star_pos], 1); - } - GWSystem.star_pos = index & 0x7; - BoardSpaceHostSet(BoardSpaceStarGetCurr()); - space = BoardSpaceLinkFlagSearch(0, BoardSpaceStarGetCurr(), 0x04000000); - BoardSpacePosGet(0, space, &pos); - BoardModelPosSetV(StarPlatGetMdl(), &pos); - BoardSpaceRotGet(0, space, &rot); - BoardModelRotYSet(StarPlatGetMdl(), rot.y); - BoardModelVisibilitySet(StarPlatGetMdl(), 1); + Vec pos; + Vec rot; + s16 space; + if (_CheckFlag(FLAG_ID_MAKE(1, 1))) { + BoardSpaceTypeSet(0, boardSpaceStarTbl[GWSystem.star_pos], 1); + } + GWSystem.star_pos = index & 0x7; + BoardSpaceHostSet(BoardSpaceStarGetCurr()); + space = BoardSpaceLinkFlagSearch(0, BoardSpaceStarGetCurr(), 0x04000000); + BoardSpacePosGet(0, space, &pos); + BoardModelPosSetV(StarPlatGetMdl(), &pos); + BoardSpaceRotGet(0, space, &rot); + BoardModelRotYSet(StarPlatGetMdl(), rot.y); + BoardModelVisibilitySet(StarPlatGetMdl(), 1); } s32 BoardSpaceStarGetNext(void) { - s16 random_pos; - s16 star_total; - s16 star_pos; - star_total = GWSystem.star_total; - star_pos = GWSystem.star_pos; - if(GWBoardGet() == BOARD_ID_MAIN6) { - s16 i; - s32 count; - s32 last_free; - last_free = -1; - for(count=i=0; i<8; i++) { - if((1 << i) & GWSystem.star_flag) { - count++; - } else { - last_free = i; - } - } - if(count == 7) { - if(BoardSpaceTypeGet(0, BoardSpaceStarGet(last_free)) == 10) { - GWSystem.star_flag = 0; - } - } - } - begin: - random_pos = BoardRandMod(8); - if(star_pos == random_pos || BoardStarSpaceTypeGet(random_pos) == 10) { - goto begin; - } - switch(GWSystem.board) { - case BOARD_ID_MAIN1: - if(star_total >= 2) { - break; - } - if(random_pos != 6 && random_pos != 7) { - break; - } - goto begin; - - case BOARD_ID_MAIN2: - if(star_total >= 2) { - break; - } - if(random_pos != 6 && random_pos != 7) { - break; - } - goto begin; - - case BOARD_ID_MAIN3: - if(star_total == 1) { - if(random_pos < 3 || random_pos > 5) { - break; - } - goto begin; - } else { - if(star_total != 2) { - break; - } - if(random_pos != 3 && random_pos != 4) { - break; - } - goto begin; - } - - case BOARD_ID_MAIN4: - if(star_total == 1) { - if(random_pos < 5 || random_pos > 7) { - break; - } - goto begin; - } else { - if(star_total != 2) { - break; - } - if(random_pos == 5) { - goto begin; - } - break; - } - - case BOARD_ID_MAIN5: - if(star_total == 1) { - if(random_pos <= 1 || random_pos >= 4) { - goto begin; - } - } - break; - - case BOARD_ID_MAIN6: - if(star_total == 1) { - if(random_pos == 1 || random_pos == 4 || random_pos == 5) { - goto begin; - } - } - if(star_total != 2) { - break; - } - if(random_pos == 5) { - goto begin; - } - } - if((1 << random_pos) & GWSystem.star_flag) { - goto begin; - } - return random_pos; + s16 random_pos; + s16 star_total; + s16 star_pos; + star_total = GWSystem.star_total; + star_pos = GWSystem.star_pos; + if (GWBoardGet() == BOARD_ID_MAIN6) { + s16 i; + s32 count; + s32 last_free; + last_free = -1; + for (count = i = 0; i < 8; i++) { + if ((1 << i) & GWSystem.star_flag) { + count++; + } + else { + last_free = i; + } + } + if (count == 7) { + if (BoardSpaceTypeGet(0, BoardSpaceStarGet(last_free)) == 10) { + GWSystem.star_flag = 0; + } + } + } +begin: + random_pos = BoardRandMod(8); + if (star_pos == random_pos || BoardStarSpaceTypeGet(random_pos) == 10) { + goto begin; + } + switch (GWSystem.board) { + case BOARD_ID_MAIN1: + if (star_total >= 2) { + break; + } + if (random_pos != 6 && random_pos != 7) { + break; + } + goto begin; + + case BOARD_ID_MAIN2: + if (star_total >= 2) { + break; + } + if (random_pos != 6 && random_pos != 7) { + break; + } + goto begin; + + case BOARD_ID_MAIN3: + if (star_total == 1) { + if (random_pos < 3 || random_pos > 5) { + break; + } + goto begin; + } + else { + if (star_total != 2) { + break; + } + if (random_pos != 3 && random_pos != 4) { + break; + } + goto begin; + } + + case BOARD_ID_MAIN4: + if (star_total == 1) { + if (random_pos < 5 || random_pos > 7) { + break; + } + goto begin; + } + else { + if (star_total != 2) { + break; + } + if (random_pos == 5) { + goto begin; + } + break; + } + + case BOARD_ID_MAIN5: + if (star_total == 1) { + if (random_pos <= 1 || random_pos >= 4) { + goto begin; + } + } + break; + + case BOARD_ID_MAIN6: + if (star_total == 1) { + if (random_pos == 1 || random_pos == 4 || random_pos == 5) { + goto begin; + } + } + if (star_total != 2) { + break; + } + if (random_pos == 5) { + goto begin; + } + } + if ((1 << random_pos) & GWSystem.star_flag) { + goto begin; + } + return random_pos; } s32 BoardSpaceStarGetRandom(s32 excl_pos) { - s8 new_pos; - int i; - for(i=0; i<1024; i++) { - new_pos = BoardRandMod(8); - if(new_pos == GWSystem.star_pos) { - continue; - } - if(GWSystem.turn == 1 && new_pos <= 2) { - continue; - } - if(new_pos != excl_pos) { - break; - } - } - return new_pos; + s8 new_pos; + int i; + for (i = 0; i < 1024; i++) { + new_pos = BoardRandMod(8); + if (new_pos == GWSystem.star_pos) { + continue; + } + if (GWSystem.turn == 1 && new_pos <= 2) { + continue; + } + if (new_pos != excl_pos) { + break; + } + } + return new_pos; } void BoardSpaceStarMove(void) { - u8 star_total; - s16 star_pos; - s16 star_next; - if(_CheckFlag(FLAG_ID_MAKE(1, 1))) { - star_pos = GWSystem.star_pos; - GWSystem.star_flag |= (u8)(1 << star_pos); - if(GWSystem.star_flag == 0xFF) { - GWSystem.star_flag = 0; - } - if(GWSystem.star_total >= 99) { - star_total = 99; - GWSystem.star_total = star_total; - } else { - star_total = GWSystem.star_total++; - } - } - star_next = BoardSpaceStarGetNext(); - BoardSpaceStarSetIndex(star_next); + u8 star_total; + s16 star_pos; + s16 star_next; + if (_CheckFlag(FLAG_ID_MAKE(1, 1))) { + star_pos = GWSystem.star_pos; + GWSystem.star_flag |= (u8)(1 << star_pos); + if (GWSystem.star_flag == 0xFF) { + GWSystem.star_flag = 0; + } + if (GWSystem.star_total >= 99) { + star_total = 99; + GWSystem.star_total = star_total; + } + else { + star_total = GWSystem.star_total++; + } + } + star_next = BoardSpaceStarGetNext(); + BoardSpaceStarSetIndex(star_next); } s32 BoardSpaceStarGet(s32 index) { - return boardSpaceStarTbl[index & 0x7]; + return boardSpaceStarTbl[index & 0x7]; } s32 BoardSpaceStarGetCurr(void) { - return BoardSpaceStarGet(GWSystem.star_pos); + return BoardSpaceStarGet(GWSystem.star_pos); } s32 BoardSpaceStarCheck(s32 index) { - s32 ret; - BoardSpace *space = BoardSpaceGet(0, index); - BoardSpace *star_space; - if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { - ret = 0; - goto end; - } - star_space = BoardSpaceGet(0, boardSpaceStarTbl[GWSystem.star_pos]); - if(space == star_space) { - ret = 1; - } else { - ret = 0; - } - end: - return ret; + s32 ret; + BoardSpace *space = BoardSpaceGet(0, index); + BoardSpace *star_space; + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { + ret = 0; + goto end; + } + star_space = BoardSpaceGet(0, boardSpaceStarTbl[GWSystem.star_pos]); + if (space == star_space) { + ret = 1; + } + else { + ret = 0; + } +end: + return ret; } void BoardSpaceLandExec(s32 player, s32 space) { - #define BLUE_SPACE 1 - #define RED_SPACE 2 - #define BOWSER_SPACE 3 - #define MUSHROOM_SPACE 4 - #define BATTLE_SPACE 5 - #define HAPPENING_SPACE 6 - #define FORTUNE_SPACE 7 - #define STAR_SPACE 8 - #define WARP_SPACE 9 +#define BLUE_SPACE 1 +#define RED_SPACE 2 +#define BOWSER_SPACE 3 +#define MUSHROOM_SPACE 4 +#define BATTLE_SPACE 5 +#define HAPPENING_SPACE 6 +#define FORTUNE_SPACE 7 +#define STAR_SPACE 8 +#define WARP_SPACE 9 - BoardSpace *space_ptr = BoardSpaceGet(0, space); - switch(space_ptr->type) { - case BLUE_SPACE: - GWPlayer[player].blue_count++; - if(GWPlayer[player].blue_count > 99) { - GWPlayer[player].blue_count = 99; - } - BoardLandBlueExec(player, space); - break; - - case RED_SPACE: - GWPlayer[player].red_count++; - if(GWPlayer[player].red_count > 99) { - GWPlayer[player].red_count = 99; - } - BoardLandRedExec(player, space); - break; - - case BOWSER_SPACE: - GWPlayer[player].bowser_count++; - if(GWPlayer[player].bowser_count > 99) { - GWPlayer[player].bowser_count = 99; - } - BoardBowserExec(player, space); - break; - - case MUSHROOM_SPACE: - GWPlayer[player].mushroom_count++; - if(GWPlayer[player].mushroom_count > 99) { - GWPlayer[player].mushroom_count = 99; - } - BoardMushroomExec(player, space); - break; - - case BATTLE_SPACE: - GWPlayer[player].battle_count++; - if(GWPlayer[player].battle_count > 99) { - GWPlayer[player].battle_count = 99; - } - BoardBattleExec(player, space); - break; - - case HAPPENING_SPACE: - GWPlayer[player].question_count++; - if(GWPlayer[player].question_count > 99) { - GWPlayer[player].question_count = 99; - } - if(_CheckFlag(FLAG_ID_MAKE(1, 11))) { - HuAudFXPlay(842); - BoardCameraViewSet(2); - BoardPlayerMotBlendSet(player, 0, 15); - while(!BoardPlayerMotBlendCheck(player)) { - HuPrcVSleep(); - } - BoardCameraMotionWait(); - BoardTutorialHookExec(16, 0); - } else { - if(landEventFunc) { - HuAudFXPlay(842); - omVibrate(player, 12, 4, 2); - landEventFunc(); - } - } - GWPlayer[player].color = 3; - break; - - case FORTUNE_SPACE: - GWPlayer[player].fortune_count++; - if(GWPlayer[player].fortune_count > 99) { - GWPlayer[player].fortune_count = 99; - } - BoardFortuneExec(player, space); - break; - - case WARP_SPACE: - GWPlayer[player].warp_count++; - if(GWPlayer[player].warp_count > 99) { - GWPlayer[player].warp_count = 99; - } - BoardWarpExec(player, space); - break; - - case STAR_SPACE: - BoardStarExec(player, space); - break; - } + BoardSpace *space_ptr = BoardSpaceGet(0, space); + switch (space_ptr->type) { + case BLUE_SPACE: + GWPlayer[player].blue_count++; + if (GWPlayer[player].blue_count > 99) { + GWPlayer[player].blue_count = 99; + } + BoardLandBlueExec(player, space); + break; + + case RED_SPACE: + GWPlayer[player].red_count++; + if (GWPlayer[player].red_count > 99) { + GWPlayer[player].red_count = 99; + } + BoardLandRedExec(player, space); + break; + + case BOWSER_SPACE: + GWPlayer[player].bowser_count++; + if (GWPlayer[player].bowser_count > 99) { + GWPlayer[player].bowser_count = 99; + } + BoardBowserExec(player, space); + break; + + case MUSHROOM_SPACE: + GWPlayer[player].mushroom_count++; + if (GWPlayer[player].mushroom_count > 99) { + GWPlayer[player].mushroom_count = 99; + } + BoardMushroomExec(player, space); + break; + + case BATTLE_SPACE: + GWPlayer[player].battle_count++; + if (GWPlayer[player].battle_count > 99) { + GWPlayer[player].battle_count = 99; + } + BoardBattleExec(player, space); + break; + + case HAPPENING_SPACE: + GWPlayer[player].question_count++; + if (GWPlayer[player].question_count > 99) { + GWPlayer[player].question_count = 99; + } + if (_CheckFlag(FLAG_ID_MAKE(1, 11))) { + HuAudFXPlay(842); + BoardCameraViewSet(2); + BoardPlayerMotBlendSet(player, 0, 15); + while (!BoardPlayerMotBlendCheck(player)) { + HuPrcVSleep(); + } + BoardCameraMotionWait(); + BoardTutorialHookExec(16, 0); + } + else { + if (landEventFunc) { + HuAudFXPlay(842); + omVibrate(player, 12, 4, 2); + landEventFunc(); + } + } + GWPlayer[player].color = 3; + break; + + case FORTUNE_SPACE: + GWPlayer[player].fortune_count++; + if (GWPlayer[player].fortune_count > 99) { + GWPlayer[player].fortune_count = 99; + } + BoardFortuneExec(player, space); + break; + + case WARP_SPACE: + GWPlayer[player].warp_count++; + if (GWPlayer[player].warp_count > 99) { + GWPlayer[player].warp_count = 99; + } + BoardWarpExec(player, space); + break; + + case STAR_SPACE: + BoardStarExec(player, space); + break; + } } s32 BoardSpaceWalkExec(s32 player, s32 space) { - s32 is_star; - BoardSpace *space_ptr; - BoardSpace *star_space; - if(_CheckFlag(FLAG_ID_MAKE(1, 11))) { - space_ptr = BoardSpaceGet(0, space); - if(space_ptr->flag & 0x180000) { - BoardTutorialHookExec(25, 0); - } - } - if(BoardPlayerSizeGet(player) == 2 || GWPlayer[player].bowser_suit) { - return 0; - } - space_ptr = BoardSpaceGet(0, space); - if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { - is_star = 0; - } else { - star_space = BoardSpaceGet(0, boardSpaceStarTbl[GWSystem.star_pos]); - if(space_ptr == star_space) { - is_star = 1; - } else { - is_star = 0; - } - } - if(is_star) { - BoardStarExec(player, space); - return 1; - } - if(space_ptr->flag & 0x600000) { - s32 mg_param = GWSystem.unk_38; - if(BoardPlayerSizeGet(player) == 1) { - BoardPlayerIdleSet(player); - BoardMGCreate(mg_param); - } - return 1; - } - if(space_ptr->flag & 0x180000) { - BoardShopExec(player, space); - return 1; - } - if(space_ptr->flag & 0x08000000) { - BoardBooHouseExec(player, space); - return 1; - } - if(space_ptr->flag & 0x10000000) { - BoardLotteryExec(); - return 1; - } - if(space_ptr->flag & 0x20000000) { - ExecPipeSpace(player, space); - return 1; - } - return 0; + s32 is_star; + BoardSpace *space_ptr; + BoardSpace *star_space; + if (_CheckFlag(FLAG_ID_MAKE(1, 11))) { + space_ptr = BoardSpaceGet(0, space); + if (space_ptr->flag & 0x180000) { + BoardTutorialHookExec(25, 0); + } + } + if (BoardPlayerSizeGet(player) == 2 || GWPlayer[player].bowser_suit) { + return 0; + } + space_ptr = BoardSpaceGet(0, space); + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { + is_star = 0; + } + else { + star_space = BoardSpaceGet(0, boardSpaceStarTbl[GWSystem.star_pos]); + if (space_ptr == star_space) { + is_star = 1; + } + else { + is_star = 0; + } + } + if (is_star) { + BoardStarExec(player, space); + return 1; + } + if (space_ptr->flag & 0x600000) { + s32 mg_param = GWSystem.unk_38; + if (BoardPlayerSizeGet(player) == 1) { + BoardPlayerIdleSet(player); + BoardMGCreate(mg_param); + } + return 1; + } + if (space_ptr->flag & 0x180000) { + BoardShopExec(player, space); + return 1; + } + if (space_ptr->flag & 0x08000000) { + BoardBooHouseExec(player, space); + return 1; + } + if (space_ptr->flag & 0x10000000) { + BoardLotteryExec(); + return 1; + } + if (space_ptr->flag & 0x20000000) { + ExecPipeSpace(player, space); + return 1; + } + return 0; } s32 BoardSpaceBlockExec(s32 player, s32 space) { - s32 event_exec; - BoardSpace *space_ptr; - event_exec = 0; - if(BoardPlayerSizeGet(player) == 2 || GWPlayer[player].bowser_suit) { - return 0; - } - space_ptr = BoardSpaceGet(0, space); - event_exec = 0; - if(space == GWSystem.block_pos) { - event_exec = 1; - } - if(!GWBonusStarGet() && GWPartyGet() == 1 && !_CheckFlag(FLAG_ID_MAKE(1, 11))) { - event_exec = 0; - } - if(GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { - event_exec = 0; - } - if(event_exec) { - BoardBlockExec(player, space); - if(_CheckFlag(FLAG_ID_MAKE(1, 11))) { - BoardBlockExec(player, space); - } - BoardSpaceBlockPosSet(); - } - return 0; + s32 event_exec; + BoardSpace *space_ptr; + event_exec = 0; + if (BoardPlayerSizeGet(player) == 2 || GWPlayer[player].bowser_suit) { + return 0; + } + space_ptr = BoardSpaceGet(0, space); + event_exec = 0; + if (space == GWSystem.block_pos) { + event_exec = 1; + } + if (!GWBonusStarGet() && GWPartyGet() == 1 && !_CheckFlag(FLAG_ID_MAKE(1, 11))) { + event_exec = 0; + } + if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { + event_exec = 0; + } + if (event_exec) { + BoardBlockExec(player, space); + if (_CheckFlag(FLAG_ID_MAKE(1, 11))) { + BoardBlockExec(player, space); + } + BoardSpaceBlockPosSet(); + } + return 0; } static s32 ExecPipeSpace(s32 player, s32 space) { - Vec pos_link; - Vec pos; - Vec dir; - float radius, y_vel; - s32 mot_disable; - BoardSpace *space_ptr; - mot_disable = 0; - if(BoardPlayerSizeGet(player) != 1) { - return 0; - } - BoardPlayerPosGet(player, &pos); - pos.y += 200.0f; - space_ptr = BoardSpaceGet(0, space); - BoardSpacePosGet(0, space_ptr->link[0], &pos_link); - VECSubtract(&pos_link, &pos, &dir); - VECNormalize(&dir, &dir); - BoardPlayerRotYSet(player, 90-((atan2(dir.z, dir.x)/M_PI)*180)); - radius = 0.75f*BoardVecDistXZCalc(&pos_link, &pos); - BoardPlayerMotionStart(player, 4, 0); - y_vel = 0; - while(1) { - if(BoardVecDistXZCalc(&pos_link, &pos) < 2) { - break; - } - pos.x += (dir.x*radius)/60.0f; - pos.z += (dir.z*radius)/60.0f; - if(pos.y <= pos_link.y) { - pos.y = pos_link.y; - if(!mot_disable) { - BoardPlayerMotionShiftSet(player, 3, 0, 4, HU3D_MOTATTR_LOOP); - break; - } - } else { - pos.y += 10.0f+(-((1/2399.99f)+(1/50.0f))*y_vel*y_vel); - y_vel += 1.0f; - } - BoardPlayerPosSetV(player, &pos); - HuPrcVSleep(); - } - return 0; + Vec pos_link; + Vec pos; + Vec dir; + float radius, y_vel; + s32 mot_disable; + BoardSpace *space_ptr; + mot_disable = 0; + if (BoardPlayerSizeGet(player) != 1) { + return 0; + } + BoardPlayerPosGet(player, &pos); + pos.y += 200.0f; + space_ptr = BoardSpaceGet(0, space); + BoardSpacePosGet(0, space_ptr->link[0], &pos_link); + VECSubtract(&pos_link, &pos, &dir); + VECNormalize(&dir, &dir); + BoardPlayerRotYSet(player, 90 - ((atan2(dir.z, dir.x) / M_PI) * 180)); + radius = 0.75f * BoardVecDistXZCalc(&pos_link, &pos); + BoardPlayerMotionStart(player, 4, 0); + y_vel = 0; + while (1) { + if (BoardVecDistXZCalc(&pos_link, &pos) < 2) { + break; + } + pos.x += (dir.x * radius) / 60.0f; + pos.z += (dir.z * radius) / 60.0f; + if (pos.y <= pos_link.y) { + pos.y = pos_link.y; + if (!mot_disable) { + BoardPlayerMotionShiftSet(player, 3, 0, 4, HU3D_MOTATTR_LOOP); + break; + } + } + else { + pos.y += 10.0f + (-((1 / 2399.99f) + (1 / 50.0f)) * y_vel * y_vel); + y_vel += 1.0f; + } + BoardPlayerPosSetV(player, &pos); + HuPrcVSleep(); + } + return 0; } void BoardSpaceTypeForce(u16 from, u16 to) { - s32 i; - for(i=0; itype == from) { - space->type = to; - } - } + s32 i; + for (i = 0; i < spaceCnt[0]; i++) { + BoardSpace *space = &spaceData[0][i]; + if (space->type == from) { + space->type = to; + } + } } void BoardSpaceHide(s32 value) { - if(value) { - Hu3DModelAttrSet(spaceDrawMdl, 1); - } else { - Hu3DModelAttrReset(spaceDrawMdl, 1); - } + if (value) { + Hu3DModelAttrSet(spaceDrawMdl, HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrReset(spaceDrawMdl, HU3D_ATTR_DISPOFF); + } } static inline void InitGXSpace() { - GXColor color = {0xFF, 0xFF, 0xFF, 0xFF}; + GXColor color = { 0xFF, 0xFF, 0xFF, 0xFF }; GXClearVtxDesc(); GXSetVtxDesc(GX_VA_POS, GX_DIRECT); GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); @@ -793,319 +798,317 @@ static inline void InitGXSpace() GXSetCullMode(GX_CULL_BACK); } -//Some stack allocation issues. code around BoardPlayerGetCurr is incorrect too +// Some stack allocation issues. code around BoardPlayerGetCurr is incorrect too static void DrawSpaces(ModelData *model, Mtx matrix) { - s32 i; + s32 i; - Vec player_pos; - Vec target; - Vec pos; - - Mtx lookat, final, rot_x, rot_y, rot_z, scale; - Mtx44 proj; - BoardCameraData *camera; - if(!spaceDrawF) { - return; - } - spaceDrawCnt = 0; - camera = &boardCamera; - BoardCameraPosGet(&pos); - BoardCameraTargetGet(&target); - MTXPerspective(proj, camera->fov, camera->aspect, camera->near, camera->far); - GXSetProjection(proj, GX_PERSPECTIVE); - MTXLookAt(lookat, &pos, &camera->up, &target); - GXSetViewport(camera->viewport_x, camera->viewport_y, camera->viewport_w, camera->viewport_h, camera->viewport_near, camera->viewport_far); - GXSetScissor(camera->viewport_x, camera->viewport_y, camera->viewport_w, camera->viewport_h); - { - BoardSpace *space_curr; - BoardSpace *space_hilite; - PlayerState *player; - s16 player_mdl; - float y_dist; - s32 space_img; - u16 space_type; - float uv_x, uv_y, uv_size; - InitGXSpace(); - - player = BoardPlayerGet(GWSystem.player_curr); - BoardPlayerPosGet(GWSystem.player_curr, &player_pos); - player_mdl = BoardModelIDGet(BoardPlayerModelGet(GWSystem.player_curr)); - space_curr = &spaceData[0][0]; - space_hilite = NULL; - GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); - for(i=0; itype == 0) { - continue; - } - if(!BoardCameraCullCheck(&space_curr->pos, 200.0f) || (space_curr->flag & spaceAttr[0])) { - continue; - } - if(!space_hilite) { - if(player_pos.x > space_curr->pos.x-100.0f - && player_pos.z > space_curr->pos.z-100.0f - && player_pos.x < space_curr->pos.x+100.0f - && player_pos.z < space_curr->pos.z+100.0f) { - if(player_pos.y-space_curr->pos.y < 0.0f) { - y_dist = -(player_pos.y-space_curr->pos.y); - } else { - y_dist = player_pos.y-space_curr->pos.y; - } - if(y_dist < 10.0f) { - space_hilite = space_curr; - } - } - } - space_type = space_curr->type; - space_img = spaceImgIdx[space_type]-1; - uv_x = (float)(space_img%4)/4.0f; - uv_y = (float)(space_img/4)/4.0f; - uv_size = 63.0f/256.0f; - MTXRotRad(rot_z, 'z', MTXDegToRad(space_curr->rot.y)); - MTXRotRad(rot_y, 'y', MTXDegToRad(space_curr->rot.z)); - MTXRotRad(rot_x, 'x', MTXDegToRad(space_curr->rot.x+90.0f)); - MTXTrans(final, space_curr->pos.x, 3.0f+space_curr->pos.y, space_curr->pos.z); - MTXConcat(rot_x, rot_y, rot_y); - MTXConcat(rot_y, rot_z, rot_z); - MTXConcat(final, rot_z, final); - MTXConcat(lookat, final, final); - GXLoadPosMtxImm(final, GX_PNMTX0); - GXBegin(GX_QUADS, GX_VTXFMT0, 4); - GXPosition3f32(-100, -100, 0); - GXTexCoord2f32(uv_x, uv_y); - GXPosition3f32(100, -100, 0); - GXTexCoord2f32(uv_x+uv_size, uv_y); - GXPosition3f32(100, 100, 0); - GXTexCoord2f32(uv_x+uv_size, uv_y+uv_size+(1.5f/256.0f)); - GXPosition3f32(-100, 100, 0); - GXTexCoord2f32(uv_x, uv_y+uv_size+(1.5f/256.0f)); - GXEnd(); - spaceDrawCnt++; - } - if(space_hilite) { - space_curr = space_hilite; - space_type = space_curr->type; - if(player->show_next && space_type != 0 && (space_img = spaceHiliteImgIdx[space_type]) >= 0) { - GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE); - GXLoadTexObj(&spaceHiliteTex, GX_TEXMAP0); - GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_ONE, GX_LO_NOOP); - uv_x = (float)(space_img%4)/4.0f; - uv_y = (float)(space_img/4)/4.0f; - uv_size = 63.0f/256.0f; - MTXScale(scale, 1.5f, 1.5f, 1.5f); - MTXRotRad(rot_z, 'z', MTXDegToRad(space_curr->rot.y)); - MTXRotRad(rot_y, 'y', MTXDegToRad(space_curr->rot.z)); - MTXRotRad(rot_x, 'x', MTXDegToRad(space_curr->rot.x+90.0f)); - MTXTrans(final, space_curr->pos.x, 3.5f+space_curr->pos.y, space_curr->pos.z); - MTXConcat(scale, rot_x, rot_x); - MTXConcat(rot_x, rot_y, rot_y); - MTXConcat(rot_y, rot_z, rot_z); - MTXConcat(final, rot_z, final); - MTXConcat(lookat, final, final); - GXLoadPosMtxImm(final, GX_PNMTX0); - GXBegin(GX_QUADS, GX_VTXFMT0, 4); - GXPosition3f32(-100, -100, 0); - GXTexCoord2f32(uv_x, uv_y); - GXPosition3f32(100, -100, 0); - GXTexCoord2f32(uv_x+uv_size, uv_y); - GXPosition3f32(100, 100, 0); - GXTexCoord2f32(uv_x+uv_size, uv_y+uv_size); - GXPosition3f32(-100, 100, 0); - GXTexCoord2f32(uv_x, uv_y+uv_size); - GXEnd(); - spaceDrawCnt++; - GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP); - GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); - return; - } - } - GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); - } - + Vec player_pos; + Vec target; + Vec pos; + + Mtx lookat, final, rot_x, rot_y, rot_z, scale; + Mtx44 proj; + BoardCameraData *camera; + if (!spaceDrawF) { + return; + } + spaceDrawCnt = 0; + camera = &boardCamera; + BoardCameraPosGet(&pos); + BoardCameraTargetGet(&target); + MTXPerspective(proj, camera->fov, camera->aspect, camera->near, camera->far); + GXSetProjection(proj, GX_PERSPECTIVE); + MTXLookAt(lookat, &pos, &camera->up, &target); + GXSetViewport(camera->viewport_x, camera->viewport_y, camera->viewport_w, camera->viewport_h, camera->viewport_near, camera->viewport_far); + GXSetScissor(camera->viewport_x, camera->viewport_y, camera->viewport_w, camera->viewport_h); + { + BoardSpace *space_curr; + BoardSpace *space_hilite; + PlayerState *player; + s16 player_mdl; + float y_dist; + s32 space_img; + u16 space_type; + float uv_x, uv_y, uv_size; + InitGXSpace(); + + player = BoardPlayerGet(GWSystem.player_curr); + BoardPlayerPosGet(GWSystem.player_curr, &player_pos); + player_mdl = BoardModelIDGet(BoardPlayerModelGet(GWSystem.player_curr)); + space_curr = &spaceData[0][0]; + space_hilite = NULL; + GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); + for (i = 0; i < spaceCnt[0]; i++, space_curr++) { + if (space_curr->type == 0) { + continue; + } + if (!BoardCameraCullCheck(&space_curr->pos, 200.0f) || (space_curr->flag & spaceAttr[0])) { + continue; + } + if (!space_hilite) { + if (player_pos.x > space_curr->pos.x - 100.0f && player_pos.z > space_curr->pos.z - 100.0f + && player_pos.x < space_curr->pos.x + 100.0f && player_pos.z < space_curr->pos.z + 100.0f) { + if (player_pos.y - space_curr->pos.y < 0.0f) { + y_dist = -(player_pos.y - space_curr->pos.y); + } + else { + y_dist = player_pos.y - space_curr->pos.y; + } + if (y_dist < 10.0f) { + space_hilite = space_curr; + } + } + } + space_type = space_curr->type; + space_img = spaceImgIdx[space_type] - 1; + uv_x = (float)(space_img % 4) / 4.0f; + uv_y = (float)(space_img / 4) / 4.0f; + uv_size = 63.0f / 256.0f; + MTXRotRad(rot_z, 'z', MTXDegToRad(space_curr->rot.y)); + MTXRotRad(rot_y, 'y', MTXDegToRad(space_curr->rot.z)); + MTXRotRad(rot_x, 'x', MTXDegToRad(space_curr->rot.x + 90.0f)); + MTXTrans(final, space_curr->pos.x, 3.0f + space_curr->pos.y, space_curr->pos.z); + MTXConcat(rot_x, rot_y, rot_y); + MTXConcat(rot_y, rot_z, rot_z); + MTXConcat(final, rot_z, final); + MTXConcat(lookat, final, final); + GXLoadPosMtxImm(final, GX_PNMTX0); + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition3f32(-100, -100, 0); + GXTexCoord2f32(uv_x, uv_y); + GXPosition3f32(100, -100, 0); + GXTexCoord2f32(uv_x + uv_size, uv_y); + GXPosition3f32(100, 100, 0); + GXTexCoord2f32(uv_x + uv_size, uv_y + uv_size + (1.5f / 256.0f)); + GXPosition3f32(-100, 100, 0); + GXTexCoord2f32(uv_x, uv_y + uv_size + (1.5f / 256.0f)); + GXEnd(); + spaceDrawCnt++; + } + if (space_hilite) { + space_curr = space_hilite; + space_type = space_curr->type; + if (player->show_next && space_type != 0 && (space_img = spaceHiliteImgIdx[space_type]) >= 0) { + GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE); + GXLoadTexObj(&spaceHiliteTex, GX_TEXMAP0); + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_ONE, GX_LO_NOOP); + uv_x = (float)(space_img % 4) / 4.0f; + uv_y = (float)(space_img / 4) / 4.0f; + uv_size = 63.0f / 256.0f; + MTXScale(scale, 1.5f, 1.5f, 1.5f); + MTXRotRad(rot_z, 'z', MTXDegToRad(space_curr->rot.y)); + MTXRotRad(rot_y, 'y', MTXDegToRad(space_curr->rot.z)); + MTXRotRad(rot_x, 'x', MTXDegToRad(space_curr->rot.x + 90.0f)); + MTXTrans(final, space_curr->pos.x, 3.5f + space_curr->pos.y, space_curr->pos.z); + MTXConcat(scale, rot_x, rot_x); + MTXConcat(rot_x, rot_y, rot_y); + MTXConcat(rot_y, rot_z, rot_z); + MTXConcat(final, rot_z, final); + MTXConcat(lookat, final, final); + GXLoadPosMtxImm(final, GX_PNMTX0); + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition3f32(-100, -100, 0); + GXTexCoord2f32(uv_x, uv_y); + GXPosition3f32(100, -100, 0); + GXTexCoord2f32(uv_x + uv_size, uv_y); + GXPosition3f32(100, 100, 0); + GXTexCoord2f32(uv_x + uv_size, uv_y + uv_size); + GXPosition3f32(-100, 100, 0); + GXTexCoord2f32(uv_x, uv_y + uv_size); + GXEnd(); + spaceDrawCnt++; + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP); + GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); + return; + } + } + GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); + } } s32 BoardSpaceRead(s32 layer, s32 data_num) { - int j; - int i; - BoardSpace *space; - u8 *data; - s32 star_idx; - u8 *data_base; - data_base = data = HuDataSelHeapReadNum(data_num, MEMORY_DEFAULT_NUM, HEAP_DATA); - spaceCnt[layer] = *(u32 *)data; - data += sizeof(u32); - space = &spaceData[layer][0]; - for(i=0; ipos, data, sizeof(Vec)); - data += sizeof(Vec); - memcpy(&space->rot, data, sizeof(Vec)); - data += sizeof(Vec); - memcpy(&space->scale, data, sizeof(Vec)); - data += sizeof(Vec); - space->flag = *(u32 *)data; - data += sizeof(u32); - space->type = *(u16 *)data; - data += sizeof(u16); - space->link_cnt = *(u16 *)data; - data += sizeof(u16); - for(j=0; jlink_cnt; j++) { - space->link[j] = (*(u16 *)data)+1; - data += sizeof(u16); - } - if(space->type == 8) { - - space->type = 1; - star_idx = (space->flag & 0x70000) >> 16; - boardSpaceStarTbl[star_idx] = i+1; - } - } - HuDataClose(data_base); - return 0; + int j; + int i; + BoardSpace *space; + u8 *data; + s32 star_idx; + u8 *data_base; + data_base = data = HuDataSelHeapReadNum(data_num, MEMORY_DEFAULT_NUM, HEAP_DATA); + spaceCnt[layer] = *(u32 *)data; + data += sizeof(u32); + space = &spaceData[layer][0]; + for (i = 0; i < spaceCnt[layer]; i++, space++) { + memcpy(&space->pos, data, sizeof(Vec)); + data += sizeof(Vec); + memcpy(&space->rot, data, sizeof(Vec)); + data += sizeof(Vec); + memcpy(&space->scale, data, sizeof(Vec)); + data += sizeof(Vec); + space->flag = *(u32 *)data; + data += sizeof(u32); + space->type = *(u16 *)data; + data += sizeof(u16); + space->link_cnt = *(u16 *)data; + data += sizeof(u16); + for (j = 0; j < space->link_cnt; j++) { + space->link[j] = (*(u16 *)data) + 1; + data += sizeof(u16); + } + if (space->type == 8) { + + space->type = 1; + star_idx = (space->flag & 0x70000) >> 16; + boardSpaceStarTbl[star_idx] = i + 1; + } + } + HuDataClose(data_base); + return 0; } void BoardSpaceCameraSet(u16 mask) { - Hu3DModelCameraSet(spaceDrawMdl, mask); + Hu3DModelCameraSet(spaceDrawMdl, mask); } void BoardSpaceBlockPosSet(void) { - BoardSpace *space; - s32 block_pos; - begin: - if(boardTutorialBlockF) { - GWSystem.block_pos = boardTutorialBlockPos; - return; - } - block_pos = BoardRandMod(spaceCnt[0])+1; - if(block_pos == GWSystem.block_pos) { - goto begin; - } - space = BoardSpaceGet(0, block_pos); - if(space->type != 1) { - goto begin; - } - GWSystem.block_pos = block_pos; + BoardSpace *space; + s32 block_pos; +begin: + if (boardTutorialBlockF) { + GWSystem.block_pos = boardTutorialBlockPos; + return; + } + block_pos = BoardRandMod(spaceCnt[0]) + 1; + if (block_pos == GWSystem.block_pos) { + goto begin; + } + space = BoardSpaceGet(0, block_pos); + if (space->type != 1) { + goto begin; + } + GWSystem.block_pos = block_pos; } void BoardSpaceInit(s32 data_num) { - s32 board; - BoardJunctionMaskZero(); - memset(spaceData, 0, sizeof(spaceData)); - memset(spaceAttr, 0, sizeof(spaceAttr)); - lbl_801D3FC4[0] = lbl_801D3FC4[1] = lbl_801D3FC4[2] = lbl_801D3FC4[3] = -1; - spaceDrawF = 0; - board = GWBoardGet(); - { - AnimBmpData *bmp; - AnimData *data; - void *data_base; - s32 size; - data = data_base = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_BOARD, 29), MEMORY_DEFAULT_NUM, HEAP_DATA); - data->bmp = (void *)((u32)data_base+(u32)data->bmp); - data->pat = (void *)((u32)data_base+(u32)data->pat); - data->bank = (void *)((u32)data_base+(u32)data->bank); - bmp = data->bmp; - size = bmp->sizeX; - spaceHiliteTexFmt = -1; - switch(bmp->dataFmt) { - case ANIM_BMP_RGBA8: - spaceHiliteTexFmt = GX_TF_RGBA8; - break; - - case ANIM_BMP_RGB5A3_DUPE: - spaceHiliteTexFmt = GX_TF_RGB5A3; - break; - - case ANIM_BMP_CMPR: - spaceHiliteTexFmt = GX_TF_CMPR; - break; - } - spaceHiliteTexData = HuMemDirectMallocNum(HEAP_SYSTEM, bmp->dataSize, MEMORY_DEFAULT_NUM); - bmp->data = (void *)((u32)bmp->data+(u32)data_base); - memcpy(spaceHiliteTexData, bmp->data, bmp->dataSize); - HuDataClose(data_base); - GXInitTexObj(&spaceHiliteTex, spaceHiliteTexData, size, size, spaceHiliteTexFmt, GX_CLAMP, GX_CLAMP, GX_FALSE); - GXInitTexObjLOD(&spaceHiliteTex, GX_LINEAR, GX_LINEAR, 0, 0, 0, GX_FALSE, GX_FALSE, GX_ANISO_1); - } - { - AnimBmpData *bmp; - AnimData *data; - void *data_base; - s32 size; - data = data_base = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_BOARD, 28), MEMORY_DEFAULT_NUM, HEAP_DATA); - data->bmp = (void *)((u32)data_base+(u32)data->bmp); - data->pat = (void *)((u32)data_base+(u32)data->pat); - data->bank = (void *)((u32)data_base+(u32)data->bank); - bmp = data->bmp; - size = bmp->sizeX; - spaceTexFmt = -1; - switch(bmp->dataFmt) { - case ANIM_BMP_RGBA8: - spaceTexFmt = GX_TF_RGBA8; - break; - - case ANIM_BMP_RGB5A3_DUPE: - spaceTexFmt = GX_TF_RGB5A3; - break; - - case ANIM_BMP_CMPR: - spaceTexFmt = GX_TF_CMPR; - break; - } - spaceTexData = HuMemDirectMallocNum(HEAP_SYSTEM, bmp->dataSize, MEMORY_DEFAULT_NUM); - bmp->data = (void *)((u32)bmp->data+(u32)data_base); - memcpy(spaceTexData, bmp->data, bmp->dataSize); - HuDataClose(data_base); - GXInitTexObj(&spaceTex, spaceTexData, size, size, spaceTexFmt, GX_CLAMP, GX_CLAMP, GX_FALSE); - GXInitTexObjLOD(&spaceTex, GX_LINEAR, GX_LINEAR, 0, 0, 0, GX_FALSE, GX_FALSE, GX_ANISO_1); - } - BoardSpaceRead(0, data_num); - spaceDrawMdl = Hu3DHookFuncCreate(DrawSpaces); - if(!BoardStartCheck() && !_CheckFlag(FLAG_ID_MAKE(1, 1))) { - BoardSpaceBlockPosSet(); - GWSystem.star_total = 0; - GWSystem.star_flag = 0; - } - if(GWBoardGet() != BOARD_ID_EXTRA1 && GWBoardGet() != BOARD_ID_EXTRA2) { - starPlatMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 6), NULL, 0); - BoardModelMotionStart(starPlatMdl, 0, 0x40000001); - BoardModelVisibilitySet(starPlatMdl, 0); - if(_CheckFlag(FLAG_ID_MAKE(1, 1))) { - Vec pos; - Vec rot; - s16 space; - BoardModelVisibilitySet(starPlatMdl, 1); - GWSystem.star_flag |= (u8)(1 << GWSystem.star_pos); - BoardSpaceTypeSet(0, boardSpaceStarTbl[GWSystem.star_pos], 8); - { - int space; - BoardSpace *space_plat; - space = BoardSpaceLinkFlagSearch(0, BoardSpaceStarGetCurr(), 0x04000000); - BoardSpacePosGet(0, space, &pos); - BoardModelPosSetV(StarPlatGetMdl(), &pos); - BoardSpaceRotGet(0, space, &rot); - BoardModelRotYSet(StarPlatGetMdl(), rot.y); - } - } - } - spaceDrawF = 1; + s32 board; + BoardJunctionMaskZero(); + memset(spaceData, 0, sizeof(spaceData)); + memset(spaceAttr, 0, sizeof(spaceAttr)); + lbl_801D3FC4[0] = lbl_801D3FC4[1] = lbl_801D3FC4[2] = lbl_801D3FC4[3] = -1; + spaceDrawF = 0; + board = GWBoardGet(); + { + AnimBmpData *bmp; + AnimData *data; + void *data_base; + s32 size; + data = data_base = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_BOARD, 29), MEMORY_DEFAULT_NUM, HEAP_DATA); + data->bmp = (void *)((u32)data_base + (u32)data->bmp); + data->pat = (void *)((u32)data_base + (u32)data->pat); + data->bank = (void *)((u32)data_base + (u32)data->bank); + bmp = data->bmp; + size = bmp->sizeX; + spaceHiliteTexFmt = -1; + switch (bmp->dataFmt) { + case ANIM_BMP_RGBA8: + spaceHiliteTexFmt = GX_TF_RGBA8; + break; + + case ANIM_BMP_RGB5A3_DUPE: + spaceHiliteTexFmt = GX_TF_RGB5A3; + break; + + case ANIM_BMP_CMPR: + spaceHiliteTexFmt = GX_TF_CMPR; + break; + } + spaceHiliteTexData = HuMemDirectMallocNum(HEAP_SYSTEM, bmp->dataSize, MEMORY_DEFAULT_NUM); + bmp->data = (void *)((u32)bmp->data + (u32)data_base); + memcpy(spaceHiliteTexData, bmp->data, bmp->dataSize); + HuDataClose(data_base); + GXInitTexObj(&spaceHiliteTex, spaceHiliteTexData, size, size, spaceHiliteTexFmt, GX_CLAMP, GX_CLAMP, GX_FALSE); + GXInitTexObjLOD(&spaceHiliteTex, GX_LINEAR, GX_LINEAR, 0, 0, 0, GX_FALSE, GX_FALSE, GX_ANISO_1); + } + { + AnimBmpData *bmp; + AnimData *data; + void *data_base; + s32 size; + data = data_base = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_BOARD, 28), MEMORY_DEFAULT_NUM, HEAP_DATA); + data->bmp = (void *)((u32)data_base + (u32)data->bmp); + data->pat = (void *)((u32)data_base + (u32)data->pat); + data->bank = (void *)((u32)data_base + (u32)data->bank); + bmp = data->bmp; + size = bmp->sizeX; + spaceTexFmt = -1; + switch (bmp->dataFmt) { + case ANIM_BMP_RGBA8: + spaceTexFmt = GX_TF_RGBA8; + break; + + case ANIM_BMP_RGB5A3_DUPE: + spaceTexFmt = GX_TF_RGB5A3; + break; + + case ANIM_BMP_CMPR: + spaceTexFmt = GX_TF_CMPR; + break; + } + spaceTexData = HuMemDirectMallocNum(HEAP_SYSTEM, bmp->dataSize, MEMORY_DEFAULT_NUM); + bmp->data = (void *)((u32)bmp->data + (u32)data_base); + memcpy(spaceTexData, bmp->data, bmp->dataSize); + HuDataClose(data_base); + GXInitTexObj(&spaceTex, spaceTexData, size, size, spaceTexFmt, GX_CLAMP, GX_CLAMP, GX_FALSE); + GXInitTexObjLOD(&spaceTex, GX_LINEAR, GX_LINEAR, 0, 0, 0, GX_FALSE, GX_FALSE, GX_ANISO_1); + } + BoardSpaceRead(0, data_num); + spaceDrawMdl = Hu3DHookFuncCreate(DrawSpaces); + if (!BoardStartCheck() && !_CheckFlag(FLAG_ID_MAKE(1, 1))) { + BoardSpaceBlockPosSet(); + GWSystem.star_total = 0; + GWSystem.star_flag = 0; + } + if (GWBoardGet() != BOARD_ID_EXTRA1 && GWBoardGet() != BOARD_ID_EXTRA2) { + starPlatMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 6), NULL, 0); + BoardModelMotionStart(starPlatMdl, 0, 0x40000001); + BoardModelVisibilitySet(starPlatMdl, 0); + if (_CheckFlag(FLAG_ID_MAKE(1, 1))) { + Vec pos; + Vec rot; + s16 space; + BoardModelVisibilitySet(starPlatMdl, 1); + GWSystem.star_flag |= (u8)(1 << GWSystem.star_pos); + BoardSpaceTypeSet(0, boardSpaceStarTbl[GWSystem.star_pos], 8); + { + int space; + BoardSpace *space_plat; + space = BoardSpaceLinkFlagSearch(0, BoardSpaceStarGetCurr(), 0x04000000); + BoardSpacePosGet(0, space, &pos); + BoardModelPosSetV(StarPlatGetMdl(), &pos); + BoardSpaceRotGet(0, space, &rot); + BoardModelRotYSet(StarPlatGetMdl(), rot.y); + } + } + } + spaceDrawF = 1; } void BoardSpaceDestroy(void) { - if(spaceDrawMdl >= 0) { - Hu3DModelKill(spaceDrawMdl); - spaceDrawMdl = -1; - } - if(spaceHiliteTexData) { - HuMemDirectFree(spaceHiliteTexData); - spaceHiliteTexData = NULL; - } - if(spaceTexData) { - HuMemDirectFree(spaceTexData); - spaceTexData = NULL; - } -} \ No newline at end of file + if (spaceDrawMdl >= 0) { + Hu3DModelKill(spaceDrawMdl); + spaceDrawMdl = -1; + } + if (spaceHiliteTexData) { + HuMemDirectFree(spaceHiliteTexData); + spaceHiliteTexData = NULL; + } + if (spaceTexData) { + HuMemDirectFree(spaceTexData); + spaceTexData = NULL; + } +} diff --git a/src/game/chrman.c b/src/game/chrman.c index e0599240..aa090cf3 100755 --- a/src/game/chrman.c +++ b/src/game/chrman.c @@ -1366,7 +1366,7 @@ void CharModelItemHookCreate(s16 character, char *arg1) Hu3DModelHookObjReset(temp_r31->unk00, arg1); var_r26 = CharModelItemHookCreateInlineFunc(); if (!var_r26) { - Hu3DModelAttrSet(temp_r29, 1); + Hu3DModelAttrSet(temp_r29, HU3D_ATTR_DISPOFF); return; } 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.y = PGMinPos.y + (PGMaxPos.y - PGMinPos.y) / 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.y = 0.0f; effectDustParam.unk0C.z = 0.0f; diff --git a/src/game/hsfanim.c b/src/game/hsfanim.c index 3ab18cf8..d0d7a579 100755 --- a/src/game/hsfanim.c +++ b/src/game/hsfanim.c @@ -495,7 +495,7 @@ s16 Hu3DParticleCreate(AnimData *arg0, s16 arg1) { temp_r25 = Hu3DHookFuncCreate((void*) &_Hu3DParticleAttrReset); 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_r28->unk_120 = temp_r31; temp_r31->unk_44 = arg0; diff --git a/src/game/hsfdraw.c b/src/game/hsfdraw.c index 6ea8b724..37e7aa16 100755 --- a/src/game/hsfdraw.c +++ b/src/game/hsfdraw.c @@ -2435,7 +2435,7 @@ static void MDObjMesh(HsfData *arg0, HsfObject *arg1) { var_r28 = temp_r29->data; if (arg1->flags & 4) { Hu3DObjInfoP->flags |= 0x400; - Hu3DModelAttrSet(curModelID, 4); + Hu3DModelAttrSet(curModelID, HU3D_ATTR_SHADOW); } if (arg1->flags & 8) { Hu3DObjInfoP->flags |= 8; diff --git a/src/game/thpmain.c b/src/game/thpmain.c index babf6433..721558ba 100755 --- a/src/game/thpmain.c +++ b/src/game/thpmain.c @@ -1,10 +1,10 @@ #include "game/thpmain.h" +#include "game/THPSimple.h" #include "game/hsfdraw.h" #include "game/hsfman.h" #include "game/init.h" #include "game/process.h" #include "game/sprite.h" -#include "game/THPSimple.h" #include "string.h" @@ -25,7 +25,8 @@ static u32 THPFrame; static s16 THPStart; 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; if (THPProc) { @@ -51,11 +52,13 @@ s16 HuTHPSprCreateVol(char *path, s16 loop, s16 prio, float volume) { 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); } -s16 HuTHP3DCreateVol(char *path, s16 loop, float volume) { +s16 HuTHP3DCreateVol(char *path, s16 loop, float volume) +{ s16 temp_r31; if (THPProc) { @@ -75,27 +78,32 @@ s16 HuTHP3DCreateVol(char *path, s16 loop, float volume) { THPLoopF = loop; THPStat = 0; THPFrame = 0; - Hu3DModelAttrSet(SimpleControl.unk19E, 1); + Hu3DModelAttrSet(SimpleControl.unk19E, HU3D_ATTR_DISPOFF); return temp_r31; } -s16 HuTHP3DCreate(char *path, s16 loop) { +s16 HuTHP3DCreate(char *path, s16 loop) +{ return HuTHP3DCreateVol(path, loop, 110.0f); } -void HuTHPStop(void) { +void HuTHPStop(void) +{ THPStat = 1; } -void HuTHPClose(void) { +void HuTHPClose(void) +{ THPStat = 2; } -void HuTHPRestart(void) { +void HuTHPRestart(void) +{ THPStat = 3; } -BOOL HuTHPEndCheck(void) { +BOOL HuTHPEndCheck(void) +{ s32 temp_r31; temp_r31 = THPSimpleGetTotalFrame() - 1; @@ -105,19 +113,23 @@ BOOL HuTHPEndCheck(void) { return (temp_r31 <= THPFrame); } -s32 HuTHPFrameGet(void) { +s32 HuTHPFrameGet(void) +{ return THPFrame; } -s32 HuTHPTotalFrameGet(void) { +s32 HuTHPTotalFrameGet(void) +{ return THPSimpleGetTotalFrame(); } -void HuTHPSetVolume(s32 left, s32 right) { +void HuTHPSetVolume(s32 left, s32 right) +{ THPSimpleSetVolume(left, right); } -static void THPTestProc(void) { +static void THPTestProc(void) +{ s32 temp_r29; u32 var_r28; void *temp_r30; @@ -146,8 +158,9 @@ static void THPTestProc(void) { decodeRate = 0; THPStart = 1; if (SimpleControl.unk19C == 1) { - Hu3DModelAttrReset(SimpleControl.unk19E, 1); - } else { + Hu3DModelAttrReset(SimpleControl.unk19E, HU3D_ATTR_DISPOFF); + } + else { HuSprAttrReset(SimpleControl.unk19E, 0, 4); } while (1) { @@ -182,7 +195,8 @@ static void THPTestProc(void) { } if (SimpleControl.unk19C == 1) { Hu3DModelKill(SimpleControl.unk19E); - } else { + } + else { HuSprKill(SimpleControl.unk19E); } 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 }; if (THPStart != 0) { GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); 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(); } } -static void THPViewSprFunc(HuSprite *arg0) { +static void THPViewSprFunc(HuSprite *arg0) +{ Vec spC = { 0.0f, 0.0f, 1.0f }; GXColor sp8; s32 temp_r30; @@ -227,19 +244,21 @@ static void THPViewSprFunc(HuSprite *arg0) { PSMTXRotAxisRad(sp18, &spC, MTXDegToRad(arg0->z_rot)); PSMTXScale(sp48, arg0->scale_x, arg0->scale_y, 1.0f); PSMTXConcat(sp18, sp48, sp48); - } else { + } + else { PSMTXScale(sp48, arg0->scale_x, arg0->scale_y, 1.0f); } mtxTransCat(sp48, arg0->x, arg0->y, 0.0f); PSMTXConcat(*arg0->group_mtx, sp48, sp48); - temp_r30 = -((s32) audioTrack.unk00 / 2); - temp_r29 = -((s32) audioTrack.unk04 / 2); + temp_r30 = -((s32)audioTrack.unk00 / 2); + temp_r29 = -((s32)audioTrack.unk04 / 2); GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE); 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) { if (THPStat == 2) { break;