diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-01-14 14:18:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 14:18:29 -0600 |
| commit | b4b4fb951a588dd50b4589efea11d1a17fd88342 (patch) | |
| tree | 8bce21f083717e8b39df833136fdab956673001b /src/apprentice.c | |
| parent | e13895e58ab38c8adbde1e572068692e8ee5ee35 (diff) | |
| parent | 87763d133fadac8270dab0cba3d964a47b5b0dd2 (diff) | |
Merge pull request #519 from DizzyEggg/trainer_hill
Trainer Hill
Diffstat (limited to 'src/apprentice.c')
| -rw-r--r-- | src/apprentice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/apprentice.c b/src/apprentice.c index 5d636d05d..9cf8cd4b4 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -1080,7 +1080,7 @@ void ResetApprenticeStruct(struct Apprentice *apprentice) u8 i; for (i = 0; i < 6; i++) - apprentice->easyChatWords[i] |= 0xFFFF; + apprentice->easyChatWords[i] = 0xFFFF; apprentice->playerName[0] = EOS; apprentice->id = 16; @@ -1094,7 +1094,7 @@ void ResetAllApprenticeData(void) for (i = 0; i < 4; i++) { for (j = 0; j < 6; j++) - gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= 0xFFFF; + gSaveBlock2Ptr->apprentices[i].easyChatWords[j] = 0xFFFF; gSaveBlock2Ptr->apprentices[i].id = 16; gSaveBlock2Ptr->apprentices[i].playerName[0] = EOS; gSaveBlock2Ptr->apprentices[i].lvlMode = 0; |