battle music configuration update

sots-private

@@ -1 +1 @@
-Subproject commit 8c513e467717af35b810a7cca6ee5a0f72f002f1
+Subproject commit 7c838c1c8b4f34e76c69bdc09144cb7b82718fa5

src/include/config.h

@@ -50,6 +50,24 @@
 /*Flag to enable the music overrides*/
 #define FLAG_SKIP_BATTLE_MUSIC 0x742
 
+/*Trainer encounter IDs*/
+#define TRAINER_EYE_MUS_BOY         0
+#define TRAINER_EYE_MUS_GIRL        1
+#define TRAINER_EYE_MUS_KID         2
+#define TRAINER_EYE_MUS_HIKER       3
+#define TRAINER_EYE_MUS_SAILOR      4
+#define TRAINER_EYE_MUS_ELECTRIC    5
+#define TRAINER_EYE_MUS_PSYCHIC     6
+#define TRAINER_EYE_MUS_SWIMMER     7
+#define TRAINER_EYE_MUS_ACE         8
+#define TRAINER_EYE_MUS_ELITE       9
+#define TRAINER_EYE_MUS_CHAMP       10
+#define TRAINER_EYE_MUS_TT_GRUNT_M  11
+#define TRAINER_EYE_MUS_TT_GRUNT_F  12
+#define TRAINER_EYE_MUS_TT_ADMIN    13
+#define TRAINER_EYE_MUS_TT_BOSS_1   14
+#define TRAINER_EYE_MUS_TT_BOSS_2   15
+
 /*Flag to deactivate transparent textboxes*/
 #define FLAG_ACTIVATE		0x900
 #define FLAG_WALK_SCRIPT	0x901

src/music/battle_music_lookup.c

@@ -16,23 +16,56 @@ u16 mhk_intro_music_id_to_song(u8 introid) {
     u16 res = 0;
 
     switch (introid) {
-        case 0:
-        case 4:
-        case 5:
-        case 8:
-        case 10:
-        case 11:
-        case 12:
-        case 13:
-            res = SEQ_FRLG_E_3;
-            break;
-        case 1:
-        case 2:
-        case 9:
-            res = SEQ_FRLG_E_2;
+        case TRAINER_EYE_MUS_BOY:
+            res = 350;
+            break;
+        case TRAINER_EYE_MUS_GIRL:
+            res = 351;
+            break;
+        case TRAINER_EYE_MUS_KID:
+            res = 352;
+            break;
+        case TRAINER_EYE_MUS_HIKER:
+            res = 353;
+            break;
+        case TRAINER_EYE_MUS_SAILOR:
+            res = 354;
+            break;
+        case TRAINER_EYE_MUS_ELECTRIC:
+            res = 355;
+            break;
+        case TRAINER_EYE_MUS_PSYCHIC:
+            res = 356;
+            break;
+        case TRAINER_EYE_MUS_SWIMMER:
+            res = 357;
+            break;
+        case TRAINER_EYE_MUS_ACE:
+            res = 358;
+            break;
+        case TRAINER_EYE_MUS_ELITE:
+            res = 359;
+            break;
+        case TRAINER_EYE_MUS_CHAMP:
+            res = 360;
+            break;
+        case TRAINER_EYE_MUS_TT_GRUNT_M:
+            res = 361;
+            break;
+        case TRAINER_EYE_MUS_TT_GRUNT_F:
+            res = 362;
+            break;
+        case TRAINER_EYE_MUS_TT_ADMIN:
+            res = 363;
+            break;
+        case TRAINER_EYE_MUS_TT_BOSS_1:
+            res = 364;
+            break;
+        case TRAINER_EYE_MUS_TT_BOSS_2:
+            res = 365;
             break;
         default:
-            res = SEQ_FRLG_E_3;
+            res = SEQ_FRLG_E_1;
             break;
     }