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/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -3,7 +3,7 @@
 #include "event_data.h"
 #include "pokemon.h"
 #include "constants/items.h"
-#include "rng.h"
+#include "random.h"
 #include "species.h"
 #include "string_util.h"
 #include "text.h"