alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the sprite spawn delay when bonking prizes

Browse Source
This commit is contained in:
codemann8
2022-11-08 18:52:11 -06:00
parent 0174e5dbf5
commit 1e2a0c7774
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
heartpieces.asm
View File

@@ -220,6 +220,12 @@ MaybeMarkDigSpotCollected:
PLP : PLA PLP : PLA
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
HeartPieceSpawnDelayFix:
; Fix the delay when spawning a HeartPiece sprite
JSL.l Sprite_CheckIfPlayerPreoccupied : BCS + ; what we moved from $05F037
JSL.l Sprite_CheckDamageToPlayerSameLayerLong : RTL ; what we wrote over
+ CLC : RTL
;--------------------------------------------------------------------------------
macro GetPossiblyEncryptedItem(ItemLabel,TableLabel) macro GetPossiblyEncryptedItem(ItemLabel,TableLabel)
LDA IsEncrypted : BNE ?encrypted LDA IsEncrypted : BNE ?encrypted
LDA.l <ItemLabel> LDA.l <ItemLabel>

6
hooks.asm
View File

@@ -2306,6 +2306,12 @@ AddReceivedItem_doneWithSoundEffects:
org $05F030 ; <- 2F030 - display item org $05F030 ; <- 2F030 - display item
JSL.l DrawHeartPieceGFX JSL.l DrawHeartPieceGFX
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; moving LinkBusy check to later time to avoid a delay in HP movement
org $05F037 ; (JSL CheckIfLinkIsBusy : BCS .exit)
BRA + : NOP #4 : +
org $05F083
JSL.l HeartPieceSpawnDelayFix
;--------------------------------------------------------------------------------
org $05F08A ; <- 2F08A - sprite_heart_upgrades.asm : 324 - (LDA $7EF36B : INC A : AND.b #$03 : STA $7EF36B : BNE .got_4_piecese) item determination org $05F08A ; <- 2F08A - sprite_heart_upgrades.asm : 324 - (LDA $7EF36B : INC A : AND.b #$03 : STA $7EF36B : BNE .got_4_piecese) item determination
JSL.l HeartPieceGet JSL.l HeartPieceGet
BCS $18 ; reinsert the near branch that appears midway through what we overrode BCS $18 ; reinsert the near branch that appears midway through what we overrode