aboutsummaryrefslogtreecommitdiffstats
path: root/audio/music/cities2.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2019-07-27 23:21:39 -0500
committerdannye <33dannye@gmail.com>2019-07-27 23:21:39 -0500
commit20c4116788d4d29b14c85ffce77e65faf89716b7 (patch)
tree7dcc36a1b3568ebe5b98b3cc7ddb8344a2162cc9 /audio/music/cities2.asm
parentMerge pull request #220 from Rangi42/master (diff)
downloadpokeyellow-20c4116788d4d29b14c85ffce77e65faf89716b7.tar.gz
pokeyellow-20c4116788d4d29b14c85ffce77e65faf89716b7.tar.xz
pokeyellow-20c4116788d4d29b14c85ffce77e65faf89716b7.zip
Update audio macro names
change audio channel numbers from 0-7 back to 1-8 change all note macros back to single note macro todo: fix comments with old macro names, update noise macros/instrument names
Diffstat (limited to 'audio/music/cities2.asm')
-rw-r--r--audio/music/cities2.asm684
1 files changed, 342 insertions, 342 deletions
diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm
index fb167999..6397f965 100644
--- a/audio/music/cities2.asm
+++ b/audio/music/cities2.asm
@@ -1,416 +1,416 @@
-Music_Cities2_Ch0::
+Music_Cities2_Ch1::
tempo 148
volume 7, 7
- duty 3
+ duty_cycle 3
vibrato 8, 3, 2
- toggleperfectpitch
- notetype 12, 11, 6
+ toggle_perfect_pitch
+ note_type 12, 11, 6
rest 8
octave 3
- E_ 2
- D# 2
- C# 2
- C_ 2
+ note E_, 2
+ note D#, 2
+ note C#, 2
+ note C_, 2
octave 2
- B_ 2
+ note B_, 2
rest 14
Music_Cities2_branch_b51a::
octave 3
- B_ 4
+ note B_, 4
octave 4
- C# 2
- D# 1
- D_ 1
- C# 4
+ note C#, 2
+ note D#, 1
+ note D_, 1
+ note C#, 4
octave 3
- B_ 4
- G# 8
- E_ 8
- A_ 4
- G# 2
- F# 2
- G# 2
- A_ 2
- B_ 2
+ note B_, 4
+ note G#, 8
+ note E_, 8
+ note A_, 4
+ note G#, 2
+ note F#, 2
+ note G#, 2
+ note A_, 2
+ note B_, 2
octave 4
- C# 2
+ note C#, 2
rest 16
- C# 4
+ note C#, 4
octave 3
- B_ 2
+ note B_, 2
octave 4
- C# 1
- D# 1
- C# 4
+ note C#, 1
+ note D#, 1
+ note C#, 4
octave 3
- B_ 4
- E_ 1
- E_ 1
- E_ 1
- E_ 1
- E_ 1
+ note B_, 4
+ note E_, 1
+ note E_, 1
+ note E_, 1
+ note E_, 1
+ note E_, 1
rest 3
- G# 8
- B_ 4
- A_ 2
- G# 2
- F# 2
- G# 2
- A_ 2
- B_ 2
- E_ 2
- F# 2
- G# 2
+ note G#, 8
+ note B_, 4
+ note A_, 2
+ note G#, 2
+ note F#, 2
+ note G#, 2
+ note A_, 2
+ note B_, 2
+ note E_, 2
+ note F#, 2
+ note G#, 2
rest 2
octave 4
- E_ 4
+ note E_, 4
octave 3
- B_ 4
- F# 2
- G# 2
- A_ 2
+ note B_, 4
+ note F#, 2
+ note G#, 2
+ note A_, 2
rest 2
octave 4
- F# 4
- D# 4
+ note F#, 4
+ note D#, 4
octave 3
- E_ 2
+ note E_, 2
rest 4
- F# 2
+ note F#, 2
rest 4
- A_ 2
+ note A_, 2
rest 2
- B_ 2
+ note B_, 2
rest 16
rest 16
rest 14
- E_ 16
- F# 8
- G# 4
- F# 4
- E_ 2
+ note E_, 16
+ note F#, 8
+ note G#, 4
+ note F#, 4
+ note E_, 2
rest 14
- loopchannel 0, Music_Cities2_branch_b51a
+ sound_loop 0, Music_Cities2_branch_b51a
-Music_Cities2_Ch1::
- duty 3
+Music_Cities2_Ch2::
+ duty_cycle 3
vibrato 8, 2, 3
- notetype 12, 12, 2
+ note_type 12, 12, 2
octave 4
- E_ 2
- D# 2
- C# 2
+ note E_, 2
+ note D#, 2
+ note C#, 2
octave 3
- B_ 2
- A_ 2
- B_ 2
+ note B_, 2
+ note A_, 2
+ note B_, 2
octave 4
- C# 2
- D# 2
- E_ 6
- notetype 12, 12, 2
- duty 2
+ note C#, 2
+ note D#, 2
+ note E_, 6
+ note_type 12, 12, 2
+ duty_cycle 2
octave 4
- E_ 1
+ note E_, 1
octave 3
- B_ 1
+ note B_, 1
octave 4
- C# 2
- D# 2
- E_ 1
- F# 1
- G# 1
- A_ 1
+ note C#, 2
+ note D#, 2
+ note E_, 1
+ note F#, 1
+ note G#, 1
+ note A_, 1
Music_Cities2_branch_b58b::
- notetype 12, 10, 6
- G# 6
- notetype 12, 12, 2
- A_ 1
- G# 1
- notetype 12, 12, 4
- F# 14
- notetype 12, 12, 2
- E_ 1
+ note_type 12, 10, 6
+ note G#, 6
+ note_type 12, 12, 2
+ note A_, 1
+ note G#, 1
+ note_type 12, 12, 4
+ note F#, 14
+ note_type 12, 12, 2
+ note E_, 1
octave 3
- B_ 1
+ note B_, 1
octave 4
- C# 2
- D# 2
- E_ 1
- F# 1
- G# 1
- A_ 1
- notetype 12, 12, 4
- G# 6
- notetype 12, 12, 2
- E_ 1
- G# 1
- notetype 12, 12, 5
- B_ 14
- notetype 12, 12, 2
- E_ 1
+ note C#, 2
+ note D#, 2
+ note E_, 1
+ note F#, 1
+ note G#, 1
+ note A_, 1
+ note_type 12, 12, 4
+ note G#, 6
+ note_type 12, 12, 2
+ note E_, 1
+ note G#, 1
+ note_type 12, 12, 5
+ note B_, 14
+ note_type 12, 12, 2
+ note E_, 1
octave 3
- B_ 1
+ note B_, 1
octave 4
- C# 2
- D# 2
- E_ 1
- F# 1
- G# 1
- A_ 1
- notetype 12, 10, 6
- G# 6
- notetype 12, 12, 2
- A_ 1
- G# 1
- notetype 12, 12, 4
- F# 8
- notetype 12, 10, 1
- duty 1
+ note C#, 2
+ note D#, 2
+ note E_, 1
+ note F#, 1
+ note G#, 1
+ note A_, 1
+ note_type 12, 10, 6
+ note G#, 6
+ note_type 12, 12, 2
+ note A_, 1
+ note G#, 1
+ note_type 12, 12, 4
+ note F#, 8
+ note_type 12, 10, 1
+ duty_cycle 1
octave 3
- G# 1
- G# 1
- G# 1
- G# 1
- G# 1
+ note G#, 1
+ note G#, 1
+ note G#, 1
+ note G#, 1
+ note G#, 1
rest 1
- notetype 12, 12, 2
- duty 2
+ note_type 12, 12, 2
+ duty_cycle 2
octave 4
- E_ 1
+ note E_, 1
octave 3
- B_ 1
+ note B_, 1
octave 4
- C# 2
- D# 2
- E_ 1
- F# 1
- G# 1
- A_ 1
- notetype 12, 12, 4
- G# 6
- E_ 1
- G# 1
- notetype 12, 12, 6
- B_ 8
- notetype 12, 12, 2
- C# 1
+ note C#, 2
+ note D#, 2
+ note E_, 1
+ note F#, 1
+ note G#, 1
+ note A_, 1
+ note_type 12, 12, 4
+ note G#, 6
+ note E_, 1
+ note G#, 1
+ note_type 12, 12, 6
+ note B_, 8
+ note_type 12, 12, 2
+ note C#, 1
octave 3
- B_ 1
+ note B_, 1
octave 4
- C# 1
- D# 1
- E_ 4
- notetype 12, 12, 7
- G# 4
- E_ 4
- notetype 12, 12, 2
- D# 1
- C# 1
- D# 1
- E_ 1
- F# 4
- notetype 12, 12, 7
- B_ 4
- F# 4
- notetype 12, 12, 2
- C# 1
+ note C#, 1
+ note D#, 1
+ note E_, 4
+ note_type 12, 12, 7
+ note G#, 4
+ note E_, 4
+ note_type 12, 12, 2
+ note D#, 1
+ note C#, 1
+ note D#, 1
+ note E_, 1
+ note F#, 4
+ note_type 12, 12, 7
+ note B_, 4
+ note F#, 4
+ note_type 12, 12, 2
+ note C#, 1
octave 3
- B_ 1
+ note B_, 1
octave 4
- C# 1
- D# 1
- E_ 2
- E_ 1
- D# 1
- E_ 1
- F# 1
- G# 2
- G# 1
- A_ 1
- G# 1
- A_ 1
- B_ 1
- F# 1
- D# 1
- C# 1
+ note C#, 1
+ note D#, 1
+ note E_, 2
+ note E_, 1
+ note D#, 1
+ note E_, 1
+ note F#, 1
+ note G#, 2
+ note G#, 1
+ note A_, 1
+ note G#, 1
+ note A_, 1
+ note B_, 1
+ note F#, 1
+ note D#, 1
+ note C#, 1
octave 3
- B_ 1
+ note B_, 1
octave 4
- C# 1
- D# 1
- F# 1
- notetype 12, 12, 2
- B_ 8
- notetype 12, 11, 7
+ note C#, 1
+ note D#, 1
+ note F#, 1
+ note_type 12, 12, 2
+ note B_, 8
+ note_type 12, 11, 7
octave 3
- E_ 8
+ note E_, 8
octave 2
- B_ 4
+ note B_, 4
octave 3
- F# 4
- G# 4
- A_ 4
- B_ 8
- B_ 8
- G# 4
+ note F#, 4
+ note G#, 4
+ note A_, 4
+ note B_, 8
+ note B_, 8
+ note G#, 4
octave 4
- D# 4
- C# 4
- D# 4
- E_ 2
- D# 2
- C# 2
- D# 2
- notetype 12, 12, 2
- E_ 6
- E_ 1
+ note D#, 4
+ note C#, 4
+ note D#, 4
+ note E_, 2
+ note D#, 2
+ note C#, 2
+ note D#, 2
+ note_type 12, 12, 2
+ note E_, 6
+ note E_, 1
octave 3
- B_ 1
+ note B_, 1
octave 4
- C# 2
- D# 2
- E_ 1
- F# 1
- G# 1
- A_ 1
- loopchannel 0, Music_Cities2_branch_b58b
+ note C#, 2
+ note D#, 2
+ note E_, 1
+ note F#, 1
+ note G#, 1
+ note A_, 1
+ sound_loop 0, Music_Cities2_branch_b58b
-Music_Cities2_Ch2::
- notetype 12, 1, 1
+Music_Cities2_Ch3::
+ note_type 12, 1, 1
rest 16
octave 4
- E_ 2
- G# 2
- E_ 2
- G# 2
- E_ 2
- G# 2
- E_ 2
- G# 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
Music_Cities2_branch_b64c::
- F# 2
- A_ 2
- F# 2
- A_ 2
- B_ 2
- A_ 2
- G# 2
- F# 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
- B_ 2
- A_ 2
- G# 2
- F# 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
- B_ 2
- A_ 2
- G# 2
- F# 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
- B_ 2
- A_ 2
- G# 2
- F# 2
- E_ 2
- G# 2
- E_ 2
+ note F#, 2
+ note A_, 2
+ note F#, 2
+ note A_, 2
+ note B_, 2
+ note A_, 2
+ note G#, 2
+ note F#, 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 B_, 2
+ note A_, 2
+ note G#, 2
+ note F#, 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 B_, 2
+ note A_, 2
+ note G#, 2
+ note F#, 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 B_, 2
+ note A_, 2
+ note G#, 2
+ note F#, 2
+ note E_, 2
+ note G#, 2
+ note E_, 2
rest 2
- E_ 4
- G# 4
- F# 2
- A_ 2
- F# 2
+ note E_, 4
+ note G#, 4
+ note F#, 2
+ note A_, 2
+ note F#, 2
rest 2
- F# 4
- A_ 4
- C# 2
+ note F#, 4
+ note A_, 4
+ note C#, 2
rest 4
- E_ 2
+ note E_, 2
rest 4
- G# 2
- A_ 2
- B_ 2
+ note G#, 2
+ note A_, 2
+ note B_, 2
rest 8
- A_ 2
- G# 2
- F# 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
- B_ 2
- A_ 2
- G# 2
- F# 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
- B_ 2
- A_ 2
- G# 2
- F# 2
- E_ 2
- G# 2
- E_ 2
- G# 2
- E_ 2
- G# 2
- E_ 2
- G# 2
- loopchannel 0, Music_Cities2_branch_b64c
+ note A_, 2
+ note G#, 2
+ note F#, 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 B_, 2
+ note A_, 2
+ note G#, 2
+ note F#, 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 B_, 2
+ note A_, 2
+ note G#, 2
+ note F#, 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
+ sound_loop 0, Music_Cities2_branch_b64c
generated by cgit v1.3.1-sl0p (git 2.54.0) at 2026-08-18 07:41:47 +0000 — sl0p fork