From 3f2e5b7ade24cff77bff9aebe216d6aa466cdc9b Mon Sep 17 00:00:00 2001 From: Tauwasser Date: Sat, 2 Jun 2018 16:48:33 +0200 Subject: macros/text: use charmap entries instead of fixed byte constants Also introduce a separate text_end control for 0x50 when it's used to end a series of text_* control codes instead of a single text_TX command. Signed-off-by: Tauwasser --- macros/text.asm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'macros') diff --git a/macros/text.asm b/macros/text.asm index e98970b..f95c300 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -1,10 +1,12 @@ -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). +text EQUS "db $00," ; Start writing text. +next EQUS "db \"\"," ; Move a line down. +line EQUS "db \"\"," ; Start writing at the bottom line. +para EQUS "db \"\"," ; Start a new paragraph. +cont EQUS "db \"\"," ; Scroll to the next line. +done EQUS "db \"\"" ; End a text box. +prompt EQUS "db \"\"" ; Prompt the player to end a text box (initiating some other event). +text_end EQUS "db $50" ; End control code for text processor + ; different from @ ; TODO: determine if these are in ; Pokedex text commands are only used with pokered. @@ -67,7 +69,7 @@ deciram: macro endm enum TX_EXIT -interpret_data: macro +text_exit: macro db TX_EXIT endm @@ -77,7 +79,7 @@ sound_dex_fanfare_50_79: macro endm enum TX_DOTS -limited_interpret_data: macro +text_dots: macro db TX_DOTS db \1 endm -- cgit v1.2.3