Merge branch 'master' into link

2017-12-16 11:27:10 -05:00
parent b1c6f80e10 224fdbf026
commit 190a2cba61
196 changed files with 20942 additions and 24990 deletions
@@ -8,9 +8,9 @@
 #include "bg.h"
 #include "rtc.h"
 #include "unknown_task.h"
-#include "rng.h"
 #include "overworld.h"
 #include "play_time.h"
+#include "random.h"
 #include "dma3.h"
 #include "gba/flash_internal.h"
 #include "load_save.h"