diff --git a/Sprites/Objects/minecart.asm b/Sprites/Objects/minecart.asm index cbb33e0..d19ec48 100644 --- a/Sprites/Objects/minecart.asm +++ b/Sprites/Objects/minecart.asm @@ -210,7 +210,7 @@ HandleToss: %GotoAction(0) ; Minecart_WaitHoriz .continue LDA #$01 : STA SprMiscG, X - LDA #$10 : STA SprTimerC, X + LDA #$12 : STA SprTimerC, X STA SprYRound, X : STA SprXRound, X RTS } @@ -1049,9 +1049,10 @@ MinecartFollower_Bottom: db $02, $02 } +; Minecart Follower Main Routine and Draw DrawMinecartFollower: { - JSL $099EFC + JSL $099EFC ; Follower_Initialize LDX $012B LDA .direction_to_anim, X diff --git a/Sprites/Objects/mineswitch.asm b/Sprites/Objects/mineswitch.asm index d7beda1..419a060 100644 --- a/Sprites/Objects/mineswitch.asm +++ b/Sprites/Objects/mineswitch.asm @@ -55,7 +55,7 @@ Sprite_LeverSwitch_Prep: { PHB : PHK : PLB - LDA.b #$80 : STA.w SprDefl, X + LDA.b #$00 : STA.w SprDefl, X LDA SprSubtype, X : STA SprAction, X LDA.b #$00 : STA.w SprTileDie, X STZ.w SprBulletproof, X @@ -89,16 +89,9 @@ Sprite_LeverSwitch_Main: STZ.w $37 LDA #$10 : STA SprTimerA, X - JSL $1EA007 ; GarnishSpawn_Sparkle %GotoAction(1) .NoDamage - ; Check for boomerang intersection - LDA.w SprX, X : CMP.w $0399 : BNE .NoBoomHit - LDA.w SprY, X : CMP.w $039B : BNE .NoBoomHit - JMP .BoomHit - .NoBoomHit - RTS }