3 files changed, 11 insertions, 5 deletions
diff --git a/src/battle/battle_1.c b/src/battle/battle_1.c
index 1f920f345..210d2c2ab 100644
--- a/src/battle/battle_1.c
+++ b/src/battle/battle_1.c
@@ -1,9 +1,12 @@
 #include "global.h"
 #include "data2.h"
 #include "battle_setup.h"
+#include "battle.h"
+#include "trainer.h"
 #include "constants/species.h"
 #include "constants/moves.h"
 #include "constants/items.h"
+#include "constants/opponents.h"
 
 const struct MonCoords gTrainerBackPicCoords[] = {
     {8, 4},
@@ -452,6 +455,9 @@ const u8 gEnemyMonElevation[] = {
 
 #if ENGLISH
 #include "../data/text/trainer_class_names_en.h"
+#include "../data/trainers_en.h"
 #elif GERMAN
 #include "../data/text/trainer_class_names_de.h"
+#include "../data/trainers_de.h"
 #endif
+
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index b00c35312..f969a28d8 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -985,7 +985,7 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
             {
             case 0:
             {
-                struct TrainerPartyMember0 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerPartyMember0 *partyData = gTrainers[trainerNum].party;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
@@ -996,7 +996,7 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
             }
             case 1:
             {
-                struct TrainerPartyMember1 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerPartyMember1 *partyData = gTrainers[trainerNum].party;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
@@ -1013,7 +1013,7 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
             }
             case 2:
             {
-                struct TrainerPartyMember2 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerPartyMember2 *partyData = gTrainers[trainerNum].party;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
@@ -1026,7 +1026,7 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
             }
             case 3:
             {
-                struct TrainerPartyMember3 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerPartyMember3 *partyData = gTrainers[trainerNum].party;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 892be1029..1c6be029d 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -748,7 +748,7 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
     u8 i;
     u8 sum;
     u32 count = numMons;
-    void *party;
+    const void *party;
 
     if (gTrainers[opponentId].partySize < count)
         count = gTrainers[opponentId].partySize;