From 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Sat, 6 Jun 2015 13:51:06 -0500 Subject: Build only Yellow Conflicts: gfx/intro_nido_1.6x6.png gfx/intro_nido_2.6x6.png gfx/intro_nido_3.6x6.png gfx/redgreenversion.png text.asm text/maps/cerulean_trade_house.asm text/maps/copycats_house_1f.asm text/maps/daycare_2.asm text/maps/museum_2f.asm text/maps/oaks_lab.asm text/maps/pewter_gym.asm text/maps/route_9_1.asm text/maps/school.asm text/maps/vermilion_gym_1.asm yellow/main.asm --- audio/music/meetjessiejames.asm | 310 ++++++++++++++ audio/music/surfingpikachu.asm | 691 ++++++++++++++++++++++++++++++++ audio/music/yellow/meetjessiejames.asm | 310 -------------- audio/music/yellow/surfingpikachu.asm | 691 -------------------------------- audio/music/yellow/yellowintro.asm | 485 ---------------------- audio/music/yellow/yellowunusedsong.asm | 327 --------------- audio/music/yellowintro.asm | 485 ++++++++++++++++++++++ audio/music/yellowunusedsong.asm | 327 +++++++++++++++ audio/sfx/sfx_1f_5d.asm | 17 - 9 files changed, 1813 insertions(+), 1830 deletions(-) create mode 100644 audio/music/meetjessiejames.asm create mode 100644 audio/music/surfingpikachu.asm delete mode 100644 audio/music/yellow/meetjessiejames.asm delete mode 100644 audio/music/yellow/surfingpikachu.asm delete mode 100644 audio/music/yellow/yellowintro.asm delete mode 100644 audio/music/yellow/yellowunusedsong.asm create mode 100644 audio/music/yellowintro.asm create mode 100644 audio/music/yellowunusedsong.asm (limited to 'audio') diff --git a/audio/music/meetjessiejames.asm b/audio/music/meetjessiejames.asm new file mode 100644 index 00000000..5ef52491 --- /dev/null +++ b/audio/music/meetjessiejames.asm @@ -0,0 +1,310 @@ +Music_MeetJessieJames_Ch1:: ; 8316d (20:716d) + tempo 144 + volume 7, 7 + duty 3 + vibrato 8, 1, 4 + notetype 12, 11, 2 + octave 3 + G# 1 + G_ 1 + F# 2 + F_ 2 + E_ 2 + D# 2 + D_ 2 + C# 2 + C_ 2 + notetype 12, 11, 6 + D# 12 + C_ 4 + +Music_MeetJessieJames_branch_83187:: + notetype 12, 11, 2 + octave 4 + D_ 16 + rest 12 + notetype 12, 11, 4 + octave 3 + A# 4 + rest 16 + rest 8 + notetype 12, 11, 2 + octave 2 + A_ 2 + octave 3 + A# 2 + A_ 4 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + D# 2 + D_ 2 + D# 2 + F_ 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + octave 2 + A# 4 + notetype 12, 11, 4 + octave 3 + B_ 4 + notetype 12, 11, 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + D# 2 + D_ 2 + D# 2 + F_ 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + octave 2 + A# 2 + octave 3 + B_ 2 + notetype 12, 11, 4 + A# 4 + loopchannel 0, Music_MeetJessieJames_branch_83187 + + +Music_MeetJessieJames_Ch2:: ; 831c8 (20:71c8) + duty 3 + vibrato 6, 1, 5 + notetype 12, 12, 2 + octave 4 + D_ 1 + C# 1 + C_ 2 + octave 3 + B_ 2 + A# 2 + A_ 2 + G# 2 + G_ 2 + F# 2 + notetype 12, 12, 7 + A_ 12 + octave 4 + C# 4 + +Music_MeetJessieJames_branch_831df:: + notetype 12, 12, 2 + octave 3 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 + octave 2 + A_ 4 + notetype 12, 12, 5 + octave 4 + C# 4 + notetype 12, 12, 2 + D_ 1 + octave 3 + D_ 1 + D_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 + notetype 12, 12, 6 + octave 4 + D_ 8 + notetype 12, 12, 2 + D# 6 + F_ 4 + D# 4 + octave 3 + A# 2 + octave 4 + D# 6 + F_ 4 + D# 2 + notetype 12, 12, 5 + D_ 4 + notetype 12, 12, 2 + D# 6 + F_ 4 + D# 4 + octave 3 + A# 2 + octave 4 + D# 4 + F_ 4 + notetype 12, 12, 5 + D# 8 + loopchannel 0, Music_MeetJessieJames_branch_831df + + +Music_MeetJessieJames_Ch3:: ; 8322a (20:722a) + notetype 12, 1, 0 + rest 16 + rest 8 + octave 4 + D_ 2 + octave 3 + A_ 2 + octave 4 + C_ 2 + D# 2 + +Music_MeetJessieJames_branch_83235:: + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A# 2 + A_ 2 + D# 2 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + octave 3 + A_ 2 + octave 4 + C_ 2 + D_ 2 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + octave 3 + A# 1 + rest 1 + octave 4 + C# 1 + rest 1 + E_ 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + octave 3 + A# 1 + rest 1 + octave 4 + C# 1 + rest 1 + E_ 1 + rest 1 + loopchannel 0, Music_MeetJessieJames_branch_83235 + endchannel +; 0x832ba diff --git a/audio/music/surfingpikachu.asm b/audio/music/surfingpikachu.asm new file mode 100644 index 00000000..1832bb03 --- /dev/null +++ b/audio/music/surfingpikachu.asm @@ -0,0 +1,691 @@ +Music_SurfingPikachu_Ch1:: ; 82ce8 (20:6ce8) + tempo 117 + volume 7, 7 + duty 3 + vibrato 8, 1, 4 + notetype 12, 11, 3 + octave 3 + E_ 6 + notetype 12, 11, 2 + F# 2 + notetype 12, 11, 3 + E_ 6 + notetype 12, 11, 2 + F# 16 + rest 2 + notetype 12, 11, 3 + E_ 6 + notetype 12, 11, 2 + A_ 2 + notetype 12, 11, 3 + E_ 6 + notetype 12, 11, 2 + A_ 14 + notetype 12, 11, 2 + D# 2 + C# 1 + D# 1 + octave 2 + B_ 6 + octave 3 + E_ 4 + E_ 4 + E_ 8 + G# 4 + G# 4 + G# 2 + +Music_SurfingPikachu_branch_82d1a:: + notetype 12, 11, 3 + octave 3 + G# 4 + E_ 4 + F# 4 + E_ 2 + A_ 2 + G# 2 + F# 2 + G# 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + D# 2 + C# 6 + F# 2 + A_ 8 + octave 2 + B_ 6 + octave 3 + E_ 2 + G# 8 + G# 4 + E_ 4 + F# 4 + E_ 2 + A_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + F# 6 + E_ 2 + F# 1 + rest 3 + A_ 4 + duty 0 + notetype 12, 11, 2 + G# 1 + F# 1 + G# 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + D# 2 + F# 2 + F# 2 + D# 2 + F# 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + B_ 1 + A# 1 + B_ 2 + G# 2 + E_ 2 + G# 2 + G_ 2 + G# 2 + A_ 2 + octave 4 + C# 2 + C_ 2 + C# 3 + octave 3 + F# 1 + A_ 2 + G# 2 + F# 2 + A_ 2 + E_ 3 + E_ 1 + B_ 2 + A_ 2 + G# 6 + E_ 1 + F_ 1 + F# 2 + F# 2 + D# 2 + F# 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + B_ 1 + A# 1 + B_ 2 + G# 2 + E_ 2 + G# 2 + G_ 2 + G# 2 + A_ 2 + octave 4 + C# 2 + C_ 2 + C# 3 + octave 3 + F# 1 + A_ 2 + G# 2 + A_ 2 + octave 4 + D# 2 + E_ 2 + E_ 1 + D# 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + E_ 8 + duty 3 + loopchannel 0, Music_SurfingPikachu_branch_82d1a + + +Music_SurfingPikachu_Ch2:: ; 82d9d (20:6d9d) + duty 3 + vibrato 6, 1, 5 + notetype 12, 12, 4 + octave 3 + B_ 6 + notetype 12, 12, 2 + octave 4 + E_ 2 + notetype 12, 12, 4 + octave 3 + B_ 6 + notetype 12, 12, 2 + octave 4 + E_ 2 + notetype 12, 11, 2 + octave 3 + B_ 2 + octave 4 + C# 2 + D# 2 + C# 2 + octave 3 + B_ 2 + A_ 2 + G# 2 + F# 2 + notetype 12, 12, 4 + octave 4 + C# 6 + notetype 12, 12, 2 + F# 2 + notetype 12, 12, 4 + C# 6 + notetype 12, 12, 2 + F# 2 + notetype 12, 11, 2 + C# 2 + D# 2 + E_ 2 + D# 2 + C# 2 + octave 3 + B_ 2 + A_ 2 + G# 2 + notetype 12, 12, 2 + E_ 6 + B_ 4 + B_ 4 + B_ 8 + B_ 4 + B_ 4 + B_ 2 + +Music_SurfingPikachu_branch_82de0:: + notetype 12, 12, 6 + octave 4 + E_ 4 + octave 3 + B_ 4 + A_ 4 + octave 4 + C# 4 + octave 3 + B_ 6 + A_ 2 + G# 8 + F# 6 + A_ 2 + octave 4 + C# 8 + octave 3 + E_ 6 + G# 2 + B_ 8 + octave 4 + E_ 4 + octave 3 + B_ 4 + A_ 4 + octave 4 + C# 4 + octave 3 + B_ 6 + octave 4 + D# 2 + E_ 8 + D# 6 + C# 2 + D# 1 + rest 3 + F# 4 + E_ 10 + notetype 12, 12, 6 + duty 2 + E_ 2 + D# 2 + C# 2 + octave 3 + B_ 6 + octave 4 + C# 2 + D# 4 + octave 3 + B_ 4 + octave 4 + E_ 6 + F# 2 + G# 8 + A_ 6 + G# 2 + A_ 4 + F# 4 + G# 10 + E_ 2 + D# 2 + C# 2 + octave 3 + B_ 6 + octave 4 + C# 2 + D# 4 + octave 3 + B_ 4 + octave 4 + E_ 6 + F# 2 + G# 8 + A_ 4 + F# 4 + D# 4 + octave 5 + C# 4 + octave 4 + B_ 8 + notetype 12, 12, 2 + octave 5 + E_ 4 + notetype 12, 12, 6 + duty 3 + octave 3 + B_ 1 + A# 1 + B_ 1 + octave 4 + C# 1 + loopchannel 0, Music_SurfingPikachu_branch_82de0 + + +Music_SurfingPikachu_Ch3:: ; 82e45 (20:6e45) + notetype 12, 1, 0 + octave 4 + B_ 6 + octave 5 + C# 1 + rest 1 + octave 4 + B_ 6 + octave 5 + C# 1 + rest 1 + octave 4 + B_ 1 + rest 1 + A_ 1 + rest 1 + G# 1 + rest 1 + A_ 1 + rest 1 + B_ 1 + rest 1 + octave 5 + C# 1 + rest 1 + D# 1 + rest 1 + C# 1 + rest 1 + octave 4 + A_ 6 + octave 5 + C# 1 + rest 1 + octave 4 + A_ 6 + octave 5 + C# 1 + rest 1 + octave 4 + A_ 1 + rest 1 + G# 1 + rest 1 + F# 1 + rest 1 + E_ 1 + rest 1 + F# 1 + rest 1 + G# 1 + rest 1 + A_ 1 + rest 1 + G# 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + C# 1 + rest 1 + D# 1 + rest 1 + +Music_SurfingPikachu_branch_82ea0:: + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + octave 5 + C# 1 + C_ 1 + C# 1 + rest 1 + octave 4 + F# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + E_ 1 + rest 1 + octave 5 + E_ 1 + D# 1 + E_ 1 + rest 1 + octave 4 + D# 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + B_ 1 + rest 1 + A_ 1 + rest 1 + G# 1 + rest 1 + F# 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + C# 1 + rest 1 + D_ 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + C# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + C# 1 + rest 1 + A_ 1 + rest 1 + B_ 1 + A# 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + F# 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + C# 1 + rest 1 + D_ 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + C# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + D# 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + A_ 1 + rest 1 + A_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + C# 1 + rest 1 + D# 1 + rest 1 + loopchannel 0, Music_SurfingPikachu_branch_82ea0 +; 0x82fbe diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm deleted file mode 100644 index 5ef52491..00000000 --- a/audio/music/yellow/meetjessiejames.asm +++ /dev/null @@ -1,310 +0,0 @@ -Music_MeetJessieJames_Ch1:: ; 8316d (20:716d) - tempo 144 - volume 7, 7 - duty 3 - vibrato 8, 1, 4 - notetype 12, 11, 2 - octave 3 - G# 1 - G_ 1 - F# 2 - F_ 2 - E_ 2 - D# 2 - D_ 2 - C# 2 - C_ 2 - notetype 12, 11, 6 - D# 12 - C_ 4 - -Music_MeetJessieJames_branch_83187:: - notetype 12, 11, 2 - octave 4 - D_ 16 - rest 12 - notetype 12, 11, 4 - octave 3 - A# 4 - rest 16 - rest 8 - notetype 12, 11, 2 - octave 2 - A_ 2 - octave 3 - A# 2 - A_ 4 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - D# 2 - D_ 2 - D# 2 - F_ 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - octave 2 - A# 4 - notetype 12, 11, 4 - octave 3 - B_ 4 - notetype 12, 11, 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - D# 2 - D_ 2 - D# 2 - F_ 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - octave 2 - A# 2 - octave 3 - B_ 2 - notetype 12, 11, 4 - A# 4 - loopchannel 0, Music_MeetJessieJames_branch_83187 - - -Music_MeetJessieJames_Ch2:: ; 831c8 (20:71c8) - duty 3 - vibrato 6, 1, 5 - notetype 12, 12, 2 - octave 4 - D_ 1 - C# 1 - C_ 2 - octave 3 - B_ 2 - A# 2 - A_ 2 - G# 2 - G_ 2 - F# 2 - notetype 12, 12, 7 - A_ 12 - octave 4 - C# 4 - -Music_MeetJessieJames_branch_831df:: - notetype 12, 12, 2 - octave 3 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - octave 2 - A_ 4 - notetype 12, 12, 5 - octave 4 - C# 4 - notetype 12, 12, 2 - D_ 1 - octave 3 - D_ 1 - D_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - notetype 12, 12, 6 - octave 4 - D_ 8 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 - octave 3 - A# 2 - octave 4 - D# 6 - F_ 4 - D# 2 - notetype 12, 12, 5 - D_ 4 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 - octave 3 - A# 2 - octave 4 - D# 4 - F_ 4 - notetype 12, 12, 5 - D# 8 - loopchannel 0, Music_MeetJessieJames_branch_831df - - -Music_MeetJessieJames_Ch3:: ; 8322a (20:722a) - notetype 12, 1, 0 - rest 16 - rest 8 - octave 4 - D_ 2 - octave 3 - A_ 2 - octave 4 - C_ 2 - D# 2 - -Music_MeetJessieJames_branch_83235:: - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A# 2 - A_ 2 - D# 2 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - octave 3 - A_ 2 - octave 4 - C_ 2 - D_ 2 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - octave 3 - A# 1 - rest 1 - octave 4 - C# 1 - rest 1 - E_ 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - octave 3 - A# 1 - rest 1 - octave 4 - C# 1 - rest 1 - E_ 1 - rest 1 - loopchannel 0, Music_MeetJessieJames_branch_83235 - endchannel -; 0x832ba diff --git a/audio/music/yellow/surfingpikachu.asm b/audio/music/yellow/surfingpikachu.asm deleted file mode 100644 index 1832bb03..00000000 --- a/audio/music/yellow/surfingpikachu.asm +++ /dev/null @@ -1,691 +0,0 @@ -Music_SurfingPikachu_Ch1:: ; 82ce8 (20:6ce8) - tempo 117 - volume 7, 7 - duty 3 - vibrato 8, 1, 4 - notetype 12, 11, 3 - octave 3 - E_ 6 - notetype 12, 11, 2 - F# 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - F# 16 - rest 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - A_ 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - A_ 14 - notetype 12, 11, 2 - D# 2 - C# 1 - D# 1 - octave 2 - B_ 6 - octave 3 - E_ 4 - E_ 4 - E_ 8 - G# 4 - G# 4 - G# 2 - -Music_SurfingPikachu_branch_82d1a:: - notetype 12, 11, 3 - octave 3 - G# 4 - E_ 4 - F# 4 - E_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - D# 2 - C# 6 - F# 2 - A_ 8 - octave 2 - B_ 6 - octave 3 - E_ 2 - G# 8 - G# 4 - E_ 4 - F# 4 - E_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - F# 6 - E_ 2 - F# 1 - rest 3 - A_ 4 - duty 0 - notetype 12, 11, 2 - G# 1 - F# 1 - G# 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - D# 2 - F# 2 - F# 2 - D# 2 - F# 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - B_ 1 - A# 1 - B_ 2 - G# 2 - E_ 2 - G# 2 - G_ 2 - G# 2 - A_ 2 - octave 4 - C# 2 - C_ 2 - C# 3 - octave 3 - F# 1 - A_ 2 - G# 2 - F# 2 - A_ 2 - E_ 3 - E_ 1 - B_ 2 - A_ 2 - G# 6 - E_ 1 - F_ 1 - F# 2 - F# 2 - D# 2 - F# 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - B_ 1 - A# 1 - B_ 2 - G# 2 - E_ 2 - G# 2 - G_ 2 - G# 2 - A_ 2 - octave 4 - C# 2 - C_ 2 - C# 3 - octave 3 - F# 1 - A_ 2 - G# 2 - A_ 2 - octave 4 - D# 2 - E_ 2 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 8 - duty 3 - loopchannel 0, Music_SurfingPikachu_branch_82d1a - - -Music_SurfingPikachu_Ch2:: ; 82d9d (20:6d9d) - duty 3 - vibrato 6, 1, 5 - notetype 12, 12, 4 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 12, 4 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 11, 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - notetype 12, 12, 4 - octave 4 - C# 6 - notetype 12, 12, 2 - F# 2 - notetype 12, 12, 4 - C# 6 - notetype 12, 12, 2 - F# 2 - notetype 12, 11, 2 - C# 2 - D# 2 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - notetype 12, 12, 2 - E_ 6 - B_ 4 - B_ 4 - B_ 8 - B_ 4 - B_ 4 - B_ 2 - -Music_SurfingPikachu_branch_82de0:: - notetype 12, 12, 6 - octave 4 - E_ 4 - octave 3 - B_ 4 - A_ 4 - octave 4 - C# 4 - octave 3 - B_ 6 - A_ 2 - G# 8 - F# 6 - A_ 2 - octave 4 - C# 8 - octave 3 - E_ 6 - G# 2 - B_ 8 - octave 4 - E_ 4 - octave 3 - B_ 4 - A_ 4 - octave 4 - C# 4 - octave 3 - B_ 6 - octave 4 - D# 2 - E_ 8 - D# 6 - C# 2 - D# 1 - rest 3 - F# 4 - E_ 10 - notetype 12, 12, 6 - duty 2 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 6 - octave 4 - C# 2 - D# 4 - octave 3 - B_ 4 - octave 4 - E_ 6 - F# 2 - G# 8 - A_ 6 - G# 2 - A_ 4 - F# 4 - G# 10 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 6 - octave 4 - C# 2 - D# 4 - octave 3 - B_ 4 - octave 4 - E_ 6 - F# 2 - G# 8 - A_ 4 - F# 4 - D# 4 - octave 5 - C# 4 - octave 4 - B_ 8 - notetype 12, 12, 2 - octave 5 - E_ 4 - notetype 12, 12, 6 - duty 3 - octave 3 - B_ 1 - A# 1 - B_ 1 - octave 4 - C# 1 - loopchannel 0, Music_SurfingPikachu_branch_82de0 - - -Music_SurfingPikachu_Ch3:: ; 82e45 (20:6e45) - notetype 12, 1, 0 - octave 4 - B_ 6 - octave 5 - C# 1 - rest 1 - octave 4 - B_ 6 - octave 5 - C# 1 - rest 1 - octave 4 - B_ 1 - rest 1 - A_ 1 - rest 1 - G# 1 - rest 1 - A_ 1 - rest 1 - B_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - D# 1 - rest 1 - C# 1 - rest 1 - octave 4 - A_ 6 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 6 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 1 - rest 1 - G# 1 - rest 1 - F# 1 - rest 1 - E_ 1 - rest 1 - F# 1 - rest 1 - G# 1 - rest 1 - A_ 1 - rest 1 - G# 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - C# 1 - rest 1 - D# 1 - rest 1 - -Music_SurfingPikachu_branch_82ea0:: - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - octave 5 - C# 1 - C_ 1 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - E_ 1 - rest 1 - octave 5 - E_ 1 - D# 1 - E_ 1 - rest 1 - octave 4 - D# 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - B_ 1 - rest 1 - A_ 1 - rest 1 - G# 1 - rest 1 - F# 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - C# 1 - rest 1 - D_ 1 - rest 1 - D# 1 - rest 1 - F# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - F# 1 - rest 1 - D# 1 - rest 1 - F# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - F# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - C# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - C# 1 - rest 1 - A_ 1 - rest 1 - B_ 1 - A# 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - F# 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - C# 1 - rest 1 - D_ 1 - rest 1 - D# 1 - rest 1 - F# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - F# 1 - rest 1 - D# 1 - rest 1 - F# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - F# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - C# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - D# 1 - rest 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - A_ 1 - rest 1 - A_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - C# 1 - rest 1 - D# 1 - rest 1 - loopchannel 0, Music_SurfingPikachu_branch_82ea0 -; 0x82fbe diff --git a/audio/music/yellow/yellowintro.asm b/audio/music/yellow/yellowintro.asm deleted file mode 100644 index 4d9cf938..00000000 --- a/audio/music/yellow/yellowintro.asm +++ /dev/null @@ -1,485 +0,0 @@ -Music_YellowIntro_Ch1:: ; 7f65c (1f:765c) - tempo 116 - volume 7, 7 - duty 3 - vibrato 8, 1, 4 - notetype 12, 11, 2 - octave 3 - G# 2 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 3 - A# 1 - B_ 2 - B_ 10 - notetype 12, 11, 6 - octave 4 - C# 1 - C_ 1 - C# 10 - octave 3 - G# 1 - G_ 1 - G# 4 - B_ 4 - octave 4 - E_ 4 - F# 8 - E_ 8 - octave 3 - A_ 4 - B_ 4 - octave 4 - C# 4 - octave 3 - B_ 4 - G# 6 - notetype 12, 11, 2 - B_ 2 - notetype 12, 11, 6 - G# 6 - notetype 12, 11, 2 - B_ 2 - notetype 12, 11, 6 - octave 4 - E_ 6 - notetype 12, 11, 2 - G# 2 - notetype 12, 11, 6 - E_ 6 - notetype 12, 11, 2 - G# 2 - notetype 12, 11, 6 - octave 3 - A_ 4 - F# 4 - A_ 4 - B_ 4 - F# 4 - G# 4 - A_ 2 - G# 2 - F# 2 - D# 2 - notetype 12, 11, 3 - B_ 2 - octave 4 - E_ 4 - E_ 4 - E_ 4 - E_ 2 - C# 2 - F# 4 - F# 3 - D# 1 - F# 2 - F# 8 - notetype 12, 11, 6 - F# 1 - F_ 1 - F# 8 - octave 3 - B_ 1 - A# 1 - B_ 8 - octave 4 - F# 1 - F_ 1 - F# 2 - notetype 12, 11, 3 - F# 1 - E_ 1 - D# 1 - C# 1 - notetype 12, 11, 2 - octave 3 - B_ 16 - endchannel - - -Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3) - duty 2 - vibrato 6, 1, 5 - notetype 12, 12, 2 - octave 3 - B_ 2 - octave 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - E_ 3 - D# 1 - E_ 2 - E_ 4 - notetype 12, 12, 5 - G# 1 - G_ 1 - G# 10 - octave 3 - B_ 1 - A# 1 - B_ 6 - notetype 12, 12, 7 - octave 4 - E_ 4 - G# 4 - B_ 4 - octave 5 - C# 16 - octave 4 - A_ 4 - G# 4 - F# 4 - E_ 4 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 12, 7 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 12, 7 - G# 6 - notetype 12, 12, 2 - B_ 2 - notetype 12, 12, 7 - G# 6 - notetype 12, 12, 2 - B_ 2 - notetype 12, 12, 7 - C# 4 - octave 3 - A_ 4 - octave 4 - C# 4 - D# 4 - E_ 2 - D# 2 - C# 2 - D# 4 - D# 2 - C# 2 - octave 3 - B_ 2 - notetype 12, 12, 3 - octave 4 - E_ 2 - G# 4 - G# 4 - G# 4 - G# 2 - F# 2 - A_ 4 - A_ 3 - F# 1 - A_ 2 - A_ 4 - notetype 12, 12, 7 - B_ 1 - A# 1 - B_ 8 - B_ 1 - A# 1 - B_ 8 - B_ 1 - A# 1 - B_ 6 - notetype 12, 12, 3 - B_ 1 - A_ 1 - G# 1 - F# 1 - notetype 12, 12, 2 - E_ 16 - endchannel - - -Music_YellowIntro_Ch3:: ; 7f749 (1f:7749) - notetype 12, 1, 0 - octave 4 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - E_ 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - C# 1 - rest 1 - D# 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - C# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - C# 1 - rest 1 - A_ 1 - rest 1 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - B_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - B_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - B_ 1 - rest 1 - A_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - A_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - E_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - E_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - F# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 3 - F# 1 - rest 1 - octave 4 - F# 1 - G# 1 - A_ 1 - octave 5 - C# 1 - E_ 1 - rest 15 - endchannel -; 0x7f860 diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm deleted file mode 100644 index e8c2a7ba..00000000 --- a/audio/music/yellow/yellowunusedsong.asm +++ /dev/null @@ -1,327 +0,0 @@ -Music_YellowUnusedSong_Ch1:: ; 82fbe (20:6fbe) - tempo 140 - volume 7, 7 - duty 3 - vibrato 8, 1, 4 - notetype 8, 11, 2 - octave 3 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 - G_ 6 - A_ 6 - E_ 6 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - A_ 6 - G_ 6 - A_ 12 - -Music_YellowUnusedSong_branch_82fde:: - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 - G_ 6 - A_ 6 - E_ 6 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 - octave 4 - D# 6 - D_ 12 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - octave 3 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 - G_ 6 - A_ 6 - E_ 6 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - A_ 6 - G_ 6 - A_ 12 - loopchannel 0, Music_YellowUnusedSong_branch_82fde - - -Music_YellowUnusedSong_Ch2:: ; 83010 (20:7010) - duty 2 - notetype 8, 12, 2 - octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 - octave 3 - A_ 6 - octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - D_ 6 - A# 6 - A_ 12 - -Music_YellowUnusedSong_branch_8302a:: - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 - octave 3 - A_ 6 - octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - G# 6 - G_ 12 - notetype 8, 9, 0 - octave 3 - D# 16 - D# 8 - D# 16 - D# 8 - octave 2 - A# 16 - A# 8 - octave 3 - D# 12 - F_ 12 - notetype 8, 12, 2 - octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 - octave 3 - A_ 6 - octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - D_ 6 - A# 6 - A_ 12 - loopchannel 0, Music_YellowUnusedSong_branch_8302a - - -Music_YellowUnusedSong_Ch3:: ; 83068 (20:7068) - notetype 12, 1, 0 - vibrato 2, 1, 5 - rest 16 - rest 12 - octave 4 - C_ 4 - D_ 8 - D# 8 - G_ 8 - A# 8 - -Music_YellowUnusedSong_branch_83075:: - A_ 8 - A# 8 - G_ 8 - A_ 4 - D_ 4 - A_ 8 - A# 8 - octave 5 - C# 8 - D_ 8 - D# 16 - D# 16 - octave 4 - A# 16 - octave 5 - D# 8 - F_ 8 - octave 4 - D_ 16 - D_ 16 - octave 4 - D_ 8 - D# 8 - G_ 8 - A# 8 - loopchannel 0, Music_YellowUnusedSong_branch_83075 - - -Music_YellowUnusedSong_Ch4:: ; 83092 (20:7092) - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 - -Music_YellowUnusedSong_branch_830c3:: - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 2 - snare3 2 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 - loopchannel 0, Music_YellowUnusedSong_branch_830c3 -; 0x8316d diff --git a/audio/music/yellowintro.asm b/audio/music/yellowintro.asm new file mode 100644 index 00000000..4d9cf938 --- /dev/null +++ b/audio/music/yellowintro.asm @@ -0,0 +1,485 @@ +Music_YellowIntro_Ch1:: ; 7f65c (1f:765c) + tempo 116 + volume 7, 7 + duty 3 + vibrato 8, 1, 4 + notetype 12, 11, 2 + octave 3 + G# 2 + B_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 3 + A# 1 + B_ 2 + B_ 10 + notetype 12, 11, 6 + octave 4 + C# 1 + C_ 1 + C# 10 + octave 3 + G# 1 + G_ 1 + G# 4 + B_ 4 + octave 4 + E_ 4 + F# 8 + E_ 8 + octave 3 + A_ 4 + B_ 4 + octave 4 + C# 4 + octave 3 + B_ 4 + G# 6 + notetype 12, 11, 2 + B_ 2 + notetype 12, 11, 6 + G# 6 + notetype 12, 11, 2 + B_ 2 + notetype 12, 11, 6 + octave 4 + E_ 6 + notetype 12, 11, 2 + G# 2 + notetype 12, 11, 6 + E_ 6 + notetype 12, 11, 2 + G# 2 + notetype 12, 11, 6 + octave 3 + A_ 4 + F# 4 + A_ 4 + B_ 4 + F# 4 + G# 4 + A_ 2 + G# 2 + F# 2 + D# 2 + notetype 12, 11, 3 + B_ 2 + octave 4 + E_ 4 + E_ 4 + E_ 4 + E_ 2 + C# 2 + F# 4 + F# 3 + D# 1 + F# 2 + F# 8 + notetype 12, 11, 6 + F# 1 + F_ 1 + F# 8 + octave 3 + B_ 1 + A# 1 + B_ 8 + octave 4 + F# 1 + F_ 1 + F# 2 + notetype 12, 11, 3 + F# 1 + E_ 1 + D# 1 + C# 1 + notetype 12, 11, 2 + octave 3 + B_ 16 + endchannel + + +Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3) + duty 2 + vibrato 6, 1, 5 + notetype 12, 12, 2 + octave 3 + B_ 2 + octave 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + E_ 3 + D# 1 + E_ 2 + E_ 4 + notetype 12, 12, 5 + G# 1 + G_ 1 + G# 10 + octave 3 + B_ 1 + A# 1 + B_ 6 + notetype 12, 12, 7 + octave 4 + E_ 4 + G# 4 + B_ 4 + octave 5 + C# 16 + octave 4 + A_ 4 + G# 4 + F# 4 + E_ 4 + octave 3 + B_ 6 + notetype 12, 12, 2 + octave 4 + E_ 2 + notetype 12, 12, 7 + octave 3 + B_ 6 + notetype 12, 12, 2 + octave 4 + E_ 2 + notetype 12, 12, 7 + G# 6 + notetype 12, 12, 2 + B_ 2 + notetype 12, 12, 7 + G# 6 + notetype 12, 12, 2 + B_ 2 + notetype 12, 12, 7 + C# 4 + octave 3 + A_ 4 + octave 4 + C# 4 + D# 4 + E_ 2 + D# 2 + C# 2 + D# 4 + D# 2 + C# 2 + octave 3 + B_ 2 + notetype 12, 12, 3 + octave 4 + E_ 2 + G# 4 + G# 4 + G# 4 + G# 2 + F# 2 + A_ 4 + A_ 3 + F# 1 + A_ 2 + A_ 4 + notetype 12, 12, 7 + B_ 1 + A# 1 + B_ 8 + B_ 1 + A# 1 + B_ 8 + B_ 1 + A# 1 + B_ 6 + notetype 12, 12, 3 + B_ 1 + A_ 1 + G# 1 + F# 1 + notetype 12, 12, 2 + E_ 16 + endchannel + + +Music_YellowIntro_Ch3:: ; 7f749 (1f:7749) + notetype 12, 1, 0 + octave 4 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + E_ 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + C# 1 + rest 1 + D# 1 + rest 1 + G# 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + G# 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + G# 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + G# 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + C# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + C# 1 + rest 1 + A_ 1 + rest 1 + A_ 1 + rest 1 + octave 5 + C# 1 + rest 1 + octave 4 + F# 1 + rest 1 + octave 5 + C# 1 + rest 1 + octave 4 + A_ 1 + rest 1 + octave 5 + C# 1 + rest 1 + octave 4 + F# 1 + rest 1 + octave 5 + C# 1 + rest 1 + octave 4 + B_ 1 + rest 1 + octave 5 + E_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + octave 5 + E_ 1 + rest 1 + octave 4 + B_ 1 + rest 1 + octave 5 + E_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + octave 5 + E_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + B_ 1 + rest 1 + A_ 1 + rest 1 + octave 5 + C# 1 + rest 1 + octave 4 + F# 1 + rest 1 + octave 5 + C# 1 + rest 1 + octave 4 + A_ 1 + rest 1 + octave 5 + C# 1 + rest 1 + octave 4 + F# 1 + rest 1 + octave 5 + C# 1 + rest 1 + octave 4 + A_ 1 + rest 1 + octave 5 + C# 1 + rest 1 + octave 4 + F# 1 + rest 1 + octave 5 + C# 1 + rest 1 + octave 4 + A_ 1 + rest 1 + octave 5 + C# 1 + rest 1 + octave 4 + B_ 1 + rest 1 + A_ 1 + rest 1 + G# 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + G# 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + G# 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + G# 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + A_ 1 + rest 1 + octave 5 + E_ 1 + rest 1 + octave 4 + E_ 1 + rest 1 + octave 5 + E_ 1 + rest 1 + octave 4 + A_ 1 + rest 1 + octave 5 + E_ 1 + rest 1 + octave 4 + E_ 1 + rest 1 + octave 5 + E_ 1 + rest 1 + octave 4 + A_ 1 + rest 1 + octave 5 + F# 1 + rest 1 + octave 4 + F# 1 + rest 1 + octave 5 + C# 1 + rest 3 + F# 1 + rest 1 + octave 4 + F# 1 + G# 1 + A_ 1 + octave 5 + C# 1 + E_ 1 + rest 15 + endchannel +; 0x7f860 diff --git a/audio/music/yellowunusedsong.asm b/audio/music/yellowunusedsong.asm new file mode 100644 index 00000000..e8c2a7ba --- /dev/null +++ b/audio/music/yellowunusedsong.asm @@ -0,0 +1,327 @@ +Music_YellowUnusedSong_Ch1:: ; 82fbe (20:6fbe) + tempo 140 + volume 7, 7 + duty 3 + vibrato 8, 1, 4 + notetype 8, 11, 2 + octave 3 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 + G_ 6 + A_ 6 + E_ 6 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + A_ 6 + G_ 6 + A_ 12 + +Music_YellowUnusedSong_branch_82fde:: + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 + G_ 6 + A_ 6 + E_ 6 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 + octave 4 + D# 6 + D_ 12 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + octave 3 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 + G_ 6 + A_ 6 + E_ 6 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + A_ 6 + G_ 6 + A_ 12 + loopchannel 0, Music_YellowUnusedSong_branch_82fde + + +Music_YellowUnusedSong_Ch2:: ; 83010 (20:7010) + duty 2 + notetype 8, 12, 2 + octave 4 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + C_ 6 + D_ 6 + octave 3 + A_ 6 + octave 4 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + D_ 6 + A# 6 + A_ 12 + +Music_YellowUnusedSong_branch_8302a:: + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + C_ 6 + D_ 6 + octave 3 + A_ 6 + octave 4 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + G# 6 + G_ 12 + notetype 8, 9, 0 + octave 3 + D# 16 + D# 8 + D# 16 + D# 8 + octave 2 + A# 16 + A# 8 + octave 3 + D# 12 + F_ 12 + notetype 8, 12, 2 + octave 4 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + C_ 6 + D_ 6 + octave 3 + A_ 6 + octave 4 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + D_ 6 + A# 6 + A_ 12 + loopchannel 0, Music_YellowUnusedSong_branch_8302a + + +Music_YellowUnusedSong_Ch3:: ; 83068 (20:7068) + notetype 12, 1, 0 + vibrato 2, 1, 5 + rest 16 + rest 12 + octave 4 + C_ 4 + D_ 8 + D# 8 + G_ 8 + A# 8 + +Music_YellowUnusedSong_branch_83075:: + A_ 8 + A# 8 + G_ 8 + A_ 4 + D_ 4 + A_ 8 + A# 8 + octave 5 + C# 8 + D_ 8 + D# 16 + D# 16 + octave 4 + A# 16 + octave 5 + D# 8 + F_ 8 + octave 4 + D_ 16 + D_ 16 + octave 4 + D_ 8 + D# 8 + G_ 8 + A# 8 + loopchannel 0, Music_YellowUnusedSong_branch_83075 + + +Music_YellowUnusedSong_Ch4:: ; 83092 (20:7092) + dspeed 12 + snare3 4 + dspeed 8 + snare3 2 + snare3 2 + snare3 2 + dspeed 12 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + dspeed 8 + snare3 2 + snare3 2 + snare3 2 + dspeed 12 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 4 + +Music_YellowUnusedSong_branch_830c3:: + snare3 4 + dspeed 8 + snare3 2 + snare3 2 + snare3 2 + dspeed 12 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + dspeed 8 + snare3 2 + snare3 2 + snare3 2 + dspeed 12 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 4 + snare3 4 + dspeed 8 + snare3 2 + snare3 2 + snare3 2 + dspeed 12 + snare3 4 + dspeed 8 + snare3 2 + snare3 2 + snare3 2 + dspeed 12 + snare3 4 + dspeed 8 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + dspeed 12 + snare3 4 + dspeed 8 + snare3 2 + snare3 2 + snare3 2 + dspeed 12 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 2 + snare3 2 + snare3 4 + dspeed 8 + snare3 2 + snare3 2 + snare3 2 + dspeed 12 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + dspeed 8 + snare3 2 + snare3 2 + snare3 2 + dspeed 12 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 4 + loopchannel 0, Music_YellowUnusedSong_branch_830c3 +; 0x8316d diff --git a/audio/sfx/sfx_1f_5d.asm b/audio/sfx/sfx_1f_5d.asm index f0606032..b26e5e09 100755 --- a/audio/sfx/sfx_1f_5d.asm +++ b/audio/sfx/sfx_1f_5d.asm @@ -1,37 +1,20 @@ SFX_1f_5d_Ch1: ; 7c45e (1f:445e) duty 2 -IF DEF(_RED) unknownsfx0x20 4, 244, 0, 7 unknownsfx0x20 3, 228, 128, 6 unknownsfx0x20 3, 228, 192, 6 unknownsfx0x20 3, 228, 0, 7 unknownsfx0x20 2, 228, 160, 7 -ELSE - unknownsfx0x20 3, 228, 0, 6 - unknownsfx0x20 3, 228, 128, 6 - unknownsfx0x20 3, 228, 192, 6 - unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 15, 242, 224, 7 -ENDC endchannel SFX_1f_5d_Ch2: ; 7c475 (1f:4475) duty 2 -IF DEF(_RED) unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 3, 212, 1, 7 unknownsfx0x20 3, 196, 129, 6 unknownsfx0x20 3, 196, 193, 6 unknownsfx0x20 3, 196, 1, 7 unknownsfx0x20 2, 196, 161, 7 -ELSE - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 3, 196, 1, 6 - unknownsfx0x20 3, 196, 129, 6 - unknownsfx0x20 3, 196, 193, 6 - unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 15, 210, 225, 7 -ENDC endchannel ; 0x7c490 -- cgit v1.3.1-sl0p