From a7bca8aa92b7696047bcb3da8607ac7981647630 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 18 Oct 2019 15:02:34 -0400 Subject: Hidden item flags --- data/maps/Route2/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route2') diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 33ed43697..9c681bc53 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -205,4 +205,4 @@ "script": "Route2_EventScript_167F65" } ] -} +} \ No newline at end of file -- cgit v1.2.3 From a16d9af699f367458d6832377a2806659d303bbe Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 18 Oct 2019 15:13:35 -0400 Subject: Document renewable_hidden_items --- data/maps/Route2/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route2') diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 9c681bc53..33ed43697 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -205,4 +205,4 @@ "script": "Route2_EventScript_167F65" } ] -} \ No newline at end of file +} -- cgit v1.2.3 From d98d4d887c16e8fa13360e3f243bf019844d3c41 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 15:05:51 -0400 Subject: Set map.json files with map_obj_gfx constants --- data/maps/Route2/map.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/Route2') diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 33ed43697..fd9c5c069 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 16, "y": 62, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "20" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 15, "y": 69, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "19" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 11, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "21" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 18, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "22" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 54, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "340" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 64, "elevation": 3, -- cgit v1.2.3 From a8b767965a92352de03780fb4671d2a469343d28 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 15:49:26 -0400 Subject: auto-assign map object hide/show flags --- data/maps/Route2/map.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/Route2') diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index fd9c5c069..4d68aacb4 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -35,7 +35,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "20" + "flag": "FLAG_0x014" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -48,7 +48,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "19" + "flag": "FLAG_0x013" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -61,7 +61,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "21" + "flag": "FLAG_0x015" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -74,7 +74,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "22" + "flag": "FLAG_0x016" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -87,7 +87,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BE58E", - "flag": "340" + "flag": "FLAG_0x154" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -100,7 +100,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BE59B", - "flag": "341" + "flag": "FLAG_0x155" }, { "graphics_id": "65375", -- cgit v1.2.3 From 2ff8af13d5a259fa0ca07afe3ecf4792b6871a80 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 20:30:38 -0400 Subject: Hide/show flags through 07F --- data/maps/Route2/map.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/Route2') diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 4d68aacb4..8aca651aa 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -35,7 +35,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "FLAG_0x014" + "flag": "FLAG_TEMP_14" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -48,7 +48,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "FLAG_0x013" + "flag": "FLAG_TEMP_13" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -61,7 +61,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "FLAG_0x015" + "flag": "FLAG_TEMP_15" }, { "graphics_id": "MAP_OBJ_GFX_CUT_TREE", @@ -74,7 +74,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BDF13", - "flag": "FLAG_0x016" + "flag": "FLAG_TEMP_16" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", -- cgit v1.2.3 From 26d8c4d04b174e40b62298a6bf42e2bad67cf81c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 21:41:03 -0400 Subject: Name all item ball hide/show flags --- data/maps/Route2/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route2') diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 8aca651aa..037722cdc 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -87,7 +87,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BE58E", - "flag": "FLAG_0x154" + "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -100,7 +100,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BE59B", - "flag": "FLAG_0x155" + "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" }, { "graphics_id": "65375", -- cgit v1.2.3 From 8efca06db2f5517a5383ac50525c4331cf99ec2d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 15:54:50 -0400 Subject: Cut, Strength, Rock Smash script names --- data/maps/Route2/map.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/Route2') diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 037722cdc..c211c5b72 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -34,7 +34,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_14" }, { @@ -47,7 +47,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_13" }, { @@ -60,7 +60,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_15" }, { @@ -73,7 +73,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_16" }, { -- cgit v1.2.3