Remove useless namespace qualifiers

data/odyssey_functions.csv

@@ -29988,7 +29988,7 @@ Address,Quality,Size,Name
 0x00000071004b5dc0,U,000008,_ZNK2al7FactoryIPFP15PlayerActorBasePKcEE11convertNameES4_
 0x00000071004b5dc8,U,000052,_Z20createPlayerFunctionI19PlayerActorHakoniwaEP15PlayerActorBasePKc
 0x00000071004b5dfc,U,000052,_Z20createPlayerFunctionI18YukimaruRacePlayerEP15PlayerActorBasePKc
-0x00000071004b5e30,O,000076,_ZN2al19ProjectActorFactoryC1Ev
+0x00000071004b5e30,O,000076,_ZN19ProjectActorFactoryC2Ev
 0x00000071004b5e7c,O,000008,_ZNK2al7FactoryIPFPNS_9LiveActorEPKcEE11convertNameES4_
 0x00000071004b5e84,U,000052,_ZN2al19createActorFunctionI14AchievementNpcEEPNS_9LiveActorEPKc
 0x00000071004b5eb8,U,000056,_ZN2al19createActorFunctionI9AirBubbleEEPNS_9LiveActorEPKc
@@ -30551,7 +30551,7 @@ Address,Quality,Size,Name
 0x00000071004be198,U,000164,_ZN2al12PrePassLightINS_12LppSpotParamEE14trySetupShadowEiPN3agl4lght12LightPrePassEPNS_14ShadowDirectorE
 0x00000071004be23c,U,000008,_ZNK2al12PrePassLightINS_12LppSpotParamEE12getLightTypeEv
 0x00000071004be244,U,000036,_ZN2al12PrePassLightINS_12LppSpotParamEED0Ev
-0x00000071004be268,O,000076,_ZN2al26ProjectAppearSwitchFactoryC1Ev
+0x00000071004be268,O,000076,_ZN26ProjectAppearSwitchFactoryC1Ev
 0x00000071004be2b4,U,000052,_ZN2al19createActorFunctionI23AppearSwitchFixMapPartsEEPNS_9LiveActorEPKc
 0x00000071004be2e8,U,000052,_ZN2al19createActorFunctionI24AppearSwitchFallMapPartsEEPNS_9LiveActorEPKc
 0x00000071004be31c,U,000096,_ZN18ProjectAreaFactoryC2Ev

lib/al/include/Library/Area/AreaInitInfo.h

@@ -9,20 +9,20 @@ class SceneObjHolder;
 class AreaInitInfo {
 public:
     AreaInitInfo();
-    AreaInitInfo(const al::PlacementInfo& placementInfo,
-                 al::StageSwitchDirector* stageSwitchDirector, al::SceneObjHolder* sceneObjHolder);
-    AreaInitInfo(const al::PlacementInfo& placementInfo, const al::AreaInitInfo& initInfo);
+    AreaInitInfo(const PlacementInfo& placementInfo,
+                 StageSwitchDirector* stageSwitchDirector, SceneObjHolder* sceneObjHolder);
+    AreaInitInfo(const PlacementInfo& placementInfo, const AreaInitInfo& initInfo);
 
-    void set(const al::PlacementInfo& placementInfo, al::StageSwitchDirector* stageSwitchDirector,
-             al::SceneObjHolder* sceneObjHolder);
+    void set(const PlacementInfo& placementInfo, StageSwitchDirector* stageSwitchDirector,
+             SceneObjHolder* sceneObjHolder);
 
-    const al::PlacementInfo& getPlacementInfo() const { return mPlacementInfo; }
-    al::StageSwitchDirector* getStageSwitchDirector() const { return mStageSwitchDirector; }
-    al::SceneObjHolder* getSceneObjHolder() const { return mSceneObjHolder; }
+    const PlacementInfo& getPlacementInfo() const { return mPlacementInfo; }
+    StageSwitchDirector* getStageSwitchDirector() const { return mStageSwitchDirector; }
+    SceneObjHolder* getSceneObjHolder() const { return mSceneObjHolder; }
 
 private:
-    al::PlacementInfo mPlacementInfo;
-    al::StageSwitchDirector* mStageSwitchDirector;
-    al::SceneObjHolder* mSceneObjHolder;
+    PlacementInfo mPlacementInfo;
+    StageSwitchDirector* mStageSwitchDirector;
+    SceneObjHolder* mSceneObjHolder;
 };
 }  // namespace al

lib/al/include/Library/Audio/AudioDirector.h

@@ -33,19 +33,19 @@ class AudioDirector : public IUseAreaObj, public HioNode, public IAudioSystemPau
     };
 
     AudioDirector();
-    void init(const al::AudioDirectorInitInfo& info);
-    void init3D(const al::AudioDirectorInitInfo& info);
+    void init(const AudioDirectorInitInfo& info);
+    void init3D(const AudioDirectorInitInfo& info);
     void initAfterInitPlacement();
-    void initMic(al::AudioMic* mic);
-    void setDependentModule(al::AudioDirector* director);
+    void initMic(AudioMic* mic);
+    void setDependentModule(AudioDirector* director);
     void updatePre();
     void updatePost();
     void startFinalizeUnsafeModuleInParallelThread();
     void updateFinalizeUnsafeModuleInParallelThread();
     bool isFinalizedUnsafeModuleInParallelThread();
     void finalize();
     bool isSystemPauseNow() const;
-    void setPlayerHolder(const al::PlayerHolder* player_holder);
+    void setPlayerHolder(const PlayerHolder* player_holder);
     void addAudiioFrameProccess(aal::IAudioFrameProcess* process);
     void removeAudiioFrameProccess(aal::IAudioFrameProcess* process);
     void* getAudioMaximizer() const;  // unknown return type

lib/al/include/Library/Camera/CameraPoserFunction.h

@@ -195,9 +195,8 @@ bool isInvalidEndEntranceCamera(const al::CameraPoser*);
 bool isPause(const al::CameraPoser*);
 void checkFirstCameraCollisionArrow(sead::Vector3f*, sead::Vector3f*, const al::IUseCollision*,
                                     const sead::Vector3f&, const sead::Vector3f&);
-void checkFirstCameraCollisionArrow(alCameraPoserFunction::CameraCollisionHitResult*,
-                                    const al::IUseCollision*, const sead::Vector3f&,
-                                    const sead::Vector3f&);
+void checkFirstCameraCollisionArrow(CameraCollisionHitResult*, const al::IUseCollision*,
+                                    const sead::Vector3f&, const sead::Vector3f&);
 void checkFirstCameraCollisionArrowOnlyCeiling(sead::Vector3f*, sead::Vector3f*,
                                                const al::IUseCollision*, const sead::Vector3f&,
                                                const sead::Vector3f&);

lib/al/include/Library/LiveActor/ActorInitInfo.h

@@ -95,8 +95,8 @@ class ActorInitInfo {
 
 void initActor(LiveActor* actor, const ActorInitInfo& initInfo);
 void initActorSuffix(LiveActor* actor, const ActorInitInfo& initInfo, const char* suffix);
-void initActorChangeModel(al::LiveActor* actor, const al::ActorInitInfo& initInfo);
-void initActorChangeModelSuffix(al::LiveActor* actor, const al::ActorInitInfo& initInfo,
+void initActorChangeModel(LiveActor* actor, const ActorInitInfo& initInfo);
+void initActorChangeModelSuffix(LiveActor* actor, const ActorInitInfo& initInfo,
                                 const char* suffix);
 void initActorWithArchiveName(LiveActor* actor, const ActorInitInfo& initInfo,
                               const sead::SafeString& archiveName, const char* suffix);

lib/al/include/Library/LiveActor/ActorPoseKeeper.h

@@ -255,9 +255,9 @@ void makeMtxSRT(sead::Matrix34f*, const LiveActor* actor);
 void makeMtxRT(sead::Matrix34f*, const LiveActor* actor);
 void makeMtxR(sead::Matrix34f*, const LiveActor* actor);
 void calcAnimFrontGravityPos(LiveActor* actor, const sead::Vector3f&);
-const sead::Vector3f& getGravity(const al::LiveActor* actor);
-const sead::Vector3f& getTrans(const al::LiveActor* actor);
-const sead::Vector3f& getScale(const al::LiveActor* actor);
+const sead::Vector3f& getGravity(const LiveActor* actor);
+const sead::Vector3f& getTrans(const LiveActor* actor);
+const sead::Vector3f& getScale(const LiveActor* actor);
 void copyPose(LiveActor* actor, const LiveActor* target);
 void updatePoseTrans(LiveActor* actor, const sead::Vector3f&);
 void updatePoseRotate(LiveActor* actor, const sead::Vector3f&);
@@ -278,7 +278,7 @@ void calcDistanceSignLocalZDir(const LiveActor* actor, const sead::Vector3f&);
 void calcDistanceLocalXDir(const LiveActor* actor, const sead::Vector3f&);
 void calcDistanceLocalYDir(const LiveActor* actor, const sead::Vector3f&);
 void calcDistanceLocalZDir(const LiveActor* actor, const sead::Vector3f&);
-sead::Vector3f* getTransPtr(al::LiveActor* actor);
+sead::Vector3f* getTransPtr(LiveActor* actor);
 void setTrans(LiveActor* actor, f32, f32, f32);
 void setTransX(LiveActor* actor, f32);
 void setTransY(LiveActor* actor, f32);
@@ -291,9 +291,9 @@ void setRotateY(LiveActor* actor, f32);
 void setRotateZ(LiveActor* actor, f32);
 void getScalePtr(LiveActor* actor);
 bool tryGetScalePtr(LiveActor* actor);
-f32 getScaleX(const al::LiveActor* actor);
-f32 getScaleY(const al::LiveActor* actor);
-f32 getScaleZ(const al::LiveActor* actor);
+f32 getScaleX(const LiveActor* actor);
+f32 getScaleY(const LiveActor* actor);
+f32 getScaleZ(const LiveActor* actor);
 void setScale(LiveActor* actor, const sead::Vector3f&);
 void setScale(LiveActor* actor, f32, f32, f32);
 void setScaleAll(LiveActor* actor, f32);
@@ -312,17 +312,17 @@ bool isUpTarget(const LiveActor* actor, const sead::Vector3f&);
 bool isUpDir(const LiveActor* actor, const sead::Vector3f&);
 bool isDownTarget(const LiveActor* actor, const sead::Vector3f&);
 bool isDownDir(const LiveActor* actor, const sead::Vector3f&);
-const sead::Quatf& getQuat(const al::LiveActor* actor);
-sead::Quatf* getQuatPtr(al::LiveActor* actor);
+const sead::Quatf& getQuat(const LiveActor* actor);
+sead::Quatf* getQuatPtr(LiveActor* actor);
 bool tryGetQuatPtr(LiveActor* actor);
 void setQuat(LiveActor* actor, const sead::Quatf&);
 void getGravityPtr(const LiveActor* actor);
 void setGravity(const LiveActor* actor, const sead::Vector3f&);
-const sead::Vector3f& getFront(const al::LiveActor* actor);
-sead::Vector3f* getFrontPtr(al::LiveActor* actor);
+const sead::Vector3f& getFront(const LiveActor* actor);
+sead::Vector3f* getFrontPtr(LiveActor* actor);
 void setFront(LiveActor* actor, const sead::Vector3f&);
-const sead::Vector3f& getUp(const al::LiveActor* actor);
-sead::Vector3f* getUpPtr(al::LiveActor* actor);
+const sead::Vector3f& getUp(const LiveActor* actor);
+sead::Vector3f* getUpPtr(LiveActor* actor);
 void setUp(LiveActor* actor, const sead::Vector3f&);
 void multVecPoseNoTrans(sead::Vector3f*, const LiveActor* actor, const sead::Vector3f&);
 void multVecPose(sead::Vector3f*, const LiveActor* actor, const sead::Vector3f&);

lib/al/include/Library/LiveActor/LiveActorUtil.h

@@ -10,46 +10,46 @@
 namespace al {
 
 template <typename T>
-al::LiveActor* createActorFunction(const char* actorName);
+LiveActor* createActorFunction(const char* actorName);
 
-const sead::Vector3f& getCameraUp(const al::LiveActor*, s32);
+const sead::Vector3f& getCameraUp(const LiveActor*, s32);
 
-const sead::Vector3f& getVelocity(const al::LiveActor* actor);
-sead::Vector3f* getVelocityPtr(al::LiveActor* actor);
-sead::Vector3f* getGravityPtr(al::LiveActor* actor);
+const sead::Vector3f& getVelocity(const LiveActor* actor);
+sead::Vector3f* getVelocityPtr(LiveActor* actor);
+sead::Vector3f* getGravityPtr(LiveActor* actor);
 
 bool isClipped(const LiveActor*);
 void tryInitFixedModelGpuBuffer(const LiveActor*);
 bool isDead(const LiveActor*);
 bool isAlive(const LiveActor*);
 bool isHideModel(const LiveActor*);
-void hideModelIfShow(al::LiveActor*);
-void showModelIfHide(al::LiveActor*);
+void hideModelIfShow(LiveActor*);
+void showModelIfHide(LiveActor*);
 void setModelAlphaMask(const LiveActor*, f32);
 void onSyncClippingSubActor(LiveActor*, const LiveActor*);
 void onSyncHideSubActor(LiveActor*, const LiveActor*);
 void onSyncAlphaMaskSubActor(LiveActor*, const LiveActor*);
-void setMaterialProgrammable(al::LiveActor*);
-bool isExistModel(const al::LiveActor*);
-bool isViewDependentModel(const al::LiveActor*);
-void calcViewModel(const al::LiveActor*);
-void calcQuat(sead::Quatf*, const al::LiveActor*);
-void calcJointFrontDir(sead::Vector3f*, const al::LiveActor*, const char*);
-
-f32* findActorParamF32(const al::LiveActor*, const char*);
-s32* findActorParamS32(const al::LiveActor*, const char*);
-
-void setNerveAtActionEnd(al::LiveActor*, const al::Nerve*);
-void initActorWithArchiveName(al::LiveActor* actor, const al::ActorInitInfo& info,
+void setMaterialProgrammable(LiveActor*);
+bool isExistModel(const LiveActor*);
+bool isViewDependentModel(const LiveActor*);
+void calcViewModel(const LiveActor*);
+void calcQuat(sead::Quatf*, const LiveActor*);
+void calcJointFrontDir(sead::Vector3f*, const LiveActor*, const char*);
+
+f32* findActorParamF32(const LiveActor*, const char*);
+s32* findActorParamS32(const LiveActor*, const char*);
+
+void setNerveAtActionEnd(LiveActor*, const Nerve*);
+void initActorWithArchiveName(LiveActor* actor, const ActorInitInfo& info,
                               const sead::SafeString&, const char* suffix);
-void initMapPartsActor(al::LiveActor* actor, const al::ActorInitInfo& info, const char* suffix);
+void initMapPartsActor(LiveActor* actor, const ActorInitInfo& info, const char* suffix);
 
-void initJointControllerKeeper(const al::LiveActor*, s32);
-void initJointGlobalQuatController(const al::LiveActor*, const sead::Quatf*, const char*);
+void initJointControllerKeeper(const LiveActor*, s32);
+void initJointGlobalQuatController(const LiveActor*, const sead::Quatf*, const char*);
 
 bool isEffectEmitting(const IUseEffectKeeper*, const char*);
 
-void registActorToDemoInfo(al::LiveActor* actor, const al::ActorInitInfo& info);
+void registActorToDemoInfo(LiveActor* actor, const ActorInitInfo& info);
 
 }  // namespace al
 

lib/al/include/Library/Nerve/NerveUtil.h

@@ -97,7 +97,7 @@ class NerveActionCollector {
     al::NerveAction* mHead = nullptr;
     al::NerveAction* mTail = nullptr;
 
-    static alNerveFunction::NerveActionCollector* sCurrentCollector;
+    static NerveActionCollector* sCurrentCollector;
 };
 
 }  // namespace alNerveFunction

lib/al/include/Library/Rail/IUseRail.h

@@ -5,6 +5,6 @@ class RailRider;
 
 class IUseRail {
 public:
-    virtual al::RailRider* getRailRider() const = 0;
+    virtual RailRider* getRailRider() const = 0;
 };
 };  // namespace al

lib/al/include/Library/Shadow/DepthShadowMapCtrl.h

@@ -15,7 +15,7 @@ class ModelDrawerMask;
 
 class DepthShadowMapCtrl {
 public:
-    DepthShadowMapCtrl(const al::Resource* resource);
+    DepthShadowMapCtrl(const Resource* resource);
     ~DepthShadowMapCtrl();
 
     void actorModelDrawDepth();
@@ -27,16 +27,16 @@ class DepthShadowMapCtrl {
     DepthShadowMapInfo* getDepthShadowMapInfo(s32 index);
     u32 getDepthShadowMapNum();
     void hide();
-    void init(al::LiveActor* actor, const al::ByamlIter& iter);
-    void initAfterPlacement(al::GraphicsSystemInfo* graphicsSystemInfo);
-    void initWithoutIter(al::LiveActor* actor, s32);
+    void init(LiveActor* actor, const ByamlIter& iter);
+    void initAfterPlacement(GraphicsSystemInfo* graphicsSystemInfo);
+    void initWithoutIter(LiveActor* actor, s32);
     void show();
     DepthShadowMapInfo* tryFindDepthShadowMapInfo(const char*);
     void update();
-    void updateShapeVisible(const al::LiveActor* actor);
+    void updateShapeVisible(const LiveActor* actor);
 
 private:
-    al::LiveActor* mLiveActor;
+    LiveActor* mLiveActor;
     sead::Vector3f lightDir;
     bool mIsAppendSubActor;
     sead::PtrArray<DepthShadowMapInfo> mDepthShadowMaps;

lib/al/include/Library/Shadow/ShadowKeeper.h

@@ -9,7 +9,7 @@ class DepthShadowMapCtrl;
 class ShadowKeeper {
 public:
     ShadowKeeper();
-    void initAfterPlacement(al::GraphicsSystemInfo*);
+    void initAfterPlacement(GraphicsSystemInfo*);
     void update();
     bool isHide() const;
     void hide();

lib/al/include/Library/Stage/StageSwitchUtil.h

@@ -5,24 +5,24 @@ class IUseStageSwitch;
 class StageSwitchDirector;
 class PlacementInfo;
 
-void initStageSwitch(al::IUseStageSwitch* user, al::StageSwitchDirector* stageSwitchDirector,
-                     const al::PlacementInfo& placementInfo);
-bool isValidStageSwitch(const al::IUseStageSwitch* user, const char* linkName);
-bool isOnStageSwitch(const al::IUseStageSwitch* user, const char* linkName);
-void onStageSwitch(al::IUseStageSwitch* user, const char* linkName);
-void offStageSwitch(al::IUseStageSwitch* user, const char* linkName);
-bool isOnStageSwitch(al::IUseStageSwitch* user, const char* linkName);
-bool isOffStageSwitch(al::IUseStageSwitch* user, const char* linkName);
-bool isSameStageSwitch(const al::IUseStageSwitch* user, const al::IUseStageSwitch* otherUser,
+void initStageSwitch(IUseStageSwitch* user, StageSwitchDirector* stageSwitchDirector,
+                     const PlacementInfo& placementInfo);
+bool isValidStageSwitch(const IUseStageSwitch* user, const char* linkName);
+bool isOnStageSwitch(const IUseStageSwitch* user, const char* linkName);
+void onStageSwitch(IUseStageSwitch* user, const char* linkName);
+void offStageSwitch(IUseStageSwitch* user, const char* linkName);
+bool isOnStageSwitch(IUseStageSwitch* user, const char* linkName);
+bool isOffStageSwitch(IUseStageSwitch* user, const char* linkName);
+bool isSameStageSwitch(const IUseStageSwitch* user, const IUseStageSwitch* otherUser,
                        const char* linkName);
-bool isValidSwitchAppear(const al::IUseStageSwitch* user);
-bool isOnSwitchAppear(const al::IUseStageSwitch* user);
-bool isValidSwitchKill(const al::IUseStageSwitch* user);
-bool isValidSwitchDeadOn(const al::IUseStageSwitch* user);
-void onSwitchDeadOn(al::IUseStageSwitch* user);
-void offSwitchDeadOn(al::IUseStageSwitch* user);
-bool isOnSwitchDeadOn(al::IUseStageSwitch* user);
-bool isOffSwitchDeadOn(al::IUseStageSwitch* user);
-bool isValidSwitchStart(const al::IUseStageSwitch* user);
-bool isOnSwitchStart(const al::IUseStageSwitch* user);
+bool isValidSwitchAppear(const IUseStageSwitch* user);
+bool isOnSwitchAppear(const IUseStageSwitch* user);
+bool isValidSwitchKill(const IUseStageSwitch* user);
+bool isValidSwitchDeadOn(const IUseStageSwitch* user);
+void onSwitchDeadOn(IUseStageSwitch* user);
+void offSwitchDeadOn(IUseStageSwitch* user);
+bool isOnSwitchDeadOn(IUseStageSwitch* user);
+bool isOffSwitchDeadOn(IUseStageSwitch* user);
+bool isValidSwitchStart(const IUseStageSwitch* user);
+bool isOnSwitchStart(const IUseStageSwitch* user);
 }  // namespace al

lib/al/include/Library/Yaml/ByamlIter.h

@@ -19,11 +19,11 @@ class ByamlIter {
     bool isInvertOrder() const;
     s32 getSize() const;
     ByamlIter getIterByIndex(s32 index) const;
-    bool getByamlDataByIndex(al::ByamlData* data, s32 index) const;
+    bool getByamlDataByIndex(ByamlData* data, s32 index) const;
     ByamlIter getIterByKey(const char* key) const;
-    bool getByamlDataByKey(al::ByamlData* data, const char* key) const;
-    bool getByamlDataByKeyIndex(al::ByamlData* data, s32 index) const;
-    bool getByamlDataAndKeyName(al::ByamlData* data, const char** key, s32 index) const;
+    bool getByamlDataByKey(ByamlData* data, const char* key) const;
+    bool getByamlDataByKeyIndex(ByamlData* data, s32 index) const;
+    bool getByamlDataAndKeyName(ByamlData* data, const char** key, s32 index) const;
     bool getKeyName(const char** key, s32 index) const;
     bool tryGetIterByIndex(ByamlIter* iter, s32 index) const;
     bool tryGetIterAndKeyNameByIndex(ByamlIter* iter, const char** key, s32 index) const;

lib/al/include/Library/Yaml/Writer/ByamlWriterBigDataList.h

@@ -16,7 +16,7 @@ class ByamlWriterBigDataList {
     ByamlWriterBigDataList();
     virtual ~ByamlWriterBigDataList();
     u32 calcPackSize() const;
-    void addData(al::ByamlWriterBigData*);
+    void addData(ByamlWriterBigData*);
     s32 setOffset(s32);
     void write(sead::WriteStream*);