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/Route120 | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/Route120')
| -rw-r--r-- | data/maps/Route120/border.bin | bin | 0 -> 8 bytes | |||
| -rw-r--r-- | data/maps/Route120/connections.inc | 8 | ||||
| -rw-r--r-- | data/maps/Route120/header.inc | 15 | ||||
| -rw-r--r-- | data/maps/Route120/map.bin | bin | 0 -> 8000 bytes |
4 files changed, 23 insertions, 0 deletions
diff --git a/data/maps/Route120/border.bin b/data/maps/Route120/border.bin Binary files differnew file mode 100644 index 000000000..864ac15fa --- /dev/null +++ b/data/maps/Route120/border.bin diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc new file mode 100644 index 000000000..f05e65739 --- /dev/null +++ b/data/maps/Route120/connections.inc @@ -0,0 +1,8 @@ +Route120_MapConnectionsList: @ 8486AC0 + connection left, 0, FORTREE_CITY, 0 + connection right, 80, ROUTE_121, 0 + +Route120_MapConnections: @ 8486AD8 + .4byte 0x2 + .4byte Route120_MapConnectionsList + diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc new file mode 100644 index 000000000..5b67adea4 --- /dev/null +++ b/data/maps/Route120/header.inc @@ -0,0 +1,15 @@ +Route120: @ 848288C + .4byte Route120_MapAttributes + .4byte Route120_MapEvents + .4byte Route120_MapScripts + .4byte Route120_MapConnections + .2byte BGM_DOORO_X3 + .2byte 36 + .byte 35 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 13 + .byte 0 + diff --git a/data/maps/Route120/map.bin b/data/maps/Route120/map.bin Binary files differnew file mode 100644 index 000000000..599e6014d --- /dev/null +++ b/data/maps/Route120/map.bin |