Put back JP chars deleted along with English ones

2 files changed, 33 insertions, 25 deletions

diff --git a/charmap.asm b/charmap.asm
index eef4f64..fa5d8ba 100644
--- a/charmap.asm
+++ b/charmap.asm
@@ -3,19 +3,30 @@
 ; Control characters (see home/text.asm)
 
 	charmap "<PLAY_G>",  $14 ; "<PLAYER>くん" or "<PLAYER>ちゃん"; same as "<PLAYER>" in English
-	charmap "¯",         $1f ; soft linebreak
-	charmap "<LNBRK>",   $22
-	charmap "<POKE>",    $24 ; "<PO><KE>"
-	charmap "%",         $25 ; soft linebreak in landmark names
+	charmap "<JP_18>",   $18 ; "ノ゛"? (ungrammatical)
+	charmap "<NI>",      $1d ; "に　"
+	charmap "<TTE>",     $1e ; "って"
+	charmap "<WO>",      $1f ; "を　"
+
+	charmap "<TA!>",     $22 ; "た！"
+	charmap "<KOUGEKI>", $23 ; "こうげき"
+	charmap "<WA>",      $24 ; "は　"
+	charmap "<NO>",      $25 ; "の　"
+
+	charmap "<ROUTE>",   $35 ; "ばん　どうろ"
+	charmap "<WATASHI>", $36 ; "わたし"
+	charmap "<KOKO_WA>", $37 ; "ここは"
 	charmap "<RED>",     $38 ; wRedsName
 	charmap "<GREEN>",   $39 ; wGreensName
 	charmap "<ENEMY>",   $3f
+
 	charmap "<MOM>",     $49 ; wMomsName
-	charmap "<PKMN>",    $4a ; "<PK><MN>"
+	charmap "<GA>",      $4a ; "が　"
 	charmap "<_CONT>",   $4b ; implements "<CONT>"
 	charmap "<SCROLL>",  $4c
 	charmap "<NEXT>",    $4e
 	charmap "<LINE>",    $4f
+
 	charmap "@",         $50 ; string terminator
 	charmap "<PARA>",    $51
 	charmap "<PLAYER>",  $52 ; wPlayerName
@@ -40,21 +51,6 @@
 	charmap "▲",         $61 ; gfx/font/up_arrow.png
 	charmap "☎",         $62 ; gfx/font/phone_icon.2bpp
 
-; Japanese control characters (see home/text.asm)
-
-	charmap "<JP_18>",   $18 ; "ノ゛"? (ungrammatical)
-	charmap "<NI>",      $1d ; "に　"
-	charmap "<TTE>",     $1e ; "って"
-	charmap "<WO>",      $1f ; "を　"
-	charmap "<TA!>",     $22 ; "た！"
-	charmap "<KOUGEKI>", $23 ; "こうげき"
-	charmap "<WA>",      $24 ; "は　"
-	charmap "<NO>",      $25 ; "の　"
-	charmap "<ROUTE>",   $35 ; "ばん　どうろ"
-	charmap "<WATASHI>", $36 ; "わたし"
-	charmap "<KOKO_WA>", $37 ; "ここは"
-	charmap "<GA>",      $4a ; "が　"
-
 ; Japanese kana
 
 	charmap "ガ", $05
@@ -112,10 +108,22 @@
 
 	charmap "「", $70
 	charmap "」", $71
+	charmap "『", $72
 	charmap "』", $73
+	charmap "·", $74
 	charmap "⋯", $75
 
-	charmap "　", $7f
+	charmap "ぁ", $76
+	charmap "ぇ", $77
+	charmap "ぉ", $78
+
+	charmap "┌", $79
+	charmap "─", $7a
+	charmap "┐", $7b
+	charmap "│", $7c
+	charmap "└", $7d
+	charmap "┘", $7e
+	charmap " ", $7f
 
 	charmap "ア", $80
 	charmap "イ", $81
diff --git a/tools/dump_text.py b/tools/dump_text.py
index 9ba6687..721d953 100644
--- a/tools/dump_text.py
+++ b/tools/dump_text.py
@@ -5,13 +5,13 @@ from sys import argv, stdout
 
 char_table = [
 	"?", "イ゛", "ヴ", "エ゛", "オ゛", "ガ", "ギ", "グ", "ゲ", "ゴ", "ザ", "ジ", "ズ", "ゼ", "ゾ", "ダ",
-	"ヂ", "ヅ", "デ", "ド", "<PLAY_G>", "<0x15>", "<0x16>", "ネ゛", "ノ゛", "バ", "ビ", "ブ", "ボ", "<NI>", "<TTE>", "¯",
-	"ィ゛", "あ゛", "<LNBRK>", "<KOUGEKI>", "<POKE>", "%", "が", "ぎ", "ぐ", "げ", "ご", "ざ", "じ", "ず", "ぜ", "ぞ",
+	"ヂ", "ヅ", "デ", "ド", "<PLAY_G>", "<0x15>", "<0x16>", "ネ゛", "<JP_18>", "バ", "ビ", "ブ", "ボ", "<NI>", "<TTE>", "<WO>",
+	"ィ゛", "あ゛", "<TA!>", "<KOUGEKI>", "<WA>", "<NO>", "が", "ぎ", "ぐ", "げ", "ご", "ざ", "じ", "ず", "ぜ", "ぞ",
 	"だ", "ぢ", "づ", "で", "ど", "<ROUTE>", "<WATASHI>", "<KOKO_WA>", "<RED>", "<GREEN>", "ば", "び", "ぶ", "べ", "ぼ", "<ENEMY>",
-	"パ", "ピ", "プ", "ポ", "ぱ", "ぴ", "ぷ", "ぺ", "ぽ", "<MOM>", "<PKMN>", "<_CONT>", "<SCROLL>", "も゜", "<NEXT>", "<LINE>",
+	"パ", "ピ", "プ", "ポ", "ぱ", "ぴ", "ぷ", "ぺ", "ぽ", "<MOM>", "<GA>", "<_CONT>", "<SCROLL>", "も゜", "<NEXT>", "<LINE>",
 	"@", "<PARA>", "<PLAYER>", "<RIVAL>", "#", "<CONT>", "<……>", "<DONE>", "<PROMPT>", "<TARGET>", "<USER>", "<PC>", "<TM>", "<TRAINER>", "<ROCKET>", "<DEXEND>",
 	"■", "▲", "☎", "D", "E", "F", "G", "H", "I", "V", "S", "L", "M", ":", "ぃ", "ぅ",
-	"「", "」", "『", "』", "・", "<・・・>", "ぁ", "ぇ", "ぉ", "<border top-left>", "<border horiz>", "<border top-right>", "<border vert>", "<border bottom-left>", "<border bottom-right>", " ",
+	"「", "」", "『", "』", "・", "<・・・>", "ぁ", "ぇ", "ぉ", "┌", "─", "┐", "│", "└", "┘", " ",
 	"ア", "イ", "ウ", "エ", "オ", "カ", "キ", "ク", "ケ", "コ", "サ", "シ", "ス", "セ", "ソ", "タ",
 	"チ", "ツ", "テ", "ト", "ナ", "ニ", "ヌ", "ネ", "ノ", "ハ", "ヒ", "フ", "ホ", "マ", "ミ", "ム",
 	"メ", "モ", "ヤ", "ユ", "ヨ", "ラ", "ル", "レ", "ロ", "ワ", "ヲ", "ン", "ッ", "ャ", "ュ", "ョ",