diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2019-09-17 00:10:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 00:10:23 -0400 |
| commit | 945d3d3a27f6e5005e5481bb2ad36f1a2a220d3d (patch) | |
| tree | 7dc8f5a21c6bb7640aad82de03a314b0e919f3b2 /src/secret_base.c | |
| parent | f4160ded9897f65e5ee7fa7050d195dfaa5bf5b2 (diff) | |
| parent | 06af24bce58b9285166d27fc371ad3c3dbb63a29 (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'src/secret_base.c')
| -rw-r--r-- | src/secret_base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index ad9cceb47..d02011406 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -349,7 +349,7 @@ void SetPlayerSecretBase(void) u16 i; gSaveBlock1Ptr->secretBases[0].secretBaseId = sCurSecretBaseId; - for (i = 0; i < 4; i++) + for (i = 0; i < TRAINER_ID_LENGTH; i++) gSaveBlock1Ptr->secretBases[0].trainerId[i] = gSaveBlock2Ptr->playerTrainerId[i]; VarSet(VAR_CURRENT_SECRET_BASE, 0); @@ -1291,7 +1291,7 @@ static void SetSecretBaseDataAndLanguage(u8 secretBaseId, struct SecretBase *sec static bool8 SecretBasesHaveSameTrainerId(struct SecretBase *secretBase1, struct SecretBase *secretBase2) { u8 i; - for (i = 0; i < 4; i++) + for (i = 0; i < TRAINER_ID_LENGTH; i++) { if (secretBase1->trainerId[i] != secretBase2->trainerId[i]) return FALSE; @@ -1445,7 +1445,7 @@ bool8 SecretBaseBelongsToPlayer(struct SecretBase *secretBase) return FALSE; // Check if the player's trainer Id matches the secret base's id. - for (i = 0; i < 4; i++) + for (i = 0; i < TRAINER_ID_LENGTH; i++) { if (secretBase->trainerId[i] != gSaveBlock2Ptr->playerTrainerId[i]) return FALSE; |