From b1d26e10a829a2a1526754b88167485df7e2511f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 10 Mar 2020 23:13:27 -0400 Subject: Sync map header property names with pokefirered --- data/maps/Route113/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route113/map.json') diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index cddfe125c..7419f4711 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -7,8 +7,8 @@ "requires_flash": false, "weather": "WEATHER_SUNNY", "map_type": "MAP_TYPE_ROUTE", - "allow_bike": true, - "allow_escape_rope": false, + "allow_cycling": true, + "allow_escaping": false, "allow_running": true, "show_map_name": true, "battle_scene": "MAP_BATTLE_SCENE_NORMAL", -- cgit v1.2.3 From e5757a3deffaf5fb211f50c6245e2eee826a8019 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 27 Mar 2020 10:24:10 -0400 Subject: Use trainer type constants --- data/maps/Route113/map.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/maps/Route113/map.json') diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index 7419f4711..f9fceed4d 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -38,7 +38,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_NinjaBoy", "flag": "0" @@ -51,7 +51,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_Gentleman", "flag": "0" @@ -64,7 +64,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route113_EventScript_Jaylen", "flag": "0" @@ -77,7 +77,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route113_EventScript_Dillon", "flag": "0" @@ -90,7 +90,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route113_EventScript_Madeline", "flag": "0" @@ -103,7 +103,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_ItemMaxEther", "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER" @@ -116,7 +116,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_ItemSuperRepel", "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL" @@ -155,7 +155,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_Tori", "flag": "0" @@ -168,7 +168,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_Tia", "flag": "0" @@ -181,7 +181,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route113_EventScript_ItemHyperPotion", "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION" @@ -194,7 +194,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route113_EventScript_Wyatt", "flag": "0" @@ -207,7 +207,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_Lawrence", "flag": "0" @@ -220,7 +220,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route113_EventScript_Sophie", "flag": "0" @@ -233,7 +233,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route113_EventScript_Coby", "flag": "0" -- cgit v1.2.3 From cb5b8da77b9ba6837fcc8c5163bedc5008b12c2c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 21 Apr 2020 15:53:48 -0400 Subject: More trainer type usage --- data/maps/Route113/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route113/map.json') diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index f9fceed4d..df1b35223 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -129,7 +129,7 @@ "movement_type": "MOVEMENT_TYPE_HIDDEN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "3", + "trainer_type": "TRAINER_TYPE_BURIED", "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_Lao", "flag": "0" @@ -142,7 +142,7 @@ "movement_type": "MOVEMENT_TYPE_HIDDEN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "3", + "trainer_type": "TRAINER_TYPE_BURIED", "trainer_sight_or_berry_tree_id": "1", "script": "Route113_EventScript_Lung", "flag": "0" -- cgit v1.2.3