Merge with master

2018-12-20 22:53:08 +01:00
parent 7dcb614cca 6ef9671718
commit ecee02816d
323 changed files with 74857 additions and 128444 deletions
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -50,8 +50,6 @@ struct PikeWildMon
    u16 moves[4];
 };

-extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
-
 // IWRAM bss
 static IWRAM_DATA u8 sRoomType;
 static IWRAM_DATA u8 sStatusMon;