From 78120062b230139bea143aa91b3b62ac267267fa Mon Sep 17 00:00:00 2001 From: Henny022p Date: Wed, 4 Jan 2023 16:58:39 +0100 Subject: [PATCH] remove fake global gUnk_020350F0 part of gBG0Buffer --- linker.ld | 1 - src/subtask.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/linker.ld b/linker.ld index d7b764cd..c7582803 100644 --- a/linker.ld +++ b/linker.ld @@ -88,7 +88,6 @@ SECTIONS { . = 0x000344A0; gUnk_020344A0 = .; . = 0x000344B0; gBG2Buffer = .; . = 0x00034CB0; gBG0Buffer = .; - . = 0x000350F0; gUnk_020350F0 = .; . = 0x0003510E; gUnk_0203510E = .; . = 0x00035160; gUnk_02035160 = .; diff --git a/src/subtask.c b/src/subtask.c index a08de5b4..3661f8a6 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -14,7 +14,6 @@ #include "subtask.h" #include "ui.h" -extern u8 gUnk_020350F0[]; extern Screen gUnk_03001020; extern u8 gPaletteBufferBackup[]; extern u8 gUnk_03000420[]; @@ -53,7 +52,7 @@ void sub_080A6F6C(u32 textIndexOrPtr) { extern Font gUnk_08128FA8; if (gGenericMenu.unk2e.HWORD != textIndexOrPtr) { gGenericMenu.unk2e.HWORD = textIndexOrPtr; - MemClear(gUnk_020350F0, 0x100); + MemClear(&gBG0Buffer[0x220], 0x100); if ((textIndexOrPtr & 0xff) != 0) { ShowTextBox(textIndexOrPtr, &gUnk_08128FA8); } @@ -86,7 +85,7 @@ void sub_080A6FB4(u32 param_1, u32 param_2) { if (gGenericMenu.unk2e.HWORD != textIndexOrPtr) { gGenericMenu.unk2e.HWORD = textIndexOrPtr; - MemClear(&gUnk_020350F0, 0x100); + MemClear(&gBG0Buffer[0x220], 0x100); if ((textIndexOrPtr & 0xff) != 0) { ShowTextBox(textIndexOrPtr, font); }