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

Merge pull request #325 from GriffinRichards/fix-encounter

Browse Source 
Fix tile encounter name
This commit is contained in:
PikalaxALT
2020-04-06 20:50:52 -04:00
committed by GitHub
parent 6ecd9dd943 662c8db99e
commit de9ae24766
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/global.fieldmap.h
+1 -1
View File
@@ -28,7 +28,7 @@ enum
enum
{
TILE_ENCOUNTER_NONE,
TILE_ENCOUNTER_GRASS,
TILE_ENCOUNTER_LAND,
TILE_ENCOUNTER_WATER,
};
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;