diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-26 02:24:41 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-26 02:24:41 -0600 |
| commit | 48c6d764e00285378d3f24d954855c6bde613bc0 (patch) | |
| tree | 82f907925cb280cfeccfc0eeb66595e87cea6f5b /src/field/field_map_obj.c | |
| parent | 4e1098beb6a84a46f0ac2bff37013a3f675f6750 (diff) | |
| parent | d373f41c2cbd2dc71ca2287b179c7c8777b9eb02 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/field/field_map_obj.c')
| -rw-r--r-- | src/field/field_map_obj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c index 98f6fedab..20edbc34f 100644 --- a/src/field/field_map_obj.c +++ b/src/field/field_map_obj.c @@ -10,7 +10,7 @@ #include "field_player_avatar.h" #include "fieldmap.h" #include "palette.h" -#include "rng.h" +#include "random.h" #include "overworld.h" #include "sprite.h" #include "metatile_behavior.h" |