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
@@ -13,7 +13,6 @@
 #include "field_player_avatar.h"
 #include "event_object_movement.h"
 #include "event_data.h"
-#include "constants/vars.h"
 #include "constants/songs.h"
 #include "pokemon_storage_system.h"
 #include "graphics.h"