From a9603984e20aae6d613c459f9854cbf335684dd9 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sat, 6 Jul 2024 15:58:19 -0400
Subject: [PATCH] update references to new labels

---
 Items/goldstar.asm           |  3 ---
 Masks/mask_routines.asm      |  8 ++++----
 Sprites/Objects/minecart.asm | 12 ++++++------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Items/goldstar.asm b/Items/goldstar.asm
index d9628a6..f60717d 100644
--- a/Items/goldstar.asm
+++ b/Items/goldstar.asm
@@ -6,9 +6,6 @@
 ; $22XXXX - Denotes the source address from all in patch
 ; =========================================================
 
-org $07D576
-  Hookshot_CheckTileCollision:
-
 pullpc
 TransferGFXinRAM:
 {
diff --git a/Masks/mask_routines.asm b/Masks/mask_routines.asm
index 737edc5..972514e 100644
--- a/Masks/mask_routines.asm
+++ b/Masks/mask_routines.asm
@@ -469,14 +469,14 @@ DekuLink_HoverBasedOnInput:
   JSR HandleMovement
   
   JSL Link_HandleCardinalCollision_Long
-  JSL $07E245 ; Link_HandleVelocity
-  JSL $07E6A6 ; Link_HandleMovingAnimation_FullLongEntry
+  JSL Link_HandleVelocityAndSandDrag
+  JSL Link_HandleMovingAnimation_FullLongEntry
 
   STZ.w $0302
 
-  JSL $07F42F ; HandleIndoorCameraAndDoors_Long
+  JSL HandleIndoorCameraAndDoors
   
-  JSL Player_HaltDashAttack
+  JSL Link_CancelDash
   
   ; Pos - Cache Pos = difference
   LDA $22 : SEC : SBC $3F : STA $31
diff --git a/Sprites/Objects/minecart.asm b/Sprites/Objects/minecart.asm
index 0f1dd34..6a3a9bc 100644
--- a/Sprites/Objects/minecart.asm
+++ b/Sprites/Objects/minecart.asm
@@ -145,9 +145,9 @@ macro HandlePlayerCamera()
   PHX 
   
   JSL $07E6A6 ; Link_HandleMovingAnimation_FullLongEntry
-  JSL $07F42F ; HandleIndoorCameraAndDoors_Long
+  JSL HandleIndoorCameraAndDoors
   
-  JSL Player_HaltDashAttack
+  JSL Link_CancelDash
   PLX 
 endmacro
 
@@ -270,7 +270,7 @@ Sprite_Minecart_Main:
         LDA.w SprMiscF, X : BNE .active_cart
           LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button
         .active_cart
-        JSL Player_HaltDashAttack            ; Stop the player from dashing
+        JSL Link_CancelDash            ; Stop the player from dashing
         LDA #$02 : STA $02F5                 ; Somaria platform and moving 
         LDA $0FDA : SEC : SBC #$0B : STA $20 ; Adjust player pos
         LDA #$01 : STA !LinkInCart           ; Set Link in cart flag
@@ -306,7 +306,7 @@ Sprite_Minecart_Main:
         LDA.w SprMiscF, X : BNE .active_cart
           LDA $F4 : AND.b #$80 : BEQ .not_ready ; Check for B button
         .active_cart
-        JSL Player_HaltDashAttack            ; Stop the player from dashing
+        JSL Link_CancelDash            ; Stop the player from dashing
         LDA #$02 : STA $02F5                 ; Somaria platform and moving 
         LDA $0FDA : SEC : SBC #$0B : STA $20 ; Adjust player pos 
         LDA #$01 : STA !LinkInCart           ; Set Link in cart flag
@@ -505,7 +505,7 @@ HandleTileDirections:
       %SetTimerA($40)
       %StopCart()
       %GotoAction(1) ; Minecart_WaitVert
-      JSL Player_ResetState
+      JSL Link_ResetProperties_A
       RTS
     
     .stop_east
@@ -524,7 +524,7 @@ HandleTileDirections:
       %SetTimerA($40)
       %StopCart()
       %GotoAction(0) ; Minecart_WaitHoriz
-      JSL Player_ResetState
+      JSL Link_ResetProperties_A
       RTS
 
     ; -----------------------------------------------------