diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-30 11:23:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 11:23:13 -0400 |
| commit | 27d69ea8e6ed7722affd6ec121443e72d2cdf377 (patch) | |
| tree | e36a8c0a66553632809e340208b1713471e184e3 /data | |
| parent | e270ee1a74429adfc4991a379fe54d4043524480 (diff) | |
| parent | 38a4dea402aee2d038d81fa5bde60687caf9cfb6 (diff) | |
Merge pull request #1508 from Pokestia/master
Use compact weather macros
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 30ca1b220..951558234 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, B_WEATHER_SUN, BattleScript_SolarbeamOnFirstTurn BattleScript_SolarbeamDecideTurn:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn |