atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2

Browse source
This commit is contained in:
DizzyEggg 2020-04-15 14:41:50 +02:00
commit 4c473d057e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/wild_encounter.c
View file

@ -23,6 +23,7 @@
#include "constants/layouts.h" #include "constants/layouts.h"
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/weather.h"
extern const u8 EventScript_RepelWoreOff[]; extern const u8 EventScript_RepelWoreOff[];
@ -493,7 +494,7 @@ static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility)
encounterRate /= 2; encounterRate /= 2;
else if (ability == ABILITY_ARENA_TRAP) else if (ability == ABILITY_ARENA_TRAP)
encounterRate *= 2; encounterRate *= 2;
else if (ability == ABILITY_SAND_VEIL && gSaveBlock1Ptr->weather == 8) else if (ability == ABILITY_SAND_VEIL && gSaveBlock1Ptr->weather == WEATHER_SANDSTORM)
encounterRate /= 2; encounterRate /= 2;
} }
if (encounterRate > 2880) if (encounterRate > 2880)