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/OldaleTown_PokemonCenter_2F | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/OldaleTown_PokemonCenter_2F')
| -rw-r--r-- | data/maps/OldaleTown_PokemonCenter_2F/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/OldaleTown_PokemonCenter_2F/header.inc | 15 | ||||
| -rw-r--r-- | data/maps/OldaleTown_PokemonCenter_2F/map.bin | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/maps/OldaleTown_PokemonCenter_2F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_2F/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc new file mode 100644 index 000000000..5417fb67b --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -0,0 +1,15 @@ +OldaleTown_PokemonCenter_2F: @ 8482BD4 + .4byte OldaleTown_PokemonCenter_2F_MapAttributes + .4byte OldaleTown_PokemonCenter_2F_MapEvents + .4byte OldaleTown_PokemonCenter_2F_MapScripts + .4byte 0x0 + .2byte BGM_POKECEN + .2byte 62 + .byte 1 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 + 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ÍÏO 2ÍÏ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 |