Relabel SFX to match constants

3 files changed, 315 insertions, 313 deletions

diff --git a/audio/sfx.asm b/audio/sfx.asm
index 69a972b..cd226c1 100644
--- a/audio/sfx.asm
+++ b/audio/sfx.asm
@@ -2,23 +2,27 @@ INCLUDE "constants.asm"
 
 SECTION "audio/sfx.asm", ROMX
 
-Sfx_01:
+Sfx_00:
 	channel_count 1
-	channel 5, Sfx_01_Ch5
+	channel 5, Sfx_00_Ch5
 
-Sfx_02:
+Sfx_Potion:
 	channel_count 1
-	channel 5, Sfx_02_Ch5
+	channel 5, Sfx_Potion_Ch5
 
-Sfx_03:
+Sfx_FullHeal:
 	channel_count 1
-	channel 5, Sfx_03_Ch5
+	channel 5, Sfx_FullHeal_Ch5
 
-Sfx_04:
+Sfx_Menu:
 	channel_count 1
-	channel 8, Sfx_04_Ch8
+	channel 8, Sfx_Menu_Ch8
 
-Sfx_05:
+Sfx_ReadText:
+	channel_count 1
+	channel 5, Sfx_ReadText_Ch5
+
+Sfx_06:
 	channel_count 1
 	channel 5, Sfx_06_Ch5
 
@@ -34,13 +38,13 @@ Sfx_09:
 	channel_count 1
 	channel 5, Sfx_09_Ch5
 
-Sfx_0a:
+Sfx_BootPC:
 	channel_count 1
-	channel 5, Sfx_0a_Ch5
+	channel 5, Sfx_BootPC_Ch5
 
-Sfx_0b:
+Sfx_EscapeRope:
 	channel_count 1
-	channel 5, Sfx_0b_Ch5
+	channel 5, Sfx_EscapeRope_Ch5
 
 Sfx_0c:
 	channel_count 1
@@ -68,45 +72,46 @@ Sfx_11:
 
 Sfx_12:
 	channel_count 1
-	channel 5, Sfx_12_Ch5
+	channel 8, Sfx_12_Ch8
 
 Sfx_13:
 	channel_count 1
 	channel 8, Sfx_13_Ch8
 
-Sfx_14:
-	channel_count 1
-	channel 8, Sfx_14_Ch8
+Sfx_Wrong:
+	channel_count 2
+	channel 5, Sfx_Wrong_Ch5
+	channel 6, Sfx_Wrong_Ch6
 
 Sfx_15:
-	channel_count 2
+	channel_count 1
 	channel 5, Sfx_15_Ch5
-	channel 6, Sfx_15_Ch6
 
 Sfx_16:
 	channel_count 1
-	channel 5, Sfx_16_Ch5
+	channel 8, Sfx_16_Ch8
 
 Sfx_17:
-	channel_count 1
-	channel 8, Sfx_17_Ch8
+	channel_count 2
+	channel 5, Sfx_17_Ch5
+	channel 6, Sfx_17_Ch6
 
 Sfx_18:
-	channel_count 2
+	channel_count 1
 	channel 5, Sfx_18_Ch5
-	channel 6, Sfx_18_Ch6
 
 Sfx_19:
 	channel_count 1
-	channel 5, Sfx_19_Ch5
+	channel 8, Sfx_19_Ch8
 
 Sfx_1a:
 	channel_count 1
 	channel 8, Sfx_1a_Ch8
 
-Sfx_1b:
-	channel_count 1
-	channel 8, Sfx_1b_Ch8
+Sfx_SwitchPokemon:
+	channel_count 2
+	channel 5, Sfx_SwitchPokemon_Ch5
+	channel 6, Sfx_SwitchPokemon_Ch6
 
 Sfx_1c:
 	channel_count 2
@@ -119,35 +124,35 @@ Sfx_1d:
 	channel 6, Sfx_1d_Ch6
 
 Sfx_1e:
-	channel_count 2
+	channel_count 1
 	channel 5, Sfx_1e_Ch5
-	channel 6, Sfx_1e_Ch6
 
 Sfx_1f:
 	channel_count 1
-	channel 5, Sfx_1f_Ch5
+	channel 8, Sfx_1f_Ch8
 
 Sfx_20:
-	channel_count 1
-	channel 8, Sfx_20_Ch8
-
-Sfx_21:
 	channel_count 2
-	channel 5, Sfx_21_Ch5
-	channel 6, Sfx_21_Ch6
+	channel 5, Sfx_20_Ch5
+	channel 6, Sfx_20_Ch6
+
+Sfx_Pokeflute:
+	channel_count 1
+	channel 7, Sfx_Pokeflute_Ch7
 
 Sfx_22:
 	channel_count 1
-	channel 7, Sfx_22_Ch7
+	channel 5, Sfx_22_Ch5
 
 Sfx_23:
-	channel_count 1
+	channel_count 2
 	channel 5, Sfx_23_Ch5
+	channel 6, Sfx_23_Ch6
 
 Sfx_24:
 	channel_count 2
 	channel 5, Sfx_24_Ch5
-	channel 6, Sfx_24_Ch6
+	channel 8, Sfx_24_Ch8
 
 Sfx_25:
 	channel_count 2
@@ -155,18 +160,17 @@ Sfx_25:
 	channel 8, Sfx_25_Ch8
 
 Sfx_26:
-	channel_count 2
-	channel 5, Sfx_26_Ch5
+	channel_count 1
 	channel 8, Sfx_26_Ch8
 
-Sfx_27:
-	channel_count 1
-	channel 8, Sfx_27_Ch8
+Sfx_PokedexRegistration:
+	channel_count 2
+	channel 5, Sfx_PokedexRegistration_Ch5
+	channel 6, Sfx_PokedexRegistration_Ch6
 
 Sfx_28:
-	channel_count 2
-	channel 5, Sfx_28_Ch5
-	channel 6, Sfx_28_Ch6
+	channel_count 1
+	channel 8, Sfx_28_Ch8
 
 Sfx_29:
 	channel_count 1
@@ -184,34 +188,34 @@ Sfx_2c:
 	channel_count 1
 	channel 8, Sfx_2c_Ch8
 
-Sfx_2d:
+Sfx_TitleEntrance:
 	channel_count 1
-	channel 8, Sfx_2d_Ch8
+	channel 8, Sfx_TitleEntrance_Ch8
 
 Sfx_2e:
 	channel_count 1
-	channel 8, Sfx_2e_Ch8
+	channel 5, Sfx_2e_Ch5
 
 Sfx_2f:
 	channel_count 1
 	channel 5, Sfx_2f_Ch5
 
-Sfx_30:
-	channel_count 1
-	channel 5, Sfx_30_Ch5
-
-Sfx_31:
+Sfx_PayDay:
 	channel_count 2
-	channel 5, Sfx_31_Ch5
-	channel 6, Sfx_31_Ch6
+	channel 5, Sfx_PayDay_Ch5
+	channel 6, Sfx_PayDay_Ch6
+
+Sfx_GameFreakLogoRG:
+	channel_count 1
+	channel 5, Sfx_GameFreakLogoRG_Ch5
 
 Sfx_32:
 	channel_count 1
-	channel 5, Sfx_32_Ch5
+	channel 8, Sfx_32_Ch8
 
 Sfx_33:
 	channel_count 1
-	channel 8, Sfx_33_Ch8
+	channel 5, Sfx_33_Ch5
 
 Sfx_34:
 	channel_count 1
@@ -219,7 +223,7 @@ Sfx_34:
 
 Sfx_35:
 	channel_count 1
-	channel 5, Sfx_35_Ch5
+	channel 8, Sfx_35_Ch8
 
 Sfx_36:
 	channel_count 1
@@ -298,12 +302,12 @@ Sfx_48:
 	channel 8, Sfx_48_Ch8
 
 Sfx_49:
-	channel_count 1
+	channel_count 2
+	channel 5, Sfx_49_Ch5
 	channel 8, Sfx_49_Ch8
 
 Sfx_4a:
-	channel_count 2
-	channel 5, Sfx_4a_Ch5
+	channel_count 1
 	channel 8, Sfx_4a_Ch8
 
 Sfx_4b:
@@ -323,12 +327,12 @@ Sfx_4e:
 	channel 8, Sfx_4e_Ch8
 
 Sfx_4f:
-	channel_count 1
+	channel_count 2
+	channel 5, Sfx_4f_Ch5
 	channel 8, Sfx_4f_Ch8
 
 Sfx_50:
-	channel_count 2
-	channel 5, Sfx_50_Ch5
+	channel_count 1
 	channel 8, Sfx_50_Ch8
 
 Sfx_51:
@@ -336,7 +340,9 @@ Sfx_51:
 	channel 8, Sfx_51_Ch8
 
 Sfx_52:
-	channel_count 1
+	channel_count 3
+	channel 5, Sfx_52_Ch5
+	channel 6, Sfx_52_Ch6
 	channel 8, Sfx_52_Ch8
 
 Sfx_53:
@@ -346,25 +352,25 @@ Sfx_53:
 	channel 8, Sfx_53_Ch8
 
 Sfx_54:
-	channel_count 3
+	channel_count 2
 	channel 5, Sfx_54_Ch5
-	channel 6, Sfx_54_Ch6
 	channel 8, Sfx_54_Ch8
 
 Sfx_55:
-	channel_count 2
+	channel_count 3
 	channel 5, Sfx_55_Ch5
+	channel 6, Sfx_55_Ch6
 	channel 8, Sfx_55_Ch8
 
 Sfx_56:
-	channel_count 3
+	channel_count 2
 	channel 5, Sfx_56_Ch5
-	channel 6, Sfx_56_Ch6
 	channel 8, Sfx_56_Ch8
 
 Sfx_57:
-	channel_count 2
+	channel_count 3
 	channel 5, Sfx_57_Ch5
+	channel 6, Sfx_57_Ch6
 	channel 8, Sfx_57_Ch8
 
 Sfx_58:
@@ -392,10 +398,9 @@ Sfx_5b:
 	channel 8, Sfx_5b_Ch8
 
 Sfx_5c:
-	channel_count 3
+	channel_count 2
 	channel 5, Sfx_5c_Ch5
 	channel 6, Sfx_5c_Ch6
-	channel 8, Sfx_5c_Ch8
 
 Sfx_5d:
 	channel_count 2
@@ -408,91 +413,86 @@ Sfx_5e:
 	channel 6, Sfx_5e_Ch6
 
 Sfx_5f:
-	channel_count 2
+	channel_count 3
 	channel 5, Sfx_5f_Ch5
 	channel 6, Sfx_5f_Ch6
+	channel 8, Sfx_5f_Ch8
 
 Sfx_60:
-	channel_count 3
+	channel_count 2
 	channel 5, Sfx_60_Ch5
 	channel 6, Sfx_60_Ch6
-	channel 8, Sfx_60_Ch8
 
 Sfx_61:
-	channel_count 2
+	channel_count 3
 	channel 5, Sfx_61_Ch5
 	channel 6, Sfx_61_Ch6
+	channel 8, Sfx_61_Ch8
 
 Sfx_62:
-	channel_count 3
-	channel 5, Sfx_62_Ch5
-	channel 6, Sfx_62_Ch6
-	channel 8, Sfx_62_Ch8
-
-Sfx_63:
 	channel_count 1
-	channel 5, Sfx_63_Ch5
+	channel 5, Sfx_62_Ch5
 
-Sfx_64:
+Sfx_GetItemRG:
 	channel_count 3
-	channel 5, Sfx_64_Ch5
-	channel 6, Sfx_64_Ch6
-	channel 8, Sfx_64_Ch8
+	channel 5, Sfx_GetItemRG_Ch5
+	channel 6, Sfx_GetItemRG_Ch6
+	channel 8, Sfx_GetItemRG_Ch8
 
-Sfx_65:
+Sfx_UnusedFanfare1:
 	channel_count 3
-	channel 5, Sfx_65_Ch5
-	channel 6, Sfx_65_Ch6
-	channel 8, Sfx_65_Ch8
+	channel 5, Sfx_UnusedFanfare1_Ch5
+	channel 6, Sfx_UnusedFanfare1_Ch6
+	channel 8, Sfx_UnusedFanfare1_Ch8
 
-Sfx_66:
+Sfx_PokedexEvaluationRG:
 	channel_count 3
-	channel 5, Sfx_66_Ch5
-	channel 6, Sfx_66_Ch6
-	channel 8, Sfx_66_Ch8
+	channel 5, Sfx_PokedexEvaluationRG_Ch5
+	channel 6, Sfx_PokedexEvaluationRG_Ch6
+	channel 8, Sfx_PokedexEvaluationRG_Ch8
 
-Sfx_67:
+Sfx_LevelUpRG:
 	channel_count 3
-	channel 5, Sfx_67_Ch5
-	channel 6, Sfx_67_Ch6
-	channel 8, Sfx_67_Ch8
+	channel 5, Sfx_LevelUpRG_Ch5
+	channel 6, Sfx_LevelUpRG_Ch6
+	channel 8, Sfx_LevelUpRG_Ch8
 
-Sfx_68:
+Sfx_EvolutionCompleteRG:
 	channel_count 3
-	channel 5, Sfx_68_Ch5
-	channel 6, Sfx_68_Ch6
-	channel 8, Sfx_68_Ch8
+	channel 5, Sfx_EvolutionCompleteRG_Ch5
+	channel 6, Sfx_EvolutionCompleteRG_Ch6
+	channel 8, Sfx_EvolutionCompleteRG_Ch8
 
-Sfx_69:
+Sfx_GetKeyItemRG:
 	channel_count 3
-	channel 5, Sfx_69_Ch5
-	channel 6, Sfx_69_Ch6
-	channel 8, Sfx_69_Ch8
+	channel 5, Sfx_GetKeyItemRG_Ch5
+	channel 6, Sfx_GetKeyItemRG_Ch6
+	channel 8, Sfx_GetKeyItemRG_Ch8
 
-Sfx_6a:
+Sfx_UnusedFanfare2:
 	channel_count 3
-	channel 5, Sfx_6a_Ch5
-	channel 6, Sfx_6a_Ch6
-	channel 8, Sfx_6a_Ch8
+	channel 5, Sfx_UnusedFanfare2_Ch5
+	channel 6, Sfx_UnusedFanfare2_Ch6
+	channel 8, Sfx_UnusedFanfare2_Ch8
 
-Sfx_6b:
+Sfx_CaughtPokemonRG:
 	channel_count 3
-	channel 5, Sfx_6b_Ch5
-	channel 6, Sfx_6b_Ch6
-	channel 8, Sfx_6b_Ch8
+	channel 5, Sfx_CaughtPokemonRG_Ch5
+	channel 6, Sfx_CaughtPokemonRG_Ch6
+	channel 8, Sfx_CaughtPokemonRG_Ch8
 
-Sfx_6c:
+Sfx_UnusedFanfare3:
 	channel_count 3
-	channel 5, Sfx_6c_Ch5
-	channel 6, Sfx_6c_Ch6
-	channel 8, Sfx_6c_Ch8
+	channel 5, Sfx_UnusedFanfare3_Ch5
+	channel 6, Sfx_UnusedFanfare3_Ch6
+	channel 8, Sfx_UnusedFanfare3_Ch8
 
-Sfx_04_Ch8:
+Sfx_Menu_Ch8:
 	noise_note 1, 14, 2, 51
 	noise_note 8, 14, 1, 34
 	sound_ret
 
-Sfx_22_Ch7:
+Sfx_Pokeflute_Ch7:
 	tempo 256
 	volume 7, 7
 	toggle_sfx
@@ -517,7 +517,7 @@ Sfx_22_Ch7:
 	rest 12
 	sound_ret
 
-Sfx_1a_Ch8:
+Sfx_19_Ch8:
 	noise_note 2, 15, 7, 36
 	noise_note 2, 15, 7, 52
 	noise_note 4, 15, 7, 68
@@ -525,23 +525,23 @@ Sfx_1a_Ch8:
 	noise_note 8, 15, 1, 68
 	sound_ret
 
-Sfx_1b_Ch8:
+Sfx_1a_Ch8:
 	noise_note 9, 15, 1, 68
 	noise_note 8, 13, 1, 67
 	sound_ret
 
-Sfx_1c_Ch5:
+Sfx_SwitchPokemon_Ch5:
 	duty_cycle 2
 	square_note 8, 14, 1, 1856
 	sound_ret
 
-Sfx_1c_Ch6:
+Sfx_SwitchPokemon_Ch6:
 	duty_cycle 2
 	square_note 2, 0, 8, 0
 	square_note 8, 11, 1, 1857
 	sound_ret
 
-Sfx_01_Ch5:
+Sfx_00_Ch5:
 	duty_cycle 2
 	pitch_sweep 3, -2
 	square_note 4, 15, 2, 512
@@ -550,38 +550,38 @@ Sfx_01_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_1d_Ch5:
+Sfx_1c_Ch5:
 	duty_cycle 2
 	square_note 4, 15, 1, 1920
 	sound_ret
 
-Sfx_1d_Ch6:
+Sfx_1c_Ch6:
 	duty_cycle 2
 	square_note 1, 0, 8, 0
 	square_note 4, 10, 1, 1889
 	sound_ret
 
-Sfx_1e_Ch5:
+Sfx_1d_Ch5:
 	duty_cycle 2
 	square_note 4, 14, 1, 1792
 	square_note 8, 15, 2, 2016
 	sound_ret
 
-Sfx_1e_Ch6:
+Sfx_1d_Ch6:
 	duty_cycle 2
 	square_note 1, 0, 8, 0
 	square_note 4, 9, 1, 1729
 	square_note 8, 10, 2, 1953
 	sound_ret
 
-Sfx_1f_Ch5:
+Sfx_1e_Ch5:
 	duty_cycle 2
 	pitch_sweep 5, -2
 	square_note 15, 15, 1, 768
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_20_Ch8:
+Sfx_1f_Ch8:
 	noise_note 2, 15, 1, 84
 	noise_note 12, 7, 1, 35
 	noise_note 2, 11, 1, 84
@@ -589,7 +589,7 @@ Sfx_20_Ch8:
 	noise_note 6, 4, 1, 84
 	sound_ret
 
-Sfx_06_Ch5:
+Sfx_ReadText_Ch5:
 	duty_cycle 2
 	square_note 0, 9, 1, 1984
 	square_note 0, 8, 1, 2000
@@ -597,7 +597,7 @@ Sfx_06_Ch5:
 	square_note 12, 10, 1, 2000
 	sound_ret
 
-Sfx_21_Ch5:
+Sfx_20_Ch5:
 	duty_cycle 2
 	square_note 2, 15, 4, 1792
 	square_note 2, 14, 4, 1536
@@ -608,7 +608,7 @@ Sfx_21_Ch5:
 	square_note 15, 15, 2, 2016
 	sound_ret
 
-Sfx_21_Ch6:
+Sfx_20_Ch6:
 	duty_cycle 2
 	square_note 2, 0, 8, 0
 	square_note 2, 13, 4, 1793
@@ -620,7 +620,7 @@ Sfx_21_Ch6:
 	square_note 15, 13, 2, 2017
 	sound_ret
 
-Sfx_02_Ch5:
+Sfx_Potion_Ch5:
 	duty_cycle 2
 	pitch_sweep 1, 7
 	square_note 15, 15, 0, 1264
@@ -628,7 +628,7 @@ Sfx_02_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_07_Ch5:
+Sfx_06_Ch5:
 .loop
 	duty_cycle 0
 	pitch_sweep 1, 4
@@ -638,7 +638,7 @@ Sfx_07_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_03_Ch5:
+Sfx_FullHeal_Ch5:
 	duty_cycle 2
 	pitch_sweep 1, 4
 	square_note 4, 15, 2, 1536
@@ -648,7 +648,7 @@ Sfx_03_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_08_Ch5:
+Sfx_07_Ch5:
 	duty_cycle 2
 	pitch_sweep 1, 5
 	square_note 15, 15, 0, 1264
@@ -656,7 +656,7 @@ Sfx_08_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_09_Ch5:
+Sfx_08_Ch5:
 	duty_cycle 2
 	square_note 15, 15, 2, 1984
 	square_note 15, 0, 0, 0
@@ -670,7 +670,7 @@ Sfx_09_Ch5:
 	square_note 8, 10, 1, 1792
 	sound_ret
 
-Sfx_0a_Ch5:
+Sfx_09_Ch5:
 	duty_cycle 2
 	square_note 4, 15, 0, 1536
 	square_note 4, 15, 0, 1024
@@ -678,7 +678,7 @@ Sfx_0a_Ch5:
 	square_note 1, 0, 0, 0
 	sound_ret
 
-Sfx_0b_Ch5:
+Sfx_BootPC_Ch5:
 	duty_cycle 2
 	square_note 6, 15, 0, 1792
 	square_note 4, 0, 0, 0
@@ -686,7 +686,7 @@ Sfx_0b_Ch5:
 	square_note 1, 0, 0, 0
 	sound_ret
 
-Sfx_0c_Ch5:
+Sfx_EscapeRope_Ch5:
 	duty_cycle 1
 	pitch_sweep 1, 7
 	square_note 15, 13, 7, 1536
@@ -697,7 +697,7 @@ Sfx_0c_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_0d_Ch5:
+Sfx_0c_Ch5:
 	duty_cycle 2
 	square_note 4, 0, 0, 0
 	square_note 2, 15, 1, 1664
@@ -706,7 +706,7 @@ Sfx_0d_Ch5:
 	square_note 4, 0, 0, 0
 	sound_ret
 
-Sfx_0e_Ch5:
+Sfx_0d_Ch5:
 	duty_cycle 2
 	pitch_sweep 2, -4
 	square_note 4, 15, 2, 1280
@@ -716,7 +716,7 @@ Sfx_0e_Ch5:
 	square_note 1, 0, 0, 0
 	sound_ret
 
-Sfx_0f_Ch5:
+Sfx_0e_Ch5:
 	duty_cycle 1
 	pitch_sweep 1, 7
 	square_note 15, 13, 7, 1280
@@ -727,7 +727,7 @@ Sfx_0f_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_10_Ch5:
+Sfx_0f_Ch5:
 	duty_cycle 1
 	pitch_sweep 1, 7
 	square_note 15, 13, 7, 1792
@@ -738,28 +738,28 @@ Sfx_10_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_11_Ch5:
+Sfx_10_Ch5:
 	duty_cycle 1
 	pitch_sweep 1, 6
 	square_note 15, 13, 2, 1280
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_12_Ch5:
+Sfx_11_Ch5:
 	duty_cycle 2
 	pitch_sweep 9, 5
 	square_note 15, 15, 2, 1024
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_13_Ch8:
+Sfx_12_Ch8:
 	noise_note 2, 15, 1, 50
 	noise_note 2, 0, 0, 0
 	noise_note 2, 15, 1, 34
 	noise_note 1, 0, 0, 0
 	sound_ret
 
-Sfx_14_Ch8:
+Sfx_13_Ch8:
 	noise_note 2, 15, 1, 18
 	noise_note 2, 0, 0, 0
 	noise_note 2, 10, 1, 18
@@ -778,7 +778,7 @@ Sfx_14_Ch8:
 	noise_note 2, 0, 0, 0
 	sound_ret
 
-Sfx_15_Ch5:
+Sfx_Wrong_Ch5:
 	duty_cycle 3
 	pitch_sweep 5, -2
 	square_note 4, 15, 0, 1280
@@ -788,7 +788,7 @@ Sfx_15_Ch5:
 	square_note 1, 0, 0, 0
 	sound_ret
 
-Sfx_15_Ch6:
+Sfx_Wrong_Ch6:
 	duty_cycle 3
 	square_note 4, 15, 0, 1025
 	square_note 4, 0, 0, 0
@@ -796,14 +796,14 @@ Sfx_15_Ch6:
 	square_note 1, 0, 0, 0
 	sound_ret
 
-Sfx_16_Ch5:
+Sfx_15_Ch5:
 	duty_cycle 0
 	pitch_sweep 1, 7
 	square_note 15, 13, 2, 1792
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_17_Ch8:
+Sfx_16_Ch8:
 	noise_note 4, 10, 2, 35
 	noise_note 8, 15, 1, 52
 	noise_note 15, 0, 0, 0
@@ -814,7 +814,7 @@ Sfx_17_Ch8:
 	noise_note 8, 15, 1, 68
 	sound_ret
 
-Sfx_18_Ch5:
+Sfx_17_Ch5:
 	duty_cycle 2
 	square_note 15, 15, 0, 1280
 	square_note 4, 0, 0, 0
@@ -825,7 +825,7 @@ Sfx_18_Ch5:
 	square_note 15, 15, 2, 1280
 	sound_ret
 
-Sfx_18_Ch6:
+Sfx_17_Ch6:
 	duty_cycle 3
 	square_note 15, 15, 0, 1154
 	square_note 4, 0, 0, 0
@@ -836,7 +836,7 @@ Sfx_18_Ch6:
 	square_note 15, 15, 2, 1154
 	sound_ret
 
-Sfx_19_Ch5:
+Sfx_18_Ch5:
 	duty_cycle 1
 	pitch_sweep 3, -2
 	square_note 4, 15, 2, 1280
@@ -849,7 +849,7 @@ Sfx_19_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_23_Ch5:
+Sfx_22_Ch5:
 	duty_cycle 2
 	square_note 15, 15, 3, 1840
 	square_note 8, 6, 5, 1840
@@ -859,18 +859,18 @@ Sfx_23_Ch5:
 	square_note 15, 2, 4, 1792
 	sound_ret
 
-Sfx_24_Ch5:
+Sfx_23_Ch5:
 	duty_cycle 2
 	pitch_sweep 2, -7
 	square_note 15, 15, 2, 1920
 	sound_ret
 
-Sfx_24_Ch6:
+Sfx_23_Ch6:
 	duty_cycle 2
 	square_note 15, 12, 2, 1922
 	sound_ret
 
-Sfx_63_Ch5:
+Sfx_62_Ch5:
 	duty_cycle 0
 	square_note 0, 13, 2, 1792
 	square_note 0, 13, 2, 1856
@@ -880,29 +880,29 @@ Sfx_63_Ch5:
 	square_note 1, 0, 0, 0
 	sound_ret
 
-Sfx_25_Ch5:
+Sfx_24_Ch5:
 	duty_cycle 2
 	pitch_sweep 1, 6
 	square_note 15, 15, 2, 1024
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_25_Ch8:
+Sfx_24_Ch8:
 	noise_note 15, 10, 2, 34
 	sound_ret
 
-Sfx_26_Ch5:
+Sfx_25_Ch5:
 	square_note 15, 13, 1, 512
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_26_Ch8:
+Sfx_25_Ch8:
 	noise_note 4, 15, 5, 51
 	noise_note 8, 15, 4, 34
 	noise_note 15, 15, 2, 33
 	sound_ret
 
-Sfx_27_Ch8:
+Sfx_26_Ch8:
 	noise_note 2, 6, 1, 35
 	noise_note 2, 10, 1, 51
 	noise_note 2, 12, 1, 51
@@ -916,7 +916,7 @@ Sfx_27_Ch8:
 	noise_note 8, 4, 1, 51
 	sound_ret
 
-Sfx_28_Ch5:
+Sfx_PokedexRegistration_Ch5:
 	duty_cycle 2
 	pitch_sweep 4, 4
 	square_note 15, 15, 0, 1264
@@ -925,76 +925,76 @@ Sfx_28_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_28_Ch6:
+Sfx_PokedexRegistration_Ch6:
 	duty_cycle 2
 	square_note 15, 9, 2, 1536
 	square_note 15, 9, 2, 1922
 	sound_ret
 
-Sfx_33_Ch8:
+Sfx_32_Ch8:
 	noise_note 2, 10, 1, 18
 	sound_ret
 
-Sfx_34_Ch5:
+Sfx_33_Ch5:
 	duty_cycle 1
 	pitch_sweep 10, -7
 	square_note 15, 15, 2, 1920
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_35_Ch5:
+Sfx_34_Ch5:
 	duty_cycle 1
 	pitch_sweep 9, 7
 	square_note 15, 15, 2, 1280
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_36_Ch8:
+Sfx_35_Ch8:
 	noise_note 2, 10, 1, 34
 	sound_ret
 
-Sfx_37_Ch8:
+Sfx_36_Ch8:
 	noise_note 8, 15, 1, 84
 	sound_ret
 
-Sfx_38_Ch8:
+Sfx_37_Ch8:
 	noise_note 15, 8, -7, 17
 	noise_note 4, 15, -7, 18
 	noise_note 10, 15, 1, 85
 	sound_ret
 
-Sfx_39_Ch8:
+Sfx_38_Ch8:
 	noise_note 15, 8, -7, 52
 	noise_note 8, 15, 2, 53
 	noise_note 10, 15, 1, 85
 	sound_ret
 
-Sfx_3a_Ch8:
+Sfx_39_Ch8:
 	noise_note 15, 9, -7, 35
 	noise_note 8, 15, 1, 33
 	sound_ret
 
-Sfx_3b_Ch8:
+Sfx_3a_Ch8:
 	noise_note 2, 14, 1, 75
 	noise_note 10, 15, 1, 68
 	noise_note 2, 14, 1, 58
 	noise_note 6, 15, 1, 52
 	sound_ret
 
-Sfx_3c_Ch8:
+Sfx_3b_Ch8:
 	noise_note 2, 15, 4, 68
 	noise_note 2, 15, 4, 20
 	noise_note 15, 15, 1, 50
 	sound_ret
 
-Sfx_3d_Ch8:
+Sfx_3c_Ch8:
 	noise_note 4, 8, -7, 85
 	noise_note 2, 15, 4, 68
 	noise_note 8, 15, 4, 34
 	noise_note 15, 15, 2, 33
 	sound_ret
 
-Sfx_3e_Ch8:
+Sfx_3d_Ch8:
 .loop
 	noise_note 8, 4, -7, 35
 	noise_note 4, 12, 4, 34
@@ -1002,21 +1002,21 @@ Sfx_3e_Ch8:
 	sound_loop 4, .loop
 	sound_ret
 
-Sfx_3f_Ch8:
+Sfx_3e_Ch8:
 	noise_note 8, 4, -7, 51
 	noise_note 4, 12, 4, 34
 	noise_note 6, 15, 2, 35
 	noise_note 15, 15, 2, 34
 	sound_ret
 
-Sfx_40_Ch8:
+Sfx_3f_Ch8:
 	noise_note 8, 15, -7, 50
 	noise_note 8, 15, 4, 67
 	noise_note 8, 15, 2, 84
 	noise_note 8, 15, 1, 101
 	sound_ret
 
-Sfx_41_Ch8:
+Sfx_40_Ch8:
 	noise_note 1, 12, 2, 51
 	noise_note 2, 15, 2, 33
 	noise_note 1, 14, 2, 51
@@ -1027,52 +1027,52 @@ Sfx_41_Ch8:
 	noise_note 8, 15, 2, 65
 	sound_ret
 
-Sfx_42_Ch8:
+Sfx_41_Ch8:
 	noise_note 1, 9, 4, 35
 	noise_note 1, 11, 4, 34
 	noise_note 8, 15, 1, 68
 	sound_ret
 
-Sfx_43_Ch8:
+Sfx_42_Ch8:
 	noise_note 2, 9, 4, 51
 	noise_note 4, 11, 4, 34
 	noise_note 4, 15, 1, 68
 	noise_note 8, 15, 1, 85
 	sound_ret
 
-Sfx_44_Ch8:
+Sfx_43_Ch8:
 	noise_note 4, 15, -7, 85
 	noise_note 8, 15, 1, 101
 	sound_ret
 
-Sfx_45_Ch8:
+Sfx_44_Ch8:
 	noise_note 2, 8, 4, 67
 	noise_note 2, 12, 4, 34
 	noise_note 8, 15, 2, 52
 	sound_ret
 
-Sfx_46_Ch8:
+Sfx_45_Ch8:
 	noise_note 4, 15, 1, 52
 	noise_note 15, 15, 2, 100
 	sound_ret
 
-Sfx_47_Ch8:
+Sfx_46_Ch8:
 	noise_note 2, 15, 1, 34
 	noise_note 15, 15, 2, 18
 	sound_ret
 
-Sfx_48_Ch8:
+Sfx_47_Ch8:
 	noise_note 2, 12, 2, 1
 	noise_note 15, 15, 4, 1
 	noise_note 15, 15, 2, 1
 	sound_ret
 
-Sfx_49_Ch8:
+Sfx_48_Ch8:
 	noise_note 8, 15, 1, 50
 	noise_note 8, 15, 1, 51
 	sound_ret
 
-Sfx_4a_Ch5:
+Sfx_49_Ch5:
 	duty_cycle 0
 	pitch_sweep 3, -2
 	square_note 4, 15, 2, 512
@@ -1081,26 +1081,26 @@ Sfx_4a_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_4a_Ch8:
+Sfx_49_Ch8:
 	noise_note 0, 13, 1, 66
 	noise_note 4, 10, 1, 50
 	noise_note 0, 13, 1, 34
 	noise_note 6, 10, 1, 50
 	sound_ret
 
-Sfx_4b_Ch8:
+Sfx_4a_Ch8:
 	noise_note 3, 9, 2, 49
 	noise_note 3, 11, 2, 50
 	noise_note 3, 12, 2, 51
 	noise_note 8, 15, 1, 84
 	sound_ret
 
-Sfx_4c_Ch8:
+Sfx_4b_Ch8:
 	noise_note 12, 15, 1, 84
 	noise_note 8, 15, 1, 100
 	sound_ret
 
-Sfx_4d_Ch8:
+Sfx_4c_Ch8:
 	noise_note 2, 15, 1, 51
 	noise_note 2, 12, 1, 50
 	noise_note 2, 10, 1, 49
@@ -1108,12 +1108,12 @@ Sfx_4d_Ch8:
 	noise_note 8, 15, 1, 52
 	sound_ret
 
-Sfx_4e_Ch8:
+Sfx_4d_Ch8:
 	noise_note 2, 13, 2, 50
 	noise_note 15, 15, 2, 67
 	sound_ret
 
-Sfx_4f_Ch8:
+Sfx_4e_Ch8:
 	noise_note 2, 15, 2, 67
 	noise_note 4, 11, 5, 50
 	noise_note 9, 8, 6, 49
@@ -1121,19 +1121,19 @@ Sfx_4f_Ch8:
 	noise_note 15, 15, 2, 85
 	sound_ret
 
-Sfx_50_Ch5:
+Sfx_4f_Ch5:
 	duty_cycle 1
 	pitch_sweep 9, 7
 	square_note 15, 15, 2, 1792
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_50_Ch8:
+Sfx_4f_Ch8:
 	noise_note 15, 3, -7, 34
 	noise_note 15, 15, 2, 33
 	sound_ret
 
-Sfx_51_Ch8:
+Sfx_50_Ch8:
 	noise_note 15, 4, -7, 65
 	noise_note 8, 8, -7, 65
 	noise_note 8, 12, -7, 65
@@ -1141,7 +1141,7 @@ Sfx_51_Ch8:
 	noise_note 15, 15, 2, 65
 	sound_ret
 
-Sfx_52_Ch8:
+Sfx_51_Ch8:
 	noise_note 10, 15, -7, 80
 	noise_note 15, 15, -7, 81
 	noise_note 8, 15, 2, 81
@@ -1151,7 +1151,7 @@ Sfx_52_Ch8:
 	noise_note 15, 15, 2, 84
 	sound_ret
 
-Sfx_53_Ch5:
+Sfx_52_Ch5:
 	duty_cycle 2
 	square_note 15, 3, -7, 1984
 .loop
@@ -1160,7 +1160,7 @@ Sfx_53_Ch5:
 	square_note 15, 13, 1, 1984
 	sound_ret
 
-Sfx_53_Ch6:
+Sfx_52_Ch6:
 	duty_cycle_pattern 2, 3, 0, 3
 	square_note 15, 2, -7, 1992
 .loop
@@ -1169,14 +1169,14 @@ Sfx_53_Ch6:
 	square_note 15, 12, 1, 1992
 	sound_ret
 
-Sfx_53_Ch8:
+Sfx_52_Ch8:
 .loop
 	noise_note 3, 9, 7, 18
 	noise_note 3, 10, 1, 17
 	sound_loop 10, .loop
 	sound_ret
 
-Sfx_54_Ch5:
+Sfx_53_Ch5:
 .loop
 	duty_cycle 0
 	square_note 0, 15, 1, 1984
@@ -1184,7 +1184,7 @@ Sfx_54_Ch5:
 	sound_loop 12, .loop
 	sound_ret
 
-Sfx_54_Ch6:
+Sfx_53_Ch6:
 .loop
 	duty_cycle_pattern 2, 3, 0, 3
 	square_note 0, 14, 1, 1985
@@ -1192,14 +1192,14 @@ Sfx_54_Ch6:
 	sound_loop 12, .loop
 	sound_ret
 
-Sfx_54_Ch8:
+Sfx_53_Ch8:
 .loop
 	noise_note 1, 13, 1, 73
 	noise_note 1, 13, 1, 41
 	sound_loop 6, .loop
 	sound_ret
 
-Sfx_55_Ch5:
+Sfx_54_Ch5:
 .loop
 	duty_cycle_pattern 3, 0, 2, 1
 	square_note 11, 15, 3, 288
@@ -1209,7 +1209,7 @@ Sfx_55_Ch5:
 	square_note 15, 12, 2, 272
 	sound_ret
 
-Sfx_55_Ch8:
+Sfx_54_Ch8:
 .loop
 	noise_note 10, 15, 3, 53
 	noise_note 14, 15, 6, 69
@@ -1219,7 +1219,7 @@ Sfx_55_Ch8:
 	noise_note 15, 15, 4, 172
 	sound_ret
 
-Sfx_56_Ch5:
+Sfx_55_Ch5:
 .loop
 	duty_cycle_pattern 0, 3, 2, 1
 	square_note 4, 15, 4, 1536
@@ -1230,7 +1230,7 @@ Sfx_56_Ch5:
 	square_note 8, 13, 1, 1536
 	sound_ret
 
-Sfx_56_Ch6:
+Sfx_55_Ch6:
 .loop
 	duty_cycle_pattern 2, 0, 3, 1
 	square_note 5, 14, 4, 1504
@@ -1240,7 +1240,7 @@ Sfx_56_Ch6:
 	sound_loop 3, .loop
 	sound_ret
 
-Sfx_56_Ch8:
+Sfx_55_Ch8:
 .loop
 	noise_note 5, 12, 3, 51
 	noise_note 3, 9, 2, 67
@@ -1249,7 +1249,7 @@ Sfx_56_Ch8:
 	sound_loop 2, .loop
 	sound_ret
 
-Sfx_57_Ch5:
+Sfx_56_Ch5:
 .loop
 	duty_cycle_pattern 3, 1, 0, 2
 	square_note 3, 8, 1, 768
@@ -1261,7 +1261,7 @@ Sfx_57_Ch5:
 	square_note 8, 8, 1, 1024
 	sound_ret
 
-Sfx_57_Ch8:
+Sfx_56_Ch8:
 .loop
 	noise_note 3, 6, 2, 34
 	noise_note 3, 10, 2, 50
@@ -1272,7 +1272,7 @@ Sfx_57_Ch8:
 	noise_note 8, 8, 1, 18
 	sound_ret
 
-Sfx_58_Ch5:
+Sfx_57_Ch5:
 .loop
 	duty_cycle_pattern 0, 3, 2, 1
 	square_note 15, 15, 4, 1280
@@ -1281,7 +1281,7 @@ Sfx_58_Ch5:
 	sound_loop 3, .loop
 	sound_ret
 
-Sfx_58_Ch6:
+Sfx_57_Ch6:
 .loop
 	duty_cycle_pattern 2, 0, 3, 1
 	square_note 7, 14, 4, 1072
@@ -1290,7 +1290,7 @@ Sfx_58_Ch6:
 	sound_loop 4, .loop
 	sound_ret
 
-Sfx_58_Ch8:
+Sfx_57_Ch8:
 .loop
 	noise_note 9, 15, 4, 68
 	noise_note 9, 15, 2, 67
@@ -1299,7 +1299,7 @@ Sfx_58_Ch8:
 	sound_loop 3, .loop
 	sound_ret
 
-Sfx_59_Ch5:
+Sfx_58_Ch5:
 .loop
 	duty_cycle_pattern 2, 2, 0, 1
 	square_note 10, 15, 1, 1600
@@ -1309,7 +1309,7 @@ Sfx_59_Ch5:
 	square_note 10, 15, 1, 1600
 	sound_ret
 
-Sfx_59_Ch6:
+Sfx_58_Ch6:
 .loop
 	duty_cycle_pattern 2, 3, 0, 3
 	square_note 10, 15, 3, 1393
@@ -1319,14 +1319,14 @@ Sfx_59_Ch6:
 	square_note 10, 15, 1, 1393
 	sound_ret
 
-Sfx_59_Ch8:
+Sfx_58_Ch8:
 .loop
 	noise_note 2, 13, 1, 74
 	noise_note 2, 13, 2, 42
 	sound_loop 21, .loop
 	sound_ret
 
-Sfx_5a_Ch5:
+Sfx_59_Ch5:
 .loop
 	duty_cycle 0
 	square_note 2, 15, 1, 512
@@ -1336,7 +1336,7 @@ Sfx_5a_Ch5:
 	sound_loop 8, .loop
 	sound_ret
 
-Sfx_5a_Ch6:
+Sfx_59_Ch6:
 .loop
 	duty_cycle_pattern 2, 3, 0, 3
 	square_note 2, 14, 1, 770
@@ -1346,7 +1346,7 @@ Sfx_5a_Ch6:
 	sound_loop 8, .loop
 	sound_ret
 
-Sfx_5a_Ch8:
+Sfx_59_Ch8:
 .loop
 	noise_note 2, 13, 3, 16
 	noise_note 3, 13, 3, 17
@@ -1355,7 +1355,7 @@ Sfx_5a_Ch8:
 	sound_loop 9, .loop
 	sound_ret
 
-Sfx_5b_Ch5:
+Sfx_5a_Ch5:
 .loop
 	duty_cycle_pattern 0, 2, 2, 3
 	square_note 3, 15, 1, 2032
@@ -1363,7 +1363,7 @@ Sfx_5b_Ch5:
 	sound_loop 8, .loop
 	sound_ret
 
-Sfx_5b_Ch6:
+Sfx_5a_Ch6:
 .loop
 	duty_cycle_pattern 2, 3, 0, 3
 	square_note 4, 14, 2, 514
@@ -1371,14 +1371,14 @@ Sfx_5b_Ch6:
 	sound_loop 9, .loop
 	sound_ret
 
-Sfx_5b_Ch8:
+Sfx_5a_Ch8:
 .loop
 	noise_note 4, 15, -7, 67
 	noise_note 4, 15, 2, 68
 	sound_loop 9, .loop
 	sound_ret
 
-Sfx_5c_Ch5:
+Sfx_5b_Ch5:
 	duty_cycle 2
 	pitch_sweep 15, 7
 	square_note 8, 12, 4, 1981
@@ -1390,7 +1390,7 @@ Sfx_5c_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_5c_Ch6:
+Sfx_5b_Ch6:
 	duty_cycle 2
 	square_note 8, 12, 4, 1904
 	square_note 8, 12, 4, 1889
@@ -1400,7 +1400,7 @@ Sfx_5c_Ch6:
 	square_note 15, 15, 2, 1892
 	sound_ret
 
-Sfx_5c_Ch8:
+Sfx_5b_Ch8:
 	noise_note 15, 3, -7, 20
 	noise_note 15, 12, -7, 19
 	noise_note 15, 12, -7, 18
@@ -1409,7 +1409,7 @@ Sfx_5c_Ch8:
 	noise_note 15, 12, 2, 16
 	sound_ret
 
-Sfx_5d_Ch5:
+Sfx_5c_Ch5:
 	duty_cycle 2
 	square_note 15, 15, -7, 2016
 	square_note 15, 15, -7, 2016
@@ -1418,7 +1418,7 @@ Sfx_5d_Ch5:
 	square_note 15, 15, 2, 2016
 	sound_ret
 
-Sfx_5d_Ch6:
+Sfx_5c_Ch6:
 	duty_cycle 3
 	square_note 15, 15, -7, 2018
 	square_note 15, 15, -7, 2017
@@ -1427,19 +1427,19 @@ Sfx_5d_Ch6:
 	square_note 15, 15, 2, 2018
 	sound_ret
 
-Sfx_5e_Ch5:
+Sfx_5d_Ch5:
 	duty_cycle 2
 	pitch_sweep 10, -7
 	square_note 8, 15, 1, 1792
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_5e_Ch6:
+Sfx_5d_Ch6:
 	duty_cycle 3
 	square_note 8, 15, 1, 1793
 	sound_ret
 
-Sfx_5f_Ch5:
+Sfx_5e_Ch5:
 	duty_cycle 2
 	square_note 6, 15, 1, 1280
 	square_note 6, 15, 1, 1408
@@ -1448,7 +1448,7 @@ Sfx_5f_Ch5:
 	square_note 8, 15, 1, 1792
 	sound_ret
 
-Sfx_5f_Ch6:
+Sfx_5e_Ch6:
 	duty_cycle 3
 	square_note 6, 14, 1, 1296
 	square_note 6, 14, 1, 1424
@@ -1457,28 +1457,28 @@ Sfx_5f_Ch6:
 	square_note 8, 14, 1, 1808
 	sound_ret
 
-Sfx_60_Ch5:
+Sfx_5f_Ch5:
 	duty_cycle_pattern 3, 2, 3, 1
 	square_note 8, 15, -7, 1016
 	square_note 15, 15, -7, 1024
 	square_note 15, 15, 3, 1024
 	sound_ret
 
-Sfx_60_Ch6:
+Sfx_5f_Ch6:
 	duty_cycle_pattern 2, 3, 1, 0
 	square_note 8, 14, -7, 960
 	square_note 15, 14, -7, 960
 	square_note 15, 14, 3, 960
 	sound_ret
 
-Sfx_60_Ch8:
+Sfx_5f_Ch8:
 	noise_note 4, 15, -7, 81
 	noise_note 8, 15, -7, 84
 	noise_note 15, 15, -7, 85
 	noise_note 15, 15, 3, 86
 	sound_ret
 
-Sfx_61_Ch5:
+Sfx_60_Ch5:
 	toggle_sfx
 	vibrato 10, 2, 4
 	duty_cycle 2
@@ -1492,7 +1492,7 @@ Sfx_61_Ch5:
 	note G_, 8
 	sound_ret
 
-Sfx_61_Ch6:
+Sfx_60_Ch6:
 	toggle_sfx
 	vibrato 10, 2, 3
 	duty_cycle 2
@@ -1507,7 +1507,7 @@ Sfx_61_Ch6:
 	note G_, 8
 	sound_ret
 
-Sfx_62_Ch5:
+Sfx_61_Ch5:
 	duty_cycle 0
 	square_note 2, 15, 1, 1920
 	square_note 2, 15, 1, 1792
@@ -1527,7 +1527,7 @@ Sfx_62_Ch5:
 	square_note 15, 15, 1, 1792
 	sound_ret
 
-Sfx_62_Ch6:
+Sfx_61_Ch6:
 	duty_cycle_pattern 2, 3, 0, 3
 	square_note 2, 15, 1, 1921
 	square_note 2, 15, 1, 1793
@@ -1547,14 +1547,14 @@ Sfx_62_Ch6:
 	square_note 15, 15, 1, 1793
 	sound_ret
 
-Sfx_62_Ch8:
+Sfx_61_Ch8:
 .loop
 	noise_note 1, 13, 1, 73
 	noise_note 1, 13, 1, 41
 	sound_loop 26, .loop
 	sound_ret
 
-Sfx_29_Ch8:
+Sfx_28_Ch8:
 	noise_note 6, 2, 0, 16
 	noise_note 6, 2, -7, 64
 	noise_note 6, 4, -7, 65
@@ -1565,26 +1565,26 @@ Sfx_29_Ch8:
 	noise_note 15, 15, 2, 67
 	sound_ret
 
-Sfx_2a_Ch8:
+Sfx_29_Ch8:
 	noise_note 4, 13, 1, 65
 	sound_ret
 
-Sfx_2b_Ch8:
+Sfx_2a_Ch8:
 	noise_note 4, 12, 1, 66
 	sound_ret
 
-Sfx_2c_Ch8:
+Sfx_2b_Ch8:
 	noise_note 2, 6, -7, 33
 	noise_note 2, 10, -7, 49
 	noise_note 15, 15, 2, 65
 	sound_ret
 
-Sfx_2d_Ch8:
+Sfx_2c_Ch8:
 	noise_note 2, 13, 2, 50
 	noise_note 15, 15, 2, 67
 	sound_ret
 
-Sfx_2e_Ch8:
+Sfx_TitleEntrance_Ch8:
 	noise_note 8, 3, -4, 32
 	noise_note 6, 10, 0, 32
 	noise_note 8, 11, 0, 33
@@ -1592,34 +1592,34 @@ Sfx_2e_Ch8:
 	noise_note 15, 13, 2, 35
 	sound_ret
 
-Sfx_2f_Ch5:
+Sfx_2e_Ch5:
 	duty_cycle 2
 	square_note 1, 15, 2, 1696
 	square_note 1, 15, 2, 1760
 	square_note 8, 15, 1, 1792
 	sound_ret
 
-Sfx_30_Ch5:
+Sfx_2f_Ch5:
 	duty_cycle 2
 	square_note 2, 15, 1, 1792
 	square_note 8, 8, 1, 2016
 	sound_ret
 
-Sfx_31_Ch5:
+Sfx_PayDay_Ch5:
 	duty_cycle 3
 	square_note 5, 14, 1, 1792
 	square_note 2, 14, 1, 1920
 	square_note 15, 15, 1, 1984
 	sound_ret
 
-Sfx_31_Ch6:
+Sfx_PayDay_Ch6:
 	duty_cycle 2
 	square_note 4, 12, 1, 1729
 	square_note 2, 12, 1, 1857
 	square_note 15, 13, 1, 1921
 	sound_ret
 
-Sfx_32_Ch5:
+Sfx_GameFreakLogoRG_Ch5:
 	duty_cycle 2
 	pitch_sweep 5, -7
 	square_note 4, 4, 0, 2016
@@ -1634,7 +1634,7 @@ Sfx_32_Ch5:
 	pitch_sweep 0, 8
 	sound_ret
 
-Sfx_64_Ch5:
+Sfx_GetItemRG_Ch5:
 	toggle_sfx
 	sfx_priority_on
 	tempo 256
@@ -1653,7 +1653,7 @@ Sfx_64_Ch5:
 	sfx_priority_off
 	sound_ret
 
-Sfx_64_Ch6:
+Sfx_GetItemRG_Ch6:
 	toggle_sfx
 	vibrato 8, 2, 7
 	duty_cycle 2
@@ -1666,7 +1666,7 @@ Sfx_64_Ch6:
 	note B_, 4
 	sound_ret
 
-Sfx_64_Ch8:
+Sfx_GetItemRG_Ch8:
 	toggle_sfx
 	note_type 4, 1, 0
 	octave 4
@@ -1682,7 +1682,7 @@ Sfx_64_Ch8:
 	rest 2
 	sound_ret
 
-Sfx_65_Ch5:
+Sfx_UnusedFanfare1_Ch5:
 	toggle_sfx
 	sfx_priority_on
 	tempo 256
@@ -1702,7 +1702,7 @@ Sfx_65_Ch5:
 	sfx_priority_off
 	sound_ret
 
-Sfx_65_Ch6:
+Sfx_UnusedFanfare1_Ch6:
 	toggle_sfx
 	vibrato 8, 2, 7
 	duty_cycle 2
@@ -1717,7 +1717,7 @@ Sfx_65_Ch6:
 	note B_, 8
 	sound_ret
 
-Sfx_65_Ch8:
+Sfx_UnusedFanfare1_Ch8:
 	toggle_sfx
 	note_type 6, 1, 0
 	octave 4
@@ -1739,7 +1739,7 @@ Sfx_65_Ch8:
 	rest 4
 	sound_ret
 
-Sfx_66_Ch5:
+Sfx_PokedexEvaluationRG_Ch5:
 	toggle_sfx
 	sfx_priority_on
 	tempo 256
@@ -1763,7 +1763,7 @@ Sfx_66_Ch5:
 	sfx_priority_off
 	sound_ret
 
-Sfx_66_Ch6:
+Sfx_PokedexEvaluationRG_Ch6:
 	toggle_sfx
 	duty_cycle 2
 	note_type 5, 12, 2
@@ -1785,7 +1785,7 @@ Sfx_66_Ch6:
 	note F_, 4
 	sound_ret
 
-Sfx_66_Ch8:
+Sfx_PokedexEvaluationRG_Ch8:
 	toggle_sfx
 	note_type 5, 1, 0
 	octave 5
@@ -1817,7 +1817,7 @@ Sfx_66_Ch8:
 	rest 2
 	sound_ret
 
-Sfx_67_Ch5:
+Sfx_LevelUpRG_Ch5:
 	toggle_sfx
 	sfx_priority_on
 	tempo 256
@@ -1840,7 +1840,7 @@ Sfx_67_Ch5:
 	sfx_priority_off
 	sound_ret
 
-Sfx_67_Ch6:
+Sfx_LevelUpRG_Ch6:
 	toggle_sfx
 	vibrato 4, 2, 2
 	duty_cycle 2
@@ -1859,7 +1859,7 @@ Sfx_67_Ch6:
 	note A_, 8
 	sound_ret
 
-Sfx_67_Ch8:
+Sfx_LevelUpRG_Ch8:
 	toggle_sfx
 	note_type 6, 1, 0
 	octave 5
@@ -1881,7 +1881,7 @@ Sfx_67_Ch8:
 	note A_, 8
 	sound_ret
 
-Sfx_68_Ch5:
+Sfx_EvolutionCompleteRG_Ch5:
 	toggle_sfx
 	sfx_priority_on
 	tempo 256
@@ -1909,7 +1909,7 @@ Sfx_68_Ch5:
 	sfx_priority_off
 	sound_ret
 
-Sfx_68_Ch6:
+Sfx_EvolutionCompleteRG_Ch6:
 	toggle_sfx
 	vibrato 8, 2, 7
 	duty_cycle 2
@@ -1929,7 +1929,7 @@ Sfx_68_Ch6:
 	note A_, 8
 	sound_ret
 
-Sfx_68_Ch8:
+Sfx_EvolutionCompleteRG_Ch8:
 	toggle_sfx
 	note_type 5, 1, 0
 	octave 5
@@ -1951,7 +1951,7 @@ Sfx_68_Ch8:
 	note A_, 8
 	sound_ret
 
-Sfx_69_Ch5:
+Sfx_GetKeyItemRG_Ch5:
 	toggle_sfx
 	sfx_priority_on
 	tempo 256
@@ -1977,7 +1977,7 @@ Sfx_69_Ch5:
 	sfx_priority_off
 	sound_ret
 
-Sfx_69_Ch6:
+Sfx_GetKeyItemRG_Ch6:
 	toggle_sfx
 	vibrato 4, 2, 3
 	duty_cycle 2
@@ -2000,7 +2000,7 @@ Sfx_69_Ch6:
 	note D#, 8
 	sound_ret
 
-Sfx_69_Ch8:
+Sfx_GetKeyItemRG_Ch8:
 	toggle_sfx
 	note_type 5, 1, 0
 	octave 4
@@ -2011,7 +2011,7 @@ Sfx_69_Ch8:
 	note D#, 8
 	sound_ret
 
-Sfx_6a_Ch5:
+Sfx_UnusedFanfare2_Ch5:
 	toggle_sfx
 	sfx_priority_on
 	tempo 256
@@ -2036,7 +2036,7 @@ Sfx_6a_Ch5:
 	sfx_priority_off
 	sound_ret
 
-Sfx_6a_Ch6:
+Sfx_UnusedFanfare2_Ch6:
 	toggle_sfx
 	duty_cycle 2
 	note_type 6, 12, 5
@@ -2056,7 +2056,7 @@ Sfx_6a_Ch6:
 	note F_, 12
 	sound_ret
 
-Sfx_6a_Ch8:
+Sfx_UnusedFanfare2_Ch8:
 	toggle_sfx
 	note_type 6, 1, 0
 	octave 5
@@ -2074,7 +2074,7 @@ Sfx_6a_Ch8:
 	note G#, 6
 	sound_ret
 
-Sfx_6b_Ch5:
+Sfx_CaughtPokemonRG_Ch5:
 	toggle_sfx
 	sfx_priority_on
 	tempo 256
@@ -2099,7 +2099,7 @@ Sfx_6b_Ch5:
 	sfx_priority_off
 	sound_ret
 
-Sfx_6b_Ch6:
+Sfx_CaughtPokemonRG_Ch6:
 	toggle_sfx
 	duty_cycle 2
 	note_type 6, 12, 2
@@ -2120,7 +2120,7 @@ Sfx_6b_Ch6:
 	note G#, 8
 	sound_ret
 
-Sfx_6b_Ch8:
+Sfx_CaughtPokemonRG_Ch8:
 	toggle_sfx
 	note_type 6, 1, 0
 	octave 4
@@ -2136,7 +2136,7 @@ Sfx_6b_Ch8:
 	note G#, 4
 	sound_ret
 
-Sfx_6c_Ch5:
+Sfx_UnusedFanfare3_Ch5:
 	toggle_sfx
 	sfx_priority_on
 	tempo 256
@@ -2166,7 +2166,7 @@ Sfx_6c_Ch5:
 	sfx_priority_off
 	sound_ret
 
-Sfx_6c_Ch6:
+Sfx_UnusedFanfare3_Ch6:
 	toggle_sfx
 	duty_cycle 2
 	note_type 6, 12, 4
@@ -2202,7 +2202,7 @@ Sfx_6c_Ch6:
 	note F#, 12
 	sound_ret
 
-Sfx_6c_Ch8:
+Sfx_UnusedFanfare3_Ch8:
 	toggle_sfx
 	note_type 6, 1, 0
 	octave 4
@@ -2224,3 +2224,4 @@ Sfx_6c_Ch8:
 	note F_, 4
 	note F#, 6
 	sound_ret
+
diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm
index fceec7c..5ef042f 100644
--- a/audio/sfx_pointers.asm
+++ b/audio/sfx_pointers.asm
@@ -4,17 +4,18 @@ SECTION "audio/sfx_pointers.asm", ROMX
 
 SFX::
 ; entries correspond to SFX_* constants
-	dba Sfx_01
-	dba Sfx_02
-	dba Sfx_03
-	dba Sfx_04
-	dba Sfx_05
-	dba Sfx_05
+	dba Sfx_00
+	dba Sfx_Potion
+	dba Sfx_FullHeal
+	dba Sfx_Menu
+	dba Sfx_ReadText
+	dba Sfx_ReadText
+	dba Sfx_06
 	dba Sfx_07
 	dba Sfx_08
 	dba Sfx_09
-	dba Sfx_0a
-	dba Sfx_0b
+	dba Sfx_BootPC
+	dba Sfx_EscapeRope
 	dba Sfx_0c
 	dba Sfx_0d
 	dba Sfx_0e
@@ -23,36 +24,36 @@ SFX::
 	dba Sfx_11
 	dba Sfx_12
 	dba Sfx_13
-	dba Sfx_14
+	dba Sfx_Wrong
 	dba Sfx_15
 	dba Sfx_16
 	dba Sfx_17
 	dba Sfx_18
 	dba Sfx_19
 	dba Sfx_1a
-	dba Sfx_1b
+	dba Sfx_SwitchPokemon
 	dba Sfx_1c
 	dba Sfx_1d
 	dba Sfx_1e
 	dba Sfx_1f
 	dba Sfx_20
-	dba Sfx_21
+	dba Sfx_Pokeflute
 	dba Sfx_22
 	dba Sfx_23
 	dba Sfx_24
 	dba Sfx_25
 	dba Sfx_26
-	dba Sfx_27
+	dba Sfx_PokedexRegistration
 	dba Sfx_28
 	dba Sfx_29
 	dba Sfx_2a
 	dba Sfx_2b
 	dba Sfx_2c
-	dba Sfx_2d
+	dba Sfx_TitleEntrance
 	dba Sfx_2e
 	dba Sfx_2f
-	dba Sfx_30
-	dba Sfx_31
+	dba Sfx_PayDay
+	dba Sfx_GameFreakLogoRG
 	dba Sfx_32
 	dba Sfx_33
 	dba Sfx_34
@@ -102,13 +103,12 @@ SFX::
 	dba Sfx_60
 	dba Sfx_61
 	dba Sfx_62
-	dba Sfx_63
-	dba Sfx_64
-	dba Sfx_65
-	dba Sfx_66
-	dba Sfx_67
-	dba Sfx_68
-	dba Sfx_69
-	dba Sfx_6a
-	dba Sfx_6b
-	dba Sfx_6c
+	dba Sfx_GetItemRG
+	dba Sfx_UnusedFanfare1
+	dba Sfx_PokedexEvaluationRG
+	dba Sfx_LevelUpRG
+	dba Sfx_EvolutionCompleteRG
+	dba Sfx_GetKeyItemRG
+	dba Sfx_UnusedFanfare2
+	dba Sfx_CaughtPokemonRG
+	dba Sfx_UnusedFanfare3
diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm
index fcd1edf..a0a3418 100644
--- a/constants/sfx_constants.asm
+++ b/constants/sfx_constants.asm
@@ -1,11 +1,11 @@
 ; TODO
-SFX_BOOT_PC                     EQU $0A
 
 SFX_POTION                      EQU $01
 SFX_FULL_HEAL                   EQU $02
 SFX_MENU                        EQU $03
 SFX_READ_TEXT                   EQU $04
 SFX_READ_TEXT_2                 EQU $05
+SFX_BOOT_PC                     EQU $0A
 SFX_ESCAPE_ROPE                 EQU $0B ; player shrink
 SFX_WRONG                       EQU $14
 SFX_SWITCH_POKEMON              EQU $1B
@@ -26,3 +26,4 @@ SFX_GET_KEY_ITEM_RG             EQU $68
 SFX_UNUSED_FANFARE_2            EQU $69
 SFX_CAUGHT_POKEMON_RG           EQU $6A
 SFX_UNUSED_FANFARE_3            EQU $6B
+