diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-09 16:09:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 16:09:48 -0500 |
| commit | 8e424b69850eb90abd0d7a65be423f8621dc1c2e (patch) | |
| tree | 1308176f28fbc134c5e7cf19bf5788d7f93103fe /src/battle_setup.c | |
| parent | adf773f1ed272f31ae34e2613d20ec796b651bf8 (diff) | |
| parent | 1c82571fa04ecad7d4a805e5fbec4691643ac655 (diff) | |
Merge branch 'master' into doc-binterface
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index a1b01f9c1..a9d4eeddf 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -46,6 +46,7 @@ #include "constants/maps.h" #include "constants/trainers.h" #include "constants/trainer_hill.h" +#include "constants/weather.h" enum { TRANSITION_TYPE_NORMAL, @@ -686,7 +687,7 @@ u8 BattleSetup_GetTerrainId(void) } if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE113) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE113)) return BATTLE_TERRAIN_SAND; - if (GetSav1Weather() == 8) + if (GetSav1Weather() == WEATHER_SANDSTORM) return BATTLE_TERRAIN_SAND; return BATTLE_TERRAIN_PLAIN; |