summaryrefslogtreecommitdiff
path: root/data/maps/SSTidalCorridor
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SSTidalCorridor')
-rw-r--r--data/maps/SSTidalCorridor/events.inc35
-rw-r--r--data/maps/SSTidalCorridor/header.inc15
-rw-r--r--data/maps/SSTidalCorridor/map.json247
-rw-r--r--data/maps/SSTidalCorridor/scripts.inc8
4 files changed, 251 insertions, 54 deletions
diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc
deleted file mode 100644
index c36e38fda..000000000
--- a/data/maps/SSTidalCorridor/events.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-SSTidalCorridor_EventObjects: @ 853A158
- object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0
- object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0
- object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
- object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
- object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT
-
-SSTidalCorridor_MapWarps: @ 853A1D0
- warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS
- warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS
- warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS
- warp_def 13, 9, 3, 6, MAP_SS_TIDAL_ROOMS
- warp_def 4, 3, 3, 8, MAP_SS_TIDAL_ROOMS
- warp_def 7, 3, 3, 9, MAP_SS_TIDAL_ROOMS
- warp_def 10, 3, 3, 10, MAP_SS_TIDAL_ROOMS
- warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS
- warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK
-
-SSTidalCorridor_MapBGEvents: @ 853A218
- bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
- bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
- bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
- bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
- bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
- bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
- bg_event 14, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
- bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D
- bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0F5
- bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0FE
- bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C107
- bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C110
-
-SSTidalCorridor_MapEvents:: @ 853A2A8
- map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
-
diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc
deleted file mode 100644
index 37128821c..000000000
--- a/data/maps/SSTidalCorridor/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SSTidalCorridor: @ 8484F0C
- .4byte SSTidalCorridor_Layout
- .4byte SSTidalCorridor_MapEvents
- .4byte SSTidalCorridor_MapScripts
- .4byte 0x0
- .2byte MUS_M_BOAT
- .2byte 277
- .byte MAPSEC_DYNAMIC
- .byte 0
- .byte WEATHER_NONE
- .byte MAP_TYPE_INDOOR
- .2byte 0
- map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
- .byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json
new file mode 100644
index 000000000..ce6c3d2d0
--- /dev/null
+++ b/data/maps/SSTidalCorridor/map.json
@@ -0,0 +1,247 @@
+{
+ "id": "MAP_SS_TIDAL_CORRIDOR",
+ "name": "SSTidalCorridor",
+ "layout": "LAYOUT_SS_TIDAL_CORRIDOR",
+ "music": "MUS_M_BOAT",
+ "region_map_section": "MAPSEC_DYNAMIC",
+ "requires_flash": false,
+ "weather": "WEATHER_NONE",
+ "map_type": "MAP_TYPE_INDOOR",
+ "allow_bike": false,
+ "allow_escape_rope": false,
+ "allow_running": false,
+ "show_map_name": false,
+ "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+ "connections": null,
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+ "x": 1,
+ "y": 11,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_UP",
+ "movement_range_x": 0,
+ "movement_range_y": 0,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "SSTidalCorridor_EventScript_23C119",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SAILOR",
+ "x": 16,
+ "y": 7,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
+ "movement_range_x": 0,
+ "movement_range_y": 2,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "SSTidalCorridor_EventScript_23C1A3",
+ "flag": "0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
+ "x": 9,
+ "y": 2,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "SSTidalCorridor_EventScript_23C0D9",
+ "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_WINGULL",
+ "x": 7,
+ "y": 2,
+ "elevation": 3,
+ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "0",
+ "trainer_sight_or_berry_tree_id": "0",
+ "script": "SSTidalCorridor_EventScript_23C0E2",
+ "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_SCOTT",
+ "x": 9,
+ "y": 10,
+ "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": "0x0",
+ "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 4,
+ "y": 9,
+ "elevation": 3,
+ "dest_map": "MAP_SS_TIDAL_ROOMS",
+ "dest_warp_id": 0
+ },
+ {
+ "x": 7,
+ "y": 9,
+ "elevation": 3,
+ "dest_map": "MAP_SS_TIDAL_ROOMS",
+ "dest_warp_id": 2
+ },
+ {
+ "x": 10,
+ "y": 9,
+ "elevation": 3,
+ "dest_map": "MAP_SS_TIDAL_ROOMS",
+ "dest_warp_id": 4
+ },
+ {
+ "x": 13,
+ "y": 9,
+ "elevation": 3,
+ "dest_map": "MAP_SS_TIDAL_ROOMS",
+ "dest_warp_id": 6
+ },
+ {
+ "x": 4,
+ "y": 3,
+ "elevation": 3,
+ "dest_map": "MAP_SS_TIDAL_ROOMS",
+ "dest_warp_id": 8
+ },
+ {
+ "x": 7,
+ "y": 3,
+ "elevation": 3,
+ "dest_map": "MAP_SS_TIDAL_ROOMS",
+ "dest_warp_id": 9
+ },
+ {
+ "x": 10,
+ "y": 3,
+ "elevation": 3,
+ "dest_map": "MAP_SS_TIDAL_ROOMS",
+ "dest_warp_id": 10
+ },
+ {
+ "x": 13,
+ "y": 3,
+ "elevation": 3,
+ "dest_map": "MAP_SS_TIDAL_ROOMS",
+ "dest_warp_id": 11
+ },
+ {
+ "x": 16,
+ "y": 2,
+ "elevation": 3,
+ "dest_map": "MAP_SS_TIDAL_LOWER_DECK",
+ "dest_warp_id": 0
+ }
+ ],
+ "coord_events": [],
+ "bg_events": [
+ {
+ "type": "sign",
+ "x": 2,
+ "y": 1,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "SSTidalCorridor_EventScript_23C17D"
+ },
+ {
+ "type": "sign",
+ "x": 4,
+ "y": 1,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "SSTidalCorridor_EventScript_23C17D"
+ },
+ {
+ "type": "sign",
+ "x": 6,
+ "y": 1,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "SSTidalCorridor_EventScript_23C17D"
+ },
+ {
+ "type": "sign",
+ "x": 8,
+ "y": 1,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "SSTidalCorridor_EventScript_23C17D"
+ },
+ {
+ "type": "sign",
+ "x": 10,
+ "y": 1,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "SSTidalCorridor_EventScript_23C17D"
+ },
+ {
+ "type": "sign",
+ "x": 12,
+ "y": 1,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "SSTidalCorridor_EventScript_23C17D"
+ },
+ {
+ "type": "sign",
+ "x": 14,
+ "y": 1,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "SSTidalCorridor_EventScript_23C17D"
+ },
+ {
+ "type": "sign",
+ "x": 16,
+ "y": 1,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
+ "script": "SSTidalCorridor_EventScript_23C17D"
+ },
+ {
+ "type": "sign",
+ "x": 5,
+ "y": 9,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "SSTidalCorridor_EventScript_23C0F5"
+ },
+ {
+ "type": "sign",
+ "x": 8,
+ "y": 9,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "SSTidalCorridor_EventScript_23C0FE"
+ },
+ {
+ "type": "sign",
+ "x": 11,
+ "y": 9,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "SSTidalCorridor_EventScript_23C107"
+ },
+ {
+ "type": "sign",
+ "x": 14,
+ "y": 9,
+ "elevation": 0,
+ "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
+ "script": "SSTidalCorridor_EventScript_23C110"
+ }
+ ]
+} \ No newline at end of file
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index 204d70e14..ec231ccdd 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -1,9 +1,9 @@
SSTidalCorridor_MapScripts:: @ 823BFCF
- map_script 2, SSTidalCorridor_MapScript2_23BFD5
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5
.byte 0
SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
- map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219
+ map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_23C219
map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF
map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015
map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067
@@ -201,7 +201,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219
lockall
applymovement 5, SSTidalCorridor_Movement_23C26D
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_2725A8
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT
closemessage
@@ -216,7 +216,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219
waitmovement 0
delay 30
setflag FLAG_MET_SCOTT_ON_SS_TIDAL
- setvar VAR_0x40D4, 1
+ setvar VAR_SS_TIDAL_SCOTT_STATE, 1
releaseall
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 12:57:27 +0000