From 80a37c16beb71698903836e7bf583a03ea78c112 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Wed, 25 Sep 2024 13:35:52 -0400
Subject: [PATCH] Remove explicit symbol sizes in sym_common.txt

---
 common_syms/ereader_screen.txt |  1 +
 src/ereader_screen.c           |  3 +++
 sym_common.txt                 | 48 +++++-----------------------------
 3 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/common_syms/ereader_screen.txt b/common_syms/ereader_screen.txt
index 2189eedbc9..26b01f678d 100644
--- a/common_syms/ereader_screen.txt
+++ b/common_syms/ereader_screen.txt
@@ -1 +1,2 @@
+gUnknownSpace
 gEReaderData
diff --git a/src/ereader_screen.c b/src/ereader_screen.c
index c625c78a9e..cb048d2ae3 100755
--- a/src/ereader_screen.c
+++ b/src/ereader_screen.c
@@ -40,6 +40,9 @@ struct EReaderData
 
 static void Task_EReader(u8);
 
+// This belongs in COMMON somewhere between party_menu and ereader_screen, but it's unused so it's unclear where.
+UNUSED u8 gUnknownSpace[64];
+
 struct EReaderData gEReaderData;
 
 extern const u8 gMultiBootProgram_EReader_Start[];
diff --git a/sym_common.txt b/sym_common.txt
index 335af85a30..e001c2ca59 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -1,37 +1,10 @@
-	.space 0x8
+	.align 4
 	.include "main.o"
-	@ ../src/bg.o
-	.align 2
-gWindowTileAutoAllocEnabled:
-	.space 4
-	@ ../src/window.o
-	.align 4
-gTransparentTileNumber:
-	.space 1
-	.align 4
-gWindowBgTilemapBuffers:
-	.space 16
-	@ ../src/text.o
-	.align 4
-gFonts:
-	.space 4
-	.align 2
-gDisableTextPrinters:
-	.space 1
-	.align 4
-gCurGlyph:
-	.space 132
-	.align 2
-gTextFlags:
-	.space 4
-	@ ../src/sprite.o
-	.align 2
-gOamMatrixAllocBitmap:
-	.space 4
-	.align 2
-gReservedSpritePaletteCount:
-	.space 1
+	.include "bg.o"
 	.align 4
+	.include "window.o"
+	.include "text.o"
+	.include "sprite.o"
 	.include "link.o"
 	.include "AgbRfu_LinkManager.o"
 	.include "link_rfu_2.o"
@@ -53,9 +26,7 @@ gReservedSpritePaletteCount:
 	.include "tv.o"
 	.include "mauville_old_man.o"
 	.include "image_processing_effects.o"
-
-	.space 0x4
-
+	.align 4
 	.include "contest_painting.o"
 	.include "field_specials.o"
 	.include "evolution_scene.o"
@@ -66,14 +37,9 @@ gReservedSpritePaletteCount:
 	.include "battle_anim_throw.o"
 	.include "battle_factory_screen.o"
 	.include "apprentice.o"
-
-	.space 0x8
-
+	.align 4
 	.include "list_menu.o"
 	.include "party_menu.o"
-
-	.space 0x44
-
 	.include "ereader_screen.o"
 	.include "m4a.o"
 	.include "agb_flash.o"