Merge branch 'master' into doc-overworld

2020-07-15 00:40:47 -04:00
parent ebb6c4ee66 3c356a1d7a
commit e129d04b93
88 changed files with 1413 additions and 1248 deletions
@@ -38,11 +38,9 @@
 #include "text.h"
 #include "constants/event_bg.h"
 #include "constants/event_objects.h"
-#include "constants/flags.h"
 #include "constants/item_effects.h"
 #include "constants/items.h"
 #include "constants/songs.h"
-#include "constants/vars.h"

 static void SetUpItemUseCallback(u8 taskId);
 static void FieldCB_UseItemOnField(void);