mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 07:25:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

JKRSolidHeap (#69)

Browse Source 
* JKRSolidHeap progress

* JKRSolidHeap, added const to virtual functions, and JKRHeap::TState

* fixed braces

* fix function overload

* clang-format

Co-authored-by: Julgodis <>
Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
Jonathan Wase
2021-01-07 02:33:03 +01:00
committed by GitHub
parent 0cf65151b3
commit 88fca194f8
65 changed files with 525 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_meter2/d_meter2/asm/func_8021EA14.s
+4 -4
View File
@@ -32,7 +32,7 @@ lbl_8021EA84:
/* 8021EA88 0021B9C8 4B DF 07 45 */ bl mDoExt_setCurrentHeap
/* 8021EA8C 0021B9CC 7C 7E 1B 78 */ mr r30, r3
/* 8021EA90 0021B9D0 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8021EA94 0021B9D4 48 0A FC F1 */ bl getTotalFreeSize__7JKRHeapFv
/* 8021EA94 0021B9D4 48 0A FC F1 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021EA98 0021B9D8 38 7B 4E 00 */ addi r3, r27, 0x4e00
/* 8021EA9C 0021B9DC 3C 80 80 3A */ lis r4, lbl_80399338@ha
/* 8021EAA0 0021B9E0 38 84 93 38 */ addi r4, r4, lbl_80399338@l
@@ -323,7 +323,7 @@ lbl_8021EEE0:
/* 8021EEE8 0021BE28 4B FF 6E C1 */ bl dMeter2Draw_c_NS_getNowLightDropRateCalc
/* 8021EEEC 0021BE2C D0 3F 01 30 */ stfs f1, 0x130(r31)
/* 8021EEF0 0021BE30 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8021EEF4 0021BE34 48 0A F8 91 */ bl getTotalFreeSize__7JKRHeapFv
/* 8021EEF4 0021BE34 48 0A F8 91 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021EEF8 0021BE38 3B 20 00 00 */ li r25, 0
/* 8021EEFC 0021BE3C 3B 80 00 00 */ li r28, 0
lbl_8021EF00:
@@ -454,7 +454,7 @@ lbl_8021F0B8:
/* 8021F0C0 0021C000 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021F0C4 0021C004 90 03 00 20 */ stw r0, 0x20(r3)
/* 8021F0C8 0021C008 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8021F0CC 0021C00C 48 0A F6 B9 */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F0CC 0021C00C 48 0A F6 B9 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F0D0 0021C010 38 60 50 00 */ li r3, 0x5000
/* 8021F0D4 0021C014 80 9F 01 00 */ lwz r4, 0x100(r31)
/* 8021F0D8 0021C018 4B E0 12 C5 */ bl fopMsgM_createExpHeap
@@ -465,7 +465,7 @@ lbl_8021F0B8:
/* 8021F0EC 0021C02C 90 1F 01 14 */ stw r0, 0x114(r31)
/* 8021F0F0 0021C030 90 1F 01 18 */ stw r0, 0x118(r31)
/* 8021F0F4 0021C034 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8021F0F8 0021C038 48 0A F6 8D */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F0F8 0021C038 48 0A F6 8D */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F0FC 0021C03C 38 00 00 00 */ li r0, 0
/* 8021F100 0021C040 90 1F 01 1C */ stw r0, 0x11c(r31)
/* 8021F104 0021C044 7F C3 F3 78 */ mr r3, r30
include/d/d_meter2/d_meter2/asm/func_8021F49C.s
+4 -4
View File
@@ -5,7 +5,7 @@
/* 8021F4AC 0021C3EC 93 C1 00 18 */ stw r30, 0x18(r1)
/* 8021F4B0 0021C3F0 7C 7E 1B 78 */ mr r30, r3
/* 8021F4B4 0021C3F4 80 63 01 00 */ lwz r3, 0x100(r3)
/* 8021F4B8 0021C3F8 48 0A F2 CD */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F4B8 0021C3F8 48 0A F2 CD */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F4BC 0021C3FC 80 7E 01 00 */ lwz r3, 0x100(r30)
/* 8021F4C0 0021C400 4B DE FD 0D */ bl mDoExt_setCurrentHeap
/* 8021F4C4 0021C404 7C 7F 1B 78 */ mr r31, r3
@@ -74,7 +74,7 @@ lbl_8021F574:
/* 8021F5B4 0021C4F4 48 08 C3 D1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc
lbl_8021F5B8:
/* 8021F5B8 0021C4F8 80 7E 01 00 */ lwz r3, 0x100(r30)
/* 8021F5BC 0021C4FC 48 0A F1 C9 */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F5BC 0021C4FC 48 0A F1 C9 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F5C0 0021C500 80 7E 01 20 */ lwz r3, 0x120(r30)
/* 8021F5C4 0021C504 28 03 00 00 */ cmplwi r3, 0
/* 8021F5C8 0021C508 41 82 00 24 */ beq lbl_8021F5EC
@@ -89,7 +89,7 @@ lbl_8021F5E4:
/* 8021F5E8 0021C528 90 1E 01 20 */ stw r0, 0x120(r30)
lbl_8021F5EC:
/* 8021F5EC 0021C52C 80 7E 01 00 */ lwz r3, 0x100(r30)
/* 8021F5F0 0021C530 48 0A F1 95 */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F5F0 0021C530 48 0A F1 95 */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F5F4 0021C534 80 7E 01 04 */ lwz r3, 0x104(r30)
/* 8021F5F8 0021C538 4B DE FB D5 */ bl mDoExt_setCurrentHeap
/* 8021F5FC 0021C53C 80 7E 01 10 */ lwz r3, 0x110(r30)
@@ -119,7 +119,7 @@ lbl_8021F64C:
/* 8021F650 0021C590 90 1E 01 14 */ stw r0, 0x114(r30)
lbl_8021F654:
/* 8021F654 0021C594 80 7E 01 00 */ lwz r3, 0x100(r30)
/* 8021F658 0021C598 48 0A F1 2D */ bl getTotalFreeSize__7JKRHeapFv
/* 8021F658 0021C598 48 0A F1 2D */ bl getTotalFreeSize__7JKRHeapCFv
/* 8021F65C 0021C59C 80 7E 01 1C */ lwz r3, 0x11c(r30)
/* 8021F660 0021C5A0 28 03 00 00 */ cmplwi r3, 0
/* 8021F664 0021C5A4 41 82 00 24 */ beq lbl_8021F688
include/d/d_meter2/d_meter2/asm/func_802237D4.s
+1 -1
View File
@@ -55,7 +55,7 @@ lbl_80223890:
/* 802238A0 002207E0 28 00 00 00 */ cmplwi r0, 0
/* 802238A4 002207E4 40 82 03 08 */ bne lbl_80223BAC
/* 802238A8 002207E8 80 7F 01 04 */ lwz r3, 0x104(r31)
/* 802238AC 002207EC 48 0A AE D9 */ bl getTotalFreeSize__7JKRHeapFv
/* 802238AC 002207EC 48 0A AE D9 */ bl getTotalFreeSize__7JKRHeapCFv
/* 802238B0 002207F0 38 60 01 18 */ li r3, 0x118
/* 802238B4 002207F4 48 0A B3 99 */ bl __nw__FUl
/* 802238B8 002207F8 7C 60 1B 79 */ or. r0, r3, r3