From 8a79315635ee9ebb6eed5c9648fe89746085d0b1 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 6 Jul 2020 12:28:31 -0400 Subject: Capitalize rgbds control structures (EQU/EQUS, IF/ELIF/ELSE/ENDC, REPT/ENDR, MACRO/ENDM, etc) --- macros/scripts/text.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'macros/scripts/text.asm') diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index b1e1727b..4bf2c1bc 100755 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -198,10 +198,10 @@ ENDM script_mart: MACRO db TX_SCRIPT_MART db _NARG ; number of items -rept _NARG +REPT _NARG db \1 ; item id shift -endr +ENDR db -1 ; end ENDM -- cgit v1.2.3 From 9c2be80bf3fbdac6505787b00da0f4ff71839a05 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 6 Jul 2020 12:39:29 -0400 Subject: text_linkpromptbutton -> text_waitbutton Fixes #260 --- macros/scripts/text.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'macros/scripts/text.asm') diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index 4bf2c1bc..efecdd1c 100755 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -92,9 +92,9 @@ text_dots: MACRO db \1 ; number of ellipses to draw ENDM - enum TX_LINK_PROMPT_BUTTON ; $0d -text_linkpromptbutton: MACRO - db TX_LINK_PROMPT_BUTTON + enum TX_WAIT_BUTTON ; $0d +text_waitbutton: MACRO + db TX_WAIT_BUTTON ENDM enum TX_SOUND_POKEDEX_RATING ; $0e -- cgit v1.2.3