diff --git a/config/GMPE01_00/rels/mgmodedll/symbols.txt b/config/GMPE01_00/rels/mgmodedll/symbols.txt index 9022b619..5a1f7053 100644 --- a/config/GMPE01_00/rels/mgmodedll/symbols.txt +++ b/config/GMPE01_00/rels/mgmodedll/symbols.txt @@ -482,7 +482,7 @@ customMinNum$837 = .data:0x000000D6; // type:object size:0x8 scope:local lbl_1_data_E0 = .data:0x000000E0; // type:object size:0x20 data:float lbl_1_data_100 = .data:0x00000100; // type:object size:0x10 lbl_1_data_110 = .data:0x00000110; // type:object size:0xC -lbl_1_data_120 = .data:0x00000120; // type:object size:0x28 +mgRecordIdxTbl = .data:0x00000120; // type:object size:0x28 lbl_1_data_148 = .data:0x00000148; // type:object size:0x2 data:2byte lbl_1_data_14A = .data:0x0000014A; // type:object size:0x8 lbl_1_data_152 = .data:0x00000152; // type:object size:0x10 data:4byte @@ -516,7 +516,7 @@ lbl_1_data_9C0 = .data:0x000009C0; // type:object size:0x20 lbl_1_data_9E0 = .data:0x000009E0; // type:object size:0x20 lbl_1_data_A00 = .data:0x00000A00; // type:object size:0x2 data:2byte lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte -lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x2 data:2byte +mgModeEvtNo = .bss:0x00000004; // type:object size:0x2 data:2byte lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x264 data:4byte lbl_1_bss_26C = .bss:0x0000026C; // type:object size:0x8 data:float lbl_1_bss_274 = .bss:0x00000274; // type:object size:0x18 data:4byte @@ -549,8 +549,8 @@ lbl_1_bss_340 = .bss:0x00000340; // type:object size:0x8 lbl_1_bss_348 = .bss:0x00000348; // type:object size:0x2 data:2byte lbl_1_bss_34A = .bss:0x0000034A; // type:object size:0x8 data:2byte lbl_1_bss_352 = .bss:0x00000352; // type:object size:0x1C -lbl_1_bss_370 = .bss:0x00000370; // type:object size:0xC -lbl_1_bss_37C = .bss:0x0000037C; // type:object size:0xC +lbl_1_bss_370 = .bss:0x00000370; // type:object size:0xC scope:local +lbl_1_bss_37C = .bss:0x0000037C; // type:object size:0xC scope:local lbl_1_bss_388 = .bss:0x00000388; // type:object size:0x2 data:2byte lbl_1_bss_38A = .bss:0x0000038A; // type:object size:0x2 data:2byte lbl_1_bss_38C = .bss:0x0000038C; // type:object size:0x8 diff --git a/config/GMPE01_00/rels/modeseldll/symbols.txt b/config/GMPE01_00/rels/modeseldll/symbols.txt index 53057676..1dd29df7 100644 --- a/config/GMPE01_00/rels/modeseldll/symbols.txt +++ b/config/GMPE01_00/rels/modeseldll/symbols.txt @@ -73,48 +73,48 @@ lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x8 scope:local data:d lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x8 scope:local data:double lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x8 scope:local data:double lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x8 scope:local data:double -lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x8 data:double -lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 data:double -lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x8 data:double -lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x8 data:double -lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x8 data:double -lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 data:float -lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 data:float -lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 data:float -lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x8 data:double -lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 data:float -lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 data:float -lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 data:float -lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 data:float -lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 data:float -lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x8 data:double -lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 data:float -lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x8 data:double -lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x8 data:double -lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x8 data:double -lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 data:float -lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x8 data:double -lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 data:float -lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 data:float -lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 data:double -lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float -lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 data:float -lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 data:float -lbl_1_rodata_164 = .rodata:0x00000164; // type:object size:0x4 data:float -lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 data:float -lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 data:float -lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x8 data:double -lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x8 data:double -lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 data:float -lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 data:float -lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 data:float -lbl_1_rodata_18C = .rodata:0x0000018C; // type:object size:0x4 data:float -lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 data:float -lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x8 data:double -lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float -lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 data:float -lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float -lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 data:float +lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 scope:local data:float +lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 scope:local data:float +lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 scope:local data:float +lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x8 scope:local data:double +lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 scope:local data:float +lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x8 scope:local data:double +lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x8 scope:local data:double +lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x8 scope:local data:double +lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 scope:local data:float +lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x8 scope:local data:double +lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 scope:local data:float +lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 scope:local data:double +lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 scope:local data:float +lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 scope:local data:float +lbl_1_rodata_164 = .rodata:0x00000164; // type:object size:0x4 scope:local data:float +lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 scope:local data:float +lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x8 scope:local data:double +lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x8 scope:local data:double +lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 scope:local data:float +lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 scope:local data:float +lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 scope:local data:float +lbl_1_rodata_18C = .rodata:0x0000018C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 scope:local data:float +lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 scope:local data:float lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 scope:local data:float lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 scope:local data:float lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 scope:local data:float @@ -188,9 +188,9 @@ lbl_1_data_80 = .data:0x00000080; // type:object size:0xC lbl_1_data_8C = .data:0x0000008C; // type:object size:0x18 lbl_1_data_A4 = .data:0x000000A4; // type:object size:0x18 lbl_1_data_BC = .data:0x000000BC; // type:object size:0x18 -lbl_1_data_D4 = .data:0x000000D4; // type:object size:0x14 data:string -lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x9 data:string -lbl_1_data_F1 = .data:0x000000F1; // type:object size:0xF +lbl_1_data_D4 = .data:0x000000D4; // type:object size:0x14 scope:local data:string +lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x9 scope:local data:string +lbl_1_data_F1 = .data:0x000000F1; // type:object size:0xF scope:local lbl_1_data_100 = .data:0x00000100; // type:object size:0x2 data:2byte lbl_1_data_104 = .data:0x00000104; // type:object size:0x118 data:float lbl_1_data_21C = .data:0x0000021C; // type:object size:0x48 data:4byte diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index d2b64397..19a42077 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -4543,7 +4543,7 @@ jumptable_8013FD68 = .data:0x8013FD68; // type:object size:0x24 scope:local jumptable_8013FD8C = .data:0x8013FD8C; // type:object size:0x24 scope:local jumptable_8013FDB0 = .data:0x8013FDB0; // type:object size:0x24 scope:local sndSintab = .data:0x8013FDD8; // type:object size:0x800 -dspSlave = .data:0x801405E0; // type:object size:0x19E0 align:32 +dspSlave = .data:0x801405E0; // type:object size:0x19E0 align:32 data:byte lens$301 = .data:0x80141FC0; // type:object size:0x10 scope:local lens$301 = .data:0x80141FD0; // type:object size:0x20 scope:local rsmpTab12khz = .data:0x80141FF0; // type:object size:0x800 scope:local diff --git a/config/GMPP01_00/rels/mgmodedll/symbols.txt b/config/GMPP01_00/rels/mgmodedll/symbols.txt index ec6ed6c9..b6729d3a 100644 --- a/config/GMPP01_00/rels/mgmodedll/symbols.txt +++ b/config/GMPP01_00/rels/mgmodedll/symbols.txt @@ -482,7 +482,7 @@ lbl_1_data_E0 = .data:0x000000E0; // type:object size:0x6 lbl_1_data_E6 = .data:0x000000E6; // type:object size:0xA lbl_1_data_F0 = .data:0x000000F0; // type:object size:0x20 lbl_1_data_110 = .data:0x00000110; // type:object size:0x10 -lbl_1_data_120 = .data:0x00000120; // type:object size:0x10 +mgRecordIdxTbl = .data:0x00000120; // type:object size:0x10 lbl_1_data_130 = .data:0x00000130; // type:object size:0x28 lbl_1_data_158 = .data:0x00000158; // type:object size:0x2 data:2byte lbl_1_data_15A = .data:0x0000015A; // type:object size:0x8 @@ -517,7 +517,7 @@ lbl_1_data_9D0 = .data:0x000009D0; // type:object size:0x20 lbl_1_data_9F0 = .data:0x000009F0; // type:object size:0x20 lbl_1_data_A10 = .data:0x00000A10; // type:object size:0x2 data:2byte lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte -lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x2 data:2byte +mgModeEvtNo = .bss:0x00000004; // type:object size:0x2 data:2byte lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x264 data:4byte lbl_1_bss_26C = .bss:0x0000026C; // type:object size:0x8 data:float lbl_1_bss_274 = .bss:0x00000274; // type:object size:0x18 data:4byte @@ -548,8 +548,8 @@ lbl_1_bss_340 = .bss:0x00000340; // type:object size:0x8 lbl_1_bss_348 = .bss:0x00000348; // type:object size:0x2 data:2byte lbl_1_bss_34A = .bss:0x0000034A; // type:object size:0x8 data:2byte lbl_1_bss_352 = .bss:0x00000352; // type:object size:0x1E -lbl_1_bss_370 = .bss:0x00000370; // type:object size:0xC -lbl_1_bss_37C = .bss:0x0000037C; // type:object size:0xC +lbl_1_bss_370 = .bss:0x00000370; // type:object size:0xC scope:local +lbl_1_bss_37C = .bss:0x0000037C; // type:object size:0xC scope:local lbl_1_bss_388 = .bss:0x00000388; // type:object size:0x2 data:2byte lbl_1_bss_38A = .bss:0x0000038A; // type:object size:0x2 data:2byte lbl_1_bss_38C = .bss:0x0000038C; // type:object size:0x8 diff --git a/include/REL/mgmodedll.h b/include/REL/mgmodedll.h index 3e8ef9c3..fdfe352e 100644 --- a/include/REL/mgmodedll.h +++ b/include/REL/mgmodedll.h @@ -7,9 +7,9 @@ #include "game/object.h" #include "game/objsub.h" +#include "game/pad.h" #include "game/sprite.h" #include "game/window.h" -#include "game/pad.h" typedef struct datalist_model { s32 datanum; @@ -33,7 +33,7 @@ typedef struct datalist_sprite { typedef struct struct_bss8_24 { omObjData *unk0; - void (*unk4)(omObjData*, ...); + void (*unk4)(omObjData *, ...); u8 unk8[0x50]; s32 unk58; s32 unk5C; @@ -72,7 +72,7 @@ extern s16 lbl_1_bss_20C0[10][70]; extern s16 lbl_1_bss_20AC[10]; extern s16 lbl_1_bss_20AA; -extern Process *lbl_1_bss_2D8; +extern Process *objman; extern s16 lbl_1_bss_2E4; @@ -80,7 +80,7 @@ extern s16 lbl_1_bss_2A6; extern s16 lbl_1_bss_2A4; extern StructBss8 lbl_1_bss_8; -extern s16 lbl_1_bss_4; +extern s16 mgModeEvtNo; extern s16 lbl_1_data_A2[]; extern DataListModel lbl_1_data_490[]; @@ -112,4 +112,4 @@ s16 fn_1_271B4(s16 mgNo, s16 x, s16 y); void fn_1_27418(void); void fn_1_279FC(s32 coinSkipF); -#endif \ No newline at end of file +#endif diff --git a/src/REL/bootDll/main.c b/src/REL/bootDll/main.c index 5aa7dfcb..ee8b1b04 100644 --- a/src/REL/bootDll/main.c +++ b/src/REL/bootDll/main.c @@ -4,6 +4,7 @@ #include "game/data.h" #include "game/gamework_data.h" #include "game/hsfman.h" +#include "game/minigame_seq.h" #include "game/memory.h" #include "game/msm.h" #include "game/object.h" @@ -783,4 +784,4 @@ void *NintendoDataDecode(void) HuDecodeData(src, dst, size, decode_type); } return dst; -} \ No newline at end of file +} diff --git a/src/REL/m413Dll/main.c b/src/REL/m413Dll/main.c index bcf73c18..718bf09c 100644 --- a/src/REL/m413Dll/main.c +++ b/src/REL/m413Dll/main.c @@ -14,6 +14,13 @@ #include "ext_math.h" +#ifndef __MWERKS__ +#include "string.h" +#include "game/hsfex.h" +#endif + +s32 rand8(void); + typedef struct struct_bss_2A6C StructBss2A6C; typedef struct struct_sp_14C8 StructSp14C8; diff --git a/src/REL/m419Dll/main.c b/src/REL/m419Dll/main.c index 83ae359e..dd58a28a 100755 --- a/src/REL/m419Dll/main.c +++ b/src/REL/m419Dll/main.c @@ -1593,7 +1593,7 @@ void fn_1_78B4(StructBss200 *arg0) float sp118; float sp114; float sp110; - float var_f27; + float var_f27; // ! - uninitialized float var_f29; float var_f28; float var_f30; diff --git a/src/REL/m423Dll/main.c b/src/REL/m423Dll/main.c index a511fc2d..4590b4a0 100755 --- a/src/REL/m423Dll/main.c +++ b/src/REL/m423Dll/main.c @@ -2800,7 +2800,7 @@ void fn_1_8CB4(omObjData *arg0) float temp_f28; float var_f30; float var_f31; - float var_f26; + float var_f26; // ! - uninitialized float temp_f27; StructBssBCData *temp_r31; ModelData *sp8; diff --git a/src/REL/m424Dll/claw.c b/src/REL/m424Dll/claw.c index b6061580..42d11821 100644 --- a/src/REL/m424Dll/claw.c +++ b/src/REL/m424Dll/claw.c @@ -1162,7 +1162,7 @@ void fn_1_C604(s32 arg0, s32 arg1) Vec *var_r31; f32 temp_f31; f32 var_f30; - s32 var_r30; + s32 var_r30; // ! - uninitialized M424DllBallStruct2 *var_r28; Vec *var_r27; diff --git a/src/REL/m424Dll/main.c b/src/REL/m424Dll/main.c index 8fb9218d..0b9f27ba 100644 --- a/src/REL/m424Dll/main.c +++ b/src/REL/m424Dll/main.c @@ -132,7 +132,7 @@ void fn_1_41C(omObjData* object) { s16 sp12; s16 spE; s16 spA; - f32 var_f31; + f32 var_f31; // ! - uninitalized s32 var_r31; s32 var_r30; CameraData* var_r29; diff --git a/src/REL/m425Dll/main.c b/src/REL/m425Dll/main.c index 01182261..7d1a75d0 100644 --- a/src/REL/m425Dll/main.c +++ b/src/REL/m425Dll/main.c @@ -800,7 +800,7 @@ void fn_1_2A94(s16 arg0, Vec *arg1, Vec *arg2, float arg8) void fn_1_2B2C(omObjData *object) { - s32 sp8; + s32 sp8; // ! - uninitialized M425DllWork *var_r31; s32 var_r29; s32 var_r28; diff --git a/src/REL/m450Dll/main.c b/src/REL/m450Dll/main.c index e8536366..4610c4b3 100644 --- a/src/REL/m450Dll/main.c +++ b/src/REL/m450Dll/main.c @@ -3874,7 +3874,7 @@ void fn_1_11D5C(omObjData *object) UnkM450Struct3 *var_r31; s32 var_r29; - s32 var_r27; + s32 var_r27; // ! - uninitialized s32 *var_r26; (void)var_r27; diff --git a/src/REL/m462Dll/main.c b/src/REL/m462Dll/main.c index ff5c24f1..4b10f621 100755 --- a/src/REL/m462Dll/main.c +++ b/src/REL/m462Dll/main.c @@ -1280,7 +1280,7 @@ s32 fn_1_65D0(StructBss340 *arg0) { float var_f31; float var_f30; - s32 sp8; + s32 sp8; // ! - uninitialized var_f31 = fn_1_1534(arg0->unk4C.z, arg0->unk84); var_f30 = fn_1_1534(arg0->unk4C.x, arg0->unk84); diff --git a/src/REL/mgmodedll/battle.c b/src/REL/mgmodedll/battle.c index a78bdc8a..c5088576 100644 --- a/src/REL/mgmodedll/battle.c +++ b/src/REL/mgmodedll/battle.c @@ -44,7 +44,7 @@ s32 fn_1_E72C(void) temp_r29 = 0; fn_1_279FC(0); fn_1_FF5C(); - if (lbl_1_bss_4 == 3) { + if (mgModeEvtNo == 3) { mgTypeCurr = mgInfoTbl[GWSystem.mg_next].type; if (mgTypeCurr >= 4) { mgTypeCurr = 3; @@ -105,7 +105,7 @@ s32 fn_1_E72C(void) } repeat_mode: if (lbl_1_bss_20AA == 0) { - HuPrcChildCreate(fn_1_27080, 100, 12288, 0, lbl_1_bss_2D8); + HuPrcChildCreate(fn_1_27080, 100, 12288, 0, objman); lbl_1_bss_20AA = 1; } lbl_1_bss_3A4 = fn_1_25CA8(0x1A0020); @@ -843,7 +843,7 @@ void fn_1_12B64(s16 arg0) { Process *process; s32 *data; - process = HuPrcChildCreate(fn_1_12BEC, 100, 12288, 0, lbl_1_bss_2D8); + process = HuPrcChildCreate(fn_1_12BEC, 100, 12288, 0, objman); data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(s32), MEMORY_DEFAULT_NUM); process->user_data = data; *data = arg0; diff --git a/src/REL/mgmodedll/datalist.c b/src/REL/mgmodedll/datalist.c index 947f1677..3eb233ec 100644 --- a/src/REL/mgmodedll/datalist.c +++ b/src/REL/mgmodedll/datalist.c @@ -1,131 +1,135 @@ #include "REL/mgmodedll.h" +#ifndef __MWERKS__ +#include "game/esprite.h" +#endif + DataListModel lbl_1_data_490[] = { - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x00), 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x01), 0x40000001, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x02), 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x03), 0, 1, -1, 2, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x04), 0, 1, -1, 2, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x5E), 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x5F), 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x60), 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x61), 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x05), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x06), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x07), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x08), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, - { -1, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x00), 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x01), 0x40000001, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x02), 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x03), 0, 1, -1, 2, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x04), 0, 1, -1, 2, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x5E), 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x5F), 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x60), 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x61), 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x05), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x06), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x07), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x08), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, + { -1, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } }, }; DataListSprite lbl_1_data_768[] = { - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x0C), 0, 10, 288, -200, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x09), 0, 10, 288, -200, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x0A), 0, 10, 288, -200, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x0D), 4, 100, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x18), 4, 200, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1A), 4, 20, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1B), 4, 30, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1C), 4, 40, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1D), 4, 50, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1E), 4, 50, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1F), 4, 50, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x20), 4, 50, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x21), 4, 50, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x25), 4, 200, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x0E), 4, 210, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x0F), 4, 210, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x19), 4, 200, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x28), 4, 10, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x28), 4, 10, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x2A), 4, 10, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x2E), 4, 200, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x2F), 4, 200, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x32), 4, 5, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x31), 4, 4, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x30), 4, 4, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x29), 4, 4, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x29), 4, 4, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x33), 4, 50, 288, 240, { 255, 255, 255, 255 } }, - { DATA_MAKE_NUM(DATADIR_MGMODE, 0x34), 4, 50, 288, 256, { 255, 255, 255, 255 } }, - { 0, 0, 0, 0, 0, { 0, 0, 0, 0 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x0C), 0, 10, 288, -200, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x09), 0, 10, 288, -200, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x0A), 0, 10, 288, -200, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x0D), 4, 100, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x18), 4, 200, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1A), 4, 20, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1B), 4, 30, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1C), 4, 40, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1D), 4, 50, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1E), 4, 50, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x1F), 4, 50, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x20), 4, 50, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x21), 4, 50, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x25), 4, 200, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x0E), 4, 210, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x0F), 4, 210, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x19), 4, 200, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x28), 4, 10, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x28), 4, 10, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x2A), 4, 10, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x2E), 4, 200, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x2F), 4, 200, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x32), 4, 5, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x31), 4, 4, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x30), 4, 4, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x29), 4, 4, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x29), 4, 4, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x33), 4, 50, 288, 240, { 255, 255, 255, 255 } }, + { DATA_MAKE_NUM(DATADIR_MGMODE, 0x34), 4, 50, 288, 256, { 255, 255, 255, 255 } }, + { 0, 0, 0, 0, 0, { 0, 0, 0, 0 } }, }; void fn_1_267E8(DataListModel *model_list) { - DataListModel *list; - s16 i; - s16 model; - s16 clear_i; - ModelData *model_ptr; - void *data; - list = model_list; - for(clear_i=0; clear_i<13; clear_i++) { - lbl_1_bss_2C80[clear_i] = lbl_1_bss_2C66[clear_i] = -1; - } - for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) { - if(list->type == 0) { - data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA); - model = Hu3DModelCreate(data); - lbl_1_bss_2C80[i] = model; - Hu3DModelAttrSet(model, list->attr); - Hu3DModelPosSetV(model, &list->pos); - Hu3DModelRotSetV(model, &list->rot); - Hu3DModelScaleSetV(model, &list->scale); - model_ptr = &Hu3DData[model]; - if(model_ptr->unk_08 != -1) { - lbl_1_bss_2C66[i] = model_ptr->unk_08; - } - } else if(list->type == 1) { - data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA); - lbl_1_bss_2C66[i] = Hu3DJointMotion(lbl_1_bss_2C80[list->mot_link], data); - - } - (void)i; - } - list = model_list; - for(i=0; list->datanum != DATA_NUM_LISTEND; list++, i++) { - if(list->type == 2) { - model = Hu3DModelLink(lbl_1_bss_2C80[list->link]); - lbl_1_bss_2C80[i] = model; - Hu3DModelAttrSet(model, list->attr); - Hu3DModelPosSetV(model, &list->pos); - Hu3DModelRotSetV(model, &list->rot); - Hu3DModelScaleSetV(model, &list->scale); - } - if(list->type == 0 && list->mot_link != -1) { - Hu3DMotionSet(lbl_1_bss_2C80[i], lbl_1_bss_2C66[list->mot_link]); - } - (void)i; - } + DataListModel *list; + s16 i; + s16 model; + s16 clear_i; + ModelData *model_ptr; + void *data; + list = model_list; + for (clear_i = 0; clear_i < 13; clear_i++) { + lbl_1_bss_2C80[clear_i] = lbl_1_bss_2C66[clear_i] = -1; + } + for (i = 0; list->datanum != DATA_NUM_LISTEND; list++, i++) { + if (list->type == 0) { + data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA); + model = Hu3DModelCreate(data); + lbl_1_bss_2C80[i] = model; + Hu3DModelAttrSet(model, list->attr); + Hu3DModelPosSetV(model, &list->pos); + Hu3DModelRotSetV(model, &list->rot); + Hu3DModelScaleSetV(model, &list->scale); + model_ptr = &Hu3DData[model]; + if (model_ptr->unk_08 != -1) { + lbl_1_bss_2C66[i] = model_ptr->unk_08; + } + } + else if (list->type == 1) { + data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA); + lbl_1_bss_2C66[i] = Hu3DJointMotion(lbl_1_bss_2C80[list->mot_link], data); + } + (void)i; + } + list = model_list; + for (i = 0; list->datanum != DATA_NUM_LISTEND; list++, i++) { + if (list->type == 2) { + model = Hu3DModelLink(lbl_1_bss_2C80[list->link]); + lbl_1_bss_2C80[i] = model; + Hu3DModelAttrSet(model, list->attr); + Hu3DModelPosSetV(model, &list->pos); + Hu3DModelRotSetV(model, &list->rot); + Hu3DModelScaleSetV(model, &list->scale); + } + if (list->type == 0 && list->mot_link != -1) { + Hu3DMotionSet(lbl_1_bss_2C80[i], lbl_1_bss_2C66[list->mot_link]); + } + (void)i; + } } void fn_1_26A78(DataListSprite *sprite_list) { - DataListSprite *list; - s16 sprite; - s16 clear_i; - s16 i; - list = sprite_list; - for(clear_i=0; clear_i<29; clear_i++) { - lbl_1_bss_2C2C[clear_i] = -1; - } - for(i=0; list->datanum; i++, list++) { - sprite = espEntry(list->datanum, 100, 0); - lbl_1_bss_2C2C[i] = sprite; - espPosSet(sprite, list->x, list->y); - espColorSet(sprite, list->color.r, list->color.g, list->color.b); - espTPLvlSet(sprite, list->color.a/255.0f); - espPriSet(sprite, list->prio); - espAttrSet(sprite, list->attr); - } + DataListSprite *list; + s16 sprite; + s16 clear_i; + s16 i; + list = sprite_list; + for (clear_i = 0; clear_i < 29; clear_i++) { + lbl_1_bss_2C2C[clear_i] = -1; + } + for (i = 0; list->datanum; i++, list++) { + sprite = espEntry(list->datanum, 100, 0); + lbl_1_bss_2C2C[i] = sprite; + espPosSet(sprite, list->x, list->y); + espColorSet(sprite, list->color.r, list->color.g, list->color.b); + espTPLvlSet(sprite, list->color.a / 255.0f); + espPriSet(sprite, list->prio); + espAttrSet(sprite, list->attr); + } } void fn_1_26BB0(void) { - s16 i; - for(i=0; i<29; i++) { - if(lbl_1_bss_2C2C[i] != -1) { - espKill(lbl_1_bss_2C2C[i]); - } - } + s16 i; + for (i = 0; i < 29; i++) { + if (lbl_1_bss_2C2C[i] != -1) { + espKill(lbl_1_bss_2C2C[i]); + } + } } diff --git a/src/REL/mgmodedll/free_play.c b/src/REL/mgmodedll/free_play.c index 7d314df5..58ffe85e 100644 --- a/src/REL/mgmodedll/free_play.c +++ b/src/REL/mgmodedll/free_play.c @@ -88,7 +88,7 @@ s32 fn_1_6D28(void) else { temp_r28 = lbl_1_bss_2C2C[2]; } - if (lbl_1_bss_4 == 1 || lbl_1_bss_4 == 2) { + if (mgModeEvtNo == 1 || mgModeEvtNo == 2) { mgTypeCurr = fn_1_B5A8(&spA, &sp8); espAttrReset(lbl_1_bss_2C2C[3], HUSPR_ATTR_DISPOFF); espTPLvlSet(lbl_1_bss_2C2C[3], 1.0f); @@ -99,7 +99,7 @@ s32 fn_1_6D28(void) if (lbl_1_bss_2A6 == 0) { espAttrReset(lbl_1_bss_2C2C[4], HUSPR_ATTR_DISPOFF); espPosSet(lbl_1_bss_2C2C[4], 450, 404); - if (lbl_1_bss_4 == 1) { + if (mgModeEvtNo == 1) { fn_1_BFA0(lbl_1_bss_264C[lbl_1_bss_318[mgTypeCurr][0]][spA + sp8]); espAttrReset(lbl_1_bss_2C2C[14], HUSPR_ATTR_DISPOFF); espPosSet(lbl_1_bss_2C2C[14], 450, 348); diff --git a/src/REL/mgmodedll/mgmode.c b/src/REL/mgmodedll/mgmode.c index a0e23802..4e078f7d 100644 --- a/src/REL/mgmodedll/mgmode.c +++ b/src/REL/mgmodedll/mgmode.c @@ -7,6 +7,10 @@ #include "ext_math.h" +#ifndef __MWERKS__ +#include "game/hsfex.h" +#endif + typedef struct camera_view_params { Vec rot; Vec pos; @@ -15,8 +19,8 @@ typedef struct camera_view_params { CameraViewParams lbl_1_data_0[1] = { { { -5, 0, 0 }, { 0, 125, 0 }, 1750 } }; -omObjData *lbl_1_bss_2DC; -Process *lbl_1_bss_2D8; +omObjData *outViewObj; +Process *objman; s32 lbl_1_bss_2D4; s32 lbl_1_bss_2D0; s16 lbl_1_bss_2CE; @@ -31,7 +35,7 @@ Vec lbl_1_bss_28C[2]; Vec lbl_1_bss_274[2]; float lbl_1_bss_26C[2]; StructBss8 lbl_1_bss_8; -s16 lbl_1_bss_4; +s16 mgModeEvtNo; s32 lbl_1_bss_0; void fn_1_464(void); @@ -42,7 +46,7 @@ void ObjectSetup(void) s32 glight; OSReport("******* MG ObjectSetup *********\n"); - lbl_1_bss_2D8 = omInitObjMan(50, 8192); + objman = omInitObjMan(50, 8192); lbl_1_bss_28C[0].x = -70; lbl_1_bss_28C[0].y = 0; lbl_1_bss_28C[0].z = 0; @@ -58,8 +62,8 @@ void ObjectSetup(void) _ClearFlag(0x10008); GWSystem.mg_type = -1; GWSystem.player_curr = 0; - lbl_1_bss_4 = omovlevtno; - if (lbl_1_bss_4 == 0) { + mgModeEvtNo = omovlevtno; + if (mgModeEvtNo == 0) { mgGameStatBackup = GWGameStat; } lbl_1_bss_2CE = -1; @@ -70,9 +74,9 @@ void ObjectSetup(void) Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); glight = Hu3DGLightCreate(0, 100, 1000, 0, -0.5, -1, 255, 255, 255); Hu3DGLightInfinitytSet(glight); - HuPrcChildCreate(fn_1_464, 100, 12288, 0, lbl_1_bss_2D8); - HuPrcChildCreate(fn_1_54F4, 200, 4096, 0, lbl_1_bss_2D8); - lbl_1_bss_2DC = omAddObjEx(lbl_1_bss_2D8, 32730, 0, 0, -1, omOutView); + HuPrcChildCreate(fn_1_464, 100, 12288, 0, objman); + HuPrcChildCreate(fn_1_54F4, 200, 4096, 0, objman); + outViewObj = omAddObjEx(objman, 32730, 0, 0, -1, omOutView); Hu3DBGColorSet(0, 0, 0); HuWinInit(1); fn_1_279FC(0); @@ -86,7 +90,7 @@ void fn_1_464(void) { s16 i; fn_1_52DC(); - if (lbl_1_bss_4 == 0) { + if (mgModeEvtNo == 0) { HuAudSStreamPlay(12); fn_1_19018(); } @@ -103,7 +107,7 @@ void fn_1_464(void) Center.y = 215; CRot.x = 0; CRot.y = CRot.z = 0; - if (lbl_1_bss_4 == 1 || lbl_1_bss_4 == 2 || lbl_1_bss_4 == 3 || lbl_1_bss_4 == 4) { + if (mgModeEvtNo == 1 || mgModeEvtNo == 2 || mgModeEvtNo == 3 || mgModeEvtNo == 4) { Hu3DModelPosSet(lbl_1_bss_2C80[5], 0, 0, 640); Hu3DMotionSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6]); Hu3DModelAttrSet(lbl_1_bss_2C80[5], HU3D_MOTATTR_LOOP); @@ -136,7 +140,7 @@ void fn_1_6F8(void) { s16 i; s16 time; - if (lbl_1_bss_4 == 1 || lbl_1_bss_4 == 2 || lbl_1_bss_4 == 3 || lbl_1_bss_4 == 4) { + if (mgModeEvtNo == 1 || mgModeEvtNo == 2 || mgModeEvtNo == 3 || mgModeEvtNo == 4) { lbl_1_bss_2A6 = 0; goto freeplay; } @@ -218,7 +222,7 @@ void fn_1_6F8(void) HuPrcVSleep(); } fn_1_25E74(lbl_1_bss_2CC); - lbl_1_bss_4 = 0; + mgModeEvtNo = 0; espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); if (lbl_1_bss_2A6 == 0) { freeplay: @@ -253,19 +257,19 @@ void fn_1_DF0(void) Vec posModel; float weight; - if (lbl_1_bss_4 == 1) { + if (mgModeEvtNo == 1) { lbl_1_bss_2A4 = 0; goto freeplay; } - if (lbl_1_bss_4 == 2) { + if (mgModeEvtNo == 2) { lbl_1_bss_2A4 = 1; goto teamplay; } - if (lbl_1_bss_4 == 3) { + if (mgModeEvtNo == 3) { lbl_1_bss_2A4 = 2; goto battle; } - if (lbl_1_bss_4 == 4) { + if (mgModeEvtNo == 4) { lbl_1_bss_2A4 = 3; goto tictactoe; } @@ -386,7 +390,7 @@ void fn_1_DF0(void) } HuWinPushKeySet(lbl_1_bss_2CE, PAD_BUTTON_A | PAD_BUTTON_B); } - lbl_1_bss_4 = 0; + mgModeEvtNo = 0; pos2D = lbl_1_data_40[0]; pos2D.z = 800; Hu3D2Dto3D(&pos2D, 1, &pos3D); @@ -429,7 +433,7 @@ s32 fn_1_1B0C(void) ModelData *modelP; s16 temp_r29 = 0; - if (lbl_1_bss_4 == 1) { + if (mgModeEvtNo == 1) { pos2D.x = 60; pos2D.y = 70; pos2D.z = 1000; @@ -480,12 +484,12 @@ s32 fn_1_1B0C(void) } mgPracticeEnableF = 1; if (fn_1_6D28()) { - lbl_1_bss_4 = 0; + mgModeEvtNo = 0; goto charsel; } exit: mgPracticeEnableF = 0; - lbl_1_bss_4 = 0; + mgModeEvtNo = 0; pos2D.x = 168; pos2D.y = 190; pos2D.z = 800; @@ -518,7 +522,7 @@ s32 fn_1_21C4(void) s16 i; ModelData *modelP; s16 temp_r29 = 1; - if (lbl_1_bss_4 == 2) { + if (mgModeEvtNo == 2) { pos2D.x = 60; pos2D.y = 70; pos2D.z = 1000; @@ -570,12 +574,12 @@ s32 fn_1_21C4(void) } mgPracticeEnableF = 1; if (fn_1_6D28()) { - lbl_1_bss_4 = 0; + mgModeEvtNo = 0; goto charsel; } exit: mgPracticeEnableF = 0; - lbl_1_bss_4 = 0; + mgModeEvtNo = 0; pos2D.x = 168; pos2D.y = 190; pos2D.z = 800; @@ -611,7 +615,7 @@ s32 fn_1_2940(void) for (i = 0; i < 4; i++) { Hu3DModelLayerSet(lbl_1_bss_2C80[i + 9], 2); } - if (lbl_1_bss_4 == 3) { + if (mgModeEvtNo == 3) { OSReport("Eliminate Play STart\n"); pos2D.x = 50; pos2D.y = 70; @@ -665,7 +669,7 @@ s32 fn_1_2940(void) } if (fn_1_E72C() == 0) { - lbl_1_bss_4 = 0; + mgModeEvtNo = 0; goto charsel; } exit: @@ -673,7 +677,7 @@ exit: for (i = 0; i < 4; i++) { Hu3DModelLayerSet(lbl_1_bss_2C80[i + 9], 3); } - lbl_1_bss_4 = 0; + mgModeEvtNo = 0; pos2D.x = 168; pos2D.y = 190; pos2D.z = 800; @@ -706,7 +710,7 @@ s32 fn_1_3150(void) s16 i; ModelData *modelP; s16 temp_r29 = 1; - if (lbl_1_bss_4 == 4) { + if (mgModeEvtNo == 4) { pos2D.x = 60; pos2D.y = 70; pos2D.z = 1000; @@ -759,12 +763,12 @@ s32 fn_1_3150(void) } if (fn_1_13418() == 0) { - lbl_1_bss_4 = 0; + mgModeEvtNo = 0; goto charsel; } exit: HuDataDirClose(DATADIR_INSTPIC); - lbl_1_bss_4 = 0; + mgModeEvtNo = 0; pos2D.x = 168; pos2D.y = 190; pos2D.z = 800; @@ -1130,7 +1134,7 @@ void fn_1_52DC(void) lbl_1_bss_8.unk10 = lbl_1_bss_2C66[6]; lbl_1_bss_8.unk14 = lbl_1_bss_2C66[7]; lbl_1_bss_8.unk18 = lbl_1_bss_2C66[6]; - fn_1_18DF8(lbl_1_bss_2D8, &lbl_1_bss_8); + fn_1_18DF8(objman, &lbl_1_bss_8); Hu3DModelShadowSet(lbl_1_bss_2C80[5]); Hu3DModelShadowMapSet(lbl_1_bss_2C80[0]); } diff --git a/src/REL/mgmodedll/record.c b/src/REL/mgmodedll/record.c index 974cc66e..0c1bb43f 100644 --- a/src/REL/mgmodedll/record.c +++ b/src/REL/mgmodedll/record.c @@ -13,17 +13,10 @@ void fn_1_DE3C(void); void fn_1_DFB8(void); void fn_1_E02C(float x, float y, s16 recordNo); -s16 lbl_1_bss_37C[6]; -s16 lbl_1_bss_370[6]; +static s16 lbl_1_bss_37C[6]; +static s16 lbl_1_bss_370[6]; -s16 lbl_1_data_120[6][3] = { - 0, 2, 13, - 1, 0, 15, - 2, 1, 35, - 3, 2, 40, - 5, 1, 51, - 10, 1, 62 -}; +s16 mgRecordIdxTbl[6][3] = { 0, 2, 13, 1, 0, 15, 2, 1, 35, 3, 2, 40, 5, 1, 51, 10, 1, 62 }; void fn_1_D8D0(void) { @@ -32,48 +25,48 @@ void fn_1_D8D0(void) fn_1_DE3C(); espAttrReset(lbl_1_bss_2C2C[3], HUSPR_ATTR_DISPOFF); espTPLvlSet(lbl_1_bss_2C2C[3], 0); - for(i=0; i<=20; i++) { - espTPLvlSet(lbl_1_bss_2C2C[3], i/20.0); + for (i = 0; i <= 20; i++) { + espTPLvlSet(lbl_1_bss_2C2C[3], i / 20.0); HuPrcVSleep(); } - for(i=0; i<=20; i++) { - weight = i/20.0; + for (i = 0; i <= 20; i++) { + weight = i / 20.0; espAttrReset(lbl_1_bss_2C2C[27], HUSPR_ATTR_DISPOFF); - espPosSet(lbl_1_bss_2C2C[27], 288, -100.0+(164.0*sind(weight*90.0f))); + espPosSet(lbl_1_bss_2C2C[27], 288, -100.0 + (164.0 * sind(weight * 90.0f))); espAttrReset(lbl_1_bss_2C2C[28], HUSPR_ATTR_DISPOFF); espTPLvlSet(lbl_1_bss_2C2C[28], weight); espAttrReset(lbl_1_bss_2C2C[20], HUSPR_ATTR_DISPOFF); - espPosSet(lbl_1_bss_2C2C[20], ((1-sind(weight*90.0f))*400)+288, 424); + espPosSet(lbl_1_bss_2C2C[20], ((1 - sind(weight * 90.0f)) * 400) + 288, 424); HuPrcVSleep(); } - for(i=0; i<6; i++) { - fn_1_E02C(288, (i*42)+150.0f, i); + for (i = 0; i < 6; i++) { + fn_1_E02C(288, (i * 42) + 150.0f, i); HuPrcVSleep(); } - while(1) { - if(HuPadBtnDown[0] & PAD_BUTTON_B) { + while (1) { + if (HuPadBtnDown[0] & PAD_BUTTON_B) { break; } HuPrcVSleep(); } HuAudFXPlay(3); - for(i=0; i<6; i++) { + for (i = 0; i < 6; i++) { fn_1_E02C(1288, 0, i); HuPrcVSleep(); } fn_1_DFB8(); - for(i=0; i<=20; i++) { - weight = i/20.0; + for (i = 0; i <= 20; i++) { + weight = i / 20.0; espAttrReset(lbl_1_bss_2C2C[27], HUSPR_ATTR_DISPOFF); - espPosSet(lbl_1_bss_2C2C[27], 288, -100.0+(164.0*cosd(weight*90.0f))); + espPosSet(lbl_1_bss_2C2C[27], 288, -100.0 + (164.0 * cosd(weight * 90.0f))); espAttrReset(lbl_1_bss_2C2C[28], HUSPR_ATTR_DISPOFF); - espTPLvlSet(lbl_1_bss_2C2C[28], 1.0-weight); + espTPLvlSet(lbl_1_bss_2C2C[28], 1.0 - weight); espAttrReset(lbl_1_bss_2C2C[20], HUSPR_ATTR_DISPOFF); - espPosSet(lbl_1_bss_2C2C[20], ((1-cosd(weight*90.0f))*400)+288, 424); + espPosSet(lbl_1_bss_2C2C[20], ((1 - cosd(weight * 90.0f)) * 400) + 288, 424); HuPrcVSleep(); } - for(i=0; i<=10; i++) { - espTPLvlSet(lbl_1_bss_2C2C[3], 1-(i/10.0)); + for (i = 0; i <= 10; i++) { + espTPLvlSet(lbl_1_bss_2C2C[3], 1 - (i / 10.0)); HuPrcVSleep(); } } @@ -82,15 +75,15 @@ void fn_1_DE3C(void) { AnimData *numAnim = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 53), MEMORY_DEFAULT_NUM)); s16 i; - for(i=0; i<6; i++) { - s16 window = HuWinCreate(0, (i*24), 268, 32, 0); + for (i = 0; i < 6; i++) { + s16 window = HuWinCreate(0, (i * 24), 268, 32, 0); s16 j; lbl_1_bss_37C[i] = window; HuWinBGTPLvlSet(window, 0); HuWinMesSpeedSet(window, 0); HuWinDispOff(window); lbl_1_bss_370[i] = HuSprGrpCreate(8); - for(j=0; j<8; j++) { + for (j = 0; j < 8; j++) { s16 sprite = HuSprCreate(numAnim, 10, 0); HuSprGrpMemberSet(lbl_1_bss_370[i], j, sprite); (void)sprite; @@ -102,7 +95,7 @@ void fn_1_DE3C(void) void fn_1_DFB8(void) { s16 i; - for(i=0; i<6; i++) { + for (i = 0; i < 6; i++) { HuWinKill(lbl_1_bss_37C[i]); HuSprGrpKill(lbl_1_bss_370[i]); } @@ -111,112 +104,117 @@ void fn_1_DFB8(void) void fn_1_E02C(float x, float y, s16 recordNo) { s32 sprGrpId = lbl_1_bss_370[recordNo]; - s32 value = GWMGRecordGet(lbl_1_data_120[recordNo][0]); + s32 value = GWMGRecordGet(mgRecordIdxTbl[recordNo][0]); s32 i; s16 mgNo; float xOfs; - - if(lbl_1_data_120[recordNo][2] != -1) { - mgNo = omMgIndexGet(lbl_1_data_120[recordNo][2]); - if(!GWMGAvailGet(mgNo+401)) { + + if (mgRecordIdxTbl[recordNo][2] != -1) { + mgNo = omMgIndexGet(mgRecordIdxTbl[recordNo][2]); + if (!GWMGAvailGet(mgNo + 401)) { mgNo = -1; - } else { + } + else { HuWinMesSet(lbl_1_bss_37C[recordNo], mgInfoTbl[mgNo].name_mess); } - } else { + } + else { mgNo = -1; } HuWinDispOn(lbl_1_bss_37C[recordNo]); - HuWinPosSet(lbl_1_bss_37C[recordNo], x-220, y-24); - if(mgNo == -1) { + HuWinPosSet(lbl_1_bss_37C[recordNo], x - 220, y - 24); + if (mgNo == -1) { HuWinMesSet(lbl_1_bss_37C[recordNo], MAKE_MESSID(35, 0)); - for(i=0; i<8; i++) { + for (i = 0; i < 8; i++) { HuSprBankSet(sprGrpId, i, 0); - HuSprPosSet(sprGrpId, i, i*16, 0); + HuSprPosSet(sprGrpId, i, i * 16, 0); HuSprAttrReset(sprGrpId, i, HUSPR_ATTR_DISPOFF); } xOfs = 128; - } else { + } + else { s32 memberNum; s32 digitValue; - if(lbl_1_data_120[recordNo][1] == 0) { + if (mgRecordIdxTbl[recordNo][1] == 0) { memberNum = 0; - if(value > 9999) { + if (value > 9999) { value = 9999; } - digitValue = value/1000; - if(digitValue != 0) { + digitValue = value / 1000; + if (digitValue != 0) { HuSprBankSet(sprGrpId, memberNum, digitValue); - value -= digitValue*1000; + value -= digitValue * 1000; memberNum++; } - digitValue = value/100; - if(digitValue != 0 || memberNum != 0) { + digitValue = value / 100; + if (digitValue != 0 || memberNum != 0) { HuSprBankSet(sprGrpId, memberNum, digitValue); - value -= digitValue*100; + value -= digitValue * 100; memberNum++; } - digitValue = value/10; - if(digitValue != 0 || memberNum != 0) { + digitValue = value / 10; + if (digitValue != 0 || memberNum != 0) { HuSprBankSet(sprGrpId, memberNum, digitValue); - value -= digitValue*10; + value -= digitValue * 10; memberNum++; } HuSprBankSet(sprGrpId, memberNum, value); memberNum++; - for(i=0; i<8; i++) { + for (i = 0; i < 8; i++) { HuSprAttrSet(sprGrpId, i, HUSPR_ATTR_DISPOFF); } - for(i=0; ipos; sp18.x = -300; sp18.y = 0; sp18.z = 680; VECSubtract(&sp18, &sp24, &sp18); - temp_f29 = (180+atan2d(sp18.z, sp18.x))-360; - for(temp_r31=0; temp_r31<=60; temp_r31++) { - if(temp_r31 <= 50) { - temp_f31 = 1.0-sind((temp_r31/50.0)*90.0); - HuSprGrpPosSet(lbl_1_bss_3A8, 288, 256+(-400*temp_f31)); - } else { - temp_f31 = cosd(((temp_r31-50.0)/10.0)*90.0); - HuSprGrpPosSet(lbl_1_bss_3A8, 288, 240+(16*temp_f31)); + temp_f29 = (180 + atan2d(sp18.z, sp18.x)) - 360; + for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { + if (temp_r31 <= 50) { + temp_f31 = 1.0 - sind((temp_r31 / 50.0) * 90.0); + HuSprGrpPosSet(lbl_1_bss_3A8, 288, 256 + (-400 * temp_f31)); } - if(temp_r31 > 20 && temp_r31 <= 50) { - temp_f31 = 1.0-sind(((temp_r31-20)/30.0)*90.0); - HuSprGrpPosSet(lbl_1_bss_3AA, 434+(400*temp_f31), 65); - } else if(temp_r31 > 50) { - temp_f31 = cosd(((temp_r31-50.0)/10.0)*90.0); - HuSprGrpPosSet(lbl_1_bss_3AA, 450+(-16*temp_f31), 65); + else { + temp_f31 = cosd(((temp_r31 - 50.0) / 10.0) * 90.0); + HuSprGrpPosSet(lbl_1_bss_3A8, 288, 240 + (16 * temp_f31)); } - if(temp_r31 == 30) { + if (temp_r31 > 20 && temp_r31 <= 50) { + temp_f31 = 1.0 - sind(((temp_r31 - 20) / 30.0) * 90.0); + HuSprGrpPosSet(lbl_1_bss_3AA, 434 + (400 * temp_f31), 65); + } + else if (temp_r31 > 50) { + temp_f31 = cosd(((temp_r31 - 50.0) / 10.0) * 90.0); + HuSprGrpPosSet(lbl_1_bss_3AA, 450 + (-16 * temp_f31), 65); + } + if (temp_r31 == 30) { Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[7], 0, 8, HU3D_MOTATTR_LOOP); } - if(temp_r31 > 30) { - temp_f31 = (temp_r31-30.0)/30.0; + if (temp_r31 > 30) { + temp_f31 = (temp_r31 - 30.0) / 30.0; VECScale(&sp18, &spC, temp_f31); VECAdd(&sp24, &spC, &spC); Hu3DModelPosSetV(lbl_1_bss_2C80[5], &spC); - if(temp_r31 <= 40) { - temp_f31 = (temp_r31-20)/10.0; - Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f29*temp_f31, 0); + if (temp_r31 <= 40) { + temp_f31 = (temp_r31 - 20) / 10.0; + Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f29 * temp_f31, 0); } } HuPrcVSleep(); } Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 8, HU3D_MOTATTR_LOOP); - for(temp_r31=0; temp_r31<=10; temp_r31++) { - temp_f31 = temp_r31/10.0; - Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f29+((20.0f-temp_f29)*temp_f31), 0); + for (temp_r31 = 0; temp_r31 <= 10; temp_r31++) { + temp_f31 = temp_r31 / 10.0; + Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f29 + ((20.0f - temp_f29) * temp_f31), 0); HuPrcVSleep(); } - for(temp_r31=0; temp_r31<3; temp_r31++) { - for(temp_r30=0; temp_r30<3; temp_r30++) { + for (temp_r31 = 0; temp_r31 < 3; temp_r31++) { + for (temp_r30 = 0; temp_r30 < 3; temp_r30++) { mgTicTacToeGrid[temp_r31][temp_r30] = 0; } } } lbl_1_bss_3B8 = fn_1_25CA8(0x280019); - if(lbl_1_data_168 == -1) { + if (lbl_1_data_168 == -1) { lbl_1_data_168 = fn_1_2530C(0, 0, 0); } fn_1_25838(lbl_1_data_168, 0x280015, -1, -1); @@ -170,63 +152,80 @@ s32 fn_1_13418(void) HuSprTPLvlSet(lbl_1_bss_3A8, 13, 0.5f); temp_f30 = 0; sp8[0] = sp8[1] = 0; - for(temp_r31=0; temp_r31<9; temp_r31++) { - mgTicTacToeGrid[temp_r31%3][temp_r31/3] &= 0x3; + for (temp_r31 = 0; temp_r31 < 9; temp_r31++) { + mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3] &= 0x3; } - while(1) { - for(temp_r31=0; temp_r31<2; temp_r31++) { - if(sp8[temp_r31] == 0) { + while (1) { + for (temp_r31 = 0; temp_r31 < 2; temp_r31++) { + if (sp8[temp_r31] == 0) { sp8[temp_r31] = fn_1_15E98(temp_r31, 1); - if(sp8[temp_r31] == -1) { + if (sp8[temp_r31] == -1) { sp8[temp_r31] = 0; goto else_case; - } else if(sp8[temp_r31] == 1) { - HuSprAttrSet(lbl_1_bss_3A8, temp_r31+12, HUSPR_ATTR_DISPOFF); - HuSprAttrReset(lbl_1_bss_3A8, temp_r31+14, HUSPR_ATTR_DISPOFF); - if(lbl_1_bss_3B4[0] != lbl_1_bss_3B4[1]) { - HuSprPosSet(lbl_1_bss_3A8, temp_r31+14, ((lbl_1_bss_3B4[temp_r31]%3)*56)-56, ((lbl_1_bss_3B4[temp_r31]/3)*56)-56); - } else { - HuSprPosSet(lbl_1_bss_3A8, temp_r31+14, ((lbl_1_bss_3B4[temp_r31]%3)*56)-60+(temp_r31*8), ((lbl_1_bss_3B4[temp_r31]/3)*56)-56); - } - } else { - else_case: - if(lbl_1_bss_3B4[0] != lbl_1_bss_3B4[1]) { - HuSprPosSet(lbl_1_bss_3A8, temp_r31+12, ((lbl_1_bss_3B4[temp_r31]%3)*56)-56, ((lbl_1_bss_3B4[temp_r31]/3)*56)-56); - } else { - HuSprPosSet(lbl_1_bss_3A8, temp_r31+12, ((lbl_1_bss_3B4[temp_r31]%3)*56)-60+(temp_r31*8), ((lbl_1_bss_3B4[temp_r31]/3)*56)-56); - } - HuSprTPLvlSet(lbl_1_bss_3A8, temp_r31+12, 0.7+(0.2*sind(temp_f30+(temp_r31*180)))); - HuSprPriSet(lbl_1_bss_3A8, temp_r31+12, 150); } - } else { - sp8[temp_r31] = fn_1_15E98(temp_r31, 0); - if(sp8[temp_r31] == -1) { - sp8[temp_r31] = 0; - HuSprAttrReset(lbl_1_bss_3A8, temp_r31+12, HUSPR_ATTR_DISPOFF); - HuSprAttrSet(lbl_1_bss_3A8, temp_r31+14, HUSPR_ATTR_DISPOFF); - if(lbl_1_bss_3B4[0] != lbl_1_bss_3B4[1]) { - HuSprPosSet(lbl_1_bss_3A8, temp_r31+12, ((lbl_1_bss_3B4[temp_r31]%3)*56)-56, ((lbl_1_bss_3B4[temp_r31]/3)*56)-56); - } else { - HuSprPosSet(lbl_1_bss_3A8, temp_r31+12, ((lbl_1_bss_3B4[temp_r31]%3)*56)-60+(temp_r31*8), ((lbl_1_bss_3B4[temp_r31]/3)*56)-56); + else if (sp8[temp_r31] == 1) { + HuSprAttrSet(lbl_1_bss_3A8, temp_r31 + 12, HUSPR_ATTR_DISPOFF); + HuSprAttrReset(lbl_1_bss_3A8, temp_r31 + 14, HUSPR_ATTR_DISPOFF); + if (lbl_1_bss_3B4[0] != lbl_1_bss_3B4[1]) { + HuSprPosSet( + lbl_1_bss_3A8, temp_r31 + 14, ((lbl_1_bss_3B4[temp_r31] % 3) * 56) - 56, ((lbl_1_bss_3B4[temp_r31] / 3) * 56) - 56); } - } else { - HuSprTPLvlSet(lbl_1_bss_3A8, temp_r31+12, 1.0f); - HuSprPriSet(lbl_1_bss_3A8, temp_r31+12, temp_r31+180); - if(lbl_1_bss_3B4[0] != lbl_1_bss_3B4[1]) { - HuSprPosSet(lbl_1_bss_3A8, temp_r31+14, ((lbl_1_bss_3B4[temp_r31]%3)*56)-56, ((lbl_1_bss_3B4[temp_r31]/3)*56)-56); - } else { - HuSprPosSet(lbl_1_bss_3A8, temp_r31+14, ((lbl_1_bss_3B4[temp_r31]%3)*56)-60+(temp_r31*8), ((lbl_1_bss_3B4[temp_r31]/3)*56)-56); + else { + HuSprPosSet(lbl_1_bss_3A8, temp_r31 + 14, ((lbl_1_bss_3B4[temp_r31] % 3) * 56) - 60 + (temp_r31 * 8), + ((lbl_1_bss_3B4[temp_r31] / 3) * 56) - 56); + } + } + else { + else_case: + if (lbl_1_bss_3B4[0] != lbl_1_bss_3B4[1]) { + HuSprPosSet( + lbl_1_bss_3A8, temp_r31 + 12, ((lbl_1_bss_3B4[temp_r31] % 3) * 56) - 56, ((lbl_1_bss_3B4[temp_r31] / 3) * 56) - 56); + } + else { + HuSprPosSet(lbl_1_bss_3A8, temp_r31 + 12, ((lbl_1_bss_3B4[temp_r31] % 3) * 56) - 60 + (temp_r31 * 8), + ((lbl_1_bss_3B4[temp_r31] / 3) * 56) - 56); + } + HuSprTPLvlSet(lbl_1_bss_3A8, temp_r31 + 12, 0.7 + (0.2 * sind(temp_f30 + (temp_r31 * 180)))); + HuSprPriSet(lbl_1_bss_3A8, temp_r31 + 12, 150); + } + } + else { + sp8[temp_r31] = fn_1_15E98(temp_r31, 0); + if (sp8[temp_r31] == -1) { + sp8[temp_r31] = 0; + HuSprAttrReset(lbl_1_bss_3A8, temp_r31 + 12, HUSPR_ATTR_DISPOFF); + HuSprAttrSet(lbl_1_bss_3A8, temp_r31 + 14, HUSPR_ATTR_DISPOFF); + if (lbl_1_bss_3B4[0] != lbl_1_bss_3B4[1]) { + HuSprPosSet( + lbl_1_bss_3A8, temp_r31 + 12, ((lbl_1_bss_3B4[temp_r31] % 3) * 56) - 56, ((lbl_1_bss_3B4[temp_r31] / 3) * 56) - 56); + } + else { + HuSprPosSet(lbl_1_bss_3A8, temp_r31 + 12, ((lbl_1_bss_3B4[temp_r31] % 3) * 56) - 60 + (temp_r31 * 8), + ((lbl_1_bss_3B4[temp_r31] / 3) * 56) - 56); + } + } + else { + HuSprTPLvlSet(lbl_1_bss_3A8, temp_r31 + 12, 1.0f); + HuSprPriSet(lbl_1_bss_3A8, temp_r31 + 12, temp_r31 + 180); + if (lbl_1_bss_3B4[0] != lbl_1_bss_3B4[1]) { + HuSprPosSet( + lbl_1_bss_3A8, temp_r31 + 14, ((lbl_1_bss_3B4[temp_r31] % 3) * 56) - 56, ((lbl_1_bss_3B4[temp_r31] / 3) * 56) - 56); + } + else { + HuSprPosSet(lbl_1_bss_3A8, temp_r31 + 14, ((lbl_1_bss_3B4[temp_r31] % 3) * 56) - 60 + (temp_r31 * 8), + ((lbl_1_bss_3B4[temp_r31] / 3) * 56) - 56); } } } } - if(sp8[0] == 1 && sp8[1] == 1) { + if (sp8[0] == 1 && sp8[1] == 1) { HuSprTPLvlSet(lbl_1_bss_3A8, 12, 1.0f); HuSprTPLvlSet(lbl_1_bss_3A8, 13, 1.0f); break; - } else { + } + else { temp_f30 += 10.0f; - if(temp_f30 > 360.0f) { + if (temp_f30 > 360.0f) { temp_f30 -= 360.0f; } HuPrcVSleep(); @@ -237,14 +236,14 @@ s32 fn_1_13418(void) fn_1_25838(lbl_1_data_168, 0x280010, -1, -1); HuSprTPLvlSet(lbl_1_bss_3A8, 24, 1.0f); mgTypeCurr = 2; - for(temp_r30=0; temp_r30<35;) { - for(temp_r31=0; temp_r31= 35) { + if (temp_r30 >= 35) { break; } } @@ -256,33 +255,35 @@ s32 fn_1_13418(void) HuWinInsertMesSet(lbl_1_data_168, mgInfoTbl[lbl_1_bss_2E4].name_mess, 0); HuWinAttrSet(lbl_1_data_168, 16); fn_1_25838(lbl_1_data_168, 0x280011, -1, -1); - repeat_mess: +repeat_mess: fn_1_25838(lbl_1_data_168, 0x280029, -1, -1); temp_r29 = HuWinChoiceGet(lbl_1_data_168, 0); - if(temp_r29 == 0) { + if (temp_r29 == 0) { _ClearFlag(11); - } else if(temp_r29 == 1) { + } + else if (temp_r29 == 1) { HuWinInsertMesSet(lbl_1_data_168, MAKE_MESSID(0x28, 40), 0); fn_1_25838(lbl_1_data_168, 0x280026, -1, -1); temp_r29 = HuWinChoiceGet(lbl_1_data_168, 1); - if(temp_r29 == 1) { + if (temp_r29 == 1) { goto repeat_mess; } fn_1_271B4(-1, 0, 0); - for(temp_r31=1; temp_r31<=10; temp_r31++) { - HuSprTPLvlSet(lbl_1_bss_3A8, 24, 1-(temp_r31/10.0)); + for (temp_r31 = 1; temp_r31 <= 10; temp_r31++) { + HuSprTPLvlSet(lbl_1_bss_3A8, 24, 1 - (temp_r31 / 10.0)); HuPrcVSleep(); } fn_1_16438(); return 1; - } else { + } + else { _SetFlag(11); } GWSystem.mg_next = lbl_1_bss_2E4; HuDataDirClose(DATADIR_INSTPIC); fn_1_2783C(4); - while(1) { + while (1) { HuPrcVSleep(); } } @@ -302,21 +303,21 @@ void fn_1_14CFC(void) s16 temp_r21; s16 temp_r20; s16 sp8; - for(temp_r31=0; temp_r31<4; temp_r31++) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { lbl_1_bss_2C1C[temp_r31] = temp_r31; } - for(temp_r31=0; temp_r31<4; temp_r31++) { - for(temp_r27=0; temp_r27<3-temp_r31; temp_r27++) { - if(GWPlayerCfg[lbl_1_bss_2C1C[temp_r27]].group > GWPlayerCfg[lbl_1_bss_2C1C[temp_r27+1]].group) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + for (temp_r27 = 0; temp_r27 < 3 - temp_r31; temp_r27++) { + if (GWPlayerCfg[lbl_1_bss_2C1C[temp_r27]].group > GWPlayerCfg[lbl_1_bss_2C1C[temp_r27 + 1]].group) { temp_r24 = lbl_1_bss_2C1C[temp_r27]; - lbl_1_bss_2C1C[temp_r27] = lbl_1_bss_2C1C[temp_r27+1]; - lbl_1_bss_2C1C[temp_r27+1] = temp_r24; + lbl_1_bss_2C1C[temp_r27] = lbl_1_bss_2C1C[temp_r27 + 1]; + lbl_1_bss_2C1C[temp_r27 + 1] = temp_r24; } } } - if(lbl_1_bss_3A8 == 0) { - - lbl_1_bss_3A8 = temp_r30 = HuSprGrpCreate(25); + if (lbl_1_bss_3A8 == 0) { + temp_r30 = HuSprGrpCreate(25); + lbl_1_bss_3A8 = temp_r30; temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 84), MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r28, 200, 0); HuSprGrpMemberSet(temp_r30, 0, temp_r29); @@ -333,52 +334,55 @@ void fn_1_14CFC(void) HuSprPosSet(temp_r30, 2, temp_r26, temp_r25); temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 87), MEMORY_DEFAULT_NUM)); temp_r22 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 88), MEMORY_DEFAULT_NUM)); - for(temp_r31=temp_r27=0; temp_r31<9; temp_r31++) { - if(mgTicTacToeGrid[temp_r31%3][temp_r31/3] & 0xF) { - temp_r24 = mgTicTacToeGrid[temp_r31%3][temp_r31/3]; - if(temp_r24 & 0x4) { + for (temp_r31 = temp_r27 = 0; temp_r31 < 9; temp_r31++) { + if (mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3] & 0xF) { + temp_r24 = mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3]; + if (temp_r24 & 0x4) { temp_r23 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 91), MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r23, 180, 0); HuSprGrpMemberSet(temp_r30, 14, temp_r29); - if(temp_r24 & 0x8) { - HuSprPosSet(temp_r30, 14, temp_r26+((temp_r31%3)*56)-60, temp_r25+((temp_r31/3)*56)-56); - } else { - HuSprPosSet(temp_r30, 14, temp_r26+((temp_r31%3)*56)-56, temp_r25+((temp_r31/3)*56)-56); + if (temp_r24 & 0x8) { + HuSprPosSet(temp_r30, 14, temp_r26 + ((temp_r31 % 3) * 56) - 60, temp_r25 + ((temp_r31 / 3) * 56) - 56); + } + else { + HuSprPosSet(temp_r30, 14, temp_r26 + ((temp_r31 % 3) * 56) - 56, temp_r25 + ((temp_r31 / 3) * 56) - 56); } temp_r27++; } - if(temp_r24 & 0x8) { + if (temp_r24 & 0x8) { temp_r23 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 92), MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r23, 180, 0); HuSprGrpMemberSet(temp_r30, 15, temp_r29); - if(temp_r24 & 0x4) { - HuSprPosSet(temp_r30, 15, temp_r26+((temp_r31%3)*56)-48, temp_r25+((temp_r31/3)*56)-56); - } else { - HuSprPosSet(temp_r30, 15, temp_r26+((temp_r31%3)*56)-56, temp_r25+((temp_r31/3)*56)-56); + if (temp_r24 & 0x4) { + HuSprPosSet(temp_r30, 15, temp_r26 + ((temp_r31 % 3) * 56) - 48, temp_r25 + ((temp_r31 / 3) * 56) - 56); + } + else { + HuSprPosSet(temp_r30, 15, temp_r26 + ((temp_r31 % 3) * 56) - 56, temp_r25 + ((temp_r31 / 3) * 56) - 56); } temp_r27++; } - if(temp_r24 & 0x3) { - if(mgTicTacToeGrid[temp_r31%3][temp_r31/3] & 0x1) { + if (temp_r24 & 0x3) { + if (mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3] & 0x1) { temp_r29 = HuSprCreate(temp_r28, 180, 0); - } else { + } + else { temp_r29 = HuSprCreate(temp_r22, 180, 0); } - HuSprGrpMemberSet(temp_r30, temp_r31+3, temp_r29); - HuSprPosSet(temp_r30, temp_r31+3, temp_r26+((temp_r31%3)*56)-56, temp_r25+((temp_r31/3)*56)-56); + HuSprGrpMemberSet(temp_r30, temp_r31 + 3, temp_r29); + HuSprPosSet(temp_r30, temp_r31 + 3, temp_r26 + ((temp_r31 % 3) * 56) - 56, temp_r25 + ((temp_r31 / 3) * 56) - 56); } } } - if(temp_r27 == 0) { + if (temp_r27 == 0) { temp_r23 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 91), MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r23, 150, 0); HuSprGrpMemberSet(temp_r30, 14, temp_r29); - HuSprPosSet(temp_r30, 14, temp_r26+((temp_r31%3)*56)-56, temp_r25+((temp_r31/3)*56)-56); + HuSprPosSet(temp_r30, 14, temp_r26 + ((temp_r31 % 3) * 56) - 56, temp_r25 + ((temp_r31 / 3) * 56) - 56); HuSprAttrSet(temp_r30, 14, HUSPR_ATTR_DISPOFF); temp_r23 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 92), MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r23, 150, 0); HuSprGrpMemberSet(temp_r30, 15, temp_r29); - HuSprPosSet(temp_r30, 15, temp_r26+((temp_r31%3)*56)-56, temp_r25+((temp_r31/3)*56)-56); + HuSprPosSet(temp_r30, 15, temp_r26 + ((temp_r31 % 3) * 56) - 56, temp_r25 + ((temp_r31 / 3) * 56) - 56); HuSprAttrSet(temp_r30, 15, HUSPR_ATTR_DISPOFF); } temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 89), MEMORY_DEFAULT_NUM)); @@ -391,14 +395,14 @@ void fn_1_14CFC(void) HuSprAttrSet(temp_r30, 13, HUSPR_ATTR_DISPOFF); temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 101), MEMORY_DEFAULT_NUM)); temp_r22 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 102), MEMORY_DEFAULT_NUM)); - for(temp_r31=0; temp_r31<4; temp_r31++) { + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { temp_r29 = HuSprCreate(temp_r28, 130, temp_r31); - HuSprGrpMemberSet(temp_r30, (temp_r31*2)+16, temp_r29); - HuSprPosSet(temp_r30, (temp_r31*2)+16, ((temp_r31%2)*314)-155, ((temp_r31/2)*185)-110); + HuSprGrpMemberSet(temp_r30, (temp_r31 * 2) + 16, temp_r29); + HuSprPosSet(temp_r30, (temp_r31 * 2) + 16, ((temp_r31 % 2) * 314) - 155, ((temp_r31 / 2) * 185) - 110); temp_r29 = HuSprCreate(temp_r22, 135, temp_r31); - HuSprGrpMemberSet(temp_r30, (temp_r31*2)+17, temp_r29); - HuSprTPLvlSet(temp_r30, (temp_r31*2)+17, 0.5f); - HuSprPosSet(temp_r30, (temp_r31*2)+17, ((temp_r31%2)*314)-155, ((temp_r31/2)*185)-102); + HuSprGrpMemberSet(temp_r30, (temp_r31 * 2) + 17, temp_r29); + HuSprTPLvlSet(temp_r30, (temp_r31 * 2) + 17, 0.5f); + HuSprPosSet(temp_r30, (temp_r31 * 2) + 17, ((temp_r31 % 2) * 314) - 155, ((temp_r31 / 2) * 185) - 102); } temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 37), MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r28, 150, 0); @@ -407,9 +411,9 @@ void fn_1_14CFC(void) HuSprScaleSet(temp_r30, 24, 0.9f, 0.9f); HuSprTPLvlSet(temp_r30, 24, 0); } - if(lbl_1_bss_3AA == 0) { - - lbl_1_bss_3AA = temp_r30 = HuSprGrpCreate(10); + if (lbl_1_bss_3AA == 0) { + temp_r30 = HuSprGrpCreate(10); + lbl_1_bss_3AA = temp_r30; temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 15), MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r28, 200, 0); HuSprGrpMemberSet(temp_r30, 0, temp_r29); @@ -418,22 +422,24 @@ void fn_1_14CFC(void) temp_r29 = HuSprCreate(temp_r28, 190, 0); HuSprGrpMemberSet(temp_r30, 1, temp_r29); HuSprPosSet(temp_r30, 1, 0, 0); - for(temp_r31=0; temp_r31<4; temp_r31++) { - temp_r20 = lbl_1_bss_2C24[temp_r31] = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].character; - temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 16)+temp_r20, MEMORY_DEFAULT_NUM)); + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + temp_r20 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].character; + lbl_1_bss_2C24[temp_r31] = temp_r20; + temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 16) + (s16)temp_r20, MEMORY_DEFAULT_NUM)); temp_r29 = HuSprCreate(temp_r28, 190, 0); - HuSprGrpMemberSet(temp_r30, (temp_r31*2)+2, temp_r29); - HuSprPosSet(temp_r30, (temp_r31*2)+2, lbl_1_data_19C[temp_r31], 0); - if(sp8 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].iscom) { + HuSprGrpMemberSet(temp_r30, (temp_r31 * 2) + 2, temp_r29); + HuSprPosSet(temp_r30, (temp_r31 * 2) + 2, lbl_1_data_19C[temp_r31], 0); + if (sp8 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].iscom) { temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 39), MEMORY_DEFAULT_NUM)); temp_r21 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].diff; - } else { + } + else { temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 38), MEMORY_DEFAULT_NUM)); temp_r21 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].pad_idx; } temp_r29 = HuSprCreate(temp_r28, 180, temp_r21); - HuSprGrpMemberSet(temp_r30, (temp_r31*2)+3, temp_r29); - HuSprPosSet(temp_r30, (temp_r31*2)+3, lbl_1_data_19C[temp_r31], 24); + HuSprGrpMemberSet(temp_r30, (temp_r31 * 2) + 3, temp_r29); + HuSprPosSet(temp_r30, (temp_r31 * 2) + 3, lbl_1_data_19C[temp_r31], 24); } HuSprGrpPosSet(temp_r30, 800, 240); } @@ -450,70 +456,74 @@ s32 fn_1_15E98(s16 arg0, s32 arg1) s16 temp_r24; s16 temp_r23; temp_r28 = 4; - for(temp_r27=0; temp_r27<4; temp_r27++) { - if(arg0 == GWPlayerCfg[temp_r27].group && GWPlayerCfg[temp_r27].iscom == 0 && temp_r28 > GWPlayerCfg[temp_r27].pad_idx) { + for (temp_r27 = 0; temp_r27 < 4; temp_r27++) { + if (arg0 == GWPlayerCfg[temp_r27].group && GWPlayerCfg[temp_r27].iscom == 0 && temp_r28 > GWPlayerCfg[temp_r27].pad_idx) { temp_r28 = GWPlayerCfg[temp_r27].pad_idx; } } - if(temp_r28 == 4) { - if(arg1 == 0) { + if (temp_r28 == 4) { + if (arg1 == 0) { return 1; } - temp_r30 = lbl_1_bss_3B4[arg0]%3; - temp_r29 = lbl_1_bss_3B4[arg0]/3; - temp_r24 = lbl_1_bss_3B0[arg0]%3; - temp_r23 = lbl_1_bss_3B0[arg0]/3; - if(--lbl_1_bss_3AC[arg0] != 0) { + temp_r30 = lbl_1_bss_3B4[arg0] % 3; + temp_r29 = lbl_1_bss_3B4[arg0] / 3; + temp_r24 = lbl_1_bss_3B0[arg0] % 3; + temp_r23 = lbl_1_bss_3B0[arg0] / 3; + if (--lbl_1_bss_3AC[arg0] != 0) { return 0; } - if(temp_r30 == temp_r24 && temp_r29 == temp_r23) { + if (temp_r30 == temp_r24 && temp_r29 == temp_r23) { HuAudFXPlay(1); mgTicTacToeGrid[temp_r24][temp_r23] |= 4 << arg0; return 1; - } else { + } + else { lbl_1_bss_3AC[arg0] = 30; - temp_r26 = (temp_r24-temp_r30 < 0) ? -1 : (temp_r24-temp_r30 > 0) ? 1 : 0; - temp_r25 = (temp_r23-temp_r29 < 0) ? -1 : (temp_r23-temp_r29 > 0) ? 1 : 0; - lbl_1_bss_3B4[arg0] = temp_r30+temp_r26+((temp_r29+temp_r25)*3); + temp_r26 = (temp_r24 - temp_r30 < 0) ? -1 : (temp_r24 - temp_r30 > 0) ? 1 : 0; + temp_r25 = (temp_r23 - temp_r29 < 0) ? -1 : (temp_r23 - temp_r29 > 0) ? 1 : 0; + lbl_1_bss_3B4[arg0] = temp_r30 + temp_r26 + ((temp_r29 + temp_r25) * 3); HuAudFXPlay(0); return 0; } - } else { - temp_r30 = lbl_1_bss_3B4[arg0]%3; - temp_r29 = lbl_1_bss_3B4[arg0]/3; - if(arg1 == 0) { + } + else { + temp_r30 = lbl_1_bss_3B4[arg0] % 3; + temp_r29 = lbl_1_bss_3B4[arg0] / 3; + if (arg1 == 0) { return 1; } - if(HuPadBtnDown[temp_r28] & PAD_BUTTON_A) { - if((mgTicTacToeGrid[temp_r30][temp_r29] & 0x3) == 0) { + if (HuPadBtnDown[temp_r28] & PAD_BUTTON_A) { + if ((mgTicTacToeGrid[temp_r30][temp_r29] & 0x3) == 0) { mgTicTacToeGrid[temp_r30][temp_r29] |= 4 << arg0; HuAudFXPlay(1); return 1; - } else { + } + else { HuAudFXPlay(4); } } - if(HuPadDStkRep[temp_r28] == 0) { + if (HuPadDStkRep[temp_r28] == 0) { return 0; } temp_r26 = temp_r25 = 0; - if((HuPadDStkRep[temp_r28] & PAD_BUTTON_LEFT) && temp_r30 > 0) { + if ((HuPadDStkRep[temp_r28] & PAD_BUTTON_LEFT) && temp_r30 > 0) { temp_r26 = -1; - } else if((HuPadDStkRep[temp_r28] & PAD_BUTTON_RIGHT) && temp_r30 < 2) { + } + else if ((HuPadDStkRep[temp_r28] & PAD_BUTTON_RIGHT) && temp_r30 < 2) { temp_r26 = 1; } - if((HuPadDStkRep[temp_r28] & PAD_BUTTON_UP) && temp_r29 > 0) { + if ((HuPadDStkRep[temp_r28] & PAD_BUTTON_UP) && temp_r29 > 0) { temp_r25 = -1; - } else if((HuPadDStkRep[temp_r28] & PAD_BUTTON_DOWN) && temp_r29 < 2) { + } + else if ((HuPadDStkRep[temp_r28] & PAD_BUTTON_DOWN) && temp_r29 < 2) { temp_r25 = 1; } - if(temp_r26 || temp_r25) { + if (temp_r26 || temp_r25) { HuAudFXPlay(0); } - lbl_1_bss_3B4[arg0] = temp_r30+temp_r26+((temp_r29+temp_r25)*3); + lbl_1_bss_3B4[arg0] = temp_r30 + temp_r26 + ((temp_r29 + temp_r25) * 3); return 0; } - } void fn_1_16438(void) @@ -525,7 +535,7 @@ void fn_1_16438(void) Vec sp8; float temp_f31; float temp_f30; - + fn_1_25E74(lbl_1_bss_3B8); fn_1_25584(lbl_1_data_168); lbl_1_data_168 = lbl_1_bss_3B8 = -1; @@ -535,44 +545,46 @@ void fn_1_16438(void) sp14.y = 0; sp14.z = 640; VECSubtract(&sp14, &sp20, &sp14); - temp_f30 = 180+atan2d(sp14.z, sp14.x); - for(temp_r31=0; temp_r31<=60; temp_r31++) { - if(temp_r31 <= 10) { - temp_f31 = sind((temp_r31/10.0)*90.0); - HuSprGrpPosSet(lbl_1_bss_3A8, 288, 240+(16*temp_f31)); - } else { - temp_f31 = 1.0-cosd(((temp_r31-10.0)/50.0)*90.0); - HuSprGrpPosSet(lbl_1_bss_3A8, 288, 256+(-400*temp_f31)); + temp_f30 = 180 + atan2d(sp14.z, sp14.x); + for (temp_r31 = 0; temp_r31 <= 60; temp_r31++) { + if (temp_r31 <= 10) { + temp_f31 = sind((temp_r31 / 10.0) * 90.0); + HuSprGrpPosSet(lbl_1_bss_3A8, 288, 240 + (16 * temp_f31)); } - if(temp_r31 <= 10) { - temp_f31 = sind((temp_r31/10.0)*90.0); - HuSprGrpPosSet(lbl_1_bss_3AA, 450+(-16*temp_f31), 65); - } else if(temp_r31 < 30) { - temp_f31 = 1-cosd(((temp_r31-10.0)/20.0)*90.0); - HuSprGrpPosSet(lbl_1_bss_3AA, 434+(400*temp_f31), 65); + else { + temp_f31 = 1.0 - cosd(((temp_r31 - 10.0) / 50.0) * 90.0); + HuSprGrpPosSet(lbl_1_bss_3A8, 288, 256 + (-400 * temp_f31)); } - if(temp_r31 == 29) { + if (temp_r31 <= 10) { + temp_f31 = sind((temp_r31 / 10.0) * 90.0); + HuSprGrpPosSet(lbl_1_bss_3AA, 450 + (-16 * temp_f31), 65); + } + else if (temp_r31 < 30) { + temp_f31 = 1 - cosd(((temp_r31 - 10.0) / 20.0) * 90.0); + HuSprGrpPosSet(lbl_1_bss_3AA, 434 + (400 * temp_f31), 65); + } + if (temp_r31 == 29) { Hu3DMotionTimeSet(lbl_1_bss_2C80[5], 0); } - if(temp_r31 == 30) { + if (temp_r31 == 30) { Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[7], 0, 8, HU3D_MOTATTR_LOOP); } - if(temp_r31 > 30) { - temp_f31 = (temp_r31-30.0)/30.0; + if (temp_r31 > 30) { + temp_f31 = (temp_r31 - 30.0) / 30.0; VECScale(&sp14, &sp8, temp_f31); VECAdd(&sp20, &sp8, &sp8); Hu3DModelPosSetV(lbl_1_bss_2C80[5], &sp8); - if(temp_r31 <= 40) { - temp_f31 = (temp_r31-30)/10.0; - Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f30*temp_f31, 0); + if (temp_r31 <= 40) { + temp_f31 = (temp_r31 - 30) / 10.0; + Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f30 * temp_f31, 0); } } HuPrcVSleep(); } Hu3DMotionShiftSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6], 0, 8, HU3D_MOTATTR_LOOP); - for(temp_r31=0; temp_r31<=10; temp_r31++) { - temp_f31 = 1.0-(temp_r31/10.0); - Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f31*temp_f30, 0); + for (temp_r31 = 0; temp_r31 <= 10; temp_r31++) { + temp_f31 = 1.0 - (temp_r31 / 10.0); + Hu3DModelRotSet(lbl_1_bss_2C80[5], 0, temp_f31 * temp_f30, 0); HuPrcVSleep(); } HuSprGrpKill(lbl_1_bss_3A8); @@ -596,81 +608,85 @@ s32 fn_1_16B30(void) s16 temp_r21; s16 temp_r20; float temp_f31; - + s16 sp22[9]; s16 sp1E[2]; s16 sp1A[2]; s16 sp16[2]; s16 sp12[2]; char spE[2][2]; - - for(temp_r31=0; temp_r31<9; temp_r31++) { - if(mgTicTacToeGrid[temp_r31%3][temp_r31/3] & 0x4) { + + for (temp_r31 = 0; temp_r31 < 9; temp_r31++) { + if (mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3] & 0x4) { sp1E[0] = temp_r31; } - if(mgTicTacToeGrid[temp_r31%3][temp_r31/3] & 0x8) { + if (mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3] & 0x8) { sp1E[1] = temp_r31; } } HuPrcSleep(60); sp16[0] = sp16[1] = 0; - for(temp_r31=0; temp_r31<4; temp_r31++) { - sp16[temp_r31/2] += GWPlayerCoinWinGet(lbl_1_bss_2C1C[temp_r31])+GWPlayerCoinCollectGet(lbl_1_bss_2C1C[temp_r31]); + for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { + sp16[temp_r31 / 2] += GWPlayerCoinWinGet(lbl_1_bss_2C1C[temp_r31]) + GWPlayerCoinCollectGet(lbl_1_bss_2C1C[temp_r31]); } sp12[0] = sp12[1] = 0; - if(sp16[0] != sp16[1]) { - if(sp16[0] > sp16[1]) { + if (sp16[0] != sp16[1]) { + if (sp16[0] > sp16[1]) { sp12[0] = 1; - } else { + } + else { sp12[1] = 1; } } - for(temp_r30=0, temp_r28=-1; temp_r30<2; temp_r30++) { - temp_r22 = sp1E[temp_r30]%3; - temp_r21 = sp1E[temp_r30]/3; - if(sp12[temp_r30] != 0) { + for (temp_r30 = 0, temp_r28 = -1; temp_r30 < 2; temp_r30++) { + temp_r22 = sp1E[temp_r30] % 3; + temp_r21 = sp1E[temp_r30] / 3; + if (sp12[temp_r30] != 0) { mgTicTacToeGrid[temp_r22][temp_r21] = (1 << temp_r30); temp_r28 = temp_r30; - } else { + } + else { mgTicTacToeGrid[temp_r22][temp_r21] &= ~(4 << temp_r30); } } - if(lbl_1_data_168 == -1) { + if (lbl_1_data_168 == -1) { lbl_1_data_168 = fn_1_2530C(0, 0, 0); } - if(temp_r28 != -1) { - HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[temp_r28*2], 0); - HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[(temp_r28*2)+1], 1); + if (temp_r28 != -1) { + HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[temp_r28 * 2], 0); + HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[(temp_r28 * 2) + 1], 1); fn_1_25838(lbl_1_data_168, 0x280016, -1, -1); - } else { + } + else { fn_1_25838(lbl_1_data_168, 0x280013, -1, -1); } temp_r26 = espEntry(0x62005D, 100, 0); espColorSet(temp_r26, 255, 255, 192); - espAttrSet(temp_r26, HUSPR_ATTR_ADDCOL|HUSPR_ATTR_DISPOFF|HUSPR_ATTR_LOOP); - for(temp_r31=0; temp_r31<=30; temp_r31++) { - for(temp_r30=0; temp_r30<2; temp_r30++) { - if(sp12[temp_r30]) { - if(temp_r31 == 0) { - temp_r23 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 87)+temp_r30, MEMORY_DEFAULT_NUM)); + espAttrSet(temp_r26, HUSPR_ATTR_ADDCOL | HUSPR_ATTR_DISPOFF | HUSPR_ATTR_LOOP); + for (temp_r31 = 0; temp_r31 <= 30; temp_r31++) { + for (temp_r30 = 0; temp_r30 < 2; temp_r30++) { + if (sp12[temp_r30]) { + if (temp_r31 == 0) { + temp_r23 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 87) + temp_r30, MEMORY_DEFAULT_NUM)); temp_r24 = HuSprCreate(temp_r23, 170, 0); - HuSprGrpMemberSet(lbl_1_bss_3A8, sp1E[temp_r30]+3, temp_r24); - HuSprPosSet(lbl_1_bss_3A8, sp1E[temp_r30]+3, ((sp1E[temp_r30]%3)*56)-56, ((sp1E[temp_r30]/3)*56)-56); - HuSprAttrSet(lbl_1_bss_3A8, sp1E[temp_r30]+3,HUSPR_ATTR_DISPOFF); + HuSprGrpMemberSet(lbl_1_bss_3A8, sp1E[temp_r30] + 3, temp_r24); + HuSprPosSet(lbl_1_bss_3A8, sp1E[temp_r30] + 3, ((sp1E[temp_r30] % 3) * 56) - 56, ((sp1E[temp_r30] / 3) * 56) - 56); + HuSprAttrSet(lbl_1_bss_3A8, sp1E[temp_r30] + 3, HUSPR_ATTR_DISPOFF); espAttrReset(temp_r26, HUSPR_ATTR_DISPOFF); - espPosSet(temp_r26, (((sp1E[temp_r30]%3)*56)+288.0f)-56, ((sp1E[temp_r30]/3)*56)+184); + espPosSet(temp_r26, (((sp1E[temp_r30] % 3) * 56) + 288.0f) - 56, ((sp1E[temp_r30] / 3) * 56) + 184); HuAudFXPlay(825); HuAudFXPlay(826); } - if(temp_r31 == 8) { - HuSprAttrReset(lbl_1_bss_3A8, sp1E[temp_r30]+3,HUSPR_ATTR_DISPOFF); + if (temp_r31 == 8) { + HuSprAttrReset(lbl_1_bss_3A8, sp1E[temp_r30] + 3, HUSPR_ATTR_DISPOFF); } - if(temp_r31 == 14) { + if (temp_r31 == 14) { espKill(temp_r26); } - } else { - temp_f31 = 1-(temp_r31/30.0); - HuSprTPLvlSet(lbl_1_bss_3A8, temp_r30+14, temp_f31); + } + else { + temp_f31 = 1 - (temp_r31 / 30.0); + HuSprTPLvlSet(lbl_1_bss_3A8, temp_r30 + 14, temp_f31); } } HuPrcVSleep(); @@ -679,30 +695,30 @@ s32 fn_1_16B30(void) HuSprTPLvlSet(lbl_1_bss_3A8, 14, 1.0f); HuSprAttrSet(lbl_1_bss_3A8, 15, HUSPR_ATTR_DISPOFF); HuSprTPLvlSet(lbl_1_bss_3A8, 15, 1.0f); - for(temp_r31=0; temp_r31<9; temp_r31++) { + for (temp_r31 = 0; temp_r31 < 9; temp_r31++) { sp22[temp_r31] = 0; } temp_r27 = 0; - for(temp_r30=0; temp_r30<2; temp_r30++) { - for(temp_r31=0; temp_r31<8; temp_r31++) { - temp_r29 = lbl_1_data_16A[temp_r31*3]; - if((1 << temp_r30) & mgTicTacToeGrid[temp_r29%3][temp_r29/3]) { - temp_r29 = lbl_1_data_16A[(temp_r31*3)+1]; - if((1 << temp_r30) & mgTicTacToeGrid[temp_r29%3][temp_r29/3]) { - temp_r29 = lbl_1_data_16A[(temp_r31*3)+2]; - if((1 << temp_r30) & mgTicTacToeGrid[temp_r29%3][temp_r29/3]) { - temp_r29 = lbl_1_data_16A[temp_r31*3]; - if(sp22[temp_r29] == 0) { + for (temp_r30 = 0; temp_r30 < 2; temp_r30++) { + for (temp_r31 = 0; temp_r31 < 8; temp_r31++) { + temp_r29 = lbl_1_data_16A[temp_r31 * 3]; + if ((1 << temp_r30) & mgTicTacToeGrid[temp_r29 % 3][temp_r29 / 3]) { + temp_r29 = lbl_1_data_16A[(temp_r31 * 3) + 1]; + if ((1 << temp_r30) & mgTicTacToeGrid[temp_r29 % 3][temp_r29 / 3]) { + temp_r29 = lbl_1_data_16A[(temp_r31 * 3) + 2]; + if ((1 << temp_r30) & mgTicTacToeGrid[temp_r29 % 3][temp_r29 / 3]) { + temp_r29 = lbl_1_data_16A[temp_r31 * 3]; + if (sp22[temp_r29] == 0) { sp22[temp_r29]++; temp_r27++; } - temp_r29 = lbl_1_data_16A[(temp_r31*3)+1]; - if(sp22[temp_r29] == 0) { + temp_r29 = lbl_1_data_16A[(temp_r31 * 3) + 1]; + if (sp22[temp_r29] == 0) { sp22[temp_r29]++; temp_r27++; } - temp_r29 = lbl_1_data_16A[(temp_r31*3)+2]; - if(sp22[temp_r29] == 0) { + temp_r29 = lbl_1_data_16A[(temp_r31 * 3) + 2]; + if (sp22[temp_r29] == 0) { sp22[temp_r29]++; temp_r27++; } @@ -711,59 +727,62 @@ s32 fn_1_16B30(void) } } } - if(temp_r27 == 0) { + if (temp_r27 == 0) { sp1A[0] = sp1A[1] = 0; - for(temp_r31=0; temp_r31<3; temp_r31++) { - for(temp_r30=0; temp_r30<3; temp_r30++) { + for (temp_r31 = 0; temp_r31 < 3; temp_r31++) { + for (temp_r30 = 0; temp_r30 < 3; temp_r30++) { temp_r20 = mgTicTacToeGrid[temp_r31][temp_r30]; - if(temp_r20 & 0x1) { + if (temp_r20 & 0x1) { sp1A[0]++; } - if(temp_r20 & 0x2) { + if (temp_r20 & 0x2) { sp1A[1]++; } } } - if(sp1A[0]+sp1A[1] >= 9) { - for(temp_r31=0; temp_r31<2; temp_r31++) { - spE[temp_r31][0] = sp1A[temp_r31]+'0'; + if (sp1A[0] + sp1A[1] >= 9) { + for (temp_r31 = 0; temp_r31 < 2; temp_r31++) { + spE[temp_r31][0] = sp1A[temp_r31] + '0'; spE[temp_r31][1] = 0; HuWinInsertMesSet(lbl_1_data_168, MAKE_MESSID_PTR(&spE[temp_r31][0]), (s32)temp_r31); } - if(sp1A[0] > sp1A[1]) { + if (sp1A[0] > sp1A[1]) { temp_r28 = 0; - } else { + } + else { temp_r28 = 1; } HuPrcSleep(30); HuAudFXPlay(2175); - HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[(temp_r28*2)+0], 2); - HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[(temp_r28*2)+1], 3); + HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[(temp_r28 * 2) + 0], 2); + HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[(temp_r28 * 2) + 1], 3); fn_1_25838(lbl_1_data_168, 0x280025, -1, -1); fn_1_25584(lbl_1_data_168); lbl_1_data_168 = -1; return 1; - } else { + } + else { return 0; } - } else { + } + else { temp_r23 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 93), MEMORY_DEFAULT_NUM)); temp_r25 = HuSprGrpCreate(temp_r27); - for(temp_r30=temp_r31=0; temp_r30<9; temp_r30++) { - if(sp22[temp_r30] == 0) { + for (temp_r30 = temp_r31 = 0; temp_r30 < 9; temp_r30++) { + if (sp22[temp_r30] == 0) { continue; } temp_r24 = HuSprCreate(temp_r23, 100, 0); HuSprGrpMemberSet(temp_r25, temp_r31, temp_r24); - HuSprPosSet(temp_r25, temp_r31, (((temp_r30%3)*56)+288.0f)-56, ((temp_r30/3)*56)+184); + HuSprPosSet(temp_r25, temp_r31, (((temp_r30 % 3) * 56) + 288.0f) - 56, ((temp_r30 / 3) * 56) + 184); HuSprAttrSet(temp_r25, temp_r31, HUSPR_ATTR_LOOP); temp_r31++; } HuPrcSleep(14); HuSprGrpKill(temp_r25); HuAudFXPlay(2175); - HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[(temp_r28*2)+0], 0); - HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[(temp_r28*2)+1], 1); + HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[(temp_r28 * 2) + 0], 0); + HuWinInsertMesSet(lbl_1_data_168, lbl_1_bss_2C24[(temp_r28 * 2) + 1], 1); fn_1_25838(lbl_1_data_168, 0x280017, -1, -1); fn_1_25584(lbl_1_data_168); lbl_1_data_168 = -1; @@ -776,17 +795,17 @@ void fn_1_17A5C(void) HuSprGrp *gp = &HuSprGrpData[lbl_1_bss_3A8]; s16 j; s16 i; - for(j=0; j<=30; j++) { - float tplvl = 1.0-(j/30.0); - for(i=3; i<12; i++) { - if(gp->members[i] != -1) { - HuSprData[gp->members[i]].a = 255.0f*tplvl; + for (j = 0; j <= 30; j++) { + float tplvl = 1.0 - (j / 30.0); + for (i = 3; i < 12; i++) { + if (gp->members[i] != -1) { + HuSprData[gp->members[i]].a = 255.0f * tplvl; } } HuPrcVSleep(); } - for(i=0; i<3; i++) { - for(j=0; j<3; j++) { + for (i = 0; i < 3; i++) { + for (j = 0; j < 3; j++) { mgTicTacToeGrid[i][j] = 0; } } @@ -805,156 +824,165 @@ void fn_1_17BE0(void) s16 temp_r23; s16 temp_r22; s16 temp_r21; - + s16 sp2A[9]; s16 sp18[9]; s16 sp8[8]; - for(temp_r26=0; temp_r26<2; temp_r26++) { - for(temp_r31=0; temp_r31<8; temp_r31++) { + for (temp_r26 = 0; temp_r26 < 2; temp_r26++) { + for (temp_r31 = 0; temp_r31 < 8; temp_r31++) { temp_r28 = 0; temp_r25 = -1; - temp_r30 = lbl_1_data_16A[(temp_r31*3)+0]; - if((1 << temp_r26) & mgTicTacToeGrid[temp_r30%3][temp_r30/3]) { + temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 0]; + if ((1 << temp_r26) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { temp_r28++; - } else if((mgTicTacToeGrid[temp_r30%3][temp_r30/3] & 0x3) == 0) { + } + else if ((mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3] & 0x3) == 0) { temp_r25 = temp_r30; } - temp_r30 = lbl_1_data_16A[(temp_r31*3)+1]; - if((1 << temp_r26) & mgTicTacToeGrid[temp_r30%3][temp_r30/3]) { + temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 1]; + if ((1 << temp_r26) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { temp_r28++; - } else if((mgTicTacToeGrid[temp_r30%3][temp_r30/3] & 0x3) == 0) { + } + else if ((mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3] & 0x3) == 0) { temp_r25 = temp_r30; } - temp_r30 = lbl_1_data_16A[(temp_r31*3)+2]; - if((1 << temp_r26) & mgTicTacToeGrid[temp_r30%3][temp_r30/3]) { + temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 2]; + if ((1 << temp_r26) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { temp_r28++; - } else if((mgTicTacToeGrid[temp_r30%3][temp_r30/3] & 0x3) == 0) { + } + else if ((mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3] & 0x3) == 0) { temp_r25 = temp_r30; } - if(temp_r28 == 2 && temp_r25 != -1) { + if (temp_r28 == 2 && temp_r25 != -1) { OSReport("%d:LEACH\n", temp_r26); lbl_1_bss_3B0[temp_r26] = temp_r25; break; } } - if(temp_r31 != 8) { + if (temp_r31 != 8) { continue; } - if(frandmod(5) != 0) { - temp_r29 = temp_r26^1; - for(temp_r31=0; temp_r31<8; temp_r31++) { + if (frandmod(5) != 0) { + temp_r29 = temp_r26 ^ 1; + for (temp_r31 = 0; temp_r31 < 8; temp_r31++) { temp_r28 = 0; temp_r25 = -1; - temp_r30 = lbl_1_data_16A[(temp_r31*3)+0]; - if((1 << temp_r29) & mgTicTacToeGrid[temp_r30%3][temp_r30/3]) { + temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 0]; + if ((1 << temp_r29) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { temp_r28++; - } else if((mgTicTacToeGrid[temp_r30%3][temp_r30/3] & 0x3) == 0) { + } + else if ((mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3] & 0x3) == 0) { temp_r25 = temp_r30; } - temp_r30 = lbl_1_data_16A[(temp_r31*3)+1]; - if((1 << temp_r29) & mgTicTacToeGrid[temp_r30%3][temp_r30/3]) { + temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 1]; + if ((1 << temp_r29) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { temp_r28++; - } else if((mgTicTacToeGrid[temp_r30%3][temp_r30/3] & 0x3) == 0) { + } + else if ((mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3] & 0x3) == 0) { temp_r25 = temp_r30; } - temp_r30 = lbl_1_data_16A[(temp_r31*3)+2]; - if((1 << temp_r29) & mgTicTacToeGrid[temp_r30%3][temp_r30/3]) { + temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 2]; + if ((1 << temp_r29) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { temp_r28++; - } else if((mgTicTacToeGrid[temp_r30%3][temp_r30/3] & 0x3) == 0) { + } + else if ((mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3] & 0x3) == 0) { temp_r25 = temp_r30; } - if(temp_r28 == 2 && temp_r25 != -1) { + if (temp_r28 == 2 && temp_r25 != -1) { lbl_1_bss_3B0[temp_r26] = temp_r25; break; } } - if(temp_r31 != 8) { + if (temp_r31 != 8) { continue; } } - for(temp_r31=temp_r24=temp_r21=0; temp_r31<9; temp_r31++) { - if((1 << temp_r26) & mgTicTacToeGrid[temp_r31%3][temp_r31/3]) { + for (temp_r31 = temp_r24 = temp_r21 = 0; temp_r31 < 9; temp_r31++) { + if ((1 << temp_r26) & mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3]) { sp2A[temp_r24] = temp_r31; temp_r24++; - } else if((mgTicTacToeGrid[temp_r31%3][temp_r31/3] & 0x3) == 0) { + } + else if ((mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3] & 0x3) == 0) { sp18[temp_r21++] = temp_r31; } } - if(temp_r24 == 0) { + if (temp_r24 == 0) { OSReport("%d:KOMA None\n", temp_r26); - for(temp_r31=0; temp_r31<50; temp_r31++) { + for (temp_r31 = 0; temp_r31 < 50; temp_r31++) { temp_r30 = lbl_1_data_1AC[frandmod(8)]; - if((mgTicTacToeGrid[temp_r30%3][temp_r30/3] & 0x3) == 0) { + if ((mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3] & 0x3) == 0) { lbl_1_bss_3B0[temp_r26] = temp_r30; break; } } - if(temp_r31 == 50) { + if (temp_r31 == 50) { lbl_1_bss_3B0[temp_r26] = sp18[frandmod(temp_r21)]; } - } else { - for(temp_r22=0; temp_r22<50; temp_r22++) { + } + else { + for (temp_r22 = 0; temp_r22 < 50; temp_r22++) { temp_r29 = sp2A[frandmod(temp_r24)]; temp_r27 = 0; - if((temp_r29%3) != 0 && (mgTicTacToeGrid[(temp_r29-1)%3][temp_r29/3] & 0x3) == 0) { - sp8[temp_r27++] = temp_r29-1; + if ((temp_r29 % 3) != 0 && (mgTicTacToeGrid[(temp_r29 - 1) % 3][temp_r29 / 3] & 0x3) == 0) { + sp8[temp_r27++] = temp_r29 - 1; } - if((temp_r29%3)!= 2 && (mgTicTacToeGrid[(temp_r29+1)%3][temp_r29/3] & 0x3) == 0) { - sp8[temp_r27++] = temp_r29+1; + if ((temp_r29 % 3) != 2 && (mgTicTacToeGrid[(temp_r29 + 1) % 3][temp_r29 / 3] & 0x3) == 0) { + sp8[temp_r27++] = temp_r29 + 1; } - if((temp_r29/3) != 0 && (mgTicTacToeGrid[temp_r29%3][(temp_r29-3)/3] & 0x3) == 0) { - sp8[temp_r27++] = temp_r29-3; + if ((temp_r29 / 3) != 0 && (mgTicTacToeGrid[temp_r29 % 3][(temp_r29 - 3) / 3] & 0x3) == 0) { + sp8[temp_r27++] = temp_r29 - 3; } - if((temp_r29/3) != 2 && (mgTicTacToeGrid[temp_r29%3][(temp_r29+3)/3] & 0x3) == 0) { - sp8[temp_r27++] = temp_r29+3; + if ((temp_r29 / 3) != 2 && (mgTicTacToeGrid[temp_r29 % 3][(temp_r29 + 3) / 3] & 0x3) == 0) { + sp8[temp_r27++] = temp_r29 + 3; } - if((temp_r29%3) != 0 && (temp_r29/3) != 0 && (mgTicTacToeGrid[(temp_r29-4)%3][(temp_r29-4)/3] & 0x3) == 0) { - sp8[temp_r27++] = temp_r29-4; + if ((temp_r29 % 3) != 0 && (temp_r29 / 3) != 0 && (mgTicTacToeGrid[(temp_r29 - 4) % 3][(temp_r29 - 4) / 3] & 0x3) == 0) { + sp8[temp_r27++] = temp_r29 - 4; } - if((temp_r29%3) != 2 && (temp_r29/3) != 0 && (mgTicTacToeGrid[(temp_r29-2)%3][(temp_r29-2)/3] & 0x3) == 0) { - sp8[temp_r27++] = temp_r29-2; + if ((temp_r29 % 3) != 2 && (temp_r29 / 3) != 0 && (mgTicTacToeGrid[(temp_r29 - 2) % 3][(temp_r29 - 2) / 3] & 0x3) == 0) { + sp8[temp_r27++] = temp_r29 - 2; } - if((temp_r29%3) != 0 && (temp_r29/3) != 2 && (mgTicTacToeGrid[(temp_r29+2)%3][(temp_r29+2)/3] & 0x3) == 0) { - sp8[temp_r27++] = temp_r29+2; + if ((temp_r29 % 3) != 0 && (temp_r29 / 3) != 2 && (mgTicTacToeGrid[(temp_r29 + 2) % 3][(temp_r29 + 2) / 3] & 0x3) == 0) { + sp8[temp_r27++] = temp_r29 + 2; } - if((temp_r29%3) != 2 && (temp_r29/3) != 2 && (mgTicTacToeGrid[(temp_r29+4)%3][(temp_r29+4)/3] & 0x3) == 0) { - sp8[temp_r27++] = temp_r29+4; + if ((temp_r29 % 3) != 2 && (temp_r29 / 3) != 2 && (mgTicTacToeGrid[(temp_r29 + 4) % 3][(temp_r29 + 4) / 3] & 0x3) == 0) { + sp8[temp_r27++] = temp_r29 + 4; } - if(temp_r27 != 0) { + if (temp_r27 != 0) { temp_r23 = sp8[frandmod(temp_r27)]; - for(temp_r31=0; temp_r31<8; temp_r31++) { + for (temp_r31 = 0; temp_r31 < 8; temp_r31++) { temp_r28 = 0; - if(temp_r29 == lbl_1_data_16A[(temp_r31*3)+0] || temp_r29 == lbl_1_data_16A[(temp_r31*3)+1] || temp_r29 == lbl_1_data_16A[(temp_r31*3)+2]) { + if (temp_r29 == lbl_1_data_16A[(temp_r31 * 3) + 0] || temp_r29 == lbl_1_data_16A[(temp_r31 * 3) + 1] + || temp_r29 == lbl_1_data_16A[(temp_r31 * 3) + 2]) { temp_r28++; } - if(temp_r23 == lbl_1_data_16A[(temp_r31*3)+0] || temp_r23 == lbl_1_data_16A[(temp_r31*3)+1] || temp_r23 == lbl_1_data_16A[(temp_r31*3)+2]) { + if (temp_r23 == lbl_1_data_16A[(temp_r31 * 3) + 0] || temp_r23 == lbl_1_data_16A[(temp_r31 * 3) + 1] + || temp_r23 == lbl_1_data_16A[(temp_r31 * 3) + 2]) { temp_r28++; } - if(temp_r28 == 2) { - for(temp_r28=0; temp_r28<3; temp_r28++) { - if(temp_r29 != lbl_1_data_16A[(temp_r31*3)+temp_r28] && temp_r23 != lbl_1_data_16A[(temp_r31*3)+temp_r28]) { + if (temp_r28 == 2) { + for (temp_r28 = 0; temp_r28 < 3; temp_r28++) { + if (temp_r29 != lbl_1_data_16A[(temp_r31 * 3) + temp_r28] && temp_r23 != lbl_1_data_16A[(temp_r31 * 3) + temp_r28]) { break; } } - temp_r30 = lbl_1_data_16A[(temp_r31*3)+temp_r28]; - if(mgTicTacToeGrid[temp_r30%3][temp_r30/3] & 0x3) { + temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + temp_r28]; + if (mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3] & 0x3) { temp_r30 = -1; } break; } } - if(temp_r31 == 8 || temp_r30 < 0) { + if (temp_r31 == 8 || temp_r30 < 0) { continue; } lbl_1_bss_3B0[temp_r26] = temp_r23; break; } } - if(temp_r22 == 50) { + if (temp_r22 == 50) { lbl_1_bss_3B0[temp_r26] = sp18[frandmod(temp_r21)]; } } - } OSReport("com %d,%d\n", lbl_1_bss_3B0[0], lbl_1_bss_3B0[1]); } diff --git a/src/game/armem.c b/src/game/armem.c index ec2be64c..66142f66 100644 --- a/src/game/armem.c +++ b/src/game/armem.c @@ -25,7 +25,7 @@ static ARQRequest arqReq; static ARMemBlock ARInfo[64]; static s32 ARBase; -static s32 arqCnt; +static volatile s32 arqCnt; static s16 arqIdx; void HuARInit(void) { diff --git a/src/game/code_8003FF68.c b/src/game/code_8003FF68.c index bff84c12..96dc703c 100644 --- a/src/game/code_8003FF68.c +++ b/src/game/code_8003FF68.c @@ -1,3 +1,4 @@ +#include "game/audio.h" #include "game/data.h" #include "game/hsfman.h" #include "game/process.h"