summaryrefslogtreecommitdiff
path: root/src/load_save.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-17 20:22:56 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-17 20:22:56 +0100
commit46fa2557d777096803ff90ba95d5500a9c03d2c5 (patch)
treeded4f0e046be43e371631fca3ac013d96fa244e0 /src/load_save.c
parent930fea6fad24692773b930ec7448c59d599844b8 (diff)
parent6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff)
merge mail with master, fix conflicts
Diffstat (limited to 'src/load_save.c')
-rw-r--r--src/load_save.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/load_save.c b/src/load_save.c
index 1d78bda50..2b40f2e92 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -3,7 +3,7 @@
#include "load_save.h"
#include "main.h"
#include "pokemon.h"
-#include "rng.h"
+#include "random.h"
extern void* gUnknown_0203CF5C;