Game-Decompilation/dk64
1
0
Fork 0
mirror of https://gitlab.com/dk64_decomp/dk64.git synced 2024-11-27 01:00:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'misc-fixes' into 'main'

Browse Source 
Fix syntax issue in heap.c, fix documentation typo

See merge request dk64_decomp/dk64!8
This commit is contained in:
Donkey Kong 2024-06-30 21:59:13 +00:00
commit b2326ad34e
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -33,7 +33,7 @@ A Dockerfile is provided that is based on Ubuntu can be used for development and
Build the Docker image: Build the Docker image:
```sh ```sh
docker build -t sm64 . docker build -t dk64 .
``` ```
Then the ROM can be built with Docker using `make` Then the ROM can be built with Docker using `make`

14
src/global_asm/heap.c
View File

@ -169,14 +169,20 @@ void *func_global_asm_806111F8(s32 arg0, u32 arg1) {
*/ */
void free(void *arg0) { void free(void *arg0) {
if (((HeapHeader*)arg0 != D_global_asm_807F5A64) && ((HeapHeader*)arg0 -= 1)->unkB == 0) { if (((HeapHeader*)arg0 != D_global_asm_807F5A64)) {
func_global_asm_80611408(arg0); arg0 = (HeapHeader*)arg0 - 1;
if (((HeapHeader*)arg0)->unkB == 0) {
func_global_asm_80611408(arg0);
}
} }
} }
void func_global_asm_8061134C(void *arg0) { void func_global_asm_8061134C(void *arg0) {
if (((HeapHeader*)arg0 != D_global_asm_807F5A64) && ((HeapHeader*)arg0 -= 1)->unkB == 0) { if (((HeapHeader*)arg0 != D_global_asm_807F5A64)) {
func_global_asm_8061138C(arg0); arg0 = (HeapHeader*)arg0 - 1;
if (((HeapHeader*)arg0)->unkB == 0) {
func_global_asm_8061138C(arg0);
}
} }
} }