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_BattlePikeThreePathRoom/events.inc | 6 +++--- data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom') diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc index 2fc9e9d6c..59abdb970 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc @@ -1,8 +1,8 @@ -BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 +BattleFrontier_BattlePikeThreePathRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 -BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 +BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 @@ -13,6 +13,6 @@ BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D -BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40 +BattleFrontier_BattlePikeThreePathRoom_MapEvents:: map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index 9743a7c36..718d5d3e6 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeThreePathRoom: @ 848552C +BattleFrontier_BattlePikeThreePathRoom: .4byte BattleFrontier_BattlePikeThreePathRoom_Layout .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 351 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM .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 | 18 --- .../header.inc | 15 --- .../map.json | 129 +++++++++++++++++++++ 3 files changed, 129 insertions(+), 33 deletions(-) delete mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom') diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc deleted file mode 100644 index 59abdb970..000000000 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 - object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 - -BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: - coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E - coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 - coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 - coord_event 5, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 5, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - -BattleFrontier_BattlePikeThreePathRoom_MapEvents:: - map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc deleted file mode 100644 index 718d5d3e6..000000000 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom: - .4byte BattleFrontier_BattlePikeThreePathRoom_Layout - .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents - .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM - .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_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json new file mode 100644 index 000000000..e2d0645cb --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -0,0 +1,129 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", + "name": "BattleFrontier_BattlePikeThreePathRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", + "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": 4, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E" + }, + { + "type": "trigger", + "x": 6, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59" + }, + { + "type": "trigger", + "x": 10, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64" + }, + { + "type": "trigger", + "x": 5, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + }, + { + "type": "trigger", + "x": 6, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + }, + { + "type": "trigger", + "x": 6, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 5, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 7, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 7, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + } + ], + "bg_events": [] +} \ No newline at end of file -- cgit v1.2.3 From 0b1bb9e4e934a26f8b165b00e08f8c2f8ed8953d Mon Sep 17 00:00:00 2001 From: garak Date: Sat, 16 Feb 2019 16:44:48 -0500 Subject: use strings for map json coord_event var_value --- .../BattleFrontier_BattlePikeThreePathRoom/map.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom') diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index e2d0645cb..ca416ce54 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -49,7 +49,7 @@ "y": 3, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E" }, { @@ -58,7 +58,7 @@ "y": 3, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59" }, { @@ -67,7 +67,7 @@ "y": 3, "elevation": 3, "var": "VAR_TEMP_1", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64" }, { @@ -76,7 +76,7 @@ "y": 10, "elevation": 0, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" }, { @@ -85,7 +85,7 @@ "y": 10, "elevation": 0, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" }, { @@ -94,7 +94,7 @@ "y": 9, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" }, { @@ -103,7 +103,7 @@ "y": 9, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" }, { @@ -112,7 +112,7 @@ "y": 9, "elevation": 3, "var": "VAR_TEMP_2", - "var_value": 0, + "var_value": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" }, { @@ -121,7 +121,7 @@ "y": 10, "elevation": 0, "var": "VAR_TEMP_3", - "var_value": 1, + "var_value": "1", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" } ], -- cgit v1.2.3 From 19b76bffda07d8878c1ff1a9005e1b57c549ffce Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 16 Feb 2019 16:40:31 -0600 Subject: Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields --- data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom') diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index ca416ce54..ac9230c53 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -22,8 +22,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908", "flag": "0" }, @@ -35,8 +35,8 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": 0, - "trainer_sight_or_berry_tree_id": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB", "flag": "0" } -- cgit v1.2.3 From 8816aa527d7f3adfa10988ac661b9842bf78e64b Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Fri, 22 Feb 2019 02:28:32 -0500 Subject: Update map script files --- data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom') diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index cac594516..54f11f071 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -1,7 +1,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843 - map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E - map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 - map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D .byte 0 BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853 -- cgit v1.2.3