From 6c20ff9e200499f7c245653a9e5aa269649c8639 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 7 Jan 2018 13:11:29 -0500 Subject: Reorganize some macros * tileset data macros go atop their related files, like all the ones in data/ * charmaps are not macros --- charmap.asm | 372 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 372 insertions(+) create mode 100644 charmap.asm (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm new file mode 100644 index 000000000..fd2d371fd --- /dev/null +++ b/charmap.asm @@ -0,0 +1,372 @@ +; Control characters + charmap "", $00 + charmap "", $14 ; gendered PlayerName; same as "" in English + charmap "", $15 + charmap "¯", $1f ; soft linebreak + charmap "", $22 + charmap "", $23 ; "こうげき" + charmap "", $24 ; "" + charmap "%", $25 + charmap "", $38 ; RedsName + charmap "", $39 ; GreensName + charmap "", $3f + charmap "", $49 ; MomsName + charmap "", $4a ; "" + charmap "", $4e + charmap "", $4f + + charmap "@", $50 ; string terminator + charmap "", $51 + charmap "", $52 ; PlayerName + charmap "", $53 + charmap "#", $54 ; "POKé" + charmap "", $55 + charmap "<......>", $56 ; "……" + charmap "", $57 + charmap "", $58 + charmap "", $59 + charmap "", $5a + charmap "", $5b ; "PC" + charmap "", $5c ; "TM" + charmap "", $5d ; "TRAINER" + charmap "", $5e ; "ROCKET" + charmap "", $5f + +; Actual characters (from gfx/font/font_extra.png) + + charmap "", $60 ; unused + charmap "", $61 ; unused + charmap "", $62 ; unused + charmap "", $63 ; unused + charmap "", $64 ; unused + charmap "", $65 ; unused + charmap "", $66 ; unused + charmap "", $67 ; unused + charmap "", $68 ; unused + charmap "", $69 + charmap "", $6a + charmap "", $6b ; unused + charmap "", $6c ; unused + charmap "", $6d ; colon with tinier dots than ":" + charmap "ぃ", $6e ; hiragana small i, unused + charmap "ぅ", $6f ; hiragana small u, unused + charmap "", $70 + charmap "", $71 + charmap "<``>", $72 ; opening quote + charmap "<''>", $73 ; closing quote + charmap "·", $74 ; middle dot, unused + charmap "…", $75 ; ellipsis + charmap "ぁ", $76 ; hiragana small a, unused + charmap "ぇ", $77 ; hiragana small e, unused + charmap "ぉ", $78 ; hiragana small o, unused + + charmap "┌", $79 + charmap "─", $7a + charmap "┐", $7b + charmap "│", $7c + charmap "└", $7d + charmap "┘", $7e + charmap " ", $7f + +; Actual characters (from gfx/font/font_battle_extra.png) + + charmap "", $6e + + charmap "<ど>", $70 ; hiragana small do, unused + charmap "◀", $71 + charmap "『", $72 ; Japanese opening quote, unused + charmap "", $73 + charmap "№", $74 + +; Actual characters (from other graphics files) + + charmap "|", $31 ; from gfx/stats/stats_tiles + + charmap "", $3f ; gfx/stats/shiny + + charmap "", $60 ; from gfx/mobile/phone_tiles.2bpp + charmap "▲", $61 ; gfx/font/up_arrow.png + charmap "", $62 ; gfx/font/overworld_phone_icon.2bpp + charmap "_", $62 ; from gfx/battle/hp_exp_bar_border.1bpp + + charmap "′", $6e ; gfx/font/feet_inches.png + charmap "″", $6f ; gfx/font/feet_inches.png + +; Actual characters (from gfx/font/font.png) + + charmap "A", $80 + charmap "B", $81 + charmap "C", $82 + charmap "D", $83 + charmap "E", $84 + charmap "F", $85 + charmap "G", $86 + charmap "H", $87 + charmap "I", $88 + charmap "J", $89 + charmap "K", $8a + charmap "L", $8b + charmap "M", $8c + charmap "N", $8d + charmap "O", $8e + charmap "P", $8f + charmap "Q", $90 + charmap "R", $91 + charmap "S", $92 + charmap "T", $93 + charmap "U", $94 + charmap "V", $95 + charmap "W", $96 + charmap "X", $97 + charmap "Y", $98 + charmap "Z", $99 + + charmap "(", $9a + charmap ")", $9b + charmap ":", $9c + charmap ";", $9d + charmap "[", $9e + charmap "]", $9f + + charmap "a", $a0 + charmap "b", $a1 + charmap "c", $a2 + charmap "d", $a3 + charmap "e", $a4 + charmap "f", $a5 + charmap "g", $a6 + charmap "h", $a7 + charmap "i", $a8 + charmap "j", $a9 + charmap "k", $aa + charmap "l", $ab + charmap "m", $ac + charmap "n", $ad + charmap "o", $ae + charmap "p", $af + charmap "q", $b0 + charmap "r", $b1 + charmap "s", $b2 + charmap "t", $b3 + charmap "u", $b4 + charmap "v", $b5 + charmap "w", $b6 + charmap "x", $b7 + charmap "y", $b8 + charmap "z", $b9 + + charmap "Ä", $c0 + charmap "Ö", $c1 + charmap "Ü", $c2 + charmap "ä", $c3 + charmap "ö", $c4 + charmap "ü", $c5 + + charmap "'d", $d0 + charmap "'l", $d1 + charmap "'m", $d2 + charmap "'r", $d3 + charmap "'s", $d4 + charmap "'t", $d5 + charmap "'v", $d6 + + charmap "←", $df + charmap "'", $e0 + charmap "", $e1 + charmap "", $e2 + charmap "-", $e3 + + charmap "?", $e6 + charmap "!", $e7 + charmap ".", $e8 + charmap "&", $e9 + + charmap "é", $ea + charmap "→", $eb + charmap "▷", $ec + charmap "▶", $ed + charmap "▼", $ee + charmap "♂", $ef + charmap "¥", $f0 + charmap "×", $f1 + charmap "", $f2 ; same as "." in English + charmap "/", $f3 + charmap ",", $f4 + charmap "♀", $f5 + + charmap "0", $f6 + charmap "1", $f7 + charmap "2", $f8 + charmap "3", $f9 + charmap "4", $fa + charmap "5", $fb + charmap "6", $fc + charmap "7", $fd + charmap "8", $fe + charmap "9", $ff + +; Japanese kana, for those bits of text that were not translated to English + + charmap "ガ", $5 + charmap "ギ", $6 + charmap "グ", $7 + charmap "ゲ", $8 + charmap "ゴ", $9 + charmap "ザ", $a + charmap "ジ", $b + charmap "ズ", $c + charmap "ゼ", $d + charmap "ゾ", $e + charmap "ダ", $f + charmap "ヂ", $10 + charmap "ヅ", $11 + charmap "デ", $12 + charmap "ド", $13 + + charmap "バ", $19 + charmap "ビ", $1a + charmap "ブ", $1b + charmap "ボ", $1c +; charmap "ベ", $1d + + charmap "が", $26 + charmap "ぎ", $27 + charmap "ぐ", $28 + charmap "げ", $29 + charmap "ご", $2a + charmap "ざ", $2b + charmap "じ", $2c + charmap "ず", $2d + charmap "ぜ", $2e + charmap "ぞ", $2f + charmap "だ", $30 + charmap "ぢ", $31 + charmap "づ", $32 + charmap "で", $33 + charmap "ど", $34 + + charmap "ば", $3a + charmap "び", $3b + charmap "ぶ", $3c + charmap "べ", $3d + charmap "ぼ", $3e + + charmap "パ", $40 + charmap "ピ", $41 + charmap "プ", $42 + charmap "ポ", $43 + charmap "ぱ", $44 + charmap "ぴ", $45 + charmap "ぷ", $46 + charmap "ぺ", $47 + charmap "ぽ", $48 + + charmap "ア", $80 + charmap "イ", $81 + charmap "ウ", $82 + charmap "エ", $83 + charmap "ォ", $84 + charmap "カ", $85 + charmap "キ", $86 + charmap "ク", $87 + charmap "ケ", $88 + charmap "コ", $89 + charmap "サ", $8a + charmap "シ", $8b + charmap "ス", $8c + charmap "セ", $8d + charmap "ソ", $8e + charmap "タ", $8f + charmap "チ", $90 + charmap "ツ", $91 + charmap "テ", $92 + charmap "ト", $93 + charmap "ナ", $94 + charmap "ニ", $95 + charmap "ヌ", $96 + charmap "ネ", $97 + charmap "ノ", $98 + charmap "ハ", $99 + charmap "ヒ", $9a + charmap "フ", $9b + charmap "ホ", $9c + charmap "マ", $9d + charmap "ミ", $9e + charmap "ム", $9f + charmap "メ", $a0 + charmap "モ", $a1 + charmap "ヤ", $a2 + charmap "ユ", $a3 + charmap "ヨ", $a4 + charmap "ラ", $a5 + charmap "ル", $a6 + charmap "レ", $a7 + charmap "ロ", $a8 + charmap "ワ", $a9 + charmap "ヲ", $aa + charmap "ン", $ab + charmap "ッ", $ac + charmap "ャ", $ad + charmap "ュ", $ae + charmap "ョ", $af + charmap "ィ", $b0 + + charmap "あ", $b1 + charmap "い", $b2 + charmap "う", $b3 + charmap "え", $b4 + charmap "お", $b5 + + charmap "か", $b6 + charmap "き", $b7 + charmap "く", $b8 + charmap "け", $b9 + charmap "こ", $ba + charmap "さ", $bb + charmap "し", $bc + charmap "す", $bd + charmap "せ", $be + charmap "そ", $bf + charmap "た", $c0 + charmap "ち", $c1 + charmap "つ", $c2 + charmap "て", $c3 + charmap "と", $c4 + charmap "な", $c5 + charmap "に", $c6 + charmap "ぬ", $c7 + charmap "ね", $c8 + charmap "の", $c9 + charmap "は", $ca + charmap "ひ", $cb + charmap "ふ", $cc + charmap "へ", $cd + charmap "ほ", $ce + + charmap "ま", $cf + charmap "み", $d0 + charmap "む", $d1 + charmap "め", $d2 + charmap "も", $d3 + charmap "や", $d4 + charmap "ゆ", $d5 + charmap "よ", $d6 + charmap "ら", $d7 + charmap "り", $d8 + charmap "る", $d9 + charmap "れ", $da + charmap "ろ", $db + charmap "わ", $dc + charmap "を", $dd + charmap "ん", $de + charmap "っ", $df + charmap "ゃ", $e0 + charmap "ゅ", $e1 + charmap "ょ", $e2 + + charmap "ー", $e3 + + charmap "ﾟ", $e4 + charmap "ﾞ", $e5 + + charmap "ァ", $e9 -- cgit v1.2.3 From 163f3e0c3f56831b5255b31045798ac950098faa Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 22:16:17 -0500 Subject: Local UI tiles don't belong in charmap Separate 1bpp font tiles from gfx/mobile/phone_tiles.png --- charmap.asm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index fd2d371fd..8cdff71e9 100644 --- a/charmap.asm +++ b/charmap.asm @@ -80,15 +80,12 @@ ; Actual characters (from other graphics files) - charmap "|", $31 ; from gfx/stats/stats_tiles - - charmap "", $3f ; gfx/stats/shiny - - charmap "", $60 ; from gfx/mobile/phone_tiles.2bpp + ; needed for _LoadFontsExtra1 (see gfx/font.asm) + charmap "", $60 ; gfx/font/black_arrow.2bpp charmap "▲", $61 ; gfx/font/up_arrow.png - charmap "", $62 ; gfx/font/overworld_phone_icon.2bpp - charmap "_", $62 ; from gfx/battle/hp_exp_bar_border.1bpp + charmap "", $62 ; gfx/font/phone_icon.2bpp + ; needed for Special_MagikarpHouseSign (see engine/events/magikarp.asm) charmap "′", $6e ; gfx/font/feet_inches.png charmap "″", $6f ; gfx/font/feet_inches.png -- cgit v1.2.3 From 0197e6f23c0db6baf11aa1e610521f78b6352605 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 13 Jan 2018 15:22:16 -0500 Subject: Don't split stats gfx in three --- charmap.asm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index 8cdff71e9..3b15daf46 100644 --- a/charmap.asm +++ b/charmap.asm @@ -89,6 +89,9 @@ charmap "′", $6e ; gfx/font/feet_inches.png charmap "″", $6f ; gfx/font/feet_inches.png + ; needed for StatsScreen_PlaceShinyIcon and PrintPartyMonPage1 + charmap "", $3f ; gfx/stats/stats_tiles.png, tile 14 + ; Actual characters (from gfx/font/font.png) charmap "A", $80 -- cgit v1.2.3 From 9180362211cf465c52798124baa5c5c06ba1d332 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 15 Jan 2018 11:06:17 -0500 Subject: Move code out of gfx/ (close #474) --- charmap.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index 3b15daf46..f01eafe94 100644 --- a/charmap.asm +++ b/charmap.asm @@ -80,7 +80,7 @@ ; Actual characters (from other graphics files) - ; needed for _LoadFontsExtra1 (see gfx/font.asm) + ; needed for _LoadFontsExtra1 (see engine/load_font.asm) charmap "", $60 ; gfx/font/black_arrow.2bpp charmap "▲", $61 ; gfx/font/up_arrow.png charmap "", $62 ; gfx/font/phone_icon.2bpp -- cgit v1.2.3 From 2acaa96cf16ce953a7149f300d54e5440abc27d8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 18:34:20 -0500 Subject: More charmap and home/text.asm documentation for JP chars --- charmap.asm | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index f01eafe94..2596b6705 100644 --- a/charmap.asm +++ b/charmap.asm @@ -1,20 +1,21 @@ -; Control characters - charmap "", $00 - charmap "", $14 ; gendered PlayerName; same as "" in English - charmap "", $15 +; $00-$16 are TX_* constants (see macros/scripts/text.asm) + +; Control characters (see home/text.asm) + + charmap "", $14 ; "くん" or "ちゃん"; same as "" in English charmap "¯", $1f ; soft linebreak charmap "", $22 - charmap "", $23 ; "こうげき" charmap "", $24 ; "" charmap "%", $25 charmap "", $38 ; RedsName charmap "", $39 ; GreensName - charmap "", $3f charmap "", $49 ; MomsName + charmap "", $3f charmap "", $4a ; "" + charmap "", $4b ; implements "" + charmap "", $4c ; unused charmap "", $4e charmap "", $4f - charmap "@", $50 ; string terminator charmap "", $51 charmap "", $52 ; PlayerName @@ -207,17 +208,29 @@ ; Japanese kana, for those bits of text that were not translated to English - charmap "ガ", $5 - charmap "ギ", $6 - charmap "グ", $7 - charmap "ゲ", $8 - charmap "ゴ", $9 - charmap "ザ", $a - charmap "ジ", $b - charmap "ズ", $c - charmap "ゼ", $d - charmap "ゾ", $e - charmap "ダ", $f + charmap "", $1d ; "に " + charmap "", $1e ; "って" + charmap "", $1e ; "を " + charmap "", $22 ; "た！" + charmap "", $23 ; "こうげき" + charmap "", $24 ; "は　" + charmap "", $25 ; "の　" + charmap "", $35 ; "ばん　どうろ" + charmap "", $36 ; "わたし" + charmap "", $37 ; "ここは" + charmap "", $4a ; "が " + + charmap "ガ", $05 + charmap "ギ", $06 + charmap "グ", $07 + charmap "ゲ", $08 + charmap "ゴ", $09 + charmap "ザ", $0a + charmap "ジ", $0b + charmap "ズ", $0c + charmap "ゼ", $0d + charmap "ゾ", $0e + charmap "ダ", $0f charmap "ヂ", $10 charmap "ヅ", $11 charmap "デ", $12 @@ -227,7 +240,6 @@ charmap "ビ", $1a charmap "ブ", $1b charmap "ボ", $1c -; charmap "ベ", $1d charmap "が", $26 charmap "ぎ", $27 -- cgit v1.2.3 From a3beba1e64bcdd71ade4595b37b033e74d87a78c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 20:40:32 -0500 Subject: Use Japanese charmap definitions in strings --- charmap.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index 2596b6705..d7742d4af 100644 --- a/charmap.asm +++ b/charmap.asm @@ -12,8 +12,8 @@ charmap "", $49 ; MomsName charmap "", $3f charmap "", $4a ; "" - charmap "", $4b ; implements "" - charmap "", $4c ; unused + charmap "<_CONT>", $4b ; implements "" + charmap "", $4c charmap "", $4e charmap "", $4f charmap "@", $50 ; string terminator @@ -210,7 +210,7 @@ charmap "", $1d ; "に " charmap "", $1e ; "って" - charmap "", $1e ; "を " + charmap "", $1f ; "を " charmap "", $22 ; "た！" charmap "", $23 ; "こうげき" charmap "", $24 ; "は　" -- cgit v1.2.3 From 747c9059d4912c275d3e1e708c026b1fe61e3b42 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 20:51:38 -0500 Subject: Two comments --- charmap.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index d7742d4af..152175c0c 100644 --- a/charmap.asm +++ b/charmap.asm @@ -206,7 +206,7 @@ charmap "8", $fe charmap "9", $ff -; Japanese kana, for those bits of text that were not translated to English +; Japanese control characters (see home/text.asm) charmap "", $1d ; "に " charmap "", $1e ; "って" @@ -220,6 +220,8 @@ charmap "", $37 ; "ここは" charmap "", $4a ; "が " +; Japanese kana, for those bits of text that were not translated to English + charmap "ガ", $05 charmap "ギ", $06 charmap "グ", $07 -- cgit v1.2.3 From 17336221e62e36e31069785622c69cf9e3582b7e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 21:15:59 -0500 Subject: newline before para --- charmap.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index 152175c0c..a1bf7a193 100644 --- a/charmap.asm +++ b/charmap.asm @@ -190,7 +190,7 @@ charmap "♂", $ef charmap "¥", $f0 charmap "×", $f1 - charmap "", $f2 ; same as "." in English + charmap "", $f2 ; decimal point; same as "." in English charmap "/", $f3 charmap ",", $f4 charmap "♀", $f5 -- cgit v1.2.3 From 105ef872dd87e3eb0aa73feacac5f1a9f8481973 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 22:06:51 -0500 Subject: Better TX_SOUND_* names --- charmap.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index a1bf7a193..7ba236867 100644 --- a/charmap.asm +++ b/charmap.asm @@ -9,8 +9,8 @@ charmap "%", $25 charmap "", $38 ; RedsName charmap "", $39 ; GreensName - charmap "", $49 ; MomsName charmap "", $3f + charmap "", $49 ; MomsName charmap "", $4a ; "" charmap "<_CONT>", $4b ; implements "" charmap "", $4c @@ -29,7 +29,7 @@ charmap "", $5a charmap "", $5b ; "PC" charmap "", $5c ; "TM" - charmap "", $5d ; "TRAINER" + charmap "", $5d ; "TRAINER" charmap "", $5e ; "ROCKET" charmap "", $5f -- cgit v1.2.3 From 2c7ca13194be53a6e4707c7bdcfe83d80e35515f Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 22:30:30 -0500 Subject: Disambiguate "%" and "" --- charmap.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index 7ba236867..cff91542a 100644 --- a/charmap.asm +++ b/charmap.asm @@ -6,7 +6,7 @@ charmap "¯", $1f ; soft linebreak charmap "", $22 charmap "", $24 ; "" - charmap "%", $25 + charmap "%", $25 ; soft linebreak in landmark names charmap "", $38 ; RedsName charmap "", $39 ; GreensName charmap "", $3f @@ -208,6 +208,7 @@ ; Japanese control characters (see home/text.asm) + charmap "", $18 ; "ノ゛"? (ungrammatical) charmap "", $1d ; "に " charmap "", $1e ; "って" charmap "", $1f ; "を " -- cgit v1.2.3 From e69544b61f5014b77852567efc3b78bc56982a20 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 02:30:19 -0500 Subject: More Unicode --- charmap.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index cff91542a..147ded561 100644 --- a/charmap.asm +++ b/charmap.asm @@ -19,10 +19,10 @@ charmap "@", $50 ; string terminator charmap "", $51 charmap "", $52 ; PlayerName - charmap "", $53 + charmap "", $53 ; RivalName charmap "#", $54 ; "POKé" charmap "", $55 - charmap "<......>", $56 ; "……" + charmap "<……>", $56 ; "……" charmap "", $57 charmap "", $58 charmap "", $59 @@ -53,8 +53,8 @@ charmap "ぅ", $6f ; hiragana small u, unused charmap "", $70 charmap "", $71 - charmap "<``>", $72 ; opening quote - charmap "<''>", $73 ; closing quote + charmap "“", $72 ; opening quote + charmap "”", $73 ; closing quote charmap "·", $74 ; middle dot, unused charmap "…", $75 ; ellipsis charmap "ぁ", $76 ; hiragana small a, unused @@ -82,16 +82,16 @@ ; Actual characters (from other graphics files) ; needed for _LoadFontsExtra1 (see engine/load_font.asm) - charmap "", $60 ; gfx/font/black_arrow.2bpp + charmap "■", $60 ; gfx/font/black.2bpp charmap "▲", $61 ; gfx/font/up_arrow.png - charmap "", $62 ; gfx/font/phone_icon.2bpp + charmap "☎", $62 ; gfx/font/phone_icon.2bpp ; needed for Special_MagikarpHouseSign (see engine/events/magikarp.asm) charmap "′", $6e ; gfx/font/feet_inches.png charmap "″", $6f ; gfx/font/feet_inches.png ; needed for StatsScreen_PlaceShinyIcon and PrintPartyMonPage1 - charmap "", $3f ; gfx/stats/stats_tiles.png, tile 14 + charmap "⁂", $3f ; gfx/stats/stats_tiles.png, tile 14 ; Actual characters (from gfx/font/font.png) -- cgit v1.2.3 From ddec0ee305f25bc9941e19e16c79f499c5e95c23 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 20:48:33 -0500 Subject: More Japanese characters --- charmap.asm | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index 147ded561..9c3ea88ba 100644 --- a/charmap.asm +++ b/charmap.asm @@ -73,7 +73,7 @@ charmap "", $6e - charmap "<ど>", $70 ; hiragana small do, unused + charmap "", $70 ; hiragana small do, unused charmap "◀", $71 charmap "『", $72 ; Japanese opening quote, unused charmap "", $73 @@ -208,7 +208,7 @@ ; Japanese control characters (see home/text.asm) - charmap "", $18 ; "ノ゛"? (ungrammatical) + charmap "", $18 ; "ノ゛"? (ungrammatical) charmap "", $1d ; "に " charmap "", $1e ; "って" charmap "", $1f ; "を " @@ -276,11 +276,18 @@ charmap "ぺ", $47 charmap "ぽ", $48 + charmap "「", $70 + charmap "」", $71 + charmap "』", $73 + charmap "⋯", $75 + + charmap "　", $7f + charmap "ア", $80 charmap "イ", $81 charmap "ウ", $82 charmap "エ", $83 - charmap "ォ", $84 + charmap "オ", $84 charmap "カ", $85 charmap "キ", $86 charmap "ク", $87 @@ -331,7 +338,6 @@ charmap "う", $b3 charmap "え", $b4 charmap "お", $b5 - charmap "か", $b6 charmap "き", $b7 charmap "く", $b8 @@ -357,7 +363,6 @@ charmap "ふ", $cc charmap "へ", $cd charmap "ほ", $ce - charmap "ま", $cf charmap "み", $d0 charmap "む", $d1 @@ -380,8 +385,31 @@ charmap "ょ", $e2 charmap "ー", $e3 - charmap "ﾟ", $e4 charmap "ﾞ", $e5 + charmap "？", $e6 + charmap "！", $e7 + charmap "。", $e8 + charmap "ァ", $e9 + charmap "ゥ", $ea + charmap "ェ", $eb + + charmap "円", $f0 + + charmap "．", $f2 + charmap "／", $f3 + + charmap "ォ", $f4 + + charmap "０", $f6 + charmap "１", $f7 + charmap "２", $f8 + charmap "３", $f9 + charmap "４", $fa + charmap "５", $fb + charmap "６", $fc + charmap "７", $fd + charmap "８", $fe + charmap "９", $ff -- cgit v1.2.3 From b071dd364f715165d6eec99ebbd1e4aed4b84bde Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 21:49:16 -0500 Subject: =?UTF-8?q?Japanese=20characters=20in=20Japanese=20text=20(e.g.=20?= =?UTF-8?q?"=E3=82=A9"=20not=20","=20for=20$f4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- charmap.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'charmap.asm') diff --git a/charmap.asm b/charmap.asm index 9c3ea88ba..283508416 100644 --- a/charmap.asm +++ b/charmap.asm @@ -209,9 +209,9 @@ ; Japanese control characters (see home/text.asm) charmap "", $18 ; "ノ゛"? (ungrammatical) - charmap "", $1d ; "に " + charmap "", $1d ; "に　" charmap "", $1e ; "って" - charmap "", $1f ; "を " + charmap "", $1f ; "を　" charmap "", $22 ; "た！" charmap "", $23 ; "こうげき" charmap "", $24 ; "は　" @@ -219,7 +219,7 @@ charmap "", $35 ; "ばん　どうろ" charmap "", $36 ; "わたし" charmap "", $37 ; "ここは" - charmap "", $4a ; "が " + charmap "", $4a ; "が　" ; Japanese kana, for those bits of text that were not translated to English -- cgit v1.2.3