From 771c5c2175a05790b50ff85d5f9d91e585c6de0f Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 24 Sep 2016 21:53:12 -0700 Subject: remove symbol with duplicate address --- ewram_syms.txt | 1 - src/field_message_box.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ewram_syms.txt b/ewram_syms.txt index 2c029956f..30e9adc57 100644 --- a/ewram_syms.txt +++ b/ewram_syms.txt @@ -56,7 +56,6 @@ gScriptResult = 0x202E8DC; gUnknown_0202E8E0 = 0x202E8E0; gMenuWindow = 0x202E908; -gFieldMessageBoxBaseTileNum = 0x202E9D2; gMenuWindowPtr = 0x202E9C8; gMenuMultistepInitState = 0x202E9CC; gMenuTextTileOffset = 0x202E9CE; diff --git a/src/field_message_box.c b/src/field_message_box.c index 7232de2b3..f42541c49 100644 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -6,7 +6,7 @@ #include "field_message_box.h" extern struct Window gFieldMessageBoxWindow; -extern u16 gFieldMessageBoxBaseTileNum; +extern u16 gMenuTextWindowContentTileOffset; extern u16 gMenuTextTileOffset; @@ -21,7 +21,7 @@ static void PrintFieldMessageFromStringVar4(void); void InitFieldMessageBox(void) { sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN; - SetMessageBoxBaseTileNum(gFieldMessageBoxBaseTileNum); + SetMessageBoxBaseTileNum(gMenuTextWindowContentTileOffset); InitWindowFromConfig(&gFieldMessageBoxWindow, (struct WindowConfig *)&gWindowConfig_81E6CE4); } -- cgit v1.2.3