diff --git a/Makefile b/Makefile index a61875e9..6c673590 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,13 @@ TEXTQUEUE := 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) diff --git a/main.asm b/main.asm index aad5c05a..1f0d663c 100644 --- a/main.asm +++ b/main.asm @@ -115622,5 +115622,3 @@ TechnicalMachinePrices: ; 7bfa7 (1e:7fa7) db $22, $52, $24, $34, $42 -INCLUDE "text.asm" - diff --git a/text.asm b/text.asm index f8af577f..7f159502 100644 --- 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 @@ -13,6 +15,9 @@ TEXT_11 EQU $2a POKEDEX_TEXT EQU $2b MOVE_NAMES EQU $2c +INCLUDE "macros.asm" + + SECTION "Text 1", ROMX, BANK[TEXT_1]