diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /charmap.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'charmap.asm')
| -rw-r--r-- | charmap.asm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/charmap.asm b/charmap.asm index e04091a88..d5bd2bcf1 100644 --- a/charmap.asm +++ b/charmap.asm @@ -2,9 +2,12 @@ ; Control characters (see home/text.asm) + charmap "<NULL>", $00 charmap "<PLAY_G>", $14 ; "<PLAYER>くん" or "<PLAYER>ちゃん"; same as "<PLAYER>" in English + charmap "<MOBILE>", $15 + charmap "<CR>", $16 charmap "¯", $1f ; soft linebreak - charmap "<LNBRK>", $22 + charmap "<LF>", $22 charmap "<POKE>", $24 ; "<PO><KE>" charmap "%", $25 ; soft linebreak in landmark names charmap "<RED>", $38 ; wRedsName |