diff options
| author | huderlem <huderlem@gmail.com> | 2019-02-04 21:36:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-04 21:36:18 -0600 |
| commit | b0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (patch) | |
| tree | ceee3e124b987b8dd24cb3a7bba85d4effe1ef5d /data/maps/BattleFrontier_BattlePikeRandomRoom2 | |
| parent | 646533cfa3c8c42aee3efedaadfe49e495b64892 (diff) | |
| parent | d4125fef9bc9adb95c7a5fb5b8be903b34adc510 (diff) | |
Merge pull request #543 from pret/mapdata
Convert map data to JSON
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom2')
3 files changed, 34 insertions, 21 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc deleted file mode 100644 index 41a58ad3b..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 - map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc deleted file mode 100644 index 506a31496..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2: @ 8485564 - .4byte BattleFrontier_BattlePikeRandomRoom2_Layout - .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents - .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte 353 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json new file mode 100644 index 000000000..437e7fcfd --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "name": "BattleFrontier_BattlePikeRandomRoom2", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 2, + "y": 4, + "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": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +}
\ No newline at end of file |