diff --git a/coilsnake/lang/en.json b/coilsnake/lang/en.json index cecf726..148cb77 100644 --- a/coilsnake/lang/en.json +++ b/coilsnake/lang/en.json @@ -44,8 +44,7 @@ "ask_expand_base": "Would you like to expand this base ROM before proceeding? This ", "ask_expand_base_2": "will permanently overwrite your base ROM.", "start_comp": "Starting compilation…", - "decomp_script_prompt": "Are you sure you would like to decompile the script into this ", - "decomp_script_prompt_2": "project? This operation cannot be undone.\n\n", + "decomp_script_prompt": "Are you sure you would like to decompile the script into this project? This operation cannot be undone.\n\n", "decompile_text": "Decompile", "compile_text": "Compile", "upgrade": "Upgrade", diff --git a/coilsnake/lang/ja.json b/coilsnake/lang/ja.json index dbb0644..b800bba 100644 --- a/coilsnake/lang/ja.json +++ b/coilsnake/lang/ja.json @@ -44,8 +44,7 @@ "ask_expand_base": "処理を続行する前に、このベースROMを展開しますか?", "ask_expand_base_2": "ベースROMが上書きされます。", "start_comp": "コンパイルを開始します…", - "decomp_script_prompt": "このプロジェクトにスクリプトをデコンパイルしますか?", - "decomp_script_prompt_2": "一度行った操作は元に戻せません。\n\n", + "decomp_script_prompt": "このプロジェクトにスクリプトをデコンパイルしますか?一度行った操作は元に戻せません。\n\n", "decompile_text": "デコンパイル", "compile_text": "コンパイル", "upgrade": "アップグレード", diff --git a/coilsnake/ui/gui.py b/coilsnake/ui/gui.py index 7c5d987..1c65ff7 100644 --- a/coilsnake/ui/gui.py +++ b/coilsnake/ui/gui.py @@ -410,8 +410,7 @@ def do_decompile_script(self, rom_entry, project_entry): if rom and project: confirm = tkinter.messagebox.askquestion(self.guistrings.get("are_you_sure"), - self.guistrings.get("decomp_script_prompt"), - self.guistrings.get("decomp_script_prompt_2"), + self.guistrings.get("decomp_script_prompt") + self.guistrings.get("backup_info"), icon='warning') if confirm != "yes": diff --git a/coilsnake/util/eb/text.py b/coilsnake/util/eb/text.py index a7fcdd3..f64c580 100644 --- a/coilsnake/util/eb/text.py +++ b/coilsnake/util/eb/text.py @@ -3,7 +3,10 @@ class CharacterSubstitutions(object): BYTE_TO_CHARACTER_JP = { 0x20: ' ', + 0x22: '$', 0x25: 'ー', + 0x26: '〜', + 0x27: '/', 0x28: '!', 0x29: '?', 0x2A: 'α', @@ -11,7 +14,7 @@ class CharacterSubstitutions(object): 0x2C: 'γ', 0x2D: 'Σ', 0x2E: 'Ω', - 0x2F: '/', + # 2F appears to be a blank space - hopefully unused? 0x30: '0', 0x31: '1', 0x32: '2', @@ -28,7 +31,7 @@ class CharacterSubstitutions(object): 0x3D: '」', 0x3E: '♪', 0x3F: '○', - 0x40: '•', + 0x40: '@', 0x41: 'A', 0x42: 'B', 0x43: 'C', @@ -57,8 +60,9 @@ class CharacterSubstitutions(object): 0x5A: 'Z', 0x5B: ':', 0x5C: '・', - 0x5D: '…', - 0x5F: '.', + 0x5D: '‥', + 0x5E: '.', + 0x5F: '。', 0x60: 'あ', 0x61: 'ぁ', 0x62: 'か', @@ -201,6 +205,7 @@ class CharacterSubstitutions(object): 0xEB: 'ペ', 0xEC: 'メ', 0xED: 'ン', + 0xEE: 'ヲ', 0xEF: 'レ', 0xF0: 'オ', 0xF1: 'ォ',