Add a subdirectory for RAM files

6 files changed, 10 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index c5ac37e3..e90ad8b6 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ rom_obj := \
 	home.o \
 	main.o \
 	maps.o \
+	ram.o \
 	text.o \
-	wram.o \
 	gfx/pics.o \
 	gfx/pikachu.o \
 	gfx/sprites.o \
diff --git a/ram.asm b/ram.asm
new file mode 100644
index 00000000..24040b14
--- /dev/null
+++ b/ram.asm
@@ -0,0 +1,9 @@
+INCLUDE "constants.asm"
+
+INCLUDE "macros/wram.asm"
+
+
+INCLUDE "ram/vram.asm"
+INCLUDE "ram/wram.asm"
+INCLUDE "ram/sram.asm"
+INCLUDE "ram/hram.asm"
diff --git a/hram.asm b/ram/hram.asm
index 0e9a61e1..0e9a61e1 100644
--- a/hram.asm
+++ b/ram/hram.asm
diff --git a/sram.asm b/ram/sram.asm
index 6cb45371..6cb45371 100644
--- a/sram.asm
+++ b/ram/sram.asm
diff --git a/vram.asm b/ram/vram.asm
index 21230ac0..21230ac0 100644
--- a/vram.asm
+++ b/ram/vram.asm
diff --git a/wram.asm b/ram/wram.asm
index 6e0deaed..80cd15a6 100644
--- a/wram.asm
+++ b/ram/wram.asm
@@ -1,11 +1,3 @@
-INCLUDE "constants.asm"
-
-INCLUDE "macros/wram.asm"
-
-
-INCLUDE "vram.asm"
-
-
 SECTION "Audio RAM", WRAM0
 
 wUnusedC000:: db
@@ -2607,8 +2599,3 @@ SECTION "Stack", WRAM0
 ; the stack grows downward
 	ds $eb - 1
 wStack:: db
-
-
-INCLUDE "sram.asm"
-
-INCLUDE "hram.asm"