Consistently use Japanese control codes for Japanese strings (#1222)

constants/charmap.asm

@@ -76,7 +76,7 @@
 
 	charmap "<LV>",      $6e
 
-	charmap "<DO>",      $70 ; hiragana small do, unused
+	charmap "<DO>",      $70 ; precomposed hiragana do (ど), unused
 	charmap "◀",         $71
 	charmap "『",         $72 ; Japanese opening quote, unused
 	charmap "<ID>",      $73
@@ -223,6 +223,7 @@
 	charmap "<WATASHI>", $36 ; "わたし"
 	charmap "<KOKO_WA>", $37 ; "ここは"
 	charmap "<GA>",      $4a ; "が　"
+	charmap "<POKEMON>", $54 ; "ポケモン"
 
 ; Japanese kana, for those bits of text that were not translated to English
 

data/credits_strings.asm

@@ -187,7 +187,7 @@ CreditsStringsPointers:
 .CoDirector:          db "    CO-DIRECTOR@"           ; "ディレクター@"
 .Programmers:         db "    PROGRAMMERS@"           ; "プログラム@"
 .GraphicsDirector:    db " GRAPHICS DIRECTOR@"        ; "グラフィック　ディレクター@"
-.MonsterDesign:       db "   MONSTER DESIGN@"         ; "#　デザイン@"
+.MonsterDesign:       db "   MONSTER DESIGN@"         ; "<POKEMON>　デザイン@"
 .GraphicsDesign:      db "  GRAPHICS DESIGN@"         ; "グラフィック　デザイン@"
 .Music:               db "       MUSIC@"              ; "おんがく@"
 .SoundEffects:        db "   SOUND EFFECTS@"          ; "サウンド　エフェクト@"
@@ -202,7 +202,7 @@ CreditsStringsPointers:
 .SpecialThanks:       db "   SPECIAL THANKS@"         ; "スぺシャルサンクス@"
 .Producers:           db "     PRODUCERS@"            ; "プロデューサー@"
 .ExecutiveProducer:   db " EXECUTIVE PRODUCER@"       ; "エグゼクティブ　プロデューサー@"
-.PokemonAnimation:    db " #MON ANIMATION@"           ; "#　アニメーション@"
+.PokemonAnimation:    db " #MON ANIMATION@"           ; "<POKEMON>　アニメーション@"
 .PokedexText:         db "    #DEX TEXT@"             ; "ずかん　テキスト@"
 .MobilePrjLeader:     db " MOBILE PRJ. LEADER@"       ; "モバイルプロジェクト　りーダー@"
 .MobileSystemAd:      db " MOBILE SYSTEM AD.@"        ; "モバイル　システムアドバイザー@"

data/moves/grammar.asm

@@ -3,7 +3,7 @@
 ; Made redundant in English localization, where all are just "[mon]<LINE>used [move]!"
 
 MoveGrammar:
-; 0: originally "[mon]の<LINE>[move]を　つかった!" ("[mon]<LINE>used [move]!")
+; 0: originally "[mon]は<LINE>[move]を　つかった！" ("[mon]<LINE>used [move]!")
 	db SWORDS_DANCE
 	db GROWTH
 	db STRENGTH
@@ -35,7 +35,7 @@ MoveGrammar:
 	db EXTREMESPEED
 	db 0 ; end set
 
-; 1: originally "[mon]の<LINE>[move]した!" ("[mon]<LINE>did [move]!")
+; 1: originally "[mon]は<LINE>[move]した！" ("[mon]<LINE>did [move]!")
 	db RECOVER
 	db TELEPORT
 	db BIDE
@@ -44,7 +44,7 @@ MoveGrammar:
 	db FLAIL
 	db 0 ; end set
 
-; 2: originally "[mon]の<LINE>[move]を　した!" ("[mon]<LINE>did [move]!")
+; 2: originally "[mon]は<LINE>[move]を　した！" ("[mon]<LINE>did [move]!")
 	db MEDITATE
 	db AGILITY
 	db MIMIC
@@ -55,7 +55,7 @@ MoveGrammar:
 	db SCARY_FACE
 	db 0 ; end set
 
-; 3: originally "[mon]の<LINE>[move]　こうげき!" ("[mon]'s<LINE>[move] attack!")
+; 3: originally "[mon]の<LINE>[move]　こうげき！" ("[mon]'s<LINE>[move] attack!")
 	db POUND
 	db SCRATCH
 	db VICEGRIP

engine/debug/color_picker.asm

@@ -1059,8 +1059,8 @@ DebugColor_PlaceCursor:
 
 DebugColor_AreYouFinishedString:
 	db   "おわりますか？"                        ; Are you finished?
-	next "はい<DOT><DOT><DOT>", DEBUGTEST_A ; YES...(A)
-	next "いいえ<DOT><DOT>", DEBUGTEST_B     ; NO..(B)
+	next "はい．．．", DEBUGTEST_A ; YES...(A)
+	next "いいえ．．", DEBUGTEST_B     ; NO..(B)
 	db   "@"
 
 DebugColor_UpArrowGFX:

engine/link/mystery_gift.asm

@@ -1694,7 +1694,7 @@ endr
 
 .String_PressAToLink_BToCancel_JP:
 	db   "エーボタン<WO>おすと"
-	next "つうしん<PKMN>おこなわれるよ！"
+	next "つうしん<GA>おこなわれるよ！"
 	next "ビーボタン<WO>おすと"
 	next "つうしん<WO>ちゅうし　します"
 	db   "@"

maps/PokecomCenterAdminOfficeMobile.asm

@@ -55,7 +55,7 @@ PokecomCenterAdminOfficeMobileComputer1:
 .MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
-	db "#　つうしん　クラブ@" ; # COM CLUB
+	db "<POKEMON>　つうしん　クラブ@" ; # COM CLUB
 	db "モバイルセンター@" ; MOBILE CENTER
 	db "やめる@" ; QUIT
 

mobile/mobile_22.asm

@@ -3886,7 +3886,7 @@ Function8aab6:
 	ret
 
 String_8aaf0:
-	db "あたらしい　めいし<GA>できまし<LF>@"
+	db "あたらしい　めいし<GA>できまし<TA!>@"
 
 Function8ab00:
 	ld de, String_8911c

mobile/mobile_40.asm

@@ -4561,7 +4561,7 @@ String_101fd2:
 	next "に　でんわを　かけています@"
 
 String_101fe1:
-	db   "でんわが　つながりました!@"
+	db   "でんわが　つながりました！@"
 
 String_101fef:
 	db   "つうわを"
@@ -6700,7 +6700,7 @@ Function102ff5:
 	ret
 
 String_103002:
-	db   "その#を　こうかんすると"
+	db   "その<POKEMON>を　こうかんすると"
 	next "せんとう　できなく　なっちゃうよ！"
 	db   "@"
 

mobile/mobile_42.asm

@@ -1264,8 +1264,8 @@ MobileTradeAnim_DisplayEggData:
 
 .EggTemplate:
 	db   "タマゴ"
-	next "おや/？？？？？"
-	next "<ID>№<DOT>？？？？？"
+	next "おや／？？？？？"
+	next "<ID>№．？？？？？"
 	db   "@"
 
 Function108a33:
@@ -1301,10 +1301,10 @@ MobileTradeAnim_LoadMonTemplate:
 	ret
 
 .MonTemplate:
-	db   "─　№<DOT>"
+	db   "─　№．"
 	next ""
 	next "おや／"
-	next "<ID>№<DOT>"
+	next "<ID>№．"
 	db   "@"
 
 MobileTradeAnim_MonDisplay_UpdateBGMap:

mobile/mobile_46.asm

@@ -6021,7 +6021,7 @@ MenuHeader_11afe8:
 
 String_11aff0:
 	db   "この　じょうけんで"
-	next "よろしいですか?@"
+	next "よろしいですか？@"
 
 String_11b003:
 	db   "こうかんを"
@@ -6548,10 +6548,10 @@ Function11b295:
 	ret
 
 String_11b2fe: ; unreferenced
-	db "あげる#@"
+	db "あげる<POKEMON>@"
 
 String_11b303: ; unreferenced
-	db "ほしい#@"
+	db "ほしい<POKEMON>@"
 
 String_11b308:
 	db "　　　　　@"