Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix feebas check

This commit is contained in:
Melody 2018-12-24 12:41:38 -05:00 committed by Marcus Huderle
parent c2fdbb0ef7
commit 370b1093cd
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wild_encounter.c
View File

@ -88,20 +88,12 @@ static bool8 CheckFeebas(void)
x -= 7;
y -= 7;
#ifdef NONMATCHING
if (y >= gRoute119WaterTileData[3 * 0 + 0] && y <= gRoute119WaterTileData[3 * 0 + 1])
route119Section = 0;
if (y >= gRoute119WaterTileData[3 * 1 + 0] && y <= gRoute119WaterTileData[3 * 1 + 1])
route119Section = 1;
if (y >= gRoute119WaterTileData[3 * 2 + 0] && y <= gRoute119WaterTileData[3 * 2 + 1])
route119Section = 2;
#else
{
register const u16 *arr asm("r0");
if (y >= (arr = gRoute119WaterTileData)[3 * 1 + 0] && y <= arr[3 * 1 + 1])
route119Section = 1;
if (y >= arr[3 * 2 + 0] && y <= arr[3 * 2 + 1])
route119Section = 2;
}
#endif
if (Random() % 100 > 49) // 50% chance of encountering Feebas
return FALSE;