fix merge conflicts

2017-12-05 12:42:30 -06:00
parent caa13f8777 00896cb3b5
commit 19fbf024ff
100 changed files with 3456 additions and 5378 deletions
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -5,7 +5,7 @@
 #include "moves.h"
 #include "pokemon.h"
 #include "species.h"
-#include "rng.h"
+#include "random.h"
 #include "util.h"
 #include "constants/items.h"
 #include "pokemon_item_effects.h"