Make each pitch/instrument its own macro

2026-02-08 08:35:30 +13:00 · 2014-06-10 11:42:56 -04:00 · 2014-06-10 11:42:56 -04:00 · fee52c53a4
commit fee52c53a4
parent f4e2814381
66 changed files with 15039 additions and 14940 deletions
--- a/audio/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
@ -8,144 +8,144 @@ Music_Pokecenter_Ch1:: ; be56 (2:7e56)
 Music_Pokecenter_branch_be61::
 	notetype 12, 10, 3
 	octave 3
-	note F#, 2
-	note F_, 2
-	note F#, 2
+	F# 2
+	F_ 2
+	F# 2
 	notetype 12, 11, 5
 	octave 4
-	note D_, 4
-	note C#, 2
+	D_ 4
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
 	notetype 12, 10, 3
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	A_ 2
+	E_ 2
+	A_ 2
 	notetype 12, 11, 5
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	notetype 12, 10, 3
-	note F#, 2
-	note F_, 2
-	note F#, 2
+	F# 2
+	F_ 2
+	F# 2
 	notetype 12, 11, 5
 	octave 4
-	note D_, 4
-	note C#, 2
+	D_ 4
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
 	notetype 12, 10, 3
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	A_ 2
+	E_ 2
+	A_ 2
 	notetype 12, 11, 5
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 4
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 4
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 8
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 2
+	F# 2
+	E_ 2
+	D_ 4
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 4
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 4
+	C# 2
+	D_ 2
+	E_ 2
+	G_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 2
+	A_ 8
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
-	note A_, 2
-	note B_, 2
+	B_ 4
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note C#, 4
+	C# 2
+	D_ 2
+	E_ 2
+	D_ 2
+	C# 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note C#, 2
+	C# 2
+	D_ 2
+	E_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 4
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
+	B_ 2
+	A_ 4
+	G_ 2
+	A_ 2
+	B_ 2
+	G_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 2
+	F# 2
+	G_ 2
 	loopchannel 0, Music_Pokecenter_branch_be61


@ -157,94 +157,94 @@ Music_Pokecenter_branch_befc::
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note A_, 4
-	note E_, 4
+	A_ 4
+	E_ 4
 	callchannel Music_Pokecenter_branch_bf60
-	note D_, 2
-	note F#, 6
+	D_ 2
+	F# 6
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note A_, 4
-	note E_, 4
+	A_ 4
+	E_ 4
 	callchannel Music_Pokecenter_branch_bf4e
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note A_, 4
-	note E_, 4
+	A_ 4
+	E_ 4
 	callchannel Music_Pokecenter_branch_bf60
-	note D_, 8
+	D_ 8
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note D_, 4
-	note E_, 4
+	D_ 4
+	E_ 4
 	duty 2
 	notetype 12, 12, 6
 	octave 4
-	note F#, 8
-	note A_, 8
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 8
-	note C#, 8
-	note E_, 8
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 8
-	note F#, 8
-	note A_, 8
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 8
-	note A_, 4
-	note G_, 2
-	note F#, 2
-	note G_, 8
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 8
+	F# 8
+	A_ 8
+	G_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 8
+	C# 8
+	E_ 8
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 8
+	F# 8
+	A_ 8
+	G_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 8
+	A_ 4
+	G_ 2
+	F# 2
+	G_ 8
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 8
 	loopchannel 0, Music_Pokecenter_branch_befc

 Music_Pokecenter_branch_bf4e::
 	duty 2
 	notetype 12, 12, 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	notetype 12, 12, 3
-	note A_, 4
-	note G_, 4
-	note F#, 2
-	note E_, 2
-	note C#, 6
+	A_ 4
+	G_ 4
+	F# 2
+	E_ 2
+	C# 6
 	endchannel

 Music_Pokecenter_branch_bf60::
 	duty 2
 	notetype 12, 12, 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	notetype 12, 12, 3
-	note F#, 4
-	note E_, 4
-	note C#, 2
+	F# 4
+	E_ 4
+	C# 2
 	endchannel


@ -253,124 +253,124 @@ Music_Pokecenter_Ch3:: ; bf70 (2:7f70)

 Music_Pokecenter_branch_bf72::
 	octave 4
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
+	D_ 2
+	F# 2
+	D_ 2
+	F# 2
+	D_ 2
+	F# 2
+	G_ 2
+	F# 2
 	callchannel Music_Pokecenter_branch_bfd9
 	callchannel Music_Pokecenter_branch_bfe2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	G_ 2
+	A_ 2
+	D_ 2
+	F# 2
+	D_ 2
+	F# 2
+	D_ 2
+	F# 2
+	G_ 2
+	F# 2
 	callchannel Music_Pokecenter_branch_bfd9
 	callchannel Music_Pokecenter_branch_bfe2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
+	D_ 2
+	F# 2
+	D_ 2
+	F# 2
+	D_ 2
+	B_ 2
+	A_ 2
+	G_ 2
 	callchannel Music_Pokecenter_branch_bfeb
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	G# 2
+	A_ 2
 	callchannel Music_Pokecenter_branch_bfeb
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
 	loopchannel 0, Music_Pokecenter_branch_bf72

 Music_Pokecenter_branch_bfd9::
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
 	endchannel

 Music_Pokecenter_branch_bfe2::
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	G_ 2
+	A_ 2
 	endchannel

 Music_Pokecenter_branch_bfeb::
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
 	endchannel
-; 0xbff4
+; 0xbff4