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/union_room_battle.c
+++ b/src/union_room_battle.c
@@ -122,7 +122,7 @@ void CB2_UnionRoomBattle(void)
        ResetTasks();
        ResetBgsAndClearDma3BusyFlags(0);
        InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates));
-        reset_temp_tile_data_buffers();
+        ResetTempTileDataBuffers();
        if (!InitWindows(sWindowTemplates))
            return;
        DeactivateAllTextPrinters();