fix rebase issues

This commit is contained in:
CallmeEchoo 2023-05-02 16:44:42 +02:00
parent f6e80b0ca7
commit c32d5f455b

View File

@ -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: