text.o

GLOBAL is temporary

5 files changed, 51 insertions, 48 deletions

diff --git a/Makefile b/Makefile
index f4da47f..7a6e47f 100755
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 .SECONDEXPANSION:
 
 ROMS := tcg.gbc
-OBJS := main.o gfx.o
+OBJS := main.o gfx.o text.o
 
 $(foreach obj, $(OBJS), \
 	$(eval $(obj:.o=)_dep := $(shell python extras/scan_includes.py $(obj:.o=.asm))) \
diff --git a/engine/home.asm b/engine/home.asm
index 859a725..e7570cc 100755
--- a/engine/home.asm
+++ b/engine/home.asm
@@ -1,4 +1,5 @@
 GLOBAL GrassEnergyCardGfx
+GLOBAL TextOffsets
 
 ; rst vectors
 SECTION "rst00",ROM0[0]
diff --git a/main.asm b/main.asm
index 6047b89..0057991 100755
--- a/main.asm
+++ b/main.asm
@@ -42,52 +42,6 @@ SECTION "bankC",ROMX,BANK[$C]
 INCLUDE "data/decks.asm"
 INCLUDE "data/cards.asm"
 
-SECTION "bankD",ROMX,BANK[$D]
-INCLUDE "text/text_offsets.asm"
-INCLUDE "text/text1.asm"
-
-SECTION "bankE",ROMX,BANK[$E]
-INCLUDE "text/text2.asm"
-
-SECTION "bankF",ROMX,BANK[$F]
-INCLUDE "text/text3.asm"
-
-SECTION "bank10",ROMX,BANK[$10]
-INCLUDE "text/text4.asm"
-
-SECTION "bank11",ROMX,BANK[$11]
-INCLUDE "text/text5.asm"
-
-SECTION "bank12",ROMX,BANK[$12]
-INCLUDE "text/text6.asm"
-
-SECTION "bank13",ROMX,BANK[$13]
-INCLUDE "text/text7.asm"
-
-SECTION "bank14",ROMX,BANK[$14]
-INCLUDE "text/text8.asm"
-
-SECTION "bank15",ROMX,BANK[$15]
-INCLUDE "text/text9.asm"
-
-SECTION "bank16",ROMX,BANK[$16]
-INCLUDE "text/texta.asm"
-
-SECTION "bank17",ROMX,BANK[$17]
-INCLUDE "text/textb.asm"
-
-SECTION "bank18",ROMX,BANK[$18]
-INCLUDE "text/textc.asm"
-
-SECTION "bank19",ROMX,BANK[$19]
-INCLUDE "text/textd.asm"
-
-SECTION "bank1A",ROMX,BANK[$1A]
-	emptybank
-
-SECTION "bank1B",ROMX,BANK[$1B]
-	emptybank
-
 SECTION "bank1C",ROMX,BANK[$1C]
 INCLUDE "engine/bank1c.asm"
 
diff --git a/text.asm b/text.asm
new file mode 100755
index 0000000..3bb3aee
--- /dev/null
+++ b/text.asm
@@ -0,0 +1,48 @@
+INCLUDE "constants.asm"
+INCLUDE "macros.asm"
+
+SECTION "bankD",ROMX,BANK[$D]
+INCLUDE "text/text_offsets.asm"
+INCLUDE "text/text1.asm"
+
+SECTION "bankE",ROMX,BANK[$E]
+INCLUDE "text/text2.asm"
+
+SECTION "bankF",ROMX,BANK[$F]
+INCLUDE "text/text3.asm"
+
+SECTION "bank10",ROMX,BANK[$10]
+INCLUDE "text/text4.asm"
+
+SECTION "bank11",ROMX,BANK[$11]
+INCLUDE "text/text5.asm"
+
+SECTION "bank12",ROMX,BANK[$12]
+INCLUDE "text/text6.asm"
+
+SECTION "bank13",ROMX,BANK[$13]
+INCLUDE "text/text7.asm"
+
+SECTION "bank14",ROMX,BANK[$14]
+INCLUDE "text/text8.asm"
+
+SECTION "bank15",ROMX,BANK[$15]
+INCLUDE "text/text9.asm"
+
+SECTION "bank16",ROMX,BANK[$16]
+INCLUDE "text/texta.asm"
+
+SECTION "bank17",ROMX,BANK[$17]
+INCLUDE "text/textb.asm"
+
+SECTION "bank18",ROMX,BANK[$18]
+INCLUDE "text/textc.asm"
+
+SECTION "bank19",ROMX,BANK[$19]
+INCLUDE "text/textd.asm"
+
+SECTION "bank1A",ROMX,BANK[$1A]
+	emptybank
+
+SECTION "bank1B",ROMX,BANK[$1B]
+	emptybank
diff --git a/text/text_offsets.asm b/text/text_offsets.asm
index 710bd4c..ca8b725 100755
--- a/text/text_offsets.asm
+++ b/text/text_offsets.asm
@@ -1,4 +1,4 @@
-TextOffsets: ; 34000 (d:4000)
+TextOffsets:: ; 34000 (d:4000)
 	db $00,$00,$00
 	text Text0001
 	text Text0002