From 86f2743b348bdafb9ef654a98595d9f575dec98c Mon Sep 17 00:00:00 2001 From: Yanis002 <35189056+Yanis002@users.noreply.github.com> Date: Sun, 20 Jul 2025 01:26:30 +0200 Subject: [PATCH] make jp build OK and port delinks from eur --- config/eur/arm9/delinks.txt | 10 +++++----- config/jp/arm9/delinks.txt | 10 ++++++++++ config/jp/arm9/overlays/ov000/relocs.txt | 8 ++++---- config/jp/arm9/symbols.txt | 10 +++++----- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 20b2c386..221c7fa9 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -7,13 +7,13 @@ .data start:0x02043220 end:0x02044dc0 kind:data align:32 .bss start:0x02044dc0 end:0x02051ae0 kind:bss align:32 -libs/cpp/src/__register_global_object.c: - complete - .text start:0x0203ce74 end:0x0203ce94 - .bss start:0x02051ad4 end:0x02051ad8 - src/Main/Main.cpp: .text start:0x02000800 end:0x02000bdc src/Main/System/OverlayManager.cpp: .text start:0x020147fc end:0x02014944 + +libs/cpp/src/__register_global_object.c: + complete + .text start:0x0203ce74 end:0x0203ce94 + .bss start:0x02051ad4 end:0x02051ad8 diff --git a/config/jp/arm9/delinks.txt b/config/jp/arm9/delinks.txt index 7e3c7e5c..c4cc517f 100644 --- a/config/jp/arm9/delinks.txt +++ b/config/jp/arm9/delinks.txt @@ -7,3 +7,13 @@ .data start:0x02044780 end:0x02046340 kind:data align:32 .bss start:0x02046340 end:0x02053060 kind:bss align:32 +src/Main/Main.cpp: + .text start:0x02000800 end:0x02000bdc + +src/Main/System/OverlayManager.cpp: + .text start:0x02014800 end:0x02014948 + +libs/cpp/src/__register_global_object.c: + complete + .text start:0x0203e3a4 end:0x0203e3c4 + .bss start:0x02053054 end:0x02053058 diff --git a/config/jp/arm9/overlays/ov000/relocs.txt b/config/jp/arm9/overlays/ov000/relocs.txt index 276c6a63..498efda4 100644 --- a/config/jp/arm9/overlays/ov000/relocs.txt +++ b/config/jp/arm9/overlays/ov000/relocs.txt @@ -1870,7 +1870,7 @@ from:0x02069014 kind:arm_call to:0x02068fc8 module:overlay(0) from:0x0206907c kind:arm_call to:0x02068b18 module:overlay(0) from:0x020690ec kind:arm_call to:0x02068da0 module:overlay(0) from:0x020690f4 kind:load to:0x020b38e4 module:overlay(0) -from:0x020690f8 kind:load to:0x021847c0 module:overlays(97,100) +from:0x020690f8 kind:load to:0x021847c0 module:overlays(100,97) from:0x02069114 kind:arm_call to:0x02068f0c module:overlay(0) from:0x02069120 kind:arm_call to:0x01ffd3d8 module:itcm from:0x0206913c kind:arm_call to:0x02068da0 module:overlay(0) @@ -6212,7 +6212,7 @@ from:0x020957c4 kind:load to:0x020ae82c module:overlay(0) from:0x020957e0 kind:arm_call to:0x02187364 module:overlays(106,108) from:0x02095800 kind:arm_call to:0x02186cc8 module:overlay(108) from:0x02095824 kind:arm_call to:0x02090efc module:overlay(0) -from:0x02095834 kind:load to:0x02186908 module:overlays(97,100,109) +from:0x02095834 kind:load to:0x02186908 module:overlays(109,97,100) from:0x02095850 kind:arm_call to:0x02187574 module:overlay(107) from:0x02095870 kind:arm_call to:0x021868ac module:overlay(106) from:0x02095890 kind:arm_call to:0x02186704 module:overlay(105) @@ -6227,9 +6227,9 @@ from:0x02095980 kind:arm_call to:0x0218766c module:overlay(108) from:0x020959a0 kind:arm_call to:0x021869d8 module:overlay(108) from:0x020959c0 kind:arm_call to:0x02187630 module:overlay(111) from:0x020959e0 kind:arm_call to:0x02186d74 module:overlay(111) -from:0x02095a00 kind:arm_call to:0x021865c0 module:overlays(103,104,105,106,107,108,109,110,111,112,113) +from:0x02095a00 kind:arm_call to:0x021865c0 module:overlays(109,103,104,105,106,107,108,110,111,112,113) from:0x02095a20 kind:arm_call to:0x02187b8c module:overlay(112) -from:0x02095a40 kind:arm_call to:0x021865c0 module:overlays(103,104,105,106,107,108,109,110,111,112,113) +from:0x02095a40 kind:arm_call to:0x021865c0 module:overlays(109,103,104,105,106,107,108,110,111,112,113) from:0x02095a60 kind:arm_call to:0x0218695c module:overlay(110) from:0x02095a84 kind:arm_call to:0x02090efc module:overlay(0) from:0x02095a94 kind:load to:0x0217b264 module:overlays(93,94) diff --git a/config/jp/arm9/symbols.txt b/config/jp/arm9/symbols.txt index 43a01943..6d566902 100644 --- a/config/jp/arm9/symbols.txt +++ b/config/jp/arm9/symbols.txt @@ -709,9 +709,9 @@ func_02014790 kind:function(arm,size=0x1c) addr:0x02014790 func_020147ac kind:function(arm,size=0x1c) addr:0x020147ac func_020147c8 kind:function(arm,size=0x1c) addr:0x020147c8 func_020147e4 kind:function(thumb,size=0x1c) addr:0x020147e4 -func_02014800 kind:function(thumb,size=0x28) addr:0x02014800 -func_02014828 kind:function(thumb,size=0x2c) addr:0x02014828 -func_02014854 kind:function(thumb,size=0x28) addr:0x02014854 +_ZN14OverlayManager15LoadIfNotLoadedEjj kind:function(thumb,size=0x28) addr:0x02014800 +_ZN14OverlayManager4LoadEjj kind:function(thumb,size=0x2c) addr:0x02014828 +_ZN14OverlayManager6UnloadEj kind:function(thumb,size=0x28) addr:0x02014854 func_0201487c kind:function(thumb,size=0x58) addr:0x0201487c func_020148d4 kind:function(thumb,size=0x46) addr:0x020148d4 func_0201491c kind:function(thumb,size=0x2c) addr:0x0201491c @@ -2136,7 +2136,7 @@ func_0203e35c kind:function(arm,size=0xc) addr:0x0203e35c func_0203e368 kind:function(arm,size=0xc) addr:0x0203e368 func_0203e374 kind:function(arm,size=0x18) addr:0x0203e374 func_0203e38c kind:function(arm,size=0x18) addr:0x0203e38c -func_0203e3a4 kind:function(arm,size=0x20) addr:0x0203e3a4 +__register_global_object kind:function(arm,size=0x20) addr:0x0203e3a4 func_0203e3c4 kind:function(arm,size=0x1b4) addr:0x0203e3c4 func_0203e578 kind:function(arm,size=0x48) addr:0x0203e578 func_0203e5c0 kind:function(arm,size=0x14) addr:0x0203e5c0 @@ -2900,4 +2900,4 @@ data_02053024 kind:bss addr:0x02053024 data_02053028 kind:bss addr:0x02053028 data_02053044 kind:bss addr:0x02053044 data_0205304c kind:bss addr:0x0205304c -data_02053054 kind:bss addr:0x02053054 +__global_destructor_chain kind:bss(size=0x4) addr:0x02053054