aboutsummaryrefslogtreecommitdiffstats
path: root/audio/sfx/caught_mon.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/caught_mon.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/caught_mon.asm')
-rw-r--r--audio/sfx/caught_mon.asm94
1 files changed, 47 insertions, 47 deletions
diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm
index d4f3e858..3fe278f3 100644
--- a/audio/sfx/caught_mon.asm
+++ b/audio/sfx/caught_mon.asm
@@ -1,61 +1,61 @@
-SFX_Caught_Mon_Ch1:
- executemusic
+SFX_Caught_Mon_Ch5:
+ execute_music
tempo 256
volume 7, 7
- duty 3
- toggleperfectpitch
- notetype 6, 11, 2
+ duty_cycle 3
+ toggle_perfect_pitch
+ note_type 6, 11, 2
octave 3
- E_ 2
- F# 2
- G# 2
- G# 1
- G# 1
- B_ 2
+ note E_, 2
+ note F#, 2
+ note G#, 2
+ note G#, 1
+ note G#, 1
+ note B_, 2
octave 4
- C# 2
- D# 2
- D# 1
- D# 1
- notetype 6, 11, 5
- E_ 8
- endchannel
+ note C#, 2
+ note D#, 2
+ note D#, 1
+ note D#, 1
+ note_type 6, 11, 5
+ note E_, 8
+ sound_ret
-SFX_Caught_Mon_Ch2:
- executemusic
- duty 2
- notetype 6, 12, 2
+SFX_Caught_Mon_Ch6:
+ execute_music
+ duty_cycle 2
+ note_type 6, 12, 2
octave 4
- G# 2
- G# 1
- G# 1
- E_ 2
- E_ 1
- E_ 1
- B_ 2
- B_ 1
- B_ 1
- A_ 2
- A_ 1
- A_ 1
- notetype 6, 12, 5
- G# 8
- endchannel
+ note G#, 2
+ note G#, 1
+ note G#, 1
+ note E_, 2
+ note E_, 1
+ note E_, 1
+ note B_, 2
+ note B_, 1
+ note B_, 1
+ note A_, 2
+ note A_, 1
+ note A_, 1
+ note_type 6, 12, 5
+ note G#, 8
+ sound_ret
-SFX_Caught_Mon_Ch3:
- executemusic
- notetype 6, 1, 0
+SFX_Caught_Mon_Ch7:
+ execute_music
+ note_type 6, 1, 0
octave 4
- B_ 2
+ note B_, 2
rest 2
octave 5
- C# 2
+ note C#, 2
rest 2
- D# 2
+ note D#, 2
rest 2
- F# 2
- G_ 2
- G# 4
- endchannel
+ note F#, 2
+ note G_, 2
+ note G#, 4
+ sound_ret