summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsceptillion <33798691+sceptillion@users.noreply.github.com>2017-12-20 07:55:09 -0800
committersceptillion <33798691+sceptillion@users.noreply.github.com>2017-12-20 07:55:09 -0800
commit791d5a48cc85e5bc93ad3a60ccfe11db76ea9f1e (patch)
tree8cafc8511ba37b17187e1b77317bd110b28ee197 /src
parent236f91e6f0e30197d44fa8352350f4cbf9218a59 (diff)
common symbols for window and text
Diffstat (limited to 'src')
-rw-r--r--src/bg.c2
-rw-r--r--src/window.c5
-rw-r--r--src/window_8bpp.c2
3 files changed, 3 insertions, 6 deletions
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;