summaryrefslogtreecommitdiff
path: root/data/maps/MagmaHideout_1F
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/MagmaHideout_1F')
-rw-r--r--data/maps/MagmaHideout_1F/events.inc17
-rw-r--r--data/maps/MagmaHideout_1F/header.inc15
-rw-r--r--data/maps/MagmaHideout_1F/map.json128
-rw-r--r--data/maps/MagmaHideout_1F/scripts.inc4
4 files changed, 130 insertions, 34 deletions
diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc
deleted file mode 100644
index fd82f78e0..000000000
--- a/data/maps/MagmaHideout_1F/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MagmaHideout_1F_EventObjects: @ 85371CC
- object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
- object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY
- object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS
- object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_11
- object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_12
- object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_13
-
-MagmaHideout_1F_MapWarps: @ 853725C
- warp_def 10, 34, 3, 4, MAP_JAGGED_PASS
- warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R
- warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R
- warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R
-
-MagmaHideout_1F_MapEvents:: @ 853727C
- map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc
deleted file mode 100644
index 897f4f4fd..000000000
--- a/data/maps/MagmaHideout_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MagmaHideout_1F: @ 8484828
- .4byte MagmaHideout_1F_Layout
- .4byte MagmaHideout_1F_MapEvents
- .4byte MagmaHideout_1F_MapScripts
- .4byte 0x0
- .2byte MUS_AJITO
- .2byte 336
- .byte MAPSEC_MAGMA_HIDEOUT
- .byte 0
- .byte WEATHER_NONE
- .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/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json
new file mode 100644
index 000000000..8eb3e23b5
--- /dev/null
+++ b/data/maps/MagmaHideout_1F/map.json
@@ -0,0 +1,128 @@
+{
+ "id": "MAP_MAGMA_HIDEOUT_1F",
+ "name": "MagmaHideout_1F",
+ "layout": "LAYOUT_MAGMA_HIDEOUT_1F",
+ "music": "MUS_AJITO",
+ "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
+ "requires_flash": false,
+ "weather": "WEATHER_NONE",
+ "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_MAGMA_MEMBER_M",
+ "x": 4,
+ "y": 5,
+ "elevation": 0,
+ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
+ "movement_range_x": 1,
+ "movement_range_y": 1,
+ "trainer_type": "1",
+ "trainer_sight_or_berry_tree_id": "2",
+ "script": "MagmaHideout_1F_EventScript_23988C",
+ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 3,
+ "y": 20,
+ "elevation": 0,
+ "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": "MagmaHideout_1F_EventScript_2914DE",
+ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M",
+ "x": 30,
+ "y": 20,
+ "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": "4",
+ "script": "MagmaHideout_1F_EventScript_2398A3",
+ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+ "x": 5,
+ "y": 22,
+ "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": "MagmaHideout_1F_EventScript_2908BA",
+ "flag": "FLAG_TEMP_11"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+ "x": 7,
+ "y": 22,
+ "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": "MagmaHideout_1F_EventScript_2908BA",
+ "flag": "FLAG_TEMP_12"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+ "x": 6,
+ "y": 23,
+ "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": "MagmaHideout_1F_EventScript_2908BA",
+ "flag": "FLAG_TEMP_13"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 10,
+ "y": 34,
+ "elevation": 3,
+ "dest_map": "MAP_JAGGED_PASS",
+ "dest_warp_id": 4
+ },
+ {
+ "x": 25,
+ "y": 34,
+ "elevation": 3,
+ "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R",
+ "dest_warp_id": 1
+ },
+ {
+ "x": 31,
+ "y": 3,
+ "elevation": 0,
+ "dest_map": "MAP_MAGMA_HIDEOUT_2F_2R",
+ "dest_warp_id": 1
+ },
+ {
+ "x": 20,
+ "y": 22,
+ "elevation": 0,
+ "dest_map": "MAP_MAGMA_HIDEOUT_2F_3R",
+ "dest_warp_id": 0
+ }
+ ],
+ "coord_events": [],
+ "bg_events": []
+} \ No newline at end of file
diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc
index 56ad204a9..0e0360990 100644
--- a/data/maps/MagmaHideout_1F/scripts.inc
+++ b/data/maps/MagmaHideout_1F/scripts.inc
@@ -1,9 +1,9 @@
MagmaHideout_1F_MapScripts:: @ 8239880
- map_script 3, MagmaHideout_1F_MapScript1_239886
+ map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_MapScript1_239886
.byte 0
MagmaHideout_1F_MapScript1_239886: @ 8239886
- setvar VAR_0x40BD, 0
+ setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
end
MagmaHideout_1F_EventScript_23988C:: @ 823988C
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-13 03:04:25 +0000