From 39dd2754276dda603d368328350ee31dc4687ca8 Mon Sep 17 00:00:00 2001 From: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Date: Thu, 30 Sep 2021 05:57:23 -0400 Subject: [PATCH] Match update_effects (#450) * Match update_effects * Delete update_effects.s * Remove unneeded variable. * Fix errors. * Fix general_heap_free typing. Co-authored-by: Ethan Roseman --- include/functions.h | 2 +- src/heap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/functions.h b/include/functions.h index 3abb71646d..acb68c3f79 100644 --- a/include/functions.h +++ b/include/functions.h @@ -88,7 +88,7 @@ s32 can_trigger_loading_zone(void); void func_802667F0(s32, Actor*, f32, f32, f32); void* general_heap_malloc(s32 size); -s32 general_heap_free(s32 size); +s32 general_heap_free(s32* size); void entity_Shadow_init(Shadow* entity); void entity_SaveBlock_idle(Entity* entity); diff --git a/src/heap.c b/src/heap.c index 8aac065c75..73602df626 100644 --- a/src/heap.c +++ b/src/heap.c @@ -15,7 +15,7 @@ s32 general_heap_malloc_tail(s32 size) { return _heap_malloc_tail(&D_802FB800, size); } -s32 general_heap_free(s32 size) { +s32 general_heap_free(s32* size) { return _heap_free(&D_802FB800, size); }