diff --git a/Makefile b/Makefile
index dfb3a3ed84..b20b97b024 100644
--- a/Makefile
+++ b/Makefile
@@ -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 #############################
 
diff --git a/include/functions.h b/include/functions.h
index aeedf2514b..d45eacafdd 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -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);
diff --git a/src/code_42e0_len_1f60.c b/src/code_42e0_len_1f60.c
index 78ef1ba6fd..7976950534 100644
--- a/src/code_42e0_len_1f60.c
+++ b/src/code_42e0_len_1f60.c
@@ -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);
 
diff --git a/src/code_6000.c b/src/code_6000.c
index 40fd58abc9..8377ef60d9 100644
--- a/src/code_6000.c
+++ b/src/code_6000.c
@@ -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 {