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

update wolfos sprite

Browse Source
This commit is contained in:
scawful
2024-07-04 16:26:06 -04:00
parent 51f211a61d
commit df5ee69a25
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Sprites/Bosses/wolfos.asm
View File

@@ -65,9 +65,8 @@ Sprite_Wolfos_Prep:
RTL RTL
.spawn_wolfos .spawn_wolfos
LDA.b #$40 : STA.w SprTimerA, X LDA.b #$40 : STA.w SprTimerA, X
LDA.b #$00 : STA.w $0CAA, X ; Sprite persist LDA.b #$80 : STA.w $0CAA, X ; Sprite persist
LDA.b #$08 : STA.w $0E40, X ; Nbr Oam Entries LDA.b #$08 : STA.w $0E40, X ; Nbr Oam Entries
LDA.b #$E0 : STA.w $0F60, X ; Persist
PLB PLB
RTL RTL
@@ -148,6 +147,10 @@ Wolfos_DecideAction:
Sprite_Wolfos_Main: Sprite_Wolfos_Main:
{ {
JSL Sprite_PlayerCantPassThrough
JSL Sprite_BounceFromTileCollision
JSL Sprite_DamageFlash_Long
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL UseImplicitRegIndexedLocalJumpTable
@@ -233,8 +236,6 @@ Sprite_Wolfos_Main:
{ {
%StartOnFrame(12) %StartOnFrame(12)
%PlayAnimation(12, 13, 10) %PlayAnimation(12, 13, 10)
JSL Sprite_PlayerCantPassThrough
JSL Sprite_BounceFromTileCollision
JSL Sprite_Move JSL Sprite_Move
@@ -252,8 +253,6 @@ Sprite_Wolfos_Main:
{ {
%StartOnFrame(14) %StartOnFrame(14)
%PlayAnimation(14, 15, 10) %PlayAnimation(14, 15, 10)
JSL Sprite_PlayerCantPassThrough
JSL Sprite_BounceFromTileCollision
JSL Sprite_Move JSL Sprite_Move
@@ -273,9 +272,6 @@ Sprite_Wolfos_Main:
STZ.w SprXSpeed, X STZ.w SprXSpeed, X
STZ.w SprYSpeed, X STZ.w SprYSpeed, X
JSL Sprite_DamageFlash_Long
JSL Sprite_PlayerCantPassThrough
; Run the dialogue and wait for a song of healing flag to be set ; Run the dialogue and wait for a song of healing flag to be set
LDA SprMiscD, X : BNE .wait LDA SprMiscD, X : BNE .wait
%ShowUnconditionalMessage($23) %ShowUnconditionalMessage($23)
@@ -313,8 +309,6 @@ Sprite_Wolfos_Main:
STZ.w SprXSpeed, X STZ.w SprXSpeed, X
STZ.w SprYSpeed, X STZ.w SprYSpeed, X
JSL Sprite_PlayerCantPassThrough
LDA SprTimerD, X : BNE .dismiss LDA SprTimerD, X : BNE .dismiss
LDA.b #$00 : STA $0DD0, X ; kill sprite normal style LDA.b #$00 : STA $0DD0, X ; kill sprite normal style
STZ.w SprAction, X STZ.w SprAction, X