diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
| commit | c94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch) | |
| tree | b188427bb1942695f32e14ee3fe137855d638c8c /src/string_util.c | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/string_util.c')
| -rw-r--r-- | src/string_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/string_util.c b/src/string_util.c index 17507b0e8..f059ac43d 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -487,7 +487,7 @@ u8 *GetExpandedPlaceholder(u32 id) [PLACEHOLDER_ID_KYOGRE] = ExpandPlaceholder_Kyogre, }; - if (id >= ARRAY_COUNT(funcs)) + if (id >= NELEMS(funcs)) return gExpandedPlaceholder_Empty; else return funcs[id](); @@ -627,7 +627,7 @@ u8 GetExtCtrlCodeLength(u8 code) }; u8 length = 0; - if (code < ARRAY_COUNT(lengths)) + if (code < NELEMS(lengths)) length = lengths[code]; return length; } |