diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /src/field_effect.c | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index fe586fcb6..b0c028c8d 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1,7 +1,8 @@ #include "global.h" #include "field_effect.h" -#include "weather.h" #include "sprite.h" +#include "text.h" +#include "weather.h" typedef bool8 (*FldEffCmd)(u8 **, u32 *); |