3 files changed, 10 insertions, 19 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index e6ea5ff88..0342dd8f0 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -1,6 +1,7 @@
 #include <ultra64.h>
 #include <global.h>
 #include <vt.h>
+#include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h"
 
 #include "overlays/actors/ovl_En_Part/z_en_part.h"
 
@@ -1020,24 +1021,14 @@ s32 func_8002DDF4(GlobalContext* globalCtx) {
     return player->stateFlags2 & 0x1000;
 }
 
-typedef struct {
-    /* 0x000 */ Actor actor;
-    /* 0x14C */ char unk_14C[0xB4];
-    /* 0x200 */ Actor* unk_200;
-    /* 0x204 */ f32 unk_204;
-    /* 0x208 */ f32 unk_208;
-    /* 0x20C */ f32 unk_20C;
-    /* 0x210 */ s16 unk_210;
-} ActorArmsHook;
-
 void func_8002DE04(GlobalContext* globalCtx, Actor* actorA, Actor* actorB) {
-    ActorArmsHook* hookActor;
+    ArmsHook* hookshot;
 
-    hookActor = (ActorArmsHook*)Actor_Find(&globalCtx->actorCtx, 0x0066, ACTORTYPE_ITEMACTION);
-    hookActor->unk_200 = actorB;
-    hookActor->unk_204 = 0.0f;
-    hookActor->unk_208 = 0.0f;
-    hookActor->unk_20C = 0.0f;
+    hookshot = (ArmsHook*)Actor_Find(&globalCtx->actorCtx, ACTOR_ARMS_HOOK, ACTORTYPE_ITEMACTION);
+    hookshot->grabbed = actorB;
+    hookshot->grabbedDistDiff.x = 0.0f;
+    hookshot->grabbedDistDiff.y = 0.0f;
+    hookshot->grabbedDistDiff.z = 0.0f;
     actorB->flags |= 0x2000;
     actorA->flags &= ~0x2000;
 }
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 3ad00ee29..6082a593e 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -1134,7 +1134,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) {
 
             if ((globalCtx->transitionMode == 3) || (globalCtx->transitionMode == 11) ||
                 (globalCtx->transitionCtx.transitionType >= 56)) {
-                View view;         // 0xA0
+                View view; // 0xA0
 
                 View_Init(&view, gfxCtx);
                 view.flags = 2 | 8;
diff --git a/src/code/z_sample.c b/src/code/z_sample.c
index a6bed1e3c..bd6cbd555 100644
--- a/src/code/z_sample.c
+++ b/src/code/z_sample.c
@@ -52,10 +52,10 @@ void Sample_Destroy(SampleContext* this) {
 void Sample_SetupView(SampleContext* this) {
     View* view;
     GraphicsContext* gfxCtx;
-    
+
     view = &this->view;
     gfxCtx = this->state.gfxCtx;
-    
+
     View_Init(view, gfxCtx);
     SET_FULLSCREEN_VIEWPORT(view);
     func_800AA460(view, 60, 10, 12800);