From 7c03eac5bb2db76a27a0c8a6c6ed118bbb636fcb Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Thu, 19 Jan 2012 18:10:32 -0600 Subject: Move music back. Music has pointers that need to change. hg-commit-id: 355ceca6c2ba --- common.asm | 13 +++++++------ music/PalletTownCh1.md | Bin 154 -> 0 bytes music/PalletTownCh2.md | Bin 127 -> 0 bytes music/PalletTownCh3.md | Bin 408 -> 0 bytes 4 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 music/PalletTownCh1.md delete mode 100644 music/PalletTownCh2.md delete mode 100644 music/PalletTownCh3.md diff --git a/common.asm b/common.asm index 16e65157..ba12ee34 100644 --- a/common.asm +++ b/common.asm @@ -3175,14 +3175,15 @@ INCBIN "baserom.gbc",$82FD,$A7C5 - $82FD ; Music Data ; The start and stop of these byte ranges were based off the theory they're lined ; consecutively (Right up against each other). -PalletTown_md_1: -INCBIN "music/PalletTownCh1.md" ;0xA7C5-0xA85E (153 bytes) -PalletTown_md_2: -INCBIN "music/PalletTownCh2.md" ;0xA85F-0xA8DD (126 bytes) +PalletTown_md_1: ; 0xa7c5 (154 bytes) +INCBIN "baserom.gbc",$a7c5,$a85f - $a7c5 -PalletTown_md_3: -INCBIN "music/PalletTownCh3.md" ;0xA8DE-0xAA75 (407 bytes) ;Suspiciously Big +PalletTown_md_2: ; 0xa85f (127 bytes) +INCBIN "baserom.gbc",$a85f,$a8de - $a85f + +PalletTown_md_3: ; 0xa8de (408 bytes) +INCBIN "baserom.gbc",$a8de,$aa76 - $a8de INCBIN "baserom.gbc",$AA76,$C000 - $AA76 diff --git a/music/PalletTownCh1.md b/music/PalletTownCh1.md deleted file mode 100644 index db9403fd..00000000 Binary files a/music/PalletTownCh1.md and /dev/null differ diff --git a/music/PalletTownCh2.md b/music/PalletTownCh2.md deleted file mode 100644 index 6a30c6c3..00000000 Binary files a/music/PalletTownCh2.md and /dev/null differ diff --git a/music/PalletTownCh3.md b/music/PalletTownCh3.md deleted file mode 100644 index 50d23d05..00000000 Binary files a/music/PalletTownCh3.md and /dev/null differ -- cgit v1.2.3