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_BattleFactoryPreBattleRoom | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/BattleFrontier_BattleFactoryPreBattleRoom')
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin | bin | 0 -> 8 bytes | |||
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc | 15 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin | 2 |
3 files changed, 17 insertions, 0 deletions
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin Binary files differnew file mode 100644 index 000000000..f496f458e --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc new file mode 100644 index 000000000..b8427f82f --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -0,0 +1,15 @@ +BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC + .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes + .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents + .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts + .4byte 0x0 + .2byte BGM_BATTLE_FACTORY + .2byte 347 + .byte 58 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 + diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin new file mode 100644 index 000000000..15e97cb30 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin @@ -0,0 +1,2 @@ +ýþÿ01ýåæç BíîïR%&'JRRõö÷=>?-./
//=>?]^_*+,*+,ABCOMN234234DEFS\UVSSSHIJS`abcdÒÓDhijkl3ÚÛL4PQ33PQXY
Z[4&'4
XY&'3&'3 +
\ No newline at end of file |