Improve music command names

2026-02-06 15:45:24 +13:00 · 2014-06-09 13:22:35 -04:00 · 2014-06-09 13:22:35 -04:00 · 0c7ed80e8f
commit 0c7ed80e8f
parent 32de1b2694
67 changed files with 321 additions and 318 deletions
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@ -1,6 +1,6 @@
 Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 12, 11, 5
@ -47,7 +47,7 @@ Music_BikeRiding_branch_7dbc9::
 	note D_, 2
 	note E_, 2
 	note F_, 6
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	note E_, 2
 	note D_, 2
@ -56,7 +56,7 @@ Music_BikeRiding_branch_7dbc9::
 	note F_, 2
 	note E_, 1
 	note F_, 1
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	note G_, 6
 	note G_, 6
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@ -1,8 +1,8 @@
 Music_Celadon_Ch1:: ; b6c7 (2:76c7)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	notetype 12, 2, 15
 	rest 8
 	octave 3
--- a/audio/music/cinnabar.asm
+++ b/audio/music/cinnabar.asm
@ -1,9 +1,9 @@
 Music_Cinnabar_Ch1:: ; b86d (2:786d)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
 	vibrato 12, 3, 4
-	togglecall
+	toggleperfectpitch

 Music_Cinnabar_branch_b878::
 	notetype 12, 11, 5
--- a/audio/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
@ -1,6 +1,6 @@
 Music_CinnabarMansion_Ch1:: ; 7ed0f (1f:6d0f)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	vibrato 11, 2, 5
 	duty 2

@ -40,7 +40,7 @@ Music_CinnabarMansion_branch_7ed19::

 Music_CinnabarMansion_Ch2:: ; 7ed40 (1f:6d40)
 	duty 2
-	togglecall
+	toggleperfectpitch
 	vibrato 10, 2, 4
 	notetype 12, 12, 2

--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@ -1,12 +1,12 @@
 Music_Cities1_branch_aa6f::
-	tempo 0, 232
+	tempo 232
 	loopchannel 0, Music_Cities1_branch_aa79

 Music_Cities1_Ch1:: ; aa76 (2:6a76)
-	tempo 0, 144
+	tempo 144

 Music_Cities1_branch_aa79::
-	stereopanning 119
+	volume 7, 7
 	vibrato 8, 2, 4
 	duty 3

@ -403,7 +403,7 @@ Music_Cities1_branch_ac00::

 Music_Cities1_Ch3:: ; ac32 (2:6c32)
 	notetype 12, 1, 1
-	togglecall
+	toggleperfectpitch

 Music_Cities1_branch_ac35::
 	vibrato 0, 0, 0
--- a/audio/music/cities2.asm
+++ b/audio/music/cities2.asm
@ -1,9 +1,9 @@
 Music_Cities2_Ch1:: ; b504 (2:7504)
-	tempo 0, 148
-	stereopanning 119
+	tempo 148
+	volume 7, 7
 	duty 3
 	vibrato 8, 3, 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 6
 	rest 8
 	octave 3
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@ -1,9 +1,9 @@
 Music_Credits_Ch1:: ; 7fc1f (1f:7c1f)
-	tempo 0, 140
-	stereopanning 119
+	tempo 140
+	volume 7, 7
 	duty 3
 	vibrato 8, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 4
 	note E_, 6
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@ -1,10 +1,10 @@
 Music_DefeatedGymLeader_Ch1:: ; 23cad (8:7cad)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
 	vibrato 18, 3, 1
-	togglecall
-	tempo 0, 112
+	toggleperfectpitch
+	tempo 112
 	notetype 12, 10, 6
 	octave 4
 	note D_, 6
--- a/audio/music/defeatedtrainer.asm
+++ b/audio/music/defeatedtrainer.asm
@ -1,13 +1,13 @@
 Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53)
-	tempo 0, 224
-	stereopanning 119
+	tempo 224
+	volume 7, 7
 	duty 2
-	togglecall
-	tempo 0, 224
+	toggleperfectpitch
+	tempo 224
 	notetype 4, 10, 2
 	octave 4
 	note D_, 2
-	tempo 0, 224
+	tempo 224
 	notetype 4, 10, 2
 	note D_, 2
 	note D_, 2
@ -19,7 +19,7 @@ Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53)
 	notetype 4, 11, 3
 	note F#, 12
 	duty 1
-	tempo 0, 224
+	tempo 224

 Music_DefeatedTrainer_branch_23a76::
 	notetype 4, 6, 3
--- a/audio/music/defeatedwildmon.asm
+++ b/audio/music/defeatedwildmon.asm
@ -1,11 +1,11 @@
 Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	executemusic
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
-	tempo 0, 112
+	toggleperfectpitch
+	tempo 112
 	notetype 12, 11, 7
 	octave 3
 	note B_, 1
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@ -1,15 +1,15 @@
 Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	vibrato 10, 1, 4
 	notetype 12, 4, 13
 	rest 8
-	unknownmusic0xee 237
+	stereopanning 237
 	octave 4
 	note F#, 8
-	unknownmusic0xee 255
+	stereopanning 255

 Music_Dungeon1_branch_7dee5::
 	notetype 12, 11, 2
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@ -1,8 +1,8 @@
 Music_Dungeon2_Ch1:: ; 7e887 (1f:6887)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	vibrato 10, 1, 4

 Music_Dungeon2_branch_7e892::
--- a/audio/music/dungeon3.asm
+++ b/audio/music/dungeon3.asm
@ -1,8 +1,8 @@
 Music_Dungeon3_Ch1:: ; 7e9f1 (1f:69f1)
-	tempo 0, 160
-	stereopanning 119
+	tempo 160
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	vibrato 8, 1, 4

 Music_Dungeon3_branch_7e9fc::
@ -243,7 +243,7 @@ Music_Dungeon3_branch_7eaf7::
 	endchannel

 Music_Dungeon3_branch_7eafc::
-	tempo 0, 168
+	tempo 168
 	octave 1
 	note A#, 1
 	note B_, 1
@ -254,7 +254,7 @@ Music_Dungeon3_branch_7eafc::
 	note D#, 1
 	note E_, 1
 	note F_, 1
-	tempo 0, 176
+	tempo 176
 	octave 1
 	note A#, 1
 	note B_, 1
@ -265,7 +265,7 @@ Music_Dungeon3_branch_7eafc::
 	note D#, 1
 	note E_, 1
 	note F_, 1
-	tempo 0, 184
+	tempo 184
 	octave 1
 	note A#, 1
 	note B_, 1
@ -276,7 +276,7 @@ Music_Dungeon3_branch_7eafc::
 	note D#, 1
 	note E_, 1
 	note F_, 1
-	tempo 0, 192
+	tempo 192
 	octave 1
 	note A_, 1
 	note A#, 1
@ -287,7 +287,7 @@ Music_Dungeon3_branch_7eafc::
 	note D_, 1
 	note D#, 1
 	note E_, 1
-	tempo 0, 200
+	tempo 200
 	octave 1
 	note G#, 1
 	note A_, 1
@ -298,7 +298,7 @@ Music_Dungeon3_branch_7eafc::
 	note C#, 1
 	note D_, 1
 	note D#, 1
-	tempo 0, 208
+	tempo 208
 	octave 1
 	note G_, 1
 	note G#, 1
@ -309,7 +309,7 @@ Music_Dungeon3_branch_7eafc::
 	note C_, 1
 	note C#, 1
 	note D_, 1
-	tempo 0, 216
+	tempo 216
 	octave 1
 	note F#, 1
 	note G_, 1
@ -320,7 +320,7 @@ Music_Dungeon3_branch_7eafc::
 	octave 2
 	note C_, 1
 	note C#, 1
-	tempo 0, 224
+	tempo 224
 	octave 1
 	note F_, 1
 	note F#, 1
@ -331,7 +331,7 @@ Music_Dungeon3_branch_7eafc::
 	note B_, 1
 	octave 2
 	note C_, 1
-	tempo 0, 160
+	tempo 160
 	endchannel


--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@ -1,9 +1,9 @@
 Music_FinalBattle_Ch1:: ; 233a6 (8:73a6)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 3
 	note F#, 1
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@ -1,9 +1,9 @@
 Music_GameCorner_Ch1:: ; 7e20b (1f:620b)
-	tempo 0, 120
-	stereopanning 119
+	tempo 120
+	volume 7, 7
 	duty 3
 	vibrato 12, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
 	note A_, 6
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@ -1,9 +1,9 @@
 Music_Gym_Ch1:: ; bcbb (2:7cbb)
-	tempo 0, 138
-	stereopanning 119
+	tempo 138
+	volume 7, 7
 	duty 3
 	vibrato 8, 2, 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
 	note G_, 6
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@ -1,9 +1,9 @@
 Music_GymLeaderBattle_Ch1:: ; 22370 (8:6370)
-	tempo 0, 104
-	stereopanning 119
+	tempo 104
+	volume 7, 7
 	duty 3
 	vibrato 8, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	rest 6
 	octave 3
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@ -1,9 +1,9 @@
 Music_HallOfFame_Ch1:: ; 7fbaf (1f:7baf)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
 	vibrato 12, 2, 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	rest 16
 	rest 16
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@ -1,9 +1,9 @@
 Music_IndigoPlateau_Ch1:: ; a5f0 (2:65f0)
-	tempo 0, 132
-	stereopanning 119
+	tempo 132
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 2
 	note A_, 8
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@ -1,9 +1,9 @@
 Music_IntroBattle_Ch1:: ; 7f844 (1f:7844)
-	tempo 0, 98
-	stereopanning 119
+	tempo 98
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 1
 	rest 8
 	octave 2
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@ -1,10 +1,10 @@
 Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	vibrato 8, 2, 4
 	duty 2
 	dutycycle 165
-	togglecall
+	toggleperfectpitch
 	notetype 13, 6, 7
 	octave 4
 	note E_, 8
--- a/audio/music/lavender.asm
+++ b/audio/music/lavender.asm
@ -1,8 +1,8 @@
 Music_Lavender_Ch1:: ; bb58 (2:7b58)
-	tempo 0, 152
-	stereopanning 119
+	tempo 152
+	volume 7, 7
 	duty 1
-	togglecall
+	toggleperfectpitch
 	vibrato 0, 8, 8
 	notetype 12, 8, 7
 	rest 16
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@ -1,8 +1,8 @@
 Music_MeetEvilTrainer_Ch1:: ; 7f69d (1f:769d)
-	tempo 0, 124
-	stereopanning 119
+	tempo 124
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 1
 	rest 4
 	octave 3
--- a/audio/music/meetfemaletrainer.asm
+++ b/audio/music/meetfemaletrainer.asm
@ -1,8 +1,8 @@
 Music_MeetFemaleTrainer_Ch1:: ; 7f6f9 (1f:76f9)
-	tempo 0, 124
-	stereopanning 119
+	tempo 124
+	volume 7, 7
 	duty 1
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 3
 	note G#, 6
--- a/audio/music/meetmaletrainer.asm
+++ b/audio/music/meetmaletrainer.asm
@ -1,9 +1,9 @@
 Music_MeetMaleTrainer_Ch1:: ; 7f77b (1f:777b)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
 	vibrato 20, 3, 3
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 4
 	octave 3
 	note C#, 1
--- a/audio/music/meetprofoak.asm
+++ b/audio/music/meetprofoak.asm
@ -1,8 +1,8 @@
 Music_MeetProfOak_Ch1:: ; af59 (2:6f59)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 4
 	octave 3
 	note F#, 1
--- a/audio/music/meetrival.asm
+++ b/audio/music/meetrival.asm
@ -1,15 +1,15 @@
 Music_MeetRival_branch_b119::
-	tempo 0, 100
+	tempo 100
 	loopchannel 0, Music_MeetRival_branch_b123

 Music_MeetRival_Ch1:: ; b120 (2:7120)
-	tempo 0, 112
+	tempo 112

 Music_MeetRival_branch_b123::
-	stereopanning 119
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 4
 	note D_, 1
@ -120,17 +120,17 @@ Music_MeetRival_branch_b140::
 	loopchannel 0, Music_MeetRival_branch_b140

 Music_MeetRival_branch_b19b::
-	tempo 0, 100
+	tempo 100
 	loopchannel 0, Music_MeetRival_branch_b1a5

 Music_MeetRival_branch_b1a2::
-	tempo 0, 112
+	tempo 112

 Music_MeetRival_branch_b1a5::
-	stereopanning 119
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 3
 	note D_, 1
--- a/audio/music/museumguy.asm
+++ b/audio/music/museumguy.asm
@ -1,8 +1,8 @@
 Music_MuseumGuy_Ch1:: ; adae (2:6dae)
-	tempo 0, 128
-	stereopanning 119
+	tempo 128
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 1
 	octave 3
 	note B_, 2
--- a/audio/music/oakslab.asm
+++ b/audio/music/oakslab.asm
@ -1,9 +1,9 @@
 Music_OaksLab_Ch1:: ; 7eeb9 (1f:6eb9)
-	tempo 0, 140
-	stereopanning 119
+	tempo 140
+	volume 7, 7
 	duty 3
 	vibrato 16, 1, 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 2
 	note B_, 1
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@ -1,6 +1,6 @@
 Music_PalletTown_Ch1:: ; a7c5 (2:67c5)
-	tempo 0, 160
-	stereopanning 119
+	tempo 160
+	volume 7, 7
 	duty 2
 	notetype 12, 12, 3

--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@ -1,8 +1,8 @@
 Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 8, 1
 	rest 2
 	pitchbend 0, 75
--- a/audio/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
@ -1,9 +1,9 @@
 Music_Pokecenter_Ch1:: ; be56 (2:7e56)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
 	vibrato 10, 2, 2
-	togglecall
+	toggleperfectpitch

 Music_Pokecenter_branch_be61::
 	notetype 12, 10, 3
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@ -1,8 +1,8 @@
 Music_PokemonTower_Ch1:: ; 7f04a (1f:704a)
-	tempo 0, 152
-	stereopanning 119
+	tempo 152
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	vibrato 12, 2, 3
 	notetype 12, 8, 0
 	rest 4
--- a/audio/music/routes1.asm
+++ b/audio/music/routes1.asm
@ -1,9 +1,9 @@
 Music_Routes1_Ch1:: ; 9bde (2:5bde)
-	tempo 0, 152
-	stereopanning 119
+	tempo 152
+	volume 7, 7
 	vibrato 4, 2, 3
 	duty 2
-	togglecall
+	toggleperfectpitch

 Music_Routes1_branch_9be9::
 	notetype 12, 10, 1
--- a/audio/music/routes2.asm
+++ b/audio/music/routes2.asm
@ -1,6 +1,6 @@
 Music_Routes2_Ch1:: ; 9db9 (2:5db9)
-	tempo 0, 152
-	stereopanning 119
+	tempo 152
+	volume 7, 7
 	vibrato 9, 2, 5
 	duty 1

--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@ -1,9 +1,9 @@
 Music_Routes3_Ch1:: ; 9fad (2:5fad)
-	tempo 0, 148
-	stereopanning 119
+	tempo 148
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
 	note E_, 1
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@ -1,9 +1,9 @@
 Music_Routes4_Ch1:: ; a26a (2:626a)
-	tempo 0, 148
-	stereopanning 119
+	tempo 148
+	volume 7, 7
 	duty 3
 	vibrato 10, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 10, 2
 	octave 2
 	note G#, 4
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@ -1,8 +1,8 @@
 Music_SafariZone_Ch1:: ; bc2e (2:7c2e)
-	tempo 0, 132
-	stereopanning 119
+	tempo 132
+	volume 7, 7
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	duty 2
 	notetype 12, 9, 2
 	octave 3
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@ -1,8 +1,8 @@
 Music_SilphCo_Ch1:: ; 7f243 (1f:7243)
-	tempo 0, 160
-	stereopanning 119
+	tempo 160
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	vibrato 8, 2, 2
 	notetype 6, 11, 3
 	octave 2
@ -129,7 +129,7 @@ Music_SilphCo_branch_7f26d::
 	notetype 6, 11, 0
 	octave 3
 	note E_, 8
-	tempo 0, 124
+	tempo 124
 	notetype 6, 11, 3
 	octave 2
 	note B_, 2
@ -320,29 +320,29 @@ Music_SilphCo_branch_7f26d::
 	note D_, 11
 	rest 4
 	rest 4
-	tempo 0, 128
+	tempo 128
 	rest 4
 	rest 4
-	tempo 0, 136
+	tempo 136
 	rest 4
 	rest 4
-	tempo 0, 144
+	tempo 144
 	rest 4
 	rest 4
-	tempo 0, 160
+	tempo 160
 	rest 4
 	rest 4
-	tempo 0, 192
+	tempo 192
 	rest 4
 	rest 4
-	tempo 1, 32
+	tempo 288
 	rest 4
 	rest 4
-	tempo 1, 160
+	tempo 416
 	rest 4
-	tempo 4, 0
+	tempo 1024
 	rest 4
-	tempo 0, 160
+	tempo 160
 	rest 4
 	notetype 6, 4, 3
 	octave 2
--- a/audio/music/ssanne.asm
+++ b/audio/music/ssanne.asm
@ -1,9 +1,9 @@
 Music_SSAnne_Ch1:: ; b3a7 (2:73a7)
-	tempo 0, 128
-	stereopanning 119
+	tempo 128
+	volume 7, 7
 	duty 1
 	vibrato 8, 3, 4
-	togglecall
+	toggleperfectpitch

 Music_SSAnne_branch_b3b2::
 	notetype 12, 10, 4
--- a/audio/music/surfing.asm
+++ b/audio/music/surfing.asm
@ -1,9 +1,9 @@
 Music_Surfing_Ch1:: ; 7fa19 (1f:7a19)
-	tempo 0, 160
-	stereopanning 119
+	tempo 160
+	volume 7, 7
 	duty 3
 	vibrato 12, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	rest 6
 	octave 2
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@ -1,6 +1,6 @@
 Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	vibrato 9, 3, 4
 	duty 3
 	notetype 12, 12, 1
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@ -1,9 +1,9 @@
 Music_TrainerBattle_Ch1:: ; 22919 (8:6919)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 2
 	rest 8
 	octave 3
--- a/audio/music/unusedsong.asm
+++ b/audio/music/unusedsong.asm
@ -1,6 +1,6 @@
 Music_UnusedSong_Ch1:: ; a913 (2:6913)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	vibrato 5, 1, 6

 Music_UnusedSong_branch_a91b::
@ -183,9 +183,9 @@ Music_UnusedSong_branch_a91b::


 Music_UnusedSong_Ch2:: ; a9cf (2:69cf)
-	tempo 0, 144
-	stereopanning 119
-	togglecall
+	tempo 144
+	volume 7, 7
+	toggleperfectpitch
 	vibrato 6, 1, 5

 Music_UnusedSong_branch_a9d8::
--- a/audio/music/vermilion.asm
+++ b/audio/music/vermilion.asm
@ -1,9 +1,9 @@
 Music_Vermilion_Ch1:: ; b9eb (2:79eb)
-	tempo 0, 156
-	stereopanning 119
+	tempo 156
+	volume 7, 7
 	duty 3
 	vibrato 12, 3, 4
-	togglecall
+	toggleperfectpitch

 Music_Vermilion_branch_b9f6::
 	notetype 12, 11, 5
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@ -1,9 +1,9 @@
 Music_WildBattle_Ch1:: ; 23099 (8:7099)
-	tempo 0, 104
-	stereopanning 119
+	tempo 104
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 4
 	note C_, 1
--- a/audio/music/yellow/meetjessiejames.asm
+++ b/audio/music/yellow/meetjessiejames.asm
@ -1,6 +1,6 @@
 Music_MeetJessieJames_Ch1: ; 8316d (20:716d)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 12, 11, 2
--- a/audio/music/yellow/surfingpikachu.asm
+++ b/audio/music/yellow/surfingpikachu.asm
@ -1,6 +1,6 @@
 Music_SurfingPikachu_Ch1: ; 82ce8 (20:6ce8)
-	tempo 0, 117
-	stereopanning 119
+	tempo 117
+	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 12, 11, 3
--- a/audio/music/yellow/yellowintro.asm
+++ b/audio/music/yellow/yellowintro.asm
@ -1,6 +1,6 @@
 Music_YellowIntro_Ch1: ; 7f65c (1f:765c)
-	tempo 0, 116
-	stereopanning 119
+	tempo 116
+	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 12, 11, 2
--- a/audio/music/yellow/yellowunusedsong.asm
+++ b/audio/music/yellow/yellowunusedsong.asm
@ -1,6 +1,6 @@
 Music_YellowUnusedSong_Ch1: ; 82fbe (20:6fbe)
-	tempo 0, 140
-	stereopanning 119
+	tempo 140
+	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 8, 11, 2