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

Fixed Hera boss music to correctly read boss defeated flag

Browse Source
This commit is contained in:
codemann8
2022-01-19 02:31:38 -06:00
parent 1677b95744
commit 7633c8b586
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hooks.asm
View File

@@ -1915,15 +1915,11 @@ NOP #8
;org $0AC012 ; <- 54012 - Bank0A.asm:1039 - (LDA $7EF2DB) ;org $0AC012 ; <- 54012 - Bank0A.asm:1039 - (LDA $7EF2DB)
;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)
LDA $7EF00F : BNE + : NOP JSL Hera_Boss_Defeated : NOP
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)
LDA $7EF00F : BNE + : NOP JSL Hera_Boss_Defeated : NOP
STX $012C ; DON'T MOVE THIS FORWARD OR MADNESS AWAITS
+
;================================================================================ ;================================================================================
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

7
music.asm
View File

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