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_BattleFactoryLobby | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/BattleFrontier_BattleFactoryLobby')
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryLobby/border.bin | bin | 0 -> 8 bytes | |||
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryLobby/header.inc | 15 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryLobby/map.bin | 2 |
3 files changed, 17 insertions, 0 deletions
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/border.bin b/data/maps/BattleFrontier_BattleFactoryLobby/border.bin Binary files differnew file mode 100644 index 000000000..f496f458e --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryLobby/border.bin diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc new file mode 100644 index 000000000..b376011f4 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -0,0 +1,15 @@ +BattleFrontier_BattleFactoryLobby: @ 84854A0 + .4byte BattleFrontier_BattleFactoryLobby_MapAttributes + .4byte BattleFrontier_BattleFactoryLobby_MapEvents + .4byte BattleFrontier_BattleFactoryLobby_MapScripts + .4byte 0x0 + .2byte BGM_BATTLE_FACTORY + .2byte 346 + .byte 58 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 + diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.bin b/data/maps/BattleFrontier_BattleFactoryLobby/map.bin new file mode 100644 index 000000000..66037e302 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.bin @@ -0,0 +1,2 @@ +#""#"""#"""#""#$()$(%)$(%)$()$ÕÖÖÖ×*+,ÝÞÞÞß*+,9<S234KTUVK234S<<A:`S\3]3^3LO;I22a-.=3202;/-432432 4!_1 4!3323322XYZ22532222PQR273243222222222222222228332222222222222222@4322222222 +
H
\ No newline at end of file |