diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-05-27 06:46:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-27 06:46:29 -0400 |
| commit | c396aaa804543c6950bdef918f3773394da09bdf (patch) | |
| tree | a925bd32e0745ddf3ecef23d1ef3e710f3250273 /src/oak_speech.c | |
| parent | 3dce3407d5f9bca69d61b1cf1b314fb1e921d572 (diff) | |
| parent | 1a9ba7bb0aeb27a7d0bca43190edd054e517f27b (diff) | |
Merge pull request #431 from PikalaxALT/sync_bery_crush
Sync berry crush from Emerald
Diffstat (limited to 'src/oak_speech.c')
| -rw-r--r-- | src/oak_speech.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/oak_speech.c b/src/oak_speech.c index 96ba0adee..3779090a3 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -534,7 +534,7 @@ static void Task_OaksSpeech1(u8 taskId) case 4: gPaletteFade.bufferTransferDisabled = TRUE; InitStandardTextBoxWindows(); - ResetBg0(); + InitTextBoxGfxAndPrinters(); Menu_LoadStdPalAt(0xD0); LoadPalette(sHelpDocsPalette, 0x000, 0x080); LoadPalette(stdpal_get(2) + 15, 0x000, 0x002); @@ -1418,8 +1418,8 @@ static void Task_OakSpeech39(u8 taskId) PlaySE(SE_WARP_IN); r0 = data[2]; data[2] -= 32; - x = MathUtil_Inv16(r0 - 8); - y = MathUtil_Inv16(data[2] - 16); + x = Q_8_8_inv(r0 - 8); + y = Q_8_8_inv(data[2] - 16); SetBgAffine(2, 0x7800, 0x5400, 0x78, 0x54, x, y, 0); if (data[2] <= 96) { @@ -1566,7 +1566,7 @@ static void CB2_ReturnFromNamingScreen(void) case 3: FreeAllWindowBuffers(); InitStandardTextBoxWindows(); - ResetBg0(); + InitTextBoxGfxAndPrinters(); LoadPalette(sHelpDocsPalette, 0, 0xe0); break; case 4: |