Rebase/warning fixes

zeldaret · Jul 1, 2024 · a3a8396 · a3a8396
1 parent 548da27
commit a3a8396
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
@@ -24725,7 +24725,7 @@ fn_8044E230 = .text:0x8044E230; // type:function size:0x1C
 fn_8044E250 = .text:0x8044E250; // type:function size:0x68
 SetRenderModeObj__Q34nw4r3g3d8G3DStateFRC16_GXRenderModeObj = .text:0x8044E2C0; // type:function size:0xD4
 fn_8044E3A0 = .text:0x8044E3A0; // type:function size:0xC
-fn_8044E3B0 = .text:0x8044E3B0; // type:function size:0x16C
+Invalidate__Q34nw4r3g3d8G3DStateFUl = .text:0x8044E3B0; // type:function size:0x16C
 fn_8044E520 = .text:0x8044E520; // type:function size:0x15C
 fn_8044E680 = .text:0x8044E680; // type:function size:0x50
 fn_8044E6D0 = .text:0x8044E6D0; // type:function size:0x16C

diff --git a/include/m/m3d/m_anmchrblend.h b/include/m/m3d/m_anmchrblend.h
@@ -15,8 +15,8 @@ class anmChrBlend_c : public banm_c {
     virtual int getType() const override;
 
     bool create(nw4r::g3d::ResMdl, int, mAllocator_c *, u32 *);
-    bool attach(int, nw4r::g3d::AnmObjChrRes *, f32);
-    bool attach(int, anmChr_c *, f32);
+    void attach(int, nw4r::g3d::AnmObjChrRes *, f32);
+    void attach(int, anmChr_c *, f32);
     void detach(int);
     // Not in NSMBW
     void setWeight(int, f32);

diff --git a/src/m/m3d/m_anmchrblend.cpp b/src/m/m3d/m_anmchrblend.cpp
@@ -30,13 +30,13 @@ bool anmChrBlend_c::create(nw4r::g3d::ResMdl mdl, int num, mAllocator_c *alloc,
     return true;
 }
 
-bool anmChrBlend_c::attach(int idx, nw4r::g3d::AnmObjChrRes *anm, f32 weight) {
+void anmChrBlend_c::attach(int idx, nw4r::g3d::AnmObjChrRes *anm, f32 weight) {
     nw4r::g3d::AnmObjChrBlend *obj = nw4r::g3d::G3dObj::DynamicCast<nw4r::g3d::AnmObjChrBlend>(mpAnmObj);
     obj->SetWeight(idx, weight);
     obj->Attach(idx, anm);
 }
 
-bool anmChrBlend_c::attach(int idx, anmChr_c *anm, f32 weight) {
+void anmChrBlend_c::attach(int idx, anmChr_c *anm, f32 weight) {
     nw4r::g3d::AnmObjChrRes *res = nw4r::g3d::G3dObj::DynamicCast<nw4r::g3d::AnmObjChrRes>(anm->getAnimObj());
     attach(idx, res, weight);
 }
@@ -50,7 +50,7 @@ void anmChrBlend_c::setWeight(int idx, f32 weight) {
 }
 
 f32 anmChrBlend_c::getWeight(int idx) const {
-    nw4r::g3d::G3dObj::DynamicCast<nw4r::g3d::AnmObjChrBlend>(mpAnmObj)->GetWeight(idx);
+    return nw4r::g3d::G3dObj::DynamicCast<nw4r::g3d::AnmObjChrBlend>(mpAnmObj)->GetWeight(idx);
 }
 
 } // namespace m3d
diff --git a/src/m/m_fader.cpp b/src/m/m_fader.cpp
@@ -1,13 +1,10 @@
 #include <m/m_fader.h>
-
-// nw4r::g3d::G3DState::Invalidate
-extern "C" void fn_8044E3B0(u32 flags);
-// m3d::resetMaterial according to NSMBW
-extern "C" void fn_802E46D0();
+#include <m/m3d/m3d.h>
+#include <nw4r/g3d/g3d_state.h>
 
 void mFader_c::draw() {
-    fn_8044E3B0(0x7ff);
-    fn_802E46D0();
+    nw4r::g3d::G3DState::Invalidate(0x7ff);
+    m3d::resetMaterial();
     mpFader->draw();
 }