From f0cc705d35820fa6673200ace50aa67e5832f3f8 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 30 Jan 2018 17:16:41 -0500 Subject: [PATCH] fixes --- include/new_menu_helpers.h | 4 ++++ src/field_message_box.c | 12 ++---------- sym_ewram.txt | 3 +++ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 4b1e372c2e..bcbb1147df 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -17,5 +17,9 @@ void SetStandardWindowBorderStyle(u8 a0, u8 a1); void sub_8197930(void); u8 GetPlayerTextSpeed(void); void sub_81978B0(u16 arg0); +u16 sub_8197224(void); +int sub_8196094(void); +void sub_8196080(u8*); +void AddTextPrinterForMessage(u8); #endif // GUARD_NEW_MENU_HELPERS_H diff --git a/src/field_message_box.c b/src/field_message_box.c index fc51bc5888..ea80b2ea9a 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -1,19 +1,11 @@ #include "global.h" +#include "new_menu_helpers.h" #include "string.h" #include "string_util.h" #include "task.h" #include "text.h" -extern void sub_81973A4(void); -extern void sub_81973C4(u8, u8); -extern u16 sub_8197224(void); -extern int sub_8196094(void); -extern void sub_8196080(u8*); -extern void AddTextPrinterForMessage(u8); -extern void sub_8197434(u8, u8); -extern void sub_81973FC(u8, u8); - -extern u8 gUnknown_020375BC; +u8 gUnknown_020375BC = 0; void textbox_fdecode_auto_and_task_add(u8*, int); void textbox_auto_and_task_add(void); diff --git a/sym_ewram.txt b/sym_ewram.txt index c04f524d8f..67df29d3b0 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -645,6 +645,9 @@ gUnknown_020375B8: @ 20375B8 gUnknown_020375BC: @ 20375BC .space 0x4 + .include "src/field_message_box.o" + + .align 2 gUnknown_020375C0: @ 20375C0 .space 0x4