LinkState4 -> LinkStateRoll

asm/ov00/Player/LinkStateInteract.s

@@ -1022,7 +1022,7 @@ _020ab000:
 	bl _ZN13LinkStateBase19GetCurrentCharacterEv
 	cmp r0, #1
 	bne _020ab060
-	bl _ZN17LinkStateInteract13GetLinkState4Ev
+	bl _ZN17LinkStateInteract16GetLinkStateRollEv
 	add r2, sp, #0x50
 	mov r1, r6
 	bl func_ov23_02171410
@@ -1275,14 +1275,14 @@ _020ab3dc: .word 0x00001ccd
 _020ab3e0: .word 0x00001333
 _020ab3e4: .word 0x000018e4
 
-	.global _ZN17LinkStateInteract13GetLinkState4Ev
-	arm_func_start _ZN17LinkStateInteract13GetLinkState4Ev
-_ZN17LinkStateInteract13GetLinkState4Ev: ; 0x020ab3e8
+	.global _ZN17LinkStateInteract16GetLinkStateRollEv
+	arm_func_start _ZN17LinkStateInteract16GetLinkStateRollEv
+_ZN17LinkStateInteract16GetLinkStateRollEv: ; 0x020ab3e8
 	ldr ip, _020ab3f4 ; =func_01fffcd8
 	mov r0, #4
 	bx ip
 	.align 2, 0
-	arm_func_end _ZN17LinkStateInteract13GetLinkState4Ev
+	arm_func_end _ZN17LinkStateInteract16GetLinkStateRollEv
 _020ab3f4: .word func_01fffcd8
 
 	.global _ZN17LinkStateInteract8vfunc_24Ei

asm/ov00/include/ov00_020ae7a4.inc

@@ -267,7 +267,7 @@
 .extern _ZNK11ItemManager19GetActiveFairyLevelEi
 .extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
 .extern func_01fffcd8
-.extern _ZN17LinkStateInteract13GetLinkState4Ev
+.extern _ZN17LinkStateInteract16GetLinkStateRollEv
 .extern func_ov05_02107b74
 .extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
 .extern func_ov05_0210a0c0

asm/ov00/ov00_020ae7a4.s

@@ -17139,7 +17139,7 @@ func_ov00_020bc1c8: ; 0x020bc1c8
 	mov r6, r1
 	mov r5, r2
 	mov r4, r3
-	bl _ZN17LinkStateInteract13GetLinkState4Ev
+	bl _ZN17LinkStateInteract16GetLinkStateRollEv
 	mov r1, r6
 	mov r2, r5
 	mov r3, r4
@@ -17160,7 +17160,7 @@ _020bc20c: .word data_027e0fac
 	arm_func_start func_ov00_020bc210
 func_ov00_020bc210: ; 0x020bc210
 	stmdb sp!, {r3, lr}
-	bl _ZN17LinkStateInteract13GetLinkState4Ev
+	bl _ZN17LinkStateInteract16GetLinkStateRollEv
 	mov r1, #1
 	strb r1, [r0, #0x28]
 	mov r0, r1
@@ -18657,7 +18657,7 @@ _020bd408:
 	mov r0, #0
 	ldmneia sp!, {r3, r4, r5, r6, r7, pc}
 	strb r0, [sp, #4]
-	bl _ZN17LinkStateInteract13GetLinkState4Ev
+	bl _ZN17LinkStateInteract16GetLinkStateRollEv
 	add ip, sp, #4
 	mov r1, r6
 	mov r2, r5
@@ -18684,7 +18684,7 @@ _020bd484:
 	ldrb r0, [sp, #4]
 	cmp r0, #0
 	beq _020bd4b8
-	bl _ZN17LinkStateInteract13GetLinkState4Ev
+	bl _ZN17LinkStateInteract16GetLinkStateRollEv
 	ldr r2, [r0]
 	mov r1, #0
 	ldr r2, [r2, #0x20]

docs/link.md

@@ -13,7 +13,7 @@ shared outside of the active state handler.
 1      | `LinkStateItem`     | Handles item usage.
 2      | `LinkStateInteract` | Handles talking to NPCs and grabbing/pushing/pulling objects.
 3      | `LinkStateFollow`   | Handles moving toward objects.
-4      | `LinkState4`        | Unknown
+4      | `LinkStateRoll`     | Unknown
 5      | `LinkStateDamage`   | Handles receiving damage.
 6      | `LinkStateItemGet`  | Handles getting items.
 

include/Player/LinkStateInteract.hpp

@@ -6,7 +6,7 @@
 #include "lib/math.h"
 
 #include "Player/LinkStateBase.hpp"
-#include "Player/LinkState4.hpp"
+#include "Player/LinkStateRoll.hpp"
 #include "Actor/ActorManager.hpp"
 #include "Actor/Actor.hpp"
 
@@ -37,7 +37,7 @@ public:
     s32 GetGrabActorId();
     bool func_ov00_020aa818();
     void func_ov00_020aa844(Actor *param1);
-    LinkState4* GetLinkState4();
+    LinkStateRoll* GetLinkStateRoll();
     void SetGrabActorVelocity(Vec3p *velocity);
     void SetBombVelocity(Vec3p *velocity);
     void func_ov00_020ab6c8();

include/Player/LinkStateRoll.hpp

@@ -5,7 +5,7 @@
 
 #include "Player/LinkStateBase.hpp"
 
-class LinkState4 : public LinkStateBase {
+class LinkStateRoll : public LinkStateBase {
 public:
     /* 00 (base) */
     /* 0c */ unk16 mUnk_0c;
@@ -30,7 +30,7 @@ public:
     /* 98 */
 
     /* 00 */ virtual void vfunc_00() override;
-    /* 04 */ virtual ~LinkState4() override;
+    /* 04 */ virtual ~LinkStateRoll() override;
     /* 0c */ virtual LinkStateId GetId() override;
     /* 10 */ virtual void CreateDebugHierarchy() override;
     /* 14 */ virtual void OnStateEnter() override;

src/00_Core/Player/LinkStateInteract.cpp

@@ -11,7 +11,7 @@ void LinkStateInteract::OnStateLeave(s32 param1) {}
 bool LinkStateInteract::func_ov00_020aa818() {}
 void LinkStateInteract::func_ov00_020aa844(Actor *param1) {}
 bool LinkStateInteract::vfunc_20(s32 param1) {}
-LinkState4* LinkStateInteract::GetLinkState4() {}
+LinkStateRoll* LinkStateInteract::GetLinkStateRoll() {}
 bool LinkStateInteract::vfunc_24(s32 param1) {}
 bool LinkStateInteract::vfunc_34(Vec3p *param1) {}
 void LinkStateInteract::SetGrabActorVelocity(Vec3p *velocity) {}