diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-15 11:47:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-15 11:47:27 -0500 |
| commit | db8a5c6c2be2ceedadf836a8e61c71eb0ff6407b (patch) | |
| tree | 8b0323bd93c5600c8391d73232242b75135f0401 /src/battle_setup.c | |
| parent | 82f55f238125ff42845881189eb9237692c48ba4 (diff) | |
| parent | fee36224eda1acc4329646caf0e65a891928afc0 (diff) | |
Merge branch 'master' into fix-eventobj
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 ea4e807c7..7bc880229 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; |