Delink `ActorForceNavi`

6 files changed, 53 insertions, 16 deletions

diff --git a/config/eur/arm9/overlays/ov000/delinks.txt b/config/eur/arm9/overlays/ov000/delinks.txt
index 612ebc21..0849ccdc 100644
--- a/config/eur/arm9/overlays/ov000/delinks.txt
+++ b/config/eur/arm9/overlays/ov000/delinks.txt
@@ -37,6 +37,13 @@ src/00_Core/Actor/Navi/ActorNavi.cpp:
     .data       start:0x020e6514 end:0x020e6674
     .sbss       start:0x020ee1a0 end:0x020ee1d8
 
+src/00_Core/Actor/Navi/ActorForceNavi.cpp:
+    .text       start:0x020b862c end:0x020b86a4
+    .init       start:0x020e133c end:0x020e137c
+    .ctor       start:0x020e1f0c end:0x020e1f10
+    .data       start:0x020e6674 end:0x020e676c
+    .sbss       start:0x020ee1d8 end:0x020ee1f8
+
 src/00_Core/Actor/Navi/ActorNaviBase.cpp:
     .text       start:0x020b885c end:0x020bb118
     .rodata     start:0x020dc81c end:0x020dc858
diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index ad3278f9..893b1f66 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -2427,10 +2427,10 @@ _ZN9ActorNaviD0Ev kind:function(arm,size=0x40) addr:0x20b8598
 func_ov000_020b85d8 kind:function(thumb,size=0x28) addr:0x20b85d8
 func_ov000_020b8600 kind:function(arm,size=0x10) addr:0x20b8600
 func_ov000_020b8610 kind:function(arm,size=0x1c) addr:0x20b8610
-func_ov000_020b862c kind:function(arm,size=0x40) addr:0x20b862c
-func_ov000_020b866c kind:function(arm,size=0x8) addr:0x20b866c
-func_ov000_020b8674 kind:function(arm,size=0x1c) addr:0x20b8674
-func_ov000_020b8690 kind:function(arm,size=0x14) addr:0x20b8690
+_ZN14ActorForceNavi6CreateEv kind:function(arm,size=0x40) addr:0x20b862c
+_ZN14ActorForceNavi8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x20b866c
+_ZN14ActorForceNaviD1Ev kind:function(arm,size=0x1c) addr:0x20b8674
+_ZN14ActorForceNaviD0Ev kind:function(arm,size=0x14) addr:0x20b8690
 func_ov000_020b86a4 kind:function(arm,size=0x44) addr:0x20b86a4
 func_ov000_020b86e8 kind:function(arm,size=0x30) addr:0x20b86e8
 func_ov000_020b8718 kind:function(arm,size=0x8) addr:0x20b8718
@@ -3956,7 +3956,7 @@ __sinit_ov000_020e120c kind:function(arm,size=0x44) addr:0x20e120c
 __sinit_ov000_020e1250 kind:function(arm,size=0x40) addr:0x20e1250
 __sinit_ov000_020e1290 kind:function(arm,size=0x48) addr:0x20e1290
 __sinit_ActorNavi.cpp kind:function(arm,size=0x64) addr:0x20e12d8
-__sinit_ov000_020e133c kind:function(arm,size=0x40) addr:0x20e133c
+__sinit_ActorForceNavi.cpp kind:function(arm,size=0x40) addr:0x20e133c
 __sinit_ov000_020e137c kind:function(arm,size=0x798) addr:0x20e137c
 __sinit_ov000_020e1b14 kind:function(arm,size=0x40) addr:0x20e1b14
 __sinit_ov000_020e1b54 kind:function(arm,size=0x40) addr:0x20e1b54
@@ -4958,7 +4958,7 @@ data_ov000_020e6530 kind:data(any) addr:0x20e6530
 data_ov000_020e6534 kind:data(any) addr:0x20e6534
 _ZTV9ActorNavi kind:data(any) addr:0x20e6560
 _ZTV24UnkStruct_ov000_020b8110 kind:data(any) addr:0x20e6658
-data_ov000_020e667c kind:data(any) addr:0x20e667c
+_ZTV14ActorForceNavi kind:data(any) addr:0x20e667c
 data_ov000_020e676c kind:data(any) addr:0x20e676c
 data_ov000_020e6770 kind:data(any) addr:0x20e6770
 data_ov000_020e6774 kind:data(any) addr:0x20e6774
@@ -5879,8 +5879,8 @@ data_ov000_020ee198 kind:bss addr:0x20ee198
 _ZN9ActorNavi5gTypeE kind:bss addr:0x20ee1ac
 @419 kind:bss addr:0x20ee1c0
 data_ov000_020ee1cc kind:bss addr:0x20ee1cc
-data_ov000_020ee1d8 kind:bss addr:0x20ee1d8
-data_ov000_020ee1e4 kind:bss addr:0x20ee1e4
+@405 kind:bss addr:0x20ee1d8
+_ZN14ActorForceNavi5gTypeE kind:bss addr:0x20ee1e4
 data_ov000_020ee1f8 kind:bss addr:0x20ee1f8
 data_ov000_020ee1fc kind:bss addr:0x20ee1fc
 data_ov000_020ee208 kind:bss addr:0x20ee208
diff --git a/config/usa/arm9/overlays/ov000/delinks.txt b/config/usa/arm9/overlays/ov000/delinks.txt
index bf023a36..9fe997fb 100644
--- a/config/usa/arm9/overlays/ov000/delinks.txt
+++ b/config/usa/arm9/overlays/ov000/delinks.txt
@@ -37,6 +37,13 @@ src/00_Core/Actor/Navi/ActorNavi.cpp:
     .data       start:0x020e64b4 end:0x020e6614
     .sbss       start:0x020ee140 end:0x020ee178
 
+src/00_Core/Actor/Navi/ActorForceNavi.cpp:
+    .text       start:0x020b85cc end:0x020b8644
+    .init       start:0x020e12dc end:0x020e131c
+    .ctor       start:0x020e1eac end:0x020e1eb0
+    .data       start:0x020e6614 end:0x020e670c
+    .sbss       start:0x020ee178 end:0x020ee198
+
 src/00_Core/Actor/Navi/ActorNaviBase.cpp:
     .text       start:0x020b87fc end:0x020bb0b8
     .rodata     start:0x020dc7bc end:0x020dc7f8
diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt
index 4b641f48..0b2c4428 100644
--- a/config/usa/arm9/overlays/ov000/symbols.txt
+++ b/config/usa/arm9/overlays/ov000/symbols.txt
@@ -2427,10 +2427,10 @@ _ZN9ActorNaviD0Ev kind:function(arm,size=0x40) addr:0x20b8538
 func_ov000_020b85d8 kind:function(thumb,size=0x28) addr:0x20b8578
 func_ov000_020b8600 kind:function(arm,size=0x10) addr:0x20b85a0
 func_ov000_020b8610 kind:function(arm,size=0x1c) addr:0x20b85b0
-func_ov000_020b862c kind:function(arm,size=0x40) addr:0x20b85cc
-func_ov000_020b866c kind:function(arm,size=0x8) addr:0x20b860c
-func_ov000_020b8674 kind:function(arm,size=0x1c) addr:0x20b8614
-func_ov000_020b8690 kind:function(arm,size=0x14) addr:0x20b8630
+_ZN14ActorForceNavi6CreateEv kind:function(arm,size=0x40) addr:0x20b85cc
+_ZN14ActorForceNavi8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x20b860c
+_ZN14ActorForceNaviD1Ev kind:function(arm,size=0x1c) addr:0x20b8614
+_ZN14ActorForceNaviD0Ev kind:function(arm,size=0x14) addr:0x20b8630
 func_ov000_020b86a4 kind:function(arm,size=0x44) addr:0x20b8644
 func_ov000_020b86e8 kind:function(arm,size=0x30) addr:0x20b8688
 func_ov000_020b8718 kind:function(arm,size=0x8) addr:0x20b86b8
@@ -3956,7 +3956,7 @@ __sinit_ov000_020e120c kind:function(arm,size=0x44) addr:0x20e11ac
 __sinit_ov000_020e1250 kind:function(arm,size=0x40) addr:0x20e11f0
 __sinit_ov000_020e1290 kind:function(arm,size=0x48) addr:0x20e1230
 __sinit_ActorNavi.cpp kind:function(arm,size=0x64) addr:0x20e1278
-__sinit_ov000_020e133c kind:function(arm,size=0x40) addr:0x20e12dc
+__sinit_ActorForceNavi.cpp kind:function(arm,size=0x40) addr:0x20e12dc
 __sinit_ov000_020e137c kind:function(arm,size=0x798) addr:0x20e131c
 __sinit_ov000_020e1b14 kind:function(arm,size=0x40) addr:0x20e1ab4
 __sinit_ov000_020e1b54 kind:function(arm,size=0x40) addr:0x20e1af4
@@ -4958,7 +4958,7 @@ data_ov000_020e6530 kind:data(any) addr:0x20e64d0
 data_ov000_020e6534 kind:data(any) addr:0x20e64d4
 _ZTV9ActorNavi kind:data(any) addr:0x20e6500
 _ZTV24UnkStruct_ov000_020b8110 kind:data(any) addr:0x20e65f8
-data_ov000_020e667c kind:data(any) addr:0x20e661c
+_ZTV14ActorForceNavi kind:data(any) addr:0x20e661c
 data_ov000_020e676c kind:data(any) addr:0x20e670c
 data_ov000_020e6770 kind:data(any) addr:0x20e6710
 data_ov000_020e6774 kind:data(any) addr:0x20e6714
@@ -5879,8 +5879,8 @@ data_ov000_020ee198 kind:bss addr:0x20ee138
 _ZN9ActorNavi5gTypeE kind:bss addr:0x20ee14c
 @419 kind:bss addr:0x20ee160
 data_ov000_020ee1cc kind:bss addr:0x20ee16c
-data_ov000_020ee1d8 kind:bss addr:0x20ee178
-data_ov000_020ee1e4 kind:bss addr:0x20ee184
+@405 kind:bss addr:0x20ee178
+_ZN14ActorForceNavi5gTypeE kind:bss addr:0x20ee184
 data_ov000_020ee1f8 kind:bss addr:0x20ee198
 data_ov000_020ee1fc kind:bss addr:0x20ee19c
 data_ov000_020ee208 kind:bss addr:0x20ee1a8
diff --git a/include/Actor/Navi/ActorForceNavi.hpp b/include/Actor/Navi/ActorForceNavi.hpp
new file mode 100644
index 00000000..1623e705
--- /dev/null
+++ b/include/Actor/Navi/ActorForceNavi.hpp
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "Actor/Navi/ActorNaviBase.hpp"
+
+class ActorForceNavi : public ActorNaviBase {
+public:
+    static ActorType gType;
+
+    /* 000 (base) */
+    /* 294 */
+
+    /* 00 */ virtual ~ActorForceNavi() override;
+    /* b4 */ virtual void vfunc_b4() override;
+
+    static ActorForceNavi *Create();
+};
diff --git a/src/00_Core/Actor/Navi/ActorForceNavi.cpp b/src/00_Core/Actor/Navi/ActorForceNavi.cpp
new file mode 100644
index 00000000..6037082d
--- /dev/null
+++ b/src/00_Core/Actor/Navi/ActorForceNavi.cpp
@@ -0,0 +1,7 @@
+#include "Actor/Navi/ActorForceNavi.hpp"
+
+ActorType ActorForceNavi::gType = ActorType(ActorTypeId_ForceNavi, (ActorCreateFunc) ActorForceNavi::Create, NULL);
+
+ActorForceNavi *ActorForceNavi::Create() {}
+void ActorForceNavi::vfunc_b4() {}
+ActorForceNavi::~ActorForceNavi() {}