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/apprentice.c | |
| parent | f4160ded9897f65e5ee7fa7050d195dfaa5bf5b2 (diff) | |
| parent | 06af24bce58b9285166d27fc371ad3c3dbb63a29 (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'src/apprentice.c')
| -rw-r--r-- | src/apprentice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/apprentice.c b/src/apprentice.c index 4ad295e1a..76962807e 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -1100,7 +1100,7 @@ void ResetAllApprenticeData(void) gSaveBlock2Ptr->apprentices[i].lvlMode = 0; gSaveBlock2Ptr->apprentices[i].number = 0; gSaveBlock2Ptr->apprentices[i].field_1 = 0; - for (j = 0; j < 4; j++) + for (j = 0; j < TRAINER_ID_LENGTH; j++) gSaveBlock2Ptr->apprentices[i].playerId[j] = 0; gSaveBlock2Ptr->apprentices[i].language = gGameLanguage; gSaveBlock2Ptr->apprentices[i].checksum = 0; @@ -1410,7 +1410,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves) static u16 sub_81A0284(u8 arg0, u8 speciesTableId, u8 arg2) { - u16 moves[4]; + u16 moves[MAX_MON_MOVES]; u8 i, count; if (PLAYER_APPRENTICE.field_B1_1 < 3) @@ -2063,7 +2063,7 @@ static void sub_81A1370(void) r10 = 0xFFFF; r9 = -1; - for (i = 1; i < 4; i++) + for (i = 1; i < TRAINER_ID_LENGTH; i++) { if (GetTrainerId(gSaveBlock2Ptr->apprentices[i].playerId) == GetTrainerId(gSaveBlock2Ptr->playerTrainerId) && gSaveBlock2Ptr->apprentices[i].number < r10) @@ -2092,7 +2092,7 @@ static void sub_81A1438(void) gSaveBlock2Ptr->apprentices[0].number++; sub_81A0390(gSaveBlock2Ptr->apprentices[0].field_1); - for (i = 0; i < 4; i++) + for (i = 0; i < TRAINER_ID_LENGTH; i++) gSaveBlock2Ptr->apprentices[0].playerId[i] = gSaveBlock2Ptr->playerTrainerId[i]; StringCopy(gSaveBlock2Ptr->apprentices[0].playerName, gSaveBlock2Ptr->playerName); |