diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-02-27 13:07:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-27 13:07:17 -0500 |
| commit | b460637b812f9829b69203f32e9a4f42a43070b6 (patch) | |
| tree | e5ee8278afa41419cf1b909dd997a48ef6801517 /macros/scripts | |
| parent | Fix hardcoded address in Blue VC patch (diff) | |
| download | pokeyellow-b460637b812f9829b69203f32e9a4f42a43070b6.tar.gz pokeyellow-b460637b812f9829b69203f32e9a4f42a43070b6.tar.xz pokeyellow-b460637b812f9829b69203f32e9a4f42a43070b6.zip | |
Avoid using `EQUS` when `EQU` or `MACRO` will do (#496)
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/maps.asm | 12 | ||||
| -rw-r--r-- | macros/scripts/text.asm | 43 |
2 files changed, 43 insertions, 12 deletions
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index b5799e64..2837d0c0 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -225,8 +225,14 @@ MACRO connection dw wOverworldMap + _win ENDM -DEF def_script_pointers EQUS "const_def" +MACRO def_script_pointers + const_def +ENDM -DEF def_text_pointers EQUS "const_def 1" +MACRO def_text_pointers + const_def 1 +ENDM -DEF object_const_def EQUS "const_def 1" +MACRO object_const_def + const_def 1 +ENDM diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index 418e839c..a848f587 100644 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -1,13 +1,38 @@ -DEF text EQUS "db TX_START," ; Start writing text. -DEF next EQUS "db \"<NEXT>\"," ; Move a line down. -DEF line EQUS "db \"<LINE>\"," ; Start writing at the bottom line. -DEF para EQUS "db \"<PARA>\"," ; Start a new paragraph. -DEF cont EQUS "db \"<CONT>\"," ; Scroll to the next line. -DEF done EQUS "db \"<DONE>\"" ; End a text box. -DEF prompt EQUS "db \"<PROMPT>\"" ; Prompt the player to end a text box (initiating some other event). +MACRO text + db TX_START, \# ; Start writing text +ENDM + +MACRO next + db "<NEXT>", \# ; Move a line down +ENDM + +MACRO line + db "<LINE>", \# ; Start writing at the bottom line +ENDM + +MACRO para + db "<PARA>", \# ; Start a new paragraph +ENDM + +MACRO cont + db "<CONT>", \# ; Scroll to the next line +ENDM + +MACRO done + db "<DONE>" ; End a text box +ENDM + +MACRO prompt + db "<PROMPT>" ; Prompt the player to end a text box (initiating some other event) +ENDM + +MACRO page + db "<PAGE>", \# ; Start a new Pokédex page +ENDM -DEF page EQUS "db \"<PAGE>\"," ; Start a new Pokédex page. -DEF dex EQUS "db \"<DEXEND>\", \"@\"" ; End a Pokédex entry. +MACRO dex + db "<DEXEND>@" ; End a Pokédex entry +ENDM ; TextCommandJumpTable indexes (see home/text.asm) |