From 55901c10203725994ff5e9bfc17229aea16abb78 Mon Sep 17 00:00:00 2001 From: dbalatoni13 Date: Sun, 15 Dec 2024 23:14:45 +0100 Subject: [PATCH] Port ztardll to PAL --- config/GMPP01_00/rels/ztardll/symbols.txt | 415 +++++++++++----------- configure.py | 6 +- src/REL/ztardll/font.c | 70 +++- src/REL/ztardll/main.c | 17 +- 4 files changed, 294 insertions(+), 214 deletions(-) diff --git a/config/GMPP01_00/rels/ztardll/symbols.txt b/config/GMPP01_00/rels/ztardll/symbols.txt index acceedbe..3ccb8483 100644 --- a/config/GMPP01_00/rels/ztardll/symbols.txt +++ b/config/GMPP01_00/rels/ztardll/symbols.txt @@ -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:0x194 -fn_1_5350 = .text:0x00005350; // type:function size:0x14BC -fn_1_680C = .text:0x0000680C; // type:function size:0x140 -fn_1_694C = .text:0x0000694C; // type:function size:0xC10 -fn_1_755C = .text:0x0000755C; // type:function size:0x340 -fn_1_789C = .text:0x0000789C; // type:function size:0x3A4 -fn_1_7C40 = .text:0x00007C40; // type:function size:0x16C -fn_1_7DAC = .text:0x00007DAC; // type:function size:0xA0 -fn_1_7E4C = .text:0x00007E4C; // type:function size:0x224 -fn_1_8070 = .text:0x00008070; // type:function size:0x2DC -fn_1_834C = .text:0x0000834C; // type:function size:0x2C -fn_1_8378 = .text:0x00008378; // type:function size:0x518 -fn_1_8890 = .text:0x00008890; // type:function size:0x2C -fn_1_88BC = .text:0x000088BC; // type:function size:0x28 -fn_1_88E4 = .text:0x000088E4; // type:function size:0x274 -fn_1_8B58 = .text:0x00008B58; // type:function size:0x2C -fn_1_8B84 = .text:0x00008B84; // type:function size:0x2C -fn_1_8BB0 = .text:0x00008BB0; // type:function size:0x24 -fn_1_8BD4 = .text:0x00008BD4; // type:function size:0x2BC -fn_1_8E90 = .text:0x00008E90; // type:function size:0x500 -fn_1_9390 = .text:0x00009390; // type:function size:0x480 -fn_1_9810 = .text:0x00009810; // type:function size:0x80C -fn_1_A01C = .text:0x0000A01C; // type:function size:0x28 -fn_1_A044 = .text:0x0000A044; // type:function size:0x28 -fn_1_A06C = .text:0x0000A06C; // type:function size:0x21C -fn_1_A288 = .text:0x0000A288; // type:function size:0x194 -fn_1_A41C = .text:0x0000A41C; // type:function size:0x198 -fn_1_A5B4 = .text:0x0000A5B4; // type:function size:0x9C -fn_1_A650 = .text:0x0000A650; // type:function size:0x2D8 -fn_1_A928 = .text:0x0000A928; // type:function size:0x2DC -fn_1_AC04 = .text:0x0000AC04; // type:function size:0x1E0 -fn_1_ADE4 = .text:0x0000ADE4; // type:function size:0xF0 -fn_1_AED4 = .text:0x0000AED4; // type:function size:0x50 -fn_1_AF24 = .text:0x0000AF24; // type:function size:0x584 -fn_1_B4A8 = .text:0x0000B4A8; // type:function size:0x5D8 -fn_1_BA80 = .text:0x0000BA80; // type:function size:0x33C -fn_1_BDBC = .text:0x0000BDBC; // type:function size:0x274 -fn_1_C030 = .text:0x0000C030; // type:function size:0x7C -fn_1_C0AC = .text:0x0000C0AC; // type:function size:0x44C -fn_1_C4F8 = .text:0x0000C4F8; // type:function size:0x434 -fn_1_C92C = .text:0x0000C92C; // type:function size:0x204 -fn_1_CB30 = .text:0x0000CB30; // type:function size:0x790 -fn_1_D2C0 = .text:0x0000D2C0; // type:function size:0xB0C -fn_1_DDCC = .text:0x0000DDCC; // type:function size:0x720 -fn_1_E4EC = .text:0x0000E4EC; // type:function size:0x9C -fn_1_E588 = .text:0x0000E588; // type:function size:0xCCC -fn_1_F254 = .text:0x0000F254; // type:function size:0x924 -fn_1_FB78 = .text:0x0000FB78; // type:function size:0x258 -fn_1_FDD0 = .text:0x0000FDD0; // type:function size:0x958 -fn_1_10728 = .text:0x00010728; // type:function size:0x7C -fn_1_107A4 = .text:0x000107A4; // type:function size:0x164 -fn_1_10908 = .text:0x00010908; // type:function size:0x1B8 -fn_1_10AC0 = .text:0x00010AC0; // type:function size:0xA4 -fn_1_10B64 = .text:0x00010B64; // type:function size:0xF4 -fn_1_10C58 = .text:0x00010C58; // type:function size:0x80 -fn_1_10CD8 = .text:0x00010CD8; // type:function size:0x80 -fn_1_10D58 = .text:0x00010D58; // type:function size:0x28 -fn_1_10D80 = .text:0x00010D80; // type:function size:0x20 -fn_1_10DA0 = .text:0x00010DA0; // type:function size:0xD8 -fn_1_10E78 = .text:0x00010E78; // type:function size:0xC8 -fn_1_10F40 = .text:0x00010F40; // type:function size:0xBC -fn_1_10FFC = .text:0x00010FFC; // type:function size:0x40 -fn_1_1103C = .text:0x0001103C; // type:function size:0x24 -fn_1_11060 = .text:0x00011060; // type:function size:0x1C0 -fn_1_11220 = .text:0x00011220; // type:function size:0x84 -fn_1_112A4 = .text:0x000112A4; // type:function size:0xD4 -fn_1_11378 = .text:0x00011378; // type:function size:0x58 -fn_1_113D0 = .text:0x000113D0; // type:function size:0x15C -fn_1_1152C = .text:0x0001152C; // type:function size:0x21C -fn_1_11748 = .text:0x00011748; // type:function size:0x204 -fn_1_1194C = .text:0x0001194C; // type:function size:0x54 -fn_1_119A0 = .text:0x000119A0; // type:function size:0x304 -fn_1_11CA4 = .text:0x00011CA4; // type:function size:0x304 -fn_1_11FA8 = .text:0x00011FA8; // type:function size:0x340 -fn_1_122E8 = .text:0x000122E8; // type:function size:0xC4 +fn_1_524C = .text:0x00005350; // type:function size:0x14BC +fn_1_66F8 = .text:0x0000680C; // type:function size:0x140 +fn_1_6804 = .text:0x0000694C; // type:function size:0xC10 +fn_1_7414 = .text:0x0000755C; // type:function size:0x340 +fn_1_7754 = .text:0x0000789C; // type:function size:0x3A4 +fn_1_7C00 = .text:0x00007C40; // type:function size:0x16C +fn_1_7D6C = .text:0x00007DAC; // type:function size:0xA0 +fn_1_7E0C = .text:0x00007E4C; // type:function size:0x224 +fn_1_8030 = .text:0x00008070; // type:function size:0x2DC +fn_1_830C = .text:0x0000834C; // type:function size:0x2C +fn_1_8338 = .text:0x00008378; // type:function size:0x518 +fn_1_8850 = .text:0x00008890; // type:function size:0x2C +fn_1_887C = .text:0x000088BC; // type:function size:0x28 +fn_1_88A4 = .text:0x000088E4; // type:function size:0x274 +fn_1_8B18 = .text:0x00008B58; // type:function size:0x2C +fn_1_8B44 = .text:0x00008B84; // type:function size:0x2C +fn_1_8B70 = .text:0x00008BB0; // type:function size:0x24 +fn_1_8B94 = .text:0x00008BD4; // type:function size:0x2BC +fn_1_8E50 = .text:0x00008E90; // type:function size:0x500 +fn_1_9350 = .text:0x00009390; // type:function size:0x480 +fn_1_97D0 = .text:0x00009810; // type:function size:0x80C +fn_1_9FDC = .text:0x0000A01C; // type:function size:0x28 +fn_1_A004 = .text:0x0000A044; // type:function size:0x28 +fn_1_A02C = .text:0x0000A06C; // type:function size:0x21C +fn_1_A248 = .text:0x0000A288; // type:function size:0x194 +fn_1_A3DC = .text:0x0000A41C; // type:function size:0x198 +fn_1_A574 = .text:0x0000A5B4; // type:function size:0x9C +fn_1_A610 = .text:0x0000A650; // type:function size:0x2D8 +fn_1_A8E8 = .text:0x0000A928; // type:function size:0x2DC +fn_1_ABC4 = .text:0x0000AC04; // type:function size:0x1E0 +fn_1_ADA4 = .text:0x0000ADE4; // type:function size:0xF0 +fn_1_AE94 = .text:0x0000AED4; // type:function size:0x50 +fn_1_AEE4 = .text:0x0000AF24; // type:function size:0x584 +fn_1_B468 = .text:0x0000B4A8; // type:function size:0x5D8 +fn_1_BA40 = .text:0x0000BA80; // type:function size:0x33C +fn_1_BD7C = .text:0x0000BDBC; // type:function size:0x274 +fn_1_BFF0 = .text:0x0000C030; // type:function size:0x7C +fn_1_C06C = .text:0x0000C0AC; // type:function size:0x44C +fn_1_C4B8 = .text:0x0000C4F8; // type:function size:0x434 +fn_1_C8EC = .text:0x0000C92C; // type:function size:0x204 +fn_1_CAF0 = .text:0x0000CB30; // type:function size:0x790 +fn_1_D280 = .text:0x0000D2C0; // type:function size:0xB0C +fn_1_DD8C = .text:0x0000DDCC; // type:function size:0x720 +fn_1_E4AC = .text:0x0000E4EC; // type:function size:0x9C +fn_1_E548 = .text:0x0000E588; // type:function size:0xCCC +fn_1_F214 = .text:0x0000F254; // type:function size:0x924 +fn_1_FB38 = .text:0x0000FB78; // type:function size:0x258 +fn_1_FD90 = .text:0x0000FDD0; // type:function size:0x958 +fn_1_106E8 = .text:0x00010728; // type:function size:0x7C +fn_1_10764 = .text:0x000107A4; // type:function size:0x164 +fn_1_108C8 = .text:0x00010908; // type:function size:0x1B8 +fn_1_10A80 = .text:0x00010AC0; // type:function size:0xA4 +fn_1_10B24 = .text:0x00010B64; // type:function size:0xF4 +fn_1_10C18 = .text:0x00010C58; // type:function size:0x80 +fn_1_10C98 = .text:0x00010CD8; // type:function size:0x80 +fn_1_10D18 = .text:0x00010D58; // type:function size:0x28 +fn_1_10D40 = .text:0x00010D80; // type:function size:0x20 +fn_1_10D60 = .text:0x00010DA0; // type:function size:0xD8 +fn_1_10E38 = .text:0x00010E78; // type:function size:0xC8 +fn_1_10F00 = .text:0x00010F40; // type:function size:0xBC +fn_1_10FBC = .text:0x00010FFC; // type:function size:0x40 +fn_1_10FFC = .text:0x0001103C; // type:function size:0x24 +fn_1_11020 = .text:0x00011060; // type:function size:0x1C0 +fn_1_111E0 = .text:0x00011220; // type:function size:0x84 +fn_1_11264 = .text:0x000112A4; // type:function size:0xD4 +fn_1_11338 = .text:0x00011378; // type:function size:0x58 +fn_1_11390 = .text:0x000113D0; // type:function size:0x15C +fn_1_114EC = .text:0x0001152C; // type:function size:0x21C +fn_1_11708 = .text:0x00011748; // type:function size:0x204 +fn_1_1190C = .text:0x0001194C; // type:function size:0x54 +fn_1_11960 = .text:0x000119A0; // type:function size:0x304 +fn_1_11C64 = .text:0x00011CA4; // type:function size:0x304 +fn_1_11F68 = .text:0x00011FA8; // type:function size:0x340 +fn_1_122A8 = .text:0x000122E8; // 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:0x4 data:float -lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x8 data:double -lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 data:float -lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 data:float -lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 data:float -lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x8 data:double -lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 data:float -lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x8 data:double -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:0x4 data:float -lbl_1_rodata_234 = .rodata:0x00000234; // type:object size:0x4 data:float -lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x8 data:double -lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x8 data:double -lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x4 data:float -lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x8 data:double -lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x4 data:float -lbl_1_rodata_25C = .rodata:0x0000025C; // type:object size:0x4 data:float -lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x4 data:float -lbl_1_rodata_264 = .rodata:0x00000264; // type:object size:0x4 data:float -lbl_1_rodata_268 = .rodata:0x00000268; // type:object size:0x38 data:4byte -lbl_1_data_0 = .data:0x00000000; // type:object size:0x22 data:string +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:0x4 scope:local data:float +lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x8 scope:local data:double +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:0x4 scope:local data:float +lbl_1_rodata_234 = .rodata:0x00000234; // type:object size:0x4 scope:local data:float +lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x8 scope:local data:double +lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x8 scope:local data:double +lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x4 scope:local data:float +lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x8 scope:local data:double +lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x4 scope:local data:float +lbl_1_rodata_25C = .rodata:0x0000025C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x4 scope:local data:float +lbl_1_rodata_264 = .rodata:0x00000264; // type:object size:0x4 scope:local data:float +lbl_1_rodata_268 = .rodata:0x00000268; // type:object size: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:0xA lbl_1_data_2C = .data:0x0000002C; // type:object size:0x18 lbl_1_data_44 = .data:0x00000044; // type:object size:0x6 @@ -210,25 +210,26 @@ 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:0x4C0 -lbl_1_data_570 = .data:0x00000570; // type:object size:0x20 -lbl_1_data_590 = .data:0x00000590; // type:object size:0x20 -lbl_1_data_5B0 = .data:0x000005B0; // type:object size:0x3C data:string -lbl_1_data_5EC = .data:0x000005EC; // type:object size:0x19 data:string -lbl_1_data_605 = .data:0x00000605; // type:object size:0x1A data:string -lbl_1_data_61F = .data:0x0000061F; // type:object size:0x3D -lbl_1_data_65C = .data:0x0000065C; // type:object size:0x20 data:4byte -lbl_1_data_67C = .data:0x0000067C; // type:object size:0x40 data:4byte -lbl_1_data_6BC = .data:0x000006BC; // type:object size:0x70 -lbl_1_data_72C = .data:0x0000072C; // type:object size:0x90 data:4byte -lbl_1_data_7BC = .data:0x000007BC; // type:object size:0x20 -lbl_1_data_7DC = .data:0x000007DC; // type:object size:0x8 data:4byte -lbl_1_data_7E4 = .data:0x000007E4; // type:object size:0x10 -lbl_1_data_7F4 = .data:0x000007F4; // type:object size:0x20 -lbl_1_data_814 = .data:0x00000814; // type:object size:0x4 data:4byte -lbl_1_data_818 = .data:0x00000818; // type:object size:0x4 data:4byte +lbl_1_data_3C8 = .data:0x00000570; // type:object size:0x20 +lbl_1_data_3E8 = .data:0x00000590; // type:object size:0x20 +lbl_1_data_5B0 = .data:0x000005B0; // type:object size:0x3C scope:local data:string +lbl_1_data_5EC = .data:0x000005EC; // type:object size:0x19 scope:local data:string +lbl_1_data_605 = .data:0x00000605; // type:object size:0x1A scope:local data:string +lbl_1_data_61F = .data:0x0000061F; // type:object size:0x3D scope:local +lbl_1_data_4B4 = .data:0x0000065C; // type:object size:0x20 data:4byte +lbl_1_data_4D4 = .data:0x0000067C; // type:object size:0x40 data:4byte +lbl_1_data_514 = .data:0x000006BC; // type:object size:0x70 +lbl_1_data_584 = .data:0x0000072C; // type:object size:0x90 data:4byte +lbl_1_data_614 = .data:0x000007BC; // type:object size:0x20 +lbl_1_data_634 = .data:0x000007DC; // type:object size:0x8 data:4byte +lbl_1_data_63C = .data:0x000007E4; // type:object size:0x10 +lbl_1_data_64C = .data:0x000007F4; // type:object size:0x20 +lbl_1_data_66C = .data:0x00000814; // type:object size:0x4 data:4byte +lbl_1_data_670 = .data:0x00000818; // type:object size:0x4 data:4byte +lbl_1_bss_0 = .bss:0x00000000; // 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 2cde7dff..4e80312b 100644 --- a/configure.py +++ b/configure.py @@ -1540,9 +1540,9 @@ config.libs = [ Rel( "ztardll", objects={ - 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"), + Object(Matching, "REL/ztardll/main.c"), + Object(Matching, "REL/ztardll/font.c"), + Object(Matching, "REL/ztardll/select.c"), }, ), ] diff --git a/src/REL/ztardll/font.c b/src/REL/ztardll/font.c index 9ee3d56c..8dbfe634 100644 --- a/src/REL/ztardll/font.c +++ b/src/REL/ztardll/font.c @@ -56,10 +56,32 @@ 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, 0x0B), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0C), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00) }; #elif VERSION_PAL - +s32 lbl_1_data_B0[0x130] = { 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, 0x00140025, 0x00140026, 0x00140027, 0x00140028, 0x00140029, 0x0014002A, 0x0014002B, 0x0014002C, 0x0014002D, 0x0014002E, + 0x00140025, 0x00140025, 0x00140025, 0x0014002F, 0x00140025, 0x00140025, 0x00140025, 0x00140035, 0x00140036, 0x00140037, 0x00140038, 0x00140039, + 0x0014003A, 0x0014003B, 0x0014003C, 0x0014003D, 0x0014003E, 0x0014003F, 0x00140040, 0x00140041, 0x00140042, 0x00140043, 0x00140044, 0x00140045, + 0x00140046, 0x00140047, 0x00140048, 0x00140049, 0x0014004A, 0x0014004B, 0x0014004C, 0x0014004D, 0x0014004E, 0x00140043, 0x00140032, 0x00140043, + 0x00140043, 0x00140043, 0x00140043, 0x0014004F, 0x00140050, 0x00140051, 0x00140052, 0x00140053, 0x00140054, 0x00140055, 0x00140056, 0x00140057, + 0x00140058, 0x00140059, 0x0014005A, 0x0014005B, 0x0014005C, 0x0014005D, 0x0014005E, 0x0014005F, 0x00140060, 0x00140061, 0x00140062, 0x00140063, + 0x00140064, 0x00140065, 0x00140066, 0x00140067, 0x00140068, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x0014002F, 0x00140033, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x00140025, 0x00140069, 0x0014006A, 0x0014006B, 0x0014006C, 0x0014006D, 0x0014006E, 0x0014006F, 0x00140070, 0x00140071, + 0x00140072, 0x00140073, 0x00140074, 0x00140075, 0x00140076, 0x00140077, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140030, 0x00140031, 0x00140025, 0x00140025, 0x0014008F, 0x0014008E, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140078, 0x00140079, 0x0014007A, 0x0014007B, 0x0014007C, + 0x0014007D, 0x0014007E, 0x0014007F, 0x00140080, 0x00140081, 0x00140082, 0x00140083, 0x00140084, 0x00140085, 0x00140086, 0x00140087, 0x00140088, + 0x00140089, 0x0014008A, 0x0014008B, 0x0014008C, 0x0014008D, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, + 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025 }; #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, +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, @@ -97,6 +119,7 @@ s32 fn_1_7754(SeqWork *work, char *mess) AnimData **var_r21; s16 var_r20; s16 var_r19; + s32 var_r19_2; var_r27 = lbl_1_data_B0; for (var_r25 = 0; var_r25 < 0x10; var_r25++) { @@ -114,6 +137,46 @@ s32 fn_1_7754(SeqWork *work, char *mess) if (var_r31[0] == 0x20 || var_r31[0] == 0x10) { var_r30 += VERSION_JP ? 0x1C : 0xE; } +#if VERSION_PAL + else if (*var_r31 >= 0x30) { + var_r19_2 = var_r27[*var_r31]; + var_r21[var_r28] = HuSprAnimReadFile(var_r19_2); + var_r22[var_r28] = var_r30; + if ((*var_r31 >= 0x61) && (*var_r31 <= 0x7A)) { + var_r29[var_r28] = 2; + var_r30 += 0x12; + } + else if ((*var_r31 == 0xC2) || (*var_r31 == 0xC3) || (*var_r31 == 0xC7)) { + var_r29[var_r28] = 0; + var_r30 += 0x12; + } + else if (*var_r31 == 0xC6) { + var_r29[var_r28] = 0; + var_r30 += 0x18; + } + else if (*var_r31 == 0x5C) { + var_r29[var_r28] = 0; + var_r30 += 8; + } + else if ((*var_r31 >= 0x90) && (*var_r31 <= 0x9F)) { + var_r29[var_r28] = -2; + var_r30 += 0x18; + } + else if ((*var_r31 >= 0xD0) && (*var_r31 <= 0xEF)) { + var_r29[var_r28] = -2; + var_r30 += 0x12; + } + else if ((*var_r31 == 0x3D) || (*var_r31 == 0x84)) { + var_r29[var_r28] = 0; + var_r30 += 0x14; + } + else { + var_r29[var_r28] = 0; + var_r30 += 0x1C; + } + var_r28++; + } +#else else if (var_r31[0] < 0x30) { } else if (var_r31[0] == 0x80) { @@ -180,6 +243,7 @@ s32 fn_1_7754(SeqWork *work, char *mess) } var_r28++; } +#endif } var_r20 = HuSprGrpCreate(var_r28); work->spr_grp[var_r25] = var_r20; diff --git a/src/REL/ztardll/main.c b/src/REL/ztardll/main.c index 462a3d62..e1e91168 100644 --- a/src/REL/ztardll/main.c +++ b/src/REL/ztardll/main.c @@ -13,6 +13,8 @@ #include "REL/ztardll.h" +extern s32 charVoiceGroupStat[8]; + void fn_1_1774(void); void fn_1_1CF0(void); void fn_1_1DA0(void); @@ -1106,7 +1108,7 @@ void fn_1_51BC(s16 arg0) while (WipeStatGet() != 0) { HuPrcVSleep(); } -#if VERSION_JP +#if !VERSION_ENG if ((GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8)) { msmMusStopAll(1, 0); msmSeStopAll(1, 0); @@ -1122,6 +1124,11 @@ void fn_1_51BC(s16 arg0) } } msmSysDelGroupBase(0); +#if VERSION_PAL + for (var_r31 = 0; var_r31 < 8; var_r31++) { + charVoiceGroupStat[var_r31] = 0; + } +#endif } #endif var_r30 = omOvlHisGet(0); @@ -1258,6 +1265,9 @@ s32 fn_1_524C(s32 arg0) var_r22 = &winData[var_r24]; HuWinPriSet(var_r24, 5); HuWinPosSet(var_r24, (576.0f - var_r22->w) / 2, 300.0f); +#if VERSION_PAL + HuWinScaleSet(var_r24, 0.95f, 1.0f); +#endif HuWinAttrSet(var_r24, 0x800); var_r30 = 0; var_r23 = 0; @@ -1419,6 +1429,11 @@ void fn_1_66F8(void) for (var_r31 = 0; var_r31 < 4; var_r31++) { GWPlayerCfg[var_r31].character = -1; } +#if VERSION_PAL + for (var_r31 = 0; var_r31 < 8; var_r31++) { + charVoiceGroupStat[var_r31] = 0; + } +#endif mgPracticeEnableF = 0; omOvlReturnEx(1, 1); HuPrcEnd();