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

Fixed Hera boss music to correctly read boss defeated flag

Browse Source
This commit is contained in:
codemann8
2022-01-19 14:39:19 -06:00
parent 335744f7b6
commit c7718e7a47
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hooks.asm
View File

@@ -1916,10 +1916,10 @@ NOP #8
;JSL.l OnLoadMap ;JSL.l OnLoadMap
;================================================================================ ;================================================================================
org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A) org $028B8F ; <- 10B8F - Bank02.asm:2236 (LDA $7EF374 : LSR A)
JSL Hera_Boss_Defeated : NOP JSL CheckHeraBossDefeated : NOP
;================================================================================ ;================================================================================
org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A) org $029090 ; <- 11090 - Bank02.asm:3099 (LDA $7EF374 : LSR A)
JSL Hera_Boss_Defeated : NOP JSL CheckHeraBossDefeated : NOP
;================================================================================ ;================================================================================
org $029798 ; <- 11798 - Bank02.asm:4287 (CMP $02895C, X : BNE BRANCH_ALPHA) org $029798 ; <- 11798 - Bank02.asm:4287 (CMP $02895C, X : BNE BRANCH_ALPHA)
NOP #6 ; remove crystal room cutscene check that causes softlocks NOP #6 ; remove crystal room cutscene check that causes softlocks

2
music.asm
View File

@@ -209,7 +209,7 @@ Underworld_DoorDown_Entry:
; This is for changing to/from ToH dungeon/boss music ; This is for changing to/from ToH dungeon/boss music
; ;
; A=16bit XY=8bit ; A=16bit XY=8bit
Hera_Boss_Defeated: CheckHeraBossDefeated:
LDA $7EF00F : AND.w #$00FF : BEQ + LDA $7EF00F : AND.w #$00FF : BEQ +
SEC : RTL SEC : RTL
+ CLC : RTL + CLC : RTL