From 5c1667b41a7d31df6d405d272833895bf8472cf6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 29 Jan 2019 16:55:25 -0600 Subject: Define layout constants --- data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc | 4 ++-- data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/BattleFrontier_BattlePyramidEmptySquare') diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc index f9604d8d1..793434de3 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C +BattleFrontier_BattlePyramidEmptySquare_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 @@ -16,6 +16,6 @@ BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC +BattleFrontier_BattlePyramidEmptySquare_MapEvents:: map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index ef5c8409f..46b22aa7a 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidEmptySquare: @ 8485414 +BattleFrontier_BattlePyramidEmptySquare: .4byte BattleFrontier_BattlePyramidEmptySquare_Layout .4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents .4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts .4byte 0x0 .2byte 65535 - .2byte 361 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE -- cgit v1.2.3 From 29d6221935d3e8e01dc11b4023ba977ff433f3c9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 31 Jan 2019 15:51:20 -0600 Subject: Convert map data to JSON --- .../events.inc | 21 -- .../header.inc | 15 -- .../map.json | 229 +++++++++++++++++++++ 3 files changed, 229 insertions(+), 36 deletions(-) delete mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json (limited to 'data/maps/BattleFrontier_BattlePyramidEmptySquare') diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc deleted file mode 100644 index 793434de3..000000000 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePyramidEmptySquare_MapEvents:: - map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc deleted file mode 100644 index 46b22aa7a..000000000 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare: - .4byte BattleFrontier_BattlePyramidEmptySquare_Layout - .4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents - .4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE - .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_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json new file mode 100644 index 000000000..aab03982f --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -0,0 +1,229 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "name": "BattleFrontier_BattlePyramidEmptySquare", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "music": "65535", + "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_NINJA_BOY", + "x": 0, + "y": 0, + "elevation": 0, + "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" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 1, + "y": 0, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 2, + "y": 0, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 3, + "y": 0, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 4, + "y": 0, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 5, + "y": 0, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 6, + "y": 0, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 0, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 0, + "y": 1, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 1, + "y": 1, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 3, + "y": 1, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 4, + "y": 1, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 5, + "y": 1, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 6, + "y": 1, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 1, + "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": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 2, + "y": 1, + "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": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file -- cgit v1.2.3