alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'OWMain' into overworld_kara

Browse Source
This commit is contained in:
karafruit
2022-11-16 14:24:25 -08:00
parent 3cec56c5d8 1e2a0c7774
commit 682583c215
5 changed files with 275 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hooks.asm
View File

@@ -2300,6 +2300,12 @@ AddReceivedItem_doneWithSoundEffects:
org $05F030 ; <- 2F030 - display item
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
JSL.l HeartPieceGet
BCS $18 ; reinsert the near branch that appears midway through what we overrode