scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore Minecart sprite behavior

Browse Source
This commit is contained in:
scawful
2024-12-20 17:22:37 -05:00
parent 583d7416c5
commit f034a5c108
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sprites/NPCs/followers.asm
View File

@@ -795,12 +795,14 @@ MinecartFollower_TransitionToSprite:
.finish_prep .finish_prep
LDA.w POSYH : STA.w SprYH, X LDA.w POSYH : STA.w SprYH, X
LDA.w POSXH : STA.w SprXH, X LDA.w POSXH : STA.w SprXH, X
LDA.w !MinecartDirection : CLC : ADC.b #$04 : STA.w SprSubtype, X LDA.w !MinecartDirection
CLC : ADC.b #$04
STA.w SprSubtype, X
LDA Minecart_AnimDirection, X : STA $0D90, X LDA Minecart_AnimDirection, X : STA $0D90, X
JSL Sprite_Minecart_Prep JSL Sprite_Minecart_Prep
LDA.b #$00 : STA.l $7EF3CC LDA.b #$00 : STA.l $7EF3CC
RTS RTL
} }
; Minecart Follower Main Routine and Draw ; Minecart Follower Main Routine and Draw
@@ -818,8 +820,8 @@ DrawMinecartFollower:
; Check the current submodule in the underworld ; Check the current submodule in the underworld
LDA.b $11 : BNE .dont_spawn LDA.b $11 : BNE .dont_spawn
LDA !LinkInCart : BEQ .dont_spawn LDA !LinkInCart : BEQ .dont_spawn
LDA.b #$09 : STA.b LinkState ;LDA.b #$09 : STA.b LinkState
;JSR MinecartFollower_TransitionToSprite JSL MinecartFollower_TransitionToSprite
.dont_spawn .dont_spawn
RTS RTS
} }