diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-22 19:10:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 19:10:49 -0500 |
| commit | e0fae879da1b773bf90fca145e047ccdb7613938 (patch) | |
| tree | b1be0ec73e33fccf2fe2deac44d62aa10ae391e4 /src/battle_setup.c | |
| parent | 5cb875b6cb798cf890e156f54a150ff90735ddab (diff) | |
| parent | 42a83ee50e3364f3f7361dacb3d3616053f4c5bf (diff) | |
Merge pull request #1558 from GriffinRichards/update-macros
Update event macro comments
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index a9d4eeddf..f928cf3f9 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -43,7 +43,6 @@ #include "constants/items.h" #include "constants/songs.h" #include "constants/map_types.h" -#include "constants/maps.h" #include "constants/trainers.h" #include "constants/trainer_hill.h" #include "constants/weather.h" @@ -687,7 +686,7 @@ u8 BattleSetup_GetTerrainId(void) } if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE113) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE113)) return BATTLE_TERRAIN_SAND; - if (GetSav1Weather() == WEATHER_SANDSTORM) + if (GetSavedWeather() == WEATHER_SANDSTORM) return BATTLE_TERRAIN_SAND; return BATTLE_TERRAIN_PLAIN; @@ -700,7 +699,7 @@ static u8 GetBattleTransitionTypeByMap(void) PlayerGetDestCoords(&x, &y); tileBehavior = MapGridGetMetatileBehaviorAt(x, y); - if (Overworld_GetFlashLevel()) + if (GetFlashLevel()) return TRANSITION_TYPE_FLASH; if (!MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior)) { |