ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust formatting, rename function

Browse Source
This commit is contained in:
Phlosioneer 2019-02-25 02:28:41 -05:00
parent b2866fae21
commit e1b2460748
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/field_weather.h
View File

@ -233,6 +233,6 @@ void SetSav1WeatherFromCurrMapHeader(void);
void SetWeather(u32 weather); void SetWeather(u32 weather);
void DoCurrentWeather(void); void DoCurrentWeather(void);
void UpdateWeatherPerDay(u16 increment); void UpdateWeatherPerDay(u16 increment);
void DoPausedWeather(void); void ResumePausedWeather(void);
#endif // GUARD_WEATHER_H #endif // GUARD_WEATHER_H

36
src/field_weather_effect.c
View File

@ -2397,7 +2397,7 @@ void DoCurrentWeather(void)
SetNextWeather(weather); SetNextWeather(weather);
} }
void DoPausedWeather(void) void ResumePausedWeather(void)
{ {
u8 weather = GetSav1Weather(); u8 weather = GetSav1Weather();
@ -2435,25 +2435,25 @@ static u8 TranslateWeatherNum(u8 weather)
{ {
switch (weather) switch (weather)
{ {
case WEATHER_NONE: return WEATHER_NONE; case WEATHER_NONE: return WEATHER_NONE;
case WEATHER_CLOUDS: return WEATHER_CLOUDS; case WEATHER_CLOUDS: return WEATHER_CLOUDS;
case WEATHER_SUNNY: return WEATHER_SUNNY; case WEATHER_SUNNY: return WEATHER_SUNNY;
case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT; case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT;
case WEATHER_SNOW: return WEATHER_SNOW; case WEATHER_SNOW: return WEATHER_SNOW;
case WEATHER_RAIN_MED: return WEATHER_RAIN_MED; case WEATHER_RAIN_MED: return WEATHER_RAIN_MED;
case WEATHER_FOG_1: return WEATHER_FOG_1; case WEATHER_FOG_1: return WEATHER_FOG_1;
case WEATHER_ASH: return WEATHER_ASH; case WEATHER_ASH: return WEATHER_ASH;
case WEATHER_SANDSTORM: return WEATHER_SANDSTORM; case WEATHER_SANDSTORM: return WEATHER_SANDSTORM;
case WEATHER_FOG_2: return WEATHER_FOG_2; case WEATHER_FOG_2: return WEATHER_FOG_2;
case WEATHER_FOG_3: return WEATHER_FOG_3; case WEATHER_FOG_3: return WEATHER_FOG_3;
case WEATHER_SHADE: return WEATHER_SHADE; case WEATHER_SHADE: return WEATHER_SHADE;
case WEATHER_DROUGHT: return WEATHER_DROUGHT; case WEATHER_DROUGHT: return WEATHER_DROUGHT;
case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY;
case WEATHER_BUBBLES: return WEATHER_BUBBLES; case WEATHER_BUBBLES: return WEATHER_BUBBLES;
case WEATHER_ALTERNATING: return WEATHER_ALTERNATING; case WEATHER_ALTERNATING: return WEATHER_ALTERNATING;
case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage]; case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage];
case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage]; case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage];
default: return WEATHER_NONE; default: return WEATHER_NONE;
} }
} }

2
src/overworld.c
View File

@ -2123,7 +2123,7 @@ static void sub_8086988(u32 a1)
FieldEffectActiveListClear(); FieldEffectActiveListClear();
StartWeather(); StartWeather();
DoPausedWeather(); ResumePausedWeather();
if (!a1) if (!a1)
SetUpFieldTasks(); SetUpFieldTasks();
mapheader_run_script_with_tag_x5(); mapheader_run_script_with_tag_x5();