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/battle_setup.c | |
| parent | 96ec5e1b84f2c1d189dc67b53a113d0299b4f37b (diff) | |
| parent | edb5df1716beb4ea81ef0493a3fac0a43cc6eae5 (diff) | |
Merge branch 'master' into constants-fade
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index b98b5df06..3234e8974 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1582,7 +1582,7 @@ static bool32 UpdateRandomTrainerRematches(const struct RematchTrainer *table, u s32 i; bool32 ret = FALSE; - for (i = 0; i <= REMATCH_WALLY_3; i++) + for (i = 0; i <= REMATCH_SPECIAL_TRAINER_START; i++) { if (table[i].mapGroup == mapGroup && table[i].mapNum == mapNum && !sub_80B1D94(i)) { @@ -1641,7 +1641,7 @@ static bool8 IsFirstTrainerIdReadyForRematch(const struct RematchTrainer *table, if (tableId == -1) return FALSE; - if (tableId >= 100) + if (tableId >= MAX_REMATCH_ENTRIES) return FALSE; if (gSaveBlock1Ptr->trainerRematches[tableId] == 0) return FALSE; @@ -1655,7 +1655,7 @@ static bool8 IsTrainerReadyForRematch_(const struct RematchTrainer *table, u16 t if (tableId == -1) return FALSE; - if (tableId >= 100) + if (tableId >= MAX_REMATCH_ENTRIES) return FALSE; if (gSaveBlock1Ptr->trainerRematches[tableId] == 0) return FALSE; |