diff options
Diffstat (limited to 'data/scripts/field_poison.inc')
| -rw-r--r-- | data/scripts/field_poison.inc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index 9f8058e4e..2ca9c7b06 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -1,51 +1,51 @@ -EventScript_Poison:: @ 82736BC +EventScript_FieldPoison:: @ 82736BC lockall - special ExecuteWhiteOut + special TryFieldPoisonWhiteOut waitstate - compare VAR_RESULT, 1 - goto_if_eq EventScript_2736D9 - compare VAR_RESULT, 2 - goto_if_eq EventScript_2736F8 + compare VAR_RESULT, FLDPSN_WHITEOUT + goto_if_eq EventScript_FieldWhiteOut + compare VAR_RESULT, FLDPSN_FRONTIER_WHITEOUT + goto_if_eq EventScript_FrontierFieldWhiteOut releaseall end -EventScript_2736D9:: @ 82736D9 +EventScript_FieldWhiteOut:: @ 82736D9 message gText_PlayerWhitedOut waitmessage waitbuttonpress - special sub_80B05B4 + special Script_FadeOutMapMusic waitstate fadescreen 1 - call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_2736F4 - special sp0C8_whiteout_maybe + call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter + special SetCB2WhiteOut waitstate end -EventScript_2736F4:: @ 82736F4 +EventScript_SetRespawnLavaridgePkmnCenter:: @ 82736F4 setrespawn HEAL_LOCATION_LAVARIDGE_TOWN return -EventScript_2736F8:: @ 82736F8 +EventScript_FrontierFieldWhiteOut:: @ 82736F8 message gText_PlayerWhitedOut waitmessage waitbuttonpress - setvar VAR_0x8004, 16 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN special CallBattlePikeFunction compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 - setvar VAR_0x8004, 12 + goto_if_eq BattleFrontier_BattlePike_EventScript_Retire + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN special CallBattlePyramidFunction compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - setvar VAR_0x8004, TRAINER_HILL_FUNC_10 + setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN special CallTrainerHillFunction compare VAR_RESULT, 1 - goto_if_eq TrainerHill_1F_EventScript_2C83C9 - special sub_80B05B4 + goto_if_eq TrainerHill_1F_EventScript_Lost + special Script_FadeOutMapMusic waitstate fadescreen 1 - special sp0C8_whiteout_maybe + special SetCB2WhiteOut waitstate end |