shithub: pokered

Download patch

ref: b4e8ec0901da238bf89ef8685355403a6960c29d
parent: cf90d30e9ea236c9e06de1d1be0b9635192f6ed9
author: yenatch <[email protected]>
date: Thu Jan 23 10:55:33 EST 2014

Make text.asm an object

--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,13 @@
 
 RED_OBJS  := \
 pokered.o \
-audio_red.o
+audio_red.o \
+text.o
 
 BLUE_OBJS := \
 pokeblue.o \
-audio_blue.o
+audio_blue.o \
+text.o
 
 OBJS := $(RED_OBJS) $(BLUE_OBJS)
 
--- a/main.asm
+++ b/main.asm
@@ -115622,5 +115622,3 @@
 	db $22, $52, $24, $34, $42
 
 
-INCLUDE "text.asm"
-
--- a/text.asm
+++ b/text.asm
@@ -1,3 +1,5 @@
+INCLUDE "globals.asm"
+
 TEXT_1  EQU $20
 TEXT_2  EQU $21
 TEXT_3  EQU $22
@@ -12,6 +14,9 @@
 
 POKEDEX_TEXT EQU $2b
 MOVE_NAMES   EQU $2c
+
+INCLUDE "macros.asm"
+
 
 
 SECTION "Text 1", ROMX, BANK[TEXT_1]