Merge branch 'master' into fldeff

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"