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

Merge remote-tracking branch 'codemann/OWMain' into codemann_OWMain

Browse Source
This commit is contained in:
karafruit
2026-01-25 21:15:13 -06:00
parent 37ee113f9d 781431f633
commit 53d2a7606a
13 changed files with 446 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bugfixes.asm
View File

@@ -238,6 +238,18 @@ FixJingleGlitch:
.exit
RTL
;--------------------------------------------------------------------------------
FixSwimBump:
LDA.b LinkIncapacitatedTimer : BEQ .normal
LDA.b LinkJumping : BNE .normal
INC.b LinkJumping
BRA .not_diving
.normal
LDA.b LinkJumping : BNE .continue ; what we wrote over
.not_diving
PLA : PLA : PEA.w $87964E ; skip ahead, not diving
.continue
RTL
;--------------------------------------------------------------------------------
; Fix spawning with more hearts than capacity when less than 3 heart containers
pushpc
org $09F4AC ; <- module_death.asm:331