Merge branch 'OWMain' into overworld_kara

This commit is contained in:
2021-07-17 12:19:56 -07:00
6 changed files with 40 additions and 6 deletions

View File

@@ -1668,6 +1668,17 @@ dw !REG_MUSIC_CONTROL
org $0CF05F
dw !REG_MUSIC_CONTROL
; Conditionally disable UW music changes in Door Rando
org $028ADB ; <- Bank02.asm:2088-2095 (LDX.b #$14 : LDA $A0 ...)
JSL.l Underworld_DoorDown_Entry : CPX #$10
db $B0, $21 ; BCS $028B04
BRA + : NOP #6 : +
org $02C3F2 ; <- Bank02.asm:10521 Unused call
Underworld_DoorDown_Call:
org $02C3F3
dw $8AD9 ; address of Bank02.asm:2085
;--------------------------------------------------------------------------------
;================================================================================