diff options
| author | huderlem <huderlem@gmail.com> | 2019-11-23 09:27:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-23 09:27:02 -0600 |
| commit | bef6150b59abb23380529099016f9deef8c558ca (patch) | |
| tree | 1f89af901a1f634c7547f6f3ce0bbb8faf5bbee5 /src/frontier_util.c | |
| parent | e3f7f47321bbe399dfcfc422d53d9beb5caab788 (diff) | |
| parent | f039e897ca8229e6e9b104408bf48c2d4e0dcb4b (diff) | |
Merge pull request #909 from GriffinRichards/doc-apprentice
Document Apprentice
Diffstat (limited to 'src/frontier_util.c')
| -rw-r--r-- | src/frontier_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/frontier_util.c b/src/frontier_util.c index baf830af9..87aff022e 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -1698,7 +1698,7 @@ void CopyFrontierTrainerText(u8 whichText, u16 trainerId) else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE) FrontierSpeechToString(gSaveBlock2Ptr->frontier.towerRecords[trainerId - TRAINER_RECORD_MIXING_FRIEND].greeting); else - CopyFriendsApprenticeChallengeText(trainerId - TRAINER_RECORD_MIXING_APPRENTICE); + BufferApprenticeChallengeText(trainerId - TRAINER_RECORD_MIXING_APPRENTICE); break; case FRONTIER_PLAYER_LOST_TEXT: if (trainerId == TRAINER_EREADER) @@ -1725,7 +1725,7 @@ void CopyFrontierTrainerText(u8 whichText, u16 trainerId) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) FrontierSpeechToString(GetRecordedBattleEasyChatSpeech()); else - FrontierSpeechToString(gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].easyChatWords); + FrontierSpeechToString(gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].speechWon); } break; case FRONTIER_PLAYER_WON_TEXT: @@ -1753,12 +1753,12 @@ void CopyFrontierTrainerText(u8 whichText, u16 trainerId) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) { trainerId = GetRecordedBattleApprenticeId(); - FrontierSpeechToString(gApprentices[trainerId].easyChatWords); + FrontierSpeechToString(gApprentices[trainerId].speechLost); } else { trainerId = gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].id; - FrontierSpeechToString(gApprentices[trainerId].easyChatWords); + FrontierSpeechToString(gApprentices[trainerId].speechLost); } } break; |