From 20efe34745e3f53f6c570a063718972cc50c8a97 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 8 Oct 2019 13:54:52 -0400 Subject: [PATCH] help_system common syms --- common_syms/help_system.txt | 1 + src/help_system.c | 2 ++ src/main.c | 1 - sym_common.txt | 6 ++---- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 common_syms/help_system.txt diff --git a/common_syms/help_system.txt b/common_syms/help_system.txt new file mode 100644 index 000000000..af59733d4 --- /dev/null +++ b/common_syms/help_system.txt @@ -0,0 +1 @@ +gHelpSystemEnabled diff --git a/src/help_system.c b/src/help_system.c index 7859961db..3ebbcb9ec 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -16,6 +16,8 @@ extern u8 gGlyphInfo[]; +bool8 gHelpSystemEnabled; + struct HelpSystemVideoState { /*0x00*/ MainCallback savedVblankCb; diff --git a/src/main.c b/src/main.c index eb1625473..9294c80ce 100644 --- a/src/main.c +++ b/src/main.c @@ -104,7 +104,6 @@ static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7; EWRAM_DATA u8 gDecompressionBuffer[0x4000] = {0}; EWRAM_DATA u16 gTrainerId = 0; -extern bool8 gHelpSystemEnabled; extern bool8 gWirelessCommType; extern bool8 gUnknown_3005E88; diff --git a/sym_common.txt b/sym_common.txt index 7a2f5099b..0619ea728 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -220,10 +220,8 @@ gUnknown_3005E98: @ 3005E98 .include "help_system_812B1E0.o" .align 4 .include "fame_checker.o" - -gHelpSystemEnabled: @ 3005ECC - .space 0x4 - + .include "help_system.o" + .align 4 .include "mevent.o" .align 4