summaryrefslogtreecommitdiff
path: root/src/field_control_avatar.c
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-12-19 21:35:32 -0500
committergarak <garakmon@gmail.com>2018-12-19 21:35:32 -0500
commitaf208a6bbb671cbf471d08856994470e707c5051 (patch)
tree9a57703eecf8c18f444454f2fae8f5dccf19d408 /src/field_control_avatar.c
parent7e170a06cc3155a6a8785af0b910434e5ab43d2b (diff)
parentf801eed3a84862d88af0d5e43c6b6754e36001f2 (diff)
Merge branch 'fldeff' of https://github.com/garakmon/pokeemerald into fldeff
Diffstat (limited to 'src/field_control_avatar.c')
-rw-r--r--src/field_control_avatar.c3
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"