From 648c6c7093f5173694562929f615380f297ad306 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 13:41:12 +0100 Subject: Move `gStringVar` declarations to text.h --- include/global.h | 5 ----- include/text.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 22927f749..736a1a5dc 100644 --- a/include/global.h +++ b/include/global.h @@ -15,11 +15,6 @@ #define POKEMON_NAME_LENGTH 10 #define OT_NAME_LENGTH 7 -extern u8 gStringVar1[]; -extern u8 gStringVar2[]; -extern u8 gStringVar3[]; -extern u8 gStringVar4[]; - enum { VERSION_SAPPHIRE = 1, diff --git a/include/text.h b/include/text.h index 99d346a23..c629fd6d9 100644 --- a/include/text.h +++ b/include/text.h @@ -134,6 +134,11 @@ extern const struct WindowConfig gWindowConfig_81E725C; extern const struct WindowConfig gWindowConfig_81E7278; extern const struct WindowConfig gWindowConfig_81E7294; +extern u8 gStringVar1[]; +extern u8 gStringVar2[]; +extern u8 gStringVar3[]; +extern u8 gStringVar4[]; + void LoadFontDefaultPalette(const struct WindowConfig *winConfig); void SetUpWindowConfig(const struct WindowConfig *winConfig); u16 InitWindowTileData(struct Window *win, u16 startOffset); -- cgit v1.2.3 From 46cf490edd4fd5971d3a3511516beb0910e33c32 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:54:35 +0100 Subject: Declare gBGTilemapBuffers in header --- include/text.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/text.h b/include/text.h index c629fd6d9..4f52e3cdd 100644 --- a/include/text.h +++ b/include/text.h @@ -134,6 +134,8 @@ extern const struct WindowConfig gWindowConfig_81E725C; extern const struct WindowConfig gWindowConfig_81E7278; extern const struct WindowConfig gWindowConfig_81E7294; +extern u16 gBGTilemapBuffers[4][0x400]; + extern u8 gStringVar1[]; extern u8 gStringVar2[]; extern u8 gStringVar3[]; -- cgit v1.2.3