From a335f6ad7d4f5939a259e158dd3bc518c25a0123 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Wed, 25 Jan 2012 07:37:49 -0600 Subject: [PATCH 1/7] Finished Cities 1 Channel 2 Msuic Data hg-commit-id: ae47d0fda0ca --- music.asm | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 151 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index 409b88bf..a643bb8a 100644 --- a/music.asm +++ b/music.asm @@ -4300,7 +4300,157 @@ branch_ab8a: ; AB91 Cities1_md_2: ;AB92 - AC02 -INCBIN "baserom.gbc",$ab92,$ac32 - $ab92 + ; AB92 + mus_mod 5, 1, 5 + mus_call branch_ac00 + + mus_octave oct3 + mus_note noteG#, note8 + mus_vel 12, 4 + mus_note noteE, note4_8 + mus_vel 12, 5 + mus_duty duty75 + + mus_octave oct2 + mus_note noteC#, note4 + mus_note noteD#, note4 + mus_note noteE, note4_8 + mus_note noteF#, note4_8 + mus_note noteG#, note4 + mus_call branch_ac00 + + mus_octave oct3 + mus_note noteG#, note8 + mus_vel 12, 4 + mus_note noteE, note2_4_8 + mus_duty duty75 + + mus_octave oct2 + mus_note noteE, note4_8 + mus_note noteF#, note4_8 + mus_note noteG#, note4 + mus_vel 11, 7 + mus_duty duty50 + mus_mod 8, 1, 7 + + mus_octave oct4 + mus_note noteC#, note2_4 + + mus_octave oct3 + mus_note noteA, note4 + + mus_octave oct4 + mus_note noteE, note2 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteD#, note8 + mus_note noteC#, note8 + + mus_octave oct3 + mus_note noteB, note2_4 + mus_note noteG#, note4 + mus_note noteB, note1 + mus_note noteF#, note2_4 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteB, note4 + mus_note noteA, note4 + mus_note noteG#, note4 + mus_note noteF#, note4 + mus_note noteG#, note2_4 + mus_note noteE, note4 + mus_note noteB, note1 + + mus_octave oct4 + mus_note noteC#, note2_4 + mus_note noteD#, note8 + mus_note noteE, note8 + mus_note noteF#, note4 + mus_note noteE, note4 + mus_note noteD#, note4 + mus_note noteC#, note4 + + mus_octave oct3 + mus_note noteB, note2_4 + + mus_octave oct4 + mus_note noteC#, note8 + mus_note noteD#, note8 + mus_note noteC#, note4 + + mus_octave oct3 + mus_note noteB, note4 + mus_note noteA, note4 + mus_note noteG#, note4 + mus_note noteA, note2_4 + mus_note noteB, note8 + + mus_octave oct4 + mus_note noteC, note8 + mus_note noteC, note4 + + mus_octave oct3 + mus_note noteB, note4 + mus_note noteA, note4 + mus_note noteF#, note4 + mus_vel 11, 7 + mus_note noteA, note2 + + mus_octave oct4 + mus_note noteC, note2 + + mus_octave oct3 + mus_note noteB, note2_4_8 + mus_vel 8, 4 + mus_note noteG#, note16 + mus_vel 10, 4 + mus_note noteA, note16 + mus_jump 0, Cities1_md_2 + +branch_ac00: + mus_duty duty50 + mus_vel 12, 3 + + mus_octave oct3 + mus_note noteB, note4 + mus_note noteA, note4 + mus_vel 12, 4 + mus_note noteG#, note2_8 + mus_vel 12, 3 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteB, note4 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_vel 12, 4 + mus_note noteF#, note2_8 + mus_vel 12, 5 + mus_duty duty75 + + mus_octave oct2 + mus_note noteE, note4 + mus_note noteD#, note2 + mus_note noteE, note4 + mus_note noteF#, note4 + mus_vel 12, 3 + mus_duty duty50 + + mus_octave oct3 + mus_note noteA, note4 + mus_note noteG#, note4 + mus_vel 12, 4 + mus_note noteF#, note2_8 + mus_vel 12, 3 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteA, note4 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_end + ; AC31 Cities1_md_3: ;AC32 - AC7F INCBIN "baserom.gbc",$ac32,$acef - $ac32 From e3a065cff57dff4e48c7a32c6e7fd8f08400fb10 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Wed, 25 Jan 2012 07:46:46 -0600 Subject: [PATCH 2/7] Finished Cities 1 Channel 3 Music Data hg-commit-id: 9f6a3c37f1b1 --- music.asm | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 2 deletions(-) diff --git a/music.asm b/music.asm index a643bb8a..d0ee7b90 100644 --- a/music.asm +++ b/music.asm @@ -4452,8 +4452,187 @@ branch_ac00: mus_end ; AC31 -Cities1_md_3: ;AC32 - AC7F -INCBIN "baserom.gbc",$ac32,$acef - $ac32 +Cities1_md_3: ;AC32 - ACEE --AC7F + ; AC32 + mus_vel 1, 1 + db $E8 + +branch_ac35: + mus_mod 0, 0, 0 + + mus_octave oct3 + mus_call branch_acc5 + mus_call branch_acc5 + mus_call branch_acce + mus_note noteG#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_call branch_acc5 + mus_note noteB, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_call branch_acc5 + mus_call branch_acce + mus_note noteG#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteG#, note8 + mus_note noteE, note8 + mus_note noteB, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteG#, note8 + mus_note noteE, note8 + mus_note noteB, note8 + mus_note noteE, note8 + mus_mod 8, 2, 5 + mus_note noteA, note2 + mus_note noteE, note2 + mus_note noteA, note2 + mus_note noteF#, note2 + mus_note noteG#, note2 + mus_note noteE, note2 + mus_note noteG#, note2_4 + mus_note noteE, note4 + mus_note noteF#, note8 + mus_note noteF#, note8 + mus_note noteD#, note8 + mus_note noteE, note4 + mus_note noteF#, note8 + mus_note noteD#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteF#, note8 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteG#, note8 + mus_note noteE, note8 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_note noteA, note2 + mus_note noteE, note2 + mus_note noteA, note2 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_note noteG#, note2 + mus_note noteE, note2 + mus_note noteB, note4 + mus_note noteE, note4 + mus_note noteF#, note4 + mus_note noteG#, note4 + mus_note noteRst, note8 + mus_note noteD#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteF#, note8 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteA, note4 + mus_note noteG#, note4 + mus_note noteF#, note8 + mus_note noteD#, note8 + mus_note noteA, note8 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteF#, note16 + mus_note noteG#, note16 + mus_note noteE, note16 + mus_note noteF#, note16 + mus_note noteG#, note4 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_jump 0, branch_ac35 + +branch_acc5: + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteRst, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_end + ; ACCD + + ; ACCE +branch_acce: + mus_note noteA, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteRst, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteRst, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_note noteD#, note8 + mus_note noteD#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteD#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteD#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteRst, note8 + mus_note noteD#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_end + ; ACEE Cities1_md_4: ;ACEF - ADAD INCBIN "baserom.gbc",$acef,$adae - $acef From d341bdb582e9a765ff6376e343244198f808c3a6 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Wed, 25 Jan 2012 09:06:55 -0600 Subject: [PATCH 3/7] Finished Cities 1 Channel 4 Music Data hg-commit-id: 7cd50185baf7 --- music.asm | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index d0ee7b90..ba2f7f38 100644 --- a/music.asm +++ b/music.asm @@ -4635,7 +4635,195 @@ branch_acce: ; ACEE Cities1_md_4: ;ACEF - ADAD -INCBIN "baserom.gbc",$acef,$adae - $acef + ; ACEF + mus_vel 15, 13 + mus_note noteD#, note4_8_16 + mus_note noteF#, note2_4_8 + +branch_acf3: + mus_call branch_ad36 + mus_call branch_ad45 + mus_call branch_ad45 + mus_jump 2, branch_acf3 + mus_call branch_ad36 + mus_call branch_ad5f + mus_call branch_ad52 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4 + mus_note noteC, note2 + mus_call branch_ad6e + mus_call branch_ad5f + mus_call branch_ad52 + mus_call branch_ad6e + mus_call branch_ad52 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note8 + mus_note noteC, note2 + mus_note noteB, note8 + mus_note noteC, note4_8_16 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4 + mus_note noteC, note4_8_16 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4_8 + mus_note noteC, note2_16 + mus_note noteB, note4 + mus_note noteC, note2_16 + mus_jump 0, Cities1_md_4 + +branch_ad36: + mus_note noteB, note4_8 + mus_note noteC, note2_16 + mus_note noteB, note4_8 + mus_note noteC, note2_16 + mus_note noteB, note4 + mus_note noteC, note2_16 + mus_note noteB, note4_8 + mus_note noteC, note2_16 + mus_note noteB, note4_8 + mus_note noteC, note2_16 + mus_note noteB, note8 + mus_note noteC, note2_16 + mus_note noteB, note8 + mus_note noteC, note2_16 + mus_end + ; AD44 + + ; AD45 +branch_ad45: + mus_note noteB, note4_8 + mus_note noteC, note2_16 + mus_note noteB, note4_8 + mus_note noteC, note2_16 + mus_note noteB, note4 + mus_note noteC, note2_16 + mus_note noteB, note4_8 + mus_note noteC, note2_16 + mus_note noteB, note4_8 + mus_note noteC, note2_16 + mus_note noteB, note4 + mus_note noteC, note2_16 + mus_end + ; AD51 + + ; AD52 +branch_ad52: + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4 + mus_note noteC, note2 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4 + mus_note noteC, note2 + mus_end + ; AD5E + + ; AD5F +branch_ad5f: + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4 + mus_note noteC, note2 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note8 + mus_note noteC, note2 + mus_note noteB, note8 + mus_note noteC, note4_8_16 + mus_end + ; AD6D + + ; AD6E +branch_ad6e: + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note4_8 + mus_note noteC, note4_8_16 + mus_note noteB, note8 + mus_note noteC, note2 + mus_note noteB, note8 + mus_note noteC, note2 + mus_end + ; AD76 + + ; AD77 +branch_ad77: + db $F8 + mus_tempo 1, 0 + mus_volume 119 + mus_mod 6, 2, 6 + mus_duty duty50 + db $E8 + db $D4 + mus_note noteB, note8 + + mus_octave oct2 + mus_note noteG#, note8 + mus_note noteG#, note8 + mus_note noteG#, note8 + mus_vel 11, 3 + + mus_octave oct3 + mus_note noteE, note4 + mus_end + ; AD8D + + ; AD8E +branch_ad8e: + db $F8 + mus_mod 8, 2, 7 + mus_duty duty50 + db $D4 + mus_note noteRst, note8 + + mus_octave oct3 + mus_note noteE, note8 + mus_note noteE, note8 + mus_note noteE, note8 + mus_vel 12, 3 + mus_note noteB, note4 + mus_end + ; AD9D + + ; AD9E +branch_ad9e: + db $F8 + db $D4 + mus_note noteC#, note16 + + mus_octave oct3 + mus_note noteB, note16 + mus_note noteRst, note16 + mus_note noteB, note16 + mus_note noteRst, note16 + mus_note noteB, note16 + mus_note noteRst, note16 + mus_vel 1, 0 + + mus_octave oct3 + mus_note noteB, note8 + mus_note noteRst, note8 + mus_end + ; ADAD ;Guy walks you to museum MuseumGuy_md_1: ;ADAE - ADF0 From 2584075e448997ccfc250e0f1aa206f586ab94bd Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Wed, 25 Jan 2012 09:15:48 -0600 Subject: [PATCH 4/7] Finished MuseumGuy Channel 1 Music Data hg-commit-id: d24ed09f83cf --- music.asm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index ba2f7f38..cc4209de 100644 --- a/music.asm +++ b/music.asm @@ -4827,7 +4827,66 @@ branch_ad9e: ;Guy walks you to museum MuseumGuy_md_1: ;ADAE - ADF0 -INCBIN "baserom.gbc",$adae,$adf1 - $adae + ; ADAE + mus_tempo 0, 128 + mus_volume 119 + mus_duty duty50 + db $E8 + mus_vel 11, 1 + + mus_octave oct2 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteF#, note8 + mus_note noteE, note8 + mus_note noteD#, note8 + + mus_octave oct1 + mus_note noteB, note4 + mus_note noteB, note16 + + mus_octave oct2 + mus_note noteD#, note16 + mus_note noteE, note16 + mus_note noteG#, note16 + mus_note noteB, note2_8 + mus_call branch_ade7 + mus_call branch_adec + mus_call branch_ade7 + mus_note noteE, note4 + mus_note noteE, note4 + mus_note noteE, note8 + mus_note noteE, note4_8 + +branch_add6: + mus_call branch_ade7 + mus_call branch_adec + mus_call branch_ade7 + mus_note noteE, note4 + mus_note noteE, note4 + mus_note noteE, note8 + mus_note noteE, note4_8 + mus_jump 0, branch_add6 + +branch_ade7: + mus_note noteE, note8 + mus_note noteE, note4_8 + mus_note noteF#, note8 + mus_note noteF#, note4_8 + mus_end + ; ADEB + + ; ADEC +branch_adec: + mus_note noteE, note8 + mus_note noteE, note4_8 + mus_note noteD, note8 + mus_note noteD, note4_8 + mus_end + ; ADF0 MuseumGuy_md_2: ;ADF1 - AE6D INCBIN "baserom.gbc",$adf1,$ae6e - $adf1 From 4c7ddcbb0761637356dc138ebf127da7514aec24 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Wed, 25 Jan 2012 09:23:18 -0600 Subject: [PATCH 5/7] Finished MuseumGuy Channel 2 Music Data hg-commit-id: e492474add42 --- music.asm | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index cc4209de..80296fab 100644 --- a/music.asm +++ b/music.asm @@ -4889,7 +4889,130 @@ branch_adec: ; ADF0 MuseumGuy_md_2: ;ADF1 - AE6D -INCBIN "baserom.gbc",$adf1,$ae6e - $adf1 + ; ADF1 + mus_duty duty50 + mus_vel 12, 1 + + mus_octave oct3 + mus_note noteE, note8 + mus_note noteD, note8 + mus_note noteC#, note8 + mus_note noteD, note8 + mus_note noteC#, note8 + + mus_octave oct2 + mus_note noteB, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteE, note4 + mus_note noteE, note16 + mus_note noteG#, note16 + mus_note noteB, note16 + + mus_octave oct3 + mus_note noteD#, note16 + mus_note noteE, note2 + + mus_octave oct2 + mus_note noteA, note8 + + mus_octave oct3 + mus_note noteC#, note8 + mus_note noteE, note4 + mus_note noteD, note8 + mus_note noteF#, note8 + mus_note noteA, note4 + + mus_octave oct2 + mus_note noteA, note8 + + mus_octave oct3 + mus_note noteC#, note8 + mus_note noteE, note4 + mus_note noteD, note8 + mus_note noteC#, note8 + + mus_octave oct2 + mus_note noteB, note4 + mus_note noteA, note8 + + mus_octave oct3 + mus_note noteC#, note8 + mus_note noteE, note4 + mus_note noteD, note8 + mus_note noteF#, note8 + mus_note noteA, note8 + mus_note noteA, note8 + mus_note noteG#, note8 + mus_note noteE, note8 + mus_note noteF#, note8 + mus_note noteG#, note8 + mus_note noteA, note8 + mus_note noteA, note8 + mus_note noteA, note4 + +branch_ae26: + mus_octave oct2 + mus_note noteA, note8 + + mus_octave oct3 + mus_note noteC#, note8 + mus_note noteE, note8_16 + mus_vel 8, 1 + mus_note noteE, note16 + mus_vel 12, 1 + mus_note noteD, note8 + mus_note noteF#, note8 + mus_note noteA, note8_16 + mus_vel 9, 1 + mus_note noteA, note16 + mus_vel 12, 1 + + mus_octave oct2 + mus_note noteA, note8 + + mus_octave oct3 + mus_note noteC#, note8 + mus_note noteE, note4 + mus_note noteD, note16 + mus_note noteC#, note16 + mus_note noteC, note16 + + mus_octave oct2 + mus_note noteB, note16 + mus_note noteB, note8_16 + mus_vel 10, 1 + mus_note noteG#, note16 + mus_vel 12, 1 + mus_note noteA, note8 + + mus_octave oct3 + mus_note noteC#, note8 + mus_note noteE, note8_16 + mus_vel 9, 1 + mus_note noteE, note16 + mus_vel 12, 1 + mus_note noteD, note8 + mus_note noteF#, note8 + mus_note noteA, note8_16 + mus_vel 8, 1 + mus_note noteA, note16 + mus_vel 12, 1 + mus_note noteG#, note8 + mus_note noteE, note16 + mus_vel 8, 1 + mus_note noteE, note16 + mus_vel 12, 1 + mus_note noteF#, note8 + mus_vel 8, 1 + mus_note noteF#, note16 + mus_vel 12, 1 + mus_note noteG#, note16 + mus_note noteA, note8 + mus_note noteA, note8 + mus_note noteA, note4 + mus_jump 0, branch_ae26 + ; AE6D MuseumGuy_md_3: ;AE6E - AED0 INCBIN "baserom.gbc",$ae6e,$aed1 - $ae6e From 369cb976b4e29990ada764bc15983aa368f5fc8c Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Wed, 25 Jan 2012 09:29:46 -0600 Subject: [PATCH 6/7] Finished MuseumGuy Channel 3 Music Data hg-commit-id: ae694f3ec16c --- music.asm | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index 80296fab..b269096c 100644 --- a/music.asm +++ b/music.asm @@ -5015,7 +5015,111 @@ branch_ae26: ; AE6D MuseumGuy_md_3: ;AE6E - AED0 -INCBIN "baserom.gbc",$ae6e,$aed1 - $ae6e + ; AE6E + mus_vel 1, 0 + mus_note noteRst, note1 + + mus_octave oct3 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteRst, note8_16 + mus_note noteE, note16 + mus_note noteRst, note2_16 + mus_call branch_aeb8 + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_note noteRst, note4_16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note4_16 + mus_call branch_aeb8 + mus_note noteB, note16 + mus_note noteRst, note8_16 + mus_note noteG#, note16 + mus_note noteRst, note8_16 + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_note noteRst, note8_16 + +branch_ae8e: + mus_call branch_aec1 + mus_note noteRst, note8_16 + + mus_octave oct5 + mus_note noteE, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_note noteRst, note8_16 + mus_note noteB, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note8_16 + mus_call branch_aec1 + mus_note noteRst, note16 + + mus_octave oct5 + mus_note noteE, note16 + mus_note noteRst, note16 + mus_note noteD, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteB, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteG#, note16 + mus_note noteRst, note8_16 + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_note noteRst, note8_16 + mus_jump 0, branch_ae8e + +branch_aeb8: + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_note noteRst, note4_16 + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_note noteRst, note4_16 + mus_end + ; AEC0 + + ; AEC1 +branch_aec1: + mus_octave oct5 + mus_note noteC#, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_note noteRst, note8_16 + + mus_octave oct5 + mus_note noteF#, note16 + mus_note noteRst, note16 + + mus_octave oct4 + mus_note noteA, note16 + mus_note noteRst, note16 + mus_note noteA, note16 + mus_end + ; AED0 MuseumGuy_md_4: ;AED1 - AF58 INCBIN "baserom.gbc",$aed1,$af59 - $aed1 From cc02a733df81cad2ca98b4dbff2564db26514b8f Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da Date: Wed, 25 Jan 2012 11:08:02 -0600 Subject: [PATCH 7/7] Finished MuseumGuy Channel 4 Music Data hg-commit-id: 43ee6c3842ee --- music.asm | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 1 deletion(-) diff --git a/music.asm b/music.asm index b269096c..66882c54 100644 --- a/music.asm +++ b/music.asm @@ -5122,7 +5122,142 @@ branch_aec1: ; AED0 MuseumGuy_md_4: ;AED1 - AF58 -INCBIN "baserom.gbc",$aed1,$af59 - $aed1 + ; AED1 + mus_vel 12, 15 + mus_note noteRst, note1 + mus_note noteRst, note1 + mus_note noteRst, note1 + mus_note noteRst, note1 + mus_note noteRst, note2_4_8 + db $D6 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + +branch_aee1: + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4_8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note4_8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4_8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4_8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note4_8 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note4 + mus_note noteC#, note8 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note4 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_note noteB, note16 + mus_note noteC#, note8_16 + mus_jump 0, branch_aee1 + ; AF58 ;Meet Prof. Oak MeetProfOak_md_1: ;AF59 - AFA8