Make each pitch/instrument its own macro

2026-02-24 08:02:24 +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/yellow/yellowunusedsong.asm
+++ b/audio/music/yellow/yellowunusedsong.asm
@ -1,51 +1,51 @@
-Music_YellowUnusedSong_Ch1: ; 82fbe (20:6fbe)
+Music_YellowUnusedSong_Ch1:: ; 82fbe (20:6fbe)
 	tempo 140
 	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 8, 11, 2
 	octave 3
-	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
+	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:
-	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
+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
-	note D#, 6
-	note D_, 12
+	D# 6
+	D_ 12
 	rest 16
 	rest 16
 	rest 16
@ -53,275 +53,275 @@ Music_YellowUnusedSong_branch_82fde:
 	rest 16
 	rest 16
 	octave 3
-	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
+	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)
+Music_YellowUnusedSong_Ch2:: ; 83010 (20:7010)
 	duty 2
 	notetype 8, 12, 2
 	octave 4
-	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
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	C_ 6
+	D_ 6
 	octave 3
-	note A_, 6
+	A_ 6
 	octave 4
-	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
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	D_ 6
+	A# 6
+	A_ 12

-Music_YellowUnusedSong_branch_8302a:
-	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
+Music_YellowUnusedSong_branch_8302a::
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	C_ 6
+	D_ 6
 	octave 3
-	note A_, 6
+	A_ 6
 	octave 4
-	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
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	G# 6
+	G_ 12
 	notetype 8, 9, 0
 	octave 3
-	note D#, 16
-	note D#, 8
-	note D#, 16
-	note D#, 8
+	D# 16
+	D# 8
+	D# 16
+	D# 8
 	octave 2
-	note A#, 16
-	note A#, 8
+	A# 16
+	A# 8
 	octave 3
-	note D#, 12
-	note F_, 12
+	D# 12
+	F_ 12
 	notetype 8, 12, 2
 	octave 4
-	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
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	C_ 6
+	D_ 6
 	octave 3
-	note A_, 6
+	A_ 6
 	octave 4
-	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
+	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)
+Music_YellowUnusedSong_Ch3:: ; 83068 (20:7068)
 	notetype 12, 1, 0
 	vibrato 2, 1, 5
 	rest 16
 	rest 12
 	octave 4
-	note C_, 4
-	note D_, 8
-	note D#, 8
-	note G_, 8
-	note A#, 8
+	C_ 4
+	D_ 8
+	D# 8
+	G_ 8
+	A# 8

-Music_YellowUnusedSong_branch_83075:
-	note A_, 8
-	note A#, 8
-	note G_, 8
-	note A_, 4
-	note D_, 4
-	note A_, 8
-	note A#, 8
+Music_YellowUnusedSong_branch_83075::
+	A_ 8
+	A# 8
+	G_ 8
+	A_ 4
+	D_ 4
+	A_ 8
+	A# 8
 	octave 5
-	note C#, 8
-	note D_, 8
-	note D#, 16
-	note D#, 16
+	C# 8
+	D_ 8
+	D# 16
+	D# 16
 	octave 4
-	note A#, 16
+	A# 16
 	octave 5
-	note D#, 8
-	note F_, 8
+	D# 8
+	F_ 8
 	octave 4
-	note D_, 16
-	note D_, 16
+	D_ 16
+	D_ 16
 	octave 4
-	note D_, 8
-	note D#, 8
-	note G_, 8
-	note A#, 8
+	D_ 8
+	D# 8
+	G_ 8
+	A# 8
 	loopchannel 0, Music_YellowUnusedSong_branch_83075


-Music_YellowUnusedSong_Ch4: ; 83092 (20:7092)
+Music_YellowUnusedSong_Ch4:: ; 83092 (20:7092)
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 4

-Music_YellowUnusedSong_branch_830c3:
-	dnote 4, snare3
+Music_YellowUnusedSong_branch_830c3::
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 4
 	loopchannel 0, Music_YellowUnusedSong_branch_830c3
-; 0x8316d
+; 0x8316d