diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-01 17:46:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 17:46:45 -0400 |
| commit | 47286d1ecb526c989d38e6e2e1c5cf80b2c5ec3f (patch) | |
| tree | c73fe8e8ea76001c7f40b2e77f22841e6d441c3f /src/battle_script_commands.c | |
| parent | 54a70ca4d4ac701b8d97c7c29687e3a824fb191e (diff) | |
| parent | f3013d8ee923472e89fe01fdbc3d386bb5006cec (diff) | |
Merge pull request #1537 from AsparagusEduardo/pret_solarbeam
Standarized Solarbeam into Solar Beam
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 92d4b9707..2bc1cfedb 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -8098,7 +8098,7 @@ static bool8 IsTwoTurnsMove(u16 move) if (gBattleMoves[move].effect == EFFECT_SKULL_BASH || gBattleMoves[move].effect == EFFECT_RAZOR_WIND || gBattleMoves[move].effect == EFFECT_SKY_ATTACK - || gBattleMoves[move].effect == EFFECT_SOLARBEAM + || gBattleMoves[move].effect == EFFECT_SOLAR_BEAM || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE || gBattleMoves[move].effect == EFFECT_BIDE) return TRUE; @@ -8118,14 +8118,14 @@ static bool8 IsInvalidForSleepTalkOrAssist(u16 move) static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a charging turn, otherwise 2 { // first argument is unused - if (gBattleMoves[move].effect == EFFECT_SOLARBEAM + if (gBattleMoves[move].effect == EFFECT_SOLAR_BEAM && (gBattleWeather & B_WEATHER_SUN)) return 2; if (gBattleMoves[move].effect == EFFECT_SKULL_BASH || gBattleMoves[move].effect == EFFECT_RAZOR_WIND || gBattleMoves[move].effect == EFFECT_SKY_ATTACK - || gBattleMoves[move].effect == EFFECT_SOLARBEAM + || gBattleMoves[move].effect == EFFECT_SOLAR_BEAM || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE || gBattleMoves[move].effect == EFFECT_BIDE) { |