summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPokestia <faiskiru@gmail.com>2021-09-29 17:45:39 +0200
committerPokestia <faiskiru@gmail.com>2021-09-29 17:45:39 +0200
commite6999653323a4a7a424e9d7d39fd3168dd84b355 (patch)
tree9ff6ee0d1676b50fb7880eda28a0e5840af0cf62 /data
parente270ee1a74429adfc4991a379fe54d4043524480 (diff)
Use compact weather macros
Diffstat (limited to 'data')
-rw-r--r--data/battle_scripts_1.s2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 30ca1b220..7a65573e6 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -1901,7 +1901,7 @@ BattleScript_EffectStomp::
BattleScript_EffectSolarbeam::
jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarbeamDecideTurn
jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarbeamDecideTurn
- jumpifhalfword CMP_COMMON_BITS, gBattleWeather, WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT, BattleScript_SolarbeamOnFirstTurn
+ jumpifhalfword CMP_COMMON_BITS, gBattleWeather, WEATHER_SUN_ANY, BattleScript_SolarbeamOnFirstTurn
BattleScript_SolarbeamDecideTurn::
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn