diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-04-07 11:05:48 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-04-07 11:05:48 -0400 |
| commit | fedb2f5c0bd4b57b067d9057e25f9430467fd0f5 (patch) | |
| tree | 66d8085a034f01c80e2430dfeb9b650814c1350e /src/wild_encounter.c | |
| parent | 1f113498c9405494b4f34da0682deb06304ddfbe (diff) | |
| parent | 7693c90e670da8fa680153ab92f2a350815b7999 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/wild_encounter.c')
| -rw-r--r-- | src/wild_encounter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 40e18e6b4..118df3c8c 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; |