diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-07-12 10:36:30 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-07-12 10:36:30 -0400 |
| commit | 33c6922ae8ee6084e4d501cb456293a5bd1a1979 (patch) | |
| tree | ad758ab9c384b11c0197a77bcdfc85cadc628c7a /src | |
| parent | a597a1902bf49a9da6f4edcbb8926d2f6ce5d425 (diff) | |
small fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/d/d_com_inf_game.cpp | 2 | ||||
| -rw-r--r-- | src/m_Do/m_Do_lib.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index f851ec74..10a51417 100644 --- 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 index f34af3ad..dab10302 100644 --- 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); |