summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-01-12 19:12:33 -0800
committerGitHub <noreply@github.com>2018-01-12 19:12:33 -0800
commit6a0d499a8a382342c3e7a81f386aea79d1105570 (patch)
treebb08da5bf2eb76b2e0013a8871208784ee9b09df /src
parente85c3517245f0fe9c1a8cb48593a3c8d1c8d28f5 (diff)
parentd6b0b3d62f80d97a8721cfe23b794ec068078d65 (diff)
Merge pull request #522 from golemgalvanize/max_item_defines
Change max item define to allow for easier item adding
Diffstat (limited to 'src')
-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;