diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-06 14:21:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-06 14:21:11 -0400 |
| commit | 737a5cba552275b43a89d59d6c5595ce4af25146 (patch) | |
| tree | d5dd5a281eeaaa11706429fe9a4807039d448f4b /src | |
| parent | f9e8c88eb5055300bdb145d0cfdb9ad89b1739eb (diff) | |
| parent | b282bbc2702f57322401247fae1a5e8a1281d149 (diff) | |
Merge pull request #1546 from AsparagusEduardo/pret_sandstorm
Using WEATHER_SANDSTORM in battle_setup
Diffstat (limited to 'src')
| -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; |