summaryrefslogtreecommitdiff
path: root/data/maps/RusturfTunnel
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/RusturfTunnel')
-rw-r--r--data/maps/RusturfTunnel/events.inc27
-rw-r--r--data/maps/RusturfTunnel/header.inc15
-rw-r--r--data/maps/RusturfTunnel/map.json219
-rw-r--r--data/maps/RusturfTunnel/scripts.inc28
4 files changed, 233 insertions, 56 deletions
diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc
deleted file mode 100644
index 292bda57d..000000000
--- a/data/maps/RusturfTunnel/events.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-RusturfTunnel_EventObjects: @ 85341C4
- object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN
- object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1
- object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL
- object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER
- object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN
- object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
- object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
- object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2
- object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0
- object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN
-
-RusturfTunnel_MapWarps: @ 85342B4
- warp_def 4, 10, 3, 0, MAP_ROUTE116
- warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN
- warp_def 18, 20, 3, 2, MAP_ROUTE116
-
-RusturfTunnel_MapCoordEvents: @ 85342CC
- coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071
- coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083
- coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083
- coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077
- coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D
-
-RusturfTunnel_MapEvents:: @ 853431C
- map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
-
diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc
deleted file mode 100644
index 70a477681..000000000
--- a/data/maps/RusturfTunnel/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RusturfTunnel: @ 8483F30
- .4byte RusturfTunnel_Layout
- .4byte RusturfTunnel_MapEvents
- .4byte RusturfTunnel_MapScripts
- .4byte 0x0
- .2byte MUS_DAN01
- .2byte 129
- .byte MAPSEC_RUSTURF_TUNNEL
- .byte 0
- .byte WEATHER_FOG_1
- .byte MAP_TYPE_UNDERGROUND
- .2byte 0
- map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
- .byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json
new file mode 100644
index 000000000..b873c76c8
--- /dev/null
+++ b/data/maps/RusturfTunnel/map.json
@@ -0,0 +1,219 @@
+{
+ "id": "MAP_RUSTURF_TUNNEL",
+ "name": "RusturfTunnel",
+ "layout": "LAYOUT_RUSTURF_TUNNEL",
+ "music": "MUS_DAN01",
+ "region_map_section": "MAPSEC_RUSTURF_TUNNEL",
+ "requires_flash": false,
+ "weather": "WEATHER_FOG_1",
+ "map_type": "MAP_TYPE_UNDERGROUND",
+ "allow_bike": true,
+ "allow_escape_rope": true,
+ "allow_running": true,
+ "show_map_name": true,
+ "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+ "connections": null,
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
+ "x": 23,
+ "y": 5,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RusturfTunnel_EventScript_22CE76",
+ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+ "x": 24,
+ "y": 5,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RusturfTunnel_EventScript_2907A6",
+ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 3,
+ "y": 1,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RusturfTunnel_EventScript_291136",
+ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 30,
+ "y": 2,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RusturfTunnel_EventScript_291143",
+ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+ "x": 5,
+ "y": 4,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "0x0",
+ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
+ "x": 14,
+ "y": 5,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RusturfTunnel_EventScript_22D0C2",
+ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+ "x": 14,
+ "y": 4,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RusturfTunnel_EventScript_22D0AF",
+ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK",
+ "x": 24,
+ "y": 4,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RusturfTunnel_EventScript_2907A6",
+ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_HIKER",
+ "x": 32,
+ "y": 13,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "3",
+ "script": "RusturfTunnel_EventScript_22D1B1",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
+ "x": 25,
+ "y": 4,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "RusturfTunnel_EventScript_22CE5F",
+ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 4,
+ "y": 10,
+ "elevation": 3,
+ "dest_map": "MAP_ROUTE116",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 29,
+ "y": 16,
+ "elevation": 3,
+ "dest_map": "MAP_VERDANTURF_TOWN",
+ "dest_warp_id": 4
+ },
+ {
+ "x": 18,
+ "y": 20,
+ "elevation": 3,
+ "dest_map": "MAP_ROUTE116",
+ "dest_warp_id": 2
+ }
+ ],
+ "coord_events": [
+ {
+ "type": "trigger",
+ "x": 23,
+ "y": 4,
+ "elevation": 3,
+ "var": "0",
+ "var_value": "0",
+ "script": "RusturfTunnel_EventScript_22D071"
+ },
+ {
+ "type": "trigger",
+ "x": 9,
+ "y": 4,
+ "elevation": 3,
+ "var": "VAR_RUSTURF_TUNNEL_STATE",
+ "var_value": "2",
+ "script": "RusturfTunnel_EventScript_22D083"
+ },
+ {
+ "type": "trigger",
+ "x": 9,
+ "y": 5,
+ "elevation": 3,
+ "var": "VAR_RUSTURF_TUNNEL_STATE",
+ "var_value": "2",
+ "script": "RusturfTunnel_EventScript_22D083"
+ },
+ {
+ "type": "trigger",
+ "x": 25,
+ "y": 4,
+ "elevation": 3,
+ "var": "0",
+ "var_value": "0",
+ "script": "RusturfTunnel_EventScript_22D077"
+ },
+ {
+ "type": "trigger",
+ "x": 25,
+ "y": 5,
+ "elevation": 3,
+ "var": "0",
+ "var_value": "0",
+ "script": "RusturfTunnel_EventScript_22D07D"
+ }
+ ],
+ "bg_events": []
+} \ No newline at end of file
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index 59d0789ba..8e7e2342e 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -1,6 +1,6 @@
RusturfTunnel_MapScripts:: @ 822CE27
- map_script 3, RusturfTunnel_MapScript1_22CE44
- map_script 2, RusturfTunnel_MapScript2_22CE32
+ map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_22CE44
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32
.byte 0
RusturfTunnel_MapScript2_22CE32: @ 822CE32
@@ -23,7 +23,7 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F
faceplayer
msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT
closemessage
- applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+ applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -35,7 +35,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76
setflag FLAG_TEMP_1
msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT
closemessage
- applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+ applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -43,7 +43,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76
RusturfTunnel_EventScript_22CE99:: @ 822CE99
msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT
closemessage
- applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+ applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -94,7 +94,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F
applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
applymovement 1, RusturfTunnel_Movement_22D06C
waitmovement 0
- applymovement 10, RusturfTunnel_Movement_2725AA
+ applymovement 10, Common_Movement_WalkInPlaceDown
waitmovement 0
return
@@ -102,14 +102,14 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B
applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
applymovement 1, RusturfTunnel_Movement_22D06C
waitmovement 0
- applymovement 10, RusturfTunnel_Movement_2725AA
+ applymovement 10, Common_Movement_WalkInPlaceDown
waitmovement 0
return
RusturfTunnel_EventScript_22CFA7:: @ 822CFA7
- applymovement 1, RusturfTunnel_Movement_2725A6
+ applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_2725AA
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
waitmovement 0
return
@@ -142,9 +142,9 @@ RusturfTunnel_EventScript_22CFE6:: @ 822CFE6
RusturfTunnel_EventScript_22CFFF:: @ 822CFFF
playse SE_PIN
- applymovement 1, RusturfTunnel_Movement_272598
+ applymovement 1, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 1, RusturfTunnel_Movement_27259A
+ applymovement 1, Common_Movement_Delay48
waitmovement 0
return
@@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
applymovement 5, RusturfTunnel_Movement_22D1A4
waitmovement 0
msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT
- applymovement 5, RusturfTunnel_Movement_27259E
+ applymovement 5, Common_Movement_FacePlayer
waitmovement 0
message RusturfTunnel_Text_22D3BA
waitmessage
@@ -345,8 +345,8 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
removeobject 7
clearflag FLAG_DEVON_GOODS_STOLEN
setflag FLAG_RECOVERED_DEVON_GOODS
- setvar VAR_0x405A, 4
- setvar VAR_0x4090, 1
+ setvar VAR_RUSTBORO_STATE, 4
+ setvar VAR_BRINEY_HOUSE_STATE, 1
setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
release
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 18:17:58 +0000