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/save_location.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/save_location.c')
| -rw-r--r-- | src/save_location.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/save_location.c b/src/save_location.c index d49afa736..f7d3aa60b 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -12,7 +12,7 @@ static bool32 IsCurMapInLocationList(const u16 *list) s32 i; u16 locSum = (gSaveBlock1Ptr->location.mapGroup << 8) + (gSaveBlock1Ptr->location.mapNum); - for (i = 0; list[i] != 0xFFFF; i++) + for (i = 0; list[i] != INVALID_U16; i++) { if (list[i] == locSum) return TRUE; @@ -61,7 +61,7 @@ static const u16 sSaveLocationPokeCenterList[] = MAP_TRADE_CENTER, MAP_RECORD_CORNER, MAP_DOUBLE_BATTLE_COLOSSEUM, - 0xFFFF, + INVALID_U16, }; static bool32 IsCurMapPokeCenter(void) @@ -72,7 +72,7 @@ static bool32 IsCurMapPokeCenter(void) static const u16 sSaveLocationReloadLocList[] = // There's only 1 location, and it's presumed its for the save reload feature for battle tower. { MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, - 0xFFFF, + INVALID_U16, }; static bool32 IsCurMapReloadLocation(void) @@ -83,7 +83,7 @@ static bool32 IsCurMapReloadLocation(void) // Nulled out list. Unknown what this would have been. static const u16 sUnknown_0861440E[] = { - 0xFFFF, + INVALID_U16, }; static bool32 sub_81AFCEC(void) |