Browse Source

battle music configuration update

ipatix 7 years ago
parent
commit
7e3e23578d
3 changed files with 67 additions and 16 deletions
  1. 1
    1
      sots-private
  2. 18
    0
      src/include/config.h
  3. 48
    15
      src/music/battle_music_lookup.c

+ 1
- 1
sots-private

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

+ 18
- 0
src/include/config.h View File

@@ -50,6 +50,24 @@
50 50
 /*Flag to enable the music overrides*/
51 51
 #define FLAG_SKIP_BATTLE_MUSIC 0x742
52 52
 
53
+/*Trainer encounter IDs*/
54
+#define TRAINER_EYE_MUS_BOY         0
55
+#define TRAINER_EYE_MUS_GIRL        1
56
+#define TRAINER_EYE_MUS_KID         2
57
+#define TRAINER_EYE_MUS_HIKER       3
58
+#define TRAINER_EYE_MUS_SAILOR      4
59
+#define TRAINER_EYE_MUS_ELECTRIC    5
60
+#define TRAINER_EYE_MUS_PSYCHIC     6
61
+#define TRAINER_EYE_MUS_SWIMMER     7
62
+#define TRAINER_EYE_MUS_ACE         8
63
+#define TRAINER_EYE_MUS_ELITE       9
64
+#define TRAINER_EYE_MUS_CHAMP       10
65
+#define TRAINER_EYE_MUS_TT_GRUNT_M  11
66
+#define TRAINER_EYE_MUS_TT_GRUNT_F  12
67
+#define TRAINER_EYE_MUS_TT_ADMIN    13
68
+#define TRAINER_EYE_MUS_TT_BOSS_1   14
69
+#define TRAINER_EYE_MUS_TT_BOSS_2   15
70
+
53 71
 /*Flag to deactivate transparent textboxes*/
54 72
 #define FLAG_ACTIVATE		0x900
55 73
 #define FLAG_WALK_SCRIPT	0x901

+ 48
- 15
src/music/battle_music_lookup.c View File

@@ -16,23 +16,56 @@ u16 mhk_intro_music_id_to_song(u8 introid) {
16 16
     u16 res = 0;
17 17
 
18 18
     switch (introid) {
19
-        case 0:
20
-        case 4:
21
-        case 5:
22
-        case 8:
23
-        case 10:
24
-        case 11:
25
-        case 12:
26
-        case 13:
27
-            res = SEQ_FRLG_E_3;
28
-            break;
29
-        case 1:
30
-        case 2:
31
-        case 9:
32
-            res = SEQ_FRLG_E_2;
19
+        case TRAINER_EYE_MUS_BOY:
20
+            res = 350;
21
+            break;
22
+        case TRAINER_EYE_MUS_GIRL:
23
+            res = 351;
24
+            break;
25
+        case TRAINER_EYE_MUS_KID:
26
+            res = 352;
27
+            break;
28
+        case TRAINER_EYE_MUS_HIKER:
29
+            res = 353;
30
+            break;
31
+        case TRAINER_EYE_MUS_SAILOR:
32
+            res = 354;
33
+            break;
34
+        case TRAINER_EYE_MUS_ELECTRIC:
35
+            res = 355;
36
+            break;
37
+        case TRAINER_EYE_MUS_PSYCHIC:
38
+            res = 356;
39
+            break;
40
+        case TRAINER_EYE_MUS_SWIMMER:
41
+            res = 357;
42
+            break;
43
+        case TRAINER_EYE_MUS_ACE:
44
+            res = 358;
45
+            break;
46
+        case TRAINER_EYE_MUS_ELITE:
47
+            res = 359;
48
+            break;
49
+        case TRAINER_EYE_MUS_CHAMP:
50
+            res = 360;
51
+            break;
52
+        case TRAINER_EYE_MUS_TT_GRUNT_M:
53
+            res = 361;
54
+            break;
55
+        case TRAINER_EYE_MUS_TT_GRUNT_F:
56
+            res = 362;
57
+            break;
58
+        case TRAINER_EYE_MUS_TT_ADMIN:
59
+            res = 363;
60
+            break;
61
+        case TRAINER_EYE_MUS_TT_BOSS_1:
62
+            res = 364;
63
+            break;
64
+        case TRAINER_EYE_MUS_TT_BOSS_2:
65
+            res = 365;
33 66
             break;
34 67
         default:
35
-            res = SEQ_FRLG_E_3;
68
+            res = SEQ_FRLG_E_1;
36 69
             break;
37 70
     }
38 71