From 65a2aab1f11a8b74f7255d425b80fe279067efe5 Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Fri, 4 Jul 2025 21:04:27 +0200
Subject: [PATCH] `OverlayManager` OK

---
 config/eur/arm9/delinks.txt        | 1 +
 config/eur/arm9/relocs.txt         | 2 ++
 config/usa/arm9/delinks.txt        | 1 +
 config/usa/arm9/relocs.txt         | 2 ++
 src/Main/System/OverlayManager.cpp | 2 --
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt
index 81ef62d3..b29780d9 100644
--- a/config/eur/arm9/delinks.txt
+++ b/config/eur/arm9/delinks.txt
@@ -11,6 +11,7 @@ src/Main/Actor/ActorType.cpp:
     .bss        start:0x02069180 end:0x02069188
 
 src/Main/System/OverlayManager.cpp:
+    complete
     .text       start:0x0202ff44 end:0x0203003c
 
 libs/cpp/src/__register_global_object.cpp:
diff --git a/config/eur/arm9/relocs.txt b/config/eur/arm9/relocs.txt
index 73238372..94217569 100644
--- a/config/eur/arm9/relocs.txt
+++ b/config/eur/arm9/relocs.txt
@@ -3840,10 +3840,12 @@ from:0x0202fff0 kind:thumb_call to:0x0202ff44 module:main
 from:0x0202fff8 kind:load to:0x020561f4 module:main
 from:0x0202fffc kind:load to:0x027e0ce0 module:dtcm
 from:0x02030000 kind:load to:0x020ee698 module:overlay(0)
+from:0x02030004 kind:overlay_id to:61 module:none
 from:0x0203000e kind:thumb_call to:0x0202ff84 module:main
 from:0x02030016 kind:thumb_call to:0x0202ff84 module:main
 from:0x02030024 kind:thumb_call_arm to:0x021028a0 module:overlay(7)
 from:0x0203002c kind:thumb_call to:0x0202ff84 module:main
+from:0x02030034 kind:overlay_id to:7 module:none
 from:0x02030038 kind:load to:0x027e0ce0 module:dtcm
 from:0x02030044 kind:thumb_call_arm to:0x0202ea0c module:main
 from:0x0203006c kind:thumb_call to:0x0203004c module:main
diff --git a/config/usa/arm9/delinks.txt b/config/usa/arm9/delinks.txt
index 25601a31..476a595a 100644
--- a/config/usa/arm9/delinks.txt
+++ b/config/usa/arm9/delinks.txt
@@ -11,6 +11,7 @@ src/Main/Actor/ActorType.cpp:
     .bss        start:0x02069120 end:0x02069128
 
 src/Main/System/OverlayManager.cpp:
+    complete
     .text       start:0x0202ff40 end:0x02030038
 
 libs/cpp/src/__register_global_object.cpp:
diff --git a/config/usa/arm9/relocs.txt b/config/usa/arm9/relocs.txt
index ca3b6efe..afde4238 100644
--- a/config/usa/arm9/relocs.txt
+++ b/config/usa/arm9/relocs.txt
@@ -3842,10 +3842,12 @@ from:0x0202ffec kind:thumb_call to:0x0202ff40 module:main
 from:0x0202fff4 kind:load to:0x020561b0 module:main
 from:0x0202fff8 kind:load to:0x027e0ce0 module:dtcm
 from:0x0202fffc kind:load to:0x020ee638 module:overlay(0)
+from:0x02030000 kind:overlay_id to:61 module:none
 from:0x0203000a kind:thumb_call to:0x0202ff80 module:main
 from:0x02030012 kind:thumb_call to:0x0202ff80 module:main
 from:0x02030020 kind:thumb_call_arm to:0x02102820 module:overlay(7)
 from:0x02030028 kind:thumb_call to:0x0202ff80 module:main
+from:0x02030030 kind:overlay_id to:7 module:none
 from:0x02030034 kind:load to:0x027e0ce0 module:dtcm
 from:0x02030040 kind:thumb_call_arm to:0x0202ea08 module:main
 from:0x02030068 kind:thumb_call to:0x02030048 module:main
diff --git a/src/Main/System/OverlayManager.cpp b/src/Main/System/OverlayManager.cpp
index 4f7da68c..4e22cb3e 100644
--- a/src/Main/System/OverlayManager.cpp
+++ b/src/Main/System/OverlayManager.cpp
@@ -52,8 +52,6 @@ THUMB void OverlayManager::Unload(OverlayIndex index) {
     }
 }
 
-//! TODO: solve the .word issue with the overlay IDs
-//! both functions should match otherwise
 THUMB void OverlayManager::LoadGameMode(s32 mode) {
     OverlayId overlayId;
     GameMode *pSetup;