diff --git a/config/GMPP01_00/rels/m439Dll/splits.txt b/config/GMPP01_00/rels/m439Dll/splits.txt index 531cd645..55b19f1f 100644 --- a/config/GMPP01_00/rels/m439Dll/splits.txt +++ b/config/GMPP01_00/rels/m439Dll/splits.txt @@ -5,3 +5,12 @@ 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/m439Dll/main.c: + .text start:0x000000A0 end:0x0000818C + .rodata start:0x00000000 end:0x00000200 + .data start:0x00000000 end:0x000078F0 + .bss start:0x00000000 end:0x00000174 diff --git a/config/GMPP01_00/rels/m439Dll/symbols.txt b/config/GMPP01_00/rels/m439Dll/symbols.txt index c7cb102e..a4c18c94 100644 --- a/config/GMPP01_00/rels/m439Dll/symbols.txt +++ b/config/GMPP01_00/rels/m439Dll/symbols.txt @@ -1,6 +1,6 @@ _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:0x2C4 +ObjectSetup = .text:0x000000A0; // type:function size:0x2C4 fn_1_364 = .text:0x00000364; // type:function size:0x10 fn_1_374 = .text:0x00000374; // type:function size:0x10 fn_1_384 = .text:0x00000384; // type:function size:0x84 @@ -50,89 +50,92 @@ fn_1_7578 = .text:0x00007578; // type:function size:0x26C fn_1_77E4 = .text:0x000077E4; // type:function size:0x9A8 _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_44 = .rodata:0x00000044; // type:object size:0x4 data:float -lbl_1_rodata_48 = .rodata:0x00000048; // 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_60 = .rodata:0x00000060; // type:object size:0x8 data:double -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_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:0x8 data:double -lbl_1_rodata_A8 = .rodata:0x000000A8; // 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_C0 = .rodata:0x000000C0; // type:object size:0x8 data:double -lbl_1_rodata_C8 = .rodata:0x000000C8; // 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_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:0x4 data:float -lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 data:float -lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x4 data:float -lbl_1_rodata_154 = .rodata:0x00000154; // type:object size:0x4 data:float -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_164 = .rodata:0x00000164; // type:object size:0x4 data:float -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:0x4 data:float -lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 data:float -lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0xC data:2byte -lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x50 -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_1EC = .rodata:0x000001EC; // type:object size:0x4 data:float -lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x1 data:byte -lbl_1_rodata_1F8 = .rodata:0x000001F8; // 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: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_44 = .rodata:0x00000044; // type:object size:0x4 scope:local data:float +lbl_1_rodata_48 = .rodata:0x00000048; // 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_60 = .rodata:0x00000060; // type:object size:0x8 scope:local data:double +lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x8 scope:local data:double +lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 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_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:0x8 scope:local data:double +lbl_1_rodata_A8 = .rodata:0x000000A8; // 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_C0 = .rodata:0x000000C0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_C8 = .rodata:0x000000C8; // 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: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:0x8 scope:local data:double +lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x8 scope:local data:double +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_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:0x4 scope:local data:float +lbl_1_rodata_154 = .rodata:0x00000154; // type:object size:0x4 scope:local data:float +lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 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_164 = .rodata:0x00000164; // type:object size:0x4 scope:local data:float +lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 scope:local data:float +lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x4 scope:local data:float +lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 scope:local data:float +lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0xC scope:local data:2byte +lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x50 scope:local +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_rodata_1EC = .rodata:0x000001EC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1F4 = .rodata:0x000001F4; // type:object size:0x1 scope:local data:byte +lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x8 scope:local data:double lbl_1_data_0 = .data:0x00000000; // type:object size:0x18 lbl_1_data_18 = .data:0x00000018; // type:object size:0x18 lbl_1_data_30 = .data:0x00000030; // type:object size:0x8 @@ -170,129 +173,130 @@ lbl_1_data_EA8 = .data:0x00000EA8; // type:object size:0x9C lbl_1_data_F44 = .data:0x00000F44; // type:object size:0x9C lbl_1_data_FE0 = .data:0x00000FE0; // type:object size:0x34 lbl_1_data_1014 = .data:0x00001014; // type:object size:0x60 -lbl_1_data_1074 = .data:0x00001074; // type:object size:0x18 -lbl_1_data_108C = .data:0x0000108C; // type:object size:0x30 -lbl_1_data_10BC = .data:0x000010BC; // type:object size:0x204 -lbl_1_data_12C0 = .data:0x000012C0; // type:object size:0x204 -lbl_1_data_14C4 = .data:0x000014C4; // type:object size:0x204 +lbl_1_data_1074 = .data:0x00001074; // type:object size:0x18 data:2byte +lbl_1_data_108C = .data:0x0000108C; // type:object size:0x30 data:float +lbl_1_data_10BC = .data:0x000010BC; // type:object size:0x204 data:float +lbl_1_data_12C0 = .data:0x000012C0; // type:object size:0x204 data:float +lbl_1_data_14C4 = .data:0x000014C4; // type:object size:0x204 data:float lbl_1_data_16C8 = .data:0x000016C8; // type:object size:0xC -lbl_1_data_16D4 = .data:0x000016D4; // type:object size:0x4 -lbl_1_data_16D8 = .data:0x000016D8; // type:object size:0x1D4 -lbl_1_data_18AC = .data:0x000018AC; // type:object size:0x1D4 -lbl_1_data_1A80 = .data:0x00001A80; // type:object size:0x1D4 -lbl_1_data_1C54 = .data:0x00001C54; // type:object size:0x120 -lbl_1_data_1D74 = .data:0x00001D74; // type:object size:0x120 -lbl_1_data_1E94 = .data:0x00001E94; // type:object size:0x120 -lbl_1_data_1FB4 = .data:0x00001FB4; // type:object size:0xF0 -lbl_1_data_20A4 = .data:0x000020A4; // type:object size:0xF0 -lbl_1_data_2194 = .data:0x00002194; // type:object size:0xF0 +lbl_1_data_16D4 = .data:0x000016D4; // type:object size:0x4 data:4byte +lbl_1_data_16D8 = .data:0x000016D8; // type:object size:0x1D4 data:float +lbl_1_data_18AC = .data:0x000018AC; // type:object size:0x1D4 data:float +lbl_1_data_1A80 = .data:0x00001A80; // type:object size:0x1D4 data:float +lbl_1_data_1C54 = .data:0x00001C54; // type:object size:0x120 data:float +lbl_1_data_1D74 = .data:0x00001D74; // type:object size:0x120 data:float +lbl_1_data_1E94 = .data:0x00001E94; // type:object size:0x120 data:float +lbl_1_data_1FB4 = .data:0x00001FB4; // type:object size:0xF0 data:float +lbl_1_data_20A4 = .data:0x000020A4; // type:object size:0xF0 data:float +lbl_1_data_2194 = .data:0x00002194; // type:object size:0xF0 data:float lbl_1_data_2284 = .data:0x00002284; // type:object size:0x24 -lbl_1_data_22A8 = .data:0x000022A8; // type:object size:0xC -lbl_1_data_22B4 = .data:0x000022B4; // type:object size:0x174 -lbl_1_data_2428 = .data:0x00002428; // type:object size:0x174 -lbl_1_data_259C = .data:0x0000259C; // type:object size:0x174 -lbl_1_data_2710 = .data:0x00002710; // type:object size:0x144 -lbl_1_data_2854 = .data:0x00002854; // type:object size:0x144 -lbl_1_data_2998 = .data:0x00002998; // type:object size:0x144 -lbl_1_data_2ADC = .data:0x00002ADC; // type:object size:0x1A4 -lbl_1_data_2C80 = .data:0x00002C80; // type:object size:0x1A4 -lbl_1_data_2E24 = .data:0x00002E24; // type:object size:0x1A4 +lbl_1_data_22A8 = .data:0x000022A8; // type:object size:0xC data:4byte +lbl_1_data_22B4 = .data:0x000022B4; // type:object size:0x174 data:float +lbl_1_data_2428 = .data:0x00002428; // type:object size:0x174 data:float +lbl_1_data_259C = .data:0x0000259C; // type:object size:0x174 data:float +lbl_1_data_2710 = .data:0x00002710; // type:object size:0x144 data:float +lbl_1_data_2854 = .data:0x00002854; // type:object size:0x144 data:float +lbl_1_data_2998 = .data:0x00002998; // type:object size:0x144 data:float +lbl_1_data_2ADC = .data:0x00002ADC; // type:object size:0x1A4 data:float +lbl_1_data_2C80 = .data:0x00002C80; // type:object size:0x1A4 data:float +lbl_1_data_2E24 = .data:0x00002E24; // type:object size:0x1A4 data:float lbl_1_data_2FC8 = .data:0x00002FC8; // type:object size:0x24 -lbl_1_data_2FEC = .data:0x00002FEC; // type:object size:0xC -lbl_1_data_2FF8 = .data:0x00002FF8; // type:object size:0x294 -lbl_1_data_328C = .data:0x0000328C; // type:object size:0x294 -lbl_1_data_3520 = .data:0x00003520; // type:object size:0x294 +lbl_1_data_2FEC = .data:0x00002FEC; // type:object size:0xC data:4byte +lbl_1_data_2FF8 = .data:0x00002FF8; // type:object size:0x294 data:float +lbl_1_data_328C = .data:0x0000328C; // type:object size:0x294 data:float +lbl_1_data_3520 = .data:0x00003520; // type:object size:0x294 data:float lbl_1_data_37B4 = .data:0x000037B4; // type:object size:0xC -lbl_1_data_37C0 = .data:0x000037C0; // type:object size:0x4 -lbl_1_data_37C4 = .data:0x000037C4; // type:object size:0x198 -lbl_1_data_395C = .data:0x0000395C; // type:object size:0x198 -lbl_1_data_3AF4 = .data:0x00003AF4; // type:object size:0x198 -lbl_1_data_3C8C = .data:0x00003C8C; // type:object size:0x198 -lbl_1_data_3E24 = .data:0x00003E24; // type:object size:0x198 -lbl_1_data_3FBC = .data:0x00003FBC; // type:object size:0x198 +lbl_1_data_37C0 = .data:0x000037C0; // type:object size:0x4 data:4byte +lbl_1_data_37C4 = .data:0x000037C4; // type:object size:0x198 data:float +lbl_1_data_395C = .data:0x0000395C; // type:object size:0x198 data:float +lbl_1_data_3AF4 = .data:0x00003AF4; // type:object size:0x198 data:float +lbl_1_data_3C8C = .data:0x00003C8C; // type:object size:0x198 data:float +lbl_1_data_3E24 = .data:0x00003E24; // type:object size:0x198 data:float +lbl_1_data_3FBC = .data:0x00003FBC; // type:object size:0x198 data:float lbl_1_data_4154 = .data:0x00004154; // type:object size:0x18 -lbl_1_data_416C = .data:0x0000416C; // type:object size:0x8 -lbl_1_data_4174 = .data:0x00004174; // type:object size:0x210 -lbl_1_data_4384 = .data:0x00004384; // type:object size:0x210 -lbl_1_data_4594 = .data:0x00004594; // type:object size:0x210 -lbl_1_data_47A4 = .data:0x000047A4; // type:object size:0x210 -lbl_1_data_49B4 = .data:0x000049B4; // type:object size:0x210 -lbl_1_data_4BC4 = .data:0x00004BC4; // type:object size:0x210 +lbl_1_data_416C = .data:0x0000416C; // type:object size:0x8 data:4byte +lbl_1_data_4174 = .data:0x00004174; // type:object size:0x210 data:float +lbl_1_data_4384 = .data:0x00004384; // type:object size:0x210 data:float +lbl_1_data_4594 = .data:0x00004594; // type:object size:0x210 data:float +lbl_1_data_47A4 = .data:0x000047A4; // type:object size:0x210 data:float +lbl_1_data_49B4 = .data:0x000049B4; // type:object size:0x210 data:float +lbl_1_data_4BC4 = .data:0x00004BC4; // type:object size:0x210 data:float lbl_1_data_4DD4 = .data:0x00004DD4; // type:object size:0x18 -lbl_1_data_4DEC = .data:0x00004DEC; // type:object size:0x8 -lbl_1_data_4DF4 = .data:0x00004DF4; // type:object size:0x1D4 -lbl_1_data_4FC8 = .data:0x00004FC8; // type:object size:0x1D4 -lbl_1_data_519C = .data:0x0000519C; // type:object size:0x1D4 -lbl_1_data_5370 = .data:0x00005370; // type:object size:0x1D4 -lbl_1_data_5544 = .data:0x00005544; // type:object size:0x1D4 -lbl_1_data_5718 = .data:0x00005718; // type:object size:0x1D4 +lbl_1_data_4DEC = .data:0x00004DEC; // type:object size:0x8 data:4byte +lbl_1_data_4DF4 = .data:0x00004DF4; // type:object size:0x1D4 data:float +lbl_1_data_4FC8 = .data:0x00004FC8; // type:object size:0x1D4 data:float +lbl_1_data_519C = .data:0x0000519C; // type:object size:0x1D4 data:float +lbl_1_data_5370 = .data:0x00005370; // type:object size:0x1D4 data:float +lbl_1_data_5544 = .data:0x00005544; // type:object size:0x1D4 data:float +lbl_1_data_5718 = .data:0x00005718; // type:object size:0x1D4 data:float lbl_1_data_58EC = .data:0x000058EC; // type:object size:0x18 -lbl_1_data_5904 = .data:0x00005904; // type:object size:0x8 -lbl_1_data_590C = .data:0x0000590C; // type:object size:0x18C -lbl_1_data_5A98 = .data:0x00005A98; // type:object size:0x18C -lbl_1_data_5C24 = .data:0x00005C24; // type:object size:0x18C -lbl_1_data_5DB0 = .data:0x00005DB0; // type:object size:0x168 -lbl_1_data_5F18 = .data:0x00005F18; // type:object size:0x168 -lbl_1_data_6080 = .data:0x00006080; // type:object size:0x168 +lbl_1_data_5904 = .data:0x00005904; // type:object size:0x8 data:4byte +lbl_1_data_590C = .data:0x0000590C; // type:object size:0x18C data:float +lbl_1_data_5A98 = .data:0x00005A98; // type:object size:0x18C data:float +lbl_1_data_5C24 = .data:0x00005C24; // type:object size:0x18C data:float +lbl_1_data_5DB0 = .data:0x00005DB0; // type:object size:0x168 data:float +lbl_1_data_5F18 = .data:0x00005F18; // type:object size:0x168 data:float +lbl_1_data_6080 = .data:0x00006080; // type:object size:0x168 data:float lbl_1_data_61E8 = .data:0x000061E8; // type:object size:0x18 -lbl_1_data_6200 = .data:0x00006200; // type:object size:0x8 -lbl_1_data_6208 = .data:0x00006208; // type:object size:0x174 -lbl_1_data_637C = .data:0x0000637C; // type:object size:0x174 -lbl_1_data_64F0 = .data:0x000064F0; // type:object size:0x174 -lbl_1_data_6664 = .data:0x00006664; // type:object size:0x15C -lbl_1_data_67C0 = .data:0x000067C0; // type:object size:0x15C -lbl_1_data_691C = .data:0x0000691C; // type:object size:0x15C +lbl_1_data_6200 = .data:0x00006200; // type:object size:0x8 data:4byte +lbl_1_data_6208 = .data:0x00006208; // type:object size:0x174 data:float +lbl_1_data_637C = .data:0x0000637C; // type:object size:0x174 data:float +lbl_1_data_64F0 = .data:0x000064F0; // type:object size:0x174 data:float +lbl_1_data_6664 = .data:0x00006664; // type:object size:0x15C data:float +lbl_1_data_67C0 = .data:0x000067C0; // type:object size:0x15C data:float +lbl_1_data_691C = .data:0x0000691C; // type:object size:0x15C data:float lbl_1_data_6A78 = .data:0x00006A78; // type:object size:0x18 -lbl_1_data_6A90 = .data:0x00006A90; // type:object size:0x8 -lbl_1_data_6A98 = .data:0x00006A98; // type:object size:0x18C -lbl_1_data_6C24 = .data:0x00006C24; // type:object size:0x18C -lbl_1_data_6DB0 = .data:0x00006DB0; // type:object size:0x18C -lbl_1_data_6F3C = .data:0x00006F3C; // type:object size:0x174 -lbl_1_data_70B0 = .data:0x000070B0; // type:object size:0x174 -lbl_1_data_7224 = .data:0x00007224; // type:object size:0x174 +lbl_1_data_6A90 = .data:0x00006A90; // type:object size:0x8 data:4byte +lbl_1_data_6A98 = .data:0x00006A98; // type:object size:0x18C data:float +lbl_1_data_6C24 = .data:0x00006C24; // type:object size:0x18C data:float +lbl_1_data_6DB0 = .data:0x00006DB0; // type:object size:0x18C data:float +lbl_1_data_6F3C = .data:0x00006F3C; // type:object size:0x174 data:float +lbl_1_data_70B0 = .data:0x000070B0; // type:object size:0x174 data:float +lbl_1_data_7224 = .data:0x00007224; // type:object size:0x174 data:float lbl_1_data_7398 = .data:0x00007398; // type:object size:0x18 -lbl_1_data_73B0 = .data:0x000073B0; // type:object size:0x8 -lbl_1_data_73B8 = .data:0x000073B8; // type:object size:0x14 +lbl_1_data_73B0 = .data:0x000073B0; // type:object size:0x8 data:4byte +lbl_1_data_73B8 = .data:0x000073B8; // type:object size:0x14 data:4byte lbl_1_data_73CC = .data:0x000073CC; // type:object size:0x28 lbl_1_data_73F4 = .data:0x000073F4; // type:object size:0x28 lbl_1_data_741C = .data:0x0000741C; // type:object size:0x70 data:float lbl_1_data_748C = .data:0x0000748C; // type:object size:0x140 -lbl_1_data_75CC = .data:0x000075CC; // type:object size:0x14 +lbl_1_data_75CC = .data:0x000075CC; // type:object size:0x14 data:float lbl_1_data_75E0 = .data:0x000075E0; // type:object size:0x10 data:4byte lbl_1_data_75F0 = .data:0x000075F0; // type:object size:0xC data:float lbl_1_data_75FC = .data:0x000075FC; // type:object size:0xC data:float lbl_1_data_7608 = .data:0x00007608; // type:object size:0x4 -lbl_1_data_760C = .data:0x0000760C; // type:object size:0xC -lbl_1_data_7618 = .data:0x00007618; // type:object size:0xC -lbl_1_data_7624 = .data:0x00007624; // type:object size:0x24 +lbl_1_data_760C = .data:0x0000760C; // type:object size:0xC data:float +lbl_1_data_7618 = .data:0x00007618; // type:object size:0xC data:float +lbl_1_data_7624 = .data:0x00007624; // type:object size:0x23 scope:local data:string lbl_1_data_7648 = .data:0x00007648; // type:object size:0x4 data:4byte lbl_1_data_764C = .data:0x0000764C; // type:object size:0x4 data:4byte jumptable_1_data_7650 = .data:0x00007650; // type:object size:0x28 scope:local -lbl_1_data_7678 = .data:0x00007678; // type:object size:0x1C data:string +lbl_1_data_7678 = .data:0x00007678; // type:object size:0x1C scope:local data:string lbl_1_data_7694 = .data:0x00007694; // type:object size:0x1C -lbl_1_data_76B0 = .data:0x000076B0; // type:object size:0x58 -lbl_1_data_7708 = .data:0x00007708; // type:object size:0x30 -lbl_1_data_7738 = .data:0x00007738; // type:object size:0x5C +lbl_1_data_76B0 = .data:0x000076B0; // type:object size:0x58 data:float +lbl_1_data_7708 = .data:0x00007708; // type:object size:0x30 data:float +lbl_1_data_7738 = .data:0x00007738; // type:object size:0x3C data:2byte +lbl_1_data_7774 = .data:0x00007774; // type:object size:0x20 data:4byte lbl_1_data_7794 = .data:0x00007794; // type:object size:0x4 lbl_1_data_7798 = .data:0x00007798; // type:object size:0x4 data:4byte lbl_1_data_779C = .data:0x0000779C; // type:object size:0x4 data:4byte lbl_1_data_77A0 = .data:0x000077A0; // type:object size:0x28 -lbl_1_data_77C8 = .data:0x000077C8; // type:object size:0x70 -lbl_1_data_7838 = .data:0x00007838; // type:object size:0x1C -lbl_1_data_7854 = .data:0x00007854; // type:object size:0x6 data:string -lbl_1_data_785A = .data:0x0000785A; // type:object size:0x6 data:string -lbl_1_data_7860 = .data:0x00007860; // type:object size:0x8 data:string -lbl_1_data_7868 = .data:0x00007868; // type:object size:0x6 data:string -lbl_1_data_786E = .data:0x0000786E; // type:object size:0x8 data:string -lbl_1_data_7876 = .data:0x00007876; // type:object size:0x6 data:string -lbl_1_data_787C = .data:0x0000787C; // type:object size:0x6 data:string -lbl_1_data_7882 = .data:0x00007882; // type:object size:0x6 data:string -lbl_1_data_7888 = .data:0x00007888; // type:object size:0x6 data:string -lbl_1_data_788E = .data:0x0000788E; // type:object size:0x6 data:string -lbl_1_data_7894 = .data:0x00007894; // type:object size:0x6 data:string -lbl_1_data_789A = .data:0x0000789A; // type:object size:0x6 data:string +lbl_1_data_77C8 = .data:0x000077C8; // type:object size:0x70 data:float +lbl_1_data_7838 = .data:0x00007838; // type:object size:0x1C data:2byte +lbl_1_data_7854 = .data:0x00007854; // type:object size:0x6 scope:local data:string +lbl_1_data_785A = .data:0x0000785A; // type:object size:0x6 scope:local data:string +lbl_1_data_7860 = .data:0x00007860; // type:object size:0x8 scope:local data:string +lbl_1_data_7868 = .data:0x00007868; // type:object size:0x6 scope:local data:string +lbl_1_data_786E = .data:0x0000786E; // type:object size:0x8 scope:local data:string +lbl_1_data_7876 = .data:0x00007876; // type:object size:0x6 scope:local data:string +lbl_1_data_787C = .data:0x0000787C; // type:object size:0x6 scope:local data:string +lbl_1_data_7882 = .data:0x00007882; // type:object size:0x6 scope:local data:string +lbl_1_data_7888 = .data:0x00007888; // type:object size:0x6 scope:local data:string +lbl_1_data_788E = .data:0x0000788E; // type:object size:0x6 scope:local data:string +lbl_1_data_7894 = .data:0x00007894; // type:object size:0x6 scope:local data:string +lbl_1_data_789A = .data:0x0000789A; // type:object size:0x6 scope:local data:string lbl_1_data_78A0 = .data:0x000078A0; // type:object size:0x20 -lbl_1_data_78C0 = .data:0x000078C0; // type:object size:0x30 +lbl_1_data_78C0 = .data:0x000078C0; // type:object size:0x30 data:float lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x4 data:4byte lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x20 @@ -316,7 +320,8 @@ lbl_1_bss_144 = .bss:0x00000144; // type:object size:0x4 data:4byte lbl_1_bss_148 = .bss:0x00000148; // type:object size:0x4 data:4byte lbl_1_bss_14C = .bss:0x0000014C; // type:object size:0x4 data:4byte lbl_1_bss_150 = .bss:0x00000150; // type:object size:0x10 data:4byte -lbl_1_bss_160 = .bss:0x00000160; // type:object size:0x8 data:4byte +lbl_1_bss_160 = .bss:0x00000160; // type:object size:0x4 data:4byte +lbl_1_bss_164 = .bss:0x00000164; // type:object size:0x4 data:4byte lbl_1_bss_168 = .bss:0x00000168; // type:object size:0x4 data:4byte lbl_1_bss_16C = .bss:0x0000016C; // type:object size:0x4 data:4byte lbl_1_bss_170 = .bss:0x00000170; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index 61aba1d4..fea780ac 100644 --- a/configure.py +++ b/configure.py @@ -1136,7 +1136,7 @@ config.libs = [ Rel( "m439Dll", # Paths of Peril objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m439Dll/main.c"), + Object(Matching, "REL/m439Dll/main.c"), }, ), Rel( diff --git a/src/REL/m439Dll/main.c b/src/REL/m439Dll/main.c index 8e761bba..44c7927b 100644 --- a/src/REL/m439Dll/main.c +++ b/src/REL/m439Dll/main.c @@ -21,6 +21,7 @@ #include "ext_math.h" #include "REL/m439data.h" +#include "version.h" typedef struct camera_params { float zoom; @@ -28,34 +29,12 @@ typedef struct camera_params { Vec rot; } CameraViewParams; -CameraViewParams lbl_1_data_741C[] = { { - 4775, - -2800, - 0, - -7700, - 343, - 20, - 0, - }, - { - 5000, - 0, - 0, - 0, - 290, - 0, - 0, - }, - { - 2800, - 0, - 0, - -7600, - 347, - 0, - 0, - }, - { 2800, 0, 0, -7600, 290, 0, 0 } }; +CameraViewParams lbl_1_data_741C[] = { + { VERSION_NTSC ? 4775.0f : 4500.0f, -2800.0f, 0.0f, -7700.0f, 343.0f, 20.0f, 0.0f }, + { 5000.0f, 0.f, 0.0f, 0.0f, 290.0f, 0.0f, 0.0f }, + { 2800.0f, 0.f, 0.0f, -7600.0f, 347.0f, 0.0f, 0.0f }, + { 2800.0f, 0.f, 0.0f, -7600.0f, 290.0f, 0.0f, 0.0f }, +}; typedef struct struct_data_748C { s32 unk0; @@ -162,9 +141,9 @@ void fn_1_408(omObjData *object); void fn_1_384(omObjData *object) { fn_1_364(0); - lbl_1_bss_14C = 60; + lbl_1_bss_14C = REFRESH_RATE; lbl_1_bss_12E = 60; - lbl_1_bss_12C = 60; + lbl_1_bss_12C = REFRESH_RATE; WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); object->func = fn_1_408; } @@ -181,12 +160,12 @@ void fn_1_408(omObjData *object) { switch (fn_1_374()) { case 0: - if (lbl_1_bss_14C == 60) { + if (lbl_1_bss_14C == REFRESH_RATE) { HuAudFXPlay(1797); } if (--lbl_1_bss_14C == 0) { fn_1_364(1); - lbl_1_bss_14C = 120; + lbl_1_bss_14C = 2 * REFRESH_RATE; } break; @@ -227,7 +206,7 @@ void fn_1_408(omObjData *object) if (--lbl_1_bss_12C == 0) { lbl_1_bss_12E--; MGSeqParamSet(lbl_1_bss_30, 1, lbl_1_bss_12E); - lbl_1_bss_12C = 60; + lbl_1_bss_12C = REFRESH_RATE; } if (lbl_1_bss_130 >= 3 || lbl_1_bss_12E == 0) { fn_1_364(6); @@ -243,7 +222,7 @@ void fn_1_408(omObjData *object) } if (!MGSeqStatGet(lbl_1_bss_32)) { fn_1_364(7); - lbl_1_bss_14C = 60; + lbl_1_bss_14C = REFRESH_RATE; } break; @@ -257,7 +236,7 @@ void fn_1_408(omObjData *object) else { HuAudSStreamPlay(4); } - lbl_1_bss_14C = 210; + lbl_1_bss_14C = 3.5f * REFRESH_RATE; } break; @@ -823,7 +802,7 @@ void fn_1_2C84(omObjData *object) if (fn_1_374() >= 6 && !temp_r31->unk0_field2) { temp_r31->unk0_field7 = 1; temp_r31->unk12 = 2; - temp_r31->unk3E = 120; + temp_r31->unk3E = 2 * REFRESH_RATE; object->func = fn_1_3C1C; return; } @@ -852,18 +831,18 @@ void fn_1_2C84(omObjData *object) if (temp_f26 > 72) { temp_f26 = 72; } - temp_f23 = (10.0f * temp_f26) / 72.0f; + temp_f23 = ((600.0f / REFRESH_RATE) * temp_f26) / 72.0f; temp_r31->unk20.x = temp_f31 * temp_f23; temp_r31->unk20.z = temp_f30 * temp_f23; temp_r31->unk14.y = temp_f23; object->rot.y = fn_1_1024(object->rot.y, atan2d(temp_r31->unk20.x, temp_r31->unk20.z), 0.2f); - if (temp_r31->unk14.y < 7.5f) { + if (temp_r31->unk14.y < (450.0f / REFRESH_RATE)) { temp_r28 = 1; - temp_f25 = temp_r31->unk14.y / 7.5f; + temp_f25 = temp_r31->unk14.y / (450.0f / REFRESH_RATE); } else { temp_r28 = 2; - temp_f25 = temp_r31->unk14.y / 10.0f; + temp_f25 = temp_r31->unk14.y / (600.0f / REFRESH_RATE); } } else { @@ -900,7 +879,7 @@ void fn_1_2C84(omObjData *object) temp_r31->unk50.z = object->trans.z; temp_r31->unk68.y = -2000; temp_r31->unk12 = 2; - temp_r31->unk3E = 12; + temp_r31->unk3E = 0.2f * REFRESH_RATE; temp_r23 = Hu3DData[object->model[2]].unk_120; temp_r23->unk_00 = 0; VECSubtract(&temp_r31->unk5C, &object->trans, &temp_r23->unk_04); @@ -933,7 +912,7 @@ void fn_1_2C84(omObjData *object) temp_r31->unk0_field4 = 01; if (temp_r29 > 1 && temp_r29 < 6) { temp_r31->unk12++; - temp_r31->unk3E = 30; + temp_r31->unk3E = 0.5f * REFRESH_RATE; temp_r31->unk48 = CenterM[temp_r31->unk2].z; temp_r31->unk4C = object->trans.z - 350.0f; temp_r31->unk40 = lbl_1_data_75CC[temp_r31->unk46 - 1]; @@ -946,7 +925,7 @@ void fn_1_2C84(omObjData *object) if (--temp_r31->unk3E == 0) { temp_r31->unk12 = 0; } - CenterM[temp_r31->unk2].z = temp_r31->unk48 + ((temp_r31->unk4C - temp_r31->unk48) * cosd((temp_r31->unk3E * 90.0f) / 30.0f)); + CenterM[temp_r31->unk2].z = temp_r31->unk48 + ((temp_r31->unk4C - temp_r31->unk48) * cosd((temp_r31->unk3E * 90.0f) / (0.5f * REFRESH_RATE))); temp_r28 = 0; temp_f25 = 1; break; @@ -957,7 +936,7 @@ void fn_1_2C84(omObjData *object) temp_r24 = temp_r27->data; switch (temp_r24->unk4) { case 1: - temp_f28 = 1.0f - (temp_r24->unk24 / 90.0f); + temp_f28 = 1.0f - (temp_r24->unk24 / (1.5f * REFRESH_RATE)); object->trans.x = temp_r31->unk50.x + (temp_f28 * (temp_r31->unk5C.x - temp_r31->unk50.x)); object->trans.y = 100 + (-2000.0f * (temp_f28 - 0.1f)) * (temp_f28 - 0.1f); object->trans.z = temp_r31->unk50.z + (temp_f28 * (temp_r31->unk5C.z - temp_r31->unk50.z)); @@ -978,7 +957,7 @@ void fn_1_2C84(omObjData *object) if (temp_r31->unk3E) { temp_r31->unk3E--; } - temp_f28 = sind((temp_r31->unk3E / 30.0f) * 90.0f); + temp_f28 = sind((temp_r31->unk3E / (0.5f * REFRESH_RATE)) * 90.0f); object->trans.x = temp_r31->unk74.x - (temp_f28 * (temp_r31->unk74.x - temp_r31->unk68.x)); object->trans.y = temp_r31->unk74.y - (temp_f28 * (temp_r31->unk74.y - temp_r31->unk68.y)); object->trans.z = temp_r31->unk74.z - (temp_f28 * (temp_r31->unk74.z - temp_r31->unk68.z)); @@ -1032,7 +1011,7 @@ void fn_1_3C1C(omObjData *object) switch (temp_r31->unk12) { case 0: if (object->trans.z > -7600.0f) { - object->trans.z -= 3.75f; + object->trans.z -= 225.0f / REFRESH_RATE; } else { temp_r31->unk12++; @@ -1113,11 +1092,11 @@ void fn_1_4528(ModelData *model, ParticleData *particle, Mtx matrix) temp_r31->unk34.x = 100.0f * (0.2f * sind(temp_f31)); temp_r31->unk34.y = 0; temp_r31->unk34.z = 100.0f * (0.2f * cosd(temp_f31)); - temp_f30 = ((frand8() * 2.5f) / 256.0f) + (5.0f / 3.0f); + temp_f30 = ((frand8() * (150.0f / REFRESH_RATE)) / 256.0f) + (100.0f / REFRESH_RATE); temp_f31 = temp_f29 + (30.0f * (((s32)frand() & 0x1FF) - 256.0f) / 256.0f); temp_r31->unk08.x = temp_f30 * sind(temp_f31); temp_r31->unk08.z = temp_f30 * cosd(temp_f31); - temp_r31->unk08.y = (frand8() * (50.0f / 3.0f)) / 256.0f; + temp_r31->unk08.y = (frand8() * (1000.0f / REFRESH_RATE)) / 256.0f; temp_r31->unk40.r = temp_r31->unk40.g = temp_r31->unk40.b = temp_r31->unk40.a = 255; } } @@ -1128,7 +1107,7 @@ void fn_1_4528(ModelData *model, ParticleData *particle, Mtx matrix) temp_r28++; } else { - temp_r31->unk08.y += -0.50000006f; + temp_r31->unk08.y += VERSION_NTSC ? -0.50000006f : -0.6f; // -3.0f / REFRESH_RATE temp_r31->unk34.x += temp_r31->unk08.x; temp_r31->unk34.y += temp_r31->unk08.y; temp_r31->unk34.z += temp_r31->unk08.z; @@ -1193,7 +1172,7 @@ void fn_1_4AA8(omObjData *object) } Hu3DMotionSet(object->model[0], object->motion[0]); Hu3DModelAttrSet(object->model[0], HU3D_MOTATTR_LOOP); - object->trans.y = 500; + object->trans.y = 500.0f; object->scale.x = object->scale.y = object->scale.z = 0.25f; if (work->unk2 == 0) { object->trans.x = -1800; @@ -1202,7 +1181,7 @@ void fn_1_4AA8(omObjData *object) object->rot.y = -90; object->func = fn_1_4CC0; Hu3DMotionSpeedSet(object->model[0], 2.0f); - work->unk24 = 60; + work->unk24 = REFRESH_RATE; } else { object->func = fn_1_4F54; @@ -1218,11 +1197,11 @@ void fn_1_4CC0(omObjData *object) Work4AA8 *work = object->data; float pan; Vec pos2D; - if (42.0f == work->unk24) { + if ((VERSION_NTSC ? 42.0f : 35.0f) == work->unk24) { HuAudFXPlay(1795); } if (work->unk24 == 0) { - object->trans.x -= 25.0f; + object->trans.x -= 1500.0f / REFRESH_RATE; } else { if (--work->unk24 == 0) { @@ -1273,7 +1252,7 @@ void fn_1_4F54(omObjData *object) case 0: if (object->work[3]) { work->unk4++; - work->unk24 = work->unk26 = 90; + work->unk24 = work->unk26 = 1.5f * REFRESH_RATE; temp_r29 = omGetGroupMemberListEx(HuPrcCurrentGet(), 0); object->trans.x = work->unk28.x = temp_r29[work->unk2]->trans.x; object->trans.y = work->unk28.y = 2000; @@ -1301,11 +1280,11 @@ void fn_1_4F54(omObjData *object) if (--work->unk24 == 0) { work->unk0 = 1; work->unk4++; - work->unk24 = 90; + work->unk24 = 1.5f * REFRESH_RATE; work->unk10 = (200.0f - object->trans.y) / work->unk24; object->rot.x = 0; } - if (60.0f == work->unk24) { + if (1.0f * REFRESH_RATE == work->unk24) { HuAudFXPlay(1796); } break; @@ -1314,7 +1293,7 @@ void fn_1_4F54(omObjData *object) object->trans.y += work->unk10; if (--work->unk24 == 0) { work->unk4++; - work->unk24 = work->unk26 = 48; + work->unk24 = work->unk26 = 0.8f * REFRESH_RATE; work->unk28.x = object->trans.x; work->unk28.y = object->trans.y; work->unk28.z = object->trans.z; @@ -1350,7 +1329,7 @@ void fn_1_4F54(omObjData *object) object->work[3] = 0; Hu3DModelAttrSet(object->model[0], HU3D_ATTR_DISPOFF); } - if (work->unk24 == (int)(work->unk26 - 12.0f)) { + if (work->unk24 == (int)(work->unk26 - (0.2f * REFRESH_RATE))) { work->unk0 = 0; temp_r29 = omGetGroupMemberListEx(HuPrcCurrentGet(), 0); temp_r28 = temp_r29[work->unk2]->data; @@ -1686,7 +1665,7 @@ void fn_1_6DEC(omObjData *object) switch (object->work[0]) { case 0: if (fn_1_374() <= 3) { - CRotM[0].y -= 10.0f / 60.0f; + CRotM[0].y -= 10.0f / REFRESH_RATE; } if (fn_1_374() == 3) { Hu3DCameraCreate(15);