diff --git a/config/GMPE01_00/rels/m421Dll/symbols.txt b/config/GMPE01_00/rels/m421Dll/symbols.txt index cb29a8cd..4afd037f 100644 --- a/config/GMPE01_00/rels/m421Dll/symbols.txt +++ b/config/GMPE01_00/rels/m421Dll/symbols.txt @@ -110,7 +110,7 @@ lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 data:float lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 data:4byte -lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x50 +lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x50 data:float lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x14 data:4byte lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x4 data:float lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 data:float diff --git a/include/REL/m421Dll.h b/include/REL/m421Dll.h new file mode 100644 index 00000000..04e08da4 --- /dev/null +++ b/include/REL/m421Dll.h @@ -0,0 +1,42 @@ +#ifndef M421DLL_H +#define M421DLL_H + +#include "game/object.h" + +typedef struct UnkM421DllStruct { + float unk_00; + float unk_04; + float unk_08; + float unk_0C; +} UnkM421DllStruct; + +typedef struct M421DllCameraStruct { + s32 unk_00; + s32 unk_04; + s32 unk_08; + u32 unk_0C; + float unk_10; + float unk_14; + float unk_18; + Vec unk_1C; + Vec unk_28; + float unk_34; + s32 unk_38; + s32 unk_3C; + float unk_40; + UnkM421DllStruct unk_44; + char unk54[0x30]; + float unk_84; + char unk88[0x4]; + float unk_8C; + float unk_90; + s32 unk_94; + char unk98[0xC]; +} M421DllCameraStruct; /* size = 0xA4 */ // same as M443DllCameraStruct and M460 + +void fn_1_4648(Process *process); +void fn_1_48B0(void); +void fn_1_B15C(Process *process, omObjData *object); +void fn_1_B1BC(void); + +#endif diff --git a/include/REL/m460Dll.h b/include/REL/m460Dll.h index 6f97310d..40ca863d 100644 --- a/include/REL/m460Dll.h +++ b/include/REL/m460Dll.h @@ -32,7 +32,7 @@ typedef struct M460DllCameraStruct { float unk_90; s32 unk_94; char unk98[0xC]; -} M460DllCameraStruct; /* size = 0xA4 */ // same as M443DllCameraStruct // TODO does this have to be here? +} M460DllCameraStruct; /* size = 0xA4 */ // same as M443DllCameraStruct void fn_1_3E68(u32 arg0); M460DllCameraStruct *fn_1_3E90(s32 arg0); diff --git a/src/REL/m421Dll/main.c b/src/REL/m421Dll/main.c new file mode 100644 index 00000000..d958eb05 --- /dev/null +++ b/src/REL/m421Dll/main.c @@ -0,0 +1,582 @@ +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXVert.h" +#include "ext_math.h" +#include "game/audio.h" +#include "game/gamework.h" +#include "game/hsfdraw.h" +#include "game/hsfman.h" +#include "game/memory.h" +#include "game/minigame_seq.h" +#include "game/object.h" +#include "game/objsub.h" +#include "game/wipe.h" +#include "string.h" + +#include "REL/m421Dll.h" + +#ifndef __MWERKS__ +#include "game/frand.h" +#endif + +typedef struct M421DllWork { + u32 unk_00; + s32 unk_04; + s32 unk_08; + u32 unk0C; + s32 unk_10; + u32 unk_14; + u32 unk_18; + u32 unk_1C; + u32 unk_20; + u32 unk24; + s32 unk28; + u32 unk_2C; + s32 unk30; + char unk34[0x4]; + u32 unk38; + s32 unk3C; + s32 unk40; + s32 unk44; + s32 unk48; + s32 unk4C; + u32 unk50; + s32 unk54[4]; + s32 unk64[4]; +} M421DllWork; /* size = 0x74 */ // TODO check the fields, they are copy pasted + +void fn_1_10EC(omObjData *object); +void fn_1_142C(omObjData *object); +void fn_1_1850(omObjData *object); +void fn_1_1C90(omObjData *object); +omObjFunc fn_1_213C(Process *process, omObjData *object); +void fn_1_21AC(omObjData *object); +omObjFunc fn_1_2A28(Process *process, omObjData *object); +void fn_1_2BB8(omObjData *object); +void fn_1_3020(Process *process); +void fn_1_30D0(omObjData *object); +void fn_1_3334(omObjData *object); +void fn_1_335C(omObjData *object); +void fn_1_38FC(ModelData *model, Mtx mtx); +void fn_1_3B50(u32 arg0); +M421DllCameraStruct *fn_1_3B78(s32 arg0); +M421DllCameraStruct *fn_1_3CB0(u32 arg0); +float fn_1_4478(float arg8, float arg9, float argA); +void fn_1_4A0(omObjData *object); +void fn_1_784(omObjData *object); +void fn_1_8B8(omObjData *object); +void fn_1_CBC(omObjData *object); + +GXColor lbl_1_data_A0 = { 0, 0, 0, 0 }; + +Process *lbl_1_bss_28; +omObjData *lbl_1_bss_24; +omObjData *lbl_1_bss_20; +// M421DllCameraStruct +omObjData *lbl_1_bss_1C; +s16 lbl_1_bss_18; +s16 lbl_1_bss_12; +s16 lbl_1_bss_10; +s16 lbl_1_bss_E; +s16 lbl_1_bss_C; +s32 lbl_1_bss_8; +s32 lbl_1_bss_4; +s32 lbl_1_bss_0; + +void fn_1_578(omObjData *var_r29) +{ + Vec sp14; + Vec sp8; + M421DllCameraStruct *var_r31; + M421DllWork *var_r30; + + var_r30 = var_r29->data; + var_r30->unk_04++; + var_r30->unk_10++; + var_r30->unk_18++; + var_r30->unk_2C++; + if ((omSysExitReq != 0) && (var_r30->unk_00 != 5)) { + var_r30->unk_00 = 4; + fn_1_784(var_r29); + } + var_r31 = fn_1_3B78(1); + sp8.x = -(sind(var_r31->unk_28.y) * cosd(var_r31->unk_28.x)); + sp8.y = -(-sind(var_r31->unk_28.x)); + sp8.z = -(cosd(var_r31->unk_28.y) * cosd(var_r31->unk_28.x)); + sp14.x = var_r31->unk_1C.x - (sp8.x * var_r31->unk_34); + sp14.y = var_r31->unk_1C.y - (sp8.y * var_r31->unk_34); + sp14.z = var_r31->unk_1C.z - (sp8.z * var_r31->unk_34); + HuAudFXListnerUpdate(&sp14, &sp8); +} + +void fn_1_784(omObjData *object) +{ + M421DllWork *work = object->data; + + if (work->unk_08 == 0) { + switch (work->unk_00) { + case 0: + WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 0x3C); + work->unk_00 = 1; + work->unk_10 = 0; + object->func = fn_1_213C(lbl_1_bss_28, object); + break; + case 1: + work->unk_00 = 2; + work->unk_18 = 0; + object->func = fn_1_142C; + break; + case 2: + work->unk_00 = 3; + work->unk_2C = 0; + object->func = fn_1_2A28(lbl_1_bss_28, object); + break; + case 3: + case 4: + work->unk_08 = 1; + work->unk_00 = 5; + object->func = fn_1_CBC; + break; + case 5: + default: + work->unk_00 = 5; + object->func = fn_1_10EC; + } + work->unk_04 = 0; + } +} + +void fn_1_8B8(omObjData *object) +{ + fn_1_578(object); + fn_1_784(object); +} + +void fn_1_CBC(omObjData *object) +{ + M421DllWork *work = object->data; + fn_1_578(object); + if (WipeStatGet() == 0) { + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 0x3C); + work->unk_08 = 0; + fn_1_784(object); + } +} + +void fn_1_10EC(omObjData *object) +{ + fn_1_578(object); + if (WipeStatGet() == 0) { + fn_1_48B0(); + fn_1_B1BC(); + MGSeqKillAll(); + HuAudFadeOut(1); + omOvlReturnEx(1, 1); + } +} + +void fn_1_142C(omObjData *object) +{ + M421DllWork *work = object->data; + fn_1_578(object); + switch (work->unk_14) { + case 0: + work->unk_1C = 0x2D; + work->unk_20 = 0x3C; + lbl_1_bss_18 = MGSeqCreate(3, 0); + MGSeqPosSet(lbl_1_bss_10, 320.0f, 240.0f); + lbl_1_bss_18 = -1; + work->unk_14 = 1; + work->unk_18 = 0; + break; + case 1: + if ((lbl_1_bss_4 < 0) && ((MGSeqStatGet(lbl_1_bss_10) & 0x10) != 0)) { + lbl_1_bss_4 = HuAudSeqPlay(0x48); + } + if (MGSeqStatGet(lbl_1_bss_18) == 0 && (work->unk_08 == 0)) { + work->unk_14 = 2; + work->unk_18 = 0; + object->func = fn_1_1850; + } + break; + } +} + +omObjFunc fn_1_213C(Process *process, omObjData *object) +{ + M421DllCameraStruct *var_r31; + + object->work[0] = object->work[1] = 0; + fn_1_3B50(1); + var_r31 = fn_1_3CB0(0); + var_r31->unk_84 = 1.0f; + var_r31->unk_94 = 0; + return fn_1_21AC; +} + +void fn_1_3020(Process *process) +{ + Hu3DCameraCreate(0x1F); + lbl_1_bss_20 = omAddObjEx(process, 0x7FDA, 0, 0, -1, omOutViewMulti); + lbl_1_bss_20->work[0] = 5; + lbl_1_bss_1C = omAddObjEx(process, 0xC, 1, 0, -1, fn_1_30D0); + lbl_1_bss_1C->work[0] = 0; +} + +void fn_1_30D0(omObjData *object) +{ + UnkM421DllStruct sp1C[5] = { + { 320.0f, 240.0f, 640.0f, 480.0f }, + { 160.0f, 120.0f, 320.0f, 240.0f }, + { 160.0f, 360.0f, 320.0f, 240.0f }, + { 480.0f, 120.0f, 320.0f, 240.0f }, + { 480.0f, 360.0f, 320.0f, 240.0f }, + }; + s32 sp8[5] = { 1, 2, 4, 8, 16 }; + M421DllCameraStruct *var_r31; + s32 var_r29; + M421DllCameraStruct *var_r28; + + object->data = HuMemDirectMallocNum(HEAP_SYSTEM, 10 * sizeof(M421DllCameraStruct), MEMORY_DEFAULT_NUM); + var_r28 = object->data; + memset(var_r28, 0, 10 * sizeof(M421DllCameraStruct)); + object->model[0] = Hu3DHookFuncCreate(fn_1_38FC); + Hu3DModelLayerSet(object->model[0], 0); + Hu3DModelCameraSet(object->model[0], 0x1E); + for (var_r31 = var_r28, var_r29 = 0; var_r29 < 5; var_r29++, var_r31++) { + var_r31->unk_00 = 1; + var_r31->unk_04 = var_r29 * 0x64; + var_r31->unk_10 = 41.5f; + var_r31->unk_14 = 100.0f; + var_r31->unk_18 = 5500.0f; + var_r31->unk_1C.x = 0.0f; + var_r31->unk_1C.y = 0.0f; + var_r31->unk_1C.z = 0.0f; + var_r31->unk_28.x = -15.0f; + var_r31->unk_28.y = 0.0f; + var_r31->unk_28.z = 0.0f; + var_r31->unk_34 = 1000.0f; + var_r31->unk_40 = 1.0f; + var_r31->unk_44.unk_00 = sp1C[var_r29].unk_00; + var_r31->unk_44.unk_04 = sp1C[var_r29].unk_04; + var_r31->unk_44.unk_08 = sp1C[var_r29].unk_08; + var_r31->unk_44.unk_0C = sp1C[var_r29].unk_0C; + var_r31->unk_3C = var_r31->unk_0C = sp8[var_r29]; + var_r31->unk_08 = var_r29; + var_r31->unk_38 = var_r29; + } + object->work[1] = 0; + object->work[0]++; + fn_1_335C(object); + object->func = fn_1_3334; +} + +void fn_1_3334(omObjData *object) +{ + fn_1_335C(object); +} + +void fn_1_335C(omObjData *var_r28) +{ + float var_f31; + M421DllCameraStruct *var_r31; + s32 var_r30; + s32 var_r29; + M421DllCameraStruct *var_r27; + u32 var_r26; + u32 var_r25; + s32 var_r24; + u32 var_r23; + u32 var_r22; + u32 var_r21; + + var_r27 = var_r28->data; + { + s32 sp40[4] = { 2, 4, 8, 16 }; + u32 sp30[4]; + s32 sp20[4]; + float sp10[4]; + float sp8[2]; + var_r24 = 0; + var_r26 = 0; + memcpy(&var_r27[5], var_r27, 5 * sizeof(M421DllCameraStruct)); + switch (var_r28->work[1]) { + case 0: + break; + case 1: + var_r26 |= 1; + break; + case 2: + var_r26 |= 1; + case 3: + var_r24 = 1; + case 4: + var_r26 |= 0x1E; + break; + } + if (var_r24 != 0) { + Hu3DModelAttrReset(var_r28->model[0], HU3D_ATTR_DISPOFF); + } + else { + Hu3DModelAttrSet(var_r28->model[0], HU3D_ATTR_DISPOFF); + } + for (var_r30 = 0; var_r30 < 4; var_r30++) { + sp30[var_r30] = var_r27[var_r30 + 6].unk_04; + sp20[var_r30] = var_r30; + } + for (var_r30 = 0; var_r30 < 3; var_r30++) { + for (var_r29 = var_r30 + 1; var_r29 < 4; var_r29++) { + if ((var_r30 != var_r29) && (sp30[var_r30] > sp30[var_r29])) { + var_r25 = sp30[var_r30]; + sp30[var_r30] = sp30[var_r29]; + sp30[var_r29] = var_r25; + var_r25 = sp20[var_r30]; + sp20[var_r30] = sp20[var_r29]; + sp20[var_r29] = var_r25; + } + } + } + for (var_r30 = 0; var_r30 < 4; var_r30++) { + var_r27[sp20[var_r30] + 6].unk_3C = sp40[var_r30]; + var_r27[sp20[var_r30] + 6].unk_38 = var_r30 + 1; + } + + for (var_r31 = &var_r27[5], var_r30 = 0; var_r30 < 5; var_r30++, var_r31++) { + if ((var_r31->unk_00 == 0) || ((var_r26 & var_r31->unk_0C) == 0)) { + Hu3DCamera[var_r31->unk_38].fov = -1.0f; + } + else { + var_f31 = 1.2f * ((var_r31->unk_44.unk_08 / 640.0f) / (var_r31->unk_44.unk_0C / 480.0f)); + sp10[2] = var_r31->unk_44.unk_08 * var_r31->unk_40; + sp10[3] = var_r31->unk_44.unk_0C * var_r31->unk_40; + Hu3DCameraPerspectiveSet(var_r31->unk_3C, var_r31->unk_10, var_r31->unk_14, var_r31->unk_18, var_f31); + Hu3DCameraViewportSet(var_r31->unk_3C, var_r31->unk_44.unk_00 - (0.5f * sp10[2]), var_r31->unk_44.unk_04 - (0.5f * sp10[3]), sp10[2], + sp10[3], 0.0f, 1.0f); + sp10[0] = var_r31->unk_44.unk_00 - (0.5f * sp10[2]); + sp10[1] = var_r31->unk_44.unk_04 - (0.5f * sp10[3]); + sp8[0] = var_r31->unk_44.unk_00 + (0.5f * sp10[2]); + sp8[1] = var_r31->unk_44.unk_04 + (0.5f * sp10[3]); + if (sp10[0] < 0.0f) { + sp10[0] = 0.0f; + } + if (sp10[1] < 0.0f) { + sp10[1] = 0.0f; + } + if (sp8[0] > 640.0f) { + sp8[0] = 640.0f; + } + if (sp8[1] > 480.0f) { + sp8[1] = 480.0f; + } + sp8[0] -= sp10[0]; + sp8[1] -= sp10[1]; + var_r21 = sp8[1]; + var_r22 = sp8[0]; + var_r23 = sp10[1]; + Hu3DCameraScissorSet(var_r31->unk_3C, sp10[0], var_r23, var_r22, var_r21); + var_r29 = var_r31->unk_38; + CenterM[var_r29].x = var_r31->unk_1C.x; + CenterM[var_r29].y = var_r31->unk_1C.y; + CenterM[var_r29].z = var_r31->unk_1C.z; + CRotM[var_r29].x = var_r31->unk_28.x; + CRotM[var_r29].y = var_r31->unk_28.y; + CRotM[var_r29].z = var_r31->unk_28.z; + CZoomM[var_r29] = var_r31->unk_34; + } + } + } +} + +void fn_1_38FC(ModelData *model, Mtx mtx) +{ + Mtx spC; + float var_f31; + float var_f30; + float var_f29; + + PSMTXIdentity(spC); + GXLoadPosMtxImm(spC, 0); + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); + GXSetNumTexGens(0); + GXSetNumTevStages(1); + GXSetTevColor(GX_TEVREG0, lbl_1_data_A0); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_C0); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetBlendMode(GX_BM_NONE, GX_BL_ONE, GX_BL_ZERO, GX_LO_SET); + GXSetZMode(GX_TRUE, GX_ALWAYS, GX_TRUE); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + var_f31 = 4125.0f; + var_f30 = 2750.0f; + var_f29 = 5494.5f; + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition3f32(-var_f31, var_f30, -var_f29); + GXPosition3f32(var_f31, var_f30, -var_f29); + GXPosition3f32(var_f31, -var_f30, -var_f29); + GXPosition3f32(-var_f31, -var_f30, -var_f29); +} + +void fn_1_3B50(u32 arg0) +{ + lbl_1_bss_1C->work[1] = arg0; +} + +u32 fn_1_3B64(void) +{ + return lbl_1_bss_1C->work[1]; +} + +M421DllCameraStruct *fn_1_3B78(s32 arg0) +{ + M421DllCameraStruct *var_r31; + s32 var_r30; + M421DllCameraStruct *var_r29; + + var_r29 = lbl_1_bss_1C->data; + for (var_r31 = var_r29, var_r30 = 0; var_r30 < 5; var_r30++, var_r31++) { + if ((var_r31->unk_0C & arg0) != 0) { + break; + } + } + if (var_r30 >= 5) { + OSReport("M421:Camera Flag Error!!\n"); + return NULL; + } + return var_r31; +} + +M421DllCameraStruct *fn_1_3C14(s32 arg0) +{ + M421DllCameraStruct *var_r31; + s32 var_r30; + M421DllCameraStruct *var_r29; + + var_r29 = lbl_1_bss_1C->data; + for (var_r31 = &var_r29[5], var_r30 = 0; var_r30 < 5; var_r30++, var_r31++) { + if ((var_r31->unk_0C & arg0) != 0) { + break; + } + } + if (var_r30 >= 5) { + OSReport("M421:Camera Flag Error!!\n"); + return NULL; + } + return var_r31; +} + +M421DllCameraStruct *fn_1_3CB0(u32 arg0) +{ + M421DllCameraStruct *var_r31 = lbl_1_bss_1C->data; + if (arg0 >= 5) { + OSReport("M421:Camera No. Error!!\n"); + return NULL; + } + return &var_r31[arg0]; +} + +M421DllCameraStruct *fn_1_3D18(u32 arg0) +{ + M421DllCameraStruct *var_r31 = lbl_1_bss_1C->data; + if (arg0 >= 5) { + OSReport("M421:Camera No. Error!!\n"); + return NULL; + } + return &var_r31[arg0 + 5]; +} + +void fn_1_3D84(s32 arg0, s32 arg1) +{ + M421DllCameraStruct *var_r31; + s32 var_r30; + s32 var_r29; + M421DllCameraStruct *var_r28; + M421DllCameraStruct *var_r27; + + var_r29 = 0; + if (arg0 >= 0) { + var_r27 = lbl_1_bss_1C->data; + var_r28 = &var_r27[5]; + for (var_r31 = var_r28, var_r30 = 0; var_r30 < 5; var_r30++, var_r31++) { + if ((var_r31->unk_0C & arg1) != 0) { + var_r29 |= var_r31->unk_3C; + } + } + Hu3DModelCameraSet(arg0, var_r29); + } +} + +void fn_1_4030(Vec *sp8, Vec *var_r31) +{ + Vec sp10; + float var_f30; + float var_f29; + + PSVECSubtract(var_r31, sp8, &sp10); + Center = *var_r31; + CRot.x = atan2d(sp10.y, sqrtf((sp10.x * sp10.x) + (sp10.z * sp10.z))); + CRot.y = atan2d(-sp10.x, -sp10.z); + CRot.z = 0.0f; + CZoom = PSVECMag(&sp10); +} + +void fn_1_4238(float arg8, float arg9, float argA, float argB, float argC, float argD) +{ + Vec sp3C; + Vec sp30; + Vec sp24; + + sp3C.x = arg8; + sp3C.y = arg9; + sp3C.z = argA; + sp30.x = argB; + sp30.y = argC; + sp30.z = argD; + PSVECSubtract(&sp30, &sp3C, &sp24); + Center = sp30; + CRot.x = atan2d(sp24.y, sqrtf((sp24.x * sp24.x) + (sp24.z * sp24.z))); + CRot.y = atan2d(-sp24.x, -sp24.z); + CRot.z = 0.0f; + CZoom = PSVECMag(&sp24); +} + +float fn_1_4478(float arg8, float arg9, float argA) +{ + float var_f31; + float var_f30; + float var_f29; + + var_f30 = fmod(arg9 - arg8, 360.0); + var_f31 = var_f30; + if (var_f31 < 0.0f) { + var_f31 += 360.0f; + } + if (var_f31 > 180.0f) { + var_f31 -= 360.0f; + } + var_f29 = fmod(arg8 + (argA * var_f31), 360.0); + var_f31 = var_f29; + if (var_f31 < 0.0f) { + var_f31 += 360.0f; + } + return var_f31; +} + +float fn_1_4594(float arg8, float arg9) +{ + float var_f31; + float var_f30; + + var_f30 = fmod(arg9 - arg8, 360.0); + var_f31 = var_f30; + if (var_f31 < 0.0f) { + var_f31 += 360.0f; + } + if (var_f31 > 180.0f) { + var_f31 -= 360.0f; + } + return var_f31; +} diff --git a/src/REL/m460Dll/main.c b/src/REL/m460Dll/main.c index 73c153ea..123f1c3e 100644 --- a/src/REL/m460Dll/main.c +++ b/src/REL/m460Dll/main.c @@ -168,30 +168,30 @@ void ObjectSetup(void) void fn_1_4C8(omObjData *var_r30) { - M460DllWork *var_r31; + M460DllWork *work; var_r30->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(M460DllWork), MEMORY_DEFAULT_NUM); - var_r31 = var_r30->data; - memset(var_r31, 0, sizeof(M460DllWork)); - var_r31->unk_00 = 0; - var_r31->unk_04 = 0; - var_r31->unk_0C = 0; - var_r31->unk_10 = 0; - var_r31->unk_14 = 0; - var_r31->unk_18 = 0; - var_r31->unk_4C = 0; - var_r31->unk_50 = 0; - var_r31->unk_08 = 0; - var_r31->unk_88 = 0; - var_r31->unk_74 = var_r31->unk_78 = var_r31->unk_7C = var_r31->unk_80 = -1; - var_r31->unk_8C = 0; - var_r31->unk_94 = 0; - var_r31->unk_30 = 0; - var_r31->unk_30 = GWMGRecordGet(0xC); - var_r31->unk_28 = (var_r31->unk_30 >> 0x10) & 0xFF; - var_r31->unk_24 = (var_r31->unk_30 >> 0x18) & 0xFF; - var_r31->unk_30 = (u16)var_r31->unk_30; - fn_1_8CAC(lbl_1_bss_30, var_r31->unk_30); + work = var_r30->data; + memset(work, 0, sizeof(M460DllWork)); + work->unk_00 = 0; + work->unk_04 = 0; + work->unk_0C = 0; + work->unk_10 = 0; + work->unk_14 = 0; + work->unk_18 = 0; + work->unk_4C = 0; + work->unk_50 = 0; + work->unk_08 = 0; + work->unk_88 = 0; + work->unk_74 = work->unk_78 = work->unk_7C = work->unk_80 = -1; + work->unk_8C = 0; + work->unk_94 = 0; + work->unk_30 = 0; + work->unk_30 = GWMGRecordGet(0xC); + work->unk_28 = (work->unk_30 >> 0x10) & 0xFF; + work->unk_24 = (work->unk_30 >> 0x18) & 0xFF; + work->unk_30 = (u16)work->unk_30; + fn_1_8CAC(lbl_1_bss_30, work->unk_30); var_r30->func = fn_1_948; } @@ -200,15 +200,15 @@ void fn_1_5F0(omObjData *var_r29) Vec sp14; Vec sp8; M460DllCameraStruct *var_r31; - M460DllWork *var_r30; + M460DllWork *work; - var_r30 = var_r29->data; - var_r30->unk_04++; - var_r30->unk_10++; - var_r30->unk_18++; - var_r30->unk_50++; - if ((omSysExitReq != 0) && (var_r30->unk_00 != 5)) { - var_r30->unk_00 = 4; + work = var_r29->data; + work->unk_04++; + work->unk_10++; + work->unk_18++; + work->unk_50++; + if ((omSysExitReq != 0) && (work->unk_00 != 5)) { + work->unk_00 = 4; fn_1_7FC(var_r29); } var_r31 = fn_1_3F2C(1); @@ -293,26 +293,26 @@ void fn_1_11EC(omObjData *object) void fn_1_1548(omObjData *object) { - M460DllWork *var_r28 = object->data; + M460DllWork *work = object->data; fn_1_5F0(object); - switch (var_r28->unk_14) { + switch (work->unk_14) { case 0: - var_r28->unk_1C = 0x3C; - var_r28->unk_20 = 0x3C; + work->unk_1C = 0x3C; + work->unk_20 = 0x3C; lbl_1_bss_18 = MGSeqCreate(3, 0); MGSeqPosSet(lbl_1_bss_18, 320.0f, 240.0f); - var_r28->unk_14 = 1; - var_r28->unk_18 = 0; + work->unk_14 = 1; + work->unk_18 = 0; break; case 1: if ((lbl_1_bss_8 < 0) && ((MGSeqStatGet(lbl_1_bss_18) & 0x10) != 0)) { lbl_1_bss_8 = HuAudSeqPlay(0x49); } if (MGSeqStatGet(lbl_1_bss_18) == 0) { - var_r28->unk_2C = 0; - var_r28->unk_44 = 0; - if (var_r28->unk_08 == 0) { - var_r28->unk_18 = 0; + work->unk_2C = 0; + work->unk_44 = 0; + if (work->unk_08 == 0) { + work->unk_18 = 0; object->func = fn_1_197C; } } @@ -322,36 +322,36 @@ void fn_1_1548(omObjData *object) void fn_1_197C(omObjData *object) { - M460DllWork *var_r31 = object->data; + M460DllWork *work = object->data; s32 var_r26 = 0; s32 sp8 = 0; fn_1_5F0(object); - switch (var_r31->unk_14) { + switch (work->unk_14) { case 1: if (WipeStatGet() == 0) { - var_r31->unk_38 = 3; - var_r31->unk_3C = 0; - var_r31->unk_40 = 0; - var_r31->unk_1C = 0x3C; - var_r31->unk_20 = 0x3C; - var_r31->unk_14 = 2; - var_r31->unk_18 = 0; + work->unk_38 = 3; + work->unk_3C = 0; + work->unk_40 = 0; + work->unk_1C = 0x3C; + work->unk_20 = 0x3C; + work->unk_14 = 2; + work->unk_18 = 0; } break; case 2: - if (var_r31->unk_38 == 3) { - if ((--var_r31->unk_20) == 0) { - var_r31->unk_20 = 0x3C; - var_r31->unk_1C--; - if (var_r31->unk_1C == 0) { - var_r31->unk_44 = 1; + if (work->unk_38 == 3) { + if ((--work->unk_20) == 0) { + work->unk_20 = 0x3C; + work->unk_1C--; + if (work->unk_1C == 0) { + work->unk_44 = 1; fn_1_42BC(frandmod(2)); } } - if ((lbl_1_bss_16 < 0) && (var_r31->unk_1C < 0xA)) { - lbl_1_bss_16 = MGSeqCreate(1, var_r31->unk_1C, -1, -1); + if ((lbl_1_bss_16 < 0) && (work->unk_1C < 0xA)) { + lbl_1_bss_16 = MGSeqCreate(1, work->unk_1C, -1, -1); } - MGSeqParamSet(lbl_1_bss_16, 1, var_r31->unk_1C); + MGSeqParamSet(lbl_1_bss_16, 1, work->unk_1C); } else { if (lbl_1_bss_16 >= 0) { @@ -359,65 +359,65 @@ void fn_1_197C(omObjData *object) lbl_1_bss_16 = -1; } if (frandmod(0x3E8) < 0x1F4) { - var_r31->unk_44 = 1; + work->unk_44 = 1; } - if (var_r31->unk_2C >= 0x1E) { - var_r31->unk_44 = 1; + if (work->unk_2C >= 0x1E) { + work->unk_44 = 1; } - if (var_r31->unk_44 != 0) { - var_r31->unk_44 = 1; - var_r31->unk_88 = 1; + if (work->unk_44 != 0) { + work->unk_44 = 1; + work->unk_88 = 1; } - var_r31->unk_14 = 3; - var_r31->unk_18 = 0; + work->unk_14 = 3; + work->unk_18 = 0; } break; case 3: if (fn_1_4358() != 0) { - if (var_r31->unk_44 != 0) { + if (work->unk_44 != 0) { var_r26 = 1; } - else if (var_r31->unk_18 > 60.0f) { - if (var_r31->unk_08 == 0) { + else if (work->unk_18 > 60.0f) { + if (work->unk_08 == 0) { WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 0x1E); WipeColorSet(0, 0, 0); } - var_r31->unk_14 = 4; - var_r31->unk_18 = 0; + work->unk_14 = 4; + work->unk_18 = 0; } } else { - var_r31->unk_18 = 0; + work->unk_18 = 0; } break; case 4: if (WipeStatGet() == 0) { - var_r31->unk_2C++; - if (var_r31->unk_08 == 0) { + work->unk_2C++; + if (work->unk_08 == 0) { WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 0x1E); } - var_r31->unk_14 = 1; - var_r31->unk_18 = 0; + work->unk_14 = 1; + work->unk_18 = 0; } break; } if (var_r26 != 0) { lbl_1_bss_14 = MGSeqCreate(3, 1); HuAudSeqFadeOut(lbl_1_bss_8, 0x64); - var_r31->unk_24++; - if (var_r31->unk_24 > 0xFF) { - var_r31->unk_24 = 0xFF; + work->unk_24++; + if (work->unk_24 > 0xFF) { + work->unk_24 = 0xFF; } - if (var_r31->unk_2C > var_r31->unk_30) { - var_r31->unk_28 = var_r31->unk_24; - var_r31->unk_30 = var_r31->unk_2C; - var_r31->unk_48 = 1; - GWMGRecordSet(0xC, var_r31->unk_30); + if (work->unk_2C > work->unk_30) { + work->unk_28 = work->unk_24; + work->unk_30 = work->unk_2C; + work->unk_48 = 1; + GWMGRecordSet(0xC, work->unk_30); } - mgRecordExtra = var_r31->unk_2C; - var_r31->unk_14 = 5; - var_r31->unk_18 = 0; - if (var_r31->unk_08 == 0) { + mgRecordExtra = work->unk_2C; + work->unk_14 = 5; + work->unk_18 = 0; + if (work->unk_08 == 0) { object->func = fn_1_201C; } } @@ -425,7 +425,7 @@ void fn_1_197C(omObjData *object) void fn_1_201C(omObjData *object) { - M460DllWork *var_r26 = object->data; + M460DllWork *work = object->data; if (lbl_1_bss_16 >= 0) { MGSeqParamSet(lbl_1_bss_16, 2, -1); @@ -433,13 +433,13 @@ void fn_1_201C(omObjData *object) } fn_1_5F0(object); if (MGSeqStatGet(lbl_1_bss_14) == 0) { - if (var_r26->unk_48 != 0) { + if (work->unk_48 != 0) { fn_1_8FAC(1); - lbl_1_bss_12 = MGSeqCreate(0xE, var_r26->unk_30); - var_r26->unk_48 = 0; + lbl_1_bss_12 = MGSeqCreate(0xE, work->unk_30); + work->unk_48 = 0; } - var_r26->unk_14 = 6; - var_r26->unk_18 = 0; + work->unk_14 = 6; + work->unk_18 = 0; fn_1_7FC(object); } } @@ -460,11 +460,11 @@ void fn_1_2564(omObjData *object) { Vec sp20; M460DllCameraStruct *var_r26; - M460DllWork *var_r25; + M460DllWork *work; s32 var_r24; float var_f31; - var_r25 = object->data; + work = object->data; fn_1_5F0(object); object->work[0]++; var_f31 = lbl_1_data_AC[object->work[1]]; @@ -499,11 +499,11 @@ void fn_1_2564(omObjData *object) fn_1_8BA0(lbl_1_data_A0[object->work[1]]); } if (lbl_1_data_AC[object->work[1]] == 0) { - var_r25->unk_0C = 2; + work->unk_0C = 2; fn_1_7FC(object); } else if (lbl_1_data_AC[object->work[1] + 1] == 0) { - var_r25->unk_0C = 1; + work->unk_0C = 1; } } } @@ -515,7 +515,7 @@ omObjFunc fn_1_2D64(Process *process, omObjData *object) void fn_1_2D70(omObjData *object) { - M460DllWork *var_r26 = object->data; + M460DllWork *work = object->data; s32 var_r23 = 1; fn_1_5F0(object); if (lbl_1_bss_12 >= 0) { @@ -526,21 +526,21 @@ void fn_1_2D70(omObjData *object) lbl_1_bss_12 = -1; } } - if (var_r26->unk_8C != 1) { + if (work->unk_8C != 1) { var_r23 = 0; } if (var_r23 != 0) { - var_r26->unk_4C = 1; + work->unk_4C = 1; if (lbl_1_bss_4 < 0) { lbl_1_bss_4 = HuAudSStreamPlay(4); } - if (var_r26->unk_50 >= 210.0f) { - var_r26->unk_4C = 2; + if (work->unk_50 >= 210.0f) { + work->unk_4C = 2; fn_1_7FC(object); } } else { - var_r26->unk_50 = 0; + work->unk_50 = 0; } } @@ -569,7 +569,7 @@ void fn_1_337C(omObjData *object) object->data = HuMemDirectMallocNum(HEAP_SYSTEM, 10 * sizeof(M460DllCameraStruct), MEMORY_DEFAULT_NUM); var_r28 = object->data; - memset(var_r28, 0, 0x668); + memset(var_r28, 0, 10 * sizeof(M460DllCameraStruct)); object->model[0] = Hu3DHookFuncCreate(fn_1_3BC0); Hu3DModelLayerSet(object->model[0], 0); Hu3DModelCameraSet(object->model[0], 0x1E); @@ -879,9 +879,9 @@ s32 fn_1_419C(void) void fn_1_41B4(s32 arg0, s32 arg1, s32 arg2) { - M460DllWork *var_r31 = lbl_1_bss_2C->data; - var_r31->unk_64[arg0 &= 3] = arg1; - var_r31->unk_54[arg0] = arg2; + M460DllWork *work = lbl_1_bss_2C->data; + work->unk_64[arg0 &= 3] = arg1; + work->unk_54[arg0] = arg2; } void fn_1_41F4(s32 arg0) @@ -906,9 +906,9 @@ s32 fn_1_4284(void) void fn_1_42BC(u32 arg0) { - M460DllWork *var_r31 = lbl_1_bss_2C->data; - if (var_r31->unk_38 == 3) { - var_r31->unk_38 = arg0; + M460DllWork *work = lbl_1_bss_2C->data; + if (work->unk_38 == 3) { + work->unk_38 = arg0; } }