summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-02-15 21:22:51 -0500
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-02-15 21:22:51 -0500
commitfa1c2c573a683185cf257cd3d6518b476f60e648 (patch)
tree49c9fd79e1316d9ffcbf510054742bb936e00281
parent370ffcfd8d911dd4c2e8e08fa361cc1d68d6446a (diff)
Final music incbins
-rw-r--r--audio/music/magnettrain.asm17
-rw-r--r--audio/music/unioncave.asm7
2 files changed, 18 insertions, 6 deletions
diff --git a/audio/music/magnettrain.asm b/audio/music/magnettrain.asm
index cb5647540..232c0ca4a 100644
--- a/audio/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
@@ -251,7 +251,22 @@ Music_MagnetTrain_Ch4: ; ef6f4
; ef711
-INCBIN "baserom.gbc", $ef711, $ef71e - $ef711
+; unused
+Music_MagnetTrain_branch_ef711: ; ef711
+ note G#, 1
+ note G_, 1
+ note G_, 1
+ note G#, 1
+ note G_, 1
+ note G_, 1
+ note G#, 1
+ note G_, 1
+ note G_, 1
+ note G#, 1
+ note G_, 1
+ note G_, 1
+ endchannel
+; ef71e
Music_MagnetTrain_branch_ef71e: ; ef71e
diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm
index f08926b12..c412cdc3c 100644
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -262,10 +262,7 @@ Music_UnionCave_branch_f5da9: ; f5da9
note G#, 4
note __, 8
loopchannel 0, Music_UnionCave_branch_f5da9
-; f5dc1
-
-
-INCBIN "baserom.gbc", $f5dc1, $f5dc5 - $f5dc1
-
+ loopchannel 0, Music_UnionCave_branch_f5da9 ; unused
+; f5dc5