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/BattlePyramidSquare06/events.inc | 4 ++-- data/maps/BattlePyramidSquare06/header.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/BattlePyramidSquare06') diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc index 3363f6d43..a7a1776e7 100644 --- a/data/maps/BattlePyramidSquare06/events.inc +++ b/data/maps/BattlePyramidSquare06/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare06_EventObjects: @ 853A80C +BattlePyramidSquare06_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare06_EventObjects: @ 853A80C object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare06_MapEvents:: @ 853A8B4 +BattlePyramidSquare06_MapEvents:: map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 7890c3088..2487c4a94 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare06: @ 8484FEC +BattlePyramidSquare06: .4byte BattlePyramidSquare06_Layout .4byte BattlePyramidSquare06_MapEvents .4byte BattlePyramidSquare06_MapScripts .4byte 0x0 .2byte 65535 - .2byte 367 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE06 .byte MAPSEC_DYNAMIC .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 --- data/maps/BattlePyramidSquare06/events.inc | 12 ---- data/maps/BattlePyramidSquare06/header.inc | 15 ---- data/maps/BattlePyramidSquare06/map.json | 112 +++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 27 deletions(-) delete mode 100644 data/maps/BattlePyramidSquare06/events.inc delete mode 100644 data/maps/BattlePyramidSquare06/header.inc create mode 100644 data/maps/BattlePyramidSquare06/map.json (limited to 'data/maps/BattlePyramidSquare06') diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc deleted file mode 100644 index a7a1776e7..000000000 --- a/data/maps/BattlePyramidSquare06/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare06_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare06_MapEvents:: - map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc deleted file mode 100644 index 2487c4a94..000000000 --- a/data/maps/BattlePyramidSquare06/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare06: - .4byte BattlePyramidSquare06_Layout - .4byte BattlePyramidSquare06_MapEvents - .4byte BattlePyramidSquare06_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE06 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json new file mode 100644 index 000000000..d9fa40ccd --- /dev/null +++ b/data/maps/BattlePyramidSquare06/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE06", + "name": "BattlePyramidSquare06", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 5, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 2, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 5, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 2, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 7, + "elevation": 4, + "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 4, + "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 0, + "elevation": 4, + "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": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file -- cgit v1.2.3