aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2022-06-17 22:54:47 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2022-06-17 22:54:47 -0400
commitba15b4b44e33877f1c314910648c5a7d682c7c75 (patch)
tree980eac5aa02a20ca52b8362927850d470260e685
parentRename `SLP` to `SLP_MASK` (#361) (diff)
downloadpokeyellow-ba15b4b44e33877f1c314910648c5a7d682c7c75.tar.gz
pokeyellow-ba15b4b44e33877f1c314910648c5a7d682c7c75.tar.xz
pokeyellow-ba15b4b44e33877f1c314910648c5a7d682c7c75.zip
Add a subdirectory for RAM files
-rw-r--r--Makefile2
-rw-r--r--ram.asm9
-rw-r--r--ram/hram.asm (renamed from hram.asm)0
-rw-r--r--ram/sram.asm (renamed from sram.asm)0
-rw-r--r--ram/vram.asm (renamed from vram.asm)0
-rw-r--r--ram/wram.asm (renamed from wram.asm)13
6 files changed, 10 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 3a23f759..636f5c3d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ rom_obj := \
home.o \
main.o \
maps.o \
+ ram.o \
text.o \
- wram.o \
gfx/pics.o \
gfx/sprites.o \
gfx/tilesets.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 0607a484..0607a484 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 428d8c96..0804e6ee 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
@@ -2337,8 +2329,3 @@ SECTION "Stack", WRAM0
; the stack grows downward
ds $100 - 1
wStack:: db
-
-
-INCLUDE "sram.asm"
-
-INCLUDE "hram.asm"