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/configure.py b/configure.py index 44b5348f..3c629e35 100644 --- a/configure.py +++ b/configure.py @@ -1149,7 +1149,7 @@ config.libs = [ Rel( "m441Dll", # Butterfly Blitz objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m441Dll/main.c"), + Object(Matching, "REL/m441Dll/main.c"), }, ), Rel( 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) {