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

Reduce Puffstool enemy health

Browse Source
This commit is contained in:
scawful
2024-10-04 09:11:59 -04:00
parent 25cf8bf7e3
commit e22303cb74
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Sprites/Enemies/puffstool.asm
View File

@@ -35,17 +35,13 @@
Sprite_Puffstool_Long: Sprite_Puffstool_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
JSR Sprite_Puffstool_Draw
JSR Sprite_Puffstool_Draw ; Call the draw code
JSL Sprite_DrawShadow JSL Sprite_DrawShadow
JSL Sprite_CheckActive ; Check if game is not paused JSL Sprite_CheckActive : BCC .SpriteIsNotActive
BCC .SpriteIsNotActive ; Skip Main code is sprite is innactive JSR Sprite_Puffstool_Main
JSR Sprite_Puffstool_Main ; Call the main sprite code
.SpriteIsNotActive .SpriteIsNotActive
PLB ; Get back the databank we stored previously PLB
RTL ; Go back to original code RTL
} }
; ========================================================= ; =========================================================
@@ -53,16 +49,14 @@ Sprite_Puffstool_Long:
Sprite_Puffstool_Prep: Sprite_Puffstool_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
LDA.l $7EF359 : TAY LDA.l $7EF359 : TAY
LDA.w .health, Y : STA.w SprHealth, X LDA.w .health, Y : STA.w SprHealth, X
LDA.b #$80 : STA.w SprDefl, X LDA.b #$80 : STA.w SprDefl, X
PLB PLB
RTL RTL
.health .health
db $0A, $10, $1A, $20 db $08, $0A, $1A, $20
} }
; ========================================================= ; =========================================================
@@ -86,7 +80,6 @@ Sprite_Puffstool_Main:
LDA.w SprTimerA, X : BNE + LDA.w SprTimerA, X : BNE +
JSL Sprite_SelectNewDirection JSL Sprite_SelectNewDirection
+ +
JSL Sprite_MoveXyz JSL Sprite_MoveXyz
JSL Sprite_BounceFromTileCollision JSL Sprite_BounceFromTileCollision
JSL Sprite_BounceOffWall JSL Sprite_BounceOffWall
@@ -123,7 +116,6 @@ Sprite_Puffstool_Main:
JSL Sprite_SetSpawnedCoordinates JSL Sprite_SetSpawnedCoordinates
JSL Sprite_TransmuteToBomb JSL Sprite_TransmuteToBomb
.no_space .no_space
+ +
RTS RTS
} }
@@ -213,7 +205,6 @@ Sprite_Puffstool_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?
@@ -241,13 +232,9 @@ Sprite_Puffstool_Draw:
LDA .properties, X : ORA $08 : STA ($90), Y LDA .properties, X : ORA $08 : 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