Merge branch 'master' into doc-tilesets

This commit is contained in:
GriffinR authored and GitHub committed 2020-02-16 11:29:06 -05:00
commit b4fce4020d
62 files changed
+911 -904

No files matched your search

+2 -2
View File
@@ -208,8 +208,8 @@
#define LAYOUT_ROUTE16_NORTH_ENTRANCE_1F 223
#define LAYOUT_ENTRANCE_1F 224
#define LAYOUT_ROCKET_HIDEOUT_ELEVATOR 225
#define LAYOUT_SAFFRON_CITY_HOUSE1_1F 226
#define LAYOUT_SAFFRON_CITY_HOUSE1_2F 227
#define LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F 226
#define LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F 227
#define LAYOUT_SAFFRON_CITY_DOJO 228
#define LAYOUT_SILPH_CO_ELEVATOR 229
#define LAYOUT_ONE_ISLAND 230