diff options
| author | yenatch <yenatch@gmail.com> | 2015-03-11 14:37:48 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-03-11 14:37:48 -0700 |
| commit | 715f0c8a8fb55253f512edf9c20dd46aca32e80c (patch) | |
| tree | 3c3be53343237cac074b35f410b9d9df6a5d0564 /audio | |
| parent | 58e5b396c10257431e764a94b04336365a80c5df (diff) | |
| parent | 53b30efdfcdeffbbca3892532e5a542056816787 (diff) | |
Merge remote-tracking branch 'kanzure/master'
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/music/magnettrain.asm | 17 | ||||
| -rw-r--r-- | audio/music/unioncave.asm | 7 |
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 |