aboutsummaryrefslogtreecommitdiffstats
path: root/audio/sfx/get_item1_3.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/sfx/get_item1_3.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/sfx/get_item1_3.asm')
-rw-r--r--audio/sfx/get_item1_3.asm60
1 files changed, 30 insertions, 30 deletions
diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm
index 6c4c01b5..dfc1848f 100644
--- a/audio/sfx/get_item1_3.asm
+++ b/audio/sfx/get_item1_3.asm
@@ -1,47 +1,47 @@
-SFX_Get_Item1_3_Ch4:
- executemusic
+SFX_Get_Item1_3_Ch5:
+ execute_music
tempo 256
volume 7, 7
vibrato 6, 2, 6
- duty 2
- toggleperfectpitch
- notetype 4, 11, 1
+ duty_cycle 2
+ toggle_perfect_pitch
+ note_type 4, 11, 1
octave 3
- G# 2
- G# 2
- G# 2
- notetype 12, 11, 3
+ note G#, 2
+ note G#, 2
+ note G#, 2
+ note_type 12, 11, 3
octave 4
- E_ 4
- endchannel
+ note E_, 4
+ sound_ret
-SFX_Get_Item1_3_Ch5:
- executemusic
+SFX_Get_Item1_3_Ch6:
+ execute_music
vibrato 8, 2, 7
- duty 2
- notetype 4, 12, 1
+ duty_cycle 2
+ note_type 4, 12, 1
octave 4
- E_ 2
- E_ 2
- E_ 2
- notetype 12, 12, 3
- B_ 4
- endchannel
+ note E_, 2
+ note E_, 2
+ note E_, 2
+ note_type 12, 12, 3
+ note B_, 4
+ sound_ret
-SFX_Get_Item1_3_Ch6:
- executemusic
- notetype 4, 1, 0
+SFX_Get_Item1_3_Ch7:
+ execute_music
+ note_type 4, 1, 0
octave 4
- B_ 1
+ note B_, 1
rest 1
- B_ 1
+ note B_, 1
rest 1
- B_ 1
+ note B_, 1
rest 1
- notetype 12, 1, 0
+ note_type 12, 1, 0
octave 4
- B_ 2
+ note B_, 2
rest 2
- endchannel
+ sound_ret