diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-15 21:04:25 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-15 21:04:25 -0500 |
| commit | da2e0dfe5075d8e6200ecd06994175c81c847705 (patch) | |
| tree | 183a9573fcc757f77e1eb784750028d225336979 /src/berry.c | |
| parent | 88636dfc2a07790d9bdbba1ca56f4ca252d16f5b (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
Merge branch 'master' into clock
Diffstat (limited to 'src/berry.c')
| -rw-r--r-- | src/berry.c | 4 |
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" |