diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-15 00:08:48 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-15 00:08:48 -0600 |
commit | e3c366df6489c92a6ac5778b458b815cc8eab75d (patch) | |
tree | 89c80f554da617d89641af8a707ccf9c96d5707c /src/pokemon_2.c | |
parent | 8e9428c482d33ac59b5c29d89db0bd5a2e6fdef3 (diff) | |
parent | c9f196cdfea08eefffd39ebc77a150f197e1250e (diff) |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'src/pokemon_2.c')
-rw-r--r-- | src/pokemon_2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 7014be492..a4d00112b 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -2,9 +2,9 @@ #include "pokemon.h" #include "battle.h" #include "event_data.h" -#include "rng.h" +#include "random.h" #include "sprite.h" -#include "species.h" +#include "constants/species.h" #include "text.h" #include "string_util.h" |