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

2018-07-24 21:18:36 -07:00
parent 156fb472e1 5883f867f0
commit e92e2cb0aa
1092 changed files with 39655 additions and 38981 deletions
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -57,6 +57,7 @@
 #include "malloc.h"
 #include "gpu_regs.h"
 #include "link_rfu.h"
+#include "constants/map_types.h"

 // event scripts
 extern const u8 EventScript_WhiteOut[];