diff options
| author | dannye <33dannye@gmail.com> | 2025-05-10 12:25:27 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-05-10 12:25:27 -0500 |
| commit | 2c74f137fc42cf7eaffa0a6f9046e4aa89887f91 (patch) | |
| tree | c52fc10a17597a1d04b63b79c6df78cc1b00de41 /macros/scripts | |
| parent | Fix hardcoded address in VC patch (diff) | |
| parent | Use features new to RGBDS 0.9.2 (#506) (diff) | |
| download | pokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.tar.gz pokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.tar.xz pokeyellow-2c74f137fc42cf7eaffa0a6f9046e4aa89887f91.zip | |
Merge branch 'master' of https://github.com/pret/pokered
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 aad42452..7de333a3 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) |