From 9f0f17ebf34d2c2526538c82854b1dfffdf11c96 Mon Sep 17 00:00:00 2001 From: scawful Date: Thu, 4 Jul 2024 15:41:58 -0400 Subject: [PATCH] fix minecart transition direction logic --- Sprites/Objects/minecart.asm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Sprites/Objects/minecart.asm b/Sprites/Objects/minecart.asm index a779653..b22b839 100644 --- a/Sprites/Objects/minecart.asm +++ b/Sprites/Objects/minecart.asm @@ -97,7 +97,7 @@ Sprite_Minecart_Prep: ; If the subtype is > 4, then it's an active cart LDA.w SprSubtype, X : CMP.b #$04 : BCC .continue - LDA.w SprSubtype, X : SEC : SBC.b #$04 : STA.w SprSubtype, X + LDA.w SprSubtype, X : SEC : SBC.b #$03 : STA.w SprSubtype, X LDA.b #$01 : STA.w SprMiscF, X ; Set the auto-move flag .continue LDA #$00 : STA $0CAA, X ; Sprite persist in dungeon @@ -1058,7 +1058,8 @@ DrawMinecartFollower: .finish_prep LDA POSYH : STA.w SprYH, X LDA POSXH : STA.w SprXH, X - LDA.w !MinecartDirection : CLC : ADC.b #$04 : STA.w SprSubtype, X + LDA.w !MinecartDirection : CLC : ADC.b #$03 : STA.w SprSubtype, X + LDA .direction_to_anim, X : STA $0D90, X JSL Sprite_Minecart_Prep LDA.b #$00 : STA.l $7EF3CC