Merge branch 'master' into event_object_movement

1 files changed, 4 insertions, 11 deletions

diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 7df93e170..a80e79bf4 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1,27 +1,20 @@
 #include "global.h"
-#include "bg.h"
 #include "data.h"
 #include "link.h"
-#include "main.h"
 #include "m4a.h"
 #include "palette.h"
 #include "pokeball.h"
 #include "pokemon.h"
-#include "reshow_battle_screen.h"
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
 #include "util.h"
-#include "window.h"
 #include "battle.h"
-#include "battle_ai_script_commands.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
 #include "battle_interface.h"
 #include "battle_message.h"
-#include "battle_setup.h"
-#include "battle_tower.h"
 #include "constants/battle_anim.h"
 #include "constants/songs.h"
 #include "constants/facility_trainer_classes.h"
@@ -1134,11 +1127,11 @@ static void LinkOpponentHandleDrawTrainerPic(void)
         }
         else if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE)
         {
-            trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PLAYER_4];
+            trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
         }
         else
         {
-            trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PLAYER_3];
+            trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
         }
     }
     else
@@ -1159,11 +1152,11 @@ static void LinkOpponentHandleDrawTrainerPic(void)
         }
         else if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE)
         {
-            trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PLAYER_4];
+            trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
         }
         else
         {
-            trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PLAYER_3];
+            trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
         }
     }
     DecompressTrainerFrontPic(trainerPicId, gActiveBattler);