diff options
Diffstat (limited to 'data/maps/Route126')
| -rw-r--r-- | data/maps/Route126/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route126/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route126/events.inc | 14 | ||||
| -rw-r--r-- | data/maps/Route126/header.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route126/map.bin | bin | 12800 -> 0 bytes | |||
| -rw-r--r-- | data/maps/Route126/scripts.inc | 69 |
6 files changed, 91 insertions, 9 deletions
diff --git a/data/maps/Route126/border.bin b/data/maps/Route126/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route126/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc index c2beee1d8..b1f0f6d81 100644 --- a/data/maps/Route126/connections.inc +++ b/data/maps/Route126/connections.inc @@ -1,7 +1,7 @@ Route126_MapConnectionsList: @ 8486BBC - connection up, 0, ROUTE_124, 0 - connection right, 0, ROUTE_127, 0 - connection dive, 0, UNDERWATER_2, 0 + connection up, 0, MAP_ROUTE124 + connection right, 0, MAP_ROUTE127 + connection dive, 0, MAP_UNDERWATER2 Route126_MapConnections: @ 8486BE0 .4byte 0x3 diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc new file mode 100644 index 000000000..0c3180a79 --- /dev/null +++ b/data/maps/Route126/events.inc @@ -0,0 +1,14 @@ +Route126_EventObjects: @ 852C648 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_1F691B, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, 1105 + object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6960, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6977, 0 + object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6932, 0 + +Route126_MapEvents:: @ 852C720 + map_events Route126_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index f87efc723..3e489dffd 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -1,15 +1,15 @@ Route126: @ 8482934 - .4byte Route126_MapAttributes + .4byte Route126_Layout .4byte Route126_MapEvents .4byte Route126_MapScripts .4byte Route126_MapConnections .2byte MUS_DOORO_X3 .2byte 42 - .byte 41 + .byte MAPSEC_ROUTE_126 .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/Route126/map.bin b/data/maps/Route126/map.bin Binary files differdeleted file mode 100644 index 2d684cf64..000000000 --- a/data/maps/Route126/map.bin +++ /dev/null diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc new file mode 100644 index 000000000..3ea9ba786 --- /dev/null +++ b/data/maps/Route126/scripts.inc @@ -0,0 +1,69 @@ +Route126_MapScripts:: @ 81F68C6 + map_script 3, Route126_MapScript1_1F68CC + .byte 0 + +Route126_MapScript1_1F68CC: @ 81F68CC + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route126_EventScript_27207A + end + +Route126_EventScript_1F68D6:: @ 81F68D6 + trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_2A1C95, Route126_Text_2A1CC8 + msgbox Route126_Text_2A1CDD, 6 + end + +Route126_EventScript_1F68ED:: @ 81F68ED + trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_2A1D2A, Route126_Text_2A1D63 + msgbox Route126_Text_2A1D72, 6 + end + +Route126_EventScript_1F6904:: @ 81F6904 + trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_2A1DAE, Route126_Text_2A1DC8 + msgbox Route126_Text_2A1E03, 6 + end + +Route126_EventScript_1F691B:: @ 81F691B + trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_2A1E3E, Route126_Text_2A1E63 + msgbox Route126_Text_2A1E70, 6 + end + +Route126_EventScript_1F6932:: @ 81F6932 + trainerbattle 0, TRAINER_LEONARDO, 0, Route126_Text_2A2063, Route126_Text_2A20C6 + msgbox Route126_Text_2A20F7, 6 + end + +Route126_EventScript_1F6949:: @ 81F6949 + trainerbattle 0, TRAINER_ISOBEL, 0, Route126_Text_2A216A, Route126_Text_2A21A3 + msgbox Route126_Text_2A21B8, 6 + end + +Route126_EventScript_1F6960:: @ 81F6960 + trainerbattle 0, TRAINER_SIENNA, 0, Route126_Text_2A21EF, Route126_Text_2A2216 + msgbox Route126_Text_2A222A, 6 + end + +Route126_EventScript_1F6977:: @ 81F6977 + trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route126_EventScript_1F69C2 + msgbox Route126_Text_2A1F10, 4 + release + end + +Route126_EventScript_1F69A3:: @ 81F69A3 + special sub_80B4808 + waitmovement 0 + msgbox Route126_Text_2A1F5A, 4 + setvar VAR_0x8004, 377 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 377 + callstd 8 + release + end + +Route126_EventScript_1F69C2:: @ 81F69C2 + trainerbattle 5, TRAINER_PABLO_1, 0, Route126_Text_2A1F98, Route126_Text_2A1FD8 + msgbox Route126_Text_2A200C, 6 + end + |