summaryrefslogtreecommitdiff
path: root/data/maps/SeafloorCavern_Room9
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SeafloorCavern_Room9')
-rw-r--r--data/maps/SeafloorCavern_Room9/events.inc18
-rw-r--r--data/maps/SeafloorCavern_Room9/header.inc15
-rw-r--r--data/maps/SeafloorCavern_Room9/map.json130
-rw-r--r--data/maps/SeafloorCavern_Room9/scripts.inc32
4 files changed, 146 insertions, 49 deletions
diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc
deleted file mode 100644
index 6ca415e12..000000000
--- a/data/maps/SeafloorCavern_Room9/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SeafloorCavern_Room9_EventObjects: @ 8535C48
- object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
- object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
- object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
- object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
- object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
- object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26
- object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2
-
-SeafloorCavern_Room9_MapWarps: @ 8535CF0
- warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8
-
-SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8
- coord_event 17, 42, 3, VAR_0x40A2, 0, SeafloorCavern_Room9_EventScript_234DC9
-
-SeafloorCavern_Room9_MapEvents:: @ 8535D08
- map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0
-
diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc
deleted file mode 100644
index 4d2be9474..000000000
--- a/data/maps/SeafloorCavern_Room9/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room9: @ 84842B0
- .4byte SeafloorCavern_Room9_Layout
- .4byte SeafloorCavern_Room9_MapEvents
- .4byte SeafloorCavern_Room9_MapScripts
- .4byte 0x0
- .2byte MUS_TOZAN
- .2byte 156
- .byte MAPSEC_SEAFLOOR_CAVERN
- .byte 0
- .byte WEATHER_FOG_1
- .byte MAP_TYPE_UNDERGROUND
- .2byte 0
- map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1
- .byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json
new file mode 100644
index 000000000..f4f7fd336
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room9/map.json
@@ -0,0 +1,130 @@
+{
+ "id": "MAP_SEAFLOOR_CAVERN_ROOM9",
+ "name": "SeafloorCavern_Room9",
+ "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM9",
+ "music": "MUS_TOZAN",
+ "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
+ "requires_flash": false,
+ "weather": "WEATHER_FOG_1",
+ "map_type": "MAP_TYPE_UNDERGROUND",
+ "allow_bike": false,
+ "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_KYOGRE_1",
+ "x": 17,
+ "y": 38,
+ "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": "0x0",
+ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ARCHIE",
+ "x": 9,
+ "y": 42,
+ "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_SEAFLOOR_CAVERN_ROOM_9_ARCHIE"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAXIE",
+ "x": 9,
+ "y": 42,
+ "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_SEAFLOOR_CAVERN_ROOM_9_MAXIE"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+ "x": 8,
+ "y": 41,
+ "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_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F",
+ "x": 8,
+ "y": 42,
+ "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_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 14,
+ "y": 5,
+ "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": "SeafloorCavern_Room9_EventScript_291401",
+ "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_KYOGRE_2",
+ "x": 17,
+ "y": 38,
+ "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": "0x0",
+ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 5,
+ "y": 4,
+ "elevation": 3,
+ "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM8",
+ "dest_warp_id": 0
+ }
+ ],
+ "coord_events": [
+ {
+ "type": "trigger",
+ "x": 17,
+ "y": 42,
+ "elevation": 3,
+ "var": "VAR_SEAFLOOR_CAVERN_STATE",
+ "var_value": "0",
+ "script": "SeafloorCavern_Room9_EventScript_234DC9"
+ }
+ ],
+ "bg_events": []
+} \ No newline at end of file
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 6ab802ee4..4c630a1d4 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -7,7 +7,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
setvar VAR_0x8005, 3
setvar VAR_0x8006, 4
setvar VAR_0x8007, 5
- applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C
waitmovement 0
@@ -15,15 +15,15 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT
closemessage
addobject VAR_0x8004
- applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A
waitmovement 0
msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT
- applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
waitmovement 0
msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT
- applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E
+ applymovement VAR_0x8004, Common_Movement_FacePlayer
waitmovement 0
msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC
@@ -47,8 +47,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
playfanfare MUS_ME_TAMA
playse SE_TAMA
special sub_80B0534
- applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6
- applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
delay 150
removeobject 7
@@ -82,7 +82,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
setvar VAR_0x8007, 5
msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT
playse SE_PC_LOGIN
- applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT
closemessage
@@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
closemessage
playse SE_PC_OFF
delay 20
- applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceDown
waitmovement 0
msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT
closemessage
@@ -103,13 +103,13 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057
applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E
waitmovement 0
- applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4
+ applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft
waitmovement 0
msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT
playse SE_PIN
- applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598
+ applymovement VAR_0x8004, Common_Movement_ExclamationMark
waitmovement 0
- applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A
+ applymovement VAR_0x8004, Common_Movement_Delay48
waitmovement 0
msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT
msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT
@@ -118,8 +118,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A
waitmovement 0
msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT
- setvar VAR_0x407B, 1
- setvar VAR_0x405E, 1
+ setvar VAR_ROUTE128_STATE, 1
+ setvar VAR_RAYQUAZA_STATE, 1
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
@@ -133,14 +133,14 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
setflag FLAG_SYS_WEATHER_CTRL
setflag FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN
setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
- setvar VAR_0x40C6, 2
- setvar VAR_0x40A2, 1
+ setvar VAR_STEVENS_HOUSE_STATE, 2
+ setvar VAR_SEAFLOOR_CAVERN_STATE, 1
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
- setflag FLAG_SPECIAL_FLAG_0x4000
+ setflag FLAG_HIDE_MAP_NAME_POPUP
warp MAP_ROUTE128, 255, 38, 22
waitstate
releaseall
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 18:46:57 +0000