merge with battle tent update

This commit is contained in:
DizzyEggg
2018-07-01 12:16:52 +02:00
2935 changed files with 9978 additions and 10814 deletions

View File

@@ -3991,7 +3991,7 @@ BattleScript_DrizzleActivates::
pause 0x20
printstring STRINGID_PKMNMADEITRAIN
waitstate
playanimation BS_BANK_0, B_ANIM_RAIN_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_RAIN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4019,7 +4019,7 @@ BattleScript_SandstreamActivates::
pause 0x20
printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM
waitstate
playanimation BS_BANK_0, B_ANIM_SANDSTORM_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_SANDSTORM_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4085,7 +4085,7 @@ BattleScript_DroughtActivates::
pause 0x20
printstring STRINGID_PKMNSXINTENSIFIEDSUN
waitstate
playanimation BS_BANK_0, B_ANIM_SUN_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_SUN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4561,8 +4561,8 @@ BattleScript_82DB973::
end2
BattleScript_82DB992::
various16 BS_BANK_0
various17 BS_BANK_0
various16 BS_BATTLER_0
various17 BS_BATTLER_0
various9 BS_ATTACKER
various15 BS_ATTACKER
printstring STRINGID_TIEDOPPONENTBYREFEREE