diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 08:36:51 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 19:00:07 -0500 |
| commit | 236cbf96c8f94b8b2d23be8c72ee0e188e82842d (patch) | |
| tree | c2042f78efdc37a5b64c9cd797cc0c66a0c80255 /data/maps/BattleFrontier_BattleFactoryBattleRoom | |
| parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
| parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) | |
Merge origin/master into pikalaxalt/link
Diffstat (limited to 'data/maps/BattleFrontier_BattleFactoryBattleRoom')
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin | bin | 0 -> 8 bytes | |||
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc | 15 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin | bin | 0 -> 312 bytes |
3 files changed, 15 insertions, 0 deletions
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin b/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin Binary files differnew file mode 100644 index 000000000..f496f458e --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc new file mode 100644 index 000000000..5ae64a1f5 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -0,0 +1,15 @@ +BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 + .4byte BattleFrontier_BattleFactoryBattleRoom_MapAttributes + .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents + .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts + .4byte 0x0 + .2byte BGM_BATTLE_FACTORY + .2byte 348 + .byte 58 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 + diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin Binary files differnew file mode 100644 index 000000000..feffbf038 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin |