fix korok gfx initialization

This commit is contained in:
scawful
2024-08-18 21:52:28 -04:00
parent a90e73f06c
commit 2c38035279

View File

@@ -12,7 +12,7 @@
!SmallShadow = 00 ; 01 = small shadow, 00 = no shadow !SmallShadow = 00 ; 01 = small shadow, 00 = no shadow
!Shadow = 01 ; 00 = don't draw shadow, 01 = draw a shadow !Shadow = 01 ; 00 = don't draw shadow, 01 = draw a shadow
!Palette = 00 ; Unused in this template (can be 0 to 7) !Palette = 00 ; Unused in this template (can be 0 to 7)
!Hitbox = 00 ; 00 to 31, can be viewed in sprite draw tool !Hitbox = 03 ; 00 to 31, can be viewed in sprite draw tool
!Persist = 01 ; 01 = your sprite continue to live offscreen !Persist = 01 ; 01 = your sprite continue to live offscreen
!Statis = 00 ; 00 = is sprite is alive?, (kill all enemies room) !Statis = 00 ; 00 = is sprite is alive?, (kill all enemies room)
!CollisionLayer = 00 ; 01 = will check both layer for collision !CollisionLayer = 00 ; 01 = will check both layer for collision
@@ -35,18 +35,20 @@ Sprite_Korok_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
LDA.w SprSubtype, X : CMP.b #$00 : BEQ .draw_makar LDA $0AA5 : BEQ .done
CMP.b #$01 : BEQ .draw_hollo LDA.w SprSubtype, X
CMP.b #$02 : BEQ .draw_rown CMP.b #$00 : BEQ .draw_makar
.draw_makar CMP.b #$01 : BEQ .draw_hollo
JSR Sprite_Korok_DrawMakar CMP.b #$02 : BEQ .draw_rown
BRA .done .draw_makar
.draw_hollo JSR Sprite_Korok_DrawMakar
JSR Sprite_Korok_DrawHollo BRA .done
BRA .done .draw_hollo
.draw_rown JSR Sprite_Korok_DrawHollo
JSR Sprite_Korok_DrawRown BRA .done
BRA .done .draw_rown
JSR Sprite_Korok_DrawRown
BRA .done
.done .done
JSL Sprite_DrawShadow JSL Sprite_DrawShadow
@@ -63,38 +65,42 @@ Sprite_Korok_Long:
Sprite_Korok_Prep: Sprite_Korok_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
JSL GetRandomInt : AND.b #$02 : STA.w SprSubtype, X JSL GetRandomInt : AND.b #$02 : STA.w SprSubtype, X
STZ.w SprMiscE, X
PLB PLB
RTL RTL
} }
KorokWalkSpeed = $02
Sprite_Korok_Main: Sprite_Korok_Main:
{ {
JSL Sprite_PlayerCantPassThrough
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL UseImplicitRegIndexedLocalJumpTable
dw Sprite_Korok_Idle dw Sprite_Korok_Idle
dw Sprite_Korok_WalkingDown
dw Sprite_Korok_WalkingUp
dw Sprite_Korok_WalkingLeft
dw Sprite_Korok_WalkingRight
dw Sprite_Korok_Liftable
Sprite_Korok_Idle: Sprite_Korok_Idle:
{ {
%PlayAnimation(0, 0, 10) %PlayAnimation(0, 0, 10)
LDA.w SprMiscE, X : BNE + LDA $0AA5 : BNE +
PHX PHX
JSL ApplyKorokSpriteSheets JSL ApplyKorokSpriteSheets
PLX PLX
LDA.b #$01 : STA.w SprMiscE, X LDA.b #$01 : STA.w $0AA5
+ +
%ShowSolicitedMessage($001D) %ShowSolicitedMessage($001D) : BCC .no_talk
JSL Sprite_CheckIfLifted JSL GetRandomInt : AND.b #$03
JSL ThrownSprite_TileAndSpriteInteraction_long STA.w SprAction, X
JSL Sprite_Move RTS
.no_talk
JSL Sprite_PlayerCantPassThrough
RTS RTS
} }