Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest

2020-08-16 05:59:10 -04:00
parent 2749948eeb 25f45ffa84
commit 65bd2faf94
511 changed files with 17469 additions and 16800 deletions
@@ -326,7 +326,7 @@ static void Task_RecordMixing_Main(u8 taskId)
        VarSet(VAR_TEMP_0, 1);
        gUnknown_03001130 = FALSE;
        PrepareExchangePacket();
-        CreateRecordMixingSprite();
+        CreateRecordMixingLights();
        tState = 1;
        data[10] = CreateTask(Task_MixingRecordsRecv, 80);
        tSndEffTaskId = CreateTask(Task_RecordMixing_SoundEffect, 81);
@@ -336,7 +336,7 @@ static void Task_RecordMixing_Main(u8 taskId)
        {
            tState = 2;
            FlagSet(FLAG_SYS_MIX_RECORD);
-            DestroyRecordMixingSprite();
+            DestroyRecordMixingLights();
            DestroyTask(tSndEffTaskId);
        }
        break;