From 495417f0760189865495e93cd856b3983f1e1f37 Mon Sep 17 00:00:00 2001 From: engineer124 Date: Sun, 3 Apr 2022 16:26:42 +1000 Subject: [PATCH] Match Interface_LoadStory --- src/code/z_parameter.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 7bbd72b19..ef502468b 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -4210,7 +4210,6 @@ void Interface_Draw(GlobalContext* globalCtx) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_Draw.s") #endif -#ifdef NON_MATCHING void Interface_LoadStory(GlobalContext* globalCtx, s32 block) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; @@ -4219,7 +4218,7 @@ void Interface_LoadStory(GlobalContext* globalCtx, s32 block) { if (interfaceCtx->storySegment == NULL) { break; } - osCreateMesgQueue(&interfaceCtx->storyMsgQueue, interfaceCtx->storyMsgBuf, 1); + osCreateMesgQueue(&interfaceCtx->storyMsgQueue, &interfaceCtx->storyMsgBuf, 1); DmaMgr_SendRequestImpl(&interfaceCtx->dmaRequest_184, interfaceCtx->storySegment, interfaceCtx->storyAddr, interfaceCtx->storySize, 0, &interfaceCtx->storyMsgQueue, NULL); interfaceCtx->storyState = 1; @@ -4230,9 +4229,6 @@ void Interface_LoadStory(GlobalContext* globalCtx, s32 block) { break; } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_LoadStory.s") -#endif void Interface_AllocStory(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;