From 14dc160ae66b29b7e4a6d1fcd4b055332709e0b1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sat, 21 Dec 2019 11:10:36 -0500
Subject: SUBALIGN rodata sections

---
 ld_script.txt      | 5 ++---
 src/braille_text.c | 1 -
 src/link.c         | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ld_script.txt b/ld_script.txt
index b6f017361..fceacf1d9 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -375,7 +375,7 @@ SECTIONS {
     } =0
 
     .rodata :
-    ALIGN(4)
+    SUBALIGN(4)
     {
         src/main.o(.rodata);
         src/bg.o(.rodata);
@@ -550,7 +550,6 @@ SECTIONS {
         src/mevent_scripts.o(.rodata);
         src/menews_jisan.o(.rodata);
         src/menews_jisan.o(.rodata.str1.4);
-        . = ALIGN(4);
         src/seagallop.o(.rodata);
         data/pokemon_jump.o(.rodata);
         data/berry_crush.o(.rodata);
@@ -932,7 +931,7 @@ SECTIONS {
     }
 
     lib_rodata :
-    ALIGN(4)
+    SUBALIGN(4)
     {
         src/agb_flash.o(.rodata);
         src/agb_flash_1m.o(.rodata);
diff --git a/src/braille_text.c b/src/braille_text.c
index c95cf64b2..4a06cd319 100644
--- a/src/braille_text.c
+++ b/src/braille_text.c
@@ -6,7 +6,6 @@
 
 extern u8 gGlyphInfo[];
 
-ALIGNED(4)
 static const u8 gUnknown_846FB08[] = {1, 2, 4};
 static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
 
diff --git a/src/link.c b/src/link.c
index dfbc9fcb2..bdaa48cdf 100644
--- a/src/link.c
+++ b/src/link.c
@@ -163,7 +163,7 @@ static void DoSend(void);
 static void StopTimer(void);
 static void SendRecvDone(void);
 
-ALIGNED(4) static const u16 sWirelessLinkDisplayPal[] = INCBIN_U16("graphics/interface/wireless_link_display.gbapal");
+static const u16 sWirelessLinkDisplayPal[] = INCBIN_U16("graphics/interface/wireless_link_display.gbapal");
 static const u16 sWirelessLinkDisplay4bpp[] = INCBIN_U16("graphics/interface/wireless_link_display.4bpp.lz");
 static const u16 sWirelessLinkDisplayBin[] = INCBIN_U16("graphics/interface/wireless_link_display.bin.lz");
 static const u16 sLinkTestFontPal[] = INCBIN_U16("graphics/interface/link_test_font.gbapal");
-- 
cgit v1.2.3