pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 20:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

PR comments, Makefile change

Browse Source
This commit is contained in:
Ethan Roseman 2020-09-02 14:20:29 -04:00
parent 11e3e9b35e
commit c92a46ae0d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -45,11 +45,11 @@ OBJCOPY = $(CROSS)objcopy
TARGET = papermario
CPPFLAGS = -fno-builtin -Iinclude -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2
ASFLAGS = -EB -march=vr4300 -mtune=vr4300 -Iinclude
OLDASFLAGS= -EB -Iinclude
CFLAGS = -fno-builtin -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32
LDFLAGS = -T undefined_syms.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/papermario.map --no-check-sections
CPPFLAGS = -fno-builtin -Iinclude -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2
ASFLAGS = -EB -Iinclude --mips3 -march=vr4300 -mtune=vr4300
OLDASFLAGS = -EB -Iinclude --mips3
CFLAGS = -fno-builtin -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32
LDFLAGS = -T undefined_syms.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/papermario.map --no-check-sections
######################## Targets #############################

2
include/functions.h
View File

@ -8,7 +8,7 @@
void osCleanupThread(void);
s32 heap_malloc(s32 size);
HeapNode* _heap_create(UNK_PTR addr, s32 size);
HeapNode* _heap_create(void* addr, s32 size);
void clone_model(u16 srcModelID, u16 newModelID);
void update_collider_transform(s16 colliderID);

2
src/code_42e0_len_1f60.c
View File

@ -10,7 +10,7 @@ INCLUDE_ASM("code_42e0_len_1f60", func_80028FE0);
INCLUDE_API_ASM("code_42e0_len_1f60", length2D);
HeapNode* INCLUDE_ASM("code_42e0_len_1f60", _heap_create, UNK_PTR addr, s32 size);
HeapNode* INCLUDE_ASM("code_42e0_len_1f60", _heap_create, void* addr, s32 size);
INCLUDE_ASM("code_42e0_len_1f60", _heap_malloc);

2
src/code_6000.c
View File

@ -63,7 +63,7 @@ s32 collision_heap_malloc(s32 size) {
}
}
s32 collision_heap_free(UNK_PTR data) {
s32 collision_heap_free(void* data) {
if (!(*gGameStatusPtr)->isBattle) {
_heap_free(&D_80268000, data);
} else {