foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use generic names for noise instruments

Browse source 
coming up with satisfactory names is hard, besides this will improve compatibility with crystal
This commit is contained in:
dannye 2019-07-28 17:29:35 -05:00
parent 20c4116788
commit 6574881cda
82 changed files with 2350 additions and 2440 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
audio.asm
View file

@ -23,25 +23,25 @@ INCLUDE "audio/headers/musicheaders3.asm"
SECTION "Sound Effects 1", ROMX ; BANK $02
INCLUDE "audio/sfx/snare1_1.asm"
INCLUDE "audio/sfx/snare2_1.asm"
INCLUDE "audio/sfx/snare3_1.asm"
INCLUDE "audio/sfx/snare4_1.asm"
INCLUDE "audio/sfx/snare5_1.asm"
INCLUDE "audio/sfx/triangle1_1.asm"
INCLUDE "audio/sfx/triangle2_1.asm"
INCLUDE "audio/sfx/snare6_1.asm"
INCLUDE "audio/sfx/snare7_1.asm"
INCLUDE "audio/sfx/snare8_1.asm"
INCLUDE "audio/sfx/snare9_1.asm"
INCLUDE "audio/sfx/cymbal1_1.asm"
INCLUDE "audio/sfx/cymbal2_1.asm"
INCLUDE "audio/sfx/cymbal3_1.asm"
INCLUDE "audio/sfx/muted_snare1_1.asm"
INCLUDE "audio/sfx/triangle3_1.asm"
INCLUDE "audio/sfx/muted_snare2_1.asm"
INCLUDE "audio/sfx/muted_snare3_1.asm"
INCLUDE "audio/sfx/muted_snare4_1.asm"
INCLUDE "audio/sfx/noise_instrument01_1.asm"
INCLUDE "audio/sfx/noise_instrument02_1.asm"
INCLUDE "audio/sfx/noise_instrument03_1.asm"
INCLUDE "audio/sfx/noise_instrument04_1.asm"
INCLUDE "audio/sfx/noise_instrument05_1.asm"
INCLUDE "audio/sfx/noise_instrument06_1.asm"
INCLUDE "audio/sfx/noise_instrument07_1.asm"
INCLUDE "audio/sfx/noise_instrument08_1.asm"
INCLUDE "audio/sfx/noise_instrument09_1.asm"
INCLUDE "audio/sfx/noise_instrument10_1.asm"
INCLUDE "audio/sfx/noise_instrument11_1.asm"
INCLUDE "audio/sfx/noise_instrument12_1.asm"
INCLUDE "audio/sfx/noise_instrument13_1.asm"
INCLUDE "audio/sfx/noise_instrument14_1.asm"
INCLUDE "audio/sfx/noise_instrument15_1.asm"
INCLUDE "audio/sfx/noise_instrument16_1.asm"
INCLUDE "audio/sfx/noise_instrument17_1.asm"
INCLUDE "audio/sfx/noise_instrument18_1.asm"
INCLUDE "audio/sfx/noise_instrument19_1.asm"
Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm"
@ -122,25 +122,25 @@ INCLUDE "audio/sfx/cry22_1.asm"
SECTION "Sound Effects 2", ROMX ; BANK $08
INCLUDE "audio/sfx/snare1_2.asm"
INCLUDE "audio/sfx/snare2_2.asm"
INCLUDE "audio/sfx/snare3_2.asm"
INCLUDE "audio/sfx/snare4_2.asm"
INCLUDE "audio/sfx/snare5_2.asm"
INCLUDE "audio/sfx/triangle1_2.asm"
INCLUDE "audio/sfx/triangle2_2.asm"
INCLUDE "audio/sfx/snare6_2.asm"
INCLUDE "audio/sfx/snare7_2.asm"
INCLUDE "audio/sfx/snare8_2.asm"
INCLUDE "audio/sfx/snare9_2.asm"
INCLUDE "audio/sfx/cymbal1_2.asm"
INCLUDE "audio/sfx/cymbal2_2.asm"
INCLUDE "audio/sfx/cymbal3_2.asm"
INCLUDE "audio/sfx/muted_snare1_2.asm"
INCLUDE "audio/sfx/triangle3_2.asm"
INCLUDE "audio/sfx/muted_snare2_2.asm"
INCLUDE "audio/sfx/muted_snare3_2.asm"
INCLUDE "audio/sfx/muted_snare4_2.asm"
INCLUDE "audio/sfx/noise_instrument01_2.asm"
INCLUDE "audio/sfx/noise_instrument02_2.asm"
INCLUDE "audio/sfx/noise_instrument03_2.asm"
INCLUDE "audio/sfx/noise_instrument04_2.asm"
INCLUDE "audio/sfx/noise_instrument05_2.asm"
INCLUDE "audio/sfx/noise_instrument06_2.asm"
INCLUDE "audio/sfx/noise_instrument07_2.asm"
INCLUDE "audio/sfx/noise_instrument08_2.asm"
INCLUDE "audio/sfx/noise_instrument09_2.asm"
INCLUDE "audio/sfx/noise_instrument10_2.asm"
INCLUDE "audio/sfx/noise_instrument11_2.asm"
INCLUDE "audio/sfx/noise_instrument12_2.asm"
INCLUDE "audio/sfx/noise_instrument13_2.asm"
INCLUDE "audio/sfx/noise_instrument14_2.asm"
INCLUDE "audio/sfx/noise_instrument15_2.asm"
INCLUDE "audio/sfx/noise_instrument16_2.asm"
INCLUDE "audio/sfx/noise_instrument17_2.asm"
INCLUDE "audio/sfx/noise_instrument18_2.asm"
INCLUDE "audio/sfx/noise_instrument19_2.asm"
Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm"
@ -247,25 +247,25 @@ INCLUDE "audio/sfx/cry22_2.asm"
SECTION "Sound Effects 3", ROMX ; BANK $1f
INCLUDE "audio/sfx/snare1_3.asm"
INCLUDE "audio/sfx/snare2_3.asm"
INCLUDE "audio/sfx/snare3_3.asm"
INCLUDE "audio/sfx/snare4_3.asm"
INCLUDE "audio/sfx/snare5_3.asm"
INCLUDE "audio/sfx/triangle1_3.asm"
INCLUDE "audio/sfx/triangle2_3.asm"
INCLUDE "audio/sfx/snare6_3.asm"
INCLUDE "audio/sfx/snare7_3.asm"
INCLUDE "audio/sfx/snare8_3.asm"
INCLUDE "audio/sfx/snare9_3.asm"
INCLUDE "audio/sfx/cymbal1_3.asm"
INCLUDE "audio/sfx/cymbal2_3.asm"
INCLUDE "audio/sfx/cymbal3_3.asm"
INCLUDE "audio/sfx/muted_snare1_3.asm"
INCLUDE "audio/sfx/triangle3_3.asm"
INCLUDE "audio/sfx/muted_snare2_3.asm"
INCLUDE "audio/sfx/muted_snare3_3.asm"
INCLUDE "audio/sfx/muted_snare4_3.asm"
INCLUDE "audio/sfx/noise_instrument01_3.asm"
INCLUDE "audio/sfx/noise_instrument02_3.asm"
INCLUDE "audio/sfx/noise_instrument03_3.asm"
INCLUDE "audio/sfx/noise_instrument04_3.asm"
INCLUDE "audio/sfx/noise_instrument05_3.asm"
INCLUDE "audio/sfx/noise_instrument06_3.asm"
INCLUDE "audio/sfx/noise_instrument07_3.asm"
INCLUDE "audio/sfx/noise_instrument08_3.asm"
INCLUDE "audio/sfx/noise_instrument09_3.asm"
INCLUDE "audio/sfx/noise_instrument10_3.asm"
INCLUDE "audio/sfx/noise_instrument11_3.asm"
INCLUDE "audio/sfx/noise_instrument12_3.asm"
INCLUDE "audio/sfx/noise_instrument13_3.asm"
INCLUDE "audio/sfx/noise_instrument14_3.asm"
INCLUDE "audio/sfx/noise_instrument15_3.asm"
INCLUDE "audio/sfx/noise_instrument16_3.asm"
INCLUDE "audio/sfx/noise_instrument17_3.asm"
INCLUDE "audio/sfx/noise_instrument18_3.asm"
INCLUDE "audio/sfx/noise_instrument19_3.asm"
Audio3_WavePointers: INCLUDE "audio/wave_instruments.asm"

76
audio/headers/sfxheaders1.asm
View file

@ -1,62 +1,62 @@
SFX_Headers_1::
db $ff, $ff, $ff ; padding
SFX_Snare1_1::
audio_header SFX_Snare1_1, Ch8
SFX_Noise_Instrument01_1::
audio_header SFX_Noise_Instrument01_1, Ch8
SFX_Snare2_1::
audio_header SFX_Snare2_1, Ch8
SFX_Noise_Instrument02_1::
audio_header SFX_Noise_Instrument02_1, Ch8
SFX_Snare3_1::
audio_header SFX_Snare3_1, Ch8
SFX_Noise_Instrument03_1::
audio_header SFX_Noise_Instrument03_1, Ch8
SFX_Snare4_1::
audio_header SFX_Snare4_1, Ch8
SFX_Noise_Instrument04_1::
audio_header SFX_Noise_Instrument04_1, Ch8
SFX_Snare5_1::
audio_header SFX_Snare5_1, Ch8
SFX_Noise_Instrument05_1::
audio_header SFX_Noise_Instrument05_1, Ch8
SFX_Triangle1_1::
audio_header SFX_Triangle1_1, Ch8
SFX_Noise_Instrument06_1::
audio_header SFX_Noise_Instrument06_1, Ch8
SFX_Triangle2_1::
audio_header SFX_Triangle2_1, Ch8
SFX_Noise_Instrument07_1::
audio_header SFX_Noise_Instrument07_1, Ch8
SFX_Snare6_1::
audio_header SFX_Snare6_1, Ch8
SFX_Noise_Instrument08_1::
audio_header SFX_Noise_Instrument08_1, Ch8
SFX_Snare7_1::
audio_header SFX_Snare7_1, Ch8
SFX_Noise_Instrument09_1::
audio_header SFX_Noise_Instrument09_1, Ch8
SFX_Snare8_1::
audio_header SFX_Snare8_1, Ch8
SFX_Noise_Instrument10_1::
audio_header SFX_Noise_Instrument10_1, Ch8
SFX_Snare9_1::
audio_header SFX_Snare9_1, Ch8
SFX_Noise_Instrument11_1::
audio_header SFX_Noise_Instrument11_1, Ch8
SFX_Cymbal1_1::
audio_header SFX_Cymbal1_1, Ch8
SFX_Noise_Instrument12_1::
audio_header SFX_Noise_Instrument12_1, Ch8
SFX_Cymbal2_1::
audio_header SFX_Cymbal2_1, Ch8
SFX_Noise_Instrument13_1::
audio_header SFX_Noise_Instrument13_1, Ch8
SFX_Cymbal3_1::
audio_header SFX_Cymbal3_1, Ch8
SFX_Noise_Instrument14_1::
audio_header SFX_Noise_Instrument14_1, Ch8
SFX_Muted_Snare1_1::
audio_header SFX_Muted_Snare1_1, Ch8
SFX_Noise_Instrument15_1::
audio_header SFX_Noise_Instrument15_1, Ch8
SFX_Triangle3_1::
audio_header SFX_Triangle3_1, Ch8
SFX_Noise_Instrument16_1::
audio_header SFX_Noise_Instrument16_1, Ch8
SFX_Muted_Snare2_1::
audio_header SFX_Muted_Snare2_1, Ch8
SFX_Noise_Instrument17_1::
audio_header SFX_Noise_Instrument17_1, Ch8
SFX_Muted_Snare3_1::
audio_header SFX_Muted_Snare3_1, Ch8
SFX_Noise_Instrument18_1::
audio_header SFX_Noise_Instrument18_1, Ch8
SFX_Muted_Snare4_1::
audio_header SFX_Muted_Snare4_1, Ch8
SFX_Noise_Instrument19_1::
audio_header SFX_Noise_Instrument19_1, Ch8
SFX_Cry00_1::
audio_header SFX_Cry00_1, Ch5, Ch6, Ch8

76
audio/headers/sfxheaders2.asm
View file

@ -1,62 +1,62 @@
SFX_Headers_2::
db $ff, $ff, $ff ; padding
SFX_Snare1_2::
audio_header SFX_Snare1_2, Ch8
SFX_Noise_Instrument01_2::
audio_header SFX_Noise_Instrument01_2, Ch8
SFX_Snare2_2::
audio_header SFX_Snare2_2, Ch8
SFX_Noise_Instrument02_2::
audio_header SFX_Noise_Instrument02_2, Ch8
SFX_Snare3_2::
audio_header SFX_Snare3_2, Ch8
SFX_Noise_Instrument03_2::
audio_header SFX_Noise_Instrument03_2, Ch8
SFX_Snare4_2::
audio_header SFX_Snare4_2, Ch8
SFX_Noise_Instrument04_2::
audio_header SFX_Noise_Instrument04_2, Ch8
SFX_Snare5_2::
audio_header SFX_Snare5_2, Ch8
SFX_Noise_Instrument05_2::
audio_header SFX_Noise_Instrument05_2, Ch8
SFX_Triangle1_2::
audio_header SFX_Triangle1_2, Ch8
SFX_Noise_Instrument06_2::
audio_header SFX_Noise_Instrument06_2, Ch8
SFX_Triangle2_2::
audio_header SFX_Triangle2_2, Ch8
SFX_Noise_Instrument07_2::
audio_header SFX_Noise_Instrument07_2, Ch8
SFX_Snare6_2::
audio_header SFX_Snare6_2, Ch8
SFX_Noise_Instrument08_2::
audio_header SFX_Noise_Instrument08_2, Ch8
SFX_Snare7_2::
audio_header SFX_Snare7_2, Ch8
SFX_Noise_Instrument09_2::
audio_header SFX_Noise_Instrument09_2, Ch8
SFX_Snare8_2::
audio_header SFX_Snare8_2, Ch8
SFX_Noise_Instrument10_2::
audio_header SFX_Noise_Instrument10_2, Ch8
SFX_Snare9_2::
audio_header SFX_Snare9_2, Ch8
SFX_Noise_Instrument11_2::
audio_header SFX_Noise_Instrument11_2, Ch8
SFX_Cymbal1_2::
audio_header SFX_Cymbal1_2, Ch8
SFX_Noise_Instrument12_2::
audio_header SFX_Noise_Instrument12_2, Ch8
SFX_Cymbal2_2::
audio_header SFX_Cymbal2_2, Ch8
SFX_Noise_Instrument13_2::
audio_header SFX_Noise_Instrument13_2, Ch8
SFX_Cymbal3_2::
audio_header SFX_Cymbal3_2, Ch8
SFX_Noise_Instrument14_2::
audio_header SFX_Noise_Instrument14_2, Ch8
SFX_Muted_Snare1_2::
audio_header SFX_Muted_Snare1_2, Ch8
SFX_Noise_Instrument15_2::
audio_header SFX_Noise_Instrument15_2, Ch8
SFX_Triangle3_2::
audio_header SFX_Triangle3_2, Ch8
SFX_Noise_Instrument16_2::
audio_header SFX_Noise_Instrument16_2, Ch8
SFX_Muted_Snare2_2::
audio_header SFX_Muted_Snare2_2, Ch8
SFX_Noise_Instrument17_2::
audio_header SFX_Noise_Instrument17_2, Ch8
SFX_Muted_Snare3_2::
audio_header SFX_Muted_Snare3_2, Ch8
SFX_Noise_Instrument18_2::
audio_header SFX_Noise_Instrument18_2, Ch8
SFX_Muted_Snare4_2::
audio_header SFX_Muted_Snare4_2, Ch8
SFX_Noise_Instrument19_2::
audio_header SFX_Noise_Instrument19_2, Ch8
SFX_Cry00_2::
audio_header SFX_Cry00_2, Ch5, Ch6, Ch8

76
audio/headers/sfxheaders3.asm
View file

@ -1,62 +1,62 @@
SFX_Headers_3::
db $ff, $ff, $ff ; padding
SFX_Snare1_3::
audio_header SFX_Snare1_3, Ch8
SFX_Noise_Instrument01_3::
audio_header SFX_Noise_Instrument01_3, Ch8
SFX_Snare2_3::
audio_header SFX_Snare2_3, Ch8
SFX_Noise_Instrument02_3::
audio_header SFX_Noise_Instrument02_3, Ch8
SFX_Snare3_3::
audio_header SFX_Snare3_3, Ch8
SFX_Noise_Instrument03_3::
audio_header SFX_Noise_Instrument03_3, Ch8
SFX_Snare4_3::
audio_header SFX_Snare4_3, Ch8
SFX_Noise_Instrument04_3::
audio_header SFX_Noise_Instrument04_3, Ch8
SFX_Snare5_3::
audio_header SFX_Snare5_3, Ch8
SFX_Noise_Instrument05_3::
audio_header SFX_Noise_Instrument05_3, Ch8
SFX_Triangle1_3::
audio_header SFX_Triangle1_3, Ch8
SFX_Noise_Instrument06_3::
audio_header SFX_Noise_Instrument06_3, Ch8
SFX_Triangle2_3::
audio_header SFX_Triangle2_3, Ch8
SFX_Noise_Instrument07_3::
audio_header SFX_Noise_Instrument07_3, Ch8
SFX_Snare6_3::
audio_header SFX_Snare6_3, Ch8
SFX_Noise_Instrument08_3::
audio_header SFX_Noise_Instrument08_3, Ch8
SFX_Snare7_3::
audio_header SFX_Snare7_3, Ch8
SFX_Noise_Instrument09_3::
audio_header SFX_Noise_Instrument09_3, Ch8
SFX_Snare8_3::
audio_header SFX_Snare8_3, Ch8
SFX_Noise_Instrument10_3::
audio_header SFX_Noise_Instrument10_3, Ch8
SFX_Snare9_3::
audio_header SFX_Snare9_3, Ch8
SFX_Noise_Instrument11_3::
audio_header SFX_Noise_Instrument11_3, Ch8
SFX_Cymbal1_3::
audio_header SFX_Cymbal1_3, Ch8
SFX_Noise_Instrument12_3::
audio_header SFX_Noise_Instrument12_3, Ch8
SFX_Cymbal2_3::
audio_header SFX_Cymbal2_3, Ch8
SFX_Noise_Instrument13_3::
audio_header SFX_Noise_Instrument13_3, Ch8
SFX_Cymbal3_3::
audio_header SFX_Cymbal3_3, Ch8
SFX_Noise_Instrument14_3::
audio_header SFX_Noise_Instrument14_3, Ch8
SFX_Muted_Snare1_3::
audio_header SFX_Muted_Snare1_3, Ch8
SFX_Noise_Instrument15_3::
audio_header SFX_Noise_Instrument15_3, Ch8
SFX_Triangle3_3::
audio_header SFX_Triangle3_3, Ch8
SFX_Noise_Instrument16_3::
audio_header SFX_Noise_Instrument16_3, Ch8
SFX_Muted_Snare2_3::
audio_header SFX_Muted_Snare2_3, Ch8
SFX_Noise_Instrument17_3::
audio_header SFX_Noise_Instrument17_3, Ch8
SFX_Muted_Snare3_3::
audio_header SFX_Muted_Snare3_3, Ch8
SFX_Noise_Instrument18_3::
audio_header SFX_Noise_Instrument18_3, Ch8
SFX_Muted_Snare4_3::
audio_header SFX_Muted_Snare4_3, Ch8
SFX_Noise_Instrument19_3::
audio_header SFX_Noise_Instrument19_3, Ch8
SFX_Cry00_3::
audio_header SFX_Cry00_3, Ch5, Ch6, Ch8

28
audio/music/bikeriding.asm
View file

@ -671,34 +671,34 @@ Music_BikeRiding_branch_7de6a::
Music_BikeRiding_branch_7dea7::
rest 2
triangle3 2
dnote 16, 2
rest 2
triangle3 2
dnote 16, 2
rest 2
triangle3 2
dnote 16, 2
rest 2
triangle3 2
dnote 16, 2
sound_ret
Music_BikeRiding_branch_7deb4::
rest 2
triangle3 2
dnote 16, 2
rest 2
triangle3 2
dnote 16, 2
rest 2
triangle3 2
triangle3 2
triangle3 2
dnote 16, 2
dnote 16, 2
dnote 16, 2
sound_ret
Music_BikeRiding_branch_7dec2::
rest 2
triangle3 2
dnote 16, 2
rest 2
triangle3 2
dnote 16, 2
rest 2
triangle3 2
dnote 16, 2
rest 2
triangle3 1
triangle3 1
dnote 16, 1
dnote 16, 1
sound_ret

30
audio/music/cinnabarmansion.asm
View file

@ -151,22 +151,22 @@ Music_CinnabarMansion_Ch4::
rest 16
Music_CinnabarMansion_branch_7edb5::
cymbal1 2
cymbal1 2
cymbal2 4
cymbal1 2
cymbal1 2
cymbal2 4
cymbal1 2
cymbal1 2
cymbal2 4
cymbal1 2
cymbal1 2
cymbal3 4
cymbal1 2
cymbal1 2
dnote 12, 2
dnote 12, 2
dnote 13, 4
dnote 12, 2
dnote 12, 2
dnote 13, 4
dnote 12, 2
dnote 12, 2
dnote 13, 4
dnote 12, 2
dnote 12, 2
dnote 14, 4
dnote 12, 2
dnote 12, 2
rest 2
rest 10
rest 8
cymbal3 8
dnote 14, 8
sound_loop 0, Music_CinnabarMansion_branch_7edb5

86
audio/music/cities1.asm
View file

@ -591,67 +591,67 @@ Music_Cities1_branch_acf3::
sound_call Music_Cities1_branch_ad36
sound_call Music_Cities1_branch_ad5f
sound_call Music_Cities1_branch_ad52
triangle1 6
triangle1 6
triangle2 4
dnote 6, 6
dnote 6, 6
dnote 7, 4
sound_call Music_Cities1_branch_ad6e
sound_call Music_Cities1_branch_ad5f
sound_call Music_Cities1_branch_ad52
sound_call Music_Cities1_branch_ad6e
sound_call Music_Cities1_branch_ad52
triangle1 6
triangle1 6
triangle2 2
triangle1 2
triangle1 6
triangle1 6
triangle1 4
triangle1 6
snare6 6
snare6 4
dnote 6, 6
dnote 6, 6
dnote 7, 2
dnote 6, 2
dnote 6, 6
dnote 6, 6
dnote 6, 4
dnote 6, 6
dnote 8, 6
dnote 8, 4
sound_loop 0, Music_Cities1_Ch4
Music_Cities1_branch_ad36::
snare6 6
snare6 6
snare6 4
snare6 6
snare6 6
snare6 2
snare6 2
dnote 8, 6
dnote 8, 6
dnote 8, 4
dnote 8, 6
dnote 8, 6
dnote 8, 2
dnote 8, 2
sound_ret
Music_Cities1_branch_ad45::
snare6 6
snare6 6
snare6 4
snare6 6
snare6 6
snare6 4
dnote 8, 6
dnote 8, 6
dnote 8, 4
dnote 8, 6
dnote 8, 6
dnote 8, 4
sound_ret
Music_Cities1_branch_ad52::
triangle1 6
triangle1 6
triangle2 4
triangle1 6
triangle1 6
triangle2 4
dnote 6, 6
dnote 6, 6
dnote 7, 4
dnote 6, 6
dnote 6, 6
dnote 7, 4
sound_ret
Music_Cities1_branch_ad5f::
triangle1 6
triangle1 6
triangle2 4
triangle1 6
triangle1 6
triangle2 2
triangle1 2
dnote 6, 6
dnote 6, 6
dnote 7, 4
dnote 6, 6
dnote 6, 6
dnote 7, 2
dnote 6, 2
sound_ret
Music_Cities1_branch_ad6e::
triangle1 6
triangle1 6
triangle2 2
triangle2 2
dnote 6, 6
dnote 6, 6
dnote 7, 2
dnote 7, 2
sound_ret

64
audio/music/dungeon1.asm
View file

@ -599,25 +599,25 @@ Music_Dungeon1_branch_7e177::
Music_Dungeon1_Ch4::
dspeed 12
rest 14
cymbal1 1
cymbal1 1
dnote 12, 1
dnote 12, 1
Music_Dungeon1_branch_7e190::
sound_call Music_Dungeon1_branch_7e1f1
sound_loop 3, Music_Dungeon1_branch_7e190
cymbal2 4
cymbal1 4
cymbal2 4
cymbal1 2
cymbal1 2
dnote 13, 4
dnote 12, 4
dnote 13, 4
dnote 12, 2
dnote 12, 2
Music_Dungeon1_branch_7e1a1::
sound_call Music_Dungeon1_branch_7e1f1
sound_loop 3, Music_Dungeon1_branch_7e1a1
cymbal2 4
cymbal1 4
cymbal2 4
cymbal2 4
dnote 13, 4
dnote 12, 4
dnote 13, 4
dnote 13, 4
Music_Dungeon1_branch_7e1b0::
sound_call Music_Dungeon1_branch_7e1fa
@ -628,12 +628,12 @@ Music_Dungeon1_branch_7e1ba::
sound_call Music_Dungeon1_branch_7e1fa
sound_loop 3, Music_Dungeon1_branch_7e1ba
sound_call Music_Dungeon1_branch_7e202
snare7 4
snare8 4
snare8 4
dnote 9, 4
dnote 10, 4
dnote 10, 4
rest 2
snare7 2
cymbal2 4
dnote 9, 2
dnote 13, 4
Music_Dungeon1_branch_7e1cf::
rest 16
@ -643,33 +643,33 @@ Music_Dungeon1_branch_7e1cf::
Music_Dungeon1_branch_7e1d5::
sound_call Music_Dungeon1_branch_7e1fa
sound_loop 3, Music_Dungeon1_branch_7e1d5
cymbal1 4
cymbal1 4
cymbal1 4
dnote 12, 4
dnote 12, 4
dnote 12, 4
rest 2
cymbal1 1
cymbal1 1
dnote 12, 1
dnote 12, 1
sound_call Music_Dungeon1_branch_7e1f1
sound_call Music_Dungeon1_branch_7e1f1
sound_loop 0, Music_Dungeon1_branch_7e190
Music_Dungeon1_branch_7e1f1::
cymbal2 4
cymbal1 4
cymbal2 4
cymbal1 4
dnote 13, 4
dnote 12, 4
dnote 13, 4
dnote 12, 4
sound_ret
Music_Dungeon1_branch_7e1fa::
cymbal1 1
cymbal1 1
dnote 12, 1
dnote 12, 1
rest 10
cymbal3 4
dnote 14, 4
sound_ret
Music_Dungeon1_branch_7e202::
snare7 4
snare8 4
snare8 4
snare9 4
dnote 9, 4
dnote 10, 4
dnote 10, 4
dnote 11, 4
sound_ret

16
audio/music/dungeon2.asm
View file

@ -306,12 +306,12 @@ Music_Dungeon2_Ch4::
dspeed 12
Music_Dungeon2_branch_7e9dd::
cymbal1 4
cymbal2 4
cymbal1 4
snare8 4
cymbal1 4
cymbal2 4
snare9 4
snare7 4
dnote 12, 4
dnote 13, 4
dnote 12, 4
dnote 10, 4
dnote 12, 4
dnote 13, 4
dnote 11, 4
dnote 9, 4
sound_loop 0, Music_Dungeon2_branch_7e9dd

132
audio/music/indigoplateau.asm
View file

@ -227,18 +227,18 @@ Music_IndigoPlateau_branch_a6fe::
Music_IndigoPlateau_Ch4::
dspeed 6
mutedsnare2 16
mutedsnare2 16
mutedsnare2 16
mutedsnare2 8
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
dnote 17, 16
dnote 17, 16
dnote 17, 16
dnote 17, 8
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
Music_IndigoPlateau_branch_a728::
sound_call Music_IndigoPlateau_branch_a791
@ -255,67 +255,67 @@ Music_IndigoPlateau_branch_a728::
sound_call Music_IndigoPlateau_branch_a7a8
sound_call Music_IndigoPlateau_branch_a77e
sound_call Music_IndigoPlateau_branch_a7a8
mutedsnare2 16
mutedsnare2 8
mutedsnare3 8
mutedsnare2 16
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare4 1
mutedsnare3 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 1
mutedsnare2 1
mutedsnare2 1
mutedsnare2 1
dnote 17, 16
dnote 17, 8
dnote 18, 8
dnote 17, 16
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 19, 1
dnote 18, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 17, 1
dnote 17, 1
dnote 17, 1
dnote 17, 1
sound_loop 0, Music_IndigoPlateau_branch_a728
Music_IndigoPlateau_branch_a77e::
mutedsnare2 4
mutedsnare3 4
mutedsnare4 4
mutedsnare3 4
mutedsnare2 4
mutedsnare3 4
mutedsnare4 4
mutedsnare4 2
mutedsnare3 2
dnote 17, 4
dnote 18, 4
dnote 19, 4
dnote 18, 4
dnote 17, 4
dnote 18, 4
dnote 19, 4
dnote 19, 2
dnote 18, 2
sound_ret
Music_IndigoPlateau_branch_a791::
mutedsnare2 4
mutedsnare3 4
mutedsnare4 4
mutedsnare3 4
mutedsnare2 4
mutedsnare3 4
mutedsnare4 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
dnote 17, 4
dnote 18, 4
dnote 19, 4
dnote 18, 4
dnote 17, 4
dnote 18, 4
dnote 19, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
sound_ret
Music_IndigoPlateau_branch_a7a8::
mutedsnare2 4
mutedsnare3 4
mutedsnare2 4
mutedsnare3 4
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
dnote 17, 4
dnote 18, 4
dnote 17, 4
dnote 18, 4
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
sound_ret

186
audio/music/introbattle.asm
View file

@ -231,99 +231,99 @@ Music_IntroBattle_Ch3::
Music_IntroBattle_Ch4::
dspeed 6
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare4 1
mutedsnare3 1
mutedsnare4 1
mutedsnare3 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 1
mutedsnare2 1
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare2 4
mutedsnare2 8
mutedsnare2 4
mutedsnare2 4
mutedsnare2 8
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare2 4
mutedsnare2 8
mutedsnare2 4
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 16
mutedsnare2 16
mutedsnare2 16
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare4 1
mutedsnare3 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 1
mutedsnare2 1
mutedsnare2 1
mutedsnare2 1
mutedsnare2 4
mutedsnare2 4
mutedsnare2 8
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare2 4
mutedsnare2 8
mutedsnare2 4
mutedsnare2 8
mutedsnare2 4
mutedsnare2 16
mutedsnare2 16
mutedsnare2 2
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 19, 1
dnote 18, 1
dnote 19, 1
dnote 18, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 17, 1
dnote 17, 1
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 17, 4
dnote 17, 8
dnote 17, 4
dnote 17, 4
dnote 17, 8
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 17, 4
dnote 17, 8
dnote 17, 4
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 16
dnote 17, 16
dnote 17, 16
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 19, 1
dnote 18, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 17, 1
dnote 17, 1
dnote 17, 1
dnote 17, 1
dnote 17, 4
dnote 17, 4
dnote 17, 8
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 17, 4
dnote 17, 8
dnote 17, 4
dnote 17, 8
dnote 17, 4
dnote 17, 16
dnote 17, 16
dnote 17, 2
rest 16
rest 14
sound_ret

4
audio/music/lavender.asm
View file

@ -194,6 +194,6 @@ Music_Lavender_Ch4::
rest 16
Music_Lavender_branch_bc26::
triangle2 8
triangle2 8
dnote 7, 8
dnote 7, 8
sound_loop 0, Music_Lavender_branch_bc26

124
audio/music/museumguy.asm
View file

@ -270,68 +270,68 @@ Music_MuseumGuy_Ch4::
rest 16
rest 14
dspeed 6
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
Music_MuseumGuy_branch_aee1::
mutedsnare2 4
mutedsnare2 6
mutedsnare2 2
mutedsnare2 2
mutedsnare2 2
mutedsnare2 4
mutedsnare2 2
mutedsnare4 1
mutedsnare4 1
mutedsnare2 6
mutedsnare4 1
mutedsnare4 1
mutedsnare2 4
mutedsnare2 6
mutedsnare2 2
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare2 2
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 6
mutedsnare2 2
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare2 2
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 4
mutedsnare2 4
mutedsnare2 2
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare2 4
mutedsnare2 2
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 6
mutedsnare4 1
mutedsnare4 1
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
dnote 17, 4
dnote 17, 6
dnote 17, 2
dnote 17, 2
dnote 17, 2
dnote 17, 4
dnote 17, 2
dnote 19, 1
dnote 19, 1
dnote 17, 6
dnote 19, 1
dnote 19, 1
dnote 17, 4
dnote 17, 6
dnote 17, 2
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 17, 2
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 6
dnote 17, 2
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 17, 2
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 4
dnote 17, 4
dnote 17, 2
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 17, 4
dnote 17, 2
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 6
dnote 19, 1
dnote 19, 1
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
sound_loop 0, Music_MuseumGuy_branch_aee1

108
audio/music/routes1.asm
View file

@ -312,93 +312,93 @@ Music_Routes1_branch_9cdd::
Music_Routes1_Ch4::
dspeed 12
rest 4
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
rest 4
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
mutedsnare1 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
dnote 15, 2
dnote 15, 2
rest 4
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
rest 4
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
dnote 15, 2
rest 2
mutedsnare1 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
dnote 15, 2
rest 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
rest 4
mutedsnare1 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
dnote 15, 2
rest 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
rest 4
mutedsnare1 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
dnote 15, 2
rest 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
rest 4
mutedsnare1 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
dnote 15, 2
rest 2
mutedsnare1 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
dnote 15, 2
rest 2
mutedsnare1 2
mutedsnare1 2
dnote 15, 2
dnote 15, 2
sound_loop 0, Music_Routes1_Ch4
sound_ret

128
audio/music/routes2.asm
View file

@ -326,100 +326,100 @@ Music_Routes2_branch_9e9e::
Music_Routes2_Ch4::
dspeed 12
snare3 2
dnote 3, 2
rest 2
snare3 1
dnote 3, 1
rest 5
snare3 1
snare3 1
snare3 2
snare3 2
snare3 2
dnote 3, 1
dnote 3, 1
dnote 3, 2
dnote 3, 2
dnote 3, 2
rest 2
dspeed 8
snare3 2
snare3 2
snare3 2
snare3 3
snare3 3
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 3
dnote 3, 3
dspeed 12
snare3 1
dnote 3, 1
rest 3
snare3 2
dnote 3, 2
rest 2
snare3 2
dnote 3, 2
rest 4
snare3 1
snare3 1
snare3 2
dnote 3, 1
dnote 3, 1
dnote 3, 2
rest 2
snare3 2
dnote 3, 2
rest 2
dspeed 8
snare3 2
snare3 2
snare3 2
snare3 3
snare3 3
snare3 2
snare3 2
snare3 2
snare3 3
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 3
dnote 3, 3
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 3
rest 3
dspeed 12
snare3 1
dnote 3, 1
rest 5
snare3 1
snare3 1
snare3 2
snare3 2
snare3 2
dnote 3, 1
dnote 3, 1
dnote 3, 2
dnote 3, 2
dnote 3, 2
rest 2
dspeed 8
snare3 2
snare3 2
snare3 2
snare3 3
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 3
rest 3
dspeed 12
snare3 1
dnote 3, 1
rest 3
snare3 2
dnote 3, 2
rest 2
snare3 2
dnote 3, 2
rest 4
snare3 1
snare3 1
snare3 2
snare3 2
snare3 2
dnote 3, 1
dnote 3, 1
dnote 3, 2
dnote 3, 2
dnote 3, 2
rest 2
dspeed 8
snare3 2
snare3 2
snare3 2
snare3 3
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 3
rest 3
snare3 3
snare3 3
snare3 3
dnote 3, 3
dnote 3, 3
dnote 3, 3
rest 3
dspeed 12
snare3 1
dnote 3, 1
rest 5
snare3 1
snare3 1
snare3 2
snare3 2
snare3 2
dnote 3, 1
dnote 3, 1
dnote 3, 2
dnote 3, 2
dnote 3, 2
rest 2
dspeed 8
snare3 2
snare3 2
snare3 2
snare3 3
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 3
rest 3
snare3 3
dnote 3, 3
rest 3
sound_loop 0, Music_Routes2_Ch4
sound_ret

308
audio/music/routes3.asm
View file

@ -356,160 +356,160 @@ Music_Routes3_branch_a0a3::
Music_Routes3_Ch4::
dspeed 6
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 8
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 12
mutedsnare2 2
mutedsnare3 2
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 12
mutedsnare2 2
mutedsnare3 2
mutedsnare2 4
mutedsnare3 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 8
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 12
dnote 17, 2
dnote 18, 2
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 17, 12
dnote 17, 2
dnote 18, 2
dnote 17, 4
dnote 18, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
Music_Routes3_branch_a17a::
mutedsnare2 12
mutedsnare2 2
mutedsnare3 2
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 12
mutedsnare2 2
mutedsnare2 2
mutedsnare2 4
mutedsnare2 8
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 12
mutedsnare2 2
mutedsnare3 2
mutedsnare2 4
mutedsnare2 10
mutedsnare4 1
mutedsnare4 1
mutedsnare2 12
mutedsnare2 2
mutedsnare4 2
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 12
mutedsnare2 2
mutedsnare2 2
mutedsnare2 4
mutedsnare2 8
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 12
mutedsnare2 2
mutedsnare2 2
mutedsnare2 4
mutedsnare2 10
mutedsnare4 1
mutedsnare4 1
mutedsnare2 12
mutedsnare2 2
mutedsnare2 2
mutedsnare2 4
mutedsnare2 8
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 12
mutedsnare2 2
mutedsnare2 2
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 12
mutedsnare2 2
mutedsnare2 2
mutedsnare2 4
mutedsnare2 10
mutedsnare4 1
mutedsnare4 1
mutedsnare2 12
mutedsnare2 2
mutedsnare2 2
mutedsnare2 4
mutedsnare2 8
mutedsnare3 1
mutedsnare4 1
mutedsnare3 1
mutedsnare4 1
mutedsnare2 12
mutedsnare2 2
mutedsnare2 2
mutedsnare2 4
mutedsnare2 8
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 12
mutedsnare2 2
mutedsnare2 2
mutedsnare2 4
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
dnote 17, 12
dnote 17, 2
dnote 18, 2
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 17, 12
dnote 17, 2
dnote 17, 2
dnote 17, 4
dnote 17, 8
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 12
dnote 17, 2
dnote 18, 2
dnote 17, 4
dnote 17, 10
dnote 19, 1
dnote 19, 1
dnote 17, 12
dnote 17, 2
dnote 19, 2
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 12
dnote 17, 2
dnote 17, 2
dnote 17, 4
dnote 17, 8
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 12
dnote 17, 2
dnote 17, 2
dnote 17, 4
dnote 17, 10
dnote 19, 1
dnote 19, 1
dnote 17, 12
dnote 17, 2
dnote 17, 2
dnote 17, 4
dnote 17, 8
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 12
dnote 17, 2
dnote 17, 2
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 17, 12
dnote 17, 2
dnote 17, 2
dnote 17, 4
dnote 17, 10
dnote 19, 1
dnote 19, 1
dnote 17, 12
dnote 17, 2
dnote 17, 2
dnote 17, 4
dnote 17, 8
dnote 18, 1
dnote 19, 1
dnote 18, 1
dnote 19, 1
dnote 17, 12
dnote 17, 2
dnote 17, 2
dnote 17, 4
dnote 17, 8
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 12
dnote 17, 2
dnote 17, 2
dnote 17, 4
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
sound_loop 0, Music_Routes3_branch_a17a

332
audio/music/routes4.asm
View file

@ -510,172 +510,172 @@ Music_Routes4_Ch4::
dspeed 12
rest 16
rest 12
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
Music_Routes4_branch_a4a8::
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare3 2
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare2 2
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare2 2
mutedsnare4 1
mutedsnare4 1
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare3 1
mutedsnare3 1
mutedsnare4 1
mutedsnare4 1
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare2 2
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare2 2
mutedsnare4 1
mutedsnare4 1
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare2 2
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare2 2
mutedsnare4 1
mutedsnare3 1
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 4
mutedsnare2 2
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare2 2
mutedsnare4 1
mutedsnare3 1
mutedsnare2 4
mutedsnare4 1
mutedsnare4 1
mutedsnare3 1
mutedsnare3 1
mutedsnare2 2
mutedsnare2 2
mutedsnare2 2
mutedsnare2 2
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 18, 2
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 17, 2
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 17, 2
dnote 19, 1
dnote 19, 1
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 18, 1
dnote 18, 1
dnote 19, 1
dnote 19, 1
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 17, 2
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 17, 2
dnote 19, 1
dnote 19, 1
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 17, 2
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 17, 2
dnote 19, 1
dnote 18, 1
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 18, 1
dnote 17, 4
dnote 17, 2
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 17, 2
dnote 19, 1
dnote 18, 1
dnote 17, 4
dnote 19, 1
dnote 19, 1
dnote 18, 1
dnote 18, 1
dnote 17, 2
dnote 17, 2
dnote 17, 2
dnote 17, 2
sound_loop 0, Music_Routes4_branch_a4a8

258
audio/music/titlescreen.asm
View file

@ -462,216 +462,216 @@ Music_TitleScreen_branch_7e6e5::
Music_TitleScreen_Ch4::
dspeed 6
rest 4
snare3 1
snare3 1
snare4 1
snare4 1
dnote 3, 1
dnote 3, 1
dnote 4, 1
dnote 4, 1
dspeed 12
snare2 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 5
snare2 1
snare2 1
snare2 1
dnote 2, 1
dnote 2, 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 3
dspeed 8
snare3 2
snare4 2
snare2 2
snare3 2
snare2 2
snare1 2
dnote 3, 2
dnote 4, 2
dnote 2, 2
dnote 3, 2
dnote 2, 2
dnote 1, 2
Music_TitleScreen_branch_7e716::
dspeed 12
snare2 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 5
snare2 1
snare2 1
snare3 1
dnote 2, 1
dnote 2, 1
dnote 3, 1
rest 3
sound_call Music_TitleScreen_branch_7e834
sound_call Music_TitleScreen_branch_7e834
snare2 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 5
snare2 1
snare2 1
snare3 1
dnote 2, 1
dnote 2, 1
dnote 3, 1
rest 1
snare3 1
snare2 1
dnote 3, 1
dnote 2, 1
sound_call Music_TitleScreen_branch_7e842
snare2 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 5
snare2 1
snare3 1
snare2 1
dnote 2, 1
dnote 3, 1
dnote 2, 1
rest 1
snare2 1
dnote 2, 1
rest 1
sound_call Music_TitleScreen_branch_7e842
snare2 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 5
snare2 1
snare3 1
snare2 1
dnote 2, 1
dnote 3, 1
dnote 2, 1
rest 1
dspeed 6
snare3 1
snare3 1
snare4 1
snare4 1
dnote 3, 1
dnote 3, 1
dnote 4, 1
dnote 4, 1
dspeed 12
sound_call Music_TitleScreen_branch_7e834
sound_call Music_TitleScreen_branch_7e842
snare2 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 5
snare2 1
snare3 1
snare2 1
dnote 2, 1
dnote 3, 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 5
snare3 1
snare2 1
snare2 1
dnote 3, 1
dnote 2, 1
dnote 2, 1
rest 1
snare3 1
snare2 1
dnote 3, 1
dnote 2, 1
sound_call Music_TitleScreen_branch_7e834
sound_call Music_TitleScreen_branch_7e842
snare2 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 5
snare3 1
snare2 1
snare2 1
dnote 3, 1
dnote 2, 1
dnote 2, 1
rest 1
snare4 1
snare3 1
snare2 1
dnote 4, 1
dnote 3, 1
dnote 2, 1
rest 3
snare3 1
dnote 3, 1
rest 5
snare2 1
snare4 1
snare2 1
dnote 2, 1
dnote 4, 1
dnote 2, 1
rest 1
dspeed 6
snare3 1
snare3 1
snare4 1
snare4 1
dnote 3, 1
dnote 3, 1
dnote 4, 1
dnote 4, 1
dspeed 12
snare1 1
dnote 1, 1
rest 3
snare2 1
dnote 2, 1
rest 5
snare3 1
snare2 1
snare1 1
dnote 3, 1
dnote 2, 1
dnote 1, 1
rest 3
snare2 1
dnote 2, 1
rest 3
snare3 1
dnote 3, 1
rest 5
snare3 1
snare2 1
snare3 1
dnote 3, 1
dnote 2, 1
dnote 3, 1
rest 3
snare2 1
dnote 2, 1
rest 3
snare3 1
dnote 3, 1
rest 5
snare2 1
snare3 1
snare4 1
dnote 2, 1
dnote 3, 1
dnote 4, 1
rest 1
snare3 1
snare2 1
snare2 1
dnote 3, 1
dnote 2, 1
dnote 2, 1
rest 3
snare3 1
dnote 3, 1
rest 5
snare2 1
snare3 1
snare2 1
dnote 2, 1
dnote 3, 1
dnote 2, 1
rest 3
snare5 1
dnote 5, 1
rest 5
snare2 1
dnote 2, 1
rest 3
snare3 1
snare2 1
snare1 1
dnote 3, 1
dnote 2, 1
dnote 1, 1
rest 5
snare2 1
snare3 1
snare2 1
dnote 2, 1
dnote 3, 1
dnote 2, 1
rest 1
snare1 1
dnote 1, 1
rest 1
dspeed 8
snare2 4
snare3 4
snare1 4
dnote 2, 4
dnote 3, 4
dnote 1, 4
dspeed 12
snare5 1
dnote 5, 1
rest 5
snare2 1
dnote 2, 1
rest 3
snare3 1
snare2 1
snare3 1
dnote 3, 1
dnote 2, 1
dnote 3, 1
rest 5
snare2 1
snare3 1
snare1 1
dnote 2, 1
dnote 3, 1
dnote 1, 1
rest 1
snare3 1
snare2 1
dnote 3, 1
dnote 2, 1
dspeed 8
snare2 4
snare3 4
snare2 4
dnote 2, 4
dnote 3, 4
dnote 2, 4
sound_loop 0, Music_TitleScreen_branch_7e716
Music_TitleScreen_branch_7e834::
snare2 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 5
snare2 1
snare3 1
snare2 1
dnote 2, 1
dnote 3, 1
dnote 2, 1
rest 3
sound_ret
Music_TitleScreen_branch_7e842::
snare2 1
dnote 2, 1
rest 3
snare2 1
dnote 2, 1
rest 5
snare3 1
snare2 1
snare2 1
dnote 3, 1
dnote 2, 1
dnote 2, 1
rest 3
sound_ret

50
audio/music/vermilion.asm
View file

@ -287,19 +287,19 @@ Music_Vermilion_Ch4::
Music_Vermilion_branch_bb0e::
sound_call Music_Vermilion_branch_bb3f
triangle1 2
triangle1 1
triangle1 1
triangle1 2
triangle1 1
triangle1 1
triangle1 2
triangle1 1
triangle1 1
triangle1 1
triangle1 1
triangle1 1
triangle1 1
dnote 6, 2
dnote 6, 1
dnote 6, 1
dnote 6, 2
dnote 6, 1
dnote 6, 1
dnote 6, 2
dnote 6, 1
dnote 6, 1
dnote 6, 1
dnote 6, 1
dnote 6, 1
dnote 6, 1
sound_loop 4, Music_Vermilion_branch_bb0e
sound_call Music_Vermilion_branch_bb3f
sound_call Music_Vermilion_branch_bb3f
@ -308,16 +308,16 @@ Music_Vermilion_branch_bb0e::
sound_loop 0, Music_Vermilion_branch_bb0e
Music_Vermilion_branch_bb3f::
triangle1 2
triangle1 1
triangle1 1
triangle1 2
triangle1 1
triangle1 1
triangle1 2
triangle1 1
triangle1 1
triangle1 2
triangle1 1
triangle1 1
dnote 6, 2
dnote 6, 1
dnote 6, 1
dnote 6, 2
dnote 6, 1
dnote 6, 1
dnote 6, 2
dnote 6, 1
dnote 6, 1
dnote 6, 2
dnote 6, 1
dnote 6, 1
sound_ret

398
audio/music/yellow/meetjessiejames.asm
View file

@ -1,309 +1,309 @@
Music_MeetJessieJames_Ch1::
tempo 144
volume 7, 7
duty 3
duty_cycle 3
vibrato 8, 1, 4
notetype 12, 11, 2
note_type 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
note G#, 1
note G_, 1
note F#, 2
note F_, 2
note E_, 2
note D#, 2
note D_, 2
note C#, 2
note C_, 2
note_type 12, 11, 6
note D#, 12
note C_, 4
Music_MeetJessieJames_branch_83187::
notetype 12, 11, 2
note_type 12, 11, 2
octave 4
D_ 16
note D_, 16
rest 12
notetype 12, 11, 4
note_type 12, 11, 4
octave 3
A# 4
note A#, 4
rest 16
rest 8
notetype 12, 11, 2
note_type 12, 11, 2
octave 2
A_ 2
note 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
note A#, 2
note A_, 4
note D_, 1
note D#, 1
note D#, 2
note D#, 2
note D_, 2
note D#, 2
note D_, 2
note D#, 2
note F_, 2
note D_, 1
note D#, 1
note D#, 2
note D#, 2
note D_, 2
octave 2
A# 4
notetype 12, 11, 4
note A#, 4
note_type 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
note B_, 4
note_type 12, 11, 2
note D_, 1
note D#, 1
note D#, 2
note D#, 2
note D_, 2
note D#, 2
note D_, 2
note D#, 2
note F_, 2
note D_, 1
note D#, 1
note D#, 2
note D#, 2
note D_, 2
octave 2
A# 2
note A#, 2
octave 3
B_ 2
notetype 12, 11, 4
A# 4
loopchannel 0, Music_MeetJessieJames_branch_83187
note B_, 2
note_type 12, 11, 4
note A#, 4
sound_loop 0, Music_MeetJessieJames_branch_83187
Music_MeetJessieJames_Ch2::
duty 3
duty_cycle 3
vibrato 6, 1, 5
notetype 12, 12, 2
note_type 12, 12, 2
octave 4
D_ 1
C# 1
C_ 2
note D_, 1
note C#, 1
note C_, 2
octave 3
B_ 2
A# 2
A_ 2
G# 2
G_ 2
F# 2
notetype 12, 12, 7
A_ 12
note B_, 2
note A#, 2
note A_, 2
note G#, 2
note G_, 2
note F#, 2
note_type 12, 12, 7
note A_, 12
octave 4
C# 4
note C#, 4
Music_MeetJessieJames_branch_831df::
notetype 12, 12, 2
note_type 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
note C#, 1
note D_, 1
note D_, 2
note D_, 2
note C#, 2
note D_, 2
note C#, 2
note D_, 2
note E_, 2
note C#, 1
note D_, 1
note D_, 2
note D_, 2
note C#, 2
octave 2
A_ 4
notetype 12, 12, 5
note A_, 4
note_type 12, 12, 5
octave 4
C# 4
notetype 12, 12, 2
D_ 1
note C#, 4
note_type 12, 12, 2
note 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
note D_, 1
note D_, 2
note D_, 2
note C#, 2
note D_, 2
note C#, 2
note D_, 2
note E_, 2
note C#, 1
note D_, 1
note D_, 2
note D_, 2
note C#, 2
note_type 12, 12, 6
octave 4
D_ 8
notetype 12, 12, 2
D# 6
F_ 4
D# 4
note D_, 8
note_type 12, 12, 2
note D#, 6
note F_, 4
note D#, 4
octave 3
A# 2
note 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
note D#, 6
note F_, 4
note D#, 2
note_type 12, 12, 5
note D_, 4
note_type 12, 12, 2
note D#, 6
note F_, 4
note D#, 4
octave 3
A# 2
note A#, 2
octave 4
D# 4
F_ 4
notetype 12, 12, 5
D# 8
loopchannel 0, Music_MeetJessieJames_branch_831df
note D#, 4
note F_, 4
note_type 12, 12, 5
note D#, 8
sound_loop 0, Music_MeetJessieJames_branch_831df
Music_MeetJessieJames_Ch3::
notetype 12, 1, 0
note_type 12, 1, 0
rest 16
rest 8
octave 4
D_ 2
note D_, 2
octave 3
A_ 2
note A_, 2
octave 4
C_ 2
D# 2
note C_, 2
note D#, 2
Music_MeetJessieJames_branch_83235::
D_ 1
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
A# 2
A_ 2
D# 2
D_ 1
note A#, 2
note A_, 2
note D#, 2
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
A_ 1
note A_, 1
rest 1
D_ 1
note D_, 1
rest 1
octave 3
A_ 2
note A_, 2
octave 4
C_ 2
D_ 2
D# 1
note C_, 2
note D_, 2
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
octave 3
A# 1
note A#, 1
rest 1
octave 4
C# 1
note C#, 1
rest 1
E_ 1
note E_, 1
rest 1
D# 1
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
A# 1
note A#, 1
rest 1
D# 1
note D#, 1
rest 1
octave 3
A# 1
note A#, 1
rest 1
octave 4
C# 1
note C#, 1
rest 1
E_ 1
note E_, 1
rest 1
loopchannel 0, Music_MeetJessieJames_branch_83235
endchannel
sound_loop 0, Music_MeetJessieJames_branch_83235
sound_ret

852
audio/music/yellow/surfingpikachu.asm
View file

File diff suppressed because it is too large Load diff

568
audio/music/yellow/yellowintro.asm
View file

@ -1,484 +1,484 @@
Music_YellowIntro_Ch1::
tempo 116
volume 7, 7
duty 3
duty_cycle 3
vibrato 8, 1, 4
notetype 12, 11, 2
note_type 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
note G#, 2
note B_, 4
note B_, 4
note B_, 4
note B_, 4
note B_, 4
note B_, 3
note A#, 1
note B_, 2
note B_, 10
note_type 12, 11, 6
octave 4
C# 1
C_ 1
C# 10
note C#, 1
note C_, 1
note C#, 10
octave 3
G# 1
G_ 1
G# 4
B_ 4
note G#, 1
note G_, 1
note G#, 4
note B_, 4
octave 4
E_ 4
F# 8
E_ 8
note E_, 4
note F#, 8
note E_, 8
octave 3
A_ 4
B_ 4
note A_, 4
note B_, 4
octave 4
C# 4
note 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
note B_, 4
note G#, 6
note_type 12, 11, 2
note B_, 2
note_type 12, 11, 6
note G#, 6
note_type 12, 11, 2
note B_, 2
note_type 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
note E_, 6
note_type 12, 11, 2
note G#, 2
note_type 12, 11, 6
note E_, 6
note_type 12, 11, 2
note G#, 2
note_type 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
note A_, 4
note F#, 4
note A_, 4
note B_, 4
note F#, 4
note G#, 4
note A_, 2
note G#, 2
note F#, 2
note D#, 2
note_type 12, 11, 3
note 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
note E_, 4
note E_, 4
note E_, 4
note E_, 2
note C#, 2
note F#, 4
note F#, 3
note D#, 1
note F#, 2
note F#, 8
note_type 12, 11, 6
note F#, 1
note F_, 1
note F#, 8
octave 3
B_ 1
A# 1
B_ 8
note B_, 1
note A#, 1
note 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
note F#, 1
note F_, 1
note F#, 2
note_type 12, 11, 3
note F#, 1
note E_, 1
note D#, 1
note C#, 1
note_type 12, 11, 2
octave 3
B_ 16
endchannel
note B_, 16
sound_ret
Music_YellowIntro_Ch2::
duty 2
duty_cycle 2
vibrato 6, 1, 5
notetype 12, 12, 2
note_type 12, 12, 2
octave 3
B_ 2
note 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
note E_, 4
note E_, 4
note E_, 4
note E_, 4
note E_, 4
note E_, 3
note D#, 1
note E_, 2
note E_, 4
note_type 12, 12, 5
note G#, 1
note G_, 1
note G#, 10
octave 3
B_ 1
A# 1
B_ 6
notetype 12, 12, 7
note B_, 1
note A#, 1
note B_, 6
note_type 12, 12, 7
octave 4
E_ 4
G# 4
B_ 4
note E_, 4
note G#, 4
note B_, 4
octave 5
C# 16
note C#, 16
octave 4
A_ 4
G# 4
F# 4
E_ 4
note A_, 4
note G#, 4
note F#, 4
note E_, 4
octave 3
B_ 6
notetype 12, 12, 2
note B_, 6
note_type 12, 12, 2
octave 4
E_ 2
notetype 12, 12, 7
note E_, 2
note_type 12, 12, 7
octave 3
B_ 6
notetype 12, 12, 2
note B_, 6
note_type 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
note E_, 2
note_type 12, 12, 7
note G#, 6
note_type 12, 12, 2
note B_, 2
note_type 12, 12, 7
note G#, 6
note_type 12, 12, 2
note B_, 2
note_type 12, 12, 7
note C#, 4
octave 3
A_ 4
note A_, 4
octave 4
C# 4
D# 4
E_ 2
D# 2
C# 2
D# 4
D# 2
C# 2
note C#, 4
note D#, 4
note E_, 2
note D#, 2
note C#, 2
note D#, 4
note D#, 2
note C#, 2
octave 3
B_ 2
notetype 12, 12, 3
note B_, 2
note_type 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
note E_, 2
note G#, 4
note G#, 4
note G#, 4
note G#, 2
note F#, 2
note A_, 4
note A_, 3
note F#, 1
note A_, 2
note A_, 4
note_type 12, 12, 7
note B_, 1
note A#, 1
note B_, 8
note B_, 1
note A#, 1
note B_, 8
note B_, 1
note A#, 1
note B_, 6
note_type 12, 12, 3
note B_, 1
note A_, 1
note G#, 1
note F#, 1
note_type 12, 12, 2
note E_, 16
sound_ret
Music_YellowIntro_Ch3::
notetype 12, 1, 0
note_type 12, 1, 0
octave 4
E_ 1
note E_, 1
rest 1
G# 1
note G#, 1
rest 1
octave 3
B_ 1
note B_, 1
rest 1
octave 4
G# 1
note G#, 1
rest 1
E_ 1
note E_, 1
rest 1
G# 1
note G#, 1
rest 1
octave 3
B_ 1
note B_, 1
rest 1
octave 4
G# 1
note G#, 1
rest 1
E_ 1
note E_, 1
rest 1
G# 1
note G#, 1
rest 1
octave 3
B_ 1
note B_, 1
rest 1
octave 4
G# 1
note G#, 1
rest 1
E_ 1
note E_, 1
rest 1
octave 3
B_ 1
note B_, 1
rest 1
octave 4
C# 1
note C#, 1
rest 1
D# 1
note D#, 1
rest 1
G# 1
note G#, 1
rest 1
B_ 1
note B_, 1
rest 1
E_ 1
note E_, 1
rest 1
B_ 1
note B_, 1
rest 1
G# 1
note G#, 1
rest 1
B_ 1
note B_, 1
rest 1
E_ 1
note E_, 1
rest 1
B_ 1
note B_, 1
rest 1
G# 1
note G#, 1
rest 1
B_ 1
note B_, 1
rest 1
E_ 1
note E_, 1
rest 1
B_ 1
note B_, 1
rest 1
G# 1
note G#, 1
rest 1
B_ 1
note B_, 1
rest 1
E_ 1
note E_, 1
rest 1
B_ 1
note B_, 1
rest 1
F# 1
note F#, 1
rest 1
A_ 1
note A_, 1
rest 1
C# 1
note C#, 1
rest 1
A_ 1
note A_, 1
rest 1
F# 1
note F#, 1
rest 1
A_ 1
note A_, 1
rest 1
C# 1
note C#, 1
rest 1
A_ 1
note A_, 1
rest 1
A_ 1
note A_, 1
rest 1
octave 5
C# 1
note C#, 1
rest 1
octave 4
F# 1
note F#, 1
rest 1
octave 5
C# 1
note C#, 1
rest 1
octave 4
A_ 1
note A_, 1
rest 1
octave 5
C# 1
note C#, 1
rest 1
octave 4
F# 1
note F#, 1
rest 1
octave 5
C# 1
note C#, 1
rest 1
octave 4
B_ 1
note B_, 1
rest 1
octave 5
E_ 1
note E_, 1
rest 1
octave 4
G# 1
note G#, 1
rest 1
octave 5
E_ 1
note E_, 1
rest 1
octave 4
B_ 1
note B_, 1
rest 1
octave 5
E_ 1
note E_, 1
rest 1
octave 4
G# 1
note G#, 1
rest 1
octave 5
E_ 1
note E_, 1
rest 1
octave 4
G# 1
note G#, 1
rest 1
B_ 1
note B_, 1
rest 1
E_ 1
note E_, 1
rest 1
B_ 1
note B_, 1
rest 1
G# 1
note G#, 1
rest 1
E_ 1
note E_, 1
rest 1
G# 1
note G#, 1
rest 1
B_ 1
note B_, 1
rest 1
A_ 1
note A_, 1
rest 1
octave 5
C# 1
note C#, 1
rest 1
octave 4
F# 1
note F#, 1
rest 1
octave 5
C# 1
note C#, 1
rest 1
octave 4
A_ 1
note A_, 1
rest 1
octave 5
C# 1
note C#, 1
rest 1
octave 4
F# 1
note F#, 1
rest 1
octave 5
C# 1
note C#, 1
rest 1
octave 4
A_ 1
note A_, 1
rest 1
octave 5
C# 1
note C#, 1
rest 1
octave 4
F# 1
note F#, 1
rest 1
octave 5
C# 1
note C#, 1
rest 1
octave 4
A_ 1
note A_, 1
rest 1
octave 5
C# 1
note C#, 1
rest 1
octave 4
B_ 1
note B_, 1
rest 1
A_ 1
note A_, 1
rest 1
G# 1
note G#, 1
rest 1
B_ 1
note B_, 1
rest 1
E_ 1
note E_, 1
rest 1
B_ 1
note B_, 1
rest 1
G# 1
note G#, 1
rest 1
B_ 1
note B_, 1
rest 1
E_ 1
note E_, 1
rest 1
B_ 1
note B_, 1
rest 1
G# 1
note G#, 1
rest 1
B_ 1
note B_, 1
rest 1
E_ 1
note E_, 1
rest 1
B_ 1
note B_, 1
rest 1
G# 1
note G#, 1
rest 1
B_ 1
note B_, 1
rest 1
E_ 1
note E_, 1
rest 1
B_ 1
note B_, 1
rest 1
A_ 1
note A_, 1
rest 1
octave 5
E_ 1
note E_, 1
rest 1
octave 4
E_ 1
note E_, 1
rest 1
octave 5
E_ 1
note E_, 1
rest 1
octave 4
A_ 1
note A_, 1
rest 1
octave 5
E_ 1
note E_, 1
rest 1
octave 4
E_ 1
note E_, 1
rest 1
octave 5
E_ 1
note E_, 1
rest 1
octave 4
A_ 1
note A_, 1
rest 1
octave 5
F# 1
note F#, 1
rest 1
octave 4
F# 1
note F#, 1
rest 1
octave 5
C# 1
note C#, 1
rest 3
F# 1
note F#, 1
rest 1
octave 4
F# 1
G# 1
A_ 1
note F#, 1
note G#, 1
note A_, 1
octave 5
C# 1
E_ 1
note C#, 1
note E_, 1
rest 15
endchannel
sound_ret

510
audio/music/yellow/yellowunusedsong.asm
View file

@ -1,51 +1,51 @@
Music_YellowUnusedSong_Ch1::
tempo 140
volume 7, 7
duty 3
duty_cycle 3
vibrato 8, 1, 4
notetype 8, 11, 2
note_type 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
note A_, 6
note A_, 2
note A_, 2
note A_, 2
note A#, 6
note A#, 6
note G_, 6
note G_, 6
note A_, 6
note E_, 6
note A_, 6
note A_, 2
note A_, 2
note A_, 2
note A#, 6
note A#, 6
note A_, 6
note G_, 6
note 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
note A_, 6
note A_, 2
note A_, 2
note A_, 2
note A#, 6
note A#, 6
note G_, 6
note G_, 6
note A_, 6
note E_, 6
note A_, 6
note A_, 2
note A_, 2
note A_, 2
note A#, 6
note A#, 6
note G_, 6
octave 4
D# 6
D_ 12
note D#, 6
note D_, 12
rest 16
rest 16
rest 16
@ -53,274 +53,274 @@ Music_YellowUnusedSong_branch_82fde::
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
note A_, 6
note A_, 2
note A_, 2
note A_, 2
note A#, 6
note A#, 6
note G_, 6
note G_, 6
note A_, 6
note E_, 6
note A_, 6
note A_, 2
note A_, 2
note A_, 2
note A#, 6
note A#, 6
note A_, 6
note G_, 6
note A_, 12
sound_loop 0, Music_YellowUnusedSong_branch_82fde
Music_YellowUnusedSong_Ch2::
duty 2
notetype 8, 12, 2
duty_cycle 2
note_type 8, 12, 2
octave 4
D_ 6
D_ 2
D_ 2
D_ 2
D# 6
D# 6
C_ 6
C_ 6
D_ 6
note D_, 6
note D_, 2
note D_, 2
note D_, 2
note D#, 6
note D#, 6
note C_, 6
note C_, 6
note D_, 6
octave 3
A_ 6
note A_, 6
octave 4
D_ 6
D_ 2
D_ 2
D_ 2
D# 6
D# 6
D_ 6
A# 6
A_ 12
note D_, 6
note D_, 2
note D_, 2
note D_, 2
note D#, 6
note D#, 6
note D_, 6
note A#, 6
note A_, 12
Music_YellowUnusedSong_branch_8302a::
D_ 6
D_ 2
D_ 2
D_ 2
D# 6
D# 6
C_ 6
C_ 6
D_ 6
note D_, 6
note D_, 2
note D_, 2
note D_, 2
note D#, 6
note D#, 6
note C_, 6
note C_, 6
note D_, 6
octave 3
A_ 6
note 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
note D_, 6
note D_, 2
note D_, 2
note D_, 2
note D#, 6
note D#, 6
note C_, 6
note G#, 6
note G_, 12
note_type 8, 9, 0
octave 3
D# 16
D# 8
D# 16
D# 8
note D#, 16
note D#, 8
note D#, 16
note D#, 8
octave 2
A# 16
A# 8
note A#, 16
note A#, 8
octave 3
D# 12
F_ 12
notetype 8, 12, 2
note D#, 12
note F_, 12
note_type 8, 12, 2
octave 4
D_ 6
D_ 2
D_ 2
D_ 2
D# 6
D# 6
C_ 6
C_ 6
D_ 6
note D_, 6
note D_, 2
note D_, 2
note D_, 2
note D#, 6
note D#, 6
note C_, 6
note C_, 6
note D_, 6
octave 3
A_ 6
note 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
note D_, 6
note D_, 2
note D_, 2
note D_, 2
note D#, 6
note D#, 6
note D_, 6
note A#, 6
note A_, 12
sound_loop 0, Music_YellowUnusedSong_branch_8302a
Music_YellowUnusedSong_Ch3::
notetype 12, 1, 0
note_type 12, 1, 0
vibrato 2, 1, 5
rest 16
rest 12
octave 4
C_ 4
D_ 8
D# 8
G_ 8
A# 8
note C_, 4
note D_, 8
note D#, 8
note G_, 8
note A#, 8
Music_YellowUnusedSong_branch_83075::
A_ 8
A# 8
G_ 8
A_ 4
D_ 4
A_ 8
A# 8
note A_, 8
note A#, 8
note G_, 8
note A_, 4
note D_, 4
note A_, 8
note A#, 8
octave 5
C# 8
D_ 8
D# 16
D# 16
note C#, 8
note D_, 8
note D#, 16
note D#, 16
octave 4
A# 16
note A#, 16
octave 5
D# 8
F_ 8
note D#, 8
note F_, 8
octave 4
D_ 16
D_ 16
note D_, 16
note D_, 16
octave 4
D_ 8
D# 8
G_ 8
A# 8
loopchannel 0, Music_YellowUnusedSong_branch_83075
note D_, 8
note D#, 8
note G_, 8
note A#, 8
sound_loop 0, Music_YellowUnusedSong_branch_83075
Music_YellowUnusedSong_Ch4::
dspeed 12
snare3 4
dnote 3, 4
dspeed 8
snare3 2
snare3 2
snare3 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dspeed 12
snare3 4
snare3 4
snare3 4
snare3 4
snare3 4
snare3 4
snare3 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dspeed 8
snare3 2
snare3 2
snare3 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dspeed 12
snare3 4
snare3 4
snare3 2
snare3 2
snare3 2
snare3 2
snare3 4
snare3 4
dnote 3, 4
dnote 3, 4
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 4
dnote 3, 4
Music_YellowUnusedSong_branch_830c3::
snare3 4
dnote 3, 4
dspeed 8
snare3 2
snare3 2
snare3 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dspeed 12
snare3 4
snare3 4
snare3 4
snare3 4
snare3 4
snare3 4
snare3 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dspeed 8
snare3 2
snare3 2
snare3 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dspeed 12
snare3 4
snare3 4
snare3 2
snare3 2
snare3 2
snare3 2
snare3 4
snare3 4
snare3 4
dnote 3, 4
dnote 3, 4
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 4
dnote 3, 4
dnote 3, 4
dspeed 8
snare3 2
snare3 2
snare3 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dspeed 12
snare3 4
dnote 3, 4
dspeed 8
snare3 2
snare3 2
snare3 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dspeed 12
snare3 4
dnote 3, 4
dspeed 8
snare3 2
snare3 2
snare3 2
snare3 2
snare3 2
snare3 2
snare3 2
snare3 2
snare3 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dspeed 12
snare3 4
dnote 3, 4
dspeed 8
snare3 2
snare3 2
snare3 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dspeed 12
snare3 4
snare3 4
snare3 2
snare3 2
snare3 2
snare3 2
snare3 4
snare3 2
snare3 2
snare3 4
dnote 3, 4
dnote 3, 4
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 4
dnote 3, 2
dnote 3, 2
dnote 3, 4
dspeed 8
snare3 2
snare3 2
snare3 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dspeed 12
snare3 4
snare3 4
snare3 4
snare3 4
snare3 4
snare3 4
snare3 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dnote 3, 4
dspeed 8
snare3 2
snare3 2
snare3 2
dnote 3, 2
dnote 3, 2
dnote 3, 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
dnote 3, 4
dnote 3, 4
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 2
dnote 3, 4
dnote 3, 4
sound_loop 0, Music_YellowUnusedSong_branch_830c3

2
audio/sfx/snare1_1.asm → audio/sfx/noise_instrument01_1.asm
View file

@ -1,3 +1,3 @@
SFX_Snare1_1_Ch8:
SFX_Noise_Instrument01_1_Ch8:
noise_note 0, 12, 1, 51
sound_ret

2
audio/sfx/snare1_2.asm → audio/sfx/noise_instrument01_2.asm
View file

@ -1,3 +1,3 @@
SFX_Snare1_2_Ch8:
SFX_Noise_Instrument01_2_Ch8:
noise_note 0, 12, 1, 51
sound_ret

2
audio/sfx/snare1_3.asm → audio/sfx/noise_instrument01_3.asm
View file

@ -1,3 +1,3 @@
SFX_Snare1_3_Ch8:
SFX_Noise_Instrument01_3_Ch8:
noise_note 0, 12, 1, 51
sound_ret

2
audio/sfx/snare2_1.asm → audio/sfx/noise_instrument02_1.asm
View file

@ -1,3 +1,3 @@
SFX_Snare2_1_Ch8:
SFX_Noise_Instrument02_1_Ch8:
noise_note 0, 11, 1, 51
sound_ret

2
audio/sfx/snare2_2.asm → audio/sfx/noise_instrument02_2.asm
View file

@ -1,3 +1,3 @@
SFX_Snare2_2_Ch8:
SFX_Noise_Instrument02_2_Ch8:
noise_note 0, 11, 1, 51
sound_ret

2
audio/sfx/snare2_3.asm → audio/sfx/noise_instrument02_3.asm
View file

@ -1,3 +1,3 @@
SFX_Snare2_3_Ch8:
SFX_Noise_Instrument02_3_Ch8:
noise_note 0, 11, 1, 51
sound_ret

2
audio/sfx/snare3_1.asm → audio/sfx/noise_instrument03_1.asm
View file

@ -1,3 +1,3 @@
SFX_Snare3_1_Ch8:
SFX_Noise_Instrument03_1_Ch8:
noise_note 0, 10, 1, 51
sound_ret

2
audio/sfx/snare3_2.asm → audio/sfx/noise_instrument03_2.asm
View file

@ -1,3 +1,3 @@
SFX_Snare3_2_Ch8:
SFX_Noise_Instrument03_2_Ch8:
noise_note 0, 10, 1, 51
sound_ret

2
audio/sfx/snare3_3.asm → audio/sfx/noise_instrument03_3.asm
View file

@ -1,3 +1,3 @@
SFX_Snare3_3_Ch8:
SFX_Noise_Instrument03_3_Ch8:
noise_note 0, 10, 1, 51
sound_ret

2
audio/sfx/snare4_1.asm → audio/sfx/noise_instrument04_1.asm
View file

@ -1,3 +1,3 @@
SFX_Snare4_1_Ch8:
SFX_Noise_Instrument04_1_Ch8:
noise_note 0, 8, 1, 51
sound_ret

2
audio/sfx/snare4_2.asm → audio/sfx/noise_instrument04_2.asm
View file

@ -1,3 +1,3 @@
SFX_Snare4_2_Ch8:
SFX_Noise_Instrument04_2_Ch8:
noise_note 0, 8, 1, 51
sound_ret

2
audio/sfx/snare4_3.asm → audio/sfx/noise_instrument04_3.asm
View file

@ -1,3 +1,3 @@
SFX_Snare4_3_Ch8:
SFX_Noise_Instrument04_3_Ch8:
noise_note 0, 8, 1, 51
sound_ret

2
audio/sfx/snare5_1.asm → audio/sfx/noise_instrument05_1.asm
View file

@ -1,4 +1,4 @@
SFX_Snare5_1_Ch8:
SFX_Noise_Instrument05_1_Ch8:
noise_note 7, 8, 4, 55
noise_note 6, 8, 4, 54
noise_note 5, 8, 3, 53

2
audio/sfx/snare5_2.asm → audio/sfx/noise_instrument05_2.asm
View file

@ -1,4 +1,4 @@
SFX_Snare5_2_Ch8:
SFX_Noise_Instrument05_2_Ch8:
noise_note 7, 8, 4, 55
noise_note 6, 8, 4, 54
noise_note 5, 8, 3, 53

2
audio/sfx/snare5_3.asm → audio/sfx/noise_instrument05_3.asm
View file

@ -1,4 +1,4 @@
SFX_Snare5_3_Ch8:
SFX_Noise_Instrument05_3_Ch8:
noise_note 7, 8, 4, 55
noise_note 6, 8, 4, 54
noise_note 5, 8, 3, 53

2
audio/sfx/triangle1_1.asm → audio/sfx/noise_instrument06_1.asm
View file

@ -1,3 +1,3 @@
SFX_Triangle1_1_Ch8:
SFX_Noise_Instrument06_1_Ch8:
noise_note 0, 5, 1, 42
sound_ret

2
audio/sfx/triangle1_2.asm → audio/sfx/noise_instrument06_2.asm
View file

@ -1,3 +1,3 @@
SFX_Triangle1_2_Ch8:
SFX_Noise_Instrument06_2_Ch8:
noise_note 0, 5, 1, 42
sound_ret

2
audio/sfx/triangle1_3.asm → audio/sfx/noise_instrument06_3.asm
View file

@ -1,3 +1,3 @@
SFX_Triangle1_3_Ch8:
SFX_Noise_Instrument06_3_Ch8:
noise_note 0, 5, 1, 42
sound_ret

2
audio/sfx/triangle2_1.asm → audio/sfx/noise_instrument07_1.asm
View file

@ -1,4 +1,4 @@
SFX_Triangle2_1_Ch8:
SFX_Noise_Instrument07_1_Ch8:
noise_note 1, 4, 1, 43
noise_note 0, 6, 1, 42
sound_ret

2
audio/sfx/triangle2_2.asm → audio/sfx/noise_instrument07_2.asm
View file

@ -1,4 +1,4 @@
SFX_Triangle2_2_Ch8:
SFX_Noise_Instrument07_2_Ch8:
noise_note 1, 4, 1, 43
noise_note 0, 6, 1, 42
sound_ret

2
audio/sfx/triangle2_3.asm → audio/sfx/noise_instrument07_3.asm
View file

@ -1,4 +1,4 @@
SFX_Triangle2_3_Ch8:
SFX_Noise_Instrument07_3_Ch8:
noise_note 1, 4, 1, 43
noise_note 0, 6, 1, 42
sound_ret

2
audio/sfx/snare6_1.asm → audio/sfx/noise_instrument08_1.asm
View file

@ -1,3 +1,3 @@
SFX_Snare6_1_Ch8:
SFX_Noise_Instrument08_1_Ch8:
noise_note 0, 8, 1, 16
sound_ret

2
audio/sfx/snare6_2.asm → audio/sfx/noise_instrument08_2.asm
View file

@ -1,3 +1,3 @@
SFX_Snare6_2_Ch8:
SFX_Noise_Instrument08_2_Ch8:
noise_note 0, 8, 1, 16
sound_ret

2
audio/sfx/snare6_3.asm → audio/sfx/noise_instrument08_3.asm
View file

@ -1,3 +1,3 @@
SFX_Snare6_3_Ch8:
SFX_Noise_Instrument08_3_Ch8:
noise_note 0, 8, 1, 16
sound_ret

2
audio/sfx/snare7_1.asm → audio/sfx/noise_instrument09_1.asm
View file

@ -1,3 +1,3 @@
SFX_Snare7_1_Ch8:
SFX_Noise_Instrument09_1_Ch8:
noise_note 0, 8, 2, 35
sound_ret

2
audio/sfx/snare7_2.asm → audio/sfx/noise_instrument09_2.asm
View file

@ -1,3 +1,3 @@
SFX_Snare7_2_Ch8:
SFX_Noise_Instrument09_2_Ch8:
noise_note 0, 8, 2, 35
sound_ret

2
audio/sfx/snare7_3.asm → audio/sfx/noise_instrument09_3.asm
View file

@ -1,3 +1,3 @@
SFX_Snare7_3_Ch8:
SFX_Noise_Instrument09_3_Ch8:
noise_note 0, 8, 2, 35
sound_ret

2
audio/sfx/snare8_1.asm → audio/sfx/noise_instrument10_1.asm
View file

@ -1,3 +1,3 @@
SFX_Snare8_1_Ch8:
SFX_Noise_Instrument10_1_Ch8:
noise_note 0, 8, 2, 37
sound_ret

2
audio/sfx/snare8_2.asm → audio/sfx/noise_instrument10_2.asm
View file

@ -1,3 +1,3 @@
SFX_Snare8_2_Ch8:
SFX_Noise_Instrument10_2_Ch8:
noise_note 0, 8, 2, 37
sound_ret

2
audio/sfx/snare8_3.asm → audio/sfx/noise_instrument10_3.asm
View file

@ -1,3 +1,3 @@
SFX_Snare8_3_Ch8:
SFX_Noise_Instrument10_3_Ch8:
noise_note 0, 8, 2, 37
sound_ret

2
audio/sfx/snare9_1.asm → audio/sfx/noise_instrument11_1.asm
View file

@ -1,3 +1,3 @@
SFX_Snare9_1_Ch8:
SFX_Noise_Instrument11_1_Ch8:
noise_note 0, 8, 2, 38
sound_ret

2
audio/sfx/snare9_2.asm → audio/sfx/noise_instrument11_2.asm
View file

@ -1,3 +1,3 @@
SFX_Snare9_2_Ch8:
SFX_Noise_Instrument11_2_Ch8:
noise_note 0, 8, 2, 38
sound_ret

2
audio/sfx/snare9_3.asm → audio/sfx/noise_instrument11_3.asm
View file

@ -1,3 +1,3 @@
SFX_Snare9_3_Ch8:
SFX_Noise_Instrument11_3_Ch8:
noise_note 0, 8, 2, 38
sound_ret

2
audio/sfx/cymbal1_1.asm → audio/sfx/noise_instrument12_1.asm
View file

@ -1,3 +1,3 @@
SFX_Cymbal1_1_Ch8:
SFX_Noise_Instrument12_1_Ch8:
noise_note 0, 10, 1, 16
sound_ret

2
audio/sfx/cymbal1_2.asm → audio/sfx/noise_instrument12_2.asm
View file

@ -1,3 +1,3 @@
SFX_Cymbal1_2_Ch8:
SFX_Noise_Instrument12_2_Ch8:
noise_note 0, 10, 1, 16
sound_ret

2
audio/sfx/cymbal1_3.asm → audio/sfx/noise_instrument12_3.asm
View file

@ -1,3 +1,3 @@
SFX_Cymbal1_3_Ch8:
SFX_Noise_Instrument12_3_Ch8:
noise_note 0, 10, 1, 16
sound_ret

2
audio/sfx/cymbal2_2.asm → audio/sfx/noise_instrument13_1.asm
View file

@ -1,3 +1,3 @@
SFX_Cymbal2_2_Ch8:
SFX_Noise_Instrument13_1_Ch8:
noise_note 0, 10, 2, 17
sound_ret

2
audio/sfx/cymbal2_3.asm → audio/sfx/noise_instrument13_2.asm
View file

@ -1,3 +1,3 @@
SFX_Cymbal2_3_Ch8:
SFX_Noise_Instrument13_2_Ch8:
noise_note 0, 10, 2, 17
sound_ret

2
audio/sfx/cymbal2_1.asm → audio/sfx/noise_instrument13_3.asm
View file

@ -1,3 +1,3 @@
SFX_Cymbal2_1_Ch8:
SFX_Noise_Instrument13_3_Ch8:
noise_note 0, 10, 2, 17
sound_ret

2
audio/sfx/cymbal3_1.asm → audio/sfx/noise_instrument14_1.asm
View file

@ -1,3 +1,3 @@
SFX_Cymbal3_1_Ch8:
SFX_Noise_Instrument14_1_Ch8:
noise_note 0, 10, 2, 80
sound_ret

2
audio/sfx/cymbal3_2.asm → audio/sfx/noise_instrument14_2.asm
View file

@ -1,3 +1,3 @@
SFX_Cymbal3_2_Ch8:
SFX_Noise_Instrument14_2_Ch8:
noise_note 0, 10, 2, 80
sound_ret

2
audio/sfx/cymbal3_3.asm → audio/sfx/noise_instrument14_3.asm
View file

@ -1,3 +1,3 @@
SFX_Cymbal3_3_Ch8:
SFX_Noise_Instrument14_3_Ch8:
noise_note 0, 10, 2, 80
sound_ret

2
audio/sfx/muted_snare1_1.asm → audio/sfx/noise_instrument15_1.asm
View file

@ -1,4 +1,4 @@
SFX_Muted_Snare1_1_Ch8:
SFX_Noise_Instrument15_1_Ch8:
noise_note 0, 10, 1, 24
noise_note 0, 3, 1, 51
sound_ret

2
audio/sfx/muted_snare1_2.asm → audio/sfx/noise_instrument15_2.asm
View file

@ -1,4 +1,4 @@
SFX_Muted_Snare1_2_Ch8:
SFX_Noise_Instrument15_2_Ch8:
noise_note 0, 10, 1, 24
noise_note 0, 3, 1, 51
sound_ret

2
audio/sfx/muted_snare1_3.asm → audio/sfx/noise_instrument15_3.asm
View file

@ -1,4 +1,4 @@
SFX_Muted_Snare1_3_Ch8:
SFX_Noise_Instrument15_3_Ch8:
noise_note 0, 10, 1, 24
noise_note 0, 3, 1, 51
sound_ret

2
audio/sfx/triangle3_1.asm → audio/sfx/noise_instrument16_1.asm
View file

@ -1,4 +1,4 @@
SFX_Triangle3_1_Ch8:
SFX_Noise_Instrument16_1_Ch8:
noise_note 2, 9, 1, 40
noise_note 0, 7, 1, 24
sound_ret

2
audio/sfx/triangle3_2.asm → audio/sfx/noise_instrument16_2.asm
View file

@ -1,4 +1,4 @@
SFX_Triangle3_2_Ch8:
SFX_Noise_Instrument16_2_Ch8:
noise_note 2, 9, 1, 40
noise_note 0, 7, 1, 24
sound_ret

2
audio/sfx/triangle3_3.asm → audio/sfx/noise_instrument16_3.asm
View file

@ -1,4 +1,4 @@
SFX_Triangle3_3_Ch8:
SFX_Noise_Instrument16_3_Ch8:
noise_note 2, 9, 1, 40
noise_note 0, 7, 1, 24
sound_ret

2
audio/sfx/muted_snare2_1.asm → audio/sfx/noise_instrument17_1.asm
View file

@ -1,3 +1,3 @@
SFX_Muted_Snare2_1_Ch8:
SFX_Noise_Instrument17_1_Ch8:
noise_note 0, 9, 1, 34
sound_ret

2
audio/sfx/muted_snare2_2.asm → audio/sfx/noise_instrument17_2.asm
View file

@ -1,3 +1,3 @@
SFX_Muted_Snare2_2_Ch8:
SFX_Noise_Instrument17_2_Ch8:
noise_note 0, 9, 1, 34
sound_ret

2
audio/sfx/muted_snare2_3.asm → audio/sfx/noise_instrument17_3.asm
View file

@ -1,3 +1,3 @@
SFX_Muted_Snare2_3_Ch8:
SFX_Noise_Instrument17_3_Ch8:
noise_note 0, 9, 1, 34
sound_ret

2
audio/sfx/muted_snare3_1.asm → audio/sfx/noise_instrument18_1.asm
View file

@ -1,3 +1,3 @@
SFX_Muted_Snare3_1_Ch8:
SFX_Noise_Instrument18_1_Ch8:
noise_note 0, 7, 1, 34
sound_ret

2
audio/sfx/muted_snare3_2.asm → audio/sfx/noise_instrument18_2.asm
View file

@ -1,3 +1,3 @@
SFX_Muted_Snare3_2_Ch8:
SFX_Noise_Instrument18_2_Ch8:
noise_note 0, 7, 1, 34
sound_ret

2
audio/sfx/muted_snare3_3.asm → audio/sfx/noise_instrument18_3.asm
View file

@ -1,3 +1,3 @@
SFX_Muted_Snare3_3_Ch8:
SFX_Noise_Instrument18_3_Ch8:
noise_note 0, 7, 1, 34
sound_ret

2
audio/sfx/muted_snare4_1.asm → audio/sfx/noise_instrument19_1.asm
View file

@ -1,3 +1,3 @@
SFX_Muted_Snare4_1_Ch8:
SFX_Noise_Instrument19_1_Ch8:
noise_note 0, 6, 1, 34
sound_ret

2
audio/sfx/muted_snare4_2.asm → audio/sfx/noise_instrument19_2.asm
View file

@ -1,3 +1,3 @@
SFX_Muted_Snare4_2_Ch8:
SFX_Noise_Instrument19_2_Ch8:
noise_note 0, 6, 1, 34
sound_ret

2
audio/sfx/muted_snare4_3.asm → audio/sfx/noise_instrument19_3.asm
View file

@ -1,3 +1,3 @@
SFX_Muted_Snare4_3_Ch8:
SFX_Noise_Instrument19_3_Ch8:
noise_note 0, 6, 1, 34
sound_ret

40
constants/music_constants.asm
View file

@ -95,25 +95,25 @@ ENDM
music_const MUSIC_MEET_MALE_TRAINER, Music_MeetMaleTrainer
; AUDIO_1 AUDIO_2 AUDIO_3
music_const SFX_SNARE_1, SFX_Snare1_1
music_const SFX_SNARE_2, SFX_Snare2_1
music_const SFX_SNARE_3, SFX_Snare3_1
music_const SFX_SNARE_4, SFX_Snare4_1
music_const SFX_SNARE_5, SFX_Snare5_1
music_const SFX_TRIANGLE_1, SFX_Triangle1_1
music_const SFX_TRIANGLE_2, SFX_Triangle2_1
music_const SFX_SNARE_6, SFX_Snare6_1
music_const SFX_SNARE_7, SFX_Snare7_1
music_const SFX_SNARE_8, SFX_Snare8_1
music_const SFX_SNARE_9, SFX_Snare9_1
music_const SFX_CYMBAL_1, SFX_Cymbal1_1
music_const SFX_CYMBAL_2, SFX_Cymbal2_1
music_const SFX_CYMBAL_3, SFX_Cymbal3_1
music_const SFX_MUTED_SNARE_1, SFX_Muted_Snare1_1
music_const SFX_TRIANGLE_3, SFX_Triangle3_1
music_const SFX_MUTED_SNARE_2, SFX_Muted_Snare2_1
music_const SFX_MUTED_SNARE_3, SFX_Muted_Snare3_1
music_const SFX_MUTED_SNARE_4, SFX_Muted_Snare4_1
music_const SFX_NOISE_INSTRUMENT01, SFX_Noise_Instrument01_1
music_const SFX_NOISE_INSTRUMENT02, SFX_Noise_Instrument02_1
music_const SFX_NOISE_INSTRUMENT03, SFX_Noise_Instrument03_1
music_const SFX_NOISE_INSTRUMENT04, SFX_Noise_Instrument04_1
music_const SFX_NOISE_INSTRUMENT05, SFX_Noise_Instrument05_1
music_const SFX_NOISE_INSTRUMENT06, SFX_Noise_Instrument06_1
music_const SFX_NOISE_INSTRUMENT07, SFX_Noise_Instrument07_1
music_const SFX_NOISE_INSTRUMENT08, SFX_Noise_Instrument08_1
music_const SFX_NOISE_INSTRUMENT09, SFX_Noise_Instrument09_1
music_const SFX_NOISE_INSTRUMENT10, SFX_Noise_Instrument10_1
music_const SFX_NOISE_INSTRUMENT11, SFX_Noise_Instrument11_1
music_const SFX_NOISE_INSTRUMENT12, SFX_Noise_Instrument12_1
music_const SFX_NOISE_INSTRUMENT13, SFX_Noise_Instrument13_1
music_const SFX_NOISE_INSTRUMENT14, SFX_Noise_Instrument14_1
music_const SFX_NOISE_INSTRUMENT15, SFX_Noise_Instrument15_1
music_const SFX_NOISE_INSTRUMENT16, SFX_Noise_Instrument16_1
music_const SFX_NOISE_INSTRUMENT17, SFX_Noise_Instrument17_1
music_const SFX_NOISE_INSTRUMENT18, SFX_Noise_Instrument18_1
music_const SFX_NOISE_INSTRUMENT19, SFX_Noise_Instrument19_1
music_const SFX_CRY_00, SFX_Cry00_1
music_const SFX_CRY_01, SFX_Cry01_1
music_const SFX_CRY_02, SFX_Cry02_1
@ -194,7 +194,7 @@ ENDM
music_const SFX_SAVE, SFX_Save_1
; AUDIO_1
music_const SFX_POKEFLUTE, SFX_Pokeflute
music_const SFX_POKEFLUTE, SFX_Pokeflute
music_const SFX_SAFARI_ZONE_PA, SFX_Safari_Zone_PA
; AUDIO_2

112
macros/audio_macros.asm
View file

@ -40,7 +40,7 @@ pitch_sweep: MACRO
ENDC
ENDM
;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
;format: length [0, 15], volume [0, 15], volume change [-7, 7], frequency
square_note: MACRO
db $20 | \1
IF \3 < 0
@ -51,7 +51,7 @@ square_note: MACRO
dw \4
ENDM
;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
;format: length [0, 15], volume [0, 15], volume change [-7, 7], frequency
noise_note: MACRO
db $20 | \1
IF \3 < 0
@ -75,113 +75,23 @@ A_ EQU $9
A# EQU $A
B_ EQU $B
;format: pitch length (in 16ths)
;format: pitch, length (in 16ths)
note: MACRO
db (\1 << 4) | (\2 - 1)
ENDM
;format: instrument length (in 16ths)
snare1: MACRO
db $B0 | (\1 - 1)
db $01
;format: instrument, length (in 16ths)
dnote: MACRO
db $B0 | (\2 - 1)
db \1
ENDM
snare2: MACRO
db $B0 | (\1 - 1)
db $02
ENDM
snare3: MACRO
db $B0 | (\1 - 1)
db $03
ENDM
snare4: MACRO
db $B0 | (\1 - 1)
db $04
ENDM
snare5: MACRO
db $B0 | (\1 - 1)
db $05
ENDM
triangle1: MACRO
db $B0 | (\1 - 1)
db $06
ENDM
triangle2: MACRO
db $B0 | (\1 - 1)
db $07
ENDM
snare6: MACRO
db $B0 | (\1 - 1)
db $08
ENDM
snare7: MACRO
db $B0 | (\1 - 1)
db $09
ENDM
snare8: MACRO
db $B0 | (\1 - 1)
db $0A
ENDM
snare9: MACRO
db $B0 | (\1 - 1)
db $0B
ENDM
cymbal1: MACRO
db $B0 | (\1 - 1)
db $0C
ENDM
cymbal2: MACRO
db $B0 | (\1 - 1)
db $0D
ENDM
cymbal3: MACRO
db $B0 | (\1 - 1)
db $0E
ENDM
mutedsnare1: MACRO
db $B0 | (\1 - 1)
db $0F
ENDM
triangle3: MACRO
db $B0 | (\1 - 1)
db $10
ENDM
mutedsnare2: MACRO
db $B0 | (\1 - 1)
db $11
ENDM
mutedsnare3: MACRO
db $B0 | (\1 - 1)
db $12
ENDM
mutedsnare4: MACRO
db $B0 | (\1 - 1)
db $13
ENDM
;format: rest length (in 16ths)
;format: length (in 16ths)
rest: MACRO
db $C0 | (\1 - 1)
ENDM
; format: notetype speed, volume, fade
;format: speed, volume, fade
note_type: MACRO
db $D0 | \1
db (\2 << 4) | \3
@ -242,13 +152,13 @@ duty_cycle_pattern: MACRO
db \1
ENDM
;format: callchannel address
;format: address
sound_call: MACRO
db $FD
dw \1
ENDM
;format: loopchannel count, address
;format: count, address
sound_loop: MACRO
db $FE
db \1