From c32d5f455b7dcfcd9c34542e9c2a06fabd8381df Mon Sep 17 00:00:00 2001 From: CallmeEchoo Date: Tue, 2 May 2023 16:44:42 +0200 Subject: [PATCH] fix rebase issues --- data/battle_scripts_1.s | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 6e32ce0afd..d1795dcf55 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -8880,16 +8880,7 @@ BattleScript_SnowWarningActivatesSnow:: printstring STRINGID_SNOWWARNINGSNOW waitstate playanimation BS_BATTLER_0, B_ANIM_SNOW_CONTINUES - call BattleScript_WeatherFormChanges - end3 - -BattleScript_SnowWarningActivatesSnow:: - pause B_WAIT_TIME_SHORT - call BattleScript_AbilityPopUp - printstring STRINGID_SNOWWARNINGSNOW - waitstate - playanimation BS_BATTLER_0, B_ANIM_SNOW_CONTINUES - call BattleScript_WeatherFormChanges + call BattleScript_ActivateWeatherAbilities end3 BattleScript_ActivateTerrainEffects: