merge with master

2018-03-01 10:12:35 +01:00
parent b846015343 0a9f0d80f5
commit edf2ea45b1
38 changed files with 3839 additions and 8153 deletions
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -5,7 +5,7 @@
 #include "battle_interface.h"
 #include "battle_anim.h"
 #include "constants/battle_anim.h"
-#include "battle_link_817C95C.h"
+#include "battle_tv.h"
 #include "battle_ai_script_commands.h"
 #include "pokemon.h"
 #include "link.h"