From adbb175cc9011c60cb7ece4788771d56e5195a58 Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Sat, 23 Mar 2024 14:39:50 +0100
Subject: [PATCH] Mangle virtual table for `LinkStateBase`

---
 asm/include/ov04.inc            |  2 +-
 asm/ov00/Player/LinkStateBase.s | 42 ++++-----------------------------
 asm/ov04.s                      |  4 ++--
 3 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/asm/include/ov04.inc b/asm/include/ov04.inc
index 4162d110..b428fe85 100644
--- a/asm/include/ov04.inc
+++ b/asm/include/ov04.inc
@@ -1569,7 +1569,7 @@
 .extern func_0203780c
 .extern func_020350ac
 .extern _ZN9SysObjectdlEPv
-.extern data_ov00_020e56ac
+.extern _ZTV13LinkStateBase
 .extern _ZN9SysObjectdlEPv
 .extern func_0204f614
 .extern data_ov00_020e60c0
diff --git a/asm/ov00/Player/LinkStateBase.s b/asm/ov00/Player/LinkStateBase.s
index b640fcbd..8a6c3009 100644
--- a/asm/ov00/Player/LinkStateBase.s
+++ b/asm/ov00/Player/LinkStateBase.s
@@ -1537,54 +1537,22 @@ data_ov00_020e56a4: ; 0x020e56a4
 	.global data_ov00_020e56a8
 data_ov00_020e56a8: ; 0x020e56a8
 	.byte 0x00, 0x00, 0x00, 0x00
-	.global data_ov00_020e56ac
-data_ov00_020e56ac: ; 0x020e56ac
+	.global _ZTV13LinkStateBase
+_ZTV13LinkStateBase: ; 0x020e56ac
     .word _ZN13LinkStateBase8vfunc_00Ev
-	.global data_ov00_020e56b0
-data_ov00_020e56b0: ; 0x020e56b0
-    .word func_ov04_0210ade4 ; data_ov07_0210ade4
-	.global data_ov00_020e56b4
-data_ov00_020e56b4: ; 0x020e56b4
-    .word func_ov04_0210ade8 ; data_ov07_0210ade8
-	.global data_ov00_020e56b8
-data_ov00_020e56b8: ; 0x020e56b8
+    .word func_ov04_0210ade4
+    .word func_ov04_0210ade8
 	.byte 0x00, 0x00, 0x00, 0x00
-	.global data_ov00_020e56bc
-data_ov00_020e56bc: ; 0x020e56bc
-    .word func_ov04_0210adf8 ; data_ov07_0210adf8
-	.global data_ov00_020e56c0
-data_ov00_020e56c0: ; 0x020e56c0
+    .word func_ov04_0210adf8
     .word _ZN13LinkStateBase12OnStateEnterEv - 1
-	.global data_ov00_020e56c4
-data_ov00_020e56c4: ; 0x020e56c4
     .word _ZN13LinkStateBase12OnStateLeaveEi - 1
-	.global data_ov00_020e56c8
-data_ov00_020e56c8: ; 0x020e56c8
     .word func_ov05_0210f700
-	.global data_ov00_020e56cc
-data_ov00_020e56cc: ; 0x020e56cc
     .word _ZN13LinkStateBase8vfunc_20Ei - 1
-	.global data_ov00_020e56d0
-data_ov00_020e56d0: ; 0x020e56d0
     .word _ZN13LinkStateBase8vfunc_24Ei - 1
-	.global data_ov00_020e56d4
-data_ov00_020e56d4: ; 0x020e56d4
     .word _ZN13LinkStateBase8vfunc_28Ev - 1
-	.global data_ov00_020e56d8
-data_ov00_020e56d8: ; 0x020e56d8
     .word func_ov05_0210f704
-	.global data_ov00_020e56dc
-data_ov00_020e56dc: ; 0x020e56dc
     .word func_ov05_0210f708
-	.global data_ov00_020e56e0
-data_ov00_020e56e0: ; 0x020e56e0
     .word _ZN13LinkStateBase8vfunc_34EP5Vec3p - 1
-	.global data_ov00_020e56e4
-data_ov00_020e56e4: ; 0x020e56e4
     .word func_ov05_0210f70c
-	.global data_ov00_020e56e8
-data_ov00_020e56e8: ; 0x020e56e8
     .word func_ov05_0210f714
-	.global data_ov00_020e56ec
-data_ov00_020e56ec: ; 0x020e56ec
     .word func_ov05_0210f71c
diff --git a/asm/ov04.s b/asm/ov04.s
index fb4b4bad..c3810028 100644
--- a/asm/ov04.s
+++ b/asm/ov04.s
@@ -20927,7 +20927,7 @@ func_ov04_0210adb0: ; 0x0210adb0
 	.global func_ov04_0210add4
 	thumb_func_start func_ov04_0210add4
 func_ov04_0210add4: ; 0x0210add4
-	ldr r2, _0210ade0 ; =data_ov00_020e56ac
+	ldr r2, _0210ade0 ; =_ZTV13LinkStateBase
 	str r2, [r0]
 	mov r2, #0
 	str r2, [r0, #4]
@@ -20935,7 +20935,7 @@ func_ov04_0210add4: ; 0x0210add4
 	bx lr
 	.align 2, 0
 	thumb_func_end func_ov04_0210add4
-_0210ade0: .word data_ov00_020e56ac
+_0210ade0: .word _ZTV13LinkStateBase
 
 	.global func_ov04_0210ade4
 	thumb_func_start func_ov04_0210ade4