Make each pitch/instrument its own macro

2026-04-16 15:13:21 +12: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/celadon.asm
+++ b/audio/music/celadon.asm
@ -6,104 +6,104 @@ Music_Celadon_Ch1:: ; b6c7 (2:76c7)
 	notetype 12, 2, 15
 	rest 8
 	octave 3
-	note D_, 8
+	D_ 8

 Music_Celadon_branch_b6d4::
 	duty 2
 	notetype 12, 11, 2
-	note G_, 4
-	note B_, 4
-	note G_, 2
-	note B_, 4
-	note G_, 2
-	note E_, 1
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note B_, 2
+	G_ 4
+	B_ 4
+	G_ 2
+	B_ 4
+	G_ 2
+	E_ 1
+	E_ 1
+	G_ 1
+	E_ 1
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A_, 8
-	note F#, 4
-	note A_, 4
-	note F#, 2
-	note A_, 6
-	note A_, 1
-	note B_, 1
+	A_ 8
+	F# 4
+	A_ 4
+	F# 2
+	A_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note A_, 2
-	note B_, 2
-	note G_, 4
+	B_ 1
+	A_ 2
+	B_ 2
+	G_ 4
 	octave 4
-	note G_, 4
+	G_ 4
 	octave 3
-	note G_, 4
-	note B_, 4
-	note G_, 2
-	note B_, 4
-	note G_, 2
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 2
+	G_ 4
+	B_ 4
+	G_ 2
+	B_ 4
+	G_ 2
+	E_ 1
+	F# 1
+	G_ 1
+	A_ 1
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A_, 8
-	note A_, 2
-	note B_, 2
+	A_ 8
+	A_ 2
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 4
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 8
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	G_ 2
+	F# 4
+	D_ 1
+	E_ 1
+	F# 1
+	G_ 1
+	A_ 8
 	notetype 12, 9, 4
-	note B_, 8
-	note G_, 4
-	note D_, 4
-	note G_, 4
-	note A_, 2
+	B_ 8
+	G_ 4
+	D_ 4
+	G_ 4
+	A_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note B_, 8
-	note A_, 8
-	note F#, 4
-	note G_, 4
-	note A_, 4
-	note G_, 4
-	note F#, 4
-	note A_, 4
-	note B_, 8
-	note G_, 4
-	note D_, 4
-	note G_, 4
-	note A_, 2
+	B_ 8
+	A_ 8
+	F# 4
+	G_ 4
+	A_ 4
+	G_ 4
+	F# 4
+	A_ 4
+	B_ 8
+	G_ 4
+	D_ 4
+	G_ 4
+	A_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note B_, 8
-	note A_, 8
-	note F#, 4
-	note G_, 4
-	note A_, 4
-	note G_, 4
-	note F#, 4
-	note A_, 4
+	B_ 8
+	A_ 8
+	F# 4
+	G_ 4
+	A_ 4
+	G_ 4
+	F# 4
+	A_ 4
 	loopchannel 0, Music_Celadon_branch_b6d4


@ -111,118 +111,118 @@ Music_Celadon_Ch2:: ; b73a (2:773a)
 	duty 3
 	notetype 12, 12, 2
 	octave 4
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
+	D_ 1
+	C# 1
+	D_ 1
+	E_ 1
+	F# 1
+	E_ 1
+	F# 1
+	G_ 1
 	notetype 12, 10, 0
-	note A_, 8
+	A_ 8

 Music_Celadon_branch_b74a::
 	duty 2
 	notetype 12, 12, 2
 	octave 4
-	note B_, 4
-	note G_, 4
-	note B_, 2
-	note G_, 6
-	note B_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	B_ 4
+	G_ 4
+	B_ 2
+	G_ 6
+	B_ 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 8
-	note A_, 4
-	note F#, 4
-	note A_, 2
-	note F#, 6
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 2
-	note B_, 2
-	note G_, 4
-	note B_, 4
-	note B_, 4
-	note G_, 4
-	note B_, 2
-	note G_, 4
+	B_ 2
+	A_ 8
+	A_ 4
+	F# 4
+	A_ 2
+	F# 6
+	A_ 1
+	G_ 1
+	F# 1
+	G_ 1
+	A_ 2
+	B_ 2
+	G_ 4
+	B_ 4
+	B_ 4
+	G_ 4
+	B_ 2
+	G_ 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note B_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 8
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
-	note D_, 8
+	B_ 2
+	A_ 8
+	A_ 2
+	G_ 2
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	C# 2
+	D_ 8
 	octave 5
-	note D_, 8
+	D_ 8
 	notetype 12, 11, 4
 	octave 4
-	note D_, 8
-	note C_, 2
+	D_ 8
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	B_ 2
 	octave 4
-	note E_, 4
-	note F#, 4
-	note D_, 8
-	note C_, 8
+	E_ 4
+	F# 4
+	D_ 8
+	C_ 8
 	octave 3
-	note A_, 2
-	note B_, 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 8
-	note D_, 8
-	note C_, 2
+	C_ 2
+	D_ 2
+	E_ 2
+	C_ 2
+	D_ 2
+	E_ 2
+	D_ 8
+	D_ 8
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	B_ 2
 	octave 4
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note D_, 8
-	note C_, 8
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 8
+	E_ 4
+	D_ 2
+	E_ 2
+	D_ 8
+	C_ 8
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 2
+	D_ 8
 	loopchannel 0, Music_Celadon_branch_b74a


@ -230,183 +230,183 @@ Music_Celadon_Ch3:: ; b7b5 (2:77b5)
 	notetype 12, 1, 3
 	rest 8
 	octave 5
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
+	D_ 1
+	C# 1
+	D_ 1
+	E_ 1
+	F# 1
+	E_ 1
+	F# 1
+	G_ 1

 Music_Celadon_branch_b7c1::
 	octave 4
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note C#, 2
-	note D_, 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	G_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	C# 2
+	D_ 2
 	rest 6
-	note F#, 2
+	F# 2
 	rest 4
-	note F#, 2
-	note G_, 2
+	F# 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
-	note B_, 2
-	note G_, 2
+	G_ 2
+	B_ 2
+	G_ 2
 	octave 5
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 2
 	octave 4
-	note B_, 2
-	note G_, 2
+	B_ 2
+	G_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
-	note B_, 2
-	note G_, 2
+	G_ 2
+	B_ 2
+	G_ 2
 	octave 5
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 2
 	octave 4
-	note B_, 2
-	note G_, 2
+	B_ 2
+	G_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
-	note C_, 2
+	D_ 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
 	loopchannel 0, Music_Celadon_branch_b7c1
-; 0xb86d
+; 0xb86d