diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-06 12:53:53 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-06 12:53:53 -0400 |
| commit | 662c8db99e3ef22c611e7ce9a16b628c04972229 (patch) | |
| tree | 0ea5bc3ad4b4f5a7fbd77cb203c7ec98a295f335 /src | |
| parent | 6ecd9dd943a22f7f090f3b272dbc8a6e04039199 (diff) | |
Fix tile encounter name
Diffstat (limited to 'src')
| -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; |