fix: csv and clang-format

LynxDev2 · Jan 13, 2025 · a40b4a4 · a40b4a4
1 parent f460ccb
commit a40b4a4
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 40 deletions.
diff --git a/data/odyssey_functions.csv b/data/odyssey_functions.csv
@@ -27519,7 +27519,7 @@ Address,Quality,Size,Name
 0x000000710044a86c,U,000128,_ZN13PlayerHitPush20setHitPushVeryStrongERKN4sead7Vector3IfEE
 0x000000710044a8ec,U,000132,_ZN13PlayerHitPush18setHitPushBlowDownERKN4sead7Vector3IfEE
 0x000000710044a970,O,000028,_ZN10PlayerInfoC2Ev
-0x000000710044a98c,M,000320,_ZN11PlayerInputC1EPKN2al9LiveActorEPK19IUsePlayerCollisionPK13IUseDimension
+0x000000710044a98c,U,000320,_ZN11PlayerInputC1EPKN2al9LiveActorEPK19IUsePlayerCollisionPK13IUseDimension
 0x000000710044aacc,U,001100,_ZN11PlayerInput6updateEv
 0x000000710044af18,U,000484,_ZN11PlayerInput15updateWallAlongEv
 0x000000710044b0fc,U,000064,_ZN11PlayerInput18updateSnapMoveAreaEv
@@ -32191,31 +32191,31 @@ Address,Quality,Size,Name
 0x00000071005000cc,U,000008,
 0x00000071005000d4,U,000100,
 0x0000007100500138,U,000008,
-0x0000007100500140,M,000200,_ZN23StageSceneStateWorldMap9tryCreateEPN2al5SceneERKNS0_13SceneInitInfoERKNS0_13ActorInitInfoERKNS0_14LayoutInitInfoEP29StageSceneStateCollectionList
-0x0000007100500208,M,002572,_ZN23StageSceneStateWorldMapC1EPKcPN2al5SceneEP16ShineTowerRocketRKNS2_13SceneInitInfoERKNS2_13ActorInitInfoERKNS2_14LayoutInitInfoEP29StageSceneStateCollectionList
-0x0000007100500c14,M,000068,_ZN23StageSceneStateWorldMapD2Ev
-0x0000007100500c58,M,000076,_ZN23StageSceneStateWorldMapD0Ev
-0x0000007100500ca4,M,001372,_ZN23StageSceneStateWorldMap7controlEv
-0x0000007100501200,M,003644,_ZN23StageSceneStateWorldMap6appearEv
+0x0000007100500140,U,000200,_ZN23StageSceneStateWorldMap9tryCreateEPN2al5SceneERKNS0_13SceneInitInfoERKNS0_13ActorInitInfoERKNS0_14LayoutInitInfoEP29StageSceneStateCollectionList
+0x0000007100500208,U,002572,_ZN23StageSceneStateWorldMapC1EPKcPN2al5SceneEP16ShineTowerRocketRKNS2_13SceneInitInfoERKNS2_13ActorInitInfoERKNS2_14LayoutInitInfoEP29StageSceneStateCollectionList
+0x0000007100500c14,U,000068,_ZN23StageSceneStateWorldMapD2Ev
+0x0000007100500c58,U,000076,_ZN23StageSceneStateWorldMapD0Ev
+0x0000007100500ca4,U,001372,_ZN23StageSceneStateWorldMap7controlEv
+0x0000007100501200,U,003644,_ZN23StageSceneStateWorldMap6appearEv
 0x000000710050203c,U,000256,
 0x000000710050213c,U,000212,
-0x0000007100502210,M,000872,_ZN23StageSceneStateWorldMap4killEv
-0x0000007100502578,M,000120,_ZN23StageSceneStateWorldMap7exeInitEv
-0x00000071005025f0,M,000176,_ZN23StageSceneStateWorldMap11exeDemoPrepEv
-0x00000071005026a0,M,000284,_ZN23StageSceneStateWorldMap12exeDemoStartEv
-0x00000071005027bc,M,000644,_ZN23StageSceneStateWorldMap23appearWorldSelectLayoutEv
-0x0000007100502a40,M,000596,_ZN23StageSceneStateWorldMap16exeDemoWorldOpenEv
-0x0000007100502c94,M,000280,_ZN23StageSceneStateWorldMap18exeDemoWorldUnlockEv
-0x0000007100502dac,M,000588,_ZN23StageSceneStateWorldMap18exeDemoWorldSelectEv
-0x0000007100502ff8,M,000748,_ZN23StageSceneStateWorldMap19exeDemoWorldCommentEv
-0x00000071005032e4,M,002272,_ZN23StageSceneStateWorldMap7exeWaitEv
+0x0000007100502210,U,000872,_ZN23StageSceneStateWorldMap4killEv
+0x0000007100502578,U,000120,_ZN23StageSceneStateWorldMap7exeInitEv
+0x00000071005025f0,U,000176,_ZN23StageSceneStateWorldMap11exeDemoPrepEv
+0x00000071005026a0,U,000284,_ZN23StageSceneStateWorldMap12exeDemoStartEv
+0x00000071005027bc,U,000644,_ZN23StageSceneStateWorldMap23appearWorldSelectLayoutEv
+0x0000007100502a40,U,000596,_ZN23StageSceneStateWorldMap16exeDemoWorldOpenEv
+0x0000007100502c94,U,000280,_ZN23StageSceneStateWorldMap18exeDemoWorldUnlockEv
+0x0000007100502dac,U,000588,_ZN23StageSceneStateWorldMap18exeDemoWorldSelectEv
+0x0000007100502ff8,U,000748,_ZN23StageSceneStateWorldMap19exeDemoWorldCommentEv
+0x00000071005032e4,U,002272,_ZN23StageSceneStateWorldMap7exeWaitEv
 0x0000007100503bc4,U,000240,
-0x0000007100503cb4,M,000364,_ZN23StageSceneStateWorldMap16exeIgnoreMessageEv
-0x0000007100503e20,M,000064,_ZN23StageSceneStateWorldMap21exeCollectionListMainEv
-0x0000007100503e60,M,000016,_ZN23StageSceneStateWorldMap21exeCollectionListExitEv
-0x0000007100503e70,M,000100,_ZN23StageSceneStateWorldMap7exeExitEv
-0x0000007100503ed4,M,000068,_ZN23StageSceneStateWorldMap6exeEndEv
-0x0000007100503f18,M,000092,_ZN23StageSceneStateWorldMap15tryOpenWorldMapEv
+0x0000007100503cb4,U,000364,_ZN23StageSceneStateWorldMap16exeIgnoreMessageEv
+0x0000007100503e20,U,000064,_ZN23StageSceneStateWorldMap21exeCollectionListMainEv
+0x0000007100503e60,U,000016,_ZN23StageSceneStateWorldMap21exeCollectionListExitEv
+0x0000007100503e70,U,000100,_ZN23StageSceneStateWorldMap7exeExitEv
+0x0000007100503ed4,U,000068,_ZN23StageSceneStateWorldMap6exeEndEv
+0x0000007100503f18,U,000092,_ZN23StageSceneStateWorldMap15tryOpenWorldMapEv
 0x0000007100503f74,U,000008,_ZNK23StageSceneStateWorldMap14isCloseEndWipeEv
 0x0000007100503f7c,U,000008,_ZNK23StageSceneStateWorldMap13isOpenEndWipeEv
 0x0000007100503f84,U,000016,_ZNK23StageSceneStateWorldMap20isOpenCollectionListEv
@@ -32700,7 +32700,7 @@ Address,Quality,Size,Name
 0x0000007100513f20,U,000052,
 0x0000007100513f54,U,000052,
 0x0000007100513f88,M,000200,_ZN19WorldResourceLoaderC2EP14GameDataHolder
-0x0000007100514050,M,000840,_ZN19WorldResourceLoader12loadResourceEv
+0x0000007100514050,U,000840,_ZN19WorldResourceLoader12loadResourceEv
 0x0000007100514398,M,000084,_ZN19WorldResourceLoaderD2Ev
 0x00000071005143ec,O,000016,_ZN19WorldResourceLoader23cancelLoadWorldResourceEv
 0x00000071005143fc,O,000232,_ZN19WorldResourceLoader23tryDestroyWorldResourceEv
@@ -33850,8 +33850,8 @@ Address,Quality,Size,Name
 0x000000710053565c,O,000232,_ZNK16GameProgressData24calcWorldIdByOrderUnlockEi
 0x0000007100535744,U,000080,_ZN10GameSystemC2Ev
 0x0000007100535794,U,000152,_ZN10GameSystemD2Ev
-0x000000710053582c,O,000036,_ZN10GameSystemD0Ev
-0x0000007100535850,M,002880,_ZN10GameSystem4initEv
+0x000000710053582c,U,000036,_ZN10GameSystemD0Ev
+0x0000007100535850,U,002880,_ZN10GameSystem4initEv
 0x0000007100536390,U,000176,_ZN10GameSystem10setPadNameEv
 0x0000007100536440,U,000468,_ZN10GameSystem17tryChangeSequenceEPKc
 0x0000007100536614,U,000524,_ZN10GameSystem8movementEv
@@ -55069,7 +55069,7 @@ Address,Quality,Size,Name
 0x00000071008b9a00,U,000240,_ZN2al23requestCaptureRecursiveEPN2nn4ui2d4PaneE
 0x00000071008b9af0,U,000004,_ZN4sead22WFormatFixedSafeStringILi2048EED0Ev
 0x00000071008b9af4,O,000064,_ZN2al22LayoutPartsActorKeeperC2Ei
-0x00000071008b9b34,M,000028,_ZN2al22LayoutPartsActorKeeper18resisterPartsActorEPNS_11LayoutActorE
+0x00000071008b9b34,U,000028,_ZN2al22LayoutPartsActorKeeper18resisterPartsActorEPNS_11LayoutActorE
 0x00000071008b9b50,O,000080,_ZN2al22LayoutPartsActorKeeper6appearEv
 0x00000071008b9ba0,U,000080,_ZN2al22LayoutPartsActorKeeper4killEv
 0x00000071008b9bf0,U,000080,_ZN2al22LayoutPartsActorKeeper6updateEv
@@ -61082,7 +61082,7 @@ Address,Quality,Size,Name
 0x0000007100980394,U,001684,_ZN2al22CameraVerticalAbsorber9exeAbsorbEv
 0x0000007100980a28,U,000564,_ZN2al22CameraVerticalAbsorber9exeFollowEv
 0x0000007100980c5c,U,000228,
-0x0000007100980d40,M,000636,_ZN2al22CameraVerticalAbsorber15exeFollowGroundEv
+0x0000007100980d40,U,000636,_ZN2al22CameraVerticalAbsorber15exeFollowGroundEv
 0x0000007100980fbc,U,000460,_ZN2al22CameraVerticalAbsorber18exeFollowClimbPoleEv
 0x0000007100981188,O,000048,_ZN2al22CameraVerticalAbsorber17exeFollowAbsoluteEv
 0x00000071009811b8,U,000040,_ZNK2al22CameraVerticalAbsorber11isAbsorbingEv

diff --git a/lib/al/Library/Collision/CollisionPartsTriangle.h b/lib/al/Library/Collision/CollisionPartsTriangle.h
@@ -48,8 +48,8 @@ class Triangle {
     const sead::Matrix34f& getBaseInvMtx() const;
     const sead::Matrix34f& getPrevBaseMtx() const;
 
-    friend bool ::operator==(const Triangle & tri1, const Triangle & tri2);
-    friend bool ::operator!=(const Triangle & tri1, const Triangle & tri2);
+    friend bool ::operator==(const Triangle& tri1, const Triangle& tri2);
+    friend bool ::operator!=(const Triangle& tri1, const Triangle& tri2);
 
 private:
     const CollisionParts* mCollisionParts;

diff --git a/lib/al/Library/Execute/ExecuteDirector.cpp b/lib/al/Library/Execute/ExecuteDirector.cpp
@@ -10,7 +10,7 @@
 
 namespace al {
 
-ExecuteDirector::ExecuteDirector(s32 count) : mUpdateTableCount(count) {};
+ExecuteDirector::ExecuteDirector(s32 count) : mUpdateTableCount(count){};
 
 ExecuteDirector::~ExecuteDirector() = default;
 

diff --git a/lib/al/Library/LiveActor/SubActorKeeper.h b/lib/al/Library/LiveActor/SubActorKeeper.h
@@ -91,8 +91,7 @@ struct SubActorSync {
 class SubActorInfo {
 public:
     SubActorInfo();
-    SubActorInfo(LiveActor* actor, SubActorSync syncType)
-        : mSubActor(actor), mSyncType(syncType) {};
+    SubActorInfo(LiveActor* actor, SubActorSync syncType) : mSubActor(actor), mSyncType(syncType){};
 
     LiveActor* mSubActor = nullptr;
     void* field_8 = nullptr;

diff --git a/lib/al/Library/Nerve/NerveSetupUtil.h b/lib/al/Library/Nerve/NerveSetupUtil.h
@@ -78,9 +78,7 @@ al::initNerveAction(this, "Hide", &NrvExampleUseCase.mCollector, 0);
             (keeper->getParent<Class>())->exe##ActionFunc();                                       \
         }                                                                                          \
                                                                                                    \
-        const char* getActionName() const override {                                               \
-            return #Action;                                                                        \
-        }                                                                                          \
+        const char* getActionName() const override { return #Action; }                             \
     };
 
 #define NERVE_ACTION_IMPL(Class, Action) NERVE_ACTION_IMPL_(Class, Action, Action)
@@ -95,7 +93,5 @@ al::initNerveAction(this, "Hide", &NrvExampleUseCase.mCollector, 0);
                                                                                                    \
         alNerveFunction::NerveActionCollector mCollector;                                          \
                                                                                                    \
-        NrvStruct##Class() {                                                                       \
-            FOR_EACH(NERVE_ACTION_CONSTRUCT, Class, __VA_ARGS__)                                   \
-        }                                                                                          \
+        NrvStruct##Class() { FOR_EACH(NERVE_ACTION_CONSTRUCT, Class, __VA_ARGS__) }                \
     } Nrv##Class;
diff --git a/lib/al/Library/Thread/FunctorV0M.h b/lib/al/Library/Thread/FunctorV0M.h
@@ -16,7 +16,7 @@ class FunctorV0M : public FunctorBase {
 public:
     inline FunctorV0M() = default;
     inline FunctorV0M(T objPointer, F functPointer)
-        : mObjPointer(objPointer), mFunctor(functPointer) {};
+        : mObjPointer(objPointer), mFunctor(functPointer){};
     inline FunctorV0M(const FunctorV0M<T, F>& copy) = default;
 
     void operator()() const override { (mObjPointer->*mFunctor)(); }