Rename sound effect files

1 files changed, 161 insertions, 161 deletions

diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index 6812e312..d8c62dda 100644
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -56,175 +56,175 @@ ENDM
 	music_const MUSIC_MEET_MALE_TRAINER,   Music_MeetMaleTrainer
 
 	; AUDIO_1 AUDIO_2 AUDIO_3
-	music_const SFX_SNARE_1,            SFX_02_01
-	music_const SFX_SNARE_2,            SFX_02_02
-	music_const SFX_SNARE_3,            SFX_02_03
-	music_const SFX_SNARE_4,            SFX_02_04
-	music_const SFX_SNARE_5,            SFX_02_05
-	music_const SFX_TRIANGLE_1,         SFX_02_06
-	music_const SFX_TRIANGLE_2,         SFX_02_07
-	music_const SFX_SNARE_6,            SFX_02_08
-	music_const SFX_SNARE_7,            SFX_02_09
-	music_const SFX_SNARE_8,            SFX_02_0a
-	music_const SFX_SNARE_9,            SFX_02_0b
-	music_const SFX_CYMBAL_1,           SFX_02_0c
-	music_const SFX_CYMBAL_2,           SFX_02_0d
-	music_const SFX_CYMBAL_3,           SFX_02_0e
-	music_const SFX_MUTED_SNARE_1,      SFX_02_0f
-	music_const SFX_TRIANGLE_3,         SFX_02_10
-	music_const SFX_MUTED_SNARE_2,      SFX_02_11
-	music_const SFX_MUTED_SNARE_3,      SFX_02_12
-	music_const SFX_MUTED_SNARE_4,      SFX_02_13
-	music_const SFX_CRY_00,             SFX_02_14
-	music_const SFX_CRY_01,             SFX_02_15
-	music_const SFX_CRY_02,             SFX_02_16
-	music_const SFX_CRY_03,             SFX_02_17
-	music_const SFX_CRY_04,             SFX_02_18
-	music_const SFX_CRY_05,             SFX_02_19
-	music_const SFX_CRY_06,             SFX_02_1a
-	music_const SFX_CRY_07,             SFX_02_1b
-	music_const SFX_CRY_08,             SFX_02_1c
-	music_const SFX_CRY_09,             SFX_02_1d
-	music_const SFX_CRY_0A,             SFX_02_1e
-	music_const SFX_CRY_0B,             SFX_02_1f
-	music_const SFX_CRY_0C,             SFX_02_20
-	music_const SFX_CRY_0D,             SFX_02_21
-	music_const SFX_CRY_0E,             SFX_02_22
-	music_const SFX_CRY_0F,             SFX_02_23
-	music_const SFX_CRY_10,             SFX_02_24
-	music_const SFX_CRY_11,             SFX_02_25
-	music_const SFX_CRY_12,             SFX_02_26
-	music_const SFX_CRY_13,             SFX_02_27
-	music_const SFX_CRY_14,             SFX_02_28
-	music_const SFX_CRY_15,             SFX_02_29
-	music_const SFX_CRY_16,             SFX_02_2a
-	music_const SFX_CRY_17,             SFX_02_2b
-	music_const SFX_CRY_18,             SFX_02_2c
-	music_const SFX_CRY_19,             SFX_02_2d
-	music_const SFX_CRY_1A,             SFX_02_2e
-	music_const SFX_CRY_1B,             SFX_02_2f
-	music_const SFX_CRY_1C,             SFX_02_30
-	music_const SFX_CRY_1D,             SFX_02_31
-	music_const SFX_CRY_1E,             SFX_02_32
-	music_const SFX_CRY_1F,             SFX_02_33
-	music_const SFX_CRY_20,             SFX_02_34
-	music_const SFX_CRY_21,             SFX_02_35
-	music_const SFX_CRY_22,             SFX_02_36
-	music_const SFX_CRY_23,             SFX_02_37
-	music_const SFX_CRY_24,             SFX_02_38
-	music_const SFX_CRY_25,             SFX_02_39
+	music_const SFX_SNARE_1,            SFX_Snare1_1
+	music_const SFX_SNARE_2,            SFX_Snare2_1
+	music_const SFX_SNARE_3,            SFX_Snare3_1
+	music_const SFX_SNARE_4,            SFX_Snare4_1
+	music_const SFX_SNARE_5,            SFX_Snare5_1
+	music_const SFX_TRIANGLE_1,         SFX_Triangle1_1
+	music_const SFX_TRIANGLE_2,         SFX_Triangle2_1
+	music_const SFX_SNARE_6,            SFX_Snare6_1
+	music_const SFX_SNARE_7,            SFX_Snare7_1
+	music_const SFX_SNARE_8,            SFX_Snare8_1
+	music_const SFX_SNARE_9,            SFX_Snare9_1
+	music_const SFX_CYMBAL_1,           SFX_Cymbal1_1
+	music_const SFX_CYMBAL_2,           SFX_Cymbal2_1
+	music_const SFX_CYMBAL_3,           SFX_Cymbal3_1
+	music_const SFX_MUTED_SNARE_1,      SFX_Muted_Snare1_1
+	music_const SFX_TRIANGLE_3,         SFX_Triangle3_1
+	music_const SFX_MUTED_SNARE_2,      SFX_Muted_Snare2_1
+	music_const SFX_MUTED_SNARE_3,      SFX_Muted_Snare3_1
+	music_const SFX_MUTED_SNARE_4,      SFX_Muted_Snare4_1
+	music_const SFX_CRY_00,             SFX_Cry00_1
+	music_const SFX_CRY_01,             SFX_Cry01_1
+	music_const SFX_CRY_02,             SFX_Cry02_1
+	music_const SFX_CRY_03,             SFX_Cry03_1
+	music_const SFX_CRY_04,             SFX_Cry04_1
+	music_const SFX_CRY_05,             SFX_Cry05_1
+	music_const SFX_CRY_06,             SFX_Cry06_1
+	music_const SFX_CRY_07,             SFX_Cry07_1
+	music_const SFX_CRY_08,             SFX_Cry08_1
+	music_const SFX_CRY_09,             SFX_Cry09_1
+	music_const SFX_CRY_0A,             SFX_Cry0A_1
+	music_const SFX_CRY_0B,             SFX_Cry0B_1
+	music_const SFX_CRY_0C,             SFX_Cry0C_1
+	music_const SFX_CRY_0D,             SFX_Cry0D_1
+	music_const SFX_CRY_0E,             SFX_Cry0E_1
+	music_const SFX_CRY_0F,             SFX_Cry0F_1
+	music_const SFX_CRY_10,             SFX_Cry10_1
+	music_const SFX_CRY_11,             SFX_Cry11_1
+	music_const SFX_CRY_12,             SFX_Cry12_1
+	music_const SFX_CRY_13,             SFX_Cry13_1
+	music_const SFX_CRY_14,             SFX_Cry14_1
+	music_const SFX_CRY_15,             SFX_Cry15_1
+	music_const SFX_CRY_16,             SFX_Cry16_1
+	music_const SFX_CRY_17,             SFX_Cry17_1
+	music_const SFX_CRY_18,             SFX_Cry18_1
+	music_const SFX_CRY_19,             SFX_Cry19_1
+	music_const SFX_CRY_1A,             SFX_Cry1A_1
+	music_const SFX_CRY_1B,             SFX_Cry1B_1
+	music_const SFX_CRY_1C,             SFX_Cry1C_1
+	music_const SFX_CRY_1D,             SFX_Cry1D_1
+	music_const SFX_CRY_1E,             SFX_Cry1E_1
+	music_const SFX_CRY_1F,             SFX_Cry1F_1
+	music_const SFX_CRY_20,             SFX_Cry20_1
+	music_const SFX_CRY_21,             SFX_Cry21_1
+	music_const SFX_CRY_22,             SFX_Cry22_1
+	music_const SFX_CRY_23,             SFX_Cry23_1
+	music_const SFX_CRY_24,             SFX_Cry24_1
+	music_const SFX_CRY_25,             SFX_Cry25_1
 
-	music_const SFX_GET_ITEM_2,         SFX_02_3b
-	music_const SFX_TINK,               SFX_02_3c
-	music_const SFX_HEAL_HP,            SFX_02_3d
-	music_const SFX_HEAL_AILMENT,       SFX_02_3e
-	music_const SFX_START_MENU,         SFX_02_3f
-	music_const SFX_PRESS_AB,           SFX_02_40
+	music_const SFX_GET_ITEM_2,         SFX_Get_Item2_1
+	music_const SFX_TINK,               SFX_Tink_1
+	music_const SFX_HEAL_HP,            SFX_Heal_HP_1
+	music_const SFX_HEAL_AILMENT,       SFX_Heal_Ailment_1
+	music_const SFX_START_MENU,         SFX_Start_Menu_1
+	music_const SFX_PRESS_AB,           SFX_Press_AB_1
 
 	; AUDIO_1 AUDIO_3
-	music_const SFX_GET_ITEM_1,         SFX_02_3a
+	music_const SFX_GET_ITEM_1,         SFX_Get_Item1_1
 
-	music_const SFX_POKEDEX_RATING,     SFX_02_41
-	music_const SFX_GET_KEY_ITEM,       SFX_02_42
-	music_const SFX_POISONED,           SFX_02_43
-	music_const SFX_TRADE_MACHINE,      SFX_02_44
-	music_const SFX_TURN_ON_PC,         SFX_02_45
-	music_const SFX_TURN_OFF_PC,        SFX_02_46
-	music_const SFX_ENTER_PC,           SFX_02_47
-	music_const SFX_SHRINK,             SFX_02_48
-	music_const SFX_SWITCH,             SFX_02_49
-	music_const SFX_HEALING_MACHINE,    SFX_02_4a
-	music_const SFX_TELEPORT_1,         SFX_02_4b
-	music_const SFX_TELEPORT_2,         SFX_02_4c
-	music_const SFX_TELEPORT_3,         SFX_02_4d
-	music_const SFX_LEDGE,              SFX_02_4e
-	music_const SFX_FLY_1,              SFX_02_4f
-	music_const SFX_FLY_2,              SFX_02_50
-	music_const SFX_DENIED,             SFX_02_51
-	music_const SFX_ARROW_TILES,        SFX_02_52
-	music_const SFX_PUSH_BOULDER,       SFX_02_53
-	music_const SFX_SS_ANNE_HORN,       SFX_02_54
-	music_const SFX_WITHDRAW_DEPOSIT,   SFX_02_55
-	music_const SFX_CUT,                SFX_02_56
-	music_const SFX_GO_INSIDE,          SFX_02_57
-	music_const SFX_SWAP,               SFX_02_58
-	music_const SFX_59,                 SFX_02_59 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL
-	music_const SFX_PURCHASE,           SFX_02_5a
-	music_const SFX_COLLISION,          SFX_02_5b
-	music_const SFX_GO_OUTSIDE,         SFX_02_5c
-	music_const SFX_SAVE,               SFX_02_5d
+	music_const SFX_POKEDEX_RATING,     SFX_Pokedex_Rating_1
+	music_const SFX_GET_KEY_ITEM,       SFX_Get_Key_Item_1
+	music_const SFX_POISONED,           SFX_Poisoned_1
+	music_const SFX_TRADE_MACHINE,      SFX_Trade_Machine_1
+	music_const SFX_TURN_ON_PC,         SFX_Turn_On_PC_1
+	music_const SFX_TURN_OFF_PC,        SFX_Turn_Off_PC_1
+	music_const SFX_ENTER_PC,           SFX_Enter_PC_1
+	music_const SFX_SHRINK,             SFX_Shrink_1
+	music_const SFX_SWITCH,             SFX_Switch_1
+	music_const SFX_HEALING_MACHINE,    SFX_Healing_Machine_1
+	music_const SFX_TELEPORT_EXIT_1,    SFX_Teleport_Exit1_1
+	music_const SFX_TELEPORT_ENTER_1,   SFX_Teleport_Enter1_1
+	music_const SFX_TELEPORT_EXIT_2,    SFX_Teleport_Exit2_1
+	music_const SFX_LEDGE,              SFX_Ledge_1
+	music_const SFX_TELEPORT_ENTER_2,   SFX_Teleport_Enter2_1
+	music_const SFX_FLY,                SFX_Fly_1
+	music_const SFX_DENIED,             SFX_Denied_1
+	music_const SFX_ARROW_TILES,        SFX_Arrow_Tiles_1
+	music_const SFX_PUSH_BOULDER,       SFX_Push_Boulder_1
+	music_const SFX_SS_ANNE_HORN,       SFX_SS_Anne_Horn_1
+	music_const SFX_WITHDRAW_DEPOSIT,   SFX_Withdraw_Deposit_1
+	music_const SFX_CUT,                SFX_Cut_1
+	music_const SFX_GO_INSIDE,          SFX_Go_Inside_1
+	music_const SFX_SWAP,               SFX_Swap_1
+	music_const SFX_59,                 SFX_59_1 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL
+	music_const SFX_PURCHASE,           SFX_Purchase_1
+	music_const SFX_COLLISION,          SFX_Collision_1
+	music_const SFX_GO_OUTSIDE,         SFX_Go_Outside_1
+	music_const SFX_SAVE,               SFX_Save_1
 
 	; AUDIO_1
-	music_const SFX_POKEFLUE,           SFX_02_5e
-	music_const SFX_SAFARI_ZONE_PA,     SFX_02_5f
+	music_const SFX_POKEFLUE,           SFX_Pokeflute
+	music_const SFX_SAFARI_ZONE_PA,     SFX_Safari_Zone_PA
 
 	; AUDIO_2
-	music_const SFX_LEVEL_UP,           SFX_08_3a
+	music_const SFX_LEVEL_UP,           SFX_Level_Up
 
-	music_const SFX_BALL_TOSS,          SFX_08_41
-	music_const SFX_BALL_POOF,          SFX_08_42
-	music_const SFX_FAINT_THUD,         SFX_08_43
-	music_const SFX_RUN,                SFX_08_44
-	music_const SFX_DEX_PAGE_ADDED,     SFX_08_45
-	music_const SFX_CAUGHT_MON,         SFX_08_46
-	music_const SFX_PECK,               SFX_08_47
-	music_const SFX_FAINT_FALL,         SFX_08_48
-	music_const SFX_BATTLE_09,          SFX_08_49
-	music_const SFX_POUND,              SFX_08_4a
-	music_const SFX_BATTLE_0B,          SFX_08_4b
-	music_const SFX_BATTLE_0C,          SFX_08_4c
-	music_const SFX_BATTLE_0D,          SFX_08_4d
-	music_const SFX_BATTLE_0E,          SFX_08_4e
-	music_const SFX_BATTLE_0F,          SFX_08_4f
-	music_const SFX_DAMAGE,             SFX_08_50
-	music_const SFX_NOT_VERY_EFFECTIVE, SFX_08_51
-	music_const SFX_BATTLE_12,          SFX_08_52
-	music_const SFX_BATTLE_13,          SFX_08_53
-	music_const SFX_BATTLE_14,          SFX_08_54
-	music_const SFX_VINE_WHIP,          SFX_08_55
-	music_const SFX_BATTLE_16,          SFX_08_56 ; unused?
-	music_const SFX_BATTLE_17,          SFX_08_57
-	music_const SFX_BATTLE_18,          SFX_08_58
-	music_const SFX_BATTLE_19,          SFX_08_59
-	music_const SFX_SUPER_EFFECTIVE,    SFX_08_5a
-	music_const SFX_BATTLE_1B,          SFX_08_5b
-	music_const SFX_BATTLE_1C,          SFX_08_5c
-	music_const SFX_DOUBLESLAP,         SFX_08_5d
-	music_const SFX_BATTLE_1E,          SFX_08_5e
-	music_const SFX_HORN_DRILL,         SFX_08_5f
-	music_const SFX_BATTLE_20,          SFX_08_60
-	music_const SFX_BATTLE_21,          SFX_08_61
-	music_const SFX_BATTLE_22,          SFX_08_62
-	music_const SFX_BATTLE_23,          SFX_08_63
-	music_const SFX_BATTLE_24,          SFX_08_64
-	music_const SFX_BATTLE_25,          SFX_08_65
-	music_const SFX_BATTLE_26,          SFX_08_66
-	music_const SFX_BATTLE_27,          SFX_08_67
-	music_const SFX_BATTLE_28,          SFX_08_68
-	music_const SFX_BATTLE_29,          SFX_08_69
-	music_const SFX_BATTLE_2A,          SFX_08_6a
-	music_const SFX_BATTLE_2B,          SFX_08_6b
-	music_const SFX_BATTLE_2C,          SFX_08_6c
-	music_const SFX_PSYBEAM,            SFX_08_6d
-	music_const SFX_BATTLE_2E,          SFX_08_6e
-	music_const SFX_BATTLE_2F,          SFX_08_6f
-	music_const SFX_PSYCHIC_M,          SFX_08_70
-	music_const SFX_BATTLE_31,          SFX_08_71
-	music_const SFX_BATTLE_32,          SFX_08_72
-	music_const SFX_BATTLE_33,          SFX_08_73
-	music_const SFX_BATTLE_34,          SFX_08_74
-	music_const SFX_BATTLE_35,          SFX_08_75
-	music_const SFX_BATTLE_36,          SFX_08_76
-	music_const SFX_SILPH_SCOPE,        SFX_08_77
+	music_const SFX_BALL_TOSS,          SFX_Ball_Toss
+	music_const SFX_BALL_POOF,          SFX_Ball_Poof
+	music_const SFX_FAINT_THUD,         SFX_Faint_Thud
+	music_const SFX_RUN,                SFX_Run
+	music_const SFX_DEX_PAGE_ADDED,     SFX_Dex_Page_Added
+	music_const SFX_CAUGHT_MON,         SFX_Caught_Mon
+	music_const SFX_PECK,               SFX_Peck
+	music_const SFX_FAINT_FALL,         SFX_Faint_Fall
+	music_const SFX_BATTLE_09,          SFX_Battle_09
+	music_const SFX_POUND,              SFX_Pound
+	music_const SFX_BATTLE_0B,          SFX_Battle_0B
+	music_const SFX_BATTLE_0C,          SFX_Battle_0C
+	music_const SFX_BATTLE_0D,          SFX_Battle_0D
+	music_const SFX_BATTLE_0E,          SFX_Battle_0E
+	music_const SFX_BATTLE_0F,          SFX_Battle_0F
+	music_const SFX_DAMAGE,             SFX_Damage
+	music_const SFX_NOT_VERY_EFFECTIVE, SFX_Not_Very_Effective
+	music_const SFX_BATTLE_12,          SFX_Battle_12
+	music_const SFX_BATTLE_13,          SFX_Battle_13
+	music_const SFX_BATTLE_14,          SFX_Battle_14
+	music_const SFX_VINE_WHIP,          SFX_Vine_Whip
+	music_const SFX_BATTLE_16,          SFX_Battle_16 ; unused?
+	music_const SFX_BATTLE_17,          SFX_Battle_17
+	music_const SFX_BATTLE_18,          SFX_Battle_18
+	music_const SFX_BATTLE_19,          SFX_Battle_19
+	music_const SFX_SUPER_EFFECTIVE,    SFX_Super_Effective
+	music_const SFX_BATTLE_1B,          SFX_Battle_1B
+	music_const SFX_BATTLE_1C,          SFX_Battle_1C
+	music_const SFX_DOUBLESLAP,         SFX_Doubleslap
+	music_const SFX_BATTLE_1E,          SFX_Battle_1E
+	music_const SFX_HORN_DRILL,         SFX_Horn_Drill
+	music_const SFX_BATTLE_20,          SFX_Battle_20
+	music_const SFX_BATTLE_21,          SFX_Battle_21
+	music_const SFX_BATTLE_22,          SFX_Battle_22
+	music_const SFX_BATTLE_23,          SFX_Battle_23
+	music_const SFX_BATTLE_24,          SFX_Battle_24
+	music_const SFX_BATTLE_25,          SFX_Battle_25
+	music_const SFX_BATTLE_26,          SFX_Battle_26
+	music_const SFX_BATTLE_27,          SFX_Battle_27
+	music_const SFX_BATTLE_28,          SFX_Battle_28
+	music_const SFX_BATTLE_29,          SFX_Battle_29
+	music_const SFX_BATTLE_2A,          SFX_Battle_2A
+	music_const SFX_BATTLE_2B,          SFX_Battle_2B
+	music_const SFX_BATTLE_2C,          SFX_Battle_2C
+	music_const SFX_PSYBEAM,            SFX_Psybeam
+	music_const SFX_BATTLE_2E,          SFX_Battle_2E
+	music_const SFX_BATTLE_2F,          SFX_Battle_2F
+	music_const SFX_PSYCHIC_M,          SFX_Psychic_M
+	music_const SFX_BATTLE_31,          SFX_Battle_31
+	music_const SFX_BATTLE_32,          SFX_Battle_32
+	music_const SFX_BATTLE_33,          SFX_Battle_33
+	music_const SFX_BATTLE_34,          SFX_Battle_34
+	music_const SFX_BATTLE_35,          SFX_Battle_35
+	music_const SFX_BATTLE_36,          SFX_Battle_36
+	music_const SFX_SILPH_SCOPE,        SFX_Silph_Scope
 
 	; AUDIO_3
-	music_const SFX_INTRO_LUNGE,        SFX_1f_5e
-	music_const SFX_INTRO_HIP,          SFX_1f_5f
-	music_const SFX_INTRO_HOP,          SFX_1f_60
-	music_const SFX_INTRO_RAISE,        SFX_1f_61
-	music_const SFX_INTRO_CRASH,        SFX_1f_62
-	music_const SFX_INTRO_WHOOSH,       SFX_1f_63
-	music_const SFX_SLOTS_STOP_WHEEL,   SFX_1f_64
-	music_const SFX_SLOTS_REWARD,       SFX_1f_65
-	music_const SFX_SLOTS_NEW_SPIN,     SFX_1f_66
-	music_const SFX_SHOOTING_STAR,      SFX_1f_67
+	music_const SFX_INTRO_LUNGE,        SFX_Intro_Lunge
+	music_const SFX_INTRO_HIP,          SFX_Intro_Hip
+	music_const SFX_INTRO_HOP,          SFX_Intro_Hop
+	music_const SFX_INTRO_RAISE,        SFX_Intro_Raise
+	music_const SFX_INTRO_CRASH,        SFX_Intro_Crash
+	music_const SFX_INTRO_WHOOSH,       SFX_Intro_Whoosh
+	music_const SFX_SLOTS_STOP_WHEEL,   SFX_Slots_Stop_Wheel
+	music_const SFX_SLOTS_REWARD,       SFX_Slots_Reward
+	music_const SFX_SLOTS_NEW_SPIN,     SFX_Slots_New_Spin
+	music_const SFX_SHOOTING_STAR,      SFX_Shooting_Star