summaryrefslogtreecommitdiff
path: root/data/maps/OldaleTown_PokemonCenter_2F/map.bin
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/OldaleTown_PokemonCenter_2F/map.bin
parent3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff)
parenta98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff)
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/OldaleTown_PokemonCenter_2F/map.bin')
-rw-r--r--data/maps/OldaleTown_PokemonCenter_2F/map.bin1
1 files changed, 1 insertions, 0 deletions
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.bin b/data/maps/OldaleTown_PokemonCenter_2F/map.bin
new file mode 100644
index 000000000..c623d86fc
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_2F/map.bin
@@ -0,0 +1 @@
+  ? \  ?\  ?Gd6Gd6GØÙÙ¦Ï2ÍÏO2ÍÏOb2Öàà×]Õ×Û]Õ×Ú/2 2l2l2¶2a2¿2l2ã<¿2l2â/2˜2™222Ê2Ë2Ì22g2È2É22g2D ¡B2Ò2Ó2Ô222Ð2Ñ222'2¨2©222222222222'2 22222^2^222^2^222'2(622422ff42&2ff&24276 \ No newline at end of file