Merge pull request #366 from dbalatoni13/main

m406Dll cleanups and finished most of m442Dll
This commit is contained in:
Liam Coleman 2024-07-09 16:15:28 -05:00 committed by GitHub
commit 8c20f8bdc2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 2634 additions and 170 deletions

View file

@ -121,8 +121,8 @@ fn_1_13C10 = .text:0x00013C10; // type:function size:0x7E4
fn_1_143F4 = .text:0x000143F4; // type:function size:0x330
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte
__fakeHalf = .rodata:0x00000000; // type:object size:0x8 data:float
__fakeThree = .rodata:0x00000008; // type:object size:0x8 data:float
__fakeHalf = .rodata:0x00000000; // type:object size:0x8 data:double
__fakeThree = .rodata:0x00000008; // type:object size:0x8 data:double
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x8 scope:local 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 scope:local data:float

View file

@ -64,128 +64,131 @@ fn_1_9784 = .text:0x00009784; // type:function size:0x88
fn_1_980C = .text:0x0000980C; // type:function size:0x164
_ctors = .ctors: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_14 = .rodata:0x00000014; // type:object size:0x4 data:float
lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 data:float
lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float
lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float
lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float
lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:float
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float
lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 data:float
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x10 data:4byte
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float
lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 data:float
lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x8 data:double
lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float
lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float
lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 data:float
lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 data:float
lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 data:float
lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x8 data:double
lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 data:double
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 data:float
lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float
lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float
lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 data:float
lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 data:float
lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x8 data:double
lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x8 data:double
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 data:float
lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 data:float
lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float
lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 data:double
lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x8 data:double
lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 data:float
lbl_1_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 data:float
lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 data:float
lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 data:float
lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 data:float
lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 data:float
lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 data:float
lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x8 data:double
lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x8 data:double
lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x8 data:double
lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x8 data:double
lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 data:float
lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x4 data:float
lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 data:float
lbl_1_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 data:float
lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 data:float
lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 data:float
lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x4 data:float
lbl_1_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 data:float
lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x8 data:double
lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 data:float
lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 data:float
lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x4 data:float
lbl_1_rodata_144 = .rodata:0x00000144; // type:object size:0x4 data:float
lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 data:float
lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 data:float
lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 data:double
lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float
lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x8 data:double
lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 data:float
lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0xC data:4byte
lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 data:float
lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 data:float
lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x8 data:double
lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x8 data:double
lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x8 data:double
lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x8 data:double
lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float
lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 data:float
lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x8 data:double
lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x8 data:double
lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 data:float
lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 data:float
lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 data:float
lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 data:float
lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 data:float
lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x8 data:double
lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x8 data:double
lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x8 data:float
lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x4 data:float
lbl_1_rodata_1EC = .rodata:0x000001EC; // type:object size:0x4 data:float
lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 data:float
lbl_1_rodata_1F4 = .rodata:0x000001F4; // type:object size:0x4 data:float
lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x4 data:float
lbl_1_rodata_1FC = .rodata:0x000001FC; // type:object size:0x4 data:float
lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x8 data:double
lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 data:float
lbl_1_rodata_20C = .rodata:0x0000020C; // type:object size:0x4 data:float
lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x4 data:float
lbl_1_rodata_214 = .rodata:0x00000214; // type:object size:0x4 data:float
__fakeHalf = .rodata:0x00000000; // type:object size:0x8 data:double
__fakeThree = .rodata:0x00000008; // type:object size:0x8 data:double
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local 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:0x4 scope:local data:float
lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 scope:local 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 scope:local data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:float
lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 scope:local data:float
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x10 scope:local data:4byte
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 scope:local 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:0x8 scope:local data:double
lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 scope:local 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 scope:local 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:0x4 scope:local data:float
lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x8 scope:local data:double
lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 scope:local data:float
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 scope:local data:double
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 scope:local data:float
lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 scope:local 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 scope:local data:float
lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 scope:local data:float
lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 scope:local 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 scope:local data:float
lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 scope:local 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 scope:local 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 scope:local data:float
lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x8 scope:local data:double
lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x8 scope:local data:double
lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 scope:local 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 scope:local 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 scope:local 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 scope:local 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:0x8 scope:local data:double
lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 scope:local 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 scope:local 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 scope:local data:float
lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 scope:local data:double
lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 scope:local data:float
lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x8 scope:local data:double
lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 scope:local data:float
lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0xC scope:local 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 scope:local data:float
lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x8 scope:local data:double
lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x8 scope:local data:double
lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x8 scope:local 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 scope:local data:float
lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 scope:local 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 scope:local data:float
lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x8 scope:local 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 scope:local 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 scope:local 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 scope:local data:float
lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x8 scope:local data:double
lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 scope:local data:float
lbl_1_rodata_20C = .rodata:0x0000020C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x4 scope:local data:float
lbl_1_rodata_214 = .rodata:0x00000214; // type:object size:0x4 scope:local data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x54 data:float
lbl_1_data_54 = .data:0x00000054; // type:object size:0xC data:float
lbl_1_data_60 = .data:0x00000060; // type:object size:0xC data:float
lbl_1_data_6C = .data:0x0000006C; // type:object size:0x4
lbl_1_data_70 = .data:0x00000070; // type:object size:0xC
lbl_1_data_7C = .data:0x0000007C; // type:object size:0xC
lbl_1_data_88 = .data:0x00000088; // type:object size:0x23 data:string
lbl_1_data_6C = .data:0x0000006C; // type:object size:0x4 data:byte
lbl_1_data_70 = .data:0x00000070; // type:object size:0xC data:float
lbl_1_data_7C = .data:0x0000007C; // type:object size:0xC data:float
lbl_1_data_88 = .data:0x00000088; // type:object size:0x24 data:string
lbl_1_data_AC = .data:0x000000AC; // type:object size:0x4 data:4byte
jumptable_1_data_B0 = .data:0x000000B0; // type:object size:0x30 scope:local
lbl_1_data_E0 = .data:0x000000E0; // type:object size:0x1C data:string
lbl_1_data_FC = .data:0x000000FC; // type:object size:0x1C
lbl_1_data_118 = .data:0x00000118; // type:object size:0x8
lbl_1_data_120 = .data:0x00000120; // type:object size:0x30
lbl_1_data_150 = .data:0x00000150; // type:object size:0x1A
lbl_1_data_16A = .data:0x0000016A; // type:object size:0x20
lbl_1_data_18A = .data:0x0000018A; // type:object size:0x16
lbl_1_data_1A0 = .data:0x000001A0; // type:object size:0xC
lbl_1_data_FC = .data:0x000000FC; // type:object size:0x1C data:4byte
lbl_1_data_118 = .data:0x00000118; // type:object size:0x8 data:4byte
lbl_1_data_120 = .data:0x00000120; // type:object size:0x30 data:float
lbl_1_data_150 = .data:0x00000150; // type:object size:0x1A data:string
lbl_1_data_16A = .data:0x0000016A; // type:object size:0x20 data:2byte
lbl_1_data_18A = .data:0x0000018A; // type:object size:0x14 data:2byte
lbl_1_data_1A0 = .data:0x000001A0; // type:object size:0xC data:4byte
lbl_1_data_1AC = .data:0x000001AC; // type:object size:0xC data:string
lbl_1_data_1B8 = .data:0x000001B8; // type:object size:0x1 data:byte
lbl_1_data_1BC = .data:0x000001BC; // type:object size:0x1 data:byte
lbl_1_data_1C0 = .data:0x000001C0; // type:object size:0x30
lbl_1_data_1F0 = .data:0x000001F0; // type:object size:0x1 data:byte
lbl_1_data_1F4 = .data:0x000001F4; // type:object size:0x24
lbl_1_data_218 = .data:0x00000218; // type:object size:0x1 data:byte
lbl_1_data_21C = .data:0x0000021C; // type:object size:0x20
lbl_1_data_23C = .data:0x0000023C; // type:object size:0xC
lbl_1_data_248 = .data:0x00000248; // type:object size:0x8
lbl_1_data_1B8 = .data:0x000001B8; // type:object size:0x4 data:byte
lbl_1_data_1BC = .data:0x000001BC; // type:object size:0x4 data:byte
lbl_1_data_1C0 = .data:0x000001C0; // type:object size:0x30 data:float
lbl_1_data_1F0 = .data:0x000001F0; // type:object size:0x4 data:byte
lbl_1_data_1F4 = .data:0x000001F4; // type:object size:0x18 data:float
lbl_1_data_20C = .data:0x0000020C; // type:object size:0xC data:byte
lbl_1_data_218 = .data:0x00000218; // type:object size:0x4 data:byte
lbl_1_data_21C = .data:0x0000021C; // type:object size:0x20 data:2byte
lbl_1_data_23C = .data:0x0000023C; // type:object size:0xC data:4byte
lbl_1_data_248 = .data:0x00000248; // type:object size:0x8 data:2byte
lbl_1_data_250 = .data:0x00000250; // type:object size:0x8 data:float
lbl_1_data_258 = .data:0x00000258; // type:object size:0x10
lbl_1_data_268 = .data:0x00000268; // type:object size:0xC
@ -199,7 +202,7 @@ lbl_1_bss_C084 = .bss:0x0000C084; // type:object size:0x974
lbl_1_bss_C9F8 = .bss:0x0000C9F8; // type:object size:0x5000 data:4byte
lbl_1_bss_119F8 = .bss:0x000119F8; // type:object size:0x4 data:4byte
lbl_1_bss_119FC = .bss:0x000119FC; // type:object size:0x271
lbl_1_bss_11C6D = .bss:0x00011C6D; // type:object size:0x273
lbl_1_bss_11C6D = .bss:0x00011C6D; // type:object size:0x271
lbl_1_bss_11EE0 = .bss:0x00011EE0; // type:object size:0x4 data:4byte
lbl_1_bss_11EE4 = .bss:0x00011EE4; // type:object size:0x4 data:4byte
lbl_1_bss_11EE8 = .bss:0x00011EE8; // type:object size:0x2 data:2byte
@ -217,7 +220,8 @@ lbl_1_bss_11F20 = .bss:0x00011F20; // type:object size:0x4 data:4byte
lbl_1_bss_11F24 = .bss:0x00011F24; // type:object size:0x4 data:4byte
lbl_1_bss_11F28 = .bss:0x00011F28; // type:object size:0x4 data:4byte
lbl_1_bss_11F2C = .bss:0x00011F2C; // type:object size:0x4 data:4byte
lbl_1_bss_11F30 = .bss:0x00011F30; // type:object size:0x8 data:4byte
lbl_1_bss_11F30 = .bss:0x00011F30; // type:object size:0x4 data:4byte
lbl_1_bss_11F34 = .bss:0x00011F34; // type:object size:0x4 data:4byte
lbl_1_bss_11F38 = .bss:0x00011F38; // type:object size:0x4 data:4byte
lbl_1_bss_11F3C = .bss:0x00011F3C; // type:object size:0x4 data:4byte
lbl_1_bss_11F40 = .bss:0x00011F40; // type:object size:0x4 data:4byte

11
include/REL/m442Dll.h Normal file
View file

@ -0,0 +1,11 @@
#ifndef M442DLL_H
#define M442DLL_H
#include "game/object.h"
#include "game/process.h"
s16 fn_1_90EC(void);
s32 fn_1_91AC(Process *arg0, s16 arg1);
void fn_1_94AC(s32 arg0);
#endif

View file

@ -21,7 +21,7 @@ typedef struct UnkM406PlayerStruct2 {
/* 0x00 */ Vec *unk_00;
/* 0x04 */ HsfFace *unk_04;
/* 0x08 */ s16 unk_08;
} UnkM406PlayerStruct2; /* size = 0x084C */
} UnkM406PlayerStruct2; /* size = 0x0C */
typedef struct M406PlayerWork {
/* 0x00 */ union {
@ -35,38 +35,38 @@ typedef struct M406PlayerWork {
};
s16 unk_00;
};
s16 unk_02;
s16 unk_04;
s8 unk_06;
s8 unk_07;
u16 unk_08;
u16 unk_0A;
s16 unk_0C;
s16 unk_0E;
s16 unk_10;
s16 unk_12;
Vec unk_14;
char unk20[0xC];
Vec unk_2C;
s32 unk_38;
u32 unk_3C;
float unk_40;
UnkM406PlayerStruct2 unk_44;
float unk_50;
float unk_54;
s16 unk_58;
s16 unk_5A;
s16 unk_5C;
s16 unk_5E;
s16 unk_60;
s16 unk_62;
s16 unk_64;
float unk_68;
float unk_6C;
float unk_70;
float unk_74;
float unk_78;
s32 unk_7C[2];
/* 0x02 */ s16 unk_02;
/* 0x04 */ s16 unk_04;
/* 0x06 */ s8 unk_06;
/* 0x07 */ s8 unk_07;
/* 0x08 */ u16 unk_08;
/* 0x0A */ u16 unk_0A;
/* 0x0C */ s16 unk_0C;
/* 0x0E */ s16 unk_0E;
/* 0x10 */ s16 unk_10;
/* 0x12 */ s16 unk_12;
/* 0x14 */ Vec unk_14;
/* 0x20 */ char unk20[0xC];
/* 0x2C */ Vec unk_2C;
/* 0x38 */ s32 unk_38;
/* 0x3C */ u32 unk_3C;
/* 0x40 */ float unk_40;
/* 0x44 */ UnkM406PlayerStruct2 unk_44;
/* 0x50 */ float unk_50;
/* 0x54 */ float unk_54;
/* 0x58 */ s16 unk_58;
/* 0x5A */ s16 unk_5A;
/* 0x5C */ s16 unk_5C;
/* 0x5E */ s16 unk_5E;
/* 0x60 */ s16 unk_60;
/* 0x62 */ s16 unk_62;
/* 0x64 */ s16 unk_64;
/* 0x68 */ float unk_68;
/* 0x6C */ float unk_6C;
/* 0x70 */ float unk_70;
/* 0x74 */ float unk_74;
/* 0x78 */ float unk_78;
/* 0x7C */ s32 unk_7C[2];
} M406PlayerWork; /* size = 0x84 */
void fn_1_1065C(omObjData *object);
@ -82,7 +82,7 @@ s32 fn_1_129E4(omObjData *object);
void fn_1_12AB8(omObjData *object);
void fn_1_12B00(omObjData *object);
void fn_1_12B38(Vec *arg0);
void fn_1_12BC4(omObjData *);
void fn_1_12BC4(omObjData *object);
void fn_1_13A88(s16 arg0, char *arg1, Mtx arg2);
float fn_1_13AF4(float arg8, float arg9, float argA);
s32 fn_1_13C10(Vec *arg0, Vec *arg1);
@ -264,25 +264,25 @@ s32 lbl_1_data_1078[10] = {
};
s32 lbl_1_data_10A0[8][4] = {
{ 0x250000, 0x250001, 0x250010, 0x250011 },
{ 0x250002, 0x250003, 0x250012, 0x250013 },
{ 0x250004, 0x250005, 0x250014, 0x250015 },
{ 0x250006, 0x250007, 0x250016, 0x250017 },
{ 0x250008, 0x250009, 0x250018, 0x250019 },
{ 0x25000A, 0x25000B, 0x25001A, 0x25001B },
{ 0x25000C, 0x25000D, 0x25001C, 0x25001D },
{ 0x25000E, 0x25000F, 0x25001E, 0x25001F },
{ DATA_MAKE_NUM(DATADIR_M406, 0), DATA_MAKE_NUM(DATADIR_M406, 1), DATA_MAKE_NUM(DATADIR_M406, 16), DATA_MAKE_NUM(DATADIR_M406, 17) },
{ DATA_MAKE_NUM(DATADIR_M406, 2), DATA_MAKE_NUM(DATADIR_M406, 3), DATA_MAKE_NUM(DATADIR_M406, 18), DATA_MAKE_NUM(DATADIR_M406, 19) },
{ DATA_MAKE_NUM(DATADIR_M406, 4), DATA_MAKE_NUM(DATADIR_M406, 5), DATA_MAKE_NUM(DATADIR_M406, 20), DATA_MAKE_NUM(DATADIR_M406, 21) },
{ DATA_MAKE_NUM(DATADIR_M406, 6), DATA_MAKE_NUM(DATADIR_M406, 7), DATA_MAKE_NUM(DATADIR_M406, 22), DATA_MAKE_NUM(DATADIR_M406, 23) },
{ DATA_MAKE_NUM(DATADIR_M406, 8), DATA_MAKE_NUM(DATADIR_M406, 9), DATA_MAKE_NUM(DATADIR_M406, 24), DATA_MAKE_NUM(DATADIR_M406, 25) },
{ DATA_MAKE_NUM(DATADIR_M406, 10), DATA_MAKE_NUM(DATADIR_M406, 11), DATA_MAKE_NUM(DATADIR_M406, 26), DATA_MAKE_NUM(DATADIR_M406, 27) },
{ DATA_MAKE_NUM(DATADIR_M406, 12), DATA_MAKE_NUM(DATADIR_M406, 13), DATA_MAKE_NUM(DATADIR_M406, 28), DATA_MAKE_NUM(DATADIR_M406, 29) },
{ DATA_MAKE_NUM(DATADIR_M406, 14), DATA_MAKE_NUM(DATADIR_M406, 15), DATA_MAKE_NUM(DATADIR_M406, 30), DATA_MAKE_NUM(DATADIR_M406, 31) },
};
s32 lbl_1_data_1120[8] = {
0x250045,
0x250046,
0x250047,
0x250048,
0x250049,
0x25004A,
0x25004B,
0x25004C,
DATA_MAKE_NUM(DATADIR_M406, 69),
DATA_MAKE_NUM(DATADIR_M406, 70),
DATA_MAKE_NUM(DATADIR_M406, 71),
DATA_MAKE_NUM(DATADIR_M406, 72),
DATA_MAKE_NUM(DATADIR_M406, 73),
DATA_MAKE_NUM(DATADIR_M406, 74),
DATA_MAKE_NUM(DATADIR_M406, 75),
DATA_MAKE_NUM(DATADIR_M406, 76),
};
s16 lbl_1_data_1140[4] = { 0, 40, 20, 90 };
@ -389,7 +389,7 @@ void fn_1_D90C(omObjData *object)
Hu3DModelAttrSet(object->model[6], 1);
object->model[7] = Hu3DModelCreateFile(lbl_1_data_1120[var_r31->unk_0C]);
Hu3DModelAttrSet(object->model[7], 1);
for (var_r29 = 0; (u32)var_r29 < 10; var_r29++) {
for (var_r29 = 0; var_r29 < 10U; var_r29++) {
object->motion[var_r29] = CharModelMotionCreate(var_r31->unk_0C, lbl_1_data_1078[var_r29]);
}
var_r31->unk_38 = -1;

2263
src/REL/m442Dll/main.c Normal file

File diff suppressed because it is too large Load diff

186
src/REL/m442Dll/score.c Normal file
View file

@ -0,0 +1,186 @@
#include "game/data.h"
#include "game/esprite.h"
#include "REL/m442Dll.h"
s32 fn_1_9520(s32 arg0);
void fn_1_9550(omObjData *object);
void fn_1_970C(void);
void fn_1_9784(void);
void fn_1_980C(void);
typedef void (*M442ScoreFunc)(void);
M442ScoreFunc lbl_1_data_268[3] = { fn_1_970C, fn_1_9784, fn_1_980C };
omObjData *lbl_1_bss_11F48;
Process *lbl_1_bss_11F4C;
typedef struct M442ScoreWork {
/* 0x00 */ s32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ s16 unk_08;
/* 0x0A */ s16 unk_0A;
/* 0x0C */ s16 unk_0C[6];
/* 0x18 */ s16 unk_18;
/* 0x1A */ s16 unk_1A;
/* 0x0E */ s32 unk_1C;
/* 0x20 */ float unk_20;
} M442ScoreWork; /* size = 0x24 */
s32 fn_1_91AC(Process *arg0, s16 arg1)
{
M442ScoreWork *var_r31;
u32 var_r30;
lbl_1_bss_11F4C = arg0;
lbl_1_bss_11F48 = omAddObjEx(lbl_1_bss_11F4C, 0x800, 0, 0, 7, fn_1_9550);
lbl_1_bss_11F48->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(M442ScoreWork), MEMORY_DEFAULT_NUM);
var_r31 = lbl_1_bss_11F48->data;
var_r31->unk_08 = arg1;
var_r31->unk_0A = 0;
var_r31->unk_18 = espEntry(0x610023, 2, 0);
espTPLvlSet(var_r31->unk_18, 0.5f);
espPosSet(var_r31->unk_18, 508.0f, 64.0f);
espColorSet(var_r31->unk_18, 0, 0, 0);
var_r31->unk_1A = espEntry(0x610037, 1, 0);
espPosSet(var_r31->unk_1A, 480.0f, 56.0f);
for (var_r30 = 0; var_r30 < 3; var_r30++) {
var_r31->unk_0C[var_r30] = espEntry(0x610030, 0, 0);
espPosSet(var_r31->unk_0C[var_r30], (var_r30 * 0x10) + 0x1F4, 56.0f);
espDispOff(var_r31->unk_0C[var_r30]);
}
for (var_r30 = 0; var_r30 < 3; var_r30++) {
var_r31->unk_0C[var_r30 + 3] = espEntry(0x610031, 1, 0);
espPosSet(var_r31->unk_0C[var_r30 + 3], (var_r30 * 0x10) + 0x1F4, 74.0f);
}
for (var_r30 = 0; var_r30 < 8; var_r30++) {
espDispOff(var_r31->unk_0C[var_r30]);
}
HuDataDirClose(0x610000);
return fn_1_9520(0);
}
void fn_1_9438(void)
{
s32 var_r31;
M442ScoreWork *var_r30;
var_r30 = lbl_1_bss_11F48->data;
for (var_r31 = 0; var_r31 < 8; var_r31++) {
espKill(var_r30->unk_0C[var_r31]);
}
HuMemDirectFree(lbl_1_bss_11F48->data);
}
void fn_1_94AC(s32 arg0)
{
switch (arg0) {
case 0:
fn_1_9520(1);
break;
case 1:
fn_1_9520(2);
break;
default:
break;
}
}
void fn_1_94FC(void)
{
fn_1_9520(0);
}
s32 fn_1_9520(s32 arg0)
{
M442ScoreWork *var_r31;
var_r31 = lbl_1_bss_11F48->data;
var_r31->unk_00 = arg0;
var_r31->unk_04 = 0;
}
void fn_1_9550(omObjData *arg0)
{
s16 var_r31;
M442ScoreWork *var_r30;
var_r30 = lbl_1_bss_11F48->data;
lbl_1_data_268[var_r30->unk_00]();
var_r31 = var_r30->unk_08;
espBankSet(var_r30->unk_0C[0], var_r31 / 100);
var_r31 %= 100;
espBankSet(var_r30->unk_0C[1], var_r31 / 10);
var_r31 %= 10;
espBankSet(var_r30->unk_0C[2], var_r31);
var_r31 = var_r30->unk_0A;
espBankSet(var_r30->unk_0C[3], var_r31 / 100);
var_r31 %= 100;
espBankSet(var_r30->unk_0C[4], var_r31 / 10);
var_r31 %= 10;
espBankSet(var_r30->unk_0C[5], var_r31);
}
void fn_1_970C(void)
{
M442ScoreWork *var_r31;
s32 var_r30;
var_r31 = lbl_1_bss_11F48->data;
if (var_r31->unk_04 == 0) {
for (var_r30 = 0; var_r30 < 8; var_r30++) {
espDispOff(var_r31->unk_0C[var_r30]);
}
var_r31->unk_04++;
}
}
void fn_1_9784(void)
{
s16 var_r30;
M442ScoreWork *var_r31;
var_r31 = lbl_1_bss_11F48->data;
if (var_r31->unk_04 == 0) {
for (var_r30 = 0; var_r30 < 8; var_r30++) {
espDispOn(var_r31->unk_0C[var_r30]);
}
var_r31->unk_04++;
}
var_r31->unk_0A = fn_1_90EC();
}
void fn_1_980C(void)
{
M442ScoreWork *var_r31;
s32 var_r30;
var_r31 = lbl_1_bss_11F48->data;
if (var_r31->unk_04 == 0) {
var_r31->unk_1C = 0;
var_r31->unk_20 = 1.0f;
if (var_r31->unk_0A > var_r31->unk_08) {
var_r31->unk_08 = var_r31->unk_0A;
}
var_r31->unk_04++;
}
if (var_r31->unk_1C == 0) {
if ((var_r31->unk_20 += 0.02f) >= 1.2f) {
var_r31->unk_20 = 1.2f;
var_r31->unk_1C = 1;
}
}
else {
if ((var_r31->unk_20 -= 0.04f) <= 1.0f) {
var_r31->unk_20 = 1.0f;
var_r31->unk_1C = 0;
}
}
for (var_r30 = 0; var_r30 <= 2; var_r30++) {
espScaleSet(var_r31->unk_0C[var_r30], var_r31->unk_20, var_r31->unk_20);
}
espScaleSet(var_r31->unk_1A, var_r31->unk_20, var_r31->unk_20);
}