diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-11-29 19:24:28 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-06 09:44:08 +0800 |
| commit | 3909b6408c0125fe311d49a3029a2806993615f7 (patch) | |
| tree | a02365a6eb268dce08941968e11e319f3a7fe080 /src/safari_zone.c | |
| parent | 1b33ad6c26fa83aa7b77055ddde59c61df03d0e4 (diff) | |
Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
Diffstat (limited to 'src/safari_zone.c')
| -rw-r--r-- | src/safari_zone.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/safari_zone.c b/src/safari_zone.c index accf94981..69914b565 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -185,7 +185,7 @@ struct Pokeblock *SafariZoneGetPokeblockInFront(void) { GetPokeblockFeederInFront(); - if (gSpecialVar_Result == 0xFFFF) + if (gSpecialVar_Result == INVALID_U16) return NULL; else return &sPokeblockFeeders[gSpecialVar_Result].pokeblock; @@ -195,7 +195,7 @@ struct Pokeblock *SafariZoneGetActivePokeblock(void) { GetPokeblockFeederWithinRange(); - if (gSpecialVar_Result == 0xFFFF) + if (gSpecialVar_Result == INVALID_U16) return NULL; else return &sPokeblockFeeders[gSpecialVar_Result].pokeblock; @@ -245,7 +245,7 @@ bool8 GetInFrontFeederPokeblockAndSteps(void) { GetPokeblockFeederInFront(); - if (gSpecialVar_Result == 0xFFFF) + if (gSpecialVar_Result == INVALID_U16) { return FALSE; } |