Merge branch 'master' into doc-tilesets

This commit is contained in:
GriffinR authored and GitHub committed 2020-02-16 12:16:04 -05:00
commit 2c92f89adc
62 files changed
+873 -838

No files matched your search

+1 -1
View File
@@ -301,7 +301,7 @@
#define LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F 316
#define LAYOUT_SIX_ISLAND_PATTERN_BUSH 317
#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL 318
#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2 319
#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT 319
#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE 320
#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1 321
#define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2 322