From a6b5d09ddfa6bd047848e023d50124e4aff86e5e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 10 Nov 2018 18:28:24 -0500
Subject: [PATCH] More changes for modern gcc compat

---
 Makefile           |  5 -----
 ld_script.txt      |  2 ++
 src/dma3_manager.c |  2 +-
 src/quest_log.c    |  4 ++--
 src/script.c       | 22 +++++++++++-----------
 src/sound.c        | 10 +++++-----
 sym_bss.txt        |  7 ++-----
 sym_ewram.txt      |  3 +--
 8 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index 0b83cb5c5..b5429de2c 100644
--- a/Makefile
+++ b/Makefile
@@ -108,11 +108,6 @@ sound/%.bin: sound/%.aif ; $(AIF) $< $@
 sound/songs/%.s: sound/songs/%.mid
 	cd $(@D) && ../../$(MID) $(<F)
 
-$(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc
-$(C_BUILDDIR)/libc.o: CFLAGS := -O2
-
-$(C_BUILDDIR)/siirtc.o: CFLAGS := -mthumb-interwork
-
 $(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork
 $(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
 $(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
diff --git a/ld_script.txt b/ld_script.txt
index f9b34218d..28abe99ca 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -358,6 +358,7 @@ SECTIONS {
         src/main.o(.rodata);
         src/bg.o(.rodata);
         src/malloc.o(.rodata);
+        src/malloc.o(.rodata.str1.4);
         src/text_printer.o(.rodata);
         src/window.o(.rodata);
         src/text.o(.rodata);
@@ -373,6 +374,7 @@ SECTIONS {
         data/quest_log.o(.rodata);
         data/data_83FECCC.o(.rodata.8456C74);
         src/menews_jisan.o(.rodata);
+        src/menews_jisan.o(.rodata.str1.4);
         data/data_8468C98.o(.rodata);
         src/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
diff --git a/src/dma3_manager.c b/src/dma3_manager.c
index bb015c5cf..10049a566 100644
--- a/src/dma3_manager.c
+++ b/src/dma3_manager.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "dma3.h"
 
-IWRAM_DATA struct {
+static /*IWRAM_DATA*/ struct {
     /* 0x00 */ const u8 *src;
     /* 0x04 */ u8 *dest;
     /* 0x08 */ u16 size;
diff --git a/src/quest_log.c b/src/quest_log.c
index 5cc458e26..3388d9012 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -88,8 +88,8 @@ u16 gUnknown_3005E8C;
 struct UnkStruct_3005E90 gUnknown_3005E90;
 struct UnkStruct_203AE98 * gUnknown_3005E94;
 
-IWRAM_DATA struct UnkStruct_300201C * gUnknown_300201C;
-IWRAM_DATA u16 gUnknown_3002020;
+static struct UnkStruct_300201C * gUnknown_300201C;
+static u16 gUnknown_3002020;
 
 EWRAM_DATA u8 gUnknown_203ADF8 = 0;
 EWRAM_DATA u8 gUnknown_203ADF9 = 0;
diff --git a/src/script.c b/src/script.c
index 0c74debb2..59ef4e579 100644
--- a/src/script.c
+++ b/src/script.c
@@ -22,17 +22,17 @@ EWRAM_DATA u8 gUnknown_20370A0 = 0;
 EWRAM_DATA u8 *gUnknown_20370A4 = NULL;
 
 // ewram bss
-IWRAM_DATA static u8 sScriptContext1Status;
-IWRAM_DATA static u32 sUnusedVariable1;
-IWRAM_DATA static struct ScriptContext sScriptContext1;
-IWRAM_DATA static u32 sUnusedVariable2;
-IWRAM_DATA static struct ScriptContext sScriptContext2;
-IWRAM_DATA static bool8 sScriptContext2Enabled;
-IWRAM_DATA static u8 gUnknown_3000F9D;
-IWRAM_DATA static u8 gUnknown_3000F9E;
-IWRAM_DATA static u8 gUnknown_3000F9F;
-IWRAM_DATA static u8 gUnknown_3000FA0;
-IWRAM_DATA static u8 gUnknown_3000FA1;
+/*IWRAM_DATA*/ static u8 sScriptContext1Status;
+/*IWRAM_DATA*/ static u32 sUnusedVariable1;
+/*IWRAM_DATA*/ static struct ScriptContext sScriptContext1;
+/*IWRAM_DATA*/ static u32 sUnusedVariable2;
+/*IWRAM_DATA*/ static struct ScriptContext sScriptContext2;
+/*IWRAM_DATA*/ static bool8 sScriptContext2Enabled;
+/*IWRAM_DATA*/ static u8 gUnknown_3000F9D;
+/*IWRAM_DATA*/ static u8 gUnknown_3000F9E;
+/*IWRAM_DATA*/ static u8 gUnknown_3000F9F;
+/*IWRAM_DATA*/ static u8 gUnknown_3000FA0;
+/*IWRAM_DATA*/ static u8 gUnknown_3000FA1;
 
 extern ScrCmdFunc gScriptCmdTable[];
 extern ScrCmdFunc gScriptCmdTableEnd[];
diff --git a/src/sound.c b/src/sound.c
index b8814de81..f94e44506 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -24,11 +24,11 @@ EWRAM_DATA struct MusicPlayerInfo* gMPlay_PokemonCry = NULL;
 EWRAM_DATA u8 gPokemonCryBGMDuckingCounter = 0;
 
 // iwram bss
-IWRAM_DATA static u16 sCurrentMapMusic;
-IWRAM_DATA static u16 sNextMapMusic;
-IWRAM_DATA static u8 sMapMusicState;
-IWRAM_DATA static u8 sMapMusicFadeInSpeed;
-IWRAM_DATA static u16 sFanfareCounter;
+/*IWRAM_DATA*/ static u16 sCurrentMapMusic;
+/*IWRAM_DATA*/ static u16 sNextMapMusic;
+/*IWRAM_DATA*/ static u8 sMapMusicState;
+/*IWRAM_DATA*/ static u8 sMapMusicFadeInSpeed;
+/*IWRAM_DATA*/ static u16 sFanfareCounter;
 
 // iwram common
 bool8 gDisableMusic;
diff --git a/sym_bss.txt b/sym_bss.txt
index 5abd54a10..20d8d561d 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -174,12 +174,9 @@ gUnknown_3002008: @ 3002008
 gUnknown_3002018: @ 3002018
 	.space 0x4
 
-gUnknown_300201C: @ 300201C
-	.space 0x4
-
-gUnknown_3002020: @ 3002020
-	.space 0x4
+    .include "src/quest_log.o"
 
+    .align 2
 gUnknown_3002024: @ 3002024
 	.space 0x4
 
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 2e0123d6f..524845763 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -47,8 +47,7 @@ gStringVar3: @ 2021D04
 gStringVar4: @ 2021D18
 	.space 0x3E8
 
-gUnknownStringVar: @ 2022100
-	.space 0x10
+    .include "src/string_util.o"
 
 gUnknown_2022110: @ 2022110
 	.space 0x1