aboutsummaryrefslogtreecommitdiffstats
path: root/audio/sfx/battle_2b.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_2b.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_2b.asm')
-rw-r--r--audio/sfx/battle_2b.asm38
1 files changed, 19 insertions, 19 deletions
diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm
index 6eddfa76..d60a96f6 100644
--- a/audio/sfx/battle_2b.asm
+++ b/audio/sfx/battle_2b.asm
@@ -1,21 +1,21 @@
-SFX_Battle_2B_Ch1:
- dutycycle 210
- unknownsfx0x20 3, 129, 0, 3
- unknownsfx0x20 3, 193, 0, 4
- unknownsfx0x20 3, 241, 0, 5
- unknownsfx0x20 3, 177, 0, 4
- unknownsfx0x20 3, 113, 0, 3
- loopchannel 5, SFX_Battle_2B_Ch1
- unknownsfx0x20 8, 129, 0, 4
- endchannel
+SFX_Battle_2B_Ch5:
+ duty_cycle_pattern 3, 1, 0, 2
+ square_note 3, 8, 1, 768
+ square_note 3, 12, 1, 1024
+ square_note 3, 15, 1, 1280
+ square_note 3, 11, 1, 1024
+ square_note 3, 7, 1, 768
+ sound_loop 5, SFX_Battle_2B_Ch5
+ square_note 8, 8, 1, 1024
+ sound_ret
-SFX_Battle_2B_Ch2:
- unknownnoise0x20 3, 98, 34
- unknownnoise0x20 3, 162, 50
- unknownnoise0x20 3, 210, 51
- unknownnoise0x20 3, 146, 35
- unknownnoise0x20 3, 82, 18
- loopchannel 5, SFX_Battle_2B_Ch2
- unknownnoise0x20 8, 129, 18
- endchannel
+SFX_Battle_2B_Ch8:
+ noise_note 3, 6, 2, 34
+ noise_note 3, 10, 2, 50
+ noise_note 3, 13, 2, 51
+ noise_note 3, 9, 2, 35
+ noise_note 3, 5, 2, 18
+ sound_loop 5, SFX_Battle_2B_Ch8
+ noise_note 8, 8, 1, 18
+ sound_ret