diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/charmap.asm | 4 | ||||
| -rw-r--r-- | macros/text.asm | 8 | ||||
| -rwxr-xr-x | macros/wram.asm | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/macros/charmap.asm b/macros/charmap.asm index 44592293..2f0b813b 100644 --- a/macros/charmap.asm +++ b/macros/charmap.asm @@ -12,6 +12,8 @@ charmap "<SHINY>", $3f charmap "<MOM>", $49 charmap "<PKMN>", $4a + charmap "<_CONT>", $4b ; implements "<CONT>" + charmap "<SCROLL>", $4c charmap "<NEXT>", $4e charmap "<LINE>", $4f @@ -21,7 +23,7 @@ charmap "<RIVAL>", $53 charmap "#", $54 charmap "<CONT>", $55 - charmap "<......>", $56 + charmap "<……>", $56 charmap "<DONE>", $57 charmap "<PROMPT>", $58 charmap "<TARGET>", $59 diff --git a/macros/text.asm b/macros/text.asm index bce2fdd2..8cda714a 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -13,7 +13,13 @@ dex EQUS "db $e8, $50" ; End a Pokedex entry. ; TX_RAM EQU $01 ; TX_FAR EQU $16 - enum_start 1 + enum_start + + enum TX_START +text_start: MACRO ; 00 + db TX_START +ENDM + enum TX_RAM text_from_ram: MACRO ; 01 db TX_RAM diff --git a/macros/wram.asm b/macros/wram.asm index 336ada43..97df2415 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -217,7 +217,6 @@ trademon: MACRO \1OTName:: ds NAME_LENGTH ; wc6f2 | wc724 \1DVs:: ds 2 ; wc6fd | wc72f \1ID:: ds 2 ; wc6ff | wc731 -\1CaughtData:: ds 1 ; wc701 | wc733 \1End:: ENDM |