diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-05-24 08:32:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 08:32:36 -0400 |
| commit | 9dd26a6602dd21251eaf1b1210cb6b458fe9822c (patch) | |
| tree | 4f877fb85bb0d0920748ea778cd11528a21478e5 /src/wild_encounter.c | |
| parent | 7f4165f7a7d99edd73f02f86f85ad7dc30f2b65f (diff) | |
| parent | 52d3cc8dac65153442d3ceed724a53546681afcf (diff) | |
Merge pull request #786 from kazblox/master
More simple NONMATCHING fixes:
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 47eb81541..1ad55dbee 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -86,20 +86,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; |