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

Cleanup Piration

Browse Source
This commit is contained in:
scawful
2024-10-04 09:11:23 -04:00
parent b8b3e15ff3
commit c271be37f7
1 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Sprites/NPCs/piratian.asm
View File

@@ -29,23 +29,19 @@
!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_Piratian_Prep, Sprite_Piratian_Long);
; ========================================================= %Set_Sprite_Properties(Sprite_Piratian_Prep, Sprite_Piratian_Long)
Sprite_Piratian_Long: Sprite_Piratian_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
JSR Sprite_Piratian_Draw
JSR Sprite_Piratian_Draw ; Call the draw code JSL Sprite_DrawShadow
JSL Sprite_DrawShadow ; Draw the shadow JSL Sprite_CheckActive : BCC .SpriteIsNotActive
JSL Sprite_CheckActive ; Check if game is not paused JSR Sprite_Piratian_Main
BCC .SpriteIsNotActive ; Skip Main code is sprite is innactive
JSR Sprite_Piratian_Main ; Call the main sprite code
.SpriteIsNotActive .SpriteIsNotActive
PLB ; Get back the databank we stored previously PLB
RTL ; Go back to original code RTL
} }
; ========================================================= ; =========================================================
@@ -54,7 +50,6 @@ Sprite_Piratian_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
PLB PLB
RTL RTL
} }
@@ -149,7 +144,6 @@ Sprite_Piratian_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?
@@ -177,13 +171,9 @@ Sprite_Piratian_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
@@ -252,3 +242,4 @@ Sprite_Piratian_Draw:
db $02 db $02
db $02 db $02
} }