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/tv.c
+++ b/src/tv.c
@@ -4,7 +4,7 @@
 #include "rtc.h"
 #include "overworld.h"
 #include "constants/maps.h"
-#include "rng.h"
+#include "random.h"
 #include "event_data.h"
 #include "fieldmap.h"
 #include "field_camera.h"