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

Fix dark world OW2 music

Browse Source
This commit is contained in:
qwertymodo
2019-09-27 20:34:46 -07:00
parent 4aef32bcca
commit adb4110c6b
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
msu.asm
View File

@@ -212,16 +212,21 @@ CheckMusicLoadRequest:
PLA PLA
LDA.b #60 : BRA .check_fallback-3 LDA.b #60 : BRA .check_fallback-3
+ +
- : PLA : BRA .check_fallback-3 -- : PLA : BRA .check_fallback-3
.darkworld .darkworld
PHA PHA
LDA $7EF371 : CMP.b #$7F : BNE - LDA $7EF37A : CMP.b #$7F : BNE --
PLA - : PLA
LDA.b #61 : BRA .check_fallback-3 LDA.b #61 : BRA .check_fallback-3
.darkwoods .darkwoods
PHA PHA
LDA $7EF3CA : BEQ - LDA $7EF37A : CMP.b #$7F : BNE +
LDA $8A : CMP #$40 : BNE - LDA !REG_MSU_FALLBACK_TABLE+7 : BIT #$10 : BEQ +
PLA : LDA.b #61 : STA !REG_MUSIC_CONTROL_REQUEST
BRA .mute
+
LDA $7EF3CA : BEQ --
LDA $8A : CMP #$40 : BNE --
PLA PLA
LDA.b #15 : BRA .check_fallback-3 LDA.b #15 : BRA .check_fallback-3
.castle .castle

2
tables.asm
View File

@@ -1684,7 +1684,7 @@ db $03,$03,$03,$03,$01,$03,$03,$03
db $01,$01,$03,$03,$03,$03,$03,$03 db $01,$01,$03,$03,$03,$03,$03,$03
db $03,$03,$03,$03,$03,$03,$03,$03 db $03,$03,$03,$03,$03,$03,$03,$03
db $03,$03,$03,$03,$03,$03,$03,$03 db $03,$03,$03,$03,$03,$03,$03,$03
db $03,$03,$03,$03,$00,$00,$00,$00 db $03,$03,$03,$03,$03,$00,$00,$00
MSUExtendedFallbackList: MSUExtendedFallbackList:
db $01,$02,$03,$04,$05,$06,$07,$08 db $01,$02,$03,$04,$05,$06,$07,$08