falso
/
banjo-kazooie
mirror of https://github.com/n64decomp/banjo-kazooie.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core1/memory.c heap_init() done

This commit is contained in:
Banjo Kazooie 2022-11-09 14:35:17 -06:00
parent 3e1fe301aa
commit 486b0b532c
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
# banjo (93.9723%)
# banjo (93.9924%)
<img src="./progress/progress_total.svg">

6
progress/progress_core1.svg
View File

@ -9,7 +9,7 @@
</mask>
<g mask="url(#anybadge_1)">
<path fill="#555" d="M0 0h44v20H0z"/>
<path fill="#34e000" d="M44 0h67v20H44z"/>
<path fill="#33e000" d="M44 0h67v20H44z"/>
<path fill="url(#b)" d="M0 0h111v20H0z"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@ -17,7 +17,7 @@
<text x="22.0" y="14">core1</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="78.5" y="15" fill="#010101" fill-opacity=".3">88.3978%</text>
<text x="77.5" y="14">88.3978%</text>
<text x="78.5" y="15" fill="#010101" fill-opacity=".3">88.5362%</text>
<text x="77.5" y="14">88.5362%</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

4
progress/progress_total.svg
View File

@ -17,7 +17,7 @@
<text x="75.0" y="14">Banjo-Kazooie (us.v10)</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="184.5" y="15" fill="#010101" fill-opacity=".3">93.9723%</text>
<text x="183.5" y="14">93.9723%</text>
<text x="184.5" y="15" fill="#010101" fill-opacity=".3">93.9924%</text>
<text x="183.5" y="14">93.9924%</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

14
src/core1/memory.c
View File

@ -183,9 +183,6 @@ void func_802546FC(void){
D_80283228 = NULL;
}
#ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core1/memory/heap_init.s")
#else
void heap_init(void){
bzero(D_8002D500, HEAP_SIZE);
func_802546FC();
@ -197,29 +194,28 @@ void heap_init(void){
D_802765A8 = 0;
D_802765AC = 0;
D_802765B0.unk0 = FALSE;
D_8002D500[0].hdr.unkC_7 = 2;
D_8002D500[0].hdr.prev = NULL;
D_8002D500[0].hdr.next = &D_8002D500[1];
D_8002D500[0].hdr.unkC_7 = 2;
D_8002D500[0].hdr.unusedBytes_C_31 = 0;
D_8002D500[0].prev_free = NULL;
D_8002D500[0].next_free = &D_8002D500[1];
D_8002D500[1].hdr.unkC_7 = 0;
D_8002D500[1].hdr.prev = &D_8002D500[0];
D_8002D500[1].hdr.next = &D_8002D500[LAST_HEAP_BLOCK];
D_8002D500[1].hdr.unkC_7 = 0;
D_8002D500[1].hdr.unusedBytes_C_31 = 0;
D_8002D500[1].prev_free = &D_8002D500[0];
D_8002D500[1].next_free = &D_8002D500[LAST_HEAP_BLOCK];
D_8002D500[LAST_HEAP_BLOCK].hdr.unkC_7 = 2;
D_8002D500[LAST_HEAP_BLOCK].hdr.prev = &D_8002D500[0];
D_8002D500[LAST_HEAP_BLOCK].hdr.prev = &D_8002D500[1];
D_8002D500[LAST_HEAP_BLOCK].hdr.next = &D_8002D500[LAST_HEAP_BLOCK + 1];
D_8002D500[LAST_HEAP_BLOCK].hdr.unkC_7 = 2;
D_8002D500[LAST_HEAP_BLOCK].hdr.unusedBytes_C_31 = 0;
D_8002D500[LAST_HEAP_BLOCK].prev_free = &D_8002D500[0];
D_8002D500[LAST_HEAP_BLOCK].prev_free = &D_8002D500[1];
D_8002D500[LAST_HEAP_BLOCK].next_free = NULL;
sns_init_base_payloads();
}
#endif
void *func_8025484C(s32 size){
D_802765B4 = malloc(ALIGN((u32)&D_8002D500[1] + 0x100, 0x100) - (u32)&D_8002D500[1] - sizeof(EmptyHeapBlock));