diff --git a/include/rel_sqrt_consts.h b/include/rel_sqrt_consts.h deleted file mode 100644 index fd06a9e9..00000000 --- a/include/rel_sqrt_consts.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _REL_SQRT_CONSTS -#define _REL_SQRT_CONSTS - - -#endif diff --git a/src/REL/E3setupDLL/mgselect.c b/src/REL/E3setupDLL/mgselect.c index ece67721..5dbd89eb 100644 --- a/src/REL/E3setupDLL/mgselect.c +++ b/src/REL/E3setupDLL/mgselect.c @@ -6,7 +6,6 @@ #include "game/sprite.h" #include "game/window.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" #include "REL/E3SetupDLL.h" diff --git a/src/REL/instDll/main.c b/src/REL/instDll/main.c index 2853c63e..3dbcc0a4 100644 --- a/src/REL/instDll/main.c +++ b/src/REL/instDll/main.c @@ -21,8 +21,6 @@ #include "ext_math.h" #include "math.h" -#include "rel_sqrt_consts.h" - #include "REL/instDll.h" static s16 lbl_1_data_0 = 1; diff --git a/src/REL/m401Dll/main.c b/src/REL/m401Dll/main.c index 14147e35..cb02264e 100644 --- a/src/REL/m401Dll/main.c +++ b/src/REL/m401Dll/main.c @@ -17,8 +17,6 @@ #include "ext_math.h" #include "math.h" -#include "rel_sqrt_consts.h" - float lbl_2_data_0 = -7.1875f; s16 lbl_2_data_4[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; diff --git a/src/REL/m402Dll/main.c b/src/REL/m402Dll/main.c index 3e3aadbd..59f189c3 100755 --- a/src/REL/m402Dll/main.c +++ b/src/REL/m402Dll/main.c @@ -22,7 +22,6 @@ #include "dolphin.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" #undef ABS #define ABS(x) ((0 > (x)) ? -(x) : (x)) diff --git a/src/REL/m403Dll/main.c b/src/REL/m403Dll/main.c index d0f9003a..a1e3fc91 100755 --- a/src/REL/m403Dll/main.c +++ b/src/REL/m403Dll/main.c @@ -17,7 +17,6 @@ #include "game/wipe.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" typedef struct { /* 0x000 */ u8 unk00; diff --git a/src/REL/m404Dll/main.c b/src/REL/m404Dll/main.c index 63011f56..6b790aee 100644 --- a/src/REL/m404Dll/main.c +++ b/src/REL/m404Dll/main.c @@ -10,7 +10,7 @@ #include "game/pad.h" #include "game/sprite.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" + #include "string.h" typedef struct UnkM404Struct { diff --git a/src/REL/m405Dll/main.c b/src/REL/m405Dll/main.c index f13da739..0c999c19 100755 --- a/src/REL/m405Dll/main.c +++ b/src/REL/m405Dll/main.c @@ -22,7 +22,6 @@ #include "dolphin.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" #undef ABS #define ABS(x) ((0 > (x)) ? -(x) : (x)) diff --git a/src/REL/m406Dll/main.c b/src/REL/m406Dll/main.c index 6d70cd61..8642d951 100644 --- a/src/REL/m406Dll/main.c +++ b/src/REL/m406Dll/main.c @@ -5,7 +5,6 @@ #include "game/hsfdraw.h" #include "game/minigame_seq.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" #include "REL/m406Dll.h" diff --git a/src/REL/m407dll/player.c b/src/REL/m407dll/player.c index 394f2885..395fb157 100644 --- a/src/REL/m407dll/player.c +++ b/src/REL/m407dll/player.c @@ -8,8 +8,6 @@ #include "game/process.h" #include "math.h" -#include "rel_sqrt_consts.h" - #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) typedef void (*ObjFuncs)(omObjData *); diff --git a/src/REL/m408Dll/main.c b/src/REL/m408Dll/main.c index 32571be7..38ab51b1 100644 --- a/src/REL/m408Dll/main.c +++ b/src/REL/m408Dll/main.c @@ -19,8 +19,6 @@ #include "ext_math.h" #include "math.h" -#include "rel_sqrt_consts.h" - s32 lbl_1_data_0[] = { DATA_MAKE_NUM(DATADIR_MGCONST, 0x00), DATA_MAKE_NUM(DATADIR_MGCONST, 0x01), diff --git a/src/REL/m409Dll/main.c b/src/REL/m409Dll/main.c index e41a1130..5071127d 100644 --- a/src/REL/m409Dll/main.c +++ b/src/REL/m409Dll/main.c @@ -11,7 +11,6 @@ #include "game/sprite.h" #include "game/wipe.h" #include "math.h" -#include "rel_sqrt_consts.h" // bss Process *lbl_1_bss_E8; diff --git a/src/REL/m410Dll/main.c b/src/REL/m410Dll/main.c index 5b234c7b..42506076 100644 --- a/src/REL/m410Dll/main.c +++ b/src/REL/m410Dll/main.c @@ -5,7 +5,6 @@ #include "game/minigame_seq.h" #include "game/object.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" #include "REL/m410Dll.h" @@ -158,37 +157,36 @@ void fn_1_63C(omObjData *object) return; } switch (var_r31->unk_00) { - case 0: - WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); - Hu3DCameraPerspectiveSet(1, 41.5f, 5.0f, 5000.0f, 1.2f); - var_r31->unk_00 = 1; - var_r31->unk_10 = 0; - object->func = fn_1_19C8(lbl_1_bss_28, object); - break; - case 1: - var_r31->unk_00 = 2; - var_r31->unk_18 = 0; - object->func = fn_1_FF0; - break; - case 2: - var_r31->unk_00 = 3; - var_r31->unk_28 = 0; - object->func = fn_1_216C(lbl_1_bss_28, object); - break; - case 3: - case 4: - var_r31->unk_08 = 1; - var_r31->unk_00 = 5; - object->func = fn_1_ABC; - break; - case 5: - default: - var_r31->unk_00 = 5; - object->func = fn_1_DEC; - break; + case 0: + WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); + Hu3DCameraPerspectiveSet(1, 41.5f, 5.0f, 5000.0f, 1.2f); + var_r31->unk_00 = 1; + var_r31->unk_10 = 0; + object->func = fn_1_19C8(lbl_1_bss_28, object); + break; + case 1: + var_r31->unk_00 = 2; + var_r31->unk_18 = 0; + object->func = fn_1_FF0; + break; + case 2: + var_r31->unk_00 = 3; + var_r31->unk_28 = 0; + object->func = fn_1_216C(lbl_1_bss_28, object); + break; + case 3: + case 4: + var_r31->unk_08 = 1; + var_r31->unk_00 = 5; + object->func = fn_1_ABC; + break; + case 5: + default: + var_r31->unk_00 = 5; + object->func = fn_1_DEC; + break; } var_r31->unk_04 = 0; - } void fn_1_7A8(omObjData *object) @@ -233,38 +231,36 @@ void fn_1_FF0(omObjData *object) fn_1_5A8(object); switch (var_r29->unk_14) { - case 0: - var_r29->unk_1C = 30; - var_r29->unk_20 = 60; - lbl_1_bss_14 = MGSeqCreate(3, 0); - MGSeqPosSet(lbl_1_bss_14, 320.0f, 240.0f); - CRot.x = -11.2f; - CRot.y = CRot.z = 0.0f; - Center.x = 0.0f; - Center.y = 367.0f; - Center.z = 252.0f; - CZoom = 592.0f; - var_r29->unk_14 = 1; - var_r29->unk_18 = 0; - break; - - case 1: - if (lbl_1_bss_4 < 0 && MGSeqStatGet(lbl_1_bss_14) & 16) { - lbl_1_bss_4 = HuAudSeqPlay(71); - } - if (!MGSeqStatGet(lbl_1_bss_14) && !var_r29->unk_08) { - lbl_1_bss_1C = MGSeqCreate(1, var_r29->unk_1C, -1, -1); - var_r29->unk_14 = 2; - var_r29->unk_18 = 0; - object->func = fn_1_139C; - } - break; - - default: - break; - } + case 0: + var_r29->unk_1C = 30; + var_r29->unk_20 = 60; + lbl_1_bss_14 = MGSeqCreate(3, 0); + MGSeqPosSet(lbl_1_bss_14, 320.0f, 240.0f); + CRot.x = -11.2f; + CRot.y = CRot.z = 0.0f; + Center.x = 0.0f; + Center.y = 367.0f; + Center.z = 252.0f; + CZoom = 592.0f; + var_r29->unk_14 = 1; + var_r29->unk_18 = 0; + break; - + case 1: + if (lbl_1_bss_4 < 0 && MGSeqStatGet(lbl_1_bss_14) & 16) { + lbl_1_bss_4 = HuAudSeqPlay(71); + } + if (!MGSeqStatGet(lbl_1_bss_14) && !var_r29->unk_08) { + lbl_1_bss_1C = MGSeqCreate(1, var_r29->unk_1C, -1, -1); + var_r29->unk_14 = 2; + var_r29->unk_18 = 0; + object->func = fn_1_139C; + } + break; + + default: + break; + } } void fn_1_139C(omObjData *object) diff --git a/src/REL/m411Dll/main.c b/src/REL/m411Dll/main.c index dd110cb4..d4a6acef 100755 --- a/src/REL/m411Dll/main.c +++ b/src/REL/m411Dll/main.c @@ -18,7 +18,6 @@ #include "dolphin.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" typedef struct { /* 0x00 */ s16 unk00; diff --git a/src/REL/m412Dll/main.c b/src/REL/m412Dll/main.c index 05a6ac98..1cad6746 100644 --- a/src/REL/m412Dll/main.c +++ b/src/REL/m412Dll/main.c @@ -12,7 +12,6 @@ #include "game/sprite.h" #include "game/wipe.h" #include "math.h" -#include "rel_sqrt_consts.h" // bss s16 lbl_1_bss_7A0; diff --git a/src/REL/m413Dll/main.c b/src/REL/m413Dll/main.c index 7ae0c7e6..ee218503 100644 --- a/src/REL/m413Dll/main.c +++ b/src/REL/m413Dll/main.c @@ -14,8 +14,6 @@ #include "ext_math.h" -#include "rel_sqrt_consts.h" - typedef struct struct_bss_2A6C StructBss2A6C; typedef struct struct_sp_14C8 StructSp14C8; diff --git a/src/REL/m414Dll/main.c b/src/REL/m414Dll/main.c index 8e6cad03..1268cdad 100644 --- a/src/REL/m414Dll/main.c +++ b/src/REL/m414Dll/main.c @@ -9,7 +9,6 @@ #include "game/pad.h" #include "game/sprite.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" typedef struct UnkM414Struct { s32 unk00; diff --git a/src/REL/m415Dll/main.c b/src/REL/m415Dll/main.c index cb5bdac7..971724b5 100644 --- a/src/REL/m415Dll/main.c +++ b/src/REL/m415Dll/main.c @@ -15,7 +15,6 @@ #include "game/sprite.h" #include "game/wipe.h" #include "math.h" -#include "rel_sqrt_consts.h" // bss unkStruct5 lbl_1_bss_36C; diff --git a/src/REL/m416Dll/main.c b/src/REL/m416Dll/main.c index 591b8b64..33fe0518 100644 --- a/src/REL/m416Dll/main.c +++ b/src/REL/m416Dll/main.c @@ -17,8 +17,6 @@ #include "REL/m416Dll.h" -#include "rel_sqrt_consts.h" - typedef struct camera_view_params { float zoom; Vec pos; diff --git a/src/REL/m417Dll/main.c b/src/REL/m417Dll/main.c index 3a5b2aff..02a55063 100644 --- a/src/REL/m417Dll/main.c +++ b/src/REL/m417Dll/main.c @@ -3,7 +3,6 @@ #include "game/hsfdraw.h" #include "game/minigame_seq.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" #include "REL/m417Dll.h" diff --git a/src/REL/m420dll/main.c b/src/REL/m420dll/main.c index c5fe048e..18f5b3ea 100644 --- a/src/REL/m420dll/main.c +++ b/src/REL/m420dll/main.c @@ -7,7 +7,6 @@ #include "game/pad.h" #include "game/printfunc.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" #include "REL/m420dll.h" diff --git a/src/REL/m426Dll/main.c b/src/REL/m426Dll/main.c index 8cd93019..d9864fb5 100644 --- a/src/REL/m426Dll/main.c +++ b/src/REL/m426Dll/main.c @@ -10,7 +10,6 @@ #include "game/pad.h" #include "game/sprite.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" typedef struct UnkM426Struct { /* 0x00 */ s32 unk_00; diff --git a/src/REL/m429Dll/main.c b/src/REL/m429Dll/main.c index c995e66a..7c2aa9be 100644 --- a/src/REL/m429Dll/main.c +++ b/src/REL/m429Dll/main.c @@ -21,7 +21,6 @@ #include "game/sprite.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" #undef ABS #define ABS(x) ((0 > (x)) ? -(x) : (x)) diff --git a/src/REL/m431Dll/main.c b/src/REL/m431Dll/main.c index 3d3f65f2..9ef89c53 100644 --- a/src/REL/m431Dll/main.c +++ b/src/REL/m431Dll/main.c @@ -16,8 +16,6 @@ #include "REL/m431Dll.h" -#include "rel_sqrt_consts.h" - typedef struct bss_5C_struct { s16 unk0[6]; s16 unkC[2]; diff --git a/src/REL/m434Dll/main.c b/src/REL/m434Dll/main.c index e0fcf2ac..733df325 100644 --- a/src/REL/m434Dll/main.c +++ b/src/REL/m434Dll/main.c @@ -6,15 +6,12 @@ #include "game/sprite.h" #include "game/wipe.h" - #include "REL/m434Dll.h" #include "ext_math.h" #include "game/gamework_data.h" #include "game/minigame_seq.h" #include "math.h" -#include "rel_sqrt_consts.h" - typedef struct camera_view { float zoom; Vec pos; diff --git a/src/REL/m436Dll/main.c b/src/REL/m436Dll/main.c index 4e2523c2..c7a806b9 100755 --- a/src/REL/m436Dll/main.c +++ b/src/REL/m436Dll/main.c @@ -14,10 +14,9 @@ #include "game/wipe.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" typedef struct { - /* 0x00 */ omObjData* unk00; + /* 0x00 */ omObjData *unk00; /* 0x04 */ s32 unk04; /* 0x08 */ s32 unk08; /* 0x0C */ s32 unk0C; @@ -47,18 +46,18 @@ typedef struct { } StructBss234; // Size 0xF8 typedef struct { - /* 0x00 */ omObjData* unk00; + /* 0x00 */ omObjData *unk00; /* 0x04 */ s32 unk04; /* 0x08 */ char unk08[0xC]; } StructBss220; // Size 0x14 typedef struct { - /* 0x00 */ omObjData* unk00; + /* 0x00 */ omObjData *unk00; /* 0x04 */ Vec unk04[8]; } StructBss1BC; // Size 0x64 typedef struct { - /* 0x00 */ omObjData* unk00; + /* 0x00 */ omObjData *unk00; /* 0x04 */ s32 unk04; /* 0x08 */ float unk08[6]; /* 0x20 */ char unk20[8]; @@ -73,12 +72,12 @@ typedef struct { } StructBssD8; // Size 0xA8 typedef struct { - /* 0x00 */ omObjData* unk00; + /* 0x00 */ omObjData *unk00; /* 0x04 */ char unk04[0x10]; } StructBss1A8; // Size 0x14 typedef struct { - /* 0x00 */ omObjData* unk00; + /* 0x00 */ omObjData *unk00; /* 0x04 */ char unk04[0x10]; } StructBss180; // Size 0x14 @@ -115,46 +114,24 @@ 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[] = { - DATA_MAKE_NUM(DATADIR_M436, 13), - DATA_MAKE_NUM(DATADIR_M436, 14), - DATA_MAKE_NUM(DATADIR_M436, 15), - DATA_MAKE_NUM(DATADIR_M436, 16), - DATA_MAKE_NUM(DATADIR_M436, 17), - DATA_MAKE_NUM(DATADIR_M436, 18), - DATA_MAKE_NUM(DATADIR_M436, 19), - DATA_MAKE_NUM(DATADIR_M436, 20) -}; +s32 lbl_1_data_0[] + = { DATA_MAKE_NUM(DATADIR_M436, 13), DATA_MAKE_NUM(DATADIR_M436, 14), DATA_MAKE_NUM(DATADIR_M436, 15), DATA_MAKE_NUM(DATADIR_M436, 16), + DATA_MAKE_NUM(DATADIR_M436, 17), DATA_MAKE_NUM(DATADIR_M436, 18), DATA_MAKE_NUM(DATADIR_M436, 19), DATA_MAKE_NUM(DATADIR_M436, 20) }; -s32 lbl_1_data_20[] = { - MAKE_MESSID(29, 23), - MAKE_MESSID(29, 24), - MAKE_MESSID(29, 30), - MAKE_MESSID(29, 26), - MAKE_MESSID(29, 28), - MAKE_MESSID(29, 27), - MAKE_MESSID(29, 25), - MAKE_MESSID(29, 29) -}; +s32 lbl_1_data_20[] = { MAKE_MESSID(29, 23), MAKE_MESSID(29, 24), MAKE_MESSID(29, 30), MAKE_MESSID(29, 26), MAKE_MESSID(29, 28), MAKE_MESSID(29, 27), + MAKE_MESSID(29, 25), MAKE_MESSID(29, 29) }; -s32 lbl_1_data_40[][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_40[][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_E0 = -1; s32 lbl_1_data_E4 = -1; s32 lbl_1_data_E8 = -1; -void fn_1_0(void) { +void fn_1_0(void) +{ s32 i; while (TRUE) { @@ -172,21 +149,24 @@ 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(void) { - StructBss32C* var_r31; +void fn_1_230(void) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; if (HuPadBtn[0] & 0x200) { if (HuPadBtn[0] & 0x100) { var_r31->unk0C -= HuPadStkY[0] / 10.0f; - } else { + } + else { var_r31->unk04 += HuPadStkX[0] / 10.0f; var_r31->unk08 += HuPadStkY[0] / 10.0f; } @@ -216,24 +196,28 @@ void fn_1_230(void) { print8(16, 130, 1.0f, "ZOOM : %.2f", var_r31->unk34); } -void fn_1_614(s32 arg0, s32 arg1, float arg2) { - StructBss32C* var_r31; +void fn_1_614(s32 arg0, s32 arg1, float arg2) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; var_r31->unk40[arg0] = arg1; if (var_r31->unk5C[arg0] < 0.0f) { var_r31->unk5C[arg0] = -arg2; - } else { + } + else { var_r31->unk5C[arg0] = arg2; } } -void fn_1_67C(s32 arg0, float arg1) { +void fn_1_67C(s32 arg0, float arg1) +{ fn_1_614(arg0, -1, arg1); } -float fn_1_6E8(s32 arg0) { - StructBss32C* var_r31; +float fn_1_6E8(s32 arg0) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; if (var_r31->unk5C[arg0] != 0.0f) { @@ -242,7 +226,8 @@ float fn_1_6E8(s32 arg0) { if (var_r31->unk5C[arg0] >= -0.5f && var_r31->unk5C[arg0] <= 0.5f) { var_r31->unk5C[arg0] = 0.0f; } - } else { + } + else { var_r31->unk40[arg0]--; if (var_r31->unk40[arg0] <= 0) { var_r31->unk40[arg0] = 0; @@ -253,8 +238,9 @@ float fn_1_6E8(s32 arg0) { return var_r31->unk5C[arg0]; } -void fn_1_818(void) { - StructBss32C* var_r31; +void fn_1_818(void) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; var_r31->unk04 = 0.0f; @@ -266,15 +252,17 @@ void fn_1_818(void) { var_r31->unk34 = 300.0f; } -void fn_1_8A4(void (*arg0)(void)) { - StructBss32C* var_r31; +void fn_1_8A4(void (*arg0)(void)) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; var_r31->unk00 = arg0; } -void fn_1_8C4(omObjData* arg0) { - StructBss32C* var_r31; +void fn_1_8C4(omObjData *arg0) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; if (var_r31->unk00 != NULL) { @@ -289,7 +277,8 @@ void fn_1_8C4(omObjData* arg0) { CZoom = var_r31->unk34 + fn_1_6E8(6); } -void fn_1_F6C(void) { +void fn_1_F6C(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); @@ -298,7 +287,8 @@ void fn_1_F6C(void) { omAddObjEx(lbl_1_bss_0, 0x7FD9, 0, 0, -1, fn_1_8C4); } -void fn_1_1084(void) { +void fn_1_1084(void) +{ Vec sp20 = { 0.0f, 2500.0f, 1.0f }; Vec sp14 = { 0.0f, 0.0f, 0.0f }; Vec sp8 = { 0.0f, 1.0f, 0.0f }; @@ -308,8 +298,9 @@ void fn_1_1084(void) { Hu3DShadowPosSet(&sp20, &sp8, &sp14); } -void fn_1_1148(s32 arg0, float arg1, float arg2, s32 arg3) { - WindowData* temp_r29; +void fn_1_1148(s32 arg0, float arg1, float arg2, s32 arg3) +{ + WindowData *temp_r29; float temp_f29; float temp_f28; float temp_f25; @@ -333,10 +324,12 @@ void fn_1_1148(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; } } @@ -344,10 +337,12 @@ void fn_1_1148(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; } } @@ -358,7 +353,8 @@ void fn_1_1148(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; @@ -373,15 +369,18 @@ void fn_1_1148(s32 arg0, float arg1, float arg2, s32 arg3) { if (i <= 10) { var_f23 = fn_1_11164(var_f31, temp_f29, i, 10.0f); var_f21 = fn_1_11164(temp_f27, 1.0f, i, 10.0f); - } else { + } + else { var_f22 = fn_1_11164(var_f30, temp_f28, i - 10, 5.0f); var_f20 = fn_1_11164(temp_f26, 1.0f, i - 10, 5.0f); } - } else { + } + else { if (i <= 10) { var_f22 = fn_1_11164(temp_f28, var_f30, i, 10.0f); var_f20 = fn_1_11164(1.0f, temp_f26, i, 10.0f); - } else { + } + else { var_f23 = fn_1_11164(temp_f29, var_f31, i - 10, 5.0f); var_f21 = fn_1_11164(1.0f, temp_f27, i - 10, 5.0f); } @@ -392,19 +391,22 @@ void fn_1_1148(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_178C(void) { +void fn_1_178C(void) +{ HuWinInit(1); } -void fn_1_17B0(s32 arg0, float arg1, float arg2) { - WindowData* temp_r31; +void fn_1_17B0(s32 arg0, float arg1, float arg2) +{ + WindowData *temp_r31; float temp_f29; float temp_f28; float temp_f27; @@ -428,10 +430,12 @@ void fn_1_17B0(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; } } @@ -439,10 +443,12 @@ void fn_1_17B0(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; } } @@ -463,8 +469,9 @@ void fn_1_17B0(s32 arg0, float arg1, float arg2) { HuPrcVSleep(); } -void fn_1_1C08(s32 arg0, float arg1, float arg2) { - WindowData* temp_r31; +void fn_1_1C08(s32 arg0, float arg1, float arg2) +{ + WindowData *temp_r31; float temp_f29; float temp_f28; float temp_f27; @@ -488,10 +495,12 @@ void fn_1_1C08(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; } } @@ -499,10 +508,12 @@ void fn_1_1C08(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; } } @@ -523,12 +534,9 @@ void fn_1_1C08(s32 arg0, float arg1, float arg2) { HuPrcVSleep(); } -s32 fn_1_2060(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4) { - s32 sp20[][5] = { - { 0xFF, 0xFF, 0xCC, 0x00, 0x09 }, - { 0xCC, 0xFF, 0xFF, 0x00, 0x09 }, - { 0xFF, 0xCC, 0xFF, 0x00, 0x09 } - }; +s32 fn_1_2060(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4) +{ + s32 sp20[][5] = { { 0xFF, 0xFF, 0xCC, 0x00, 0x09 }, { 0xCC, 0xFF, 0xFF, 0x00, 0x09 }, { 0xFF, 0xCC, 0xFF, 0x00, 0x09 } }; float sp14[] = { 0.9f, 0.9f, 0.9f }; GXColor sp10; s32 temp_r31; @@ -543,22 +551,26 @@ s32 fn_1_2060(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4) { return temp_r31; } -s32 fn_1_2230(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4) { +s32 fn_1_2230(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4) +{ return fn_1_2060(arg0, arg1, arg2, arg3, arg4); } -void fn_1_2400(s32 arg0) { +void fn_1_2400(s32 arg0) +{ HuWinMesSet(arg0, MAKE_MESSID(29, 22)); HuPrcVSleep(); fn_1_1148(arg0, 0.5f, 0.5f, 0); HuWinKill(arg0); } -void fn_1_2468(s32 arg0) { +void fn_1_2468(s32 arg0) +{ fn_1_2400(arg0); } -void fn_1_24D0(s32 arg0, s32 arg1) { +void fn_1_24D0(s32 arg0, s32 arg1) +{ s32 i; s32 var_r30; s32 temp_r28; @@ -584,7 +596,8 @@ void fn_1_24D0(s32 arg0, s32 arg1) { HuWinComKeyReset(); } -void fn_1_25B8(s32 arg0) { +void fn_1_25B8(s32 arg0) +{ s32 var_r31; s32 temp_r28; s32 i; @@ -605,13 +618,15 @@ void fn_1_25B8(s32 arg0) { var_r31 = HuWinChoiceGet(arg0, 1); if (var_r31 == -1 || var_r31 == 1) { lbl_1_bss_8 = 0; - } else { + } + else { lbl_1_bss_8 = 1; } HuWinComKeyReset(); } -void fn_1_26D4(float* arg0, s32 arg1) { +void fn_1_26D4(float *arg0, s32 arg1) +{ float spC[2]; HuWinMesMaxSizeGet(1, spC, arg1); @@ -623,29 +638,34 @@ void fn_1_26D4(float* arg0, s32 arg1) { } } -void fn_1_2744(s32 arg0, s32 arg1) { +void fn_1_2744(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_27C8(s32 arg0) { +void fn_1_27C8(s32 arg0) +{ if (lbl_1_bss_10 == 0) { lbl_1_bss_10 = 1; lbl_1_bss_C = arg0 * 60; } } -s32 fn_1_2800(void) { +s32 fn_1_2800(void) +{ if (lbl_1_bss_10 == 3) { return 1; - } else { + } + else { return 0; } } -void fn_1_2824(void) { +void fn_1_2824(void) +{ if (lbl_1_bss_10 == 2) { lbl_1_bss_10 = 3; lbl_1_bss_C = 30; @@ -654,7 +674,8 @@ void fn_1_2824(void) { s32 lbl_1_data_16C = -1; -void fn_1_285C(omObjData* arg0) { +void fn_1_285C(omObjData *arg0) +{ switch (lbl_1_bss_10) { case 1: if (lbl_1_data_16C == -1) { @@ -683,20 +704,22 @@ void fn_1_285C(omObjData* arg0) { } } -void fn_1_2A2C(void) { +void fn_1_2A2C(void) +{ lbl_1_bss_C = 0; lbl_1_bss_10 = 0; omAddObjEx(lbl_1_bss_0, 0x2000, 0, 0, -1, fn_1_285C); } -void fn_1_2A90(s32 arg0) { +void fn_1_2A90(s32 arg0) +{ float spC[2]; float temp_f31; float temp_f30; float temp_f28; float temp_f29; - WindowData* temp_r29; - StructBss234* var_r31; + WindowData *temp_r29; + StructBss234 *var_r31; s32 i; temp_r29 = &winData[arg0]; @@ -707,7 +730,8 @@ void fn_1_2A90(s32 arg0) { temp_f29 = temp_r29->w; for (i = 0; i < var_r31->unk00; i++) { HuWinMesMaxSizeGet(1, spC, lbl_1_data_20[var_r31->unk44[i]]); - var_r31->unk08[i] = HuWinCreate(temp_f31 + temp_f29 + 16.0f + var_r31->unk80[i][0], temp_f30 + 26.0f + var_r31->unk80[i][1], spC[0], spC[1], 1); + var_r31->unk08[i] + = HuWinCreate(temp_f31 + temp_f29 + 16.0f + var_r31->unk80[i][0], temp_f30 + 26.0f + var_r31->unk80[i][1], spC[0], spC[1], 1); winData[var_r31->unk08[i]].mess_shadow_color = 9; HuWinMesColSet(var_r31->unk08[i], 0); HuWinScissorSet(var_r31->unk08[i], temp_f31 + 20.0f, temp_f30, temp_f29 + 20.0f, temp_f28); @@ -719,14 +743,15 @@ void fn_1_2A90(s32 arg0) { HuPrcVSleep(); } -void fn_1_2D94(s32 arg0) { +void fn_1_2D94(s32 arg0) +{ float sp10[2]; float temp_f31; float temp_f29; float spC; float temp_f30; - WindowData* temp_r30; - StructBss234* var_r31; + WindowData *temp_r30; + StructBss234 *var_r31; s32 i; temp_r30 = &winData[arg0]; @@ -755,9 +780,10 @@ void fn_1_2D94(s32 arg0) { HuPrcVSleep(); } -void fn_1_3020(void) { +void fn_1_3020(void) +{ s32 i; - StructBss234* var_r30; + StructBss234 *var_r30; var_r30 = &lbl_1_bss_234; for (i = 0; i < var_r30->unk00; i++) { @@ -767,9 +793,10 @@ void fn_1_3020(void) { HuPrcVSleep(); } -void fn_1_3088(void) { +void fn_1_3088(void) +{ float sp8[2]; - StructBss234* var_r31; + StructBss234 *var_r31; s32 i; var_r31 = &lbl_1_bss_234; @@ -792,9 +819,10 @@ void fn_1_3088(void) { } } -void fn_1_31FC(omObjData* arg0) { - StructBss220* var_r29; - ModelData* temp_r30; +void fn_1_31FC(omObjData *arg0) +{ + StructBss220 *var_r29; + ModelData *temp_r30; s32 i; var_r29 = &lbl_1_bss_220; @@ -869,7 +897,8 @@ void fn_1_31FC(omObjData* arg0) { if (Hu3DMotionTimeGet(arg0->model[10]) >= 25.0f && var_r29->unk04 == 0) { var_r29->unk04 = 1; fn_1_614(1, 10, 4.0f); - } else if (Hu3DMotionTimeGet(arg0->model[10]) >= 40.0f && var_r29->unk04 == 1) { + } + else if (Hu3DMotionTimeGet(arg0->model[10]) >= 40.0f && var_r29->unk04 == 1) { var_r29->unk04 = 2; fn_1_614(1, 10, 4.0f); } @@ -891,7 +920,8 @@ void fn_1_31FC(omObjData* arg0) { } } -void fn_1_39B4(omObjData* arg0) { +void fn_1_39B4(omObjData *arg0) +{ fn_1_11818(arg0, 0, 0, 1, 2); Hu3DModelPosSet(arg0->model[1], 0.0f, 0.0f, -680.0f); fn_1_11818(arg0, 1, 1, 1, 2); @@ -912,7 +942,8 @@ void fn_1_39B4(omObjData* arg0) { arg0->work[0] = arg0->work[1] = arg0->work[2] = arg0->work[3] = 0; } -void fn_1_3BF0(omObjData* arg0) { +void fn_1_3BF0(omObjData *arg0) +{ arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M436, 21)); arg0->motion[0] = Hu3DMotionIDGet(arg0->model[0]); Hu3DModelShadowMapSet(arg0->model[0]); @@ -973,7 +1004,8 @@ void fn_1_3BF0(omObjData* arg0) { arg0->func = fn_1_31FC; } -void fn_1_420C(omObjData* arg0) { +void fn_1_420C(omObjData *arg0) +{ s32 i; switch (arg0->work[0]) { @@ -993,8 +1025,9 @@ void fn_1_420C(omObjData* arg0) { } } -void fn_1_4304(omObjData* arg0) { - StructBss1BC* var_r30; +void fn_1_4304(omObjData *arg0) +{ + StructBss1BC *var_r30; s32 i; var_r30 = &lbl_1_bss_1BC; @@ -1015,8 +1048,9 @@ void fn_1_4304(omObjData* arg0) { arg0->work[0] = arg0->work[1] = arg0->work[2] = arg0->work[3] = 0; } -void fn_1_4594(omObjData* arg0) { - StructBss1BC* var_r30; +void fn_1_4594(omObjData *arg0) +{ + StructBss1BC *var_r30; s32 i; var_r30 = &lbl_1_bss_1BC; @@ -1041,8 +1075,9 @@ void fn_1_4594(omObjData* arg0) { arg0->func = fn_1_420C; } -void fn_1_48AC(omObjData* arg0) { - StructBss1A8* sp8; +void fn_1_48AC(omObjData *arg0) +{ + StructBss1A8 *sp8; sp8 = &lbl_1_bss_1A8; switch (arg0->work[3]) { @@ -1074,7 +1109,8 @@ void fn_1_48AC(omObjData* arg0) { } } -void fn_1_49FC(omObjData* arg0) { +void fn_1_49FC(omObjData *arg0) +{ omSetTra(arg0, 0.0f, 37.0f, -565.0f); omSetSca(arg0, 1.5f, 1.5f, 1.5f); Hu3DModelHookReset(arg0->model[0]); @@ -1082,10 +1118,11 @@ void fn_1_49FC(omObjData* arg0) { arg0->work[0] = arg0->work[1] = arg0->work[2] = arg0->work[3] = 0; } -void fn_1_4AB4(s32 arg0) { - ModelData* var_r28; - HsfData* temp_r31; - HsfMaterial* var_r30; +void fn_1_4AB4(s32 arg0) +{ + ModelData *var_r28; + HsfData *temp_r31; + HsfMaterial *var_r30; s32 i; var_r28 = &Hu3DData[arg0]; @@ -1096,8 +1133,9 @@ void fn_1_4AB4(s32 arg0) { } } -void fn_1_4B1C(omObjData* arg0) { - StructBss1A8* sp8; +void fn_1_4B1C(omObjData *arg0) +{ + StructBss1A8 *sp8; sp8 = &lbl_1_bss_1A8; arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M436, 31)); @@ -1126,14 +1164,16 @@ void fn_1_4B1C(omObjData* arg0) { arg0->func = fn_1_48AC; } -void fn_1_4EA8(omObjData* arg0) { +void fn_1_4EA8(omObjData *arg0) +{ switch (arg0->work[3]) { case 1: arg0->work[3] = 0; if (arg0->work[0] == 0) { fn_1_11818(arg0, 0, 2, 5, 0); fn_1_11818(arg0, 1, 5, 5, 2); - } else { + } + else { fn_1_11818(arg0, 0, 3, 5, 0); } break; @@ -1142,14 +1182,16 @@ void fn_1_4EA8(omObjData* arg0) { if (arg0->work[0] == 0) { fn_1_11818(arg0, 0, 0, 30, 1); fn_1_11818(arg0, 1, 5, 30, 1); - } else { + } + else { fn_1_11818(arg0, 0, 0, 30, 1); } break; } } -void fn_1_4FB0(omObjData* arg0) { +void fn_1_4FB0(omObjData *arg0) +{ s32 temp_r30; temp_r30 = arg0->work[0]; @@ -1167,7 +1209,8 @@ void fn_1_4FB0(omObjData* arg0) { Hu3DModelLayerSet(arg0->model[1], 2); fn_1_11818(arg0, 0, 0, 1, 1); fn_1_11818(arg0, 1, 5, 1, 1); - } else { + } + else { arg0->motion[0] = Hu3DJointMotionFile(arg0->model[0], DATA_MAKE_NUM(DATADIR_M436, 47)); arg0->motion[1] = Hu3DJointMotionFile(arg0->model[0], DATA_MAKE_NUM(DATADIR_M436, 51)); arg0->motion[2] = Hu3DJointMotionFile(arg0->model[0], DATA_MAKE_NUM(DATADIR_M436, 52)); @@ -1184,15 +1227,17 @@ void fn_1_4FB0(omObjData* arg0) { arg0->func = fn_1_4EA8; } -s32 fn_1_538C(s32 arg0) { - StructBss3E4* temp_r31; +s32 fn_1_538C(s32 arg0) +{ + StructBss3E4 *temp_r31; temp_r31 = &lbl_1_bss_3E4[arg0]; return temp_r31->unk04; } -s32 fn_1_53B4(void) { - StructBss3E4* temp_r29; +s32 fn_1_53B4(void) +{ + StructBss3E4 *temp_r29; s32 var_r30; s32 i; @@ -1206,8 +1251,9 @@ s32 fn_1_53B4(void) { return var_r30; } -s32 fn_1_5414(s32 arg0) { - StructBss3E4* temp_r31; +s32 fn_1_5414(s32 arg0) +{ + StructBss3E4 *temp_r31; temp_r31 = &lbl_1_bss_3E4[arg0]; if (temp_r31->unk0C != 0) { @@ -1216,8 +1262,9 @@ s32 fn_1_5414(s32 arg0) { return 0; } -s32 fn_1_5450(s32 arg0) { - StructBss3E4* temp_r31; +s32 fn_1_5450(s32 arg0) +{ + StructBss3E4 *temp_r31; temp_r31 = &lbl_1_bss_3E4[arg0]; if (HuPadBtnDown[temp_r31->unk18] == 0x100) { @@ -1226,8 +1273,9 @@ s32 fn_1_5450(s32 arg0) { return 0; } -void fn_1_54A0(void) { - StructBss3E4* temp_r31; +void fn_1_54A0(void) +{ + StructBss3E4 *temp_r31; s32 sp8[4]; s32 i; @@ -1245,7 +1293,8 @@ void fn_1_54A0(void) { temp_r31->unk0C = GWPlayerCfg[temp_r31->unk04].iscom; if (temp_r31->unk0C != 0) { temp_r31->unk10 = GWPlayerCfg[temp_r31->unk04].diff; - } else { + } + else { temp_r31->unk10 = 0; } temp_r31->unk14 = GWPlayerCfg[temp_r31->unk04].character; @@ -1253,13 +1302,14 @@ void fn_1_54A0(void) { } } -s32 fn_1_5608(omObjData* arg0, Vec arg1, float arg2, float arg3, float arg4, float arg5, s32 arg6) { +s32 fn_1_5608(omObjData *arg0, Vec arg1, float arg2, float arg3, float arg4, float arg5, s32 arg6) +{ float var_f31; float var_f30; float var_f27; float var_f26; s32 var_r30; - StructBss3E4* sp18; + StructBss3E4 *sp18; var_r30 = 0; sp18 = &lbl_1_bss_3E4[arg0->work[0]]; @@ -1270,14 +1320,16 @@ s32 fn_1_5608(omObjData* arg0, Vec arg1, float arg2, float arg3, float arg4, flo if (var_f27 <= arg4) { var_f31 = var_f30 = 0.0f; var_r30 = 1; - } else { + } + else { var_f31 = 72.0f * (var_f31 / var_f27); var_f30 = 72.0f * (var_f30 / var_f27); } var_f27 = arg3 * (sqrtf(var_f31 * var_f31 + var_f30 * var_f30) / 72.0f); if (var_f27 >= arg3) { var_f27 = arg3; - } else if (var_f27 <= 1.0f) { + } + else if (var_f27 <= 1.0f) { var_f31 = var_f30 = var_f27 = 0.0f; var_r30 = 1; } @@ -1292,7 +1344,8 @@ s32 fn_1_5608(omObjData* arg0, Vec arg1, float arg2, float arg3, float arg4, flo if (arg0->rot.y - var_f26 < -180.0f) { arg0->rot.y += 360.0f; } - } else { + } + else { if (arg0->rot.y - var_f26 > 180.0f) { arg0->rot.y -= 360.0f; } @@ -1307,25 +1360,28 @@ s32 fn_1_5608(omObjData* arg0, Vec arg1, float arg2, float arg3, float arg4, flo if (arg6 == 0) { if (var_f27 >= 6.75f) { fn_1_11B18(arg0, 0, 2, 15, 1); - } else if (var_f27 > 0.0f) { + } + else if (var_f27 > 0.0f) { fn_1_11B18(arg0, 0, 1, 15, 1); - } else { + } + else { fn_1_11B18(arg0, 0, 0, 15, 1); } } return var_r30; } -void fn_1_5CD0(omObjData* arg0) { - StructBss3E4* sp8; - char** temp_r26; +void fn_1_5CD0(omObjData *arg0) +{ + StructBss3E4 *sp8; + char **temp_r26; s32 var_r22; s32 i, j; - ModelData* temp_r24; - HsfData* temp_r27; - HsfMaterial* var_r31; - StructBss3E4* temp_r30; - HsfAttribute* temp_r23; + ModelData *temp_r24; + HsfData *temp_r27; + HsfMaterial *var_r31; + StructBss3E4 *temp_r30; + HsfAttribute *temp_r23; sp8 = &lbl_1_bss_3E4[arg0->work[0]]; if (arg0->work[2] != 1) { @@ -1353,7 +1409,8 @@ void fn_1_5CD0(omObjData* arg0) { } } } - } else { + } + else { temp_r26 = CharModelTexNameGet(temp_r30->unk14, 2); for (i = 0; i < temp_r27->materialCnt; i++, var_r31++) { var_r22 = 1; @@ -1385,15 +1442,11 @@ void fn_1_5CD0(omObjData* arg0) { } } -void fn_1_6060(omObjData* arg0) { +void fn_1_6060(omObjData *arg0) +{ u32 temp_r29 = arg0->work[0]; - StructBss3E4* temp_r30 = &lbl_1_bss_3E4[temp_r29]; - Vec sp8[] = { - { -600.0f, 0.0f, 300.0f }, - { -600.0f, 0.0f, 150.0f }, - { -450.0f, 0.0f, 150.0f }, - { -300.0f, 0.0f, 150.0f } - }; + StructBss3E4 *temp_r30 = &lbl_1_bss_3E4[temp_r29]; + Vec sp8[] = { { -600.0f, 0.0f, 300.0f }, { -600.0f, 0.0f, 150.0f }, { -450.0f, 0.0f, 150.0f }, { -300.0f, 0.0f, 150.0f } }; arg0->model[0] = CharModelCreate(temp_r30->unk14, 2); arg0->motion[0] = CharModelMotionCreate(temp_r30->unk14, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0)); @@ -1415,18 +1468,15 @@ void fn_1_6060(omObjData* arg0) { } // unused -s16 gap_04_00000182_data[] = { - 0, 0x43, 0, 0x43, 1, 0x43, - 2, 0x43, 3, 0x43, 4, 0x43, - 5, 0x43, 6, 0x43, 7 -}; +s16 gap_04_00000182_data[] = { 0, 0x43, 0, 0x43, 1, 0x43, 2, 0x43, 3, 0x43, 4, 0x43, 5, 0x43, 6, 0x43, 7 }; -s32 fn_1_62C4(omObjData* arg0) { +s32 fn_1_62C4(omObjData *arg0) +{ Mtx sp8; - StructBss4A4* var_r25; - StructBssD8* var_r31; - StructBss1A8* var_r28; - StructBss3E4* temp_r27; + StructBss4A4 *var_r25; + StructBssD8 *var_r31; + StructBss1A8 *var_r28; + StructBss3E4 *temp_r27; s32 i; var_r25 = &lbl_1_bss_4A4; @@ -1473,9 +1523,11 @@ s32 fn_1_62C4(omObjData* arg0) { } if (var_r31->unk88[i] < 8.0f) { var_r31->unk68[i] += 0.025f; - } else if (var_r31->unk88[i] < 23.0f) { + } + else if (var_r31->unk88[i] < 23.0f) { var_r31->unk68[i] = 0.7f; - } else if (var_r31->unk88[i] < 31.0f) { + } + else if (var_r31->unk88[i] < 31.0f) { var_r31->unk68[i] -= 0.1f; if (var_r31->unk68[i] < 0.0f) { var_r31->unk68[i] = 0.0f; @@ -1506,16 +1558,18 @@ s32 fn_1_62C4(omObjData* arg0) { } } -void fn_1_68E8(omObjData* arg0) { - StructBss1A8* var_r30; +void fn_1_68E8(omObjData *arg0) +{ + StructBss1A8 *var_r30; var_r30 = &lbl_1_bss_1A8; fn_1_11818(var_r30->unk00, 0, 8, 5, 0); - arg0->func = (void*) fn_1_62C4; // fn_1_62C4 must return s32 to match + arg0->func = (void *)fn_1_62C4; // fn_1_62C4 must return s32 to match } -void fn_1_6944(omObjData* arg0) { - StructBssD8* var_r29; +void fn_1_6944(omObjData *arg0) +{ + StructBssD8 *var_r29; s32 i; var_r29 = &lbl_1_bss_D8; @@ -1523,7 +1577,8 @@ void fn_1_6944(omObjData* arg0) { if (i % 2 == 0) { arg0->model[i + 1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M436, 44)); arg0->motion[i + 1] = Hu3DMotionIDGet(arg0->model[i + 1]); - } else { + } + else { arg0->model[i + 1] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M436, 45)); arg0->motion[i + 1] = Hu3DMotionIDGet(arg0->model[i + 1]); } @@ -1539,11 +1594,12 @@ void fn_1_6944(omObjData* arg0) { var_r29->unk88[i] = 0.0f; } var_r29->unk04 = 1; - arg0->func = (void*) fn_1_62C4; // fn_1_62C4 must return s32 to match + arg0->func = (void *)fn_1_62C4; // fn_1_62C4 must return s32 to match } -void fn_1_6BDC(void) { - StructBss32C* var_r31; +void fn_1_6BDC(void) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; var_r31->unk10 = 0.0f; @@ -1556,8 +1612,9 @@ void fn_1_6BDC(void) { fn_1_125F4(var_r31, 200.0f); } -void fn_1_6C8C(void) { - StructBss32C* var_r31; +void fn_1_6C8C(void) +{ + StructBss32C *var_r31; StructBss32C sp8; var_r31 = &lbl_1_bss_32C; @@ -1571,8 +1628,9 @@ void fn_1_6C8C(void) { fn_1_14D24(var_r31, &sp8, var_r31->unk3C++, 30.0f, 5.0f); } -void fn_1_6D64(void) { - StructBss32C* var_r31; +void fn_1_6D64(void) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; var_r31->unk10 = 0.0f; @@ -1585,8 +1643,9 @@ void fn_1_6D64(void) { fn_1_125F4(var_r31, 200.0f); } -void fn_1_6E14(void) { - StructBss32C* var_r31; +void fn_1_6E14(void) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; var_r31->unk10 = 0.0f; @@ -1599,8 +1658,9 @@ void fn_1_6E14(void) { fn_1_125F4(var_r31, 45.0f); } -void fn_1_6EC4(void) { - StructBss32C* var_r31; +void fn_1_6EC4(void) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; var_r31->unk10 = 0.0f; @@ -1613,8 +1673,9 @@ void fn_1_6EC4(void) { fn_1_125F4(var_r31, 30.0f); } -void fn_1_6F74(void) { - StructBss32C* var_r31; +void fn_1_6F74(void) +{ + StructBss32C *var_r31; StructBss32C sp8; var_r31 = &lbl_1_bss_32C; @@ -1628,8 +1689,9 @@ void fn_1_6F74(void) { fn_1_13C48(var_r31, &sp8, var_r31->unk3C++, 10.0f, 5.0f); } -void fn_1_704C(void) { - StructBss32C* var_r31; +void fn_1_704C(void) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; var_r31->unk10 = 0.0f; @@ -1642,8 +1704,9 @@ void fn_1_704C(void) { fn_1_125F4(var_r31, 20.0f); } -void fn_1_70FC(void) { - StructBss32C* var_r31; +void fn_1_70FC(void) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; var_r31->unk10 = 0.0f; @@ -1656,8 +1719,9 @@ void fn_1_70FC(void) { fn_1_125F4(var_r31, 20.0f); } -void fn_1_71AC(s32 arg0) { - StructBss32C* var_r23; +void fn_1_71AC(s32 arg0) +{ + StructBss32C *var_r23; var_r23 = &lbl_1_bss_32C; fn_1_12294(var_r23); @@ -1689,9 +1753,10 @@ void fn_1_71AC(s32 arg0) { } } -void fn_1_72CC(void) { +void fn_1_72CC(void) +{ float sp18[] = { 0.0f, 0.0f }; - StructBss1A8* var_r30; + StructBss1A8 *var_r30; s32 var_r31; var_r30 = &lbl_1_bss_1A8; @@ -1712,9 +1777,10 @@ void fn_1_72CC(void) { HuPrcEnd(); } -void fn_1_77F0(void) { +void fn_1_77F0(void) +{ float sp18[] = { 0.0f, 0.0f }; - StructBss1A8* var_r30; + StructBss1A8 *var_r30; s32 var_r31; var_r30 = &lbl_1_bss_1A8; @@ -1732,17 +1798,11 @@ void fn_1_77F0(void) { HuPrcEnd(); } -void fn_1_7B58(s32 arg0) { +void fn_1_7B58(s32 arg0) +{ float sp10[2] = { 0.0f, 0.0f }; - StructBss180* var_r30 = &lbl_1_bss_180[0]; - s32 sp18[] = { - MAKE_MESSID(29, 6), - MAKE_MESSID(29, 8), - MAKE_MESSID(29, 10), - MAKE_MESSID(29, 12), - MAKE_MESSID(29, 15), - MAKE_MESSID(29, 17) - }; + StructBss180 *var_r30 = &lbl_1_bss_180[0]; + s32 sp18[] = { MAKE_MESSID(29, 6), MAKE_MESSID(29, 8), MAKE_MESSID(29, 10), MAKE_MESSID(29, 12), MAKE_MESSID(29, 15), MAKE_MESSID(29, 17) }; s32 var_r31; var_r30->unk00->work[3] = 1; @@ -1756,9 +1816,10 @@ void fn_1_7B58(s32 arg0) { fn_1_2468(var_r31); } -void fn_1_7F1C(void) { +void fn_1_7F1C(void) +{ float sp2D8[2] = { 0.0f, 0.0f }; - StructBss180* var_r30; + StructBss180 *var_r30; s32 var_r31; var_r30 = &lbl_1_bss_180[1]; @@ -1814,10 +1875,11 @@ void fn_1_7F1C(void) { HuPrcEnd(); } -void fn_1_A5A8(void) { +void fn_1_A5A8(void) +{ float sp9C[2] = { 0.0f, 0.0f }; - StructBss220* sp68; - StructBss1A8* var_r28; + StructBss220 *sp68; + StructBss1A8 *var_r28; s32 var_r31; sp68 = &lbl_1_bss_220; @@ -1859,9 +1921,10 @@ void fn_1_A5A8(void) { HuPrcEnd(); } -void fn_1_B3D4(void) { +void fn_1_B3D4(void) +{ float sp1C[2] = { 0.0f, 0.0f }; - StructBss180* var_r30; + StructBss180 *var_r30; s32 var_r31; var_r30 = &lbl_1_bss_180[1]; @@ -1878,11 +1941,11 @@ void fn_1_B3D4(void) { HuPrcEnd(); } -void fn_1_B7E0(void) { -} +void fn_1_B7E0(void) { } -s32 fn_1_B7E4(void) { - StructBss220* var_r31; +s32 fn_1_B7E4(void) +{ + StructBss220 *var_r31; var_r31 = &lbl_1_bss_220; if (fn_1_11F04(&lbl_1_bss_C0, 0) == 80) { @@ -1907,20 +1970,23 @@ s32 fn_1_B7E4(void) { return 0; } -void fn_1_B968(void) { +void fn_1_B968(void) +{ lbl_1_bss_4 = 0; HuPrcChildCreate(fn_1_72CC, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_B9B4(void) { +s32 fn_1_B9B4(void) +{ if (lbl_1_bss_4 == 1 && fn_1_11F04(&lbl_1_bss_C0, 1) != 0) { return fn_1_11D74(&lbl_1_bss_C0); } return 0; } -void fn_1_BA10(void) { - StructBss3E4* var_r30; +void fn_1_BA10(void) +{ + StructBss3E4 *var_r30; s32 i; lbl_1_bss_4 = 0; @@ -1931,10 +1997,11 @@ void fn_1_BA10(void) { } } -s32 fn_1_BAA4(void) { - StructBss220* var_r31; - StructBss1BC* var_r30; - StructBss220* var_r29; +s32 fn_1_BAA4(void) +{ + StructBss220 *var_r31; + StructBss1BC *var_r30; + StructBss220 *var_r29; var_r31 = &lbl_1_bss_220; var_r30 = &lbl_1_bss_1BC; @@ -1953,22 +2020,26 @@ s32 fn_1_BAA4(void) { return 0; } -void fn_1_BBA4(void) { +void fn_1_BBA4(void) +{ fn_1_71AC(10); } -s32 fn_1_BBF4(void) { +s32 fn_1_BBF4(void) +{ if (fn_1_11F04(&lbl_1_bss_C0, 1) != 0) { return fn_1_11D74(&lbl_1_bss_C0); } return 0; } -void fn_1_BC3C(void) { +void fn_1_BC3C(void) +{ HuPrcChildCreate(fn_1_B3D4, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_BC78(void) { +s32 fn_1_BC78(void) +{ if (lbl_1_bss_4 != 0 && fn_1_11F04(&lbl_1_bss_C0, 1) != 0) { if (lbl_1_bss_8 != 0) { return fn_1_11D74(&lbl_1_bss_C0); @@ -1978,8 +2049,9 @@ s32 fn_1_BC78(void) { return 0; } -void fn_1_BCF8(void) { - StructBss1A8* var_r31; +void fn_1_BCF8(void) +{ + StructBss1A8 *var_r31; var_r31 = &lbl_1_bss_1A8; fn_1_11818(var_r31->unk00, 0, 12, 60, 1); @@ -1987,8 +2059,9 @@ void fn_1_BCF8(void) { HuPrcChildCreate(fn_1_7F1C, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_BD6C(void) { - StructBss1A8* var_r31; +s32 fn_1_BD6C(void) +{ + StructBss1A8 *var_r31; var_r31 = &lbl_1_bss_1A8; if (lbl_1_bss_4 == 1 && fn_1_11F04(&lbl_1_bss_C0, 0) == 0) { @@ -2000,23 +2073,27 @@ s32 fn_1_BD6C(void) { return 0; } -void fn_1_BE1C(void) { +void fn_1_BE1C(void) +{ fn_1_71AC(11); } -s32 fn_1_BE6C(void) { +s32 fn_1_BE6C(void) +{ if (fn_1_11F04(&lbl_1_bss_C0, 1) != 0) { return fn_1_11D74(&lbl_1_bss_C0); } return 0; } -void fn_1_BEB4(void) { +void fn_1_BEB4(void) +{ lbl_1_bss_4 = 0; HuPrcChildCreate(fn_1_A5A8, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_BF00(void) { +s32 fn_1_BF00(void) +{ if (lbl_1_bss_4 == 1) { lbl_1_bss_4 = 2; HuAudSeqFadeOut(lbl_1_bss_3A4[0], 1000); @@ -2028,23 +2105,17 @@ s32 fn_1_BF00(void) { return 0; } -StructData1E8 lbl_1_data_1E8[] = { - { fn_1_B7E0, fn_1_B7E4, 300 }, - { fn_1_B968, fn_1_B9B4, 60 }, - { fn_1_BA10, fn_1_BAA4, 60 }, - { fn_1_BBA4, fn_1_BBF4, 45 }, - { fn_1_BC3C, fn_1_BC78, 60 }, - { fn_1_BCF8, fn_1_BD6C, 60 }, - { fn_1_BE1C, fn_1_BE6C, 45 }, - { fn_1_BEB4, fn_1_BF00, 15 }, - { NULL, NULL, -1 } -}; +StructData1E8 lbl_1_data_1E8[] = { { fn_1_B7E0, fn_1_B7E4, 300 }, { fn_1_B968, fn_1_B9B4, 60 }, { fn_1_BA10, fn_1_BAA4, 60 }, + { fn_1_BBA4, fn_1_BBF4, 45 }, { fn_1_BC3C, fn_1_BC78, 60 }, { fn_1_BCF8, fn_1_BD6C, 60 }, { fn_1_BE1C, fn_1_BE6C, 45 }, + { fn_1_BEB4, fn_1_BF00, 15 }, { NULL, NULL, -1 } }; -void fn_1_BFC8(void) { +void fn_1_BFC8(void) +{ fn_1_11D18(&lbl_1_bss_C0, lbl_1_data_1E8); } -s32 fn_1_BFF8(void) { +s32 fn_1_BFF8(void) +{ s32 var_r31; var_r31 = 0; @@ -2058,11 +2129,12 @@ s32 fn_1_BFF8(void) { return var_r31; } -s32 fn_1_C090(s32 arg0, s32 arg1, s32 arg2) { - StructBss4A4* var_r28; - StructBss3E4* temp_r31; - StructBss1BC* var_r27; - StructBss234* var_r26; +s32 fn_1_C090(s32 arg0, s32 arg1, s32 arg2) +{ + StructBss4A4 *var_r28; + StructBss3E4 *temp_r31; + StructBss1BC *var_r27; + StructBss234 *var_r26; s32 var_r29; s32 var_r30; s32 spC; @@ -2083,43 +2155,52 @@ s32 fn_1_C090(s32 arg0, s32 arg1, s32 arg2) { case 0: if (arg2 <= 120) { var_r29 = 0; - } else if (var_r28->unk04 <= 3) { + } + else if (var_r28->unk04 <= 3) { temp_r31->unk24 = var_r29 = 1; - } else { + } + else { var_r29 = 0; } break; case 1: if (arg2 <= 120) { var_r29 = 0; - } else if (var_r28->unk04 <= 6) { + } + else if (var_r28->unk04 <= 6) { temp_r31->unk24 = var_r29 = 1; - } else { + } + else { var_r29 = 0; } break; case 2: if (arg2 <= 60) { var_r29 = 0; - } else if (var_r28->unk04 <= 9) { + } + else if (var_r28->unk04 <= 9) { temp_r31->unk24 = var_r29 = 1; - } else { + } + else { var_r29 = 0; } break; case 3: if (arg2 <= 60) { var_r29 = 0; - } else if (var_r28->unk04 <= 12) { + } + else if (var_r28->unk04 <= 12) { temp_r31->unk24 = var_r29 = 1; - } else { + } + else { var_r29 = 0; } break; } if (var_r29 == 0) { temp_r31->unk28 = rand8() % 8; - } else { + } + else { var_r23 = 0; for (i = 0; i <= temp_r31->unk10; i++) { temp_r22 = rand8() % 10; @@ -2136,29 +2217,35 @@ s32 fn_1_C090(s32 arg0, s32 arg1, s32 arg2) { } if (temp_r31->unk24 == 1 && temp_r31->unk28 == var_r30) { var_r30 = 99; - } else if (temp_r31->unk28 > var_r30 && temp_r31->unk00->trans.x >= var_r27->unk04[var_r30].x - 7.5f && var_r30 < 7) { + } + else if (temp_r31->unk28 > var_r30 && temp_r31->unk00->trans.x >= var_r27->unk04[var_r30].x - 7.5f && var_r30 < 7) { var_r30++; - } else if (temp_r31->unk28 < var_r30 && temp_r31->unk00->trans.x <= var_r27->unk04[var_r30].x + 7.5f && var_r30 > 0) { + } + else if (temp_r31->unk28 < var_r30 && temp_r31->unk00->trans.x <= var_r27->unk04[var_r30].x + 7.5f && var_r30 > 0) { var_r30--; } - } else { + } + else { var_r30 = arg1; if (HuPadStkX[temp_r31->unk18] > 20.0f && temp_r31->unk00->trans.x >= var_r27->unk04[var_r30].x - 7.5f && var_r30 < 7) { var_r30++; - } else if (HuPadStkX[temp_r31->unk18] < -20.0f && temp_r31->unk00->trans.x <= var_r27->unk04[var_r30].x + 7.5f && var_r30 > 0) { + } + else if (HuPadStkX[temp_r31->unk18] < -20.0f && temp_r31->unk00->trans.x <= var_r27->unk04[var_r30].x + 7.5f && var_r30 > 0) { var_r30--; - } else if (HuPadBtnDown[temp_r31->unk18] & 0x100) { + } + else if (HuPadBtnDown[temp_r31->unk18] & 0x100) { var_r30 = 99; } } return var_r30; } -void fn_1_C4E8(void) { - StructBss4A4* var_r29; - StructBss3E4* temp_r30; - StructBss1BC* var_r28; - StructBss32C* var_r31; +void fn_1_C4E8(void) +{ + StructBss4A4 *var_r29; + StructBss3E4 *temp_r30; + StructBss1BC *var_r28; + StructBss32C *var_r31; var_r29 = &lbl_1_bss_4A4; temp_r30 = &lbl_1_bss_3E4[var_r29->unk00]; @@ -2174,8 +2261,9 @@ void fn_1_C4E8(void) { fn_1_125F4(var_r31, 10.0f); } -void fn_1_C5E4(void) { - StructBss32C* var_r31; +void fn_1_C5E4(void) +{ + StructBss32C *var_r31; var_r31 = &lbl_1_bss_32C; var_r31->unk10 = 0.0f; @@ -2188,8 +2276,9 @@ void fn_1_C5E4(void) { fn_1_125F4(var_r31, 360.0f); } -void fn_1_C694(void) { - StructBss32C* var_r31; +void fn_1_C694(void) +{ + StructBss32C *var_r31; StructBss32C sp8; var_r31 = &lbl_1_bss_32C; @@ -2203,8 +2292,9 @@ void fn_1_C694(void) { fn_1_13C48(var_r31, &sp8, var_r31->unk3C++, 10.0f, 5.0f); } -void fn_1_C76C(void) { - StructBss32C* var_r31; +void fn_1_C76C(void) +{ + StructBss32C *var_r31; StructBss32C sp8; var_r31 = &lbl_1_bss_32C; @@ -2218,8 +2308,9 @@ void fn_1_C76C(void) { fn_1_13C48(var_r31, &sp8, var_r31->unk3C++, 60.0f, 10.0f); } -void fn_1_C844(s32 arg0) { - StructBss32C* var_r27; +void fn_1_C844(s32 arg0) +{ + StructBss32C *var_r27; var_r27 = &lbl_1_bss_32C; fn_1_12294(var_r27); @@ -2239,16 +2330,13 @@ void fn_1_C844(s32 arg0) { } } -void fn_1_C90C(void) { +void fn_1_C90C(void) +{ float sp28[] = { 0.0f, 0.0f }; s32 var_r28; s32 var_r31; - StructBss1A8* var_r27 = &lbl_1_bss_1A8; - s32 sp3C[] = { - MAKE_MESSID(29, 31), - MAKE_MESSID(29, 32), - MAKE_MESSID(29, 33) - }; + StructBss1A8 *var_r27 = &lbl_1_bss_1A8; + s32 sp3C[] = { MAKE_MESSID(29, 31), MAKE_MESSID(29, 32), MAKE_MESSID(29, 33) }; var_r28 = rand8() % 3; HuPrcSleep(70); @@ -2264,14 +2352,12 @@ void fn_1_C90C(void) { HuPrcEnd(); } -void fn_1_CCA4(void) { +void fn_1_CCA4(void) +{ float sp2C[] = { 0.0f, 0.0f }; s32 var_r28; s32 var_r31; - s32 sp24[] = { - MAKE_MESSID(29, 34), - MAKE_MESSID(29, 35) - }; + s32 sp24[] = { MAKE_MESSID(29, 34), MAKE_MESSID(29, 35) }; var_r28 = rand8() % 2; HuPrcSleep(40); @@ -2287,7 +2373,8 @@ void fn_1_CCA4(void) { HuPrcEnd(); } -void fn_1_D018(void) { +void fn_1_D018(void) +{ float sp2C[] = { 0.0f, 0.0f }; s32 var_r31; @@ -2304,10 +2391,11 @@ void fn_1_D018(void) { HuPrcEnd(); } -void fn_1_D344(void) { - StructBss4A4* var_r30; - StructBss3E4* temp_r31; - StructBss1A8* var_r29; +void fn_1_D344(void) +{ + StructBss4A4 *var_r30; + StructBss3E4 *temp_r31; + StructBss1A8 *var_r29; var_r30 = &lbl_1_bss_4A4; temp_r31 = &lbl_1_bss_3E4[var_r30->unk00]; @@ -2318,13 +2406,14 @@ void fn_1_D344(void) { fn_1_27C8(5); } -s32 fn_1_D418(void) { +s32 fn_1_D418(void) +{ Vec sp14; - StructBss4A4* var_r30; - StructBss3E4* temp_r31; - StructBss1BC* var_r28; - StructBss180* var_r26; - StructBss3E4* var_r25; + StructBss4A4 *var_r30; + StructBss3E4 *temp_r31; + StructBss1BC *var_r28; + StructBss180 *var_r26; + StructBss3E4 *var_r25; s32 var_r27; s32 i; @@ -2340,17 +2429,20 @@ s32 fn_1_D418(void) { if (fn_1_2800()) { temp_r31->unk20 = 1; temp_r31->unk24 = 0; - } else { + } + else { var_r27 = fn_1_C090(var_r30->unk00, temp_r31->unk1C, fn_1_11F04(&lbl_1_bss_A8, 0)); if (var_r27 == 99) { temp_r31->unk20 = 1; temp_r31->unk24 = 0; fn_1_2824(); - } else { + } + else { temp_r31->unk1C = var_r27; } } - } else if (temp_r31->unk24++ >= 60) { + } + else if (temp_r31->unk24++ >= 60) { return fn_1_11D74(&lbl_1_bss_A8); } sp14.x = var_r28->unk04[temp_r31->unk1C].x; @@ -2374,19 +2466,21 @@ s32 fn_1_D418(void) { return 0; } -void fn_1_D6C0(void) { - StructBss4A4* var_r30; +void fn_1_D6C0(void) +{ + StructBss4A4 *var_r30; var_r30 = &lbl_1_bss_4A4; var_r30->unk0C = 0; } -s32 fn_1_D6E4(void) { - StructBss4A4* var_r29; - StructBss3E4* temp_r31; - StructBss1BC* var_r30; - StructBss180* var_r26; - StructBss3E4* var_r25; +s32 fn_1_D6E4(void) +{ + StructBss4A4 *var_r29; + StructBss3E4 *temp_r31; + StructBss1BC *var_r30; + StructBss180 *var_r26; + StructBss3E4 *var_r25; s32 i; var_r29 = &lbl_1_bss_4A4; @@ -2400,17 +2494,21 @@ s32 fn_1_D6E4(void) { temp_r31->unk00->trans.z = var_r30->unk04[temp_r31->unk1C].z - 100.0f; fn_1_11B18(temp_r31->unk00, 0, 0, 10, 1); } - } else { + } + else { fn_1_11B18(temp_r31->unk00, 0, 0, 10, 1); } - } else if (fn_1_11F04(&lbl_1_bss_A8, 0) == 30) { + } + else if (fn_1_11F04(&lbl_1_bss_A8, 0) == 30) { fn_1_11990(temp_r31->unk00, 0, 5, 30, 0); - } else if (fn_1_11708(temp_r31->unk00, 0, 5, 35, 1) != 0 && var_r29->unk0C == 0) { + } + else if (fn_1_11708(temp_r31->unk00, 0, 5, 35, 1) != 0 && var_r29->unk0C == 0) { var_r29->unk0C = 1; Hu3DModelHookSet(temp_r31->unk00->model[0], CharModelHookNameGet(temp_r31->unk14, 2, 0), var_r30->unk00->model[temp_r31->unk1C + 1]); if (temp_r31->unk14 != 7) { Hu3DModelPosSet(var_r30->unk00->model[temp_r31->unk1C + 1], 0.0f, 5.0f, 0.0f); - } else { + } + else { Hu3DModelPosSet(var_r30->unk00->model[temp_r31->unk1C + 1], 0.0f, -15.0f, 0.0f); } Hu3DModelScaleSet(var_r30->unk00->model[temp_r31->unk1C + 1], 0.75f, 0.75f, 0.75f); @@ -2430,20 +2528,21 @@ s32 fn_1_D6E4(void) { // Required to match. if (0) { s32 var_r28 = 0; - (void) var_r28; - (void) var_r28; - (void) var_r28; - (void) var_r28; - (void) var_r28; - (void) var_r28; + (void)var_r28; + (void)var_r28; + (void)var_r28; + (void)var_r28; + (void)var_r28; + (void)var_r28; } return 0; } -void fn_1_DA60(void) { - StructBss4A4* var_r30; - StructBss1A8* sp8; - StructBss3E4* temp_r31; +void fn_1_DA60(void) +{ + StructBss4A4 *var_r30; + StructBss1A8 *sp8; + StructBss3E4 *temp_r31; var_r30 = &lbl_1_bss_4A4; temp_r31 = &lbl_1_bss_3E4[var_r30->unk00]; @@ -2457,14 +2556,15 @@ void fn_1_DA60(void) { Vec lbl_1_data_254 = { 0.0f, 0.0f, 0.0f }; Vec lbl_1_data_260 = { 0.0f, 0.0f, 0.0f }; // unused -s32 fn_1_DB00(void) { - StructBss4A4* var_r30; - StructBss220* var_r28; - StructBss1BC* sp8; - StructBss3E4* temp_r31; - StructBss1A8* var_r27; - StructBss180* var_r26; - StructBss3E4* var_r25; +s32 fn_1_DB00(void) +{ + StructBss4A4 *var_r30; + StructBss220 *var_r28; + StructBss1BC *sp8; + StructBss3E4 *temp_r31; + StructBss1A8 *var_r27; + StructBss180 *var_r26; + StructBss3E4 *var_r25; s32 i; var_r30 = &lbl_1_bss_4A4; @@ -2476,7 +2576,8 @@ s32 fn_1_DB00(void) { lbl_1_data_254.x = 0.0f; lbl_1_data_254.y = temp_r31->unk00->trans.y; lbl_1_data_254.z = 300.0f; - } else if (temp_r31->unk20 == 1 && fn_1_11F04(&lbl_1_bss_A8, 0) <= 320) { + } + else if (temp_r31->unk20 == 1 && fn_1_11F04(&lbl_1_bss_A8, 0) <= 320) { lbl_1_data_254.x = 0.0f; lbl_1_data_254.y = temp_r31->unk00->trans.y; lbl_1_data_254.z = -240.0f; @@ -2504,10 +2605,11 @@ s32 fn_1_DB00(void) { return 0; } -void fn_1_DDBC(void) { - StructBss4A4* var_r30; - StructBss1A8* var_r29; - StructBss3E4* temp_r31; +void fn_1_DDBC(void) +{ + StructBss4A4 *var_r30; + StructBss1A8 *var_r29; + StructBss3E4 *temp_r31; var_r30 = &lbl_1_bss_4A4; var_r29 = &lbl_1_bss_1A8; @@ -2522,14 +2624,15 @@ void fn_1_DDBC(void) { temp_r31->unk20 = temp_r31->unk24 = temp_r31->unk28 = 0; } -s32 fn_1_DEB0(void) { - StructBss4A4* var_r30; - StructBss220* var_r28; - StructBss1BC* var_r29; - StructBss3E4* temp_r31; - ModelData* temp_r27; - ModelData* temp_r26; - StructBss180* var_r25; +s32 fn_1_DEB0(void) +{ + StructBss4A4 *var_r30; + StructBss220 *var_r28; + StructBss1BC *var_r29; + StructBss3E4 *temp_r31; + ModelData *temp_r27; + ModelData *temp_r26; + StructBss180 *var_r25; var_r30 = &lbl_1_bss_4A4; var_r28 = &lbl_1_bss_220; @@ -2558,10 +2661,11 @@ s32 fn_1_DEB0(void) { return 0; } -void fn_1_E0B0(void) { - StructBss4A4* var_r31; - StructBss1A8* var_r30; - StructBss3E4* var_r29; +void fn_1_E0B0(void) +{ + StructBss4A4 *var_r31; + StructBss1A8 *var_r30; + StructBss3E4 *var_r29; var_r31 = &lbl_1_bss_4A4; var_r30 = &lbl_1_bss_1A8; @@ -2571,13 +2675,14 @@ void fn_1_E0B0(void) { fn_1_11818(var_r30->unk00, 0, 4, 1, 0); } -s32 fn_1_E144(void) { - StructBss4A4* var_r31; - StructBss220* var_r28; - StructBss1BC* var_r30; - StructBss1A8* var_r27; - StructBss3E4* temp_r29; - StructBss180* var_r25; +s32 fn_1_E144(void) +{ + StructBss4A4 *var_r31; + StructBss220 *var_r28; + StructBss1BC *var_r30; + StructBss1A8 *var_r27; + StructBss3E4 *temp_r29; + StructBss180 *var_r25; var_r31 = &lbl_1_bss_4A4; var_r28 = &lbl_1_bss_220; @@ -2606,10 +2711,11 @@ s32 fn_1_E144(void) { return 0; } -void fn_1_E38C(void) { - StructBss4A4* var_r31; - StructBss220* sp8; - StructBss1A8* var_r30; +void fn_1_E38C(void) +{ + StructBss4A4 *var_r31; + StructBss220 *sp8; + StructBss1A8 *var_r30; sp8 = &lbl_1_bss_220; var_r31 = &lbl_1_bss_4A4; @@ -2622,38 +2728,43 @@ void fn_1_E38C(void) { if (var_r31->unk04 > 3 && rand8() % 2 == 0) { var_r31->unk08 = 2; } - } else if (var_r31->unk08 == 2) { + } + else if (var_r31->unk08 == 2) { var_r31->unk08 = 1; fn_1_11818(var_r30->unk00, 0, 10, 15, 0); if (var_r31->unk04 > 6 && rand8() % 2 == 0) { var_r31->unk08 = 3; } - } else if (var_r31->unk08 == 3) { + } + else if (var_r31->unk08 == 3) { var_r31->unk08 = 1; fn_1_11818(var_r30->unk00, 0, 10, 15, 0); } } -s32 fn_1_E4CC(void) { - StructBss4A4* var_r31; - StructBss1A8* var_r30; +s32 fn_1_E4CC(void) +{ + StructBss4A4 *var_r31; + StructBss1A8 *var_r30; var_r31 = &lbl_1_bss_4A4; var_r30 = &lbl_1_bss_1A8; if (Hu3DMotionEndCheck(var_r30->unk00->model[0]) && fn_1_11F04(&lbl_1_bss_A8, 1) != 0) { if (var_r31->unk08 != 1) { return fn_1_11E70(&lbl_1_bss_A8, 5); - } else { + } + else { return fn_1_11D74(&lbl_1_bss_A8); } } return 0; } -void fn_1_E56C(void) { - StructBss4A4* var_r31; - StructBss234* var_r30; - StructBss3E4* var_r28; +void fn_1_E56C(void) +{ + StructBss4A4 *var_r31; + StructBss234 *var_r30; + StructBss3E4 *var_r28; s32 i; var_r31 = &lbl_1_bss_4A4; @@ -2672,20 +2783,23 @@ void fn_1_E56C(void) { } } -s32 fn_1_E628(void) { - StructBss4A4* var_r31; +s32 fn_1_E628(void) +{ + StructBss4A4 *var_r31; var_r31 = &lbl_1_bss_4A4; if (var_r31->unk08 != 0) { fn_1_11E70(&lbl_1_bss_A8, 10); - } else { + } + else { fn_1_11D74(&lbl_1_bss_A8); } } -void fn_1_E680(void) { - StructBss4A4* var_r31; - StructBss1A8* var_r30; +void fn_1_E680(void) +{ + StructBss4A4 *var_r31; + StructBss1A8 *var_r30; var_r31 = &lbl_1_bss_4A4; var_r30 = &lbl_1_bss_1A8; @@ -2695,12 +2809,13 @@ void fn_1_E680(void) { HuPrcChildCreate(fn_1_C90C, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_E710(void) { - StructBss4A4* var_r29; - StructBss1A8* var_r28; - StructBss1BC* var_r31; - StructBss3E4* temp_r30; - StructBss180* var_r27; +s32 fn_1_E710(void) +{ + StructBss4A4 *var_r29; + StructBss1A8 *var_r28; + StructBss1BC *var_r31; + StructBss3E4 *temp_r30; + StructBss180 *var_r27; var_r29 = &lbl_1_bss_4A4; var_r31 = &lbl_1_bss_1BC; @@ -2714,7 +2829,8 @@ s32 fn_1_E710(void) { var_r27 = &lbl_1_bss_180[1]; fn_1_11818(var_r27->unk00, 0, 7, 10, 0); Hu3DModelHookReset(var_r28->unk00->model[0]); - Hu3DModelPosSet(var_r31->unk00->model[temp_r30->unk1C + 1], var_r31->unk04[temp_r30->unk1C].x, var_r31->unk04[temp_r30->unk1C].y + 65.0f, var_r31->unk04[temp_r30->unk1C].z); + Hu3DModelPosSet(var_r31->unk00->model[temp_r30->unk1C + 1], var_r31->unk04[temp_r30->unk1C].x, var_r31->unk04[temp_r30->unk1C].y + 65.0f, + var_r31->unk04[temp_r30->unk1C].z); Hu3DModelRotSet(var_r31->unk00->model[temp_r30->unk1C + 1], 0.0f, 0.0f, 0.0f); Hu3DModelScaleSet(var_r31->unk00->model[temp_r30->unk1C + 1], 1.0f, 1.0f, 1.0f); } @@ -2727,10 +2843,11 @@ s32 fn_1_E710(void) { return 0; } -void fn_1_E930(void) { - StructBss4A4* var_r29; - StructBss3E4* var_r28; - StructBss180* var_r31; +void fn_1_E930(void) +{ + StructBss4A4 *var_r29; + StructBss3E4 *var_r28; + StructBss180 *var_r31; s32 var_r30; var_r29 = &lbl_1_bss_4A4; @@ -2746,17 +2863,13 @@ void fn_1_E930(void) { fn_1_C844(3); } -s32 fn_1_EA04(void) { - Vec sp14[] = { - { -600.0f, 0.0f, 300.0f }, - { -600.0f, 0.0f, 150.0f }, - { -450.0f, 0.0f, 150.0f }, - { -300.0f, 0.0f, 150.0f } - }; - StructBss4A4* var_r30; - StructBss1BC* var_r27; - StructBss3E4* temp_r31; - StructBss3E4* temp_r26; +s32 fn_1_EA04(void) +{ + Vec sp14[] = { { -600.0f, 0.0f, 300.0f }, { -600.0f, 0.0f, 150.0f }, { -450.0f, 0.0f, 150.0f }, { -300.0f, 0.0f, 150.0f } }; + StructBss4A4 *var_r30; + StructBss1BC *var_r27; + StructBss3E4 *temp_r31; + StructBss3E4 *temp_r26; s32 i; s32 var_r28; @@ -2770,7 +2883,8 @@ s32 fn_1_EA04(void) { temp_r31 = &lbl_1_bss_3E4[var_r28]; if (i != 0) { fn_1_5608(temp_r31->unk00, sp14[i], 0.0f, 9.0f, 10.0f, 8.0f, 0); - } else { + } + else { temp_r31->unk00->trans.x -= 1.0f; temp_r31->unk00->trans.z += 5.0f; temp_r31->unk00->rot.y = fn_1_110FC(temp_r31->unk00->rot.y, 0.0f, 10.0f); @@ -2808,9 +2922,10 @@ s32 fn_1_EA04(void) { return 0; } -void fn_1_ED4C(void) { - StructBss4A4* var_r31; - StructBss1A8* var_r30; +void fn_1_ED4C(void) +{ + StructBss4A4 *var_r31; + StructBss1A8 *var_r30; var_r31 = &lbl_1_bss_4A4; var_r30 = &lbl_1_bss_1A8; @@ -2818,19 +2933,21 @@ void fn_1_ED4C(void) { lbl_1_bss_4 = 0; if (var_r31->unk08 == 1) { HuPrcChildCreate(fn_1_CCA4, 100, 0x2000, 0, HuPrcCurrentGet()); - } else { + } + else { HuPrcChildCreate(fn_1_D018, 100, 0x2000, 0, HuPrcCurrentGet()); } var_r31->unk04 = var_r31->unk08 = var_r31->unk0C = 0; } -s32 fn_1_EE10(void) { - StructBss4A4* var_r30; - StructBss220* var_r26; - StructBss1BC* var_r29; - StructBss1A8* var_r27; - StructBss180* var_r31; - StructBss3E4* temp_r28; +s32 fn_1_EE10(void) +{ + StructBss4A4 *var_r30; + StructBss220 *var_r26; + StructBss1BC *var_r29; + StructBss1A8 *var_r27; + StructBss180 *var_r31; + StructBss3E4 *temp_r28; var_r30 = &lbl_1_bss_4A4; var_r26 = &lbl_1_bss_220; @@ -2857,7 +2974,8 @@ s32 fn_1_EE10(void) { lbl_1_bss_3C.x = fn_1_1113C(lbl_1_bss_78[0][3], lbl_1_bss_48[0][3], lbl_1_bss_14, 30.0f); if (lbl_1_bss_14 < 13) { lbl_1_bss_3C.y = fn_1_11164(lbl_1_bss_78[1][3], 500.0f, lbl_1_bss_14, 13.0f); - } else { + } + else { lbl_1_bss_3C.y = fn_1_112F4(500.0f, lbl_1_bss_48[1][3], lbl_1_bss_14 - 13, 17.0f); } lbl_1_bss_3C.z = fn_1_1113C(lbl_1_bss_78[2][3], lbl_1_bss_48[2][3], lbl_1_bss_14, 30.0f); @@ -2868,13 +2986,15 @@ s32 fn_1_EE10(void) { if (fn_1_11708(var_r31->unk00, 0, 4, 21, 1) != 0 && var_r30->unk08 == 0) { var_r30->unk08 = 1; Hu3DMotionSpeedSet(var_r31->unk00->model[0], 0.0f); - } else { + } + else { Hu3DModelPosSet(var_r29->unk00->model[temp_r28->unk1C + 1], lbl_1_bss_3C.x, lbl_1_bss_3C.y, lbl_1_bss_3C.z); } if (lbl_1_bss_14++ >= 30) { var_r30->unk04 = 2; } - } else if (var_r30->unk04 == 2) { + } + else if (var_r30->unk04 == 2) { Hu3DModelHookSet(var_r31->unk00->model[0], "g007m0-itemhook_c", var_r29->unk00->model[temp_r28->unk1C + 1]); Hu3DModelPosSet(var_r29->unk00->model[temp_r28->unk1C + 1], 0.0f, 0.0f, 0.0f); Hu3DMotionSpeedSet(var_r31->unk00->model[0], 1.0f); @@ -2887,13 +3007,14 @@ s32 fn_1_EE10(void) { return 0; } -void fn_1_F404(void) { - StructBss4A4* var_r29; - StructBss1A8* spC; - StructBssD8* var_r28; - StructBss180* var_r31; - StructBss180* var_r30; - StructBss3E4* sp8; +void fn_1_F404(void) +{ + StructBss4A4 *var_r29; + StructBss1A8 *spC; + StructBssD8 *var_r28; + StructBss180 *var_r31; + StructBss180 *var_r30; + StructBss3E4 *sp8; var_r29 = &lbl_1_bss_4A4; spC = &lbl_1_bss_1A8; @@ -2908,34 +3029,26 @@ void fn_1_F404(void) { fn_1_11818(var_r30->unk00, 1, 6, 30, 1); } -s32 fn_1_F4F0(void) { +s32 fn_1_F4F0(void) +{ if (fn_1_11F04(&lbl_1_bss_A8, 1) != 0) { return fn_1_11D74(&lbl_1_bss_A8); } return 0; } -StructData1E8 lbl_1_data_290[] = { - { fn_1_D344, fn_1_D418, 600 }, - { fn_1_D6C0, fn_1_D6E4, 90 }, - { fn_1_DA60, fn_1_DB00, 300 }, - { fn_1_DDBC, fn_1_DEB0, 150 }, - { fn_1_E0B0, fn_1_E144, 240 }, - { fn_1_E38C, fn_1_E4CC, 90 }, - { fn_1_E56C, fn_1_E628, 120 }, - { fn_1_E680, fn_1_E710, 120 }, - { fn_1_E930, fn_1_EA04, 120 }, - { NULL, NULL, -1 }, - { fn_1_ED4C, fn_1_EE10, -1 }, - { fn_1_F404, fn_1_F4F0, 60 }, - { NULL, NULL, -1 } -}; +StructData1E8 lbl_1_data_290[] + = { { fn_1_D344, fn_1_D418, 600 }, { fn_1_D6C0, fn_1_D6E4, 90 }, { fn_1_DA60, fn_1_DB00, 300 }, { fn_1_DDBC, fn_1_DEB0, 150 }, + { fn_1_E0B0, fn_1_E144, 240 }, { fn_1_E38C, fn_1_E4CC, 90 }, { fn_1_E56C, fn_1_E628, 120 }, { fn_1_E680, fn_1_E710, 120 }, + { fn_1_E930, fn_1_EA04, 120 }, { NULL, NULL, -1 }, { fn_1_ED4C, fn_1_EE10, -1 }, { fn_1_F404, fn_1_F4F0, 60 }, { NULL, NULL, -1 } }; -void fn_1_F538(void) { +void fn_1_F538(void) +{ fn_1_11D18(&lbl_1_bss_A8, lbl_1_data_290); } -s32 fn_1_F568(void) { +s32 fn_1_F568(void) +{ s32 var_r31; var_r31 = 0; @@ -2949,9 +3062,10 @@ s32 fn_1_F568(void) { return var_r31; } -void fn_1_F600(void) { - StructBss4A4* var_r30; - StructBss3E4* temp_r31; +void fn_1_F600(void) +{ + StructBss4A4 *var_r30; + StructBss3E4 *temp_r31; var_r30 = &lbl_1_bss_4A4; temp_r31 = &lbl_1_bss_3E4[var_r30->unk00]; @@ -2962,9 +3076,10 @@ void fn_1_F600(void) { HuPrcChildCreate(fn_1_0, 100, 0x2000, 0, HuPrcCurrentGet()); } -s32 fn_1_F6B0(void) { - StructBss4A4* var_r31; - StructBss3E4* temp_r30; +s32 fn_1_F6B0(void) +{ + StructBss4A4 *var_r31; + StructBss3E4 *temp_r30; var_r31 = &lbl_1_bss_4A4; temp_r30 = &lbl_1_bss_3E4[var_r31->unk00]; @@ -2978,16 +3093,15 @@ s32 fn_1_F6B0(void) { return 0; } -StructData1E8 lbl_1_data_32C[] = { - { fn_1_F600, fn_1_F6B0, 360 }, - { NULL, NULL, -1 } -}; +StructData1E8 lbl_1_data_32C[] = { { fn_1_F600, fn_1_F6B0, 360 }, { NULL, NULL, -1 } }; -void fn_1_F75C(void) { +void fn_1_F75C(void) +{ fn_1_11D18(&lbl_1_bss_24, lbl_1_data_32C); } -s32 fn_1_F78C(void) { +s32 fn_1_F78C(void) +{ s32 var_r31; var_r31 = 0; @@ -3001,10 +3115,11 @@ s32 fn_1_F78C(void) { return var_r31; } -void fn_1_F824(omObjData* arg0) { - StructBss1A8* sp8; - StructBss4A4* var_r30; - StructBss3E4* temp_r29; +void fn_1_F824(omObjData *arg0) +{ + StructBss1A8 *sp8; + StructBss4A4 *var_r30; + StructBss3E4 *temp_r29; s32 i; sp8 = &lbl_1_bss_1A8; @@ -3023,7 +3138,8 @@ void fn_1_F824(omObjData* arg0) { } } -void fn_1_F924(omObjData* arg0) { +void fn_1_F924(omObjData *arg0) +{ if (omSysExitReq == 1) { HuAudSeqAllFadeOut(250); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1); @@ -3031,10 +3147,11 @@ void fn_1_F924(omObjData* arg0) { } } -void fn_1_F984(void) { - StructBss180* var_r21; - StructBss4A4* var_r22; - StructBss3E4* temp_r25; +void fn_1_F984(void) +{ + StructBss180 *var_r21; + StructBss4A4 *var_r22; + StructBss3E4 *temp_r25; s32 i; fn_1_3088(); @@ -3047,13 +3164,8 @@ void fn_1_F984(void) { var_r22 = &lbl_1_bss_4A4; var_r22->unk00 = var_r22->unk04 = var_r22->unk08 = var_r22->unk0C = 0; { - StructBss1BC* var_r20 = &lbl_1_bss_1BC; - Vec sp18[] = { - { -600.0f, 0.0f, 300.0f }, - { -600.0f, 0.0f, 150.0f }, - { -450.0f, 0.0f, 150.0f }, - { -300.0f, 0.0f, 150.0f } - }; + StructBss1BC *var_r20 = &lbl_1_bss_1BC; + Vec sp18[] = { { -600.0f, 0.0f, 300.0f }, { -600.0f, 0.0f, 150.0f }, { -450.0f, 0.0f, 150.0f }, { -300.0f, 0.0f, 150.0f } }; sp18[0].z = var_r20->unk04[0].z - 100.0f; for (i = 0; i < 4; i++) { @@ -3074,7 +3186,8 @@ void fn_1_F984(void) { lbl_1_bss_3AC.unk28 = HuAudFXPlay(0x6D7); } -void fn_1_1026C(omObjData* arg0) { +void fn_1_1026C(omObjData *arg0) +{ switch (lbl_1_bss_18) { case 0: fn_1_F984(); @@ -3134,13 +3247,14 @@ void fn_1_1026C(omObjData* arg0) { fn_1_F924(arg0); } -void fn_1_10670(omObjData* arg0) { - StructBss220* var_r28; - StructBss1BC* var_r27; - StructBss1A8* var_r26; - StructBss180* temp_r30; - StructBss3E4* temp_r29; - StructBssD8* var_r25; +void fn_1_10670(omObjData *arg0) +{ + StructBss220 *var_r28; + StructBss1BC *var_r27; + StructBss1A8 *var_r26; + StructBss180 *temp_r30; + StructBss3E4 *temp_r29; + StructBssD8 *var_r25; s32 i; var_r28 = &lbl_1_bss_220; @@ -3167,7 +3281,8 @@ void fn_1_10670(omObjData* arg0) { #include "src/REL/executor.c" -void fn_1_108DC(void) { +void fn_1_108DC(void) +{ lbl_1_bss_0 = omInitObjMan(62, 0x2000); omGameSysInit(lbl_1_bss_0); fn_1_1A8(); @@ -3179,6 +3294,7 @@ void fn_1_108DC(void) { omAddObjEx(lbl_1_bss_0, 0x1000, 0, 0, -1, fn_1_10670); } -void ObjectSetup(void) { +void ObjectSetup(void) +{ fn_1_108DC(); } diff --git a/src/REL/m438Dll/main.c b/src/REL/m438Dll/main.c index 2c4c80b4..26583249 100644 --- a/src/REL/m438Dll/main.c +++ b/src/REL/m438Dll/main.c @@ -9,7 +9,6 @@ #include "game/pad.h" #include "game/sprite.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" #include "REL/m438Dll.h" diff --git a/src/REL/m439Dll/main.c b/src/REL/m439Dll/main.c index f89c03d4..8e761bba 100644 --- a/src/REL/m439Dll/main.c +++ b/src/REL/m439Dll/main.c @@ -20,8 +20,6 @@ #include "ext_math.h" -#include "rel_sqrt_consts.h" - #include "REL/m439data.h" typedef struct camera_params { diff --git a/src/REL/m440Dll/main.c b/src/REL/m440Dll/main.c index 4f9c8c9e..e200145c 100644 --- a/src/REL/m440Dll/main.c +++ b/src/REL/m440Dll/main.c @@ -12,7 +12,7 @@ #include "game/sprite.h" #include "game/wipe.h" #include "math.h" -#include "rel_sqrt_consts.h" + #include "string.h" // bss diff --git a/src/REL/m441Dll/main.c b/src/REL/m441Dll/main.c index fcb990a5..10409258 100644 --- a/src/REL/m441Dll/main.c +++ b/src/REL/m441Dll/main.c @@ -21,7 +21,6 @@ #include "game/sprite.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" #undef ABS #define ABS(x) ((0 > (x)) ? -(x) : (x)) diff --git a/src/REL/m442Dll/main.c b/src/REL/m442Dll/main.c index 38b861b7..b6e60e1e 100644 --- a/src/REL/m442Dll/main.c +++ b/src/REL/m442Dll/main.c @@ -12,7 +12,6 @@ #include "game/pad.h" #include "game/sprite.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" #include "REL/m442Dll.h" diff --git a/src/REL/m443Dll/main.c b/src/REL/m443Dll/main.c index b7c1cb01..5b22d7c6 100644 --- a/src/REL/m443Dll/main.c +++ b/src/REL/m443Dll/main.c @@ -11,7 +11,7 @@ #include "game/sprite.h" #include "game/wipe.h" #include "math.h" -#include "rel_sqrt_consts.h" + #include "string.h" #ifndef __MWERKS__ diff --git a/src/REL/m444dll/main.c b/src/REL/m444dll/main.c index 4a2c8b7e..12db5f84 100644 --- a/src/REL/m444dll/main.c +++ b/src/REL/m444dll/main.c @@ -19,8 +19,6 @@ #include "ext_math.h" #include "math.h" -#include "rel_sqrt_consts.h" - typedef struct camera_view_params { Vec rot; Vec pos; diff --git a/src/REL/m445Dll/main.c b/src/REL/m445Dll/main.c index 5056e81c..67dbe9d3 100755 --- a/src/REL/m445Dll/main.c +++ b/src/REL/m445Dll/main.c @@ -18,7 +18,6 @@ #include "dolphin.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" typedef struct { /* 0x00 */ s16 unk00; diff --git a/src/REL/m448Dll/main.c b/src/REL/m448Dll/main.c index 6c160d1c..8309a194 100755 --- a/src/REL/m448Dll/main.c +++ b/src/REL/m448Dll/main.c @@ -20,7 +20,6 @@ #include "dolphin.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" typedef struct { /* 0x00 */ s32 unk00; diff --git a/src/REL/m450Dll/main.c b/src/REL/m450Dll/main.c index 8bd49c19..cca17e4b 100644 --- a/src/REL/m450Dll/main.c +++ b/src/REL/m450Dll/main.c @@ -31,7 +31,6 @@ #include "game/sprite.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" #include "game/window.h" #include "string.h" diff --git a/src/REL/m451Dll/m451.c b/src/REL/m451Dll/m451.c index 280fe651..05d6adaa 100644 --- a/src/REL/m451Dll/m451.c +++ b/src/REL/m451Dll/m451.c @@ -17,8 +17,6 @@ #include "game/gamework_data.h" -#include "rel_sqrt_consts.h" - typedef struct bss_348_data { s16 unk0[5]; s16 unkA; diff --git a/src/REL/m453Dll/main.c b/src/REL/m453Dll/main.c index 3e07c4b1..2c8f9116 100644 --- a/src/REL/m453Dll/main.c +++ b/src/REL/m453Dll/main.c @@ -12,7 +12,7 @@ #include "game/pad.h" #include "game/sprite.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" + #include "string.h" #include "REL/m453Dll.h" diff --git a/src/REL/m455Dll/main.c b/src/REL/m455Dll/main.c index 3a41ee0b..2a2c634a 100644 --- a/src/REL/m455Dll/main.c +++ b/src/REL/m455Dll/main.c @@ -1,25 +1,24 @@ +#include "game/hsfdraw.h" +#include "game/hsfman.h" #include "game/object.h" #include "game/objsub.h" -#include "game/hsfman.h" -#include "game/hsfdraw.h" + #include "game/hsfmotion.h" #include "game/pad.h" -#include "game/wipe.h" -#include "game/frand.h" -#include "game/audio.h" -#include "game/minigame_seq.h" -#include "game/gamework_data.h" -#include "game/chrman.h" #include "REL/m455Dll.h" +#include "game/audio.h" +#include "game/chrman.h" +#include "game/frand.h" +#include "game/gamework_data.h" +#include "game/minigame_seq.h" +#include "game/wipe.h" + #include "ext_math.h" #include "math.h" -#include "rel_sqrt_consts.h" - - typedef struct camera_view_params { float zoom; Vec pos; @@ -51,7 +50,6 @@ Vec lbl_1_bss_8; s16 lbl_1_bss_4; s32 lbl_1_bss_0; - void fn_1_330(omObjData *object); void fn_1_B94(Process *objman); void fn_1_2A90(Process *objman); @@ -68,9 +66,9 @@ void ObjectSetup(void) Hu3DCameraPerspectiveSet(HU3D_CAM0, -1, 20, 25000, 1.2f); Hu3DCameraViewportSet(HU3D_CAM0, 0, 0, 640, 480, 0, 1); lbl_1_bss_3C = omAddObjEx(objman, 32730, 0, 0, -1, omOutView); - lbl_1_bss_8.x = lbl_1_data_44.x-lbl_1_data_38.x; - lbl_1_bss_8.y = lbl_1_data_44.y-lbl_1_data_38.y; - lbl_1_bss_8.z = lbl_1_data_44.z-lbl_1_data_38.z; + lbl_1_bss_8.x = lbl_1_data_44.x - lbl_1_data_38.x; + lbl_1_bss_8.y = lbl_1_data_44.y - lbl_1_data_38.y; + lbl_1_bss_8.z = lbl_1_data_44.z - lbl_1_data_38.z; PSVECNormalize(&lbl_1_bss_8, &lbl_1_bss_8); light = Hu3DGLightCreateV(&lbl_1_data_38, &lbl_1_bss_8, &lbl_1_data_50); Hu3DGLightInfinitytSet(light); @@ -107,7 +105,7 @@ void fn_1_330(omObjData *object) lbl_1_bss_24 = 60; lbl_1_bss_22 = -1; lbl_1_bss_20 = 0; - lbl_1_bss_16 = ((frand16()*270.0f)/65536.0f)+30.0f; + lbl_1_bss_16 = ((frand16() * 270.0f) / 65536.0f) + 30.0f; WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); camera->fov = 30.0f; object->func = fn_1_478; @@ -152,115 +150,114 @@ s16 lbl_1_data_90 = -1; s32 lbl_1_data_94 = -1; s32 lbl_1_data_98 = -1; - - void fn_1_478(omObjData *object) { s32 i; omObjData **playerList; M455Player *player; - - switch(fn_1_320()) { + + switch (fn_1_320()) { case 0: - if(lbl_1_data_98 < 0) { + if (lbl_1_data_98 < 0) { lbl_1_data_98 = HuAudFXPlay(1985); } - if(--lbl_1_bss_2C == 0) { + if (--lbl_1_bss_2C == 0) { fn_1_310(1); lbl_1_bss_2C = 120; } break; - + case 1: - if(--lbl_1_bss_2C == 0) { + if (--lbl_1_bss_2C == 0) { fn_1_310(2); lbl_1_bss_4 = MGSeqStartCreate(); } break; - + case 2: - if(!MGSeqStatGet(lbl_1_bss_4)) { + if (!MGSeqStatGet(lbl_1_bss_4)) { fn_1_310(3); } - if(lbl_1_data_94 < 0 && (MGSeqStatGet(lbl_1_bss_4) & 0x10)) { + if (lbl_1_data_94 < 0 && (MGSeqStatGet(lbl_1_bss_4) & 0x10)) { lbl_1_data_94 = HuAudSeqPlay(60); } break; - + case 3: - if(--lbl_1_bss_24 == 0) { + if (--lbl_1_bss_24 == 0) { lbl_1_bss_26--; - if(lbl_1_data_90 >= 0) { + if (lbl_1_data_90 >= 0) { MGSeqParamSet(lbl_1_data_90, 1, lbl_1_bss_26); } lbl_1_bss_24 = 60; - if(lbl_1_bss_26 == 10) { + if (lbl_1_bss_26 == 10) { lbl_1_data_90 = MGSeqTimerCreate(10); } } - if(lbl_1_bss_16 >= 0) { + if (lbl_1_bss_16 >= 0) { lbl_1_bss_16--; } - if(lbl_1_bss_26 == 0 || fn_1_C90()) { + if (lbl_1_bss_26 == 0 || fn_1_C90()) { fn_1_310(4); lbl_1_bss_4 = MGSeqFinishCreate(); HuAudSeqFadeOut(lbl_1_data_94, 100); } break; - + case 4: - if(lbl_1_data_90 >= 0) { + if (lbl_1_data_90 >= 0) { MGSeqParamSet(lbl_1_data_90, 2, -1); lbl_1_data_90 = -1; } - if(!MGSeqStatGet(lbl_1_bss_4)) { + if (!MGSeqStatGet(lbl_1_bss_4)) { fn_1_310(7); lbl_1_bss_2C = 120; } break; - + case 7: - if(--lbl_1_bss_2C == 0) { + if (--lbl_1_bss_2C == 0) { fn_1_310(9); - if(lbl_1_bss_30 >= 0) { + if (lbl_1_bss_30 >= 0) { HuAudSStreamPlay(1); playerList = omGetGroupMemberListEx(HuPrcCurrentGet(), 0); - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { player = playerList[i]->data; - if(player->unk28 < 0) { - GWPlayerCoinWinSet(i, lbl_1_bss_22+1); + if (player->unk28 < 0) { + GWPlayerCoinWinSet(i, lbl_1_bss_22 + 1); } } - } else { + } + else { HuAudSStreamPlay(4); - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { GWPlayerCoinWinSet(i, 3); } } lbl_1_bss_2C = 210; } break; - + case 9: - if(--lbl_1_bss_2C == 0) { + if (--lbl_1_bss_2C == 0) { WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); HuAudFXStop(lbl_1_data_98); object->func = fn_1_B38; } break; } - if(lbl_1_bss_20) { - if(lbl_1_bss_20 >= 2) { - for(i=0; i<100; i++){ - s32 srcIdx = (frand8()*lbl_1_bss_20) >> 8; - s32 dstIdx = (frand8()*lbl_1_bss_20) >> 8; + if (lbl_1_bss_20) { + if (lbl_1_bss_20 >= 2) { + for (i = 0; i < 100; i++) { + s32 srcIdx = (frand8() * lbl_1_bss_20) >> 8; + s32 dstIdx = (frand8() * lbl_1_bss_20) >> 8; s32 temp = lbl_1_bss_18[srcIdx]; lbl_1_bss_18[srcIdx] = lbl_1_bss_18[dstIdx]; lbl_1_bss_18[dstIdx] = temp; } } playerList = omGetGroupMemberListEx(HuPrcCurrentGet(), 0); - for(i=0; idata; @@ -268,7 +265,7 @@ void fn_1_478(omObjData *object) } lbl_1_bss_20 = 0; } - if(omSysExitReq && !WipeStatGet()) { + if (omSysExitReq && !WipeStatGet()) { WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); object->func = fn_1_B38; } @@ -276,7 +273,7 @@ void fn_1_478(omObjData *object) void fn_1_B38(omObjData *object) { - if(WipeStatGet()) { + if (WipeStatGet()) { return; } fn_1_C28(); @@ -295,9 +292,8 @@ void fn_1_B94(Process *objman) lbl_1_bss_28 = 0; lbl_1_bss_14 = 3; omMakeGroupEx(objman, 0, 4); - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { omAddObjEx(objman, 5, 10, 50, 0, fn_1_D14); - } } @@ -308,10 +304,10 @@ void fn_1_C28(void) s32 i; omObjData **playerList; playerList = omGetGroupMemberListEx(HuPrcCurrentGet(), 0); - if(playerList == NULL) { + if (playerList == NULL) { return; } - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { fn_1_2010(playerList[i]); } } @@ -321,9 +317,9 @@ s32 fn_1_C90(void) s32 i; omObjData **playerList; playerList = omGetGroupMemberListEx(HuPrcCurrentGet(), 0); - for(i=0; i<4; i++) { + for (i = 0; i < 4; i++) { M455Player *player = playerList[i]->data; - if(!player->field1) { + if (!player->field1) { return 0; } } @@ -333,11 +329,16 @@ s32 fn_1_C90(void) s32 fn_1_3214(void); u32 lbl_1_data_E0[5][2] = { - 0x5F0000, 0, - 0x540024, 1, - 0x54001C, 1, - 0x5F0017, 0, - 0x5F0018, 0, + 0x5F0000, + 0, + 0x540024, + 1, + 0x54001C, + 1, + 0x5F0017, + 0, + 0x5F0018, + 0, }; Vec lbl_1_data_108[4] = { @@ -372,13 +373,14 @@ void fn_1_D14(omObjData *object) Hu3DModelCameraSet(object->model[0], HU3D_CAM0); object->model[1] = Hu3DModelCreateFile(0x540002); Hu3DModelHookSet(object->model[0], "test11_tex_we-itemhook-r", object->model[1]); - Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_SHAPE_PAUSE|HU3D_MOTATTR_PAUSE); + Hu3DModelAttrSet(object->model[1], HU3D_MOTATTR_SHAPE_PAUSE | HU3D_MOTATTR_PAUSE); player->unk1C = 1; - for(i=0; i<5; i++) { - if(lbl_1_data_E0[i][1] == 0) { + for (i = 0; i < 5; i++) { + if (lbl_1_data_E0[i][1] == 0) { object->motion[i] = CharModelMotionCreate(player->unk10, lbl_1_data_E0[i][0]); - } else { - object->motion[i] = CharModelMotionCreate(player->unk10, player->unk10+lbl_1_data_E0[i][0]); + } + else { + object->motion[i] = CharModelMotionCreate(player->unk10, player->unk10 + lbl_1_data_E0[i][0]); } } Hu3DMotionSet(object->model[0], object->motion[player->unk1C]); @@ -400,7 +402,7 @@ void fn_1_D14(omObjData *object) Hu3DMotionSet(object->model[4], i); Hu3DModelAttrSet(object->model[4], HU3D_MOTATTR_LOOP); Hu3DModelAttrSet(object->model[4], HU3D_MOTATTR_PAUSE); - player->unk4C.x = object->trans.x+(50.0f*((((s32)frand() & 0x1FF)-256.0f)/256.0f)); + player->unk4C.x = object->trans.x + (50.0f * ((((s32)frand() & 0x1FF) - 256.0f) / 256.0f)); player->unk4C.y = -200; player->unk4C.z = -1500; Hu3DModelPosSetV(object->model[4], &player->unk4C); @@ -413,13 +415,14 @@ void fn_1_D14(omObjData *object) player->unk34[1].z = -1000; CharModelDataClose(player->unk10); object->rot.y = 180; - if(((s32)frand() & 0x1F) < 4-player->unk12) { - player->unk58 = lbl_1_bss_16-(60.0f*(0.05f*(4-player->unk12)))-((frand8()/256.0f)*6.0f); - if(player->unk58 < 0) { + if (((s32)frand() & 0x1F) < 4 - player->unk12) { + player->unk58 = lbl_1_bss_16 - (60.0f * (0.05f * (4 - player->unk12))) - ((frand8() / 256.0f) * 6.0f); + if (player->unk58 < 0) { player->unk58 = 0; } - } else { - player->unk58 = lbl_1_bss_16+(60.0f*(0.1f*(4-player->unk12)))+((frand8()/256.0f)*30.0f)+6.0f; + } + else { + player->unk58 = lbl_1_bss_16 + (60.0f * (0.1f * (4 - player->unk12))) + ((frand8() / 256.0f) * 30.0f) + 6.0f; } player->unk28 = -1; object->func = fn_1_1444; @@ -428,25 +431,17 @@ void fn_1_D14(omObjData *object) void fn_1_1400(omObjData *object) { M455Player *player = object->data; - if(player->unk58 != 0) { + if (player->unk58 != 0) { player->unk58--; - } else { + } + else { player->unkA |= PAD_BUTTON_A; } } -float lbl_1_data_154[4] = { - -350, - -170, - 170, - 350 -}; +float lbl_1_data_154[4] = { -350, -170, 170, 350 }; -float lbl_1_data_164[3] = { - 1.5f, - 1.0f, - 0.5f -}; +float lbl_1_data_164[3] = { 1.5f, 1.0f, 0.5f }; float fn_1_2390(float arg0, float arg1, float arg2); s32 fn_1_24F0(Vec *arg0, Vec *arg1, float arg2); @@ -461,38 +456,39 @@ void fn_1_1444(omObjData *object) Vec spC; float temp_f31; - temp_r31 = object->data; temp_r29 = temp_r31->unk1C; temp_r28 = temp_r31->unk20; object->trans.y = fn_1_687C(); - if(fn_1_320() < 3) { + if (fn_1_320() < 3) { return; } - switch(temp_r31->unk16) { + switch (temp_r31->unk16) { case 0: - if(fn_1_320() == 4 || lbl_1_bss_14 == 0) { + if (fn_1_320() == 4 || lbl_1_bss_14 == 0) { temp_r31->field1 = 1; temp_r31->unk16 = 2; espDispOff(temp_r31->unk2A); return; } - if(!GWPlayerCfg[temp_r31->unk2].iscom) { + if (!GWPlayerCfg[temp_r31->unk2].iscom) { temp_r31->unk6 = HuPadStkX[temp_r31->unk4]; temp_r31->unk7 = HuPadStkY[temp_r31->unk4]; temp_r31->unk8 = HuPadBtn[temp_r31->unk4]; temp_r31->unkA = HuPadBtnDown[temp_r31->unk4]; - } else { + } + else { temp_r31->unk8 = temp_r31->unkA = 0; temp_r31->unk6 = temp_r31->unk7 = 0; fn_1_1400(object); } - if(lbl_1_bss_16 == 0) { - if(temp_r31->unkC) { + if (lbl_1_bss_16 == 0) { + if (temp_r31->unkC) { omVibrate(temp_r31->unk2, 12, 12, 0); - } else { + } + else { sp18.x = object->trans.x; - sp18.y = object->trans.y+300; + sp18.y = object->trans.y + 300; sp18.z = object->trans.z; Hu3D3Dto2D(&sp18, HU3D_CAM0, &sp18); espPosSet(temp_r31->unk2A, sp18.x, sp18.y); @@ -501,31 +497,30 @@ void fn_1_1444(omObjData *object) } temp_r31->unk2C = temp_r31->unk2E = 30; } - - if(temp_r31->unkA & PAD_BUTTON_A) { + + if (temp_r31->unkA & PAD_BUTTON_A) { temp_r31->unk16 = 1; temp_r31->unk24 = temp_r31->unk26 = 90; temp_r31->unk2C = -1; - if(lbl_1_bss_16 <= 0) { + if (lbl_1_bss_16 <= 0) { lbl_1_bss_18[lbl_1_bss_20++] = temp_r31->unk2; } - Hu3DModelAttrReset(object->model[1], HU3D_MOTATTR_SHAPE_PAUSE|HU3D_MOTATTR_PAUSE); + Hu3DModelAttrReset(object->model[1], HU3D_MOTATTR_SHAPE_PAUSE | HU3D_MOTATTR_PAUSE); Hu3DMotionSpeedSet(object->model[1], 1.2f); Hu3DMotionShapeSpeedSet(object->model[1], 1.2f); HuAudFXPlay(1986); - } temp_r29 = 1; temp_r28 = HU3D_MOTATTR_LOOP; break; - + case 1: temp_r29 = 2; temp_r28 = HU3D_MOTATTR_NONE; - if(!temp_r31->field0) { - if(temp_r31->unk28 >= 0 && temp_r31->unk28 < 3) { + if (!temp_r31->field0) { + if (temp_r31->unk28 >= 0 && temp_r31->unk28 < 3) { temp_r31->field0 = 1; - if(temp_r31->unk28 == 0) { + if (temp_r31->unk28 == 0) { lbl_1_bss_30 = temp_r31->unk2; } temp_f31 = lbl_1_data_164[temp_r31->unk28]; @@ -533,13 +528,13 @@ void fn_1_1444(omObjData *object) Hu3DModelAttrReset(object->model[4], HU3D_ATTR_DISPOFF); } } - temp_f31 = 1.0f-((float)temp_r31->unk24/temp_r31->unk26); + temp_f31 = 1.0f - ((float)temp_r31->unk24 / temp_r31->unk26); sp24[0].x = temp_r31->unk4C.x; sp24[0].y = temp_r31->unk4C.y; sp24[0].z = temp_r31->unk4C.z; sp24[1].x = object->trans.x; - sp24[1].y = object->trans.y+1500; - sp24[1].z = object->trans.z-200; + sp24[1].y = object->trans.y + 1500; + sp24[1].z = object->trans.z - 200; sp24[2].x = lbl_1_data_154[temp_r31->unk2]; sp24[2].y = 0; sp24[2].z = 150; @@ -547,32 +542,32 @@ void fn_1_1444(omObjData *object) VECSubtract(&sp18, &Hu3DData[object->model[4]].pos, &spC); Hu3DModelRotSet(object->model[4], atan2d(-spC.y, VECMagXZ(&spC)), atan2d(spC.x, spC.z), 0); Hu3DModelPosSetV(object->model[4], &sp18); - if(sp18.y > 0.0f) { - if(!temp_r31->field2 && temp_r31->field0) { + if (sp18.y > 0.0f) { + if (!temp_r31->field2 && temp_r31->field0) { fn_1_6CB0(&sp18, -1); fn_1_6698(&sp18, -1, -1, -1); temp_r31->field2 = 1; } } - temp_r31->unk34[0].x = temp_f31*(2.0f*lbl_1_data_154[temp_r31->unk2]); - temp_r31->unk34[0].y = -200.0f+(-400.0f*temp_f31); - temp_r31->unk34[0].z = -500.0f+(-1500.0f*temp_f31); - temp_r31->unk34[1].x = temp_f31*lbl_1_data_154[temp_r31->unk2]; - temp_r31->unk34[1].y = -200.0f+(400.0f*temp_f31); - temp_r31->unk34[1].z = -1000.0f+(750.0f*temp_f31); - if(--temp_r31->unk24 == 0) { + temp_r31->unk34[0].x = temp_f31 * (2.0f * lbl_1_data_154[temp_r31->unk2]); + temp_r31->unk34[0].y = -200.0f + (-400.0f * temp_f31); + temp_r31->unk34[0].z = -500.0f + (-1500.0f * temp_f31); + temp_r31->unk34[1].x = temp_f31 * lbl_1_data_154[temp_r31->unk2]; + temp_r31->unk34[1].y = -200.0f + (400.0f * temp_f31); + temp_r31->unk34[1].z = -1000.0f + (750.0f * temp_f31); + if (--temp_r31->unk24 == 0) { temp_r31->unk16 = 2; temp_r31->field1 = 1; - if(temp_r31->field0) { + if (temp_r31->field0) { Hu3DModelAttrReset(object->model[4], HU3D_MOTATTR_PAUSE); Hu3DModelRotSet(object->model[4], 0, 0, 0); lbl_1_bss_14--; } } break; - + case 2: - if(fn_1_320() == 7) { + if (fn_1_320() == 7) { temp_r31->unk16 = 3; Hu3DModelObjPosGet(object->model[0], "test11_tex_we-itemhook-r", &sp18); CharModelEffectCreate(1, &sp18); @@ -580,46 +575,50 @@ void fn_1_1444(omObjData *object) Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); } break; - + case 3: - if(fn_1_320() < 9) { + if (fn_1_320() < 9) { temp_r29 = 0; temp_r28 = HU3D_MOTATTR_LOOP; - } else { + } + else { object->rot.y = fn_1_2390(object->rot.y, 0, 0.2f); - if(temp_r31->unk2 == lbl_1_bss_30) { + if (temp_r31->unk2 == lbl_1_bss_30) { temp_r29 = 3; temp_r28 = HU3D_MOTATTR_NONE; - } else { + } + else { temp_r29 = 4; temp_r28 = HU3D_MOTATTR_NONE; } } break; - + default: break; } - if(temp_r31->unk2C) { - if(temp_r31->unk2C >= 0) { - temp_f31 = (0.5*sind((90.0f*(float)temp_r31->unk2C)/(float)temp_r31->unk2E))+0.5; + if (temp_r31->unk2C) { + if (temp_r31->unk2C >= 0) { + temp_f31 = (0.5 * sind((90.0f * (float)temp_r31->unk2C) / (float)temp_r31->unk2E)) + 0.5; espScaleSet(temp_r31->unk2A, temp_f31, temp_f31); - if(--temp_r31->unk2C == 0) { + if (--temp_r31->unk2C == 0) { temp_r31->unk2C = temp_r31->unk2E; } temp_r31->unk30++; - } else { - if(temp_r31->unk30 > 30.0f) { + } + else { + if (temp_r31->unk30 > 30.0f) { espDispOff(temp_r31->unk2A); temp_r31->unk2C = 0; - } else { + } + else { temp_r31->unk30++; } } } - if(temp_r31->unk16 >= 2 && temp_r31->unk16 <= 3 && temp_r31->field0) { + if (temp_r31->unk16 >= 2 && temp_r31->unk16 <= 3 && temp_r31->field0) { Hu3DData[object->model[4]].rot.y += 2.0f; - if(0.0f == Hu3DData[object->model[4]].unk_64) { + if (0.0f == Hu3DData[object->model[4]].unk_64) { HuAudFXPlay(1987); } } @@ -633,7 +632,7 @@ void fn_1_1444(omObjData *object) void fn_1_2010(omObjData *object) { M455Player *player = object->data; - if(object->data != NULL) { + if (object->data != NULL) { HuMemDirectFree(object->data); object->data = NULL; } @@ -647,7 +646,7 @@ void fn_1_2060(ModelData *arg0, Mtx arg1) { Vec vtxPos[4]; Mtx mtxHook; - + Vec pos; Vec itemHookPos; s32 i; @@ -666,16 +665,16 @@ void fn_1_2060(ModelData *arg0, Mtx arg1) GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR); GXClearVtxDesc(); GXSetVtxDesc(GX_VA_POS, GX_DIRECT); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); Hu3DModelObjMtxGet(object->model[0], "test11_tex_we-itemhook-r", mtxHook); Hu3DModelObjPosGet(object->model[1], "hook", &pos); MTXMultVec(mtxHook, &pos, &vtxPos[0]); - for(i=0; i<2; i++) { - vtxPos[i+1].x = player->unk34[i].x; - vtxPos[i+1].y = player->unk34[i].y; - vtxPos[i+1].z = player->unk34[i].z; + for (i = 0; i < 2; i++) { + vtxPos[i + 1].x = player->unk34[i].x; + vtxPos[i + 1].y = player->unk34[i].y; + vtxPos[i + 1].z = player->unk34[i].z; } - if(player->field0) { + if (player->field0) { Mtx hookMtx; Vec hookPos; Hu3DModelObjMtxGet(object->model[4], "itemhook_C", hookMtx); @@ -683,14 +682,15 @@ void fn_1_2060(ModelData *arg0, Mtx arg1) hookPos.y = -60.000004f; hookPos.z = 35.0f; MTXMultVec(hookMtx, &hookPos, &vtxPos[3]); - } else { + } + else { vtxPos[3].x = modelPuku->pos.x; vtxPos[3].y = modelPuku->pos.y; vtxPos[3].z = modelPuku->pos.z; } GXBegin(GX_LINESTRIP, GX_VTXFMT0, 20); - for(i=0; i<20; i++) { - fn_1_27A0(vtxPos, &pos, i/19.0f); + for (i = 0; i < 20; i++) { + fn_1_27A0(vtxPos, &pos, i / 19.0f); GXPosition3f32(pos.x, pos.y, pos.z); } GXEnd(); @@ -698,16 +698,16 @@ void fn_1_2060(ModelData *arg0, Mtx arg1) float fn_1_2390(float arg0, float arg1, float arg2) { - float temp_f31 = fmod(arg1-arg0, 360); + float temp_f31 = fmod(arg1 - arg0, 360); float temp_f30; - if(temp_f31 < 0) { + if (temp_f31 < 0) { temp_f31 += 360.0f; } - if(temp_f31 > 180) { + if (temp_f31 > 180) { temp_f31 -= 360.0f; } - temp_f30 = fmod(arg0+(arg2*temp_f31), 360); - if(temp_f30 < 0) { + temp_f30 = fmod(arg0 + (arg2 * temp_f31), 360); + if (temp_f30 < 0) { temp_f30 += 360.0f; } return temp_f30; @@ -715,8 +715,8 @@ float fn_1_2390(float arg0, float arg1, float arg2) float fn_1_2494(float arg0, float arg1, float arg2, float arg3) { - float temp_f31 = 1.0f-arg3; - return (arg0*(temp_f31*temp_f31))+((2.0f*temp_f31)*arg3*arg1)+(arg2*(arg3*arg3)); + float temp_f31 = 1.0f - arg3; + return (arg0 * (temp_f31 * temp_f31)) + ((2.0f * temp_f31) * arg3 * arg1) + (arg2 * (arg3 * arg3)); } s32 fn_1_24F0(Vec *arg0, Vec *arg1, float arg2) @@ -728,9 +728,9 @@ s32 fn_1_24F0(Vec *arg0, Vec *arg1, float arg2) float fn_1_26F8(float arg0, float arg1, float arg2, float arg3, float arg4) { - float temp_f31 = 1.0f-arg0; - float temp_f30 = temp_f31*temp_f31; - float temp_f29 = temp_f31*temp_f31*temp_f31; + float temp_f31 = 1.0f - arg0; + float temp_f30 = temp_f31 * temp_f31; + float temp_f29 = temp_f31 * temp_f31 * temp_f31; return (arg4 * (arg0 * (arg0 * arg0))) + ((arg3 * (arg0 * (3.0f * temp_f31 * arg0))) + ((temp_f29 * arg1) + (arg2 * (3.0f * temp_f30 * arg0)))); } @@ -755,33 +755,33 @@ void fn_1_2A90(Process *objman) void fn_1_2AF4(s32 arg0, s32 arg1, float arg2) { - CZoom = lbl_1_data_0[arg0].zoom+(arg2*(lbl_1_data_0[arg1].zoom-lbl_1_data_0[arg0].zoom)); - Center.x = lbl_1_data_0[arg0].pos.x+(arg2*(lbl_1_data_0[arg1].pos.x-lbl_1_data_0[arg0].pos.x)); - Center.y = lbl_1_data_0[arg0].pos.y+(arg2*(lbl_1_data_0[arg1].pos.y-lbl_1_data_0[arg0].pos.y)); - Center.z = lbl_1_data_0[arg0].pos.z+(arg2*(lbl_1_data_0[arg1].pos.z-lbl_1_data_0[arg0].pos.z)); - CRot.x = lbl_1_data_0[arg0].rot.x+(arg2*(lbl_1_data_0[arg1].rot.x-lbl_1_data_0[arg0].rot.x)); - CRot.y = lbl_1_data_0[arg0].rot.y+(arg2*(lbl_1_data_0[arg1].rot.y-lbl_1_data_0[arg0].rot.y)); - CRot.z = lbl_1_data_0[arg0].rot.z+(arg2*(lbl_1_data_0[arg1].rot.z-lbl_1_data_0[arg0].rot.z)); + CZoom = lbl_1_data_0[arg0].zoom + (arg2 * (lbl_1_data_0[arg1].zoom - lbl_1_data_0[arg0].zoom)); + Center.x = lbl_1_data_0[arg0].pos.x + (arg2 * (lbl_1_data_0[arg1].pos.x - lbl_1_data_0[arg0].pos.x)); + Center.y = lbl_1_data_0[arg0].pos.y + (arg2 * (lbl_1_data_0[arg1].pos.y - lbl_1_data_0[arg0].pos.y)); + Center.z = lbl_1_data_0[arg0].pos.z + (arg2 * (lbl_1_data_0[arg1].pos.z - lbl_1_data_0[arg0].pos.z)); + CRot.x = lbl_1_data_0[arg0].rot.x + (arg2 * (lbl_1_data_0[arg1].rot.x - lbl_1_data_0[arg0].rot.x)); + CRot.y = lbl_1_data_0[arg0].rot.y + (arg2 * (lbl_1_data_0[arg1].rot.y - lbl_1_data_0[arg0].rot.y)); + CRot.z = lbl_1_data_0[arg0].rot.z + (arg2 * (lbl_1_data_0[arg1].rot.z - lbl_1_data_0[arg0].rot.z)); } void fn_1_2D44(omObjData *object) { CameraData *camera = &Hu3DCamera[0]; - switch(fn_1_320()) { + switch (fn_1_320()) { case 1: - fn_1_2AF4(0, 1, sind(lbl_1_data_184[0]*90.0f)); - if(lbl_1_data_184[0] < 1.0f) { - lbl_1_data_184[0] += 1.0f/60.0f; - if(lbl_1_data_184[0] > 1.0f) { + fn_1_2AF4(0, 1, sind(lbl_1_data_184[0] * 90.0f)); + if (lbl_1_data_184[0] < 1.0f) { + lbl_1_data_184[0] += 1.0f / 60.0f; + if (lbl_1_data_184[0] > 1.0f) { lbl_1_data_184[0] = 1.0f; } } break; - + case 6: fn_1_2AF4(1, 1, 0); break; - + case 4: case 5: case 7: @@ -794,9 +794,9 @@ s32 fn_1_3214(void) { s32 rumble = HuPadRumbleGet(); s32 i; - for(i=0; i<4; i++) { - if(!GWPlayerCfg[i].iscom) { - if((rumble & lbl_1_data_18C[GWPlayerCfg[i].pad_idx]) == 0) { + for (i = 0; i < 4; i++) { + if (!GWPlayerCfg[i].iscom) { + if ((rumble & lbl_1_data_18C[GWPlayerCfg[i].pad_idx]) == 0) { return 0; } } @@ -804,4 +804,4 @@ s32 fn_1_3214(void) return GWGameStat.rumble; } -float lbl_1_data_19C[] = { 0,355,0,0,0,275,128,950,6,0,0,0,190,0,550 }; \ No newline at end of file +float lbl_1_data_19C[] = { 0, 355, 0, 0, 0, 275, 128, 950, 6, 0, 0, 0, 190, 0, 550 }; diff --git a/src/REL/m461Dll/main.c b/src/REL/m461Dll/main.c index 5b0ae287..f94c9831 100644 --- a/src/REL/m461Dll/main.c +++ b/src/REL/m461Dll/main.c @@ -22,7 +22,6 @@ #include "game/sprite.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" #undef ABS #define ABS(x) ((0 > (x)) ? -(x) : (x)) diff --git a/src/REL/mentDll/common.c b/src/REL/mentDll/common.c index 9d71da1f..82910c62 100644 --- a/src/REL/mentDll/common.c +++ b/src/REL/mentDll/common.c @@ -13,9 +13,6 @@ #include "game/wipe.h" #include "math.h" - -#include "rel_sqrt_consts.h" - Process *lbl_1_bss_0; // TODO: unknown type extern s32 lbl_1_bss_A8[]; diff --git a/src/REL/messDll/main.c b/src/REL/messDll/main.c index 9f861bf1..f7b32576 100755 --- a/src/REL/messDll/main.c +++ b/src/REL/messDll/main.c @@ -9,9 +9,8 @@ #include "dolphin.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" -extern s32 sprintf(char*, const char*, s32); +extern s32 sprintf(char *, const char *, s32); static void fn_1_2BC(omObjData *arg0); static void fn_1_300(omObjData *arg0); @@ -27,7 +26,8 @@ static u8 lbl_1_bss_4_pad[4]; static s16 lbl_1_bss_2; static s16 lbl_1_bss_0; -void ObjectSetup(void) { +void ObjectSetup(void) +{ OSReport("******* SAFObjectSetup *********\n"); lbl_1_bss_34 = omInitObjMan(0x32, 0x2000); CRot.x = -20.0f; @@ -46,12 +46,14 @@ void ObjectSetup(void) { lbl_1_bss_8 = HuPrcChildCreate(fn_1_E88, 100, 0x3000, 0, lbl_1_bss_34); } -static void fn_1_2BC(omObjData *arg0) { +static void fn_1_2BC(omObjData *arg0) +{ WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); arg0->func = fn_1_300; } -static void fn_1_300(omObjData *arg0) { +static void fn_1_300(omObjData *arg0) +{ Vec sp2C; Vec sp20; Vec sp14; @@ -79,14 +81,14 @@ static void fn_1_300(omObjData *arg0) { sp14.z = cosd(CRot.y) * sind(CRot.x); temp_f31 = CRot.z; sp8.x = sp14.x * (sp20.x * sp20.x + (1.0f - sp20.x * sp20.x) * cosd(temp_f31)) - + sp14.y * (sp20.x * sp20.y * (1.0 - cosd(temp_f31)) - sp20.z * sind(temp_f31)) - + sp14.z * (sp20.x * sp20.z * (1.0 - cosd(temp_f31)) + sp20.y * sind(temp_f31)); + + sp14.y * (sp20.x * sp20.y * (1.0 - cosd(temp_f31)) - sp20.z * sind(temp_f31)) + + sp14.z * (sp20.x * sp20.z * (1.0 - cosd(temp_f31)) + sp20.y * sind(temp_f31)); sp8.y = sp14.x * (sp20.x * sp20.y * (1.0 - cosd(temp_f31)) + sp20.z * sind(temp_f31)) - + sp14.y * (sp20.y * sp20.y + (1.0f - sp20.y * sp20.y) * cosd(temp_f31)) - + sp14.z * (sp20.y * sp20.z * (1.0 - cosd(temp_f31)) - sp20.x * sind(temp_f31)); + + sp14.y * (sp20.y * sp20.y + (1.0f - sp20.y * sp20.y) * cosd(temp_f31)) + + sp14.z * (sp20.y * sp20.z * (1.0 - cosd(temp_f31)) - sp20.x * sind(temp_f31)); sp8.z = sp14.x * (sp20.x * sp20.z * (1.0 - cosd(temp_f31)) - sp20.y * sind(temp_f31)) - + sp14.y * (sp20.y * sp20.z * (1.0 - cosd(temp_f31)) + sp20.x * sind(temp_f31)) - + sp14.z * (sp20.z * sp20.z + (1.0f - sp20.z * sp20.z) * cosd(temp_f31)); + + sp14.y * (sp20.y * sp20.z * (1.0 - cosd(temp_f31)) + sp20.x * sind(temp_f31)) + + sp14.z * (sp20.z * sp20.z + (1.0f - sp20.z * sp20.z) * cosd(temp_f31)); VECCrossProduct(&sp14, &sp20, &sp20); VECNormalize(&sp20, &sp20); temp_r31 = HuPadSubStkX[0] & 0xF8; @@ -104,69 +106,19 @@ static void fn_1_300(omObjData *arg0) { } } -static char *lbl_1_data_32C[] = { - "001_Character_Name_ss", - "002_Hidden_Block", - "003_Battle_M", - "004_Bowser_M", - "005_Warp_M", - "006_Mushroom_M", - "007_Lot_house", - "008_Boo_house", - "009_ItemName", - "010_Bord", - "011_RoundItem", - "012_Spaceamida", - "013_Star_M", - "014_RollerCoaster", - "015_Last5", - "016_ItemShop", - "017_System", - "018_ModeSelect", - "019_Item", - "020_Map2_event", - "021_Lucky_Minigame", - "022_Bord_Start", - "023_Map3_event", - "024_Minigame_Name", - "025_mg_446", - "026_debugmes", - "027_Party_Mode", - "028_SETUP", - "029_Miracle", - "030_mg_kuppa", - "031_Story_Mode", - "032_Bowser_Story", - "033_Map4_event", - "034_mg_inst", - "035_E3_only", - "036_saf", - "037_Mg_inst_sys_", - "038_Bord_Results", - "039_Bord_Results2", - "040_Map5_event", - "041_Mg_Mode", - "042_mg_445", - "043_mg_447", - "044_mg_448", - "045_mg_449", - "046_mg_450", - "047_tutorial", - "048_Option_Rooml", - "049_Map6_event", - "050_charley", - "051_Present_Room", - "052_Extra_Room", - "053_Staff_Post", - "054_Staff_Name", - "055_Opening_Demo", - "056_mgex_inst", - NULL -}; +static char *lbl_1_data_32C[] + = { "001_Character_Name_ss", "002_Hidden_Block", "003_Battle_M", "004_Bowser_M", "005_Warp_M", "006_Mushroom_M", "007_Lot_house", "008_Boo_house", + "009_ItemName", "010_Bord", "011_RoundItem", "012_Spaceamida", "013_Star_M", "014_RollerCoaster", "015_Last5", "016_ItemShop", "017_System", + "018_ModeSelect", "019_Item", "020_Map2_event", "021_Lucky_Minigame", "022_Bord_Start", "023_Map3_event", "024_Minigame_Name", "025_mg_446", + "026_debugmes", "027_Party_Mode", "028_SETUP", "029_Miracle", "030_mg_kuppa", "031_Story_Mode", "032_Bowser_Story", "033_Map4_event", + "034_mg_inst", "035_E3_only", "036_saf", "037_Mg_inst_sys_", "038_Bord_Results", "039_Bord_Results2", "040_Map5_event", "041_Mg_Mode", + "042_mg_445", "043_mg_447", "044_mg_448", "045_mg_449", "046_mg_450", "047_tutorial", "048_Option_Rooml", "049_Map6_event", "050_charley", + "051_Present_Room", "052_Extra_Room", "053_Staff_Post", "054_Staff_Name", "055_Opening_Demo", "056_mgex_inst", NULL }; static s16 lbl_1_data_410 = -1; -static void fn_1_E88(void) { +static void fn_1_E88(void) +{ s16 sp10[256]; // unknown size char spC[4]; char sp8[4]; @@ -192,7 +144,7 @@ static void fn_1_E88(void) { var_r30 = (var_r28 << 16); var_r25 = 0; while (1) { - if ((s32) MessData_MesPtrGet(messDataPtr, var_r30 + var_r25) == 0) { + if ((s32)MessData_MesPtrGet(messDataPtr, var_r30 + var_r25) == 0) { break; } sp10[var_r28]++; @@ -226,13 +178,15 @@ static void fn_1_E88(void) { var_r31 = 0; } var_r30 = 0; - } else if (temp_r3_2 & 0x40) { + } + else if (temp_r3_2 & 0x40) { var_r31--; if (var_r31 < 0) { var_r31 = var_r27 - 1; } var_r30 = 0; - } else if (temp_r3_2 & 0x200) { + } + else if (temp_r3_2 & 0x200) { var_r30--; if (var_r30 < 0) { var_r31--; @@ -241,7 +195,8 @@ static void fn_1_E88(void) { } var_r30 = sp10[var_r31] - 1; } - } else { + } + else { var_r30++; if (var_r30 >= sp10[var_r31]) { var_r31++; @@ -255,18 +210,10 @@ static void fn_1_E88(void) { } } -static char *lbl_1_data_440[] = { - "]1^", - "]2^", - "]3^", - "]4^", - "]5^", - "]6^", - "]7^", - "]8^" -}; +static char *lbl_1_data_440[] = { "]1^", "]2^", "]3^", "]4^", "]5^", "]6^", "]7^", "]8^" }; -static s32 fn_1_11B0(s16 arg0, s16 arg1) { +static s32 fn_1_11B0(s16 arg0, s16 arg1) +{ WindowData *temp_r30; float spC[2]; s32 temp_r28; @@ -285,7 +232,7 @@ static s32 fn_1_11B0(s16 arg0, s16 arg1) { } temp_r28 = MAKE_MESSID(arg0, arg1); for (i = 0; i < 8; i++) { - HuWinInsertMesSizeGet(MAKE_MESSID_PTR(lbl_1_data_440[i]), (s16) i); + HuWinInsertMesSizeGet(MAKE_MESSID_PTR(lbl_1_data_440[i]), (s16)i); } HuWinMesMaxSizeGet(1, &spC[0], temp_r28); if (spC[0] <= 16.0f) { @@ -293,7 +240,7 @@ static s32 fn_1_11B0(s16 arg0, s16 arg1) { } 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); + HuWinInsertMesSet(lbl_1_data_410, MAKE_MESSID_PTR(lbl_1_data_440[i]), (s16)i); } temp_r30 = &winData[lbl_1_data_410]; temp_r30->push_key |= 0x360; diff --git a/src/REL/mgmodedll/mgmode.c b/src/REL/mgmodedll/mgmode.c index 28d8c990..67b59009 100644 --- a/src/REL/mgmodedll/mgmode.c +++ b/src/REL/mgmodedll/mgmode.c @@ -6,7 +6,6 @@ #include "game/wipe.h" #include "ext_math.h" -#include "rel_sqrt_consts.h" typedef struct camera_view_params { Vec rot; diff --git a/src/REL/modeseldll/main.c b/src/REL/modeseldll/main.c index fc10e07b..f1d9be9b 100644 --- a/src/REL/modeseldll/main.c +++ b/src/REL/modeseldll/main.c @@ -1,26 +1,22 @@ -#include "game/object.h" +#include "REL/modeseldll.h" +#include "game/audio.h" +#include "game/gamework_data.h" #include "game/hsfman.h" +#include "game/object.h" +#include "game/objsub.h" +#include "game/pad.h" #include "game/process.h" #include "game/window.h" -#include "game/objsub.h" -#include "game/audio.h" #include "game/wipe.h" -#include "game/pad.h" #include "math.h" -#include "game/gamework_data.h" -#include "REL/modeseldll.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[] = { - { { 0, 0, 0 }, { 0, 0, 0 }, 1500 }, - { { 0, 0, 0 }, { 0, 0, 0 }, 524 } -}; +CameraViewParams lbl_1_data_0[] = { { { 0, 0, 0 }, { 0, 0, 0 }, 1500 }, { { 0, 0, 0 }, { 0, 0, 0 }, 524 } }; omObjData *lbl_1_bss_7C; Process *lbl_1_bss_78; @@ -42,325 +38,332 @@ void fn_1_1B6C(void); void ObjectSetup(void) { - s32 light; - OSReport("******* MS ObjectSetup *********\n"); - lbl_1_bss_78 = omInitObjMan(50, 8192); - omGameSysInit(lbl_1_bss_78); - lbl_1_bss_24[0].x = -70; - lbl_1_bss_24[0].y = 0; - lbl_1_bss_24[0].z = 0; - lbl_1_bss_C[0].x = 0; - lbl_1_bss_C[0].y = 130; - lbl_1_bss_C[0].z = -186; - lbl_1_bss_4[0] = 1360; - lbl_1_bss_64 = lbl_1_bss_24[0]; - lbl_1_bss_58 = lbl_1_bss_C[0]; - lbl_1_bss_54 = lbl_1_bss_4[0]; - lbl_1_bss_70[0] = 0; - Hu3DCameraCreate(1); - Hu3DCameraPerspectiveSet(1, 30, 20, 8000, 1.2f); - Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); - Hu3DCameraScissorSet(1, 0, 16, 640, 448); - light = Hu3DGLightCreate(0, 100, 1000, 0, -0.5, -1, 255, 255, 255); - Hu3DGLightInfinitytSet(light); - HuPrcChildCreate(fn_1_414, 100, 16384, 0, lbl_1_bss_78); - HuPrcChildCreate(fn_1_AF0, 200, 4096, 0, lbl_1_bss_78); - lbl_1_bss_7C = omAddObjEx(lbl_1_bss_78, 32730, 0, 0, -1, fn_1_B8C); - omAddObjEx(lbl_1_bss_78, 0, 32, 32, -1, fn_1_F40); - Hu3DBGColorSet(0, 0, 0); - mgBoardHostEnableF = 0; - HuWinInit(1); - mgPracticeEnableF = 0; - mgQuitExtraF = 0; + s32 light; + OSReport("******* MS ObjectSetup *********\n"); + lbl_1_bss_78 = omInitObjMan(50, 8192); + omGameSysInit(lbl_1_bss_78); + lbl_1_bss_24[0].x = -70; + lbl_1_bss_24[0].y = 0; + lbl_1_bss_24[0].z = 0; + lbl_1_bss_C[0].x = 0; + lbl_1_bss_C[0].y = 130; + lbl_1_bss_C[0].z = -186; + lbl_1_bss_4[0] = 1360; + lbl_1_bss_64 = lbl_1_bss_24[0]; + lbl_1_bss_58 = lbl_1_bss_C[0]; + lbl_1_bss_54 = lbl_1_bss_4[0]; + lbl_1_bss_70[0] = 0; + Hu3DCameraCreate(1); + Hu3DCameraPerspectiveSet(1, 30, 20, 8000, 1.2f); + Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); + Hu3DCameraScissorSet(1, 0, 16, 640, 448); + light = Hu3DGLightCreate(0, 100, 1000, 0, -0.5, -1, 255, 255, 255); + Hu3DGLightInfinitytSet(light); + HuPrcChildCreate(fn_1_414, 100, 16384, 0, lbl_1_bss_78); + HuPrcChildCreate(fn_1_AF0, 200, 4096, 0, lbl_1_bss_78); + lbl_1_bss_7C = omAddObjEx(lbl_1_bss_78, 32730, 0, 0, -1, fn_1_B8C); + omAddObjEx(lbl_1_bss_78, 0, 32, 32, -1, fn_1_F40); + Hu3DBGColorSet(0, 0, 0); + mgBoardHostEnableF = 0; + HuWinInit(1); + mgPracticeEnableF = 0; + mgQuitExtraF = 0; } void fn_1_414(void) { - fn_1_9F4(); - if(omovlevtno) { - HuAudSeqPlay(43); - } else { - if(!fn_1_37DC()) { - WipeColorSet(0, 0, 0); - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20); - HuAudSeqAllFadeOut(1000); - while(WipeStatGet()) { - HuPrcVSleep(); - } - omOvlReturnEx(1, 1); - while(1) { - HuPrcVSleep(); - } - } else { - s16 group = HuSprGrpCreate(1); - s16 sprite = HuTHPSprCreateVol("movie/opmov_s00.thp", 0, 3000, 70.0); - HuSprGrpMemberSet(group, 0, sprite); - HuSprPosSet(group, 0, 288, 240); - HuSprDrawNoSet(group, 0, 127); - HuPrcSleep(2); - espAttrSet(lbl_1_bss_152[0], HUSPR_ATTR_DISPOFF); - HuAudFXStop(lbl_1_data_100); - while(!HuTHPEndCheck()) { - HuPrcVSleep(); - } - HuTHPClose(); - HuSprGrpKill(group); - } - } - espAttrReset(lbl_1_bss_152[9], HUSPR_ATTR_DISPOFF); - espDrawNoSet(lbl_1_bss_152[9], 127); - { - s16 result = fn_1_2490(); - if(result == -1) { - HuAudSeqAllFadeOut(1000); - WipeColorSet(0, 0, 0); - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20); - - while(WipeStatGet()) { - HuPrcVSleep(); - } - omOvlGotoEx(OVL_MODESEL, 1, 0, 0); - while(1) { - HuPrcVSleep(); - } - } else { - s16 i; - omOvlHisData *his; - for(i=0; i<4; i++) { - GWPlayerCfg[i].pad_idx = i; - if(!HuPadStatGet(i)) { - GWPlayerCfg[i].iscom = 0; - } else { - GWPlayerCfg[i].iscom = 1; - } - } - his = omOvlHisGet(0); - omOvlHisChg(0, his->overlay, 1, his->stat); - _ClearFlag(FLAG_ID_MAKE(1, 0)); - _ClearFlag(FLAG_ID_MAKE(1, 8)); - _ClearFlag(FLAG_ID_MAKE(1, 12)); - _ClearFlag(FLAG_ID_MAKE(1, 11)); - GWGameStat.sound_mode = msmSysGetOutputMode(); - switch(result) { - case 0: - GWMGExplainSet(GWGameStat.party_pause.explain_mg); - GWMGShowComSet(GWGameStat.party_pause.show_com_mg); - GWMGListSet(GWGameStat.party_pause.mg_list); - GWMessSpeedSet(GWGameStat.party_pause.mess_speed); - GWSaveModeSet(GWGameStat.party_pause.save_mode); - omOvlCallEx(OVL_MENT, 1, 0, 0); - break; - - case 1: - GWMGExplainSet(GWGameStat.story_pause.explain_mg); - GWMGShowComSet(GWGameStat.story_pause.show_com_mg); - GWMGListSet(GWGameStat.story_pause.mg_list); - GWMessSpeedSet(GWGameStat.story_pause.mess_speed); - GWSaveModeSet(GWGameStat.story_pause.save_mode); - omOvlCallEx(OVL_MENT, 1, 1, 0); - break; - - case 2: - omOvlCallEx(OVL_MGMODE, 1, 0, 0); - break; - - case 3: - omOvlCallEx(OVL_MENT, 1, 3, 0); - break; - - case 4: - omOvlCallEx(OVL_MENT, 1, 4, 0); - break; - - case 5: - omOvlCallEx(OVL_MPEX, 1, 0, 0); - break; - } - while(1) { - HuPrcVSleep(); - } - } - } + fn_1_9F4(); + if (omovlevtno) { + HuAudSeqPlay(43); + } + else { + if (!fn_1_37DC()) { + WipeColorSet(0, 0, 0); + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20); + HuAudSeqAllFadeOut(1000); + while (WipeStatGet()) { + HuPrcVSleep(); + } + omOvlReturnEx(1, 1); + while (1) { + HuPrcVSleep(); + } + } + else { + s16 group = HuSprGrpCreate(1); + s16 sprite = HuTHPSprCreateVol("movie/opmov_s00.thp", 0, 3000, 70.0); + HuSprGrpMemberSet(group, 0, sprite); + HuSprPosSet(group, 0, 288, 240); + HuSprDrawNoSet(group, 0, 127); + HuPrcSleep(2); + espAttrSet(lbl_1_bss_152[0], HUSPR_ATTR_DISPOFF); + HuAudFXStop(lbl_1_data_100); + while (!HuTHPEndCheck()) { + HuPrcVSleep(); + } + HuTHPClose(); + HuSprGrpKill(group); + } + } + espAttrReset(lbl_1_bss_152[9], HUSPR_ATTR_DISPOFF); + espDrawNoSet(lbl_1_bss_152[9], 127); + { + s16 result = fn_1_2490(); + if (result == -1) { + HuAudSeqAllFadeOut(1000); + WipeColorSet(0, 0, 0); + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20); + + while (WipeStatGet()) { + HuPrcVSleep(); + } + omOvlGotoEx(OVL_MODESEL, 1, 0, 0); + while (1) { + HuPrcVSleep(); + } + } + else { + s16 i; + omOvlHisData *his; + for (i = 0; i < 4; i++) { + GWPlayerCfg[i].pad_idx = i; + if (!HuPadStatGet(i)) { + GWPlayerCfg[i].iscom = 0; + } + else { + GWPlayerCfg[i].iscom = 1; + } + } + his = omOvlHisGet(0); + omOvlHisChg(0, his->overlay, 1, his->stat); + _ClearFlag(FLAG_ID_MAKE(1, 0)); + _ClearFlag(FLAG_ID_MAKE(1, 8)); + _ClearFlag(FLAG_ID_MAKE(1, 12)); + _ClearFlag(FLAG_ID_MAKE(1, 11)); + GWGameStat.sound_mode = msmSysGetOutputMode(); + switch (result) { + case 0: + GWMGExplainSet(GWGameStat.party_pause.explain_mg); + GWMGShowComSet(GWGameStat.party_pause.show_com_mg); + GWMGListSet(GWGameStat.party_pause.mg_list); + GWMessSpeedSet(GWGameStat.party_pause.mess_speed); + GWSaveModeSet(GWGameStat.party_pause.save_mode); + omOvlCallEx(OVL_MENT, 1, 0, 0); + break; + + case 1: + GWMGExplainSet(GWGameStat.story_pause.explain_mg); + GWMGShowComSet(GWGameStat.story_pause.show_com_mg); + GWMGListSet(GWGameStat.story_pause.mg_list); + GWMessSpeedSet(GWGameStat.story_pause.mess_speed); + GWSaveModeSet(GWGameStat.story_pause.save_mode); + omOvlCallEx(OVL_MENT, 1, 1, 0); + break; + + case 2: + omOvlCallEx(OVL_MGMODE, 1, 0, 0); + break; + + case 3: + omOvlCallEx(OVL_MENT, 1, 3, 0); + break; + + case 4: + omOvlCallEx(OVL_MENT, 1, 4, 0); + break; + + case 5: + omOvlCallEx(OVL_MPEX, 1, 0, 0); + break; + } + while (1) { + HuPrcVSleep(); + } + } + } } void fn_1_9F4(void) { - Vec pos; - Vec target; - Vec up; - Hu3DShadowCreate(20, 100, 5000); - Hu3DShadowTPLvlSet(0.3f); - Hu3DShadowSizeSet(192); - target.x = target.y = target.z = 0; - pos.x = 500; - pos.z = 1000; - pos.y = 2000; - up.x = 0; - up.y = 1; - up.z = 0; - Hu3DShadowPosSet(&pos, &up, &target); - fn_1_BED8(lbl_1_data_428); - fn_1_C168(lbl_1_data_93C); + Vec pos; + Vec target; + Vec up; + Hu3DShadowCreate(20, 100, 5000); + Hu3DShadowTPLvlSet(0.3f); + Hu3DShadowSizeSet(192); + target.x = target.y = target.z = 0; + pos.x = 500; + pos.z = 1000; + pos.y = 2000; + up.x = 0; + up.y = 1; + up.z = 0; + Hu3DShadowPosSet(&pos, &up, &target); + fn_1_BED8(lbl_1_data_428); + fn_1_C168(lbl_1_data_93C); } void fn_1_AF0(void) { - s16 i; - while(1) { - if(lbl_1_bss_70[0] || omSysExitReq) { - break; - } - HuPrcVSleep(); - } - for(i=0; i<4; i++) { - GWPlayerCfg[i].character = -1; - } - BoardStatusKill(); - omOvlReturnEx(1, 1); - HuPrcEnd(); + s16 i; + while (1) { + if (lbl_1_bss_70[0] || omSysExitReq) { + break; + } + HuPrcVSleep(); + } + for (i = 0; i < 4; i++) { + GWPlayerCfg[i].character = -1; + } + BoardStatusKill(); + omOvlReturnEx(1, 1); + HuPrcEnd(); } u16 lbl_1_data_6E[] = { 1, 2 }; void fn_1_B8C(omObjData *object) { - s16 i; - for(i=0; i<1; i++) { - Vec pos, target, up; - float x, y, z; - - x = lbl_1_bss_24[i].x; - y = lbl_1_bss_24[i].y; - z = lbl_1_bss_24[i].z; - - pos.x = (((sin((M_PI*y)/180.0)*cos((M_PI*x)/180.0))*lbl_1_bss_4[i])+lbl_1_bss_C[i].x); - pos.y = (-sin((M_PI*x)/180.0)*lbl_1_bss_4[i])+lbl_1_bss_C[i].y; - pos.z = ((cos((M_PI*y)/180.0)*cos((M_PI*x)/180.0))*lbl_1_bss_4[i])+lbl_1_bss_C[i].z; - target.x = lbl_1_bss_C[i].x; - target.y = lbl_1_bss_C[i].y; - target.z = lbl_1_bss_C[i].z; - up.x = sin((M_PI*y)/180.0)*sin((M_PI*x)/180.0); - up.y = cos((M_PI*x)/180.0); - up.z = cos((M_PI*y)/180.0)*sin((M_PI*x)/180.0); - Hu3DCameraPosSet(lbl_1_data_6E[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_24[i].x; + y = lbl_1_bss_24[i].y; + z = lbl_1_bss_24[i].z; + + pos.x = (((sin((M_PI * y) / 180.0) * cos((M_PI * x) / 180.0)) * lbl_1_bss_4[i]) + lbl_1_bss_C[i].x); + pos.y = (-sin((M_PI * x) / 180.0) * lbl_1_bss_4[i]) + lbl_1_bss_C[i].y; + pos.z = ((cos((M_PI * y) / 180.0) * cos((M_PI * x) / 180.0)) * lbl_1_bss_4[i]) + lbl_1_bss_C[i].z; + target.x = lbl_1_bss_C[i].x; + target.y = lbl_1_bss_C[i].y; + target.z = lbl_1_bss_C[i].z; + up.x = sin((M_PI * y) / 180.0) * sin((M_PI * x) / 180.0); + up.y = cos((M_PI * x) / 180.0); + up.z = cos((M_PI * y) / 180.0) * sin((M_PI * x) / 180.0); + Hu3DCameraPosSet(lbl_1_data_6E[i], pos.x, pos.y, pos.z, up.x, up.y, up.z, target.x, target.y, target.z); + } } void fn_1_F40(omObjData *object) { - Vec pos; + Vec pos; Vec offset; Vec dir; Vec y_offset; - + f32 z_rot; s8 stick_pos; if (!lbl_1_bss_0) { - fn_1_1B6C(); + fn_1_1B6C(); return; } - lbl_1_bss_24[0].y += 0.1f * HuPadStkX[0]; - lbl_1_bss_24[0].x += 0.1f * HuPadStkY[0]; - lbl_1_bss_4[0] += HuPadTrigL[0] / 2; - lbl_1_bss_4[0] -= HuPadTrigR[0] / 2; - if(HuPadBtnDown[0] & PAD_BUTTON_B) { - OSReport("%f,%f,%f\n", lbl_1_bss_24[0].x, lbl_1_bss_24[0].y, lbl_1_bss_24[0].z); - OSReport("%f,%f,%f\n", lbl_1_bss_C[0].x, lbl_1_bss_C[0].y, lbl_1_bss_C[0].z); - OSReport("%f\n", lbl_1_bss_4[0]); - } - if (lbl_1_bss_4[0] < 100.0f) { - lbl_1_bss_4[0] = 100.0f; - } - pos.x = lbl_1_bss_C[0].x + (lbl_1_bss_4[0] * (sin((M_PI * lbl_1_bss_24[0].y) / 180.0) * cos((M_PI * lbl_1_bss_24[0].x) / 180.0))); - pos.y = (lbl_1_bss_C[0].y + (lbl_1_bss_4[0] * -sin((M_PI * lbl_1_bss_24[0].x) / 180.0))); - pos.z = (lbl_1_bss_C[0].z + (lbl_1_bss_4[0] * (cos((M_PI * lbl_1_bss_24[0].y) / 180.0) * cos((M_PI * lbl_1_bss_24[0].x) / 180.0)))); - offset.x = lbl_1_bss_C[0].x - pos.x; - offset.y = lbl_1_bss_C[0].y - pos.y; - offset.z = lbl_1_bss_C[0].z - pos.z; - dir.x = (sin((M_PI * lbl_1_bss_24[0].y) / 180.0) * sin((M_PI * lbl_1_bss_24[0].x) / 180.0)); - dir.y = cos((M_PI * lbl_1_bss_24[0].x) / 180.0); - dir.z = (cos((M_PI * lbl_1_bss_24[0].y) / 180.0) * sin((M_PI * lbl_1_bss_24[0].x) / 180.0)); - z_rot = lbl_1_bss_24[0].z; - y_offset.x = dir.x * (offset.x * offset.x + (1.0f - offset.x * offset.x) * cos((M_PI * z_rot) / 180.0)) - + dir.y * (offset.x * offset.y * (1.0f - cos((M_PI * z_rot) / 180.0)) - offset.z * sin((M_PI * z_rot) / 180.0)) - + dir.z * (offset.x * offset.z * (1.0f - cos((M_PI * z_rot) / 180.0)) + offset.y * sin((M_PI * z_rot) / 180.0)); + lbl_1_bss_24[0].y += 0.1f * HuPadStkX[0]; + lbl_1_bss_24[0].x += 0.1f * HuPadStkY[0]; + lbl_1_bss_4[0] += HuPadTrigL[0] / 2; + lbl_1_bss_4[0] -= HuPadTrigR[0] / 2; + if (HuPadBtnDown[0] & PAD_BUTTON_B) { + OSReport("%f,%f,%f\n", lbl_1_bss_24[0].x, lbl_1_bss_24[0].y, lbl_1_bss_24[0].z); + OSReport("%f,%f,%f\n", lbl_1_bss_C[0].x, lbl_1_bss_C[0].y, lbl_1_bss_C[0].z); + OSReport("%f\n", lbl_1_bss_4[0]); + } + if (lbl_1_bss_4[0] < 100.0f) { + lbl_1_bss_4[0] = 100.0f; + } + pos.x = lbl_1_bss_C[0].x + (lbl_1_bss_4[0] * (sin((M_PI * lbl_1_bss_24[0].y) / 180.0) * cos((M_PI * lbl_1_bss_24[0].x) / 180.0))); + pos.y = (lbl_1_bss_C[0].y + (lbl_1_bss_4[0] * -sin((M_PI * lbl_1_bss_24[0].x) / 180.0))); + pos.z = (lbl_1_bss_C[0].z + (lbl_1_bss_4[0] * (cos((M_PI * lbl_1_bss_24[0].y) / 180.0) * cos((M_PI * lbl_1_bss_24[0].x) / 180.0)))); + offset.x = lbl_1_bss_C[0].x - pos.x; + offset.y = lbl_1_bss_C[0].y - pos.y; + offset.z = lbl_1_bss_C[0].z - pos.z; + dir.x = (sin((M_PI * lbl_1_bss_24[0].y) / 180.0) * sin((M_PI * lbl_1_bss_24[0].x) / 180.0)); + dir.y = cos((M_PI * lbl_1_bss_24[0].x) / 180.0); + dir.z = (cos((M_PI * lbl_1_bss_24[0].y) / 180.0) * sin((M_PI * lbl_1_bss_24[0].x) / 180.0)); + z_rot = lbl_1_bss_24[0].z; + y_offset.x = dir.x * (offset.x * offset.x + (1.0f - offset.x * offset.x) * cos((M_PI * z_rot) / 180.0)) + + dir.y * (offset.x * offset.y * (1.0f - cos((M_PI * z_rot) / 180.0)) - offset.z * sin((M_PI * z_rot) / 180.0)) + + dir.z * (offset.x * offset.z * (1.0f - cos((M_PI * z_rot) / 180.0)) + offset.y * sin((M_PI * z_rot) / 180.0)); - y_offset.y = dir.y * (offset.y * offset.y + (1.0f - offset.y * offset.y) * cos((M_PI * z_rot) / 180.0)) - + dir.x * (offset.x * offset.y * (1.0f - cos((M_PI * z_rot) / 180.0)) + offset.z * sin((M_PI * z_rot) / 180.0)) - + dir.z * (offset.y * offset.z * (1.0f - cos((M_PI * z_rot) / 180.0)) - offset.x * sin((M_PI * z_rot) / 180.0)); - - y_offset.z = dir.z * (offset.z * offset.z + (1.0f - offset.z * offset.z) * cos((M_PI * z_rot) / 180.0)) - + (dir.x * (offset.x * offset.z * (1.0 - cos((M_PI * z_rot) / 180.0)) - offset.y * sin((M_PI * z_rot) / 180.0)) - + dir.y * (offset.y * offset.z * (1.0 - cos((M_PI * z_rot) / 180.0)) + offset.x * sin((M_PI * z_rot) / 180.0))); + y_offset.y = dir.y * (offset.y * offset.y + (1.0f - offset.y * offset.y) * cos((M_PI * z_rot) / 180.0)) + + dir.x * (offset.x * offset.y * (1.0f - cos((M_PI * z_rot) / 180.0)) + offset.z * sin((M_PI * z_rot) / 180.0)) + + dir.z * (offset.y * offset.z * (1.0f - cos((M_PI * z_rot) / 180.0)) - offset.x * sin((M_PI * z_rot) / 180.0)); - VECCrossProduct(&dir, &offset, &offset); - VECNormalize(&offset, &offset); - stick_pos = (HuPadSubStkX[0] & 0xF8); - if (stick_pos != 0) { - lbl_1_bss_C[0].x += 0.05f * (offset.x * stick_pos); - lbl_1_bss_C[0].y += 0.05f * (offset.y * stick_pos); - lbl_1_bss_C[0].z += 0.05f * (offset.z * stick_pos); - } - VECNormalize(&y_offset, &offset); - stick_pos = -(HuPadSubStkY[0] & 0xF8); - if (stick_pos != 0) { - lbl_1_bss_C[0].x += 0.05f * (offset.x * stick_pos); - lbl_1_bss_C[0].y += 0.05f * (offset.y * stick_pos); - lbl_1_bss_C[0].z += 0.05f * (offset.z * stick_pos); - } + y_offset.z = dir.z * (offset.z * offset.z + (1.0f - offset.z * offset.z) * cos((M_PI * z_rot) / 180.0)) + + (dir.x * (offset.x * offset.z * (1.0 - cos((M_PI * z_rot) / 180.0)) - offset.y * sin((M_PI * z_rot) / 180.0)) + + dir.y * (offset.y * offset.z * (1.0 - cos((M_PI * z_rot) / 180.0)) + offset.x * sin((M_PI * z_rot) / 180.0))); + + VECCrossProduct(&dir, &offset, &offset); + VECNormalize(&offset, &offset); + stick_pos = (HuPadSubStkX[0] & 0xF8); + if (stick_pos != 0) { + lbl_1_bss_C[0].x += 0.05f * (offset.x * stick_pos); + lbl_1_bss_C[0].y += 0.05f * (offset.y * stick_pos); + lbl_1_bss_C[0].z += 0.05f * (offset.z * stick_pos); + } + VECNormalize(&y_offset, &offset); + stick_pos = -(HuPadSubStkY[0] & 0xF8); + if (stick_pos != 0) { + lbl_1_bss_C[0].x += 0.05f * (offset.x * stick_pos); + lbl_1_bss_C[0].y += 0.05f * (offset.y * stick_pos); + lbl_1_bss_C[0].z += 0.05f * (offset.z * stick_pos); + } } void fn_1_1B6C(void) { - Vec delta_vec; - float delta_zoom; - if(lbl_1_bss_70[0]) { - return; - } - VECSubtract(&lbl_1_bss_64, &lbl_1_bss_24[0], &delta_vec); - if(VECMag(&delta_vec) > 0.2) { - VECScale(&delta_vec, &delta_vec, 0.05f); - VECAdd(&lbl_1_bss_24[0], &delta_vec, &lbl_1_bss_24[0]); - } else { - lbl_1_bss_24[0] = lbl_1_bss_64; - } - VECSubtract(&lbl_1_bss_58, &lbl_1_bss_C[0], &delta_vec); - if(VECMag(&delta_vec) > 0.2) { - VECScale(&delta_vec, &delta_vec, 0.05f); - VECAdd(&lbl_1_bss_C[0], &delta_vec, &lbl_1_bss_C[0]); - } else { - lbl_1_bss_C[0] = lbl_1_bss_58; - } - delta_zoom = lbl_1_bss_54-lbl_1_bss_4[0]; - if(sqrtf(delta_zoom*delta_zoom) > 0.2) { - delta_zoom *= 0.05f; - lbl_1_bss_4[0] += delta_zoom; - } else { - lbl_1_bss_4[0] = lbl_1_bss_54; - } + Vec delta_vec; + float delta_zoom; + if (lbl_1_bss_70[0]) { + return; + } + VECSubtract(&lbl_1_bss_64, &lbl_1_bss_24[0], &delta_vec); + if (VECMag(&delta_vec) > 0.2) { + VECScale(&delta_vec, &delta_vec, 0.05f); + VECAdd(&lbl_1_bss_24[0], &delta_vec, &lbl_1_bss_24[0]); + } + else { + lbl_1_bss_24[0] = lbl_1_bss_64; + } + VECSubtract(&lbl_1_bss_58, &lbl_1_bss_C[0], &delta_vec); + if (VECMag(&delta_vec) > 0.2) { + VECScale(&delta_vec, &delta_vec, 0.05f); + VECAdd(&lbl_1_bss_C[0], &delta_vec, &lbl_1_bss_C[0]); + } + else { + lbl_1_bss_C[0] = lbl_1_bss_58; + } + delta_zoom = lbl_1_bss_54 - lbl_1_bss_4[0]; + if (sqrtf(delta_zoom * delta_zoom) > 0.2) { + delta_zoom *= 0.05f; + lbl_1_bss_4[0] += delta_zoom; + } + else { + lbl_1_bss_4[0] = lbl_1_bss_54; + } } void fn_1_1E30(s16 view) { - lbl_1_bss_64 = lbl_1_data_0[view].rot; - lbl_1_bss_58 = lbl_1_data_0[view].pos; - lbl_1_bss_54 = lbl_1_data_0[view].zoom; + lbl_1_bss_64 = lbl_1_data_0[view].rot; + lbl_1_bss_58 = lbl_1_data_0[view].pos; + lbl_1_bss_54 = lbl_1_data_0[view].zoom; } void fn_1_1EC0(s16 view) { - s16 i; - lbl_1_bss_24[0] = lbl_1_data_0[view].rot; - lbl_1_bss_64 = lbl_1_bss_24[0]; - lbl_1_bss_C[0] = lbl_1_data_0[view].pos; - lbl_1_bss_58 = lbl_1_bss_C[0]; - lbl_1_bss_54 = lbl_1_bss_4[0] = lbl_1_data_0[view].zoom; - fn_1_B8C(NULL); + s16 i; + lbl_1_bss_24[0] = lbl_1_data_0[view].rot; + lbl_1_bss_64 = lbl_1_bss_24[0]; + lbl_1_bss_C[0] = lbl_1_data_0[view].pos; + lbl_1_bss_58 = lbl_1_bss_C[0]; + lbl_1_bss_54 = lbl_1_bss_4[0] = lbl_1_data_0[view].zoom; + fn_1_B8C(NULL); } float fn_1_2368(void) { - float delta_zoom = lbl_1_bss_54-lbl_1_bss_4[0]; - return sqrtf(delta_zoom*delta_zoom); + float delta_zoom = lbl_1_bss_54 - lbl_1_bss_4[0]; + return sqrtf(delta_zoom * delta_zoom); } diff --git a/src/REL/mpexDll/main.c b/src/REL/mpexDll/main.c index 148d7711..a613e729 100644 --- a/src/REL/mpexDll/main.c +++ b/src/REL/mpexDll/main.c @@ -8,7 +8,6 @@ #include "game/pad.h" #include "game/printfunc.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" #include "REL/mpexDll.h" diff --git a/src/REL/resultDll/main.c b/src/REL/resultDll/main.c index afe551d5..66c26486 100644 --- a/src/REL/resultDll/main.c +++ b/src/REL/resultDll/main.c @@ -13,7 +13,6 @@ #include "game/saveload.h" #include "game/window.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" #include "math.h" diff --git a/src/REL/ztardll/main.c b/src/REL/ztardll/main.c index d1d58b62..0c0b8ce0 100644 --- a/src/REL/ztardll/main.c +++ b/src/REL/ztardll/main.c @@ -10,7 +10,6 @@ #include "game/sprite.h" #include "game/window.h" #include "game/wipe.h" -#include "rel_sqrt_consts.h" #include "REL/ztardll.h"