Merge branch 'master' into contest-ai-cleanup

src/battle_controller_safari.c

@@ -5,7 +5,7 @@
 #include "battle_interface.h"
 #include "battle_message.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item_menu.h"
 #include "link.h"
 #include "main.h"
@@ -24,8 +24,6 @@
 #include "constants/songs.h"
 #include "constants/rgb.h"
 
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void SafariHandleGetMonData(void);
 static void SafariHandleGetRawMonData(void);