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
@@ -17,7 +17,6 @@
 #include "constants/event_object_movement.h"
 #include "constants/field_specials.h"
 #include "constants/songs.h"
-#include "constants/vars.h"
 #include "constants/metatile_labels.h"

 #define SECONDS(value) ((signed) (60.0 * value + 0.5))