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/Route121 | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/Route121')
| -rw-r--r-- | data/maps/Route121/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route121/connections.inc | 9 | ||||
| -rw-r--r-- | data/maps/Route121/header.inc | 15 | ||||
| -rw-r--r-- | data/maps/Route121/map.bin | 1 |
4 files changed, 26 insertions, 0 deletions
diff --git a/data/maps/Route121/border.bin b/data/maps/Route121/border.bin new file mode 100644 index 000000000..03bcafef1 --- /dev/null +++ b/data/maps/Route121/border.bin @@ -0,0 +1 @@ +ÔÕÜÝ
\ No newline at end of file diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc new file mode 100644 index 000000000..47d55b65d --- /dev/null +++ b/data/maps/Route121/connections.inc @@ -0,0 +1,9 @@ +Route121_MapConnectionsList: @ 8486AE0 + connection down, 20, ROUTE_122, 0 + connection left, -80, ROUTE_120, 0 + connection right, -10, LILYCOVE_CITY, 0 + +Route121_MapConnections: @ 8486B04 + .4byte 0x3 + .4byte Route121_MapConnectionsList + diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc new file mode 100644 index 000000000..ac6277e86 --- /dev/null +++ b/data/maps/Route121/header.inc @@ -0,0 +1,15 @@ +Route121: @ 84828A8 + .4byte Route121_MapAttributes + .4byte Route121_MapEvents + .4byte Route121_MapScripts + .4byte Route121_MapConnections + .2byte BGM_DOORO_X3 + .2byte 37 + .byte 36 + .byte 0 + .byte 2 + .byte 3 + .2byte 0 + .byte 13 + .byte 0 + diff --git a/data/maps/Route121/map.bin b/data/maps/Route121/map.bin new file mode 100644 index 000000000..cfee98f2a --- /dev/null +++ b/data/maps/Route121/map.bin @@ -0,0 +1 @@ +ÆÆÆÆurÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕXÔÕÔÕÔÕÔÕ01112ÔÕ0Z6urÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÆÆÆÆurÜÝÜÝÜÝÜÝäåäåÜÝÜÝÜÝÜÝXæåäåäåäç01112æç0ZuræåæåæåäåÜÝÜÝæåæåæåæåæåÜÝÜÝÜÝÜÝÜÝÜÝÆÆurÔÕÔÕÔÕÔÕs6L5L5u6ÔÕÔÕÔÕÔÕX0000000001112000Zur00000000ÔÕÔÕ0000000000ÔÕÔÕÔÕÔÕÔÕÔÕ00urÜÝÜÝÜÝÜÝ{211}2æ5åäåäåäç5X000000008999:000Zur00000000æåäç0000000000æåäåäåäåäåäå||||}rÔÕÔÕÔÕÔÕ
0
0
0PQQQQQQQQQQQQQQQQQ3$%&5QQQRurPQQQQQQQQQQQQQQQQQR0PQQQQQQAQQQQQR‘‘‘‘‘Dæ5åäåäåäç5
0
0
0
000000
0
0
0000000Î1Ï10BD-EC0tyy}r00000000
0
0
0
0
0000000000
0
0
0
00Z0000000000000000000000000000
0
0
0
0
000000Ö×000000r00tz000000000
0
0
0
0
0
0
000000
0
0
0
0
0
0Z0000000000000000000000000000
0
0
0
0
000000ÜÝÎ1Ï100000r&'rPQQQQR00PQQR00PQR00PQQQQQQQQR000000000001111111100000000
0
0
0
0
0
0
00000ÔÕÔ×t¯0Ï0yyz00r
0
0000000000Z0000Z00X0
0
00
0
0
00Z00000000011!1!1)1)1)1)1)1*10
0
0
0PQQQQQQQQQQQR00æåäçr0000000r
0
0
0PQQQQR0PR0000Z00X0
0
0
0
0
0
00Z0000Î1Ï1111!1!1!1*100000
0
0
0
0
0
0
0
0
0
0
00t|||||¯0Ï0||||z0000000r
0
0
0
0
0
0
00000Z
0
000Z0000
0
0
0
0
0
00000Î1Ï1Ö5Õ5)1)1)1)1)1*100Î1Ï1Î1Ç1Æ1Ç1Æ1Ç1
0
0
0
0t|||}t‘‘‘‘¯0Ï0‘‘‘‘‘yyy y¯0Ï0zPQQQQQQQQQQR
0
0
00Z00000000000000Ö5Õ5ä5å500000000ÖÕÔÕÔÕÔ×t|||}t‘‘‘z000000000000
0
0
0
0
0000000000000
0
0
0
0
00ZPQQQQQQQQR0000æ5å5t|00000000æ5åäç5äåäç5ut ‘‘z00000tyy¯0Ï0yy‰0000
0
0
0
0
0
0
0000000000
0
0
0
0
00Z011111100000t|||}€yyyðñyyy||||||||}r00000t|||}]^0^0^0_{||||‰
0
0
0
0
0
0
00000000
0
0
0
0
0PQR0Õ2Ý6Ý6Ý6Ý6å200000u€‰‰‰˜PPPÖ×PPPt©©©©©©©©}t||||}€‰‰�]^0^0^0^0_€‰‰‰�{||||||||||||||||||||||||||||||||||}�p1p1p1p1Î1Ï1Pæ5ç5t||}q0q0q0q0q0q0t©©}€‰‰‰‰˜pPe]^0^0^0^0_dQppš‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰˜p1p1p1p1Ö×Pt|}t©©||||||}€‰‰˜ppppppXm]^0^0^0^0_lYPQpppppppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1æ5ç5t}q0q0u€‰‰‰‰‰‰‰‰˜ppppppppPQ’e^0^0^0^0g�pXYPQPQpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1Pt}q0t|}�pppppppppppppppppXYš‰‰‰‰‰‰˜pppXYXYpppppppppppppppppppppppppp1p1p1p1p1p1p1p1p1p1p1p1p1
\ No newline at end of file |
