aboutsummaryrefslogtreecommitdiffstats
path: root/audio/sfx/battle_35.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/battle_35.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/battle_35.asm')
-rw-r--r--audio/sfx/battle_35.asm38
1 files changed, 19 insertions, 19 deletions
diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm
index 2fe57bc4..e9f78657 100644
--- a/audio/sfx/battle_35.asm
+++ b/audio/sfx/battle_35.asm
@@ -1,29 +1,29 @@
-SFX_Battle_35_Ch1:
- executemusic
+SFX_Battle_35_Ch5:
+ execute_music
vibrato 10, 2, 4
- duty 2
- notetype 10, 8, 7
+ duty_cycle 2
+ note_type 10, 8, 7
octave 5
- G# 8
+ note G#, 8
octave 6
- F# 4
- E_ 4
+ note F#, 4
+ note E_, 4
octave 5
- G# 8
- endchannel
+ note G#, 8
+ sound_ret
-SFX_Battle_35_Ch2:
- executemusic
+SFX_Battle_35_Ch6:
+ execute_music
vibrato 10, 2, 3
- duty 2
- notetype 11, 6, 7
+ duty_cycle 2
+ note_type 11, 6, 7
octave 5
- G# 8
- notetype 10, 6, 7
+ note G#, 8
+ note_type 10, 6, 7
octave 6
- F# 4
- E_ 4
+ note F#, 4
+ note E_, 4
octave 5
- G# 8
- endchannel
+ note G#, 8
+ sound_ret