Merge branch 'master' into doc-link

2020-06-13 16:15:11 -04:00
parent a9a427c6f2 46f4a4bbf7
commit c2a07276ae
64 changed files with 886 additions and 803 deletions
--- a/src/link.c
+++ b/src/link.c
@@ -1659,7 +1659,7 @@ void CB2_LinkError(void)
    if (InitWindows(sLinkErrorWindowTemplates))
    {
        DeactivateAllTextPrinters();
-        reset_temp_tile_data_buffers();
+        ResetTempTileDataBuffers();
        SetGpuReg(REG_OFFSET_BLDCNT, 0);
        SetGpuReg(REG_OFFSET_BLDALPHA, 0);
        SetGpuReg(REG_OFFSET_BG0HOFS, 0);