From 0c7ed80e8f0db0e0a908e372a1bcd11ab7c06e0b Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 9 Jun 2014 13:22:35 -0400 Subject: Improve music command names --- audio/music/defeatedwildmon.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'audio/music/defeatedwildmon.asm') diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index c56c6471..6340afd3 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -1,11 +1,11 @@ Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74) - tempo 0, 112 - stereopanning 119 + tempo 112 + volume 7, 7 executemusic duty 3 vibrato 6, 3, 4 - togglecall - tempo 0, 112 + toggleperfectpitch + tempo 112 notetype 12, 11, 7 octave 3 note B_, 1 -- cgit v1.2.3 From fee52c53a40f8e36dfccfbe73668bfc2858c2a95 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 10 Jun 2014 11:42:56 -0400 Subject: Make each pitch/instrument its own macro --- audio/music/defeatedwildmon.asm | 322 ++++++++++++++++++++-------------------- 1 file changed, 161 insertions(+), 161 deletions(-) (limited to 'audio/music/defeatedwildmon.asm') diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index 6340afd3..93b4d3ff 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -8,62 +8,62 @@ Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74) tempo 112 notetype 12, 11, 7 octave 3 - note B_, 1 - note A_, 1 - note G#, 1 - note F#, 1 - note E_, 12 + B_ 1 + A_ 1 + G# 1 + F# 1 + E_ 12 Music_DefeatedWildMon_branch_23b8b:: notetype 12, 6, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note G#, 2 - note G#, 2 - note G#, 4 - note E_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note G#, 8 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note A_, 2 - note A_, 4 - note A#, 2 - note A#, 2 - note A#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note A_, 2 - note A_, 4 - note A#, 2 - note A#, 2 - note A#, 4 - note A_, 8 + E_ 2 + F# 2 + E_ 2 + F# 2 + G# 2 + G# 2 + G# 4 + A_ 2 + A_ 2 + A_ 4 + G# 2 + G# 2 + G# 4 + E_ 2 + F# 2 + E_ 2 + F# 2 + G# 2 + G# 2 + G# 4 + A_ 2 + A_ 2 + A_ 4 + G# 8 + F_ 2 + G_ 2 + F_ 2 + G_ 2 + A_ 2 + A_ 2 + A_ 4 + A# 2 + A# 2 + A# 4 + A_ 2 + A_ 2 + A_ 4 + F_ 2 + G_ 2 + F_ 2 + G_ 2 + A_ 2 + A_ 2 + A_ 4 + A# 2 + A# 2 + A# 4 + A_ 8 loopchannel 0, Music_DefeatedWildMon_branch_23b8b @@ -72,73 +72,73 @@ Music_DefeatedWildMon_Ch2:: ; 23bc1 (8:7bc1) duty 2 notetype 12, 12, 3 octave 4 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + E_ 1 + F# 1 + G# 1 + A_ 1 notetype 12, 12, 7 - note B_, 12 + B_ 12 Music_DefeatedWildMon_branch_23bce:: notetype 12, 8, 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note B_, 2 - note B_, 4 + B_ 2 + A_ 2 + G# 2 + A_ 2 + B_ 2 + B_ 2 + B_ 4 octave 4 - note C#, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 2 + C# 4 octave 3 - note B_, 2 - note B_, 2 - note B_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note B_, 2 - note B_, 4 + B_ 2 + B_ 2 + B_ 4 + B_ 2 + A_ 2 + G# 2 + A_ 2 + B_ 2 + B_ 2 + B_ 4 octave 4 - note C#, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 2 + C# 4 octave 3 - note B_, 8 + B_ 8 octave 4 - note C_, 2 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note A#, 2 + A# 2 + A_ 2 + A# 2 octave 4 - note C_, 2 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C_, 2 - note C_, 2 - note C_, 4 - note C_, 2 + C_ 2 + C_ 2 + C_ 4 + D_ 2 + D_ 2 + D_ 4 + C_ 2 + C_ 2 + C_ 4 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note A#, 2 + A# 2 + A_ 2 + A# 2 octave 4 - note C_, 2 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C_, 8 + C_ 2 + C_ 2 + C_ 4 + D_ 2 + D_ 2 + D_ 4 + C_ 8 loopchannel 0, Music_DefeatedWildMon_branch_23bce @@ -146,158 +146,158 @@ Music_DefeatedWildMon_Ch3:: ; 23c0e (8:7c0e) executemusic notetype 12, 2, 0 octave 5 - note E_, 1 + E_ 1 rest 1 octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 octave 6 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 Music_DefeatedWildMon_branch_23c21:: octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 3 octave 5 - note E_, 1 + E_ 1 rest 3 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note F#, 1 + F# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 octave 5 - note D#, 1 + D# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 3 octave 5 - note E_, 1 + E_ 1 rest 3 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note F#, 1 + F# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 3 octave 5 - note E_, 1 + E_ 1 rest 3 octave 4 - note D#, 4 + D# 4 octave 4 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 3 octave 5 - note F_, 1 + F_ 1 rest 3 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note G_, 1 + G_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 3 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 3 octave 5 - note F_, 1 + F_ 1 rest 3 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note G_, 1 + G_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 3 octave 5 - note F_, 1 + F_ 1 rest 3 octave 4 - note D#, 4 + D# 4 loopchannel 0, Music_DefeatedWildMon_branch_23c21 -; 0x23cad \ No newline at end of file +; 0x23cad -- cgit v1.2.3