diff --git a/include/functions.h b/include/functions.h
index b9976ca3c..8e0e493c2 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1934,7 +1934,7 @@ void Health_GiveHearts(s16 hearts);
 void Rupees_ChangeBy(s16 rupeeChange);
 void Inventory_ChangeAmmo(s16 item, s16 ammoChange);
 void Magic_Add(GlobalContext* globalCtx, s16 magicToAdd);
-void Magic_Reset(GameState* gamestate);
+void Magic_Reset(GlobalContext* globalCtx);
 s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 type);
 // void func_80116FD8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
 // void func_801170B8(void);
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 7b87ac47f..d933843c5 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -2218,7 +2218,7 @@ s32 func_800B90AC(GlobalContext* globalCtx, Actor* actor, CollisionPoly* polygon
 void Actor_DisableLens(GlobalContext* globalCtx) {
     if (globalCtx->actorCtx.lensActive) {
         globalCtx->actorCtx.lensActive = false;
-        Magic_Reset(&globalCtx->state);
+        Magic_Reset(globalCtx);
     }
 }
 
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 873eb9112..263961f42 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -3174,7 +3174,7 @@ void Magic_Add(GlobalContext* globalCtx, s16 magicToAdd) {
     }
 }
 
-void Magic_Reset(GameState* gamestate) {
+void Magic_Reset(GlobalContext* globalCtx) {
     if ((gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) && (gSaveContext.magicState != MAGIC_STATE_FILL)) {
         sMagicMeterOutlinePrimRed = sMagicMeterOutlinePrimGreen = sMagicMeterOutlinePrimBlue = 255;
         gSaveContext.magicState = MAGIC_STATE_IDLE;
diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
index ce671a03c..3739af3de 100644
--- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
@@ -81,7 +81,7 @@ void ArrowFire_Init(Actor* thisx, GlobalContext* globalCtx) {
 void ArrowFire_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     ArrowFire* this = THIS;
 
-    Magic_Reset(&globalCtx->state);
+    Magic_Reset(globalCtx);
     Collider_DestroyQuad(globalCtx, &this->collider1);
     Collider_DestroyQuad(globalCtx, &this->collider2);
 }
diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
index 83f34f8d7..2b492f2dc 100644
--- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
@@ -57,7 +57,7 @@ void ArrowIce_Init(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void ArrowIce_Destroy(Actor* thisx, GlobalContext* globalCtx) {
-    Magic_Reset(&globalCtx->state);
+    Magic_Reset(globalCtx);
     (void)"消滅"; // Unreferenced in retail, means "Disappearance"
 }
 
diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
index bb9ec4878..9f84bd0ef 100644
--- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
@@ -56,7 +56,7 @@ void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx) {
-    Magic_Reset(&globalCtx->state);
+    Magic_Reset(globalCtx);
     (void)"消滅"; // Unreferenced in retail, means "Disappearance"
 }
 
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index a88170bd6..1bfb0e071 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -139,7 +139,7 @@ void EnArrow_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     }
 
     if ((this->actor.params >= ENARROW_3) && (this->actor.params < ENARROW_6) && (this->actor.child == NULL)) {
-        Magic_Reset(&globalCtx->state);
+        Magic_Reset(globalCtx);
     }
 }
 
@@ -162,13 +162,13 @@ void func_8088A594(EnArrow* this, GlobalContext* globalCtx) {
             this->bubble.unk_148++;
             if (this->bubble.unk_148 > 20) {
                 this->actionFunc = func_8088ACE0;
-                Magic_Reset(&globalCtx->state);
+                Magic_Reset(globalCtx);
             }
         }
     } else {
         if ((this->actor.params != ENARROW_8) && (player->unk_D57 == 0)) {
             if (this->actor.params == ENARROW_7) {
-                Magic_Reset(&globalCtx->state);
+                Magic_Reset(globalCtx);
             }
             Actor_MarkForDeath(&this->actor);
             return;
@@ -202,7 +202,7 @@ void func_8088A594(EnArrow* this, GlobalContext* globalCtx) {
             this->bubble.unk_144 = CLAMP_MIN(this->bubble.unk_144, 3.5f);
             func_8088A514(this);
             this->unk_260 = 99;
-            Magic_Reset(&globalCtx->state);
+            Magic_Reset(globalCtx);
         } else if (this->actor.params >= ENARROW_6) {
             if ((this->actor.params == ENARROW_8) && (this->actor.world.rot.x < 0)) {
                 Actor_SetScale(&this->actor, 0.009f);
@@ -311,7 +311,7 @@ void func_8088AA98(EnArrow* this, GlobalContext* globalCtx) {
                 return;
             }
 
-            Magic_Reset(&globalCtx->state);
+            Magic_Reset(globalCtx);
         }
     }
 }
diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c
index ef986e2be..c07600c7c 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c
+++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c
@@ -38,7 +38,7 @@ void OceffWipe6_Init(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void OceffWipe6_Destroy(Actor* thisx, GlobalContext* globalCtx) {
-    Magic_Reset(&globalCtx->state);
+    Magic_Reset(globalCtx);
     globalCtx->msgCtx.unk120B0 = 0;
 }