summaryrefslogtreecommitdiff
path: root/data/maps/FieryPath
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/FieryPath')
-rw-r--r--data/maps/FieryPath/events.inc17
-rw-r--r--data/maps/FieryPath/header.inc15
-rw-r--r--data/maps/FieryPath/map.json140
-rw-r--r--data/maps/FieryPath/scripts.inc2
4 files changed, 141 insertions, 33 deletions
diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc
deleted file mode 100644
index 0ea132989..000000000
--- a/data/maps/FieryPath/events.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-FieryPath_EventObjects: @ 8534C80
- object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06
- object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11
- object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12
- object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_13
- object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_14
- object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_15
- object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16
- object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE
-
-FieryPath_MapWarps: @ 8534D40
- warp_def 26, 36, 3, 4, MAP_ROUTE112
- warp_def 26, 4, 3, 5, MAP_ROUTE112
-
-FieryPath_MapEvents:: @ 8534D50
- map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc
deleted file mode 100644
index 20278028f..000000000
--- a/data/maps/FieryPath/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FieryPath: @ 8484048
- .4byte FieryPath_Layout
- .4byte FieryPath_MapEvents
- .4byte FieryPath_MapScripts
- .4byte 0x0
- .2byte MUS_DAN01
- .2byte 293
- .byte MAPSEC_FIERY_PATH
- .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/FieryPath/map.json b/data/maps/FieryPath/map.json
new file mode 100644
index 000000000..61324a8ff
--- /dev/null
+++ b/data/maps/FieryPath/map.json
@@ -0,0 +1,140 @@
+{
+ "id": "MAP_FIERY_PATH",
+ "name": "FieryPath",
+ "layout": "LAYOUT_FIERY_PATH",
+ "music": "MUS_DAN01",
+ "region_map_section": "MAPSEC_FIERY_PATH",
+ "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_ITEM_BALL",
+ "x": 8,
+ "y": 3,
+ "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": "FieryPath_EventScript_29119E",
+ "flag": "FLAG_ITEM_FIERY_PATH_TM06"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+ "x": 10,
+ "y": 15,
+ "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": "FieryPath_EventScript_2908BA",
+ "flag": "FLAG_TEMP_11"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+ "x": 17,
+ "y": 15,
+ "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": "FieryPath_EventScript_2908BA",
+ "flag": "FLAG_TEMP_12"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+ "x": 8,
+ "y": 11,
+ "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": "FieryPath_EventScript_2908BA",
+ "flag": "FLAG_TEMP_13"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+ "x": 3,
+ "y": 12,
+ "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": "FieryPath_EventScript_2908BA",
+ "flag": "FLAG_TEMP_14"
+ },
+ {
+ "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": "FieryPath_EventScript_2908BA",
+ "flag": "FLAG_TEMP_15"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER",
+ "x": 5,
+ "y": 24,
+ "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": "FieryPath_EventScript_2908BA",
+ "flag": "FLAG_TEMP_16"
+ },
+ {
+ "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "x": 7,
+ "y": 32,
+ "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": "FieryPath_EventScript_291191",
+ "flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE"
+ }
+ ],
+ "warp_events": [
+ {
+ "x": 26,
+ "y": 36,
+ "elevation": 3,
+ "dest_map": "MAP_ROUTE112",
+ "dest_warp_id": 4
+ },
+ {
+ "x": 26,
+ "y": 4,
+ "elevation": 3,
+ "dest_map": "MAP_ROUTE112",
+ "dest_warp_id": 5
+ }
+ ],
+ "coord_events": [],
+ "bg_events": []
+} \ No newline at end of file
diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc
index 3888c61ef..ddba0dc0b 100644
--- a/data/maps/FieryPath/scripts.inc
+++ b/data/maps/FieryPath/scripts.inc
@@ -1,5 +1,5 @@
FieryPath_MapScripts:: @ 8230F24
- map_script 3, FieryPath_MapScript1_230F2A
+ map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_230F2A
.byte 0
FieryPath_MapScript1_230F2A: @ 8230F2A