From 046c7d7ac8bcac7d8bfea833c624557260ab5ab5 Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 4 Mar 2025 20:59:04 +0100 Subject: [PATCH 1/3] Delink `ActorEventIcon` --- config/eur/arm9/overlays/ov000/delinks.txt | 7 +++++++ config/eur/arm9/overlays/ov000/symbols.txt | 4 ++-- config/usa/arm9/overlays/ov000/delinks.txt | 7 +++++++ config/usa/arm9/overlays/ov000/symbols.txt | 4 ++-- src/00_Core/Actor/Dungeon/ActorEventIcon.cpp | 2 +- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/config/eur/arm9/overlays/ov000/delinks.txt b/config/eur/arm9/overlays/ov000/delinks.txt index 75d6e12c..7c1d2eb9 100644 --- a/config/eur/arm9/overlays/ov000/delinks.txt +++ b/config/eur/arm9/overlays/ov000/delinks.txt @@ -16,6 +16,13 @@ src/00_Core/Actor/ActorManager.cpp: .text start:0x020c33d4 end:0x020c3e54 .data start:0x020e72a8 end:0x020e72f4 +src/00_Core/Actor/Dungeon/ActorEventIcon.cpp: + .text start:0x020904f4 end:0x020908f8 + .init start:0x020df6f8 end:0x020df738 + .ctor start:0x020e1ecc end:0x020e1ed0 + .data start:0x020e2aa0 end:0x020e2b5c + .sbss start:0x020ecda4 end:0x020ecdc4 + src/00_Core/Item/Item.cpp: .text start:0x020ad020 end:0x020ad090 .rodata start:0x020dc574 end:0x020dc6c4 diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 539b6f97..5e28fe07 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -965,7 +965,7 @@ _ZN14ActorEventIcon8vfunc_08Ev kind:function(arm,size=0xb0) addr:0x2090580 _ZN14ActorEventIcon8vfunc_14Ej kind:function(arm,size=0xc) addr:0x2090630 _ZN14ActorEventIcon8vfunc_18Ej kind:function(arm,size=0xc) addr:0x209063c _ZN14ActorEventIcon19func_ov000_02090648Ej kind:function(arm,size=0x12c) addr:0x2090648 -_Z19func_ov000_02090774j kind:function(arm,size=0x2c) addr:0x2090774 +_ZN14ActorEventIcon19func_ov000_02090774Ej kind:function(arm,size=0x2c) addr:0x2090774 _ZN14ActorEventIcon8vfunc_1cEPt kind:function(arm,size=0x110) addr:0x20907a0 _ZN14ActorEventIconD1Ev kind:function(arm,size=0x20) addr:0x20908b0 _ZN14ActorEventIconD0Ev kind:function(arm,size=0x28) addr:0x20908d0 @@ -4038,7 +4038,7 @@ __sinit_ov000_020df4cc kind:function(arm,size=0x174) addr:0x20df4cc __sinit_ov000_020df640 kind:function(arm,size=0x38) addr:0x20df640 __sinit_ActorSwitchObject.cpp kind:function(arm,size=0x40) addr:0x20df678 __sinit_ov000_020df6b8 kind:function(arm,size=0x40) addr:0x20df6b8 -__sinit_ov000_020df6f8 kind:function(arm,size=0x40) addr:0x20df6f8 +__sinit_ActorEventIcon.cpp kind:function(arm,size=0x40) addr:0x20df6f8 __sinit_ov000_020df738 kind:function(arm,size=0x38) addr:0x20df738 __sinit_ov000_020df770 kind:function(arm,size=0x20) addr:0x20df770 __sinit_ov000_020df790 kind:function(arm,size=0x1718) addr:0x20df790 diff --git a/config/usa/arm9/overlays/ov000/delinks.txt b/config/usa/arm9/overlays/ov000/delinks.txt index 15a58b97..9eb5b647 100644 --- a/config/usa/arm9/overlays/ov000/delinks.txt +++ b/config/usa/arm9/overlays/ov000/delinks.txt @@ -16,6 +16,13 @@ src/00_Core/Actor/ActorManager.cpp: .text start:0x020c3374 end:0x020c3df4 .data start:0x020e7248 end:0x020e7294 +src/00_Core/Actor/Dungeon/ActorEventIcon.cpp: + .text start:0x02090494 end:0x02090898 + .init start:0x020df698 end:0x020df6d8 + .ctor start:0x020e1e6c end:0x020e1e70 + .data start:0x020e2a40 end:0x020e2afc + .sbss start:0x020ecd44 end:0x020ecd64 + src/00_Core/Item/Item.cpp: .text start:0x020acfc0 end:0x020ad030 .rodata start:0x020dc514 end:0x020dc664 diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt index 6a5f320f..1b9d2f65 100644 --- a/config/usa/arm9/overlays/ov000/symbols.txt +++ b/config/usa/arm9/overlays/ov000/symbols.txt @@ -965,7 +965,7 @@ _ZN14ActorEventIcon8vfunc_08Ev kind:function(arm,size=0xb0) addr:0x2090520 _ZN14ActorEventIcon8vfunc_14Ej kind:function(arm,size=0xc) addr:0x20905d0 _ZN14ActorEventIcon8vfunc_18Ej kind:function(arm,size=0xc) addr:0x20905dc _ZN14ActorEventIcon19func_ov000_02090648Ej kind:function(arm,size=0x12c) addr:0x20905e8 -_Z19func_ov000_02090774j kind:function(arm,size=0x2c) addr:0x2090714 +_ZN14ActorEventIcon19func_ov000_02090774Ej kind:function(arm,size=0x2c) addr:0x2090714 _ZN14ActorEventIcon8vfunc_1cEPt kind:function(arm,size=0x110) addr:0x2090740 _ZN14ActorEventIconD1Ev kind:function(arm,size=0x20) addr:0x2090850 _ZN14ActorEventIconD0Ev kind:function(arm,size=0x28) addr:0x2090870 @@ -3940,7 +3940,7 @@ __sinit_ov000_020df4cc kind:function(arm,size=0x174) addr:0x20df46c __sinit_ov000_020df640 kind:function(arm,size=0x38) addr:0x20df5e0 __sinit_ActorSwitchObject.cpp kind:function(arm,size=0x40) addr:0x20df618 __sinit_ov000_020df6b8 kind:function(arm,size=0x40) addr:0x20df658 -__sinit_ov000_020df6f8 kind:function(arm,size=0x40) addr:0x20df698 +__sinit_ActorEventIcon.cpp kind:function(arm,size=0x40) addr:0x20df698 __sinit_ov000_020df738 kind:function(arm,size=0x38) addr:0x20df6d8 __sinit_ov000_020df770 kind:function(arm,size=0x20) addr:0x20df710 __sinit_ov000_020df790 kind:function(arm,size=0x1718) addr:0x20df730 diff --git a/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp b/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp index 8e943095..94e7381d 100644 --- a/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp +++ b/src/00_Core/Actor/Dungeon/ActorEventIcon.cpp @@ -8,6 +8,6 @@ bool ActorEventIcon::vfunc_08() {} void ActorEventIcon::vfunc_14(u32 param1) {} void ActorEventIcon::vfunc_18(u32 param1) {} u32 ActorEventIcon::func_ov000_02090648(u32 param1) {} -bool func_ov000_02090774(u32 param1) {} +bool ActorEventIcon::func_ov000_02090774(u32 param1) {} void ActorEventIcon::vfunc_1c(u16 *param1) {} ActorEventIcon::~ActorEventIcon() {} From 13b4acb5771c918432cb26327e365f0611f64d7b Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 4 Mar 2025 21:09:46 +0100 Subject: [PATCH 2/3] Delink `ActorSwitchObject` --- config/eur/arm9/overlays/ov000/delinks.txt | 7 +++++++ config/usa/arm9/overlays/ov000/delinks.txt | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/config/eur/arm9/overlays/ov000/delinks.txt b/config/eur/arm9/overlays/ov000/delinks.txt index 7c1d2eb9..3e06cc47 100644 --- a/config/eur/arm9/overlays/ov000/delinks.txt +++ b/config/eur/arm9/overlays/ov000/delinks.txt @@ -16,6 +16,13 @@ src/00_Core/Actor/ActorManager.cpp: .text start:0x020c33d4 end:0x020c3e54 .data start:0x020e72a8 end:0x020e72f4 +src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp: + .text start:0x0208fa70 end:0x020903a8 + .init start:0x020df678 end:0x020df6b8 + .ctor start:0x020e1ec4 end:0x020e1ec8 + .data start:0x020e2928 end:0x020e29e4 + .sbss start:0x020ecd64 end:0x020ecd84 + src/00_Core/Actor/Dungeon/ActorEventIcon.cpp: .text start:0x020904f4 end:0x020908f8 .init start:0x020df6f8 end:0x020df738 diff --git a/config/usa/arm9/overlays/ov000/delinks.txt b/config/usa/arm9/overlays/ov000/delinks.txt index 9eb5b647..2ae64955 100644 --- a/config/usa/arm9/overlays/ov000/delinks.txt +++ b/config/usa/arm9/overlays/ov000/delinks.txt @@ -16,6 +16,13 @@ src/00_Core/Actor/ActorManager.cpp: .text start:0x020c3374 end:0x020c3df4 .data start:0x020e7248 end:0x020e7294 +src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp: + .text start:0x0208fa10 end:0x02090348 + .init start:0x020df618 end:0x020df658 + .ctor start:0x020e1e64 end:0x020e1e68 + .data start:0x020e28c8 end:0x020e2984 + .sbss start:0x020ecd04 end:0x020ecd24 + src/00_Core/Actor/Dungeon/ActorEventIcon.cpp: .text start:0x02090494 end:0x02090898 .init start:0x020df698 end:0x020df6d8 From 91b0782a4ab635ec7aaa777389c8c7d70cc82da1 Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 4 Mar 2025 21:26:39 +0100 Subject: [PATCH 3/3] Delink `ActorNaviBase` --- config/eur/arm9/overlays/ov000/delinks.txt | 6 ++ config/eur/arm9/overlays/ov000/symbols.txt | 98 ---------------------- config/usa/arm9/overlays/ov000/delinks.txt | 6 ++ 3 files changed, 12 insertions(+), 98 deletions(-) diff --git a/config/eur/arm9/overlays/ov000/delinks.txt b/config/eur/arm9/overlays/ov000/delinks.txt index 3e06cc47..46f9a7dc 100644 --- a/config/eur/arm9/overlays/ov000/delinks.txt +++ b/config/eur/arm9/overlays/ov000/delinks.txt @@ -30,6 +30,12 @@ src/00_Core/Actor/Dungeon/ActorEventIcon.cpp: .data start:0x020e2aa0 end:0x020e2b5c .sbss start:0x020ecda4 end:0x020ecdc4 +src/00_Core/Actor/Navi/ActorNaviBase.cpp: + .text start:0x020b885c end:0x020bb118 + .rodata start:0x020dc81c end:0x020dc858 + .data start:0x020e676c end:0x020e68d4 + .sbss start:0x020ee1f8 end:0x020ee1fc + src/00_Core/Item/Item.cpp: .text start:0x020ad020 end:0x020ad090 .rodata start:0x020dc574 end:0x020dc6c4 diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 5e28fe07..56f493dd 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -2502,104 +2502,6 @@ _ZN15ItemModelLoader19func_ov000_020bb3f4EPc kind:function(thumb,size=0x20) addr _ZN15ItemModelLoader19func_ov000_020bb414Ei kind:function(thumb,size=0xc) addr:0x20bb414 _ZN15ItemModelLoader19func_ov000_020bb420Ei kind:function(thumb,size=0xc) addr:0x20bb420 _ZN15ItemModelLoader19func_ov000_020bb42cEi kind:function(thumb,size=0x20) addr:0x20bb42c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - _ZN14PlayerLinkBase12GetMaxHealthEv kind:function(arm,size=0x20) addr:0x20bb44c _ZN14PlayerLinkBase8vfunc_10EP8Cylinder kind:function(arm,size=0x70) addr:0x20bb46c _ZN14PlayerLinkBase8vfunc_14EP8Cylinder kind:function(arm,size=0x30) addr:0x20bb4dc diff --git a/config/usa/arm9/overlays/ov000/delinks.txt b/config/usa/arm9/overlays/ov000/delinks.txt index 2ae64955..ddb30117 100644 --- a/config/usa/arm9/overlays/ov000/delinks.txt +++ b/config/usa/arm9/overlays/ov000/delinks.txt @@ -30,6 +30,12 @@ src/00_Core/Actor/Dungeon/ActorEventIcon.cpp: .data start:0x020e2a40 end:0x020e2afc .sbss start:0x020ecd44 end:0x020ecd64 +src/00_Core/Actor/Navi/ActorNaviBase.cpp: + .text start:0x020b87fc end:0x020bb0b8 + .rodata start:0x020dc7bc end:0x020dc7f8 + .data start:0x020e670c end:0x020e6874 + .sbss start:0x020ee198 end:0x020ee19c + src/00_Core/Item/Item.cpp: .text start:0x020acfc0 end:0x020ad030 .rodata start:0x020dc514 end:0x020dc664