diff options
Diffstat (limited to 'data/maps/Route124')
| -rw-r--r-- | data/maps/Route124/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route124/connections.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route124/events.inc | 23 | ||||
| -rw-r--r-- | data/maps/Route124/header.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route124/map.bin | bin | 12800 -> 0 bytes | |||
| -rw-r--r-- | data/maps/Route124/scripts.inc | 117 |
6 files changed, 150 insertions, 11 deletions
diff --git a/data/maps/Route124/border.bin b/data/maps/Route124/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route124/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc index 72e358f4c..ed10daab9 100644 --- a/data/maps/Route124/connections.inc +++ b/data/maps/Route124/connections.inc @@ -1,9 +1,9 @@ Route124_MapConnectionsList: @ 8486B4C - connection down, 0, ROUTE_126, 0 - connection left, 10, LILYCOVE_CITY, 0 - connection right, 0, ROUTE_125, 0 - connection right, 40, MOSSDEEP_CITY, 0 - connection dive, 0, UNDERWATER_1, 0 + connection down, 0, MAP_ROUTE126 + connection left, 10, MAP_LILYCOVE_CITY + connection right, 0, MAP_ROUTE125 + connection right, 40, MAP_MOSSDEEP_CITY + connection dive, 0, MAP_UNDERWATER1 Route124_MapConnections: @ 8486B88 .4byte 0x5 diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc new file mode 100644 index 000000000..30ff07ee9 --- /dev/null +++ b/data/maps/Route124/events.inc @@ -0,0 +1,23 @@ +Route124_EventObjects: @ 852C3C4 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, 1092 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, 1093 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, 1066 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 + object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 + object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 + object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 + +Route124_MapWarps: @ 852C4E4 + warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE + +Route124_MapBGEvents: @ 852C4EC + bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C + +Route124_MapEvents:: @ 852C4F8 + map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents + diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index e4c690104..43aab1b68 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -1,15 +1,15 @@ Route124: @ 84828FC - .4byte Route124_MapAttributes + .4byte Route124_Layout .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections .2byte MUS_DOORO_X3 .2byte 40 - .byte 39 + .byte MAPSEC_ROUTE_124 .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/Route124/map.bin b/data/maps/Route124/map.bin Binary files differdeleted file mode 100644 index acd4a65fb..000000000 --- a/data/maps/Route124/map.bin +++ /dev/null diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc new file mode 100644 index 000000000..b21e55417 --- /dev/null +++ b/data/maps/Route124/scripts.inc @@ -0,0 +1,117 @@ +Route124_MapScripts:: @ 81F656C + map_script 3, Route124_MapScript1_1F6572 + .byte 0 + +Route124_MapScript1_1F6572: @ 81F6572 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route124_EventScript_27207A + end + +Route124_EventScript_1F657C:: @ 81F657C + msgbox Route124_Text_1F6739, 3 + end + +Route124_EventScript_1F6585:: @ 81F6585 + trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02 + msgbox Route124_Text_2A0A20, 6 + end + +Route124_EventScript_1F659C:: @ 81F659C + trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC + msgbox Route124_Text_2A0AD9, 6 + end + +Route124_EventScript_1F65B3:: @ 81F65B3 + trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route124_EventScript_1F65FE + msgbox Route124_Text_2A0B9A, 4 + release + end + +Route124_EventScript_1F65DF:: @ 81F65DF + special sub_80B4808 + waitmovement 0 + msgbox Route124_Text_2A0C14, 4 + setvar VAR_0x8004, 449 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 449 + callstd 8 + release + end + +Route124_EventScript_1F65FE:: @ 81F65FE + trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0 + msgbox Route124_Text_2A0CBE, 6 + end + +Route124_EventScript_1F6615:: @ 81F6615 + trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D + msgbox Route124_Text_2A0D66, 6 + end + +Route124_EventScript_1F662C:: @ 81F662C + trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF + msgbox Route124_Text_2A0E1E, 6 + end + +Route124_EventScript_1F6643:: @ 81F6643 + trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route124_EventScript_1F668C + msgbox Route124_Text_2A0F3A, 4 + release + end + +Route124_EventScript_1F6673:: @ 81F6673 + msgbox Route124_Text_2A109F, 4 + setvar VAR_0x8004, 687 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 687 + callstd 8 + release + end + +Route124_EventScript_1F668C:: @ 81F668C + trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 + msgbox Route124_Text_2A1203, 6 + end + +Route124_EventScript_1F66A7:: @ 81F66A7 + trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route124_EventScript_1F66F0 + msgbox Route124_Text_2A103E, 4 + release + end + +Route124_EventScript_1F66D7:: @ 81F66D7 + msgbox Route124_Text_2A109F, 4 + setvar VAR_0x8004, 687 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 687 + callstd 8 + release + end + +Route124_EventScript_1F66F0:: @ 81F66F0 + trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 + msgbox Route124_Text_2A130F, 6 + end + +Route124_EventScript_1F670B:: @ 81F670B + trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C + msgbox Route124_Text_2A144F, 6 + end + +Route124_EventScript_1F6722:: @ 81F6722 + trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC + msgbox Route124_Text_2A14ED, 6 + end + +Route124_Text_1F6739: @ 81F6739 + .string "HUNTER’S HOUSE$" + |