diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-17 19:11:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 19:11:51 -0500 |
| commit | 4879c1eab27b0a01410d6c56c0a25b8152b166b8 (patch) | |
| tree | c2d5f2f056d753bb65dfd36ec3ca7d27419f2c31 /src/match_call.c | |
| parent | 96ec5e1b84f2c1d189dc67b53a113d0299b4f37b (diff) | |
| parent | edb5df1716beb4ea81ef0493a3fac0a43cc6eae5 (diff) | |
Merge branch 'master' into constants-fade
Diffstat (limited to 'src/match_call.c')
| -rw-r--r-- | src/match_call.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/match_call.c b/src/match_call.c index 646b14cea..dac98e559 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1060,7 +1060,7 @@ static bool32 SelectMatchCallTrainer(void) static u32 GetNumRegisteredNPCs(void) { u32 i, count; - for (i = 0, count = 0; i < 64; i++) + for (i = 0, count = 0; i < REMATCH_SPECIAL_TRAINER_START; i++) { if (FlagGet(FLAG_MATCH_CALL_REGISTERED + i)) count++; @@ -1072,7 +1072,7 @@ static u32 GetNumRegisteredNPCs(void) static u32 GetActiveMatchCallTrainerId(u32 activeMatchCallId) { u32 i; - for (i = 0; i < 64; i++) + for (i = 0; i < REMATCH_SPECIAL_TRAINER_START; i++) { if (FlagGet(FLAG_MATCH_CALL_REGISTERED + i)) { @@ -1384,7 +1384,7 @@ static u16 GetRematchTrainerLocation(int matchCallId) static u32 GetNumRematchTrainersFought(void) { u32 i, count; - for (i = 0, count = 0; i < 64; i++) + for (i = 0, count = 0; i < REMATCH_SPECIAL_TRAINER_START; i++) { if (HasTrainerBeenFought(gRematchTable[i].trainerIds[0])) count++; @@ -1961,7 +1961,7 @@ static const u8 *const sBirchDexRatingTexts[] = gBirchDexRatingText_DexCompleted, }; -void sub_8197080(u8 *destStr) +void BufferPokedexRatingForMatchCall(u8 *destStr) { int numSeen, numCaught; u8 *str; |