From 791d5a48cc85e5bc93ad3a60ccfe11db76ea9f1e Mon Sep 17 00:00:00 2001 From: sceptillion <33798691+sceptillion@users.noreply.github.com> Date: Wed, 20 Dec 2017 07:55:09 -0800 Subject: common symbols for window and text --- src/bg.c | 2 +- src/window.c | 5 ++--- src/window_8bpp.c | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/bg.c b/src/bg.c index ce9174fec..d7f84bf4e 100644 --- a/src/bg.c +++ b/src/bg.c @@ -42,7 +42,7 @@ static struct BgConfig2 sGpuBgConfigs2[4]; static u32 sDmaBusyBitfield[4]; static u8 gpu_tile_allocation_map_bg[0x100]; -u32 gWindowTileAutoAllocEnabled; +bool32 gWindowTileAutoAllocEnabled; static const struct BgConfig sZeroedBgControlStruct = { 0 }; diff --git a/src/window.c b/src/window.c index 4f922084a..e760fc8e4 100644 --- a/src/window.c +++ b/src/window.c @@ -3,9 +3,8 @@ #include "malloc.h" #include "bg.h" -extern u8 gWindowClearTile; -extern void* gWindowBgTilemapBuffers[]; -extern u32 gWindowTileAutoAllocEnabled; +u8 gWindowClearTile; +void *gWindowBgTilemapBuffers[4]; EWRAM_DATA struct Window gWindows[WINDOWS_MAX] = {0}; diff --git a/src/window_8bpp.c b/src/window_8bpp.c index a1c19314c..5eac3c558 100644 --- a/src/window_8bpp.c +++ b/src/window_8bpp.c @@ -3,8 +3,6 @@ #include "malloc.h" #include "bg.h" -extern void* gWindowBgTilemapBuffers[]; - EWRAM_DATA static struct Window* sWindowPtr = NULL; EWRAM_DATA static u16 sWindowSize = 0; -- cgit v1.2.3