From 62b4ad4e999f1884e19c1e6770e1966f78ce6d1e Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 24 Mar 2025 21:02:28 -0400
Subject: [PATCH] Update minecart and pedestal sprite positions; clean up
 switch track code

---
 Sprites/Objects/minecart.asm     |  4 ++--
 Sprites/Objects/pedestal.asm     |  3 ++-
 Sprites/Objects/switch_track.asm | 12 +++---------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Sprites/Objects/minecart.asm b/Sprites/Objects/minecart.asm
index e3bf967..a1274bc 100644
--- a/Sprites/Objects/minecart.asm
+++ b/Sprites/Objects/minecart.asm
@@ -317,13 +317,13 @@ 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 $1190, $12D0, $1300, $1100, $1300, $1300, $1300, $1300
+  dw $1190, $1160, $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 $1380, $1120, $1100, $10D0, $1100, $1100, $1100, $1100
+  dw $1380, $10C9, $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
diff --git a/Sprites/Objects/pedestal.asm b/Sprites/Objects/pedestal.asm
index 451eb09..f4364ff 100644
--- a/Sprites/Objects/pedestal.asm
+++ b/Sprites/Objects/pedestal.asm
@@ -5,6 +5,7 @@
 ; Fortress Secrets (Map 5E)
 
 pushpc
+; Sprite_B3_PedestalPlaque
 org $1EE05F
   JSL CheckForBook
 pullpc
@@ -37,7 +38,7 @@ PedestalPlaque:
                     CMP.b #$5E : BEQ .fortress_secrets
                       JMP .return
   .zora_temple
-    
+
     LDA.l $7EF29E : AND.b #$20 : BNE .return
       LDA.b SongFlag : CMP.b #$03 : BNE .return
         LDA.b #$01 : STA $04C6
diff --git a/Sprites/Objects/switch_track.asm b/Sprites/Objects/switch_track.asm
index a98143f..35f6e5d 100644
--- a/Sprites/Objects/switch_track.asm
+++ b/Sprites/Objects/switch_track.asm
@@ -29,9 +29,7 @@
 !ImpervSwordHammer  = 00  ; 01 = Impervious to sword and hammer attacks
 !Boss               = 00  ; 00 = normal sprite, 01 = sprite is a boss
 
-%Set_Sprite_Properties(Sprite_RotatingTrack_Prep, Sprite_RotatingTrack_Long);
-
-; =========================================================
+%Set_Sprite_Properties(Sprite_RotatingTrack_Prep, Sprite_RotatingTrack_Long)
 
 Sprite_RotatingTrack_Long:
 {
@@ -44,8 +42,6 @@ Sprite_RotatingTrack_Long:
   RTL
 }
 
-; =========================================================
-
 Sprite_RotatingTrack_Prep:
 {
   PHB : PHK : PLB
@@ -55,10 +51,10 @@ Sprite_RotatingTrack_Prep:
   ; We use AND #$F8 to clamp to a 8x8 grid.
   ; Subtract 8 from the Y position to get the tile right above instead.
   LDA.w SprY, X : AND #$F8 : SEC : SBC.b #$08 : STA.b $00
-  LDA.w SprYH, X                              : STA.b $01
+  LDA.w SprYH, X : STA.b $01
 
   LDA.w SprX, X : AND #$F8 : STA.b $02
-  LDA.w SprXH, X           : STA.b $03
+  LDA.w SprXH, X : STA.b $03
 
   ; Fetch tile attributes based on current coordinates
   LDA.b #$00 : JSL Sprite_GetTileAttr
@@ -140,8 +136,6 @@ Sprite_RotatingTrack_Main:
   }
 }
 
-; =========================================================
-
 Sprite_RotatingTrack_Draw:
 {
   JSL Sprite_PrepOamCoord