mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-27 04:04:17 +01:00
fix rebase issues
This commit is contained in:
parent
f6e80b0ca7
commit
c32d5f455b
@ -8880,16 +8880,7 @@ BattleScript_SnowWarningActivatesSnow::
|
|||||||
printstring STRINGID_SNOWWARNINGSNOW
|
printstring STRINGID_SNOWWARNINGSNOW
|
||||||
waitstate
|
waitstate
|
||||||
playanimation BS_BATTLER_0, B_ANIM_SNOW_CONTINUES
|
playanimation BS_BATTLER_0, B_ANIM_SNOW_CONTINUES
|
||||||
call BattleScript_WeatherFormChanges
|
call BattleScript_ActivateWeatherAbilities
|
||||||
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
|
|
||||||
end3
|
end3
|
||||||
|
|
||||||
BattleScript_ActivateTerrainEffects:
|
BattleScript_ActivateTerrainEffects:
|
||||||
|
Loading…
Reference in New Issue
Block a user