Merge branch 'master' into doc-introcred

2021-03-29 20:56:15 -04:00
parent dea07dc865 e8b6b4b65e
commit 50e9666e16
114 changed files with 10795 additions and 6942 deletions
@@ -1746,7 +1746,7 @@ static void Task_Scene3_SpinPokeball(u8 taskId)
        gTasks[taskId].func = Task_Scene3_WaitGroudon;
    }

-    PanFadeAndZoomScreen(0x78, 0x50, 0x10000 / gTasks[taskId].tZoomDiv, gTasks[taskId].tAlpha);
+    PanFadeAndZoomScreen(0x78, 0x50, SAFE_DIV(0x10000, gTasks[taskId].tZoomDiv), gTasks[taskId].tAlpha);

    if (gIntroFrameCounter == TIMER_POKEBALL_FADE)
        BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_WHITEALPHA);