Adjust Eon Owl flight path and timer

This commit is contained in:
scawful
2024-09-29 11:42:03 -04:00
parent a115632478
commit b28e967a18

View File

@@ -31,7 +31,6 @@
!Boss = 00 ; 00 = normal sprite, 01 = sprite is a boss
%Set_Sprite_Properties(Sprite_EonOwl_Prep, Sprite_EonOwl_Long)
; =========================================================
Sprite_EonOwl_Long:
{
@@ -61,7 +60,6 @@ Sprite_EonOwl_Prep:
.continue
.not_intro
PLB
RTL
}
@@ -70,15 +68,13 @@ Sprite_EonOwl_Prep:
Sprite_EonOwl_Main:
{
LDA.w SprAction, X ; Load the SprAction
JSL UseImplicitRegIndexedLocalJumpTable ; Goto the SprAction we are currently in
LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable
dw EonOwl_Idle
dw EonOwl_IntroDialogue
dw EonOwl_FlyingAway
EonOwl_Idle:
{
%PlayAnimation(0,1,16)
@@ -100,9 +96,8 @@ Sprite_EonOwl_Main:
%ShowUnconditionalMessage($00E6)
LDA.b #$A0 : STA.w SprTimerA, X
LDA.b #$C0 : STA.w SprTimerA, X
%GotoAction(2)
RTS
}
@@ -114,6 +109,10 @@ Sprite_EonOwl_Main:
LDA.b #$F8 : STA.w SprYSpeed, X
JSL Sprite_Move
LDA.w SprTimerA, X : CMP.b #$80 : BNE +
LDA.b #$40 : STA.w SprXSpeed, X
+
LDA.w SprTimerA, X : BNE .not_done
STZ.w SprState, X
.not_done
@@ -139,7 +138,6 @@ Sprite_EonOwl_Draw:
.nextTile
PHX ; Save current Tile Index?
TXA : CLC : ADC $06 ; Add Animation Index Offset
PHA ; Keep the value with animation index offset?
@@ -167,13 +165,9 @@ Sprite_EonOwl_Draw:
LDA .properties, X : STA ($90), Y
PHY
TYA : LSR #2 : TAY
LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
PLY : INY
PLX : DEX : BPL .nextTile
PLX