kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing imports and mark uninitialized variables

Browse source
This commit is contained in:
dbalatoni13 2025-03-03 23:26:43 +01:00
parent 75d49a9e05
commit 58e0a85761
22 changed files with 701 additions and 658 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/GMPE01_00/rels/mgmodedll/symbols.txt
View file

@ -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_E0 = .data:0x000000E0; // type:object size:0x20 data:float
lbl_1_data_100 = .data:0x00000100; // type:object size:0x10 lbl_1_data_100 = .data:0x00000100; // type:object size:0x10
lbl_1_data_110 = .data:0x00000110; // type:object size:0xC 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_148 = .data:0x00000148; // type:object size:0x2 data:2byte
lbl_1_data_14A = .data:0x0000014A; // type:object size:0x8 lbl_1_data_14A = .data:0x0000014A; // type:object size:0x8
lbl_1_data_152 = .data:0x00000152; // type:object size:0x10 data:4byte 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_9E0 = .data:0x000009E0; // type:object size:0x20
lbl_1_data_A00 = .data:0x00000A00; // type:object size:0x2 data:2byte 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_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_8 = .bss:0x00000008; // type:object size:0x264 data:4byte
lbl_1_bss_26C = .bss:0x0000026C; // type:object size:0x8 data:float lbl_1_bss_26C = .bss:0x0000026C; // type:object size:0x8 data:float
lbl_1_bss_274 = .bss:0x00000274; // type:object size:0x18 data:4byte 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_348 = .bss:0x00000348; // type:object size:0x2 data:2byte
lbl_1_bss_34A = .bss:0x0000034A; // type:object size:0x8 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_352 = .bss:0x00000352; // type:object size:0x1C
lbl_1_bss_370 = .bss:0x00000370; // 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 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_388 = .bss:0x00000388; // type:object size:0x2 data:2byte
lbl_1_bss_38A = .bss:0x0000038A; // 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 lbl_1_bss_38C = .bss:0x0000038C; // type:object size:0x8

90
config/GMPE01_00/rels/modeseldll/symbols.txt
View file

@ -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_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_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_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_B8 = .rodata:0x000000B8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 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 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 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 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 data:float lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 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 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 data:double lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 data:float lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 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 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 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 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 data:double lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x8 scope:local data:double
lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 data:float lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 scope:local data:float
lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x8 data:double lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x8 scope:local data:double
lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x8 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 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 data:float lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 scope:local data:float
lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x8 data:double lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x8 scope:local data:double
lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 data:float lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 scope:local data:float
lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 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 data:double lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 scope:local data:double
lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 scope:local data:float
lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 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 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 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 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 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 data:double lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x8 scope:local data:double
lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x8 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 data:float lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 scope:local data:float
lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 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 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 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 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 data:double lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 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 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 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_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_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 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_8C = .data:0x0000008C; // type:object size:0x18
lbl_1_data_A4 = .data:0x000000A4; // 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_BC = .data:0x000000BC; // type:object size:0x18
lbl_1_data_D4 = .data:0x000000D4; // type:object size:0x14 data:string lbl_1_data_D4 = .data:0x000000D4; // type:object size:0x14 scope:local data:string
lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x9 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 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_100 = .data:0x00000100; // type:object size:0x2 data:2byte
lbl_1_data_104 = .data:0x00000104; // type:object size:0x118 data:float lbl_1_data_104 = .data:0x00000104; // type:object size:0x118 data:float
lbl_1_data_21C = .data:0x0000021C; // type:object size:0x48 data:4byte lbl_1_data_21C = .data:0x0000021C; // type:object size:0x48 data:4byte

2
config/GMPE01_00/symbols.txt
View file

@ -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_8013FD8C = .data:0x8013FD8C; // type:object size:0x24 scope:local
jumptable_8013FDB0 = .data:0x8013FDB0; // type:object size:0x24 scope:local jumptable_8013FDB0 = .data:0x8013FDB0; // type:object size:0x24 scope:local
sndSintab = .data:0x8013FDD8; // type:object size:0x800 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:0x80141FC0; // type:object size:0x10 scope:local
lens$301 = .data:0x80141FD0; // type:object size:0x20 scope:local lens$301 = .data:0x80141FD0; // type:object size:0x20 scope:local
rsmpTab12khz = .data:0x80141FF0; // type:object size:0x800 scope:local rsmpTab12khz = .data:0x80141FF0; // type:object size:0x800 scope:local

8
config/GMPP01_00/rels/mgmodedll/symbols.txt
View file

@ -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_E6 = .data:0x000000E6; // type:object size:0xA
lbl_1_data_F0 = .data:0x000000F0; // type:object size:0x20 lbl_1_data_F0 = .data:0x000000F0; // type:object size:0x20
lbl_1_data_110 = .data:0x00000110; // type:object size:0x10 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_130 = .data:0x00000130; // type:object size:0x28
lbl_1_data_158 = .data:0x00000158; // type:object size:0x2 data:2byte lbl_1_data_158 = .data:0x00000158; // type:object size:0x2 data:2byte
lbl_1_data_15A = .data:0x0000015A; // type:object size:0x8 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_9F0 = .data:0x000009F0; // type:object size:0x20
lbl_1_data_A10 = .data:0x00000A10; // type:object size:0x2 data:2byte 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_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_8 = .bss:0x00000008; // type:object size:0x264 data:4byte
lbl_1_bss_26C = .bss:0x0000026C; // type:object size:0x8 data:float lbl_1_bss_26C = .bss:0x0000026C; // type:object size:0x8 data:float
lbl_1_bss_274 = .bss:0x00000274; // type:object size:0x18 data:4byte 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_348 = .bss:0x00000348; // type:object size:0x2 data:2byte
lbl_1_bss_34A = .bss:0x0000034A; // type:object size:0x8 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_352 = .bss:0x00000352; // type:object size:0x1E
lbl_1_bss_370 = .bss:0x00000370; // 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 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_388 = .bss:0x00000388; // type:object size:0x2 data:2byte
lbl_1_bss_38A = .bss:0x0000038A; // 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 lbl_1_bss_38C = .bss:0x0000038C; // type:object size:0x8

6
include/REL/mgmodedll.h
View file

@ -7,9 +7,9 @@
#include "game/object.h" #include "game/object.h"
#include "game/objsub.h" #include "game/objsub.h"
#include "game/pad.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/window.h" #include "game/window.h"
#include "game/pad.h"
typedef struct datalist_model { typedef struct datalist_model {
s32 datanum; s32 datanum;
@ -72,7 +72,7 @@ extern s16 lbl_1_bss_20C0[10][70];
extern s16 lbl_1_bss_20AC[10]; extern s16 lbl_1_bss_20AC[10];
extern s16 lbl_1_bss_20AA; extern s16 lbl_1_bss_20AA;
extern Process *lbl_1_bss_2D8; extern Process *objman;
extern s16 lbl_1_bss_2E4; extern s16 lbl_1_bss_2E4;
@ -80,7 +80,7 @@ extern s16 lbl_1_bss_2A6;
extern s16 lbl_1_bss_2A4; extern s16 lbl_1_bss_2A4;
extern StructBss8 lbl_1_bss_8; extern StructBss8 lbl_1_bss_8;
extern s16 lbl_1_bss_4; extern s16 mgModeEvtNo;
extern s16 lbl_1_data_A2[]; extern s16 lbl_1_data_A2[];
extern DataListModel lbl_1_data_490[]; extern DataListModel lbl_1_data_490[];

1
src/REL/bootDll/main.c
View file

@ -4,6 +4,7 @@
#include "game/data.h" #include "game/data.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "game/hsfman.h" #include "game/hsfman.h"
#include "game/minigame_seq.h"
#include "game/memory.h" #include "game/memory.h"
#include "game/msm.h" #include "game/msm.h"
#include "game/object.h" #include "game/object.h"

7
src/REL/m413Dll/main.c
View file

@ -14,6 +14,13 @@
#include "ext_math.h" #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_bss_2A6C StructBss2A6C;
typedef struct struct_sp_14C8 StructSp14C8; typedef struct struct_sp_14C8 StructSp14C8;

2
src/REL/m419Dll/main.c
View file

@ -1593,7 +1593,7 @@ void fn_1_78B4(StructBss200 *arg0)
float sp118; float sp118;
float sp114; float sp114;
float sp110; float sp110;
float var_f27; float var_f27; // ! - uninitialized
float var_f29; float var_f29;
float var_f28; float var_f28;
float var_f30; float var_f30;

2
src/REL/m423Dll/main.c
View file

@ -2800,7 +2800,7 @@ void fn_1_8CB4(omObjData *arg0)
float temp_f28; float temp_f28;
float var_f30; float var_f30;
float var_f31; float var_f31;
float var_f26; float var_f26; // ! - uninitialized
float temp_f27; float temp_f27;
StructBssBCData *temp_r31; StructBssBCData *temp_r31;
ModelData *sp8; ModelData *sp8;

2
src/REL/m424Dll/claw.c
View file

@ -1162,7 +1162,7 @@ void fn_1_C604(s32 arg0, s32 arg1)
Vec *var_r31; Vec *var_r31;
f32 temp_f31; f32 temp_f31;
f32 var_f30; f32 var_f30;
s32 var_r30; s32 var_r30; // ! - uninitialized
M424DllBallStruct2 *var_r28; M424DllBallStruct2 *var_r28;
Vec *var_r27; Vec *var_r27;

2
src/REL/m424Dll/main.c
View file

@ -132,7 +132,7 @@ void fn_1_41C(omObjData* object) {
s16 sp12; s16 sp12;
s16 spE; s16 spE;
s16 spA; s16 spA;
f32 var_f31; f32 var_f31; // ! - uninitalized
s32 var_r31; s32 var_r31;
s32 var_r30; s32 var_r30;
CameraData* var_r29; CameraData* var_r29;

2
src/REL/m425Dll/main.c
View file

@ -800,7 +800,7 @@ void fn_1_2A94(s16 arg0, Vec *arg1, Vec *arg2, float arg8)
void fn_1_2B2C(omObjData *object) void fn_1_2B2C(omObjData *object)
{ {
s32 sp8; s32 sp8; // ! - uninitialized
M425DllWork *var_r31; M425DllWork *var_r31;
s32 var_r29; s32 var_r29;
s32 var_r28; s32 var_r28;

2
src/REL/m450Dll/main.c
View file

@ -3874,7 +3874,7 @@ void fn_1_11D5C(omObjData *object)
UnkM450Struct3 *var_r31; UnkM450Struct3 *var_r31;
s32 var_r29; s32 var_r29;
s32 var_r27; s32 var_r27; // ! - uninitialized
s32 *var_r26; s32 *var_r26;
(void)var_r27; (void)var_r27;

2
src/REL/m462Dll/main.c
View file

@ -1280,7 +1280,7 @@ s32 fn_1_65D0(StructBss340 *arg0)
{ {
float var_f31; float var_f31;
float var_f30; float var_f30;
s32 sp8; s32 sp8; // ! - uninitialized
var_f31 = fn_1_1534(arg0->unk4C.z, arg0->unk84); var_f31 = fn_1_1534(arg0->unk4C.z, arg0->unk84);
var_f30 = fn_1_1534(arg0->unk4C.x, arg0->unk84); var_f30 = fn_1_1534(arg0->unk4C.x, arg0->unk84);

6
src/REL/mgmodedll/battle.c
View file

@ -44,7 +44,7 @@ s32 fn_1_E72C(void)
temp_r29 = 0; temp_r29 = 0;
fn_1_279FC(0); fn_1_279FC(0);
fn_1_FF5C(); fn_1_FF5C();
if (lbl_1_bss_4 == 3) { if (mgModeEvtNo == 3) {
mgTypeCurr = mgInfoTbl[GWSystem.mg_next].type; mgTypeCurr = mgInfoTbl[GWSystem.mg_next].type;
if (mgTypeCurr >= 4) { if (mgTypeCurr >= 4) {
mgTypeCurr = 3; mgTypeCurr = 3;
@ -105,7 +105,7 @@ s32 fn_1_E72C(void)
} }
repeat_mode: repeat_mode:
if (lbl_1_bss_20AA == 0) { 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_20AA = 1;
} }
lbl_1_bss_3A4 = fn_1_25CA8(0x1A0020); lbl_1_bss_3A4 = fn_1_25CA8(0x1A0020);
@ -843,7 +843,7 @@ void fn_1_12B64(s16 arg0)
{ {
Process *process; Process *process;
s32 *data; 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); data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(s32), MEMORY_DEFAULT_NUM);
process->user_data = data; process->user_data = data;
*data = arg0; *data = arg0;

8
src/REL/mgmodedll/datalist.c
View file

@ -1,5 +1,9 @@
#include "REL/mgmodedll.h" #include "REL/mgmodedll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif
DataListModel lbl_1_data_490[] = { 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, 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, 0x01), 0x40000001, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
@ -75,10 +79,10 @@ void fn_1_267E8(DataListModel *model_list)
if (model_ptr->unk_08 != -1) { if (model_ptr->unk_08 != -1) {
lbl_1_bss_2C66[i] = model_ptr->unk_08; lbl_1_bss_2C66[i] = model_ptr->unk_08;
} }
} else if(list->type == 1) { }
else if (list->type == 1) {
data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA); data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA);
lbl_1_bss_2C66[i] = Hu3DJointMotion(lbl_1_bss_2C80[list->mot_link], data); lbl_1_bss_2C66[i] = Hu3DJointMotion(lbl_1_bss_2C80[list->mot_link], data);
} }
(void)i; (void)i;
} }

4
src/REL/mgmodedll/free_play.c
View file

@ -88,7 +88,7 @@ s32 fn_1_6D28(void)
else { else {
temp_r28 = lbl_1_bss_2C2C[2]; 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); mgTypeCurr = fn_1_B5A8(&spA, &sp8);
espAttrReset(lbl_1_bss_2C2C[3], HUSPR_ATTR_DISPOFF); espAttrReset(lbl_1_bss_2C2C[3], HUSPR_ATTR_DISPOFF);
espTPLvlSet(lbl_1_bss_2C2C[3], 1.0f); espTPLvlSet(lbl_1_bss_2C2C[3], 1.0f);
@ -99,7 +99,7 @@ s32 fn_1_6D28(void)
if (lbl_1_bss_2A6 == 0) { if (lbl_1_bss_2A6 == 0) {
espAttrReset(lbl_1_bss_2C2C[4], HUSPR_ATTR_DISPOFF); espAttrReset(lbl_1_bss_2C2C[4], HUSPR_ATTR_DISPOFF);
espPosSet(lbl_1_bss_2C2C[4], 450, 404); 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]); fn_1_BFA0(lbl_1_bss_264C[lbl_1_bss_318[mgTypeCurr][0]][spA + sp8]);
espAttrReset(lbl_1_bss_2C2C[14], HUSPR_ATTR_DISPOFF); espAttrReset(lbl_1_bss_2C2C[14], HUSPR_ATTR_DISPOFF);
espPosSet(lbl_1_bss_2C2C[14], 450, 348); espPosSet(lbl_1_bss_2C2C[14], 450, 348);

66
src/REL/mgmodedll/mgmode.c
View file

@ -7,6 +7,10 @@
#include "ext_math.h" #include "ext_math.h"
#ifndef __MWERKS__
#include "game/hsfex.h"
#endif
typedef struct camera_view_params { typedef struct camera_view_params {
Vec rot; Vec rot;
Vec pos; Vec pos;
@ -15,8 +19,8 @@ typedef struct camera_view_params {
CameraViewParams lbl_1_data_0[1] = { { { -5, 0, 0 }, { 0, 125, 0 }, 1750 } }; CameraViewParams lbl_1_data_0[1] = { { { -5, 0, 0 }, { 0, 125, 0 }, 1750 } };
omObjData *lbl_1_bss_2DC; omObjData *outViewObj;
Process *lbl_1_bss_2D8; Process *objman;
s32 lbl_1_bss_2D4; s32 lbl_1_bss_2D4;
s32 lbl_1_bss_2D0; s32 lbl_1_bss_2D0;
s16 lbl_1_bss_2CE; s16 lbl_1_bss_2CE;
@ -31,7 +35,7 @@ Vec lbl_1_bss_28C[2];
Vec lbl_1_bss_274[2]; Vec lbl_1_bss_274[2];
float lbl_1_bss_26C[2]; float lbl_1_bss_26C[2];
StructBss8 lbl_1_bss_8; StructBss8 lbl_1_bss_8;
s16 lbl_1_bss_4; s16 mgModeEvtNo;
s32 lbl_1_bss_0; s32 lbl_1_bss_0;
void fn_1_464(void); void fn_1_464(void);
@ -42,7 +46,7 @@ void ObjectSetup(void)
s32 glight; s32 glight;
OSReport("******* MG ObjectSetup *********\n"); 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].x = -70;
lbl_1_bss_28C[0].y = 0; lbl_1_bss_28C[0].y = 0;
lbl_1_bss_28C[0].z = 0; lbl_1_bss_28C[0].z = 0;
@ -58,8 +62,8 @@ void ObjectSetup(void)
_ClearFlag(0x10008); _ClearFlag(0x10008);
GWSystem.mg_type = -1; GWSystem.mg_type = -1;
GWSystem.player_curr = 0; GWSystem.player_curr = 0;
lbl_1_bss_4 = omovlevtno; mgModeEvtNo = omovlevtno;
if (lbl_1_bss_4 == 0) { if (mgModeEvtNo == 0) {
mgGameStatBackup = GWGameStat; mgGameStatBackup = GWGameStat;
} }
lbl_1_bss_2CE = -1; lbl_1_bss_2CE = -1;
@ -70,9 +74,9 @@ void ObjectSetup(void)
Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1); Hu3DCameraViewportSet(1, 0, 0, 640, 480, 0, 1);
glight = Hu3DGLightCreate(0, 100, 1000, 0, -0.5, -1, 255, 255, 255); glight = Hu3DGLightCreate(0, 100, 1000, 0, -0.5, -1, 255, 255, 255);
Hu3DGLightInfinitytSet(glight); Hu3DGLightInfinitytSet(glight);
HuPrcChildCreate(fn_1_464, 100, 12288, 0, lbl_1_bss_2D8); HuPrcChildCreate(fn_1_464, 100, 12288, 0, objman);
HuPrcChildCreate(fn_1_54F4, 200, 4096, 0, lbl_1_bss_2D8); HuPrcChildCreate(fn_1_54F4, 200, 4096, 0, objman);
lbl_1_bss_2DC = omAddObjEx(lbl_1_bss_2D8, 32730, 0, 0, -1, omOutView); outViewObj = omAddObjEx(objman, 32730, 0, 0, -1, omOutView);
Hu3DBGColorSet(0, 0, 0); Hu3DBGColorSet(0, 0, 0);
HuWinInit(1); HuWinInit(1);
fn_1_279FC(0); fn_1_279FC(0);
@ -86,7 +90,7 @@ void fn_1_464(void)
{ {
s16 i; s16 i;
fn_1_52DC(); fn_1_52DC();
if (lbl_1_bss_4 == 0) { if (mgModeEvtNo == 0) {
HuAudSStreamPlay(12); HuAudSStreamPlay(12);
fn_1_19018(); fn_1_19018();
} }
@ -103,7 +107,7 @@ void fn_1_464(void)
Center.y = 215; Center.y = 215;
CRot.x = 0; CRot.x = 0;
CRot.y = CRot.z = 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); Hu3DModelPosSet(lbl_1_bss_2C80[5], 0, 0, 640);
Hu3DMotionSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6]); Hu3DMotionSet(lbl_1_bss_2C80[5], lbl_1_bss_2C66[6]);
Hu3DModelAttrSet(lbl_1_bss_2C80[5], HU3D_MOTATTR_LOOP); Hu3DModelAttrSet(lbl_1_bss_2C80[5], HU3D_MOTATTR_LOOP);
@ -136,7 +140,7 @@ void fn_1_6F8(void)
{ {
s16 i; s16 i;
s16 time; 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; lbl_1_bss_2A6 = 0;
goto freeplay; goto freeplay;
} }
@ -218,7 +222,7 @@ void fn_1_6F8(void)
HuPrcVSleep(); HuPrcVSleep();
} }
fn_1_25E74(lbl_1_bss_2CC); fn_1_25E74(lbl_1_bss_2CC);
lbl_1_bss_4 = 0; mgModeEvtNo = 0;
espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF); espAttrSet(lbl_1_bss_2C2C[0], HUSPR_ATTR_DISPOFF);
if (lbl_1_bss_2A6 == 0) { if (lbl_1_bss_2A6 == 0) {
freeplay: freeplay:
@ -253,19 +257,19 @@ void fn_1_DF0(void)
Vec posModel; Vec posModel;
float weight; float weight;
if (lbl_1_bss_4 == 1) { if (mgModeEvtNo == 1) {
lbl_1_bss_2A4 = 0; lbl_1_bss_2A4 = 0;
goto freeplay; goto freeplay;
} }
if (lbl_1_bss_4 == 2) { if (mgModeEvtNo == 2) {
lbl_1_bss_2A4 = 1; lbl_1_bss_2A4 = 1;
goto teamplay; goto teamplay;
} }
if (lbl_1_bss_4 == 3) { if (mgModeEvtNo == 3) {
lbl_1_bss_2A4 = 2; lbl_1_bss_2A4 = 2;
goto battle; goto battle;
} }
if (lbl_1_bss_4 == 4) { if (mgModeEvtNo == 4) {
lbl_1_bss_2A4 = 3; lbl_1_bss_2A4 = 3;
goto tictactoe; goto tictactoe;
} }
@ -386,7 +390,7 @@ void fn_1_DF0(void)
} }
HuWinPushKeySet(lbl_1_bss_2CE, PAD_BUTTON_A | PAD_BUTTON_B); 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 = lbl_1_data_40[0];
pos2D.z = 800; pos2D.z = 800;
Hu3D2Dto3D(&pos2D, 1, &pos3D); Hu3D2Dto3D(&pos2D, 1, &pos3D);
@ -429,7 +433,7 @@ s32 fn_1_1B0C(void)
ModelData *modelP; ModelData *modelP;
s16 temp_r29 = 0; s16 temp_r29 = 0;
if (lbl_1_bss_4 == 1) { if (mgModeEvtNo == 1) {
pos2D.x = 60; pos2D.x = 60;
pos2D.y = 70; pos2D.y = 70;
pos2D.z = 1000; pos2D.z = 1000;
@ -480,12 +484,12 @@ s32 fn_1_1B0C(void)
} }
mgPracticeEnableF = 1; mgPracticeEnableF = 1;
if (fn_1_6D28()) { if (fn_1_6D28()) {
lbl_1_bss_4 = 0; mgModeEvtNo = 0;
goto charsel; goto charsel;
} }
exit: exit:
mgPracticeEnableF = 0; mgPracticeEnableF = 0;
lbl_1_bss_4 = 0; mgModeEvtNo = 0;
pos2D.x = 168; pos2D.x = 168;
pos2D.y = 190; pos2D.y = 190;
pos2D.z = 800; pos2D.z = 800;
@ -518,7 +522,7 @@ s32 fn_1_21C4(void)
s16 i; s16 i;
ModelData *modelP; ModelData *modelP;
s16 temp_r29 = 1; s16 temp_r29 = 1;
if (lbl_1_bss_4 == 2) { if (mgModeEvtNo == 2) {
pos2D.x = 60; pos2D.x = 60;
pos2D.y = 70; pos2D.y = 70;
pos2D.z = 1000; pos2D.z = 1000;
@ -570,12 +574,12 @@ s32 fn_1_21C4(void)
} }
mgPracticeEnableF = 1; mgPracticeEnableF = 1;
if (fn_1_6D28()) { if (fn_1_6D28()) {
lbl_1_bss_4 = 0; mgModeEvtNo = 0;
goto charsel; goto charsel;
} }
exit: exit:
mgPracticeEnableF = 0; mgPracticeEnableF = 0;
lbl_1_bss_4 = 0; mgModeEvtNo = 0;
pos2D.x = 168; pos2D.x = 168;
pos2D.y = 190; pos2D.y = 190;
pos2D.z = 800; pos2D.z = 800;
@ -611,7 +615,7 @@ s32 fn_1_2940(void)
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
Hu3DModelLayerSet(lbl_1_bss_2C80[i + 9], 2); Hu3DModelLayerSet(lbl_1_bss_2C80[i + 9], 2);
} }
if (lbl_1_bss_4 == 3) { if (mgModeEvtNo == 3) {
OSReport("Eliminate Play STart\n"); OSReport("Eliminate Play STart\n");
pos2D.x = 50; pos2D.x = 50;
pos2D.y = 70; pos2D.y = 70;
@ -665,7 +669,7 @@ s32 fn_1_2940(void)
} }
if (fn_1_E72C() == 0) { if (fn_1_E72C() == 0) {
lbl_1_bss_4 = 0; mgModeEvtNo = 0;
goto charsel; goto charsel;
} }
exit: exit:
@ -673,7 +677,7 @@ exit:
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
Hu3DModelLayerSet(lbl_1_bss_2C80[i + 9], 3); Hu3DModelLayerSet(lbl_1_bss_2C80[i + 9], 3);
} }
lbl_1_bss_4 = 0; mgModeEvtNo = 0;
pos2D.x = 168; pos2D.x = 168;
pos2D.y = 190; pos2D.y = 190;
pos2D.z = 800; pos2D.z = 800;
@ -706,7 +710,7 @@ s32 fn_1_3150(void)
s16 i; s16 i;
ModelData *modelP; ModelData *modelP;
s16 temp_r29 = 1; s16 temp_r29 = 1;
if (lbl_1_bss_4 == 4) { if (mgModeEvtNo == 4) {
pos2D.x = 60; pos2D.x = 60;
pos2D.y = 70; pos2D.y = 70;
pos2D.z = 1000; pos2D.z = 1000;
@ -759,12 +763,12 @@ s32 fn_1_3150(void)
} }
if (fn_1_13418() == 0) { if (fn_1_13418() == 0) {
lbl_1_bss_4 = 0; mgModeEvtNo = 0;
goto charsel; goto charsel;
} }
exit: exit:
HuDataDirClose(DATADIR_INSTPIC); HuDataDirClose(DATADIR_INSTPIC);
lbl_1_bss_4 = 0; mgModeEvtNo = 0;
pos2D.x = 168; pos2D.x = 168;
pos2D.y = 190; pos2D.y = 190;
pos2D.z = 800; 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.unk10 = lbl_1_bss_2C66[6];
lbl_1_bss_8.unk14 = lbl_1_bss_2C66[7]; lbl_1_bss_8.unk14 = lbl_1_bss_2C66[7];
lbl_1_bss_8.unk18 = lbl_1_bss_2C66[6]; 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]); Hu3DModelShadowSet(lbl_1_bss_2C80[5]);
Hu3DModelShadowMapSet(lbl_1_bss_2C80[0]); Hu3DModelShadowMapSet(lbl_1_bss_2C80[0]);
} }

38
src/REL/mgmodedll/record.c
View file

@ -13,17 +13,10 @@ void fn_1_DE3C(void);
void fn_1_DFB8(void); void fn_1_DFB8(void);
void fn_1_E02C(float x, float y, s16 recordNo); void fn_1_E02C(float x, float y, s16 recordNo);
s16 lbl_1_bss_37C[6]; static s16 lbl_1_bss_37C[6];
s16 lbl_1_bss_370[6]; static s16 lbl_1_bss_370[6];
s16 lbl_1_data_120[6][3] = { s16 mgRecordIdxTbl[6][3] = { 0, 2, 13, 1, 0, 15, 2, 1, 35, 3, 2, 40, 5, 1, 51, 10, 1, 62 };
0, 2, 13,
1, 0, 15,
2, 1, 35,
3, 2, 40,
5, 1, 51,
10, 1, 62
};
void fn_1_D8D0(void) void fn_1_D8D0(void)
{ {
@ -111,19 +104,21 @@ void fn_1_DFB8(void)
void fn_1_E02C(float x, float y, s16 recordNo) void fn_1_E02C(float x, float y, s16 recordNo)
{ {
s32 sprGrpId = lbl_1_bss_370[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; s32 i;
s16 mgNo; s16 mgNo;
float xOfs; float xOfs;
if(lbl_1_data_120[recordNo][2] != -1) { if (mgRecordIdxTbl[recordNo][2] != -1) {
mgNo = omMgIndexGet(lbl_1_data_120[recordNo][2]); mgNo = omMgIndexGet(mgRecordIdxTbl[recordNo][2]);
if (!GWMGAvailGet(mgNo + 401)) { if (!GWMGAvailGet(mgNo + 401)) {
mgNo = -1; mgNo = -1;
} else { }
else {
HuWinMesSet(lbl_1_bss_37C[recordNo], mgInfoTbl[mgNo].name_mess); HuWinMesSet(lbl_1_bss_37C[recordNo], mgInfoTbl[mgNo].name_mess);
} }
} else { }
else {
mgNo = -1; mgNo = -1;
} }
HuWinDispOn(lbl_1_bss_37C[recordNo]); HuWinDispOn(lbl_1_bss_37C[recordNo]);
@ -136,10 +131,11 @@ void fn_1_E02C(float x, float y, s16 recordNo)
HuSprAttrReset(sprGrpId, i, HUSPR_ATTR_DISPOFF); HuSprAttrReset(sprGrpId, i, HUSPR_ATTR_DISPOFF);
} }
xOfs = 128; xOfs = 128;
} else { }
else {
s32 memberNum; s32 memberNum;
s32 digitValue; s32 digitValue;
if(lbl_1_data_120[recordNo][1] == 0) { if (mgRecordIdxTbl[recordNo][1] == 0) {
memberNum = 0; memberNum = 0;
if (value > 9999) { if (value > 9999) {
value = 9999; value = 9999;
@ -172,7 +168,8 @@ void fn_1_E02C(float x, float y, s16 recordNo)
HuSprAttrReset(sprGrpId, i, HUSPR_ATTR_DISPOFF); HuSprAttrReset(sprGrpId, i, HUSPR_ATTR_DISPOFF);
} }
xOfs = memberNum * 16; xOfs = memberNum * 16;
} else { }
else {
s16 yOfs[8]; s16 yOfs[8];
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
yOfs[i] = 0; yOfs[i] = 0;
@ -198,9 +195,10 @@ void fn_1_E02C(float x, float y, s16 recordNo)
HuSprBankSet(sprGrpId, memberNum, 12); HuSprBankSet(sprGrpId, memberNum, 12);
yOfs[memberNum] = -2; yOfs[memberNum] = -2;
memberNum++; memberNum++;
if(lbl_1_data_120[recordNo][1] == 2) { if (mgRecordIdxTbl[recordNo][1] == 2) {
value = (float)value * (203.0 / 120.0); value = (float)value * (203.0 / 120.0);
} else { }
else {
value = (float)value * (200.0 / 120.0); value = (float)value * (200.0 / 120.0);
} }
digitValue = value / 10; digitValue = value / 10;

206
src/REL/mgmodedll/tictactoe.c
View file

@ -2,12 +2,13 @@
#include "game/gamework.h" #include "game/gamework.h"
#include "game/audio.h" #include "game/audio.h"
#include "game/chrman.h"
#include "game/esprite.h" #include "game/esprite.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "game/minigame_seq.h"
#include "game/saveload.h" #include "game/saveload.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "game/chrman.h"
#include "game/minigame_seq.h"
#include "ext_math.h" #include "ext_math.h"
@ -19,34 +20,11 @@ s16 lbl_1_bss_3AA;
s16 lbl_1_bss_3A8; s16 lbl_1_bss_3A8;
s16 lbl_1_data_168 = -1; s16 lbl_1_data_168 = -1;
s16 lbl_1_data_16A[] = { s16 lbl_1_data_16A[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 3, 6, 1, 4, 7, 2, 5, 8, 0, 4, 8, 2, 4, 6 };
0, 1, 2,
3, 4, 5,
6, 7, 8,
0, 3, 6,
1, 4, 7,
2, 5, 8,
0, 4, 8,
2, 4, 6
};
float lbl_1_data_19C[4] = { float lbl_1_data_19C[4] = { -80, -38, 38, 80 };
-80,
-38,
38,
80
};
s16 lbl_1_data_1AC[8] = { s16 lbl_1_data_1AC[8] = { 4, 4, 4, 4, 0, 2, 6, 8 };
4,
4,
4,
4,
0,
2,
6,
8
};
void fn_1_2783C(s16 evtno); void fn_1_2783C(s16 evtno);
@ -74,7 +52,7 @@ s32 fn_1_13418(void)
float temp_f29; float temp_f29;
fn_1_279FC(0); fn_1_279FC(0);
if(lbl_1_bss_4 != 4) { if (mgModeEvtNo != 4) {
for (temp_r31 = 0; temp_r31 < 3; temp_r31++) { for (temp_r31 = 0; temp_r31 < 3; temp_r31++) {
for (temp_r30 = 0; temp_r30 < 3; temp_r30++) { for (temp_r30 = 0; temp_r30 < 3; temp_r30++) {
mgTicTacToeGrid[temp_r31][temp_r30] = 0; mgTicTacToeGrid[temp_r31][temp_r30] = 0;
@ -82,7 +60,7 @@ s32 fn_1_13418(void)
} }
} }
fn_1_14CFC(); fn_1_14CFC();
if(lbl_1_bss_4 == 4) { if (mgModeEvtNo == 4) {
HuSprGrpPosSet(lbl_1_bss_3A8, 288, 240); HuSprGrpPosSet(lbl_1_bss_3A8, 288, 240);
HuSprGrpPosSet(lbl_1_bss_3AA, 450, 65); HuSprGrpPosSet(lbl_1_bss_3AA, 450, 65);
Hu3DModelPosSet(lbl_1_bss_2C80[5], -300, 0, 680); Hu3DModelPosSet(lbl_1_bss_2C80[5], -300, 0, 680);
@ -100,12 +78,14 @@ s32 fn_1_13418(void)
temp_r29 = HuWinChoiceGet(lbl_1_data_168, 1); temp_r29 = HuWinChoiceGet(lbl_1_data_168, 1);
if (temp_r29 == 0) { if (temp_r29 == 0) {
fn_1_17A5C(); fn_1_17A5C();
} else { }
else {
fn_1_16438(); fn_1_16438();
return 0; return 0;
} }
} }
} else { }
else {
temp_r27 = &Hu3DData[lbl_1_bss_2C80[5]]; temp_r27 = &Hu3DData[lbl_1_bss_2C80[5]];
sp24 = temp_r27->pos; sp24 = temp_r27->pos;
sp18.x = -300; sp18.x = -300;
@ -117,14 +97,16 @@ s32 fn_1_13418(void)
if (temp_r31 <= 50) { if (temp_r31 <= 50) {
temp_f31 = 1.0 - sind((temp_r31 / 50.0) * 90.0); temp_f31 = 1.0 - sind((temp_r31 / 50.0) * 90.0);
HuSprGrpPosSet(lbl_1_bss_3A8, 288, 256 + (-400 * temp_f31)); HuSprGrpPosSet(lbl_1_bss_3A8, 288, 256 + (-400 * temp_f31));
} else { }
else {
temp_f31 = cosd(((temp_r31 - 50.0) / 10.0) * 90.0); temp_f31 = cosd(((temp_r31 - 50.0) / 10.0) * 90.0);
HuSprGrpPosSet(lbl_1_bss_3A8, 288, 240 + (16 * temp_f31)); HuSprGrpPosSet(lbl_1_bss_3A8, 288, 240 + (16 * temp_f31));
} }
if (temp_r31 > 20 && temp_r31 <= 50) { if (temp_r31 > 20 && temp_r31 <= 50) {
temp_f31 = 1.0 - sind(((temp_r31 - 20) / 30.0) * 90.0); temp_f31 = 1.0 - sind(((temp_r31 - 20) / 30.0) * 90.0);
HuSprGrpPosSet(lbl_1_bss_3AA, 434 + (400 * temp_f31), 65); HuSprGrpPosSet(lbl_1_bss_3AA, 434 + (400 * temp_f31), 65);
} else if(temp_r31 > 50) { }
else if (temp_r31 > 50) {
temp_f31 = cosd(((temp_r31 - 50.0) / 10.0) * 90.0); temp_f31 = cosd(((temp_r31 - 50.0) / 10.0) * 90.0);
HuSprGrpPosSet(lbl_1_bss_3AA, 450 + (-16 * temp_f31), 65); HuSprGrpPosSet(lbl_1_bss_3AA, 450 + (-16 * temp_f31), 65);
} }
@ -180,42 +162,58 @@ s32 fn_1_13418(void)
if (sp8[temp_r31] == -1) { if (sp8[temp_r31] == -1) {
sp8[temp_r31] = 0; sp8[temp_r31] = 0;
goto else_case; goto else_case;
} else if(sp8[temp_r31] == 1) { }
else if (sp8[temp_r31] == 1) {
HuSprAttrSet(lbl_1_bss_3A8, temp_r31 + 12, HUSPR_ATTR_DISPOFF); HuSprAttrSet(lbl_1_bss_3A8, temp_r31 + 12, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(lbl_1_bss_3A8, temp_r31 + 14, 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]) { 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); HuSprPosSet(
} else { 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);
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 {
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: else_case:
if (lbl_1_bss_3B4[0] != lbl_1_bss_3B4[1]) { 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); HuSprPosSet(
} else { 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);
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 {
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)))); 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); HuSprPriSet(lbl_1_bss_3A8, temp_r31 + 12, 150);
} }
} else { }
else {
sp8[temp_r31] = fn_1_15E98(temp_r31, 0); sp8[temp_r31] = fn_1_15E98(temp_r31, 0);
if (sp8[temp_r31] == -1) { if (sp8[temp_r31] == -1) {
sp8[temp_r31] = 0; sp8[temp_r31] = 0;
HuSprAttrReset(lbl_1_bss_3A8, temp_r31 + 12, HUSPR_ATTR_DISPOFF); HuSprAttrReset(lbl_1_bss_3A8, temp_r31 + 12, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(lbl_1_bss_3A8, temp_r31 + 14, 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]) { 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); HuSprPosSet(
} else { 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);
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 { 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); HuSprTPLvlSet(lbl_1_bss_3A8, temp_r31 + 12, 1.0f);
HuSprPriSet(lbl_1_bss_3A8, temp_r31 + 12, temp_r31 + 180); HuSprPriSet(lbl_1_bss_3A8, temp_r31 + 12, temp_r31 + 180);
if (lbl_1_bss_3B4[0] != lbl_1_bss_3B4[1]) { 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); HuSprPosSet(
} else { 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);
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);
} }
} }
} }
@ -224,7 +222,8 @@ s32 fn_1_13418(void)
HuSprTPLvlSet(lbl_1_bss_3A8, 12, 1.0f); HuSprTPLvlSet(lbl_1_bss_3A8, 12, 1.0f);
HuSprTPLvlSet(lbl_1_bss_3A8, 13, 1.0f); HuSprTPLvlSet(lbl_1_bss_3A8, 13, 1.0f);
break; break;
} else { }
else {
temp_f30 += 10.0f; temp_f30 += 10.0f;
if (temp_f30 > 360.0f) { if (temp_f30 > 360.0f) {
temp_f30 -= 360.0f; temp_f30 -= 360.0f;
@ -261,7 +260,8 @@ s32 fn_1_13418(void)
temp_r29 = HuWinChoiceGet(lbl_1_data_168, 0); temp_r29 = HuWinChoiceGet(lbl_1_data_168, 0);
if (temp_r29 == 0) { if (temp_r29 == 0) {
_ClearFlag(11); _ClearFlag(11);
} else if(temp_r29 == 1) { }
else if (temp_r29 == 1) {
HuWinInsertMesSet(lbl_1_data_168, MAKE_MESSID(0x28, 40), 0); HuWinInsertMesSet(lbl_1_data_168, MAKE_MESSID(0x28, 40), 0);
fn_1_25838(lbl_1_data_168, 0x280026, -1, -1); fn_1_25838(lbl_1_data_168, 0x280026, -1, -1);
temp_r29 = HuWinChoiceGet(lbl_1_data_168, 1); temp_r29 = HuWinChoiceGet(lbl_1_data_168, 1);
@ -276,7 +276,8 @@ s32 fn_1_13418(void)
fn_1_16438(); fn_1_16438();
return 1; return 1;
} else { }
else {
_SetFlag(11); _SetFlag(11);
} }
GWSystem.mg_next = lbl_1_bss_2E4; GWSystem.mg_next = lbl_1_bss_2E4;
@ -315,8 +316,8 @@ void fn_1_14CFC(void)
} }
} }
if (lbl_1_bss_3A8 == 0) { if (lbl_1_bss_3A8 == 0) {
temp_r30 = HuSprGrpCreate(25);
lbl_1_bss_3A8 = temp_r30 = HuSprGrpCreate(25); lbl_1_bss_3A8 = temp_r30;
temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 84), MEMORY_DEFAULT_NUM)); temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 84), MEMORY_DEFAULT_NUM));
temp_r29 = HuSprCreate(temp_r28, 200, 0); temp_r29 = HuSprCreate(temp_r28, 200, 0);
HuSprGrpMemberSet(temp_r30, 0, temp_r29); HuSprGrpMemberSet(temp_r30, 0, temp_r29);
@ -342,7 +343,8 @@ void fn_1_14CFC(void)
HuSprGrpMemberSet(temp_r30, 14, temp_r29); HuSprGrpMemberSet(temp_r30, 14, temp_r29);
if (temp_r24 & 0x8) { if (temp_r24 & 0x8) {
HuSprPosSet(temp_r30, 14, temp_r26 + ((temp_r31 % 3) * 56) - 60, temp_r25 + ((temp_r31 / 3) * 56) - 56); HuSprPosSet(temp_r30, 14, temp_r26 + ((temp_r31 % 3) * 56) - 60, temp_r25 + ((temp_r31 / 3) * 56) - 56);
} else { }
else {
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);
} }
temp_r27++; temp_r27++;
@ -353,7 +355,8 @@ void fn_1_14CFC(void)
HuSprGrpMemberSet(temp_r30, 15, temp_r29); HuSprGrpMemberSet(temp_r30, 15, temp_r29);
if (temp_r24 & 0x4) { if (temp_r24 & 0x4) {
HuSprPosSet(temp_r30, 15, temp_r26 + ((temp_r31 % 3) * 56) - 48, temp_r25 + ((temp_r31 / 3) * 56) - 56); HuSprPosSet(temp_r30, 15, temp_r26 + ((temp_r31 % 3) * 56) - 48, temp_r25 + ((temp_r31 / 3) * 56) - 56);
} else { }
else {
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);
} }
temp_r27++; temp_r27++;
@ -361,7 +364,8 @@ void fn_1_14CFC(void)
if (temp_r24 & 0x3) { if (temp_r24 & 0x3) {
if (mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3] & 0x1) { if (mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3] & 0x1) {
temp_r29 = HuSprCreate(temp_r28, 180, 0); temp_r29 = HuSprCreate(temp_r28, 180, 0);
} else { }
else {
temp_r29 = HuSprCreate(temp_r22, 180, 0); temp_r29 = HuSprCreate(temp_r22, 180, 0);
} }
HuSprGrpMemberSet(temp_r30, temp_r31 + 3, temp_r29); HuSprGrpMemberSet(temp_r30, temp_r31 + 3, temp_r29);
@ -408,8 +412,8 @@ void fn_1_14CFC(void)
HuSprTPLvlSet(temp_r30, 24, 0); HuSprTPLvlSet(temp_r30, 24, 0);
} }
if (lbl_1_bss_3AA == 0) { if (lbl_1_bss_3AA == 0) {
temp_r30 = HuSprGrpCreate(10);
lbl_1_bss_3AA = temp_r30 = HuSprGrpCreate(10); lbl_1_bss_3AA = temp_r30;
temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 15), MEMORY_DEFAULT_NUM)); temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 15), MEMORY_DEFAULT_NUM));
temp_r29 = HuSprCreate(temp_r28, 200, 0); temp_r29 = HuSprCreate(temp_r28, 200, 0);
HuSprGrpMemberSet(temp_r30, 0, temp_r29); HuSprGrpMemberSet(temp_r30, 0, temp_r29);
@ -419,15 +423,17 @@ void fn_1_14CFC(void)
HuSprGrpMemberSet(temp_r30, 1, temp_r29); HuSprGrpMemberSet(temp_r30, 1, temp_r29);
HuSprPosSet(temp_r30, 1, 0, 0); HuSprPosSet(temp_r30, 1, 0, 0);
for (temp_r31 = 0; temp_r31 < 4; temp_r31++) { 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_r20 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].character;
temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 16)+temp_r20, MEMORY_DEFAULT_NUM)); 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); temp_r29 = HuSprCreate(temp_r28, 190, 0);
HuSprGrpMemberSet(temp_r30, (temp_r31 * 2) + 2, temp_r29); HuSprGrpMemberSet(temp_r30, (temp_r31 * 2) + 2, temp_r29);
HuSprPosSet(temp_r30, (temp_r31 * 2) + 2, lbl_1_data_19C[temp_r31], 0); HuSprPosSet(temp_r30, (temp_r31 * 2) + 2, lbl_1_data_19C[temp_r31], 0);
if (sp8 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].iscom) { if (sp8 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].iscom) {
temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 39), MEMORY_DEFAULT_NUM)); temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 39), MEMORY_DEFAULT_NUM));
temp_r21 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].diff; 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_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 38), MEMORY_DEFAULT_NUM));
temp_r21 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].pad_idx; temp_r21 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].pad_idx;
} }
@ -470,7 +476,8 @@ s32 fn_1_15E98(s16 arg0, s32 arg1)
HuAudFXPlay(1); HuAudFXPlay(1);
mgTicTacToeGrid[temp_r24][temp_r23] |= 4 << arg0; mgTicTacToeGrid[temp_r24][temp_r23] |= 4 << arg0;
return 1; return 1;
} else { }
else {
lbl_1_bss_3AC[arg0] = 30; lbl_1_bss_3AC[arg0] = 30;
temp_r26 = (temp_r24 - temp_r30 < 0) ? -1 : (temp_r24 - temp_r30 > 0) ? 1 : 0; 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; temp_r25 = (temp_r23 - temp_r29 < 0) ? -1 : (temp_r23 - temp_r29 > 0) ? 1 : 0;
@ -478,7 +485,8 @@ s32 fn_1_15E98(s16 arg0, s32 arg1)
HuAudFXPlay(0); HuAudFXPlay(0);
return 0; return 0;
} }
} else { }
else {
temp_r30 = lbl_1_bss_3B4[arg0] % 3; temp_r30 = lbl_1_bss_3B4[arg0] % 3;
temp_r29 = lbl_1_bss_3B4[arg0] / 3; temp_r29 = lbl_1_bss_3B4[arg0] / 3;
if (arg1 == 0) { if (arg1 == 0) {
@ -489,7 +497,8 @@ s32 fn_1_15E98(s16 arg0, s32 arg1)
mgTicTacToeGrid[temp_r30][temp_r29] |= 4 << arg0; mgTicTacToeGrid[temp_r30][temp_r29] |= 4 << arg0;
HuAudFXPlay(1); HuAudFXPlay(1);
return 1; return 1;
} else { }
else {
HuAudFXPlay(4); HuAudFXPlay(4);
} }
} }
@ -499,12 +508,14 @@ s32 fn_1_15E98(s16 arg0, s32 arg1)
temp_r26 = temp_r25 = 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; 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; 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; 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; temp_r25 = 1;
} }
if (temp_r26 || temp_r25) { if (temp_r26 || temp_r25) {
@ -513,7 +524,6 @@ s32 fn_1_15E98(s16 arg0, s32 arg1)
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; return 0;
} }
} }
void fn_1_16438(void) void fn_1_16438(void)
@ -540,14 +550,16 @@ void fn_1_16438(void)
if (temp_r31 <= 10) { if (temp_r31 <= 10) {
temp_f31 = sind((temp_r31 / 10.0) * 90.0); temp_f31 = sind((temp_r31 / 10.0) * 90.0);
HuSprGrpPosSet(lbl_1_bss_3A8, 288, 240 + (16 * temp_f31)); HuSprGrpPosSet(lbl_1_bss_3A8, 288, 240 + (16 * temp_f31));
} else { }
else {
temp_f31 = 1.0 - cosd(((temp_r31 - 10.0) / 50.0) * 90.0); temp_f31 = 1.0 - cosd(((temp_r31 - 10.0) / 50.0) * 90.0);
HuSprGrpPosSet(lbl_1_bss_3A8, 288, 256 + (-400 * temp_f31)); HuSprGrpPosSet(lbl_1_bss_3A8, 288, 256 + (-400 * temp_f31));
} }
if (temp_r31 <= 10) { if (temp_r31 <= 10) {
temp_f31 = sind((temp_r31 / 10.0) * 90.0); temp_f31 = sind((temp_r31 / 10.0) * 90.0);
HuSprGrpPosSet(lbl_1_bss_3AA, 450 + (-16 * temp_f31), 65); HuSprGrpPosSet(lbl_1_bss_3AA, 450 + (-16 * temp_f31), 65);
} else if(temp_r31 < 30) { }
else if (temp_r31 < 30) {
temp_f31 = 1 - cosd(((temp_r31 - 10.0) / 20.0) * 90.0); temp_f31 = 1 - cosd(((temp_r31 - 10.0) / 20.0) * 90.0);
HuSprGrpPosSet(lbl_1_bss_3AA, 434 + (400 * temp_f31), 65); HuSprGrpPosSet(lbl_1_bss_3AA, 434 + (400 * temp_f31), 65);
} }
@ -621,7 +633,8 @@ s32 fn_1_16B30(void)
if (sp16[0] != sp16[1]) { if (sp16[0] != sp16[1]) {
if (sp16[0] > sp16[1]) { if (sp16[0] > sp16[1]) {
sp12[0] = 1; sp12[0] = 1;
} else { }
else {
sp12[1] = 1; sp12[1] = 1;
} }
} }
@ -631,7 +644,8 @@ s32 fn_1_16B30(void)
if (sp12[temp_r30] != 0) { if (sp12[temp_r30] != 0) {
mgTicTacToeGrid[temp_r22][temp_r21] = (1 << temp_r30); mgTicTacToeGrid[temp_r22][temp_r21] = (1 << temp_r30);
temp_r28 = temp_r30; temp_r28 = temp_r30;
} else { }
else {
mgTicTacToeGrid[temp_r22][temp_r21] &= ~(4 << temp_r30); mgTicTacToeGrid[temp_r22][temp_r21] &= ~(4 << temp_r30);
} }
} }
@ -642,7 +656,8 @@ s32 fn_1_16B30(void)
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], 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) + 1], 1);
fn_1_25838(lbl_1_data_168, 0x280016, -1, -1); fn_1_25838(lbl_1_data_168, 0x280016, -1, -1);
} else { }
else {
fn_1_25838(lbl_1_data_168, 0x280013, -1, -1); fn_1_25838(lbl_1_data_168, 0x280013, -1, -1);
} }
temp_r26 = espEntry(0x62005D, 100, 0); temp_r26 = espEntry(0x62005D, 100, 0);
@ -668,7 +683,8 @@ s32 fn_1_16B30(void)
if (temp_r31 == 14) { if (temp_r31 == 14) {
espKill(temp_r26); espKill(temp_r26);
} }
} else { }
else {
temp_f31 = 1 - (temp_r31 / 30.0); temp_f31 = 1 - (temp_r31 / 30.0);
HuSprTPLvlSet(lbl_1_bss_3A8, temp_r30 + 14, temp_f31); HuSprTPLvlSet(lbl_1_bss_3A8, temp_r30 + 14, temp_f31);
} }
@ -732,7 +748,8 @@ s32 fn_1_16B30(void)
} }
if (sp1A[0] > sp1A[1]) { if (sp1A[0] > sp1A[1]) {
temp_r28 = 0; temp_r28 = 0;
} else { }
else {
temp_r28 = 1; temp_r28 = 1;
} }
HuPrcSleep(30); HuPrcSleep(30);
@ -743,10 +760,12 @@ s32 fn_1_16B30(void)
fn_1_25584(lbl_1_data_168); fn_1_25584(lbl_1_data_168);
lbl_1_data_168 = -1; lbl_1_data_168 = -1;
return 1; return 1;
} else { }
else {
return 0; return 0;
} }
} else { }
else {
temp_r23 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 93), MEMORY_DEFAULT_NUM)); temp_r23 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 93), MEMORY_DEFAULT_NUM));
temp_r25 = HuSprGrpCreate(temp_r27); temp_r25 = HuSprGrpCreate(temp_r27);
for (temp_r30 = temp_r31 = 0; temp_r30 < 9; temp_r30++) { for (temp_r30 = temp_r31 = 0; temp_r30 < 9; temp_r30++) {
@ -816,19 +835,22 @@ void fn_1_17BE0(void)
temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 0]; temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 0];
if ((1 << temp_r26) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { if ((1 << temp_r26) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) {
temp_r28++; 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_r25 = temp_r30;
} }
temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 1]; temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 1];
if ((1 << temp_r26) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { if ((1 << temp_r26) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) {
temp_r28++; 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_r25 = temp_r30;
} }
temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 2]; temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 2];
if ((1 << temp_r26) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { if ((1 << temp_r26) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) {
temp_r28++; 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_r25 = temp_r30;
} }
if (temp_r28 == 2 && temp_r25 != -1) { if (temp_r28 == 2 && temp_r25 != -1) {
@ -848,19 +870,22 @@ void fn_1_17BE0(void)
temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 0]; temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 0];
if ((1 << temp_r29) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { if ((1 << temp_r29) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) {
temp_r28++; 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_r25 = temp_r30;
} }
temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 1]; temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 1];
if ((1 << temp_r29) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { if ((1 << temp_r29) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) {
temp_r28++; 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_r25 = temp_r30;
} }
temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 2]; temp_r30 = lbl_1_data_16A[(temp_r31 * 3) + 2];
if ((1 << temp_r29) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) { if ((1 << temp_r29) & mgTicTacToeGrid[temp_r30 % 3][temp_r30 / 3]) {
temp_r28++; 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_r25 = temp_r30;
} }
if (temp_r28 == 2 && temp_r25 != -1) { if (temp_r28 == 2 && temp_r25 != -1) {
@ -876,7 +901,8 @@ void fn_1_17BE0(void)
if ((1 << temp_r26) & mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3]) { if ((1 << temp_r26) & mgTicTacToeGrid[temp_r31 % 3][temp_r31 / 3]) {
sp2A[temp_r24] = temp_r31; sp2A[temp_r24] = temp_r31;
temp_r24++; 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; sp18[temp_r21++] = temp_r31;
} }
} }
@ -892,7 +918,8 @@ void fn_1_17BE0(void)
if (temp_r31 == 50) { if (temp_r31 == 50) {
lbl_1_bss_3B0[temp_r26] = sp18[frandmod(temp_r21)]; lbl_1_bss_3B0[temp_r26] = sp18[frandmod(temp_r21)];
} }
} else { }
else {
for (temp_r22 = 0; temp_r22 < 50; temp_r22++) { for (temp_r22 = 0; temp_r22 < 50; temp_r22++) {
temp_r29 = sp2A[frandmod(temp_r24)]; temp_r29 = sp2A[frandmod(temp_r24)];
temp_r27 = 0; temp_r27 = 0;
@ -924,10 +951,12 @@ void fn_1_17BE0(void)
temp_r23 = sp8[frandmod(temp_r27)]; 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; 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++; 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++; temp_r28++;
} }
if (temp_r28 == 2) { if (temp_r28 == 2) {
@ -954,7 +983,6 @@ void fn_1_17BE0(void)
lbl_1_bss_3B0[temp_r26] = sp18[frandmod(temp_r21)]; 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]); OSReport("com %d,%d\n", lbl_1_bss_3B0[0], lbl_1_bss_3B0[1]);
} }

2
src/game/armem.c
View file

@ -25,7 +25,7 @@ static ARQRequest arqReq;
static ARMemBlock ARInfo[64]; static ARMemBlock ARInfo[64];
static s32 ARBase; static s32 ARBase;
static s32 arqCnt; static volatile s32 arqCnt;
static s16 arqIdx; static s16 arqIdx;
void HuARInit(void) { void HuARInit(void) {

1
src/game/code_8003FF68.c
View file

@ -1,3 +1,4 @@
#include "game/audio.h"
#include "game/data.h" #include "game/data.h"
#include "game/hsfman.h" #include "game/hsfman.h"
#include "game/process.h" #include "game/process.h"