diff options
Diffstat (limited to 'data/maps/Route134')
| -rw-r--r-- | data/maps/Route134/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route134/connections.inc | 4 | ||||
| -rw-r--r-- | data/maps/Route134/events.inc | 16 | ||||
| -rw-r--r-- | data/maps/Route134/header.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route134/map.bin | bin | 6400 -> 0 bytes | |||
| -rw-r--r-- | data/maps/Route134/scripts.inc | 53 |
6 files changed, 76 insertions, 8 deletions
diff --git a/data/maps/Route134/border.bin b/data/maps/Route134/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route134/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc index 8429378e4..861c82b4d 100644 --- a/data/maps/Route134/connections.inc +++ b/data/maps/Route134/connections.inc @@ -1,6 +1,6 @@ Route134_MapConnectionsList: @ 8486D04 - connection left, 0, SLATEPORT_CITY, 0 - connection right, 0, ROUTE_133, 0 + connection left, 0, MAP_SLATEPORT_CITY + connection right, 0, MAP_ROUTE133 Route134_MapConnections: @ 8486D1C .4byte 0x2 diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc new file mode 100644 index 000000000..03339b081 --- /dev/null +++ b/data/maps/Route134/events.inc @@ -0,0 +1,16 @@ +Route134_EventObjects: @ 852CD98 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 24, 23, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 1, 6, Route134_EventScript_1F7681, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 43, 23, 1, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0 + object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 + object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, 1158 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 + +Route134_MapEvents:: @ 852CEA0 + map_events Route134_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 9730f5036..d1df504ed 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -1,15 +1,15 @@ Route134: @ 8482A14 - .4byte Route134_MapAttributes + .4byte Route134_Layout .4byte Route134_MapEvents .4byte Route134_MapScripts .4byte Route134_MapConnections .2byte MUS_GRANROAD .2byte 50 - .byte 49 + .byte MAPSEC_ROUTE_134 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route134/map.bin b/data/maps/Route134/map.bin Binary files differdeleted file mode 100644 index 7b78a2d3c..000000000 --- a/data/maps/Route134/map.bin +++ /dev/null diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc new file mode 100644 index 000000000..bdec88c42 --- /dev/null +++ b/data/maps/Route134/scripts.inc @@ -0,0 +1,53 @@ +Route134_MapScripts:: @ 81F7644 + map_script 5, Route134_MapScript1_1F764A + .byte 0 + +Route134_MapScript1_1F764A: @ 81F764A + setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 + end + +Route134_EventScript_1F7653:: @ 81F7653 + trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB + msgbox Route134_Text_2A45C5, 6 + end + +Route134_EventScript_1F766A:: @ 81F766A + trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643 + msgbox Route134_Text_2A464B, 6 + end + +Route134_EventScript_1F7681:: @ 81F7681 + trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE + msgbox Route134_Text_2A46D2, 6 + end + +Route134_EventScript_1F7698:: @ 81F7698 + trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1 + msgbox Route134_Text_2A47FD, 6 + end + +Route134_EventScript_1F76AF:: @ 81F76AF + trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745 + msgbox Route134_Text_2A475D, 6 + end + +Route134_EventScript_1F76C6:: @ 81F76C6 + trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1 + msgbox Route134_Text_2A4AD8, 6 + end + +Route134_EventScript_1F76DD:: @ 81F76DD + trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10 + msgbox Route134_Text_2A4A34, 6 + end + +Route134_EventScript_1F76F4:: @ 81F76F4 + trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B + msgbox Route134_Text_2A49B1, 6 + end + +Route134_EventScript_1F770B:: @ 81F770B + trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B + msgbox Route134_Text_2A48BD, 6 + end + |