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

Sprite functions housekeeping

Browse Source
This commit is contained in:
scawful
2025-01-26 22:13:05 -05:00
parent d60b3683a0
commit 490ecef311
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Core/sprite_functions.asm
View File

@@ -94,14 +94,13 @@ Sprite_BounceTowardPlayer:
} }
; A = Speed, Y = Height ; A = Speed, Y = Height
; Maintain altitude (float effect)
Sprite_FloatTowardPlayer: Sprite_FloatTowardPlayer:
{ {
; Maintain altitude (float effect)
TYA : STA.w SprHeight, X TYA : STA.w SprHeight, X
JSL Sprite_MoveAltitude JSL Sprite_MoveAltitude
JSL Sprite_ApplySpeedTowardsPlayer JSL Sprite_ApplySpeedTowardsPlayer
JSL Sprite_MoveHoriz JSL Sprite_Move
JSL Sprite_MoveVert
RTL RTL
} }
@@ -859,20 +858,21 @@ Sprite_Twinrova_FireAttack:
; $1DBDD6 - TrinexxFire_AddFireGarnish ; $1DBDD6 - TrinexxFire_AddFireGarnish
AddFireGarnish: AddFireGarnish:
{ {
INC.w SprDelay, X : LDA.w SprDelay, X : AND.b #$07 : BNE .return INC.w SprDelay, X : LDA.w SprDelay, X : AND.b #$07 : BNE .return
LDA.b #$2A : JSL Sound_SetSfx2PanLong LDA.b #$2A : JSL Sound_SetSfx2PanLong
LDA.b #$1D : PHX : TXY : TAX : STA $00 LDA.b #$1D : PHX : TXY : TAX : STA $00
.next_slot .next_slot
LDA $7FF800, X : BEQ .free_slot ; Search for free Garnish slot LDA $7FF800, X : BEQ .free_slot ; Search for free Garnish slot
DEX : BPL .next_slot DEX : BPL .next_slot
DEC $0FF8 : BPL .use_search_index DEC $0FF8 : BPL .use_search_index
LDA $00 : STA $0FF8 LDA $00 : STA $0FF8
.use_search_index .use_search_index
LDX $0FF8 LDX $0FF8
.free_slot .free_slot
; Set garnish ID, set garnish handled flag, set garnish parent sprite ; Set garnish ID, set garnish handled flag
LDA.b #$10 : STA $7FF800, X : STA $0FB4 : TYA : STA $7FF92C, X LDA.b #$10 : STA $7FF800, X : STA $0FB4
TYA : STA $7FF92C, X ; set garnish parent sprite
LDA.w SprX, Y : STA $7FF83C, X ; Garnish XL LDA.w SprX, Y : STA $7FF83C, X ; Garnish XL
LDA.w SprXH, Y : STA $7FF878, X ; Garnish XH LDA.w SprXH, Y : STA $7FF878, X ; Garnish XH
LDA.w SprY, Y : CLC : ADC.b #$10 : STA $7FF81E, X ; Garnish YL LDA.w SprY, Y : CLC : ADC.b #$10 : STA $7FF81E, X ; Garnish YL
@@ -881,7 +881,7 @@ AddFireGarnish:
PLX PLX
.return .return
RTS RTS
} }
; ========================================================= ; =========================================================