diff options
| author | dannye <33dannye@gmail.com> | 2019-07-27 23:21:39 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2019-07-27 23:21:39 -0500 |
| commit | 20c4116788d4d29b14c85ffce77e65faf89716b7 (patch) | |
| tree | 7dcc36a1b3568ebe5b98b3cc7ddb8344a2162cc9 /audio/sfx/battle_36.asm | |
| parent | Merge pull request #220 from Rangi42/master (diff) | |
| download | pokeyellow-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_36.asm')
| -rw-r--r-- | audio/sfx/battle_36.asm | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index 9d00fad9..2fd40bd3 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,47 +1,47 @@ -SFX_Battle_36_Ch4: - duty 0 - squarenote 2, 15, 1, 1920 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1936 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1952 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1968 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1984 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 2000 +SFX_Battle_36_Ch5: + duty_cycle 0 + square_note 2, 15, 1, 1920 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1936 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1952 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1968 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1984 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2000 SFX_Battle_36_branch_20930: - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 2016 - loopchannel 12, SFX_Battle_36_branch_20930 - squarenote 15, 15, 1, 1792 - endchannel + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2016 + sound_loop 12, SFX_Battle_36_branch_20930 + square_note 15, 15, 1, 1792 + sound_ret -SFX_Battle_36_Ch5: - dutycycle 179 - squarenote 2, 15, 1, 1921 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1937 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1953 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1969 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1985 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 2001 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 2017 - loopchannel 12, SFX_Battle_36_branch_20930 - squarenote 15, 15, 1, 1793 - endchannel +SFX_Battle_36_Ch6: + duty_cycle_pattern 179 + square_note 2, 15, 1, 1921 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1937 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1953 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1969 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1985 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 2001 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 2017 + sound_loop 12, SFX_Battle_36_branch_20930 + square_note 15, 15, 1, 1793 + sound_ret -SFX_Battle_36_Ch7: - noisenote 1, 13, 1, 73 - noisenote 1, 13, 1, 41 - loopchannel 26, SFX_Battle_36_Ch7 - endchannel +SFX_Battle_36_Ch8: + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 26, SFX_Battle_36_Ch8 + sound_ret |