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

Adjust Eon Owl flight path and timer

Browse Source
This commit is contained in:
scawful
2024-09-29 11:42:03 -04:00
parent a115632478
commit b28e967a18
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Sprites/NPCs/eon_owl.asm
View File

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