fix trainer class song ids

src/include/config.h

@@ -1,124 +1,110 @@
-#include "pkmn_types.h"
-
-#ifndef CONFIG_S_
-#define CONFIG_S_
-
-#define MAGIC_BOUNCE_FLAG	0x0203FFFD
-#define OBJ_1_TEMP			0x0203FFFE
-#define OBJ_2_TEMP			0x0203FFFF
-
-
-/*Variables regarding battle background loading*/
-#define NORMAL_VAR	0x4000
-#define SEA_VAR	0x4001
-
-/*Variables and Tags regarding mugshots*/
-#define MUGHSOT_1_TABLE 0x5000
-#define MUGSHOT_1_X 0x5001
-#define MUGSHOT_1_Y 0x5002
-#define MUGSHOT_1_TAG 0x1337
-
-#define MUGHSOT_2_TABLE 0x5003
-#define MUGSHOT_2_X 0x5004
-#define MUGSHOT_2_Y 0x5005
-#define MUGSHOT_2_TAG 0x1338
-
-/*Variable for special control*/
-#define CALLASM_VAR 0x5006
-
-/*Variables for camera control*/
-#define CAMERA_VAR_X 0x5007
-#define CAMERA_VAR_Y 0x5008
-
-/*Variables for walking script control*/
-#define WALK_SCRIPT_VAR 0x5009
-
-/*Variable for custom text*/
-#define TEXT_VAR 0x500C
-
-/*Variable for controlling evolutions*/
-#define EVO_VAR 0x500D
-
-/*Variables to control the music overrides*/
-#define VAR_FROM_1 0x51FA
-#define VAR_FROM_2 0x51FB
-#define VAR_FROM_3 0x51FC
-#define VAR_TO_1 0x51FD
-#define VAR_TO_2 0x51FE
-#define VAR_TO_3 0x51FF
-
-/*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
-#define FLAG_DEOXYS_AURA        0x902
-
-/*Effect IDs controlling various in-battle item effects etc.*/
-#define ITEM_EFFECT_SMOOTH_ROCK	0x48
-#define ITEM_EFFECT_DAMP_ROCK	0x49
-#define ITEM_EFFECT_HEAT_ROCK	0x4A
-#define ITEM_EFFECT_ICY_ROCK	0x4B
-#define ITEM_EFFECT_FLAME_ORB	0x4C
-#define ITEM_EFFECT_TOXIC_ORB	0x4D
-#define ITEM_EFFECT_EXPERT_BELT	0x4E
-
-/*Battlescript command definitions (Do not edit unless changing the command table [bs_command_table.S])*/
-#define BS_ATTACKSTRING			0x02
-#define BS_PPREDUCE				0x03
-
-#define BS_ATTACKANIMATION		0x09
-#define BS_WAITANIMATION		0x0A
-#define BS_PRINTSTRING			0x10
-#define BS_WAITMESSAGE			0x12
-#define BS_JUMPIFSTATUS			0x1C
-#define BS_JUMPIFABILITY		0x1E
-#define BS_JUMPIFSTAT			0x20
-#define BS_JUMPIFWORD			0x2B
-#define BS_GOTO					0x28
-#define BS_JUMPIFARRAYNOTEQUAL	0x2D
-#define BS_SETBYTE				0x2E
-#define BS_ORWORD				0x35
-#define BS_PAUSE 				0x39
-#define BS_WAITSTATE			0x3A
-#define BS_RETURN				0x3C
-#define BS_END3					0x3F
-#define BS_CALL					0x41
-#define BS_PLAYANIMATION		0x45
-#define BS_PLAYSTATANIM			0x48
-#define BS_SWITCH1				0x4C
-#define BS_SWITCH2				0x4D
-#define BS_SWITCH3				0x4E
-#define BS_NOP3					0x83
-#define BS_STATBUFFCHANGE		0x89
-#define BS_CASTFORMSWITCH		0xE7
-#define BS_CALLASM				0xF8
-#define BS_CURESTATUS			0xF9
-#define BS_SETWORD				0xFA
-
-/*For hacking the miracle eye command into set foresight*/
-/*Comment out the first define to deactivate the miracleeye injection in the command table*/
-
-/*Some move effect IDs important for correct implementation*/
-#define MOVE_EFFECT_SACRED_SWORD	0xFF
-
-#endif
+#include "pkmn_types.h"
+
+#ifndef CONFIG_S_
+#define CONFIG_S_
+
+#define MAGIC_BOUNCE_FLAG       0x0203FFFD
+#define OBJ_1_TEMP              0x0203FFFE
+#define OBJ_2_TEMP              0x0203FFFF
+
+
+/*Variables regarding battle background loading*/
+#define NORMAL_VAR              0x4000
+#define SEA_VAR                 0x4001
+
+/*Variables and Tags regarding mugshots*/
+#define MUGHSOT_1_TABLE         0x5000
+#define MUGSHOT_1_X             0x5001
+#define MUGSHOT_1_Y             0x5002
+#define MUGSHOT_1_TAG           0x1337
+
+#define MUGHSOT_2_TABLE         0x5003
+#define MUGSHOT_2_X             0x5004
+#define MUGSHOT_2_Y             0x5005
+#define MUGSHOT_2_TAG           0x1338
+
+/*Variable for special control*/
+#define CALLASM_VAR             0x5006
+
+/*Variables for camera control*/
+#define CAMERA_VAR_X            0x5007
+#define CAMERA_VAR_Y            0x5008
+
+/*Variables for walking script control*/
+#define WALK_SCRIPT_VAR         0x5009
+
+/*Variable for custom text*/
+#define TEXT_VAR                0x500C
+
+/*Variable for controlling evolutions*/
+#define EVO_VAR                 0x500D
+
+#define HEALING_BANK_MAP_VAR    0x500E
+#define HEALING_X_VAR           0x500F
+#define HEALING_Y_VAR           0x5010
+
+/*Variables to control the music overrides*/
+#define VAR_FROM_1              0x51FA
+#define VAR_FROM_2              0x51FB
+#define VAR_FROM_3              0x51FC
+#define VAR_TO_1                0x51FD
+#define VAR_TO_2                0x51FE
+#define VAR_TO_3                0x51FF
+
+/*Flag to enable the music overrides*/
+#define FLAG_SKIP_BATTLE_MUSIC  0x742
+
+/*Flag to deactivate transparent textboxes*/
+#define FLAG_ACTIVATE           0x900
+#define FLAG_WALK_SCRIPT        0x901
+#define FLAG_DEOXYS_AURA        0x902
+
+/*Effect IDs controlling various in-battle item effects etc.*/
+#define ITEM_EFFECT_SMOOTH_ROCK 0x48
+#define ITEM_EFFECT_DAMP_ROCK   0x49
+#define ITEM_EFFECT_HEAT_ROCK   0x4A
+#define ITEM_EFFECT_ICY_ROCK    0x4B
+#define ITEM_EFFECT_FLAME_ORB   0x4C
+#define ITEM_EFFECT_TOXIC_ORB   0x4D
+#define ITEM_EFFECT_EXPERT_BELT 0x4E
+
+/*Battlescript command definitions (Do not edit unless changing the command table [bs_command_table.S])*/
+#define BS_ATTACKSTRING         0x02
+#define BS_PPREDUCE             0x03
+
+#define BS_ATTACKANIMATION      0x09
+#define BS_WAITANIMATION        0x0A
+#define BS_PRINTSTRING          0x10
+#define BS_WAITMESSAGE          0x12
+#define BS_JUMPIFSTATUS         0x1C
+#define BS_JUMPIFABILITY        0x1E
+#define BS_JUMPIFSTAT           0x20
+#define BS_JUMPIFWORD           0x2B
+#define BS_GOTO                 0x28
+#define BS_JUMPIFARRAYNOTEQUAL  0x2D
+#define BS_SETBYTE              0x2E
+#define BS_ORWORD               0x35
+#define BS_PAUSE                0x39
+#define BS_WAITSTATE            0x3A
+#define BS_RETURN               0x3C
+#define BS_END3                 0x3F
+#define BS_CALL                 0x41
+#define BS_PLAYANIMATION        0x45
+#define BS_PLAYSTATANIM         0x48
+#define BS_SWITCH1              0x4C
+#define BS_SWITCH2              0x4D
+#define BS_SWITCH3              0x4E
+#define BS_NOP3                 0x83
+#define BS_STATBUFFCHANGE       0x89
+#define BS_CASTFORMSWITCH       0xE7
+#define BS_CALLASM              0xF8
+#define BS_CURESTATUS           0xF9
+#define BS_SETWORD              0xFA
+
+/*For hacking the miracle eye command into set foresight*/
+/*Comment out the first define to deactivate the miracleeye injection in the command table*/
+
+/*Some move effect IDs important for correct implementation*/
+#define MOVE_EFFECT_SACRED_SWORD    0xFF
+
+#endif

src/music/battle_music_lookup.c

@@ -16,53 +16,365 @@ u16 mhk_intro_music_id_to_song(u8 introid) {
     u16 res = 0;
 
     switch (introid) {
-        case TRAINER_EYE_MUS_BOY:
-            res = 350;
+        case 0:
+            res = 480;
             break;
-        case TRAINER_EYE_MUS_GIRL:
-            res = 351;
+        case 1:
+            res = 480;
             break;
-        case TRAINER_EYE_MUS_KID:
-            res = 352;
+        case 2:
+            res = 480;
             break;
-        case TRAINER_EYE_MUS_HIKER:
-            res = 353;
+        case 3:
+            res = 471;
             break;
-        case TRAINER_EYE_MUS_SAILOR:
-            res = 354;
+        case 4:
+            res = 471;
             break;
-        case TRAINER_EYE_MUS_ELECTRIC:
-            res = 355;
+        case 5:
+            res = 480;
             break;
-        case TRAINER_EYE_MUS_PSYCHIC:
-            res = 356;
+        case 6:
+            res = 487;
             break;
-        case TRAINER_EYE_MUS_SWIMMER:
-            res = 357;
+        case 7:
+            res = 476;
             break;
-        case TRAINER_EYE_MUS_ACE:
-            res = 358;
+        case 8:
+            res = 471;
             break;
-        case TRAINER_EYE_MUS_ELITE:
-            res = 359;
+        case 9:
+            res = 471;
             break;
-        case TRAINER_EYE_MUS_CHAMP:
-            res = 360;
+        case 10:
+            res = 480;
             break;
-        case TRAINER_EYE_MUS_TT_GRUNT_M:
-            res = 361;
+        case 11:
+            res = 480;
             break;
-        case TRAINER_EYE_MUS_TT_GRUNT_F:
-            res = 362;
+        case 12:
+            res = 480;
             break;
-        case TRAINER_EYE_MUS_TT_ADMIN:
-            res = 363;
+        case 13:
+            res = 480;
             break;
-        case TRAINER_EYE_MUS_TT_BOSS_1:
-            res = 364;
+        case 14:
+            res = 488;
             break;
-        case TRAINER_EYE_MUS_TT_BOSS_2:
-            res = 365;
+        case 15:
+            res = 475;
+            break;
+        case 16:
+            res = 475;
+            break;
+        case 17:
+            res = 470;
+            break;
+        case 18:
+            res = 495;
+            break;
+        case 19:
+            res = 480;
+            break;
+        case 20:
+            res = 475;
+            break;
+        case 21:
+            res = 481;
+            break;
+        case 22:
+            res = 471;
+            break;
+        case 23:
+            res = 471;
+            break;
+        case 24:
+            res = 473;
+            break;
+        case 25:
+            res = 473;
+            break;
+        case 26:
+            res = 480;
+            break;
+        case 27:
+            res = 480;
+            break;
+        case 28:
+            res = 491;
+            break;
+        case 29:
+            res = 488;
+            break;
+        case 30:
+            res = 488;
+            break;
+        case 31:
+            res = 488;
+            break;
+        case 32:
+            res = 491;
+            break;
+        case 33:
+            res = 490;
+            break;
+        case 34:
+            res = 472;
+            break;
+        case 35:
+            res = 472;
+            break;
+        case 36:
+            res = 471;
+            break;
+        case 37:
+            res = 492;
+            break;
+        case 38:
+            res = 492;
+            break;
+        case 39:
+            res = 490;
+            break;
+        case 40:
+            res = 472;
+            break;
+        case 41:
+            res = 491;
+            break;
+        case 42:
+            res = 480;
+            break;
+        case 43:
+            res = 493;
+            break;
+        case 44:
+            res = 495;
+            break;
+        case 45:
+            res = 495;
+            break;
+        case 46:
+            res = 472;
+            break;
+        case 47:
+            res = 473;
+            break;
+        case 48:
+            res = 472;
+            break;
+        case 49:
+            res = 480;
+            break;
+        case 50:
+            res = 470;
+            break;
+        case 51:
+            res = 470;
+            break;
+        case 52:
+            res = 470;
+            break;
+        case 53:
+            res = 494;
+            break;
+        case 54:
+            res = 494;
+            break;
+        case 55:
+            res = 494;
+            break;
+        case 56:
+            res = 494;
+            break;
+        case 57:
+            res = 494;
+            break;
+        case 58:
+            res = 494;
+            break;
+        case 59:
+            res = 494;
+            break;
+        case 60:
+            res = 494;
+            break;
+        case 61:
+            res = 494;
+            break;
+        case 62:
+            res = 494;
+            break;
+        case 63:
+            res = 473;
+            break;
+        case 64:
+            res = 473;
+            break;
+        case 65:
+            res = 470;
+            break;
+        case 66:
+            res = 470;
+            break;
+        case 67:
+            res = 490;
+            break;
+        case 68:
+            res = 491;
+            break;
+        case 69:
+            res = 490;
+            break;
+        case 70:
+            res = 490;
+            break;
+        case 71:
+            res = 491;
+            break;
+        case 72:
+            res = 480;
+            break;
+        case 73:
+            res = 495;
+            break;
+        case 74:
+            res = 490;
+            break;
+        case 75:
+            res = 474;
+            break;
+        case 76:
+            res = 476;
+            break;
+        case 77:
+            res = 476;
+            break;
+        case 78:
+            res = 477;
+            break;
+        case 79:
+            res = 477;
+            break;
+        case 80:
+            res = 496;
+            break;
+        case 81:
+            res = 475;
+            break;
+        case 82:
+            res = 475;
+            break;
+        case 83:
+            res = 472;
+            break;
+        case 84:
+            res = 471;
+            break;
+        case 85:
+            res = 494;
+            break;
+        case 86:
+            res = 490;
+            break;
+        case 87:
+            res = 486;
+            break;
+        case 88:
+            res = 470;
+            break;
+        case 89:
+            res = 472;
+            break;
+        case 90:
+            res = 484;
+            break;
+        case 91:
+            res = 472;
+            break;
+        case 92:
+            res = 481;
+            break;
+        case 93:
+            res = 485;
+            break;
+        case 94:
+            res = 472;
+            break;
+        case 95:
+            res = 472;
+            break;
+        case 96:
+            res = 472;
+            break;
+        case 97:
+            res = 470;
+            break;
+        case 98:
+            res = 496;
+            break;
+        case 99:
+            res = 480;
+            break;
+        case 100:
+            res = 480;
+            break;
+        case 101:
+            res = 481;
+            break;
+        case 102:
+            res = 481;
+            break;
+        case 103:
+            res = 495;
+            break;
+        case 104:
+            res = 475;
+            break;
+        case 105:
+            res = 471;
+            break;
+        case 106:
+            res = 490;
+            break;
+        case 107:
+            res = 495;
+            break;
+        case 108:
+            res = 481;
+            break;
+        case 109:
+            res = 495;
+            break;
+        case 110:
+            res = 495;
+            break;
+        case 111:
+            res = 482;
+            break;
+        case 112:
+            res = 482;
+            break;
+        case 113:
+            res = 483;
+            break;
+        case 114:
+            res = 495;
+            break;
+        case 115:
+            res = 472;
+            break;
+        case 116:
+            res = 495;
+            break;
+        case 117:
+            res = 482;
+            break;
+        case 118:
+            res = 483;
+            break;
+        case 119:
+            res = 483;
             break;
         default:
             res = SEQ_FRLG_E_1;
@@ -81,19 +393,39 @@ u16 mhk_song_id_for_battle(void) {
         res = SEQ_BGM_VS_RSE;
     } else if (battle_type_flags.battle_trainer) {
         switch (trainer_data[trainerbattle_flag_id].trainer_class) {
+            case 36:
+                res = 527;
+                break;
             case 90:
-                res = SEQ_BGM_VS_CHAMP;
+                res = 528;
                 break;
-            case 84:
-            case 87:
-                res = SEQ_BGM_VS_LEADER;
+            case 93:
+                res = 524;
+                break;
+            case 111:
+                res = 532;
+                break;
+            case 112:
+                res = 529;
+                break;
+            case 113:
+                res = 530;
+                break;
+            case 117:
+                res = 532;
+                break;
+            case 118:
+                res = 530;
+                break;
+            case 119:
+                res = 531;
                 break;
             default:
-                res = SEQ_BGM_VS_TRAINER;
+                res = 522;
                 break;
         }
     } else {
-        res = SEQ_BGM_VS_POKE;
+        res = 523;
     }
 
     return res;
@@ -154,10 +486,10 @@ u16 mhk_species_to_song(u16 species) {
         case POKE_MOLTRES:
         case POKE_LUGIA:
         case POKE_HOOH:
-            res = SEQ_BGM_VS_LEG1;
+            res = 526;
             break;
         case POKE_DEOXYS:
-            res = SEQ_BGM_VS_DEOXYS;
+            res = 525;
             break;
         default:
             res = SEQ_BGM_VS_RSE;