diff options
| author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
| commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
| tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /src/field_control_avatar.c | |
| parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index ae598045e..7b17413d3 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -8,10 +8,9 @@ #include "event_scripts.h" #include "fieldmap.h" #include "field_control_avatar.h" -#include "field_fadetransition.h" #include "field_player_avatar.h" #include "field_poison.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "field_specials.h" #include "fldeff_80F9BCC.h" #include "item_menu.h" |