From ee09b6dacc9bcab869a22834b3776a6231563e59 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 16 Feb 2025 10:41:21 -0500
Subject: [PATCH] Add comment for checking MinecartTrack positions with
 breakpoint

---
 Sprites/Objects/minecart.asm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/Sprites/Objects/minecart.asm b/Sprites/Objects/minecart.asm
index c393a96..ae267a9 100644
--- a/Sprites/Objects/minecart.asm
+++ b/Sprites/Objects/minecart.asm
@@ -197,16 +197,17 @@ Sprite_Minecart_Prep:
     .killMinecart
     SEP #$20
     STZ.w SprState, X
-
     PLB
     RTL
   .inRoom
 
   ; Check if the coordinates match, if not kill the sprite.
+  ; If cart isn't appearring in room, check here for values to match
+  ; against the MiencartTrack table values.
+  ; print "MinecartPrep_CheckCoords ", pc
   LDA.w !MinecartTrackX, Y : CMP.w SprCachedX : BNE .killMinecart
-  LDA.w !MinecartTrackY, Y : CMP.w SprCachedY : BNE .killMinecart
-  SEP #$20
-
+    LDA.w !MinecartTrackY, Y : CMP.w SprCachedY : BNE .killMinecart
+      SEP #$20
   .active1
 
   STZ.w SprMiscG, X ; Clear the active tossing flag
@@ -307,7 +308,7 @@ Sprite_Minecart_Prep:
   ; This is which room each track should start in if it hasn't already
   ; been given a track.
   .TrackStartingRooms
-  dw $0089, $0089, $0089, $0088, $0089, $0089, $0089, $0089
+  dw $0098, $0088, $0089, $0088, $0089, $0089, $0089, $0089
   dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089
   dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089
   dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089
@@ -316,20 +317,16 @@ Sprite_Minecart_Prep:
   ; already been given a position. This is necessary to allow for more
   ; than one stopping point to be in one room.
   .TrackStartingX
-  dw $1320, $12D0, $1300, $1100, $1300, $1300, $1300, $1300
+  dw $1190, $12D0, $1300, $1100, $1300, $1300, $1300, $1300
   dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300
   dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300
   dw $1300, $1300, $1300, $1300, $1300, $1300, $1300, $1300
 
   .TrackStartingY
-  dw $11C0, $1120, $1100, $10D0, $1100, $1100, $1100, $1100
+  dw $1380, $1120, $1100, $10D0, $1100, $1100, $1100, $1100
   dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100
   dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100
   dw $1100, $1100, $1100, $1100, $1100, $1100, $1100, $1100
-
-  ; NOTE TO SCAWFUL: All of these values will need to be set when you
-  ; place the carts within ZS. I set them all to spawn in the middle of
-  ; room 0x89 just for testing purposes.
 }
 
 ; =========================================================