Merge remote-tracking branch 'pret/master' into trade

2018-12-25 15:03:13 -06:00
parent dea41e1a7e a54aa03d20
commit d8948a5cda
517 changed files with 41317 additions and 67419 deletions
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -1,9 +1,8 @@
 #include "global.h"
 #include "bg.h"
 #include "fieldmap.h"
-#include "fldeff_80F9BCC.h"
-#include "fldeff_cut.h"
-#include "fldeff_groundshake.h"
+#include "fldeff.h"
+#include "fldeff_misc.h"
 #include "frontier_util.h"
 #include "menu.h"
 #include "overworld.h"