diff options
| author | dannye <33dannye@gmail.com> | 2019-09-03 22:55:51 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2019-09-03 22:55:51 -0500 |
| commit | 5fd3e591df48ca081726cde12d9991fa52a1c839 (patch) | |
| tree | 06ebf32d6d29b5ce75687bbff35eeac9b9e11ddb | |
| parent | e0583934874a8fddb1204efd4357146be617cb1f (diff) | |
Use TRUE/FALSE constants for stereo_panning
and use dn instead of db for volume envelope and pitch sweep
86 files changed, 414 insertions, 414 deletions
diff --git a/audio/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm index 7ef346eff..4dd0904e7 100644 --- a/audio/music/aftertherivalfight.asm +++ b/audio/music/aftertherivalfight.asm @@ -11,7 +11,7 @@ Music_AfterTheRivalFight_Ch1: duty_cycle 0 pitch_offset 1 vibrato 8, 1, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 11, 2 octave 2 note G#, 4 @@ -27,7 +27,7 @@ Music_AfterTheRivalFight_Ch1: Music_AfterTheRivalFight_Ch2: duty_cycle 1 vibrato 6, 3, 5 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 12, 2 octave 4 note G#, 4 @@ -54,7 +54,7 @@ Music_AfterTheRivalFight_Ch3: Music_AfterTheRivalFight_Ch4: toggle_noise 3 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_speed 12 drum_note 3, 4 drum_note 3, 4 diff --git a/audio/music/azaleatown.asm b/audio/music/azaleatown.asm index 4c5e8e35e..3c58a2067 100644 --- a/audio/music/azaleatown.asm +++ b/audio/music/azaleatown.asm @@ -9,7 +9,7 @@ Music_AzaleaTown_Ch1: tempo 160 volume 7, 7 duty_cycle 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 10, 1 rest 2 Music_AzaleaTown_branch_f5801: @@ -29,7 +29,7 @@ Music_AzaleaTown_branch_f5801: sound_loop 2, Music_AzaleaTown_branch_f5801 Music_AzaleaTown_branch_f5816: sound_call Music_AzaleaTown_branch_f588c - stereo_panning 1, 0 + stereo_panning TRUE, FALSE volume_envelope 10, 4 note G#, 2 note A#, 1 @@ -42,9 +42,9 @@ Music_AzaleaTown_branch_f5816: note F#, 4 note D#, 2 rest 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE sound_call Music_AzaleaTown_branch_f588c - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 6, 10, 4 note D#, 4 note C_, 4 @@ -55,7 +55,7 @@ Music_AzaleaTown_branch_f5816: octave 3 note A#, 4 note F#, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE sound_call Music_AzaleaTown_branch_f5912 volume_envelope 10, 3 note A#, 4 @@ -232,7 +232,7 @@ Music_AzaleaTown_branch_f5912: Music_AzaleaTown_Ch2: vibrato 18, 2, 3 duty_cycle 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 6, 2 rest 1 octave 4 @@ -418,7 +418,7 @@ Music_AzaleaTown_branch_f59c7: sound_ret Music_AzaleaTown_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 6, 2, 6 note_type 12, 2, 5 octave 2 diff --git a/audio/music/battletowerlobby.asm b/audio/music/battletowerlobby.asm index 4f22e9522..dc31ac1b7 100644 --- a/audio/music/battletowerlobby.asm +++ b/audio/music/battletowerlobby.asm @@ -11,7 +11,7 @@ Music_BattleTowerLobby_Ch1: duty_cycle 3 pitch_offset 1 vibrato 8, 2, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 7, 2 Music_BattleTowerLobby_branch_1794a9: note_type 12, 7, 2 @@ -120,7 +120,7 @@ Music_BattleTowerLobby_branch_1794a9: Music_BattleTowerLobby_Ch2: duty_cycle 2 vibrato 16, 3, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 8, 2 Music_BattleTowerLobby_branch_179544: note_type 12, 8, 2 diff --git a/audio/music/battletowertheme.asm b/audio/music/battletowertheme.asm index 938a6da7a..0e8b8b347 100644 --- a/audio/music/battletowertheme.asm +++ b/audio/music/battletowertheme.asm @@ -10,7 +10,7 @@ Music_BattleTowerTheme_Ch1: volume 7, 7 pitch_offset 1 vibrato 18, 3, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 6, 9, 4 Music_BattleTowerTheme_branch_1788a5: rest 16 @@ -285,7 +285,7 @@ Music_BattleTowerTheme_branch_178970: note G_, 1 note F_, 1 note E_, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE duty_cycle 2 note F_, 6 note A_, 1 @@ -336,7 +336,7 @@ Music_BattleTowerTheme_branch_178970: rest 1 note G_, 4 rest 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE duty_cycle 3 octave 3 note C_, 2 @@ -361,7 +361,7 @@ Music_BattleTowerTheme_Ch3: vibrato 18, 3, 4 note_type 6, 1, 6 Music_BattleTowerTheme_branch_178a26: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_BattleTowerTheme_branch_178afe note C_, 2 rest 2 @@ -375,7 +375,7 @@ Music_BattleTowerTheme_branch_178a26: rest 1 note F_, 4 rest 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note C_, 8 sound_call Music_BattleTowerTheme_branch_178afe note C_, 2 @@ -469,7 +469,7 @@ Music_BattleTowerTheme_branch_178a26: note F_, 2 note G_, 4 rest 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note G_, 2 octave 3 note C_, 2 diff --git a/audio/music/bicycle.asm b/audio/music/bicycle.asm index 51e914a61..af8301f30 100644 --- a/audio/music/bicycle.asm +++ b/audio/music/bicycle.asm @@ -10,7 +10,7 @@ Music_Bicycle_Ch1: volume 7, 7 duty_cycle 3 pitch_offset 1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 8, 1, 5 note_type 12, 11, 4 octave 3 @@ -24,7 +24,7 @@ Music_Bicycle_Ch1: volume_envelope 11, 2 note F#, 2 Music_Bicycle_branch_ee144: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE volume_envelope 11, 2 note G_, 2 note G_, 2 @@ -100,7 +100,7 @@ Music_Bicycle_branch_ee144: note G_, 2 note G#, 2 note A_, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE volume_envelope 11, 6 note B_, 4 note G_, 4 @@ -173,7 +173,7 @@ Music_Bicycle_branch_ee144: Music_Bicycle_Ch2: duty_cycle 2 vibrato 16, 2, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 12, 6 octave 4 note D_, 6 @@ -195,7 +195,7 @@ Music_Bicycle_Ch2: note B_, 2 note A_, 2 Music_Bicycle_branch_ee1fd: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE duty_cycle 2 volume_envelope 12, 3 octave 3 @@ -253,7 +253,7 @@ Music_Bicycle_branch_ee1fd: note E_, 2 volume_envelope 12, 7 note F#, 8 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE sound_call Music_Bicycle_branch_ee263 note F#, 4 volume_envelope 12, 3 @@ -503,12 +503,12 @@ Music_Bicycle_Ch4: Music_Bicycle_branch_ee34b: rest 2 Music_Bicycle_branch_ee34c: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 6, 4 sound_loop 12, Music_Bicycle_branch_ee34c drum_note 6, 4 drum_note 6, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 6, 2 drum_note 6, 2 drum_note 6, 2 diff --git a/audio/music/buenaspassword.asm b/audio/music/buenaspassword.asm index 89a0974b0..5d4d109a0 100644 --- a/audio/music/buenaspassword.asm +++ b/audio/music/buenaspassword.asm @@ -12,12 +12,12 @@ Music_BuenasPassword_Ch1: note_type 12, 11, 3 rest 8 Music_BuenasPassword_branch_17816b: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE rest 16 rest 16 duty_cycle 3 note_type 6, 9, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE octave 4 note G#, 1 rest 1 @@ -27,7 +27,7 @@ Music_BuenasPassword_branch_17816b: note G#, 2 rest 10 rest 10 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note C#, 2 note F_, 2 note G#, 1 @@ -39,11 +39,11 @@ Music_BuenasPassword_branch_17816b: rest 12 duty_cycle 2 sound_call Music_BuenasPassword_branch_178204 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_BuenasPassword_branch_1782df sound_call Music_BuenasPassword_branch_178222 sound_call Music_BuenasPassword_branch_178204 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_BuenasPassword_branch_1782df sound_call Music_BuenasPassword_branch_178222 sound_call Music_BuenasPassword_branch_178204 @@ -140,7 +140,7 @@ Music_BuenasPassword_branch_17816b: sound_loop 0, Music_BuenasPassword_branch_17816b Music_BuenasPassword_branch_178204: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 6, 8, 4 octave 4 note D#, 2 @@ -187,10 +187,10 @@ Music_BuenasPassword_Ch2: octave 3 note F#, 1 Music_BuenasPassword_branch_17823c: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_BuenasPassword_branch_1782df sound_call Music_BuenasPassword_branch_1782a4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_BuenasPassword_branch_1782cc octave 3 note B_, 2 @@ -198,7 +198,7 @@ Music_BuenasPassword_branch_17823c: note B_, 2 note G#, 16 sound_call Music_BuenasPassword_branch_1782a4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_BuenasPassword_branch_1782cc note B_, 2 note A#, 2 @@ -283,7 +283,7 @@ Music_BuenasPassword_branch_1782a4: rest 1 note F#, 1 rest 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 4 note G#, 1 note_type 6, 8, 1 @@ -575,18 +575,18 @@ Music_BuenasPassword_branch_1783d9: sound_call Music_BuenasPassword_branch_17840c sound_call Music_BuenasPassword_branch_17840c sound_call Music_BuenasPassword_branch_17840c - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 4, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 3, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 8, 1 drum_note 8, 1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 3, 2 drum_note 3, 2 drum_note 3, 1 @@ -594,37 +594,37 @@ Music_BuenasPassword_branch_1783d9: sound_loop 0, Music_BuenasPassword_branch_1783d9 Music_BuenasPassword_branch_17840c: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 4, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 3, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 8, 1 drum_note 8, 1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 4, 2 drum_note 3, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 8, 2 sound_ret Music_BuenasPassword_branch_178424: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 4, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 3, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 8, 1 drum_note 8, 1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 4, 2 drum_note 3, 2 drum_note 3, 1 diff --git a/audio/music/bugcatchingcontest.asm b/audio/music/bugcatchingcontest.asm index 61c1e0478..4b47b2f70 100644 --- a/audio/music/bugcatchingcontest.asm +++ b/audio/music/bugcatchingcontest.asm @@ -8,7 +8,7 @@ Music_BugCatchingContest: Music_BugCatchingContest_Ch1: tempo 144 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 8, 2, 4 duty_cycle 2 note_type 12, 11, 7 @@ -189,7 +189,7 @@ Music_BugCatchingContest_branch_f7c8e: sound_loop 0, Music_BugCatchingContest_branch_f7c4b Music_BugCatchingContest_Ch2: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 8, 2, 3 duty_cycle 1 note_type 12, 12, 7 @@ -372,7 +372,7 @@ Music_BugCatchingContest_branch_f7d8e: sound_ret Music_BugCatchingContest_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 16, 2, 3 note_type 12, 1, 4 rest 8 diff --git a/audio/music/burnedtower.asm b/audio/music/burnedtower.asm index 5abd367ca..7fda35fac 100644 --- a/audio/music/burnedtower.asm +++ b/audio/music/burnedtower.asm @@ -11,7 +11,7 @@ Music_BurnedTower_Ch1: duty_cycle 1 pitch_offset 4 vibrato 8, 4, 5 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 9, 1 rest 2 octave 2 @@ -193,7 +193,7 @@ Music_BurnedTower_branch_f6b8e: sound_ret Music_BurnedTower_Ch3: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 1, 4 rest 16 rest 16 @@ -251,7 +251,7 @@ Music_BurnedTower_branch_f6be1: sound_loop 4, Music_BurnedTower_branch_f6be1 rest 2 Music_BurnedTower_branch_f6be7: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 2 drum_note 9, 2 drum_note 8, 4 diff --git a/audio/music/celadoncity.asm b/audio/music/celadoncity.asm index 04f379901..004a4e1be 100644 --- a/audio/music/celadoncity.asm +++ b/audio/music/celadoncity.asm @@ -9,7 +9,7 @@ Music_CeladonCity_Ch1: volume 7, 7 pitch_offset 1 Music_CeladonCity_branch_f436c: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 10, 6 octave 3 note A_, 7 @@ -143,7 +143,7 @@ Music_CeladonCity_branch_f43fe: Music_CeladonCity_Ch2: vibrato 18, 3, 4 duty_cycle 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 11, 7 octave 4 note D_, 1 diff --git a/audio/music/cherrygrovecity.asm b/audio/music/cherrygrovecity.asm index e18782ef9..7696a5fef 100644 --- a/audio/music/cherrygrovecity.asm +++ b/audio/music/cherrygrovecity.asm @@ -11,7 +11,7 @@ Music_CherrygroveCity_Ch1: duty_cycle 3 pitch_offset 1 vibrato 8, 1, 5 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 11, 5 rest 10 octave 3 @@ -96,7 +96,7 @@ Music_CherrygroveCity_branch_f5b26: Music_CherrygroveCity_Ch2: duty_cycle 3 vibrato 16, 3, 6 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 12, 3 octave 3 note C_, 2 diff --git a/audio/music/clair.asm b/audio/music/clair.asm index f5200f084..171f5c0ab 100644 --- a/audio/music/clair.asm +++ b/audio/music/clair.asm @@ -10,7 +10,7 @@ Music_Clair_Ch1: volume 7, 7 pitch_offset 1 vibrato 18, 3, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 9, 3 duty_cycle 3 Music_Clair_branch_1faab: @@ -98,13 +98,13 @@ Music_Clair_branch_1fac9: Music_Clair_branch_1fb12: duty_cycle 3 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 3 note B_, 1 rest 2 note G#, 5 duty_cycle 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE octave 2 note B_, 2 note G#, 1 @@ -391,11 +391,11 @@ Music_Clair_branch_1fc3c: Music_Clair_Ch4: toggle_noise 3 drum_speed 12 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 12, 8 drum_note 12, 8 drum_note 12, 6 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 4, 1 drum_note 4, 1 drum_note 3, 2 @@ -405,31 +405,31 @@ Music_Clair_Ch4: drum_note 3, 1 drum_note 3, 1 Music_Clair_branch_1fc5e: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_Clair_branch_1fc6e drum_note 8, 1 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_Clair_branch_1fc6e drum_note 7, 1 sound_loop 0, Music_Clair_branch_1fc5e Music_Clair_branch_1fc6e: drum_note 4, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 3, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 1 drum_note 8, 1 drum_note 8, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 4, 1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 1 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 3, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 1 sound_ret diff --git a/audio/music/credits.asm b/audio/music/credits.asm index 401e29ba4..b96091e3d 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -8,7 +8,7 @@ Music_Credits: Music_Credits_Ch1: tempo 139 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 3 note_type 12, 2, -7 octave 2 @@ -561,7 +561,7 @@ Music_Credits_Ch2: duty_cycle 1 vibrato 20, 2, 3 note_type 12, 2, -7 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 4 note G_, 16 volume_envelope 12, 7 @@ -975,7 +975,7 @@ Music_Credits_branch_1f748: Music_Credits_Ch3: vibrato 22, 2, 3 note_type 12, 3, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 6 note G_, 1 note D_, 1 diff --git a/audio/music/crystalopening.asm b/audio/music/crystalopening.asm index de99b25e2..c8a54fa9e 100644 --- a/audio/music/crystalopening.asm +++ b/audio/music/crystalopening.asm @@ -11,7 +11,7 @@ Music_CrystalOpening_Ch1: pitch_offset 2 vibrato 16, 3, 4 duty_cycle 3 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 9, 2 octave 2 note F#, 2 @@ -242,7 +242,7 @@ Music_CrystalOpening_Ch3: sound_ret Music_CrystalOpening_Ch4: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE toggle_noise 3 drum_speed 12 rest 16 diff --git a/audio/music/dancinghall.asm b/audio/music/dancinghall.asm index 99527f898..b2a5510c1 100644 --- a/audio/music/dancinghall.asm +++ b/audio/music/dancinghall.asm @@ -9,7 +9,7 @@ Music_DancingHall: Music_DancingHall_Ch1: tempo 208 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 6, 11, 7 rest 3 duty_cycle 0 @@ -89,7 +89,7 @@ Music_DancingHall_branch_efa17: sound_ret Music_DancingHall_Ch2: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 6, 10, 1 duty_cycle 0 vibrato 16, 2, 4 @@ -221,7 +221,7 @@ Music_DancingHall_branch_efa7a: sound_ret Music_DancingHall_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 22, 2, 4 note_type 6, 1, 0 octave 5 diff --git a/audio/music/darkcave.asm b/audio/music/darkcave.asm index 192763a3b..ae965824a 100644 --- a/audio/music/darkcave.asm +++ b/audio/music/darkcave.asm @@ -11,7 +11,7 @@ Music_DarkCave_Ch1: duty_cycle 3 pitch_offset 1 vibrato 17, 1, 5 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 10, 7 Music_DarkCave_branch_ea2dc: rest 16 @@ -139,7 +139,7 @@ Music_DarkCave_branch_ea333: Music_DarkCave_Ch2: duty_cycle 1 vibrato 18, 3, 6 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 10, 7 Music_DarkCave_branch_ea374: rest 16 @@ -153,7 +153,7 @@ Music_DarkCave_branch_ea37e: rest 16 sound_loop 4, Music_DarkCave_branch_ea37e rest 8 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE volume_envelope 12, 7 octave 5 note C_, 8 @@ -196,7 +196,7 @@ Music_DarkCave_branch_ea37e: note D#, 10 volume_envelope 11, 7 note D#, 6 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE volume_envelope 12, 4 octave 4 note F_, 4 @@ -259,7 +259,7 @@ Music_DarkCave_branch_ea37e: volume_envelope 11, 7 note C_, 8 volume_envelope 12, 7 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE rest 8 octave 5 note C_, 8 @@ -303,7 +303,7 @@ Music_DarkCave_branch_ea37e: note C_, 8 volume_envelope 12, 7 rest 16 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE rest 8 octave 3 note A#, 2 @@ -461,24 +461,24 @@ Music_DarkCave_Ch4: toggle_noise 3 drum_speed 12 Music_DarkCave_branch_ea4ee: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 4, 8 drum_note 4, 8 drum_note 4, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 2, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 2, 2 drum_note 2, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 2, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 4, 8 drum_note 4, 8 drum_note 4, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 2, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 2, 2 drum_note 2, 2 sound_loop 0, Music_DarkCave_branch_ea4ee diff --git a/audio/music/dragonsden.asm b/audio/music/dragonsden.asm index 07b19b4c1..4191988c2 100644 --- a/audio/music/dragonsden.asm +++ b/audio/music/dragonsden.asm @@ -10,7 +10,7 @@ Music_DragonsDen_Ch1: volume 7, 7 duty_cycle 0 pitch_offset 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 8, 0 Music_DragonsDen_branch_eed03: sound_call Music_DragonsDen_branch_eed1e @@ -62,7 +62,7 @@ Music_DragonsDen_branch_eed2d: Music_DragonsDen_Ch2: duty_cycle 0 pitch_offset 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 9, 0 Music_DragonsDen_branch_eed46: sound_call Music_DragonsDen_branch_eed5e @@ -161,12 +161,12 @@ Music_DragonsDen_Ch4: rest 16 rest 16 Music_DragonsDen_branch_eedbd: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 6, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 7, 4 drum_note 7, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 7, 4 sound_loop 0, Music_DragonsDen_branch_eedbd diff --git a/audio/music/ecruteakcity.asm b/audio/music/ecruteakcity.asm index 7f38d6e1a..c26170a06 100644 --- a/audio/music/ecruteakcity.asm +++ b/audio/music/ecruteakcity.asm @@ -7,7 +7,7 @@ Music_EcruteakCity: Music_EcruteakCity_Ch1: tempo 197 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 18, 2, 5 duty_cycle 2 Music_EcruteakCity_branch_ef2e5: @@ -40,10 +40,10 @@ Music_EcruteakCity_branch_ef2e5: note C#, 4 note D_, 10 rest 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 4 note B_, 8 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE octave 3 note A#, 1 note B_, 11 @@ -251,7 +251,7 @@ Music_EcruteakCity_branch_ef3d0: Music_EcruteakCity_Ch2: vibrato 18, 2, 5 duty_cycle 3 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_EcruteakCity_branch_ef3f2: note_type 6, 6, 7 rest 16 @@ -312,9 +312,9 @@ Music_EcruteakCity_branch_ef3f2: note E_, 4 note D_, 10 rest 1 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note D#, 9 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE duty_cycle 0 octave 5 note C#, 1 @@ -471,7 +471,7 @@ Music_EcruteakCity_branch_ef3f2: sound_loop 0, Music_EcruteakCity_branch_ef3f2 Music_EcruteakCity_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE Music_EcruteakCity_branch_ef4e3: vibrato 18, 2, 5 note_type 12, 2, 5 diff --git a/audio/music/elmslab.asm b/audio/music/elmslab.asm index 785ca8b82..ba11eb9eb 100644 --- a/audio/music/elmslab.asm +++ b/audio/music/elmslab.asm @@ -11,7 +11,7 @@ Music_ElmsLab_Ch1: duty_cycle 3 pitch_offset 1 vibrato 16, 1, 5 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 11, 2 octave 2 note F_, 2 @@ -186,7 +186,7 @@ Music_ElmsLab_branch_ea075: Music_ElmsLab_Ch2: duty_cycle 3 vibrato 16, 2, 6 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 12, 3 octave 4 note F_, 2 @@ -212,7 +212,7 @@ Music_ElmsLab_Ch2: note C_, 4 note C_, 4 note C_, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE Music_ElmsLab_branch_ea14f: volume_envelope 12, 6 octave 4 @@ -351,7 +351,7 @@ Music_ElmsLab_branch_ea14f: sound_loop 0, Music_ElmsLab_branch_ea14f Music_ElmsLab_Ch3: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 2, 5 rest 8 rest 14 @@ -528,7 +528,7 @@ Music_ElmsLab_branch_ea216: sound_loop 0, Music_ElmsLab_branch_ea216 Music_ElmsLab_Ch4: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE toggle_noise 0 drum_speed 12 rest 16 diff --git a/audio/music/evolution.asm b/audio/music/evolution.asm index c8e4f2697..8ae1245e1 100644 --- a/audio/music/evolution.asm +++ b/audio/music/evolution.asm @@ -23,7 +23,7 @@ Music_Evolution_Ch1: note G_, 1 rest 4 duty_cycle 3 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_Evolution_branch_f0713: sound_call Music_Evolution_branch_f0737 note_type 12, 10, 4 @@ -75,7 +75,7 @@ Music_Evolution_Ch2: note D_, 1 rest 4 duty_cycle 3 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_Evolution_branch_f0761: sound_call Music_Evolution_branch_f0787 note_type 12, 11, 5 @@ -190,10 +190,10 @@ Music_Evolution_Ch4: drum_speed 12 rest 8 Music_Evolution_branch_f07f0: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 11, 6 drum_note 11, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 5, 2 drum_note 5, 2 drum_note 5, 2 diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index d5f5cc075..9abb6ff35 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -8,7 +8,7 @@ Music_GameCorner: Music_GameCorner_Ch1: tempo 147 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 9, 1 rest 8 Music_GameCorner_branch_edd84: @@ -135,7 +135,7 @@ Music_GameCorner_branch_ede13: sound_ret Music_GameCorner_Ch2: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 8, 2, 4 note_type 12, 10, 1 rest 8 @@ -321,7 +321,7 @@ Music_GameCorner_Ch3: note_type 12, 1, 4 rest 8 Music_GameCorner_branch_edeef: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note_type 12, 1, 4 sound_call Music_GameCorner_branch_edfdd sound_call Music_GameCorner_branch_edff8 @@ -334,7 +334,7 @@ Music_GameCorner_branch_edeef: note A#, 1 octave 5 note C_, 3 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE sound_call Music_GameCorner_branch_edfdd sound_call Music_GameCorner_branch_ee00c sound_call Music_GameCorner_branch_edfdd @@ -342,7 +342,7 @@ Music_GameCorner_branch_edeef: sound_call Music_GameCorner_branch_edfdd sound_call Music_GameCorner_branch_ee00c sound_call Music_GameCorner_branch_edfdd - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 2 note F_, 1 octave 3 @@ -375,7 +375,7 @@ Music_GameCorner_branch_edeef: note A#, 1 octave 5 note C_, 3 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE sound_call Music_GameCorner_branch_edfdd sound_call Music_GameCorner_branch_ee00c sound_call Music_GameCorner_branch_edfdd diff --git a/audio/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm index dfa4f7f9b..9fdd7cc95 100644 --- a/audio/music/goldenrodcity.asm +++ b/audio/music/goldenrodcity.asm @@ -6,7 +6,7 @@ Music_GoldenrodCity: channel 4, Music_GoldenrodCity_Ch4 Music_GoldenrodCity_Ch1: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE tempo 176 volume 7, 7 note_type 12, 9, 7 @@ -174,7 +174,7 @@ Music_GoldenrodCity_branch_eb4d1: sound_ret Music_GoldenrodCity_Ch2: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 18, 2, 3 duty_cycle 2 note_type 12, 9, 7 @@ -265,7 +265,7 @@ Music_GoldenrodCity_branch_eb572: sound_ret Music_GoldenrodCity_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 8, 2, 3 note_type 12, 2, 5 Music_GoldenrodCity_branch_eb58c: diff --git a/audio/music/goldsilveropening.asm b/audio/music/goldsilveropening.asm index ce56d0603..a0e66a9ae 100644 --- a/audio/music/goldsilveropening.asm +++ b/audio/music/goldsilveropening.asm @@ -9,7 +9,7 @@ Music_GoldSilverOpening_Ch1: volume 7, 7 pitch_offset 1 duty_cycle 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 11, 7 octave 1 note G#, 16 @@ -131,7 +131,7 @@ Music_GoldSilverOpening_Ch1: Music_GoldSilverOpening_Ch2: pitch_offset 1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 11, 7 duty_cycle 2 octave 2 diff --git a/audio/music/goldsilveropening2.asm b/audio/music/goldsilveropening2.asm index 9d201a14d..93ecc2c3c 100644 --- a/audio/music/goldsilveropening2.asm +++ b/audio/music/goldsilveropening2.asm @@ -10,7 +10,7 @@ Music_GoldSilverOpening2_Ch1: volume 7, 7 duty_cycle 3 pitch_offset 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 3, -5 octave 3 note D#, 8 @@ -56,7 +56,7 @@ Music_GoldSilverOpening2_branch_f7325: Music_GoldSilverOpening2_Ch2: duty_cycle 3 vibrato 20, 1, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 3, -7 octave 3 note A#, 8 diff --git a/audio/music/gym.asm b/audio/music/gym.asm index 05817f244..e1f7c8c89 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -8,7 +8,7 @@ Music_Gym: Music_Gym_Ch1: tempo 156 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 18, 2, 4 duty_cycle 1 note_type 12, 11, 7 @@ -192,7 +192,7 @@ Music_Gym_branch_f48c9: Music_Gym_Ch2: duty_cycle 1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_Gym_branch_f4980: note_type 12, 12, 3 octave 2 @@ -370,7 +370,7 @@ Music_Gym_branch_f4a15: Music_Gym_Ch3: vibrato 20, 2, 3 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE Music_Gym_branch_f4a3c: note_type 12, 1, 4 octave 6 diff --git a/audio/music/gymleadervictory.asm b/audio/music/gymleadervictory.asm index 6b5bccefe..24b6cb6db 100644 --- a/audio/music/gymleadervictory.asm +++ b/audio/music/gymleadervictory.asm @@ -26,7 +26,7 @@ Music_GymLeaderVictory_Ch1: note A_, 1 octave 5 note D_, 8 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_GymLeaderVictory_branch_f4658: duty_cycle 1 sound_call Music_GymLeaderVictory_branch_f4689 @@ -224,7 +224,7 @@ Music_GymLeaderVictory_Ch3: note B_, 2 octave 3 note C#, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_GymLeaderVictory_branch_f4744: note D_, 2 rest 4 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 698de153a..cb0651993 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -11,7 +11,7 @@ Music_HallOfFame_Ch1: duty_cycle 2 vibrato 12, 2, 2 pitch_offset 1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 9, 3 rest 16 rest 16 @@ -144,13 +144,13 @@ Music_HallOfFame_Ch4: rest 16 drum_speed 6 Music_HallOfFame_branch_f0677: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 11, 4 drum_note 11, 8 drum_note 11, 4 drum_note 11, 4 drum_note 11, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 10, 2 drum_note 10, 2 drum_note 11, 2 @@ -160,7 +160,7 @@ Music_HallOfFame_branch_f0677: drum_note 11, 8 drum_note 11, 4 drum_note 11, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 11, 1 drum_note 11, 1 drum_note 10, 1 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index d2e9fcd72..6ac053a55 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -10,7 +10,7 @@ Music_IndigoPlateau_Ch1: volume 7, 7 duty_cycle 3 pitch_offset 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_IndigoPlateau_branch_ee86a: sound_call Music_IndigoPlateau_branch_ee881 octave 3 @@ -43,7 +43,7 @@ Music_IndigoPlateau_branch_ee881: Music_IndigoPlateau_Ch2: duty_cycle 3 vibrato 16, 2, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_IndigoPlateau_branch_ee899: sound_call Music_IndigoPlateau_branch_ee8e9 note A_, 4 @@ -149,7 +149,7 @@ Music_IndigoPlateau_branch_ee915: sound_ret Music_IndigoPlateau_Ch4: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE toggle_noise 0 drum_speed 12 Music_IndigoPlateau_branch_ee92a: diff --git a/audio/music/lakeofrage.asm b/audio/music/lakeofrage.asm index 9a6262d57..100ff03ef 100644 --- a/audio/music/lakeofrage.asm +++ b/audio/music/lakeofrage.asm @@ -11,7 +11,7 @@ Music_LakeOfRage_Ch1: duty_cycle 3 pitch_offset 2 vibrato 8, 2, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 11, 4 octave 3 note D_, 6 @@ -97,7 +97,7 @@ Music_LakeOfRage_branch_ee6e9: Music_LakeOfRage_Ch2: duty_cycle 3 vibrato 32, 4, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note_type 12, 9, 0 octave 3 note G_, 8 @@ -184,7 +184,7 @@ Music_LakeOfRage_branch_ee75e: sound_loop 0, Music_LakeOfRage_branch_ee75e Music_LakeOfRage_Ch3: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 1, 6 octave 3 note G_, 4 @@ -297,7 +297,7 @@ Music_LakeOfRage_branch_ee7d0: sound_loop 0, Music_LakeOfRage_branch_ee7d0 Music_LakeOfRage_Ch4: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE toggle_noise 3 drum_speed 12 Music_LakeOfRage_branch_ee83b: diff --git a/audio/music/lakeofragerocketradio.asm b/audio/music/lakeofragerocketradio.asm index ec3b265cc..91df9d550 100644 --- a/audio/music/lakeofragerocketradio.asm +++ b/audio/music/lakeofragerocketradio.asm @@ -10,7 +10,7 @@ Music_LakeOfRageRocketRadio_Ch1: duty_cycle 1 pitch_offset 4376 vibrato 0, 15, 0 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_LakeOfRageRocketRadio_branch_ef5c9: note_type 12, 10, 7 octave 7 @@ -26,7 +26,7 @@ Music_LakeOfRageRocketRadio_Ch2: vibrato 19, 14, 8 note_type 12, 10, 7 rest 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE sound_loop 0, Music_LakeOfRageRocketRadio_branch_ef5c9 Music_LakeOfRageRocketRadio_Ch3: diff --git a/audio/music/lavendertown.asm b/audio/music/lavendertown.asm index 12607d4ba..b3d6adb73 100644 --- a/audio/music/lavendertown.asm +++ b/audio/music/lavendertown.asm @@ -9,7 +9,7 @@ Music_LavenderTown: Music_LavenderTown_Ch1: tempo 160 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 6, 2, 4 duty_cycle 0 note_type 12, 11, 3 @@ -265,7 +265,7 @@ Music_LavenderTown_branch_ef87f: Music_LavenderTown_Ch2: duty_cycle 1 vibrato 8, 2, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE Music_LavenderTown_branch_ef8a0: note_type 12, 10, 3 octave 5 @@ -390,7 +390,7 @@ Music_LavenderTown_branch_ef915: Music_LavenderTown_Ch3: vibrato 18, 2, 4 note_type 12, 1, 3 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE rest 16 rest 16 rest 16 diff --git a/audio/music/lighthouse.asm b/audio/music/lighthouse.asm index 5ce09cf25..f2ba932a5 100644 --- a/audio/music/lighthouse.asm +++ b/audio/music/lighthouse.asm @@ -11,7 +11,7 @@ Music_Lighthouse_Ch1: duty_cycle 3 pitch_offset 4 vibrato 8, 4, 5 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_Lighthouse_branch_ee584: note_type 12, 11, 3 octave 3 @@ -213,7 +213,7 @@ Music_Lighthouse_branch_ee604: Music_Lighthouse_Ch3: note_type 12, 1, -1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_Lighthouse_branch_ee65b: octave 2 note G#, 2 @@ -293,14 +293,14 @@ Music_Lighthouse_Ch4: toggle_noise 0 drum_speed 12 Music_Lighthouse_branch_ee6b1: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 9, 4 drum_note 6, 2 drum_note 9, 4 drum_note 6, 2 drum_note 10, 2 drum_note 11, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 9, 2 drum_note 6, 4 drum_note 9, 2 diff --git a/audio/music/lookbeauty.asm b/audio/music/lookbeauty.asm index e74883162..90c610cd1 100644 --- a/audio/music/lookbeauty.asm +++ b/audio/music/lookbeauty.asm @@ -6,7 +6,7 @@ Music_LookBeauty: channel 4, Music_LookBeauty_Ch4 Music_LookBeauty_Ch1: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 18, 2, 5 duty_cycle 2 tempo 128 @@ -78,7 +78,7 @@ Music_LookBeauty_branch_eee5f: sound_loop 0, Music_LookBeauty_branch_eee5f Music_LookBeauty_Ch2: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 16, 2, 3 duty_cycle 2 note_type 12, 12, 7 @@ -155,7 +155,7 @@ Music_LookBeauty_branch_eeec5: sound_loop 0, Music_LookBeauty_branch_eeec5 Music_LookBeauty_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 8, 1, 2 note_type 12, 1, 5 rest 16 diff --git a/audio/music/lookhiker.asm b/audio/music/lookhiker.asm index 4a1b86262..bae20aad2 100644 --- a/audio/music/lookhiker.asm +++ b/audio/music/lookhiker.asm @@ -11,7 +11,7 @@ Music_LookHiker_Ch1: pitch_offset 1 vibrato 18, 2, 4 duty_cycle 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 6, 8 octave 3 note F#, 2 @@ -70,7 +70,7 @@ Music_LookHiker_branch_f7457: Music_LookHiker_Ch3: vibrato 18, 2, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 1, 4 octave 4 note B_, 2 diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm index 83c66f7d5..cf296a358 100644 --- a/audio/music/lookkimonogirl.asm +++ b/audio/music/lookkimonogirl.asm @@ -9,7 +9,7 @@ Music_LookKimonoGirl: Music_LookKimonoGirl_Ch1: tempo 160 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 1 note_type 6, 8, 7 pitch_offset 1 @@ -107,7 +107,7 @@ Music_LookKimonoGirl_branch_f7a34: Music_LookKimonoGirl_Ch2: duty_cycle 0 note_type 6, 10, 7 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE sound_call Music_LookKimonoGirl_branch_f7aa8 Music_LookKimonoGirl_branch_f7a5f: duty_cycle 3 @@ -212,7 +212,7 @@ Music_LookKimonoGirl_branch_f7aa8: sound_ret Music_LookKimonoGirl_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 18, 2, 4 note_type 6, 1, 3 rest 1 diff --git a/audio/music/looklass.asm b/audio/music/looklass.asm index 0e644795e..4939f8c9a 100644 --- a/audio/music/looklass.asm +++ b/audio/music/looklass.asm @@ -16,7 +16,7 @@ Music_LookLass_Ch1: rest 1 octave 4 note B_, 14 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 0 Music_LookLass_branch_ed7bd: volume_envelope 10, 2 @@ -31,7 +31,7 @@ Music_LookLass_branch_ed7bd: sound_loop 0, Music_LookLass_branch_ed7bd Music_LookLass_Ch2: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE duty_cycle 0 note_type 12, 8, 3 rest 16 diff --git a/audio/music/lookmysticalman.asm b/audio/music/lookmysticalman.asm index 868a66bb4..9adf37dcb 100644 --- a/audio/music/lookmysticalman.asm +++ b/audio/music/lookmysticalman.asm @@ -10,7 +10,7 @@ Music_LookMysticalMan_Ch1: volume 7, 7 vibrato 10, 3, 4 pitch_offset 1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 11, 3 rest 8 Music_LookMysticalMan_branch_178458: @@ -198,7 +198,7 @@ Music_LookMysticalMan_Ch2: note_type 12, 11, 3 rest 8 Music_LookMysticalMan_branch_178523: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 6, 11, 8 octave 3 note B_, 1 @@ -210,10 +210,10 @@ Music_LookMysticalMan_branch_178523: rest 4 note B_, 2 rest 6 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note B_, 8 note A_, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note G#, 1 rest 1 note G#, 1 @@ -223,10 +223,10 @@ Music_LookMysticalMan_branch_178523: rest 4 note G#, 2 rest 6 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note F#, 8 note G#, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note A_, 1 rest 1 note A_, 1 @@ -236,10 +236,10 @@ Music_LookMysticalMan_branch_178523: rest 4 note A_, 2 rest 6 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note A_, 8 note G_, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note F#, 1 rest 1 note F#, 1 diff --git a/audio/music/lookofficer.asm b/audio/music/lookofficer.asm index 2e609525c..69ee344d7 100644 --- a/audio/music/lookofficer.asm +++ b/audio/music/lookofficer.asm @@ -9,7 +9,7 @@ Music_LookOfficer_Ch1: volume 7, 7 pitch_offset 1 vibrato 18, 3, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 3 note_type 12, 10, 7 octave 4 @@ -97,7 +97,7 @@ Music_LookOfficer_branch_ed89e: Music_LookOfficer_Ch3: vibrato 20, 1, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 1, 4 rest 10 octave 3 diff --git a/audio/music/lookpokemaniac.asm b/audio/music/lookpokemaniac.asm index ab9fe88d6..fb9cafd75 100644 --- a/audio/music/lookpokemaniac.asm +++ b/audio/music/lookpokemaniac.asm @@ -5,7 +5,7 @@ Music_LookPokemaniac: channel 3, Music_LookPokemaniac_Ch3 Music_LookPokemaniac_Ch1: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE tempo 144 volume 7, 7 vibrato 2, 3, 3 @@ -29,7 +29,7 @@ Music_LookPokemaniac_branch_ebdfb: sound_loop 0, Music_LookPokemaniac_branch_ebdfb Music_LookPokemaniac_Ch2: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 2, 3, 3 pitch_offset 1 note_type 12, 11, 3 @@ -80,7 +80,7 @@ Music_LookPokemaniac_branch_ebe38: sound_loop 0, Music_LookPokemaniac_branch_ebe24 Music_LookPokemaniac_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 6, 3, 3 note_type 12, 1, 5 octave 4 diff --git a/audio/music/lookrival.asm b/audio/music/lookrival.asm index d69f4183c..ee64d9593 100644 --- a/audio/music/lookrival.asm +++ b/audio/music/lookrival.asm @@ -11,7 +11,7 @@ Music_LookRival_Ch1: duty_cycle 1 pitch_offset 1 vibrato 18, 1, 5 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 11, 2 octave 4 note C_, 1 @@ -119,7 +119,7 @@ Music_LookRival_branch_f4ff7: Music_LookRival_Ch2: duty_cycle 3 vibrato 8, 3, 6 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 12, 2 octave 4 note F#, 2 @@ -322,7 +322,7 @@ Music_LookRival_branch_f50ff: sound_ret Music_LookRival_Ch4: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE toggle_noise 3 drum_speed 12 rest 8 diff --git a/audio/music/lookrocket.asm b/audio/music/lookrocket.asm index 68be10c72..ceab8c334 100644 --- a/audio/music/lookrocket.asm +++ b/audio/music/lookrocket.asm @@ -9,7 +9,7 @@ Music_LookRocket_Ch1: tempo 123 volume 7, 7 transpose 0, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 3 vibrato 5, 6, 4 note_type 12, 10, 8 @@ -94,7 +94,7 @@ Music_LookRocket_Ch2: vibrato 4, 6, 4 duty_cycle 3 note_type 12, 11, 7 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 5 note C_, 1 note D_, 1 @@ -209,7 +209,7 @@ Music_LookRocket_Ch3: transpose 0, 2 vibrato 4, 2, 2 note_type 12, 1, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE rest 2 sound_call Music_LookRocket_branch_f75bf Music_LookRocket_branch_f75a5: diff --git a/audio/music/looksage.asm b/audio/music/looksage.asm index 0eb6ff238..aac002b82 100644 --- a/audio/music/looksage.asm +++ b/audio/music/looksage.asm @@ -5,7 +5,7 @@ Music_LookSage: Music_LookSage_Ch1: tempo 144 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE volume 7, 7 duty_cycle 3 note_type 12, 11, 3 @@ -123,7 +123,7 @@ Music_LookSage_branch_ee3fa: sound_ret Music_LookSage_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 22, 2, 3 note_type 12, 1, 0 octave 5 diff --git a/audio/music/lookyoungster.asm b/audio/music/lookyoungster.asm index 10dc59366..a61d66b2f 100644 --- a/audio/music/lookyoungster.asm +++ b/audio/music/lookyoungster.asm @@ -7,7 +7,7 @@ Music_LookYoungster: Music_LookYoungster_Ch1: tempo 118 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 3 note_type 12, 10, 3 octave 3 @@ -62,7 +62,7 @@ Music_LookYoungster_branch_f66ea: sound_ret Music_LookYoungster_Ch2: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 18, 2, 6 duty_cycle 1 note_type 12, 10, 3 @@ -159,7 +159,7 @@ Music_LookYoungster_branch_f672f: sound_ret Music_LookYoungster_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 2, 2, 4 note_type 12, 2, 5 rest 4 diff --git a/audio/music/magnettrain.asm b/audio/music/magnettrain.asm index fcf8c9d59..734b37fd8 100644 --- a/audio/music/magnettrain.asm +++ b/audio/music/magnettrain.asm @@ -8,7 +8,7 @@ Music_MagnetTrain: Music_MagnetTrain_Ch1: tempo 110 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 20, 2, 3 duty_cycle 2 note_type 12, 11, 2 @@ -73,7 +73,7 @@ Music_MagnetTrain_Ch2: vibrato 20, 2, 3 duty_cycle 1 note_type 12, 13, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 13, 8 octave 1 note F_, 12 @@ -108,7 +108,7 @@ Music_MagnetTrain_Ch2: sound_ret Music_MagnetTrain_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 16, 2, 3 note_type 12, 1, 5 octave 6 diff --git a/audio/music/mainmenu.asm b/audio/music/mainmenu.asm index 5b6fa6f04..d86502989 100644 --- a/audio/music/mainmenu.asm +++ b/audio/music/mainmenu.asm @@ -11,7 +11,7 @@ Music_MainMenu_Ch1: duty_cycle 3 pitch_offset 1 vibrato 16, 1, 5 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 0, -7 octave 3 note D_, 8 @@ -44,7 +44,7 @@ Music_MainMenu_branch_f791d: Music_MainMenu_Ch2: duty_cycle 3 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 0, -7 octave 3 note G_, 8 @@ -73,7 +73,7 @@ Music_MainMenu_branch_f7949: sound_loop 0, Music_MainMenu_branch_f7949 Music_MainMenu_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 2, 5 rest 8 Music_MainMenu_branch_f796f: @@ -112,7 +112,7 @@ Music_MainMenu_branch_f796f: sound_loop 0, Music_MainMenu_branch_f796f Music_MainMenu_Ch4: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE toggle_noise 3 drum_speed 12 rest 8 diff --git a/audio/music/mobileadapter.asm b/audio/music/mobileadapter.asm index 99bd1cf37..ac695387f 100644 --- a/audio/music/mobileadapter.asm +++ b/audio/music/mobileadapter.asm @@ -9,7 +9,7 @@ Music_MobileAdapter_Ch1: tempo 132 volume 7, 7 pitch_offset 1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 2 note_type 12, 8, 4 rest 2 @@ -606,7 +606,7 @@ Music_MobileAdapter_branch_1ff09: Music_MobileAdapter_Ch4: toggle_noise 3 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_speed 12 rest 2 rest 10 diff --git a/audio/music/mobileadaptermenu.asm b/audio/music/mobileadaptermenu.asm index b22918384..8235f5d9f 100644 --- a/audio/music/mobileadaptermenu.asm +++ b/audio/music/mobileadaptermenu.asm @@ -8,7 +8,7 @@ Music_MobileAdapterMenu_Ch1: tempo 168 volume 7, 7 pitch_offset 1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 2 note_type 12, 6, 6 rest 2 @@ -84,7 +84,7 @@ Music_MobileAdapterMenu_branch_178076: sound_ret Music_MobileAdapterMenu_Ch2: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 8, 4 duty_cycle 2 octave 4 diff --git a/audio/music/mobilecenter.asm b/audio/music/mobilecenter.asm index 6c448640d..61fc2f75b 100644 --- a/audio/music/mobilecenter.asm +++ b/audio/music/mobilecenter.asm @@ -11,7 +11,7 @@ Music_MobileCenter_Ch1: duty_cycle 1 pitch_offset 2 vibrato 8, 2, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 10, 2 octave 3 note E_, 2 @@ -453,7 +453,7 @@ Music_MobileCenter_branch_179788: Music_MobileCenter_Ch4: toggle_noise 3 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_speed 12 drum_note 10, 8 drum_note 10, 4 diff --git a/audio/music/mom.asm b/audio/music/mom.asm index 8941eca6a..c266d52ac 100644 --- a/audio/music/mom.asm +++ b/audio/music/mom.asm @@ -7,7 +7,7 @@ Music_Mom: Music_Mom_Ch2: tempo 144 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 2 note_type 6, 11, 3 octave 3 @@ -33,7 +33,7 @@ Music_Mom_branch_f6c0e: sound_loop 0, Music_Mom_branch_f6c0e Music_Mom_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 6, 2, 5 octave 3 note E_, 1 diff --git a/audio/music/mtmoon.asm b/audio/music/mtmoon.asm index 8849f6454..eeed1f0c7 100644 --- a/audio/music/mtmoon.asm +++ b/audio/music/mtmoon.asm @@ -11,7 +11,7 @@ Music_MtMoon_Ch1: duty_cycle 2 pitch_offset 1 vibrato 8, 1, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 4, 5 rest 2 sound_loop 0, Music_MtMoon_branch_edb56 @@ -20,7 +20,7 @@ Music_MtMoon_Ch2: vibrato 11, 1, 5 duty_cycle 2 note_type 12, 8, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_MtMoon_branch_edb56: octave 4 note D#, 6 @@ -122,18 +122,18 @@ Music_MtMoon_Ch4: toggle_noise 5 drum_speed 12 Music_MtMoon_branch_edbc3: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 11, 4 drum_note 11, 8 drum_note 11, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 11, 4 drum_note 11, 4 drum_note 11, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 11, 4 drum_note 11, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 11, 8 sound_loop 0, Music_MtMoon_branch_edbc3 diff --git a/audio/music/nationalpark.asm b/audio/music/nationalpark.asm index b77a34afd..4a157ae77 100644 --- a/audio/music/nationalpark.asm +++ b/audio/music/nationalpark.asm @@ -8,7 +8,7 @@ Music_NationalPark: Music_NationalPark_Ch1: tempo 192 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 24, 2, 4 duty_cycle 1 note_type 12, 7, 7 @@ -301,7 +301,7 @@ Music_NationalPark_Ch2: duty_cycle 1 note_type 12, 10, 7 rest 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_NationalPark_branch_f565d: note_type 12, 10, 7 sound_call Music_NationalPark_branch_f56b8 @@ -484,7 +484,7 @@ Music_NationalPark_Ch3: octave 4 note G#, 1 note A#, 1 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE Music_NationalPark_branch_f572e: sound_call Music_NationalPark_branch_f5756 octave 5 diff --git a/audio/music/newbarktown.asm b/audio/music/newbarktown.asm index 11607ccb7..9b7a30e46 100644 --- a/audio/music/newbarktown.asm +++ b/audio/music/newbarktown.asm @@ -9,7 +9,7 @@ Music_NewBarkTown: Music_NewBarkTown_Ch1: tempo 187 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 18, 2, 3 note_type 12, 8, 7 rest 4 @@ -159,7 +159,7 @@ Music_NewBarkTown_branch_eb37c: sound_ret Music_NewBarkTown_Ch2: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 18, 2, 3 note_type 6, 10, 7 rest 8 @@ -253,7 +253,7 @@ Music_NewBarkTown_branch_eb3f2: sound_ret Music_NewBarkTown_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 1, 0 octave 5 note D_, 2 diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index ffcc17013..e73e11678 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -9,7 +9,7 @@ Music_PalletTown_Ch1: volume 7, 7 vibrato 18, 2, 4 pitch_offset 1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_PalletTown_branch_f4b22: duty_cycle 2 note_type 12, 7, 8 @@ -122,7 +122,7 @@ Music_PalletTown_branch_f4b59: Music_PalletTown_Ch2: vibrato 18, 4, 4 duty_cycle 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_PalletTown_branch_f4ba8: note_type 12, 8, 8 octave 1 diff --git a/audio/music/pokeflutechannel.asm b/audio/music/pokeflutechannel.asm index ba41eb47b..d04d25fd4 100644 --- a/audio/music/pokeflutechannel.asm +++ b/audio/music/pokeflutechannel.asm @@ -7,7 +7,7 @@ Music_PokeFluteChannel: Music_PokeFluteChannel_Ch1: tempo 240 volume 7, 7 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE duty_cycle 3 pitch_offset 2 note_type 12, 11, 4 @@ -70,7 +70,7 @@ Music_PokeFluteChannel_branch_f7b40: sound_loop 0, Music_PokeFluteChannel_branch_f7b40 Music_PokeFluteChannel_Ch2: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 3 pitch_offset 1 note_type 12, 12, 4 diff --git a/audio/music/pokemoncenter.asm b/audio/music/pokemoncenter.asm index c66b9f07d..1768f5460 100644 --- a/audio/music/pokemoncenter.asm +++ b/audio/music/pokemoncenter.asm @@ -12,7 +12,7 @@ Music_PokemonCenter_Ch1: vibrato 10, 1, 4 pitch_offset 1 Music_PokemonCenter_branch_ed5df: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 8, 3 octave 3 note F#, 2 @@ -86,7 +86,7 @@ Music_PokemonCenter_branch_ed5df: note G_, 2 note A_, 2 note B_, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note F#, 2 note E_, 2 note D_, 4 @@ -153,33 +153,33 @@ Music_PokemonCenter_branch_ed5df: Music_PokemonCenter_Ch2: vibrato 16, 2, 5 Music_PokemonCenter_branch_ed674: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_PokemonCenter_branch_ed6d1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_PokemonCenter_branch_ed6e4 note D_, 2 note F#, 6 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_PokemonCenter_branch_ed6d1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_PokemonCenter_branch_ed6e4 note D_, 8 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 10, 5 octave 3 note D_, 4 @@ -252,7 +252,7 @@ Music_PokemonCenter_branch_ed6e4: Music_PokemonCenter_Ch3: note_type 12, 2, 8 Music_PokemonCenter_branch_ed6f6: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 3 note D_, 1 rest 5 @@ -298,7 +298,7 @@ Music_PokemonCenter_branch_ed6f6: rest 1 note G_, 1 rest 1 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_PokemonCenter_branch_ed783 note G_, 1 rest 5 @@ -395,7 +395,7 @@ Music_PokemonCenter_branch_ed783: Music_PokemonCenter_Ch4: toggle_noise 3 drum_speed 12 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE Music_PokemonCenter_branch_ed792: drum_note 8, 6 drum_note 8, 4 diff --git a/audio/music/pokemonchannel.asm b/audio/music/pokemonchannel.asm index f67a3ffbe..a5d004d0c 100644 --- a/audio/music/pokemonchannel.asm +++ b/audio/music/pokemonchannel.asm @@ -10,7 +10,7 @@ Music_PokemonChannel_Ch1: volume 7, 7 vibrato 8, 3, 8 duty_cycle 1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 11, 3 octave 2 note B_, 1 @@ -78,7 +78,7 @@ Music_PokemonChannel_Ch1: Music_PokemonChannel_Ch2: duty_cycle 1 vibrato 8, 3, 8 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note_type 12, 11, 3 octave 3 note G_, 3 @@ -148,7 +148,7 @@ Music_PokemonChannel_Ch2: Music_PokemonChannel_Ch3: vibrato 8, 3, 8 note_type 12, 2, 5 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 2 note G_, 1 rest 2 diff --git a/audio/music/pokemonlullaby.asm b/audio/music/pokemonlullaby.asm index 9b28b467b..a38108490 100644 --- a/audio/music/pokemonlullaby.asm +++ b/audio/music/pokemonlullaby.asm @@ -15,26 +15,26 @@ Music_PokemonLullaby_branch_f6d8c: note G_, 16 octave 4 note C_, 16 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 3 note G_, 16 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE octave 4 note C_, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 3 note B_, 8 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note G_, 16 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 4 note C_, 8 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE octave 3 note B_, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note G_, 8 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE rest 2 note G_, 2 note G_, 2 @@ -107,7 +107,7 @@ Music_PokemonLullaby_branch_f6dcc: Music_PokemonLullaby_Ch3: note_type 12, 1, 1 Music_PokemonLullaby_branch_f6e06: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 4 note C_, 2 note E_, 2 @@ -119,7 +119,7 @@ Music_PokemonLullaby_branch_f6e06: note B_, 2 note A_, 2 note G_, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note D_, 2 note F_, 2 note A_, 2 diff --git a/audio/music/pokemonmarch.asm b/audio/music/pokemonmarch.asm index 7da445fb7..262417061 100644 --- a/audio/music/pokemonmarch.asm +++ b/audio/music/pokemonmarch.asm @@ -8,7 +8,7 @@ Music_PokemonMarch: Music_PokemonMarch_Ch1: tempo 144 volume 7, 7 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE duty_cycle 3 pitch_offset 1 note_type 12, 4, 2 @@ -233,7 +233,7 @@ Music_PokemonMarch_branch_f6ece: sound_loop 0, Music_PokemonMarch_branch_f6ece Music_PokemonMarch_Ch3: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 1, 6 rest 16 note_type 8, 1, 6 @@ -395,7 +395,7 @@ Music_PokemonMarch_branch_f6fe8: sound_ret Music_PokemonMarch_Ch4: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE toggle_noise 5 drum_speed 8 sound_call Music_PokemonMarch_branch_f704c diff --git a/audio/music/profoak.asm b/audio/music/profoak.asm index f331aab72..9cbdb90f4 100644 --- a/audio/music/profoak.asm +++ b/audio/music/profoak.asm @@ -9,7 +9,7 @@ Music_ProfOak_Ch1: volume 7, 7 vibrato 18, 3, 4 pitch_offset 1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE duty_cycle 3 note_type 12, 9, 8 octave 2 @@ -205,7 +205,7 @@ Music_ProfOak_branch_f4ebf: sound_loop 0, Music_ProfOak_branch_f4ebf Music_ProfOak_Ch3: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 1, 4 rest 4 octave 3 diff --git a/audio/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm index 792954ddc..b4dfabf55 100644 --- a/audio/music/profoakspokemontalk.asm +++ b/audio/music/profoakspokemontalk.asm @@ -9,7 +9,7 @@ Music_ProfOaksPokemonTalk: Music_ProfOaksPokemonTalk_Ch1: tempo 164 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 6, 2, 5 duty_cycle 1 note_type 12, 9, 4 @@ -137,7 +137,7 @@ Music_ProfOaksPokemonTalk_Ch2: vibrato 8, 2, 4 duty_cycle 3 note_type 12, 10, 7 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 3 note B_, 1 octave 4 @@ -211,7 +211,7 @@ Music_ProfOaksPokemonTalk_branch_f4d4d: Music_ProfOaksPokemonTalk_Ch3: vibrato 6, 3, 8 note_type 12, 2, 5 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE rest 8 octave 3 note F#, 1 diff --git a/audio/music/rockethideout.asm b/audio/music/rockethideout.asm index f5d55cd01..1e77b0f49 100644 --- a/audio/music/rockethideout.asm +++ b/audio/music/rockethideout.asm @@ -12,7 +12,7 @@ Music_RocketHideout_Ch1: pitch_offset 4 vibrato 16, 4, 4 note_type 12, 11, 3 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_RocketHideout_branch_eeb93: rest 16 sound_loop 4, Music_RocketHideout_branch_eeb93 @@ -124,7 +124,7 @@ Music_RocketHideout_Ch2: pitch_offset 2 vibrato 0, 15, 0 note_type 12, 12, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_RocketHideout_branch_eec14: octave 2 note D#, 2 @@ -276,7 +276,7 @@ Music_RocketHideout_branch_eeca6: Music_RocketHideout_Ch4: toggle_noise 0 drum_speed 12 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE rest 16 rest 16 drum_note 3, 1 @@ -296,14 +296,14 @@ Music_RocketHideout_branch_eecc7: sound_loop 0, Music_RocketHideout_branch_eecc7 Music_RocketHideout_branch_eecdb: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 4, 1 drum_note 4, 1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 10, 4 drum_note 4, 1 drum_note 4, 1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 10, 4 sound_ret diff --git a/audio/music/rockettheme.asm b/audio/music/rockettheme.asm index ccedb8b90..dd949c9b3 100644 --- a/audio/music/rockettheme.asm +++ b/audio/music/rockettheme.asm @@ -9,7 +9,7 @@ Music_RocketTheme_Ch1: tempo 128 volume 7, 7 duty_cycle 3 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 5, 6, 4 note_type 12, 10, 8 octave 4 @@ -155,7 +155,7 @@ Music_RocketTheme_branch_f7727: sound_ret Music_RocketTheme_Ch2: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 4, 6, 4 duty_cycle 3 note_type 12, 11, 7 @@ -331,7 +331,7 @@ Music_RocketTheme_branch_f781c: sound_ret Music_RocketTheme_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 4, 2, 2 note_type 12, 1, 4 rest 2 diff --git a/audio/music/route1.asm b/audio/music/route1.asm index 85559f872..08cfd3632 100644 --- a/audio/music/route1.asm +++ b/audio/music/route1.asm @@ -7,7 +7,7 @@ Music_Route1: db $3 Music_Route1_Ch1: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE tempo 184 volume 7, 7 vibrato 22, 1, 1 @@ -205,7 +205,7 @@ Music_Route1_branch_ec04a: sound_loop 0, Music_Route1_branch_ec04a Music_Route1_Ch2: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 18, 2, 2 duty_cycle 2 note_type 12, 9, 2 @@ -378,7 +378,7 @@ Music_Route1_branch_ec1aa: sound_ret Music_Route1_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 16, 2, 3 note_type 12, 2, 5 rest 2 diff --git a/audio/music/route12.asm b/audio/music/route12.asm index 33538d1f9..2407121d9 100644 --- a/audio/music/route12.asm +++ b/audio/music/route12.asm @@ -10,7 +10,7 @@ Music_Route12_Ch1: volume 7, 7 vibrato 18, 3, 4 pitch_offset 1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 3 note_type 12, 9, 8 octave 3 @@ -391,7 +391,7 @@ Music_Route12_branch_ec6b4: Music_Route12_Ch4: toggle_noise 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_speed 12 drum_note 12, 10 drum_note 2, 1 diff --git a/audio/music/route2.asm b/audio/music/route2.asm index ccaecd130..b51dd9d79 100644 --- a/audio/music/route2.asm +++ b/audio/music/route2.asm @@ -8,7 +8,7 @@ Music_Route2: Music_Route2_Ch1: tempo 151 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 6, 2, 3 note_type 12, 11, 1 rest 16 @@ -160,7 +160,7 @@ Music_Route2_branch_ed971: sound_ret Music_Route2_Ch2: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 8, 2, 4 note_type 12, 11, 2 sound_call Music_Route2_branch_ed9ba @@ -294,7 +294,7 @@ Music_Route2_branch_eda02: sound_ret Music_Route2_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 22, 1, 5 note_type 12, 1, 4 octave 4 diff --git a/audio/music/route26.asm b/audio/music/route26.asm index 4fdb0ad6a..31e05b9e2 100644 --- a/audio/music/route26.asm +++ b/audio/music/route26.asm @@ -6,7 +6,7 @@ Music_Route26: channel 4, Music_Route26_Ch4 Music_Route26_Ch1: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 18, 2, 3 tempo 151 volume 7, 7 @@ -196,7 +196,7 @@ Music_Route26_branch_eefe0: sound_loop 0, Music_Route26_branch_eefe0 Music_Route26_Ch2: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 20, 2, 3 duty_cycle 2 note_type 12, 12, 7 @@ -354,7 +354,7 @@ Music_Route26_branch_ef14e: sound_ret Music_Route26_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 18, 2, 3 note_type 12, 1, 4 vibrato 24, 2, 3 diff --git a/audio/music/route29.asm b/audio/music/route29.asm index ea0063584..00f5f80cb 100644 --- a/audio/music/route29.asm +++ b/audio/music/route29.asm @@ -11,7 +11,7 @@ Music_Route29_Ch1: duty_cycle 3 pitch_offset 1 vibrato 16, 1, 5 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 11, 2 rest 2 Music_Route29_branch_f03a5: @@ -333,7 +333,7 @@ Music_Route29_branch_f04de: sound_ret Music_Route29_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 2, 5 vibrato 9, 2, 7 rest 2 @@ -502,7 +502,7 @@ Music_Route29_branch_f0504: sound_loop 0, Music_Route29_branch_f0504 Music_Route29_Ch4: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE toggle_noise 0 drum_speed 12 rest 2 diff --git a/audio/music/route3.asm b/audio/music/route3.asm index 2f0a86d4d..eb44c3567 100644 --- a/audio/music/route3.asm +++ b/audio/music/route3.asm @@ -6,7 +6,7 @@ Music_Route3: channel 4, Music_Route3_Ch4 Music_Route3_Ch1: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE tempo 160 volume 7, 7 note_type 12, 9, 1 @@ -236,7 +236,7 @@ Music_Route3_branch_ec3bd: sound_ret Music_Route3_Ch2: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 5, -6 duty_cycle 2 vibrato 6, 0, 3 @@ -352,7 +352,7 @@ Music_Route3_branch_ec443: sound_ret Music_Route3_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 6, 0, 3 note_type 12, 1, 3 octave 3 diff --git a/audio/music/route30.asm b/audio/music/route30.asm index 09c6072e0..205bbd4e9 100644 --- a/audio/music/route30.asm +++ b/audio/music/route30.asm @@ -11,7 +11,7 @@ Music_Route30_Ch1: duty_cycle 3 pitch_offset 1 vibrato 16, 1, 5 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 11, 2 octave 3 note D_, 6 @@ -187,7 +187,7 @@ Music_Route30_branch_efc2e: Music_Route30_Ch2: duty_cycle 3 vibrato 18, 3, 6 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 12, 2 octave 3 note G_, 6 diff --git a/audio/music/route36.asm b/audio/music/route36.asm index 8ecae8f30..03523e0ff 100644 --- a/audio/music/route36.asm +++ b/audio/music/route36.asm @@ -11,7 +11,7 @@ Music_Route36_Ch1: duty_cycle 3 pitch_offset 1 vibrato 16, 1, 5 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 11, 3 octave 3 note C_, 4 @@ -98,7 +98,7 @@ Music_Route36_branch_e9517: note A_, 2 octave 4 note D_, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE volume_envelope 9, 5 octave 3 note D_, 6 @@ -158,7 +158,7 @@ Music_Route36_branch_e9517: note B_, 2 note A_, 6 note D_, 6 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE volume_envelope 11, 5 note D#, 2 note E_, 2 @@ -167,7 +167,7 @@ Music_Route36_branch_e9517: Music_Route36_Ch2: duty_cycle 3 vibrato 16, 3, 6 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 12, 2 octave 3 note F_, 2 @@ -231,7 +231,7 @@ Music_Route36_branch_e95ce: note A_, 16 volume_envelope 11, 7 note A_, 16 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE volume_envelope 10, 4 octave 3 note A_, 6 @@ -293,7 +293,7 @@ Music_Route36_branch_e95ce: octave 4 note C_, 8 note C#, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note D_, 6 note A_, 6 note G_, 2 @@ -302,7 +302,7 @@ Music_Route36_branch_e95ce: note D_, 4 volume_envelope 11, 7 note D_, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE volume_envelope 12, 4 octave 3 note F#, 1 diff --git a/audio/music/route37.asm b/audio/music/route37.asm index fa6656fd7..92f6fa102 100644 --- a/audio/music/route37.asm +++ b/audio/music/route37.asm @@ -67,7 +67,7 @@ Music_Route37_branch_ee969: note F#, 4 note E_, 2 note D#, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_Route37_branch_ee9a5: sound_call Music_Route37_branch_ee9da octave 3 @@ -91,7 +91,7 @@ Music_Route37_branch_ee9a5: sound_call Music_Route37_branch_ee9e9 octave 3 note F_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_call Music_Route37_branch_ee9e9 rest 4 sound_call Music_Route37_branch_ee9e9 @@ -287,7 +287,7 @@ Music_Route37_branch_eeab7: sound_ret Music_Route37_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 1, 4 Music_Route37_branch_eeacc: octave 2 @@ -394,7 +394,7 @@ Music_Route37_branch_eeb3c: sound_ret Music_Route37_Ch4: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE toggle_noise 0 Music_Route37_branch_eeb51: drum_speed 12 diff --git a/audio/music/ruinsofalphinterior.asm b/audio/music/ruinsofalphinterior.asm index a1e984bcc..b8a04c3d0 100644 --- a/audio/music/ruinsofalphinterior.asm +++ b/audio/music/ruinsofalphinterior.asm @@ -8,7 +8,7 @@ Music_RuinsOfAlphInterior_Ch1: tempo 224 volume 7, 7 duty_cycle 0 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 4, 4 rest 1 sound_loop 0, Music_RuinsOfAlphInterior_branch_ebdc2 @@ -16,7 +16,7 @@ Music_RuinsOfAlphInterior_Ch1: Music_RuinsOfAlphInterior_Ch2: pitch_offset 2 duty_cycle 0 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 10, 4 Music_RuinsOfAlphInterior_branch_ebdc2: octave 4 diff --git a/audio/music/ruinsofalphradio.asm b/audio/music/ruinsofalphradio.asm index 686bd847b..3ed88bcc6 100644 --- a/audio/music/ruinsofalphradio.asm +++ b/audio/music/ruinsofalphradio.asm @@ -10,7 +10,7 @@ Music_RuinsOfAlphRadio_Ch1: duty_cycle 0 pitch_offset 280 vibrato 0, 15, 0 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_RuinsOfAlphRadio_branch_eede3: note_type 6, 7, 1 sound_call Music_RuinsOfAlphRadio_branch_eee01 @@ -51,7 +51,7 @@ Music_RuinsOfAlphRadio_Ch2: duty_cycle 1 vibrato 1, 14, 0 Music_RuinsOfAlphRadio_branch_eee17: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 6, 8, 1 sound_call Music_RuinsOfAlphRadio_branch_eee01 note_type 12, 10, 1 diff --git a/audio/music/showmearound.asm b/audio/music/showmearound.asm index abad2e83f..50941d309 100644 --- a/audio/music/showmearound.asm +++ b/audio/music/showmearound.asm @@ -8,7 +8,7 @@ Music_ShowMeAround: Music_ShowMeAround_Ch1: tempo 144 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 2 note_type 12, 11, 1 octave 4 @@ -63,7 +63,7 @@ Music_ShowMeAround_branch_edc15: sound_ret Music_ShowMeAround_Ch2: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE duty_cycle 2 note_type 12, 11, 1 octave 5 @@ -179,7 +179,7 @@ Music_ShowMeAround_branch_edc98: sound_ret Music_ShowMeAround_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 16, 2, 2 note_type 6, 2, 5 octave 2 diff --git a/audio/music/sprouttower.asm b/audio/music/sprouttower.asm index 10c2f331d..71f16f8b5 100644 --- a/audio/music/sprouttower.asm +++ b/audio/music/sprouttower.asm @@ -11,7 +11,7 @@ Music_SproutTower_Ch1: duty_cycle 3 pitch_offset 2 vibrato 8, 4, 5 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 10, 3 rest 16 rest 16 @@ -159,7 +159,7 @@ Music_SproutTower_Ch3: note D#, 2 rest 2 note F#, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_SproutTower_branch_f6a3e: rest 4 note C_, 2 @@ -225,20 +225,20 @@ Music_SproutTower_Ch4: rest 4 Music_SproutTower_branch_f6a7f: drum_note 7, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 4, 4 drum_note 7, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 4, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 7, 4 drum_note 7, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 4, 4 drum_note 7, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 4, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 7, 4 sound_loop 0, Music_SproutTower_branch_f6a7f diff --git a/audio/music/ssaqua.asm b/audio/music/ssaqua.asm index 3e73dfd41..dba3ff9c4 100644 --- a/audio/music/ssaqua.asm +++ b/audio/music/ssaqua.asm @@ -8,7 +8,7 @@ Music_SSAqua: Music_SSAqua_Ch1: tempo 117 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE pitch_offset 1 vibrato 18, 3, 3 duty_cycle 2 @@ -250,7 +250,7 @@ Music_SSAqua_branch_eadbc: sound_loop 0, Music_SSAqua_branch_eadbc Music_SSAqua_Ch2: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE duty_cycle 2 vibrato 8, 3, 3 note_type 12, 11, 7 @@ -603,7 +603,7 @@ Music_SSAqua_branch_eb03e: sound_ret Music_SSAqua_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE vibrato 8, 3, 4 note_type 6, 1, 5 octave 2 diff --git a/audio/music/surf.asm b/audio/music/surf.asm index adbebdb02..57ce49222 100644 --- a/audio/music/surf.asm +++ b/audio/music/surf.asm @@ -10,7 +10,7 @@ Music_Surf_Ch1: tempo 108 volume 7, 7 note_type 12, 10, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_Surf_branch_f519e: duty_cycle 2 vibrato 16, 2, 4 @@ -341,7 +341,7 @@ Music_Surf_branch_f52d9: Music_Surf_Ch2: note_type 12, 12, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE duty_cycle 2 vibrato 20, 2, 3 Music_Surf_branch_f5321: @@ -543,7 +543,7 @@ Music_Surf_branch_f5404: sound_ret Music_Surf_Ch3: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note_type 12, 1, 5 vibrato 22, 2, 3 octave 4 diff --git a/audio/music/tintower.asm b/audio/music/tintower.asm index 1c5474c51..be1910b44 100644 --- a/audio/music/tintower.asm +++ b/audio/music/tintower.asm @@ -12,7 +12,7 @@ Music_TinTower_Ch1: pitch_offset 4 vibrato 8, 4, 5 Music_TinTower_branch_f682a: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 10, 5 octave 3 note G_, 4 @@ -101,7 +101,7 @@ Music_TinTower_Ch2: pitch_offset 2 vibrato 24, 4, 4 Music_TinTower_branch_f6893: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE Music_TinTower_branch_f6895: note_type 12, 11, 5 octave 4 @@ -132,7 +132,7 @@ Music_TinTower_branch_f6895: note C_, 4 octave 4 note C_, 8 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE sound_loop 2, Music_TinTower_branch_f6895 volume_envelope 11, 2 octave 3 @@ -153,7 +153,7 @@ Music_TinTower_branch_f6895: volume_envelope 11, 7 note D#, 4 volume_envelope 9, 0 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note G_, 4 octave 4 note C_, 4 @@ -231,7 +231,7 @@ Music_TinTower_branch_f68fb: note C#, 1 rest 7 note D#, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note C_, 1 rest 3 note C_, 1 @@ -240,14 +240,14 @@ Music_TinTower_branch_f68fb: rest 3 note C_, 1 rest 3 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 2 note A#, 2 octave 3 note C_, 2 note C#, 2 note D#, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note C_, 1 rest 3 note C_, 1 @@ -256,36 +256,36 @@ Music_TinTower_branch_f68fb: rest 3 note C_, 1 rest 11 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE sound_loop 0, Music_TinTower_branch_f68fb Music_TinTower_Ch4: toggle_noise 0 drum_speed 12 Music_TinTower_branch_f694c: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 8, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 1 drum_note 8, 1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 8, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 6, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 8, 2 drum_note 8, 2 drum_note 6, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 8, 1 drum_note 8, 1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 6, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 8, 2 drum_note 8, 2 drum_note 6, 2 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 33d4cad53..2cb5e0edd 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -11,7 +11,7 @@ Music_TitleScreen_Ch1: duty_cycle 3 pitch_offset 2 vibrato 16, 1, 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 10, 7 volume_envelope 10, 0 octave 3 @@ -44,10 +44,10 @@ Music_TitleScreen_Ch1: note C_, 6 note E_, 4 note F#, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 4 note G_, 1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 3 note D_, 5 octave 2 @@ -329,25 +329,25 @@ Music_TitleScreen_Ch2: note B_, 2 octave 4 note D_, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE volume_envelope 9, 7 octave 2 note A_, 4 note F_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE volume_envelope 12, 7 octave 4 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE volume_envelope 9, 7 octave 2 note A_, 6 octave 3 note C_, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE volume_envelope 10, 3 octave 4 note D_, 4 @@ -356,20 +356,20 @@ Music_TitleScreen_Ch2: note C_, 2 octave 3 note B_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE volume_envelope 12, 7 octave 3 note G_, 6 note B_, 2 octave 4 note D_, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE volume_envelope 9, 7 octave 2 note A_, 2 note F_, 4 note A_, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note_type 8, 12, 7 octave 4 note C_, 4 @@ -378,11 +378,11 @@ Music_TitleScreen_Ch2: octave 4 note C_, 4 note D_, 12 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 8, 11, 7 octave 2 note A_, 9 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 12, 7 note G_, 1 note A_, 1 @@ -392,26 +392,26 @@ Music_TitleScreen_Ch2: note G_, 4 note_type 12, 4, -3 note A_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note_type 12, 12, 7 octave 3 note G_, 6 note B_, 2 octave 4 note D_, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE volume_envelope 9, 7 octave 2 note A_, 2 note F_, 6 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE volume_envelope 12, 7 octave 4 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE volume_envelope 9, 7 octave 3 note C_, 2 @@ -423,19 +423,19 @@ Music_TitleScreen_Ch2: note F_, 4 note G_, 4 note F_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 3 note G_, 9 note B_, 3 octave 4 note D_, 12 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 8, 10, 7 octave 3 note D_, 4 note C_, 4 note D_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note_type 8, 12, 7 octave 4 note F_, 4 @@ -479,7 +479,7 @@ Music_TitleScreen_Ch2: note C_, 4 note C#, 4 pitch_offset 1 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE sound_call Music_TitleScreen_branch_ebae7 note C#, 4 sound_call Music_TitleScreen_branch_ebae7 @@ -487,7 +487,7 @@ Music_TitleScreen_Ch2: sound_call Music_TitleScreen_branch_ebae7 octave 4 note A_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE pitch_offset 0 note_type 12, 11, 0 octave 3 @@ -578,7 +578,7 @@ Music_TitleScreen_branch_ebaeb: sound_ret Music_TitleScreen_Ch3: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE vibrato 16, 1, 4 pitch_offset 1 note_type 12, 1, 6 @@ -769,7 +769,7 @@ Music_TitleScreen_Ch3: note E_, 4 note D_, 1 rest 1 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note_type 12, 1, 6 pitch_offset 0 octave 4 @@ -828,7 +828,7 @@ Music_TitleScreen_Ch3: note C_, 4 note E_, 2 note F#, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note_type 12, 1, 6 note G_, 16 note F_, 16 @@ -895,7 +895,7 @@ Music_TitleScreen_Ch3: Music_TitleScreen_Ch4: toggle_noise 5 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_speed 12 rest 4 drum_note 1, 2 diff --git a/audio/music/trainervictory.asm b/audio/music/trainervictory.asm index 662a0250b..67f85f258 100644 --- a/audio/music/trainervictory.asm +++ b/audio/music/trainervictory.asm @@ -19,7 +19,7 @@ Music_TrainerVictory_Ch1: note G_, 2 volume_envelope 11, 6 note A_, 12 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_TrainerVictory_branch_ebecd: volume_envelope 7, 2 sound_call Music_TrainerVictory_branch_ebf11 @@ -98,7 +98,7 @@ Music_TrainerVictory_Ch2: note C#, 2 volume_envelope 13, 6 note D_, 12 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_TrainerVictory_branch_ebf30: note_type 8, 8, 2 sound_call Music_TrainerVictory_branch_ebf56 diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm index 690bf740b..4be59e225 100644 --- a/audio/music/unioncave.asm +++ b/audio/music/unioncave.asm @@ -11,7 +11,7 @@ Music_UnionCave_Ch1: duty_cycle 1 pitch_offset 2 vibrato 24, 3, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_UnionCave_branch_f5c7b: note_type 12, 11, 3 Music_UnionCave_branch_f5c7e: @@ -176,7 +176,7 @@ Music_UnionCave_branch_f5d52: Music_UnionCave_Ch3: note_type 12, 1, 6 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_UnionCave_branch_f5d5d: rest 16 sound_loop 7, Music_UnionCave_branch_f5d5d @@ -241,18 +241,18 @@ Music_UnionCave_Ch4: toggle_noise 1 drum_speed 12 Music_UnionCave_branch_f5da9: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 5, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 6, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 9, 4 rest 8 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE drum_note 5, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE drum_note 6, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE drum_note 9, 4 rest 8 sound_loop 0, Music_UnionCave_branch_f5da9 diff --git a/audio/music/vermilioncity.asm b/audio/music/vermilioncity.asm index e22954902..224b26051 100644 --- a/audio/music/vermilioncity.asm +++ b/audio/music/vermilioncity.asm @@ -7,7 +7,7 @@ Music_VermilionCity: db $3 Music_VermilionCity_Ch1: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE tempo 176 volume 7, 7 duty_cycle 2 @@ -139,7 +139,7 @@ Music_VermilionCity_branch_eb70c: sound_ret Music_VermilionCity_Ch2: - stereo_panning 1, 1 + stereo_panning TRUE, TRUE duty_cycle 3 note_type 12, 7, 7 vibrato 16, 2, 3 @@ -222,7 +222,7 @@ Music_VermilionCity_branch_eb77e: sound_ret Music_VermilionCity_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE vibrato 34, 2, 3 note_type 12, 2, 5 octave 2 diff --git a/audio/music/victoryroad.asm b/audio/music/victoryroad.asm index def7271b6..e9edd88e2 100644 --- a/audio/music/victoryroad.asm +++ b/audio/music/victoryroad.asm @@ -8,7 +8,7 @@ Music_VictoryRoad: Music_VictoryRoad_Ch1: tempo 144 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 3 pitch_offset 2 note_type 12, 11, 3 @@ -95,20 +95,20 @@ Music_VictoryRoad_branch_f6cd3: note E_, 8 note_type 12, 12, 7 note D_, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note C#, 4 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE octave 4 note A_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 5 note C_, 8 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE octave 4 note A#, 4 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note F_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note A_, 12 note D_, 1 note F#, 1 @@ -135,7 +135,7 @@ Music_VictoryRoad_branch_f6d1e: sound_ret Music_VictoryRoad_Ch3: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note_type 12, 2, 8 Music_VictoryRoad_branch_f6d31: sound_call Music_VictoryRoad_branch_f6d52 diff --git a/audio/music/violetcity.asm b/audio/music/violetcity.asm index 42710b1f7..a2cd42add 100644 --- a/audio/music/violetcity.asm +++ b/audio/music/violetcity.asm @@ -12,12 +12,12 @@ Music_VioletCity_Ch1: duty_cycle 2 note_type 12, 9, 5 rest 16 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 2 note E_, 1 note G#, 1 note B_, 1 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 3 note D#, 1 note G#, 1 @@ -26,12 +26,12 @@ Music_VioletCity_Ch1: note G#, 2 note F#, 2 note C#, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE octave 2 note D#, 1 note F#, 1 note A#, 1 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 3 note C#, 1 note F#, 1 @@ -83,7 +83,7 @@ Music_VioletCity_branch_f0056: rest 2 note B_, 2 rest 2 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 4 note C#, 2 octave 3 @@ -91,21 +91,21 @@ Music_VioletCity_branch_f0056: note E_, 2 octave 4 note C#, 2 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note C_, 2 octave 3 note G#, 2 note E_, 2 octave 4 note C_, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE octave 3 note B_, 2 rest 2 note B_, 2 rest 2 note A#, 8 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE rest 4 note C#, 2 note E_, 2 @@ -122,11 +122,11 @@ Music_VioletCity_branch_f0056: rest 2 note C#, 2 rest 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE note D#, 8 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note E_, 8 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE note F_, 2 rest 2 note F_, 2 @@ -134,7 +134,7 @@ Music_VioletCity_branch_f0056: note F#, 2 rest 2 note G_, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note G#, 2 note D#, 1 rest 1 @@ -168,7 +168,7 @@ Music_VioletCity_branch_f0056: duty_cycle 2 rest 16 note_type 6, 9, 1 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 3 note E_, 2 octave 2 @@ -176,7 +176,7 @@ Music_VioletCity_branch_f0056: note G#, 2 octave 3 note E_, 2 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE octave 2 note B_, 2 note G#, 2 @@ -184,7 +184,7 @@ Music_VioletCity_branch_f0056: octave 3 note E_, 2 volume_envelope 10, 4 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE note D#, 8 rest 8 duty_cycle 3 diff --git a/audio/music/viridiancity.asm b/audio/music/viridiancity.asm index cd3d0612a..89d209ca0 100644 --- a/audio/music/viridiancity.asm +++ b/audio/music/viridiancity.asm @@ -8,7 +8,7 @@ Music_ViridianCity: Music_ViridianCity_Ch1: tempo 157 volume 7, 7 - stereo_panning 0, 1 + stereo_panning FALSE, TRUE duty_cycle 2 vibrato 18, 3, 4 note_type 12, 10, 7 @@ -275,7 +275,7 @@ Music_ViridianCity_Ch2: vibrato 16, 4, 6 duty_cycle 1 note_type 12, 11, 7 - stereo_panning 1, 0 + stereo_panning TRUE, FALSE octave 2 note D_, 4 rest 2 @@ -509,7 +509,7 @@ Music_ViridianCity_branch_f4215: Music_ViridianCity_Ch3: vibrato 18, 2, 4 note_type 12, 1, 3 - stereo_panning 1, 1 + stereo_panning TRUE, TRUE octave 4 note A_, 1 rest 3 diff --git a/audio/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm index 38da4cd9f..1e2c13dc1 100644 --- a/audio/music/wildpokemonvictory.asm +++ b/audio/music/wildpokemonvictory.asm @@ -18,7 +18,7 @@ Music_WildPokemonVictory_Ch1: volume_envelope 11, 6 note E_, 12 Music_SuccessfulCapture_branch_f4536: - stereo_panning 0, 1 + stereo_panning FALSE, TRUE Music_WildPokemonVictory_branch_f4538: sound_call Music_WildPokemonVictory_branch_f455c note F#, 2 @@ -80,7 +80,7 @@ Music_WildPokemonVictory_Ch2: volume_envelope 13, 6 note B_, 12 Music_SuccessfulCapture_branch_f4585: - stereo_panning 1, 0 + stereo_panning TRUE, FALSE Music_WildPokemonVictory_branch_f4587: sound_call Music_WildPokemonVictory_branch_f45b5 octave 4 diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index afbd2ef13..6df7a0543 100644 --- a/macros/scripts/audio.asm +++ b/macros/scripts/audio.asm @@ -23,9 +23,9 @@ ENDM square_note: MACRO db \1 ; length IF \3 < 0 - db (\2 << 4) | (%1000 | (\3 * -1)) ; volume envelope + dn \2, %1000 | (\3 * -1) ; volume envelope ELSE - db (\2 << 4) | \3 ; volume envelope + dn \2, \3 ; volume envelope ENDC dw \4 ; frequency ENDM @@ -33,9 +33,9 @@ ENDM noise_note: MACRO db \1 ; length IF \3 < 0 - db (\2 << 4) | (%1000 | (\3 * -1)) ; volume envelope + dn \2, %1000 | (\3 * -1) ; volume envelope ELSE - db (\2 << 4) | \3 ; volume envelope + dn \2, \3 ; volume envelope ENDC db \4 ; frequency ENDM @@ -57,9 +57,9 @@ note_type: MACRO db \1 ; note length IF _NARG >= 2 IF \3 < 0 - db (\2 << 4) | (%1000 | (\3 * -1)) ; volume envelope + dn \2, %1000 | (\3 * -1) ; volume envelope ELSE - db (\2 << 4) | \3 ; volume envelope + dn \2, \3 ; volume envelope ENDC ENDC ENDM @@ -91,9 +91,9 @@ ENDM volume_envelope: MACRO db volume_envelope_cmd IF \2 < 0 - db (\1 << 4) | (%1000 | (\2 * -1)) ; volume envelope + dn \1, %1000 | (\2 * -1) ; volume envelope ELSE - db (\1 << 4) | \2 ; volume envelope + dn \1, \2 ; volume envelope ENDC ENDM @@ -101,9 +101,9 @@ ENDM pitch_sweep: MACRO db pitch_sweep_cmd IF \2 < 0 - db (\1 << 4) | (%1000 | (\2 * -1)) ; pitch sweep + dn \1, %1000 | (\2 * -1) ; pitch sweep ELSE - db (\1 << 4) | \2 ; pitch sweep + dn \1, \2 ; pitch sweep ENDC ENDM @@ -152,7 +152,7 @@ ENDM enum force_stereo_panning_cmd ; $e4 force_stereo_panning: MACRO db force_stereo_panning_cmd - dn %\1\1\1\1, %\2\2\2\2 ; left enable, right enable + dn %1111 * \1, %1111 * \2 ; left enable, right enable ENDM enum volume_cmd ; $e5 @@ -221,7 +221,7 @@ ENDM enum stereo_panning_cmd ; $ef stereo_panning: MACRO db stereo_panning_cmd - dn %\1\1\1\1, %\2\2\2\2 ; left enable, right enable + dn %1111 * \1, %1111 * \2 ; left enable, right enable ENDM enum sfx_toggle_noise_cmd ; $f0 |