From 0bda107188b5623f34d95214fae1c715b757ec7f Mon Sep 17 00:00:00 2001
From: Kurausukun <lord.uber1@gmail.com>
Date: Wed, 20 Apr 2022 01:07:10 -0400
Subject: [PATCH 1/3] don't build modern with -g by default

---
 INSTALL.md | 1 +
 Makefile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/INSTALL.md b/INSTALL.md
index f6434c07be..72f3c92f3f 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -457,6 +457,7 @@ To build **pokeemerald.elf** with enhanced debug info:
 ```bash
 make DINFO=1
 ```
+Note that this is only necessary for the `modern` target; the regular target has debug info enabled by default.
 
 ## devkitARM's C compiler
 
diff --git a/Makefile b/Makefile
index 6283a87fe3..c36cc8e936 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@ LIBPATH := -L ../../tools/agbcc/lib
 LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
 else
 CC1              = $(shell $(PATH_MODERNCC) --print-prog-name=cc1) -quiet
-override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -g
+override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
 ROM := $(MODERN_ROM_NAME)
 OBJ_DIR := $(MODERN_OBJ_DIR_NAME)
 LIBPATH := -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libc.a))"

From 1c13335d16f610d2c3881effb7eddf3fefd5d894 Mon Sep 17 00:00:00 2001
From: Kurausukun <lord.uber1@gmail.com>
Date: Thu, 12 May 2022 22:05:44 -0400
Subject: [PATCH 2/3] Update INSTALL.md

---
 INSTALL.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 72f3c92f3f..42d8a75ec8 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -451,14 +451,6 @@ Replace `<output of nproc>` with the number that the `nproc` command returned.
 
 `nproc` is not available on macOS. The alternative is `sysctl -n hw.ncpu` ([relevant Stack Overflow thread](https://stackoverflow.com/questions/1715580)).
 
-## Debug info
-
-To build **pokeemerald.elf** with enhanced debug info:
-```bash
-make DINFO=1
-```
-Note that this is only necessary for the `modern` target; the regular target has debug info enabled by default.
-
 ## devkitARM's C compiler
 
 This project supports the `arm-none-eabi-gcc` compiler included with devkitARM. If devkitARM (a.k.a. gba-dev) has already been installed as part of the platform-specific instructions, simply run:
@@ -535,7 +527,7 @@ devkitARM is now installed.
 
 devkitARM is now installed.
 
-## Installing devkitARM on Arch Linux
+### Installing devkitARM on Arch Linux
         
 1. Follow [devkitPro's instructions](https://devkitpro.org/wiki/devkitPro_pacman#Customising_Existing_Pacman_Install) to configure `pacman` to download devkitPro packages.
 2. Install `gba-dev`: run the following command as root.
@@ -553,7 +545,7 @@ devkitARM is now installed.
 
 devkitARM is now installed.
 
-## Other toolchains
+### Other toolchains
 
 To build using a toolchain other than devkitARM, override the `TOOLCHAIN` environment variable with the path to your toolchain, which must contain the subdirectory `bin`.
 ```bash
@@ -565,6 +557,14 @@ make TOOLCHAIN="/usr/local/arm-none-eabi"
 ```
 To compile the `modern` target with this toolchain, the subdirectories `lib`, `include`, and `arm-none-eabi` must also be present.
 
+### Building with debug info under a modern toolchain
+
+To build **pokeemerald.elf** with debug symbols under a modern toolchain:
+```bash
+make DINFO=1
+```
+Note that this is not necessary for a non-modern build since those are built with debug symbols by default.
+
 # Useful additional tools
 
 * [porymap](https://github.com/huderlem/porymap) for viewing and editing maps

From 7d224197c05fb319c03d2bcbed3ed36d6f246fd8 Mon Sep 17 00:00:00 2001
From: Kurausukun <lord.uber1@gmail.com>
Date: Thu, 12 May 2022 22:33:17 -0400
Subject: [PATCH 3/3] Update INSTALL.md

---
 INSTALL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.md b/INSTALL.md
index 42d8a75ec8..7f1d47879f 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -561,7 +561,7 @@ To compile the `modern` target with this toolchain, the subdirectories `lib`, `i
 
 To build **pokeemerald.elf** with debug symbols under a modern toolchain:
 ```bash
-make DINFO=1
+make modern DINFO=1
 ```
 Note that this is not necessary for a non-modern build since those are built with debug symbols by default.