diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-05 14:38:26 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-05 14:38:26 -0500 |
| commit | 83137b40053bbea4c5288e269ed913746dd9713f (patch) | |
| tree | c30e0e3d4e88caf9e9f9fb6345c85bdd8aa071d2 /data/maps/PowerPlant/scripts.inc | |
| parent | 7f81fdc8df5247c926228b784f6878dc3edac051 (diff) | |
| parent | 3d5d298c63a88c1a581b58d44dcc3706a7799c04 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking
Diffstat (limited to 'data/maps/PowerPlant/scripts.inc')
| -rw-r--r-- | data/maps/PowerPlant/scripts.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 964a74e02..3877d5f57 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -8,7 +8,7 @@ PowerPlant_OnResume:: @ 816376F end PowerPlant_EventScript_TryRemoveStaticMon:: @ 8163779 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED @@ -48,10 +48,10 @@ PowerPlant_EventScript_Zapdos:: @ 81637B8 playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special Special_StartLegendaryBattle + special StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_DefeatedZapdos compare VAR_RESULT, B_OUTCOME_RAN @@ -85,7 +85,7 @@ PowerPlant_EventScript_Electrode1:: @ 816382F dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_FoughtElectrode1 compare VAR_RESULT, B_OUTCOME_RAN @@ -114,7 +114,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 - specialvar VAR_RESULT, Special_GetBattleOutcome + specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_FoughtElectrode2 compare VAR_RESULT, B_OUTCOME_RAN |