From 36badcfdb1c37028bb0385f7ca2bbc7d20fc95a0 Mon Sep 17 00:00:00 2001 From: robojumper Date: Fri, 22 Nov 2024 21:49:46 +0100 Subject: [PATCH] Split out d_carry (for vtable alignment) --- config/SOUE01/splits.txt | 8 ++++++-- configure.py | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 9ef4c36b..479d64a7 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -70,9 +70,13 @@ d/d_base.cpp: .data start:0x80503380 end:0x805033D0 .sbss start:0x805750C0 end:0x805750CC +d/d_carry.cpp: + .text start:0x80050A20 end:0x80051C00 + .data start:0x805033D0 end:0x805033E0 + d/d_cc.cpp: - .text start:0x80050A20 end:0x800520F0 - .data start:0x805033D0 end:0x805033F0 + .text start:0x80051C00 end:0x800520F0 + .data start:0x805033E0 end:0x805033F0 d/d_dvd.cpp: .text start:0x800520F0 end:0x800522FC diff --git a/configure.py b/configure.py index 9044d9bd..bb06f8a6 100644 --- a/configure.py +++ b/configure.py @@ -314,7 +314,8 @@ config.libs = [ Object(Matching, "d/flag/flag_managers.cpp"), Object(NonMatching, "toBeSorted/special_item_drop_mgr.cpp"), Object(Matching, "d/d_base.cpp"), - Object(NonMatching, "d/d_cc.cpp"), + Object(NonMatching, "d/d_carry.cpp"), + Object(Matching, "d/d_cc.cpp"), Object(Matching, "d/d_dvd.cpp"), Object(NonMatching, "d/d_dvd_unk.cpp"), Object(NonMatching, "d/d_dylink.cpp"),