diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
commit | 44abbae60b6a39e2a1432426005e1860be196abb (patch) | |
tree | f2405db72863761afcdcda57a88cf6ab0346e4fd /src/recorded_battle.c | |
parent | 039c9f4bd8ee6bfb299d4422372804c569eddebd (diff) | |
parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) |
nerge with master, fix conflicts
Diffstat (limited to 'src/recorded_battle.c')
-rw-r--r-- | src/recorded_battle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/recorded_battle.c b/src/recorded_battle.c index e843ff7cb..4f3fe4ab9 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -3,7 +3,7 @@ #include "recorded_battle.h" #include "main.h" #include "pokemon.h" -#include "rng.h" +#include "random.h" #include "event_data.h" #include "link.h" #include "string_util.h" |