diff --git a/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h b/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h
index 3236d9cad09..b7a1e742973 100644
--- a/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h
+++ b/include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h
@@ -12,8 +12,8 @@ protected:
 public:
     /* vt[04] */ virtual u32 getHeapType(void);           /* override */
     /* vt[05] */ virtual bool check(void);                /* override */
-    /* vt[06] */ virtual bool dump(void);                 /* override */
-    /* vt[07] */ virtual void dump_sort(void);            /* override */
+    /* vt[06] */ virtual bool dump_sort(void);            /* override */
+    /* vt[07] */ virtual bool dump(void);                 /* override */
     /* vt[08] */ virtual void do_destroy(void);           /* override */
     /* vt[09] */ virtual void* do_alloc(u32, int);        /* override */
     /* vt[10] */ virtual void do_free(void*);             /* override */
@@ -29,7 +29,7 @@ public:
     /* vt[20] */ virtual u8 do_getCurrentGroupId(void);   /* override */
 
 public:
-    static void create(JKRHeap*);
+    static JKRAssertHeap* create(JKRHeap*);
 };
 
 #endif
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D12C4.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D12C4.s
deleted file mode 100644
index 3185c06a030..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D12C4.s
+++ /dev/null
@@ -1,17 +0,0 @@
-/* __ct__13JKRAssertHeapFPvUlP7JKRHeapb __ct__13JKRAssertHeapFPvUlP7JKRHeapb::__ct(void *, unsigned long, JKRHeap *, bool) */
-/* JKRAssertHeap */
-/* 802D12C4 002CE204  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802D12C8 002CE208  7C 08 02 A6 */	mflr r0
-/* 802D12CC 002CE20C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802D12D0 002CE210  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802D12D4 002CE214  7C 7F 1B 78 */	mr r31, r3
-/* 802D12D8 002CE218  4B FF CE 61 */	bl __ct__7JKRHeapFPvUlP7JKRHeapb
-/* 802D12DC 002CE21C  3C 60 80 3D */	lis r3, lbl_803CC090@ha
-/* 802D12E0 002CE220  38 03 C0 90 */	addi r0, r3, lbl_803CC090@l
-/* 802D12E4 002CE224  90 1F 00 00 */	stw r0, 0(r31)
-/* 802D12E8 002CE228  7F E3 FB 78 */	mr r3, r31
-/* 802D12EC 002CE22C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802D12F0 002CE230  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802D12F4 002CE234  7C 08 03 A6 */	mtlr r0
-/* 802D12F8 002CE238  38 21 00 10 */	addi r1, r1, 0x10
-/* 802D12FC 002CE23C  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1300.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1300.s
deleted file mode 100644
index 65b9bb0472e..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1300.s
+++ /dev/null
@@ -1,29 +0,0 @@
-/* __dt__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::__dt(void) */
-/* missing reference */
-/* 802D1300 002CE240  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802D1304 002CE244  7C 08 02 A6 */	mflr r0
-/* 802D1308 002CE248  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802D130C 002CE24C  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802D1310 002CE250  93 C1 00 08 */	stw r30, 8(r1)
-/* 802D1314 002CE254  7C 7E 1B 79 */	or. r30, r3, r3
-/* 802D1318 002CE258  7C 9F 23 78 */	mr r31, r4
-/* 802D131C 002CE25C  41 82 00 30 */	beq lbl_802D134C
-/* 802D1320 002CE260  3C 80 80 3D */	lis r4, lbl_803CC090@ha
-/* 802D1324 002CE264  38 04 C0 90 */	addi r0, r4, lbl_803CC090@l
-/* 802D1328 002CE268  90 1E 00 00 */	stw r0, 0(r30)
-/* 802D132C 002CE26C  4B FF D7 95 */	bl dispose__7JKRHeapFv
-/* 802D1330 002CE270  7F C3 F3 78 */	mr r3, r30
-/* 802D1334 002CE274  38 80 00 00 */	li r4, 0
-/* 802D1338 002CE278  4B FF CF 2D */	bl __dt__7JKRHeapFv
-/* 802D133C 002CE27C  7F E0 07 35 */	extsh. r0, r31
-/* 802D1340 002CE280  40 81 00 0C */	ble lbl_802D134C
-/* 802D1344 002CE284  7F C3 F3 78 */	mr r3, r30
-/* 802D1348 002CE288  4B FF D9 F5 */	bl __dl__FPv
-lbl_802D134C:
-/* 802D134C 002CE28C  7F C3 F3 78 */	mr r3, r30
-/* 802D1350 002CE290  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802D1354 002CE294  83 C1 00 08 */	lwz r30, 8(r1)
-/* 802D1358 002CE298  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802D135C 002CE29C  7C 08 03 A6 */	mtlr r0
-/* 802D1360 002CE2A0  38 21 00 10 */	addi r1, r1, 0x10
-/* 802D1364 002CE2A4  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1368.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1368.s
deleted file mode 100644
index f8a1a15af73..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1368.s
+++ /dev/null
@@ -1,34 +0,0 @@
-/* create__13JKRAssertHeapFP7JKRHeap __ct__13JKRAssertHeapFPvUlP7JKRHeapb::create(JKRHeap *) */
-/* JKRAssertHeap_NS_create */
-/* 802D1368 002CE2A8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802D136C 002CE2AC  7C 08 02 A6 */	mflr r0
-/* 802D1370 002CE2B0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802D1374 002CE2B4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802D1378 002CE2B8  7C 7F 1B 79 */	or. r31, r3, r3
-/* 802D137C 002CE2BC  40 82 00 08 */	bne lbl_802D1384
-/* 802D1380 002CE2C0  83 ED 8D F8 */	lwz r31, lbl_80451378-_SDA_BASE_(r13)
-lbl_802D1384:
-/* 802D1384 002CE2C4  38 60 00 70 */	li r3, 0x70
-/* 802D1388 002CE2C8  38 80 00 10 */	li r4, 0x10
-/* 802D138C 002CE2CC  7F E5 FB 78 */	mr r5, r31
-/* 802D1390 002CE2D0  4B FF D0 E5 */	bl alloc__7JKRHeapFUliP7JKRHeap
-/* 802D1394 002CE2D4  7C 60 1B 79 */	or. r0, r3, r3
-/* 802D1398 002CE2D8  40 82 00 0C */	bne lbl_802D13A4
-/* 802D139C 002CE2DC  38 60 00 00 */	li r3, 0
-/* 802D13A0 002CE2E0  48 00 00 24 */	b lbl_802D13C4
-lbl_802D13A4:
-/* 802D13A4 002CE2E4  41 82 00 1C */	beq lbl_802D13C0
-/* 802D13A8 002CE2E8  38 80 00 00 */	li r4, 0
-/* 802D13AC 002CE2EC  38 A0 00 00 */	li r5, 0
-/* 802D13B0 002CE2F0  7F E6 FB 78 */	mr r6, r31
-/* 802D13B4 002CE2F4  38 E0 00 00 */	li r7, 0
-/* 802D13B8 002CE2F8  4B FF FF 0D */	bl __ct__13JKRAssertHeapFPvUlP7JKRHeapb
-/* 802D13BC 002CE2FC  7C 60 1B 78 */	mr r0, r3
-lbl_802D13C0:
-/* 802D13C0 002CE300  7C 03 03 78 */	mr r3, r0
-lbl_802D13C4:
-/* 802D13C4 002CE304  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802D13C8 002CE308  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802D13CC 002CE30C  7C 08 03 A6 */	mtlr r0
-/* 802D13D0 002CE310  38 21 00 10 */	addi r1, r1, 0x10
-/* 802D13D4 002CE314  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D13D8.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D13D8.s
deleted file mode 100644
index b27e733b31a..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D13D8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-/* do_destroy__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_destroy(void) */
-/* missing reference */
-/* 802D13D8 002CE318  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802D13DC 002CE31C  7C 08 02 A6 */	mflr r0
-/* 802D13E0 002CE320  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802D13E4 002CE324  38 80 FF FF */	li r4, -1
-/* 802D13E8 002CE328  81 83 00 00 */	lwz r12, 0(r3)
-/* 802D13EC 002CE32C  81 8C 00 08 */	lwz r12, 8(r12)
-/* 802D13F0 002CE330  7D 89 03 A6 */	mtctr r12
-/* 802D13F4 002CE334  4E 80 04 21 */	bctrl
-/* 802D13F8 002CE338  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802D13FC 002CE33C  7C 08 03 A6 */	mtlr r0
-/* 802D1400 002CE340  38 21 00 10 */	addi r1, r1, 0x10
-/* 802D1404 002CE344  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1408.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1408.s
deleted file mode 100644
index 77b626c2250..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1408.s
+++ /dev/null
@@ -1,5 +0,0 @@
-/* getHeapType__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::getHeapType(void) */
-/* missing reference */
-/* 802D1408 002CE348  3C 60 41 53 */	lis r3, 0x41535448@ha
-/* 802D140C 002CE34C  38 63 54 48 */	addi r3, r3, 0x41535448@l
-/* 802D1410 002CE350  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1414.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1414.s
deleted file mode 100644
index 7a5d6ac96e3..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1414.s
+++ /dev/null
@@ -1,4 +0,0 @@
-/* check__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::check(void) */
-/* missing reference */
-/* 802D1414 002CE354  38 60 00 01 */	li r3, 1
-/* 802D1418 002CE358  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D141C.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D141C.s
deleted file mode 100644
index 85f53b38920..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D141C.s
+++ /dev/null
@@ -1,4 +0,0 @@
-/* dump__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::dump(void) */
-/* missing reference */
-/* 802D141C 002CE35C  38 60 00 01 */	li r3, 1
-/* 802D1420 002CE360  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1424.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1424.s
deleted file mode 100644
index 21a0b3a909b..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1424.s
+++ /dev/null
@@ -1,4 +0,0 @@
-/* dump_sort__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::dump_sort(void) */
-/* missing reference */
-/* 802D1424 002CE364  38 60 00 01 */	li r3, 1
-/* 802D1428 002CE368  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D142C.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D142C.s
deleted file mode 100644
index 94c9860c864..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D142C.s
+++ /dev/null
@@ -1,4 +0,0 @@
-/* do_changeGroupID__13JKRAssertHeapFUc __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_changeGroupID(unsigned char) */
-/* missing reference */
-/* 802D142C 002CE36C  38 60 00 00 */	li r3, 0
-/* 802D1430 002CE370  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1434.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1434.s
deleted file mode 100644
index ddaac73270a..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1434.s
+++ /dev/null
@@ -1,4 +0,0 @@
-/* do_getCurrentGroupId__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_getCurrentGroupId(void) */
-/* missing reference */
-/* 802D1434 002CE374  38 60 00 00 */	li r3, 0
-/* 802D1438 002CE378  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D143C.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D143C.s
deleted file mode 100644
index b6ebe45770d..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D143C.s
+++ /dev/null
@@ -1,4 +0,0 @@
-/* do_alloc__13JKRAssertHeapFUli __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_alloc(unsigned long, int) */
-/* missing reference */
-/* 802D143C 002CE37C  38 60 00 00 */	li r3, 0
-/* 802D1440 002CE380  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1444.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1444.s
deleted file mode 100644
index 989661625af..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1444.s
+++ /dev/null
@@ -1,3 +0,0 @@
-/* do_free__13JKRAssertHeapFPv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_free(void *) */
-/* missing reference */
-/* 802D1444 002CE384  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1448.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1448.s
deleted file mode 100644
index 1992bc57b35..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1448.s
+++ /dev/null
@@ -1,3 +0,0 @@
-/* do_freeAll__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_freeAll(void) */
-/* missing reference */
-/* 802D1448 002CE388  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D144C.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D144C.s
deleted file mode 100644
index 3d71484ccaf..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D144C.s
+++ /dev/null
@@ -1,3 +0,0 @@
-/* do_freeTail__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_freeTail(void) */
-/* missing reference */
-/* 802D144C 002CE38C  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1450.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1450.s
deleted file mode 100644
index 6820c4c3953..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1450.s
+++ /dev/null
@@ -1,3 +0,0 @@
-/* do_fillFreeArea__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_fillFreeArea(void) */
-/* missing reference */
-/* 802D1450 002CE390  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1454.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1454.s
deleted file mode 100644
index 1f65c329d34..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1454.s
+++ /dev/null
@@ -1,4 +0,0 @@
-/* do_resize__13JKRAssertHeapFPvUl __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_resize(void *, unsigned long) */
-/* missing reference */
-/* 802D1454 002CE394  38 60 00 00 */	li r3, 0
-/* 802D1458 002CE398  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D145C.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D145C.s
deleted file mode 100644
index 3aef7f099e2..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D145C.s
+++ /dev/null
@@ -1,4 +0,0 @@
-/* do_getSize__13JKRAssertHeapFPv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_getSize(void *) */
-/* missing reference */
-/* 802D145C 002CE39C  38 60 00 00 */	li r3, 0
-/* 802D1460 002CE3A0  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1464.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1464.s
deleted file mode 100644
index caa4c144f25..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1464.s
+++ /dev/null
@@ -1,4 +0,0 @@
-/* do_getFreeSize__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_getFreeSize(void) */
-/* missing reference */
-/* 802D1464 002CE3A4  38 60 00 00 */	li r3, 0
-/* 802D1468 002CE3A8  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D146C.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D146C.s
deleted file mode 100644
index 04be41cd0c4..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D146C.s
+++ /dev/null
@@ -1,4 +0,0 @@
-/* do_getMaxFreeBlock__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_getMaxFreeBlock(void) */
-/* missing reference */
-/* 802D146C 002CE3AC  38 60 00 00 */	li r3, 0
-/* 802D1470 002CE3B0  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1474.s b/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1474.s
deleted file mode 100644
index cd17f98d2a1..00000000000
--- a/include/JSystem/JKernel/JKRAssertHeap/asm/func_802D1474.s
+++ /dev/null
@@ -1,4 +0,0 @@
-/* do_getTotalFreeSize__13JKRAssertHeapFv __ct__13JKRAssertHeapFPvUlP7JKRHeapb::do_getTotalFreeSize(void) */
-/* missing reference */
-/* 802D1474 002CE3B4  38 60 00 00 */	li r3, 0
-/* 802D1478 002CE3B8  4E 80 00 20 */	blr
diff --git a/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
index 9e7f7d1a1c8..bbe1705db84 100644
--- a/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
@@ -59,7 +59,7 @@ public:
 public:
     /* vt[04] */ virtual u32 getHeapType();                                /* override */
     /* vt[05] */ virtual bool check();                                     /* override */
-    /* vt[06] */ virtual void dump_sort();                                 /* override */
+    /* vt[06] */ virtual bool dump_sort();                                 /* override */
     /* vt[07] */ virtual bool dump();                                      /* override */
     /* vt[08] */ virtual void do_destroy();                                /* override */
     /* vt[09] */ virtual void* do_alloc(u32 size, int alignment);          /* override */
@@ -72,7 +72,7 @@ public:
     /* vt[16] */ virtual s32 do_getFreeSize();                             /* override */
     /* vt[17] */ virtual void* do_getMaxFreeBlock();                       /* override */
     /* vt[18] */ virtual s32 do_getTotalFreeSize();                        /* override */
-    /* vt[19] */ virtual u8 do_changeGroupID(u8 param_1);                  /* override */
+    /* vt[19] */ virtual u8 do_changeGroupID(u8 newGroupID);               /* override */
     /* vt[20] */ virtual u8 do_getCurrentGroupId();                        /* override */
     /* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
     /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&,
diff --git a/include/JSystem/JKernel/JKRHeap/JKRHeap.h b/include/JSystem/JKernel/JKRHeap/JKRHeap.h
index 31e5d5a59b8..8f52d54fb5f 100644
--- a/include/JSystem/JKernel/JKRHeap/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap/JKRHeap.h
@@ -38,13 +38,13 @@ public:
     void dispose(void* begin, void* end);
     void dispose();
 
-    bool setErrorFlag(bool param_1);
+    bool setErrorFlag(bool errorFlag);
     bool isSubHeap(JKRHeap* heap) const;
 
     /* vt[03] */ virtual void callAllDisposer();
     /* vt[04] */ virtual u32 getHeapType() = 0;
     /* vt[05] */ virtual bool check() = 0;
-    /* vt[06] */ virtual void dump_sort();
+    /* vt[06] */ virtual bool dump_sort();
     /* vt[07] */ virtual bool dump() = 0;
     /* vt[08] */ virtual void do_destroy() = 0;
     /* vt[09] */ virtual void* do_alloc(u32 size, int alignment) = 0;
@@ -57,7 +57,7 @@ public:
     /* vt[16] */ virtual s32 do_getFreeSize() = 0;
     /* vt[17] */ virtual void* do_getMaxFreeBlock() = 0;
     /* vt[18] */ virtual s32 do_getTotalFreeSize() = 0;
-    /* vt[19] */ virtual u8 do_changeGroupID(u8 param_1);
+    /* vt[19] */ virtual u8 do_changeGroupID(u8 newGroupID);
     /* vt[20] */ virtual u8 do_getCurrentGroupId();
     /* vt[21] */ virtual void state_register(JKRHeap::TState*, unsigned long) const;
     /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const;
@@ -146,4 +146,8 @@ void* operator new[](u32 size, JKRHeap* heap, int alignment);
 void operator delete(void* ptr);
 void operator delete[](void* ptr);
 
+inline void* operator new(u32 size, void* ptr) {
+    return ptr;
+}
+
 #endif
\ No newline at end of file
diff --git a/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h
index 88a46d3e231..d2650dd7803 100644
--- a/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h
+++ b/include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h
@@ -7,7 +7,7 @@
 class JKRSolidHeap : public JKRHeap {
 protected:
     JKRSolidHeap(void*, u32, JKRHeap*, bool);
-    virtual ~JKRSolidHeap(void);
+    virtual ~JKRSolidHeap();
 
     void adjustSize(void);
     void allocFromHead(u32, int);
diff --git a/libs/JSystem/JKernel/JKRAssertHeap.cpp b/libs/JSystem/JKernel/JKRAssertHeap.cpp
index 7fc02f5c37d..4742a70dd90 100644
--- a/libs/JSystem/JKernel/JKRAssertHeap.cpp
+++ b/libs/JSystem/JKernel/JKRAssertHeap.cpp
@@ -1,102 +1,85 @@
 #include "JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h"
 #include "global.h"
 
-asm JKRAssertHeap::JKRAssertHeap(void*, unsigned long, JKRHeap*, bool) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D12C4.s"
+JKRAssertHeap::JKRAssertHeap(void* data, unsigned long size, JKRHeap* parent, bool errorFlag)
+    : JKRHeap(data, size, parent, errorFlag) {}
+
+JKRAssertHeap::~JKRAssertHeap() {
+    this->dispose();
 }
 
-asm JKRAssertHeap::~JKRAssertHeap() {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1300.s"
+JKRAssertHeap* JKRAssertHeap::create(JKRHeap* parent) {
+    if (!parent) {
+        parent = JKRHeap::getRootHeap();
+    }
+
+    // 0x70 is sizeof(JKRAssertHeap) aligned to 16 bytes
+    u32 size = 0x70;
+    int alignment = 16;
+
+    void* ptr = JKRHeap::alloc(size, alignment, parent);
+    if (!ptr)
+        return NULL;
+
+    return new (ptr) JKRAssertHeap(NULL, 0, parent, false);
 }
 
-asm void JKRAssertHeap::create(JKRHeap*) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1368.s"
+void JKRAssertHeap::do_destroy(void) {
+    this->~JKRAssertHeap();
 }
 
-asm void JKRAssertHeap::do_destroy(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D13D8.s"
+u32 JKRAssertHeap::getHeapType(void) {
+    return 0x41535448;  // FOURCC("ASTH")
 }
 
-asm u32 JKRAssertHeap::getHeapType(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1408.s"
+bool JKRAssertHeap::check(void) {
+    return true;
 }
 
-asm bool JKRAssertHeap::check(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1414.s"
+bool JKRAssertHeap::dump(void) {
+    return true;
 }
 
-asm bool JKRAssertHeap::dump(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D141C.s"
+bool JKRAssertHeap::dump_sort(void) {
+    return true;
 }
 
-asm void JKRAssertHeap::dump_sort(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1424.s"
+u8 JKRAssertHeap::do_changeGroupID(u8) {
+    return 0;
 }
 
-asm u8 JKRAssertHeap::do_changeGroupID(u8 param_1) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D142C.s"
+u8 JKRAssertHeap::do_getCurrentGroupId(void) {
+    return 0;
 }
 
-asm u8 JKRAssertHeap::do_getCurrentGroupId(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1434.s"
+void* JKRAssertHeap::do_alloc(u32, int) {
+    return NULL;
 }
 
-asm void* JKRAssertHeap::do_alloc(u32, int) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D143C.s"
+void JKRAssertHeap::do_free(void*) {}
+
+void JKRAssertHeap::do_freeAll(void) {}
+
+void JKRAssertHeap::do_freeTail(void) {}
+
+void JKRAssertHeap::do_fillFreeArea(void) {}
+
+s32 JKRAssertHeap::do_resize(void*, u32) {
+    return 0;
 }
 
-asm void JKRAssertHeap::do_free(void*) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1444.s"
+s32 JKRAssertHeap::do_getSize(void*) {
+    return 0;
 }
 
-asm void JKRAssertHeap::do_freeAll(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1448.s"
+s32 JKRAssertHeap::do_getFreeSize(void) {
+    return 0;
 }
 
-asm void JKRAssertHeap::do_freeTail(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D144C.s"
+void* JKRAssertHeap::do_getMaxFreeBlock(void) {
+    return NULL;
 }
 
-asm void JKRAssertHeap::do_fillFreeArea(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1450.s"
-}
-
-asm s32 JKRAssertHeap::do_resize(void*, u32) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1454.s"
-}
-
-asm s32 JKRAssertHeap::do_getSize(void*) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D145C.s"
-}
-
-asm s32 JKRAssertHeap::do_getFreeSize(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1464.s"
-}
-
-asm void* JKRAssertHeap::do_getMaxFreeBlock(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D146C.s"
-}
-
-asm s32 JKRAssertHeap::do_getTotalFreeSize(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAssertHeap/asm/func_802D1474.s"
+s32 JKRAssertHeap::do_getTotalFreeSize(void) {
+    return 0;
 }
diff --git a/libs/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/JKernel/JKRExpHeap.cpp
index 2e0c3d0f019..2badf9e73cc 100644
--- a/libs/JSystem/JKernel/JKRExpHeap.cpp
+++ b/libs/JSystem/JKernel/JKRExpHeap.cpp
@@ -157,7 +157,7 @@ asm bool JKRExpHeap::dump(void) {
 #include "JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s"
 }
 
-asm void JKRExpHeap::dump_sort(void) {
+asm bool JKRExpHeap::dump_sort(void) {
     nofralloc
 #include "JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s"
 }