From 35849f7ac57d27730d17289a0ff244fb3f60018b Mon Sep 17 00:00:00 2001 From: dbalatoni13 Date: Tue, 4 Mar 2025 03:07:07 +0100 Subject: [PATCH] Ported m457Dll to all versions --- config/GMPJ01_00/rels/m457Dll/splits.txt | 9 + config/GMPJ01_00/rels/m457Dll/symbols.txt | 238 ++++----- config/GMPP01_00/rels/m457Dll/splits.txt | 9 + config/GMPP01_00/rels/m457Dll/symbols.txt | 238 ++++----- configure.py | 10 +- src/REL/m457Dll/main.c | 567 +++++++++++----------- 6 files changed, 538 insertions(+), 533 deletions(-) diff --git a/config/GMPJ01_00/rels/m457Dll/splits.txt b/config/GMPJ01_00/rels/m457Dll/splits.txt index 531cd645..b1f5db69 100644 --- a/config/GMPJ01_00/rels/m457Dll/splits.txt +++ b/config/GMPJ01_00/rels/m457Dll/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/m457Dll/main.c: + .text start:0x000000A0 end:0x00007B60 + .rodata start:0x00000000 end:0x00000578 + .data start:0x00000000 end:0x000003E7 + .bss start:0x00000000 end:0x000000C8 diff --git a/config/GMPJ01_00/rels/m457Dll/symbols.txt b/config/GMPJ01_00/rels/m457Dll/symbols.txt index 536be91f..9cca9232 100644 --- a/config/GMPJ01_00/rels/m457Dll/symbols.txt +++ b/config/GMPJ01_00/rels/m457Dll/symbols.txt @@ -3,123 +3,123 @@ _epilog = .text:0x00000054; // type:function size:0x4C scope:global fn_1_A0 = .text:0x000000A0; // type:function size:0x3CC fn_1_46C = .text:0x0000046C; // type:function size:0x2858 fn_1_2CC4 = .text:0x00002CC4; // type:function size:0x281C -fn_1_54E0 = .text:0x000054E0; // type:function size:0x220 -fn_1_5700 = .text:0x00005700; // type:function size:0x29C -fn_1_599C = .text:0x0000599C; // type:function size:0xB3C -fn_1_64D8 = .text:0x000064D8; // type:function size:0xAB8 -fn_1_6F90 = .text:0x00006F90; // type:function size:0x5F4 -fn_1_7584 = .text:0x00007584; // type:function size:0xC0 -fn_1_7644 = .text:0x00007644; // type:function size:0x480 -fn_1_7AC4 = .text:0x00007AC4; // type:function size:0x9C +fn_1_5500 = .text:0x000054E0; // type:function size:0x220 +fn_1_5720 = .text:0x00005700; // type:function size:0x29C +fn_1_59BC = .text:0x0000599C; // type:function size:0xB3C +fn_1_64F8 = .text:0x000064D8; // type:function size:0xAB8 +fn_1_6FB0 = .text:0x00006F90; // type:function size:0x5F4 +fn_1_75A4 = .text:0x00007584; // type:function size:0xC0 +ObjectSetup = .text:0x00007644; // type:function size:0x480 +fn_1_7AE4 = .text:0x00007AC4; // type:function size:0x9C _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:0x8 data:double -lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x8 data:double -lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x8 data:double -lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 data:double -lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float -lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 data:double -lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x24 data:4byte -lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x24 data:4byte +lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x8 scope:local data:double +lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x8 scope:local data:double +lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x8 scope:local data:double +lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 scope:local data:double +lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:float +lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 scope:local data:double +lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x24 scope:local data:4byte +lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x24 scope:local data:4byte lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x64 -lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x8 data:4byte -lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x8 data:4byte -lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x40 data:4byte -lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x40 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_188 = .rodata:0x00000188; // type:object size:0x8 data:double -lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x8 data:double -lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x8 data:double -lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float -lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 data:float -lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float -lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x8 data:double -lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 data:float -lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 data:float -lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 data:float -lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 data:float -lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 data:float -lbl_1_rodata_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:0x8 data:double -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:0x8 data:double -lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x8 data:double -lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 data:float -lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 data:double -lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x8 data:4byte +lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x8 scope:local data:4byte +lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x8 scope:local data:4byte +lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x40 scope:local data:4byte +lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x40 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_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_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_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:0x8 scope:local data:double +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:0x8 scope:local data:double +lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x8 scope:local data:double +lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 scope:local data:float +lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 scope:local data:double +lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x8 scope:local data:4byte lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x90 -lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x8 data:double -lbl_1_rodata_2B8 = .rodata:0x000002B8; // type:object size:0x8 data:double -lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x8 data:double -lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x8 data:double -lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x8 data:double -lbl_1_rodata_2D8 = .rodata:0x000002D8; // type:object size:0x4 data:float -lbl_1_rodata_2E0 = .rodata:0x000002E0; // type:object size:0x8 data:double -lbl_1_rodata_2E8 = .rodata:0x000002E8; // type:object size:0x8 data:double -lbl_1_rodata_2F0 = .rodata:0x000002F0; // type:object size:0x8 data:double -lbl_1_rodata_2F8 = .rodata:0x000002F8; // type:object size:0x4 data:float -lbl_1_rodata_2FC = .rodata:0x000002FC; // type:object size:0x4 data:float -lbl_1_rodata_300 = .rodata:0x00000300; // type:object size:0x8 data:double -lbl_1_rodata_308 = .rodata:0x00000308; // type:object size:0x8 data:double -lbl_1_rodata_310 = .rodata:0x00000310; // type:object size:0x4 data:float -lbl_1_rodata_314 = .rodata:0x00000314; // type:object size:0x4 data:float -lbl_1_rodata_318 = .rodata:0x00000318; // type:object size:0x8 data:double -lbl_1_rodata_320 = .rodata:0x00000320; // type:object size:0x8 data:double -lbl_1_rodata_328 = .rodata:0x00000328; // type:object size:0x8 data:double -lbl_1_rodata_330 = .rodata:0x00000330; // type:object size:0x4 data:float -lbl_1_rodata_334 = .rodata:0x00000334; // type:object size:0x4 data:float -lbl_1_rodata_338 = .rodata:0x00000338; // type:object size:0x4 data:float -lbl_1_rodata_340 = .rodata:0x00000340; // type:object size:0x8 data:double -lbl_1_rodata_348 = .rodata:0x00000348; // type:object size:0x8 data:double -lbl_1_rodata_350 = .rodata:0x00000350; // type:object size:0x8 data:double -lbl_1_rodata_358 = .rodata:0x00000358; // type:object size:0x4 data:float -lbl_1_rodata_360 = .rodata:0x00000360; // type:object size:0x8 data:double -lbl_1_rodata_368 = .rodata:0x00000368; // type:object size:0x8 data:double -lbl_1_rodata_370 = .rodata:0x00000370; // type:object size:0x8 data:double -lbl_1_rodata_378 = .rodata:0x00000378; // type:object size:0x8 data:double -lbl_1_rodata_380 = .rodata:0x00000380; // type:object size:0x8 data:double -lbl_1_rodata_388 = .rodata:0x00000388; // type:object size:0x4 data:float -lbl_1_rodata_38C = .rodata:0x0000038C; // type:object size:0x4 data:float -lbl_1_rodata_390 = .rodata:0x00000390; // type:object size:0x4 data:float -lbl_1_rodata_394 = .rodata:0x00000394; // type:object size:0x4 data:float -lbl_1_rodata_398 = .rodata:0x00000398; // type:object size:0x4 data:float -lbl_1_rodata_3A0 = .rodata:0x000003A0; // type:object size:0x8 data:double -lbl_1_rodata_3A8 = .rodata:0x000003A8; // type:object size:0x8 data:double -lbl_1_rodata_3B0 = .rodata:0x000003B0; // type:object size:0x8 data:double -lbl_1_rodata_3B8 = .rodata:0x000003B8; // type:object size:0x4 data:float -lbl_1_rodata_3BC = .rodata:0x000003BC; // type:object size:0x14 data:4byte -lbl_1_rodata_3D0 = .rodata:0x000003D0; // type:object size:0x8 data:4byte -lbl_1_rodata_3D8 = .rodata:0x000003D8; // type:object size:0x8 data:4byte -lbl_1_rodata_3E0 = .rodata:0x000003E0; // type:object size:0x40 data:4byte -lbl_1_rodata_420 = .rodata:0x00000420; // type:object size:0x40 data:4byte +lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2B8 = .rodata:0x000002B8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2D8 = .rodata:0x000002D8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2E0 = .rodata:0x000002E0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2E8 = .rodata:0x000002E8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2F0 = .rodata:0x000002F0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2F8 = .rodata:0x000002F8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2FC = .rodata:0x000002FC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_300 = .rodata:0x00000300; // type:object size:0x8 scope:local data:double +lbl_1_rodata_308 = .rodata:0x00000308; // type:object size:0x8 scope:local data:double +lbl_1_rodata_310 = .rodata:0x00000310; // type:object size:0x4 scope:local data:float +lbl_1_rodata_314 = .rodata:0x00000314; // type:object size:0x4 scope:local data:float +lbl_1_rodata_318 = .rodata:0x00000318; // type:object size:0x8 scope:local data:double +lbl_1_rodata_320 = .rodata:0x00000320; // type:object size:0x8 scope:local data:double +lbl_1_rodata_328 = .rodata:0x00000328; // type:object size:0x8 scope:local data:double +lbl_1_rodata_330 = .rodata:0x00000330; // type:object size:0x4 scope:local data:float +lbl_1_rodata_334 = .rodata:0x00000334; // type:object size:0x4 scope:local data:float +lbl_1_rodata_338 = .rodata:0x00000338; // type:object size:0x4 scope:local data:float +lbl_1_rodata_340 = .rodata:0x00000340; // type:object size:0x8 scope:local data:double +lbl_1_rodata_348 = .rodata:0x00000348; // type:object size:0x8 scope:local data:double +lbl_1_rodata_350 = .rodata:0x00000350; // type:object size:0x8 scope:local data:double +lbl_1_rodata_358 = .rodata:0x00000358; // type:object size:0x4 scope:local data:float +lbl_1_rodata_360 = .rodata:0x00000360; // type:object size:0x8 scope:local data:double +lbl_1_rodata_368 = .rodata:0x00000368; // type:object size:0x8 scope:local data:double +lbl_1_rodata_370 = .rodata:0x00000370; // type:object size:0x8 scope:local data:double +lbl_1_rodata_378 = .rodata:0x00000378; // type:object size:0x8 scope:local data:double +lbl_1_rodata_380 = .rodata:0x00000380; // type:object size:0x8 scope:local data:double +lbl_1_rodata_388 = .rodata:0x00000388; // type:object size:0x4 scope:local data:float +lbl_1_rodata_38C = .rodata:0x0000038C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_390 = .rodata:0x00000390; // type:object size:0x4 scope:local data:float +lbl_1_rodata_394 = .rodata:0x00000394; // type:object size:0x4 scope:local data:float +lbl_1_rodata_398 = .rodata:0x00000398; // type:object size:0x4 scope:local data:float +lbl_1_rodata_3A0 = .rodata:0x000003A0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_3A8 = .rodata:0x000003A8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_3B0 = .rodata:0x000003B0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_3B8 = .rodata:0x000003B8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_3BC = .rodata:0x000003BC; // type:object size:0x14 scope:local data:4byte +lbl_1_rodata_3D0 = .rodata:0x000003D0; // type:object size:0x8 scope:local data:4byte +lbl_1_rodata_3D8 = .rodata:0x000003D8; // type:object size:0x8 scope:local data:4byte +lbl_1_rodata_3E0 = .rodata:0x000003E0; // type:object size:0x40 scope:local data:4byte +lbl_1_rodata_420 = .rodata:0x00000420; // type:object size:0x40 scope:local data:4byte lbl_1_rodata_460 = .rodata:0x00000460; // type:object size:0x5C lbl_1_rodata_4BC = .rodata:0x000004BC; // type:object size:0x5C -lbl_1_rodata_518 = .rodata:0x00000518; // type:object size:0x4 data:float -lbl_1_rodata_51C = .rodata:0x0000051C; // type:object size:0x4 data:float -lbl_1_rodata_520 = .rodata:0x00000520; // type:object size:0x4 data:float -lbl_1_rodata_524 = .rodata:0x00000524; // type:object size:0xC data:4byte -lbl_1_rodata_530 = .rodata:0x00000530; // type:object size:0xC data:4byte -lbl_1_rodata_53C = .rodata:0x0000053C; // type:object size:0x1 data:byte -lbl_1_rodata_540 = .rodata:0x00000540; // type:object size:0x4 data:float -lbl_1_rodata_544 = .rodata:0x00000544; // type:object size:0x4 data:float -lbl_1_rodata_548 = .rodata:0x00000548; // type:object size:0x4 data:float -lbl_1_rodata_54C = .rodata:0x0000054C; // type:object size:0x4 data:float -lbl_1_rodata_550 = .rodata:0x00000550; // type:object size:0x4 data:float -lbl_1_rodata_554 = .rodata:0x00000554; // type:object size:0x4 data:float -lbl_1_rodata_558 = .rodata:0x00000558; // type:object size:0x4 data:float -lbl_1_rodata_55C = .rodata:0x0000055C; // type:object size:0x4 data:float -lbl_1_rodata_560 = .rodata:0x00000560; // type:object size:0x4 data:float -lbl_1_rodata_564 = .rodata:0x00000564; // type:object size:0x4 data:float -lbl_1_rodata_568 = .rodata:0x00000568; // type:object size:0x4 data:float -lbl_1_rodata_56C = .rodata:0x0000056C; // type:object size:0x4 data:float -lbl_1_rodata_570 = .rodata:0x00000570; // type:object size:0x4 data:float -lbl_1_rodata_574 = .rodata:0x00000574; // type:object size:0x4 data:float +lbl_1_rodata_518 = .rodata:0x00000518; // type:object size:0x4 scope:local data:float +lbl_1_rodata_51C = .rodata:0x0000051C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_520 = .rodata:0x00000520; // type:object size:0x4 scope:local data:float +lbl_1_rodata_524 = .rodata:0x00000524; // type:object size:0xC scope:local data:4byte +lbl_1_rodata_530 = .rodata:0x00000530; // type:object size:0xC scope:local data:4byte +lbl_1_rodata_53C = .rodata:0x0000053C; // type:object size:0x1 scope:local data:byte +lbl_1_rodata_540 = .rodata:0x00000540; // type:object size:0x4 scope:local data:float +lbl_1_rodata_544 = .rodata:0x00000544; // type:object size:0x4 scope:local data:float +lbl_1_rodata_548 = .rodata:0x00000548; // type:object size:0x4 scope:local data:float +lbl_1_rodata_54C = .rodata:0x0000054C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_550 = .rodata:0x00000550; // type:object size:0x4 scope:local data:float +lbl_1_rodata_554 = .rodata:0x00000554; // type:object size:0x4 scope:local data:float +lbl_1_rodata_558 = .rodata:0x00000558; // type:object size:0x4 scope:local data:float +lbl_1_rodata_55C = .rodata:0x0000055C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_560 = .rodata:0x00000560; // type:object size:0x4 scope:local data:float +lbl_1_rodata_564 = .rodata:0x00000564; // type:object size:0x4 scope:local data:float +lbl_1_rodata_568 = .rodata:0x00000568; // type:object size:0x4 scope:local data:float +lbl_1_rodata_56C = .rodata:0x0000056C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_570 = .rodata:0x00000570; // type:object size:0x4 scope:local data:float +lbl_1_rodata_574 = .rodata:0x00000574; // type:object size:0x4 scope:local data:float lbl_1_data_0 = .data:0x00000000; // type:object size:0x5C lbl_1_data_5C = .data:0x0000005C; // type:object size:0x5C data:4byte lbl_1_data_B8 = .data:0x000000B8; // type:object size:0x30 @@ -138,8 +138,8 @@ lbl_1_data_2AC = .data:0x000002AC; // type:object size:0x4 data:4byte lbl_1_data_2B0 = .data:0x000002B0; // type:object size:0x2 data:2byte lbl_1_data_2B4 = .data:0x000002B4; // type:object size:0x4 data:4byte lbl_1_data_2B8 = .data:0x000002B8; // type:object size:0x4 data:4byte -lbl_1_data_2BC = .data:0x000002BC; // type:object size:0x9 data:string -lbl_1_data_2C5 = .data:0x000002C5; // type:object size:0x3 data:string +lbl_1_data_2BC = .data:0x000002BC; // type:object size:0x9 scope:local data:string +lbl_1_data_2C5 = .data:0x000002C5; // type:object size:0x3 scope:local data:string jumptable_1_data_2C8 = .data:0x000002C8; // type:object size:0x2C scope:local jumptable_1_data_2F4 = .data:0x000002F4; // type:object size:0x48 scope:local lbl_1_data_33C = .data:0x0000033C; // type:object size:0x4 data:4byte @@ -148,10 +148,10 @@ lbl_1_data_344 = .data:0x00000344; // type:object size:0x4 data:float lbl_1_data_348 = .data:0x00000348; // type:object size:0x4 data:float jumptable_1_data_34C = .data:0x0000034C; // type:object size:0x20 scope:local jumptable_1_data_36C = .data:0x0000036C; // type:object size:0x2C scope:local -lbl_1_data_398 = .data:0x00000398; // type:object size:0x12 data:string -lbl_1_data_3AA = .data:0x000003AA; // type:object size:0x19 data:string -lbl_1_data_3C3 = .data:0x000003C3; // type:object size:0x24 data:string -lbl_1_bss_4 = .bss:0x00000004; // type:object size:0xC data:4byte +lbl_1_data_398 = .data:0x00000398; // type:object size:0x12 scope:local data:string +lbl_1_data_3AA = .data:0x000003AA; // type:object size:0x19 scope:local data:string +lbl_1_data_3C3 = .data:0x000003C3; // type:object size:0x24 scope:local data:string +lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 data:4byte lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x4 data:4byte lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 data:4byte @@ -161,14 +161,14 @@ lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x4 data:4byte lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:float lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:float lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:float -lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x8 data:float +lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 data:float 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 lbl_1_bss_4C = .bss:0x0000004C; // type:object size:0x4 data:4byte lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 data:4byte -lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x8 data:4byte +lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 data:4byte lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x4 data:4byte lbl_1_bss_60 = .bss:0x00000060; // type:object size:0x4 data:4byte lbl_1_bss_64 = .bss:0x00000064; // type:object size:0x4 data:4byte diff --git a/config/GMPP01_00/rels/m457Dll/splits.txt b/config/GMPP01_00/rels/m457Dll/splits.txt index 531cd645..fe59c2cc 100644 --- a/config/GMPP01_00/rels/m457Dll/splits.txt +++ b/config/GMPP01_00/rels/m457Dll/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/m457Dll/main.c: + .text start:0x000000A0 end:0x00007C04 + .rodata start:0x00000000 end:0x00000568 + .data start:0x00000000 end:0x000003E7 + .bss start:0x00000000 end:0x000000C8 diff --git a/config/GMPP01_00/rels/m457Dll/symbols.txt b/config/GMPP01_00/rels/m457Dll/symbols.txt index 71fd03bb..809b91bc 100644 --- a/config/GMPP01_00/rels/m457Dll/symbols.txt +++ b/config/GMPP01_00/rels/m457Dll/symbols.txt @@ -3,122 +3,122 @@ _epilog = .text:0x00000054; // type:function size:0x4C scope:global fn_1_A0 = .text:0x000000A0; // type:function size:0x3CC fn_1_46C = .text:0x0000046C; // type:function size:0x2858 fn_1_2CC4 = .text:0x00002CC4; // type:function size:0x2654 -fn_1_5318 = .text:0x00005318; // type:function size:0x220 -fn_1_5538 = .text:0x00005538; // type:function size:0x510 -fn_1_5A48 = .text:0x00005A48; // type:function size:0xB34 -fn_1_657C = .text:0x0000657C; // type:function size:0xAB8 -fn_1_7034 = .text:0x00007034; // type:function size:0x5F4 -fn_1_7628 = .text:0x00007628; // type:function size:0xC0 -fn_1_76E8 = .text:0x000076E8; // type:function size:0x480 -fn_1_7B68 = .text:0x00007B68; // type:function size:0x9C +fn_1_5500 = .text:0x00005318; // type:function size:0x220 +fn_1_5720 = .text:0x00005538; // type:function size:0x510 +fn_1_59BC = .text:0x00005A48; // type:function size:0xB34 +fn_1_64F8 = .text:0x0000657C; // type:function size:0xAB8 +fn_1_6FB0 = .text:0x00007034; // type:function size:0x5F4 +fn_1_75A4 = .text:0x00007628; // type:function size:0xC0 +ObjectSetup = .text:0x000076E8; // type:function size:0x480 +fn_1_7AE4 = .text:0x00007B68; // type:function size:0x9C _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:0x8 data:double -lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x8 data:double -lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x8 data:double -lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 data:double -lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float -lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 data:double -lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x24 data:4byte -lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x24 data:4byte -lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x64 -lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x8 data:4byte -lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x8 data:4byte -lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x40 data:4byte -lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x40 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_188 = .rodata:0x00000188; // type:object size:0x8 data:double -lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x8 data:double -lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x8 data:double -lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float -lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 data:float -lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float -lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x8 data:double -lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 data:float -lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 data:float -lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 data:float -lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 data:float -lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 data:float -lbl_1_rodata_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:0x8 data:double -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:0x8 data:double -lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x8 data:double -lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 data:float -lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 data:double -lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x8 data:4byte +lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x8 scope:local data:double +lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x8 scope:local data:double +lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x8 scope:local data:double +lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 scope:local data:double +lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:float +lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 scope:local data:double +lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x24 scope:local data:4byte +lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x24 scope:local data:4byte +lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x64 scope:local +lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x8 scope:local data:4byte +lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x8 scope:local data:4byte +lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x40 scope:local data:4byte +lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x40 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_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_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_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:0x8 scope:local data:double +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:0x8 scope:local data:double +lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x8 scope:local data:double +lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 scope:local data:float +lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 scope:local data:double +lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x8 scope:local data:4byte lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x90 -lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x8 data:double -lbl_1_rodata_2B8 = .rodata:0x000002B8; // type:object size:0x8 data:double -lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x8 data:double -lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x4 data:float -lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x8 data:double -lbl_1_rodata_2D8 = .rodata:0x000002D8; // type:object size:0x8 data:double -lbl_1_rodata_2E0 = .rodata:0x000002E0; // type:object size:0x8 data:double -lbl_1_rodata_2E8 = .rodata:0x000002E8; // type:object size:0x4 data:float -lbl_1_rodata_2EC = .rodata:0x000002EC; // type:object size:0x4 data:float -lbl_1_rodata_2F0 = .rodata:0x000002F0; // type:object size:0x8 data:double -lbl_1_rodata_2F8 = .rodata:0x000002F8; // type:object size:0x8 data:double -lbl_1_rodata_300 = .rodata:0x00000300; // type:object size:0x4 data:float -lbl_1_rodata_304 = .rodata:0x00000304; // type:object size:0x4 data:float -lbl_1_rodata_308 = .rodata:0x00000308; // type:object size:0x8 data:double -lbl_1_rodata_310 = .rodata:0x00000310; // type:object size:0x8 data:double -lbl_1_rodata_318 = .rodata:0x00000318; // type:object size:0x8 data:double -lbl_1_rodata_320 = .rodata:0x00000320; // type:object size:0x4 data:float -lbl_1_rodata_324 = .rodata:0x00000324; // type:object size:0x4 data:float -lbl_1_rodata_328 = .rodata:0x00000328; // type:object size:0x4 data:float -lbl_1_rodata_330 = .rodata:0x00000330; // type:object size:0x8 data:double -lbl_1_rodata_338 = .rodata:0x00000338; // type:object size:0x8 data:double -lbl_1_rodata_340 = .rodata:0x00000340; // type:object size:0x8 data:double -lbl_1_rodata_348 = .rodata:0x00000348; // type:object size:0x4 data:float -lbl_1_rodata_350 = .rodata:0x00000350; // type:object size:0x8 data:double -lbl_1_rodata_358 = .rodata:0x00000358; // type:object size:0x8 data:double -lbl_1_rodata_360 = .rodata:0x00000360; // type:object size:0x8 data:double -lbl_1_rodata_368 = .rodata:0x00000368; // type:object size:0x8 data:double -lbl_1_rodata_370 = .rodata:0x00000370; // type:object size:0x8 data:double -lbl_1_rodata_378 = .rodata:0x00000378; // type:object size:0x4 data:float -lbl_1_rodata_37C = .rodata:0x0000037C; // type:object size:0x4 data:float -lbl_1_rodata_380 = .rodata:0x00000380; // type:object size:0x4 data:float -lbl_1_rodata_384 = .rodata:0x00000384; // type:object size:0x4 data:float -lbl_1_rodata_388 = .rodata:0x00000388; // type:object size:0x8 data:double -lbl_1_rodata_390 = .rodata:0x00000390; // type:object size:0x8 data:double -lbl_1_rodata_398 = .rodata:0x00000398; // type:object size:0x8 data:double -lbl_1_rodata_3A0 = .rodata:0x000003A0; // type:object size:0x4 data:float -lbl_1_rodata_3A4 = .rodata:0x000003A4; // type:object size:0x4 data:float -lbl_1_rodata_3A8 = .rodata:0x000003A8; // type:object size:0x14 data:4byte -lbl_1_rodata_3BC = .rodata:0x000003BC; // type:object size:0x4 data:float -lbl_1_rodata_3C0 = .rodata:0x000003C0; // type:object size:0x8 data:4byte -lbl_1_rodata_3C8 = .rodata:0x000003C8; // type:object size:0x8 data:4byte -lbl_1_rodata_3D0 = .rodata:0x000003D0; // type:object size:0x40 data:4byte -lbl_1_rodata_410 = .rodata:0x00000410; // type:object size:0x40 data:4byte +lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2B8 = .rodata:0x000002B8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2D8 = .rodata:0x000002D8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2E0 = .rodata:0x000002E0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2E8 = .rodata:0x000002E8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2EC = .rodata:0x000002EC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2F0 = .rodata:0x000002F0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2F8 = .rodata:0x000002F8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_300 = .rodata:0x00000300; // type:object size:0x4 scope:local data:float +lbl_1_rodata_304 = .rodata:0x00000304; // type:object size:0x4 scope:local data:float +lbl_1_rodata_308 = .rodata:0x00000308; // type:object size:0x8 scope:local data:double +lbl_1_rodata_310 = .rodata:0x00000310; // type:object size:0x8 scope:local data:double +lbl_1_rodata_318 = .rodata:0x00000318; // type:object size:0x8 scope:local data:double +lbl_1_rodata_320 = .rodata:0x00000320; // type:object size:0x4 scope:local data:float +lbl_1_rodata_324 = .rodata:0x00000324; // type:object size:0x4 scope:local data:float +lbl_1_rodata_328 = .rodata:0x00000328; // type:object size:0x4 scope:local data:float +lbl_1_rodata_330 = .rodata:0x00000330; // type:object size:0x8 scope:local data:double +lbl_1_rodata_338 = .rodata:0x00000338; // type:object size:0x8 scope:local data:double +lbl_1_rodata_340 = .rodata:0x00000340; // type:object size:0x8 scope:local data:double +lbl_1_rodata_348 = .rodata:0x00000348; // type:object size:0x4 scope:local data:float +lbl_1_rodata_350 = .rodata:0x00000350; // type:object size:0x8 scope:local data:double +lbl_1_rodata_358 = .rodata:0x00000358; // type:object size:0x8 scope:local data:double +lbl_1_rodata_360 = .rodata:0x00000360; // type:object size:0x8 scope:local data:double +lbl_1_rodata_368 = .rodata:0x00000368; // type:object size:0x8 scope:local data:double +lbl_1_rodata_370 = .rodata:0x00000370; // type:object size:0x8 scope:local data:double +lbl_1_rodata_378 = .rodata:0x00000378; // type:object size:0x4 scope:local data:float +lbl_1_rodata_37C = .rodata:0x0000037C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_380 = .rodata:0x00000380; // type:object size:0x4 scope:local data:float +lbl_1_rodata_384 = .rodata:0x00000384; // type:object size:0x4 scope:local data:float +lbl_1_rodata_388 = .rodata:0x00000388; // type:object size:0x8 scope:local data:double +lbl_1_rodata_390 = .rodata:0x00000390; // type:object size:0x8 scope:local data:double +lbl_1_rodata_398 = .rodata:0x00000398; // type:object size:0x8 scope:local data:double +lbl_1_rodata_3A0 = .rodata:0x000003A0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_3A4 = .rodata:0x000003A4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_3A8 = .rodata:0x000003A8; // type:object size:0x14 scope:local data:4byte +lbl_1_rodata_3BC = .rodata:0x000003BC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_3C0 = .rodata:0x000003C0; // type:object size:0x8 scope:local data:4byte +lbl_1_rodata_3C8 = .rodata:0x000003C8; // type:object size:0x8 scope:local data:4byte +lbl_1_rodata_3D0 = .rodata:0x000003D0; // type:object size:0x40 scope:local data:4byte +lbl_1_rodata_410 = .rodata:0x00000410; // type:object size:0x40 scope:local data:4byte lbl_1_rodata_450 = .rodata:0x00000450; // type:object size:0x5C lbl_1_rodata_4AC = .rodata:0x000004AC; // type:object size:0x5C -lbl_1_rodata_508 = .rodata:0x00000508; // type:object size:0x4 data:float -lbl_1_rodata_50C = .rodata:0x0000050C; // type:object size:0x4 data:float -lbl_1_rodata_510 = .rodata:0x00000510; // type:object size:0x4 data:float -lbl_1_rodata_514 = .rodata:0x00000514; // type:object size:0xC data:4byte -lbl_1_rodata_520 = .rodata:0x00000520; // type:object size:0xC data:4byte -lbl_1_rodata_52C = .rodata:0x0000052C; // type:object size:0x1 data:byte -lbl_1_rodata_530 = .rodata:0x00000530; // type:object size:0x4 data:float -lbl_1_rodata_534 = .rodata:0x00000534; // type:object size:0x4 data:float -lbl_1_rodata_538 = .rodata:0x00000538; // type:object size:0x4 data:float -lbl_1_rodata_53C = .rodata:0x0000053C; // type:object size:0x4 data:float -lbl_1_rodata_540 = .rodata:0x00000540; // type:object size:0x4 data:float -lbl_1_rodata_544 = .rodata:0x00000544; // type:object size:0x4 data:float -lbl_1_rodata_548 = .rodata:0x00000548; // type:object size:0x4 data:float -lbl_1_rodata_54C = .rodata:0x0000054C; // type:object size:0x4 data:float -lbl_1_rodata_550 = .rodata:0x00000550; // type:object size:0x4 data:float -lbl_1_rodata_554 = .rodata:0x00000554; // type:object size:0x4 data:float -lbl_1_rodata_558 = .rodata:0x00000558; // type:object size:0x4 data:float -lbl_1_rodata_55C = .rodata:0x0000055C; // type:object size:0x4 data:float -lbl_1_rodata_560 = .rodata:0x00000560; // type:object size:0x4 data:float -lbl_1_rodata_564 = .rodata:0x00000564; // type:object size:0x4 data:float +lbl_1_rodata_508 = .rodata:0x00000508; // type:object size:0x4 scope:local data:float +lbl_1_rodata_50C = .rodata:0x0000050C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_510 = .rodata:0x00000510; // type:object size:0x4 scope:local data:float +lbl_1_rodata_514 = .rodata:0x00000514; // type:object size:0xC scope:local data:4byte +lbl_1_rodata_520 = .rodata:0x00000520; // type:object size:0xC scope:local data:4byte +lbl_1_rodata_52C = .rodata:0x0000052C; // type:object size:0x1 scope:local data:byte +lbl_1_rodata_530 = .rodata:0x00000530; // type:object size:0x4 scope:local data:float +lbl_1_rodata_534 = .rodata:0x00000534; // type:object size:0x4 scope:local data:float +lbl_1_rodata_538 = .rodata:0x00000538; // type:object size:0x4 scope:local data:float +lbl_1_rodata_53C = .rodata:0x0000053C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_540 = .rodata:0x00000540; // type:object size:0x4 scope:local data:float +lbl_1_rodata_544 = .rodata:0x00000544; // type:object size:0x4 scope:local data:float +lbl_1_rodata_548 = .rodata:0x00000548; // type:object size:0x4 scope:local data:float +lbl_1_rodata_54C = .rodata:0x0000054C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_550 = .rodata:0x00000550; // type:object size:0x4 scope:local data:float +lbl_1_rodata_554 = .rodata:0x00000554; // type:object size:0x4 scope:local data:float +lbl_1_rodata_558 = .rodata:0x00000558; // type:object size:0x4 scope:local data:float +lbl_1_rodata_55C = .rodata:0x0000055C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_560 = .rodata:0x00000560; // type:object size:0x4 scope:local data:float +lbl_1_rodata_564 = .rodata:0x00000564; // type:object size:0x4 scope:local data:float lbl_1_data_0 = .data:0x00000000; // type:object size:0x5C lbl_1_data_5C = .data:0x0000005C; // type:object size:0x5C data:4byte lbl_1_data_B8 = .data:0x000000B8; // type:object size:0x30 @@ -137,8 +137,8 @@ lbl_1_data_2AC = .data:0x000002AC; // type:object size:0x4 data:4byte lbl_1_data_2B0 = .data:0x000002B0; // type:object size:0x2 data:2byte lbl_1_data_2B4 = .data:0x000002B4; // type:object size:0x4 data:4byte lbl_1_data_2B8 = .data:0x000002B8; // type:object size:0x4 data:4byte -lbl_1_data_2BC = .data:0x000002BC; // type:object size:0x9 data:string -lbl_1_data_2C5 = .data:0x000002C5; // type:object size:0x3 data:string +lbl_1_data_2BC = .data:0x000002BC; // type:object size:0x9 scope:local data:string +lbl_1_data_2C5 = .data:0x000002C5; // type:object size:0x3 scope:local data:string jumptable_1_data_2C8 = .data:0x000002C8; // type:object size:0x2C scope:local jumptable_1_data_2F4 = .data:0x000002F4; // type:object size:0x48 scope:local lbl_1_data_33C = .data:0x0000033C; // type:object size:0x4 data:4byte @@ -147,10 +147,10 @@ lbl_1_data_344 = .data:0x00000344; // type:object size:0x4 data:float lbl_1_data_348 = .data:0x00000348; // type:object size:0x4 data:float jumptable_1_data_34C = .data:0x0000034C; // type:object size:0x20 scope:local jumptable_1_data_36C = .data:0x0000036C; // type:object size:0x2C scope:local -lbl_1_data_398 = .data:0x00000398; // type:object size:0x12 data:string -lbl_1_data_3AA = .data:0x000003AA; // type:object size:0x19 data:string -lbl_1_data_3C3 = .data:0x000003C3; // type:object size:0x24 data:string -lbl_1_bss_4 = .bss:0x00000004; // type:object size:0xC data:4byte +lbl_1_data_398 = .data:0x00000398; // type:object size:0x12 scope:local data:string +lbl_1_data_3AA = .data:0x000003AA; // type:object size:0x19 scope:local data:string +lbl_1_data_3C3 = .data:0x000003C3; // type:object size:0x24 scope:local data:string +lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 data:4byte lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x4 data:4byte lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 data:4byte @@ -160,14 +160,14 @@ lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x4 data:4byte lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:float lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:float lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:float -lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x8 data:float +lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 data:float 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 lbl_1_bss_4C = .bss:0x0000004C; // type:object size:0x4 data:4byte lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 data:4byte -lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x8 data:4byte +lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 data:4byte lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x4 data:4byte lbl_1_bss_60 = .bss:0x00000060; // type:object size:0x4 data:4byte lbl_1_bss_64 = .bss:0x00000064; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index a7d72d58..7a862bd5 100644 --- a/configure.py +++ b/configure.py @@ -199,6 +199,9 @@ cflags_base = [ "-DMUSY_TARGET=MUSY_TARGET_DOLPHIN", ] +if config.non_matching: + cflags_base.append("-DNON_MATCHING") + # Debug flags if args.debug: cflags_base.extend(["-sym on", "-DDEBUG=1"]) @@ -279,6 +282,7 @@ cflags_musyx = [ "-str reuse,pool,readonly", "-fp_contract off", "-DMUSY_TARGET=MUSY_TARGET_DOLPHIN", + "-sym on" ] cflags_musyx_debug = [ @@ -419,7 +423,7 @@ config.libs = [ Object(Matching, "game/sprman.c"), Object(Matching, "game/sprput.c"), Object(Matching, "game/hsfload.c"), - Object(NonMatching, "game/hsfdraw.c"), + Object(Equivalent, "game/hsfdraw.c"), Object(Matching, "game/hsfman.c"), Object(Matching, "game/hsfmotion.c"), Object(Matching, "game/hsfanim.c"), @@ -1290,7 +1294,7 @@ config.libs = [ Rel( "m457Dll", # Bowser Wrestling objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m457Dll/main.c"), + Object(Matching, "REL/m457Dll/main.c"), }, ), Rel( @@ -1370,7 +1374,7 @@ config.libs = [ "modeseldll", objects={ Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/modeseldll/main.c"), - Object(NonMatching, "REL/modeseldll/modesel.c"), + Object(Equivalent, "REL/modeseldll/modesel.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/modeseldll/filesel.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/modeseldll/datalist.c"), }, diff --git a/src/REL/m457Dll/main.c b/src/REL/m457Dll/main.c index 484b27b6..192cb3f1 100755 --- a/src/REL/m457Dll/main.c +++ b/src/REL/m457Dll/main.c @@ -1,7 +1,6 @@ #include "game/audio.h" #include "game/chrman.h" #include "game/data.h" -#include "game/sprite.h" #include "game/esprite.h" #include "game/gamework_data.h" #include "game/hsfdraw.h" @@ -13,11 +12,13 @@ #include "game/pad.h" #include "game/printfunc.h" #include "game/process.h" +#include "game/sprite.h" #include "game/window.h" #include "game/wipe.h" #include "string.h" #include "ext_math.h" +#include "version.h" s32 rand8(void); @@ -58,19 +59,20 @@ typedef struct { /* 0x14 */ float unk14; } StructData28C; // Size 0x18 -void fn_1_7AE4(omObjData* arg0); +void fn_1_7AE4(omObjData *arg0); StructBss78 lbl_1_bss_78[5]; -omObjData* lbl_1_bss_74; -omObjData* lbl_1_bss_70; -omObjData* lbl_1_bss_68[2]; -omObjData* lbl_1_bss_64; +omObjData *lbl_1_bss_74; +omObjData *lbl_1_bss_70; +omObjData *lbl_1_bss_68[2]; +omObjData *lbl_1_bss_64; s32 lbl_1_bss_60; s32 lbl_1_bss_5C; char lbl_1_bss_58[4]; // unused s32 lbl_1_bss_54; s32 lbl_1_bss_50; -Process* lbl_1_bss_4C; +// objman +Process *lbl_1_bss_4C; s32 lbl_1_bss_48; s32 lbl_1_bss_44; s32 lbl_1_bss_40; @@ -90,93 +92,35 @@ char lbl_1_bss_8[8]; // unused s32 lbl_1_bss_4; char lbl_1_bss_0[4]; // unused -s32 lbl_1_data_0[] = { - DATA_MAKE_NUM(DATADIR_M457, 23), - DATA_MAKE_NUM(DATADIR_M457, 22), - DATA_MAKE_NUM(DATADIR_M457, 24), - DATA_MAKE_NUM(DATADIR_M457, 24), - DATA_MAKE_NUM(DATADIR_M457, 24), - DATA_MAKE_NUM(DATADIR_M457, 24), - DATA_MAKE_NUM(DATADIR_M457, 24), - DATA_MAKE_NUM(DATADIR_MGCONST, 0), - DATA_MAKE_NUM(DATADIR_M457, 23), - DATA_MAKE_NUM(DATADIR_M457, 22), - DATA_MAKE_NUM(DATADIR_M457, 24), - DATA_MAKE_NUM(DATADIR_M457, 24), - DATA_MAKE_NUM(DATADIR_M457, 24), - DATA_MAKE_NUM(DATADIR_M457, 24), - DATA_MAKE_NUM(DATADIR_M457, 24), - DATA_MAKE_NUM(DATADIR_MGCONST, 0), - DATA_MAKE_NUM(DATADIR_M457, 27), - DATA_MAKE_NUM(DATADIR_M457, 28), - DATA_MAKE_NUM(DATADIR_M457, 25), - DATA_MAKE_NUM(DATADIR_M457, 25), - DATA_MAKE_NUM(DATADIR_M457, 25), - DATA_MAKE_NUM(DATADIR_M457, 25), - DATA_MAKE_NUM(DATADIR_M457, 25) -}; +s32 lbl_1_data_0[] = { DATA_MAKE_NUM(DATADIR_M457, 23), DATA_MAKE_NUM(DATADIR_M457, 22), DATA_MAKE_NUM(DATADIR_M457, 24), + DATA_MAKE_NUM(DATADIR_M457, 24), DATA_MAKE_NUM(DATADIR_M457, 24), DATA_MAKE_NUM(DATADIR_M457, 24), DATA_MAKE_NUM(DATADIR_M457, 24), + DATA_MAKE_NUM(DATADIR_MGCONST, 0), DATA_MAKE_NUM(DATADIR_M457, 23), DATA_MAKE_NUM(DATADIR_M457, 22), DATA_MAKE_NUM(DATADIR_M457, 24), + DATA_MAKE_NUM(DATADIR_M457, 24), DATA_MAKE_NUM(DATADIR_M457, 24), DATA_MAKE_NUM(DATADIR_M457, 24), DATA_MAKE_NUM(DATADIR_M457, 24), + DATA_MAKE_NUM(DATADIR_MGCONST, 0), DATA_MAKE_NUM(DATADIR_M457, 27), DATA_MAKE_NUM(DATADIR_M457, 28), DATA_MAKE_NUM(DATADIR_M457, 25), + DATA_MAKE_NUM(DATADIR_M457, 25), DATA_MAKE_NUM(DATADIR_M457, 25), DATA_MAKE_NUM(DATADIR_M457, 25), DATA_MAKE_NUM(DATADIR_M457, 25) }; s32 lbl_1_data_5C[23] = { 0 }; -s32 lbl_1_data_B8[] = { - DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 5), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 6), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 112), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 111), - DATA_MAKE_NUM(DATADIR_M457, 8), - DATA_MAKE_NUM(DATADIR_M457, 0), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 12), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 13), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 21), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), - DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) -}; +s32 lbl_1_data_B8[] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0), DATA_MAKE_NUM(DATADIR_MARIOMOT, 5), DATA_MAKE_NUM(DATADIR_MARIOMOT, 6), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 112), DATA_MAKE_NUM(DATADIR_MARIOMOT, 111), DATA_MAKE_NUM(DATADIR_M457, 8), DATA_MAKE_NUM(DATADIR_M457, 0), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 12), DATA_MAKE_NUM(DATADIR_MARIOMOT, 13), DATA_MAKE_NUM(DATADIR_MARIOMOT, 21), + DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), DATA_MAKE_NUM(DATADIR_MARIOMOT, 24) }; u32 lbl_1_data_E8[] = { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0 }; -u32 lbl_1_data_118[] = { - DATA_MAKE_NUM(DATADIR_BKOOPA, 8), - DATA_MAKE_NUM(DATADIR_BKOOPA, 10), - 0, - DATA_MAKE_NUM(DATADIR_M457, 31), - DATA_MAKE_NUM(DATADIR_M457, 32), - DATA_MAKE_NUM(DATADIR_M457, 33), - DATA_MAKE_NUM(DATADIR_M457, 34), - DATA_MAKE_NUM(DATADIR_M457, 35), - DATA_MAKE_NUM(DATADIR_M457, 36), - DATA_MAKE_NUM(DATADIR_M457, 37), - DATA_MAKE_NUM(DATADIR_M457, 29), - DATA_MAKE_NUM(DATADIR_M457, 30) -}; +u32 lbl_1_data_118[] = { DATA_MAKE_NUM(DATADIR_BKOOPA, 8), DATA_MAKE_NUM(DATADIR_BKOOPA, 10), 0, DATA_MAKE_NUM(DATADIR_M457, 31), + DATA_MAKE_NUM(DATADIR_M457, 32), DATA_MAKE_NUM(DATADIR_M457, 33), DATA_MAKE_NUM(DATADIR_M457, 34), DATA_MAKE_NUM(DATADIR_M457, 35), + DATA_MAKE_NUM(DATADIR_M457, 36), DATA_MAKE_NUM(DATADIR_M457, 37), DATA_MAKE_NUM(DATADIR_M457, 29), DATA_MAKE_NUM(DATADIR_M457, 30) }; u8 lbl_1_data_148[12] = { 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1 }; s32 lbl_1_data_154[12] = { 8, 0, 0, 8, 5, 8, 4, 2, 2, 8, 8, 8 }; s32 lbl_1_data_184[12] = { 0 }; -float lbl_1_data_1B4[][3] = { - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - { 20.0f, 60.0f, 20.0f }, - { 20.0f, 70.0f, 20.0f }, - { 20.0f, 20.0f, 20.0f }, - { 50.0f, -70.0f, 0.0f }, - { 20.0f, 60.0f, 20.0f }, - { 100.0f, 0.0f, 50.0f }, - { -70.0f, -70.0f, -70.0f } -}; +float lbl_1_data_1B4[][3] = { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 20.0f, 60.0f, 20.0f }, { 20.0f, 70.0f, 20.0f }, { 20.0f, 20.0f, 20.0f }, + { 50.0f, -70.0f, 0.0f }, { 20.0f, 60.0f, 20.0f }, { 100.0f, 0.0f, 50.0f }, { -70.0f, -70.0f, -70.0f } }; -float lbl_1_data_220[][3] = { - { 1.5f, 45.0f, 270.0f }, - { 1.7f, 45.0f, 270.0f }, - { 1.8f, 45.0f, 270.0f }, - { 1.6f, 45.0f, 270.0f }, - { 1.7f, 5.0f, 270.0f }, - { 2.0f, -85.0f, 295.0f }, - { 1.8f, 45.0f, 270.0f }, - { 2.0f, 40.0f, 330.0f }, - { 2.25f, -30.0f, 300.0f } -}; +float lbl_1_data_220[][3] = { { 1.5f, 45.0f, 270.0f }, { 1.7f, 45.0f, 270.0f }, { 1.8f, 45.0f, 270.0f }, { 1.6f, 45.0f, 270.0f }, + { 1.7f, 5.0f, 270.0f }, { 2.0f, -85.0f, 295.0f }, { 1.8f, 45.0f, 270.0f }, { 2.0f, 40.0f, 330.0f }, { 2.25f, -30.0f, 300.0f } }; StructData28C lbl_1_data_28C = { 0 }; @@ -186,9 +130,11 @@ s32 lbl_1_data_2A8 = -1; s32 lbl_1_data_2AC = -1; s16 lbl_1_data_2B0 = -1; s32 lbl_1_data_2B4 = -1; -s32 lbl_1_data_2B8 = 600; +s32 lbl_1_data_2B8 = 10 * REFRESH_RATE; -void fn_1_A0(void) { +// CameraPrintDebug +void fn_1_A0(void) +{ Center.x += 10.0 * (((HuPadBtn[0] & PAD_BUTTON_RIGHT) != 0) - ((HuPadBtn[0] & PAD_BUTTON_LEFT) != 0)); Center.z -= 10.0 * (((HuPadBtn[0] & PAD_BUTTON_UP) != 0) - ((HuPadBtn[0] & PAD_BUTTON_DOWN) != 0)); Center.y += 10.0 * (((HuPadBtn[0] & PAD_BUTTON_Y) != 0) - ((HuPadBtn[0] & PAD_BUTTON_X) != 0)); @@ -200,7 +146,8 @@ void fn_1_A0(void) { print8(64, 424, 1.0f, "%f", CZoom); } -void fn_1_46C(omObjData* arg0) { +void fn_1_46C(omObjData *arg0) +{ s16 var_r29; s16 var_r26; s16 var_r22; @@ -218,10 +165,10 @@ void fn_1_46C(omObjData* arg0) { s32 sp20; s32 temp_r19; s32 temp_r21; - char* var_r18; - StructBss68Data* temp_r31; - StructBss68Data* temp_r28; - ModelData* spD4; + char *var_r18; + StructBss68Data *temp_r31; + StructBss68Data *temp_r28; + ModelData *spD4; s32 i; temp_r31 = arg0->data; @@ -233,37 +180,33 @@ void fn_1_46C(omObjData* arg0) { var_r29 = -1; var_r26 = -1; var_r22 = -1; - var_r20 = (temp_r31->unk0C == -1) ? 0 - : ((HuPadBtnDown[temp_r31->unk0C] & 0x100) > 0); - var_r25 = (temp_r31->unk0C == -1) ? 0 - : ((HuPadBtnDown[temp_r31->unk0C] & 0x20) > 0); - var_r24 = (temp_r31->unk0C == -1) ? 0 - : ((HuPadBtnDown[temp_r31->unk0C] & 0x40) > 0); + var_r20 = (temp_r31->unk0C == -1) ? 0 : ((HuPadBtnDown[temp_r31->unk0C] & 0x100) > 0); + var_r25 = (temp_r31->unk0C == -1) ? 0 : ((HuPadBtnDown[temp_r31->unk0C] & 0x20) > 0); + var_r24 = (temp_r31->unk0C == -1) ? 0 : ((HuPadBtnDown[temp_r31->unk0C] & 0x40) > 0); if (temp_r31->unk0C == -1) { temp_r31->unk3C--; if (temp_r31->unk3C <= 0) { if (temp_r31->unk14 == 1) { var_r20 = 1; - } else { + } + else { var_r25 = var_r24 = 1; } if (temp_r31->unk14 >= 8 || (temp_r31->unk14 >= 3 && temp_r31->unk18 >= 10)) { switch (temp_r31->unk10) { case 0: - temp_r31->unk3C = rand8() % 14 + 4 - + (temp_r31->unk14 != 8 ? 28 - temp_r31->unk18 : 0); + temp_r31->unk3C = rand8() % 14 + 4 + (temp_r31->unk14 != 8 ? 28 - temp_r31->unk18 : 0); break; case 1: - temp_r31->unk3C = rand8() % 9 + 4 - + (temp_r31->unk14 != 8 ? 28 - temp_r31->unk18 : 0); + temp_r31->unk3C = rand8() % 9 + 4 + (temp_r31->unk14 != 8 ? 28 - temp_r31->unk18 : 0); break; case 2: temp_r31->unk3C = rand8() % 10 + 12 + ((temp_r31->unk14 != 8 && temp_r31->unk18 >= 9 && temp_r31->unk18 <= 13) ? 13 - temp_r31->unk18 : 0); break; case 3: - temp_r31->unk3C = rand8() % 5 + 4 - + ((temp_r31->unk14 != 8 && temp_r31->unk18 >= 2 && temp_r31->unk18 <= 17) ? 17 - temp_r31->unk18 : 0); + temp_r31->unk3C + = rand8() % 5 + 4 + ((temp_r31->unk14 != 8 && temp_r31->unk18 >= 2 && temp_r31->unk18 <= 17) ? 17 - temp_r31->unk18 : 0); if (temp_r28->unk1C > 0 || temp_r31->unk14 == 7) { var_r24 = var_r25 = 0; } @@ -281,19 +224,22 @@ void fn_1_46C(omObjData* arg0) { if (temp_r31->unk20 > 0) { var_r20 = 0; temp_r31->unk20--; - } else if (var_r20 != 0) { + } + else if (var_r20 != 0) { temp_r31->unk20 = 20; } if (temp_r31->unk24 > 0) { var_r24 = 0; temp_r31->unk24--; - } else if (var_r24 != 0) { + } + else if (var_r24 != 0) { temp_r31->unk24 = 6; } if (temp_r31->unk28 > 0) { var_r25 = 0; temp_r31->unk28--; - } else if (var_r25 != 0) { + } + else if (var_r25 != 0) { temp_r31->unk28 = 6; } if (lbl_1_bss_5C == 1008 && temp_r31->unk14 >= 8 && temp_r31->unk14 <= 14) { @@ -310,8 +256,7 @@ void fn_1_46C(omObjData* arg0) { } } if (lbl_1_bss_20 == 0 && lbl_1_bss_5C == 1008 && temp_r31->unk14 >= 7 && temp_r31->unk14 <= 14 && (var_r24 != 0 || var_r25 != 0)) { - temp_r31->unk38 = (var_r24 != 0) ? 0 - : (var_r25 != 0) ? 1 : 0; + temp_r31->unk38 = (var_r24 != 0) ? 0 : (var_r25 != 0) ? 1 : 0; } if (temp_r31->unk00 == 0) { lbl_1_bss_68[0]->trans.x -= temp_r31->unk48; @@ -350,7 +295,7 @@ void fn_1_46C(omObjData* arg0) { if (lbl_1_bss_60 == 0) { var_r29 = 3; } - if (lbl_1_bss_60 == 70) { + if (lbl_1_bss_60 == (s32)((21.0f / 18) * REFRESH_RATE)) { var_r29 = 4; } break; @@ -486,7 +431,8 @@ void fn_1_46C(omObjData* arg0) { temp_r31->unk14 = 7; temp_r31->unk18 = 1; temp_r31->unk34 = 0; - } else { + } + else { if (var_r24 == 0 && var_r25 == 0) { break; } @@ -496,19 +442,14 @@ void fn_1_46C(omObjData* arg0) { var_r22 = (temp_r31->unk38 == 0 ? 0 : 11) + 5; var_r29 = 6; if (lbl_1_bss_20 == 1) { - temp_r31->unk38 = (var_r24 != 0) ? 0 - : (var_r25 != 0) ? 1 : 0; + temp_r31->unk38 = (var_r24 != 0) ? 0 : (var_r25 != 0) ? 1 : 0; } break; } /* fallthrough */ case 7: if (temp_r31->unk18 == 1) { - s32 sp1B4[] = { - 0x12A, 0x16A, 0x1AA, - 0x1EA, 0x22A, 0x26A, - 0x2AA, 0x2EA, 0x03B - }; + s32 sp1B4[] = { 0x12A, 0x16A, 0x1AA, 0x1EA, 0x22A, 0x26A, 0x2AA, 0x2EA, 0x03B }; HuAudFXPlay(sp1B4[temp_r31->unk08 == -1 ? 8 : temp_r31->unk08]); var_r29 = 9; temp_r31->unk4C = 0; @@ -599,7 +540,7 @@ void fn_1_46C(omObjData* arg0) { var_r29 = 4; var_r26 = 20; } - if (temp_r31->unk18 == 60) { + if (temp_r31->unk18 == REFRESH_RATE) { lbl_1_bss_44 = temp_r31->unk00; temp_r31->unk1C = 0; } @@ -608,11 +549,7 @@ void fn_1_46C(omObjData* arg0) { arg0->trans.x += -39.130432f * (temp_r31->unk00 == 0 ? 1 : -1); arg0->trans.y += 39.130432f; if (temp_r31->unk18 == 1) { - s32 sp190[] = { - 0x123, 0x163, 0x1A3, - 0x1E3, 0x223, 0x263, - 0x2A3, 0x2E3, 0x03C - }; + s32 sp190[] = { 0x123, 0x163, 0x1A3, 0x1E3, 0x223, 0x263, 0x2A3, 0x2E3, 0x03C }; HuAudFXPlay(sp190[temp_r31->unk08 == -1 ? 8 : temp_r31->unk08]); var_r29 = 8; @@ -636,7 +573,7 @@ void fn_1_46C(omObjData* arg0) { if (temp_r31->unk18 >= 7 && temp_r31->unk18 < 17) { arg0->trans.x += (temp_r31->unk00 == 0 ? -1 : 1) * 2; } - if (temp_r31->unk18 == 60) { + if (temp_r31->unk18 == REFRESH_RATE) { lbl_1_bss_44 = 2; temp_r31->unk1C = 0; } @@ -660,14 +597,12 @@ void fn_1_46C(omObjData* arg0) { } temp_r21 = ((temp_r19 + 1) / 11 - 1) % 2; { - char sp1D8[][50] = { - "g000mN-itemhook_R", - "g000mN-itemhook_L" - }; + char sp1D8[][50] = { "g000mN-itemhook_R", "g000mN-itemhook_L" }; if (temp_r31->unk08 != -1) { var_r18 = CharModelHookNameGet(temp_r31->unk08, 1, (temp_r21 % 2 == 0) ? 0 : 1); - } else { + } + else { var_r18 = (temp_r21 % 2 == 0) ? sp1D8[0] : sp1D8[1]; } } @@ -692,71 +627,50 @@ void fn_1_46C(omObjData* arg0) { lbl_1_data_2A8 = -1; } } - break; + break; } temp_r31->unk34++; - if (temp_r31->unk14 != 16 && temp_r31->unk14 != 15 && temp_r31->unk14 != 17 && lbl_1_bss_5C == 1008 && temp_r31->unk34 >= 30 && (temp_r31->unk34 - 30) % 30 == 0) { + if (temp_r31->unk14 != 16 && temp_r31->unk14 != 15 && temp_r31->unk14 != 17 && lbl_1_bss_5C == 1008 && temp_r31->unk34 >= 30 + && (temp_r31->unk34 - 30) % 30 == 0) { temp_r31->unk30 += (temp_r31->unk4C == 0 || temp_r31->unk14 == 7) ? 10 : 0; } - temp_r31->unk30 = (temp_r31->unk1C > 0 || temp_r31->unk30 >= 100) ? 100 - : (temp_r31->unk30 < 0) ? 0 - : temp_r31->unk30; + temp_r31->unk30 = (temp_r31->unk1C > 0 || temp_r31->unk30 >= 100) ? 100 : (temp_r31->unk30 < 0) ? 0 : temp_r31->unk30; for (i = 0; i < 5; i++) { - temp_f31 = (temp_r31->unk30 >= i * 20 + 20) ? 1.0 - : (temp_r31->unk30 <= i * 20) ? 0.0 - : (temp_r31->unk30 - i * 20) / 20.0; + temp_f31 = (temp_r31->unk30 >= i * 20 + 20) ? 1.0 : (temp_r31->unk30 <= i * 20) ? 0.0 : (temp_r31->unk30 - i * 20) / 20.0; espScaleSet(lbl_1_data_5C[i + (temp_r31->unk00 == 0 ? 2 : 10)], temp_f31, temp_f31); if (temp_r31->unk1C > 0) { s32 spF4[] = { 106, 469 }; s32 spEC[] = { 78, 78 }; - s32 sp150[] = { - 0, 0, -33, -9, 15, 39, 63, -68, - 0, 0, -33, -9, 15, 39, 63, -68 - }; - s32 sp110[] = { - 0, 0, -1, -1, -1, -1, -1, -2, - 0, 0, -1, -1, -1, -1, -1, -2 - }; + s32 sp150[] = { 0, 0, -33, -9, 15, 39, 63, -68, 0, 0, -33, -9, 15, 39, 63, -68 }; + s32 sp110[] = { 0, 0, -1, -1, -1, -1, -1, -2, 0, 0, -1, -1, -1, -1, -1, -2 }; espPosSet(lbl_1_data_5C[i + 18], spF4[temp_r31->unk00] + sp150[i + 2], spEC[temp_r31->unk00] + sp110[i + 2]); - espScaleSet(lbl_1_data_5C[i + 18], - (temp_r31->unk1C % 4 == 0) ? 1.1 : 1.0, - (temp_r31->unk1C % 4 == 0) ? 1.1 : 1.0); - espTPLvlSet(lbl_1_data_5C[i + 18], - (temp_r31->unk1C % 4 < 2) ? 1.0 - : (var_r22 % 4 == 2) ? 0.5 : 0.0); + espScaleSet(lbl_1_data_5C[i + 18], (temp_r31->unk1C % 4 == 0) ? 1.1 : 1.0, (temp_r31->unk1C % 4 == 0) ? 1.1 : 1.0); + espTPLvlSet(lbl_1_data_5C[i + 18], (temp_r31->unk1C % 4 < 2) ? 1.0 : (var_r22 % 4 == 2) ? 0.5 : 0.0); espDispOn(lbl_1_data_5C[i + 18]); - } else if (temp_r28->unk1C == 0) { + } + else if (temp_r28->unk1C == 0) { espDispOff(lbl_1_data_5C[i + 18]); } } if (temp_r31->unk1C > 0) { sp20 = (temp_r31->unk08 != -1) ? temp_r31->unk08 : 8; - Hu3DModelPosSet(lbl_1_bss_64->model[3], - arg0->trans.x + lbl_1_data_220[sp20][1] * (temp_r31->unk00 == 0 ? 1 : -1), - arg0->trans.y + lbl_1_data_220[sp20][2], - 150.0f + arg0->trans.z); - Hu3DModelScaleSet(lbl_1_bss_64->model[3], - 0.75 * lbl_1_data_220[sp20][0], - 0.75 * lbl_1_data_220[sp20][0], - 0.75 * lbl_1_data_220[sp20][0]); + Hu3DModelPosSet(lbl_1_bss_64->model[3], arg0->trans.x + lbl_1_data_220[sp20][1] * (temp_r31->unk00 == 0 ? 1 : -1), + arg0->trans.y + lbl_1_data_220[sp20][2], 150.0f + arg0->trans.z); + Hu3DModelScaleSet(lbl_1_bss_64->model[3], 0.75 * lbl_1_data_220[sp20][0], 0.75 * lbl_1_data_220[sp20][0], 0.75 * lbl_1_data_220[sp20][0]); Hu3DModelAttrReset(lbl_1_bss_64->model[3], 1); Hu3DModelAttrSet(lbl_1_bss_64->model[3], HU3D_ATTR_ZCMP_OFF); - Hu3DModelPosSet(lbl_1_bss_64->model[4], - arg0->trans.x + lbl_1_data_220[sp20][1] * (temp_r31->unk00 == 0 ? 1 : -1), - arg0->trans.y + lbl_1_data_220[sp20][2], - 150.0f + arg0->trans.z); - Hu3DModelScaleSet(lbl_1_bss_64->model[4], - 0.75 * lbl_1_data_220[sp20][0], - 0.75 * lbl_1_data_220[sp20][0], - 0.75 * lbl_1_data_220[sp20][0]); + Hu3DModelPosSet(lbl_1_bss_64->model[4], arg0->trans.x + lbl_1_data_220[sp20][1] * (temp_r31->unk00 == 0 ? 1 : -1), + arg0->trans.y + lbl_1_data_220[sp20][2], 150.0f + arg0->trans.z); + Hu3DModelScaleSet(lbl_1_bss_64->model[4], 0.75 * lbl_1_data_220[sp20][0], 0.75 * lbl_1_data_220[sp20][0], 0.75 * lbl_1_data_220[sp20][0]); Hu3DModelAttrReset(lbl_1_bss_64->model[4], 1); Hu3DModelAttrSet(lbl_1_bss_64->model[4], HU3D_ATTR_ZCMP_OFF); temp_r31->unk1C--; if (temp_r31->unk1C == 0) { HuAudFXStop(lbl_1_data_2B4); } - } else if (temp_r28->unk1C == 0) { + } + else if (temp_r28->unk1C == 0) { Hu3DModelAttrSet(lbl_1_bss_64->model[3], HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(lbl_1_bss_64->model[4], HU3D_ATTR_DISPOFF); } @@ -767,11 +681,10 @@ void fn_1_46C(omObjData* arg0) { if (var_r26 == 0) { Hu3DMotionSet(arg0->model[0], arg0->motion[var_r29]); Hu3DMotionTimeSet(arg0->model[0], (var_r22 == -1) ? 0 : var_r22); - } else { - Hu3DMotionShiftSet(arg0->model[0], arg0->motion[var_r29], - (var_r22 != -1) ? var_r22 : lbl_1_data_184[var_r29], - (var_r26 != -1) ? var_r26 : lbl_1_data_154[var_r29], - lbl_1_data_148[var_r29] ? HU3D_MOTATTR_NONE : HU3D_MOTATTR_LOOP); + } + else { + Hu3DMotionShiftSet(arg0->model[0], arg0->motion[var_r29], (var_r22 != -1) ? var_r22 : lbl_1_data_184[var_r29], + (var_r26 != -1) ? var_r26 : lbl_1_data_154[var_r29], lbl_1_data_148[var_r29] ? HU3D_MOTATTR_NONE : HU3D_MOTATTR_LOOP); } temp_r31->unk40 = var_r29; } @@ -785,17 +698,18 @@ float lbl_1_data_340 = 3500.0f; float lbl_1_data_344 = 100.0f; float lbl_1_data_348 = -59.0f; -void fn_1_2CC4(omObjData* arg0) { - StructBss68Data* sp158[2]; - omObjData* sp150[2]; - StructBss68Data* sp148[2]; +void fn_1_2CC4(omObjData *arg0) +{ + StructBss68Data *sp158[2]; + omObjData *sp150[2]; + StructBss68Data *sp148[2]; s32 sp140[2]; - omObjData* sp138[2]; - StructBss68Data* sp130[2]; - ModelData* temp_r24; - ModelData* temp_r27; - ModelData* temp_r28; - ModelData* temp_r29; + omObjData *sp138[2]; + StructBss68Data *sp130[2]; + ModelData *temp_r24; + ModelData *temp_r27; + ModelData *temp_r28; + ModelData *temp_r29; float spAC; float spA8; float spA4; @@ -842,16 +756,16 @@ void fn_1_2CC4(omObjData* arg0) { if (lbl_1_bss_60 == 0) { lbl_1_bss_3C = 0; } - if (lbl_1_bss_60 == 20) { + if (lbl_1_bss_60 == (VERSION_NTSC ? 20 : 15)) { espAttrReset(lbl_1_data_5C[16], HU3D_ATTR_SHADOW); } - if ((lbl_1_bss_60 >= 20 && lbl_1_bss_60 <= 50) || (lbl_1_bss_60 >= 180 && lbl_1_bss_60 <= 210)) { - spAC = (lbl_1_bss_60 <= 120) - ? (lbl_1_bss_60 - 20) / 30.0 - : (1.0 - (lbl_1_bss_60 - 180) / 30.0); + if ((lbl_1_bss_60 >= (VERSION_NTSC ? 20 : 15) && lbl_1_bss_60 <= REFRESH_RATE - 10) + || (lbl_1_bss_60 >= 3 * REFRESH_RATE && lbl_1_bss_60 <= (s32)(3.5 * REFRESH_RATE))) { + spAC = (lbl_1_bss_60 <= 120) ? (lbl_1_bss_60 - (VERSION_NTSC ? 20 : 15)) / (0.5 * REFRESH_RATE) + : (1.0 - (lbl_1_bss_60 - 3 * REFRESH_RATE) / (0.5 * REFRESH_RATE)); espTPLvlSet(lbl_1_data_5C[16], spAC); } - if (lbl_1_bss_60 == 210) { + if (lbl_1_bss_60 == (s32)(3.5 * REFRESH_RATE)) { espAttrSet(lbl_1_data_5C[16], HU3D_ATTR_SHADOW); } break; @@ -871,6 +785,7 @@ void fn_1_2CC4(omObjData* arg0) { espDispOn(lbl_1_data_5C[i]); } } +#if VERSION_NTSC if (lbl_1_bss_60 <= 25) { temp_f28 = lbl_1_bss_60 / 25.0; temp_f26 = 1.0f - (1.0f - temp_f28) * (1.0f - temp_f28) * (1.0f - temp_f28); @@ -878,30 +793,35 @@ void fn_1_2CC4(omObjData* arg0) { temp_f23 = 1.0f - (1.0f - temp_f28) * (1.0f - temp_f28); temp_f23 = 2.0f * (1.0f - temp_f28); espAttrReset(lbl_1_data_5C[17], HU3D_ATTR_SHADOW); +#if VERSION_ENG espScaleSet(lbl_1_data_5C[17], 0.85 * temp_f26, 0.85 * temp_f26); +#else + espScaleSet(lbl_1_data_5C[17], temp_f26, temp_f26); +#endif espTPLvlSet(lbl_1_data_5C[17], (temp_f23 > 1.0f) ? 1.0f : temp_f23); - } else { + } + else { espAttrSet(lbl_1_data_5C[17], HU3D_ATTR_SHADOW); } +#endif for (i = 0; i < 2; i++) { sp150[i] = lbl_1_bss_68[i]; sp148[i] = lbl_1_bss_68[i]->data; } for (i = 0; i < 2; i++) { sp140[i] = (sp148[1 - i]->unk1C > 0) ? 2 - : (sp148[i]->unk14 == 8) ? 2 - : (sp148[i]->unk14 == 1) ? 1 - : (sp148[i]->unk14 == 9) ? (sp148[i]->unk18 >= 0 ? 3 : 2) - : (sp148[i]->unk14 == 2) ? 4 - : (sp148[i]->unk14 == 7) ? 0 : -1; + : (sp148[i]->unk14 == 8) ? 2 + : (sp148[i]->unk14 == 1) ? 1 + : (sp148[i]->unk14 == 9) ? (sp148[i]->unk18 >= 0 ? 3 : 2) + : (sp148[i]->unk14 == 2) ? 4 + : (sp148[i]->unk14 == 7) ? 0 + : -1; } if (sp140[0] >= 0 && sp140[1] >= 0 && fabs(sp150[0]->trans.x - sp150[1]->trans.x) < 300.0) { sp150[0]->trans.x = (sp148[0]->unk1C > 0) ? sp150[0]->trans.x - : (sp148[1]->unk1C > 0) ? (sp150[1]->trans.x - 300.0f) - : ((sp150[0]->trans.x + sp150[1]->trans.x) / 2.0 - 150.0); - sp150[0]->trans.x = (sp150[0]->trans.x >= 650.0) ? 650.0 - : (sp150[0]->trans.x <= -950.0) ? -950.0 - : sp150[0]->trans.x; + : (sp148[1]->unk1C > 0) ? (sp150[1]->trans.x - 300.0f) + : ((sp150[0]->trans.x + sp150[1]->trans.x) / 2.0 - 150.0); + sp150[0]->trans.x = (sp150[0]->trans.x >= 650.0) ? 650.0 : (sp150[0]->trans.x <= -950.0) ? -950.0 : sp150[0]->trans.x; sp150[1]->trans.x = sp150[0]->trans.x + 300.0f; if (sp140[0] >= 3 || sp140[1] >= 3) { var_r26 = (sp140[0] >= 3) ? 0 : 1; @@ -981,9 +901,7 @@ void fn_1_2CC4(omObjData* arg0) { break; } Hu3DModelAttrReset(arg0->model[2], HU3D_ATTR_DISPOFF); - Hu3DModelPosSet(arg0->model[2], - (lbl_1_bss_1C == 0) ? 0.0 : (2.0 * ((rand8() % 256) / 255.0 - 0.5) * 400.0), - 1500.0f, 0.0f); + Hu3DModelPosSet(arg0->model[2], (lbl_1_bss_1C == 0) ? 0.0 : (2.0 * ((rand8() % 256) / 255.0 - 0.5) * 400.0), 1500.0f, 0.0f); lbl_1_bss_1C = 1; /* fallthrough */ case 1: @@ -1002,8 +920,8 @@ void fn_1_2CC4(omObjData* arg0) { var_r23 = (sp128[0] < sp128[1]) ? 0 : 1; Hu3DModelAttrSet(arg0->model[2], HU3D_ATTR_DISPOFF); lbl_1_bss_1C = 2; - lbl_1_data_2B8 = 600; - sp130[var_r23]->unk1C = 300; + lbl_1_data_2B8 = 10 * REFRESH_RATE; + sp130[var_r23]->unk1C = 5 * REFRESH_RATE; sp130[var_r23]->unk4C = 0; if (lbl_1_bss_78[3].unk00 < 3) { lbl_1_bss_78[3].unk04[lbl_1_bss_78[3].unk00] = 0.0f; @@ -1022,9 +940,10 @@ void fn_1_2CC4(omObjData* arg0) { /* fallthrough */ case 3: lbl_1_data_2B8++; - if (lbl_1_data_2B8 < 60 && lbl_1_data_2B8 % 2 == 0) { + if (lbl_1_data_2B8 < REFRESH_RATE && lbl_1_data_2B8 % 2 == 0) { Hu3DModelAttrReset(arg0->model[2], HU3D_ATTR_DISPOFF); - } else { + } + else { Hu3DModelAttrSet(arg0->model[2], HU3D_ATTR_DISPOFF); } break; @@ -1050,7 +969,8 @@ void fn_1_2CC4(omObjData* arg0) { temp_f22 = 1.0 - (lbl_1_bss_60 - 30) / 7.0; Hu3DModelRotSet(arg0->model[5], 25.0 * (temp_f22 * 0.5 + temp_f22 * temp_f22 * 0.5), 0.0f, 0.0f); } - } else if (lbl_1_bss_18 == 0) { + } + else if (lbl_1_bss_18 == 0) { Hu3DMotionSet(lbl_1_bss_64->model[5], arg0->motion[0]); Hu3DModelAttrReset(lbl_1_bss_64->model[5], HU3D_MOTATTR_LOOP); } @@ -1069,14 +989,9 @@ void fn_1_2CC4(omObjData* arg0) { } var_r22 = lbl_1_data_33C; { - float sp160[][6] = { - { 3500.0f, 0.0f, 100.0f, 0.0f, -59.0f, 0.0f }, - { 3200.0f, 0.0f, 100.0f, 0.0f, -30.0f, 0.0f }, - { 2100.0f, 0.0f, 200.0f, 0.0f, -30.0f, 0.0f }, - { 2000.0f, 0.0f, 200.0f, 0.0f, -30.0f, 0.0f }, - { 800.0f, 0.0f, 200.0f, 0.0f, -89.0f, 0.0f }, - { 1800.0f, 0.0f, 200.0f, 0.0f, -30.0f, 0.0f } - }; + float sp160[][6] = { { 3500.0f, 0.0f, 100.0f, 0.0f, -59.0f, 0.0f }, { 3200.0f, 0.0f, 100.0f, 0.0f, -30.0f, 0.0f }, + { 2100.0f, 0.0f, 200.0f, 0.0f, -30.0f, 0.0f }, { 2000.0f, 0.0f, 200.0f, 0.0f, -30.0f, 0.0f }, + { 800.0f, 0.0f, 200.0f, 0.0f, -89.0f, 0.0f }, { 1800.0f, 0.0f, 200.0f, 0.0f, -30.0f, 0.0f } }; if (lbl_1_bss_44 != -1 && lbl_1_bss_40 == 0) { sp160[2][1] = lbl_1_bss_68[lbl_1_bss_44]->trans.x; @@ -1107,7 +1022,8 @@ void fn_1_2CC4(omObjData* arg0) { if (lbl_1_bss_24 == 0) { lbl_1_bss_28 = 1.0 - 0.95 * (1.0f - lbl_1_bss_28); var_f31 = lbl_1_bss_28; - } else { + } + else { lbl_1_bss_28 += 0.008333333333333333; lbl_1_bss_28 = (lbl_1_bss_28 > 1.0f) ? 1.0f : lbl_1_bss_28; var_f31 = 0.5 + -0.5 * cosd(180.0f * lbl_1_bss_28); @@ -1131,7 +1047,8 @@ void fn_1_2CC4(omObjData* arg0) { lbl_1_data_28C.unk10 = 2.0 * (rand8() / 255.0) - 1.0; lbl_1_data_28C.unk14 = 2.0 * (rand8() / 255.0) - 1.0; lbl_1_data_28C.unk10 = 0.0f; - temp_f29 = (lbl_1_data_28C.unk10 - lbl_1_data_28C.unk08) * (lbl_1_data_28C.unk10 - lbl_1_data_28C.unk08) + (lbl_1_data_28C.unk14 - lbl_1_data_28C.unk0C) * (lbl_1_data_28C.unk14 - lbl_1_data_28C.unk0C); + temp_f29 = (lbl_1_data_28C.unk10 - lbl_1_data_28C.unk08) * (lbl_1_data_28C.unk10 - lbl_1_data_28C.unk08) + + (lbl_1_data_28C.unk14 - lbl_1_data_28C.unk0C) * (lbl_1_data_28C.unk14 - lbl_1_data_28C.unk0C); } while (sqrtf(temp_f29) < 0.75); } var_f21 = lbl_1_data_28C.unk08; @@ -1139,8 +1056,7 @@ void fn_1_2CC4(omObjData* arg0) { var_f21 *= lbl_1_data_28C.unk04 * 2; temp_f25 *= lbl_1_data_28C.unk04 * 2; lbl_1_data_28C.unk00 = !lbl_1_data_28C.unk00; - lbl_1_data_28C.unk04 = (lbl_1_data_28C.unk04 > 24) ? 23 - : (lbl_1_data_28C.unk04 - 1 > 0) ? (lbl_1_data_28C.unk04 - 1) : 0; + lbl_1_data_28C.unk04 = (lbl_1_data_28C.unk04 > 24) ? 23 : (lbl_1_data_28C.unk04 - 1 > 0) ? (lbl_1_data_28C.unk04 - 1) : 0; Center.x = 0.0f; Center.y = 100.0f + temp_f25; } @@ -1149,16 +1065,16 @@ void fn_1_2CC4(omObjData* arg0) { temp_r29 = &Hu3DData[lbl_1_bss_68[i]->model[0]]; var_r21 = (sp158[i]->unk08 != -1) ? sp158[i]->unk08 : 8; var_r20 = (temp_r29->unk_08 == lbl_1_bss_68[i]->motion[4]) ? 0 - : (temp_r29->unk_08 == lbl_1_bss_68[i]->motion[6]) ? 1 - : (temp_r29->unk_08 == lbl_1_bss_68[i]->motion[7]) ? 2 : -1; + : (temp_r29->unk_08 == lbl_1_bss_68[i]->motion[6]) ? 1 + : (temp_r29->unk_08 == lbl_1_bss_68[i]->motion[7]) ? 2 + : -1; var_r19 = (temp_r29->unk_0C == lbl_1_bss_68[i]->motion[4]) ? 0 - : (temp_r29->unk_0C == lbl_1_bss_68[i]->motion[6]) ? 1 - : (temp_r29->unk_0C == lbl_1_bss_68[i]->motion[7]) ? 2 : -1; + : (temp_r29->unk_0C == lbl_1_bss_68[i]->motion[6]) ? 1 + : (temp_r29->unk_0C == lbl_1_bss_68[i]->motion[7]) ? 2 + : -1; spA8 = (var_r20 == -1) ? 0.0f : lbl_1_data_1B4[var_r21][var_r20]; spA4 = (var_r19 == -1) ? 0.0f : lbl_1_data_1B4[var_r21][var_r19]; - var_f19 = (temp_r29->unk_0C == -1) ? 0.0f - : (temp_r29->unk_80 == 0.0f) ? 1.0f - : (temp_r29->unk_7C / temp_r29->unk_80); + var_f19 = (temp_r29->unk_0C == -1) ? 0.0f : (temp_r29->unk_80 == 0.0f) ? 1.0f : (temp_r29->unk_7C / temp_r29->unk_80); sp158[i]->unk48 = (i == 0 ? 1 : -1) * (spA8 * (1.0f - var_f19) + spA4 * var_f19); lbl_1_bss_68[i]->trans.x += sp158[i]->unk48; Hu3DModelPosSet(lbl_1_bss_68[i]->model[0], lbl_1_bss_68[i]->trans.x, lbl_1_bss_68[i]->trans.y, lbl_1_bss_68[i]->trans.z); @@ -1166,8 +1082,9 @@ void fn_1_2CC4(omObjData* arg0) { } } -void fn_1_5500(void) { - StructBss68Data* spC[2]; +void fn_1_5500(void) +{ + StructBss68Data *spC[2]; s16 sp8; s16 temp_r31; s32 i; @@ -1176,20 +1093,19 @@ void fn_1_5500(void) { for (i = 0; i < 2; i++) { spC[i] = lbl_1_bss_68[i]->data; } - HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, 60); + HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, REFRESH_RATE); HuWinComKeyReset(); temp_r31 = HuWinExCreateStyled(36.0f, 344.0f, 504, 96, 6, 0); HuWinBGTPLvlSet(temp_r31, 0.8f); HuWinMesSpeedSet(temp_r31, 1); HuWinExAnimIn(temp_r31); - HuWinDisablePlayerSet(temp_r31, 0xF - & ((spC[0]->unk0C != -1) ? ~(1 << spC[0]->unk0C) : 0xF) - & ((spC[1]->unk0C != -1) ? ~(1 << spC[1]->unk0C) : 0xF)); + HuWinDisablePlayerSet( + temp_r31, 0xF & ((spC[0]->unk0C != -1) ? ~(1 << spC[0]->unk0C) : 0xF) & ((spC[1]->unk0C != -1) ? ~(1 << spC[1]->unk0C) : 0xF)); HuWinMesSet(temp_r31, MAKE_MESSID(48, 31)); if ((spC[0]->unk0C == -1 || spC[0]->unk08 == -1) && (spC[1]->unk0C == -1 || spC[1]->unk08 == -1)) { - HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, 60); - HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, 60); - HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, 60); + HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, VERSION_JP ? 48 : REFRESH_RATE); + HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, VERSION_JP ? 90 : REFRESH_RATE); + HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, VERSION_JP ? 72 : REFRESH_RATE); } HuWinMesWait(temp_r31); HuWinExAnimOut(temp_r31); @@ -1198,44 +1114,96 @@ void fn_1_5500(void) { HuPrcEnd(); } -void fn_1_5720(void) { +void fn_1_5720(void) +{ float var_f31; - StructBss68Data* spC[2]; - WindowData* temp_r30; - s16 sp8; s16 temp_r31; + WindowData *temp_r30; + StructBss68Data *spC[2]; +#if VERSION_PAL + float var_f30; + double var_f29; + double var_f28; + float sp14[2]; + float spC_2[2]; + WindowData *var_r29; +#endif s32 var_r28; + s16 sp8; + s32 var_r26; s32 i; sp8 = 0; for (i = 0; i < 2; i++) { spC[i] = lbl_1_bss_68[i]->data; } - HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, 60); + HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, REFRESH_RATE); HuWinComKeyReset(); +#if VERSION_NTSC temp_r31 = HuWinCreate(215.0f, 100.0f, 130, 37, 1); +#else + HuWinMesMaxSizeGet(1, sp14, MAKE_MESSID(48, 32)); + temp_r31 = HuWinCreate(-10000.0f, 100.0f, sp14[0], 0x25, 1); +#endif HuSprColorSet(winData[temp_r31].group, 0, 0xFF, 0xFF, 0xCC); HuWinBGTPLvlSet(temp_r31, 0.9f); temp_r30 = &winData[temp_r31]; +#if VERSION_PAL + var_f29 = temp_r30->pos_x; +#endif temp_r30->mess_color = 0; temp_r30->mess_shadow_color = 9; temp_r30->attr |= 0x80; - for (var_r28 = 15, var_f31 = 0.0f; var_r28 != 0; var_r28--, var_f31 += 0.06666667f) { + for (var_r28 = 15, var_f31 = 0.0f; var_r28 != 0; var_r28--, var_f31 += 2.0f / 30) { HuWinScaleSet(temp_r31, 1.0f, 1.0 * (1.0f - (1.0f - var_f31) * (1.0f - var_f31))); +#if VERSION_NTSC HuWinPosSet(temp_r31, 215.0f, 100.0 + 37.0 * (1.0f - (1.0f - var_f31) * (1.0f - var_f31)) / -4.0); +#else + HuWinPosSet(temp_r31, var_f29, 100.0 + 37.0 * (1.0f - (1.0f - var_f31) * (1.0f - var_f31)) / -4.0); +#endif HuPrcVSleep(); } HuWinScaleSet(temp_r31, 1.0f, 1.0f); HuWinMesSet(temp_r31, MAKE_MESSID(48, 32)); - HuPrcSleep(60); + HuPrcSleep(REFRESH_RATE); HuWinExAnimOut(temp_r31); HuWinExCleanup(temp_r31); +#if VERSION_PAL + temp_r31 = 0; +#endif lbl_1_bss_10 = 0; +#if VERSION_PAL + while (lbl_1_bss_5C != 0x3F0) { + HuPrcVSleep(); + } + HuWinMesMaxSizeGet(1, spC_2, MAKE_MESSID(48, 33)); + temp_r31 = HuWinCreate(-10000.0f, 100.0f, spC_2[0], spC_2[1], 1); + HuSprColorSet(winData[temp_r31].group, 0, 0xFF, 0xFF, 0xCC); + HuWinBGTPLvlSet(temp_r31, 0.9f); + var_r29 = &winData[temp_r31]; + var_f28 = var_r29->pos_x; + var_r29->mess_color = 0; + var_r29->mess_shadow_color = 9; + var_r29->attr |= 0x80; + for (var_r26 = 5, var_f30 = 0.0f; var_r26 != 0; var_r26--, var_f30 += 0.2f) { + HuWinScaleSet(temp_r31, 1.0f, (double)(1.0f - ((1.0f - var_f30) * (1.0f - var_f30)))); + HuWinPosSet(temp_r31, var_f28, 100.0 + (((double)spC_2[1] * (1.0f - ((1.0f - var_f30) * (1.0f - var_f30)))) / -4.0)); + HuPrcVSleep(); + } + HuWinScaleSet(temp_r31, 1.0f, 1.0f); + HuWinMesSet(temp_r31, MAKE_MESSID(48, 33)); + HuWinMesSpeedSet(temp_r31, 0); + HuPrcSleep(0x32); + HuWinExAnimOut(temp_r31); + HuWinExCleanup(temp_r31); + temp_r31 = 0; +#endif HuPrcEnd(); } -void fn_1_59BC(omObjData* arg0) { - StructBss68Data* sp14[2]; +void fn_1_59BC(omObjData *arg0) +{ + StructBss68Data *sp14[2]; float spC[2]; s32 sp8; s32 i; @@ -1274,7 +1242,7 @@ void fn_1_59BC(omObjData* arg0) { break; case 1002: lbl_1_bss_60++; - if (lbl_1_bss_60 > 210) { + if (lbl_1_bss_60 > (s32)(3.5 * REFRESH_RATE)) { lbl_1_bss_5C++; lbl_1_bss_60 = 0; } @@ -1291,7 +1259,8 @@ void fn_1_59BC(omObjData* arg0) { HuPrcChildCreate(fn_1_5500, 100, 0x2000, 0, HuPrcCurrentGet()); lbl_1_bss_10 = 1; lbl_1_bss_60++; - } else if (lbl_1_bss_10 == 0) { + } + else if (lbl_1_bss_10 == 0) { lbl_1_bss_60++; if (sp14[0]->unk14 == 0) { lbl_1_bss_5C++; @@ -1301,7 +1270,7 @@ void fn_1_59BC(omObjData* arg0) { break; case 1005: lbl_1_bss_60++; - if (lbl_1_bss_60 == 180) { + if (lbl_1_bss_60 == (VERSION_NTSC ? 180 : 128)) { lbl_1_bss_5C++; lbl_1_bss_60 = 0; } @@ -1316,13 +1285,15 @@ void fn_1_59BC(omObjData* arg0) { HuPrcChildCreate(fn_1_5720, 100, 0x2000, 0, HuPrcCurrentGet()); lbl_1_bss_10 = 1; lbl_1_bss_60++; - } else if (lbl_1_bss_10 == 0) { + } + else if (lbl_1_bss_10 == 0) { lbl_1_bss_60++; if (sp14[0]->unk14 == 0) { lbl_1_bss_5C++; - lbl_1_bss_60 = rand8() * 30 % 5 + 60; + lbl_1_bss_60 = rand8() * (REFRESH_RATE / 2) % 5 + REFRESH_RATE; } - } else { + } + else { lbl_1_bss_60++; } break; @@ -1331,7 +1302,9 @@ void fn_1_59BC(omObjData* arg0) { if (lbl_1_bss_60 <= 0) { lbl_1_bss_5C++; lbl_1_bss_60 = 0; +#if VERSION_NTSC HuAudFXPlay(0x3E); +#endif } break; case 1008: @@ -1341,20 +1314,20 @@ void fn_1_59BC(omObjData* arg0) { lbl_1_bss_60 = 0; break; } - if (lbl_1_data_2A6 == -1 && lbl_1_bss_60 >= 16200 && sp14[0]->unk14 < 16 && sp14[1]->unk14 < 16) { + if (lbl_1_data_2A6 == -1 && lbl_1_bss_60 >= 270 * REFRESH_RATE && sp14[0]->unk14 < 16 && sp14[1]->unk14 < 16) { lbl_1_data_2A6 = MGSeqTimerCreate(30); } if (lbl_1_data_2A6 == -1) { break; } if (sp14[0]->unk14 < 16 && sp14[1]->unk14 < 16) { - MGSeqParamSet(lbl_1_data_2A6, 1, (18059 - lbl_1_bss_60) / 60); - if (lbl_1_bss_60 > 18000) { + MGSeqParamSet(lbl_1_data_2A6, 1, (301 * REFRESH_RATE - 1 - lbl_1_bss_60) / REFRESH_RATE); + if (lbl_1_bss_60 > 300 * REFRESH_RATE) { MGSeqParamSet(lbl_1_data_2A6, 2, -1); lbl_1_data_2A6 = -1; } } - if (lbl_1_bss_60 > 18000 && sp14[0]->unk14 < 16 && sp14[1]->unk14 < 16) { + if (lbl_1_bss_60 > 300 * REFRESH_RATE && sp14[0]->unk14 < 16 && sp14[1]->unk14 < 16) { lbl_1_bss_5C = 1009; lbl_1_bss_60 = 0; lbl_1_bss_40 = 1; @@ -1373,7 +1346,7 @@ void fn_1_59BC(omObjData* arg0) { lbl_1_data_2A6 = -1; } lbl_1_bss_60++; - if (lbl_1_bss_60 >= 120) { + if (lbl_1_bss_60 >= 2 * REFRESH_RATE) { lbl_1_bss_5C++; lbl_1_bss_60 = 0; } @@ -1384,21 +1357,24 @@ void fn_1_59BC(omObjData* arg0) { if (lbl_1_bss_44 != 2) { if (sp14[lbl_1_bss_44]->unk08 != -1) { HuAudSStreamPlay(1); - } else { + } + else { HuAudSStreamPlay(3); } if (lbl_1_bss_14 != 0) { if (lbl_1_bss_44 == 0) { _SetFlag(FLAG_ID_MAKE(1, 7)); } - } else { + } + else { GWPlayerCoinWinSet(sp14[lbl_1_bss_44]->unk04, 10); } - } else if (lbl_1_bss_44 == 2) { + } + else if (lbl_1_bss_44 == 2) { HuAudSStreamPlay(4); } } - if (225.0f < lbl_1_bss_60) { + if ((VERSION_NTSC ? 225.0f : 190.0f) < lbl_1_bss_60) { if (lbl_1_data_2AC != -1) { HuAudFXStop(lbl_1_data_2AC); lbl_1_data_2AC = -1; @@ -1411,9 +1387,10 @@ void fn_1_59BC(omObjData* arg0) { } } -void fn_1_64F8(omObjData* arg0) { - StructBss68Data* sp18[2]; - StructBss68Data* temp_r29; +void fn_1_64F8(omObjData *arg0) +{ + StructBss68Data *sp18[2]; + StructBss68Data *temp_r29; s32 i; for (i = 0; i < 2; i++) { @@ -1465,19 +1442,14 @@ void fn_1_64F8(omObjData* arg0) { for (i = 0; i < 16; i++) { s32 sp10[] = { 106, 469 }; s32 sp8[] = { 78, 78 }; - s32 sp60[] = { - 0, 0, -33, -9, 15, 39, 63, -68, - 0, 0, -33, -9, 15, 39, 63, -68 - }; - s32 sp20[] = { - 0, 0, -1, -1, -1, -1, -1, -2, - 0, 0, -1, -1, -1, -1, -1, -2 - }; + s32 sp60[] = { 0, 0, -33, -9, 15, 39, 63, -68, 0, 0, -33, -9, 15, 39, 63, -68 }; + s32 sp20[] = { 0, 0, -1, -1, -1, -1, -1, -2, 0, 0, -1, -1, -1, -1, -1, -2 }; if (lbl_1_data_0[i] == DATA_MAKE_NUM(DATADIR_MGCONST, 0)) { temp_r29 = lbl_1_bss_68[i == 7 ? 0 : 1]->data; lbl_1_data_5C[i] = espEntry((temp_r29->unk08 == -1) ? DATA_MAKE_NUM(DATADIR_M457, 26) : (lbl_1_data_0[i] + temp_r29->unk08), 0, 0); - } else { + } + else { lbl_1_data_5C[i] = espEntry(lbl_1_data_0[i], 0, 0); } espDrawNoSet(lbl_1_data_5C[i], 0); @@ -1487,8 +1459,9 @@ void fn_1_64F8(omObjData* arg0) { espPriSet(lbl_1_data_5C[i], 128 - i); espPosSet(lbl_1_data_5C[i], sp60[i] + sp10[i < 8 ? 0 : 1], sp20[i] + sp8[i < 8 ? 0 : 1]); if ((i >= 8 ? i - 8 : i) != 0) { - (void) 1; // Required to match. - } else { + (void)1; // Required to match. + } + else { espTPLvlSet(lbl_1_data_5C[i], 0.5f); espColorSet(lbl_1_data_5C[i], 0, 0, 0); } @@ -1509,10 +1482,11 @@ void fn_1_64F8(omObjData* arg0) { arg0->func = fn_1_2CC4; } -void fn_1_6FB0(omObjData* arg0) { +void fn_1_6FB0(omObjData *arg0) +{ s32 sp14; - StructBss68Data* temp_r31; - StructBss68Data* sp10; + StructBss68Data *temp_r31; + StructBss68Data *sp10; s32 i; temp_r31 = arg0->data; @@ -1520,13 +1494,15 @@ void fn_1_6FB0(omObjData* arg0) { memset(temp_r31, 0, sizeof(*temp_r31)); temp_r31->unk00 = arg0->work[0]; temp_r31->unk04 = (GWPlayerCfg[0].group == temp_r31->unk00) ? 0 - : (GWPlayerCfg[1].group == temp_r31->unk00) ? 1 - : (GWPlayerCfg[2].group == temp_r31->unk00) ? 2 - : (GWPlayerCfg[3].group == temp_r31->unk00) ? 3 : 4; + : (GWPlayerCfg[1].group == temp_r31->unk00) ? 1 + : (GWPlayerCfg[2].group == temp_r31->unk00) ? 2 + : (GWPlayerCfg[3].group == temp_r31->unk00) ? 3 + : 4; sp14 = (GWPlayerCfg[0].group == 1 - temp_r31->unk00) ? 0 - : (GWPlayerCfg[1].group == 1 - temp_r31->unk00) ? 1 - : (GWPlayerCfg[2].group == 1 - temp_r31->unk00) ? 2 - : (GWPlayerCfg[3].group == 1 - temp_r31->unk00) ? 3 : 4; + : (GWPlayerCfg[1].group == 1 - temp_r31->unk00) ? 1 + : (GWPlayerCfg[2].group == 1 - temp_r31->unk00) ? 2 + : (GWPlayerCfg[3].group == 1 - temp_r31->unk00) ? 3 + : 4; if (temp_r31->unk04 == 4) { OSReport("m457:wrong player group\n"); temp_r31->unk04 = temp_r31->unk00; @@ -1536,7 +1512,8 @@ void fn_1_6FB0(omObjData* arg0) { temp_r31->unk0C = -1; temp_r31->unk04 = -1; temp_r31->unk10 = 1; - } else { + } + else { temp_r31->unk08 = GWPlayerCfg[temp_r31->unk04].character; temp_r31->unk0C = (temp_r31->unk08 == -1 || GWPlayerCfg[temp_r31->unk04].iscom) ? -1 : GWPlayerCfg[temp_r31->unk04].pad_idx; temp_r31->unk10 = (temp_r31->unk0C != -1) ? 0 : GWPlayerCfg[temp_r31->unk04].diff; @@ -1551,19 +1528,22 @@ void fn_1_6FB0(omObjData* arg0) { temp_r31->unk44 = -1; if (temp_r31->unk08 != -1) { arg0->model[0] = CharModelCreate(temp_r31->unk08, 1); - } else { + } + else { arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_BKOOPA, 7)); } omSetTra(arg0, 0.0f, temp_r31->unk00 == 0 ? 0 : 300, 0.0f); if (temp_r31->unk08 != -1) { omSetSca(arg0, 2.5f, 2.5f, 2.5f); - } else { + } + else { omSetSca(arg0, 2.0f, 2.0f, 2.0f); } for (i = 0; i < 12; i++) { if (temp_r31->unk08 != -1) { arg0->motion[i] = CharModelMotionCreate(temp_r31->unk08, lbl_1_data_B8[i] + (lbl_1_data_E8[i] != 0 ? temp_r31->unk08 : 0)); - } else if (lbl_1_data_118[i] != 0) { + } + else if (lbl_1_data_118[i] != 0) { arg0->motion[i] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_118[i]); } } @@ -1579,7 +1559,8 @@ void fn_1_6FB0(omObjData* arg0) { arg0->func = fn_1_46C; } -void fn_1_75A4(omObjData* arg0) { +void fn_1_75A4(omObjData *arg0) +{ lbl_1_bss_5C = 1000; lbl_1_bss_60 = 0; lbl_1_bss_54 = 0; @@ -1592,8 +1573,9 @@ void fn_1_75A4(omObjData* arg0) { arg0->func = fn_1_59BC; } -void ObjectSetup(void) { - omObjData* var_r30; +void ObjectSetup(void) +{ + omObjData *var_r30; s32 i; OSReport("******* M457 ObjectSetup *********\n"); @@ -1651,8 +1633,9 @@ void ObjectSetup(void) { lbl_1_bss_74 = omAddObjEx(lbl_1_bss_4C, 103, 0, 0, -1, fn_1_75A4); } -void fn_1_7AE4(omObjData* arg0) { - StructBss68Data* sp8; +void fn_1_7AE4(omObjData *arg0) +{ + StructBss68Data *sp8; s32 i; if (WipeStatGet() == 0) {