dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-tilesets

Browse Source
This commit is contained in:
GriffinR
2020-02-16 11:29:06 -05:00
committed by GitHub
parent 659afd708b 4e07002d13
commit b4fce4020d
62 changed files with 911 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/layouts/layouts.json
+8 -8
View File
@@ -2504,28 +2504,28 @@
"blockdata_filepath": "data/layouts/RocketHideout_Elevator/map.bin"
},
{
"id": "LAYOUT_SAFFRON_CITY_HOUSE1_1F",
"name": "SaffronCity_House1_1F_Layout",
"id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F",
"name": "SaffronCity_CopycatsHouse_1F_Layout",
"width": 13,
"height": 10,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_GenericBuilding1",
"border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin"
"border_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/map.bin"
},
{
"id": "LAYOUT_SAFFRON_CITY_HOUSE1_2F",
"name": "SaffronCity_House1_2F_Layout",
"id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F",
"name": "SaffronCity_CopycatsHouse_2F_Layout",
"width": 12,
"height": 9,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_GenericBuilding1",
"border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin"
"border_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/map.bin"
},
{
"id": "LAYOUT_SAFFRON_CITY_DOJO",