diff options
Diffstat (limited to 'data/maps/Route127')
| -rw-r--r-- | data/maps/Route127/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route127/connections.inc | 8 | ||||
| -rw-r--r-- | data/maps/Route127/events.inc | 23 | ||||
| -rw-r--r-- | data/maps/Route127/header.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route127/map.bin | bin | 12800 -> 0 bytes | |||
| -rw-r--r-- | data/maps/Route127/scripts.inc | 88 |
6 files changed, 120 insertions, 10 deletions
diff --git a/data/maps/Route127/border.bin b/data/maps/Route127/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route127/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc index 2b4136c3c..3ad7057a3 100644 --- a/data/maps/Route127/connections.inc +++ b/data/maps/Route127/connections.inc @@ -1,8 +1,8 @@ Route127_MapConnectionsList: @ 8486BE8 - connection up, 0, MOSSDEEP_CITY, 0 - connection down, 0, ROUTE_128, 0 - connection left, 0, ROUTE_126, 0 - connection dive, 0, UNDERWATER_3, 0 + connection up, 0, MAP_MOSSDEEP_CITY + connection down, 0, MAP_ROUTE128 + connection left, 0, MAP_ROUTE126 + connection dive, 0, MAP_UNDERWATER3 Route127_MapConnections: @ 8486C18 .4byte 0x4 diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc new file mode 100644 index 000000000..6a7c07b9b --- /dev/null +++ b/data/maps/Route127/events.inc @@ -0,0 +1,23 @@ +Route127_EventObjects: @ 852C734 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, 1034 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, 1035 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0 + object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, 1155 + +Route127_MapBGEvents: @ 852C83C + bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 + bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2 + bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1 + bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3 + bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 + +Route127_MapEvents:: @ 852C878 + map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents + diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index 070f9996f..950e11df7 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -1,15 +1,15 @@ Route127: @ 8482950 - .4byte Route127_MapAttributes + .4byte Route127_Layout .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections .2byte MUS_DOORO_X3 .2byte 43 - .byte 42 + .byte MAPSEC_ROUTE_127 .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/Route127/map.bin b/data/maps/Route127/map.bin Binary files differdeleted file mode 100644 index fa44f9960..000000000 --- a/data/maps/Route127/map.bin +++ /dev/null diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc new file mode 100644 index 000000000..12e5bf127 --- /dev/null +++ b/data/maps/Route127/scripts.inc @@ -0,0 +1,88 @@ +Route127_MapScripts:: @ 81F69D9 + map_script 3, Route127_MapScript1_1F69E9 + map_script 1, Route127_MapScript1_1F6A14 + map_script 2, Route127_MapScript2_1F6A2B + .byte 0 + +Route127_MapScript1_1F69E9: @ 81F69E9 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route127_EventScript_27207A + compare VAR_0x4039, 1 + call_if 1, Route127_EventScript_273D13 + compare VAR_0x4037, 13 + call_if 1, Route127_EventScript_273D17 + compare VAR_0x4037, 14 + call_if 1, Route127_EventScript_273D17 + end + +Route127_MapScript1_1F6A14: @ 81F6A14 + compare VAR_0x4037, 13 + call_if 1, Route127_EventScript_273B5F + compare VAR_0x4037, 14 + call_if 1, Route127_EventScript_273BCC + end + +Route127_MapScript2_1F6A2B: @ 81F6A2B + map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + .2byte 0 + +Route127_EventScript_1F6A35:: @ 81F6A35 + trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294 + msgbox Route127_Text_2A22A1, 6 + end + +Route127_EventScript_1F6A4C:: @ 81F6A4C + trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315 + msgbox Route127_Text_2A232C, 6 + end + +Route127_EventScript_1F6A63:: @ 81F6A63 + trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1 + msgbox Route127_Text_2A240C, 6 + end + +Route127_EventScript_1F6A7A:: @ 81F6A7A + trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483 + msgbox Route127_Text_2A2494, 6 + end + +Route127_EventScript_1F6A91:: @ 81F6A91 + trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B + msgbox Route127_Text_2A2538, 6 + end + +Route127_EventScript_1F6AA8:: @ 81F6AA8 + trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1 + msgbox Route127_Text_2A25D2, 6 + end + +Route127_EventScript_1F6ABF:: @ 81F6ABF + trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC + msgbox Route127_Text_2A2832, 6 + end + +Route127_EventScript_1F6AD6:: @ 81F6AD6 + trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route127_EventScript_1F6B21 + msgbox Route127_Text_2A26AC, 4 + release + end + +Route127_EventScript_1F6B02:: @ 81F6B02 + special sub_80B4808 + waitmovement 0 + msgbox Route127_Text_2A26EE, 4 + setvar VAR_0x8004, 672 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 672 + callstd 8 + release + end + +Route127_EventScript_1F6B21:: @ 81F6B21 + trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B + msgbox Route127_Text_2A278E, 6 + end + |