diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-18 15:25:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 15:25:46 -0400 |
| commit | ed16a7409ae9c808a110975dec1930f9f949a6d6 (patch) | |
| tree | 662be8b474b9c50264fc49262cbaf21769479516 /src/roamer.c | |
| parent | 5075067ecd8718ab96a063946662c71fe3ef5369 (diff) | |
| parent | c5aa5d37229e5692355e4b3979b6cafbcad7caee (diff) | |
Merge pull request #403 from PikalaxALT/battle_multi_buffer
Battle documentation (14032021)
Diffstat (limited to 'src/roamer.c')
| -rw-r--r-- | src/roamer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/roamer.c b/src/roamer.c index 074ac22cf..6367e9d43 100644 --- a/src/roamer.c +++ b/src/roamer.c @@ -94,7 +94,7 @@ void CreateInitialRoamerMon(void) saveRoamer.smart = GetMonData(tmpMon, MON_DATA_SMART); saveRoamer.tough = GetMonData(tmpMon, MON_DATA_TOUGH); sRoamerLocation[MAP_GRP] = 3; - sRoamerLocation[MAP_NUM] = sRoamerLocations[Random() % (ARRAY_COUNT(sRoamerLocations) - 1)][0]; + sRoamerLocation[MAP_NUM] = sRoamerLocations[Random() % (NELEMS(sRoamerLocations) - 1)][0]; } void InitRoamer(void) @@ -125,7 +125,7 @@ void RoamerMoveToOtherLocationSet(void) while (1) { - mapNum = sRoamerLocations[Random() % (ARRAY_COUNT(sRoamerLocations) - 1)][0]; + mapNum = sRoamerLocations[Random() % (NELEMS(sRoamerLocations) - 1)][0]; if (sRoamerLocation[MAP_NUM] != mapNum) { sRoamerLocation[MAP_NUM] = mapNum; @@ -150,7 +150,7 @@ void RoamerMove(void) if (!roamer->active) return; - while (locSet < (ARRAY_COUNT(sRoamerLocations) - 1)) + while (locSet < (NELEMS(sRoamerLocations) - 1)) { if (sRoamerLocation[MAP_NUM] == sRoamerLocations[locSet][0]) { |