Sync berry crush from Emerald

2021-05-05 13:03:39 -04:00
parent 9ed87063f1
commit ee6b3c1acf
46 changed files with 1776 additions and 1456 deletions
@@ -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 = invfx16(r0 - 8);
+        y = invfx16(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: