More symbols from NSMBW

5 files changed, 21 insertions, 18 deletions

diff --git a/include/egg/gfx/eggDrawPathDOF.h b/include/egg/gfx/eggDrawPathDOF.h
index a291f9c2..62f23a33 100644
--- a/include/egg/gfx/eggDrawPathDOF.h
+++ b/include/egg/gfx/eggDrawPathDOF.h
@@ -27,7 +27,7 @@ public:
     virtual void SetBinaryInner(const Bin &, const Bin &, f32) override;
 
 
-    void execute();
+    void updateShimmer();
 
 private:
     void internalDrawStandard(u16);
diff --git a/include/egg/gfx/eggLightObject.h b/include/egg/gfx/eggLightObject.h
index c6dcd9a9..535b5969 100644
--- a/include/egg/gfx/eggLightObject.h
+++ b/include/egg/gfx/eggLightObject.h
@@ -45,7 +45,7 @@ public:
     void Calc();
     void CalcView(nw4r::math::MTX34 const &);
 
-    void fn_804A9C30(const LightTexture *, nw4r::math::VEC3 *, GXColor *) const;
+    void CalcFinalDirColor(const LightTexture &, nw4r::math::VEC3 *, GXColor *) const;
 
     void InitGX(GXLightObj *obj) const;
     void CopyToG3D_World(nw4r::g3d::LightObj &) const;
diff --git a/include/egg/gfx/eggLightTexture.h b/include/egg/gfx/eggLightTexture.h
index f7c59554..06941b7d 100644
--- a/include/egg/gfx/eggLightTexture.h
+++ b/include/egg/gfx/eggLightTexture.h
@@ -89,7 +89,7 @@ public:
         mpByteData2[idx] = val;
     }
 
-    static void getTexDimensions(u16 *, u16 *, u16 *, u16 *, u16);
+    static void getRequiredPosAndSize(u16 *, u16 *, u16 *, u16 *, u16);
 
 private:
     static void fn_804AC0A0(int, int *, int *);
diff --git a/include/egg/gfx/eggStateEfb.h b/include/egg/gfx/eggStateEfb.h
index b854e16d..f3ec2ac1 100644
--- a/include/egg/gfx/eggStateEfb.h
+++ b/include/egg/gfx/eggStateEfb.h
@@ -9,12 +9,17 @@ namespace EGG {
 class StateEfb {
 public:
     enum BufferType {
-        BUFFER_0,
-        BUFFER_1,
-        BUFFER_2,
-        BUFFER_3,
+        BUFFER_TYPE_0,
+        BUFFER_TYPE_1,
+        BUFFER_TYPE_2,
+        BUFFER_TYPE_3,
 
-        BUFFER_MAX,
+        BUFFER_TYPE_MAX,
+    };
+
+    enum WorkBuffer {
+        WORK_BUFFER_0,
+        WORK_BUFFER_1,
     };
 
     struct Buffer {
@@ -24,7 +29,7 @@ public:
     };
 
 private:
-    static Buffer spBufferSet[BUFFER_MAX];
+    static Buffer spBufferSet[BUFFER_TYPE_MAX];
     static f32 sWorkSpaceV[6];
     static f32 sWorkSpaceHideV[6];
     static f32 sShiftViewPort[6]; // unk name
@@ -43,11 +48,9 @@ public:
     static void Clean();
     static TextureBuffer *captureEfb(BufferType type, bool, u32 userData);
     static bool releaseEfb(BufferType type, u32 userData);
-
-    // Unknown names
-    static void fn_804B4270(BufferType type, u32 userData);
+    static void pushWorkBuffer(WorkBuffer work, u32 userData);
     static void popWorkBuffer(bool b, u32 userData);
-    static f32 *fn_804B4550();
+    static f32 *shiftWorkSpaceViewportGX();
 };
 
 } // namespace EGG
diff --git a/include/m/m_dvd.h b/include/m/m_dvd.h
index 64272a18..32c0a4f5 100644
--- a/include/m/m_dvd.h
+++ b/include/m/m_dvd.h
@@ -15,10 +15,10 @@ namespace mDvd {
 
 extern void *somePtr;
 
-class TUncompressInfo_Base_c {
+class UncompressInfo_c {
 public:
-    TUncompressInfo_Base_c(u8 type, const char *extension) : mType(type), mExtension(extension) {}
-    virtual ~TUncompressInfo_Base_c() {}
+    UncompressInfo_c(u8 type, const char *extension) : mType(type), mExtension(extension) {}
+    virtual ~UncompressInfo_c() {}
     virtual EGG::StreamDecomp *Construct() const {
         return nullptr;
     }
@@ -29,9 +29,9 @@ public:
 };
 
 template <typename T>
-class TUncompressInfo_c : public TUncompressInfo_Base_c {
+class TUncompressInfo_c : public UncompressInfo_c {
 public:
-    TUncompressInfo_c(u8 type, const char *extension) : TUncompressInfo_Base_c(type, extension) {}
+    TUncompressInfo_c(u8 type, const char *extension) : UncompressInfo_c(type, extension) {}
     virtual T *Construct() const {
         return new (somePtr) T();
     }