From c467da924b652ee137d5fce4bfe76efcadd7d502 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Thu, 8 Oct 2015 02:03:14 -0700
Subject: [PATCH] make includes relative to the base dir

---
 asm/crt0.s    |  2 +-
 asm/emerald.s | 44 ++++++++++++++++++++++----------------------
 build.bat     |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/asm/crt0.s b/asm/crt0.s
index f54b87c12..820b31e57 100644
--- a/asm/crt0.s
+++ b/asm/crt0.s
@@ -1,4 +1,4 @@
-	.include "rom_header.s"
+	.include "asm/rom_header.s"
 
 _080000C0:
 	.long 0
diff --git a/asm/emerald.s b/asm/emerald.s
index 466df7a35..f4e6aa798 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -1,5 +1,5 @@
-	.include "defines.s"
-	.include "macros.s"
+	.include "asm/defines.s"
+	.include "asm/macros.s"
 
 	.syntax unified
 
@@ -10,19 +10,19 @@
 	.arm
 
 Start:
-	.include "crt0.s"
+	.include "asm/crt0.s"
 
 	.thumb
 
-	.include "main.s"
-	.include "malloc.s"
-	.include "dma3_manager.s"
-	.include "gpu_reg_manager.s"
-	.include "gpu_bg.s"
-	.include "pixel_buffer.s"
-	.include "window.s"
-	.include "text_renderer.s"
-	.include "gpu_obj.s"
+	.include "asm/main.s"
+	.include "asm/malloc.s"
+	.include "asm/dma3_manager.s"
+	.include "asm/gpu_reg_manager.s"
+	.include "asm/gpu_bg.s"
+	.include "asm/pixel_buffer.s"
+	.include "asm/window.s"
+	.include "asm/text_renderer.s"
+	.include "asm/gpu_obj.s"
 
 	thumb_func_start strcpy_limit_10_chars
 strcpy_limit_10_chars: @ 8008B10
@@ -317522,7 +317522,7 @@ _080A8F32:
 	.pool
 	thumb_func_end sub_80A8EE4
 
-	.include "task.s"
+	.include "asm/task.s"
 
 	thumb_func_start nullsub_35
 nullsub_35: @ 80A92F4
@@ -920531,12 +920531,12 @@ _081DB66C:
 	.pool
 	thumb_func_end sub_81DB620
 
-	.include "data1.s"
-	.include "unknown_lib_1.s"
-	.include "libmks4agb.s"
-	.include "libagbbackup.s"
-	.include "unknown_lib_2.s"
-	.include "librfu.s"
-	.include "libagbsyscall.s"
-	.include "libgcc.s"
-	.include "data2.s"
+	.include "asm/data1.s"
+	.include "asm/unknown_lib_1.s"
+	.include "asm/libmks4agb.s"
+	.include "asm/libagbbackup.s"
+	.include "asm/unknown_lib_2.s"
+	.include "asm/librfu.s"
+	.include "asm/libagbsyscall.s"
+	.include "asm/libgcc.s"
+	.include "asm/data2.s"
diff --git a/build.bat b/build.bat
index c459340a3..7bf8b510d 100644
--- a/build.bat
+++ b/build.bat
@@ -1,4 +1,4 @@
-as -mcpu=arm7tdmi asm/emerald.s -Iasm
+as -mcpu=arm7tdmi asm/emerald.s
 ld -T ld_script.txt -o emerald.o a.out
 objcopy -O binary emerald.o emerald.gba
 fc /b base_emerald.gba emerald.gba