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

Add EonScrub_Defeated action

Browse Source
This commit is contained in:
scawful
2024-10-04 00:06:02 -04:00
parent 93454f14c5
commit cb2deb9240
1 changed files with 68 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
Sprites/Enemies/eon_scrub.asm
View File

@@ -87,8 +87,8 @@ Sprite_EonScrub_Main:
dw EonScrub_Recoil dw EonScrub_Recoil
dw EonScrub_Dazed dw EonScrub_Dazed
dw EonScrub_Subdued dw EonScrub_Subdued
dw EonScrub_PeaShot dw EonScrub_PeaShot
dw EonScrub_Defeated
EonScrub_Stalking: EonScrub_Stalking:
{ {
@@ -185,9 +185,11 @@ Sprite_EonScrub_Main:
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
LDA.w SprMiscD, X : BNE .no_talk LDA.w SprMiscD, X : BNE .no_talk
%ShowSolicitedMessage($12D) : BCC .no_talk
JSR DekuScrub_GiveRandomPrize
LDA.b #$01 : STA.w SprMiscD, X
%GotoAction(7)
.no_talk .no_talk
RTS RTS
} }
@@ -209,7 +211,13 @@ Sprite_EonScrub_Main:
LDA #-16 : STA.w SprYSpeed, X LDA #-16 : STA.w SprYSpeed, X
.no_damage .no_damage
RTS RTS
}
EonScrub_Defeated:
{
%PlayAnimation(0,1,16)
JSL Sprite_CheckIfLifted
JSL ThrownSprite_TileAndSpriteInteraction_long
RTS RTS
} }
} }
@@ -242,7 +250,6 @@ Sprite_EonScrub_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?
@@ -270,72 +277,67 @@ Sprite_EonScrub_Draw:
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
RTS RTS
; =========================================================
; ========================================================= .start_index
db $00, $02, $04, $06, $08, $0A, $0C, $0E, $10, $12, $14, $16, $18, $1A
.start_index .nbr_of_tiles
db $00, $02, $04, $06, $08, $0A, $0C, $0E, $10, $12, $14, $16, $18, $1A db 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
.nbr_of_tiles .x_offsets
db 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 dw 0, 0
.x_offsets dw 0, 0
dw 0, 0 dw 0, 0
dw 0, 0 dw 0, 0
dw 0, 0 dw 0, 0
dw 0, 0 dw 0, 0
dw 0, 0 dw 0, 0
dw 0, 0 dw 0, 0
dw 0, 0 dw 0, 0
dw 0, 0 dw 0, 0
dw 0, 0 dw 0, 0
dw 0, 0 dw 0, 0
dw 0, 0 dw 0, 0
dw 0, 0 dw 0
dw 0, 0 .y_offsets
dw 0 dw 0, -8
.y_offsets dw 0, -8
dw 0, -8 dw 0, -12
dw 0, -8 dw 0, -12
dw 0, -12 dw 0, -12
dw 0, -12 dw 0, -12
dw 0, -12 dw 0, -12
dw 0, -12 dw 0, -12
dw 0, -12 dw 0, -12
dw 0, -12 dw 0, -8
dw 0, -12 dw 0, -4
dw 0, -8 dw 0, -16
dw 0, -4 dw 0, -16
dw 0, -16 dw 0
dw 0, -16 .chr
dw 0 db $20, $0A
.chr db $20, $0A
db $20, $0A db $24, $0A
db $20, $0A db $22, $0A
db $24, $0A db $00, $0A
db $22, $0A db $02, $0A
db $00, $0A db $04, $0A
db $02, $0A db $08, $0A
db $04, $0A db $06, $0A
db $08, $0A db $28, $0A
db $06, $0A db $26, $0A
db $28, $0A db $2C, $0C
db $26, $0A db $2C, $0C
db $2C, $0C db $2A
db $2C, $0C .properties
db $2A
.properties
db $33, $33 db $33, $33
db $73, $33 db $73, $33
db $33, $33 db $33, $33