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 ; "を " diff --git a/engine/routines/checknickerrors.asm b/engine/routines/checknickerrors.asm index 65efd7b94..70cc8d058 100644 --- a/engine/routines/checknickerrors.asm +++ b/engine/routines/checknickerrors.asm @@ -64,11 +64,11 @@ CheckNickErrors:: ; 669f ; table defining which characters are actually text commands ; format: ; ≥ < - db TX_START, TX_BOX + 1 - db "", $18 + 1 - db "", "%" + 1 - db "", "" + 1 - db "", "" + 1 - db "", "" + 1 - db "", "┘" + 1 + db TX_START, TX_BOX + 1 + db "", "" + 1 + db "", "" + 1 + db "", "" + 1 + db "", "" + 1 + db "", "" + 1 + db "", "┘" + 1 db -1 ; end diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 1b7b7084a..0b6ff3ac2 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -7085,7 +7085,7 @@ Function102fce: ; 102fce ; 102fdb String_102fdb: ; 102fdb - db "あいてがわ%せんたくに" + db "あいてがわせんたくに" next "いじょうあるようです!!" done ; 102ff5 diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 46122d5dc..f4a9c56c4 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -7318,7 +7318,7 @@ YessNoString_1179c5: ; 1179c5 ; 1179cc AskSavePasswordString: ; 1179cc - db "こ%パスワード¯ほぞんして" + db "こパスワード¯ほぞんして" line "おきますか?@" ; 1179e1 diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index cb5d3e1d1..a74e5029c 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -236,17 +236,17 @@ CheckStringForErrors_IgnoreTerminator: ; 17d0b3 cp "@" jr z, .next - cp $5 + cp "ガ" jr c, .end cp "" jr c, .next - cp $19 + cp "" + 1 jr c, .end - cp $1d + cp "" jr c, .next - cp "%" + 1 + cp "" + 1 jr c, .end - cp $35 + cp "" jr c, .next cp "" + 1 jr c, .end diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 56d645ddd..61474f956 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -124,7 +124,7 @@ String_0x4a004: ; 4a004 ; 4a026 String_0x4a026: ; 4a026 - db "あなた%じゅうしょや ねんれいの" + db "あなたじゅうしょや ねんれいの" next "せい¯かえられます@" ; 4a042 @@ -134,7 +134,7 @@ String_0x4a042: ; 4a042 ; 4a062 String_0x4a062: ; 4a062 - db "まえ%がめん もどります" + db "まえがめん もどります" next "@" ; 4a071 @@ -377,7 +377,7 @@ Strings_4a23d: ; 4a23d db "モバイルセンターせつぞくするとき" next "つかうパスワード¯ほぞんできます@" - db "まえ%がめん もどります@" + db "まえがめん もどります@" db "@" ; 4a28a @@ -797,14 +797,14 @@ String_4a5f2: ; 4a5f2 Strings_4a5f6: ; 4a5f6 db "めいし や ニュース のせる@" - db "あなた%あいさつです@" + db "あなたあいさつです@" db "モバイル たいせんはじまるとき@" db "あいてみえる あいさつです@" db "モバイル たいせんで かったとき@" db "あいてみえる あいさつです@" db "モバイル たいせんで まけたとき@" db "あいてみえる あいさつです@" - db "まえ%がめん もどります@" + db "まえがめん もどります@" db "@" ; 4a680