summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAetias <aetias@outlook.com>2025-01-31 21:55:23 +0100
committerAetias <aetias@outlook.com>2025-01-31 21:55:23 +0100
commitaf8b40be4305f4eee9b2cd1510d1f5d34d41e0b8 (patch)
treef5eec59eb4addee4bb708eb81351a6b9bce11dda
parent931990c0e205e21b345ba15929e42662c0b07918 (diff)
Move ov023 documentation from Ghidra
-rw-r--r--config/eur/arm9/overlays/ov023/symbols.txt22
-rw-r--r--config/usa/arm9/overlays/ov023/symbols.txt22
-rw-r--r--include/Player/PlayerLink.hpp14
-rw-r--r--src/23/Player/PlayerLink.cpp13
4 files changed, 49 insertions, 22 deletions
diff --git a/config/eur/arm9/overlays/ov023/symbols.txt b/config/eur/arm9/overlays/ov023/symbols.txt
index 4c40c6ff..ccad1771 100644
--- a/config/eur/arm9/overlays/ov023/symbols.txt
+++ b/config/eur/arm9/overlays/ov023/symbols.txt
@@ -274,17 +274,17 @@ func_ov023_02177b50 kind:function(arm,size=0x50) addr:0x2177b50
func_ov023_02177ba0 kind:function(arm,size=0x284) addr:0x2177ba0
func_ov023_02177e24 kind:function(arm,size=0x3c) addr:0x2177e24
func_ov023_02177e60 kind:function(arm,size=0x1c) addr:0x2177e60
-func_ov023_02177e7c kind:function(arm,size=0x8) addr:0x2177e7c
-func_ov023_02177e84 kind:function(arm,size=0xc) addr:0x2177e84
-func_ov023_02177e90 kind:function(arm,size=0x1c8) addr:0x2177e90
-func_ov023_02178058 kind:function(arm,size=0x10c) addr:0x2178058
-func_ov023_02178164 kind:function(arm,size=0x10) addr:0x2178164
-func_ov023_02178174 kind:function(arm,size=0x1c0) addr:0x2178174
-func_ov023_02178334 kind:function(arm,size=0x10) addr:0x2178334
-func_ov023_02178344 kind:function(arm,size=0x10) addr:0x2178344
-func_ov023_02178354 kind:function(arm,size=0xcc) addr:0x2178354
-func_ov023_02178420 kind:function(arm,size=0x210) addr:0x2178420
-func_ov023_02178630 kind:function(arm,size=0xf4) addr:0x2178630
+_ZN10PlayerLink19func_ov023_02177e7cEv kind:function(arm,size=0x8) addr:0x2177e7c
+_ZN10PlayerLink19func_ov023_02177e84Ev kind:function(arm,size=0xc) addr:0x2177e84
+_ZN10PlayerLink19func_ov023_02177e90Ev kind:function(arm,size=0x1c8) addr:0x2177e90
+_ZN10PlayerLink19func_ov023_02178058Ev kind:function(arm,size=0x10c) addr:0x2178058
+_ZN10PlayerLink18GetLinkStateFollowEv kind:function(arm,size=0x10) addr:0x2178164
+_ZN10PlayerLink19func_ov023_02178174Ev kind:function(arm,size=0x1c0) addr:0x2178174
+_ZN10PlayerLink15GetEquipBombchuEv kind:function(arm,size=0x10) addr:0x2178334
+_ZN10PlayerLink14GetEquipShieldEv kind:function(arm,size=0x10) addr:0x2178344
+_ZN10PlayerLink17GiveControlToLinkEv kind:function(arm,size=0xcc) addr:0x2178354
+_ZN10PlayerLink8vfunc_6cEv kind:function(arm,size=0x210) addr:0x2178420
+_ZN10PlayerLink19func_ov023_02178630Ev kind:function(arm,size=0xf4) addr:0x2178630
func_ov023_02178724 kind:function(arm,size=0x80) addr:0x2178724
func_ov023_021787a4 kind:function(arm,size=0x258) addr:0x21787a4
func_ov023_021789fc kind:function(arm,size=0xb4) addr:0x21789fc
diff --git a/config/usa/arm9/overlays/ov023/symbols.txt b/config/usa/arm9/overlays/ov023/symbols.txt
index b9e07a77..7fdaf12b 100644
--- a/config/usa/arm9/overlays/ov023/symbols.txt
+++ b/config/usa/arm9/overlays/ov023/symbols.txt
@@ -274,17 +274,17 @@ func_ov023_02177b50 kind:function(arm,size=0x50) addr:0x2177ab0
func_ov023_02177ba0 kind:function(arm,size=0x284) addr:0x2177b00
func_ov023_02177e24 kind:function(arm,size=0x3c) addr:0x2177d84
func_ov023_02177e60 kind:function(arm,size=0x1c) addr:0x2177dc0
-func_ov023_02177e7c kind:function(arm,size=0x8) addr:0x2177ddc
-func_ov023_02177e84 kind:function(arm,size=0xc) addr:0x2177de4
-func_ov023_02177e90 kind:function(arm,size=0x1c8) addr:0x2177df0
-func_ov023_02178058 kind:function(arm,size=0x10c) addr:0x2177fb8
-func_ov023_02178164 kind:function(arm,size=0x10) addr:0x21780c4
-func_ov023_02178174 kind:function(arm,size=0x1c0) addr:0x21780d4
-func_ov023_02178334 kind:function(arm,size=0x10) addr:0x2178294
-func_ov023_02178344 kind:function(arm,size=0x10) addr:0x21782a4
-func_ov023_02178354 kind:function(arm,size=0xcc) addr:0x21782b4
-func_ov023_02178420 kind:function(arm,size=0x210) addr:0x2178380
-func_ov023_02178630 kind:function(arm,size=0xf4) addr:0x2178590
+_ZN10PlayerLink19func_ov023_02177e7cEv kind:function(arm,size=0x8) addr:0x2177ddc
+_ZN10PlayerLink19func_ov023_02177e84Ev kind:function(arm,size=0xc) addr:0x2177de4
+_ZN10PlayerLink19func_ov023_02177e90Ev kind:function(arm,size=0x1c8) addr:0x2177df0
+_ZN10PlayerLink19func_ov023_02178058Ev kind:function(arm,size=0x10c) addr:0x2177fb8
+_ZN10PlayerLink18GetLinkStateFollowEv kind:function(arm,size=0x10) addr:0x21780c4
+_ZN10PlayerLink19func_ov023_02178174Ev kind:function(arm,size=0x1c0) addr:0x21780d4
+_ZN10PlayerLink15GetEquipBombchuEv kind:function(arm,size=0x10) addr:0x2178294
+_ZN10PlayerLink14GetEquipShieldEv kind:function(arm,size=0x10) addr:0x21782a4
+_ZN10PlayerLink17GiveControlToLinkEv kind:function(arm,size=0xcc) addr:0x21782b4
+_ZN10PlayerLink8vfunc_6cEv kind:function(arm,size=0x210) addr:0x2178380
+_ZN10PlayerLink19func_ov023_02178630Ev kind:function(arm,size=0xf4) addr:0x2178590
func_ov023_02178724 kind:function(arm,size=0x80) addr:0x2178684
func_ov023_021787a4 kind:function(arm,size=0x258) addr:0x2178704
func_ov023_021789fc kind:function(arm,size=0xb4) addr:0x217895c
diff --git a/include/Player/PlayerLink.hpp b/include/Player/PlayerLink.hpp
index 497672d4..08f37469 100644
--- a/include/Player/PlayerLink.hpp
+++ b/include/Player/PlayerLink.hpp
@@ -4,7 +4,10 @@
#include "types.h"
#include "DTCM/UnkStruct_027e0fd4.hpp"
+#include "Player/EquipBombchu.hpp"
+#include "Player/EquipShield.hpp"
#include "Player/LinkStateCutscene.hpp"
+#include "Player/LinkStateFollow.hpp"
#include "Player/PlayerLinkBase.hpp"
class PlayerLink : public PlayerLinkBase {
@@ -48,4 +51,15 @@ public:
static void func_ov014_0213f734(unk32 *param1, UnkStruct_027e0fd4 *param2);
void func_ov014_0213f740();
void func_ov014_0213f97c();
+
+ unk32 func_ov023_02177e7c();
+ unk32 func_ov023_02177e84();
+ void func_ov023_02177e90();
+ bool func_ov023_02178058();
+ static LinkStateFollow *GetLinkStateFollow();
+ void func_ov023_02178174();
+ static EquipBombchu *GetEquipBombchu();
+ static EquipShield *GetEquipShield();
+ void GiveControlToLink();
+ void func_ov023_02178630();
};
diff --git a/src/23/Player/PlayerLink.cpp b/src/23/Player/PlayerLink.cpp
new file mode 100644
index 00000000..6911221f
--- /dev/null
+++ b/src/23/Player/PlayerLink.cpp
@@ -0,0 +1,13 @@
+#include "Player/PlayerLink.hpp"
+
+unk32 PlayerLink::func_ov023_02177e7c() {}
+unk32 PlayerLink::func_ov023_02177e84() {}
+void PlayerLink::func_ov023_02177e90() {}
+bool PlayerLink::func_ov023_02178058() {}
+LinkStateFollow *PlayerLink::GetLinkStateFollow() {}
+void PlayerLink::func_ov023_02178174() {}
+EquipBombchu *PlayerLink::GetEquipBombchu() {}
+EquipShield *PlayerLink::GetEquipShield() {}
+void PlayerLink::GiveControlToLink() {}
+void PlayerLink::vfunc_6c() {}
+void PlayerLink::func_ov023_02178630() {}