Add MinecartFollower_TransitionToSprite for DrawMinecartFollwer

This commit is contained in:
scawful
2024-12-10 19:17:05 -05:00
parent 5368f498ea
commit 50f18743d1

View File

@@ -775,21 +775,8 @@ MinecartFollower_Bottom:
db $3D, $7D db $3D, $7D
} }
; Minecart Follower Main Routine and Draw MinecartFollower_TransitionToSprite:
DrawMinecartFollower:
{ {
JSL $099EFC ; Follower_Initialize
LDX !MinecartDirection
LDA .direction_to_anim, X : STA $02CF
JSR FollowerDraw_CachePosition
JSR MinecartFollower_Top
JSR MinecartFollower_Bottom
; Check the current submodule in the underworld
LDA.b $11 : BNE .dont_spawn
LDA !LinkInCart : BEQ .dont_spawn
LDA.b #$A3 LDA.b #$A3
JSL Sprite_SpawnDynamically JSL Sprite_SpawnDynamically
TYX TYX
@@ -810,13 +797,32 @@ DrawMinecartFollower:
LDA .direction_to_anim, X : STA $0D90, X LDA .direction_to_anim, X : STA $0D90, X
JSL Sprite_Minecart_Prep JSL Sprite_Minecart_Prep
LDA.b #$00 : STA.l $7EF3CC LDA.b #$00 : STA.l $7EF3CC
.dont_spawn
RTS RTS
.direction_to_anim .direction_to_anim
db $02, $00, $02, $00 db $02, $00, $02, $00
} }
; Minecart Follower Main Routine and Draw
DrawMinecartFollower:
{
JSL $099EFC ; Follower_Initialize
LDX !MinecartDirection
LDA .direction_to_anim, X : STA $02CF
JSR FollowerDraw_CachePosition
JSR MinecartFollower_Top
JSR MinecartFollower_Bottom
; Check the current submodule in the underworld
LDA.b $11 : BNE .dont_spawn
LDA !LinkInCart : BEQ .dont_spawn
JSR MinecartFollower_TransitionToSprite
.dont_spawn
RTS
}
FollowerDraw_CachePosition: FollowerDraw_CachePosition:
{ {
LDX.b #$00 LDX.b #$00
@@ -933,8 +939,18 @@ CheckForFollowerIntraroomTransition:
RTL RTL
} }
LinkState_Minecart:
{
RTL
}
pushpc pushpc
org $07A50F
JSL LinkState_Minecart
RTS
; Follower_OldManUnused ; Follower_OldManUnused
org $09A41F org $09A41F
JSL CheckForMinecartFollowerDraw JSL CheckForMinecartFollowerDraw