diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h
index 3d566c03cac..cf90a526d07 100644
--- a/include/JSystem/JKernel/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap.h
@@ -84,7 +84,7 @@ public:
     /* vt[18] */ virtual s32 do_getTotalFreeSize();                             /* override */
     /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID);                   /* override */
     /* vt[20] */ virtual u8 do_getCurrentGroupId();                             /* override */
-    /* vt[21] */ virtual u32 state_register(JKRHeap::TState* p, u32 id) const; /* override */
+    /* vt[21] */ virtual void state_register(JKRHeap::TState* p, u32 id) const; /* override */
     /* vt[22] */ virtual bool state_compare(JKRHeap::TState const& r1,
                                             JKRHeap::TState const& r2) const; /* override */
 
diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h
index 2a323fcbe74..dcc75cb49f4 100644
--- a/include/JSystem/JKernel/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap.h
@@ -76,7 +76,7 @@ public:
     /* vt[18] */ virtual s32 do_getTotalFreeSize() = 0;
     /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID);
     /* vt[20] */ virtual u8 do_getCurrentGroupId();
-    /* vt[21] */ virtual u32 state_register(JKRHeap::TState* p, u32 id) const;
+    /* vt[21] */ virtual void state_register(JKRHeap::TState* p, u32 id) const;
     /* vt[22] */ virtual bool state_compare(JKRHeap::TState const& r1, JKRHeap::TState const& r2) const;
     /* vt[23] */ virtual void state_dump(JKRHeap::TState const& p) const;
 
diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap.h
index 62ccedc0c3a..7a72e6eb869 100644
--- a/include/JSystem/JKernel/JKRSolidHeap.h
+++ b/include/JSystem/JKernel/JKRSolidHeap.h
@@ -39,7 +39,7 @@ public:
     /* vt[17] */ virtual void* do_getMaxFreeBlock(void); /* override */
     /* vt[18] */ virtual s32 do_getTotalFreeSize(void);  /* override */
 
-    /* vt[21] */ virtual u32 state_register(JKRHeap::TState*, u32) const; /* override */
+    /* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
     /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&,
                                             JKRHeap::TState const&) const; /* override */
 
diff --git a/libs/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/JKernel/JKRExpHeap.cpp
index a91601e71bc..f30bc1d86e0 100644
--- a/libs/JSystem/JKernel/JKRExpHeap.cpp
+++ b/libs/JSystem/JKernel/JKRExpHeap.cpp
@@ -1083,7 +1083,7 @@ JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::getHeapBlock(void* ptr) {
 
 /* 802D0938-802D09E0 2CB278 00A8+00 1/0 0/0 0/0 .text
  * state_register__10JKRExpHeapCFPQ27JKRHeap6TStateUl           */
-u32 JKRExpHeap::state_register(JKRHeap::TState* p, u32 param_1) const {
+void JKRExpHeap::state_register(JKRHeap::TState* p, u32 param_1) const {
     p->mId = param_1;
     if (param_1 <= 0xff) {
         p->mUsedSize = getUsedSize(param_1);
@@ -1104,7 +1104,6 @@ u32 JKRExpHeap::state_register(JKRHeap::TState* p, u32 param_1) const {
         }
     }
     p->mCheckCode = checkCode;
-    return checkCode;
 }
 
 /* 802D09E0-802D0A10 2CB320 0030+00 1/0 0/0 0/0 .text
diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp
index 33f322759f9..8ed32e29548 100644
--- a/libs/JSystem/JKernel/JKRHeap.cpp
+++ b/libs/JSystem/JKernel/JKRHeap.cpp
@@ -481,7 +481,7 @@ void operator delete[](void* ptr) {
 
 /* 802CED84-802CED88 2C96C4 0004+00 1/0 1/0 0/0 .text
  * state_register__7JKRHeapCFPQ27JKRHeap6TStateUl               */
-u32 JKRHeap::state_register(JKRHeap::TState* p, u32 id) const {
+void JKRHeap::state_register(JKRHeap::TState* p, u32 id) const {
     JUT_ASSERT(1213, p != 0);
     JUT_ASSERT(1214, p->getHeap() == this);
 }
diff --git a/libs/JSystem/JKernel/JKRSolidHeap.cpp b/libs/JSystem/JKernel/JKRSolidHeap.cpp
index e9fdc5bf619..f09291c7272 100644
--- a/libs/JSystem/JKernel/JKRSolidHeap.cpp
+++ b/libs/JSystem/JKernel/JKRSolidHeap.cpp
@@ -265,15 +265,16 @@ bool JKRSolidHeap::dump(void) {
 }
 /* 802D11FC-802D1258 2CBB3C 005C+00 1/0 0/0 0/0 .text
  * state_register__12JKRSolidHeapCFPQ27JKRHeap6TStateUl         */
-u32 JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
+void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
     JUT_ASSERT(604, p != 0);
     JUT_ASSERT(605, p->getHeap() == this);
 
     getState_(p);
     setState_u32ID_(p, id);
     setState_uUsedSize_(p, getUsedSize((JKRSolidHeap*)this));
-    setState_u32CheckCode_(p, (u32)mSolidHead + (u32)mSolidTail * 3);
-    return (u32)mSolidHead + (u32)mSolidTail * 3;
+    u32 r29 = (u32)mSolidHead;
+    r29 += (u32)mSolidTail * 3;
+    setState_u32CheckCode_(p, r29);
 }
 
 /* 802D1258-802D1288 2CBB98 0030+00 1/0 0/0 0/0 .text