diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-05-19 12:10:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-19 12:10:26 -0400 |
| commit | 4661be783654c654ba66c5e5fafa1aa18e7b9213 (patch) | |
| tree | 414b3654d06ebe8431c1334874a336a0c1a6d354 /src | |
| parent | 6c2d5ea50d8b2505f7eccc4283bfc32961adfb92 (diff) | |
| parent | 333d2f37a811c05672f785a13af47708ccc08613 (diff) | |
Merge pull request #57 from SatoMew/master
Add weather labels and missing constants
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_ai_script_commands.c | 6 | ||||
| -rw-r--r-- | src/pokemon.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 6f5577f70..6343b55cd 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -1623,7 +1623,7 @@ static void BattleAICmd_if_status_not_in_party(void) enum { - WEATHER_TYPE_SUN, + WEATHER_TYPE_SUNNY, WEATHER_TYPE_RAIN, WEATHER_TYPE_SANDSTORM, WEATHER_TYPE_HAIL, @@ -1637,8 +1637,8 @@ static void BattleAICmd_get_weather(void) AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_RAIN; if (gBattleWeather & WEATHER_SANDSTORM_ANY) AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SANDSTORM; - if (gBattleWeather & WEATHER_SUN_ANY) - AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SUN; + if (gBattleWeather & WEATHER_SUNNY_ANY) + AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SUNNY; if (gBattleWeather & WEATHER_HAIL) AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_HAIL; diff --git a/src/pokemon.c b/src/pokemon.c index 7700d537a..3a9fdbf04 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1001,7 +1001,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de damage /= 2; // sunny - if (gBattleWeather & WEATHER_SUN_ANY) + if (gBattleWeather & WEATHER_SUNNY_ANY) { switch (type) { |