Merge branch 'master' into contest-ai-cleanup

src/evolution_scene.c

@@ -3,7 +3,7 @@
 #include "battle.h"
 #include "battle_message.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "evolution_scene.h"
 #include "evolution_graphics.h"
@@ -53,8 +53,6 @@ void (*gCB2_AfterEvolution)(void);
 #define sEvoCursorPos           gBattleCommunication[1] // when learning a new move
 #define sEvoGraphicsTaskID      gBattleCommunication[2]
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
-
 // this file's functions
 static void Task_EvolutionScene(u8 taskID);
 static void Task_TradeEvolutionScene(u8 taskID);