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

Merge pull request #439 from dbalatoni13/main

Browse source 
Finished m432Dll, removed rel_sqrt_consts.h and found new inlines
This commit is contained in:
Liam Coleman 2024-11-09 23:59:04 -06:00 • committed by GitHub
commit 33cf800697
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
51 changed files with 5918 additions and 1426 deletions
Download patch file Download diff file Expand all files Collapse all files

375
config/GMPE01_00/rels/m432Dll/symbols.txt
View file

@ -101,138 +101,138 @@ fn_1_128C8 = .text:0x000128C8; // type:function size:0x5E0
fn_1_12EA8 = .text:0x00012EA8; // type:function size:0x300 fn_1_12EA8 = .text:0x00012EA8; // type:function size:0x300
fn_1_131A8 = .text:0x000131A8; // type:function size:0x2178 fn_1_131A8 = .text:0x000131A8; // type:function size:0x2178
fn_1_15320 = .text:0x00015320; // type:function size:0x9C fn_1_15320 = .text:0x00015320; // type:function size:0x9C
fn_1_153BC = .text:0x000153BC; // type:function size:0xDA0 ObjectSetup = .text:0x000153BC; // type:function size:0xDA0
fn_1_1615C = .text:0x0001615C; // type:function size:0x104 fn_1_1615C = .text:0x0001615C; // type:function size:0x104
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte _ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float
lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 data:float lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 scope:local data:float
lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x8 data:double lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x8 scope:local data:double
lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 scope:local data:float
lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 scope:local data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 data:double lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 scope:local data:double
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x8 data:double lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x8 scope:local data:double
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 data:double lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 scope:local data:double
lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 data:double lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 scope:local data:double
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 scope:local data:float
lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 data:float lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 data:float lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 scope:local data:float
lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 data:float lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 scope:local data:float
lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 data:float lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 scope:local data:float
lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 scope:local data:float
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x8 data:double lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x8 scope:local data:double
lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 data:float lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 scope:local data:float
lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 data:float lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 scope:local data:float
lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 scope:local data:float
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 data:double lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 scope:local data:double
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x8 data:double lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x8 scope:local data:double
lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 scope:local data:float
lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 data:float lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 scope:local data:float
lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 data:float lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 scope:local data:float
lbl_1_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 data:float lbl_1_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 data:float lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 data:float lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 data:float lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 data:float lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 data:float lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 data:float lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 data:float lbl_1_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 data:float lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 data:float lbl_1_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 data:float lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 data:float lbl_1_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 data:float lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 data:float lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 scope:local data:float
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_EC = .rodata:0x000000EC; // type:object size:0x4 data:float lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 data:float lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 data:float lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 scope:local data:float
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_10C = .rodata:0x0000010C; // type:object size:0x4 data:float lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 data:float lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 scope:local data:float
lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x4 data:float lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x4 scope:local data:float
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_11C = .rodata:0x0000011C; // type:object size:0x4 data:float lbl_1_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 data:float lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 scope:local data:float
lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 data:float lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 scope:local data:float
lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x4 data:float lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x4 scope:local data:float
lbl_1_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 data:float lbl_1_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 data:float lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 scope:local data:float
lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 data:float lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 scope:local data:float
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_13C = .rodata:0x0000013C; // type:object size:0x4 data:float lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x4 data:float lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x4 scope:local data:float
lbl_1_rodata_144 = .rodata:0x00000144; // type:object size:0x4 data:float lbl_1_rodata_144 = .rodata:0x00000144; // type:object size:0x4 scope:local data:float
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:0x4 data:float lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x4 scope:local data:float
lbl_1_rodata_154 = .rodata:0x00000154; // type:object size:0x4 data:float lbl_1_rodata_154 = .rodata:0x00000154; // type:object size:0x4 scope:local data:float
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:0x4 data:float lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x4 scope:local data:float
lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 data:float lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 scope:local data:float
lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 data:float lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 scope:local data:float
lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 data:float lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 scope:local data:float
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_194 = .rodata:0x00000194; // type:object size:0x4 data:float lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 scope:local data:float
lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 data:float lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 scope:local data:float
lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 data:float lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 scope:local data:float
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 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 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:0x8 data:double lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 data:float lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 data:float lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 data:float lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 data:float lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 data:float lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 data:float lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 data:float lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 data:float lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 data:float lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 data:float lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x4 data:float lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1EC = .rodata:0x000001EC; // type:object size:0x4 data:float lbl_1_rodata_1EC = .rodata:0x000001EC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 data:float lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1F4 = .rodata:0x000001F4; // type:object size:0x4 data:float lbl_1_rodata_1F4 = .rodata:0x000001F4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x4 data:float lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1FC = .rodata:0x000001FC; // type:object size:0x4 data:float lbl_1_rodata_1FC = .rodata:0x000001FC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x4 data:float lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x4 scope:local data:float
lbl_1_rodata_204 = .rodata:0x00000204; // type:object size:0x4 data:float lbl_1_rodata_204 = .rodata:0x00000204; // type:object size:0x4 scope:local data:float
lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x8 data:double lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x8 scope:local data:double
lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 data:double lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 scope:local data:double
lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x4 data:float lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x4 scope:local data:float
lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x8 data:double lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x8 scope:local data:double
lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 data:float lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 scope:local data:float
lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 data:float lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x4 data:float lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x4 scope:local data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x10 lbl_1_data_0 = .data:0x00000000; // type:object size:0x10
lbl_1_data_10 = .data:0x00000010; // type:object size:0x20 lbl_1_data_10 = .data:0x00000010; // type:object size:0x20
lbl_1_data_30 = .data:0x00000030; // type:object size:0x28 lbl_1_data_30 = .data:0x00000030; // type:object size:0x28
lbl_1_data_58 = .data:0x00000058; // type:object size:0x28 lbl_1_data_58 = .data:0x00000058; // type:object size:0x28
lbl_1_data_80 = .data:0x00000080; // type:object size:0x1F data:string lbl_1_data_80 = .data:0x00000080; // type:object size:0x1F scope:local data:string
lbl_1_data_A0 = .data:0x000000A0; // type:object size:0x8 lbl_1_data_A0 = .data:0x000000A0; // type:object size:0x8
lbl_1_data_A8 = .data:0x000000A8; // type:object size:0x20 data:float lbl_1_data_A8 = .data:0x000000A8; // type:object size:0x20 data:float
lbl_1_data_C8 = .data:0x000000C8; // type:object size:0xC lbl_1_data_C8 = .data:0x000000C8; // type:object size:0xC
@ -250,81 +250,81 @@ lbl_1_data_2F4 = .data:0x000002F4; // type:object size:0x24
lbl_1_data_318 = .data:0x00000318; // type:object size:0x3C lbl_1_data_318 = .data:0x00000318; // type:object size:0x3C
lbl_1_data_354 = .data:0x00000354; // type:object size:0x18 lbl_1_data_354 = .data:0x00000354; // type:object size:0x18
lbl_1_data_36C = .data:0x0000036C; // type:object size:0x18 lbl_1_data_36C = .data:0x0000036C; // type:object size:0x18
lbl_1_data_384 = .data:0x00000384; // type:object size:0xB data:string lbl_1_data_384 = .data:0x00000384; // type:object size:0xB scope:local data:string
lbl_1_data_38F = .data:0x0000038F; // type:object size:0xB data:string lbl_1_data_38F = .data:0x0000038F; // type:object size:0xB scope:local data:string
lbl_1_data_39A = .data:0x0000039A; // type:object size:0xB data:string lbl_1_data_39A = .data:0x0000039A; // type:object size:0xB scope:local data:string
lbl_1_data_3A5 = .data:0x000003A5; // type:object size:0xB data:string lbl_1_data_3A5 = .data:0x000003A5; // type:object size:0xB scope:local data:string
lbl_1_data_3B0 = .data:0x000003B0; // type:object size:0xB data:string lbl_1_data_3B0 = .data:0x000003B0; // type:object size:0xB scope:local data:string
lbl_1_data_3BB = .data:0x000003BB; // type:object size:0xB data:string lbl_1_data_3BB = .data:0x000003BB; // type:object size:0xB scope:local data:string
lbl_1_data_3C6 = .data:0x000003C6; // type:object size:0xB data:string lbl_1_data_3C6 = .data:0x000003C6; // type:object size:0xB scope:local data:string
lbl_1_data_3D1 = .data:0x000003D1; // type:object size:0xB data:string lbl_1_data_3D1 = .data:0x000003D1; // type:object size:0xB scope:local data:string
lbl_1_data_3DC = .data:0x000003DC; // type:object size:0x20 lbl_1_data_3DC = .data:0x000003DC; // type:object size:0x20
lbl_1_data_3FC = .data:0x000003FC; // type:object size:0xB data:string lbl_1_data_3FC = .data:0x000003FC; // type:object size:0xB scope:local data:string
lbl_1_data_407 = .data:0x00000407; // type:object size:0xB data:string lbl_1_data_407 = .data:0x00000407; // type:object size:0xB scope:local data:string
lbl_1_data_412 = .data:0x00000412; // type:object size:0xB data:string lbl_1_data_412 = .data:0x00000412; // type:object size:0xB scope:local data:string
lbl_1_data_41D = .data:0x0000041D; // type:object size:0xB data:string lbl_1_data_41D = .data:0x0000041D; // type:object size:0xB scope:local data:string
lbl_1_data_428 = .data:0x00000428; // type:object size:0xB data:string lbl_1_data_428 = .data:0x00000428; // type:object size:0xB scope:local data:string
lbl_1_data_433 = .data:0x00000433; // type:object size:0xD lbl_1_data_433 = .data:0x00000433; // type:object size:0xD scope:local data:string
lbl_1_data_440 = .data:0x00000440; // type:object size:0x18 data:4byte lbl_1_data_440 = .data:0x00000440; // type:object size:0x18 data:4byte
lbl_1_data_458 = .data:0x00000458; // type:object size:0xB data:string lbl_1_data_458 = .data:0x00000458; // type:object size:0xB scope:local data:string
lbl_1_data_463 = .data:0x00000463; // type:object size:0xB data:string lbl_1_data_463 = .data:0x00000463; // type:object size:0xB scope:local data:string
lbl_1_data_46E = .data:0x0000046E; // type:object size:0xB data:string lbl_1_data_46E = .data:0x0000046E; // type:object size:0xB scope:local data:string
lbl_1_data_479 = .data:0x00000479; // type:object size:0xB data:string lbl_1_data_479 = .data:0x00000479; // type:object size:0xB scope:local data:string
lbl_1_data_484 = .data:0x00000484; // type:object size:0xB data:string lbl_1_data_484 = .data:0x00000484; // type:object size:0xB scope:local data:string
lbl_1_data_48F = .data:0x0000048F; // type:object size:0xB data:string lbl_1_data_48F = .data:0x0000048F; // type:object size:0xB scope:local data:string
lbl_1_data_49A = .data:0x0000049A; // type:object size:0xB data:string lbl_1_data_49A = .data:0x0000049A; // type:object size:0xB scope:local data:string
lbl_1_data_4A5 = .data:0x000004A5; // type:object size:0xB data:string lbl_1_data_4A5 = .data:0x000004A5; // type:object size:0xB scope:local data:string
lbl_1_data_4B0 = .data:0x000004B0; // type:object size:0xB data:string lbl_1_data_4B0 = .data:0x000004B0; // type:object size:0xB scope:local data:string
lbl_1_data_4BB = .data:0x000004BB; // type:object size:0xD lbl_1_data_4BB = .data:0x000004BB; // type:object size:0xD scope:local data:string
lbl_1_data_4C8 = .data:0x000004C8; // type:object size:0x28 data:4byte lbl_1_data_4C8 = .data:0x000004C8; // type:object size:0x28 data:4byte
lbl_1_data_4F0 = .data:0x000004F0; // type:object size:0x14 lbl_1_data_4F0 = .data:0x000004F0; // type:object size:0x14 data:byte
lbl_1_data_504 = .data:0x00000504; // type:object size:0x24 lbl_1_data_504 = .data:0x00000504; // type:object size:0x24 data:byte
lbl_1_data_528 = .data:0x00000528; // type:object size:0x8 lbl_1_data_528 = .data:0x00000528; // type:object size:0x8
lbl_1_data_530 = .data:0x00000530; // type:object size:0xB data:string lbl_1_data_530 = .data:0x00000530; // type:object size:0xB scope:local data:string
lbl_1_data_53B = .data:0x0000053B; // type:object size:0xB data:string lbl_1_data_53B = .data:0x0000053B; // type:object size:0xB scope:local data:string
lbl_1_data_546 = .data:0x00000546; // type:object size:0xB data:string lbl_1_data_546 = .data:0x00000546; // type:object size:0xB scope:local data:string
lbl_1_data_551 = .data:0x00000551; // type:object size:0xB data:string lbl_1_data_551 = .data:0x00000551; // type:object size:0xB scope:local data:string
lbl_1_data_55C = .data:0x0000055C; // type:object size:0xB data:string lbl_1_data_55C = .data:0x0000055C; // type:object size:0xB scope:local data:string
lbl_1_data_567 = .data:0x00000567; // type:object size:0xB data:string lbl_1_data_567 = .data:0x00000567; // type:object size:0xB scope:local data:string
lbl_1_data_572 = .data:0x00000572; // type:object size:0xB data:string lbl_1_data_572 = .data:0x00000572; // type:object size:0xB scope:local data:string
lbl_1_data_57D = .data:0x0000057D; // type:object size:0xB data:string lbl_1_data_57D = .data:0x0000057D; // type:object size:0xB scope:local data:string
lbl_1_data_588 = .data:0x00000588; // type:object size:0xB data:string lbl_1_data_588 = .data:0x00000588; // type:object size:0xB scope:local data:string
lbl_1_data_593 = .data:0x00000593; // type:object size:0xB data:string lbl_1_data_593 = .data:0x00000593; // type:object size:0xB scope:local data:string
lbl_1_data_59E = .data:0x0000059E; // type:object size:0xB data:string lbl_1_data_59E = .data:0x0000059E; // type:object size:0xB scope:local data:string
lbl_1_data_5A9 = .data:0x000005A9; // type:object size:0xB data:string lbl_1_data_5A9 = .data:0x000005A9; // type:object size:0xB scope:local data:string
lbl_1_data_5B4 = .data:0x000005B4; // type:object size:0xB data:string lbl_1_data_5B4 = .data:0x000005B4; // type:object size:0xB scope:local data:string
lbl_1_data_5BF = .data:0x000005BF; // type:object size:0xB data:string lbl_1_data_5BF = .data:0x000005BF; // type:object size:0xB scope:local data:string
lbl_1_data_5CA = .data:0x000005CA; // type:object size:0xB data:string lbl_1_data_5CA = .data:0x000005CA; // type:object size:0xB scope:local data:string
lbl_1_data_5D5 = .data:0x000005D5; // type:object size:0xB data:string lbl_1_data_5D5 = .data:0x000005D5; // type:object size:0xB scope:local data:string
lbl_1_data_5E0 = .data:0x000005E0; // type:object size:0xB data:string lbl_1_data_5E0 = .data:0x000005E0; // type:object size:0xB scope:local data:string
lbl_1_data_5EC = .data:0x000005EC; // type:object size:0x8B8 lbl_1_data_5EC = .data:0x000005EC; // type:object size:0x8B8
lbl_1_data_EA4 = .data:0x00000EA4; // type:object size:0xB data:string lbl_1_data_EA4 = .data:0x00000EA4; // type:object size:0xB scope:local data:string
lbl_1_data_EAF = .data:0x00000EAF; // type:object size:0xB data:string lbl_1_data_EAF = .data:0x00000EAF; // type:object size:0xB scope:local data:string
lbl_1_data_EBA = .data:0x00000EBA; // type:object size:0xB data:string lbl_1_data_EBA = .data:0x00000EBA; // type:object size:0xB scope:local data:string
lbl_1_data_EC5 = .data:0x00000EC5; // type:object size:0xB data:string lbl_1_data_EC5 = .data:0x00000EC5; // type:object size:0xB scope:local data:string
lbl_1_data_ED0 = .data:0x00000ED0; // type:object size:0xC lbl_1_data_ED0 = .data:0x00000ED0; // type:object size:0xC scope:local data:string
lbl_1_data_EDC = .data:0x00000EDC; // type:object size:0x8B8 lbl_1_data_EDC = .data:0x00000EDC; // type:object size:0x8B8
lbl_1_data_1794 = .data:0x00001794; // type:object size:0x20 lbl_1_data_1794 = .data:0x00001794; // type:object size:0x20
lbl_1_data_17B4 = .data:0x000017B4; // type:object size:0x20 lbl_1_data_17B4 = .data:0x000017B4; // type:object size:0x20
lbl_1_data_17D4 = .data:0x000017D4; // type:object size:0x20 data:float lbl_1_data_17D4 = .data:0x000017D4; // type:object size:0x20 data:float
lbl_1_data_17F4 = .data:0x000017F4; // type:object size:0x20 lbl_1_data_17F4 = .data:0x000017F4; // type:object size:0x20
lbl_1_data_1814 = .data:0x00001814; // type:object size:0x50 lbl_1_data_1814 = .data:0x00001814; // type:object size:0x50
lbl_1_data_1864 = .data:0x00001864; // type:object size:0x11 data:string lbl_1_data_1864 = .data:0x00001864; // type:object size:0x11 scope:local data:string
lbl_1_data_1875 = .data:0x00001875; // type:object size:0x11 data:string lbl_1_data_1875 = .data:0x00001875; // type:object size:0x11 scope:local data:string
lbl_1_data_1886 = .data:0x00001886; // type:object size:0x11 data:string lbl_1_data_1886 = .data:0x00001886; // type:object size:0x11 scope:local data:string
lbl_1_data_1897 = .data:0x00001897; // type:object size:0x18 data:string lbl_1_data_1897 = .data:0x00001897; // type:object size:0x18 scope:local data:string
lbl_1_data_18AF = .data:0x000018AF; // type:object size:0xB data:string lbl_1_data_18AF = .data:0x000018AF; // type:object size:0xB scope:local data:string
lbl_1_data_18BA = .data:0x000018BA; // type:object size:0x18 data:string lbl_1_data_18BA = .data:0x000018BA; // type:object size:0x18 scope:local data:string
lbl_1_data_18D2 = .data:0x000018D2; // type:object size:0xC data:string lbl_1_data_18D2 = .data:0x000018D2; // type:object size:0xC scope:local data:string
lbl_1_data_18DE = .data:0x000018DE; // type:object size:0x6 data:string lbl_1_data_18DE = .data:0x000018DE; // type:object size:0x6 scope:local data:string
lbl_1_data_18E4 = .data:0x000018E4; // type:object size:0x21 data:string lbl_1_data_18E4 = .data:0x000018E4; // type:object size:0x21 scope:local data:string
lbl_1_data_1905 = .data:0x00001905; // type:object size:0x1F lbl_1_data_1905 = .data:0x00001905; // type:object size:0x1F scope:local data:string
jumptable_1_data_1924 = .data:0x00001924; // type:object size:0x1C scope:local jumptable_1_data_1924 = .data:0x00001924; // type:object size:0x1C scope:local
jumptable_1_data_1940 = .data:0x00001940; // type:object size:0x44 scope:local jumptable_1_data_1940 = .data:0x00001940; // type:object size:0x44 scope:local
lbl_1_data_1984 = .data:0x00001984; // type:object size:0xB data:string lbl_1_data_1984 = .data:0x00001984; // type:object size:0xB scope:local data:string
lbl_1_data_198F = .data:0x0000198F; // type:object size:0x1D lbl_1_data_198F = .data:0x0000198F; // type:object size:0x1D scope:local data:string
jumptable_1_data_19AC = .data:0x000019AC; // type:object size:0x28 scope:local jumptable_1_data_19AC = .data:0x000019AC; // type:object size:0x28 scope:local
lbl_1_data_19D4 = .data:0x000019D4; // type:object size:0x24 data:string lbl_1_data_19D4 = .data:0x000019D4; // type:object size:0x24 scope:local data:string
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x3F0 data:float lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x3F0 data:float
lbl_1_bss_3F0 = .bss:0x000003F0; // type:object size:0x4 data:float lbl_1_bss_3F0 = .bss:0x000003F0; // type:object size:0x4 data:float
lbl_1_bss_3F4 = .bss:0x000003F4; // type:object size:0x4 data:4byte lbl_1_bss_3F4 = .bss:0x000003F4; // type:object size:0x4 data:4byte
@ -333,7 +333,8 @@ lbl_1_bss_3FC = .bss:0x000003FC; // type:object size:0x4 data:4byte
lbl_1_bss_400 = .bss:0x00000400; // type:object size:0x2 data:2byte lbl_1_bss_400 = .bss:0x00000400; // type:object size:0x2 data:2byte
lbl_1_bss_402 = .bss:0x00000402; // type:object size:0x2 data:2byte lbl_1_bss_402 = .bss:0x00000402; // type:object size:0x2 data:2byte
lbl_1_bss_404 = .bss:0x00000404; // type:object size:0x2 data:2byte lbl_1_bss_404 = .bss:0x00000404; // type:object size:0x2 data:2byte
lbl_1_bss_408 = .bss:0x00000408; // type:object size:0x8 data:4byte lbl_1_bss_408 = .bss:0x00000408; // type:object size:0x4 data:4byte
lbl_1_bss_40C = .bss:0x0000040C; // type:object size:0x4 data:4byte
lbl_1_bss_410 = .bss:0x00000410; // type:object size:0x4 data:4byte lbl_1_bss_410 = .bss:0x00000410; // type:object size:0x4 data:4byte
lbl_1_bss_414 = .bss:0x00000414; // type:object size:0x4 data:4byte lbl_1_bss_414 = .bss:0x00000414; // type:object size:0x4 data:4byte
lbl_1_bss_418 = .bss:0x00000418; // type:object size:0x4 data:4byte lbl_1_bss_418 = .bss:0x00000418; // type:object size:0x4 data:4byte

2
configure.py
View file

@ -1065,7 +1065,7 @@ config.libs = [
Rel( Rel(
"m432Dll", # Dungeon Duos "m432Dll", # Dungeon Duos
objects={ objects={
Object(NonMatching, "REL/m432Dll/main.c"), Object(Matching, "REL/m432Dll/main.c"),
}, },
), ),
Rel( Rel(

1235
include/REL/m432data.h Normal file
View file

File diff suppressed because it is too large Load diff

5
include/rel_sqrt_consts.h
View file

@ -1,5 +0,0 @@
#ifndef _REL_SQRT_CONSTS
#define _REL_SQRT_CONSTS
#endif

1
src/REL/E3setupDLL/mgselect.c
View file

@ -6,7 +6,6 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "game/window.h" #include "game/window.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "REL/E3SetupDLL.h" #include "REL/E3SetupDLL.h"

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

@ -21,8 +21,6 @@
#include "ext_math.h" #include "ext_math.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
#include "REL/instDll.h" #include "REL/instDll.h"
static s16 lbl_1_data_0 = 1; static s16 lbl_1_data_0 = 1;

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

@ -17,8 +17,6 @@
#include "ext_math.h" #include "ext_math.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
float lbl_2_data_0 = -7.1875f; float lbl_2_data_0 = -7.1875f;
s16 lbl_2_data_4[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; s16 lbl_2_data_4[] = { 0, 1, 2, 3, 4, 5, 6, 7 };

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

@ -22,7 +22,6 @@
#include "dolphin.h" #include "dolphin.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
#undef ABS #undef ABS
#define ABS(x) ((0 > (x)) ? -(x) : (x)) #define ABS(x) ((0 > (x)) ? -(x) : (x))

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

@ -17,7 +17,6 @@
#include "game/wipe.h" #include "game/wipe.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
typedef struct { typedef struct {
/* 0x000 */ u8 unk00; /* 0x000 */ u8 unk00;

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

@ -10,7 +10,7 @@
#include "game/pad.h" #include "game/pad.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "string.h" #include "string.h"
typedef struct UnkM404Struct { typedef struct UnkM404Struct {

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

@ -22,7 +22,6 @@
#include "dolphin.h" #include "dolphin.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
#undef ABS #undef ABS
#define ABS(x) ((0 > (x)) ? -(x) : (x)) #define ABS(x) ((0 > (x)) ? -(x) : (x))

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

@ -5,7 +5,6 @@
#include "game/hsfdraw.h" #include "game/hsfdraw.h"
#include "game/minigame_seq.h" #include "game/minigame_seq.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "REL/m406Dll.h" #include "REL/m406Dll.h"

2
src/REL/m407dll/player.c
View file

@ -8,8 +8,6 @@
#include "game/process.h" #include "game/process.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
typedef void (*ObjFuncs)(omObjData *); typedef void (*ObjFuncs)(omObjData *);

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

@ -19,8 +19,6 @@
#include "ext_math.h" #include "ext_math.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
s32 lbl_1_data_0[] = { s32 lbl_1_data_0[] = {
DATA_MAKE_NUM(DATADIR_MGCONST, 0x00), DATA_MAKE_NUM(DATADIR_MGCONST, 0x00),
DATA_MAKE_NUM(DATADIR_MGCONST, 0x01), DATA_MAKE_NUM(DATADIR_MGCONST, 0x01),

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

@ -11,7 +11,6 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
// bss // bss
Process *lbl_1_bss_E8; Process *lbl_1_bss_E8;

4
src/REL/m410Dll/main.c
View file

@ -5,7 +5,6 @@
#include "game/minigame_seq.h" #include "game/minigame_seq.h"
#include "game/object.h" #include "game/object.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "REL/m410Dll.h" #include "REL/m410Dll.h"
@ -188,7 +187,6 @@ void fn_1_63C(omObjData *object)
break; break;
} }
var_r31->unk_04 = 0; var_r31->unk_04 = 0;
} }
void fn_1_7A8(omObjData *object) void fn_1_7A8(omObjData *object)
@ -263,8 +261,6 @@ void fn_1_FF0(omObjData *object)
default: default:
break; break;
} }
} }
void fn_1_139C(omObjData *object) void fn_1_139C(omObjData *object)

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

@ -18,7 +18,6 @@
#include "dolphin.h" #include "dolphin.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
typedef struct { typedef struct {
/* 0x00 */ s16 unk00; /* 0x00 */ s16 unk00;

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

@ -12,7 +12,6 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
// bss // bss
s16 lbl_1_bss_7A0; s16 lbl_1_bss_7A0;

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

@ -14,8 +14,6 @@
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
typedef struct struct_bss_2A6C StructBss2A6C; typedef struct struct_bss_2A6C StructBss2A6C;
typedef struct struct_sp_14C8 StructSp14C8; typedef struct struct_sp_14C8 StructSp14C8;

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

@ -9,7 +9,6 @@
#include "game/pad.h" #include "game/pad.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
typedef struct UnkM414Struct { typedef struct UnkM414Struct {
s32 unk00; s32 unk00;

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

@ -15,7 +15,6 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
// bss // bss
unkStruct5 lbl_1_bss_36C; unkStruct5 lbl_1_bss_36C;

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

@ -17,8 +17,6 @@
#include "REL/m416Dll.h" #include "REL/m416Dll.h"
#include "rel_sqrt_consts.h"
typedef struct camera_view_params { typedef struct camera_view_params {
float zoom; float zoom;
Vec pos; Vec pos;

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

@ -3,7 +3,6 @@
#include "game/hsfdraw.h" #include "game/hsfdraw.h"
#include "game/minigame_seq.h" #include "game/minigame_seq.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "REL/m417Dll.h" #include "REL/m417Dll.h"

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

@ -7,7 +7,6 @@
#include "game/pad.h" #include "game/pad.h"
#include "game/printfunc.h" #include "game/printfunc.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "REL/m420dll.h" #include "REL/m420dll.h"

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

@ -10,7 +10,6 @@
#include "game/pad.h" #include "game/pad.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
typedef struct UnkM426Struct { typedef struct UnkM426Struct {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;

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

@ -21,7 +21,6 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
#undef ABS #undef ABS
#define ABS(x) ((0 > (x)) ? -(x) : (x)) #define ABS(x) ((0 > (x)) ? -(x) : (x))

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

@ -16,8 +16,6 @@
#include "REL/m431Dll.h" #include "REL/m431Dll.h"
#include "rel_sqrt_consts.h"
typedef struct bss_5C_struct { typedef struct bss_5C_struct {
s16 unk0[6]; s16 unk0[6];
s16 unkC[2]; s16 unkC[2];

3305
src/REL/m432Dll/main.c
View file

File diff suppressed because it is too large Load diff

3
src/REL/m434Dll/main.c
View file

@ -6,15 +6,12 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "REL/m434Dll.h" #include "REL/m434Dll.h"
#include "ext_math.h" #include "ext_math.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "game/minigame_seq.h" #include "game/minigame_seq.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
typedef struct camera_view { typedef struct camera_view {
float zoom; float zoom;
Vec pos; Vec pos;

732
src/REL/m436Dll/main.c
View file

File diff suppressed because it is too large Load diff

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

@ -9,7 +9,6 @@
#include "game/pad.h" #include "game/pad.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "REL/m438Dll.h" #include "REL/m438Dll.h"

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

@ -20,8 +20,6 @@
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
#include "REL/m439data.h" #include "REL/m439data.h"
typedef struct camera_params { typedef struct camera_params {

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

@ -12,7 +12,7 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
#include "string.h" #include "string.h"
// bss // bss

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

@ -21,7 +21,6 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
#undef ABS #undef ABS
#define ABS(x) ((0 > (x)) ? -(x) : (x)) #define ABS(x) ((0 > (x)) ? -(x) : (x))

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

@ -12,7 +12,6 @@
#include "game/pad.h" #include "game/pad.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "REL/m442Dll.h" #include "REL/m442Dll.h"

3
src/REL/m443Dll/main.c
View file

@ -11,7 +11,7 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
#include "string.h" #include "string.h"
#ifndef __MWERKS__ #ifndef __MWERKS__
@ -806,7 +806,6 @@ void fn_1_3770(omObjData *arg0)
s32 var_r30; s32 var_r30;
s32 var_r29; s32 var_r29;
M443DllCameraStruct *var_r28; M443DllCameraStruct *var_r28;
omObjData *var_r27;
s32 var_r26; s32 var_r26;
u32 var_r25; u32 var_r25;
s32 var_r24; s32 var_r24;

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

@ -19,8 +19,6 @@
#include "ext_math.h" #include "ext_math.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
typedef struct camera_view_params { typedef struct camera_view_params {
Vec rot; Vec rot;
Vec pos; Vec pos;

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

@ -18,7 +18,6 @@
#include "dolphin.h" #include "dolphin.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
typedef struct { typedef struct {
/* 0x00 */ s16 unk00; /* 0x00 */ s16 unk00;

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

@ -20,7 +20,6 @@
#include "dolphin.h" #include "dolphin.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
typedef struct { typedef struct {
/* 0x00 */ s32 unk00; /* 0x00 */ s32 unk00;

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

@ -31,7 +31,6 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
#include "game/window.h" #include "game/window.h"
#include "string.h" #include "string.h"
@ -930,7 +929,7 @@ void fn_1_2C1C(WorkPlayerOld *player, omObjData *obj, s32 arg2, s32 arg3, s32 *a
player->unk_10 = NULL; player->unk_10 = NULL;
player->unk_50 = NULL; player->unk_50 = NULL;
player->unk_64 = 0; player->unk_64 = 0;
player->unk_68 = 0; player->unk_68 = NULL;
player->unk_38 = 0; player->unk_38 = 0;
player->unk_3C = 0; player->unk_3C = 0;
player->unk_44 = arg5; player->unk_44 = arg5;
@ -978,7 +977,7 @@ void fn_1_2DC8(WorkPlayerOld *player, s32 count, Vec *data)
void fn_1_2DD4(WorkPlayerOld *player) void fn_1_2DD4(WorkPlayerOld *player)
{ {
omSetTra(player->unk_00, player->unk_6C.x, player->unk_6C.y, player->unk_6C.z); omSetTra(player->unk_00, player->unk_6C.x, player->unk_6C.y, player->unk_6C.z);
omSetRot(player->unk_00, 0, player->unk_9C, 0); omSetRot(player->unk_00, 0.0f, player->unk_9C, 0.0f);
} }
void fn_1_2E34(WorkPlayerOld *player) void fn_1_2E34(WorkPlayerOld *player)
@ -1123,12 +1122,7 @@ void fn_1_3CE0(WorkPlayerOld *player, s32 *state, u32 *motAttr)
} }
if (player->unk_14[3] >= 0 && (player->unk_28 & 0x100)) { if (player->unk_14[3] >= 0 && (player->unk_28 & 0x100)) {
player->unk_38 = 1; fn_1_2BD0(player, 26.766666f, 1.0f);
player->unk_84.y = 26.766666f;
player->unk_A4 = 1;
if (player->unk_3C & 0x2) {
player->unk_3C &= ~0x2;
}
*motAttr = HU3D_MOTATTR_NONE; *motAttr = HU3D_MOTATTR_NONE;
*state = 3; *state = 3;
} }
@ -1181,12 +1175,7 @@ void fn_1_3ECC(WorkPlayerOld *player, s32 *state, u32 *motAttr)
void fn_1_3F84(WorkPlayerOld *player, s32 *state, u32 *motAttr) void fn_1_3F84(WorkPlayerOld *player, s32 *state, u32 *motAttr)
{ {
if (Hu3DMotionShiftIDGet(player->unk_00->model[0]) < 0 && Hu3DMotionEndCheck(player->unk_00->model[0])) { if (Hu3DMotionShiftIDGet(player->unk_00->model[0]) < 0 && Hu3DMotionEndCheck(player->unk_00->model[0])) {
player->unk_38 = 1; fn_1_2BD0(player, 0.0f, 0.0f);
player->unk_84.y = 0;
player->unk_A4 = 0;
if (player->unk_3C & 0x2) {
player->unk_3C &= ~0x2;
}
} }
} }
@ -1352,12 +1341,8 @@ void fn_1_40C0(WorkPlayerOld *player)
player->unk_3C |= 0x800; player->unk_3C |= 0x800;
} }
else { else {
player->unk_38 = 1; fn_1_2BD0(player, 0.0f, 0.0f);
player->unk_84.y = 0.0f;
player->unk_A4 = 0.0f;
if ((player->unk_3C & 2) != 0) {
player->unk_3C &= ~2;
}
motAttr = HU3D_MOTATTR_NONE; motAttr = HU3D_MOTATTR_NONE;
state = 3; state = 3;
} }
@ -6582,12 +6567,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
HuAudCharVoicePlay(var_r31->unk_11C, 0x123); HuAudCharVoicePlay(var_r31->unk_11C, 0x123);
var_r31->unk_FC |= 0x10; var_r31->unk_FC |= 0x10;
var_r31->unk_00.unk_3C |= 0x210; var_r31->unk_00.unk_3C |= 0x210;
var_r31->unk_00.unk_38 = 1; fn_1_2BD0(&var_r31->unk_00, 48.179996f, 0.0f);
var_r31->unk_00.unk_84.y = 48.179996f;
var_r31->unk_00.unk_A4 = 0.0f;
if (var_r31->unk_00.unk_3C & 2) {
var_r31->unk_00.unk_3C &= ~0x2;
}
Hu3DMotionShiftSet(var_r30->model[0], var_r30->motion[8], 0.0f, 8.0f, 0); Hu3DMotionShiftSet(var_r30->model[0], var_r30->motion[8], 0.0f, 8.0f, 0);
if (fn_1_125C0(0, 1) <= 0) { if (fn_1_125C0(0, 1) <= 0) {
var_r31->unk_FC |= 0x80000; var_r31->unk_FC |= 0x80000;
@ -6599,12 +6579,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
HuAudCharVoicePlay(var_r31->unk_11C, 0x123); HuAudCharVoicePlay(var_r31->unk_11C, 0x123);
var_r31->unk_FC |= 0x100; var_r31->unk_FC |= 0x100;
var_r31->unk_00.unk_3C |= 0x210; var_r31->unk_00.unk_3C |= 0x210;
var_r31->unk_00.unk_38 = 1; fn_1_2BD0(&var_r31->unk_00, 0.0f, 0.0f);
var_r31->unk_00.unk_84.y = 0.0f;
var_r31->unk_00.unk_A4 = 0.0f;
if (var_r31->unk_00.unk_3C & 2) {
var_r31->unk_00.unk_3C &= ~0x2;
}
if (fn_1_125C0(0, 1) <= 0) { if (fn_1_125C0(0, 1) <= 0) {
var_r31->unk_FC |= 0x80000; var_r31->unk_FC |= 0x80000;
} }
@ -6715,12 +6690,7 @@ void fn_1_1E150(omObjData *var_r29)
HuAudCharVoicePlay(var_r31->unk_11C, 0x123); HuAudCharVoicePlay(var_r31->unk_11C, 0x123);
var_r31->unk_FC |= 0x800000; var_r31->unk_FC |= 0x800000;
var_r31->unk_118 = 0x7EB; var_r31->unk_118 = 0x7EB;
var_r31->unk_00.unk_38 = 1; fn_1_2BD0(&var_r31->unk_00, 53.533333f, 0.0f);
var_r31->unk_00.unk_84.y = 53.533333f;
var_r31->unk_00.unk_A4 = 0.0f;
if (var_r31->unk_00.unk_3C & 2) {
var_r31->unk_00.unk_3C &= ~0x2;
}
Hu3DMotionSet(var_r29->model[0], var_r29->motion[8]); Hu3DMotionSet(var_r29->model[0], var_r29->motion[8]);
Hu3DModelAttrReset(var_r29->model[0], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(var_r29->model[0], HU3D_ATTR_DISPOFF);
fn_1_125C0(0, 0); fn_1_125C0(0, 0);
@ -7129,12 +7099,7 @@ void fn_1_20170(omObjData *var_r30)
var_r29->unk_00.unk_A8 = MapPos( var_r29->unk_00.unk_A8 = MapPos(
var_r29->unk_00.unk_6C.x, var_r29->unk_00.unk_6C.y, var_r29->unk_00.unk_6C.z, var_r29->unk_00.unk_C0, &var_r29->unk_00.unk_AC); var_r29->unk_00.unk_6C.x, var_r29->unk_00.unk_6C.y, var_r29->unk_00.unk_6C.z, var_r29->unk_00.unk_C0, &var_r29->unk_00.unk_AC);
if (var_r29->unk_00.unk_A8 > var_r29->unk_00.unk_6C.y) { if (var_r29->unk_00.unk_A8 > var_r29->unk_00.unk_6C.y) {
var_r31->unk_00.unk_38 = 1; fn_1_2BD0(&var_r31->unk_00, 53.533333f, 0.0f);
var_r31->unk_00.unk_84.y = 53.533333f;
var_r31->unk_00.unk_A4 = 0.0f;
if (var_r31->unk_00.unk_3C & 2) {
var_r31->unk_00.unk_3C &= ~2;
}
} }
var_f31 = var_r29->unk_00.unk_6C.x; var_f31 = var_r29->unk_00.unk_6C.x;
var_f30 = var_r29->unk_00.unk_6C.z; var_f30 = var_r29->unk_00.unk_6C.z;

2
src/REL/m451Dll/m451.c
View file

@ -17,8 +17,6 @@
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "rel_sqrt_consts.h"
typedef struct bss_348_data { typedef struct bss_348_data {
s16 unk0[5]; s16 unk0[5];
s16 unkA; s16 unkA;

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

@ -12,7 +12,7 @@
#include "game/pad.h" #include "game/pad.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "string.h" #include "string.h"
#include "REL/m453Dll.h" #include "REL/m453Dll.h"

88
src/REL/m455Dll/main.c
View file

@ -1,25 +1,24 @@
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/object.h" #include "game/object.h"
#include "game/objsub.h" #include "game/objsub.h"
#include "game/hsfman.h"
#include "game/hsfdraw.h"
#include "game/hsfmotion.h" #include "game/hsfmotion.h"
#include "game/pad.h" #include "game/pad.h"
#include "game/wipe.h"
#include "game/frand.h"
#include "game/audio.h"
#include "game/minigame_seq.h"
#include "game/gamework_data.h"
#include "game/chrman.h"
#include "REL/m455Dll.h" #include "REL/m455Dll.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/frand.h"
#include "game/gamework_data.h"
#include "game/minigame_seq.h"
#include "game/wipe.h"
#include "ext_math.h" #include "ext_math.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
typedef struct camera_view_params { typedef struct camera_view_params {
float zoom; float zoom;
Vec pos; Vec pos;
@ -51,7 +50,6 @@ Vec lbl_1_bss_8;
s16 lbl_1_bss_4; s16 lbl_1_bss_4;
s32 lbl_1_bss_0; s32 lbl_1_bss_0;
void fn_1_330(omObjData *object); void fn_1_330(omObjData *object);
void fn_1_B94(Process *objman); void fn_1_B94(Process *objman);
void fn_1_2A90(Process *objman); void fn_1_2A90(Process *objman);
@ -152,8 +150,6 @@ s16 lbl_1_data_90 = -1;
s32 lbl_1_data_94 = -1; s32 lbl_1_data_94 = -1;
s32 lbl_1_data_98 = -1; s32 lbl_1_data_98 = -1;
void fn_1_478(omObjData *object) void fn_1_478(omObjData *object)
{ {
s32 i; s32 i;
@ -231,7 +227,8 @@ void fn_1_478(omObjData *object)
GWPlayerCoinWinSet(i, lbl_1_bss_22 + 1); GWPlayerCoinWinSet(i, lbl_1_bss_22 + 1);
} }
} }
} else { }
else {
HuAudSStreamPlay(4); HuAudSStreamPlay(4);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
GWPlayerCoinWinSet(i, 3); GWPlayerCoinWinSet(i, 3);
@ -297,7 +294,6 @@ void fn_1_B94(Process *objman)
omMakeGroupEx(objman, 0, 4); omMakeGroupEx(objman, 0, 4);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
omAddObjEx(objman, 5, 10, 50, 0, fn_1_D14); omAddObjEx(objman, 5, 10, 50, 0, fn_1_D14);
} }
} }
@ -333,11 +329,16 @@ s32 fn_1_C90(void)
s32 fn_1_3214(void); s32 fn_1_3214(void);
u32 lbl_1_data_E0[5][2] = { u32 lbl_1_data_E0[5][2] = {
0x5F0000, 0, 0x5F0000,
0x540024, 1, 0,
0x54001C, 1, 0x540024,
0x5F0017, 0, 1,
0x5F0018, 0, 0x54001C,
1,
0x5F0017,
0,
0x5F0018,
0,
}; };
Vec lbl_1_data_108[4] = { Vec lbl_1_data_108[4] = {
@ -377,7 +378,8 @@ void fn_1_D14(omObjData *object)
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
if (lbl_1_data_E0[i][1] == 0) { if (lbl_1_data_E0[i][1] == 0) {
object->motion[i] = CharModelMotionCreate(player->unk10, lbl_1_data_E0[i][0]); object->motion[i] = CharModelMotionCreate(player->unk10, lbl_1_data_E0[i][0]);
} else { }
else {
object->motion[i] = CharModelMotionCreate(player->unk10, player->unk10 + lbl_1_data_E0[i][0]); object->motion[i] = CharModelMotionCreate(player->unk10, player->unk10 + lbl_1_data_E0[i][0]);
} }
} }
@ -418,7 +420,8 @@ void fn_1_D14(omObjData *object)
if (player->unk58 < 0) { if (player->unk58 < 0) {
player->unk58 = 0; player->unk58 = 0;
} }
} else { }
else {
player->unk58 = lbl_1_bss_16 + (60.0f * (0.1f * (4 - player->unk12))) + ((frand8() / 256.0f) * 30.0f) + 6.0f; player->unk58 = lbl_1_bss_16 + (60.0f * (0.1f * (4 - player->unk12))) + ((frand8() / 256.0f) * 30.0f) + 6.0f;
} }
player->unk28 = -1; player->unk28 = -1;
@ -430,23 +433,15 @@ void fn_1_1400(omObjData *object)
M455Player *player = object->data; M455Player *player = object->data;
if (player->unk58 != 0) { if (player->unk58 != 0) {
player->unk58--; player->unk58--;
} else { }
else {
player->unkA |= PAD_BUTTON_A; player->unkA |= PAD_BUTTON_A;
} }
} }
float lbl_1_data_154[4] = { float lbl_1_data_154[4] = { -350, -170, 170, 350 };
-350,
-170,
170,
350
};
float lbl_1_data_164[3] = { float lbl_1_data_164[3] = { 1.5f, 1.0f, 0.5f };
1.5f,
1.0f,
0.5f
};
float fn_1_2390(float arg0, float arg1, float arg2); float fn_1_2390(float arg0, float arg1, float arg2);
s32 fn_1_24F0(Vec *arg0, Vec *arg1, float arg2); s32 fn_1_24F0(Vec *arg0, Vec *arg1, float arg2);
@ -461,7 +456,6 @@ void fn_1_1444(omObjData *object)
Vec spC; Vec spC;
float temp_f31; float temp_f31;
temp_r31 = object->data; temp_r31 = object->data;
temp_r29 = temp_r31->unk1C; temp_r29 = temp_r31->unk1C;
temp_r28 = temp_r31->unk20; temp_r28 = temp_r31->unk20;
@ -482,7 +476,8 @@ void fn_1_1444(omObjData *object)
temp_r31->unk7 = HuPadStkY[temp_r31->unk4]; temp_r31->unk7 = HuPadStkY[temp_r31->unk4];
temp_r31->unk8 = HuPadBtn[temp_r31->unk4]; temp_r31->unk8 = HuPadBtn[temp_r31->unk4];
temp_r31->unkA = HuPadBtnDown[temp_r31->unk4]; temp_r31->unkA = HuPadBtnDown[temp_r31->unk4];
} else { }
else {
temp_r31->unk8 = temp_r31->unkA = 0; temp_r31->unk8 = temp_r31->unkA = 0;
temp_r31->unk6 = temp_r31->unk7 = 0; temp_r31->unk6 = temp_r31->unk7 = 0;
fn_1_1400(object); fn_1_1400(object);
@ -490,7 +485,8 @@ void fn_1_1444(omObjData *object)
if (lbl_1_bss_16 == 0) { if (lbl_1_bss_16 == 0) {
if (temp_r31->unkC) { if (temp_r31->unkC) {
omVibrate(temp_r31->unk2, 12, 12, 0); omVibrate(temp_r31->unk2, 12, 12, 0);
} else { }
else {
sp18.x = object->trans.x; sp18.x = object->trans.x;
sp18.y = object->trans.y + 300; sp18.y = object->trans.y + 300;
sp18.z = object->trans.z; sp18.z = object->trans.z;
@ -513,7 +509,6 @@ void fn_1_1444(omObjData *object)
Hu3DMotionSpeedSet(object->model[1], 1.2f); Hu3DMotionSpeedSet(object->model[1], 1.2f);
Hu3DMotionShapeSpeedSet(object->model[1], 1.2f); Hu3DMotionShapeSpeedSet(object->model[1], 1.2f);
HuAudFXPlay(1986); HuAudFXPlay(1986);
} }
temp_r29 = 1; temp_r29 = 1;
temp_r28 = HU3D_MOTATTR_LOOP; temp_r28 = HU3D_MOTATTR_LOOP;
@ -585,12 +580,14 @@ void fn_1_1444(omObjData *object)
if (fn_1_320() < 9) { if (fn_1_320() < 9) {
temp_r29 = 0; temp_r29 = 0;
temp_r28 = HU3D_MOTATTR_LOOP; temp_r28 = HU3D_MOTATTR_LOOP;
} else { }
else {
object->rot.y = fn_1_2390(object->rot.y, 0, 0.2f); object->rot.y = fn_1_2390(object->rot.y, 0, 0.2f);
if (temp_r31->unk2 == lbl_1_bss_30) { if (temp_r31->unk2 == lbl_1_bss_30) {
temp_r29 = 3; temp_r29 = 3;
temp_r28 = HU3D_MOTATTR_NONE; temp_r28 = HU3D_MOTATTR_NONE;
} else { }
else {
temp_r29 = 4; temp_r29 = 4;
temp_r28 = HU3D_MOTATTR_NONE; temp_r28 = HU3D_MOTATTR_NONE;
} }
@ -608,11 +605,13 @@ void fn_1_1444(omObjData *object)
temp_r31->unk2C = temp_r31->unk2E; temp_r31->unk2C = temp_r31->unk2E;
} }
temp_r31->unk30++; temp_r31->unk30++;
} else { }
else {
if (temp_r31->unk30 > 30.0f) { if (temp_r31->unk30 > 30.0f) {
espDispOff(temp_r31->unk2A); espDispOff(temp_r31->unk2A);
temp_r31->unk2C = 0; temp_r31->unk2C = 0;
} else { }
else {
temp_r31->unk30++; temp_r31->unk30++;
} }
} }
@ -683,7 +682,8 @@ void fn_1_2060(ModelData *arg0, Mtx arg1)
hookPos.y = -60.000004f; hookPos.y = -60.000004f;
hookPos.z = 35.0f; hookPos.z = 35.0f;
MTXMultVec(hookMtx, &hookPos, &vtxPos[3]); MTXMultVec(hookMtx, &hookPos, &vtxPos[3]);
} else { }
else {
vtxPos[3].x = modelPuku->pos.x; vtxPos[3].x = modelPuku->pos.x;
vtxPos[3].y = modelPuku->pos.y; vtxPos[3].y = modelPuku->pos.y;
vtxPos[3].z = modelPuku->pos.z; vtxPos[3].z = modelPuku->pos.z;

19
src/REL/m461Dll/main.c
View file

@ -22,7 +22,6 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
#undef ABS #undef ABS
#define ABS(x) ((0 > (x)) ? -(x) : (x)) #define ABS(x) ((0 > (x)) ? -(x) : (x))
@ -702,7 +701,7 @@ void fn_1_2DC8(WorkPlayerOld *player, s32 count, Vec *data)
void fn_1_2DD4(WorkPlayerOld *player) void fn_1_2DD4(WorkPlayerOld *player)
{ {
omSetTra(player->unk0, player->unk6C.x, player->unk6C.y, player->unk6C.z); omSetTra(player->unk0, player->unk6C.x, player->unk6C.y, player->unk6C.z);
omSetRot(player->unk0, 0, player->unk9C, 0); omSetRot(player->unk0, 0.0f, player->unk9C, 0.0f);
} }
void fn_1_2E34(WorkPlayerOld *player) void fn_1_2E34(WorkPlayerOld *player)
@ -840,12 +839,7 @@ void fn_1_3C74(WorkPlayerOld *player, s32 *state, u32 *motAttr)
} }
if(player->unk14[3] >= 0 && (player->unk28 & 0x100)) { if(player->unk14[3] >= 0 && (player->unk28 & 0x100)) {
player->unk38 = 1; fn_1_2BD0(player, 26.766666f, 1.0f);
player->unk84.y = 26.766666f;
player->unkA4 = 1;
if(player->unk3C & 0x2) {
player->unk3C &= ~0x2;
}
*motAttr = HU3D_MOTATTR_NONE; *motAttr = HU3D_MOTATTR_NONE;
*state = 3; *state = 3;
} }
@ -868,7 +862,7 @@ void fn_1_3D4C(WorkPlayerOld *player, s32 *state, u32 *motAttr)
player->unk84.y += -2.4333334f; player->unk84.y += -2.4333334f;
if(player->unk14[5] >= 0 && (player->unk28 & 0x140)) { if(player->unk14[5] >= 0 && (player->unk28 & 0x140)) {
player->unk38 = 3; player->unk38 = 3;
player->unk84.y = 0; player->unk84.y = 0.0f;
player->unk3C &= ~0x3; player->unk3C &= ~0x3;
player->unk3C |= 0x4; player->unk3C |= 0x4;
*motAttr = HU3D_MOTATTR_NONE; *motAttr = HU3D_MOTATTR_NONE;
@ -895,12 +889,7 @@ void fn_1_3E60(WorkPlayerOld *player, s32 *state, u32 *motAttr)
void fn_1_3F18(WorkPlayerOld *player, s32 *state, u32 *motAttr) void fn_1_3F18(WorkPlayerOld *player, s32 *state, u32 *motAttr)
{ {
if(Hu3DMotionShiftIDGet(player->unk0->model[0]) < 0 && Hu3DMotionEndCheck(player->unk0->model[0])) { if(Hu3DMotionShiftIDGet(player->unk0->model[0]) < 0 && Hu3DMotionEndCheck(player->unk0->model[0])) {
player->unk38 = 1; fn_1_2BD0(player, 0.0f, 0.0f);
player->unk84.y = 0;
player->unkA4 = 0;
if(player->unk3C & 0x2) {
player->unk3C &= ~0x2;
}
} }
} }

3
src/REL/mentDll/common.c
View file

@ -13,9 +13,6 @@
#include "game/wipe.h" #include "game/wipe.h"
#include "math.h" #include "math.h"
#include "rel_sqrt_consts.h"
Process *lbl_1_bss_0; Process *lbl_1_bss_0;
// TODO: unknown type // TODO: unknown type
extern s32 lbl_1_bss_A8[]; extern s32 lbl_1_bss_A8[];

103
src/REL/messDll/main.c
View file

@ -9,7 +9,6 @@
#include "dolphin.h" #include "dolphin.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
extern s32 sprintf(char *, const char *, s32); extern s32 sprintf(char *, const char *, s32);
@ -27,7 +26,8 @@ static u8 lbl_1_bss_4_pad[4];
static s16 lbl_1_bss_2; static s16 lbl_1_bss_2;
static s16 lbl_1_bss_0; static s16 lbl_1_bss_0;
void ObjectSetup(void) { void ObjectSetup(void)
{
OSReport("******* SAFObjectSetup *********\n"); OSReport("******* SAFObjectSetup *********\n");
lbl_1_bss_34 = omInitObjMan(0x32, 0x2000); lbl_1_bss_34 = omInitObjMan(0x32, 0x2000);
CRot.x = -20.0f; CRot.x = -20.0f;
@ -46,12 +46,14 @@ void ObjectSetup(void) {
lbl_1_bss_8 = HuPrcChildCreate(fn_1_E88, 100, 0x3000, 0, lbl_1_bss_34); lbl_1_bss_8 = HuPrcChildCreate(fn_1_E88, 100, 0x3000, 0, lbl_1_bss_34);
} }
static void fn_1_2BC(omObjData *arg0) { static void fn_1_2BC(omObjData *arg0)
{
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10);
arg0->func = fn_1_300; arg0->func = fn_1_300;
} }
static void fn_1_300(omObjData *arg0) { static void fn_1_300(omObjData *arg0)
{
Vec sp2C; Vec sp2C;
Vec sp20; Vec sp20;
Vec sp14; Vec sp14;
@ -104,69 +106,19 @@ static void fn_1_300(omObjData *arg0) {
} }
} }
static char *lbl_1_data_32C[] = { static char *lbl_1_data_32C[]
"001_Character_Name_ss", = { "001_Character_Name_ss", "002_Hidden_Block", "003_Battle_M", "004_Bowser_M", "005_Warp_M", "006_Mushroom_M", "007_Lot_house", "008_Boo_house",
"002_Hidden_Block", "009_ItemName", "010_Bord", "011_RoundItem", "012_Spaceamida", "013_Star_M", "014_RollerCoaster", "015_Last5", "016_ItemShop", "017_System",
"003_Battle_M", "018_ModeSelect", "019_Item", "020_Map2_event", "021_Lucky_Minigame", "022_Bord_Start", "023_Map3_event", "024_Minigame_Name", "025_mg_446",
"004_Bowser_M", "026_debugmes", "027_Party_Mode", "028_SETUP", "029_Miracle", "030_mg_kuppa", "031_Story_Mode", "032_Bowser_Story", "033_Map4_event",
"005_Warp_M", "034_mg_inst", "035_E3_only", "036_saf", "037_Mg_inst_sys_", "038_Bord_Results", "039_Bord_Results2", "040_Map5_event", "041_Mg_Mode",
"006_Mushroom_M", "042_mg_445", "043_mg_447", "044_mg_448", "045_mg_449", "046_mg_450", "047_tutorial", "048_Option_Rooml", "049_Map6_event", "050_charley",
"007_Lot_house", "051_Present_Room", "052_Extra_Room", "053_Staff_Post", "054_Staff_Name", "055_Opening_Demo", "056_mgex_inst", NULL };
"008_Boo_house",
"009_ItemName",
"010_Bord",
"011_RoundItem",
"012_Spaceamida",
"013_Star_M",
"014_RollerCoaster",
"015_Last5",
"016_ItemShop",
"017_System",
"018_ModeSelect",
"019_Item",
"020_Map2_event",
"021_Lucky_Minigame",
"022_Bord_Start",
"023_Map3_event",
"024_Minigame_Name",
"025_mg_446",
"026_debugmes",
"027_Party_Mode",
"028_SETUP",
"029_Miracle",
"030_mg_kuppa",
"031_Story_Mode",
"032_Bowser_Story",
"033_Map4_event",
"034_mg_inst",
"035_E3_only",
"036_saf",
"037_Mg_inst_sys_",
"038_Bord_Results",
"039_Bord_Results2",
"040_Map5_event",
"041_Mg_Mode",
"042_mg_445",
"043_mg_447",
"044_mg_448",
"045_mg_449",
"046_mg_450",
"047_tutorial",
"048_Option_Rooml",
"049_Map6_event",
"050_charley",
"051_Present_Room",
"052_Extra_Room",
"053_Staff_Post",
"054_Staff_Name",
"055_Opening_Demo",
"056_mgex_inst",
NULL
};
static s16 lbl_1_data_410 = -1; static s16 lbl_1_data_410 = -1;
static void fn_1_E88(void) { static void fn_1_E88(void)
{
s16 sp10[256]; // unknown size s16 sp10[256]; // unknown size
char spC[4]; char spC[4];
char sp8[4]; char sp8[4];
@ -226,13 +178,15 @@ static void fn_1_E88(void) {
var_r31 = 0; var_r31 = 0;
} }
var_r30 = 0; var_r30 = 0;
} else if (temp_r3_2 & 0x40) { }
else if (temp_r3_2 & 0x40) {
var_r31--; var_r31--;
if (var_r31 < 0) { if (var_r31 < 0) {
var_r31 = var_r27 - 1; var_r31 = var_r27 - 1;
} }
var_r30 = 0; var_r30 = 0;
} else if (temp_r3_2 & 0x200) { }
else if (temp_r3_2 & 0x200) {
var_r30--; var_r30--;
if (var_r30 < 0) { if (var_r30 < 0) {
var_r31--; var_r31--;
@ -241,7 +195,8 @@ static void fn_1_E88(void) {
} }
var_r30 = sp10[var_r31] - 1; var_r30 = sp10[var_r31] - 1;
} }
} else { }
else {
var_r30++; var_r30++;
if (var_r30 >= sp10[var_r31]) { if (var_r30 >= sp10[var_r31]) {
var_r31++; var_r31++;
@ -255,18 +210,10 @@ static void fn_1_E88(void) {
} }
} }
static char *lbl_1_data_440[] = { static char *lbl_1_data_440[] = { "]1^", "]2^", "]3^", "]4^", "]5^", "]6^", "]7^", "]8^" };
"]1^",
"]2^",
"]3^",
"]4^",
"]5^",
"]6^",
"]7^",
"]8^"
};
static s32 fn_1_11B0(s16 arg0, s16 arg1) { static s32 fn_1_11B0(s16 arg0, s16 arg1)
{
WindowData *temp_r30; WindowData *temp_r30;
float spC[2]; float spC[2];
s32 temp_r28; s32 temp_r28;

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

@ -6,7 +6,6 @@
#include "game/wipe.h" #include "game/wipe.h"
#include "ext_math.h" #include "ext_math.h"
#include "rel_sqrt_consts.h"
typedef struct camera_view_params { typedef struct camera_view_params {
Vec rot; Vec rot;

39
src/REL/modeseldll/main.c
View file

@ -1,15 +1,14 @@
#include "game/object.h" #include "REL/modeseldll.h"
#include "game/audio.h"
#include "game/gamework_data.h"
#include "game/hsfman.h" #include "game/hsfman.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/process.h" #include "game/process.h"
#include "game/window.h" #include "game/window.h"
#include "game/objsub.h"
#include "game/audio.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "game/pad.h"
#include "math.h" #include "math.h"
#include "game/gamework_data.h"
#include "REL/modeseldll.h"
#include "rel_sqrt_consts.h"
typedef struct camera_view_params { typedef struct camera_view_params {
Vec rot; Vec rot;
@ -17,10 +16,7 @@ typedef struct camera_view_params {
float zoom; float zoom;
} CameraViewParams; } CameraViewParams;
CameraViewParams lbl_1_data_0[] = { CameraViewParams lbl_1_data_0[] = { { { 0, 0, 0 }, { 0, 0, 0 }, 1500 }, { { 0, 0, 0 }, { 0, 0, 0 }, 524 } };
{ { 0, 0, 0 }, { 0, 0, 0 }, 1500 },
{ { 0, 0, 0 }, { 0, 0, 0 }, 524 }
};
omObjData *lbl_1_bss_7C; omObjData *lbl_1_bss_7C;
Process *lbl_1_bss_78; Process *lbl_1_bss_78;
@ -79,7 +75,8 @@ void fn_1_414(void)
fn_1_9F4(); fn_1_9F4();
if (omovlevtno) { if (omovlevtno) {
HuAudSeqPlay(43); HuAudSeqPlay(43);
} else { }
else {
if (!fn_1_37DC()) { if (!fn_1_37DC()) {
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20);
@ -91,7 +88,8 @@ void fn_1_414(void)
while (1) { while (1) {
HuPrcVSleep(); HuPrcVSleep();
} }
} else { }
else {
s16 group = HuSprGrpCreate(1); s16 group = HuSprGrpCreate(1);
s16 sprite = HuTHPSprCreateVol("movie/opmov_s00.thp", 0, 3000, 70.0); s16 sprite = HuTHPSprCreateVol("movie/opmov_s00.thp", 0, 3000, 70.0);
HuSprGrpMemberSet(group, 0, sprite); HuSprGrpMemberSet(group, 0, sprite);
@ -123,14 +121,16 @@ void fn_1_414(void)
while (1) { while (1) {
HuPrcVSleep(); HuPrcVSleep();
} }
} else { }
else {
s16 i; s16 i;
omOvlHisData *his; omOvlHisData *his;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
GWPlayerCfg[i].pad_idx = i; GWPlayerCfg[i].pad_idx = i;
if (!HuPadStatGet(i)) { if (!HuPadStatGet(i)) {
GWPlayerCfg[i].iscom = 0; GWPlayerCfg[i].iscom = 0;
} else { }
else {
GWPlayerCfg[i].iscom = 1; GWPlayerCfg[i].iscom = 1;
} }
} }
@ -322,21 +322,24 @@ void fn_1_1B6C(void)
if (VECMag(&delta_vec) > 0.2) { if (VECMag(&delta_vec) > 0.2) {
VECScale(&delta_vec, &delta_vec, 0.05f); VECScale(&delta_vec, &delta_vec, 0.05f);
VECAdd(&lbl_1_bss_24[0], &delta_vec, &lbl_1_bss_24[0]); VECAdd(&lbl_1_bss_24[0], &delta_vec, &lbl_1_bss_24[0]);
} else { }
else {
lbl_1_bss_24[0] = lbl_1_bss_64; lbl_1_bss_24[0] = lbl_1_bss_64;
} }
VECSubtract(&lbl_1_bss_58, &lbl_1_bss_C[0], &delta_vec); VECSubtract(&lbl_1_bss_58, &lbl_1_bss_C[0], &delta_vec);
if (VECMag(&delta_vec) > 0.2) { if (VECMag(&delta_vec) > 0.2) {
VECScale(&delta_vec, &delta_vec, 0.05f); VECScale(&delta_vec, &delta_vec, 0.05f);
VECAdd(&lbl_1_bss_C[0], &delta_vec, &lbl_1_bss_C[0]); VECAdd(&lbl_1_bss_C[0], &delta_vec, &lbl_1_bss_C[0]);
} else { }
else {
lbl_1_bss_C[0] = lbl_1_bss_58; lbl_1_bss_C[0] = lbl_1_bss_58;
} }
delta_zoom = lbl_1_bss_54 - lbl_1_bss_4[0]; delta_zoom = lbl_1_bss_54 - lbl_1_bss_4[0];
if (sqrtf(delta_zoom * delta_zoom) > 0.2) { if (sqrtf(delta_zoom * delta_zoom) > 0.2) {
delta_zoom *= 0.05f; delta_zoom *= 0.05f;
lbl_1_bss_4[0] += delta_zoom; lbl_1_bss_4[0] += delta_zoom;
} else { }
else {
lbl_1_bss_4[0] = lbl_1_bss_54; lbl_1_bss_4[0] = lbl_1_bss_54;
} }
} }

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

@ -8,7 +8,6 @@
#include "game/pad.h" #include "game/pad.h"
#include "game/printfunc.h" #include "game/printfunc.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "REL/mpexDll.h" #include "REL/mpexDll.h"

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

@ -13,7 +13,6 @@
#include "game/saveload.h" #include "game/saveload.h"
#include "game/window.h" #include "game/window.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "math.h" #include "math.h"

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

@ -10,7 +10,6 @@
#include "game/sprite.h" #include "game/sprite.h"
#include "game/window.h" #include "game/window.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "REL/ztardll.h" #include "REL/ztardll.h"