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

Change dark woods to track 15

Browse Source
This commit is contained in:
qwertymodo
2018-11-28 16:41:48 -08:00
parent 80bc569279
commit bf49cde0ea
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
msu.asm
View File

@@ -159,7 +159,7 @@ msu_check_busy:
JML spc_continue JML spc_continue
.ready .ready
LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_TRACK_MISSING : BEQ .start LDA !REG_MSU_STATUS : BIT !FLAG_MSU_STATUS_TRACK_MISSING : BEQ .start
BRL dungeon_fallback BRL alternate_fallback
.start .start
LDA !VAL_VOLUME_FULL LDA !VAL_VOLUME_FULL
STA !REG_TARGET_VOLUME STA !REG_TARGET_VOLUME
@@ -238,16 +238,18 @@ load_track:
STX !REG_CURRENT_MSU_TRACK STX !REG_CURRENT_MSU_TRACK
JML spc_continue JML spc_continue
dungeon_fallback: alternate_fallback:
LDA !REG_CURRENT_MSU_TRACK : AND #$3F LDA !REG_CURRENT_MSU_TRACK : AND #$3F
CMP #$0F : BEQ .woods ; 15: dark woods
CMP #$23 : !BLT spc_fallback ; < 35: normal tracks CMP #$23 : !BLT spc_fallback ; < 35: normal tracks
CMP #$2F : !BGE .boss ; > 46: boss-specific tracks CMP #$2F : !BGE .boss ; > 46: boss-specific tracks
CMP #$25 : BEQ .castle ; 37: aga tower, fall back to hyrule castle CMP #$25 : BEQ .castle ; 37: aga tower, fall back to hyrule castle
BRA .dungeon ; 35-46: dungeon-specific tracks BRA .dungeon ; 35-46: dungeon-specific tracks
.woods
LDA #$0D : BRA .fallback
.boss .boss
LDA #$15 : BRA .fallback LDA #$15 : BRA .fallback
.castle .castle
LDA #$10 : BRA .fallback LDA #$10 : BRA .fallback

22
music.asm
View File

@@ -54,11 +54,15 @@ PreOverworld_LoadProperties_ChooseMusic:
; if we are in the light world go ahead and set chosen selection ; if we are in the light world go ahead and set chosen selection
LDA $7EF3CA : BEQ .checkInverted+4 LDA $7EF3CA : BEQ .checkInverted+4
LDX.b #$0D ; dark woods theme LDX.b #$0F ; dark woods theme
; This music is used in dark woods, and dark death mountain ; This music is used in dark woods
LDA $8A LDA $8A
CMP.b #$40 : BEQ + : CMP.b #$43 : BEQ + : CMP.b #$45 : BEQ + : CMP.b #$47 : BEQ + CMP.b #$40 : BEQ +
LDX.b #$0D ; dark death mountain theme
; This music is used in dark death mountain
CMP.b #$43 : BEQ + : CMP.b #$45 : BEQ + : CMP.b #$47 : BEQ +
LDX.b #$09 ; dark overworld theme LDX.b #$09 ; dark overworld theme
+ +
@@ -133,18 +137,20 @@ Overworld_FinishMirrorWarp:
.endOfLightWorldChecks .endOfLightWorldChecks
STX $012C STX $012C
LDA $8A : CMP.b #$40 : BEQ .darkWoods LDA $8A : CMP.b #$40 : BNE +
LDX #$0F ; dark woods theme
BRA .bunny
+
CMP.b #$43 : BEQ .darkMountain CMP.b #$43 : BEQ .darkMountain
CMP.b #$45 : BEQ .darkMountain CMP.b #$45 : BEQ .darkMountain
CMP.b #$47 : BNE .notDarkMountain CMP.b #$47 : BNE .notDarkMountain
.darkMountain .darkMountain
LDA #$09 : STA $012D ; set storm ambient SFX LDA.b #$09 : STA $012D ; set storm ambient SFX
LDX.b #$0D ; dark mountain theme
.darkWoods
LDX.b #$0D ; dark mountain/woods theme
.bunny
LDA $7EF357 : ORA InvertedMode : BNE + LDA $7EF357 : ORA InvertedMode : BNE +
LDA #$04 ; bunny theme LDA #$04 ; bunny theme
+ +

4
tables.asm
View File

@@ -713,6 +713,10 @@ org $06C93B ; PC 0x3493B
PyramidPotion: PyramidPotion:
db #$2C ; #$2C = Green Potion db #$2C ; #$2C = Green Potion
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; Change track 15 (unused) to point to 13 (Death Mountain) so dark woods can be track 15
org $1A9F15 ; PC 0xD1F15
dw #$2B00 ; Set track 15 pointer to track 13's data
;--------------------------------------------------------------------------------
org $308140 ; PC 0x180140 - 0x18014A [encrypted] org $308140 ; PC 0x180140 - 0x18014A [encrypted]
HeartPieceOutdoorValues: HeartPieceOutdoorValues:
HeartPiece_Spectacle: HeartPiece_Spectacle: