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

add puffstool ai states, optimize draw code

Browse Source
This commit is contained in:
scawful
2024-06-16 19:52:41 -04:00
parent aea4470095
commit 12dc64ba3f
1 changed files with 108 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Sprites/Enemies/puffstool.asm
View File

@@ -27,11 +27,13 @@
!ImperviousArrow = 00 ; 01 = Impervious to arrows !ImperviousArrow = 00 ; 01 = Impervious to arrows
!ImpervSwordHammer = 00 ; 01 = Impervious to sword and hammer attacks !ImpervSwordHammer = 00 ; 01 = Impervious to sword and hammer attacks
!Boss = 00 ; 00 = normal sprite, 01 = sprite is a boss !Boss = 00 ; 00 = normal sprite, 01 = sprite is a boss
%Set_Sprite_Properties(Sprite_Puffstool_Prep, Sprite_Puffstool_Long) %Set_Sprite_Properties(Sprite_Puffstool_Prep, Sprite_Puffstool_Long)
; ========================================================= ; =========================================================
Sprite_Puffstool_Long: Sprite_Puffstool_Long:
{
PHB : PHK : PLB PHB : PHK : PLB
JSR Sprite_Puffstool_Draw ; Call the draw code JSR Sprite_Puffstool_Draw ; Call the draw code
@@ -43,35 +45,48 @@ JSR Sprite_Puffstool_Main ; Call the main sprite code
.SpriteIsNotActive .SpriteIsNotActive
PLB ; Get back the databank we stored previously PLB ; Get back the databank we stored previously
RTL ; Go back to original code RTL ; Go back to original code
}
; ========================================================= ; =========================================================
Sprite_Puffstool_Prep: Sprite_Puffstool_Prep:
{
PHB : PHK : PLB PHB : PHK : PLB
; Add more code here to initialize data
PLB PLB
RTL RTL
}
; ========================================================= ; =========================================================
Sprite_Puffstool_Main: Sprite_Puffstool_Main:
LDA.w SprAction, X; Load the SprAction {
JSL UseImplicitRegIndexedLocalJumpTable; Goto the SprAction we are currently in LDA.w SprAction, X
dw Action00 JSL UseImplicitRegIndexedLocalJumpTable
dw Puffstool_Walking
dw Puffstool_Stunned
Action00:
Puffstool_Walking:
{
%PlayAnimation(0,6,10)
RTS RTS
}
Puffstool_Stunned:
{
%PlayAnimation(7,7,10)
RTS
}
}
; ========================================================= ; =========================================================
Sprite_Puffstool_Draw: Sprite_Puffstool_Draw:
{
JSL Sprite_PrepOamCoord JSL Sprite_PrepOamCoord
JSL Sprite_OAM_AllocateDeferToPlayer JSL Sprite_OAM_AllocateDeferToPlayer
@@ -94,7 +109,7 @@ ASL A : TAX
REP #$20 REP #$20
LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y LDA $00 : STA ($90), Y
AND.w #$0100 : STA $0E AND.w #$0100 : STA $0E
INY INY
LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y
@@ -116,7 +131,7 @@ PHY
TYA : LSR #2 : TAY TYA : LSR #2 : TAY
LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer LDA.b #$02 : ORA $0F : STA ($92), Y ; store size in oam buffer
PLY : INY PLY : INY
@@ -132,15 +147,6 @@ RTS
db $00, $02, $04, $06, $08, $0A, $0C, $0E db $00, $02, $04, $06, $08, $0A, $0C, $0E
.nbr_of_tiles .nbr_of_tiles
db 1, 1, 1, 1, 1, 1, 1, 0 db 1, 1, 1, 1, 1, 1, 1, 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
.y_offsets .y_offsets
dw -8, 0 dw -8, 0
dw 0, -8 dw 0, -8
@@ -168,12 +174,4 @@ db $33, $33
db $73, $73 db $73, $73
db $73, $73 db $73, $73
db $3D db $3D
.sizes }
db $02, $02
db $02, $02
db $02, $02
db $02, $02
db $02, $02
db $02, $02
db $02, $02
db $02