Merge remote-tracking branch 'upstream/main' into d_a_obj_boomerang

include/egg/audio/eggAudioRmtSpeakerMgr.h

@@ -42,7 +42,7 @@ private:
 
     static u8 sAudioRmtSpeakerWpadVolume;
 
-    static AudioRmtSpeakerTask sTasks[0x14];
+    static AudioRmtSpeakerTask sConnectTask[0x14];
 };
 
 } // namespace EGG

include/egg/gfx/eggDrawPathDOF.h

@@ -30,8 +30,8 @@ public:
     void execute();
 
 private:
-    void internalDrawVariant01(u16);
-    void internalDrawVariant2(u16);
+    void internalDrawStandard(u16);
+    void internalDrawLite(u16);
 
     void afterDraw(u16 x, u16 y, u16 width, u16 height);