Merge branch 'master' of https://github.com/iimarckus/pokered

Conflicts:
	main.asm

1 files changed, 12 insertions, 0 deletions

diff --git a/macros.asm b/macros.asm
index be1879b7..90fafdbe 100644
--- a/macros.asm
+++ b/macros.asm
@@ -1,4 +1,16 @@
 
+text   EQUS "db $00," ; Start writing text.
+next   EQUS "db $4e," ; Move a line down.
+line   EQUS "db $4f," ; Start writing at the bottom line.
+para   EQUS "db $51," ; Start a new paragraph.
+cont   EQUS "db $55," ; Scroll to the next line.
+done   EQUS "db $57"  ; End a text box.
+prompt EQUS "db $58"  ; Prompt the player to end a text box (initiating some other event).
+
+page   EQUS "db $49,"     ; Start a new Pokedex page.
+dex    EQUS "db $5f, $50" ; End a Pokedex entry.
+
+
 ;\1 = X
 ;\2 = Y
 FuncCoord: MACRO