dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into doc-tower

Browse Source
This commit is contained in:
GriffinR
2019-12-17 21:17:46 -05:00
parent ddfa0c6298 f8cef9a6a8
commit 23f952b34e
145 changed files with 7875 additions and 10345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin → data/layouts/BattleFrontier_BattlePyramidFloor/border.bin
View File

0
data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin → data/layouts/BattleFrontier_BattlePyramidFloor/map.bin
View File

8
data/layouts/layouts.json
View File

@@ -3602,14 +3602,14 @@
"blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin"
},
{
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
"name": "BattleFrontier_BattlePyramidEmptySquare_Layout",
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR",
"name": "BattleFrontier_BattlePyramidFloor_Layout",
"width": 8,
"height": 8,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattlePyramid",
"border_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin",
"blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin"
"border_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/border.bin",
"blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/map.bin"
},
{
"id": "LAYOUT_BATTLE_PYRAMID_SQUARE01",