pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from nanaian/battle_heap_create

Browse Source 
match battle_heap_create
This commit is contained in:
Ethan Roseman 2020-08-13 21:23:08 -04:00 committed by GitHub
commit 7f83b2c881
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
asm/nonmatchings/code_6000/battle_heap_create.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel battle_heap_create
/* 0060A0 8002ACA0 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0060A4 8002ACA4 AFBF0010 */ sw $ra, 0x10($sp)
/* 0060A8 8002ACA8 3C050002 */ lui $a1, 2
/* 0060AC 8002ACAC 3C04803E */ lui $a0, 0x803e
/* 0060B0 8002ACB0 2484A800 */ addiu $a0, $a0, -0x5800
/* 0060B4 8002ACB4 0C00A40C */ jal _heap_create
/* 0060B8 8002ACB8 34A55800 */ ori $a1, $a1, 0x5800
/* 0060BC 8002ACBC 0040202D */ daddu $a0, $v0, $zero
/* 0060C0 8002ACC0 2402FFFF */ addiu $v0, $zero, -1
/* 0060C4 8002ACC4 0040182D */ daddu $v1, $v0, $zero
/* 0060C8 8002ACC8 54830001 */ bnel $a0, $v1, .L8002ACD0
/* 0060CC 8002ACCC 0000102D */ daddu $v0, $zero, $zero
.L8002ACD0:
/* 0060D0 8002ACD0 8FBF0010 */ lw $ra, 0x10($sp)
/* 0060D4 8002ACD4 03E00008 */ jr $ra
/* 0060D8 8002ACD8 27BD0018 */ addiu $sp, $sp, 0x18

7
src/code_6000.c
View File

@ -22,14 +22,13 @@ s32 general_heap_free(s32 size) {
return _heap_free(&D_802FB800, size);
}
INCLUDE_ASM(code_6000, battle_heap_create);
/*s32 battle_heap_create(void) {
if (_heap_create(&D_803DA800, 0x25800) != -1) {
s32 battle_heap_create(void) {
if (_heap_create(&D_803DA800, 0x25800) == -1) {
return -1;
} else {
return 0;
}
}*/
}
s32 func_8002ACDC(void) {
return 0;