summaryrefslogtreecommitdiff
path: root/data/maps/SecretBase_YellowCave4
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SecretBase_YellowCave4')
-rw-r--r--data/maps/SecretBase_YellowCave4/events.inc23
-rw-r--r--data/maps/SecretBase_YellowCave4/header.inc15
-rw-r--r--data/maps/SecretBase_YellowCave4/map.json224
-rw-r--r--data/maps/SecretBase_YellowCave4/scripts.inc12
4 files changed, 230 insertions, 44 deletions
diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc
deleted file mode 100644
index 13757dbef..000000000
--- a/data/maps/SecretBase_YellowCave4/events.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave4_EventObjects: @ 85398B8
- object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, FLAG_DECORATION_0
- object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
- object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
- object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
- object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
- object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
- object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
- object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
- object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
- object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
- object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
- object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
- object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
- object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
- object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
-
-SecretBase_YellowCave4_MapWarps: @ 8539A20
- warp_def 6, 12, 0, 126, MAP_NONE
-
-SecretBase_YellowCave4_MapEvents:: @ 8539A28
- map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc
deleted file mode 100644
index d7056f380..000000000
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SecretBase_YellowCave4: @ 8484CDC
- .4byte SecretBase_YellowCave4_Layout
- .4byte SecretBase_YellowCave4_MapEvents
- .4byte SecretBase_YellowCave4_MapScripts
- .4byte 0x0
- .2byte MUS_MACHI_S3
- .2byte 218
- .byte MAPSEC_SECRET_BASE
- .byte 0
- .byte WEATHER_NONE
- .byte MAP_TYPE_SECRET_BASE
- .2byte 0
- map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1
- .byte MAP_BATTLE_SCENE_FRONTIER
-
diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json
new file mode 100644
index 000000000..3dfa7cc08
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave4/map.json
@@ -0,0 +1,224 @@
+{
+ "id": "MAP_SECRET_BASE_YELLOW_CAVE4",
+ "name": "SecretBase_YellowCave4",
+ "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4",
+ "music": "MUS_MACHI_S3",
+ "region_map_section": "MAPSEC_SECRET_BASE",
+ "requires_flash": false,
+ "weather": "WEATHER_NONE",
+ "map_type": "MAP_TYPE_SECRET_BASE",
+ "allow_bike": false,
+ "allow_escape_rope": false,
+ "allow_running": true,
+ "show_map_name": true,
+ "battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
+ "connections": null,
+ "object_events": [
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_F",
+ "x": 9,
+ "y": 8,
+ "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": "SecretBase_YellowCave4_EventScript_275D64",
+ "flag": "FLAG_DECORATION_0"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_0",
+ "x": 0,
+ "y": 0,
+ "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_DECORATION_1"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_1",
+ "x": 0,
+ "y": 1,
+ "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_DECORATION_2"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_2",
+ "x": 0,
+ "y": 2,
+ "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_DECORATION_3"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_3",
+ "x": 0,
+ "y": 3,
+ "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_DECORATION_4"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_4",
+ "x": 0,
+ "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": "0x0",
+ "flag": "FLAG_DECORATION_5"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_5",
+ "x": 0,
+ "y": 5,
+ "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_DECORATION_6"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_6",
+ "x": 0,
+ "y": 6,
+ "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_DECORATION_7"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_7",
+ "x": 1,
+ "y": 0,
+ "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_DECORATION_8"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_8",
+ "x": 1,
+ "y": 1,
+ "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_DECORATION_9"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_9",
+ "x": 1,
+ "y": 2,
+ "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_DECORATION_10"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_A",
+ "x": 1,
+ "y": 3,
+ "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_DECORATION_11"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_B",
+ "x": 1,
+ "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": "0x0",
+ "flag": "FLAG_DECORATION_12"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_C",
+ "x": 1,
+ "y": 5,
+ "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_DECORATION_13"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_VAR_D",
+ "x": 1,
+ "y": 6,
+ "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_DECORATION_14"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 6,
+ "y": 12,
+ "elevation": 0,
+ "dest_map": "MAP_NONE",
+ "dest_warp_id": 126
+ }
+ ],
+ "coord_events": [],
+ "bg_events": []
+} \ No newline at end of file
diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc
index 32da39388..805d7e299 100644
--- a/data/maps/SecretBase_YellowCave4/scripts.inc
+++ b/data/maps/SecretBase_YellowCave4/scripts.inc
@@ -1,12 +1,12 @@
SecretBase_YellowCave4_MapScripts:: @ 823B483
- map_script 4, SecretBase_RedCave1_MapScript2_23B498
- map_script 3, SecretBase_RedCave1_MapScript1_23B4A2
- map_script 2, SecretBase_RedCave1_MapScript2_23B4AE
- map_script 5, SecretBase_RedCave1_MapScript1_23B4B8
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498
+ map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_23B4A2
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE
+ map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8
.byte 0
SecretBase_RedCave1_MapScript2_23B498: @ 823B498
- map_script_2 VAR_0x4089, 0, EventScript_275D0C
+ map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, EventScript_275D0C
.2byte 0
SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2
@@ -16,7 +16,7 @@ SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2
end
SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE
- map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_275B81
+ map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_RedCave1_EventScript_275B81
.2byte 0
SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 02:54:12 +0000