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

+4 -4
View File
@@ -409,15 +409,15 @@
"IndigoPlateau_PokemonCenter_2F"
],
"gMapGroup14": [
"SaffronCity_House1_1F",
"SaffronCity_House1_2F",
"SaffronCity_CopycatsHouse_1F",
"SaffronCity_CopycatsHouse_2F",
"SaffronCity_Dojo",
"SaffronCity_Gym",
"SaffronCity_House2",
"SaffronCity_House",
"SaffronCity_Mart",
"SaffronCity_PokemonCenter_1F",
"SaffronCity_PokemonCenter_2F",
"SaffronCity_House3",
"SaffronCity_MrPsychicsHouse",
"SaffronCity_PokemonTrainerFanClub"
],
"gMapGroup15": [