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/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -10,7 +10,7 @@
 #include "species.h"
 #include "link.h"
 #include "constants/hold_effects.h"
-#include "rng.h"
+#include "random.h"
 #include "trainer_classes.h"
 #include "trainer_ids.h"
 #include "songs.h"