From 9c915a08fd2f76d10c4941877cbb0986281660ac Mon Sep 17 00:00:00 2001 From: dbalatoni13 Date: Sun, 15 Dec 2024 22:35:14 +0100 Subject: [PATCH] Port ztardll to JP --- config/GMPJ01_00/rels/ztardll/splits.txt | 20 ++ config/GMPJ01_00/rels/ztardll/symbols.txt | 416 +++++++++++----------- configure.py | 6 +- src/REL/ztardll/font.c | 34 +- src/REL/ztardll/main.c | 31 +- src/REL/ztardll/select.c | 21 ++ 6 files changed, 309 insertions(+), 219 deletions(-) diff --git a/config/GMPJ01_00/rels/ztardll/splits.txt b/config/GMPJ01_00/rels/ztardll/splits.txt index 531cd645..9d81d15d 100644 --- a/config/GMPJ01_00/rels/ztardll/splits.txt +++ b/config/GMPJ01_00/rels/ztardll/splits.txt @@ -5,3 +5,23 @@ 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/ztardll/main.c: + .text start:0x000000A0 end:0x00007820 + .rodata start:0x00000000 end:0x000001B8 + .data start:0x00000000 end:0x000000B0 + .bss start:0x00000000 end:0x00000070 + +REL/ztardll/font.c: + .text start:0x00007820 end:0x00007C9C + .rodata start:0x000001B8 end:0x000001C0 + .data start:0x000000B0 end:0x00000578 + +REL/ztardll/select.c: + .text start:0x00007C9C end:0x00012358 + .rodata start:0x000001C0 end:0x00000298 + .data start:0x00000578 end:0x00000824 + .bss start:0x00000070 end:0x000002D8 diff --git a/config/GMPJ01_00/rels/ztardll/symbols.txt b/config/GMPJ01_00/rels/ztardll/symbols.txt index 7e87352c..f9516f21 100644 --- a/config/GMPJ01_00/rels/ztardll/symbols.txt +++ b/config/GMPJ01_00/rels/ztardll/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:0x384 +ObjectSetup = .text:0x000000A0; // type:function size:0x384 fn_1_424 = .text:0x00000424; // type:function size:0x1350 fn_1_1774 = .text:0x00001774; // type:function size:0x57C fn_1_1CF0 = .text:0x00001CF0; // type:function size:0xB0 @@ -11,197 +11,197 @@ fn_1_40E4 = .text:0x000040E4; // type:function size:0x290 fn_1_4374 = .text:0x00004374; // type:function size:0x5D4 fn_1_4948 = .text:0x00004948; // type:function size:0x874 fn_1_51BC = .text:0x000051BC; // type:function size:0x15C -fn_1_5318 = .text:0x00005318; // type:function size:0x14AC -fn_1_67C4 = .text:0x000067C4; // type:function size:0x10C -fn_1_68D0 = .text:0x000068D0; // type:function size:0xC10 -fn_1_74E0 = .text:0x000074E0; // type:function size:0x340 -fn_1_7820 = .text:0x00007820; // type:function size:0x47C -fn_1_7C9C = .text:0x00007C9C; // type:function size:0x16C -fn_1_7E08 = .text:0x00007E08; // type:function size:0xA0 -fn_1_7EA8 = .text:0x00007EA8; // type:function size:0x224 -fn_1_80CC = .text:0x000080CC; // type:function size:0x2DC -fn_1_83A8 = .text:0x000083A8; // type:function size:0x2C -fn_1_83D4 = .text:0x000083D4; // type:function size:0x518 -fn_1_88EC = .text:0x000088EC; // type:function size:0x2C -fn_1_8918 = .text:0x00008918; // type:function size:0x28 -fn_1_8940 = .text:0x00008940; // type:function size:0x274 -fn_1_8BB4 = .text:0x00008BB4; // type:function size:0x2C -fn_1_8BE0 = .text:0x00008BE0; // type:function size:0x2C -fn_1_8C0C = .text:0x00008C0C; // type:function size:0x24 -fn_1_8C30 = .text:0x00008C30; // type:function size:0x2BC -fn_1_8EEC = .text:0x00008EEC; // type:function size:0x500 -fn_1_93EC = .text:0x000093EC; // type:function size:0x480 -fn_1_986C = .text:0x0000986C; // type:function size:0x80C -fn_1_A078 = .text:0x0000A078; // type:function size:0x28 -fn_1_A0A0 = .text:0x0000A0A0; // type:function size:0x28 -fn_1_A0C8 = .text:0x0000A0C8; // type:function size:0x21C -fn_1_A2E4 = .text:0x0000A2E4; // type:function size:0x194 -fn_1_A478 = .text:0x0000A478; // type:function size:0x198 -fn_1_A610 = .text:0x0000A610; // type:function size:0x9C -fn_1_A6AC = .text:0x0000A6AC; // type:function size:0x2D8 -fn_1_A984 = .text:0x0000A984; // type:function size:0x2DC -fn_1_AC60 = .text:0x0000AC60; // type:function size:0x1E0 -fn_1_AE40 = .text:0x0000AE40; // type:function size:0xF0 -fn_1_AF30 = .text:0x0000AF30; // type:function size:0x50 -fn_1_AF80 = .text:0x0000AF80; // type:function size:0x584 -fn_1_B504 = .text:0x0000B504; // type:function size:0x5D8 -fn_1_BADC = .text:0x0000BADC; // type:function size:0x33C -fn_1_BE18 = .text:0x0000BE18; // type:function size:0x274 -fn_1_C08C = .text:0x0000C08C; // type:function size:0x7C -fn_1_C108 = .text:0x0000C108; // type:function size:0x44C -fn_1_C554 = .text:0x0000C554; // type:function size:0x434 -fn_1_C988 = .text:0x0000C988; // type:function size:0x204 -fn_1_CB8C = .text:0x0000CB8C; // type:function size:0x790 -fn_1_D31C = .text:0x0000D31C; // type:function size:0xB0C -fn_1_DE28 = .text:0x0000DE28; // type:function size:0x720 -fn_1_E548 = .text:0x0000E548; // type:function size:0x9C -fn_1_E5E4 = .text:0x0000E5E4; // type:function size:0xCCC -fn_1_F2B0 = .text:0x0000F2B0; // type:function size:0x924 -fn_1_FBD4 = .text:0x0000FBD4; // type:function size:0x258 -fn_1_FE2C = .text:0x0000FE2C; // type:function size:0x958 -fn_1_10784 = .text:0x00010784; // type:function size:0x7C -fn_1_10800 = .text:0x00010800; // type:function size:0x164 -fn_1_10964 = .text:0x00010964; // type:function size:0x1B8 -fn_1_10B1C = .text:0x00010B1C; // type:function size:0xA4 -fn_1_10BC0 = .text:0x00010BC0; // type:function size:0xF4 -fn_1_10CB4 = .text:0x00010CB4; // type:function size:0x80 -fn_1_10D34 = .text:0x00010D34; // type:function size:0x80 -fn_1_10DB4 = .text:0x00010DB4; // type:function size:0x28 -fn_1_10DDC = .text:0x00010DDC; // type:function size:0x20 -fn_1_10DFC = .text:0x00010DFC; // type:function size:0xD8 -fn_1_10ED4 = .text:0x00010ED4; // type:function size:0xC8 -fn_1_10F9C = .text:0x00010F9C; // type:function size:0xBC -fn_1_11058 = .text:0x00011058; // type:function size:0x40 -fn_1_11098 = .text:0x00011098; // type:function size:0x24 -fn_1_110BC = .text:0x000110BC; // type:function size:0x1C0 -fn_1_1127C = .text:0x0001127C; // type:function size:0x84 -fn_1_11300 = .text:0x00011300; // type:function size:0xD4 -fn_1_113D4 = .text:0x000113D4; // type:function size:0x58 -fn_1_1142C = .text:0x0001142C; // type:function size:0x15C -fn_1_11588 = .text:0x00011588; // type:function size:0x1C4 -fn_1_1174C = .text:0x0001174C; // type:function size:0x1AC -fn_1_118F8 = .text:0x000118F8; // type:function size:0x54 -fn_1_1194C = .text:0x0001194C; // type:function size:0x304 -fn_1_11C50 = .text:0x00011C50; // type:function size:0x304 -fn_1_11F54 = .text:0x00011F54; // type:function size:0x340 -fn_1_12294 = .text:0x00012294; // type:function size:0xC4 +fn_1_524C = .text:0x00005318; // type:function size:0x14AC +fn_1_66F8 = .text:0x000067C4; // type:function size:0x10C +fn_1_6804 = .text:0x000068D0; // type:function size:0xC10 +fn_1_7414 = .text:0x000074E0; // type:function size:0x340 +fn_1_7754 = .text:0x00007820; // type:function size:0x47C +fn_1_7C00 = .text:0x00007C9C; // type:function size:0x16C +fn_1_7D6C = .text:0x00007E08; // type:function size:0xA0 +fn_1_7E0C = .text:0x00007EA8; // type:function size:0x224 +fn_1_8030 = .text:0x000080CC; // type:function size:0x2DC +fn_1_830C = .text:0x000083A8; // type:function size:0x2C +fn_1_8338 = .text:0x000083D4; // type:function size:0x518 +fn_1_8850 = .text:0x000088EC; // type:function size:0x2C +fn_1_887C = .text:0x00008918; // type:function size:0x28 +fn_1_88A4 = .text:0x00008940; // type:function size:0x274 +fn_1_8B18 = .text:0x00008BB4; // type:function size:0x2C +fn_1_8B44 = .text:0x00008BE0; // type:function size:0x2C +fn_1_8B70 = .text:0x00008C0C; // type:function size:0x24 +fn_1_8B94 = .text:0x00008C30; // type:function size:0x2BC +fn_1_8E50 = .text:0x00008EEC; // type:function size:0x500 +fn_1_9350 = .text:0x000093EC; // type:function size:0x480 +fn_1_97D0 = .text:0x0000986C; // type:function size:0x80C +fn_1_9FDC = .text:0x0000A078; // type:function size:0x28 +fn_1_A004 = .text:0x0000A0A0; // type:function size:0x28 +fn_1_A02C = .text:0x0000A0C8; // type:function size:0x21C +fn_1_A248 = .text:0x0000A2E4; // type:function size:0x194 +fn_1_A3DC = .text:0x0000A478; // type:function size:0x198 +fn_1_A574 = .text:0x0000A610; // type:function size:0x9C +fn_1_A610 = .text:0x0000A6AC; // type:function size:0x2D8 +fn_1_A8E8 = .text:0x0000A984; // type:function size:0x2DC +fn_1_ABC4 = .text:0x0000AC60; // type:function size:0x1E0 +fn_1_ADA4 = .text:0x0000AE40; // type:function size:0xF0 +fn_1_AE94 = .text:0x0000AF30; // type:function size:0x50 +fn_1_AEE4 = .text:0x0000AF80; // type:function size:0x584 +fn_1_B468 = .text:0x0000B504; // type:function size:0x5D8 +fn_1_BA40 = .text:0x0000BADC; // type:function size:0x33C +fn_1_BD7C = .text:0x0000BE18; // type:function size:0x274 +fn_1_BFF0 = .text:0x0000C08C; // type:function size:0x7C +fn_1_C06C = .text:0x0000C108; // type:function size:0x44C +fn_1_C4B8 = .text:0x0000C554; // type:function size:0x434 +fn_1_C8EC = .text:0x0000C988; // type:function size:0x204 +fn_1_CAF0 = .text:0x0000CB8C; // type:function size:0x790 +fn_1_D280 = .text:0x0000D31C; // type:function size:0xB0C +fn_1_DD8C = .text:0x0000DE28; // type:function size:0x720 +fn_1_E4AC = .text:0x0000E548; // type:function size:0x9C +fn_1_E548 = .text:0x0000E5E4; // type:function size:0xCCC +fn_1_F214 = .text:0x0000F2B0; // type:function size:0x924 +fn_1_FB38 = .text:0x0000FBD4; // type:function size:0x258 +fn_1_FD90 = .text:0x0000FE2C; // type:function size:0x958 +fn_1_106E8 = .text:0x00010784; // type:function size:0x7C +fn_1_10764 = .text:0x00010800; // type:function size:0x164 +fn_1_108C8 = .text:0x00010964; // type:function size:0x1B8 +fn_1_10A80 = .text:0x00010B1C; // type:function size:0xA4 +fn_1_10B24 = .text:0x00010BC0; // type:function size:0xF4 +fn_1_10C18 = .text:0x00010CB4; // type:function size:0x80 +fn_1_10C98 = .text:0x00010D34; // type:function size:0x80 +fn_1_10D18 = .text:0x00010DB4; // type:function size:0x28 +fn_1_10D40 = .text:0x00010DDC; // type:function size:0x20 +fn_1_10D60 = .text:0x00010DFC; // type:function size:0xD8 +fn_1_10E38 = .text:0x00010ED4; // type:function size:0xC8 +fn_1_10F00 = .text:0x00010F9C; // type:function size:0xBC +fn_1_10FBC = .text:0x00011058; // type:function size:0x40 +fn_1_10FFC = .text:0x00011098; // type:function size:0x24 +fn_1_11020 = .text:0x000110BC; // type:function size:0x1C0 +fn_1_111E0 = .text:0x0001127C; // type:function size:0x84 +fn_1_11264 = .text:0x00011300; // type:function size:0xD4 +fn_1_11338 = .text:0x000113D4; // type:function size:0x58 +fn_1_11390 = .text:0x0001142C; // type:function size:0x15C +fn_1_114EC = .text:0x00011588; // type:function size:0x1C4 +fn_1_11708 = .text:0x0001174C; // type:function size:0x1AC +fn_1_1190C = .text:0x000118F8; // type:function size:0x54 +fn_1_11960 = .text:0x0001194C; // type:function size:0x304 +fn_1_11C64 = .text:0x00011C50; // type:function size:0x304 +fn_1_11F68 = .text:0x00011F54; // type:function size:0x340 +fn_1_122A8 = .text:0x00012294; // type:function size:0xC4 _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_4C = .rodata:0x0000004C; // type:object size:0x4 data:float -lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 data:float -lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 data:float -lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float -lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float -lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x8 data:double -lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 data:float -lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x8 data:double -lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x8 data:double -lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 data:double -lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x8 data:double -lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x8 data:double -lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x8 data:double -lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float -lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x8 data:double -lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x8 data:double -lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float -lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 data:float -lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 data:float -lbl_1_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 data:float -lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x8 data:double -lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x8 data:double -lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 data:float -lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x8 data:double -lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x8 data:double -lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 data:float -lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x8 data:double -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:0x8 data:double -lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x8 data:double -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:0x8 data:double -lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x8 data:double -lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x8 data:double -lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x8 data:double -lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 data:float -lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 data:float -lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x8 data:double -lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float -lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 data:float -lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 data:float -lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x8 data:double -lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 data:float -lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x8 data:double -lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 data:float -lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 data:float -lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 data:float -lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 data:float -lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 data:float -lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 data:float -lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x4 data:float -lbl_1_rodata_1EC = .rodata:0x000001EC; // type:object size:0x4 data:float -lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 data:float -lbl_1_rodata_1F4 = .rodata:0x000001F4; // type:object size:0x4 data:float -lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x4 data:float -lbl_1_rodata_1FC = .rodata:0x000001FC; // type:object size:0x4 data:float -lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x4 data:float -lbl_1_rodata_204 = .rodata:0x00000204; // type:object size:0x4 data:float -lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 data:float -lbl_1_rodata_20C = .rodata:0x0000020C; // type:object size:0x4 data:float -lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x4 data:float -lbl_1_rodata_214 = .rodata:0x00000214; // type:object size:0x4 data:float -lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x4 data:float -lbl_1_rodata_21C = .rodata:0x0000021C; // type:object size:0x4 data:float -lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x4 data:float -lbl_1_rodata_224 = .rodata:0x00000224; // type:object size:0x4 data:float -lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 data:float -lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 data:float -lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x8 data:double -lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x8 data:double -lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x4 data:float -lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x8 data:double -lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x4 data:float -lbl_1_rodata_254 = .rodata:0x00000254; // type:object size:0x4 data:float -lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x4 data:float -lbl_1_rodata_25C = .rodata:0x0000025C; // type:object size:0x4 data:float -lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x38 data:4byte -lbl_1_data_0 = .data:0x00000000; // type:object size:0x22 data:string -lbl_1_data_22 = .data:0x00000022; // type:object size:0xA +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_4C = .rodata:0x0000004C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 scope:local data:float +lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 scope:local data:float +lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 scope:local data:float +lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x8 scope:local data:double +lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 scope:local data:float +lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x8 scope:local data:double +lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x8 scope:local data:double +lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 scope:local data:double +lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x8 scope:local data:double +lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x8 scope:local data:double +lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x8 scope:local data:double +lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 scope:local data:float +lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 scope:local data:float +lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 scope:local data:float +lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 scope:local data:float +lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x4 scope:local data:float +lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 scope:local data:float +lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x8 scope:local data:double +lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x8 scope:local data:double +lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 scope:local data:float +lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 scope:local data:float +lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 scope:local data:float +lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x8 scope:local data:double +lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x8 scope:local data:double +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:0x8 scope:local data:double +lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x8 scope:local data:double +lbl_1_rodata_188 = .rodata:0x00000188; // type:object size: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:0x4 scope:local data:float +lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1EC = .rodata:0x000001EC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1F4 = .rodata:0x000001F4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1FC = .rodata:0x000001FC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x4 scope:local data:float +lbl_1_rodata_204 = .rodata:0x00000204; // type:object size:0x4 scope:local data:float +lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 scope:local data:float +lbl_1_rodata_20C = .rodata:0x0000020C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x4 scope:local data:float +lbl_1_rodata_214 = .rodata:0x00000214; // type:object size:0x4 scope:local data:float +lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x4 scope:local data:float +lbl_1_rodata_21C = .rodata:0x0000021C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x4 scope:local data:float +lbl_1_rodata_224 = .rodata:0x00000224; // type:object size:0x4 scope:local data:float +lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 scope:local data:float +lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x8 scope:local data:double +lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x8 scope:local data:double +lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x4 scope:local data:float +lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x8 scope:local data:double +lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x4 scope:local data:float +lbl_1_rodata_254 = .rodata:0x00000254; // type:object size:0x4 scope:local data:float +lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x4 scope:local data:float +lbl_1_rodata_25C = .rodata:0x0000025C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x38 scope:local data:4byte +lbl_1_data_0 = .data:0x00000000; // type:object size:0x22 scope:local data:string +lbl_1_data_22 = .data:0x00000022; // type:object size:0x8 lbl_1_data_2C = .data:0x0000002C; // type:object size:0x18 lbl_1_data_44 = .data:0x00000044; // type:object size:0x6 lbl_1_data_4A = .data:0x0000004A; // type:object size:0xC @@ -209,25 +209,25 @@ lbl_1_data_56 = .data:0x00000056; // type:object size:0xE data:wstring lbl_1_data_64 = .data:0x00000064; // type:object size:0x20 lbl_1_data_84 = .data:0x00000084; // type:object size:0x10 lbl_1_data_94 = .data:0x00000094; // type:object size:0xC -lbl_1_data_A0 = .data:0x000000A0; // type:object size:0xA data:string -lbl_1_data_AA = .data:0x000000AA; // type:object size:0x6 +lbl_1_data_A0 = .data:0x000000A0; // type:object size:0xA scope:local data:string +lbl_1_data_AA = .data:0x000000AA; // type:object size:0x6 scope:local lbl_1_data_B0 = .data:0x000000B0; // type:object size:0x4C8 -lbl_1_data_578 = .data:0x00000578; // type:object size:0x20 -lbl_1_data_598 = .data:0x00000598; // type:object size:0x20 -lbl_1_data_5B8 = .data:0x000005B8; // type:object size:0x3C data:string -lbl_1_data_5F4 = .data:0x000005F4; // type:object size:0x19 data:string -lbl_1_data_60D = .data:0x0000060D; // type:object size:0x1A data:string -lbl_1_data_627 = .data:0x00000627; // type:object size:0x3D -lbl_1_data_664 = .data:0x00000664; // type:object size:0x20 data:4byte -lbl_1_data_684 = .data:0x00000684; // type:object size:0x40 data:4byte -lbl_1_data_6C4 = .data:0x000006C4; // type:object size:0x70 -lbl_1_data_734 = .data:0x00000734; // type:object size:0x90 data:4byte -lbl_1_data_7C4 = .data:0x000007C4; // type:object size:0x20 -lbl_1_data_7E4 = .data:0x000007E4; // type:object size:0x8 data:4byte -lbl_1_data_7EC = .data:0x000007EC; // type:object size:0x10 -lbl_1_data_7FC = .data:0x000007FC; // type:object size:0x20 -lbl_1_data_81C = .data:0x0000081C; // type:object size:0x4 data:4byte -lbl_1_data_820 = .data:0x00000820; // type:object size:0x4 data:4byte +lbl_1_data_3C8 = .data:0x00000578; // type:object size:0x20 +lbl_1_data_3E8 = .data:0x00000598; // type:object size:0x20 +lbl_1_data_5B8 = .data:0x000005B8; // type:object size:0x3C scope:local data:string +lbl_1_data_5F4 = .data:0x000005F4; // type:object size:0x19 scope:local data:string +lbl_1_data_60D = .data:0x0000060D; // type:object size:0x1A scope:local data:string +lbl_1_data_627 = .data:0x00000627; // type:object size:0x3A scope:local data:string +lbl_1_data_4B4 = .data:0x00000664; // type:object size:0x20 data:4byte +lbl_1_data_4D4 = .data:0x00000684; // type:object size:0x40 data:4byte +lbl_1_data_514 = .data:0x000006C4; // type:object size:0x70 +lbl_1_data_584 = .data:0x00000734; // type:object size:0x90 data:4byte +lbl_1_data_614 = .data:0x000007C4; // type:object size:0x20 +lbl_1_data_634 = .data:0x000007E4; // type:object size:0x8 data:4byte +lbl_1_data_63C = .data:0x000007EC; // type:object size:0x10 +lbl_1_data_64C = .data:0x000007FC; // type:object size:0x20 +lbl_1_data_66C = .data:0x0000081C; // type:object size:0x4 data:4byte +lbl_1_data_670 = .data:0x00000820; // type:object size:0x4 data:4byte lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x2 data:2byte lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x2 data:2byte diff --git a/configure.py b/configure.py index 7cc762cb..2cde7dff 100644 --- a/configure.py +++ b/configure.py @@ -1540,9 +1540,9 @@ config.libs = [ Rel( "ztardll", objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/ztardll/main.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/ztardll/font.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/ztardll/select.c"), + Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/ztardll/main.c"), + Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/ztardll/font.c"), + Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/ztardll/select.c"), }, ), ] diff --git a/src/REL/ztardll/font.c b/src/REL/ztardll/font.c index fe081d17..9ee3d56c 100644 --- a/src/REL/ztardll/font.c +++ b/src/REL/ztardll/font.c @@ -1,8 +1,9 @@ -#include "game/sprite.h" #include "game/minigame_seq.h" +#include "game/sprite.h" #include "REL/ztardll.h" +#if VERSION_ENG s32 lbl_1_data_B0[0xC6] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x01), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x02), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x03), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x04), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x05), @@ -54,6 +55,33 @@ s32 lbl_1_data_B0[0xC6] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0B), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0C), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00) }; +#elif VERSION_PAL + +#else +s32 lbl_1_data_B0[0x132] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0x00150000, 0x00150001, 0x00150002, 0x00150003, 0x00150004, 0x00150005, 0x00150006, 0x00150007, 0x00150008, 0x00150009, + 0x0013000A, 0x0013000A, 0x0013000A, 0x0015000A, 0x0013000A, 0x0013000A, 0x0013000A, 0x00130014, 0x00130015, 0x00130016, 0x00130017, 0x00130018, + 0x00130019, 0x001500AE, 0x0013001B, 0x0013001C, 0x0013001D, 0x0013001E, 0x0013001F, 0x00130020, 0x00130021, 0x001500AF, 0x00130023, 0x00130024, + 0x00130025, 0x00130026, 0x00130027, 0x00130028, 0x00130029, 0x0013002A, 0x0013002B, 0x0013002C, 0x0013002D, 0x00130022, 0x00130022, 0x00130022, + 0x00130022, 0x00130022, 0x00130022, 0x0013002E, 0x0013002F, 0x00130030, 0x00130031, 0x00130032, 0x00130033, 0x00130034, 0x00130035, 0x00130036, + 0x00130037, 0x00130038, 0x00130039, 0x0013003A, 0x0013003B, 0x0013003C, 0x0013003D, 0x0013003E, 0x0013003F, 0x00130040, 0x00130041, 0x00130042, + 0x00130043, 0x00130044, 0x00130045, 0x00130046, 0x00130047, 0x0013000A, 0x0013000A, 0x0013000A, 0x0013000A, 0x0013000A, 0x0013000A, 0x0013000A, + 0x0013000A, 0x0013000A, 0x0015000A, 0x0013000A, 0x0015008A, 0x0015008C, 0x0015008D, 0x0015008E, 0x0015008F, 0x00150090, 0x00150091, 0x00150092, + 0x00150093, 0x00150094, 0x0013000A, 0x0015005E, 0x0015005F, 0x00150060, 0x00150061, 0x00150062, 0x00150063, 0x00150064, 0x00150065, 0x00150066, + 0x00150067, 0x00150068, 0x00150069, 0x0015006A, 0x0015006B, 0x0015006C, 0x0015006D, 0x0015006E, 0x0015006F, 0x00150070, 0x00150071, 0x00150072, + 0x00150073, 0x00150074, 0x00150075, 0x00150076, 0x00150077, 0x00150078, 0x00150079, 0x0015007A, 0x0015007B, 0x0015007C, 0x0015007D, 0x0015007E, + 0x0015007F, 0x00150080, 0x00150081, 0x00150082, 0x00150083, 0x00150084, 0x00150085, 0x00150086, 0x00150087, 0x00150088, 0x00150089, 0x0015008B, + 0x0013000A, 0x0013000A, 0x0013000A, 0x0013000A, 0x0015000B, 0x0015000C, 0x0013000A, 0x0013000A, 0x0015003A, 0x0015003C, 0x0015003D, 0x0015003E, + 0x0015003F, 0x00150040, 0x00150041, 0x00150042, 0x00150043, 0x00150044, 0x0013000A, 0x0015000E, 0x0015000F, 0x00150010, 0x00150011, 0x00150012, + 0x00150013, 0x00150014, 0x00150015, 0x00150016, 0x00150017, 0x00150018, 0x00150019, 0x0015001A, 0x0015001B, 0x0015001C, 0x0015001D, 0x0015001E, + 0x0015001F, 0x00150020, 0x00150021, 0x00150022, 0x00150023, 0x00150024, 0x00150025, 0x00150026, 0x00150027, 0x00150028, 0x00150029, 0x0015002A, + 0x0015002B, 0x0015002C, 0x0015002D, 0x0015002E, 0x0015002F, 0x00150030, 0x00150031, 0x00150032, 0x00150033, 0x00150034, 0x00150035, 0x00150036, + 0x00150037, 0x00150038, 0x00150039, 0x0015003B, 0x0013000A, 0x0013000A, 0x00150095, 0x00150096, 0x00150097, 0x00150098, 0x00150099, 0x0015009A, + 0x0015009B, 0x0015009C, 0x0015009D, 0x0015009E, 0x0015009F, 0x001500A0, 0x001500A1, 0x001500A2, 0x001500A3, 0x001500A4, 0x001500A5, 0x001500A6, + 0x001500A7, 0x001500A8, 0x001500A9, 0x001500AA, 0x001500AB, 0x001500AC, 0x001500AD, 0x00150045, 0x00150046, 0x00150047, 0x00150048, 0x00150049, + 0x0015004A, 0x0015004B, 0x0015004C, 0x0015004D, 0x0015004E, 0x0015004F, 0x00150050, 0x00150051, 0x00150052, 0x00150053, 0x00150054, 0x00150055, + 0x00150056, 0x00150057, 0x00150058, 0x00150059, 0x0015005A, 0x0015005B, 0x0015005C, 0x0015005D }; +#endif s32 fn_1_7754(SeqWork *work, char *mess) { @@ -84,7 +112,7 @@ s32 fn_1_7754(SeqWork *work, char *mess) var_r29 = HuMemDirectMalloc(HEAP_SYSTEM, 0xC8); for (var_r31 = mess, var_r30 = 0, var_r28 = 0; var_r31[0] != 0; var_r31++) { if (var_r31[0] == 0x20 || var_r31[0] == 0x10) { - var_r30 += 0xE; + var_r30 += VERSION_JP ? 0x1C : 0xE; } else if (var_r31[0] < 0x30) { } @@ -140,10 +168,12 @@ s32 fn_1_7754(SeqWork *work, char *mess) var_r29[var_r28] = 4; var_r30 += 0x18; } +#if !VERSION_JP else if ((var_r31[0] == 0x3D) || (var_r31[0] == 0x84)) { var_r29[var_r28] = 0; var_r30 += 0x14; } +#endif else { var_r29[var_r28] = 0; var_r30 += 0x1C; diff --git a/src/REL/ztardll/main.c b/src/REL/ztardll/main.c index 0c0b8ce0..462a3d62 100644 --- a/src/REL/ztardll/main.c +++ b/src/REL/ztardll/main.c @@ -763,7 +763,7 @@ void fn_1_33B0(void) var_r30 = HuSprCreate(var_r29, 0x64, mgBattleStarMax + 1); } HuSprGrpMemberSet(lbl_1_bss_50, 1, var_r30); - HuSprPosSet(lbl_1_bss_50, 1, 342.0f, 80.0f); + HuSprPosSet(lbl_1_bss_50, 1, VERSION_JP ? 234.0f : 342.0f, 80.0f); HuSprScaleSet(lbl_1_bss_50, 1, 0.0f, 0.0f); HuSprGrpDrawNoSet(lbl_1_bss_50, 0x7F); var_r29 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_ZTAR, 9)); @@ -1096,17 +1096,36 @@ void fn_1_4948(void) void fn_1_51BC(s16 arg0) { - omOvlHisData *var_r31; + s16 var_r31; + omOvlHisData *var_r30; + u32 var_r29; WipeColorSet(0xFF, 0xFF, 0xFF); - WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60); + WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 0x3C); HuAudSeqAllFadeOut(0x3E8); - while (WipeStatGet() != 0) { HuPrcVSleep(); } - var_r31 = omOvlHisGet(0); - omOvlHisChg(0, OVL_ZTAR, arg0, var_r31->stat); +#if VERSION_JP + if ((GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8)) { + msmMusStopAll(1, 0); + msmSeStopAll(1, 0); + var_r29 = OSGetTick(); + while (TRUE) { + if ((msmMusGetNumPlay(1) != 0) || (msmSeGetNumPlay(1) != 0)) { + if (((OSGetTick() - var_r29) / (*((u32 *)0x800000F8) / 4 / 1000)) >= 0x1F4) { + break; + } + } + else { + break; + } + } + msmSysDelGroupBase(0); + } +#endif + var_r30 = omOvlHisGet(0); + omOvlHisChg(0, OVL_ZTAR, arg0, var_r30->stat); omOvlCallEx(OVL_M433, 1, 0, 0); while (TRUE) { HuPrcVSleep(); diff --git a/src/REL/ztardll/select.c b/src/REL/ztardll/select.c index b092f9b5..e8de9216 100644 --- a/src/REL/ztardll/select.c +++ b/src/REL/ztardll/select.c @@ -3028,6 +3028,12 @@ void fn_1_114EC(u32 arg0, s32 arg1) s32 var_r29; s32 var_r28; +#if VERSION_JP + if (lbl_1_data_670 != -1) { + HuWinMesSet(lbl_1_data_670, arg0); + return; + } +#endif HuWinMesMaxSizeGet(1, spC, arg0); var_r29 = spC[0]; var_r31 = spC[1]; @@ -3038,6 +3044,9 @@ void fn_1_114EC(u32 arg0, s32 arg1) else { var_r30 = 0x181 - var_r31; } +#if VERSION_JP + lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r30, var_r29, var_r31, -1, 1); +#else if (lbl_1_data_670 != -1) { fn_1_1190C(); lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r30, var_r29, var_r31, -1, 1); @@ -3045,6 +3054,7 @@ void fn_1_114EC(u32 arg0, s32 arg1) else { lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r30, var_r29, var_r31, -1, 1); } +#endif HuWinBGTPLvlSet(lbl_1_data_670, 0.0f); HuWinDispOn(lbl_1_data_670); HuWinMesSet(lbl_1_data_670, arg0); @@ -3059,11 +3069,21 @@ void fn_1_11708(u32 arg0) s32 var_r29; s32 var_r28; +#if VERSION_JP + if (lbl_1_data_670 != -1) { + HuWinMesSet(lbl_1_data_670, arg0); + return; + } +#endif HuWinMesMaxSizeGet(1, sp8, arg0); var_r30 = sp8[0]; var_r31 = sp8[1]; var_r28 = (0x240 - var_r30) / 2.0f; var_r29 = 0x181 - var_r31; +#if VERSION_JP + lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r29, var_r30, var_r31, -1, 1); + (void)var_r29; +#else if (lbl_1_data_670 != -1) { fn_1_1190C(); lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r29, var_r30, var_r31, -1, 1); @@ -3071,6 +3091,7 @@ void fn_1_11708(u32 arg0) else { lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r29, var_r30, var_r31, -1, 1); } +#endif HuWinBGTPLvlSet(lbl_1_data_670, 0.0f); HuWinDispOn(lbl_1_data_670); HuWinMesSet(lbl_1_data_670, arg0);