From 4db344db89d8e36b0dd915cac570c9819f311146 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 17 Jun 2022 22:54:52 -0400 Subject: [PATCH] Add a subdirectory for RAM files Fixes #920 --- Makefile | 2 +- ram.asm | 9 +++++++++ hram.asm => ram/hram.asm | 0 sram.asm => ram/sram.asm | 0 vram.asm => ram/vram.asm | 0 wram.asm => ram/wram.asm | 13 ------------- 6 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 ram.asm rename hram.asm => ram/hram.asm (100%) rename sram.asm => ram/sram.asm (100%) rename vram.asm => ram/vram.asm (100%) rename wram.asm => ram/wram.asm (99%) diff --git a/Makefile b/Makefile index 66f5eed07..c82215e47 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ rom_obj := \ audio.o \ home.o \ main.o \ - wram.o \ + ram.o \ data/text/common.o \ data/maps/map_data.o \ data/pokemon/dex_entries.o \ diff --git a/ram.asm b/ram.asm new file mode 100644 index 000000000..24040b140 --- /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 similarity index 100% rename from hram.asm rename to ram/hram.asm diff --git a/sram.asm b/ram/sram.asm similarity index 100% rename from sram.asm rename to ram/sram.asm diff --git a/vram.asm b/ram/vram.asm similarity index 100% rename from vram.asm rename to ram/vram.asm diff --git a/wram.asm b/ram/wram.asm similarity index 99% rename from wram.asm rename to ram/wram.asm index f49917ce3..1077b8bee 100644 --- a/wram.asm +++ b/ram/wram.asm @@ -1,11 +1,3 @@ -INCLUDE "constants.asm" - -INCLUDE "macros/wram.asm" - - -INCLUDE "vram.asm" - - SECTION "Stack", WRAM0 wStackBottom:: @@ -3614,8 +3606,3 @@ SECTION "Stack RAM", WRAMX wWindowStack:: ds $1000 - 1 wWindowStackBottom:: ds 1 - - -INCLUDE "sram.asm" - -INCLUDE "hram.asm"