diff --git a/Makefile b/Makefile
index 85d3f6a51e..293f86f176 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ ELF = $(ROM:.gba=.elf)
 MAP = $(ROM:.gba=.map)
 
 C_SUBDIR = src
+GFLIB_SUBDIR = gflib
 ASM_SUBDIR = asm
 DATA_SRC_SUBDIR = src/data
 DATA_ASM_SUBDIR = data
@@ -50,6 +51,7 @@ SONG_SUBDIR = sound/songs
 MID_SUBDIR = sound/songs/midi
 
 C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
+GFLIB_BUILDDIR = $(OBJ_DIR)/$(GFLIB_SUBDIR)
 ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
 DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
 SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
@@ -73,14 +75,14 @@ OBJ_DIR := build/modern
 LIBPATH := -L $(TOOLCHAIN)/lib/gcc/arm-none-eabi/$(GCC_VER)/thumb -L $(TOOLCHAIN)/arm-none-eabi/lib/thumb
 endif
 
-CPPFLAGS := -iquote include -Wno-trigraphs -DMODERN=$(MODERN)
+CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN)
 ifeq ($(MODERN),0)
 CPPFLAGS += -I tools/agbcc/include -I tools/agbcc
 endif
 
 LDFLAGS = -Map ../../$(MAP)
 
-LIB := $(LIBPATH) -lgcc -lc
+LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
 
 SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
 GFX := tools/gbagfx/gbagfx$(EXE)
@@ -109,7 +111,7 @@ MAKEFLAGS += --no-print-directory
 # Secondary expansion is required for dependency variables in object rules.
 .SECONDEXPANSION:
 
-.PHONY: all rom clean compare tidy tools mostlyclean clean-tools $(TOOLDIRS) berry_fix
+.PHONY: all rom clean compare tidy tools mostlyclean clean-tools $(TOOLDIRS) berry_fix libagbsyscall
 
 infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
 
@@ -125,6 +127,9 @@ C_SRCS_IN := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
 C_SRCS := $(foreach src,$(C_SRCS_IN),$(if $(findstring .inc.c,$(src)),,$(src)))
 C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
 
+GFLIB_SRCS := $(wildcard $(GFLIB_SUBDIR)/*.c)
+GFLIB_OBJS := $(patsubst $(GFLIB_SUBDIR)/%.c,$(GFLIB_BUILDDIR)/%.o,$(GFLIB_SRCS))
+
 C_ASM_SRCS += $(wildcard $(C_SUBDIR)/*.s $(C_SUBDIR)/*/*.s $(C_SUBDIR)/*/*/*.s)
 C_ASM_OBJS := $(patsubst $(C_SUBDIR)/%.s,$(C_BUILDDIR)/%.o,$(C_ASM_SRCS))
 
@@ -140,7 +145,7 @@ SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS))
 MID_SRCS := $(wildcard $(MID_SUBDIR)/*.mid)
 MID_OBJS := $(patsubst $(MID_SUBDIR)/%.mid,$(MID_BUILDDIR)/%.o,$(MID_SRCS))
 
-OBJS     := $(C_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
+OBJS     := $(C_OBJS) $(GFLIB_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
 OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
 
 SUBDIRS  := $(sort $(dir $(OBJS)))
@@ -156,7 +161,7 @@ tools: $(TOOLDIRS)
 $(TOOLDIRS):
 	@$(MAKE) -C $@ CC=$(HOSTCC) CXX=$(HOSTCXX)
 
-rom: berry_fix $(ROM)
+rom: $(ROM)
 ifeq ($(COMPARE),1)
 	@$(SHA1) rom.sha1
 endif
@@ -178,6 +183,7 @@ mostlyclean: tidy
 	find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
 	rm -f $(AUTO_GEN_TARGETS)
 	@$(MAKE) clean -C berry_fix
+	@$(MAKE) clean -C libagbsyscall
 
 tidy:
 	rm -f $(ROM) $(ELF) $(MAP)
@@ -230,7 +236,7 @@ endif
 ifeq ($(NODEP),1)
 $(C_BUILDDIR)/%.o: c_dep :=
 else
-$(C_BUILDDIR)/%.o: c_dep = $(shell [[ -f $(C_SUBDIR)/$*.c ]] && $(SCANINC) -I include -I tools/agbcc/include $(C_SUBDIR)/$*.c)
+$(C_BUILDDIR)/%.o: c_dep = $(shell [[ -f $(C_SUBDIR)/$*.c ]] && $(SCANINC) -I include -I tools/agbcc/include -I gflib $(C_SUBDIR)/$*.c)
 endif
 
 ifeq ($(DINFO),1)
@@ -243,6 +249,18 @@ $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
 	@echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s
 	$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s
 
+ifeq ($(NODEP),1)
+$(GFLIB_BUILDDIR)/%.o: c_dep :=
+else
+$(GFLIB_BUILDDIR)/%.o: c_dep = $(shell [[ -f $(GFLIB_SUBDIR)/$*.c ]] && $(SCANINC) -I include -I tools/agbcc/include -I gflib $(GFLIB_SUBDIR)/$*.c)
+endif
+
+$(GFLIB_BUILDDIR)/%.o : $(GFLIB_SUBDIR)/%.c $$(c_dep)
+	@$(CPP) $(CPPFLAGS) $< -o $(GFLIB_BUILDDIR)/$*.i
+	@$(PREPROC) $(GFLIB_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(GFLIB_BUILDDIR)/$*.s
+	@echo -e ".text\n\t.align\t2, 0\n" >> $(GFLIB_BUILDDIR)/$*.s
+	$(AS) $(ASFLAGS) -o $@ $(GFLIB_BUILDDIR)/$*.s
+
 ifeq ($(NODEP),1)
 $(C_BUILDDIR)/%.o: c_asm_dep :=
 else
@@ -293,7 +311,7 @@ endif
 $(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS)
 	cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT) > ld_script.ld
 
-$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
+$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) berry_fix libagbsyscall
 	cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
 	$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
 
@@ -306,4 +324,7 @@ modern: ; @$(MAKE) MODERN=1
 berry_fix/berry_fix.gba: berry_fix
 
 berry_fix:
-	@$(MAKE) -C berry_fix COMPARE=$(COMPARE)
+	@$(MAKE) -C berry_fix COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN)
+
+libagbsyscall:
+	@$(MAKE) -C libagbsyscall TOOLCHAIN=$(TOOLCHAIN)
diff --git a/berry_fix/Makefile b/berry_fix/Makefile
index 2bc225eba9..0ead3804fd 100644
--- a/berry_fix/Makefile
+++ b/berry_fix/Makefile
@@ -1,7 +1,29 @@
-include $(DEVKITARM)/base_tools
+TOOLCHAIN := $(DEVKITARM)
+COMPARE ?= 0
+
+ifeq ($(CC),)
+HOSTCC := gcc
+else
+HOSTCC := $(CC)
+endif
+
+ifeq ($(CXX),)
+HOSTCXX := g++
+else
+HOSTCXX := $(CXX)
+endif
+
+ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
+include $(TOOLCHAIN)/base_tools
+else
+export PATH := $(TOOLCHAIN)/bin:$(PATH)
+PREFIX := arm-none-eabi-
+OBJCOPY := $(PREFIX)objcopy
+export CC := $(PREFIX)gcc
+export AS := $(PREFIX)as
+endif
 export CPP := $(PREFIX)cpp
 export LD := $(PREFIX)ld
-COMPARE ?= 0
 
 ifeq ($(OS),Windows_NT)
 EXE := .exe
@@ -144,7 +166,7 @@ $(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
 endif
 
 payload:
-	@$(MAKE) -C payload COMPARE=$(COMPARE)
+	@$(MAKE) -C payload COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN)
 
 payload/payload.gba: payload
 
diff --git a/berry_fix/payload/Makefile b/berry_fix/payload/Makefile
index 63e3267241..a121fda93b 100644
--- a/berry_fix/payload/Makefile
+++ b/berry_fix/payload/Makefile
@@ -1,7 +1,29 @@
-include $(DEVKITARM)/base_tools
+TOOLCHAIN := $(DEVKITARM)
+COMPARE ?= 0
+
+ifeq ($(CC),)
+HOSTCC := gcc
+else
+HOSTCC := $(CC)
+endif
+
+ifeq ($(CXX),)
+HOSTCXX := g++
+else
+HOSTCXX := $(CXX)
+endif
+
+ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
+include $(TOOLCHAIN)/base_tools
+else
+export PATH := $(TOOLCHAIN)/bin:$(PATH)
+PREFIX := arm-none-eabi-
+OBJCOPY := $(PREFIX)objcopy
+export CC := $(PREFIX)gcc
+export AS := $(PREFIX)as
+endif
 export CPP := $(PREFIX)cpp
 export LD := $(PREFIX)ld
-COMPARE ?= 0
 
 ifeq ($(OS),Windows_NT)
 EXE := .exe
diff --git a/src/bg.c b/gflib/bg.c
similarity index 100%
rename from src/bg.c
rename to gflib/bg.c
diff --git a/include/bg.h b/gflib/bg.h
similarity index 100%
rename from include/bg.h
rename to gflib/bg.h
diff --git a/src/blit.c b/gflib/blit.c
similarity index 100%
rename from src/blit.c
rename to gflib/blit.c
diff --git a/include/blit.h b/gflib/blit.h
similarity index 100%
rename from include/blit.h
rename to gflib/blit.h
diff --git a/include/dma3.h b/gflib/dma3.h
similarity index 100%
rename from include/dma3.h
rename to gflib/dma3.h
diff --git a/src/dma3_manager.c b/gflib/dma3_manager.c
similarity index 100%
rename from src/dma3_manager.c
rename to gflib/dma3_manager.c
diff --git a/src/gpu_regs.c b/gflib/gpu_regs.c
similarity index 100%
rename from src/gpu_regs.c
rename to gflib/gpu_regs.c
diff --git a/include/gpu_regs.h b/gflib/gpu_regs.h
similarity index 100%
rename from include/gpu_regs.h
rename to gflib/gpu_regs.h
diff --git a/src/alloc.c b/gflib/malloc.c
similarity index 100%
rename from src/alloc.c
rename to gflib/malloc.c
diff --git a/include/alloc.h b/gflib/malloc.h
similarity index 100%
rename from include/alloc.h
rename to gflib/malloc.h
diff --git a/src/sprite.c b/gflib/sprite.c
similarity index 100%
rename from src/sprite.c
rename to gflib/sprite.c
diff --git a/include/sprite.h b/gflib/sprite.h
similarity index 100%
rename from include/sprite.h
rename to gflib/sprite.h
diff --git a/src/string_util.c b/gflib/string_util.c
similarity index 100%
rename from src/string_util.c
rename to gflib/string_util.c
diff --git a/include/string_util.h b/gflib/string_util.h
similarity index 100%
rename from include/string_util.h
rename to gflib/string_util.h
diff --git a/src/text.c b/gflib/text.c
similarity index 100%
rename from src/text.c
rename to gflib/text.c
diff --git a/include/text.h b/gflib/text.h
similarity index 100%
rename from include/text.h
rename to gflib/text.h
diff --git a/src/window.c b/gflib/window.c
similarity index 99%
rename from src/window.c
rename to gflib/window.c
index fbce57743d..7c87ea86dc 100644
--- a/src/window.c
+++ b/gflib/window.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "window.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "blit.h"
 
diff --git a/include/window.h b/gflib/window.h
similarity index 100%
rename from include/window.h
rename to gflib/window.h
diff --git a/ld_script.txt b/ld_script.txt
index 4247fca4d2..d37cd595fa 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -49,15 +49,15 @@ SECTIONS {
     {
         src/crt0.o(.text);
         src/main.o(.text);
-        src/alloc.o(.text);
-        src/dma3_manager.o(.text);
-        src/gpu_regs.o(.text);
-        src/bg.o(.text);
-        src/blit.o(.text);
-        src/window.o(.text);
-        src/text.o(.text);
-        src/sprite.o(.text);
-        src/string_util.o(.text);
+        gflib/malloc.o(.text);
+        gflib/dma3_manager.o(.text);
+        gflib/gpu_regs.o(.text);
+        gflib/bg.o(.text);
+        gflib/blit.o(.text);
+        gflib/window.o(.text);
+        gflib/text.o(.text);
+        gflib/sprite.o(.text);
+        gflib/string_util.o(.text);
         src/link.o(.text);
         src/link_rfu.o(.text);
         src/union_room.o(.text);
@@ -361,7 +361,21 @@ SECTIONS {
         src/librfu_rfu.o(.text);
         asm/librfu.o(.text);
         src/libisagbprn.o(.text);
-        src/libagbsyscall.o(.text);
+        *libagbsyscall.a:ArcTan2.o(.text);
+        *libagbsyscall.a:BgAffineSet.o(.text);
+        *libagbsyscall.a:CpuFastSet.o(.text);
+        *libagbsyscall.a:CpuSet.o(.text);
+        *libagbsyscall.a:Div.o(.text);
+        *libagbsyscall.a:LZ77UnCompVram.o(.text);
+        *libagbsyscall.a:LZ77UnCompWram.o(.text);
+        *libagbsyscall.a:MultiBoot.o(.text);
+        *libagbsyscall.a:ObjAffineSet.o(.text);
+        *libagbsyscall.a:RLUnCompVram.o(.text);
+        *libagbsyscall.a:RLUnCompWram.o(.text);
+        *libagbsyscall.a:RegisterRamReset.o(.text);
+        *libagbsyscall.a:SoftReset.o(.text);
+        *libagbsyscall.a:Sqrt.o(.text);
+        *libagbsyscall.a:VBlankIntrWait.o(.text);
         *libgcc.a:_call_via_rX.o(.text);
         *libgcc.a:_divdi3.o(.text);
         *libgcc.a:_divsi3.o(.text);
@@ -420,12 +434,12 @@ SECTIONS {
     ALIGN(4)
     {
         src/main.o(.rodata);
-        src/bg.o(.rodata);
-        src/window.o(.rodata);
-        src/text.o(.rodata);
-        src/sprite.o(.rodata);
+        gflib/bg.o(.rodata);
+        gflib/window.o(.rodata);
+        gflib/text.o(.rodata);
+        gflib/sprite.o(.rodata);
         data/io_reg.o(.rodata);
-        src/string_util.o(.rodata);
+        gflib/string_util.o(.rodata);
         src/link.o(.rodata);
         src/link.o(.rodata.str1.4);
         src/link_rfu.o(.rodata);
diff --git a/ld_script_modern.txt b/ld_script_modern.txt
index 5157e81dca..bf575857e6 100644
--- a/ld_script_modern.txt
+++ b/ld_script_modern.txt
@@ -14,6 +14,7 @@ SECTIONS {
         . = 0x1C000;
 
         src/*.o(ewram_data);
+        gflib/*.o(ewram_data);
 
         . = 0x40000;
 }
@@ -25,12 +26,14 @@ SECTIONS {
     {
         /* .bss starts at 0x3000000 */
         src/*.o(.bss);
+        gflib/*.o(.bss);
 
         /* .bss.code starts at 0x3001AA8 */
         src/m4a.o(.bss.code);
 
         /* COMMON starts at 0x30022A8 */
         src/*.o(COMMON);
+        gflib/*.o(COMMON);
         *libc.a:sbrkr.o(COMMON);
         end = .;
         . = 0x8000;
@@ -43,6 +46,7 @@ SECTIONS {
     {
         src/crt0.o(.text);
         src/*.o(.text);
+        gflib/*.o(.text);
         asm/*.o(.text);
     } =0
 
@@ -67,7 +71,7 @@ SECTIONS {
         asm/librfu_intr.o(.text);
         src/librfu_rfu.o(.text);
         asm/librfu.o(.text);
-        src/libagbsyscall.o(.text);
+        *libagbsyscall.a:*.o(.text*);
         *libgcc.a:*.o(.text*);
         *libc.a:*.o(.text*);
         src/libisagbprn.o(.text);
@@ -77,6 +81,7 @@ SECTIONS {
     ALIGN(4)
     {
         src/*.o(.rodata*);
+        gflib/*.o(.rodata*);
         data/*.o(.rodata*);
     } =0
 
diff --git a/libagbsyscall/Makefile b/libagbsyscall/Makefile
new file mode 100644
index 0000000000..911cdb237c
--- /dev/null
+++ b/libagbsyscall/Makefile
@@ -0,0 +1,98 @@
+TOOLCHAIN := $(DEVKITARM)
+COMPARE ?= 0
+
+ifeq ($(CC),)
+HOSTCC := gcc
+else
+HOSTCC := $(CC)
+endif
+
+ifeq ($(CXX),)
+HOSTCXX := g++
+else
+HOSTCXX := $(CXX)
+endif
+
+ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
+include $(TOOLCHAIN)/base_tools
+else
+export PATH := $(TOOLCHAIN)/bin:$(PATH)
+PREFIX := arm-none-eabi-
+OBJCOPY := $(PREFIX)objcopy
+export CC := $(PREFIX)gcc
+export AS := $(PREFIX)as
+endif
+export CPP := $(PREFIX)cpp
+export LD := $(PREFIX)ld
+
+ifeq ($(OS),Windows_NT)
+EXE := .exe
+else
+EXE :=
+endif
+
+ASFLAGS := -mcpu=arm7tdmi
+ARFLAGS := rc
+
+SYSCALLS := IntrWait \
+            RegisterRamReset \
+            Sqrt \
+            MusicPlayerOpen \
+            SoundBiasReset \
+            SoundDriverVSyncOn \
+            Mod \
+            VBlankIntrWait \
+            MusicPlayerStart \
+            SoundDriverVSyncOff \
+            HuffUnComp \
+            SoftResetExram \
+            MusicPlayerFadeOut \
+            LZ77UnCompWram \
+            SoundDriverMain \
+            SoundBiasChange \
+            LZ77UnCompVram \
+            ArcTan2 \
+            MusicPlayerStop \
+            DivArm \
+            ModArm \
+            SoundDriverVSync \
+            SoundDriverInit \
+            BgAffineSet \
+            Diff8bitUnFilterWram \
+            MultiBoot \
+            MidiKey2Freq \
+            Div \
+            Diff8bitUnFilterVram \
+            ArcTan \
+            ObjAffineSet \
+            SoftResetRom \
+            SoundDriverMode \
+            RLUnCompWram \
+            BitUnPack \
+            SoundChannelClear \
+            CpuFastSet \
+            CpuSet \
+            Diff16bitUnFilter \
+            SoundBiasSet \
+            MusicPlayerContinue \
+            SoftReset \
+            RLUnCompVram
+
+ASM_SRCS := libagbsyscall.s
+ASM_OBJS := $(foreach syscall, $(SYSCALLS), $(syscall).o)
+
+LIB := libagbsyscall.a
+
+.PHONY: all clean
+
+all: $(LIB)
+	@:
+
+clean:
+	rm -f $(LIB) $(ASM_OBJS)
+
+$(LIB): $(ASM_OBJS)
+	$(AR) $(ARFLAGS) $@ $^
+
+$(ASM_OBJS): libagbsyscall.s
+	$(AS) $(ASFLAGS) --defsym L_$(*F)=1 -o $@ $<
diff --git a/libagbsyscall/libagbsyscall.s b/libagbsyscall/libagbsyscall.s
new file mode 100644
index 0000000000..893235e322
--- /dev/null
+++ b/libagbsyscall/libagbsyscall.s
@@ -0,0 +1,432 @@
+	.include "../constants/gba_constants.inc"
+	.include "../asm/macros/function.inc"
+
+	.text
+
+	.set SOFT_RESET_DIRECT_BUF, 0x03007FFA
+	.set RESET_EX_WRAM_FLAG,           0x1
+
+	.ifdef NO_GRANULAR_AGBSYSCALL
+	.set L_IntrWait, 1
+	.set L_RegisterRamReset, 1
+	.set L_Sqrt, 1
+	.set L_MusicPlayerOpen, 1
+	.set L_SoundBiasReset, 1
+	.set L_SoundDriverVSyncOn, 1
+	.set L_Mod, 1
+	.set L_VBlankIntrWait, 1
+	.set L_MusicPlayerStart, 1
+	.set L_SoundDriverVSyncOff, 1
+	.set L_HuffUnComp, 1
+	.set L_SoftResetExram, 1
+	.set L_MusicPlayerFadeOut, 1
+	.set L_LZ77UnCompWram, 1
+	.set L_SoundDriverMain, 1
+	.set L_SoundBiasChange, 1
+	.set L_LZ77UnCompVram, 1
+	.set L_ArcTan2, 1
+	.set L_MusicPlayerStop, 1
+	.set L_DivArm, 1
+	.set L_ModArm, 1
+	.set L_SoundDriverVSync, 1
+	.set L_SoundDriverInit, 1
+	.set L_BgAffineSet, 1
+	.set L_Diff8bitUnFilterWram, 1
+	.set L_MultiBoot, 1
+	.set L_MidiKey2Freq, 1
+	.set L_Div, 1
+	.set L_Diff8bitUnFilterVram, 1
+	.set L_ArcTan, 1
+	.set L_ObjAffineSet, 1
+	.set L_SoftResetRom, 1
+	.set L_SoundDriverMode, 1
+	.set L_RLUnCompWram, 1
+	.set L_BitUnPack, 1
+	.set L_SoundChannelClear, 1
+	.set L_CpuFastSet, 1
+	.set L_CpuSet, 1
+	.set L_Diff16bitUnFilter, 1
+	.set L_SoundBiasSet, 1
+	.set L_MusicPlayerContinue, 1
+	.set L_SoftReset, 1
+	.set L_RLUnCompVram, 1
+	.endif
+
+	.ifdef L_IntrWait
+	thumb_func_start IntrWait
+IntrWait:
+	mov r2, #0
+	swi 4
+	bx lr
+	thumb_func_end IntrWait
+	.endif
+
+	.ifdef L_RegisterRamReset
+	thumb_func_start RegisterRamReset
+RegisterRamReset:
+	swi 1
+	bx lr
+	thumb_func_end RegisterRamReset
+	.endif
+
+	.ifdef L_Sqrt
+	thumb_func_start Sqrt
+Sqrt:
+	swi 8
+	bx lr
+	thumb_func_end Sqrt
+	.endif
+
+	.ifdef L_MusicPlayerOpen
+	thumb_func_start MusicPlayerOpen
+MusicPlayerOpen:
+	swi 32
+	bx lr
+	thumb_func_end MusicPlayerOpen
+	.endif
+
+	.ifdef L_SoundBiasReset
+	thumb_func_start SoundBiasReset
+SoundBiasReset:
+	mov r0, #0
+	swi 25
+	bx lr
+	thumb_func_end SoundBiasReset
+	.endif
+
+	.ifdef L_SoundDriverVSyncOn
+	thumb_func_start SoundDriverVSyncOn
+SoundDriverVSyncOn:
+	swi 41
+	bx lr
+	thumb_func_end SoundDriverVSyncOn
+	.endif
+
+	.ifdef L_Mod
+	thumb_func_start Mod
+Mod:
+	swi 6
+	mov r0, r1
+	bx lr
+	thumb_func_end Mod
+	.endif
+
+	.ifdef L_VBlankIntrWait
+	thumb_func_start VBlankIntrWait
+VBlankIntrWait:
+	mov r2, #0
+	swi 5
+	bx lr
+	thumb_func_end VBlankIntrWait
+	.endif
+
+	.ifdef L_MusicPlayerStart
+	thumb_func_start MusicPlayerStart
+MusicPlayerStart:
+	swi 33
+	bx lr
+	thumb_func_end MusicPlayerStart
+	.endif
+
+	.ifdef L_SoundDriverVSyncOff
+	thumb_func_start SoundDriverVSyncOff
+SoundDriverVSyncOff:
+	swi 40
+	bx lr
+	thumb_func_end SoundDriverVSyncOff
+	.endif
+
+	.ifdef L_HuffUnComp
+	thumb_func_start HuffUnComp
+HuffUnComp:
+	swi 19
+	bx lr
+	thumb_func_end HuffUnComp
+	.endif
+
+	.ifdef L_SoftResetExram
+	thumb_func_start SoftResetExram
+SoftResetExram:
+	ldr r3, =REG_IME
+	mov r2, #0
+	strb r2, [r3, #0]
+	ldr r3, =SOFT_RESET_DIRECT_BUF
+	mov r2, #1
+	strb r2, [r3, #0]
+	sub r3, #SOFT_RESET_DIRECT_BUF - 0x3007f00
+	mov sp, r3
+	mov r2, #RESET_EX_WRAM_FLAG
+	bic r0, r2
+	swi 1
+	swi 0
+	.pool
+	thumb_func_end SoftResetExram
+	.endif
+
+	.ifdef L_MusicPlayerFadeOut
+	thumb_func_start MusicPlayerFadeOut
+MusicPlayerFadeOut:
+	swi 36
+	bx lr
+	thumb_func_end MusicPlayerFadeOut
+	.endif
+
+	.ifdef L_LZ77UnCompWram
+	thumb_func_start LZ77UnCompWram
+LZ77UnCompWram:
+	swi 17
+	bx lr
+	thumb_func_end LZ77UnCompWram
+	.endif
+
+	.ifdef L_SoundDriverMain
+	thumb_func_start SoundDriverMain
+SoundDriverMain:
+	swi 28
+	bx lr
+	thumb_func_end SoundDriverMain
+	.endif
+
+	.ifdef L_SoundBiasChange
+	thumb_func_start SoundBiasChange
+SoundBiasChange:
+	swi 25
+	bx lr
+	thumb_func_end SoundBiasChange
+	.endif
+
+	.ifdef L_LZ77UnCompVram
+	thumb_func_start LZ77UnCompVram
+LZ77UnCompVram:
+	swi 18
+	bx lr
+	thumb_func_end LZ77UnCompVram
+	.endif
+
+	.ifdef L_ArcTan2
+	thumb_func_start ArcTan2
+ArcTan2:
+	swi 10
+	bx lr
+	thumb_func_end ArcTan2
+	.endif
+
+	.ifdef L_MusicPlayerStop
+	thumb_func_start MusicPlayerStop
+MusicPlayerStop:
+	swi 34
+	bx lr
+	thumb_func_end MusicPlayerStop
+	.endif
+
+	.ifdef L_DivArm
+	thumb_func_start DivArm
+DivArm:
+	swi 7
+	bx lr
+	thumb_func_end DivArm
+	.endif
+
+	.ifdef L_ModArm
+	thumb_func_start ModArm
+ModArm:
+	swi 7
+	mov r0, r1
+	bx lr
+	thumb_func_end ModArm
+	.endif
+
+	.ifdef L_SoundDriverVSync
+	thumb_func_start SoundDriverVSync
+SoundDriverVSync:
+	swi 29
+	bx lr
+	thumb_func_end SoundDriverVSync
+	.endif
+
+	.ifdef L_SoundDriverInit
+	thumb_func_start SoundDriverInit
+SoundDriverInit:
+	swi 26
+	bx lr
+	thumb_func_end SoundDriverInit
+	.endif
+
+	.ifdef L_BgAffineSet
+	thumb_func_start BgAffineSet
+BgAffineSet:
+	swi 14
+	bx lr
+	thumb_func_end BgAffineSet
+	.endif
+
+	.ifdef L_Diff8bitUnFilterWram
+	thumb_func_start Diff8bitUnFilterWram
+Diff8bitUnFilterWram:
+	swi 22
+	bx lr
+	thumb_func_end Diff8bitUnFilterWram
+	.endif
+
+	.ifdef L_MultiBoot
+	thumb_func_start MultiBoot
+MultiBoot:
+	mov r1, #1
+	swi 37
+	bx lr
+	thumb_func_end MultiBoot
+	.endif
+
+	.ifdef L_MidiKey2Freq
+	thumb_func_start MidiKey2Freq
+MidiKey2Freq:
+	swi 31
+	bx lr
+	thumb_func_end MidiKey2Freq
+	.endif
+
+	.ifdef L_Div
+	thumb_func_start Div
+Div:
+	swi 6
+	bx lr
+	thumb_func_end Div
+	.endif
+
+	.ifdef L_Diff8bitUnFilterVram
+	thumb_func_start Diff8bitUnFilterVram
+Diff8bitUnFilterVram:
+	swi 23
+	bx lr
+	thumb_func_end Diff8bitUnFilterVram
+	.endif
+
+	.ifdef L_ArcTan
+	thumb_func_start ArcTan
+ArcTan:
+	swi 9
+	bx lr
+	thumb_func_end ArcTan
+	.endif
+
+	.ifdef L_ObjAffineSet
+	thumb_func_start ObjAffineSet
+ObjAffineSet:
+	swi 15
+	bx lr
+	thumb_func_end ObjAffineSet
+	.endif
+
+	.ifdef L_SoftResetRom
+	thumb_func_start SoftResetRom
+SoftResetRom:
+	ldr r3, =REG_IME
+	mov r2, #0
+	strb r2, [r3, #0]
+	ldr r3, =SOFT_RESET_DIRECT_BUF
+	mov r2, #0
+	strb r2, [r3, #0]
+	sub r3, #SOFT_RESET_DIRECT_BUF - 0x3007f00
+	mov sp, r3
+	swi 1
+	swi 0
+	.pool
+	thumb_func_end SoftResetRom
+	.endif
+
+	.ifdef L_SoundDriverMode
+	thumb_func_start SoundDriverMode
+SoundDriverMode:
+	swi 27
+	bx lr
+	thumb_func_end SoundDriverMode
+	.endif
+
+	.ifdef L_RLUnCompWram
+	thumb_func_start RLUnCompWram
+RLUnCompWram:
+	swi 20
+	bx lr
+	thumb_func_end RLUnCompWram
+	.endif
+
+	.ifdef L_BitUnPack
+	thumb_func_start BitUnPack
+BitUnPack:
+	swi 16
+	bx lr
+	thumb_func_end BitUnPack
+	.endif
+
+	.ifdef L_SoundChannelClear
+	thumb_func_start SoundChannelClear
+SoundChannelClear:
+	swi 30
+	bx lr
+	thumb_func_end SoundChannelClear
+	.endif
+
+	.ifdef L_CpuFastSet
+	thumb_func_start CpuFastSet
+CpuFastSet:
+	swi 12
+	bx lr
+	thumb_func_end CpuFastSet
+	.endif
+
+	.ifdef L_CpuSet
+	thumb_func_start CpuSet
+CpuSet:
+	swi 11
+	bx lr
+	thumb_func_end CpuSet
+	.endif
+
+	.ifdef L_Diff16bitUnFilter
+	thumb_func_start Diff16bitUnFilter
+Diff16bitUnFilter:
+	swi 24
+	bx lr
+	thumb_func_end Diff16bitUnFilter
+	.endif
+
+	.ifdef L_SoundBiasSet
+	thumb_func_start SoundBiasSet
+SoundBiasSet:
+	mov r0, #1
+	swi 25
+	bx lr
+	thumb_func_end SoundBiasSet
+	.endif
+
+	.ifdef L_MusicPlayerContinue
+	thumb_func_start MusicPlayerContinue
+MusicPlayerContinue:
+	swi 35
+	bx lr
+	thumb_func_end MusicPlayerContinue
+	.endif
+
+	.ifdef L_SoftReset
+	thumb_func_start SoftReset
+SoftReset:
+	ldr r3, =REG_IME
+	mov r2, #0
+	strb r2, [r3, #0]
+	ldr r1, =0x3007f00
+	mov sp, r1
+	swi 1
+	swi 0
+	.pool
+	thumb_func_end SoftReset
+	.endif
+
+	.ifdef L_RLUnCompVram
+	thumb_func_start RLUnCompVram
+RLUnCompVram:
+	swi 21
+	bx lr
+	thumb_func_end RLUnCompVram
+	.endif
+
+	.align 2, 0 @ Don't pad with nop
diff --git a/src/apprentice.c b/src/apprentice.c
index 113b22f6ec..189647991f 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -10,7 +10,7 @@
 #include "item.h"
 #include "item_menu.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "new_game.h"
 #include "party_menu.h"
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index db9057cb4e..b2999a1278 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
 #include "decompress.h"
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index 1add76bf36..87023e7e10 100755
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
 #include "decompress.h"
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index 79b728e61d..ea69780ef0 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "bg.h"
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
index a667daecff..9a588a9ca6 100644
--- a/src/battle_anim_mons.c
+++ b/src/battle_anim_mons.c
@@ -7,7 +7,7 @@
 #include "decompress.h"
 #include "dma3.h"
 #include "gpu_regs.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "pokemon_icon.h"
 #include "sprite.h"
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c
index efe35e1b4c..1a02002719 100644
--- a/src/battle_anim_utility_funcs.c
+++ b/src/battle_anim_utility_funcs.c
@@ -3,7 +3,7 @@
 #include "contest.h"
 #include "gpu_regs.h"
 #include "graphics.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "sound.h"
 #include "sprite.h"
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 1c116467db..22a1ecaf27 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -8,7 +8,7 @@
 #include "event_data.h"
 #include "overworld.h"
 #include "util.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "string_util.h"
 #include "random.h"
 #include "task.h"
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c
index f564424329..36839cde57 100644
--- a/src/battle_factory_screen.c
+++ b/src/battle_factory_screen.c
@@ -11,7 +11,7 @@
 #include "palette.h"
 #include "task.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "gpu_regs.h"
 #include "string_util.h"
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index de403aec7c..737e6b61ed 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -6,7 +6,7 @@
 #include "constants/battle_anim.h"
 #include "battle_interface.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "graphics.h"
 #include "random.h"
 #include "util.h"
diff --git a/src/battle_main.c b/src/battle_main.c
index 27889e81ea..26e9e91ae9 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -26,7 +26,7 @@
 #include "link_rfu.h"
 #include "load_save.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "m4a.h"
 #include "palette.h"
 #include "party_menu.h"
diff --git a/src/battle_pike.c b/src/battle_pike.c
index 4e2be23e41..bfb87f6798 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -9,7 +9,7 @@
 #include "task.h"
 #include "battle_tower.h"
 #include "party_menu.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "script.h"
 #include "battle_setup.h"
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index 4d35f42444..6bcf007485 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -23,7 +23,7 @@
 #include "main.h"
 #include "load_save.h"
 #include "script.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "overworld.h"
 #include "event_scripts.h"
 #include "constants/battle_frontier.h"
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index b4ec6cd627..a17a934991 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -17,7 +17,7 @@
 #include "list_menu.h"
 #include "mail.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "overworld.h"
diff --git a/src/battle_records.c b/src/battle_records.c
index 3d4cabcb06..ccd16e2193 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -18,7 +18,7 @@
 #include "international_string_util.h"
 #include "sound.h"
 #include "constants/songs.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "constants/game_stat.h"
 #include "trainer_hill.h"
diff --git a/src/battle_transition.c b/src/battle_transition.c
index fb7fd0c2f2..c344190489 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -9,7 +9,7 @@
 #include "field_weather.h"
 #include "gpu_regs.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "overworld.h"
 #include "palette.h"
 #include "random.h"
diff --git a/src/battle_util2.c b/src/battle_util2.c
index f840cd58b9..ce2153b2d8 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -2,7 +2,7 @@
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "pokemon.h"
 #include "trainer_hill.h"
 #include "party_menu.h"
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 911c3e545c..6c8d9c8121 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -12,7 +12,7 @@
 #include "bg.h"
 #include "palette.h"
 #include "decompress.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "text.h"
 #include "text_window.h"
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 6259e0a419..8b4c7a545b 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "berry_powder.h"
 #include "bg.h"
 #include "event_data.h"
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 37be569f8e..e3c4e26757 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "gpu_regs.h"
 #include "multiboot.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "graphics.h"
 #include "main.h"
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 10a45dc658..07daafd523 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -19,7 +19,7 @@
 #include "string_util.h"
 #include "strings.h"
 #include "bg.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "scanline_effect.h"
 #include "gpu_regs.h"
 #include "graphics.h"
diff --git a/src/cable_car.c b/src/cable_car.c
index adeee2647e..c6e7e724e7 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -6,7 +6,7 @@
 #include "field_weather.h"
 #include "gpu_regs.h"
 #include "graphics.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "main.h"
 #include "menu.h"
 #include "overworld.h"
diff --git a/src/contest.c b/src/contest.c
index 79c1616c2e..e9a2f456f0 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "gpu_regs.h"
 #include "bg.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "constants/items.h"
 #include "constants/event_objects.h"
 #include "constants/moves.h"
diff --git a/src/contest_link_80F57C4.c b/src/contest_link_80F57C4.c
index a0a29f0ad4..54b2326d01 100644
--- a/src/contest_link_80F57C4.c
+++ b/src/contest_link_80F57C4.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_gfx_sfx_util.h"
 #include "bg.h"
diff --git a/src/contest_painting.c b/src/contest_painting.c
index 1b95e1ed99..2b36d5e381 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_gfx_sfx_util.h"
 #include "bg.h"
diff --git a/src/credits.c b/src/credits.c
index 44fa2002c7..e2c125d3fa 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -3,7 +3,7 @@
 #include "main.h"
 #include "task.h"
 #include "bg.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "window.h"
 #include "text.h"
 #include "menu.h"
diff --git a/src/data.c b/src/data.c
index 7aebd63ede..8d6640223c 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "data.h"
 #include "graphics.h"
diff --git a/src/decompress.c b/src/decompress.c
index 46e4ef6149..5e85e065f0 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "data.h"
 #include "decompress.h"
 #include "pokemon.h"
diff --git a/src/decoration.c b/src/decoration.c
index cb371b300a..2a47dd5539 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "decoration.h"
 #include "decoration_inventory.h"
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index ee310af04a..57a97d8f3c 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -3,7 +3,7 @@
 #include "easy_chat.h"
 #include "event_data.h"
 #include "link.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "random.h"
 #include "text.h"
 #include "tv.h"
diff --git a/src/diploma.c b/src/diploma.c
index 8e0901fa81..3c03c057f9 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -5,7 +5,7 @@
 #include "gpu_regs.h"
 #include "scanline_effect.h"
 #include "task.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "bg.h"
 #include "window.h"
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 714b10ef6b..4b636e2b91 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "dodrio_berry_picking.h"
 #include "dynamic_placeholder_text_util.h"
diff --git a/src/easy_chat.c b/src/easy_chat.c
index ba54de783b..f4ac92d065 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bard_music.h"
 #include "bg.h"
 #include "data.h"
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 1eaf4e4a15..9e9d1c2c5c 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -17,7 +17,7 @@
 #include "menu.h"
 #include "trig.h"
 #include "random.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "dma3.h"
 #include "gpu_regs.h"
 #include "bg.h"
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index f184dea826..7f08877904 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "ereader_helpers.h"
 #include "link.h"
diff --git a/src/ereader_screen.c b/src/ereader_screen.c
index 13e9642245..0e865558a0 100755
--- a/src/ereader_screen.c
+++ b/src/ereader_screen.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "ereader_helpers.h"
 #include "link.h"
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 75f758a129..c493c6d87d 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_pyramid.h"
 #include "berry.h"
 #include "decoration.h"
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 96ca2ed1ca..5ba9794534 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_message.h"
 #include "bg.h"
diff --git a/src/field_region_map.c b/src/field_region_map.c
index ac1b26154b..184c49b40c 100644
--- a/src/field_region_map.c
+++ b/src/field_region_map.c
@@ -3,7 +3,7 @@
 #include "gpu_regs.h"
 #include "international_string_util.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "palette.h"
 #include "region_map.h"
diff --git a/src/field_specials.c b/src/field_specials.c
index 0c4cc34e3a..f57b8ab0a0 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_tower.h"
 #include "cable_club.h"
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 3115ff2318..00eed76245 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -7,7 +7,7 @@
 #include "field_player_avatar.h"
 #include "fieldmap.h"
 #include "fldeff.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
 #include "party_menu.h"
diff --git a/src/frontier_pass.c b/src/frontier_pass.c
index fff93c3c76..a4ef500d71 100644
--- a/src/frontier_pass.c
+++ b/src/frontier_pass.c
@@ -5,7 +5,7 @@
 #include "battle_anim.h"
 #include "event_data.h"
 #include "recorded_battle.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "sprite.h"
 #include "scanline_effect.h"
 #include "text_window.h"
diff --git a/src/frontier_util.c b/src/frontier_util.c
index 88e466e8c9..83934c9f66 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -24,7 +24,7 @@
 #include "data.h"
 #include "record_mixing.h"
 #include "strings.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "save.h"
 #include "load_save.h"
 #include "battle_dome.h"
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index ac37b2ece0..d138abbb12 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -6,7 +6,7 @@
 #include "pokemon.h"
 #include "text.h"
 #include "text_window.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "graphics.h"
 #include "main.h"
diff --git a/src/intro.c b/src/intro.c
index e97fbedb0a..58f2509cc0 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -5,7 +5,7 @@
 #include "task.h"
 #include "title_screen.h"
 #include "libgcnmultiboot.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "link.h"
 #include "multiboot_pokemon_colosseum.h"
diff --git a/src/item.c b/src/item.c
index 5e505724c9..6b8f51f126 100644
--- a/src/item.c
+++ b/src/item.c
@@ -4,7 +4,7 @@
 #include "string_util.h"
 #include "text.h"
 #include "event_data.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "secret_base.h"
 #include "item_menu.h"
 #include "strings.h"
diff --git a/src/item_icon.c b/src/item_icon.c
index 91c32951ab..6ae7eac58a 100644
--- a/src/item_icon.c
+++ b/src/item_icon.c
@@ -2,7 +2,7 @@
 #include "decompress.h"
 #include "graphics.h"
 #include "item_icon.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "sprite.h"
 #include "constants/items.h"
 
diff --git a/src/item_menu.c b/src/item_menu.c
index 12f03b3283..c004ed4436 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -25,7 +25,7 @@
 #include "link.h"
 #include "mail.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "map_name_popup.h"
 #include "menu.h"
 #include "money.h"
diff --git a/src/libagbsyscall.s b/src/libagbsyscall.s
deleted file mode 100644
index d5639f6893..0000000000
--- a/src/libagbsyscall.s
+++ /dev/null
@@ -1,116 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start ArcTan2
-ArcTan2: @ 82E7078
-	swi 0xA
-	bx lr
-	thumb_func_end ArcTan2
-
-	thumb_func_start BgAffineSet
-@ void BgAffineSet(BgAffineSet_src_data *src, BgAffineSet_dest_data *dest, int entry_count)
-BgAffineSet: @ 82E707C
-	swi 0xE
-	bx lr
-	thumb_func_end BgAffineSet
-
-	thumb_func_start CpuFastSet
-@ void CpuFastSet(void *src, void *dest, unsigned int mode)
-CpuFastSet: @ 82E7080
-	swi 0xC
-	bx lr
-	thumb_func_end CpuFastSet
-
-	thumb_func_start CpuSet
-@ void CpuSet(void *src, void *dest, unsigned int mode)
-CpuSet: @ 82E7084
-	swi 0xB
-	bx lr
-	thumb_func_end CpuSet
-
-	thumb_func_start Div
-Div: @ 82E7088
-	swi 0x6
-	bx lr
-	thumb_func_end Div
-
-	thumb_func_start LZ77UnCompVram
-@ void LZ77UnCompVram(void *src, void *dest)
-LZ77UnCompVram: @ 82E708C
-	swi 0x12
-	bx lr
-	thumb_func_end LZ77UnCompVram
-
-	thumb_func_start LZ77UnCompWram
-@ void LZ77UnCompWram(void *src, void *dest)
-LZ77UnCompWram: @ 82E7090
-	swi 0x11
-	bx lr
-	thumb_func_end LZ77UnCompWram
-
-	thumb_func_start MultiBoot
-@ s32 MultiBoot(struct MultiBootParam *mp)
-MultiBoot: @ 82E7094
-	movs r1, 0x1
-	swi 0x25
-	bx lr
-	thumb_func_end MultiBoot
-
-	thumb_func_start ObjAffineSet
-ObjAffineSet: @ 82E709C
-	swi 0xF
-	bx lr
-	thumb_func_end ObjAffineSet
-
-	thumb_func_start RLUnCompVram
-RLUnCompVram: @ 82E70A0
-	swi 0x15
-	bx lr
-	thumb_func_end RLUnCompVram
-
-	thumb_func_start RLUnCompWram
-RLUnCompWram: @ 82E70A4
-	swi 0x14
-	bx lr
-	thumb_func_end RLUnCompWram
-
-	thumb_func_start RegisterRamReset
-@ void RegisterRamReset(int ResetFlags)
-RegisterRamReset: @ 82E70A8
-	swi 0x1
-	bx lr
-	thumb_func_end RegisterRamReset
-
-	thumb_func_start SoftReset
-@ void SoftReset()
-SoftReset: @ 82E70AC
-	ldr r3, =REG_IME
-	movs r2, 0
-	strb r2, [r3]
-	ldr r1, =0x3007F00
-	mov sp, r1
-	swi 0x1
-	swi 0
-	.pool
-	thumb_func_end SoftReset
-
-	thumb_func_start Sqrt
-@ s16 Sqrt(int)
-Sqrt: @ 82E70C4
-	swi 0x8
-	bx lr
-	thumb_func_end Sqrt
-
-	thumb_func_start VBlankIntrWait
-@ void VBlankIntrWait()
-VBlankIntrWait: @ 82E70C8
-	movs r2, 0
-	swi 0x5
-	bx lr
-	thumb_func_end VBlankIntrWait
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/src/link.c b/src/link.c
index 9928b48da5..db72be19ad 100644
--- a/src/link.c
+++ b/src/link.c
@@ -2,7 +2,7 @@
 // Includes
 #include "global.h"
 #include "m4a.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "reset_save_heap.h"
 #include "save.h"
 #include "bg.h"
diff --git a/src/link_rfu.c b/src/link_rfu.c
index 4b0b0a2a51..3b533a3a46 100644
--- a/src/link_rfu.c
+++ b/src/link_rfu.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "berry_blender.h"
 #include "decompress.h"
diff --git a/src/list_menu.c b/src/list_menu.c
index 6d51559f7f..797aff5f8d 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -8,7 +8,7 @@
 #include "trig.h"
 #include "decompress.h"
 #include "palette.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "strings.h"
 #include "sound.h"
 #include "constants/songs.h"
diff --git a/src/load_save.c b/src/load_save.c
index 5857f2b463..24dfda20cb 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "berry_powder.h"
 #include "item.h"
 #include "load_save.h"
diff --git a/src/mail.c b/src/mail.c
index 0078bc4fc6..cdf9655459 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -17,7 +17,7 @@
 #include "bg.h"
 #include "pokemon_icon.h"
 #include "constants/species.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "easy_chat.h"
 #include "constants/rgb.h"
 
diff --git a/src/main.c b/src/main.c
index 06425e661d..f488e7f6d8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "crt0.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "librfu.h"
diff --git a/src/match_call.c b/src/match_call.c
index 3ed6849380..f5d36645bd 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_setup.h"
 #include "bg.h"
diff --git a/src/menu.c b/src/menu.c
index 8d50d4dccf..177c376945 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "blit.h"
 #include "dma3.h"
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index 1536cf4137..f46c93e05a 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_main.h"
 #include "contest_effect.h"
 #include "data.h"
diff --git a/src/mevent_801BAAC.c b/src/mevent_801BAAC.c
index 8f5b2d6361..24d55c511b 100644
--- a/src/mevent_801BAAC.c
+++ b/src/mevent_801BAAC.c
@@ -4,7 +4,7 @@
 #include "gpu_regs.h"
 #include "palette.h"
 #include "decompress.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "pokemon_icon.h"
 #include "union_room.h"
diff --git a/src/mevent_client.c b/src/mevent_client.c
index ec8908af28..659b772df4 100644
--- a/src/mevent_client.c
+++ b/src/mevent_client.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "overworld.h"
 #include "script.h"
diff --git a/src/mevent_server.c b/src/mevent_server.c
index 06b10dd957..0d3afea304 100644
--- a/src/mevent_server.c
+++ b/src/mevent_server.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "script.h"
 #include "mevent.h"
 #include "mevent_server.h"
diff --git a/src/mevent_server_helpers.c b/src/mevent_server_helpers.c
index 9d47ba7459..616f394f71 100644
--- a/src/mevent_server_helpers.c
+++ b/src/mevent_server_helpers.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "util.h"
 #include "link.h"
diff --git a/src/mirage_tower.c b/src/mirage_tower.c
index bb9c6e9586..0c2b8ce744 100644
--- a/src/mirage_tower.c
+++ b/src/mirage_tower.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "event_data.h"
 #include "event_object_movement.h"
diff --git a/src/mossdeep_gym.c b/src/mossdeep_gym.c
index 880780638e..bc279334b7 100644
--- a/src/mossdeep_gym.c
+++ b/src/mossdeep_gym.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "event_object_movement.h"
 #include "fieldmap.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "mossdeep_gym.h"
 #include "script_movement.h"
 #include "constants/event_object_movement_constants.h"
diff --git a/src/move_relearner.c b/src/move_relearner.c
index 867c6c9958..121ac66e8c 100644
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -9,7 +9,7 @@
 #include "gpu_regs.h"
 #include "move_relearner.h"
 #include "list_menu.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "menu_specialized.h"
diff --git a/src/mystery_gift.c b/src/mystery_gift.c
index ab3df9020c..aae7d127e5 100644
--- a/src/mystery_gift.c
+++ b/src/mystery_gift.c
@@ -2,7 +2,7 @@
 #include "main.h"
 #include "text.h"
 #include "task.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "scanline_effect.h"
 #include "text_window.h"
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 472489a269..095a431174 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "naming_screen.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "task.h"
 #include "sprite.h"
diff --git a/src/overworld.c b/src/overworld.c
index 0cac8390a1..e32024c770 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -26,7 +26,7 @@
 #include "link_rfu.h"
 #include "load_save.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "m4a.h"
 #include "map_name_popup.h"
 #include "match_call.h"
diff --git a/src/party_menu.c b/src/party_menu.c
index f4b749bde7..e4235b29fa 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "battle_controllers.h"
diff --git a/src/player_pc.c b/src/player_pc.c
index 08f24d379e..dd90bbd8a7 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -14,7 +14,7 @@
 #include "list_menu.h"
 #include "mail.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "overworld.h"
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 30e630d9a6..14e5b6a1fd 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_controllers.h"
 #include "battle_message.h"
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 4ad15414dc..2c0b68dc6c 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "bg.h"
 #include "data.h"
diff --git a/src/pokedex.c b/src/pokedex.c
index c1787ef6a5..0710bdecf1 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -8,7 +8,7 @@
 #include "graphics.h"
 #include "international_string_util.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "m4a.h"
 #include "overworld.h"
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index dc69b5d540..697fdb792b 100755
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -4,7 +4,7 @@
 #include "gpu_regs.h"
 #include "graphics.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "overworld.h"
 #include "palette.h"
diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c
index 487db6d58f..0b35b00eea 100644
--- a/src/pokedex_cry_screen.c
+++ b/src/pokedex_cry_screen.c
@@ -2,7 +2,7 @@
 #include "bg.h"
 #include "m4a.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "pokedex_cry_screen.h"
 #include "sound.h"
diff --git a/src/pokemon.c b/src/pokemon.c
index 8812e5bc4b..da659b10d3 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "apprentice.h"
 #include "battle.h"
 #include "battle_anim.h"
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index 8f16e1ce23..cc9c2f4ff8 100755
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_anim.h"
 #include "bg.h"
 #include "data.h"
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index fa9e615042..c6994e5ac3 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "data.h"
 #include "decompress.h"
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 8697c557f0..5908f8bba3 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -20,7 +20,7 @@
 #include "item.h"
 #include "link.h"
 #include "m4a.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "mon_markings.h"
diff --git a/src/pokenav.c b/src/pokenav.c
index a5bb51789b..2a1647a6f2 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "task.h"
 #include "main.h"
 #include "overworld.h"
diff --git a/src/pokenav_unk_2.c b/src/pokenav_unk_2.c
index 1c40e146fb..cb9467a9ce 100644
--- a/src/pokenav_unk_2.c
+++ b/src/pokenav_unk_2.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "bg.h"
 #include "palette.h"
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index fc28607972..4e5e492f27 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -5,7 +5,7 @@
 #include "graphics.h"
 #include "bg.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "scanline_effect.h"
 #include "menu.h"
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 32e0404b96..8df0a8a8b7 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "random.h"
 #include "constants/items.h"
 #include "text.h"
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 432c5dbe69..bd1974d486 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -10,7 +10,7 @@
 #include "string_util.h"
 #include "palette.h"
 #include "save.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "util.h"
 #include "task.h"
 #include "text.h"
diff --git a/src/region_map.c b/src/region_map.c
index ea2cbfa6a3..3bb532a193 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -2,7 +2,7 @@
 #include "main.h"
 #include "text.h"
 #include "menu.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "gpu_regs.h"
 #include "palette.h"
 #include "party_menu.h"
diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c
index beba742f56..5a54a21771 100644
--- a/src/reset_save_heap.c
+++ b/src/reset_save_heap.c
@@ -6,7 +6,7 @@
 #include "save.h"
 #include "new_game.h"
 #include "overworld.h"
-#include "alloc.h"
+#include "malloc.h"
 
 void sub_81700F8(void)
 {
diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c
index 42817fc2b4..7cc30c7757 100644
--- a/src/rom_8034C54.c
+++ b/src/rom_8034C54.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "rom_8034C54.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "main.h"
 #include "battle_main.h"
diff --git a/src/rom_81520A8.c b/src/rom_81520A8.c
index f068235949..f6d14d49c4 100644
--- a/src/rom_81520A8.c
+++ b/src/rom_81520A8.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "rom_81520A8.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "main.h"
 #include "rom_8034C54.h"
 
diff --git a/src/roulette.c b/src/roulette.c
index 662522aae8..bef14a3646 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "coins.h"
 #include "decompress.h"
diff --git a/src/secret_base.c b/src/secret_base.c
index d02011406f..76dbe76684 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_setup.h"
 #include "decoration.h"
diff --git a/src/shop.c b/src/shop.c
index bf15568fbc..ded88a2a6e 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -17,7 +17,7 @@
 #include "item_menu.h"
 #include "list_menu.h"
 #include "main.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "money.h"
diff --git a/src/slot_machine.c b/src/slot_machine.c
index 003ac3327c..37071926e8 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -14,7 +14,7 @@
 #include "util.h"
 #include "text.h"
 #include "menu.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "gpu_regs.h"
 #include "coins.h"
diff --git a/src/trade.c b/src/trade.c
index c29fe54c36..196d9659c1 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
 #include "bg.h"
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 9c4816c422..f7685b8cc7 100755
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -4,7 +4,7 @@
 #include "task.h"
 #include "main.h"
 #include "window.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "link.h"
 #include "bg.h"
 #include "sound.h"
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 2a7e003d9a..995dc164ac 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "battle_tower.h"
 #include "battle_setup.h"
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index 047783a85c..f360ec84c2 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "sprite.h"
 #include "window.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "constants/species.h"
 #include "palette.h"
 #include "decompress.h"
diff --git a/src/tv.c b/src/tv.c
index 62d261a63e..4696a25e39 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -31,7 +31,7 @@
 #include "text.h"
 #include "script_menu.h"
 #include "naming_screen.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "region_map.h"
 #include "constants/region_map_sections.h"
 #include "decoration.h"
diff --git a/src/union_room.c b/src/union_room.c
index 8c88c19f8f..8ae1119260 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "berry_crush.h"
 #include "bg.h"
diff --git a/src/union_room_battle.c b/src/union_room_battle.c
index 79d12291d0..b49406eac6 100644
--- a/src/union_room_battle.c
+++ b/src/union_room_battle.c
@@ -6,7 +6,7 @@
 #include "bg.h"
 #include "palette.h"
 #include "gpu_regs.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "menu.h"
 #include "window.h"
 #include "text_window.h"
diff --git a/src/union_room_chat.c b/src/union_room_chat.c
index 4afeb99cfd..8a3ab758e5 100755
--- a/src/union_room_chat.c
+++ b/src/union_room_chat.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "bg.h"
 #include "decompress.h"
 #include "dma3.h"
diff --git a/src/unk_pokedex_area_screen_helper.c b/src/unk_pokedex_area_screen_helper.c
index 0041d628c5..9b2401cb20 100644
--- a/src/unk_pokedex_area_screen_helper.c
+++ b/src/unk_pokedex_area_screen_helper.c
@@ -2,7 +2,7 @@
 #include "main.h"
 #include "menu.h"
 #include "bg.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "palette.h"
 #include "unk_pokedex_area_screen_helper.h"
 
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 655f38defd..4d7605c50c 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "main.h"
 #include "pokeblock.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "graphics.h"
 #include "palette.h"
diff --git a/sym_bss.txt b/sym_bss.txt
index 29b30f2db8..c2a60404e5 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -1,10 +1,10 @@
 	.include "src/main.o"
-	.include "src/alloc.o"
-	.include "src/dma3_manager.o"
-	.include "src/gpu_regs.o"
-	.include "src/bg.o"
-	.include "src/text.o"
-	.include "src/sprite.o"
+	.include "gflib/malloc.o"
+	.include "gflib/dma3_manager.o"
+	.include "gflib/gpu_regs.o"
+	.include "gflib/bg.o"
+	.include "gflib/text.o"
+	.include "gflib/sprite.o"
 	.include "src/link.o"
 	.include "src/link_rfu.o"
 	.include "src/union_room.o"
diff --git a/sym_common.txt b/sym_common.txt
index f277ed0f2a..7c306c61bb 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -1,9 +1,37 @@
 	.space 0x8
 	.include "main.o"
-	.include "bg.o"
-	.include "window.o"
-	.include "text.o"
-	.include "sprite.o"
+	@ ../gflib/bg.o
+	.align 2
+gUnneededFireRedVariable:
+    .space 4
+    @ ../gflib/window.o
+    .align 4
+gTransparentTileNumber:
+    .space 1
+    .align 4
+gUnknown_03002F70:
+    .space 16
+    @ ../gflib/text.o
+    .align 4
+gFonts:
+    .space 4
+    .align 2
+gUnknown_03002F84:
+    .space 1
+    .align 4
+gUnknown_03002F90:
+    .space 132
+    .align 2
+gTextFlags:
+    .space 4
+    @ ../gflib/sprite.o
+    .align 2
+gOamMatrixAllocBitmap:
+    .space 4
+    .align 2
+gReservedSpritePaletteCount:
+    .space 1
+    .align 4
 	.include "link.o"
 	.include "link_rfu.o"
 	.include "rtc.o"
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 3de0c45cbb..bdbb85d37d 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1,9 +1,9 @@
 	.include "src/decompress.o"
 	.include "src/main.o"
-	.include "src/window.o"
-	.include "src/text.o"
-	.include "src/sprite.o"
-	.include "src/string_util.o"
+	.include "gflib/window.o"
+	.include "gflib/text.o"
+	.include "gflib/sprite.o"
+	.include "gflib/string_util.o"
 	.include "src/link.o"
 	.include "src/link_rfu.o"
 	.include "src/union_room.o"