diff --git a/config/GMPE01_00/rels/m440Dll/symbols.txt b/config/GMPE01_00/rels/m440Dll/symbols.txt index 8cff0e70..47f1c944 100644 --- a/config/GMPE01_00/rels/m440Dll/symbols.txt +++ b/config/GMPE01_00/rels/m440Dll/symbols.txt @@ -238,13 +238,13 @@ lbl_1_data_60 = .data:0x00000060; // type:object size:0xC lbl_1_data_6C = .data:0x0000006C; // type:object size:0xC data:float lbl_1_data_78 = .data:0x00000078; // type:object size:0x54 data:float lbl_1_data_CC = .data:0x000000CC; // type:object size:0x18 scope:local -lbl_1_data_E4 = .data:0x000000E4; // type:object size:0x2 data:2byte -lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x2 data:2byte -lbl_1_data_EC = .data:0x000000EC; // type:object size:0x2 data:2byte -lbl_1_data_F0 = .data:0x000000F0; // type:object size:0x2 data:2byte +lbl_1_data_E4 = .data:0x000000E4; // type:object size:0x4 data:2byte +lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x4 data:2byte +lbl_1_data_EC = .data:0x000000EC; // type:object size:0x4 data:2byte +lbl_1_data_F0 = .data:0x000000F0; // type:object size:0x4 data:2byte lbl_1_data_F4 = .data:0x000000F4; // type:object size:0x10 -lbl_1_data_104 = .data:0x00000104; // type:object size:0x2 data:2byte -lbl_1_data_108 = .data:0x00000108; // type:object size:0x2 data:2byte +lbl_1_data_104 = .data:0x00000104; // type:object size:0x4 data:2byte +lbl_1_data_108 = .data:0x00000108; // type:object size:0x4 data:2byte lbl_1_data_10C = .data:0x0000010C; // type:object size:0x12 lbl_1_data_11E = .data:0x0000011E; // type:object size:0x13 scope:local data:string lbl_1_data_131 = .data:0x00000131; // type:object size:0x17 scope:local data:string diff --git a/config/GMPP01_00/rels/m440Dll/splits.txt b/config/GMPP01_00/rels/m440Dll/splits.txt index 531cd645..a5cd08ba 100644 --- a/config/GMPP01_00/rels/m440Dll/splits.txt +++ b/config/GMPP01_00/rels/m440Dll/splits.txt @@ -5,3 +5,18 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m440Dll/main.c: + .text start:0x000000A0 end:0x0000AE04 + .rodata start:0x00000000 end:0x00000190 + .data start:0x00000000 end:0x000001D8 + .bss start:0x00000000 end:0x00000070 + +REL/m440Dll/object.c: + .text start:0x0000AE04 end:0x0000F4F0 + .rodata start:0x00000190 end:0x000002B8 + .data start:0x000001D8 end:0x00000254 + .bss start:0x00000070 end:0x000000D0 diff --git a/config/GMPP01_00/rels/m440Dll/symbols.txt b/config/GMPP01_00/rels/m440Dll/symbols.txt index 2f3f212b..c1d0231e 100644 --- a/config/GMPP01_00/rels/m440Dll/symbols.txt +++ b/config/GMPP01_00/rels/m440Dll/symbols.txt @@ -1,237 +1,238 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x324 +ObjectSetup = .text:0x000000A0; // type:function size:0x324 fn_1_3C4 = .text:0x000003C4; // type:function size:0x70 fn_1_434 = .text:0x00000434; // type:function size:0x70 fn_1_4A4 = .text:0x000004A4; // type:function size:0x224 fn_1_6C8 = .text:0x000006C8; // type:function size:0x228 fn_1_8F0 = .text:0x000008F0; // type:function size:0x1F0 fn_1_AE0 = .text:0x00000AE0; // type:function size:0x330 -fn_1_E10 = .text:0x00000E10; // type:function size:0x324 -fn_1_1134 = .text:0x00001134; // type:function size:0x5A0 -fn_1_16D4 = .text:0x000016D4; // type:function size:0x30 -fn_1_1704 = .text:0x00001704; // type:function size:0x60 -fn_1_1764 = .text:0x00001764; // type:function size:0x64 -fn_1_17C8 = .text:0x000017C8; // type:function size:0x28 -fn_1_17F0 = .text:0x000017F0; // type:function size:0x28 -fn_1_1818 = .text:0x00001818; // type:function size:0x74 -fn_1_188C = .text:0x0000188C; // type:function size:0x50 -fn_1_18DC = .text:0x000018DC; // type:function size:0x74 -fn_1_1950 = .text:0x00001950; // type:function size:0x5C -fn_1_19AC = .text:0x000019AC; // type:function size:0x2FC -fn_1_1CA8 = .text:0x00001CA8; // type:function size:0xA8 -fn_1_1D50 = .text:0x00001D50; // type:function size:0x4EC -fn_1_223C = .text:0x0000223C; // type:function size:0x1A4 -fn_1_23E0 = .text:0x000023E0; // type:function size:0x44 -fn_1_2424 = .text:0x00002424; // type:function size:0x48 -fn_1_246C = .text:0x0000246C; // type:function size:0x604 -fn_1_2A70 = .text:0x00002A70; // type:function size:0x40 -fn_1_2AB0 = .text:0x00002AB0; // type:function size:0x50 -fn_1_2B00 = .text:0x00002B00; // type:function size:0x1A4 -fn_1_2CA4 = .text:0x00002CA4; // type:function size:0x80 -fn_1_2D24 = .text:0x00002D24; // type:function size:0x6AC -fn_1_33D0 = .text:0x000033D0; // type:function size:0xA04 -fn_1_3DD4 = .text:0x00003DD4; // type:function size:0x780 -fn_1_4554 = .text:0x00004554; // type:function size:0x64 -fn_1_45B8 = .text:0x000045B8; // type:function size:0xA4 -fn_1_465C = .text:0x0000465C; // type:function size:0x80 -fn_1_46DC = .text:0x000046DC; // type:function size:0x340 -fn_1_4A1C = .text:0x00004A1C; // type:function size:0x124 -fn_1_4B40 = .text:0x00004B40; // type:function size:0x2BC -fn_1_4DFC = .text:0x00004DFC; // type:function size:0x2C -fn_1_4E28 = .text:0x00004E28; // type:function size:0x28 -fn_1_4E50 = .text:0x00004E50; // type:function size:0x54 -fn_1_4EA4 = .text:0x00004EA4; // type:function size:0x44 -fn_1_4EE8 = .text:0x00004EE8; // type:function size:0x48 -fn_1_4F30 = .text:0x00004F30; // type:function size:0xDC -fn_1_500C = .text:0x0000500C; // type:function size:0x7A4 -fn_1_57B0 = .text:0x000057B0; // type:function size:0x478 -fn_1_5C28 = .text:0x00005C28; // type:function size:0x928 -fn_1_6550 = .text:0x00006550; // type:function size:0x604 -fn_1_6B54 = .text:0x00006B54; // type:function size:0x6A4 -fn_1_71F8 = .text:0x000071F8; // type:function size:0x738 -fn_1_7930 = .text:0x00007930; // type:function size:0x42C -fn_1_7D5C = .text:0x00007D5C; // type:function size:0x30C -fn_1_8068 = .text:0x00008068; // type:function size:0x404 -fn_1_846C = .text:0x0000846C; // type:function size:0x654 -fn_1_8AC0 = .text:0x00008AC0; // type:function size:0x258 -fn_1_8D18 = .text:0x00008D18; // type:function size:0x488 -fn_1_91A0 = .text:0x000091A0; // type:function size:0xD8 -fn_1_9278 = .text:0x00009278; // type:function size:0xC8 -fn_1_9340 = .text:0x00009340; // type:function size:0x7C -fn_1_93BC = .text:0x000093BC; // type:function size:0x10 -fn_1_93CC = .text:0x000093CC; // type:function size:0x5C -fn_1_9428 = .text:0x00009428; // type:function size:0x140 -fn_1_9568 = .text:0x00009568; // type:function size:0x544 -fn_1_9AAC = .text:0x00009AAC; // type:function size:0x60 -fn_1_9B0C = .text:0x00009B0C; // type:function size:0x2C -fn_1_9B38 = .text:0x00009B38; // type:function size:0x58 -fn_1_9B90 = .text:0x00009B90; // type:function size:0x38 -fn_1_9BC8 = .text:0x00009BC8; // type:function size:0x38 -fn_1_9C00 = .text:0x00009C00; // type:function size:0x5B4 -fn_1_A1B4 = .text:0x0000A1B4; // type:function size:0xCC -fn_1_A280 = .text:0x0000A280; // type:function size:0xA4 -fn_1_A324 = .text:0x0000A324; // type:function size:0x68 -fn_1_A38C = .text:0x0000A38C; // type:function size:0x704 -fn_1_AA90 = .text:0x0000AA90; // type:function size:0x374 -fn_1_AE04 = .text:0x0000AE04; // type:function size:0xDC -fn_1_AEE0 = .text:0x0000AEE0; // type:function size:0x298 -fn_1_B178 = .text:0x0000B178; // type:function size:0x4 -fn_1_B17C = .text:0x0000B17C; // type:function size:0x224 -fn_1_B3A0 = .text:0x0000B3A0; // type:function size:0x4E0 -fn_1_B880 = .text:0x0000B880; // type:function size:0x950 -fn_1_C1D0 = .text:0x0000C1D0; // type:function size:0x770 -fn_1_C940 = .text:0x0000C940; // type:function size:0x668 -fn_1_CFA8 = .text:0x0000CFA8; // type:function size:0x2A0 -fn_1_D248 = .text:0x0000D248; // type:function size:0x100 -fn_1_D348 = .text:0x0000D348; // type:function size:0x4AC -fn_1_D7F4 = .text:0x0000D7F4; // type:function size:0x83C -fn_1_E030 = .text:0x0000E030; // type:function size:0x858 -fn_1_E888 = .text:0x0000E888; // type:function size:0x4DC -fn_1_ED64 = .text:0x0000ED64; // type:function size:0xF0 -fn_1_EE54 = .text:0x0000EE54; // type:function size:0xD8 -fn_1_EF2C = .text:0x0000EF2C; // type:function size:0x1AC -fn_1_F0D8 = .text:0x0000F0D8; // type:function size:0x6C -fn_1_F144 = .text:0x0000F144; // type:function size:0xC0 -fn_1_F204 = .text:0x0000F204; // type:function size:0x298 -fn_1_F49C = .text:0x0000F49C; // type:function size:0x14 -fn_1_F4B0 = .text:0x0000F4B0; // type:function size:0x28 -fn_1_F4D8 = .text:0x0000F4D8; // type:function size:0x18 +fn_1_E14 = .text:0x00000E10; // type:function size:0x324 +fn_1_1138 = .text:0x00001134; // type:function size:0x5A0 +fn_1_16D8 = .text:0x000016D4; // type:function size:0x30 +fn_1_1708 = .text:0x00001704; // type:function size:0x60 +fn_1_1768 = .text:0x00001764; // type:function size:0x64 +fn_1_17CC = .text:0x000017C8; // type:function size:0x28 +fn_1_17F4 = .text:0x000017F0; // type:function size:0x28 +fn_1_181C = .text:0x00001818; // type:function size:0x74 +fn_1_1890 = .text:0x0000188C; // type:function size:0x50 +fn_1_18E0 = .text:0x000018DC; // type:function size:0x74 +fn_1_1954 = .text:0x00001950; // type:function size:0x5C +fn_1_19B0 = .text:0x000019AC; // type:function size:0x2FC +fn_1_1CAC = .text:0x00001CA8; // type:function size:0xA8 +fn_1_1D54 = .text:0x00001D50; // type:function size:0x4EC +fn_1_2240 = .text:0x0000223C; // type:function size:0x1A4 +fn_1_23E4 = .text:0x000023E0; // type:function size:0x44 +fn_1_2428 = .text:0x00002424; // type:function size:0x48 +fn_1_2470 = .text:0x0000246C; // type:function size:0x604 +fn_1_2A74 = .text:0x00002A70; // type:function size:0x40 +fn_1_2AB4 = .text:0x00002AB0; // type:function size:0x50 +fn_1_2B04 = .text:0x00002B00; // type:function size:0x1A4 +fn_1_2CA8 = .text:0x00002CA4; // type:function size:0x80 +fn_1_2D28 = .text:0x00002D24; // type:function size:0x6AC +fn_1_33D4 = .text:0x000033D0; // type:function size:0xA04 +fn_1_3DD8 = .text:0x00003DD4; // type:function size:0x780 +fn_1_4558 = .text:0x00004554; // type:function size:0x64 +fn_1_45BC = .text:0x000045B8; // type:function size:0xA4 +fn_1_4660 = .text:0x0000465C; // type:function size:0x80 +fn_1_46E0 = .text:0x000046DC; // type:function size:0x340 +fn_1_4A20 = .text:0x00004A1C; // type:function size:0x124 +fn_1_4B44 = .text:0x00004B40; // type:function size:0x2BC +fn_1_4E00 = .text:0x00004DFC; // type:function size:0x2C +fn_1_4E2C = .text:0x00004E28; // type:function size:0x28 +fn_1_4E54 = .text:0x00004E50; // type:function size:0x54 +fn_1_4EA8 = .text:0x00004EA4; // type:function size:0x44 +fn_1_4EEC = .text:0x00004EE8; // type:function size:0x48 +fn_1_4F34 = .text:0x00004F30; // type:function size:0xDC +fn_1_5010 = .text:0x0000500C; // type:function size:0x7A4 +fn_1_57B4 = .text:0x000057B0; // type:function size:0x478 +fn_1_5C2C = .text:0x00005C28; // type:function size:0x928 +fn_1_6554 = .text:0x00006550; // type:function size:0x604 +fn_1_6B58 = .text:0x00006B54; // type:function size:0x6A4 +fn_1_71FC = .text:0x000071F8; // type:function size:0x738 +fn_1_7934 = .text:0x00007930; // type:function size:0x42C +fn_1_7D60 = .text:0x00007D5C; // type:function size:0x30C +fn_1_806C = .text:0x00008068; // type:function size:0x404 +fn_1_8470 = .text:0x0000846C; // type:function size:0x654 +fn_1_8AC4 = .text:0x00008AC0; // type:function size:0x258 +fn_1_8D1C = .text:0x00008D18; // type:function size:0x488 +fn_1_91A4 = .text:0x000091A0; // type:function size:0xD8 +fn_1_927C = .text:0x00009278; // type:function size:0xC8 +fn_1_9344 = .text:0x00009340; // type:function size:0x7C +fn_1_93C0 = .text:0x000093BC; // type:function size:0x10 +fn_1_93D0 = .text:0x000093CC; // type:function size:0x5C +fn_1_942C = .text:0x00009428; // type:function size:0x140 +fn_1_956C = .text:0x00009568; // type:function size:0x544 +fn_1_9AB0 = .text:0x00009AAC; // type:function size:0x60 +fn_1_9B10 = .text:0x00009B0C; // type:function size:0x2C +fn_1_9B3C = .text:0x00009B38; // type:function size:0x58 +fn_1_9B94 = .text:0x00009B90; // type:function size:0x38 +fn_1_9BCC = .text:0x00009BC8; // type:function size:0x38 +fn_1_9C04 = .text:0x00009C00; // type:function size:0x5B4 +fn_1_A1B8 = .text:0x0000A1B4; // type:function size:0xCC +fn_1_A284 = .text:0x0000A280; // type:function size:0xA4 +fn_1_A328 = .text:0x0000A324; // type:function size:0x68 +fn_1_A390 = .text:0x0000A38C; // type:function size:0x704 +fn_1_AA94 = .text:0x0000AA90; // type:function size:0x374 +fn_1_AE08 = .text:0x0000AE04; // type:function size:0xDC +fn_1_AEE4 = .text:0x0000AEE0; // type:function size:0x298 +fn_1_B17C = .text:0x0000B178; // type:function size:0x4 +fn_1_B180 = .text:0x0000B17C; // type:function size:0x224 +fn_1_B3A4 = .text:0x0000B3A0; // type:function size:0x4E0 +fn_1_B884 = .text:0x0000B880; // type:function size:0x950 +fn_1_C1D4 = .text:0x0000C1D0; // type:function size:0x770 +fn_1_C944 = .text:0x0000C940; // type:function size:0x668 +fn_1_CFAC = .text:0x0000CFA8; // type:function size:0x2A0 +fn_1_D24C = .text:0x0000D248; // type:function size:0x100 +fn_1_D34C = .text:0x0000D348; // type:function size:0x4AC +fn_1_D7F8 = .text:0x0000D7F4; // type:function size:0x83C +fn_1_E034 = .text:0x0000E030; // type:function size:0x858 +fn_1_E8AC = .text:0x0000E888; // type:function size:0x4DC +fn_1_ED88 = .text:0x0000ED64; // type:function size:0xF0 +fn_1_EE78 = .text:0x0000EE54; // type:function size:0xD8 +fn_1_EF50 = .text:0x0000EF2C; // type:function size:0x1AC +fn_1_F0FC = .text:0x0000F0D8; // type:function size:0x6C +fn_1_F168 = .text:0x0000F144; // type:function size:0xC0 +fn_1_F228 = .text:0x0000F204; // type:function size:0x298 +fn_1_F4C0 = .text:0x0000F49C; // type:function size:0x14 +fn_1_F4D4 = .text:0x0000F4B0; // type:function size:0x28 +fn_1_F4FC = .text:0x0000F4D8; // type:function size:0x18 _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:0x4 data:float -lbl_1_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 data:float -lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x4 data:float -lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x8 data:double -lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 data:float -lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x8 data:double -lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x8 data:double -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_7C = .rodata:0x0000007C; // type:object size:0x4 data:float -lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x4 data:float -lbl_1_rodata_84 = .rodata:0x00000084; // type:object size:0x4 data:float -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_98 = .rodata:0x00000098; // type:object size:0x8 data:double -lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float -lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float -lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 data:float -lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 data:float -lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x8 data:double -lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float -lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 data:float -lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 data:float -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_EC = .rodata:0x000000EC; // type:object size:0x4 data:float -lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 data:float -lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 data:float -lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 data:float -lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 data:float -lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 data:float -lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 data:float -lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 data:float -lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 data:float -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_120 = .rodata:0x00000120; // type:object size:0x8 data:double -lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x8 data:double -lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 data:float -lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 data:float -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:0x1 data:byte -lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0xC data:2byte -lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float -lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 data:float -lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 data:float -lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x8 data:double -lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0xC data:4byte -lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 data:float -lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 data:float -lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 data:float -lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x8 data:float -lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 data:float -lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 data:float -lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 data:float -lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 data:float -lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x8 data:double -lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x8 data:double -lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 data:float -lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 data:float -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:0x8 data:double -lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0xC data:2byte -lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 data:float -lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 data:float -lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x8 data:double -lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x8 data:double -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:0x4 data:float -lbl_1_rodata_204 = .rodata:0x00000204; // type:object size:0x4 data:float -lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 data:float -lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 data:double -lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x4 data:float -lbl_1_rodata_21C = .rodata:0x0000021C; // type:object size:0x4 data:float -lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x4 data:float -lbl_1_rodata_224 = .rodata:0x00000224; // type:object size:0x4 data:float -lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 data:float -lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 data:float -lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x4 data:float -lbl_1_rodata_234 = .rodata:0x00000234; // type:object size:0x4 data:float -lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x4 data:float -lbl_1_rodata_23C = .rodata:0x0000023C; // type:object size:0x4 data:float -lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x4 data:float -lbl_1_rodata_244 = .rodata:0x00000244; // type:object size:0x4 data:float -lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x8 data:double -lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x8 data:double -lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x4 data:float -lbl_1_rodata_25C = .rodata:0x0000025C; // type:object size:0x4 data:float -lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x4 data:float -lbl_1_rodata_264 = .rodata:0x00000264; // type:object size:0x4 data:float -lbl_1_rodata_268 = .rodata:0x00000268; // type:object size:0x4 data:float -lbl_1_rodata_26C = .rodata:0x0000026C; // type:object size:0x4 data:float -lbl_1_rodata_270 = .rodata:0x00000270; // type:object size:0x4 data:float -lbl_1_rodata_274 = .rodata:0x00000274; // type:object size:0x4 data:float -lbl_1_rodata_278 = .rodata:0x00000278; // type:object size:0x4 data:float -lbl_1_rodata_27C = .rodata:0x0000027C; // type:object size:0x4 data:float -lbl_1_rodata_280 = .rodata:0x00000280; // type:object size:0x4 data:float -lbl_1_rodata_284 = .rodata:0x00000284; // type:object size:0x4 data:float -lbl_1_rodata_288 = .rodata:0x00000288; // type:object size:0x8 data:double -lbl_1_rodata_290 = .rodata:0x00000290; // type:object size:0x4 data:float -lbl_1_rodata_298 = .rodata:0x00000298; // type:object size:0x8 data:double -lbl_1_rodata_2A0 = .rodata:0x000002A0; // type:object size:0x8 data:double -lbl_1_rodata_2A8 = .rodata:0x000002A8; // type:object size:0x4 data:float -lbl_1_rodata_2AC = .rodata:0x000002AC; // type:object size:0x4 data:float -lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x4 data:float -lbl_1_rodata_2B4 = .rodata:0x000002B4; // 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 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:0x4 scope:local data:float +lbl_1_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x4 scope:local data:float +lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x8 scope:local data:double +lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 scope:local data:float +lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x8 scope:local data:double +lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x8 scope:local data:double +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_7C = .rodata:0x0000007C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x4 scope:local data:float +lbl_1_rodata_84 = .rodata:0x00000084; // type:object size:0x4 scope:local data:float +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_98 = .rodata:0x00000098; // type:object size:0x8 scope:local data:double +lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 scope:local 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 scope:local 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:0x8 scope:local data:double +lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 scope:local 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 scope:local data:float +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_EC = .rodata:0x000000EC; // type:object size:0x4 scope:local 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 scope:local 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 scope:local data:float +lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 scope:local data:float +lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 scope:local data:float +lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 scope:local data:float +lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 scope:local 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 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:0x8 scope:local data:double +lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x8 scope:local data:double +lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 scope:local 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 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:byte +lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0xC scope:local data:2byte +lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 scope:local data:float +lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 scope:local data:float +lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x8 scope:local data:double +lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0xC scope:local data:4byte +lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 scope:local 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 scope:local data:float +lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 scope:local data:float +lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 scope:local data:float +lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 scope:local 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 scope:local data:float +lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 scope:local data:float +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:0x8 scope:local data:double +lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0xC scope:local data:2byte +lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x8 scope:local data:double +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:0x4 scope:local 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:0x4 scope:local data:float +lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 scope:local data:double +lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x4 scope:local data:float +lbl_1_rodata_21C = .rodata:0x0000021C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x4 scope:local data:float +lbl_1_rodata_224 = .rodata:0x00000224; // type:object size:0x4 scope:local 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 scope:local data:float +lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x4 scope:local data:float +lbl_1_rodata_234 = .rodata:0x00000234; // type:object size:0x4 scope:local data:float +lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x4 scope:local data:float +lbl_1_rodata_23C = .rodata:0x0000023C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x4 scope:local data:float +lbl_1_rodata_244 = .rodata:0x00000244; // type:object size:0x4 scope:local data:float +lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x8 scope:local data:double +lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x8 scope:local data:double +lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x4 scope:local data:float +lbl_1_rodata_25C = .rodata:0x0000025C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x4 scope:local data:float +lbl_1_rodata_264 = .rodata:0x00000264; // type:object size:0x4 scope:local data:float +lbl_1_rodata_268 = .rodata:0x00000268; // type:object size:0x4 scope:local data:float +lbl_1_rodata_26C = .rodata:0x0000026C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_270 = .rodata:0x00000270; // type:object size:0x4 scope:local data:float +lbl_1_rodata_274 = .rodata:0x00000274; // type:object size:0x4 scope:local data:float +lbl_1_rodata_278 = .rodata:0x00000278; // type:object size:0x4 scope:local data:float +lbl_1_rodata_27C = .rodata:0x0000027C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_280 = .rodata:0x00000280; // type:object size:0x4 scope:local data:float +lbl_1_rodata_284 = .rodata:0x00000284; // type:object size:0x4 scope:local data:float +lbl_1_rodata_288 = .rodata:0x00000288; // type:object size:0x8 scope:local data:double +lbl_1_rodata_290 = .rodata:0x00000290; // type:object size:0x4 scope:local data:float +lbl_1_rodata_298 = .rodata:0x00000298; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2A0 = .rodata:0x000002A0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2A8 = .rodata:0x000002A8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2AC = .rodata:0x000002AC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2B4 = .rodata:0x000002B4; // type:object size:0x4 scope:local data:float lbl_1_data_0 = .data:0x00000000; // type:object size:0x14 lbl_1_data_14 = .data:0x00000014; // type:object size:0xC lbl_1_data_20 = .data:0x00000020; // type:object size:0xC data:float @@ -242,22 +243,23 @@ lbl_1_data_54 = .data:0x00000054; // type:object size:0xC data:float lbl_1_data_60 = .data:0x00000060; // type:object size:0xC lbl_1_data_6C = .data:0x0000006C; // type:object size:0xC data:float lbl_1_data_78 = .data:0x00000078; // type:object size:0x54 data:float -lbl_1_data_CC = .data:0x000000CC; // type:object size:0x18 -lbl_1_data_E4 = .data:0x000000E4; // type:object size:0x2 data:2byte -lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x2 data:2byte -lbl_1_data_EC = .data:0x000000EC; // type:object size:0x2 data:2byte -lbl_1_data_F0 = .data:0x000000F0; // type:object size:0x2 data:2byte +lbl_1_data_CC = .data:0x000000CC; // type:object size:0x18 scope:local +lbl_1_data_E4 = .data:0x000000E4; // type:object size:0x4 data:2byte +lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x4 data:2byte +lbl_1_data_EC = .data:0x000000EC; // type:object size:0x4 data:2byte +lbl_1_data_F0 = .data:0x000000F0; // type:object size:0x4 data:2byte lbl_1_data_F4 = .data:0x000000F4; // type:object size:0x10 -lbl_1_data_104 = .data:0x00000104; // type:object size:0x2 data:2byte -lbl_1_data_108 = .data:0x00000108; // type:object size:0x2 data:2byte +lbl_1_data_104 = .data:0x00000104; // type:object size:0x4 data:2byte +lbl_1_data_108 = .data:0x00000108; // type:object size:0x4 data:2byte lbl_1_data_10C = .data:0x0000010C; // type:object size:0x12 -lbl_1_data_11E = .data:0x0000011E; // type:object size:0x13 data:string -lbl_1_data_131 = .data:0x00000131; // type:object size:0x18 -lbl_1_data_149 = .data:0x00000149; // type:object size:0x19 data:string -lbl_1_data_162 = .data:0x00000162; // type:object size:0x1C data:string -lbl_1_data_17E = .data:0x0000017E; // type:object size:0x10 data:string -lbl_1_data_18E = .data:0x0000018E; // type:object size:0x26 data:string -lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x24 data:string +lbl_1_data_11E = .data:0x0000011E; // type:object size:0x13 scope:local data:string +lbl_1_data_131 = .data:0x00000131; // type:object size:0x17 scope:local data:string +lbl_1_data_148 = .data:0x00000148; // type:object size:0x1 scope:local +lbl_1_data_149 = .data:0x00000149; // type:object size:0x19 scope:local data:string +lbl_1_data_162 = .data:0x00000162; // type:object size:0x1C scope:local data:string +lbl_1_data_17E = .data:0x0000017E; // type:object size:0x10 scope:local data:string +lbl_1_data_18E = .data:0x0000018E; // type:object size:0x26 scope:local data:string +lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x24 scope:local data:string lbl_1_data_1D8 = .data:0x000001D8; // type:object size:0x2 data:2byte lbl_1_data_1DA = .data:0x000001DA; // type:object size:0x2 data:2byte lbl_1_data_1DC = .data:0x000001DC; // type:object size:0x40 diff --git a/config/GMPP01_00/rels/m441Dll/splits.txt b/config/GMPP01_00/rels/m441Dll/splits.txt index 531cd645..b67999c6 100644 --- a/config/GMPP01_00/rels/m441Dll/splits.txt +++ b/config/GMPP01_00/rels/m441Dll/splits.txt @@ -5,3 +5,9 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/m441Dll/main.c: + .text start:0x00000000 end:0x0000AABC + .rodata start:0x00000000 end:0x000001EC + .data start:0x00000000 end:0x000005CC + .bss start:0x00000000 end:0x00000204 diff --git a/config/GMPP01_00/rels/m441Dll/symbols.txt b/config/GMPP01_00/rels/m441Dll/symbols.txt index d2b885ed..ccaec68e 100644 --- a/config/GMPP01_00/rels/m441Dll/symbols.txt +++ b/config/GMPP01_00/rels/m441Dll/symbols.txt @@ -7,185 +7,185 @@ fn_1_2D8 = .text:0x000002D8; // type:function size:0x13C fn_1_414 = .text:0x00000414; // type:function size:0x58 fn_1_46C = .text:0x0000046C; // type:function size:0x114 fn_1_580 = .text:0x00000580; // type:function size:0x204 -fn_1_784 = .text:0x00000784; // type:function size:0x240 -fn_1_9C4 = .text:0x000009C4; // type:function size:0x54 -fn_1_A18 = .text:0x00000A18; // type:function size:0x10C -fn_1_B24 = .text:0x00000B24; // type:function size:0x680 -fn_1_11A4 = .text:0x000011A4; // type:function size:0x15C -fn_1_1300 = .text:0x00001300; // type:function size:0x8C -fn_1_138C = .text:0x0000138C; // type:function size:0x334 -fn_1_16C0 = .text:0x000016C0; // type:function size:0x350 -fn_1_1A10 = .text:0x00001A10; // type:function size:0x2B8 -fn_1_1CC8 = .text:0x00001CC8; // type:function size:0x58 -fn_1_1D20 = .text:0x00001D20; // type:function size:0xB0 -fn_1_1DD0 = .text:0x00001DD0; // type:function size:0x104 -fn_1_1ED4 = .text:0x00001ED4; // type:function size:0x34 -fn_1_1F08 = .text:0x00001F08; // type:function size:0x6C -fn_1_1F74 = .text:0x00001F74; // type:function size:0x3F0 +fn_1_798 = .text:0x00000784; // type:function size:0x240 +fn_1_9EC = .text:0x000009C4; // type:function size:0x54 +fn_1_A40 = .text:0x00000A18; // type:function size:0x10C +fn_1_B4C = .text:0x00000B24; // type:function size:0x680 +fn_1_11F4 = .text:0x000011A4; // type:function size:0x15C +fn_1_1350 = .text:0x00001300; // type:function size:0x8C +fn_1_13DC = .text:0x0000138C; // type:function size:0x334 +fn_1_1710 = .text:0x000016C0; // type:function size:0x350 +fn_1_1A60 = .text:0x00001A10; // type:function size:0x2B8 +fn_1_1D18 = .text:0x00001CC8; // type:function size:0x58 +fn_1_1D70 = .text:0x00001D20; // type:function size:0xB0 +fn_1_1E20 = .text:0x00001DD0; // type:function size:0x104 +fn_1_1F24 = .text:0x00001ED4; // type:function size:0x34 +fn_1_1F58 = .text:0x00001F08; // type:function size:0x6C +fn_1_1FC4 = .text:0x00001F74; // type:function size:0x3F0 _prolog = .text:0x00002364; // type:function size:0x54 scope:global _epilog = .text:0x000023B8; // type:function size:0x4C scope:global -fn_1_2404 = .text:0x00002404; // type:function size:0x2E8 -fn_1_26EC = .text:0x000026EC; // type:function size:0x1C8 -fn_1_28B4 = .text:0x000028B4; // type:function size:0x2D0 -fn_1_2B84 = .text:0x00002B84; // type:function size:0x830 -fn_1_33B4 = .text:0x000033B4; // type:function size:0x700 -fn_1_3AB4 = .text:0x00003AB4; // type:function size:0xFC -fn_1_3BB0 = .text:0x00003BB0; // type:function size:0x4A8 -fn_1_4058 = .text:0x00004058; // type:function size:0x1340 -fn_1_5398 = .text:0x00005398; // type:function size:0x744 -fn_1_5ADC = .text:0x00005ADC; // type:function size:0xD8 -fn_1_5BB4 = .text:0x00005BB4; // type:function size:0x1538 -fn_1_70EC = .text:0x000070EC; // type:function size:0x3B8 -fn_1_74A4 = .text:0x000074A4; // type:function size:0x464 -fn_1_7908 = .text:0x00007908; // type:function size:0xD4 -fn_1_79DC = .text:0x000079DC; // type:function size:0x610 -fn_1_7FEC = .text:0x00007FEC; // type:function size:0x4DC -fn_1_84C8 = .text:0x000084C8; // type:function size:0x414 -fn_1_88DC = .text:0x000088DC; // type:function size:0x174 -fn_1_8A50 = .text:0x00008A50; // type:function size:0x2B8 -fn_1_8D08 = .text:0x00008D08; // type:function size:0x11D8 -fn_1_9EE0 = .text:0x00009EE0; // type:function size:0x570 -fn_1_A450 = .text:0x0000A450; // type:function size:0x59C -fn_1_A9EC = .text:0x0000A9EC; // type:function size:0xD0 +fn_1_2454 = .text:0x00002404; // type:function size:0x2E8 +fn_1_273C = .text:0x000026EC; // type:function size:0x1C8 +fn_1_2904 = .text:0x000028B4; // type:function size:0x2D0 +fn_1_2BD4 = .text:0x00002B84; // type:function size:0x830 +fn_1_3404 = .text:0x000033B4; // type:function size:0x700 +fn_1_3B04 = .text:0x00003AB4; // type:function size:0xFC +fn_1_3C00 = .text:0x00003BB0; // type:function size:0x4A8 +fn_1_40A8 = .text:0x00004058; // type:function size:0x1340 +fn_1_53E8 = .text:0x00005398; // type:function size:0x744 +fn_1_5B2C = .text:0x00005ADC; // type:function size:0xD8 +fn_1_5C04 = .text:0x00005BB4; // type:function size:0x1538 +fn_1_713C = .text:0x000070EC; // type:function size:0x3B8 +fn_1_74F4 = .text:0x000074A4; // type:function size:0x464 +fn_1_7958 = .text:0x00007908; // type:function size:0xD4 +fn_1_7A2C = .text:0x000079DC; // type:function size:0x610 +fn_1_803C = .text:0x00007FEC; // type:function size:0x4DC +fn_1_8518 = .text:0x000084C8; // type:function size:0x414 +fn_1_892C = .text:0x000088DC; // type:function size:0x174 +fn_1_8AA0 = .text:0x00008A50; // type:function size:0x2B8 +fn_1_8D58 = .text:0x00008D08; // type:function size:0x11D8 +fn_1_9F40 = .text:0x00009EE0; // type:function size:0x570 +ObjectSetup = .text:0x0000A450; // type:function size:0x59C +fn_1_AA4C = .text:0x0000A9EC; // type:function size:0xD0 _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:0x8 data:double -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:0x8 data:double -lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x8 data:double -lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 data:double -lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 data:double -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:0x4 data:float -lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 data:float -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:0x8 data:double -lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 data:float -lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 data:float -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:0x8 data:double -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_9C = .rodata:0x0000009C; // type:object size:0x4 data:float -lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float -lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float -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_BC = .rodata:0x000000BC; // type:object size:0x4 data:float -lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 data:float -lbl_1_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 data:float -lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 data:float -lbl_1_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 data:float -lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x8 data:double -lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x8 data:double -lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 data:float -lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 data:float -lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 data:float -lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 data:float -lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 data:float -lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 data:float -lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 data:float -lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 data:float -lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 data:float -lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 data:float -lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 data:float -lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 data:float -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:0x4 data:float -lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 data:float -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_148 = .rodata:0x00000148; // type:object size:0x8 data:double -lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 data:double -lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float -lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 data:float -lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 data:float -lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x8 data:double -lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x8 data:double -lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x8 data:double -lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x8 data:double -lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 data:float -lbl_1_rodata_18C = .rodata:0x0000018C; // type:object size:0x4 data:float -lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 data:float -lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 data:float -lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 data:float -lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 data:float -lbl_1_rodata_1A0 = .rodata:0x000001A0; // 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:0x8 data:double -lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x8 data:double -lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 data:float -lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 data:float -lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 data:float -lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 data:float -lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 data:float -lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 data:float -lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 data:float -lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 data:float -lbl_1_rodata_1E8 = .rodata:0x000001E8; // 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 scope:local data:float +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 +lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 scope:local data:float +lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 scope:local 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 scope:local 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 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:0x4 scope:local 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 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:0x8 scope:local data:double +lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 scope:local 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 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:0x8 scope:local data:double +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_9C = .rodata:0x0000009C; // type:object size:0x4 scope:local 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 scope:local data:float +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_BC = .rodata:0x000000BC; // type:object size:0x4 scope:local 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 scope:local 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 scope:local data:float +lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 scope:local 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 scope:local 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 scope:local data:float +lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 scope:local data:float +lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 scope:local data:float +lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 scope:local data:float +lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 scope:local 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 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:0x4 scope:local 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 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_148 = .rodata:0x00000148; // type:object size:0x8 scope:local data:double +lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 scope:local data:double +lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 scope:local data:float +lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 scope:local data:float +lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x8 scope:local data:double +lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x8 scope:local data:double +lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x8 scope:local data:double +lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x8 scope:local data:double +lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 scope:local data:float +lbl_1_rodata_18C = .rodata:0x0000018C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 scope:local data:float +lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 scope:local 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 scope:local data:float +lbl_1_rodata_1A0 = .rodata:0x000001A0; // 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:0x8 scope:local data:double +lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 scope:local 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 scope:local 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 scope:local 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 scope:local 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 scope:local data:float lbl_1_data_0 = .data:0x00000000; // type:object size:0x10 lbl_1_data_10 = .data:0x00000010; // type:object size:0xC data:4byte lbl_1_data_1C = .data:0x0000001C; // type:object size:0xC lbl_1_data_28 = .data:0x00000028; // type:object size:0xC data:4byte -lbl_1_data_34 = .data:0x00000034; // type:object size:0xC data:4byte -lbl_1_data_40 = .data:0x00000040; // type:object size:0xC -lbl_1_data_4C = .data:0x0000004C; // type:object size:0xC data:4byte -lbl_1_data_58 = .data:0x00000058; // type:object size:0xC data:4byte -lbl_1_data_64 = .data:0x00000064; // type:object size:0xC -lbl_1_data_70 = .data:0x00000070; // type:object size:0xC data:4byte -lbl_1_data_7C = .data:0x0000007C; // type:object size:0xC -lbl_1_data_88 = .data:0x00000088; // type:object size:0xC +lbl_1_data_34 = .data:0x00000034; // type:object size:0xC data:float +lbl_1_data_40 = .data:0x00000040; // type:object size:0xC data:float +lbl_1_data_4C = .data:0x0000004C; // type:object size:0xC data:float +lbl_1_data_58 = .data:0x00000058; // type:object size:0xC data:float +lbl_1_data_64 = .data:0x00000064; // type:object size:0xC data:float +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:0xC data:float lbl_1_data_94 = .data:0x00000094; // type:object size:0x4 -lbl_1_data_98 = .data:0x00000098; // type:object size:0xC -lbl_1_data_A4 = .data:0x000000A4; // type:object size:0xC +lbl_1_data_98 = .data:0x00000098; // type:object size:0xC data:float +lbl_1_data_A4 = .data:0x000000A4; // type:object size:0xC data:float lbl_1_data_B0 = .data:0x000000B0; // type:object size:0x200 lbl_1_data_2B0 = .data:0x000002B0; // type:object size:0x8 lbl_1_data_2B8 = .data:0x000002B8; // type:object size:0xC lbl_1_data_2C4 = .data:0x000002C4; // type:object size:0x10 -lbl_1_data_2D4 = .data:0x000002D4; // type:object size:0x40 +lbl_1_data_2D4 = .data:0x000002D4; // type:object size:0x40 data:float lbl_1_data_314 = .data:0x00000314; // type:object size:0xC lbl_1_data_320 = .data:0x00000320; // type:object size:0x6 lbl_1_data_326 = .data:0x00000326; // type:object size:0x6 -lbl_1_data_32C = .data:0x0000032C; // type:object size:0x24 -lbl_1_data_350 = .data:0x00000350; // type:object size:0x18 +lbl_1_data_32C = .data:0x0000032C; // type:object size:0x24 data:float +lbl_1_data_350 = .data:0x00000350; // type:object size:0x18 data:float lbl_1_data_368 = .data:0x00000368; // type:object size:0x4 -lbl_1_data_36C = .data:0x0000036C; // type:object size:0xC -lbl_1_data_378 = .data:0x00000378; // type:object size:0xC -lbl_1_data_384 = .data:0x00000384; // type:object size:0xC -lbl_1_data_390 = .data:0x00000390; // type:object size:0xC +lbl_1_data_36C = .data:0x0000036C; // type:object size:0xC data:float +lbl_1_data_378 = .data:0x00000378; // type:object size:0xC data:float +lbl_1_data_384 = .data:0x00000384; // type:object size:0xC data:float +lbl_1_data_390 = .data:0x00000390; // type:object size:0xC data:float lbl_1_data_39C = .data:0x0000039C; // type:object size:0x50 lbl_1_data_3EC = .data:0x000003EC; // type:object size:0x50 lbl_1_data_43C = .data:0x0000043C; // type:object size:0x50 lbl_1_data_48C = .data:0x0000048C; // type:object size:0x50 -lbl_1_data_4DC = .data:0x000004DC; // type:object size:0x18 data:string -lbl_1_data_4F4 = .data:0x000004F4; // type:object size:0x9 data:string -lbl_1_data_4FD = .data:0x000004FD; // type:object size:0x6 data:string -lbl_1_data_503 = .data:0x00000503; // type:object size:0x1D data:string +lbl_1_data_4DC = .data:0x000004DC; // type:object size:0x18 scope:local data:string +lbl_1_data_4F4 = .data:0x000004F4; // type:object size:0x9 scope:local data:string +lbl_1_data_4FD = .data:0x000004FD; // type:object size:0x6 scope:local data:string +lbl_1_data_503 = .data:0x00000503; // type:object size:0x1D scope:local data:string jumptable_1_data_520 = .data:0x00000520; // type:object size:0x40 scope:local -lbl_1_data_560 = .data:0x00000560; // type:object size:0x8 data:string -lbl_1_data_568 = .data:0x00000568; // type:object size:0x1C +lbl_1_data_560 = .data:0x00000560; // type:object size:0x8 scope:local data:string +lbl_1_data_568 = .data:0x00000568; // type:object size:0x1B scope:local data:string jumptable_1_data_584 = .data:0x00000584; // type:object size:0x24 scope:local -lbl_1_data_5A8 = .data:0x000005A8; // type:object size:0x24 data:string +lbl_1_data_5A8 = .data:0x000005A8; // type:object size:0x24 scope:local data:string lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:float lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:float lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 data:float @@ -200,7 +200,8 @@ lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:float lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x2 data:2byte lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:4byte lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x2 data:2byte -lbl_1_bss_38 = .bss:0x00000038; // type:object size:0x8 data:4byte +lbl_1_bss_38 = .bss:0x00000038; // type:object size:0x4 data:4byte +lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x4 data:4byte lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 data:4byte lbl_1_bss_44 = .bss:0x00000044; // type:object size:0x4 data:4byte lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x4 data:4byte diff --git a/config/GMPP01_00/rels/m442Dll/splits.txt b/config/GMPP01_00/rels/m442Dll/splits.txt index 531cd645..87722ecf 100644 --- a/config/GMPP01_00/rels/m442Dll/splits.txt +++ b/config/GMPP01_00/rels/m442Dll/splits.txt @@ -5,3 +5,18 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m442Dll/main.c: + .text start:0x000000A0 end:0x000091B8 + .rodata start:0x00000000 end:0x000001D0 + .data start:0x00000000 end:0x00000268 + .bss start:0x00000000 end:0x00011F48 + +REL/m442Dll/score.c: + .text start:0x000091B8 end:0x0000997C + .rodata start:0x000001D0 end:0x00000200 + .data start:0x00000268 end:0x00000274 + .bss start:0x00011F48 end:0x00011F58 diff --git a/config/GMPP01_00/rels/m442Dll/symbols.txt b/config/GMPP01_00/rels/m442Dll/symbols.txt index f7292ca9..c50572e9 100644 --- a/config/GMPP01_00/rels/m442Dll/symbols.txt +++ b/config/GMPP01_00/rels/m442Dll/symbols.txt @@ -1,222 +1,234 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x2D4 +ObjectSetup = .text:0x000000A0; // type:function size:0x2D4 fn_1_374 = .text:0x00000374; // type:function size:0x10 fn_1_384 = .text:0x00000384; // type:function size:0x10 fn_1_394 = .text:0x00000394; // type:function size:0xB4 fn_1_448 = .text:0x00000448; // type:function size:0x5E8 fn_1_A30 = .text:0x00000A30; // type:function size:0x60 fn_1_A90 = .text:0x00000A90; // type:function size:0x31C -fn_1_DAC = .text:0x00000DAC; // type:function size:0x68 -fn_1_E14 = .text:0x00000E14; // type:function size:0x84 -fn_1_E98 = .text:0x00000E98; // type:function size:0x380 -fn_1_1218 = .text:0x00001218; // type:function size:0x30 -fn_1_1248 = .text:0x00001248; // type:function size:0xDE0 -fn_1_2028 = .text:0x00002028; // type:function size:0x244 -fn_1_226C = .text:0x0000226C; // type:function size:0xF9C -fn_1_3208 = .text:0x00003208; // type:function size:0x3B0 -fn_1_35B8 = .text:0x000035B8; // type:function size:0xAC -fn_1_3664 = .text:0x00003664; // type:function size:0x160 -fn_1_37C4 = .text:0x000037C4; // type:function size:0x150 -fn_1_3914 = .text:0x00003914; // type:function size:0x1DC -fn_1_3AF0 = .text:0x00003AF0; // type:function size:0x13C -fn_1_3C2C = .text:0x00003C2C; // type:function size:0x74 -fn_1_3CA0 = .text:0x00003CA0; // type:function size:0x180 -fn_1_3E20 = .text:0x00003E20; // type:function size:0x50 -fn_1_3E70 = .text:0x00003E70; // type:function size:0x58 -fn_1_3EC8 = .text:0x00003EC8; // type:function size:0x4 -fn_1_3ECC = .text:0x00003ECC; // type:function size:0x4A4 -fn_1_4370 = .text:0x00004370; // type:function size:0x4 -fn_1_4374 = .text:0x00004374; // type:function size:0xDC -fn_1_4450 = .text:0x00004450; // type:function size:0x418 -fn_1_4868 = .text:0x00004868; // type:function size:0xC6C -fn_1_54D4 = .text:0x000054D4; // type:function size:0x450 -fn_1_5924 = .text:0x00005924; // type:function size:0xA8 -fn_1_59CC = .text:0x000059CC; // type:function size:0x88 -fn_1_5A54 = .text:0x00005A54; // type:function size:0x494 -fn_1_5EE8 = .text:0x00005EE8; // type:function size:0x5D8 -fn_1_64C0 = .text:0x000064C0; // type:function size:0x700 -fn_1_6BC0 = .text:0x00006BC0; // type:function size:0x114 -fn_1_6CD4 = .text:0x00006CD4; // type:function size:0x5C -fn_1_6D30 = .text:0x00006D30; // type:function size:0x5A0 -fn_1_72D0 = .text:0x000072D0; // type:function size:0x318 -fn_1_75E8 = .text:0x000075E8; // type:function size:0x158 -fn_1_7740 = .text:0x00007740; // type:function size:0x114 -fn_1_7854 = .text:0x00007854; // type:function size:0x48 -fn_1_789C = .text:0x0000789C; // type:function size:0x3FC -fn_1_7C98 = .text:0x00007C98; // type:function size:0x230 -fn_1_7EC8 = .text:0x00007EC8; // type:function size:0x664 -fn_1_852C = .text:0x0000852C; // type:function size:0xC8 -fn_1_85F4 = .text:0x000085F4; // type:function size:0x104 -fn_1_86F8 = .text:0x000086F8; // type:function size:0x4C -fn_1_8744 = .text:0x00008744; // type:function size:0x250 -fn_1_8994 = .text:0x00008994; // type:function size:0x764 -fn_1_90F8 = .text:0x000090F8; // type:function size:0x10 -fn_1_9108 = .text:0x00009108; // type:function size:0xB0 -fn_1_91B8 = .text:0x000091B8; // type:function size:0x28C -fn_1_9444 = .text:0x00009444; // type:function size:0x74 -fn_1_94B8 = .text:0x000094B8; // type:function size:0x50 -fn_1_9508 = .text:0x00009508; // type:function size:0x24 -fn_1_952C = .text:0x0000952C; // type:function size:0x30 -fn_1_955C = .text:0x0000955C; // type:function size:0x1BC -fn_1_9718 = .text:0x00009718; // type:function size:0x78 -fn_1_9790 = .text:0x00009790; // type:function size:0x88 -fn_1_9818 = .text:0x00009818; // type:function size:0x164 +fn_1_D9C = .text:0x00000DAC; // type:function size:0x68 +fn_1_E04 = .text:0x00000E14; // type:function size:0x84 +fn_1_E88 = .text:0x00000E98; // type:function size:0x380 +fn_1_1200 = .text:0x00001218; // type:function size:0x30 +fn_1_1230 = .text:0x00001248; // type:function size:0xDE0 +fn_1_2010 = .text:0x00002028; // type:function size:0x244 +fn_1_2254 = .text:0x0000226C; // type:function size:0xF9C +fn_1_31FC = .text:0x00003208; // type:function size:0x3B0 +fn_1_35AC = .text:0x000035B8; // type:function size:0xAC +fn_1_3658 = .text:0x00003664; // type:function size:0x160 +fn_1_37B8 = .text:0x000037C4; // type:function size:0x150 +fn_1_3908 = .text:0x00003914; // type:function size:0x1DC +fn_1_3AE4 = .text:0x00003AF0; // type:function size:0x13C +fn_1_3C20 = .text:0x00003C2C; // type:function size:0x74 +fn_1_3C94 = .text:0x00003CA0; // type:function size:0x180 +fn_1_3E14 = .text:0x00003E20; // type:function size:0x50 +fn_1_3E64 = .text:0x00003E70; // type:function size:0x58 +fn_1_3EBC = .text:0x00003EC8; // type:function size:0x4 +fn_1_3EC0 = .text:0x00003ECC; // type:function size:0x4A4 +fn_1_4364 = .text:0x00004370; // type:function size:0x4 +fn_1_4368 = .text:0x00004374; // type:function size:0xDC +fn_1_4444 = .text:0x00004450; // type:function size:0x418 +fn_1_485C = .text:0x00004868; // type:function size:0xC6C +fn_1_54C8 = .text:0x000054D4; // type:function size:0x450 +fn_1_5918 = .text:0x00005924; // type:function size:0xA8 +fn_1_59C0 = .text:0x000059CC; // type:function size:0x88 +fn_1_5A48 = .text:0x00005A54; // type:function size:0x494 +fn_1_5EDC = .text:0x00005EE8; // type:function size:0x5D8 +fn_1_64B4 = .text:0x000064C0; // type:function size:0x700 +fn_1_6BB4 = .text:0x00006BC0; // type:function size:0x114 +fn_1_6CC8 = .text:0x00006CD4; // type:function size:0x5C +fn_1_6D24 = .text:0x00006D30; // type:function size:0x5A0 +fn_1_72C4 = .text:0x000072D0; // type:function size:0x318 +fn_1_75DC = .text:0x000075E8; // type:function size:0x158 +fn_1_7734 = .text:0x00007740; // type:function size:0x114 +fn_1_7848 = .text:0x00007854; // type:function size:0x48 +fn_1_7890 = .text:0x0000789C; // type:function size:0x3FC +fn_1_7C8C = .text:0x00007C98; // type:function size:0x230 +fn_1_7EBC = .text:0x00007EC8; // type:function size:0x664 +fn_1_8520 = .text:0x0000852C; // type:function size:0xC8 +fn_1_85E8 = .text:0x000085F4; // type:function size:0x104 +fn_1_86EC = .text:0x000086F8; // type:function size:0x4C +fn_1_8738 = .text:0x00008744; // type:function size:0x250 +fn_1_8988 = .text:0x00008994; // type:function size:0x764 +fn_1_90EC = .text:0x000090F8; // type:function size:0x10 +fn_1_90FC = .text:0x00009108; // type:function size:0xB0 +fn_1_91AC = .text:0x000091B8; // type:function size:0x28C +fn_1_9438 = .text:0x00009444; // type:function size:0x74 +fn_1_94AC = .text:0x000094B8; // type:function size:0x50 +fn_1_94FC = .text:0x00009508; // type:function size:0x24 +fn_1_9520 = .text:0x0000952C; // type:function size:0x30 +fn_1_9550 = .text:0x0000955C; // type:function size:0x1BC +fn_1_970C = .text:0x00009718; // type:function size:0x78 +fn_1_9784 = .text:0x00009790; // type:function size:0x88 +fn_1_980C = .text:0x00009818; // 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_BC = .rodata:0x000000BC; // 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:0x8 data:double -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:0x4 data:float -lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 data:float -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_128 = .rodata:0x00000128; // type:object size:0x8 data:double -lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 data:float -lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 data:float -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:0x8 data:double -lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 data:double -lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float -lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0xC data:4byte -lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 data:float -lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 data:float -lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x8 data:double -lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x8 data:double -lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x8 data:double -lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x8 data:double -lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 data:float -lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 data:float -lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x8 data:double -lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x8 data:double -lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float -lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 data:float -lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 data:float -lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x8 data:double -lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x8 data:double -lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x8 data:float -lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 data:float -lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 data:float -lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 data:float -lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 data:float -lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 data:float -lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 data:float -lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x8 data:double -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 +__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_BC = .rodata:0x000000BC; // 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:0x4 scope:local 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 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_15C = .rodata:0x0000015C; // type:object size:0x4 scope:local data:4byte +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:0x4 scope:local data:float +lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size: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:0x4 scope:local 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 scope:local 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 scope:local 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:0x8 scope:local data:double +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_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:0x24 +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:0x23 scope:local 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_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_E0 = .data:0x000000E0; // type:object size:0x1C scope:local data:string +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:0x19 scope:local 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 scope:local data:string +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 lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x2 data:2byte lbl_1_bss_12 = .bss:0x00000012; // type:object size:0x2 data:2byte lbl_1_bss_14 = .bss:0x00000014; // type:object size:0xC data:float -lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x4 data:4byte -lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x3C -lbl_1_bss_60 = .bss:0x00000060; // type:object size:0xC000 data:2byte -lbl_1_bss_C060 = .bss:0x0000C060; // type:object size:0x28 data:2byte -lbl_1_bss_C088 = .bss:0x0000C088; // type:object size:0x974 -lbl_1_bss_C9FC = .bss:0x0000C9FC; // type:object size:0x5000 data:4byte -lbl_1_bss_119FC = .bss:0x000119FC; // type:object size:0x4 data:4byte -lbl_1_bss_11A00 = .bss:0x00011A00; // type:object size:0x271 -lbl_1_bss_11C71 = .bss:0x00011C71; // type:object size:0x273 +lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x3C data:4byte +lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0xC000 data:2byte +lbl_1_bss_C05C = .bss:0x0000C05C; // type:object size:0x28 data:2byte +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: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:0x4 data:4byte -lbl_1_bss_11EEC = .bss:0x00011EEC; // type:object size:0x2 data:2byte -lbl_1_bss_11EF0 = .bss:0x00011EF0; // type:object size:0x10 +lbl_1_bss_11EE8 = .bss:0x00011EE8; // type:object size:0x2 data:2byte +lbl_1_bss_11EEC = .bss:0x00011EEC; // type:object size:0x10 data:2byte +lbl_1_bss_11EFC = .bss:0x00011EFC; // type:object size:0x4 data:4byte lbl_1_bss_11F00 = .bss:0x00011F00; // type:object size:0x4 data:4byte -lbl_1_bss_11F04 = .bss:0x00011F04; // type:object size:0x4 data:4byte -lbl_1_bss_11F08 = .bss:0x00011F08; // type:object size:0xC -lbl_1_bss_11F14 = .bss:0x00011F14; // type:object size:0x4 data:4byte +lbl_1_bss_11F04 = .bss:0x00011F04; // type:object size:0xC data:4byte +lbl_1_bss_11F10 = .bss:0x00011F10; // type:object size:0x4 data:4byte +lbl_1_bss_11F14 = .bss:0x00011F14; // type:object size:0x2 data:2byte +lbl_1_bss_11F16 = .bss:0x00011F16; // type:object size:0x2 data:2byte lbl_1_bss_11F18 = .bss:0x00011F18; // type:object size:0x2 data:2byte lbl_1_bss_11F1A = .bss:0x00011F1A; // type:object size:0x2 data:2byte lbl_1_bss_11F1C = .bss:0x00011F1C; // type:object size:0x2 data:2byte lbl_1_bss_11F1E = .bss:0x00011F1E; // type:object size:0x2 data:2byte -lbl_1_bss_11F20 = .bss:0x00011F20; // type:object size:0x2 data:2byte +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:0x4 data:4byte -lbl_1_bss_11F34 = .bss:0x00011F34; // type:object size:0x8 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 -lbl_1_bss_11F44 = .bss:0x00011F44; // type:object size:0xC data:4byte +lbl_1_bss_11F44 = .bss:0x00011F44; // type:object size:0x4 data:4byte +lbl_1_bss_11F48 = .bss:0x00011F48; // type:object size:0x4 data:4byte +lbl_1_bss_11F4C = .bss:0x00011F4C; // type:object size:0x4 data:4byte lbl_1_bss_11F50 = .bss:0x00011F50; // type:object size:0x4 data:4byte lbl_1_bss_11F54 = .bss:0x00011F54; // type:object size:0x4 data:4byte diff --git a/config/GMPP01_00/rels/m451Dll/symbols.txt b/config/GMPP01_00/rels/m451Dll/symbols.txt index 31e776c0..27c352fc 100644 --- a/config/GMPP01_00/rels/m451Dll/symbols.txt +++ b/config/GMPP01_00/rels/m451Dll/symbols.txt @@ -99,109 +99,109 @@ lbl_1_data_54 = .data:0x00000054; // type:object size:0xC lbl_1_data_60 = .data:0x00000060; // type:object size:0xC lbl_1_data_6C = .data:0x0000006C; // type:object size:0xC lbl_1_data_78 = .data:0x00000078; // type:object size:0xC -lbl_1_data_84 = .data:0x00000084; // type:object size:0xB data:string -lbl_1_data_8F = .data:0x0000008F; // type:object size:0xB data:string -lbl_1_data_9A = .data:0x0000009A; // type:object size:0xB data:string -lbl_1_data_A5 = .data:0x000000A5; // type:object size:0xB data:string -lbl_1_data_B0 = .data:0x000000B0; // type:object size:0xB data:string -lbl_1_data_BB = .data:0x000000BB; // type:object size:0xB data:string -lbl_1_data_C6 = .data:0x000000C6; // type:object size:0xB data:string -lbl_1_data_D1 = .data:0x000000D1; // type:object size:0xB data:string -lbl_1_data_DC = .data:0x000000DC; // type:object size:0xB data:string -lbl_1_data_E7 = .data:0x000000E7; // type:object size:0xB data:string -lbl_1_data_F2 = .data:0x000000F2; // type:object size:0xB data:string -lbl_1_data_FD = .data:0x000000FD; // type:object size:0xB data:string -lbl_1_data_108 = .data:0x00000108; // type:object size:0xB data:string -lbl_1_data_113 = .data:0x00000113; // type:object size:0xB data:string -lbl_1_data_11E = .data:0x0000011E; // type:object size:0xB data:string -lbl_1_data_129 = .data:0x00000129; // type:object size:0xB data:string -lbl_1_data_134 = .data:0x00000134; // type:object size:0xB data:string -lbl_1_data_13F = .data:0x0000013F; // type:object size:0xB data:string -lbl_1_data_14A = .data:0x0000014A; // type:object size:0xB data:string -lbl_1_data_155 = .data:0x00000155; // type:object size:0xB data:string -lbl_1_data_160 = .data:0x00000160; // type:object size:0xB data:string -lbl_1_data_16B = .data:0x0000016B; // type:object size:0xB data:string -lbl_1_data_176 = .data:0x00000176; // type:object size:0xB data:string -lbl_1_data_181 = .data:0x00000181; // type:object size:0xB data:string -lbl_1_data_18C = .data:0x0000018C; // type:object size:0xB data:string -lbl_1_data_197 = .data:0x00000197; // type:object size:0xB data:string -lbl_1_data_1A2 = .data:0x000001A2; // type:object size:0xB data:string -lbl_1_data_1AD = .data:0x000001AD; // type:object size:0xB data:string -lbl_1_data_1B8 = .data:0x000001B8; // type:object size:0xB data:string -lbl_1_data_1C3 = .data:0x000001C3; // type:object size:0xB data:string -lbl_1_data_1CE = .data:0x000001CE; // type:object size:0xB data:string -lbl_1_data_1D9 = .data:0x000001D9; // type:object size:0xB data:string -lbl_1_data_1E4 = .data:0x000001E4; // type:object size:0xB data:string -lbl_1_data_1EF = .data:0x000001EF; // type:object size:0xB data:string -lbl_1_data_1FA = .data:0x000001FA; // type:object size:0xB data:string -lbl_1_data_205 = .data:0x00000205; // type:object size:0xB data:string -lbl_1_data_210 = .data:0x00000210; // type:object size:0xB data:string -lbl_1_data_21B = .data:0x0000021B; // type:object size:0xB data:string -lbl_1_data_226 = .data:0x00000226; // type:object size:0xB data:string -lbl_1_data_231 = .data:0x00000231; // type:object size:0xB data:string -lbl_1_data_23C = .data:0x0000023C; // type:object size:0xB data:string -lbl_1_data_247 = .data:0x00000247; // type:object size:0xB data:string -lbl_1_data_252 = .data:0x00000252; // type:object size:0xB data:string -lbl_1_data_25D = .data:0x0000025D; // type:object size:0xB data:string -lbl_1_data_268 = .data:0x00000268; // type:object size:0xB data:string -lbl_1_data_273 = .data:0x00000273; // type:object size:0xB data:string -lbl_1_data_27E = .data:0x0000027E; // type:object size:0xB data:string -lbl_1_data_289 = .data:0x00000289; // type:object size:0xB data:string -lbl_1_data_294 = .data:0x00000294; // type:object size:0xB data:string -lbl_1_data_29F = .data:0x0000029F; // type:object size:0xB data:string -lbl_1_data_2AA = .data:0x000002AA; // type:object size:0xB data:string -lbl_1_data_2B5 = .data:0x000002B5; // type:object size:0xB data:string -lbl_1_data_2C0 = .data:0x000002C0; // type:object size:0xB data:string -lbl_1_data_2CB = .data:0x000002CB; // type:object size:0xB data:string -lbl_1_data_2D6 = .data:0x000002D6; // type:object size:0xB data:string -lbl_1_data_2E1 = .data:0x000002E1; // type:object size:0xB data:string -lbl_1_data_2EC = .data:0x000002EC; // type:object size:0xB data:string -lbl_1_data_2F7 = .data:0x000002F7; // type:object size:0xB data:string -lbl_1_data_302 = .data:0x00000302; // type:object size:0xB data:string -lbl_1_data_30D = .data:0x0000030D; // type:object size:0xB data:string -lbl_1_data_318 = .data:0x00000318; // type:object size:0xB data:string -lbl_1_data_323 = .data:0x00000323; // type:object size:0xB data:string -lbl_1_data_32E = .data:0x0000032E; // type:object size:0xB data:string -lbl_1_data_339 = .data:0x00000339; // type:object size:0xB data:string -lbl_1_data_344 = .data:0x00000344; // type:object size:0xB data:string -lbl_1_data_34F = .data:0x0000034F; // type:object size:0xB data:string -lbl_1_data_35A = .data:0x0000035A; // type:object size:0xB data:string -lbl_1_data_365 = .data:0x00000365; // type:object size:0xB data:string -lbl_1_data_370 = .data:0x00000370; // type:object size:0xB data:string -lbl_1_data_37B = .data:0x0000037B; // type:object size:0xB data:string -lbl_1_data_386 = .data:0x00000386; // type:object size:0xB data:string -lbl_1_data_391 = .data:0x00000391; // type:object size:0xB data:string -lbl_1_data_39C = .data:0x0000039C; // type:object size:0xB data:string -lbl_1_data_3A7 = .data:0x000003A7; // type:object size:0xB data:string -lbl_1_data_3B2 = .data:0x000003B2; // type:object size:0xB data:string -lbl_1_data_3BD = .data:0x000003BD; // type:object size:0xB data:string -lbl_1_data_3C8 = .data:0x000003C8; // type:object size:0xB data:string -lbl_1_data_3D3 = .data:0x000003D3; // type:object size:0xB data:string -lbl_1_data_3DE = .data:0x000003DE; // type:object size:0xB data:string -lbl_1_data_3E9 = .data:0x000003E9; // type:object size:0xB data:string -lbl_1_data_3F4 = .data:0x000003F4; // type:object size:0xB data:string -lbl_1_data_3FF = .data:0x000003FF; // type:object size:0xB data:string -lbl_1_data_40A = .data:0x0000040A; // type:object size:0xB data:string -lbl_1_data_415 = .data:0x00000415; // type:object size:0xB data:string -lbl_1_data_420 = .data:0x00000420; // type:object size:0xB data:string -lbl_1_data_42B = .data:0x0000042B; // type:object size:0xB data:string -lbl_1_data_436 = .data:0x00000436; // type:object size:0xB data:string -lbl_1_data_441 = .data:0x00000441; // type:object size:0xB data:string -lbl_1_data_44C = .data:0x0000044C; // type:object size:0xB data:string +lbl_1_data_84 = .data:0x00000084; // type:object size:0xB scope:local data:string +lbl_1_data_8F = .data:0x0000008F; // type:object size:0xB scope:local data:string +lbl_1_data_9A = .data:0x0000009A; // type:object size:0xB scope:local data:string +lbl_1_data_A5 = .data:0x000000A5; // type:object size:0xB scope:local data:string +lbl_1_data_B0 = .data:0x000000B0; // type:object size:0xB scope:local data:string +lbl_1_data_BB = .data:0x000000BB; // type:object size:0xB scope:local data:string +lbl_1_data_C6 = .data:0x000000C6; // type:object size:0xB scope:local data:string +lbl_1_data_D1 = .data:0x000000D1; // type:object size:0xB scope:local data:string +lbl_1_data_DC = .data:0x000000DC; // type:object size:0xB scope:local data:string +lbl_1_data_E7 = .data:0x000000E7; // type:object size:0xB scope:local data:string +lbl_1_data_F2 = .data:0x000000F2; // type:object size:0xB scope:local data:string +lbl_1_data_FD = .data:0x000000FD; // type:object size:0xB scope:local data:string +lbl_1_data_108 = .data:0x00000108; // type:object size:0xB scope:local data:string +lbl_1_data_113 = .data:0x00000113; // type:object size:0xB scope:local data:string +lbl_1_data_11E = .data:0x0000011E; // type:object size:0xB scope:local data:string +lbl_1_data_129 = .data:0x00000129; // type:object size:0xB scope:local data:string +lbl_1_data_134 = .data:0x00000134; // type:object size:0xB scope:local data:string +lbl_1_data_13F = .data:0x0000013F; // type:object size:0xB scope:local data:string +lbl_1_data_14A = .data:0x0000014A; // type:object size:0xB scope:local data:string +lbl_1_data_155 = .data:0x00000155; // type:object size:0xB scope:local data:string +lbl_1_data_160 = .data:0x00000160; // type:object size:0xB scope:local data:string +lbl_1_data_16B = .data:0x0000016B; // type:object size:0xB scope:local data:string +lbl_1_data_176 = .data:0x00000176; // type:object size:0xB scope:local data:string +lbl_1_data_181 = .data:0x00000181; // type:object size:0xB scope:local data:string +lbl_1_data_18C = .data:0x0000018C; // type:object size:0xB scope:local data:string +lbl_1_data_197 = .data:0x00000197; // type:object size:0xB scope:local data:string +lbl_1_data_1A2 = .data:0x000001A2; // type:object size:0xB scope:local data:string +lbl_1_data_1AD = .data:0x000001AD; // type:object size:0xB scope:local data:string +lbl_1_data_1B8 = .data:0x000001B8; // type:object size:0xB scope:local data:string +lbl_1_data_1C3 = .data:0x000001C3; // type:object size:0xB scope:local data:string +lbl_1_data_1CE = .data:0x000001CE; // type:object size:0xB scope:local data:string +lbl_1_data_1D9 = .data:0x000001D9; // type:object size:0xB scope:local data:string +lbl_1_data_1E4 = .data:0x000001E4; // type:object size:0xB scope:local data:string +lbl_1_data_1EF = .data:0x000001EF; // type:object size:0xB scope:local data:string +lbl_1_data_1FA = .data:0x000001FA; // type:object size:0xB scope:local data:string +lbl_1_data_205 = .data:0x00000205; // type:object size:0xB scope:local data:string +lbl_1_data_210 = .data:0x00000210; // type:object size:0xB scope:local data:string +lbl_1_data_21B = .data:0x0000021B; // type:object size:0xB scope:local data:string +lbl_1_data_226 = .data:0x00000226; // type:object size:0xB scope:local data:string +lbl_1_data_231 = .data:0x00000231; // type:object size:0xB scope:local data:string +lbl_1_data_23C = .data:0x0000023C; // type:object size:0xB scope:local data:string +lbl_1_data_247 = .data:0x00000247; // type:object size:0xB scope:local data:string +lbl_1_data_252 = .data:0x00000252; // type:object size:0xB scope:local data:string +lbl_1_data_25D = .data:0x0000025D; // type:object size:0xB scope:local data:string +lbl_1_data_268 = .data:0x00000268; // type:object size:0xB scope:local data:string +lbl_1_data_273 = .data:0x00000273; // type:object size:0xB scope:local data:string +lbl_1_data_27E = .data:0x0000027E; // type:object size:0xB scope:local data:string +lbl_1_data_289 = .data:0x00000289; // type:object size:0xB scope:local data:string +lbl_1_data_294 = .data:0x00000294; // type:object size:0xB scope:local data:string +lbl_1_data_29F = .data:0x0000029F; // type:object size:0xB scope:local data:string +lbl_1_data_2AA = .data:0x000002AA; // type:object size:0xB scope:local data:string +lbl_1_data_2B5 = .data:0x000002B5; // type:object size:0xB scope:local data:string +lbl_1_data_2C0 = .data:0x000002C0; // type:object size:0xB scope:local data:string +lbl_1_data_2CB = .data:0x000002CB; // type:object size:0xB scope:local data:string +lbl_1_data_2D6 = .data:0x000002D6; // type:object size:0xB scope:local data:string +lbl_1_data_2E1 = .data:0x000002E1; // type:object size:0xB scope:local data:string +lbl_1_data_2EC = .data:0x000002EC; // type:object size:0xB scope:local data:string +lbl_1_data_2F7 = .data:0x000002F7; // type:object size:0xB scope:local data:string +lbl_1_data_302 = .data:0x00000302; // type:object size:0xB scope:local data:string +lbl_1_data_30D = .data:0x0000030D; // type:object size:0xB scope:local data:string +lbl_1_data_318 = .data:0x00000318; // type:object size:0xB scope:local data:string +lbl_1_data_323 = .data:0x00000323; // type:object size:0xB scope:local data:string +lbl_1_data_32E = .data:0x0000032E; // type:object size:0xB scope:local data:string +lbl_1_data_339 = .data:0x00000339; // type:object size:0xB scope:local data:string +lbl_1_data_344 = .data:0x00000344; // type:object size:0xB scope:local data:string +lbl_1_data_34F = .data:0x0000034F; // type:object size:0xB scope:local data:string +lbl_1_data_35A = .data:0x0000035A; // type:object size:0xB scope:local data:string +lbl_1_data_365 = .data:0x00000365; // type:object size:0xB scope:local data:string +lbl_1_data_370 = .data:0x00000370; // type:object size:0xB scope:local data:string +lbl_1_data_37B = .data:0x0000037B; // type:object size:0xB scope:local data:string +lbl_1_data_386 = .data:0x00000386; // type:object size:0xB scope:local data:string +lbl_1_data_391 = .data:0x00000391; // type:object size:0xB scope:local data:string +lbl_1_data_39C = .data:0x0000039C; // type:object size:0xB scope:local data:string +lbl_1_data_3A7 = .data:0x000003A7; // type:object size:0xB scope:local data:string +lbl_1_data_3B2 = .data:0x000003B2; // type:object size:0xB scope:local data:string +lbl_1_data_3BD = .data:0x000003BD; // type:object size:0xB scope:local data:string +lbl_1_data_3C8 = .data:0x000003C8; // type:object size:0xB scope:local data:string +lbl_1_data_3D3 = .data:0x000003D3; // type:object size:0xB scope:local data:string +lbl_1_data_3DE = .data:0x000003DE; // type:object size:0xB scope:local data:string +lbl_1_data_3E9 = .data:0x000003E9; // type:object size:0xB scope:local data:string +lbl_1_data_3F4 = .data:0x000003F4; // type:object size:0xB scope:local data:string +lbl_1_data_3FF = .data:0x000003FF; // type:object size:0xB scope:local data:string +lbl_1_data_40A = .data:0x0000040A; // type:object size:0xB scope:local data:string +lbl_1_data_415 = .data:0x00000415; // type:object size:0xB scope:local data:string +lbl_1_data_420 = .data:0x00000420; // type:object size:0xB scope:local data:string +lbl_1_data_42B = .data:0x0000042B; // type:object size:0xB scope:local data:string +lbl_1_data_436 = .data:0x00000436; // type:object size:0xB scope:local data:string +lbl_1_data_441 = .data:0x00000441; // type:object size:0xB scope:local data:string +lbl_1_data_44C = .data:0x0000044C; // type:object size:0xB scope:local data:string lbl_1_data_457 = .data:0x00000457; // type:object size:0xD lbl_1_data_464 = .data:0x00000464; // type:object size:0x264 lbl_1_data_6C8 = .data:0x000006C8; // type:object size:0xC lbl_1_data_6D4 = .data:0x000006D4; // type:object size:0x78 data:float lbl_1_data_74C = .data:0x0000074C; // type:object size:0xC lbl_1_data_758 = .data:0x00000758; // type:object size:0xC -lbl_1_data_764 = .data:0x00000764; // type:object size:0xC data:string -lbl_1_data_770 = .data:0x00000770; // type:object size:0xC data:string -lbl_1_data_77C = .data:0x0000077C; // type:object size:0x7 data:string -lbl_1_data_783 = .data:0x00000783; // type:object size:0x8 data:string -lbl_1_data_78B = .data:0x0000078B; // type:object size:0x8 data:string -lbl_1_data_793 = .data:0x00000793; // type:object size:0x8 data:string -lbl_1_data_79B = .data:0x0000079B; // type:object size:0xB data:string -lbl_1_data_7A6 = .data:0x000007A6; // type:object size:0xF data:string +lbl_1_data_764 = .data:0x00000764; // type:object size:0xC scope:local data:string +lbl_1_data_770 = .data:0x00000770; // type:object size:0xC scope:local data:string +lbl_1_data_77C = .data:0x0000077C; // type:object size:0x7 scope:local data:string +lbl_1_data_783 = .data:0x00000783; // type:object size:0x8 scope:local data:string +lbl_1_data_78B = .data:0x0000078B; // type:object size:0x8 scope:local data:string +lbl_1_data_793 = .data:0x00000793; // type:object size:0x8 scope:local data:string +lbl_1_data_79B = .data:0x0000079B; // type:object size:0xB scope:local data:string +lbl_1_data_7A6 = .data:0x000007A6; // type:object size:0xF scope:local data:string lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x340 data:4byte lbl_1_bss_348 = .bss:0x00000348; // type:object size:0x810 data:float diff --git a/configure.py b/configure.py index d3de99e8..cd766eff 100644 --- a/configure.py +++ b/configure.py @@ -1142,20 +1142,20 @@ config.libs = [ Rel( "m440Dll", # Bowser's Bigger Blast objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m440Dll/main.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m440Dll/object.c"), + Object(Matching, "REL/m440Dll/main.c"), + Object(Matching, "REL/m440Dll/object.c"), }, ), Rel( "m441Dll", # Butterfly Blitz objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m441Dll/main.c"), + Object(Matching, "REL/m441Dll/main.c"), }, ), Rel( "m442Dll", # Barrel Baron objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m442Dll/main.c"), + Object(Matching, "REL/m442Dll/main.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m442Dll/score.c"), }, ), diff --git a/include/REL/m440Dll.h b/include/REL/m440Dll.h index 071bc6a5..ef9426e8 100644 --- a/include/REL/m440Dll.h +++ b/include/REL/m440Dll.h @@ -4,6 +4,8 @@ #include "dolphin/types.h" #include "game/hsfman.h" +#include "version.h" + #include "game/object.h" extern s32 rand8(void); @@ -240,6 +242,11 @@ typedef struct _unkObjStruct { f32 unk70; } unkObjStruct; +#if VERSION_NTSC +#define REFRESH_RATE_F 60.0f +#else +#define REFRESH_RATE_F 49.998f +#endif ////// BSS ////// extern omObjData* lbl_1_bss_C0[4]; diff --git a/src/REL/m440Dll/main.c b/src/REL/m440Dll/main.c index e200145c..1ec95168 100644 --- a/src/REL/m440Dll/main.c +++ b/src/REL/m440Dll/main.c @@ -14,6 +14,7 @@ #include "math.h" #include "string.h" +#include "version.h" // bss omObjData *lbl_1_bss_6C; @@ -117,7 +118,7 @@ s32 fn_1_4A4(void) var_r31 = &lbl_1_data_78[0]; var_r30 = 0; lbl_1_bss_4++; - var_f31 = lbl_1_bss_4 / 120.0f; + var_f31 = lbl_1_bss_4 / (2 * REFRESH_RATE_F); if (var_f31 > 1.0f) { lbl_1_bss_4 = 0; var_f31 = 1.0f; @@ -144,7 +145,7 @@ s32 fn_1_6C8(void) var_r31 = &lbl_1_data_78[1]; var_r30 = 0; lbl_1_bss_4++; - var_f31 = lbl_1_bss_4 / 120.0f; + var_f31 = lbl_1_bss_4 / (2 * REFRESH_RATE_F); if (var_f31 > 1.0f) { lbl_1_bss_4 = 0; var_f31 = 1.0f; @@ -173,7 +174,7 @@ void fn_1_8F0(omObjData *arg0) temp_r31->unk0 = 1; temp_r31->unk4 = -1; temp_r31->unk8 = -1; - temp_r31->unk6 = 0x12C; + temp_r31->unk6 = 5 * REFRESH_RATE; temp_r31->unkA = 0; temp_r31->unkC = -1; @@ -215,7 +216,7 @@ void fn_1_AE0(omObjData *arg0) break; case 3: if (temp_r31->unk8 != -1) { - MGSeqParamSet(temp_r31->unk8, 1, ((temp_r31->unk6 + 0x3B) / 60)); + MGSeqParamSet(temp_r31->unk8, 1, ((temp_r31->unk6 + REFRESH_RATE - 1) / REFRESH_RATE)); } if ((temp_r31->unkC < 0) && ((MGSeqStatGet(temp_r31->unk4) & 0x10) != 0)) { temp_r31->unkC = HuAudSeqPlay(0x49); @@ -226,7 +227,7 @@ void fn_1_AE0(omObjData *arg0) temp_f31 = (((rand8() << 8) | rand8()) % 361); Center.x = (lbl_1_data_78[1].center.x + (10.0 * sind(temp_f31))); Center.y = (lbl_1_data_78[1].center.y + (10.0 * cosd(temp_f31))); - if (temp_r31->unkA > 0x28) { + if (temp_r31->unkA > (2 * REFRESH_RATE / 3)) { temp_r31->unkA = 0; return; } @@ -265,7 +266,7 @@ u8 fn_1_E14(omObjData *arg0) lbl_1_bss_6++; break; case 1: - if (++lbl_1_bss_8 > 0x1E) { + if (++lbl_1_bss_8 > (s16)(0.5f * REFRESH_RATE_F)) { fn_1_F168(); lbl_1_bss_8 = 0; lbl_1_bss_6++; @@ -275,7 +276,7 @@ u8 fn_1_E14(omObjData *arg0) var_r31 = lbl_1_data_78; var_r30 = 0; lbl_1_bss_4++; - var_f31 = lbl_1_bss_4 / 120.0f; + var_f31 = lbl_1_bss_4 / (2 * REFRESH_RATE_F); if (var_f31 > 1.0f) { lbl_1_bss_4 = 0; var_f31 = 1.0f; @@ -319,7 +320,7 @@ u8 fn_1_1138(omObjData *object) temp_r30->unk40 = temp_r30->unk34; } lbl_1_bss_8++; - var_f30 = lbl_1_bss_8 / 30.0f; + var_f30 = lbl_1_bss_8 / (0.5f * REFRESH_RATE_F); if (var_f30 >= 1.0f) { var_f30 = 1.0f; if (lbl_1_bss_B == 0) { @@ -331,7 +332,7 @@ u8 fn_1_1138(omObjData *object) var_r31 = &lbl_1_data_78[1]; // could be fn_1_6C8 var_r28 = 0; lbl_1_bss_4++; - var_f31 = lbl_1_bss_4 / 120.0f; + var_f31 = lbl_1_bss_4 / (2 * REFRESH_RATE_F); if (var_f31 > 1.0f) { lbl_1_bss_4 = 0; var_f31 = 1.0f; @@ -357,7 +358,7 @@ u8 fn_1_1138(omObjData *object) lbl_1_bss_8 = 0; break; case 2: - if (++lbl_1_bss_8 > 210.0f) { + if (++lbl_1_bss_8 > (3.5f * REFRESH_RATE)) { lbl_1_bss_6 = 0; return 1; } @@ -392,7 +393,7 @@ void fn_1_1768(void) temp_r31 = (unkStruct2 *)lbl_1_bss_6C->data; if (temp_r31->unk8 == -1) { - temp_r31->unk6 = 0x12C; + temp_r31->unk6 = 5 * REFRESH_RATE; temp_r31->unk8 = MGSeqCreate(1, 5, -1, -1); } } @@ -695,7 +696,7 @@ void fn_1_2B04(omObjData *object) switch (lbl_1_data_E4[0]) { case 0: lbl_1_data_E8[0]++; - temp_f31 = lbl_1_data_E8[0] / 360.0f; + temp_f31 = lbl_1_data_E8[0] / (6 * REFRESH_RATE_F); if (temp_f31 > 1.0f) { temp_f31 = 1.0f; Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); @@ -752,15 +753,15 @@ void fn_1_2D28(omObjData *object) break; case 0x1: lbl_1_data_F0[0]++; - var_f31 = lbl_1_data_F0[0] / 120.0f; + var_f31 = lbl_1_data_F0[0] / (2 * REFRESH_RATE_F); if (var_f31 > 1.0f) { var_f31 = 1.0f; lbl_1_data_F0[0] = 0; - lbl_1_data_F0[1] = 0xF; + lbl_1_data_F0[1] = REFRESH_RATE / 4; lbl_1_data_EC[1] = (lbl_1_data_EC[0] + 1); lbl_1_data_EC[0] = 0x63; } - if (110.0f == lbl_1_data_F0[0]) { + if ((11 * REFRESH_RATE_F / 6) == lbl_1_data_F0[0]) { HuAudFXPlay(0x70A); } var_f31 = sin((M_PI * (90.0f * var_f31)) / 180.0); @@ -771,11 +772,11 @@ void fn_1_2D28(omObjData *object) HuAudFXPlay(0x713); } lbl_1_data_F0[0]++; - var_f31 = lbl_1_data_F0[0] / 60.0f; + var_f31 = lbl_1_data_F0[0] / REFRESH_RATE_F; if (var_f31 > 1.0f) { var_f31 = 1.0f; lbl_1_data_F0[0] = 0; - lbl_1_data_F0[1] = 0xF; + lbl_1_data_F0[1] = REFRESH_RATE / 4; lbl_1_data_EC[1] = lbl_1_data_EC[0] + 1; lbl_1_data_EC[0] = 0x63; HuAudFXPlay(0x714); @@ -788,7 +789,7 @@ void fn_1_2D28(omObjData *object) if (lbl_1_data_F0[0] == 0) { HuAudFXPlay(0x711); } - if (++lbl_1_data_F0[0] > 12.0) { + if (++lbl_1_data_F0[0] > (0.2 * REFRESH_RATE)) { if (fn_1_4EA8(0x40) != 0) { fn_1_4EEC(0x40, 0); fn_1_F228(); @@ -801,7 +802,7 @@ void fn_1_2D28(omObjData *object) break; case 0x4: lbl_1_data_F0[0]++; - var_f31 = lbl_1_data_F0[0] / 360.0f; + var_f31 = lbl_1_data_F0[0] / (6 * REFRESH_RATE_F); if (var_f31 > 1.0f) { var_f31 = 1.0f; Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); @@ -1021,7 +1022,7 @@ void fn_1_46E0(omObjData *object) break; case 0x1: lbl_1_data_108[0]++; - var_f31 = lbl_1_data_108[0] / 60.0f; + var_f31 = lbl_1_data_108[0] / REFRESH_RATE_F; if (var_f31 > 1.0f) { var_f31 = 1.0f; lbl_1_data_108[0] = 0; @@ -1083,7 +1084,7 @@ void fn_1_4B44(omObjData *object) switch (lbl_1_data_104[0]) { case 0: lbl_1_data_108[0]++; - var_f31 = lbl_1_data_108[0] / 60.0f; + var_f31 = lbl_1_data_108[0] / REFRESH_RATE_F; if (var_f31 > 1.0f) { var_f31 = 1.0f; lbl_1_data_108[0] = 0; @@ -1094,7 +1095,7 @@ void fn_1_4B44(omObjData *object) break; case 1: lbl_1_data_108[0]++; - var_f31 = (lbl_1_data_108[0] / 30.0f); + var_f31 = (lbl_1_data_108[0] / (0.5f * REFRESH_RATE_F)); if (var_f31 >= 1.0f) { lbl_1_data_108[0] = 0; lbl_1_data_104[0] = 0; @@ -1301,7 +1302,7 @@ void fn_1_57B4(unkStruct6 *arg0) } } if ((arg0->unk2 & 4) != 0) { - if (++arg0->unk3E > 0x50) { + if (++arg0->unk3E > (4 * REFRESH_RATE / 3)) { arg0->unk3C = ((arg0->unk3C - 10) < 0) ? 0 : arg0->unk3C - 10; } } diff --git a/src/REL/m440Dll/object.c b/src/REL/m440Dll/object.c index 5e94301f..941f1463 100644 --- a/src/REL/m440Dll/object.c +++ b/src/REL/m440Dll/object.c @@ -8,6 +8,12 @@ #include "game/pad.h" #include "math.h" #include "string.h" +#include "version.h" + + +#ifdef __MWERKS__ +#include "game/audio.h" +#endif // bss @@ -78,7 +84,7 @@ void fn_1_AEE4(omObjData *arg0) temp_r31->unk30.x = temp_r31->unk30.y = temp_r31->unk30.z = 0.0f; temp_r31->unk3C.y = 90.0f; temp_r31->unkC = 0; - temp_r31->unkE = 0x78; + temp_r31->unkE = 2 * REFRESH_RATE_F; temp_r31->unk10 = temp_r31->unk12 = temp_r31->unk14 = 0; if (temp_r31->unk8 == 5) { var_f31 = 350.0f; @@ -173,7 +179,7 @@ void fn_1_B3A4(omObjData *arg0) var_r31->unk18.y = 0.0f; var_r31->unk18.z = var_r31->unk24.z + (lbl_1_bss_88[var_r28].z - var_r31->unk24.z) * var_f31; var_r31->unk14++; - var_f31 = var_r31->unk14 / 20.0f; + var_f31 = var_r31->unk14 / (REFRESH_RATE_F / 3.0f); if (var_f31 >= 1.0f) { var_f31 = 1.0f; } @@ -181,7 +187,7 @@ void fn_1_B3A4(omObjData *arg0) break; case 7: var_r31->unkC++; - var_f31 = (f32)var_r31->unkC / 40.0f; + var_f31 = (f32)var_r31->unkC / (2.0f * REFRESH_RATE_F / 3); if (var_f31 >= 1.0f) { var_f31 = 1.0f; var_r31->unkC = 0; @@ -239,7 +245,7 @@ void fn_1_B884(omObjData *arg0, unkObjStruct *arg1) switch (lbl_1_bss_74) { case 0: - lbl_1_data_250 -= 0.5f; + lbl_1_data_250 -= (REFRESH_RATE_F / 120); if (lbl_1_data_250 <= 45.0f) { lbl_1_data_250 = 45.0f; lbl_1_bss_74++; @@ -258,14 +264,14 @@ void fn_1_B884(omObjData *arg0, unkObjStruct *arg1) return; case 1: arg1->unkE++; - var_f31 = arg1->unkE / 10.0f; + var_f31 = arg1->unkE / (REFRESH_RATE_F / 6.0f); if (var_f31 >= 1.0f) { var_f31 = 1.0f; } var_f30 = 225.0f; arg1->unk30.y = arg1->unk68 + (var_f31 * (var_f30 - arg1->unk68)); arg1->unkC++; - var_f31 = arg1->unkC / 50.0f; + var_f31 = arg1->unkC / (5.0f * REFRESH_RATE_F / 6.0f); if (var_f31 >= 1.0f) { var_f31 = 1.0f; arg1->unkC = arg1->unkE = 0; @@ -294,7 +300,7 @@ void fn_1_B884(omObjData *arg0, unkObjStruct *arg1) } break; case 2: - lbl_1_data_250++; + lbl_1_data_250 += REFRESH_RATE_F / 60.0f; if (lbl_1_data_250 >= lbl_1_data_0[arg1->unk60]) { lbl_1_data_250 = lbl_1_data_0[arg1->unk60]; lbl_1_bss_74++; @@ -309,7 +315,7 @@ void fn_1_B884(omObjData *arg0, unkObjStruct *arg1) var_f30 += 360.0f; } arg1->unkC++; - var_f31 = arg1->unkC / 10.0f; + var_f31 = arg1->unkC / (REFRESH_RATE_F / 6.0f); if (var_f31 < 1.0f) { arg1->unk30.y = arg1->unk68 + (var_f31 * (var_f30 - arg1->unk68)); } @@ -320,7 +326,7 @@ void fn_1_B884(omObjData *arg0, unkObjStruct *arg1) return; case 3: arg1->unkE++; - var_f31 = arg1->unkE / 10.0f; + var_f31 = arg1->unkE / (REFRESH_RATE_F / 6.0f); if (var_f31 >= 1.0f) { var_f31 = 1.0f; arg1->unkC = arg1->unkE = 0; @@ -332,7 +338,7 @@ void fn_1_B884(omObjData *arg0, unkObjStruct *arg1) arg1->unk30.y = fn_1_927C(arg1->unk6C, var_f30, var_f31); return; case 4: - if (++arg1->unkC > 15) { + if (++arg1->unkC > (REFRESH_RATE / 4)) { lbl_1_bss_74++; } break; @@ -443,7 +449,7 @@ void fn_1_C1D4(omObjData *arg0, unkObjStruct *arg1) if (var_f30 < 5.0f) { if (arg1->unk5A != 0) { arg1->unk56++; - var_f31 = arg1->unk56 / 40.0f; + var_f31 = arg1->unk56 / (2.0f * REFRESH_RATE_F / 3.0f); if (var_f31 > 1.0f) { var_f31 = 1.0f; arg1->unk5A = 0; @@ -523,7 +529,7 @@ void fn_1_C944(omObjData *arg0, unkObjStruct *arg1) } } if ((arg1->unk48 & 1) != 0) { - arg1->unk68 -= 1.0f; + arg1->unk68 -= REFRESH_RATE_F / 60.0f; if ((var_r30 != -1) && (lbl_1_data_0[var_r30] > arg1->unk68)) { arg1->unk68 = lbl_1_data_0[var_r30]; arg1->unk4A = var_r30; @@ -531,7 +537,7 @@ void fn_1_C944(omObjData *arg0, unkObjStruct *arg1) } } else if ((arg1->unk48 & 2) != 0) { - arg1->unk68++; + arg1->unk68 += REFRESH_RATE_F / 60.0f; if ((var_r30 != -1) && (lbl_1_data_0[var_r30] < arg1->unk68)) { arg1->unk68 = lbl_1_data_0[var_r30]; arg1->unk4A = var_r30; @@ -659,7 +665,7 @@ void fn_1_D24C(unkObjStruct *arg0, f32 arg1, f32 arg2) f32 var_f30; f32 var_f31; - var_f28 = 10.0f; + var_f28 = REFRESH_RATE_F / 6.0f; arg0->unk6C = arg1; arg0->unk70 = arg2; var_f31 = ABS(arg1 - arg2); @@ -702,7 +708,7 @@ void fn_1_D34C(omObjData *arg0, unkObjStruct *arg1) arg1->unk6C = 0.0f; arg1->unk48 = 0; lbl_1_data_14[arg1->unk4A] = 0; - if (fn_1_17CC() < 270.0f) { + if (fn_1_17CC() < (4.5f * REFRESH_RATE)) { fn_1_1708(); } fn_1_F4D4(arg1, 15, 4); @@ -793,7 +799,7 @@ void fn_1_D7F8(omObjData *arg0, unkObjStruct *arg1) } break; case 1: - if (++arg1->unkC > 0xA) { + if (++arg1->unkC > (REFRESH_RATE / 6)) { arg1->unkC = 0; Hu3DMotionSpeedSet(arg0->model[0], 2.0f); if ((arg1->unk6C - arg1->unk68) > 0.0f) { @@ -808,7 +814,7 @@ void fn_1_D7F8(omObjData *arg0, unkObjStruct *arg1) break; case 2: arg1->unkC++; - var_f31 = arg1->unkC / 30.0f; + var_f31 = arg1->unkC / (0.5f * REFRESH_RATE_F); arg1->unk18.x = ((410.0f + (var_f31 * (arg1->unk5C - 410.0f))) * cosd(lbl_1_data_0[arg1->unk4A])); arg1->unk18.z = ((410.0f + (var_f31 * (arg1->unk5C - 410.0f))) * sind(lbl_1_data_0[arg1->unk4A])); if (var_f31 >= 1.0f) { @@ -825,7 +831,7 @@ void fn_1_D7F8(omObjData *arg0, unkObjStruct *arg1) arg1->unk30.y = fn_1_927C(arg1->unk68, arg1->unk6C, var_f31); break; case 3: - if (++arg1->unkC > 0x3C) { + if (++arg1->unkC > (s32)REFRESH_RATE_F) { if (fn_1_4E54(arg1->unk4A) == 0) { fn_1_4EEC(7U, 3U); } @@ -852,7 +858,7 @@ void fn_1_D7F8(omObjData *arg0, unkObjStruct *arg1) break; } if (fn_1_17F4() >= 0) { - if (fn_1_17CC() < 270.0f) { + if (fn_1_17CC() < (4.5f * REFRESH_RATE)) { fn_1_1708(); return; } @@ -874,7 +880,11 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1) switch (arg1->unk60) { case 0: lbl_1_bss_84 = lbl_1_data_0[arg1->unk4A]; +#if VERSION_NTSC Hu3DMotionShiftSet(arg0->model[0], arg0->motion[4], 0.0f, 7.0f, HU3D_MOTATTR_LOOP); +#else + Hu3DMotionSet(arg0->model[0], arg0->motion[4]); +#endif HuAudCharVoicePlay(arg1->unk8, 0x125); arg1->unk60++; break; @@ -898,7 +908,7 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1) } break; case 2: - lbl_1_bss_84++; + lbl_1_bss_84 += REFRESH_RATE_F / 60.0f; if (lbl_1_bss_84 >= 135.0f) { lbl_1_bss_84 = 135.0f; arg1->unkE = arg1->unk10 = 0; @@ -915,7 +925,7 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1) var_f30 += 360.0f; } arg1->unkC++; - var_f31 = arg1->unkC / 10.0f; + var_f31 = arg1->unkC / (REFRESH_RATE_F / 6.0f); if (var_f31 >= 1.0f) { var_f31 = 1.0f; } @@ -924,14 +934,14 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1) break; case 3: arg1->unkE++; - var_f31 = arg1->unkE / 10.0f; + var_f31 = arg1->unkE / (REFRESH_RATE_F / 6.0f); if (var_f31 >= 1.0f) { var_f31 = 1.0f; } var_f30 = 315.0f; arg1->unk30.y = arg1->unk6C + (var_f31 * (var_f30 - arg1->unk6C)); arg1->unk10++; - var_f31 = arg1->unk10 / 50.0f; + var_f31 = arg1->unk10 / (5.0f * REFRESH_RATE_F / 6.0f); if (var_f31 >= 1.0f) { var_f31 = 1.0f; arg1->unkC = arg1->unkE = arg1->unk10 = 0; @@ -953,12 +963,12 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1) } break; case 4: - lbl_1_bss_84 -= 0.5f; + lbl_1_bss_84 -= REFRESH_RATE_F / 120; if (lbl_1_bss_84 <= 110.0f) { lbl_1_bss_84 = 110.0f; arg1->unk60 = 0; arg1->unkC = 0; - arg1->unkE = (3 - lbl_1_data_1D8) * 0x1E; + arg1->unkE = (3 - lbl_1_data_1D8) * (s32)(0.5f * REFRESH_RATE_F); arg1->unk14 = 0; arg1->unk3C.y = 90.0f; fn_1_F4D4(arg1, 15, 1); @@ -973,7 +983,7 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1) var_f30 += 360.0f; } arg1->unk10++; - var_f31 = arg1->unk10 / 10.0f; + var_f31 = arg1->unk10 / (REFRESH_RATE_F / 6.0f); if (var_f31 >= 1.0f) { var_f31 = 1.0f; } @@ -1025,7 +1035,7 @@ u8 fn_1_E8AC(omObjData *arg0, unkObjStruct *arg1) case 2: arg1->unkC++; arg1->unk68 += 40.0f; - var_f31 = arg1->unkC / 90.0f; + var_f31 = arg1->unkC / (1.5f * REFRESH_RATE_F); if (var_f31 >= 1.0f) { var_f31 = 1.0f; arg1->unk60++; @@ -1165,7 +1175,7 @@ void fn_1_F228(void) temp_r31->unkA--; temp_r31->unk24 = temp_r31->unk18; temp_r31->unkC = 0; - temp_r31->unkE = 0x1E; + temp_r31->unkE = (s32)(0.5f * REFRESH_RATE_F); temp_r31->unk14 = 0; fn_1_F4D4(temp_r31, 15, 1); } diff --git a/src/REL/m441Dll/main.c b/src/REL/m441Dll/main.c index 38896429..e6143406 100644 --- a/src/REL/m441Dll/main.c +++ b/src/REL/m441Dll/main.c @@ -872,7 +872,7 @@ void fn_1_3404(Work53E8 *arg0) } arg0->unk94 = 1; arg0->unk8C = arg0->unk0[1] + ((frandf() * arg0->unk0[1]) / 2); - temp_f25 = 1.0f - (lbl_1_bss_1A4 / 3600.0f); + temp_f25 = 1.0f - (lbl_1_bss_1A4 / (60.0f * REFRESH_RATE)); if (0.25f < temp_f25) { arg0->unk8C *= arg0->unk90 / (arg0->unk0[2] * temp_f25); } @@ -1491,7 +1491,7 @@ void fn_1_5C04(omObjData *object) if (2.0f > temp_f23) { temp_r31->unk24.x--; if (0.0f > temp_r31->unk24.x) { - temp_r31->unk24.x = 60.0f; + temp_r31->unk24.x = 1.0f * REFRESH_RATE; if (frandmod(100) > 50) { temp_r31->unk24.y = (frandf() * 220.0f) + 80.0f; } @@ -1619,7 +1619,7 @@ void fn_1_74F4(s32 arg0) work->unk18.z = 0; work->unk38 = 0; work->unk18.y = 2; - work->unk24.x = (frandf() * 180.0f) + 180.0f; + work->unk24.x = (frandf() * (3.0f * REFRESH_RATE)) + (3.0f * REFRESH_RATE); if (arg0) { work->unk18.y = 3; work->unk18.x = 180.0f - (frandf() * 120.0f); @@ -1821,7 +1821,7 @@ void fn_1_8D58(omObjData *object) WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); object->func = fn_1_AA4C; } - lbl_1_bss_24 += (1.0f / 60.0f); + lbl_1_bss_24 += (1.0f / REFRESH_RATE); if (360.0f <= lbl_1_bss_24) { lbl_1_bss_24 -= 360.0f; } @@ -1850,8 +1850,8 @@ void fn_1_8D58(omObjData *object) case 1002: lbl_1_bss_28++; - fn_1_13DC(lbl_1_bss_28 / 180.0f, &lbl_1_data_40); - if (180.0f <= lbl_1_bss_28) { + fn_1_13DC(lbl_1_bss_28 / (3.0f * REFRESH_RATE), &lbl_1_data_40); + if ((3.0f * REFRESH_RATE) <= lbl_1_bss_28) { object->work[0]++; fn_1_1350(&lbl_1_data_34, &lbl_1_data_40, &lbl_1_data_4C); } @@ -1869,8 +1869,8 @@ void fn_1_8D58(omObjData *object) } if (!MGSeqStatGet(lbl_1_bss_19E)) { object->work[0]++; - lbl_1_bss_1A4 = 3600; - lbl_1_bss_19C = MGSeqTimerCreate(lbl_1_bss_1A4 / 60); + lbl_1_bss_1A4 = 60 * REFRESH_RATE; + lbl_1_bss_19C = MGSeqTimerCreate(lbl_1_bss_1A4 / REFRESH_RATE); lbl_1_bss_19E = -1; } } @@ -1881,7 +1881,7 @@ void fn_1_8D58(omObjData *object) lbl_1_bss_1A4--; if (lbl_1_bss_1A4 < 0) { object->work[0] = 1005; - lbl_1_bss_1A4 = 3600; + lbl_1_bss_1A4 = 60 * REFRESH_RATE; lbl_1_bss_28 = 0; } break; @@ -1913,9 +1913,9 @@ void fn_1_8D58(omObjData *object) case 1006: lbl_1_bss_28++; - fn_1_13DC(lbl_1_bss_28 / 120.0f, &lbl_1_data_64); - if (120.0f <= lbl_1_bss_28) { - lbl_1_bss_28 = 120.0f; + fn_1_13DC(lbl_1_bss_28 / (2.0f * REFRESH_RATE), &lbl_1_data_64); + if ((2.0f * REFRESH_RATE) <= lbl_1_bss_28) { + lbl_1_bss_28 = 2.0f * REFRESH_RATE; for (i = 0; i < 4; i++) { float temp; if (OM_GET_DATA_PTR(lbl_1_bss_48[i], Work53E8)->unk98 != 2010) { diff --git a/src/REL/m442Dll/main.c b/src/REL/m442Dll/main.c index b6e60e1e..28beaccd 100644 --- a/src/REL/m442Dll/main.c +++ b/src/REL/m442Dll/main.c @@ -1,3 +1,4 @@ +#include "version.h" #define HUSPR_USE_OLD_DEFS #include "ext_math.h" #include "game/audio.h" @@ -213,6 +214,9 @@ M442StructBssC084 lbl_1_bss_C084[11][11]; M442StructBssC05C lbl_1_bss_C05C[2]; M442StructBss5C lbl_1_bss_5C[0x400]; float lbl_1_bss_20[0xF]; +#if VERSION_PAL +s32 lbl_1_bss_20_pal; +#endif Vec lbl_1_bss_14; s16 lbl_1_bss_12; s16 lbl_1_bss_10; @@ -268,9 +272,9 @@ u32 fn_1_384(void) void fn_1_394(omObjData *object) { lbl_1_bss_11F30 = 0; - lbl_1_bss_11F24 = 60; + lbl_1_bss_11F24 = REFRESH_RATE; lbl_1_bss_11F1C = 60; - lbl_1_bss_11F1A = 60; + lbl_1_bss_11F1A = REFRESH_RATE; lbl_1_bss_11F18 = -1; lbl_1_bss_11F16 = 0; lbl_1_bss_11EE8 = 0; @@ -286,19 +290,19 @@ void fn_1_448(omObjData *object) switch (lbl_1_bss_11F30) { case 0: - if (lbl_1_bss_11F24 == 60) { + if (lbl_1_bss_11F24 == REFRESH_RATE) { HuAudFXPlay(0x71B); HuAudFXPlay(0x71F); } if (--lbl_1_bss_11F24 == 0) { lbl_1_bss_11F30 = 1; - lbl_1_bss_11F24 = 0x78; + lbl_1_bss_11F24 = 2 * REFRESH_RATE; } break; case 1: if (--lbl_1_bss_11F24 == 0) { lbl_1_bss_11F30 = 2; - lbl_1_bss_11F24 = 0x78; + lbl_1_bss_11F24 = 2 * REFRESH_RATE; } break; case 2: @@ -320,7 +324,7 @@ void fn_1_448(omObjData *object) if (--lbl_1_bss_11F1A == 0) { lbl_1_bss_11F1C -= 1; MGSeqParamSet(lbl_1_bss_10, 1, lbl_1_bss_11F1C); - lbl_1_bss_11F1A = 0x3C; + lbl_1_bss_11F1A = REFRESH_RATE; } if (lbl_1_bss_11F1C == 0 || lbl_1_bss_11EE4 == 0) { lbl_1_bss_11F30 = 5; @@ -337,13 +341,13 @@ void fn_1_448(omObjData *object) if (GWMGRecordGet(4) < lbl_1_bss_11EE8) { GWMGRecordSet(4, lbl_1_bss_11EE8); lbl_1_bss_11F30 = 6; - lbl_1_bss_11F24 = 60; + lbl_1_bss_11F24 = REFRESH_RATE; lbl_1_bss_12 = MGSeqCreate(0xE, lbl_1_bss_11EE8); fn_1_94AC(1); } else { lbl_1_bss_11F30 = 9; - lbl_1_bss_11F24 = 60; + lbl_1_bss_11F24 = REFRESH_RATE; } mgRecordExtra = lbl_1_bss_11EE8; } @@ -351,7 +355,7 @@ void fn_1_448(omObjData *object) case 6: if (MGSeqStatGet(lbl_1_bss_12) == 0) { lbl_1_bss_11F30 = 9; - lbl_1_bss_11F24 = 60; + lbl_1_bss_11F24 = REFRESH_RATE; } break; case 9: @@ -363,7 +367,7 @@ void fn_1_448(omObjData *object) else { HuAudSStreamPlay(4); } - lbl_1_bss_11F24 = 0xD2; + lbl_1_bss_11F24 = 3.5f * REFRESH_RATE; } break; case 11: @@ -410,6 +414,10 @@ void fn_1_A90(Process *arg0) lbl_1_bss_11F28[0] = lbl_1_bss_11F28[1] = lbl_1_bss_11F28[2] = lbl_1_bss_11F28[3] = -1; lbl_1_bss_11F20 = 0; +#if VERSION_PAL + lbl_1_bss_20_pal = fn_1_90FC(); +#endif + for (var_r31 = 0; var_r31 < 4; var_r31++) { if (GWPlayerCfg[var_r31].iscom != 1) { break; @@ -495,7 +503,11 @@ void fn_1_E88(omObjData *object) memset(var_r30, 0, sizeof(M442MainWork)); var_r30->unk_02 = lbl_1_bss_11F20++; var_r30->unk_04 = GWPlayerCfg[var_r30->unk_02].pad_idx; +#if VERSION_NTSC var_r30->unk_0C = fn_1_90FC(); +#else + var_r30->unk_0C = lbl_1_bss_20_pal; +#endif var_r26 = GWPlayerCfg[var_r30->unk_02].character; var_r30->unk_10 = var_r26; var_r30->unk_12 = GWPlayerCfg[var_r30->unk_02].diff; @@ -740,7 +752,7 @@ void fn_1_1230(omObjData *object) var_r30->unk_06 = var_f29 * sind(var_r30->unk_18); var_r30->unk_07 = var_f29 * -cosd(var_r30->unk_18); - if (++var_r30->unk_7C > 300) { + if (++var_r30->unk_7C > 5 * REFRESH_RATE) { var_r30->unk_00_field2 = 1; var_r30->unk_7C = 0; } @@ -863,18 +875,18 @@ void fn_1_2254(omObjData *object) if (var_f27 > 72.0f) { var_f27 = 72.0f; } - var_f26 = (10.0f * var_f27) / 72.0f; + var_f26 = ((VERSION_NTSC ? 10.0f : 12.0f) * var_f27) / 72.0f; var_r31->unk_24.x = var_f31 * var_f26; var_r31->unk_24.z = var_f30 * var_f26; var_r31->unk_1C = var_f26; object->rot.y = fn_1_85E8(object->rot.y, atan2d(var_r31->unk_24.x, var_r31->unk_24.z), 0.5f); - if (var_r31->unk_1C < 7.5f) { + if (var_r31->unk_1C < (450.0f / REFRESH_RATE)) { var_r29 = 1; - var_f28 = var_r31->unk_1C / 7.5f; + var_f28 = var_r31->unk_1C / (450.0f / REFRESH_RATE); } else { var_r29 = 2; - var_f28 = var_r31->unk_1C / 10.0f; + var_f28 = var_r31->unk_1C / (VERSION_NTSC ? 10.0f : 12.0f); } } else { @@ -935,7 +947,7 @@ void fn_1_2254(omObjData *object) } if ((var_r31->unk_48 >= 0) && (lbl_1_bss_C9F8[var_r31->unk_48].unk_0C < 3)) { lbl_1_bss_C9F8[var_r31->unk_48].unk_0C += 1; - lbl_1_bss_C9F8[var_r31->unk_48].unk_0E = 120; + lbl_1_bss_C9F8[var_r31->unk_48].unk_0E = 2 * REFRESH_RATE; HuAudFXPlay(0x71C); if (lbl_1_bss_C9F8[var_r31->unk_48].unk_0C == 3) { var_r31->unk_00_field2 = 1; @@ -998,21 +1010,27 @@ void fn_1_2254(omObjData *object) } switch (var_r31->unk_40) { case 0: - var_r31->unk_44 = 0.75 + sind(((90.0f * (var_r31->unk_42 % 15)) / 15.0f)); - if ((var_r31->unk_42 % 20) == 0) { - omVibrate(var_r31->unk_02, 0xC, 0xC, 0); + var_r31->unk_44 = 0.75 + sind(((90.0f * (var_r31->unk_42 % (REFRESH_RATE / 4))) / (float)(REFRESH_RATE / 4))); + if (VERSION_NTSC ? 1 : var_r31->unk_0C == 1) { + if ((var_r31->unk_42 % (REFRESH_RATE / 3)) == 0) { + omVibrate(var_r31->unk_02, 0xC, 0xC, 0); + } } break; case 1: - var_r31->unk_44 = 0.75 + (0.75 * sind(((90.0f * (var_r31->unk_42 % 30)) / 30.0f))); - if ((var_r31->unk_42 % 20) == 0) { - omVibrate(var_r31->unk_02, 0xC, 4, 2); + var_r31->unk_44 = 0.75 + (0.75 * sind(((90.0f * (var_r31->unk_42 % (REFRESH_RATE / 2))) / (0.5f * REFRESH_RATE)))); + if (VERSION_NTSC ? 1 : var_r31->unk_0C == 1) { + if ((var_r31->unk_42 % (REFRESH_RATE / 3)) == 0) { + omVibrate(var_r31->unk_02, 0xC, 4, 2); + } } break; case 2: - var_r31->unk_44 = 0.75 + (0.5 * sind(((90.0f * (var_r31->unk_42 % 60)) / 60.0f))); - if ((var_r31->unk_42 % 20) == 0) { - omVibrate(var_r31->unk_02, 12, 6, 6); + var_r31->unk_44 = 0.75 + (0.5 * sind(((90.0f * (var_r31->unk_42 % REFRESH_RATE)) / (1.0f * REFRESH_RATE)))); + if (VERSION_NTSC ? 1 : var_r31->unk_0C == 1) { + if ((var_r31->unk_42 % (REFRESH_RATE / 3)) == 0) { + omVibrate(var_r31->unk_02, 12, 6, 6); + } } break; } @@ -1273,7 +1291,7 @@ void fn_1_3C20(omObjData *object) Hu3DMotionOverlayReset(object->model[0]); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); - var_r30->unk_3C = 10; + var_r30->unk_3C = REFRESH_RATE / 5.5; object->func = fn_1_3C94; } @@ -1414,7 +1432,7 @@ void fn_1_4444(s32 arg0) lbl_1_bss_5C[arg0].unk_04 = 0.0f; lbl_1_bss_5C[arg0].unk_08 = 100.0f * (18.0f * ((frand() & 0x1FF) - 256.0f)) / 256; lbl_1_bss_5C[arg0].unk_0C = lbl_1_bss_5C[arg0].unk_00; - lbl_1_bss_5C[arg0].unk_10 = 0.41666666f + (1.6666666f * (frand() & 0xFF) / 256); + lbl_1_bss_5C[arg0].unk_10 = (25.0f / REFRESH_RATE) + ((100.0f / REFRESH_RATE) * (frand() & 0xFF) / 256); lbl_1_bss_5C[arg0].unk_18 = lbl_1_bss_5C[arg0].unk_1A = (frand() & 0x3F) + 0x20; lbl_1_bss_5C[arg0].unk_1C = 0.1f + (0.9f * (frand() & 0xFF) / 256); lbl_1_bss_5C[arg0].unk_20 = 360.0f * (frand() & 0xFF) / 256; @@ -1965,7 +1983,7 @@ void fn_1_72C4(omObjData *object) Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF); var_r31->unk_02 = 1; var_r31->unk_18 = 0.0f; - var_r31->unk_0C = 60; + var_r31->unk_0C = REFRESH_RATE; } break; case 1: @@ -1973,7 +1991,7 @@ void fn_1_72C4(omObjData *object) var_r31->unk_18 += 0.05f; } var_r31->unk_02 = 2; - var_r31->unk_0C = var_r31->unk_0E = 45; + var_r31->unk_0C = var_r31->unk_0E = 0.75 * REFRESH_RATE; var_r31->unk_10 = HuAudFXPlay(lbl_1_data_23C[var_r31->unk_14]); break; case 2: @@ -2070,11 +2088,11 @@ void fn_1_7890(ModelData *model, ParticleData *particle, Mtx matrix) var_r31->unk34.x = 100.0 * (0.20000000298023224 * sind(var_f31)); var_r31->unk34.y = 0.0f; var_r31->unk34.z = 100.0 * (0.20000000298023224 * cosd(var_f31)); - var_f30 = 1.6666666f + (2.5f * (frand() & 0xFF) / 256); + var_f30 = (100.0f / REFRESH_RATE) + ((150.0f / REFRESH_RATE) * (frand() & 0xFF) / 256); var_f31 = 360.0f * (frand() & 0xFF) / 256; var_r31->unk08.x = var_f30 * sind(var_f31); var_r31->unk08.z = var_f30 * cosd(var_f31); - var_r31->unk08.y = 16.666666f * (frand() & 0xFF) / 256; + var_r31->unk08.y = (1000.0f / REFRESH_RATE) * (frand() & 0xFF) / 256; var_r31->unk40.r = var_r31->unk40.g = var_r31->unk40.b = var_r31->unk40.a = 0xFF; } } @@ -2085,7 +2103,7 @@ void fn_1_7890(ModelData *model, ParticleData *particle, Mtx matrix) var_r28++; } else { - var_r31->unk08.y += -0.50000006f; + var_r31->unk08.y += VERSION_NTSC ? -0.50000006f : -0.6f; var_r31->unk34.x += var_r31->unk08.x; var_r31->unk34.y += var_r31->unk08.y; var_r31->unk34.z += var_r31->unk08.z; @@ -2210,7 +2228,7 @@ void fn_1_8988(omObjData *arg0) case 1: fn_1_8738(0, 1, sind((90.0f * lbl_1_data_250[0]))); if (lbl_1_data_250[0] < 1.0f) { - lbl_1_data_250[0] += 0.016666668f; + lbl_1_data_250[0] += 1.0f / REFRESH_RATE; if (lbl_1_data_250[0] > 1.0f) { lbl_1_data_250[0] = 1.0f; return; @@ -2222,7 +2240,7 @@ void fn_1_8988(omObjData *arg0) case 2: fn_1_8738(1, 2, 1.0 - cosd((90.0f * lbl_1_data_250[1]))); if (lbl_1_data_250[1] < 1.0f) { - lbl_1_data_250[1] += 0.016666668f; + lbl_1_data_250[1] += 1.0f / REFRESH_RATE; if (lbl_1_data_250[1] > 1.0f) { lbl_1_data_250[1] = 1.0f; return;