Merge branch 'master' into multiworld

This commit is contained in:
caitsith2
2020-06-20 18:35:48 -07:00

View File

@@ -6,7 +6,7 @@ macro copybin(source, length)
dd read4(pctosnes(<source>+!copycount)) dd read4(pctosnes(<source>+!copycount))
!copycount #= !copycount+4 !copycount #= !copycount+4
endif endif
while !copycount < <length> while !copycount < <length>
db read1(pctosnes(<source>+!copycount)) db read1(pctosnes(<source>+!copycount))
!copycount #= !copycount+1 !copycount #= !copycount+1
@@ -93,6 +93,11 @@ SPCEngineEnd:
;@ check bankcross on ;@ check bankcross on
; Change track 15 (unused) to point to 13 (Death Mountain) so dark woods can be track 15 ; Change track 15 (unused) to point to 13 (Death Mountain) so dark woods can be track 15
; Bank 1
org $1A9F15 ; PC 0x0D1F15 ; SPC $D01C
dw #$2B00 ; Set track 15 pointer to track 13's data
; Bank 2
org $359F6E ; PC 0x1A9F6E ; SPC $D01C org $359F6E ; PC 0x1A9F6E ; SPC $D01C
dw #$2B00 ; Set track 15 pointer to track 13's data dw #$2B00 ; Set track 15 pointer to track 13's data