summaryrefslogtreecommitdiff
path: root/charmap.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
committerdannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
commit7c01509b6b69b4dc33f5d739589d50f26ffd65b0 (patch)
tree89b4000a56c9e3d942666639c83416100f360f88 /charmap.asm
parent80bae03975a84dadf080c79f52216866dd410cf8 (diff)
parentfc474c8ee740acbe662b06db0d9cab8edc6680e9 (diff)
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'charmap.asm')
-rw-r--r--charmap.asm7
1 files changed, 7 insertions, 0 deletions
diff --git a/charmap.asm b/charmap.asm
index 52db1d9a..4b5278c6 100644
--- a/charmap.asm
+++ b/charmap.asm
@@ -147,9 +147,16 @@ charmap "ゅ", $E1
charmap "ょ", $E2
charmap "ー", $E3
+charmap "<pkmn>", $4A ; PkMn
charmap "@", $50
+charmap "<PLAYER>", $52
+charmap "<RIVAL>", $53
charmap "#", $54
;charmap "POKé", $54
+charmap "<TARGET>", $59
+charmap "<USER>", $5A
+charmap "′", $71
+charmap "″", $73
charmap "№", $74
charmap "…", $75