diff options
Diffstat (limited to 'data/maps/PowerPlant/scripts.inc')
| -rw-r--r-- | data/maps/PowerPlant/scripts.inc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index d4222d23a..4ef343d14 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -4,8 +4,8 @@ PowerPlant_MapScripts:: @ 8163764 .byte 0 PowerPlant_MapScript1_16376F:: @ 816376F - checkflag FLAG_0x807 - call_if eq, EventScript_163779 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_163779 end EventScript_163779:: @ 8163779 @@ -18,11 +18,11 @@ EventScript_163779:: @ 8163779 PowerPlant_MapScript2_16378D:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT checkflag FLAG_0x2BF - call_if lt, EventScript_1637AC + call_if FALSE, EventScript_1637AC checkflag FLAG_0x2D0 - call_if lt, EventScript_1637B0 + call_if FALSE, EventScript_1637B0 checkflag FLAG_0x2D1 - call_if lt, EventScript_1637B4 + call_if FALSE, EventScript_1637B4 end EventScript_1637AC:: @ 81637AC @@ -40,7 +40,7 @@ EventScript_1637B4:: @ 81637B4 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,17 +53,17 @@ 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 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, sub_80CA74C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16381B + goto_if eq, EventScript_16381B compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163824 + goto_if eq, EventScript_163824 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163824 + goto_if eq, EventScript_163824 setflag FLAG_0x2BF release 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,17 +89,17 @@ 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 + goto_if eq, EventScript_163884 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163884 + goto_if eq, EventScript_163884 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163884 + goto_if eq, EventScript_163884 setflag FLAG_0x2D0 release end @@ -112,7 +112,7 @@ EventScript_163884:: @ 8163884 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,17 +120,17 @@ 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 + goto_if eq, EventScript_1638E2 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_1638E2 + goto_if eq, EventScript_1638E2 compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_1638E2 + goto_if eq, EventScript_1638E2 setflag FLAG_0x2D1 release end |