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

Play GT2 track in DR if GTBK is collected

Browse Source
This commit is contained in:
codemann8
2023-11-05 08:44:19 -06:00
parent 6de8dc606c
commit 3dfae76275
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
msu.asm
View File

@@ -244,9 +244,10 @@ CheckMusicLoadRequest:
CMP.b #16 : BEQ .castle CMP.b #16 : BEQ .castle
CMP.b #17 : BEQ .dungeon CMP.b #17 : BEQ .dungeon
CMP.b #22 : BEQ .dungeon CMP.b #22 : BEQ .dungeon
CMP.b #21 : BNE .check_fallback CMP.b #21 : BEQ .boss
JMP .check_fallback
;.boss .boss
LDA $040C : LSR : !ADD.b #45 LDA $040C : LSR : !ADD.b #45
BRA .check_fallback-3 BRA .check_fallback-3
.no_change .no_change
@@ -277,7 +278,13 @@ CheckMusicLoadRequest:
LDA $040C LDA $040C
CMP.b #$08 : BNE .check_fallback ; Hyrule Castle 2 CMP.b #$08 : BNE .check_fallback ; Hyrule Castle 2
.dungeon .dungeon
LDA $040C : LSR : !ADD.b #33 : STA !REG_MUSIC_CONTROL_REQUEST LDA $040C : CMP.b #$1A : BNE +
PHA : LDA.l DRMode : BEQ ++
LDA.w BigKeyField : AND.b #$04 : BEQ ++
; if door rando and entering GT with BK
PLA : LDA.b #59 : BRA .check_fallback-3
++ PLA
+ LSR : !ADD.b #33 : STA !REG_MUSIC_CONTROL_REQUEST
.check_fallback .check_fallback
LDX !REG_MUSIC_CONTROL_REQUEST LDX !REG_MUSIC_CONTROL_REQUEST