summaryrefslogtreecommitdiff
path: root/src/field/item.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-14 10:53:36 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-14 10:53:36 -0500
commit1ff1e8ce9547d646b17b135b3013a516d17f35db (patch)
treec23fbb425b230e81529932482ddb0fe7fc6a1376 /src/field/item.c
parentdaa0a98ee0129be1797274de318a35df30d39020 (diff)
parentb9388f078ed95e80ac73b35eeb206e52ce376b0c (diff)
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'src/field/item.c')
-rw-r--r--src/field/item.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field/item.c b/src/field/item.c
index 66d7d65df..6ff7a7cbe 100644
--- a/src/field/item.c
+++ b/src/field/item.c
@@ -571,7 +571,7 @@ void SwapRegisteredBike(void)
static u16 SanitizeItemId(u16 itemId)
{
- if (itemId > 0x15C)
+ if (itemId >= ARRAY_COUNT(gItems))
return 0;
else
return itemId;