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/RustboroCity | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/RustboroCity')
| -rw-r--r-- | data/maps/RustboroCity/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/RustboroCity/connections.inc | 9 | ||||
| -rw-r--r-- | data/maps/RustboroCity/header.inc | 15 | ||||
| -rw-r--r-- | data/maps/RustboroCity/map.bin | bin | 0 -> 4800 bytes |
4 files changed, 25 insertions, 0 deletions
diff --git a/data/maps/RustboroCity/border.bin b/data/maps/RustboroCity/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/maps/RustboroCity/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ
\ No newline at end of file diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc new file mode 100644 index 000000000..01e5aff35 --- /dev/null +++ b/data/maps/RustboroCity/connections.inc @@ -0,0 +1,9 @@ +RustboroCity_MapConnectionsList: @ 8486758 + connection up, 0, ROUTE_115, 0 + connection down, 0, ROUTE_104, 0 + connection right, 0, ROUTE_116, 0 + +RustboroCity_MapConnections: @ 848677C + .4byte 0x3 + .4byte RustboroCity_MapConnectionsList + diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc new file mode 100644 index 000000000..cdff5a143 --- /dev/null +++ b/data/maps/RustboroCity/header.inc @@ -0,0 +1,15 @@ +RustboroCity: @ 848250C + .4byte RustboroCity_MapAttributes + .4byte RustboroCity_MapEvents + .4byte RustboroCity_MapScripts + .4byte RustboroCity_MapConnections + .2byte BGM_GOTOWN + .2byte 4 + .byte 10 + .byte 0 + .byte 2 + .byte 2 + .2byte 0 + .byte 13 + .byte 0 + diff --git a/data/maps/RustboroCity/map.bin b/data/maps/RustboroCity/map.bin Binary files differnew file mode 100644 index 000000000..06736e47e --- /dev/null +++ b/data/maps/RustboroCity/map.bin |