aboutsummaryrefslogtreecommitdiffstats
path: root/audio/sfx/get_item1_3.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /audio/sfx/get_item1_3.asm
parentMerge pull request #39 from TiKevin83/master (diff)
downloadpokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip
Sync with pokered
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 b30ce40c..dfc1848f 100644
--- a/audio/sfx/get_item1_3.asm
+++ b/audio/sfx/get_item1_3.asm
@@ -1,47 +1,47 @@
-SFX_Get_Item1_3_Ch1:
- 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_Ch2:
- 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_Ch3:
- 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