Some Symbols

6 files changed, 12 insertions, 27 deletions

diff --git a/include/egg/core/eggController.h b/include/egg/core/eggController.h
index e8414b13..a790b667 100644
--- a/include/egg/core/eggController.h
+++ b/include/egg/core/eggController.h
@@ -362,7 +362,7 @@ private:
 
     static CoreControllerFactory sCoreControllerFactory;
     static CoreControllerConnectCallback sConnectCallback;
-    static bool sUseBuiltinWpadAllocator;
+    static bool sWPADRegisterAllocatorOFF;
     static s32 sWPADWorkSize;
 };
 
diff --git a/include/egg/gfx/eggDrawGX.h b/include/egg/gfx/eggDrawGX.h
index e7e944af..862792f8 100644
--- a/include/egg/gfx/eggDrawGX.h
+++ b/include/egg/gfx/eggDrawGX.h
@@ -172,14 +172,6 @@ public:
     static const DL s_DL7;
     static const DL s_DL8;
 
-    static const ZModeConfig s_ZMode[ZMODE_MAX];
-    static const BlendModeConfig s_Blend[BLEND_MAX];
-    static GXTexObj sDummyTexObj;
-    // not sure end
-
-    static GXTexMapID sTexMapDefault;
-    static GXLightID sLightMaskDefault;
-
     static nw4r::math::MTX34 s_cameraMtx;
 
     static u32 s_flag;
diff --git a/include/egg/gfx/eggLightObject.h b/include/egg/gfx/eggLightObject.h
index a072e190..c6dcd9a9 100644
--- a/include/egg/gfx/eggLightObject.h
+++ b/include/egg/gfx/eggLightObject.h
@@ -52,9 +52,9 @@ public:
     void CopyToG3D_View(nw4r::g3d::LightObj &, const nw4r::math::MTX34 &) const;
     void CopyFromG3D(const nw4r::g3d::ResAnmLight &, f32, EGG::LightObject *, bool);
 
-    void ApplyAnmResultInner(const nw4r::g3d::LightAnmResult &);
-    void ApplyAnmResultA(const nw4r::g3d::LightAnmResult &);
-    bool ApplyAnmResultB(const nw4r::g3d::LightAnmResult &);
+    void ImportAnmG3D(const nw4r::g3d::LightAnmResult &);
+    void ImportAnmG3D_Diff(const nw4r::g3d::LightAnmResult &);
+    bool ImportAnmG3D_Spec(const nw4r::g3d::LightAnmResult &);
 
     void CalcAt();
     void SetPos(const nw4r::math::VEC3 &);
diff --git a/include/egg/gfx/eggLightTexture.h b/include/egg/gfx/eggLightTexture.h
index ef441058..f7c59554 100644
--- a/include/egg/gfx/eggLightTexture.h
+++ b/include/egg/gfx/eggLightTexture.h
@@ -92,11 +92,6 @@ public:
     static void getTexDimensions(u16 *, u16 *, u16 *, u16 *, u16);
 
 private:
-    static void fn_804AB270();
-    static void fn_804AB310(const GXColor &color);
-    static void fn_804AB440();
-    static void fn_804AB600();
-
     static void fn_804AC0A0(int, int *, int *);
     static void loadTextureData(int index, void *data, GXTexFmt fmt);
 
@@ -125,6 +120,7 @@ private:
     /* 0x9F */ u8 field_0x9F;
 
     static u16 sTextureSize;
+    static s8 sScaleExp;
 
     static u16 sDrawWidth;
     static u16 sDrawHeight;
diff --git a/include/egg/gfx/eggStateEfb.h b/include/egg/gfx/eggStateEfb.h
index a1eac8e2..b854e16d 100644
--- a/include/egg/gfx/eggStateEfb.h
+++ b/include/egg/gfx/eggStateEfb.h
@@ -22,27 +22,28 @@ public:
         u32 userData;
         u32 field_0x08;
     };
+
 private:
     static Buffer spBufferSet[BUFFER_MAX];
     static f32 sWorkSpaceV[6];
     static f32 sWorkSpaceHideV[6];
-    static f32 sUnkBuffer[6]; // unk name
+    static f32 sShiftViewPort[6]; // unk name
     static s32 sWorkBuffer;
     static s32 sPushCount;
     static u32 sFlag;
 
     static bool isEnableDirtyBufferMode();
     static bool GetUseTfRgb565();
-    
-    public:
+
+public:
     static bool CheckFlag0x2() {
         return (sFlag & 2) != 0;
     }
-    
+
     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 popWorkBuffer(bool b, u32 userData);
diff --git a/include/egg/gfx/eggStateGX.h b/include/egg/gfx/eggStateGX.h
index 697e3dc6..4d4e7fd9 100644
--- a/include/egg/gfx/eggStateGX.h
+++ b/include/egg/gfx/eggStateGX.h
@@ -87,15 +87,13 @@ public:
     static bool GXSetDither_(bool);
     static void GXCopyTex_(void *data, bool);
     static CacheGX &GXSetDstAlpha_(bool, u8);
+    static void GetScissorSafeParam(const f32 src[4], u32 dst[4]);
     static void GXSetProjection_(Mtx44, GXProjectionType);
     static void GXSetProjectionv_(const f32 *);
     static void GXSetViewport_(f32 ox, f32 oy, f32 sx, f32 sy, f32 near, f32 far);
     static void GXSetScissor_(u32, u32, u32, u32);
     static void GXSetScissorBoxOffset_(s32, s32);
 
-    // not sure
-    static void CalculateScreenScissor(const f32 src[4], u32 dst[4]);
-
     static u16 s_widthEfb;
     static u16 s_heightEfb;
     static GXPixelFmt s_pixFormat;
@@ -105,8 +103,6 @@ public:
     static u16 s_commandFlag;
 
     static CacheGX s_cacheGX;
-    // Inofficial names
-    static GXTexObj sDefaultTexObj;
     static MemLayout s_tmem_layout; // same name, different type
 };