diff options
Diffstat (limited to 'data/maps/Route132')
| -rw-r--r-- | data/maps/Route132/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route132/connections.inc | 4 | ||||
| -rw-r--r-- | data/maps/Route132/events.inc | 15 | ||||
| -rw-r--r-- | data/maps/Route132/header.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route132/map.bin | bin | 6400 -> 0 bytes | |||
| -rw-r--r-- | data/maps/Route132/scripts.inc | 43 |
6 files changed, 65 insertions, 8 deletions
diff --git a/data/maps/Route132/border.bin b/data/maps/Route132/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route132/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc index 0e18aa2f2..5a70e3471 100644 --- a/data/maps/Route132/connections.inc +++ b/data/maps/Route132/connections.inc @@ -1,6 +1,6 @@ Route132_MapConnectionsList: @ 8486CC4 - connection left, 0, ROUTE_133, 0 - connection right, 0, PACIFIDLOG_TOWN, 0 + connection left, 0, MAP_ROUTE133 + connection right, 0, MAP_PACIFIDLOG_TOWN Route132_MapConnections: @ 8486CDC .4byte 0x2 diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc new file mode 100644 index 000000000..7d62fb306 --- /dev/null +++ b/data/maps/Route132/events.inc @@ -0,0 +1,15 @@ +Route132_EventObjects: @ 852CB90 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, 1036 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route132_EventScript_1F752F, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route132_EventScript_1F7518, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, 1156 + +Route132_MapEvents:: @ 852CC80 + map_events Route132_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index df2aadbfa..4e292a92b 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -1,15 +1,15 @@ Route132: @ 84829DC - .4byte Route132_MapAttributes + .4byte Route132_Layout .4byte Route132_MapEvents .4byte Route132_MapScripts .4byte Route132_MapConnections .2byte MUS_GRANROAD .2byte 48 - .byte 47 + .byte MAPSEC_ROUTE_132 .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/Route132/map.bin b/data/maps/Route132/map.bin Binary files differdeleted file mode 100644 index 3250c0429..000000000 --- a/data/maps/Route132/map.bin +++ /dev/null diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc new file mode 100644 index 000000000..a4ae6f716 --- /dev/null +++ b/data/maps/Route132/scripts.inc @@ -0,0 +1,43 @@ +Route132_MapScripts:: @ 81F74E9 + .byte 0 + +Route132_EventScript_1F74EA:: @ 81F74EA + trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC + msgbox Route132_Text_2A3BC0, 6 + end + +Route132_EventScript_1F7501:: @ 81F7501 + trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39 + msgbox Route132_Text_2A3C49, 6 + end + +Route132_EventScript_1F7518:: @ 81F7518 + trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD + msgbox Route132_Text_2A3CC5, 6 + end + +Route132_EventScript_1F752F:: @ 81F752F + trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C + msgbox Route132_Text_2A3D8B, 6 + end + +Route132_EventScript_1F7546:: @ 81F7546 + trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8 + msgbox Route132_Text_2A3FE5, 6 + end + +Route132_EventScript_1F755D:: @ 81F755D + trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E + msgbox Route132_Text_2A40A4, 6 + end + +Route132_EventScript_1F7574:: @ 81F7574 + trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD + msgbox Route132_Text_2A3F03, 6 + end + +Route132_EventScript_1F758B:: @ 81F758B + trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C + msgbox Route132_Text_2A3E4E, 6 + end + |