dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered into various_documentation

Browse Source
This commit is contained in:
PikalaxALT
2020-04-07 13:45:25 -04:00
parent c05ca373e0 7f9e0ae6bf
commit 6451143b3b
277 changed files with 435 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wild_encounter.c
+3 -3
View File
@@ -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;