diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-14 01:17:28 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-14 01:17:28 +0100 |
| commit | 30858625ff6c82d7a6380a44acf5c75baa988f20 (patch) | |
| tree | 5814ac66984c481382418db28ff97f018ffc04d7 /src/field/item.c | |
| parent | 29d16a0af10c2de52de8ff37c13dd5aa3401c98f (diff) | |
| parent | 2e8f0cd4b33a7a3ea92b2b42742d78d98959d1e5 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle_anim_data
Diffstat (limited to 'src/field/item.c')
| -rw-r--r-- | src/field/item.c | 2 |
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; |