From f6706ecb0908ac5a11ba12672299fea8266ee26b Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Thu, 10 Oct 2013 03:24:02 -0400
Subject: finally compile multiple objects

pokecrystal.asm doesnt really make sense now so its gone

add includes.asm so objects have a standard include set
---
 Makefile        | 2 +-
 includes.asm    | 2 ++
 main.asm        | 3 +++
 pokecrystal.asm | 5 -----
 wram.asm        | 3 +++
 5 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 includes.asm
 delete mode 100644 pokecrystal.asm

diff --git a/Makefile b/Makefile
index eb4086367..b8016535f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ PYTHON := python
 TEXTFILES := $(shell find ./ -type f -name '*.asm' | grep -v globals.asm)
 TEXTQUEUE :=
 
-OBJS := pokecrystal.o
+OBJS := wram.o main.o
 
 PNGS   := $(shell find gfx/ -type f -name '*.png')
 LZS    := $(shell find gfx/ -type f -name '*.lz')
diff --git a/includes.asm b/includes.asm
new file mode 100644
index 000000000..ce581fd02
--- /dev/null
+++ b/includes.asm
@@ -0,0 +1,2 @@
+INCLUDE "globals.asm"
+INCLUDE "constants.asm"
diff --git a/main.asm b/main.asm
index 582a3393d..b572b4f5e 100644
--- a/main.asm
+++ b/main.asm
@@ -1,3 +1,6 @@
+INCLUDE "includes.asm"
+
+
 SECTION "bank0",ROM0
 
 INCLUDE "rst.asm"
diff --git a/pokecrystal.asm b/pokecrystal.asm
deleted file mode 100644
index 495b02178..000000000
--- a/pokecrystal.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-INCLUDE "globals.asm"
-
-INCLUDE "constants.asm"
-INCLUDE "wram.asm"
-INCLUDE "main.asm"
diff --git a/wram.asm b/wram.asm
index 3796969fb..2054d2ff0 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1,3 +1,6 @@
+INCLUDE "includes.asm"
+
+
 SECTION "tiles0",VRAM[$8000],BANK[0]
 VTiles0:
 SECTION "tiles1",VRAM[$8800],BANK[0]
-- 
cgit v1.2.3