From c7db1c177670f07e19a81da65a3651ca56d78a7c Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 19 Jan 2025 13:09:37 -0500 Subject: [PATCH] wolfos immune to arrows, fix song flag check --- Sprites/Bosses/wolfos.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sprites/Bosses/wolfos.asm b/Sprites/Bosses/wolfos.asm index c158c55..ae2a09d 100644 --- a/Sprites/Bosses/wolfos.asm +++ b/Sprites/Bosses/wolfos.asm @@ -60,7 +60,7 @@ Sprite_Wolfos_Prep: RTL .spawn_wolfos LDA.b #$40 : STA.w SprTimerA, X - LDA.b #$80 : STA.w SprDefl, X ; Sprite persist + LDA.b #$82 : STA.w SprDefl, X ; persist, impervious to arrows LDA.b #$08 : STA.w SprNbrOAM, X ; Nbr Oam Entries PLB RTL @@ -137,7 +137,7 @@ Wolfos_DecideAction: Sprite_Wolfos_Main: { LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw Wolfos_AttackForward ; 0x00 dw Wolfos_AttackBack ; 0x01 @@ -249,8 +249,8 @@ Sprite_Wolfos_Main: .wait ; Wait for Song of Healing before granting the mask. - LDA $FE : BEQ .ninguna_cancion - STZ $FE + LDA.b SongFlag : CMP.b #$01 : BNE .ninguna_cancion + STZ.w SongFlag LDA.b #$20 : STA.w SprTimerD, X LDA.w POSX : STA.w SprX, X LDA.w POSXH : STA.w SprXH, X