From 4d96369b64ba9df4911919995dadc6fbb83fb2d0 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Tue, 2 Apr 2024 22:04:34 -0500 Subject: [PATCH] Clean up some splits --- config/GMPE01_00/rels/modeseldll/splits.txt | 3 ++- config/GMPE01_00/rels/modeseldll/symbols.txt | 3 ++- config/GMPE01_00/rels/resultDll/splits.txt | 6 +++--- config/GMPE01_00/rels/resultDll/symbols.txt | 4 +++- include/game/gamework_data.h | 1 - 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/config/GMPE01_00/rels/modeseldll/splits.txt b/config/GMPE01_00/rels/modeseldll/splits.txt index 36609413..ca14d3ce 100644 --- a/config/GMPE01_00/rels/modeseldll/splits.txt +++ b/config/GMPE01_00/rels/modeseldll/splits.txt @@ -25,9 +25,10 @@ REL/modeseldll/filesel.c: .text start:0x000037DC end:0x0000BED8 .rodata start:0x000001B0 end:0x00000318 .data start:0x00000100 end:0x00000428 - .bss start:0x00000088 end:0x000001CA + .bss start:0x00000088 end:0x00000150 REL/modeseldll/datalist.c: .text start:0x0000BED8 end:0x0000C334 .rodata start:0x00000318 end:0x00000328 .data start:0x00000428 end:0x00000A2C + .bss start:0x00000150 end:0x000001CA diff --git a/config/GMPE01_00/rels/modeseldll/symbols.txt b/config/GMPE01_00/rels/modeseldll/symbols.txt index 31d88edd..bc128524 100644 --- a/config/GMPE01_00/rels/modeseldll/symbols.txt +++ b/config/GMPE01_00/rels/modeseldll/symbols.txt @@ -263,7 +263,8 @@ lbl_1_bss_13A = .bss:0x0000013A; // type:object size:0x6 lbl_1_bss_140 = .bss:0x00000140; // type:object size:0x6 lbl_1_bss_146 = .bss:0x00000146; // type:object size:0x2 data:2byte lbl_1_bss_148 = .bss:0x00000148; // type:object size:0x2 data:2byte -lbl_1_bss_14C = .bss:0x0000014C; // type:object size:0x6 +lbl_1_bss_14C = .bss:0x0000014C; // type:object size:0x4 data:4byte +lbl_1_bss_150 = .bss:0x00000150; // type:object size:0x2 lbl_1_bss_152 = .bss:0x00000152; // type:object size:0x18 data:2byte lbl_1_bss_16A = .bss:0x0000016A; // type:object size:0x30 data:2byte lbl_1_bss_19A = .bss:0x0000019A; // type:object size:0x30 data:2byte diff --git a/config/GMPE01_00/rels/resultDll/splits.txt b/config/GMPE01_00/rels/resultDll/splits.txt index e3323be0..a2f15b2b 100644 --- a/config/GMPE01_00/rels/resultDll/splits.txt +++ b/config/GMPE01_00/rels/resultDll/splits.txt @@ -18,10 +18,10 @@ REL/resultDll/main.c: REL/resultDll/battle.c: .text start:0x00006490 end:0x00008FF8 .rodata start:0x00000160 end:0x00000220 - .data start:0x000004E8 end:0x000008B8 - .bss start:0x00000190 end:0x00001ADC + .data start:0x000004E8 end:0x00000918 + .bss start:0x00000190 end:0x00001A18 REL/resultDll/datalist.c: .text start:0x00008FF8 end:0x0000942C .rodata start:0x00000220 end:0x00000230 - .data start:0x000008B8 end:0x00000918 + .bss start:0x00001A18 end:0x00001ADC diff --git a/config/GMPE01_00/rels/resultDll/symbols.txt b/config/GMPE01_00/rels/resultDll/symbols.txt index 28077d73..85f1fdb6 100644 --- a/config/GMPE01_00/rels/resultDll/symbols.txt +++ b/config/GMPE01_00/rels/resultDll/symbols.txt @@ -198,7 +198,9 @@ lbl_1_bss_19B0 = .bss:0x000019B0; // type:object size:0x8 lbl_1_bss_19B8 = .bss:0x000019B8; // type:object size:0x28 lbl_1_bss_19E0 = .bss:0x000019E0; // type:object size:0x8 lbl_1_bss_19E8 = .bss:0x000019E8; // type:object size:0x8 -lbl_1_bss_19F0 = .bss:0x000019F0; // type:object size:0x2A +lbl_1_bss_19F0 = .bss:0x000019F0; // type:object size:0x8 +lbl_1_bss_19F8 = .bss:0x000019F8; // type:object size:0x20 +lbl_1_bss_1A18 = .bss:0x00001A18; // type:object size:0x2 lbl_1_bss_1A1A = .bss:0x00001A1A; // type:object size:0x42 data:2byte lbl_1_bss_1A5C = .bss:0x00001A5C; // type:object size:0x40 data:2byte lbl_1_bss_1A9C = .bss:0x00001A9C; // type:object size:0x40 data:2byte diff --git a/include/game/gamework_data.h b/include/game/gamework_data.h index cf87373b..fa11d647 100644 --- a/include/game/gamework_data.h +++ b/include/game/gamework_data.h @@ -254,7 +254,6 @@ static inline void GWPlayerCoinWinSet(s32 player, s16 value) if (_CheckFlag(0x1000C) == 0) { GWPlayer[player].coin_win = value; } - } #endif