Merge branch 'master' into fldeff

2018-12-16 20:05:31 -05:00
parent 10237e8d13 d1e6e705cc
commit e292d0ca83
714 changed files with 111097 additions and 142352 deletions
@@ -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"