diff options
Diffstat (limited to 'data/maps/Route122')
| -rw-r--r-- | data/maps/Route122/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route122/connections.inc | 4 | ||||
| -rw-r--r-- | data/maps/Route122/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route122/header.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route122/map.bin | bin | 3200 -> 0 bytes | |||
| -rw-r--r-- | data/maps/Route122/scripts.inc | 3 |
6 files changed, 16 insertions, 8 deletions
diff --git a/data/maps/Route122/border.bin b/data/maps/Route122/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route122/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc index 2d6f53859..2a0442a05 100644 --- a/data/maps/Route122/connections.inc +++ b/data/maps/Route122/connections.inc @@ -1,6 +1,6 @@ Route122_MapConnectionsList: @ 8486B0C - connection up, -20, ROUTE_121, 0 - connection down, -100, ROUTE_123, 0 + connection up, -20, MAP_ROUTE121 + connection down, -100, MAP_ROUTE123 Route122_MapConnections: @ 8486B24 .4byte 0x2 diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc new file mode 100644 index 000000000..4c5b9b464 --- /dev/null +++ b/data/maps/Route122/events.inc @@ -0,0 +1,6 @@ +Route122_MapWarps: @ 852BDA0 + warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F + +Route122_MapEvents:: @ 852BDA8 + map_events 0x0, Route122_MapWarps, 0x0, 0x0 + diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index f4856b8ab..7e6dc55c2 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -1,15 +1,15 @@ Route122: @ 84828C4 - .4byte Route122_MapAttributes + .4byte Route122_Layout .4byte Route122_MapEvents .4byte Route122_MapScripts .4byte Route122_MapConnections .2byte MUS_DOORO_X4 .2byte 38 - .byte 37 + .byte MAPSEC_ROUTE_122 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route122/map.bin b/data/maps/Route122/map.bin Binary files differdeleted file mode 100644 index 1c76b0b0a..000000000 --- a/data/maps/Route122/map.bin +++ /dev/null diff --git a/data/maps/Route122/scripts.inc b/data/maps/Route122/scripts.inc new file mode 100644 index 000000000..8fcfb4c09 --- /dev/null +++ b/data/maps/Route122/scripts.inc @@ -0,0 +1,3 @@ +Route122_MapScripts:: @ 81F6146 + .byte 0 + |