change wolfos message id, update health

This commit is contained in:
scawful
2024-07-02 22:38:01 -04:00
parent f1ca71867a
commit 36a88e6a89

View File

@@ -6,7 +6,7 @@
!NbrTiles = 03 ; Number of tiles used in a frame !NbrTiles = 03 ; Number of tiles used in a frame
!Harmless = 00 ; 00 = Sprite is Harmful, 01 = Sprite is Harmless !Harmless = 00 ; 00 = Sprite is Harmful, 01 = Sprite is Harmless
!HVelocity = 00 ; Is your sprite going super fast? put 01 if it is !HVelocity = 00 ; Is your sprite going super fast? put 01 if it is
!Health = 40 ; Number of Health the sprite have !Health = 30 ; Number of Health the sprite have
!Damage = 00 ; (08 is a whole heart), 04 is half heart !Damage = 00 ; (08 is a whole heart), 04 is half heart
!DeathAnimation = 00 ; 00 = normal death, 01 = no death animation !DeathAnimation = 00 ; 00 = normal death, 01 = no death animation
!ImperviousAll = 00 ; 00 = Can be attack, 01 = attack will clink on it !ImperviousAll = 00 ; 00 = Can be attack, 01 = attack will clink on it
@@ -75,15 +75,15 @@ Sprite_Wolfos_Prep:
Sprite_Wolfos_CheckIfDefeated: Sprite_Wolfos_CheckIfDefeated:
{ {
LDA.b $1B : BNE .outdoors LDA.b $1B : BNE .indoors
LDA.w SprHealth, X : CMP.b #$10 : BCS .not_defeated LDA.w SprHealth, X : CMP.b #$04 : BCS .not_defeated
LDA.b #$06 : STA.w SprAction, X ; Set to defeated LDA.b #$06 : STA.w SprAction, X ; Set to defeated
LDA.b #$09 : STA.w SprState, X LDA.b #$09 : STA.w SprState, X
LDA.b #$40 : STA.w SprHealth, X ; Refill the health of the sprite LDA.b #$40 : STA.w SprHealth, X ; Refill the health of the sprite
STZ.w SprMiscD, X STZ.w SprMiscD, X
RTS RTS
.not_defeated .not_defeated
.outdoors .indoors
RTS RTS
} }
@@ -278,7 +278,7 @@ Sprite_Wolfos_Main:
; 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($0F) %ShowUnconditionalMessage($23)
LDA.b #$01 : STA.w SprMiscD, X LDA.b #$01 : STA.w SprMiscD, X
.wait .wait
LDA $FE : BEQ .ninguna_cancion LDA $FE : BEQ .ninguna_cancion