Merge branch 'master' into contest-ai-cleanup

src/battle_controller_wally.c

@@ -7,7 +7,7 @@
 #include "battle_setup.h"
 #include "battle_tv.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item.h"
 #include "item_menu.h"
 #include "link.h"
@@ -32,8 +32,6 @@
 #include "constants/trainers.h"
 #include "constants/rgb.h"
 
-extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
-
 // this file's functions
 static void WallyHandleGetMonData(void);
 static void WallyHandleGetRawMonData(void);