diff options
Diffstat (limited to 'data/maps/PowerPlant/scripts.inc')
| -rw-r--r-- | data/maps/PowerPlant/scripts.inc | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index b70dc0f22..aa6fa42b0 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -4,43 +4,43 @@ PowerPlant_MapScripts:: @ 8163764 .byte 0 PowerPlant_MapScript1_16376F:: @ 816376F - checkflag FLAG_0x807 - call_if 1, EventScript_163779 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_163779 end EventScript_163779:: @ 8163779 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return PowerPlant_MapScript2_16378D:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT - checkflag FLAG_0x2BF - call_if 0, EventScript_1637AC - checkflag FLAG_0x2D0 - call_if 0, EventScript_1637B0 - checkflag FLAG_0x2D1 - call_if 0, EventScript_1637B4 + checkflag FLAG_FOUGHT_ZAPDOS + call_if FALSE, EventScript_1637AC + checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 + call_if FALSE, EventScript_1637B0 + checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 + call_if FALSE, EventScript_1637B4 end EventScript_1637AC:: @ 81637AC - clearflag FLAG_0x05D + clearflag FLAG_HIDE_ZAPDOS return EventScript_1637B0:: @ 81637B0 - clearflag FLAG_0x085 + clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_1 return EventScript_1637B4:: @ 81637B4 - clearflag FLAG_0x086 + clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_2 return PowerPlant_EventScript_1637B8:: @ 81637B8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -53,23 +53,23 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 delay 10 playbgm MUS_EXEYE, 0 waitbuttonpress - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16381B - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163824 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163824 - setflag FLAG_0x2BF + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_16381B + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_163824 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_163824 + setflag FLAG_FOUGHT_ZAPDOS release end EventScript_16381B:: @ 816381B - setflag FLAG_0x2BF + setflag FLAG_FOUGHT_ZAPDOS goto EventScript_1A922D end @@ -81,7 +81,7 @@ EventScript_163824:: @ 8163824 PowerPlant_EventScript_16382F:: @ 816382F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -89,30 +89,30 @@ PowerPlant_EventScript_16382F:: @ 816382F playmoncry SPECIES_ELECTRODE, 2 delay 40 waitmoncry - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_163884 - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163884 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163884 - setflag FLAG_0x2D0 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_163884 + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_163884 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_163884 + 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 PowerPlant_EventScript_16388D:: @ 816388D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -120,22 +120,22 @@ PowerPlant_EventScript_16388D:: @ 816388D playmoncry SPECIES_ELECTRODE, 2 delay 40 waitmoncry - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1638E2 - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_1638E2 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_1638E2 - setflag FLAG_0x2D1 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_1638E2 + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_1638E2 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_1638E2 + 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 |