diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
| commit | 47534a1471019a25e25c29a3f5bb529ccbd73e86 (patch) | |
| tree | da4f2abb0fa27f5f07bcbdd4af47ca4eec84a786 /data/maps/SSAnne_Kitchen | |
| parent | b8fec3d9f617ec9a764bb56804c526ff7449631f (diff) | |
| parent | 922411abebd56d0f5d6072bad4924c909c8e2c27 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into trade
Diffstat (limited to 'data/maps/SSAnne_Kitchen')
| -rw-r--r-- | data/maps/SSAnne_Kitchen/map.json | 33 | ||||
| -rw-r--r-- | data/maps/SSAnne_Kitchen/scripts.inc | 6 |
2 files changed, 21 insertions, 18 deletions
diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 19e7eac4e..45404e0cc 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, @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SSAnne_Kitchen_EventScript_1BE6AC", - "flag": "362" + "flag": "FLAG_HIDE_SSANNE_KITCHEN_GREAT_BALL" } ], "warp_events": [ @@ -135,8 +135,9 @@ "y": 8, "elevation": 0, "item": "ITEM_CHESTO_BERRY", - "flag": "122", - "unknown": 1 + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHESTO_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -144,8 +145,9 @@ "y": 4, "elevation": 0, "item": "ITEM_PECHA_BERRY", - "flag": "120", - "unknown": 1 + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_PECHA_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -153,8 +155,9 @@ "y": 6, "elevation": 0, "item": "ITEM_CHERI_BERRY", - "flag": "121", - "unknown": 1 + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHERI_BERRY", + "quantity": 1, + "underfoot": false } ] } 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 |