Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu

2018-12-13 00:31:06 -05:00
parent 2265d49ac2 170b6ef449
commit 6748ef72fb
525 changed files with 76142 additions and 91660 deletions
@@ -10,7 +10,7 @@
 #include "fieldmap.h"
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "field_weather.h"
 #include "item.h"
 #include "item_menu.h"