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/Route13/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route13') diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 919048b8d..cfbd702fd 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -198,8 +198,8 @@ "y": 14, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "15", + "flag": "HIDDEN_ITEM_ROUTE13_PP_UP", "unknown": 1 } ] -} +} \ 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/Route13/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route13') diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index cfbd702fd..79920bc35 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -202,4 +202,4 @@ "unknown": 1 } ] -} \ 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/Route13/map.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/maps/Route13') diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 79920bc35..aca567b0d 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 62, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 63, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 54, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 42, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 43, "y": 7, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 35, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 29, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 9, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 16, "y": 5, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 14, "y": 8, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 44, "y": 5, "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/Route13/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route13') diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index aca567b0d..215ad80ee 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -165,7 +165,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route13_EventScript_1BDF13", - "flag": "18" + "flag": "FLAG_0x012" } ], "warp_events": [], -- 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/Route13/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route13') diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 215ad80ee..abf55d492 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -165,7 +165,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route13_EventScript_1BDF13", - "flag": "FLAG_0x012" + "flag": "FLAG_TEMP_12" } ], "warp_events": [], -- cgit v1.2.3 From c5db70322987a977f5b15d7a04a5a3e8cc080724 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 21 Oct 2019 13:34:31 -0400 Subject: Update hidden item json fields --- data/maps/Route13/map.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data/maps/Route13') diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index abf55d492..1037ef1a5 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -199,7 +199,8 @@ "elevation": 3, "item": "ITEM_PP_UP", "flag": "HIDDEN_ITEM_ROUTE13_PP_UP", - "unknown": 1 + "quantity": 1, + "underfoot": false } ] } -- 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/Route13/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route13') diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 1037ef1a5..86a682dfb 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -164,7 +164,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route13_EventScript_1BDF13", + "script": "EventScript_InteractWithCutTreeObject", "flag": "FLAG_TEMP_12" } ], -- cgit v1.2.3