Full project cleanup + other changes (#3)

Improves many of the added changes made in edc5133, d2c9320, and
0a603ee.
Removes IUse folder and adds headers for their related classes.
Marks missing functions from old decomp structure as non-matching.
This PR also makes various other minor changes, like fully matching
WorldMapEarth or partially matching RootTask.

CMakeLists.txt

@@ -18,8 +18,8 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-file(GLOB_RECURSE SOURCES_GAME ${PROJECT_SOURCE_DIR}/src/*.cpp ${PROJECT_SOURCE_DIR}/src/*.c ${PROJECT_SOURCE_DIR}/libs/*.cpp)
-file(GLOB_RECURSE SOURCES_AL ${PROJECT_SOURCE_DIR}/lib/al/*.cpp ${PROJECT_SOURCE_DIR}/lib/al/*.c ${PROJECT_SOURCE_DIR}/lib/al/*.cpp)
+file(GLOB_RECURSE SOURCES_GAME ${PROJECT_SOURCE_DIR}/src/*.cpp ${PROJECT_SOURCE_DIR}/src/*.c ${PROJECT_SOURCE_DIR}/src/*.hpp ${PROJECT_SOURCE_DIR}/src/*.h)
+file(GLOB_RECURSE SOURCES_AL ${PROJECT_SOURCE_DIR}/lib/al/*.cpp ${PROJECT_SOURCE_DIR}/lib/al/*.c ${PROJECT_SOURCE_DIR}/lib/al/*.h ${PROJECT_SOURCE_DIR}/lib/al/*.hpp)
 
 add_executable(odyssey ${SOURCES_GAME} ${SOURCES_AL})
 

data/odyssey_functions.csv

@@ -3557,7 +3557,7 @@ Address,Quality,Size,Name
 0x00000071000b717c,U,000120,_ZN16MofumofuWarpHole8exeCloseEv
 0x00000071000b71f4,O,000004,_ZN16MofumofuWarpHole11exeHideWaitEv
 0x00000071000b71f8,O,000060,_ZN16MofumofuWarpHole11exeHideMoveEv
-0x00000071000b7234,m,000420,_ZN16MofumofuWarpHole11exeDashSignEv
+0x00000071000b7234,U,000420,_ZN16MofumofuWarpHole11exeDashSignEv
 0x00000071000b73d8,U,000064,_ZN16MofumofuWarpHole14exeDashSignEndEv
 0x00000071000b7418,U,000068,_ZN12_GLOBAL__N_125MofumofuWarpHoleNrvAppear7executeEPN2al11NerveKeeperE
 0x00000071000b745c,U,000100,_ZN12_GLOBAL__N_128MofumofuWarpHoleNrvDisappear7executeEPN2al11NerveKeeperE
@@ -6230,7 +6230,7 @@ Address,Quality,Size,Name
 0x000000710015733c,U,000004,_ZN2rs27SensorMsgCactusNeedleAttackD0Ev
 0x0000007100157340,U,000004,_ZN2al9SensorMsgD2Ev
 0x0000007100157344,O,000012,_ZNK4sead15RuntimeTypeInfo4Root9isDerivedEPKNS0_9InterfaceE
-0x0000007100157350,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN2al9SensorMsgEE9isDerivedEPKNS0_9InterfaceE
+0x0000007100157350,U,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN2al9SensorMsgEE9isDerivedEPKNS0_9InterfaceE
 0x0000007100157418,U,000028,_ZNK2al10FunctorV0MIP10KuriboMiniMS1_FvvEEclEv
 0x0000007100157434,U,000076,_ZNK2al10FunctorV0MIP10KuriboMiniMS1_FvvEE5cloneEv
 0x0000007100157480,U,000004,_ZN2al10FunctorV0MIP10KuriboMiniMS1_FvvEED0Ev
@@ -9814,7 +9814,7 @@ Address,Quality,Size,Name
 0x00000071002154e0,O,000048,_ZN24AnagramAlphabetCharacter13killCapTargetEv
 0x0000007100215510,O,000076,_ZN24AnagramAlphabetCharacter7exeWaitEv
 0x000000710021555c,O,000052,_ZN24AnagramAlphabetCharacter11exeWaitHackEv
-0x0000007100215590,O,000064,_ZN24AnagramAlphabetCharacter16exeWaitHackStartEv
+0x0000007100215590,U,000064,_ZN24AnagramAlphabetCharacter16exeWaitHackStartEv
 0x00000071002155d0,O,000164,_ZN24AnagramAlphabetCharacter12exeHackStartEv
 0x0000007100215674,O,000208,_ZN24AnagramAlphabetCharacter11exeHackWaitEv
 0x0000007100215744,U,000428,_ZN24AnagramAlphabetCharacter11exeHackMoveEv
@@ -15560,10 +15560,10 @@ Address,Quality,Size,Name
 0x000000710034acd8,U,000268,_ZN14WindBlowPuzzle9movePartsEP16WindBlowMapPartsii
 0x000000710034ade4,U,000364,_ZNK14WindBlowPuzzle13checkOnAnswerEi
 0x000000710034af50,U,000140,_ZNK14WindBlowPuzzle14checkCollisionERKN4sead7Vector3IiEE
-0x000000710034b0ec,U,000120,_ZN13WorldMapEarthC2EPKc
-0x000000710034b164,U,000132,_ZN13WorldMapEarthC1EPKc
-0x000000710034b1e8,U,000048,_ZN13WorldMapEarth4initERKN2al13ActorInitInfoE
-0x000000710034b218,U,000076,_ZN13WorldMapEarth7controlEv
+0x000000710034b0ec,O,000120,_ZN13WorldMapEarthC2EPKc
+0x000000710034b164,O,000132,_ZN13WorldMapEarthC1EPKc
+0x000000710034b1e8,O,000048,_ZN13WorldMapEarth4initERKN2al13ActorInitInfoE
+0x000000710034b218,O,000076,_ZN13WorldMapEarth7controlEv
 0x000000710034b264,U,000364,_ZN17WorldMapKoopaShip6createEPKcRKN2al13ActorInitInfoEPKN4sead8Matrix34IfEE
 0x000000710034b3d0,U,000156,_ZN17WorldMapKoopaShipC1EPKc
 0x000000710034b46c,U,000144,_ZN17WorldMapKoopaShipC2EPKc
@@ -17170,9 +17170,9 @@ Address,Quality,Size,Name
 0x0000007100378590,U,001868,_ZNK17AchievementHolder32getAchievementProgressCurrentRowEi22GameDataHolderAccessor
 0x0000007100378cdc,U,000128,_ZNK17AchievementHolder19calcAchieveTotalNumE22GameDataHolderAccessor
 0x0000007100378d5c,U,000132,_ZNK17AchievementHolder19calcMoonGetTotalNumE22GameDataHolderAccessor
-0x0000007100378de0,m,000184,_ZNK17AchievementHolder20tryGetNewAchievementE22GameDataHolderAccessor
+0x0000007100378de0,U,000184,_ZNK17AchievementHolder20tryGetNewAchievementE22GameDataHolderAccessor
 0x0000007100378e98,U,000008,_ZN21AchievementInfoReaderC2Ev
-0x0000007100378ea0,m,000508,_ZN21AchievementInfoReader4initEv
+0x0000007100378ea0,U,000508,_ZN21AchievementInfoReader4initEv
 0x000000710037909c,U,000120,_ZNK21AchievementInfoReader18tryFindIndexByNameEPKc
 0x0000007100379114,U,000184,_ZN14AchievementNpcC2EPKc
 0x00000071003791cc,U,000168,_ZN14AchievementNpcC1EPKc
@@ -21917,7 +21917,7 @@ Address,Quality,Size,Name
 0x000000710045e854,U,000004,_ZN23PlayerModelChangerYoshi14hideShadowMaskEv
 0x000000710045e858,U,000004,_ZN23PlayerModelChangerYoshi14showShadowMaskEv
 0x000000710045e85c,U,000216,_ZN17PlayerModelHolderC1Ej
-0x000000710045e934,m,000312,_ZN17PlayerModelHolder13registerModelEPN2al9LiveActorEPKc
+0x000000710045e934,U,000312,_ZN17PlayerModelHolder13registerModelEPN2al9LiveActorEPKc
 0x000000710045ea6c,U,000128,_ZN17PlayerModelHolder11changeModelEPKc
 0x000000710045eaec,U,000128,_ZNK17PlayerModelHolder14findModelActorEPKc
 0x000000710045eb6c,U,000120,_ZNK17PlayerModelHolder17tryFindModelActorEPKc
@@ -21927,16 +21927,16 @@ Address,Quality,Size,Name
 0x000000710045ec6c,U,000012,_ZN12PlayerOxygen5setupEiiii
 0x000000710045ec78,U,000016,_ZN12PlayerOxygen5resetEv
 0x000000710045ec88,U,000084,_ZN12PlayerOxygen6reduceEv
-0x000000710045ecdc,m,000040,_ZN12PlayerOxygen8recoveryEv
+0x000000710045ecdc,U,000040,_ZN12PlayerOxygen8recoveryEv
 0x000000710045ed04,U,000040,_ZNK12PlayerOxygen15isTriggerDamageEv
 0x000000710045ed2c,U,000032,_ZN21PlayerPainPartsKeeperC2EPKN2al9LiveActorEPK17PlayerCostumeInfo
 0x000000710045ed4c,U,000004,_ZN21PlayerPainPartsKeeper6updateEv
 0x000000710045ed50,U,000164,_ZN21PlayerPainPartsKeeper12updateNeedleEv
 0x000000710045edf4,U,000060,_ZN21PlayerPainPartsKeeper13resetPositionEv
 0x000000710045ee30,U,000064,_ZNK21PlayerPainPartsKeeper16isEnableNosePainEv
 0x000000710045ee70,U,000016,_ZNK21PlayerPainPartsKeeper21isInvalidNoseDynamicsEv
-0x000000710045ee80,m,000272,_ZN21PlayerPainPartsKeeper16createNoseNeedleEPK17PlayerModelHolderRKN2al13ActorInitInfoE
-0x000000710045ef90,m,000112,_ZN21PlayerPainPartsKeeper12appearNeedleEv
+0x000000710045ee80,U,000272,_ZN21PlayerPainPartsKeeper16createNoseNeedleEPK17PlayerModelHolderRKN2al13ActorInitInfoE
+0x000000710045ef90,U,000112,_ZN21PlayerPainPartsKeeper12appearNeedleEv
 0x000000710045f000,U,000084,_ZN19PlayerPlayRecordMtxC2Ev
 0x000000710045f054,U,000032,_ZN19PlayerPlayRecordMtx11startRecordERKN4sead8Matrix34IfEE
 0x000000710045f074,U,000068,_ZN19PlayerPlayRecordMtx13recordViewMtxERKN4sead8Matrix34IfEE
@@ -26729,7 +26729,7 @@ Address,Quality,Size,Name
 0x000000710053565c,U,000232,_ZNK16GameProgressData24calcWorldIdByOrderUnlockEi
 0x0000007100535744,U,000080,_ZN10GameSystemC2Ev
 0x0000007100535794,U,000152,_ZN10GameSystemD2Ev
-0x000000710053582c,O,000036,_ZN10GameSystemD0Ev
+0x000000710053582c,U,000036,_ZN10GameSystemD0Ev
 0x0000007100535850,U,002880,_ZN10GameSystem4initEv
 0x0000007100536390,U,000176,_ZN10GameSystem10setPadNameEv
 0x0000007100536440,U,000468,_ZN10GameSystem17tryChangeSequenceEPKc
@@ -26794,7 +26794,7 @@ Address,Quality,Size,Name
 0x0000007100538b30,U,000008,_ZNK18PlayerHitPointData17isForceNormalModeEv
 0x0000007100538b38,U,000072,_ZN18PlayerHitPointData5writeEPN2al11ByamlWriterE
 0x0000007100538b80,U,000180,_ZN18PlayerHitPointData4readERKN2al9ByamlIterE
-0x0000007100538c34,U,000020,_ZN18alProjectInterface12getSystemKitEv
+0x0000007100538c34,O,000020,_ZN18alProjectInterface12getSystemKitEv
 0x0000007100538c48,U,000056,_ZN18ProjectNfpDirectorC2Ev
 0x0000007100538c80,U,000004,_ZN18ProjectNfpDirectorD2Ev
 0x0000007100538c84,U,000036,_ZN18ProjectNfpDirectorD0Ev
@@ -26811,8 +26811,8 @@ Address,Quality,Size,Name
 0x0000007100538fc4,U,000224,_ZN10RaceRecord4readERKN2al9ByamlIterE
 0x00000071005390a4,U,000068,_ZN8RootTaskC2ERKN4sead16TaskConstructArgE
 0x00000071005390e8,U,000476,_ZN8RootTask7prepareEv
-0x00000071005392c4,U,000004,_ZN8RootTask5enterEv
-0x00000071005392c8,U,000160,_ZN8RootTask4calcEv
+0x00000071005392c4,O,000004,_ZN8RootTask5enterEv
+0x00000071005392c8,O,000160,_ZN8RootTask4calcEv
 0x0000007100539368,U,000016,_ZN8RootTask4drawEv
 0x0000007100539378,U,000036,_ZN8RootTaskD0Ev
 0x000000710053939c,U,000204,_ZNK4sead4Task27checkDerivedRuntimeTypeInfoEPKNS_15RuntimeTypeInfo9InterfaceE
@@ -44657,7 +44657,7 @@ Address,Quality,Size,Name
 0x00000071008400c0,U,000008,_ZNK2al12ICameraInput23isHoldSnapShotRollRightEv
 0x00000071008400c8,U,000088,_ZNK2al12ICameraInput12calcGyroPoseEPN4sead7Vector3IfEES4_S4_
 0x0000007100840120,U,000172,_ZN2al18SnapShotCameraCtrlC1EPKNS_23SnapShotCameraSceneInfoE
-0x00000071008401cc,W,000032,_ZN2al18SnapShotCameraCtrl5startEf
+0x00000071008401cc,U,000032,_ZN2al18SnapShotCameraCtrl5startEf
 0x00000071008401ec,W,000136,_ZN2al18SnapShotCameraCtrl4loadERKNS_9ByamlIterE
 0x0000007100840274,U,000032,_ZN2al18SnapShotCameraCtrl10startResetEi
 0x0000007100840294,U,001488,_ZN2al18SnapShotCameraCtrl6updateERKN4sead12LookAtCameraEPKNS_13IUseCollisionEPKNS_12ICameraInputE
@@ -48484,8 +48484,8 @@ Address,Quality,Size,Name
 0x00000071008d7694,U,000072,_ZN2al35tryExpandClippingByShadowMaskLengthEPNS_9LiveActorEPN4sead7Vector3IfEE
 0x00000071008d76dc,U,000640,_ZN2al36tryExpandClippingByDepthShadowLengthEPNS_9LiveActorEPN4sead7Vector3IfEE
 0x00000071008d795c,U,000116,_ZN2al31tryExpandClippingByExpandObjectEPNS_9LiveActorERKNS_13ActorInitInfoE
-0x00000071008d79d0,U,000012,_ZN2al9isClippedEPKNS_9LiveActorE
-0x00000071008d79dc,U,000012,_ZN2al17isInvalidClippingEPKNS_9LiveActorE
+0x00000071008d79d0,O,000012,_ZN2al9isClippedEPKNS_9LiveActorE
+0x00000071008d79dc,O,000012,_ZN2al17isInvalidClippingEPKNS_9LiveActorE
 0x00000071008d79e8,U,000100,_ZN2al18invalidateClippingEPNS_9LiveActorE
 0x00000071008d7a4c,U,000072,_ZN2al16validateClippingEPNS_9LiveActorE
 0x00000071008d7a94,U,000168,_ZN2al14onDrawClippingEPNS_9LiveActorE
@@ -48610,16 +48610,16 @@ Address,Quality,Size,Name
 0x00000071008d99c8,U,000020,_ZN2al16invalidateShadowEPNS_9LiveActorE
 0x00000071008d99dc,U,000024,_ZN2al9onCollideEPNS_9LiveActorE
 0x00000071008d99f4,O,000016,_ZN2al10offCollideEPNS_9LiveActorE
-0x00000071008d9a04,U,000016,_ZN2al20validateMaterialCodeEPNS_9LiveActorE
-0x00000071008d9a14,U,000012,_ZN2al22invalidateMaterialCodeEPNS_9LiveActorE
-0x00000071008d9a20,U,000016,_ZN2al22validatePuddleMaterialEPNS_9LiveActorE
-0x00000071008d9a30,U,000012,_ZN2al24invalidatePuddleMaterialEPNS_9LiveActorE
-0x00000071008d9a3c,U,000012,_ZN2al12isAreaTargetEPKNS_9LiveActorE
-0x00000071008d9a48,U,000016,_ZN2al12onAreaTargetEPNS_9LiveActorE
+0x00000071008d9a04,O,000016,_ZN2al20validateMaterialCodeEPNS_9LiveActorE
+0x00000071008d9a14,O,000012,_ZN2al22invalidateMaterialCodeEPNS_9LiveActorE
+0x00000071008d9a20,O,000016,_ZN2al22validatePuddleMaterialEPNS_9LiveActorE
+0x00000071008d9a30,O,000012,_ZN2al24invalidatePuddleMaterialEPNS_9LiveActorE
+0x00000071008d9a3c,O,000012,_ZN2al12isAreaTargetEPKNS_9LiveActorE
+0x00000071008d9a48,O,000016,_ZN2al12onAreaTargetEPNS_9LiveActorE
 0x00000071008d9a58,U,000012,_ZN2al13offAreaTargetEPNS_9LiveActorE
-0x00000071008d9a64,U,000012,_ZN2al42isUpdateMovementEffectAudioCollisionSensorEPKNS_9LiveActorE
-0x00000071008d9a70,U,000016,_ZN2al42onUpdateMovementEffectAudioCollisionSensorEPNS_9LiveActorE
-0x00000071008d9a80,U,000012,_ZN2al43offUpdateMovementEffectAudioCollisionSensorEPNS_9LiveActorE
+0x00000071008d9a64,O,000012,_ZN2al42isUpdateMovementEffectAudioCollisionSensorEPKNS_9LiveActorE
+0x00000071008d9a70,O,000016,_ZN2al42onUpdateMovementEffectAudioCollisionSensorEPNS_9LiveActorE
+0x00000071008d9a80,O,000012,_ZN2al43offUpdateMovementEffectAudioCollisionSensorEPNS_9LiveActorE
 0x00000071008d9a8c,U,000104,_ZN2al18initActorSceneInfoEPNS_9LiveActorERKNS_13ActorInitInfoE
 0x00000071008d9af4,U,000008,_ZN2al18initExecutorUpdateEPNS_9LiveActorERKNS_13ActorInitInfoEPKc
 0x00000071008d9afc,U,000008,_ZN2al16initExecutorDrawEPNS_9LiveActorERKNS_13ActorInitInfoEPKc
@@ -48930,7 +48930,7 @@ Address,Quality,Size,Name
 0x00000071008e274c,U,000012,_ZN2al31isJudgedToClipFrustumWithoutFarEPKNS_16ClippingDirectorERKN4sead7Vector3IfEEff
 0x00000071008e2758,U,000072,_ZN2al31isJudgedToClipFrustumWithoutFarEPKNS_9LiveActorERKN4sead7Vector3IfEEff
 0x00000071008e27a0,U,000084,_ZN2al31isJudgedToClipFrustumWithoutFarEPKNS_9LiveActorEff
-0x00000071008e27f4,O,000196,_ZN2al13resetPositionEPNS_9LiveActorE
+0x00000071008e27f4,m,000196,_ZN2al13resetPositionEPNS_9LiveActorE
 0x00000071008e28b8,O,000036,_ZN2al13resetPositionEPNS_9LiveActorERKN4sead7Vector3IfEE
 0x00000071008e28dc,O,000052,_ZN2al19resetRotatePositionEPNS_9LiveActorERKN4sead7Vector3IfEES6_
 0x00000071008e2910,O,000052,_ZN2al17resetQuatPositionEPNS_9LiveActorERKN4sead4QuatIfEERKNS2_7Vector3IfEE
@@ -54550,7 +54550,7 @@ Address,Quality,Size,Name
 0x00000071009c2f50,U,000004,_ZN2al16createRailKeeperERKNS_13PlacementInfoEPKc
 0x00000071009c2f54,U,000168,_ZN2al19tryCreateRailKeeperERKNS_13PlacementInfoEPKc
 0x00000071009c2ffc,U,000164,_ZN2al21createRailKeeperIndexERKNS_13PlacementInfoEiPKc
-0x00000071009c30a0,U,000008,_ZNK2al10RailKeeper12getRailRiderEv
+0x00000071009c30a0,O,000008,_ZNK2al10RailKeeper12getRailRiderEv
 0x00000071009c30a8,O,000012,_ZN2al8RailPartC2Ev
 0x00000071009c30b4,O,000336,_ZN2al8RailPart4initERKN4sead7Vector3IfEES5_S5_S5_
 0x00000071009c3204,O,000024,_ZNK2al8RailPart7calcPosEPN4sead7Vector3IfEEf

lib/al/Library/Area/AreaInitInfo.h

@@ -13,13 +13,11 @@ class AreaInitInfo : public al::PlacementInfo {
     al::SceneObjHolder* mSceneObjHolder = nullptr;
 
 public:
-    AreaInitInfo() { };
-    AreaInitInfo(const al::PlacementInfo& placementInfo,
-                 al::StageSwitchDirector* stageSwitchDirector, al::SceneObjHolder* sceneObjHolder);
+    AreaInitInfo(){};
+    AreaInitInfo(const al::PlacementInfo& placementInfo, al::StageSwitchDirector* stageSwitchDirector, al::SceneObjHolder* sceneObjHolder);
     AreaInitInfo(const al::PlacementInfo& placementInfo, const al::AreaInitInfo& initInfo);
 
-    void set(const al::PlacementInfo& placementInfo, al::StageSwitchDirector* stageSwitchDirector,
-             al::SceneObjHolder* sceneObjHolder);
+    void set(const al::PlacementInfo& placementInfo, al::StageSwitchDirector* stageSwitchDirector, al::SceneObjHolder* sceneObjHolder);
 
     al::StageSwitchDirector* getStageSwitchDirector() const { return mStageSwitchDirector; }
     al::SceneObjHolder* getSceneObjHolder() const { return mSceneObjHolder; }

lib/al/Library/Area/AreaObjDirector.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <basis/seadTypes.h>
+#include <math/seadVector.h>
+
+namespace al {
+class AreaObjFactory;
+class AreaObjMtxConnecterHolder;
+class AreaObjGroup;
+class AreaObj;
+class AreaInitInfo;
+
+class AreaObjDirector {
+private:
+    al::AreaObjFactory* mFactory;
+    al::AreaObjMtxConnecterHolder* mMtxConnecterHolder;
+    al::AreaObjGroup** mAreaGroups;
+    u32 mAreaGroupCount;
+
+public:
+    AreaObjDirector();
+    void init(const al::AreaObjFactory* factory);
+    void endInit();
+    void update();
+    void placement(const al::AreaInitInfo& initInfo);
+    void placement(const al::AreaInitInfo& initInfo, s32);
+    void createAreaObjGroup(const al::AreaInitInfo& initInfo);
+    void createAreaObjGroupBuffer(const al::AreaInitInfo& initInfo);
+    void placementAreaObj(const al::AreaInitInfo& initInfo);
+    al::AreaObjGroup* getAreaObjGroup(const char* name);
+    bool isExistAreaGroup(const char* name);
+    al::AreaObj* getInVolumeAreaObj(const char* name, const sead::Vector3f& position);
+    al::AreaObjMtxConnecterHolder* getMtxConnecterHolder();
+};
+
+class IUseAreaObj {
+public:
+    virtual AreaObjDirector* getAreaObjDirector() const = 0;
+};
+}  // namespace al

lib/al/Library/Audio/AudioKeeper.h

@@ -1,8 +1,8 @@
 #pragma once
 
+#include <al/Library/HostIO/HioNode.h>
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
-#include <al/Library/IUse/IUseHioNode.h>
 
 namespace al {
 class AudioDirector;
@@ -16,7 +16,6 @@ class SeKeeper;
 class BgmKeeper;
 
 class AudioKeeper : public al::IUseHioNode {
-    void *field_0;
     AudioEventController* mAudioEventController;
     AudioEffectController* mAudioEffectController;
     AudioRequestKeeperSyncedBgm* mAudioRequestKeeperSyncedBgm;
@@ -25,24 +24,29 @@ class AudioKeeper : public al::IUseHioNode {
     AudioMic* mAudioMic;
 
 public:
-    AudioKeeper(al::AudioDirector const*);
+    AudioKeeper(const al::AudioDirector*);
     ~AudioKeeper();
 
-    void initSeKeeper(al::AudioDirector const*, char const*, sead::Vector3f const*,
-                      sead::Matrix34f const*, al::ModelKeeper const*, al::CameraDirector*);
-    void initBgmKeeper(al::AudioDirector const*, char const*);
-    void validate(void);
-    void invalidate(void);
-    void startClipped(void);
-    void endClipped(void);
-    void appear(void);
-    void kill(void);
+    void initSeKeeper(const al::AudioDirector*, const char*, const sead::Vector3f*, const sead::Matrix34f*, const al::ModelKeeper*,
+                      al::CameraDirector*);
+    void initBgmKeeper(const al::AudioDirector*, const char*);
+    void validate();
+    void invalidate();
+    void startClipped();
+    void endClipped();
+    void appear();
+    void kill();
 
-    AudioEventController* getAudioEventController() const { return mAudioEventController; };
-    AudioEffectController* getAudioEffectController() const { return mAudioEffectController; };
-    AudioRequestKeeperSyncedBgm* getAudioRequestKeeperSyncedBgm() const { return mAudioRequestKeeperSyncedBgm; };
-    SeKeeper* getSeKeeper() const { return mSeKeeper; };
-    BgmKeeper* getBgmKeeper() const { return mBgmKeeper; };
-    AudioMic* getAudioMic() const { return mAudioMic; };
+    al::AudioEventController* getAudioEventController() const { return mAudioEventController; };
+    al::AudioEffectController* getAudioEffectController() const { return mAudioEffectController; };
+    al::AudioRequestKeeperSyncedBgm* getAudioRequestKeeperSyncedBgm() const { return mAudioRequestKeeperSyncedBgm; };
+    al::SeKeeper* getSeKeeper() const { return mSeKeeper; };
+    al::BgmKeeper* getBgmKeeper() const { return mBgmKeeper; };
+    al::AudioMic* getAudioMic() const { return mAudioMic; };
+};
+
+class IUseAudioKeeper {
+public:
+    virtual al::AudioKeeper* getAudioKeeper() const = 0;
 };
 }  // namespace al