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

Use boss flag instead of pendant/crystal flag for Hera boss music

Browse Source 
Customizer allows the player to start with the pendant/crystal assigned to Hera, which breaks boss music, so use the boss defeated flag instead
This commit is contained in:
qwertymodo
2019-10-10 13:45:24 -07:00
parent 4e060e7d6d
commit 2995889157
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hooks.asm
View File

@@ -1710,12 +1710,12 @@ NOP #8
;JSL.l OnLoadMap ;JSL.l OnLoadMap
;================================================================================ ;================================================================================
org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A : BCS BRANCH_BETA) org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A : BCS BRANCH_BETA)
JSL.l CheckHeraObject : BNE + : NOP LDA $7EF00F : BNE + : NOP
LDX.b #$F1 : STX $012C LDX.b #$F1 : STX $012C
+ +
;================================================================================ ;================================================================================
org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A : BCS BRANCH_GAMMA) org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A : BCS BRANCH_GAMMA)
JSL.l CheckHeraObject : BNE + : NOP LDA $7EF00F : BNE + : NOP
STX $012C ; DON'T MOVE THIS FORWARD OR MADNESS AWAITS STX $012C ; DON'T MOVE THIS FORWARD OR MADNESS AWAITS
+ +
;================================================================================ ;================================================================================

10
pendantcrystalhud.asm
View File

@@ -139,16 +139,6 @@ RTL
LDA.b #03 ; light world - pendants LDA.b #03 ; light world - pendants
RTL RTL
;================================================================================ ;================================================================================
CheckHeraObject:
LDA CrystalPendantFlags_2_hera : AND.w #$00FF : BNE .crystal
.pendant
LDA $7EF374 : AND.l CrystalPendantFlags_hera : AND.w #$00FF
RTL
.crystal
LDA $7EF37A : AND.l CrystalPendantFlags_hera : AND.w #$00FF
RTL
;================================================================================
;GetPendantCrystalWorld: ;GetPendantCrystalWorld:
; PHB : PHK : PLB ; PHB : PHK : PLB
; PHX ; PHX