From 25794a39c3539e66d1c0b2334cb35273cd9d8494 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 11 Oct 2021 09:03:17 -0700 Subject: Finish main menu decomp (#59) * decomp rest of main_menu * move some main menu data over * decomp some more wonder mail * decomp the dungeon dialogue scene switches * more wonder mail * consolidate struct_802F204 * another wonder mail func * more wonder mail * slight cleanup --- src/memory_mid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/memory_mid.c') diff --git a/src/memory_mid.c b/src/memory_mid.c index 1eb707c..51c927a 100644 --- a/src/memory_mid.c +++ b/src/memory_mid.c @@ -2,7 +2,7 @@ #include "memory.h" extern u32 gUnknown_80B7F14; -extern u32 gUnknown_80B7F20; +extern const char gLocateSetErrorMessage[]; extern struct HeapDescriptor gMainHeapDescriptor; extern s32 MemorySearchFromBack(struct HeapDescriptor *heap, s32, s32); @@ -12,7 +12,7 @@ extern struct HeapDescriptor * _LocateSetFront(struct HeapDescriptor *, u32, u32 void DoFree(struct HeapDescriptor *, void *); void *DoAlloc(struct HeapDescriptor *, s32, u32); -void FatalError(u32 *, u32 *, ...) __attribute__((noreturn)); +void FatalError(u32 *, const char *, ...) __attribute__((noreturn)); s32 _LocateSet(struct HeapDescriptor *heap, s32 size, s32 group) @@ -48,7 +48,7 @@ error: // LocateSet [%p] buffer %8x size can't locate // atb %02x grp %3d FatalError(&gUnknown_80B7F14, - &gUnknown_80B7F20, + gLocateSetErrorMessage, heap,size,atb,group); } -- cgit v1.2.3