Decompile field weather

This commit is contained in:
DizzyEggg
2018-12-08 19:05:03 +01:00
parent 6068495619
commit 4c23adb5f5
20 changed files with 3808 additions and 8365 deletions
+3 -3
View File
@@ -23,7 +23,7 @@
#include "link.h"
#include "berry.h"
extern u8 weather_get_current(void);
extern u8 GetCurrentWeather(void);
// rom const data
static const u16 sSoundMovesTable[] =
@@ -1827,7 +1827,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
case ABILITYEFFECT_SWITCH_IN_WEATHER:
if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
{
switch (weather_get_current())
switch (GetCurrentWeather())
{
case 3:
case 5:
@@ -1862,7 +1862,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
}
if (effect)
{
gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current();
gBattleCommunication[MULTISTRING_CHOOSER] = GetCurrentWeather();
BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts);
}
break;