From f6b0bd9368f242aca455d491a31aff624c49ca8d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 16 Jun 2021 14:44:52 -0400
Subject: [PATCH 1/2] Symplifi symfiles

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a5fe77f23..d0b48f1d7 100644
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,8 @@ FIX := tools/gbafix/gbafix
 MAPJSON := tools/mapjson/mapjson
 JSONPROC := tools/jsonproc/jsonproc
 
+PERL := perl
+
 # Clear the default suffixes
 .SUFFIXES:
 # Don't delete intermediate files
@@ -354,4 +356,4 @@ modern: ; @$(MAKE) MODERN=1
 ###################
 
 $(SYM): $(ELF)
-	$(OBJDUMP) -t $< | sort -u | grep -E "^0[2389]" > $@
\ No newline at end of file
+	$(OBJDUMP) -t $< | sort -u | grep -E "^0[2389]" | $(PERL) -p -e 's/^(\w{8}) (\w).{6} \S+\t(\w{8}) (\w+)$$/\1 \2 \3 \4/g' > $@
\ No newline at end of file

From 3116ec6375229293033d95eb044a11c957ac6f42 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 18 Jun 2021 12:53:27 -0400
Subject: [PATCH 2/2] Fix regex error

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d0b48f1d7..9aaccc2fc 100644
--- a/Makefile
+++ b/Makefile
@@ -356,4 +356,4 @@ modern: ; @$(MAKE) MODERN=1
 ###################
 
 $(SYM): $(ELF)
-	$(OBJDUMP) -t $< | sort -u | grep -E "^0[2389]" | $(PERL) -p -e 's/^(\w{8}) (\w).{6} \S+\t(\w{8}) (\w+)$$/\1 \2 \3 \4/g' > $@
\ No newline at end of file
+	$(OBJDUMP) -t $< | sort -u | grep -E "^0[2389]" | $(PERL) -p -e 's/^(\w{8}) (\w).{6} \S+\t(\w{8}) (\S+)$$/\1 \2 \3 \4/g' > $@