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/Route124 | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/Route124')
| -rw-r--r-- | data/maps/Route124/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route124/connections.inc | 11 | ||||
| -rw-r--r-- | data/maps/Route124/header.inc | 15 | ||||
| -rw-r--r-- | data/maps/Route124/map.bin | bin | 0 -> 12800 bytes |
4 files changed, 27 insertions, 0 deletions
diff --git a/data/maps/Route124/border.bin b/data/maps/Route124/border.bin new file mode 100644 index 000000000..c3fe51511 --- /dev/null +++ b/data/maps/Route124/border.bin @@ -0,0 +1 @@ +pppp
\ No newline at end of file diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc new file mode 100644 index 000000000..72e358f4c --- /dev/null +++ b/data/maps/Route124/connections.inc @@ -0,0 +1,11 @@ +Route124_MapConnectionsList: @ 8486B4C + connection down, 0, ROUTE_126, 0 + connection left, 10, LILYCOVE_CITY, 0 + connection right, 0, ROUTE_125, 0 + connection right, 40, MOSSDEEP_CITY, 0 + connection dive, 0, UNDERWATER_1, 0 + +Route124_MapConnections: @ 8486B88 + .4byte 0x5 + .4byte Route124_MapConnectionsList + diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc new file mode 100644 index 000000000..bdd54bf00 --- /dev/null +++ b/data/maps/Route124/header.inc @@ -0,0 +1,15 @@ +Route124: @ 84828FC + .4byte Route124_MapAttributes + .4byte Route124_MapEvents + .4byte Route124_MapScripts + .4byte Route124_MapConnections + .2byte BGM_DOORO_X3 + .2byte 40 + .byte 39 + .byte 0 + .byte 2 + .byte 6 + .2byte 0 + .byte 13 + .byte 0 + diff --git a/data/maps/Route124/map.bin b/data/maps/Route124/map.bin Binary files differnew file mode 100644 index 000000000..acd4a65fb --- /dev/null +++ b/data/maps/Route124/map.bin |