summaryrefslogtreecommitdiff
path: root/src/wild_encounter.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-04-07 07:50:06 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-04-07 07:50:06 -0400
commit31ecdcdd0a71cd0230bfa1d80b3355a60db1e93d (patch)
tree55311105ebb36f3d4a4c370af0d493b65d776dc2 /src/wild_encounter.c
parenta7d74b177999510dfd2dc1e3abf146b95180020c (diff)
parent7693c90e670da8fa680153ab92f2a350815b7999 (diff)
Merge branch 'master' of github.com:pret/pokefirered into various_documentation
Diffstat (limited to 'src/wild_encounter.c')
-rw-r--r--src/wild_encounter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 76f20c85e..5e1daaf36 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -367,7 +367,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
headerId = GetCurrentMapWildMonHeaderId();
if (headerId != 0xFFFF)
{
- if (GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_GRASS)
+ if (GetMetatileAttributeFromRawMetatileBehavior(currMetatileBehavior, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_LAND)
{
if (gWildMonHeaders[headerId].landMonsInfo == NULL)
return FALSE;
@@ -474,7 +474,7 @@ bool8 SweetScentWildEncounter(void)
headerId = GetCurrentMapWildMonHeaderId();
if (headerId != 0xFFFF)
{
- if (MapGridGetMetatileAttributeAt(x, y, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_GRASS)
+ if (MapGridGetMetatileAttributeAt(x, y, METATILE_ATTRIBUTE_ENCOUNTER_TYPE) == TILE_ENCOUNTER_LAND)
{
if (TryStartRoamerEncounter() == TRUE)
{
@@ -680,7 +680,7 @@ static u8 GetMapBaseEncounterCooldown(u8 encounterType)
u16 headerIdx = GetCurrentMapWildMonHeaderId();
if (headerIdx == 0xFFFF)
return 0xFF;
- if (encounterType == TILE_ENCOUNTER_GRASS)
+ if (encounterType == TILE_ENCOUNTER_LAND)
{
if (gWildMonHeaders[headerIdx].landMonsInfo == NULL)
return 0xFF;