diff --git a/src/REL/m407dll/camera.c b/src/REL/m407dll/camera.c index a19431d2..72162e07 100644 --- a/src/REL/m407dll/camera.c +++ b/src/REL/m407dll/camera.c @@ -35,7 +35,7 @@ void fn_1_1B1C(Process* arg0) { Hu3DCameraViewportSet(1, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); Hu3DCameraPerspectiveSet(1, 45.0f, 10.0f, 40000.0f, 1.2f); lbl_1_bss_30 = omAddObjEx(lbl_1_bss_34, 0x80, 0U, 0U, -1, fn_1_2024); - lbl_1_bss_30->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x4C, 0x10000000U); + lbl_1_bss_30->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData2), 0x10000000); unkData = OM_GET_DATA_PTR(lbl_1_bss_30, unkDominationData2); unkData->unk_04 = 0; fn_1_1CAC(0.0f, 0.0f, 0.0f); diff --git a/src/REL/m407dll/effect.c b/src/REL/m407dll/effect.c index e68ed0bd..e29724ac 100644 --- a/src/REL/m407dll/effect.c +++ b/src/REL/m407dll/effect.c @@ -3,8 +3,8 @@ #include "game/object.h" #include "game/hsfmotion.h" #include "game/hsfdraw.h" + //bss -s32 bssPad3; Process* lbl_1_bss_3970; omObjData* lbl_1_bss_37E0[100]; @@ -33,10 +33,8 @@ void fn_1_41CC(Process* arg0) { Process* sp8; u32 i; u32 temp_r30; - lbl_1_bss_3970 = arg0; - temp_r30 = 0; for (i = 0; i < 40; i++) { @@ -146,7 +144,7 @@ void fn_1_46EC(omObjData* arg0) { unkDominationData4* temp_r30; arg0->func = fn_1_4680; - arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x20, 0x10000000); + arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData4), 0x10000000); temp_r30 = arg0->data; temp_r30->unk_00 = arg0->work[0]; temp_r30->unk_08 = arg0->work[1]; @@ -205,5 +203,3 @@ void fn_1_485C(omObjData* arg0) { temp_r29->unk_1C = 0; } } - -f32 pad3[1] = {0.0f}; \ No newline at end of file diff --git a/src/REL/m407dll/main.c b/src/REL/m407dll/main.c index 99f91349..97e76b3f 100644 --- a/src/REL/m407dll/main.c +++ b/src/REL/m407dll/main.c @@ -5,13 +5,23 @@ #include "game/audio.h" #include "game/hsfman.h" -s32 bssPad2; +#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) + +//bss Process* lbl_1_bss_3980; omObjData* lbl_1_bss_397C; s16 lbl_1_bss_3978; -s32 fn_1_4C0(s32 arg0); - +//func signatures +void fn_1_388(u8, s32); +void fn_1_3C4(u8); +s32 fn_1_4C0(s32); +s32 fn_1_508(u8); +s32 fn_1_53C(u8); +void fn_1_568(s16, s16, s16); +void fn_1_4B7C(void); +void fn_1_4C3C(s32); +void fn_1_4C6C(omObjData*); void fn_1_4D0C(void); void fn_1_4D54(void); void fn_1_4E8C(void); @@ -25,13 +35,6 @@ void fn_1_5630(void); s16 fn_1_5804(void); void fn_1_5A80(void); void fn_1_5BB0(void); -void fn_1_4B7C(void); -void fn_1_4C6C(omObjData* obj); -void fn_1_4C3C(s32 arg0); -void fn_1_568(s16 arg0, s16 arg1, s16 arg2); -s32 fn_1_508(u8 arg0); -s32 fn_1_53C(u8 arg0); -void fn_1_3C4(u8 arg0); typedef void (*ObjFuncs)(void); //data @@ -74,7 +77,7 @@ void fn_1_4980(Process* arg0) { lbl_1_bss_3980 = arg0; lbl_1_bss_397C = omAddObjEx(lbl_1_bss_3980, 0x40, 0U, 0U, 0, fn_1_4C6C); - lbl_1_bss_397C->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x48, 0x10000000U); + lbl_1_bss_397C->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData5), 0x10000000); temp_r31 = lbl_1_bss_397C->data; Hu3DShadowCreate(45.0f, 10.0f, 10000.0f); Hu3DShadowTPLvlSet(0.6f); @@ -96,7 +99,7 @@ void fn_1_4980(Process* arg0) { temp_r31->unk_08 = -1; temp_r31->unk_24 = 0; - for (i = 0; i < 4; i++) { + for (i = 0; i < ARRAY_COUNT(temp_r31->unk_1C); i++) { temp_r31->unk_1C[i] = -1; } @@ -109,7 +112,7 @@ void fn_1_4B7C(void) { temp_r31 = lbl_1_bss_397C->data; if (temp_r31->unk_04 == 0) { - WipeCreate(2, 0, 0x3C); + WipeCreate(2, 0, 60); temp_r31->unk_04++; } if (WipeStatGet() == 0) { @@ -143,15 +146,12 @@ void fn_1_4C3C(s32 arg0) { void fn_1_4C6C(omObjData* obj) { unkDominationData5* temp_r30; - unkDominationData5* temp_r31; temp_r30 = lbl_1_bss_397C->data; lbl_1_data_2A8[temp_r30->unk_00](); if (omSysExitReq != 0) { - temp_r31 = lbl_1_bss_397C->data; - temp_r31->unk_00 = 0xC; - temp_r31->unk_04 = 0; + fn_1_4C3C(12); omSysExitReq = 0; } } @@ -161,9 +161,7 @@ void fn_1_4D0C(void) { unkDominationData5* temp_r31; sp8 = lbl_1_bss_397C->data; - temp_r31 = lbl_1_bss_397C->data; - temp_r31->unk_00 = 1; - temp_r31->unk_04 = 0; + fn_1_4C3C(1); } f32 lbl_1_data_2DC[4] = {850.0f, 900.0f, 1300.0f, 1500.0f}; @@ -182,7 +180,6 @@ f32 lbl_1_data_358 = 1900.0f; void fn_1_4D54(void) { s16 temp_r0; - unkDominationData5* temp_r30; unkDominationData5* temp_r31; temp_r31 = lbl_1_bss_397C->data; @@ -202,9 +199,7 @@ void fn_1_4D54(void) { temp_r31->unk_04 = 3; case 3: if (fn_1_1D88() == 0) { - temp_r30 = lbl_1_bss_397C->data; - temp_r30->unk_00 = 2; - temp_r30->unk_04 = 0; + fn_1_4C3C(2); return; } } @@ -231,17 +226,13 @@ void fn_1_4E8C(void) { temp_r31->unk_10 = 0x258; temp_r31->unk_08 = MGSeqCreate(1, temp_r31->unk_10 / 60, -1, -1); fn_1_1E4(); - temp_r29 = lbl_1_bss_397C->data; - temp_r29->unk_00 = 3; - temp_r29->unk_04 = 0; + fn_1_4C3C(3); } } void fn_1_4FAC(void) { s16 temp_r0; unkDominationData5* temp_r31; - unkDominationData5* temp_r30; - unkDominationData5* temp_r29; temp_r31 = lbl_1_bss_397C->data; if (temp_r31->unk_10 > 0) { @@ -258,23 +249,18 @@ void fn_1_4FAC(void) { fn_1_5804(); if (temp_r31->unk_24 > 0) { - temp_r30 = lbl_1_bss_397C->data; - temp_r30->unk_00 = 4; - temp_r30->unk_04 = 0; + fn_1_4C3C(4); return; } - - temp_r29 = lbl_1_bss_397C->data; - temp_r29->unk_00 = 6; - temp_r29->unk_04 = 0; + + fn_1_4C3C(6); } void fn_1_50E8(void) { unkDominationData5* temp_r31; - unkDominationData5* temp_r30; temp_r31 = lbl_1_bss_397C->data; - switch (temp_r31->unk_04++) { /* irregular */ + switch (temp_r31->unk_04++) { case 0xA: fn_1_1DB0(&lbl_1_data_340, &lbl_1_data_34C, &lbl_1_data_358, 0xB4, 4); return; @@ -290,9 +276,7 @@ void fn_1_50E8(void) { case 0xBE: temp_r31->unk_44 = HuAudSeqPlay(0x3A); fn_1_25C0(); - temp_r30 = lbl_1_bss_397C->data; - temp_r30->unk_00 = 5; - temp_r30->unk_04 = 0; + fn_1_4C3C(5); return; } } @@ -300,115 +284,99 @@ void fn_1_50E8(void) { void fn_1_51E4(void) { Vec sp8; unkDominationData5* temp_r30; - unkDominationData5* temp_r31; temp_r30 = lbl_1_bss_397C->data; - if ((temp_r30->unk_04++ >= 0xF) || (fn_1_2880() != 0)) { + if ((temp_r30->unk_04++ >= 15) || (fn_1_2880() != 0)) { if (fn_1_2880() == 0) { fn_1_1CD4(&sp8.z, &sp8.y, &sp8.x); sp8.x += 33.5f; fn_1_1CAC(sp8.z, sp8.y, sp8.x); return; } - temp_r31 = lbl_1_bss_397C->data; - temp_r31->unk_00 = 6; - temp_r31->unk_04 = 0; + fn_1_4C3C(6); } } void fn_1_52AC(void) { unkDominationData5* temp_r31; - unkDominationData5* temp_r30; - unkDominationData5* temp_r29; temp_r31 = lbl_1_bss_397C->data; if (temp_r31->unk_04 == 0) { temp_r31->unk_06 = MGSeqCreate(3, 1); temp_r31->unk_04++; - HuAudSeqFadeOut(temp_r31->unk_44, 0x64); + HuAudSeqFadeOut(temp_r31->unk_44, 100); } if (MGSeqStatGet(temp_r31->unk_06) == 0) { MGSeqKill(temp_r31->unk_06); temp_r31->unk_06 = -1; + if (temp_r31->unk_08 != 0) { MGSeqKill(temp_r31->unk_08); temp_r31->unk_08 = -1; } + if (temp_r31->unk_24 > 0) { - temp_r30 = lbl_1_bss_397C->data; - temp_r30->unk_00 = 7; - temp_r30->unk_04 = 0; + fn_1_4C3C(7); return; } - temp_r29 = lbl_1_bss_397C->data; - temp_r29->unk_00 = 0xA; - temp_r29->unk_04 = 0; + fn_1_4C3C(10); } } void fn_1_53B8(void) { s32 i; unkDominationData5* temp_r31; - unkDominationData5* temp_r29; - unkDominationData5* temp_r28; temp_r31 = lbl_1_bss_397C->data; if (temp_r31->unk_04 == 0) { - fn_1_1DB0(&temp_r31->unk_28, &temp_r31->unk_34, &temp_r31->unk_40, 0x3C, 4); + fn_1_1DB0(&temp_r31->unk_28, &temp_r31->unk_34, &temp_r31->unk_40, 60, 4); temp_r31->unk_04++; for (i = 0; i < 4; i++) { - if ((fn_1_508(i) == 0) && (fn_1_28B8(i) >= 0x64)) { - GWGameStat.present[0x38] = 1; + if ((fn_1_508(i) == 0) && (fn_1_28B8(i) >= 100)) { + GWGameStat.present[56] = 1; } } } - if (temp_r31->unk_04 == 0x28) { + + if (temp_r31->unk_04 == 40) { fn_1_404(); for (i = 0; i < temp_r31->unk_24; i++) { fn_1_2770(temp_r31->unk_1C[i]); fn_1_568(temp_r31->unk_1C[i], 2, 60); } } - if (temp_r31->unk_04 == 0x46) { + + if (temp_r31->unk_04 == 70) { for (i = 0; i < temp_r31->unk_24; i++) { if (!(fn_1_508(temp_r31->unk_1C[i])) && (lbl_1_bss_3978 < fn_1_28D4())) { - temp_r29 = lbl_1_bss_397C->data; - temp_r29->unk_00 = 8; - temp_r29->unk_04 = 0; + fn_1_4C3C(8); return; } } - temp_r28 = lbl_1_bss_397C->data; - temp_r28->unk_00 = 9; - temp_r28->unk_04 = 0; + fn_1_4C3C(9); } else { temp_r31->unk_04++; } - } void fn_1_5574(void) { unkDominationData5* temp_r31; - unkDominationData5* temp_r30; temp_r31 = lbl_1_bss_397C->data; if (temp_r31->unk_04 == 0) { GWMGRecordSet(1, fn_1_28D4()); - temp_r31->unk_06 = MGSeqCreate(0xE, fn_1_28D4()); + temp_r31->unk_06 = MGSeqCreate(14, fn_1_28D4()); fn_1_5F40(1); temp_r31->unk_04++; return; } if (MGSeqStatGet(temp_r31->unk_06) == 0) { - temp_r30 = lbl_1_bss_397C->data; - temp_r30->unk_00 = 9; - temp_r30->unk_04 = 0; + fn_1_4C3C(9); } } void fn_1_5630(void) { unkDominationData5* temp_r31; - unkDominationData5* temp_r29; s32 temp_r28; s16 temp_r27; s32 temp_r26; @@ -434,16 +402,15 @@ void fn_1_5630(void) { temp_r22 = fn_1_4C0(temp_r31->unk_1C[2]); temp_r23 = fn_1_4C0(temp_r31->unk_1C[1]); temp_r31->unk_06 = MGSeqCreate(5, 3, fn_1_4C0(temp_r31->unk_1C[0]), temp_r23, temp_r22, temp_r21); - for (i = 0; i < 4; i++) { + for (i = 0; i < ARRAY_COUNT(temp_r31->unk_1C); i++) { if (temp_r31->unk_1C[i] != -1) { - fn_1_3C4(temp_r31->unk_1C[i]); temp_r26 = temp_r31->unk_1C[i]; coins = GWPlayer[temp_r26].coin_win; coins2 = coins; - temp_r27 = coins2 + 0xA; + temp_r27 = coins2 + 10; temp_r28 = temp_r31->unk_1C[i]; - if (_CheckFlag(0x1000CU) == 0) { + if (_CheckFlag(0x1000C) == 0) { GWPlayer[temp_r28].coin_win = temp_r27; } } @@ -452,12 +419,10 @@ void fn_1_5630(void) { } } - if (temp_r31->unk_04++ >= 0xD2) { + if (temp_r31->unk_04++ >= 210) { MGSeqKill(temp_r31->unk_06); temp_r31->unk_06 = -1; - temp_r29 = lbl_1_bss_397C->data; - temp_r29->unk_00 = 0xC; - temp_r29->unk_04 = 0; + fn_1_4C3C(12); } } @@ -470,7 +435,6 @@ s16 fn_1_5804(void) { s32 i; s32 var_r27; s32 var_r26; - s32 var_r30; unkDominationData5* temp_r31; @@ -491,7 +455,7 @@ s16 fn_1_5804(void) { if (var_r29 == temp_r28) { if (var_r29 > 0) { temp_r31->unk_1C[temp_r31->unk_24++] = i; - fn_1_388((u8) i, 1); + fn_1_388(i, 1); } if (var_r27 == 0) { var_r27 = 1; @@ -501,12 +465,14 @@ s16 fn_1_5804(void) { var_f30 = 400.0f * i; } } else { - fn_1_388((u8) i, 2); + fn_1_388(i, 2); } } + if (var_r26 == 0) { var_f30 = var_f31; } + temp_r31->unk_28.x = (600.0f - (0.5f * (var_f30 + var_f31))); temp_r31->unk_28.y = 250.0f; temp_r31->unk_28.z = (200.0f * ((s16) var_r29 + 2)); @@ -525,26 +491,23 @@ void fn_1_5A80(void) { f32 sp8; s16 temp_r0; s16 temp_r3; - unkDominationData5* temp_r30; unkDominationData5* temp_r31; sp8 = 1420.0f; temp_r31 = lbl_1_bss_397C->data; switch (temp_r31->unk_04++) { - case 0x0: + case 0: MGSeqKill(temp_r31->unk_08); temp_r31->unk_08 = -1; fn_1_1DB0(&sp18, &spC, &sp8, 0x78, 4); return; - case 0xA: + case 10: fn_1_5F40(0); fn_1_28C(); return; - case 0x78: + case 120: fn_1_404(); - temp_r30 = lbl_1_bss_397C->data; - temp_r30->unk_00 = 9; - temp_r30->unk_04 = 0; + fn_1_4C3C(9); return; /* fallthrough */ case 0x3C: @@ -554,7 +517,6 @@ void fn_1_5A80(void) { } void fn_1_5BB0(void) { - unkDominationData5* temp_r30; unkDominationData5* temp_r31; temp_r31 = lbl_1_bss_397C->data; @@ -565,11 +527,6 @@ void fn_1_5BB0(void) { if (MGSeqStatGet(temp_r31->unk_06) == 0) { MGSeqKill(temp_r31->unk_06); temp_r31->unk_06 = -1; - temp_r30 = lbl_1_bss_397C->data; - temp_r30->unk_00 = 0xC; - temp_r30->unk_04 = 0; + fn_1_4C3C(12); } } - -f32 pad4[1] = {0.0f}; -const f32 pad5 = 0.0f; \ No newline at end of file diff --git a/src/REL/m407dll/map.c b/src/REL/m407dll/map.c index 0ef5208c..61e85f02 100644 --- a/src/REL/m407dll/map.c +++ b/src/REL/m407dll/map.c @@ -3,6 +3,8 @@ #include "game/gamework_data.h" #include "game/hsfman.h" +#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) + void fn_1_162C(omObjData*); void fn_1_1A8C(omObjData*); @@ -39,8 +41,6 @@ Point3d lbl_1_data_208 = {-0.5f, -0.5f, -0.5f}; GXColor lbl_1_data_214 = {255, 255, 255, 255}; Point3d lbl_1_data_218 = {0.0f, 1.0f, 0.0f}; -f32 pad[1] = {0.0f}; - void fn_1_14F0(Process* arg0, s32 arg1) { LightData* sp10; @@ -76,7 +76,7 @@ void fn_1_162C(omObjData* arg0) { arg0->model[1] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_198[3], 0x10000000, HEAP_DATA)); Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f); Hu3DModelAttrSet(arg0->model[1], 1U); - for (i = 0; i < 4; i++) { + for (i = 0; i < ARRAY_COUNT(GWPlayerCfg); i++) { arg0->model[i+2] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_198[GWPlayerCfg[i].character + 4], 0x10000000, HEAP_DATA)); Hu3DModelAmbSet(arg0->model[i + 2], 1.0f, 1.0f, 1.0f); Hu3DModelShadowMapSet(arg0->model[i + 2]); diff --git a/src/REL/m407dll/player.c b/src/REL/m407dll/player.c index c907f00d..5a7aef94 100644 --- a/src/REL/m407dll/player.c +++ b/src/REL/m407dll/player.c @@ -7,6 +7,8 @@ #include "game/hsfman.h" #include "rel_sqrt_consts.h" +#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) + //structs typedef struct unkDominationData { u8 unk_00; @@ -30,7 +32,6 @@ typedef struct unkDominationData { s32 unk_38; } unkDominationData; -s32 pad_20; Process* lbl_1_bss_18; omObjData* lbl_1_bss_8[4]; Process* lbl_1_bss_0[2]; @@ -265,7 +266,7 @@ void fn_1_64C(omObjData* arg0) { u32 i; arg0->func = fn_1_A1C; - arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x3C, 0x10000000U); + arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData), 0x10000000); temp_r31 = arg0->data; temp_r29 = arg0->work[0]; temp_r31->unk_00 = temp_r29; @@ -285,7 +286,7 @@ void fn_1_64C(omObjData* arg0) { Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f); Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f); - for (i = 0; i < 8; i++) { + for (i = 0; i < ARRAY_COUNT(lbl_1_data_0); i++) { arg0->motion[i] = CharModelMotionCreate(temp_r31->unk_01, lbl_1_data_0[temp_r31->unk_01].unk_00[i]); } @@ -339,7 +340,7 @@ void fn_1_A8C(omObjData* arg0) { var_r29 = (HuPadBtnDown[temp_r31->unk_0C] & 0x100) ? 1 : 0; } else if ((u32) temp_r31->unk_28 >= (u32) temp_r31->unk_2C) { var_r29 = 1; - temp_r31->unk_2C = (f32) (temp_r31->unk_2C + temp_r31->unk_30); + temp_r31->unk_2C += temp_r31->unk_30; } if (var_r29 != 0) { @@ -405,7 +406,7 @@ void fn_1_DB4(omObjData* arg0) { } temp_r31->unk_14 = 30.0f; - CharModelMotionShiftSet((s16) temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, 0U); + CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, 0); SetDominationDataStuff(arg0, 0, 0); } @@ -421,7 +422,7 @@ void fn_1_F8C(omObjData* arg0) { HuAudFXPlay(lbl_1_rodata_70[temp_r31->unk_01]); } - if (temp_r31->unk_20++ >= 0x78) { + if (temp_r31->unk_20++ >= 120) { CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[0], 0.0f, 10.0f, 0x40000001); SetDominationDataStuff(arg0, 0, 0); } @@ -431,10 +432,9 @@ void fn_1_1074(omObjData* arg0) { unkDominationData* temp_r31; temp_r31 = arg0->data; - if (temp_r31->unk_20 == 0) { CharModelVoiceEnableSet(temp_r31->unk_01, arg0->motion[3], 0); - CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[3], 0.0f, 10.0f, 0U); + CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[3], 0.0f, 10.0f, 0); temp_r31->unk_24 = 0.0f; temp_r31->unk_20 = 1; } @@ -471,7 +471,7 @@ void fn_1_11CC(omObjData* arg0) { CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, 0); temp = fn_1_28E4(temp_r31->unk_00); //can remove \0 after matching whole rel likely - Hu3DModelHookSet(temp, "itemhook_c\0", arg0->model[0]); + Hu3DModelHookSet(temp, "itemhook_c", arg0->model[0]); temp_r31->unk_10 = 0.0f; temp_r31->unk_14 = 0.0f; temp_r31->unk_18 = 0.0f; diff --git a/src/REL/m407dll/score.c b/src/REL/m407dll/score.c index 5d0ebd84..97258bb7 100644 --- a/src/REL/m407dll/score.c +++ b/src/REL/m407dll/score.c @@ -2,6 +2,8 @@ #include "game/object.h" #include "game/esprite.h" +#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) + typedef struct unkDominationData6 { /* 0x00 */ s32 unk_00; /* 0x04 */ s32 unk_04; @@ -39,7 +41,7 @@ void fn_1_5C5C(Process* arg0, s16 arg1) { lbl_1_bss_398C = arg0; lbl_1_bss_3988 = omAddObjEx(lbl_1_bss_398C, 0x800, 0U, 0U, 7, fn_1_5FE4); - lbl_1_bss_3988->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x24, 0x10000000U); + lbl_1_bss_3988->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData6), 0x10000000); temp_r31 = lbl_1_bss_3988->data; temp_r31->unk_08 = arg1; temp_r31->unk_0A = 0; @@ -130,7 +132,7 @@ void fn_1_61A0(void) { temp_r31 = lbl_1_bss_3988->data; if (temp_r31->unk_04 == 0) { - for (i = 0; i < 8; i++) { + for (i = 0; i < ARRAY_COUNT(temp_r31->unk_0C); i++) { espDispOff(temp_r31->unk_0C[i]); } temp_r31->unk_04++; @@ -144,7 +146,7 @@ void fn_1_6218(void) { temp_r31 = lbl_1_bss_3988->data; if (temp_r31->unk_04 == 0) { - for (i = 0; i < 8; i++) { + for (i = 0; i < ARRAY_COUNT(temp_r31->unk_0C); i++) { espDispOn(temp_r31->unk_0C[i]); } temp_r31->unk_04++; diff --git a/src/REL/m407dll/whomp_score.c b/src/REL/m407dll/whomp_score.c index 7b00cf63..28b76729 100644 --- a/src/REL/m407dll/whomp_score.c +++ b/src/REL/m407dll/whomp_score.c @@ -12,7 +12,7 @@ void fn_1_3FF0(omObjData*); void fn_1_3FF4(omObjData* arg0); void fn_1_40F4(omObjData* arg0); -s32 bssPad; +//bss Process* lbl_1_bss_37D8; omObjData* lbl_1_bss_37C8[4]; @@ -56,7 +56,7 @@ void fn_1_3BB8(s16 arg0, f32 arg8, f32 arg9) { Vec sp14; unkDominationData3* temp_r31; u32 i; - s16 temp;; + s16 temp; for (i = 0; i < ARRAY_COUNT(lbl_1_bss_37C8); i++) { obj = lbl_1_bss_37C8[i]; @@ -100,11 +100,10 @@ void fn_1_3D4C(omObjData* arg0) { } void fn_1_3E34(omObjData* arg0) { - unkDominationData3* temp_r29; unkDominationData3* temp_r31; arg0->func = fn_1_3D4C; - arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x24, 0x10000000U); + arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData3), 0x10000000); temp_r31 = arg0->data; temp_r31->unk_00 = arg0->work[0]; temp_r31->unk_14 = 0; @@ -120,9 +119,7 @@ void fn_1_3E34(omObjData* arg0) { espScaleSet(temp_r31->unk_18[0], 1.8f, 1.8f); temp_r31->unk_08.x = (f32) 0.0f; temp_r31->unk_08.y = (f32) 0.0f; - temp_r29 = arg0->data; - temp_r29->unk_04 = 0; - temp_r29->unk_14 = 0; + fn_1_3D28(arg0, 0); } void fn_1_3F7C(omObjData* arg0) { @@ -145,7 +142,6 @@ void fn_1_3FF0(omObjData* arg0) { } void fn_1_3FF4(omObjData* arg0) { - unkDominationData3* temp_r30; unkDominationData3* temp_r31; temp_r31 = arg0->data; @@ -164,18 +160,16 @@ void fn_1_3FF4(omObjData* arg0) { temp_r31->unk_20 += 0.1f; } - if (temp_r31->unk_14++ >= 0x3C) { - temp_r30 = arg0->data; - temp_r30->unk_04 = 2; - temp_r30->unk_14 = 0; + if (temp_r31->unk_14++ >= 60) { + fn_1_3D28(arg0, 2); } } void fn_1_40F4(omObjData* arg0) { - unkDominationData3* temp_r30; unkDominationData3* temp_r31; temp_r31 = arg0->data; + if (temp_r31->unk_20 > 0.0f) { espTPLvlSet(temp_r31->unk_18[0], temp_r31->unk_20); espTPLvlSet(temp_r31->unk_18[1], temp_r31->unk_20); @@ -184,13 +178,11 @@ void fn_1_40F4(omObjData* arg0) { temp_r31->unk_20 -= 0.05; return; } + espDispOff(temp_r31->unk_18[0]); espDispOff(temp_r31->unk_18[1]); espDispOff(temp_r31->unk_18[2]); espDispOff(temp_r31->unk_18[3]); - temp_r30 = arg0->data; - temp_r30->unk_04 = 0; - temp_r30->unk_14 = 0; + fn_1_3D28(arg0, 0); } -f32 pad2[1] = {0.0f}; diff --git a/src/REL/messDll/main.c b/src/REL/messDll/main.c index a3381d0c..5ef28622 100755 --- a/src/REL/messDll/main.c +++ b/src/REL/messDll/main.c @@ -268,8 +268,7 @@ static char *lbl_1_data_440[] = { static s32 fn_1_11B0(s16 arg0, s16 arg1) { WindowData *temp_r30; - float sp10; - float spC; + float spC[2]; s32 temp_r28; s32 var_r27; s32 var_r26; @@ -288,11 +287,11 @@ static s32 fn_1_11B0(s16 arg0, s16 arg1) { for (i = 0; i < 8; i++) { HuWinInsertMesSizeGet(MAKE_MESSID_PTR(lbl_1_data_440[i]), (s16) i); } - HuWinMesMaxSizeGet(1, &spC, temp_r28); - if (spC <= 16.0f) { - spC = 32.0f; + HuWinMesMaxSizeGet(1, &spC[0], temp_r28); + if (spC[0] <= 16.0f) { + spC[0] = 32.0f; } - lbl_1_data_410 = HuWinCreate(-10000.0f, -10000.0f, spC, sp10, 0); + lbl_1_data_410 = HuWinCreate(-10000.0f, -10000.0f, spC[0], spC[1], 0); for (i = 0; i < 8; i++) { HuWinInsertMesSet(lbl_1_data_410, MAKE_MESSID_PTR(lbl_1_data_440[i]), (s16) i); }