From 45c5389b4d2b446d902373470df7bc9ef5d2fe74 Mon Sep 17 00:00:00 2001 From: scawful Date: Thu, 4 Jul 2024 23:27:47 -0400 Subject: [PATCH] update booki floating movement, chase, hide --- Sprites/Enemies/booki.asm | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/Sprites/Enemies/booki.asm b/Sprites/Enemies/booki.asm index ea065b7..7501724 100644 --- a/Sprites/Enemies/booki.asm +++ b/Sprites/Enemies/booki.asm @@ -134,6 +134,11 @@ Sprite_Booki_Move: STZ.w SprMiscC, X .Continue + JSL Sprite_CheckDamageToPlayer + JSL Sprite_CheckDamageFromPlayer : BCC .no_damage + LDA.b #$01 : STA.w SprMiscB, X + .no_damage + LDA.w SprMiscB, X JSL UseImplicitRegIndexedLocalJumpTable @@ -142,20 +147,15 @@ Sprite_Booki_Move: SlowFloat: { + LDY #$04 JSL GetRandomInt : AND.b #$04 JSL Sprite_FloatTowardPlayer - JSL Sprite_CheckDamageFromPlayer : BCC .no_damage - LDA.b #$01 : STA.w SprMiscB, X - .no_damage - - JSL Sprite_CheckDamageToPlayer - PHX JSL Sprite_DirectionToFacePlayer - print pc - LDA.b $0E : CMP.b #$11 : BCS .NotTooClose - LDA.b $0F : CMP.b #$11 : BCS .NotTooClose + + LDA.b $0E : CMP.b #$1A : BCS .NotTooClose + LDA.b $0F : CMP.b #$1A : BCS .NotTooClose LDA.b #$01 : STA.w SprMiscB, X LDA.b #$20 : STA.w SprTimerA, X %GotoAction(1) @@ -169,17 +169,11 @@ Sprite_Booki_Move: { JSL GetRandomInt : AND.b #$04 JSL Sprite_FloatAwayFromPlayer - - JSL Sprite_CheckDamageFromPlayer : BCC .no_damage - LDA.b #$01 : STA.w SprMiscB, X - .no_damage - JSL Sprite_CheckDamageToPlayer - PHX JSL Sprite_DirectionToFacePlayer - LDA.b $0E : CMP.b #$16 : BCC .NotTooClose - LDA.b $0F : CMP.b #$16 : BCC .NotTooClose + LDA.b $0E : CMP.b #$1B : BCC .NotTooClose + LDA.b $0F : CMP.b #$1B : BCC .NotTooClose LDA.b #$00 : STA.w SprMiscB, X %GotoAction(0) .NotTooClose @@ -237,7 +231,7 @@ Sprite_Booki_Draw: LDA.b $09 : BEQ .ToRight LDA.b #$29 : JMP .Prop .ToRight - LDA.b #$59 + LDA.b #$69 .Prop ORA $08 : STA ($90), Y