Used official or more common names for music tracks

5 files changed, 26 insertions, 26 deletions

diff --git a/data/cutscenes_1.s b/data/cutscenes_1.s
index 096fae4..2c76b68 100644
--- a/data/cutscenes_1.s
+++ b/data/cutscenes_1.s
@@ -9080,7 +9080,7 @@
     .byte 0xf6, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xdb, 0x26, 0x08
     changeTileSet 0xDE
     .byte 0x0c, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    playMusic MUS_IN_THE_DEPTHS_OF_PIT
+    playMusic MUS_IN_THE_DEPTHS_OF_THE_PIT
     .byte 0x22, 0x01, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     waitFlag 3
     fadeMusicOut 0x78
diff --git a/data/scripts/personality_test.inc b/data/scripts/personality_test.inc
index e6de4a1..ae7cd06 100644
--- a/data/scripts/personality_test.inc
+++ b/data/scripts/personality_test.inc
@@ -27,7 +27,7 @@
     floatingText InterviewBegin_826E108
     closeTextBox
     StartSceneRunCall 0
-    playMusic MUS_WELCOME_TO_WORLD_POKEMON
+    playMusic MUS_WELCOME_TO_THE_WORLD_OF_POKEMON
     .byte 0x22, 0x01, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     .byte 0x3c, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     fadeMusicOut 0x1E
diff --git a/include/constants/bg_music.h b/include/constants/bg_music.h
index 86fb4e9..53bfade 100644
--- a/include/constants/bg_music.h
+++ b/include/constants/bg_music.h
@@ -1,51 +1,51 @@
 #ifndef GUARD_CONSTANTS_BG_MUSIC_H
-#define GUARD_CONSTANTS_BG_MUSIC_H 
+#define GUARD_CONSTANTS_BG_MUSIC_H
 
-#define MUS_TEAM_BASE 1
+#define MUS_RESCUE_TEAM_BASE 1
 #define MUS_FRIEND_AREA_SWAMP 2
 #define MUS_FRIEND_AREA_CAVES 3
 #define MUS_DREAM 4
-#define MUS_BENEVOLENT_SPIRT 5
+#define MUS_BENEVOLENT_SPIRIT 5
 #define MUS_LEGEND_OF_NINETALES 6
 #define MUS_POKEMON_SQUARE 7
-#define MUS_LOADING_SCREEN 8
+#define MUS_FILE_SELECT 8
 #define MUS_RISING_FEAR 9
 #define MUS_THERES_TROUBLE 10
-#define MUS_DECISIVE_BATTLE 11
-#define MUS_WELCOME_TO_WORLD_POKEMON 12
-#define MUS_BURIED_RELIC 13
+#define MUS_BOSS_BATTLE 11
+#define MUS_WELCOME_TO_THE_WORLD_OF_POKEMON 12
+#define MUS_A_NEW_ADVENTURE 13 // Plays in Buried Relic and Southern Cavern
 #define MUS_THUNDERWAVE_CAVE 14
 #define MUS_SINISTER_WOODS 15
 #define MUS_FRIEND_AREA_POND 16
 #define MUS_KECLEON_SHOP 17
 #define MUS_STOP_THIEF 18
 #define MUS_WORLD_CALAMITY 19 // GIANT_STAR_APPROACHING
-#define MUS_GRAND_CANYON 20
+#define MUS_GREAT_CANYON 20
 #define MUS_STORMY_SEA 21
 #define MUS_SKY_TOWER 22
 #define MUS_SKY_TOWER_SUMMIT 23
-#define MUS_RUN_AWAY 24
+#define MUS_THE_ESCAPE 24
 #define MUS_MT_BLAZE 25
-#define MUS_SKY_TOWER_END 26
+#define MUS_RAYQUAZAS_DOMAIN 26
 #define MUS_FRIEND_AREA_STRATOS_LOOKOUT 27
 #define MUS_FRIEND_AREA_RAINBOW_PEAK 28
-#define MUS_GENGAR_DREAM 29
+#define MUS_DREAM_EATER 29
 #define MUS_FRIEND_AREA_DEEPSEA_CURRENT 30
 #define MUS_FRIEND_AREA_SEAFLOOR_CAVE 31
-#define MUS_LAST_BATTLE 32
+#define MUS_BATTLE_WITH_RAYQUAZA 32
 #define MUS_MT_BLAZE_PEAK 33
 #define MUS_FRIEND_AREA_VOLCANIC_PIT 34
 #define MUS_FRIEND_AREA_CRYPTIC_CAVE 35
-#define MUS_THROUGH_THE_LAND_OF_ICE_AND_SNOW 36
-#define MUS_GENGAR_DARK_WORLD 37
-#define MUS_MT_BLAZE_END 38
+#define MUS_ESCAPE_THROUGH_THE_SNOW 36
+#define MUS_THE_OTHER_SIDE 37
+#define MUS_THE_MOUNTAIN_OF_FIRE 38
 #define MUS_FROSTY_GROTTO 39
 #define MUS_INTRO 40
-#define MUS_AFTER_THE_BATTLE 41
-#define MUS_NEVER_FORGET 42
+#define MUS_AFTERMATH 41
+#define MUS_FAREWELL 42
 #define MUS_TITLE_SCREEN 43
 #define MUS_CREDITS 44
-#define MUS_EPILOGUE 45
+#define MUS_TIME_OF_REUNION 45
 #define MUS_OPENING_TITLE 46
 #define MUS_DUNGEON_FAIL 51
 #define MUS_DUNGEON_COMPLETE 52
@@ -53,7 +53,7 @@
 // 53 - 99 are blank/empty slots for BG Music
 
 #define MUS_FRIEND_AREA_UNUSED_1 100
-#define MUS_MEETING_WITH_PARTNER 101
+#define MUS_HEARTWARMING 101
 #define MUS_LAPIS_CAVE 102
 #define MUS_A_SUCCESSFUL_RESCUE 103
 #define MUS_FROSTY_FOREST 104
@@ -66,7 +66,7 @@
 #define MUS_MT_THUNDER 111
 #define MUS_FRIEND_AREA_LAB 112
 #define MUS_SILENT_CHASM 113
-#define MUS_IN_THE_DEPTHS_OF_PIT 114
+#define MUS_IN_THE_DEPTHS_OF_THE_PIT 114
 #define MUS_MT_FREEZE 115
 #define MUS_FRIEND_AREA_WILDS 116
 #define MUS_FRIEND_AREA_LEGENDARY_ISLAND 117
diff --git a/src/code_2.c b/src/code_2.c
index 29f1088..8a6987b 100644
--- a/src/code_2.c
+++ b/src/code_2.c
@@ -138,7 +138,7 @@ void GameLoop(void)
             FinishReadSavePak();
         }
         tmp3 = 1;
-        StartNewBGM(MUS_LOADING_SCREEN);
+        StartNewBGM(MUS_FILE_SELECT);
         flag = TRUE;
         sub_80095CC(0, 20);
         InitMainMenu();
diff --git a/src/luminous_cave.c b/src/luminous_cave.c
index eef6acd..2b5afa3 100644
--- a/src/luminous_cave.c
+++ b/src/luminous_cave.c
@@ -132,7 +132,7 @@ extern void sub_808F468(struct PokemonStruct *, u8 *, u32);
 
 bool8 LuminousCave_HasOnly1Member(void);
 
-enum 
+enum
 {
     LUMINOUS_CAVE_ENTRY,
     LUMINOUS_CAVE_ASK_EVOLVE,
@@ -284,7 +284,7 @@ void sub_8024804(void)
 void UpdateLuminousCaveDialogue(void)
 {
   char *monName;
-  
+
   switch(gUnknown_203B2B0->state) {
     case LUMINOUS_CAVE_ENTRY:
         if (LuminousCave_HasOnly1Member()) {
@@ -306,7 +306,7 @@ void UpdateLuminousCaveDialogue(void)
         break;
     case LUMINOUS_CAVE_SHALL_RETURN:
         gUnknown_203B2B0->fallbackState = 4;
-        xxx_call_fade_in_new_bgm(MUS_LOADING_SCREEN,0x3c);
+        xxx_call_fade_in_new_bgm(MUS_FILE_SELECT,0x3c);
         sub_80141B4(gLuminousCaveYeShallReturn,0,0,0x305);
         break;