diff options
| -rw-r--r-- | include/global.fieldmap.h | 2 | ||||
| -rw-r--r-- | src/wild_encounter.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 5fa15b95a..fceec9daf 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -28,7 +28,7 @@ enum enum { TILE_ENCOUNTER_NONE, - TILE_ENCOUNTER_GRASS, + TILE_ENCOUNTER_LAND, TILE_ENCOUNTER_WATER, }; 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; |