diff options
author | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
commit | 32153295edc1e93bd27894f75f2ab01f9140bed5 (patch) | |
tree | 397bb2852fbacc95b66a2b121c0a7eeb31c5c44d /src/field_effect.c | |
parent | e78f49f1efc2eadb674d00c00ffc9a4018b3cdbd (diff) | |
parent | 242af849cb56ce0c4469c4e2be82a3ad5dbd3434 (diff) |
Merge remote-tracking branch 'upstream/master' into decompile_battle_2
Diffstat (limited to 'src/field_effect.c')
-rw-r--r-- | src/field_effect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 1b2346a00..bbc1144c1 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1,6 +1,6 @@ #include "global.h" #include "field_effect.h" -#include "field_screeneffect.h" +#include "field_weather.h" #include "sprite.h" #include "text.h" |