summaryrefslogtreecommitdiff
path: root/charmap.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-07-19 00:46:59 -0400
committerGitHub <noreply@github.com>2018-07-19 00:46:59 -0400
commit2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (patch)
treed2ac10a6cc7f70e839f393706e1a3261cf95c2ae /charmap.asm
parent3e14c1f26e91b1fc1d18eed389518ae8454e938f (diff)
parent1cb364cc1825d1b149eb4e0fe09d1cab21006208 (diff)
Merge pull request #542 from mid-kid/master
Miscellaneous fixes
Diffstat (limited to 'charmap.asm')
-rw-r--r--charmap.asm5
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