aboutsummaryrefslogtreecommitdiffstats
path: root/audio/sfx/psybeam.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-02-05 17:59:01 -0600
committerGitHub <noreply@github.com>2020-02-05 17:59:01 -0600
commit5048f24816e95fc38a708b967648deb86c62a689 (patch)
treec6b15116aefe09c91c3047d506fc7bbf677f8001 /audio/sfx/psybeam.asm
parentNew Discord invite link (diff)
parentRename dnote to drum_note and dspeed to drum_speed (diff)
downloadpokeyellow-5048f24816e95fc38a708b967648deb86c62a689.tar.gz
pokeyellow-5048f24816e95fc38a708b967648deb86c62a689.tar.xz
pokeyellow-5048f24816e95fc38a708b967648deb86c62a689.zip
Merge pull request #223 from pret/audio-macros
Audio macros
Diffstat (limited to 'audio/sfx/psybeam.asm')
-rw-r--r--audio/sfx/psybeam.asm42
1 files changed, 21 insertions, 21 deletions
diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm
index 71c7119b..2b94cf6d 100644
--- a/audio/sfx/psybeam.asm
+++ b/audio/sfx/psybeam.asm
@@ -1,25 +1,25 @@
-SFX_Psybeam_Ch4:
- dutycycle 161
- squarenote 10, 15, 1, 1600
- squarenote 10, 15, 3, 1664
- squarenote 10, 15, 2, 1568
- loopchannel 4, SFX_Psybeam_Ch4
- squarenote 10, 15, 1, 1600
- endchannel
+SFX_Psybeam_Ch5:
+ duty_cycle_pattern 2, 2, 0, 1
+ square_note 10, 15, 1, 1600
+ square_note 10, 15, 3, 1664
+ square_note 10, 15, 2, 1568
+ sound_loop 4, SFX_Psybeam_Ch5
+ square_note 10, 15, 1, 1600
+ sound_ret
-SFX_Psybeam_Ch5:
- dutycycle 179
- squarenote 10, 15, 3, 1393
- squarenote 7, 14, 3, 1329
- squarenote 10, 15, 1, 1361
- loopchannel 4, SFX_Psybeam_Ch5
- squarenote 10, 15, 1, 1393
- endchannel
+SFX_Psybeam_Ch6:
+ duty_cycle_pattern 2, 3, 0, 3
+ square_note 10, 15, 3, 1393
+ square_note 7, 14, 3, 1329
+ square_note 10, 15, 1, 1361
+ sound_loop 4, SFX_Psybeam_Ch6
+ square_note 10, 15, 1, 1393
+ sound_ret
-SFX_Psybeam_Ch7:
- noisenote 2, 13, 1, 74
- noisenote 2, 13, 2, 42
- loopchannel 21, SFX_Psybeam_Ch7
- endchannel
+SFX_Psybeam_Ch8:
+ noise_note 2, 13, 1, 74
+ noise_note 2, 13, 2, 42
+ sound_loop 21, SFX_Psybeam_Ch8
+ sound_ret