summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattlePointExchangeServiceCorner
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-11-17 19:34:55 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-11-17 19:34:55 +0100
commitd0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch)
treecb5e1c81baaf882f2bb8f323b04a7b41d316be7b /data/maps/BattleFrontier_BattlePointExchangeServiceCorner
parent3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff)
parenta98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff)
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/BattleFrontier_BattlePointExchangeServiceCorner')
-rw-r--r--data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.binbin0 -> 8 bytes
-rw-r--r--data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc15
-rw-r--r--data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin2
3 files changed, 17 insertions, 0 deletions
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
Binary files differ
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
new file mode 100644
index 000000000..d0b08b300
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
+ .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes
+ .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents
+ .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts
+ .4byte 0x0
+ .2byte BGM_B_TOWER
+ .2byte 398
+ .byte 58
+ .byte 0
+ .byte 0
+ .byte 8
+ .2byte 0
+ .byte 0
+ .byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
new file mode 100644
index 000000000..62d5761e0
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
@@ -0,0 +1,2 @@
+àáâàáâàáâàáâàáøèéêðùú 
+ûüòèéºÀÁ†ýþ  †ºÀ·Ž¹¸†¸¹¸†Ì¹¸–¸¹†Í¸¹¸¹¸¹†Í¸¹ž¹¸†¦ÓÔÓÔÓԆ̹¸Í¸¹øòòòòòòòü͸¹Ž¹¸ÁÀÁÀÁÀÁÀÁÕ¹¸ž¸¹¸¹¸¹¸¹¸¹¸¹¸¹Í¸¹¸¹mno¹¸¹¸¹Í¸¹¸uvw¸¹¸¹ \ No newline at end of file