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

Merge master into ObjEvent rename and prune accidental inclusions

Browse Source
This commit is contained in:
GriffinR
2020-01-08 05:43:06 -05:00
parent 68cdd7b1cb
commit ef67f2d33b
85 changed files with 4548 additions and 4729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin → data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin
View File

0
data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin → data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin
View File

0
data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin → data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin
View File

0
data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin → data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin
View File

16
data/layouts/layouts.json
View File

@@ -3892,24 +3892,24 @@
"blockdata_filepath": "data/layouts/DesertUnderpass/map.bin"
},
{
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
"name": "BattleFrontier_BattleTowerMultiBattleRoom_Layout",
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
"name": "BattleFrontier_BattleTowerMultiPartnerRoom_Layout",
"width": 21,
"height": 15,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattleFrontier",
"border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin",
"blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin"
"border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin",
"blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin"
},
{
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2",
"name": "BattleFrontier_BattleTowerCorridor2_Layout",
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
"name": "BattleFrontier_BattleTowerMultiCorridor_Layout",
"width": 17,
"height": 5,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattleFrontier",
"border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin",
"blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin"
"border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin",
"blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin"
},
{
"id": "LAYOUT_ROUTE111_NO_MIRAGE_TOWER",