From 7c3d2956cd4e69d9f2c157b9259c11dfd827de1d Mon Sep 17 00:00:00 2001 From: SnorlaxMonster <7100450+SnorlaxMonster@users.noreply.github.com> Date: Sun, 25 Jan 2026 07:07:50 +1030 Subject: [PATCH] Consistently use Japanese control codes for Japanese strings (#1222) --- constants/charmap.asm | 3 ++- data/credits_strings.asm | 4 ++-- data/moves/grammar.asm | 8 ++++---- engine/debug/color_picker.asm | 4 ++-- engine/link/mystery_gift.asm | 2 +- maps/PokecomCenterAdminOfficeMobile.asm | 2 +- mobile/mobile_22.asm | 2 +- mobile/mobile_40.asm | 4 ++-- mobile/mobile_42.asm | 8 ++++---- mobile/mobile_46.asm | 6 +++--- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/constants/charmap.asm b/constants/charmap.asm index 5b5ff67af..d59a1d33d 100644 --- a/constants/charmap.asm +++ b/constants/charmap.asm @@ -76,7 +76,7 @@ charmap "", $6e - charmap "", $70 ; hiragana small do, unused + charmap "", $70 ; precomposed hiragana do (ど), unused charmap "◀", $71 charmap "『", $72 ; Japanese opening quote, unused charmap "", $73 @@ -223,6 +223,7 @@ charmap "", $36 ; "わたし" charmap "", $37 ; "ここは" charmap "", $4a ; "が　" + charmap "", $54 ; "ポケモン" ; Japanese kana, for those bits of text that were not translated to English diff --git a/data/credits_strings.asm b/data/credits_strings.asm index 68e70164e..67bd1875f 100644 --- a/data/credits_strings.asm +++ b/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@" ; "　デザイン@" .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@" ; "　アニメーション@" .PokedexText: db " #DEX TEXT@" ; "ずかん　テキスト@" .MobilePrjLeader: db " MOBILE PRJ. LEADER@" ; "モバイルプロジェクト　りーダー@" .MobileSystemAd: db " MOBILE SYSTEM AD.@" ; "モバイル　システムアドバイザー@" diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm index 929b13c6b..763132b23 100644 --- a/data/moves/grammar.asm +++ b/data/moves/grammar.asm @@ -3,7 +3,7 @@ ; Made redundant in English localization, where all are just "[mon]used [move]!" MoveGrammar: -; 0: originally "[mon]の[move]を　つかった!" ("[mon]used [move]!") +; 0: originally "[mon]は[move]を　つかった！" ("[mon]used [move]!") db SWORDS_DANCE db GROWTH db STRENGTH @@ -35,7 +35,7 @@ MoveGrammar: db EXTREMESPEED db 0 ; end set -; 1: originally "[mon]の[move]した!" ("[mon]did [move]!") +; 1: originally "[mon]は[move]した！" ("[mon]did [move]!") db RECOVER db TELEPORT db BIDE @@ -44,7 +44,7 @@ MoveGrammar: db FLAIL db 0 ; end set -; 2: originally "[mon]の[move]を　した!" ("[mon]did [move]!") +; 2: originally "[mon]は[move]を　した！" ("[mon]did [move]!") db MEDITATE db AGILITY db MIMIC @@ -55,7 +55,7 @@ MoveGrammar: db SCARY_FACE db 0 ; end set -; 3: originally "[mon]の[move]　こうげき!" ("[mon]'s[move] attack!") +; 3: originally "[mon]の[move]　こうげき！" ("[mon]'s[move] attack!") db POUND db SCRATCH db VICEGRIP diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm index c4413bc88..5ba5f730b 100644 --- a/engine/debug/color_picker.asm +++ b/engine/debug/color_picker.asm @@ -1059,8 +1059,8 @@ DebugColor_PlaceCursor: DebugColor_AreYouFinishedString: db "おわりますか？" ; Are you finished? - next "はい", DEBUGTEST_A ; YES...(A) - next "いいえ", DEBUGTEST_B ; NO..(B) + next "はい．．．", DEBUGTEST_A ; YES...(A) + next "いいえ．．", DEBUGTEST_B ; NO..(B) db "@" DebugColor_UpArrowGFX: diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index fc64d6420..14499c91b 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -1694,7 +1694,7 @@ endr .String_PressAToLink_BToCancel_JP: db "エーボタンおすと" - next "つうしんおこなわれるよ！" + next "つうしんおこなわれるよ！" next "ビーボタンおすと" next "つうしんちゅうし　します" db "@" diff --git a/maps/PokecomCenterAdminOfficeMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm index 5b65e95dc..b84e667aa 100644 --- a/maps/PokecomCenterAdminOfficeMobile.asm +++ b/maps/PokecomCenterAdminOfficeMobile.asm @@ -55,7 +55,7 @@ PokecomCenterAdminOfficeMobileComputer1: .MenuData: db STATICMENU_CURSOR ; flags db 3 ; items - db "#　つうしん　クラブ@" ; # COM CLUB + db "　つうしん　クラブ@" ; # COM CLUB db "モバイルセンター@" ; MOBILE CENTER db "やめる@" ; QUIT diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 03c276914..8f7a9a942 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -3886,7 +3886,7 @@ Function8aab6: ret String_8aaf0: - db "あたらしい　めいしできまし@" + db "あたらしい　めいしできまし@" Function8ab00: ld de, String_8911c diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 007dbb634..b8198e932 100644 --- a/mobile/mobile_40.asm +++ b/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 "そのを　こうかんすると" next "せんとう　できなく　なっちゃうよ！" db "@" diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index e32b2e7a2..02991cce5 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1264,8 +1264,8 @@ MobileTradeAnim_DisplayEggData: .EggTemplate: db "タマゴ" - next "おや/？？？？？" - next "№？？？？？" + next "おや／？？？？？" + next "№．？？？？？" db "@" Function108a33: @@ -1301,10 +1301,10 @@ MobileTradeAnim_LoadMonTemplate: ret .MonTemplate: - db "─　№" + db "─　№．" next "" next "おや／" - next "№" + next "№．" db "@" MobileTradeAnim_MonDisplay_UpdateBGMap: diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 9e3cb19cd..93bfef006 100644 --- a/mobile/mobile_46.asm +++ b/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 "あげる@" String_11b303: ; unreferenced - db "ほしい#@" + db "ほしい@" String_11b308: db "　　　　　@"