small fixes

zeldaret · Jul 12, 2024 · 33c6922 · 33c6922
1 parent a597a19
commit 33c6922
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h
@@ -593,14 +593,15 @@ struct J3DZMode {
 struct J3DBlend : public J3DBlendInfo {
     J3DBlend() { *(J3DBlendInfo*)this = j3dDefaultBlendInfo; }
     explicit J3DBlend(const J3DBlendInfo& info) { *(J3DBlendInfo*)this = info; }
+    void setBlendInfo(const J3DBlendInfo& info) { *(J3DBlendInfo*)this = info; }
 
     GXBlendMode getType() const { return (GXBlendMode)mBlendMode; }
     GXBlendFactor getSrcFactor() const { return (GXBlendFactor)mSrcFactor; }
     GXBlendFactor getDstFactor() const { return (GXBlendFactor)mDstFactor; }
-    GXLogicOp getLogicOp() const { return (GXLogicOp)mLogicOp; }
+    GXLogicOp getOp() const { return (GXLogicOp)mLogicOp; }
 
     void load(u8 ditherEnable) {
-        J3DGDSetBlendMode(getType(), getSrcFactor(), getDstFactor(), getLogicOp(), ditherEnable);
+        J3DGDSetBlendMode(getType(), getSrcFactor(), getDstFactor(), getOp(), ditherEnable);
     }
 
     void setType(u8 i_type) {
@@ -615,10 +616,8 @@ struct J3DBlend : public J3DBlendInfo {
         mDstFactor = i_dst;
     }
 
-    void getOp() const {}
     // void operator=(const J3DBlend&) {}
     // void operator==(J3DBlend&) {}
-    void setBlendInfo(const J3DBlendInfo&) {}
 };
 
 extern const J3DFogInfo j3dDefaultFogInfo;

diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
@@ -132,7 +132,7 @@ void dComIfG_play_c::itemInit() {
 
     field_0x4944 = 7;
     mScopeType = 0;
-    field_0x4946 = 0;
+    mOperateWind = 0;
     field_0x4947 = 0;
     mMesgSendButton = 0;
     mMesgCancelButton = 0;

diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp
@@ -12,8 +12,9 @@
 #include "dolphin/gx/GX.h"
 
 /* 80017530-800176BC       .text mDoLib_setResTimgObj__FP7ResTIMGP9_GXTexObjUlP10_GXTlutObj */
-u8 mDoLib_setResTimgObj(ResTIMG* i_img, GXTexObj* o_texObj, u32 i_tlut_name, GXTlutObj * o_tlutObj) {
+u8 mDoLib_setResTimgObj(ResTIMG* i_img, GXTexObj* r4, u32 i_tlut_name, GXTlutObj * o_tlutObj) {
     /* Nonmatching - regalloc */
+    GXTexObj* o_texObj = (GXTexObj*)r4; // fixes regalloc for r31, but the other 3 are incorrect in a different way
     if (i_img->indexTexture) {
         JUT_ASSERT(0x2b, o_tlutObj != NULL);
         GXInitTlutObj(o_tlutObj, ((char*)i_img) + i_img->paletteOffset, (GXTlutFmt)i_img->colorFormat, i_img->numColors);