aboutsummaryrefslogtreecommitdiffstats
path: root/audio/sfx/battle_33.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/battle_33.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/battle_33.asm')
-rw-r--r--audio/sfx/battle_33.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm
index 5eee7b32..95afe045 100644
--- a/audio/sfx/battle_33.asm
+++ b/audio/sfx/battle_33.asm
@@ -1,18 +1,18 @@
-SFX_Battle_33_Ch4:
- duty 2
- squarenote 6, 15, 1, 1280
- squarenote 6, 15, 1, 1408
- squarenote 6, 15, 1, 1536
- squarenote 6, 15, 1, 1664
- squarenote 8, 15, 1, 1792
- endchannel
+SFX_Battle_33_Ch5:
+ duty_cycle 2
+ square_note 6, 15, 1, 1280
+ square_note 6, 15, 1, 1408
+ square_note 6, 15, 1, 1536
+ square_note 6, 15, 1, 1664
+ square_note 8, 15, 1, 1792
+ sound_ret
-SFX_Battle_33_Ch5:
- duty 3
- squarenote 6, 14, 1, 1296
- squarenote 6, 14, 1, 1424
- squarenote 6, 14, 1, 1552
- squarenote 6, 14, 1, 1680
- squarenote 8, 14, 1, 1808
- endchannel
+SFX_Battle_33_Ch6:
+ duty_cycle 3
+ square_note 6, 14, 1, 1296
+ square_note 6, 14, 1, 1424
+ square_note 6, 14, 1, 1552
+ square_note 6, 14, 1, 1680
+ square_note 8, 14, 1, 1808
+ sound_ret