diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-24 22:01:52 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-24 22:01:52 +0100 |
| commit | e230afd54312ce044ef8f046fc1cc797c125a37a (patch) | |
| tree | 377ad0d4da6dbe671668ed5fa003e08982846241 /src/wild_encounter.c | |
| parent | 442b1826a276d9270092b7f3e43de1dd87150f4d (diff) | |
| parent | 370b1093cd40235951f0d1b6762006b085565499 (diff) | |
Merge branch 'master' into learn
Diffstat (limited to 'src/wild_encounter.c')
| -rw-r--r-- | src/wild_encounter.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 00650fc8c..2e6f1642a 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -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; |