diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-21 09:58:14 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-21 09:58:14 -0400 |
| commit | a1bddb8f8c3f43d0942e2874f9d873d4bcf05371 (patch) | |
| tree | 679283620e586e95daab351afd1ce43d8bd56c8e /data/maps/PowerPlant | |
| parent | 3ab70c735e86369dc927beb5cddf7adc2e96afd9 (diff) | |
Remaining story flags referenced in event scripts
Diffstat (limited to 'data/maps/PowerPlant')
| -rw-r--r-- | data/maps/PowerPlant/map.json | 4 | ||||
| -rw-r--r-- | data/maps/PowerPlant/scripts.inc | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 9c6716048..a6610832f 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_16388D", - "flag": "FLAG_HIDE_POWER_PLANT_VOLTORB_2" + "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2" }, { "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_16382F", - "flag": "FLAG_HIDE_POWER_PLANT_VOLTORB_1" + "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_1" } ], "warp_events": [ diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 4ef343d14..5c2903c19 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -17,11 +17,11 @@ EventScript_163779:: @ 8163779 PowerPlant_MapScript2_16378D:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT - checkflag FLAG_0x2BF + checkflag FLAG_FOUGHT_ZAPDOS call_if FALSE, EventScript_1637AC - checkflag FLAG_0x2D0 + checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 call_if FALSE, EventScript_1637B0 - checkflag FLAG_0x2D1 + checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 call_if FALSE, EventScript_1637B4 end @@ -30,11 +30,11 @@ EventScript_1637AC:: @ 81637AC return EventScript_1637B0:: @ 81637B0 - clearflag FLAG_HIDE_POWER_PLANT_VOLTORB_1 + clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_1 return EventScript_1637B4:: @ 81637B4 - clearflag FLAG_HIDE_POWER_PLANT_VOLTORB_2 + clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_2 return PowerPlant_EventScript_1637B8:: @ 81637B8 @@ -64,12 +64,12 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 goto_if eq, EventScript_163824 compare_var_to_value VAR_RESULT, 5 goto_if eq, EventScript_163824 - setflag FLAG_0x2BF + setflag FLAG_FOUGHT_ZAPDOS release end EventScript_16381B:: @ 816381B - setflag FLAG_0x2BF + setflag FLAG_FOUGHT_ZAPDOS goto EventScript_1A922D end @@ -100,12 +100,12 @@ PowerPlant_EventScript_16382F:: @ 816382F goto_if eq, EventScript_163884 compare_var_to_value VAR_RESULT, 5 goto_if eq, EventScript_163884 - setflag FLAG_0x2D0 + setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 release end EventScript_163884:: @ 8163884 - setflag FLAG_0x2D0 + setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 goto EventScript_1A922D end @@ -131,11 +131,11 @@ PowerPlant_EventScript_16388D:: @ 816388D goto_if eq, EventScript_1638E2 compare_var_to_value VAR_RESULT, 5 goto_if eq, EventScript_1638E2 - setflag FLAG_0x2D1 + setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 release end EventScript_1638E2:: @ 81638E2 - setflag FLAG_0x2D1 + setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 goto EventScript_1A922D end |