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/SSAnne_Kitchen/map.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/SSAnne_Kitchen') diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 19e7eac4e..5614ae769 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -135,7 +135,7 @@ "y": 8, "elevation": 0, "item": "ITEM_CHESTO_BERRY", - "flag": "122", + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHESTO_BERRY", "unknown": 1 }, { @@ -144,7 +144,7 @@ "y": 4, "elevation": 0, "item": "ITEM_PECHA_BERRY", - "flag": "120", + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_PECHA_BERRY", "unknown": 1 }, { @@ -153,8 +153,8 @@ "y": 6, "elevation": 0, "item": "ITEM_CHERI_BERRY", - "flag": "121", + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHERI_BERRY", "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/SSAnne_Kitchen/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/SSAnne_Kitchen') diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 5614ae769..e19200676 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -157,4 +157,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/SSAnne_Kitchen/map.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/SSAnne_Kitchen') diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index e19200676..be4d95f8b 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 1, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 6, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 10, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 8, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 14, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 14, "y": 7, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 14, "y": 9, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 10, "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/SSAnne_Kitchen/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/SSAnne_Kitchen') diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index be4d95f8b..980304be4 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SSAnne_Kitchen_EventScript_1BE6AC", - "flag": "362" + "flag": "FLAG_0x16A" } ], "warp_events": [ -- 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/SSAnne_Kitchen/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/SSAnne_Kitchen') diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 980304be4..c4a75b80b 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SSAnne_Kitchen_EventScript_1BE6AC", - "flag": "FLAG_0x16A" + "flag": "FLAG_HIDE_SSANNE_KITCHEN_GREAT_BALL" } ], "warp_events": [ -- cgit v1.2.3 From 6b503e306d73c749794cf7b61126287e3941f12f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 20 Oct 2019 20:38:23 -0400 Subject: script switch/case; name script conditionals --- data/maps/SSAnne_Kitchen/scripts.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/SSAnne_Kitchen') diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index b1b60056d..8ab022028 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -20,11 +20,11 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE random 3 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_160B03 + call_if eq, EventScript_160B03 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_160B0C + call_if eq, EventScript_160B0C compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_160B15 + call_if eq, EventScript_160B15 release end -- 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/SSAnne_Kitchen/map.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'data/maps/SSAnne_Kitchen') diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index c4a75b80b..45404e0cc 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -136,7 +136,8 @@ "elevation": 0, "item": "ITEM_CHESTO_BERRY", "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHESTO_BERRY", - "unknown": 1 + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -145,7 +146,8 @@ "elevation": 0, "item": "ITEM_PECHA_BERRY", "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_PECHA_BERRY", - "unknown": 1 + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -154,7 +156,8 @@ "elevation": 0, "item": "ITEM_CHERI_BERRY", "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHERI_BERRY", - "unknown": 1 + "quantity": 1, + "underfoot": false } ] } -- cgit v1.2.3