common symbols for window and text

common_syms/text.txt

@@ -0,0 +1 @@
+gTextFlags

common_syms/window.txt

@@ -0,0 +1,2 @@
+gWindowClearTile
+gWindowBgTilemapBuffers

include/bg.h

@@ -89,4 +89,6 @@ u32 GetBgType(u8 bg);
 bool32 IsInvalidBg32(u8 bg);
 bool32 IsTileMapOutsideWram(u8 bg);
 
+extern bool32 gWindowTileAutoAllocEnabled;
+
 #endif // GUARD_BG_H

include/window.h

@@ -69,6 +69,7 @@ void FillWindowPixelRect8Bit(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width,
 void BlitBitmapRectToWindow4BitTo8Bit(u8 windowId, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 paletteNum);
 void CopyWindowToVram8Bit(u8 windowId, u8 mode);
 
+extern void *gWindowBgTilemapBuffers[];
 extern struct Window gWindows[];
 
 #endif // GUARD_WINDOW_H

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 };
 

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};
 

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;
 

sym_common.txt

@@ -1,16 +1,8 @@
 	.include "main.o"
 	.include "bg.o"
 	.include "text_printer.o"
-
-gWindowClearTile: @ 3003E30
-	.space 0x10
-
-gWindowBgTilemapBuffers: @ 3003E40
-	.space 0x10
-
-gTextFlags: @ 3003E50
-	.space 0x4
-
+	.include "window.o"
+	.include "text.o"
 	.include "sprite.o"
 
 	.align 4