From a3bfcb1abfa0e041c2f64bc5a757600dfc402911 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sat, 3 Apr 2021 17:45:32 -0500
Subject: [PATCH] Restore toggle_perfect_pitch

---
 crysaudio/macros.asm                      | 6 +-----
 crysaudio/music/RBY/bikeriding.asm        | 3 ++-
 crysaudio/music/RBY/celadon.asm           | 2 +-
 crysaudio/music/RBY/cinnabar.asm          | 2 +-
 crysaudio/music/RBY/cinnabarmansion.asm   | 2 +-
 crysaudio/music/RBY/cities1.asm           | 2 +-
 crysaudio/music/RBY/cities2.asm           | 2 +-
 crysaudio/music/RBY/credits.asm           | 2 +-
 crysaudio/music/RBY/defeatedgymleader.asm | 2 +-
 crysaudio/music/RBY/defeatedtrainer.asm   | 2 +-
 crysaudio/music/RBY/defeatedwildmon.asm   | 2 +-
 crysaudio/music/RBY/dungeon1.asm          | 2 +-
 crysaudio/music/RBY/dungeon2.asm          | 2 +-
 crysaudio/music/RBY/dungeon3.asm          | 2 +-
 crysaudio/music/RBY/finalbattle.asm       | 2 +-
 crysaudio/music/RBY/gamecorner.asm        | 2 +-
 crysaudio/music/RBY/gym.asm               | 2 +-
 crysaudio/music/RBY/gymleaderbattle.asm   | 2 +-
 crysaudio/music/RBY/halloffame.asm        | 2 +-
 crysaudio/music/RBY/indigoplateau.asm     | 2 +-
 crysaudio/music/RBY/introbattle.asm       | 2 +-
 crysaudio/music/RBY/jigglypuffsong.asm    | 2 +-
 crysaudio/music/RBY/lavender.asm          | 2 +-
 crysaudio/music/RBY/meeteviltrainer.asm   | 2 +-
 crysaudio/music/RBY/meetfemaletrainer.asm | 2 +-
 crysaudio/music/RBY/meetmaletrainer.asm   | 2 +-
 crysaudio/music/RBY/meetprofoak.asm       | 2 +-
 crysaudio/music/RBY/meetrival.asm         | 4 ++--
 crysaudio/music/RBY/museumguy.asm         | 2 +-
 crysaudio/music/RBY/oakslab.asm           | 2 +-
 crysaudio/music/RBY/pkmnhealed.asm        | 2 +-
 crysaudio/music/RBY/pokecenter.asm        | 2 +-
 crysaudio/music/RBY/pokemontower.asm      | 2 +-
 crysaudio/music/RBY/routes1.asm           | 2 +-
 crysaudio/music/RBY/routes3.asm           | 2 +-
 crysaudio/music/RBY/routes4.asm           | 2 +-
 crysaudio/music/RBY/safarizone.asm        | 2 +-
 crysaudio/music/RBY/silphco.asm           | 2 +-
 crysaudio/music/RBY/ssanne.asm            | 2 +-
 crysaudio/music/RBY/surfing.asm           | 2 +-
 crysaudio/music/RBY/trainerbattle.asm     | 2 +-
 crysaudio/music/RBY/vermilion.asm         | 2 +-
 crysaudio/music/RBY/wildbattle.asm        | 2 +-
 43 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/crysaudio/macros.asm b/crysaudio/macros.asm
index e41059a1..d42bdb7a 100644
--- a/crysaudio/macros.asm
+++ b/crysaudio/macros.asm
@@ -233,6 +233,7 @@ pitch_offset: MACRO
 	db pitch_offset_cmd
 	bigdw \1 ; pitch offset
 ENDM
+toggle_perfect_pitch EQUS "pitch_offset 1"
 
 	const unknownmusic0xe7_cmd ; $e7
 unknownmusic0xe7: MACRO
@@ -413,8 +414,3 @@ ENDM
 notetype2: MACRO
 	db $f8, \1
 ENDM
-
-
-; not reimplemented yet
-toggle_perfect_pitch: MACRO
-ENDM
diff --git a/crysaudio/music/RBY/bikeriding.asm b/crysaudio/music/RBY/bikeriding.asm
index 93e1a5a4..61de7fb1 100644
--- a/crysaudio/music/RBY/bikeriding.asm
+++ b/crysaudio/music/RBY/bikeriding.asm
@@ -54,7 +54,7 @@ Music_BikeRiding_branch_7dbc9::
 	note D_, 2
 	note E_, 2
 	note F_, 6
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 3
 	note E_, 2
 	note D_, 2
@@ -64,6 +64,7 @@ Music_BikeRiding_branch_7dbc9::
 	note E_, 1
 	note F_, 1
 	;toggle_perfect_pitch
+	pitch_offset 0
 	note_type 12, 11, 5
 	note G_, 6
 	note G_, 6
diff --git a/crysaudio/music/RBY/celadon.asm b/crysaudio/music/RBY/celadon.asm
index bb050e94..858cb46e 100644
--- a/crysaudio/music/RBY/celadon.asm
+++ b/crysaudio/music/RBY/celadon.asm
@@ -8,7 +8,7 @@ Music_Celadon_Ch1::
 	tempo 144
 	volume 7, 7
 	duty_cycle 3
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 2, -7
 	rest 8
 	octave 3
diff --git a/crysaudio/music/RBY/cinnabar.asm b/crysaudio/music/RBY/cinnabar.asm
index 40a13cd9..e8ea9004 100644
--- a/crysaudio/music/RBY/cinnabar.asm
+++ b/crysaudio/music/RBY/cinnabar.asm
@@ -9,7 +9,7 @@ Music_Cinnabar_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 12, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 
 Music_Cinnabar_branch_b878::
 	note_type 12, 11, 5
diff --git a/crysaudio/music/RBY/cinnabarmansion.asm b/crysaudio/music/RBY/cinnabarmansion.asm
index 572d9c84..de76206d 100644
--- a/crysaudio/music/RBY/cinnabarmansion.asm
+++ b/crysaudio/music/RBY/cinnabarmansion.asm
@@ -47,7 +47,7 @@ Music_CinnabarMansion_branch_7ed19::
 
 Music_CinnabarMansion_Ch2::
 	duty_cycle 2
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	vibrato 10, 2, 4
 	note_type 12, 12, 2
 
diff --git a/crysaudio/music/RBY/cities1.asm b/crysaudio/music/RBY/cities1.asm
index a6be6ebd..8ca6e3dc 100644
--- a/crysaudio/music/RBY/cities1.asm
+++ b/crysaudio/music/RBY/cities1.asm
@@ -410,7 +410,7 @@ Music_Cities1_branch_ac00::
 
 Music_Cities1_Ch3::
 	note_type 12, 1, 1
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 
 Music_Cities1_branch_ac35::
 	vibrato 0, 0, 0
diff --git a/crysaudio/music/RBY/cities2.asm b/crysaudio/music/RBY/cities2.asm
index 9063d106..05c71a6f 100644
--- a/crysaudio/music/RBY/cities2.asm
+++ b/crysaudio/music/RBY/cities2.asm
@@ -9,7 +9,7 @@ Music_Cities2_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 8, 3, 2
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 6
 	rest 8
 	octave 3
diff --git a/crysaudio/music/RBY/credits.asm b/crysaudio/music/RBY/credits.asm
index 25a960a5..5abc11a3 100644
--- a/crysaudio/music/RBY/credits.asm
+++ b/crysaudio/music/RBY/credits.asm
@@ -9,7 +9,7 @@ Music_RBYCredits_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 8, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 5
 	octave 4
 	note E_, 6
diff --git a/crysaudio/music/RBY/defeatedgymleader.asm b/crysaudio/music/RBY/defeatedgymleader.asm
index 48a65ad5..159a2d82 100644
--- a/crysaudio/music/RBY/defeatedgymleader.asm
+++ b/crysaudio/music/RBY/defeatedgymleader.asm
@@ -9,7 +9,7 @@ Music_DefeatedGymLeader_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 18, 3, 1
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	tempo 112
 	note_type 12, 10, 6
 	octave 4
diff --git a/crysaudio/music/RBY/defeatedtrainer.asm b/crysaudio/music/RBY/defeatedtrainer.asm
index fbb3994b..0c339e42 100644
--- a/crysaudio/music/RBY/defeatedtrainer.asm
+++ b/crysaudio/music/RBY/defeatedtrainer.asm
@@ -8,7 +8,7 @@ Music_DefeatedTrainer_Ch1::
 	tempo 224
 	volume 7, 7
 	duty_cycle 2
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	tempo 224
 	note_type 4, 10, 2
 	octave 4
diff --git a/crysaudio/music/RBY/defeatedwildmon.asm b/crysaudio/music/RBY/defeatedwildmon.asm
index dee90553..69345d96 100644
--- a/crysaudio/music/RBY/defeatedwildmon.asm
+++ b/crysaudio/music/RBY/defeatedwildmon.asm
@@ -10,7 +10,7 @@ Music_DefeatedWildMon_Ch1::
 	;execute_music
 	duty_cycle 3
 	vibrato 6, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	tempo 112
 	note_type 12, 11, 7
 	octave 3
diff --git a/crysaudio/music/RBY/dungeon1.asm b/crysaudio/music/RBY/dungeon1.asm
index 0e02edde..8d1eb7b8 100644
--- a/crysaudio/music/RBY/dungeon1.asm
+++ b/crysaudio/music/RBY/dungeon1.asm
@@ -9,7 +9,7 @@ Music_Dungeon1_Ch1::
 	tempo 144
 	volume 7, 7
 	duty_cycle 3
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	vibrato 10, 1, 4
 	note_type 12, 4, -5
 	rest 8
diff --git a/crysaudio/music/RBY/dungeon2.asm b/crysaudio/music/RBY/dungeon2.asm
index 51b0dce6..035a26ee 100644
--- a/crysaudio/music/RBY/dungeon2.asm
+++ b/crysaudio/music/RBY/dungeon2.asm
@@ -9,7 +9,7 @@ Music_Dungeon2_Ch1::
 	tempo 144
 	volume 7, 7
 	duty_cycle 3
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	vibrato 10, 1, 4
 
 Music_Dungeon2_branch_7e892::
diff --git a/crysaudio/music/RBY/dungeon3.asm b/crysaudio/music/RBY/dungeon3.asm
index d9b77522..0e7ee4f7 100644
--- a/crysaudio/music/RBY/dungeon3.asm
+++ b/crysaudio/music/RBY/dungeon3.asm
@@ -9,7 +9,7 @@ Music_Dungeon3_Ch1::
 	tempo 160
 	volume 7, 7
 	duty_cycle 3
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	vibrato 8, 1, 4
 
 Music_Dungeon3_branch_7e9fc::
diff --git a/crysaudio/music/RBY/finalbattle.asm b/crysaudio/music/RBY/finalbattle.asm
index 0daac932..805abc89 100644
--- a/crysaudio/music/RBY/finalbattle.asm
+++ b/crysaudio/music/RBY/finalbattle.asm
@@ -9,7 +9,7 @@ Music_FinalBattle_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 6, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 2
 	octave 3
 	note F#, 1
diff --git a/crysaudio/music/RBY/gamecorner.asm b/crysaudio/music/RBY/gamecorner.asm
index f50e11b0..5c755823 100644
--- a/crysaudio/music/RBY/gamecorner.asm
+++ b/crysaudio/music/RBY/gamecorner.asm
@@ -9,7 +9,7 @@ Music_RBYGameCorner_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 12, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 5
 	octave 3
 	note A_, 6
diff --git a/crysaudio/music/RBY/gym.asm b/crysaudio/music/RBY/gym.asm
index 4cc62a6b..2bca11bd 100644
--- a/crysaudio/music/RBY/gym.asm
+++ b/crysaudio/music/RBY/gym.asm
@@ -9,7 +9,7 @@ Music_RBYGym_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 8, 2, 2
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 5
 	octave 3
 	note G_, 6
diff --git a/crysaudio/music/RBY/gymleaderbattle.asm b/crysaudio/music/RBY/gymleaderbattle.asm
index 76742532..a8186cd3 100644
--- a/crysaudio/music/RBY/gymleaderbattle.asm
+++ b/crysaudio/music/RBY/gymleaderbattle.asm
@@ -9,7 +9,7 @@ Music_GymLeaderBattle_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 8, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 3
 	rest 6
 	octave 3
diff --git a/crysaudio/music/RBY/halloffame.asm b/crysaudio/music/RBY/halloffame.asm
index 9707d6bc..199b458b 100644
--- a/crysaudio/music/RBY/halloffame.asm
+++ b/crysaudio/music/RBY/halloffame.asm
@@ -9,7 +9,7 @@ Music_RBYHallOfFame_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 12, 2, 2
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 3
 	rest 16
 	rest 16
diff --git a/crysaudio/music/RBY/indigoplateau.asm b/crysaudio/music/RBY/indigoplateau.asm
index fd79121e..a95d6765 100644
--- a/crysaudio/music/RBY/indigoplateau.asm
+++ b/crysaudio/music/RBY/indigoplateau.asm
@@ -10,7 +10,7 @@ Music_RBYIndigoPlateau_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 6, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 2
 	octave 2
 	note A_, 8
diff --git a/crysaudio/music/RBY/introbattle.asm b/crysaudio/music/RBY/introbattle.asm
index 514e3a4b..403dcd8e 100644
--- a/crysaudio/music/RBY/introbattle.asm
+++ b/crysaudio/music/RBY/introbattle.asm
@@ -10,7 +10,7 @@ Music_IntroBattle_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 6, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 1
 	rest 8
 	octave 2
diff --git a/crysaudio/music/RBY/jigglypuffsong.asm b/crysaudio/music/RBY/jigglypuffsong.asm
index 98a4d6db..668a3d47 100644
--- a/crysaudio/music/RBY/jigglypuffsong.asm
+++ b/crysaudio/music/RBY/jigglypuffsong.asm
@@ -9,7 +9,7 @@ Music_JigglypuffSong_Ch1::
 	vibrato 8, 2, 4
 	duty_cycle 2
 	duty_cycle_pattern 2, 2, 1, 1
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 13, 6, 7
 	octave 4
 	note E_, 8
diff --git a/crysaudio/music/RBY/lavender.asm b/crysaudio/music/RBY/lavender.asm
index 3efe199e..8e21420d 100644
--- a/crysaudio/music/RBY/lavender.asm
+++ b/crysaudio/music/RBY/lavender.asm
@@ -9,7 +9,7 @@ Music_Lavender_Ch1::
 	tempo 152
 	volume 7, 7
 	duty_cycle 1
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	vibrato 0, 8, 8
 	note_type 12, 8, 7
 	rest 16
diff --git a/crysaudio/music/RBY/meeteviltrainer.asm b/crysaudio/music/RBY/meeteviltrainer.asm
index 6925954d..12454863 100644
--- a/crysaudio/music/RBY/meeteviltrainer.asm
+++ b/crysaudio/music/RBY/meeteviltrainer.asm
@@ -8,7 +8,7 @@ Music_MeetEvilTrainer_Ch1::
 	tempo 124
 	volume 7, 7
 	duty_cycle 2
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 1
 	rest 4
 	octave 3
diff --git a/crysaudio/music/RBY/meetfemaletrainer.asm b/crysaudio/music/RBY/meetfemaletrainer.asm
index 8e8459b6..c4c8a10a 100644
--- a/crysaudio/music/RBY/meetfemaletrainer.asm
+++ b/crysaudio/music/RBY/meetfemaletrainer.asm
@@ -8,7 +8,7 @@ Music_MeetFemaleTrainer_Ch1::
 	tempo 124
 	volume 7, 7
 	duty_cycle 1
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 2
 	octave 3
 	note G#, 6
diff --git a/crysaudio/music/RBY/meetmaletrainer.asm b/crysaudio/music/RBY/meetmaletrainer.asm
index a4190068..f27ab410 100644
--- a/crysaudio/music/RBY/meetmaletrainer.asm
+++ b/crysaudio/music/RBY/meetmaletrainer.asm
@@ -9,7 +9,7 @@ Music_MeetMaleTrainer_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 20, 3, 3
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 4
 	octave 3
 	note C#, 1
diff --git a/crysaudio/music/RBY/meetprofoak.asm b/crysaudio/music/RBY/meetprofoak.asm
index 09913ddd..09da5234 100644
--- a/crysaudio/music/RBY/meetprofoak.asm
+++ b/crysaudio/music/RBY/meetprofoak.asm
@@ -8,7 +8,7 @@ Music_MeetProfOak_Ch1::
 	tempo 112
 	volume 7, 7
 	duty_cycle 3
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 4
 	octave 3
 	note F#, 1
diff --git a/crysaudio/music/RBY/meetrival.asm b/crysaudio/music/RBY/meetrival.asm
index f88d593b..b40722e8 100644
--- a/crysaudio/music/RBY/meetrival.asm
+++ b/crysaudio/music/RBY/meetrival.asm
@@ -15,7 +15,7 @@ Music_MeetRival_branch_b123::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 6, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 3
 	octave 4
 	note D_, 1
@@ -136,7 +136,7 @@ Music_MeetRival_branch_b1a5::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 6, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 3
 	octave 3
 	note D_, 1
diff --git a/crysaudio/music/RBY/museumguy.asm b/crysaudio/music/RBY/museumguy.asm
index 5f460ac2..b1f85547 100644
--- a/crysaudio/music/RBY/museumguy.asm
+++ b/crysaudio/music/RBY/museumguy.asm
@@ -9,7 +9,7 @@ Music_MuseumGuy_Ch1::
 	tempo 128
 	volume 7, 7
 	duty_cycle 2
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 1
 	octave 3
 	note B_, 2
diff --git a/crysaudio/music/RBY/oakslab.asm b/crysaudio/music/RBY/oakslab.asm
index c17b9665..b3728a42 100644
--- a/crysaudio/music/RBY/oakslab.asm
+++ b/crysaudio/music/RBY/oakslab.asm
@@ -9,7 +9,7 @@ Music_OaksLab_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 16, 1, 2
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 3
 	octave 2
 	note B_, 1
diff --git a/crysaudio/music/RBY/pkmnhealed.asm b/crysaudio/music/RBY/pkmnhealed.asm
index d9b2d4b0..e28948fb 100644
--- a/crysaudio/music/RBY/pkmnhealed.asm
+++ b/crysaudio/music/RBY/pkmnhealed.asm
@@ -8,7 +8,7 @@ Music_PkmnHealed_Ch1::
 	tempo 144
 	volume 7, 7
 	duty_cycle 2
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 8, 1
 	rest 2
 	pitch_slide 1, 4, B_
diff --git a/crysaudio/music/RBY/pokecenter.asm b/crysaudio/music/RBY/pokecenter.asm
index 57ee3f6a..d6d20d6e 100644
--- a/crysaudio/music/RBY/pokecenter.asm
+++ b/crysaudio/music/RBY/pokecenter.asm
@@ -9,7 +9,7 @@ Music_Pokecenter_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 10, 2, 2
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 
 Music_Pokecenter_branch_be61::
 	note_type 12, 10, 3
diff --git a/crysaudio/music/RBY/pokemontower.asm b/crysaudio/music/RBY/pokemontower.asm
index 1f4a044f..865fc6d2 100644
--- a/crysaudio/music/RBY/pokemontower.asm
+++ b/crysaudio/music/RBY/pokemontower.asm
@@ -8,7 +8,7 @@ Music_PokemonTower_Ch1::
 	tempo 152
 	volume 7, 7
 	duty_cycle 3
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	vibrato 12, 2, 3
 	note_type 12, 8, 0
 	rest 4
diff --git a/crysaudio/music/RBY/routes1.asm b/crysaudio/music/RBY/routes1.asm
index dddea279..2c12d83e 100644
--- a/crysaudio/music/RBY/routes1.asm
+++ b/crysaudio/music/RBY/routes1.asm
@@ -10,7 +10,7 @@ Music_Routes1_Ch1::
 	volume 7, 7
 	vibrato 4, 2, 3
 	duty_cycle 2
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 
 Music_Routes1_branch_9be9::
 	note_type 12, 10, 1
diff --git a/crysaudio/music/RBY/routes3.asm b/crysaudio/music/RBY/routes3.asm
index a538e2d0..62a08f73 100644
--- a/crysaudio/music/RBY/routes3.asm
+++ b/crysaudio/music/RBY/routes3.asm
@@ -10,7 +10,7 @@ Music_Routes3_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 6, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 5
 	octave 3
 	note E_, 1
diff --git a/crysaudio/music/RBY/routes4.asm b/crysaudio/music/RBY/routes4.asm
index bad933c5..ed5b827e 100644
--- a/crysaudio/music/RBY/routes4.asm
+++ b/crysaudio/music/RBY/routes4.asm
@@ -10,7 +10,7 @@ Music_Routes4_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 10, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 10, 2
 	octave 2
 	note G#, 4
diff --git a/crysaudio/music/RBY/safarizone.asm b/crysaudio/music/RBY/safarizone.asm
index 9f4a0ba4..7ad8ff74 100644
--- a/crysaudio/music/RBY/safarizone.asm
+++ b/crysaudio/music/RBY/safarizone.asm
@@ -8,7 +8,7 @@ Music_SafariZone_Ch1::
 	tempo 132
 	volume 7, 7
 	vibrato 6, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	duty_cycle 2
 	note_type 12, 9, 2
 	octave 3
diff --git a/crysaudio/music/RBY/silphco.asm b/crysaudio/music/RBY/silphco.asm
index 984eb19d..2577058c 100644
--- a/crysaudio/music/RBY/silphco.asm
+++ b/crysaudio/music/RBY/silphco.asm
@@ -8,7 +8,7 @@ Music_SilphCo_Ch1::
 	tempo 160
 	volume 7, 7
 	duty_cycle 3
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	vibrato 8, 2, 2
 	note_type 6, 11, 3
 	octave 2
diff --git a/crysaudio/music/RBY/ssanne.asm b/crysaudio/music/RBY/ssanne.asm
index b098cc4d..b0a27225 100644
--- a/crysaudio/music/RBY/ssanne.asm
+++ b/crysaudio/music/RBY/ssanne.asm
@@ -9,7 +9,7 @@ Music_SSAnne_Ch1::
 	volume 7, 7
 	duty_cycle 1
 	vibrato 8, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 
 Music_SSAnne_branch_b3b2::
 	note_type 12, 10, 4
diff --git a/crysaudio/music/RBY/surfing.asm b/crysaudio/music/RBY/surfing.asm
index 05e422ee..1847f876 100644
--- a/crysaudio/music/RBY/surfing.asm
+++ b/crysaudio/music/RBY/surfing.asm
@@ -9,7 +9,7 @@ Music_Surfing_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 12, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 5
 	rest 6
 	octave 2
diff --git a/crysaudio/music/RBY/trainerbattle.asm b/crysaudio/music/RBY/trainerbattle.asm
index 5b177730..c33973b5 100644
--- a/crysaudio/music/RBY/trainerbattle.asm
+++ b/crysaudio/music/RBY/trainerbattle.asm
@@ -9,7 +9,7 @@ Music_TrainerBattle_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 6, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 2
 	rest 8
 	octave 3
diff --git a/crysaudio/music/RBY/vermilion.asm b/crysaudio/music/RBY/vermilion.asm
index c3156806..35ba8c8a 100644
--- a/crysaudio/music/RBY/vermilion.asm
+++ b/crysaudio/music/RBY/vermilion.asm
@@ -10,7 +10,7 @@ Music_Vermilion_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 12, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 
 Music_Vermilion_branch_b9f6::
 	note_type 12, 11, 5
diff --git a/crysaudio/music/RBY/wildbattle.asm b/crysaudio/music/RBY/wildbattle.asm
index 638041df..29d09f6c 100644
--- a/crysaudio/music/RBY/wildbattle.asm
+++ b/crysaudio/music/RBY/wildbattle.asm
@@ -9,7 +9,7 @@ Music_WildBattle_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	vibrato 6, 3, 4
-	;toggle_perfect_pitch
+	toggle_perfect_pitch
 	note_type 12, 11, 3
 	octave 4
 	note C_, 1