summaryrefslogtreecommitdiff
path: root/src/berry.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-12-15 00:08:48 -0600
committerDiegoisawesome <diego@domoreaweso.me>2017-12-15 00:08:48 -0600
commite3c366df6489c92a6ac5778b458b815cc8eab75d (patch)
tree89c80f554da617d89641af8a707ccf9c96d5707c /src/berry.c
parent8e9428c482d33ac59b5c29d89db0bd5a2e6fdef3 (diff)
parentc9f196cdfea08eefffd39ebc77a150f197e1250e (diff)
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'src/berry.c')
-rw-r--r--src/berry.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/berry.c b/src/berry.c
index 0c1553463..74b7090c0 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -2,9 +2,9 @@
#include "berry.h"
#include "main.h"
#include "item.h"
-#include "items.h"
+#include "constants/items.h"
#include "text.h"
-#include "rng.h"
+#include "random.h"
#include "event_data.h"
#include "fieldmap.h"