diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
| commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
| tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /data/maps/BattleFrontier_BattleFactoryBattleRoom | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
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 |