diff options
Diffstat (limited to 'data/maps/AlteringCave')
-rw-r--r-- | data/maps/AlteringCave/events.inc | 6 | ||||
-rw-r--r-- | data/maps/AlteringCave/header.inc | 15 | ||||
-rw-r--r-- | data/maps/AlteringCave/map.json | 28 | ||||
-rw-r--r-- | data/maps/AlteringCave/scripts.inc | 2 |
4 files changed, 29 insertions, 22 deletions
diff --git a/data/maps/AlteringCave/events.inc b/data/maps/AlteringCave/events.inc deleted file mode 100644 index 898038715..000000000 --- a/data/maps/AlteringCave/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -AlteringCave_MapWarps: @ 8537894 - warp_def 18, 22, 0, 0, MAP_ROUTE103 - -AlteringCave_MapEvents:: @ 853789C - map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc deleted file mode 100644 index fe88dbca0..000000000 --- a/data/maps/AlteringCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AlteringCave: @ 8484A58 - .4byte AlteringCave_Layout - .4byte AlteringCave_MapEvents - .4byte AlteringCave_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte 420 - .byte MAPSEC_ALTERING_CAVE_2 - .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/AlteringCave/map.json b/data/maps/AlteringCave/map.json new file mode 100644 index 000000000..848eb95c1 --- /dev/null +++ b/data/maps/AlteringCave/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_ALTERING_CAVE", + "name": "AlteringCave", + "layout": "LAYOUT_ALTERING_CAVE", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_ALTERING_CAVE_2", + "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": [], + "warp_events": [ + { + "x": 18, + "y": 22, + "elevation": 0, + "dest_map": "MAP_ROUTE103", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file diff --git a/data/maps/AlteringCave/scripts.inc b/data/maps/AlteringCave/scripts.inc index a9faddc36..185466c80 100644 --- a/data/maps/AlteringCave/scripts.inc +++ b/data/maps/AlteringCave/scripts.inc @@ -1,5 +1,5 @@ AlteringCave_MapScripts:: @ 823B177 - map_script 3, AlteringCave_MapScript1_23B17D + map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D .byte 0 AlteringCave_MapScript1_23B17D: @ 823B17D |