diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
commit | 46fa2557d777096803ff90ba95d5500a9c03d2c5 (patch) | |
tree | ded4f0e046be43e371631fca3ac013d96fa244e0 /src/lottery_corner.c | |
parent | 930fea6fad24692773b930ec7448c59d599844b8 (diff) | |
parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) |
merge mail with master, fix conflicts
Diffstat (limited to 'src/lottery_corner.c')
-rw-r--r-- | src/lottery_corner.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lottery_corner.c b/src/lottery_corner.c index 211b78f19..2ded9c943 100644 --- a/src/lottery_corner.c +++ b/src/lottery_corner.c @@ -2,9 +2,9 @@ #include "lottery_corner.h" #include "event_data.h" #include "pokemon.h" -#include "items.h" -#include "rng.h" -#include "species.h" +#include "constants/items.h" +#include "random.h" +#include "constants/species.h" #include "string_util.h" #include "text.h" |