diff options
Diffstat (limited to 'src/battle/battle_util.c')
| -rw-r--r-- | src/battle/battle_util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c index 3bb99f845..8dae98b66 100644 --- a/src/battle/battle_util.c +++ b/src/battle/battle_util.c @@ -4,6 +4,7 @@ #include "data2.h" #include "event_data.h" #include "ewram.h" +#include "field_weather.h" #include "item.h" #include "link.h" #include "pokemon.h" @@ -85,7 +86,6 @@ u8 CountTrailingZeroBits(u32 a); u8 GetMoveTarget(u16 move, u8 useMoveTarget); u8 sub_803FC34(u8 bank); u16 sub_803FBFC(u8 a); -u8 weather_get_current(void); void RecordAbilityBattle(u8 bank, u8 ability); void RecordItemBattle(u8 bank, u8 holdEffect); s8 GetPokeFlavourRelation(u32 pid, u8 flavor); @@ -1987,7 +1987,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) beq ._789 @cond_branch\n\ bl ._1534\n\ ._789:\n\ - bl weather_get_current\n\ + bl GetCurrentWeather\n\ lsl r0, r0, #0x18\n\ lsr r0, r0, #0x18\n\ sub r0, r0, #0x3\n\ @@ -2084,7 +2084,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) bne ._815 @cond_branch\n\ bl ._1540\n\ ._815:\n\ - bl weather_get_current\n\ + bl GetCurrentWeather\n\ ldr r1, ._818 + 16\n\ strb r0, [r1, #0x5]\n\ ldr r0, ._818 + 20\n\ @@ -5807,7 +5807,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) { case 0xFF: //weather from overworld //_08018586 - switch (weather_get_current()) + switch (GetCurrentWeather()) { case WEATHER_RAIN_LIGHT: case WEATHER_RAIN_MED: @@ -5841,7 +5841,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } if (effect) { - gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current(); + gBattleCommunication[MULTISTRING_CHOOSER] = GetCurrentWeather(); BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts); } break; |