diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/battle_main.c | 2 | ||||
-rw-r--r-- | src/battle_records.c | 12 | ||||
-rw-r--r-- | src/berry.c | 4 | ||||
-rw-r--r-- | src/berry_blender.c | 15 | ||||
-rw-r--r-- | src/debug/ereader_debug_menu.c | 16 | ||||
-rw-r--r-- | src/debug/matsuda_debug_menu.c | 40 | ||||
-rw-r--r-- | src/debug/mori_debug_menu.c | 6 | ||||
-rw-r--r-- | src/debug/nakamura_debug_menu.c | 39 | ||||
-rw-r--r-- | src/debug/nohara_debug_menu.c | 86 | ||||
-rw-r--r-- | src/debug/sound_check_menu.c | 16 | ||||
-rw-r--r-- | src/debug/start_menu_debug.c | 227 | ||||
-rw-r--r-- | src/debug/taya_debug_window.c | 24 | ||||
-rw-r--r-- | src/debug/tomomichi_debug_menu.c | 152 | ||||
-rw-r--r-- | src/debug/watanabe_debug_menu.c | 124 | ||||
-rw-r--r-- | src/field_weather.c | 30 | ||||
-rw-r--r-- | src/mail.c | 58 | ||||
-rw-r--r-- | src/main.c | 8 | ||||
-rw-r--r-- | src/reset_rtc_screen.c | 8 | ||||
-rw-r--r-- | src/slot_machine.c | 41 |
19 files changed, 477 insertions, 431 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 56eabd515..9a9f954aa 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2475,11 +2475,13 @@ void debug_nullsub_3(void) extern const u32 gUnknown_Debug_821F680[][0x23]; +// Shows a cursor void debug_sub_80125A0(void) { gSharedMem[gUnknown_Debug_821F680[gUnknown_Debug_03004360][gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5]] = 0x6D; } +// Hides a cursor void debug_sub_80125E4(void) { gSharedMem[gUnknown_Debug_821F680[gUnknown_Debug_03004360][gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5]] = 0x81; diff --git a/src/battle_records.c b/src/battle_records.c index d94d88032..e462e8992 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -21,12 +21,12 @@ extern u8 gBattleOutcome; const struct DebugStruct1 gUnknown_Debug_4245CC[] = { { 1, _("NUMBER1") }, - { 2, _("ナンバー2") }, - { 3, _("ナンバー3") }, - { 4, _("ナンバー4") }, - { 5, _("ナンバー5") }, - { 6, _("ナンバー6") }, - { 7, _("ナンバー7") }, + { 2, DTR("ナンバー2", "NUMBER2") }, + { 3, DTR("ナンバー3", "NUMBER3") }, + { 4, DTR("ナンバー4", "NUMBER4") }, + { 5, DTR("ナンバー5", "NUMBER5") }, + { 6, DTR("ナンバー6", "NUMBER6") }, + { 7, DTR("ナンバー7", "NUMBER7") }, }; const struct {u8 unk0; u8 unk1;} gUnknown_Debug_8424620[] = diff --git a/src/berry.c b/src/berry.c index 162615086..ad0a31b28 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1072,8 +1072,8 @@ extern const u8 gSpriteImage_UnusedCherry[]; extern const u16 gSpritePalette_UnusedCherry[]; extern u8 gUnknown_Debug_839B6CE[]; -static const u8 gUnknown_Debug_083F7F84[] = _("そとから きた きのみ"); -static const u8 gUnknown_Debug_083F7F90[] = _("ただいま かいはつちゅう"); +static const u8 gUnknown_Debug_083F7F84[] = DTR("そとから きた きのみ", "An exterior BERRY"); +static const u8 gUnknown_Debug_083F7F90[] = DTR("ただいま かいはつちゅう", "Currently under development"); void debug_sub_80C2C18(const u8 *name, u8 holdEffect, u8 holdEffectParam) { diff --git a/src/berry_blender.c b/src/berry_blender.c index 70cb34809..8d7a7faab 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -3271,6 +3271,13 @@ void debug_sub_80524BC(void) SetMainCallback2(sub_8052AF8); } +// Partially fixes the clipping on longer names. +#if DEBUG_TRANSLATE && DEBUG +# define BLENDER_DEBUG_BERRY_LEN 12 +#else +# define BLENDER_DEBUG_BERRY_LEN 6 +#endif + static void BlenderDebug_PrintBerryData(void) { u8 text[128]; @@ -3294,8 +3301,8 @@ static void BlenderDebug_PrintBerryData(void) else { CopyItemName(sBlenderDebug.berries[i] + 133, &text[0]); - text[6] = CHAR_SPACE; - text[7] = EOS; + text[BLENDER_DEBUG_BERRY_LEN] = CHAR_SPACE; + text[BLENDER_DEBUG_BERRY_LEN + 1] = EOS; } var = (i * 3) + 3; Menu_PrintText(text, 2, var); @@ -3318,7 +3325,7 @@ static void BlenderDebug_PrintBerryData(void) ConvertIntToDecimalStringN(&text[15], gBerries[sBlenderDebug.berries[i]].smoothness, 2, 2); text[17] = EOS; - Menu_PrintText(text, 7, var); + Menu_PrintText(text, BLENDER_DEBUG_BERRY_LEN + 1, var); } if (sBlenderDebug.pokeblock.color != 0) { @@ -3343,7 +3350,7 @@ static void BlenderDebug_PrintBerryData(void) ConvertIntToHexStringN(&text[15], sBlenderDebug.feel, 2, 2); text[17] = EOS; - Menu_PrintText(text, 7, 17); + Menu_PrintText(text, BLENDER_DEBUG_BERRY_LEN + 1, 17); } } diff --git a/src/debug/ereader_debug_menu.c b/src/debug/ereader_debug_menu.c index aaffca383..74a5ff10c 100644 --- a/src/debug/ereader_debug_menu.c +++ b/src/debug/ereader_debug_menu.c @@ -10,7 +10,11 @@ #include "berry.h" #include "mail_data.h" +#if DEBUG +const u8 Str_842E238[] = DTR("タマゴ", "EGG"); +#else const u8 Str_842E238[] = _("タマゴ"); +#endif #if DEBUG @@ -131,7 +135,7 @@ extern u8 gUnknown_Debug_845DDB2[]; extern u8 gUnknown_Debug_845DDB2End[]; extern u8 gUnknown_Debug_845DDD6[]; -const u8 Str_842E23C[] = _("ガイブ"); +const u8 Str_842E23C[] = DTR("ガイブ", "EXTERNAL"); size_t debug_sub_813C5B4(u8 * dest) { @@ -286,7 +290,7 @@ extern u8 gUnknown_Debug_845E4EF[]; extern u8 gUnknown_Debug_845E4EFEnd[]; extern u8 gUnknown_Debug_845E506[]; -const u8 Str_842E253[] = _(" そら カードイー"); +const u8 Str_842E253[] = DTR(" そら カードイー", "eCARD TRAINER"); size_t debug_sub_813C93C(u8 * dest) { @@ -305,22 +309,22 @@ size_t debug_sub_813C93C(u8 * dest) return size; } -const u8 Str_842E25E[] = _("ポケコッコ"); +const u8 Str_842E25E[] = KANA("ポケコッコ"); // TRN: kokko? const u8 Str_842E264[] = _("ticket"); const u8 Str_842E26B[] = _("{PKMN}"); -const u8 Str_842E26E[] = _("wrong {PKMN}"); +const u8 Str_842E26E[] = _("wrong {PKMN}"); const u8 Str_842E277[] = _("ribbon"); const u8 Str_842E27E[] = _("DEX"); const u8 Str_842E282[] = _("message"); const u8 Str_842E28A[] = _("egg"); -const u8 Str_842E28E[] = _("RAM seed"); +const u8 Str_842E28E[] = _("RAM seed"); const u8 Str_842E297[] = _("trainer"); const u8 Str_842E29F[] = _("clock"); const u8 Str_842E2A5[] = _("item"); const u8 Str_842E2AA[] = _("goods"); const u8 Str_842E2B0[] = _("potion"); const u8 Str_842E2B7[] = _("ball"); -const u8 Str_842E2BC[] = _("cheri berry"); +const u8 Str_842E2BC[] = _("cheri berry"); const u8 Str_842E2C8[] = _("TM01"); const struct UnkDebugMenu3Items gUnknown_Debug_842E2D0[] = { diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index 1d2879661..27d2db66b 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -44,13 +44,13 @@ static void sub_80AA614(u8, u8); static void sub_80AAD08(struct Sprite *, s8); // unused -const u8 gText_Unused83C9150[] = _("テストです"); // "test" +const u8 gText_Unused83C9150[] = DTR("テストです", "Test"); const u8 gMatsudaDebugMenu_ActionContestText[] = _("Contest"); const u8 gMatsudaDebugMenu_ActionContestResultsText[] = _("Contest results"); // unused -const u8 gMatsudaDebugMenu_ActionChangePerimeterText[] = _("パラメータへんこう"); // "Change parameter" +const u8 gMatsudaDebugMenu_ActionChangeParameterText[] = DTR("パラメータへんこう", "Change parameter"); // unused -const u8 gMatsudaDebugMenu_ActionChangeMoveText[] = _("わざ へんこう"); // "Change move" +const u8 gMatsudaDebugMenu_ActionChangeMoveText[] = DTR("わざ へんこう", "Change move"); // "Change move" const u8 gMatsudaDebugMenu_ActionContestCommText[] = _("Contest (comm.)"); const u8 gMatsudaDebugMenu_ActionCommTestText[] = _("Init comm. data"); const u8 gMatsudaDebugMenu_ActionSetHighScoreText[] = _("Set highest score"); @@ -387,8 +387,8 @@ static void (* const gUnknown_083C92E4[][2])(struct Sprite *, s8) = }; static const u8 gMatsudaDebugMenu_StartText[] = _("{COLOR CYAN}{HIGHLIGHT RED}"); -static const u8 gMatsudaDebugMenu_StartJapText[] = _("かいし"); // because StartText is only called by StringCopy, this part appears to be unused. -static const u8 gMatsudaDebugMenu_GoBackText[] = _("もどる"); +static const u8 gMatsudaDebugMenu_StartJapText[] = DTR("かいし", "START"); // because StartText is only called by StringCopy, this part appears to be unused. +static const u8 gMatsudaDebugMenu_GoBackText[] = DTR("もどる", "BACK"); #ifdef GERMAN static const u8 gMatsudaDebugMenu_BattlePointsText[] = _("{COLOR MAGENTA}BP,"); @@ -396,12 +396,12 @@ static const u8 gMatsudaDebugMenu_BattlePointsText[] = _("{COLOR MAGENTA}BP,"); static const u8 gMatsudaDebugMenu_BattlePointsText[] = _("{COLOR MAGENTA}BP."); #endif -static const u8 MatsudaDebugMenuText_Cool[] = _("かっこよさ"); // cool -static const u8 MatsudaDebugMenuText_Cute[] = _("かわいさ"); // cute -static const u8 MatsudaDebugMenuText_Beauty[] = _("うつくしさ"); // beauty -static const u8 MatsudaDebugMenuText_Smart[] = _("かしこさ"); // smart -static const u8 MatsudaDebugMenuText_Tough[] = _("たくましさ"); // tough -static const u8 MatsudaDebugMenuText_Sheen[] = _("けづや"); // sheen +static const u8 MatsudaDebugMenuText_Cool[] = DTR("かっこよさ", "COOL"); +static const u8 MatsudaDebugMenuText_Cute[] = DTR("かわいさ", "CUTE"); +static const u8 MatsudaDebugMenuText_Beauty[] = DTR("うつくしさ", "BEAUTY"); +static const u8 MatsudaDebugMenuText_Smart[] = DTR("かしこさ", "SMART"); +static const u8 MatsudaDebugMenuText_Tough[] = DTR("たくましさ", "TOUGH"); +static const u8 MatsudaDebugMenuText_Sheen[] = DTR("けづや", "SHEEN"); static const u8 *const gMatsudaDebugMenuTextList1[] = { @@ -413,11 +413,11 @@ static const u8 *const gMatsudaDebugMenuTextList1[] = MatsudaDebugMenuText_Sheen, }; -static const u8 MatsudaDebugMenuText_CoolContest[] = _("かっこよさコンテスト"); -static const u8 MatsudaDebugMenuText_BeautyContest[] = _("うつくしさコンテスト"); -static const u8 MatsudaDebugMenuText_CuteContest[] = _("かわいさコンテスト "); -static const u8 MatsudaDebugMenuText_SmartContest[] = _("かしこさコンテスト "); -static const u8 MatsudaDebugMenuText_ToughContest[] = _("たくましさコンテスト"); +static const u8 MatsudaDebugMenuText_CoolContest[] = DTR("かっこよさコンテスト", "COOL CONTEST"); +static const u8 MatsudaDebugMenuText_BeautyContest[] = DTR("うつくしさコンテスト", "BEAUTY CONTEST"); +static const u8 MatsudaDebugMenuText_CuteContest[] = DTR("かわいさコンテスト ", "CUTE CONTEST"); +static const u8 MatsudaDebugMenuText_SmartContest[] = DTR("かしこさコンテスト ", "SMART CONTEST"); +static const u8 MatsudaDebugMenuText_ToughContest[] = DTR("たくましさコンテスト", "TOUGH CONTEST"); static const u8 *const gMatsudaDebugMenuTextList2[] = { @@ -428,10 +428,10 @@ static const u8 *const gMatsudaDebugMenuTextList2[] = MatsudaDebugMenuText_ToughContest, }; -static const u8 MatsudaDebugMenuText_Fallarbor[] = _("ハジツゲ/ノーマル"); // Fallarbor / Normal -static const u8 MatsudaDebugMenuText_Verdanturf[] = _("シダケ/スーパー "); // Verdanturf / Super -static const u8 MatsudaDebugMenuText_Slateport[] = _("カイナ/ハイパー "); // Slateport / Hyper -static const u8 MatsudaDebugMenuText_Lilycove[] = _("ミナモ/マスター "); // Lilycove / Master +static const u8 MatsudaDebugMenuText_Fallarbor[] = DTR("ハジツゲ/ノーマル", "FALLARBOR/NORMAL"); // Fallarbor / Normal +static const u8 MatsudaDebugMenuText_Verdanturf[] = DTR("シダケ/スーパー ", "VERDANTURF/SUPER"); // Verdanturf / Super +static const u8 MatsudaDebugMenuText_Slateport[] = DTR("カイナ/ハイパー ", "SLATEPORT/HYPER"); // Slateport / Hyper +static const u8 MatsudaDebugMenuText_Lilycove[] = DTR("ミナモ/マスター ", "LILYCOVE/MASTER"); // Lilycove / Master static const u8 *const gMatsudaDebugMenuTextList3[] = { diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c index 4f798ecb3..b930350ff 100644 --- a/src/debug/mori_debug_menu.c +++ b/src/debug/mori_debug_menu.c @@ -31,9 +31,9 @@ const u8 gUnknown_0839B22C[][3] = }; const u8 gUnknown_0839B24A[] = _("ND"); -const u8 gUnknown_0839B24D[] = _("の こどもは\n"); // "'s child <topic-particle>"= +const u8 gUnknown_0839B24D[] = DTR("の こどもは\n", "'s child =\n"); // TRN const u8 gUnknown_0839B255[] = _(" "); -const u8 gUnknown_0839B257[] = _("ながいなまえぽけもん"); // "long name pokemon" (used as test name) +const u8 gUnknown_0839B257[] = DTR("ながいなまえぽけもん", "LongName{PKMN}"); // "long name pokemon" (used as test name) const u8 Text_39B262[] = _("Search a child"); const u8 Text_39B271[] = _("Egg"); const u8 Text_39B275[] = _("Egg (male)"); @@ -45,7 +45,7 @@ const u8 Text_39B2AF[] = _("Long name"); #ifdef GERMAN const u8 Text_39B2B9[] = _("Delete {POKEBLOCK}"); #else -const u8 Text_39B2B9[] = _("ポロックけす"); +const u8 Text_39B2B9[] = DTR("ポロックけす", "Delete {POKEBLOCK}"); #endif const struct MenuAction gMoriDebugMenuActions[] = diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index e6af3c58d..32ac57dc2 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -50,7 +50,7 @@ static bool8 SetPokeblock(void); static const u8 Str_843E36C[] = _("Berries"); static const u8 Str_843E374[] = _("Goods"); static const u8 Str_843E37A[] = _("{PKMN} list"); -static const u8 Str_843E382[] = _("トラップ"); +static const u8 Str_843E382[] = DTR("トラップ", "Trap"); static const u8 Str_843E387[] = _("Move your base"); static const u8 Str_843E396[] = _("Moving {PKMN}"); static const u8 Str_843E3A0[] = _("Fishing points"); @@ -874,10 +874,11 @@ static struct { EWRAM_DATA u8 sNakaGenderTest_CursorPosition = 0; static const u8 _843E5D1[] = {0x0F, 0x16, 0x19}; -static const u8 Str_843E5D4[] = _( - "Aボタン {ESCAPE}\p" - " Bボタン ー\n" - "START けってい"); +static const u8 Str_843E5D4[] = DTR( + "Aボタン {TALL_PLUS} Bボタン ー\n" + "START けってい", + "A BUTTON {TALL_PLUS} B BUTTON {JPN}ー{ENG}\n" + "START CHOOSE"); void NakaGenderTest(void) { @@ -1916,14 +1917,14 @@ static bool8 SetPokeblock(void) EWRAM_DATA u8 sEVTest_CursorPosition = 0; -static const u8 Str_843E5F2[] = _("HP どりょくち"); -static const u8 Str_843E5FB[] = _("こうげき どりょくち"); -static const u8 Str_843E606[] = _("ぼうぎょ どりょくち"); -static const u8 Str_843E611[] = _("すばやさ どりょくち"); -static const u8 Str_843E61C[] = _("とくこう どりょくち"); -static const u8 Str_843E627[] = _("とくぼう どりょくち"); -static const u8 Str_843E632[] = _("なつきど"); -static const u8 Str_843E637[] = _("どりょくち ごうけい"); +static const u8 Str_843E5F2[] = DTR("HP どりょくち", "HP EVs"); +static const u8 Str_843E5FB[] = DTR("こうげき どりょくち", "ATK EVs"); +static const u8 Str_843E606[] = DTR("ぼうぎょ どりょくち", "DEF EVs"); +static const u8 Str_843E611[] = DTR("すばやさ どりょくち", "SPE EVs"); +static const u8 Str_843E61C[] = DTR("とくこう どりょくち", "SPA EVs"); +static const u8 Str_843E627[] = DTR("とくぼう どりょくち", "SPD EVs"); +static const u8 Str_843E632[] = DTR("なつきど", "FRIENDSHIP"); +static const u8 Str_843E637[] = DTR("どりょくち ごうけい", "EV TOTAL"); static void EVTest_Init(void) { @@ -2071,13 +2072,13 @@ EWRAM_DATA u16 sRngRight = 0; EWRAM_DATA u16 sNumSamples = 0; EWRAM_DATA u16 sRngMax = 0; -static const u8 Str_843E642[] = _("ここから"); -static const u8 Str_843E647[] = _("ここまで"); -static const u8 Str_843E64C[] = _("かいすう"); -static const u8 Str_843E651[] = _("けっか"); -static const u8 Str_843E655[] = _("かい"); +static const u8 Str_843E642[] = DTR("ここから", "FROM"); +static const u8 Str_843E647[] = DTR("ここまで", "TO"); +static const u8 Str_843E64C[] = DTR("かいすう", "TIMES"); +static const u8 Str_843E651[] = DTR("けっか", "RESULT"); +static const u8 Str_843E655[] = DTR("かい", "×"); static const u8 Str_843E658[] = _("0"); -static const u8 Str_843E65A[] = _("はんい"); +static const u8 Str_843E65A[] = DTR("はんい", "RANGE"); static u16 EVTest_GetDiscreteUniformRandomSamples(void) { diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index 349e5111f..4cb0f34ed 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -58,13 +58,13 @@ bool8 NoharaDebugMenu_AddNumWinningStreaks(void); const u8 gUnknown_Debug_083C48C4[] = _("TV"); const u8 gUnknown_Debug_083C48C7[] = _("Fan"); -const u8 gUnknown_Debug_083C48CB[] = _("Battle (vs Dad)"); -const u8 gUnknown_Debug_083C48DB[] = _("Dad after battle"); -const u8 gUnknown_Debug_083C48EC[] = _("SOOTOPOLIS CITY"); +const u8 gUnknown_Debug_083C48CB[] = _("Battle (vs Dad)"); +const u8 gUnknown_Debug_083C48DB[] = _("Dad after battle"); +const u8 gUnknown_Debug_083C48EC[] = _("SOOTOPOLIS CITY"); const u8 gUnknown_Debug_083C48FC[] = _("Embark"); -const u8 gUnknown_Debug_083C4903[] = _("Yes 9999"); -const u8 gUnknown_Debug_083C490C[] = _("Legends flag ON"); -const u8 gUnknown_Debug_083C491C[] = _("Add num of winning streaks"); +const u8 gUnknown_Debug_083C4903[] = _("Yes 9999"); +const u8 gUnknown_Debug_083C490C[] = _("Legends flag ON"); +const u8 gUnknown_Debug_083C491C[] = _("Add num of winning streaks"); const struct MenuAction gUnknown_Debug_083C4938[] = { {gUnknown_Debug_083C48C4, NoharaDebugMenu_TV}, @@ -104,28 +104,30 @@ bool8 debug_sub_808F414(void) } } -const u8 gUnknown_Debug_083C4980[] = _("Want to change data type{CLEAR_TO 143}Press Left\n" - "to see secret type now?{CLEAR_TO 143}to switch"); +const u8 gUnknown_Debug_083C4980[] = _("Want to change data type{CLEAR_TO 143}Press Left\n" + "to see secret type now?{CLEAR_TO 143}to switch"); -const u8 gUnknown_Debug_083C49CA[] = _("Choose the TV data you wish to\n" - "create to check a transmission。"); +const u8 gUnknown_Debug_083C49CA[] = _("Choose the TV data you wish to\n" + "create to check a transmission。"); -const u8 gUnknown_Debug_083C4A09[] = _("ほうそうの はっせいりつを セット\n" - "してください ?ぶんの1に なります"); +const u8 gUnknown_Debug_083C4A09[] = DTR("ほうそうの はっせいりつを セット\n" + "してください ?ぶんの1に なります", + "Please set the transmission frequency\n" + "Part 1"); const u8 gUnknown_Debug_083C4A2E[] = _("SURVEY"); -const u8 gUnknown_Debug_083C4A35[] = _("RECENT HAPPENINGS"); -const u8 gUnknown_Debug_083C4A47[] = _("POKひMON FAN CLUB"); -const u8 gUnknown_Debug_083C4A58[] = _("ジム"); +const u8 gUnknown_Debug_083C4A35[] = _("RECENT HAPPENINGS"); +const u8 gUnknown_Debug_083C4A47[] = _("POKéMON FAN CLUB"); +const u8 gUnknown_Debug_083C4A58[] = DTR("ジム", "GYM"); const u8 gUnknown_Debug_083C4A5B[] = _("OUTBREAKS"); -const u8 gUnknown_Debug_083C4A65[] = _("NAME RATER"); +const u8 gUnknown_Debug_083C4A65[] = _("NAME RATER"); const u8 gUnknown_Debug_083C4A70[] = _("CONTEST"); const u8 gUnknown_Debug_083C4A78[] = _("INTRODUCTION"); const u8 gUnknown_Debug_083C4A85[] = _("SHOPPING"); const u8 gUnknown_Debug_083C4A8E[] = _("MISFORTUNE"); const u8 gUnknown_Debug_083C4A99[] = _("FISHING"); -const u8 gUnknown_Debug_083C4AA1[] = _("MEMORABLE DAY"); -const u8 gUnknown_Debug_083C4AAF[] = _("BRAVO TRAINER"); +const u8 gUnknown_Debug_083C4AA1[] = _("MEMORABLE DAY"); +const u8 gUnknown_Debug_083C4AAF[] = _("BRAVO TRAINER"); const u8 gUnknown_Debug_083C4ABD[] = { TVSHOW_FAN_CLUB_LETTER, @@ -159,8 +161,8 @@ const u8 *const gUnknown_Debug_083C4ACC[] = { const u8 gDebugText_BigSale[] = _("BIG SALE"); -const u8 gUnknown_Debug_083C4B05[] = _("SERVICE DAY"); -const u8 gUnknown_Debug_083C4B11[] = _("CLEARーOUT SALE"); +const u8 gUnknown_Debug_083C4B05[] = _("SERVICE DAY"); +const u8 gUnknown_Debug_083C4B11[] = _("CLEAR-OUT SALE"); const u8 gUnknown_Debug_083C4B20[] = {1, 2, 3}; const u8 *const gUnknown_Debug_083C4B24[] = { @@ -169,15 +171,15 @@ const u8 *const gUnknown_Debug_083C4B24[] = { gUnknown_Debug_083C4B11 }; -const u8 gUnknown_Debug_083C4B30[] = _("Secret type"); +const u8 gUnknown_Debug_083C4B30[] = _("Secret type"); const u8 gUnknown_Debug_083C4B3C[] = _("Start"); -const u8 gUnknown_Debug_083C4B42[] = _("Create TV"); -const u8 gUnknown_Debug_083C4B4C[] = _("All clear"); -const u8 gUnknown_Debug_083C4B56[] = _("All seen"); -const u8 gUnknown_Debug_083C4B5F[] = _("Create CM"); -const u8 gUnknown_Debug_083C4B69[] = _("Not yet seen"); -const u8 gUnknown_Debug_083C4B76[] = _("Hit Table"); -const u8 gUnknown_Debug_083C4B80[] = _("Set full"); +const u8 gUnknown_Debug_083C4B42[] = _("Create TV"); +const u8 gUnknown_Debug_083C4B4C[] = _("All clear"); +const u8 gUnknown_Debug_083C4B56[] = _("All seen"); +const u8 gUnknown_Debug_083C4B5F[] = _("Create CM"); +const u8 gUnknown_Debug_083C4B69[] = _("Not yet seen"); +const u8 gUnknown_Debug_083C4B76[] = _("Hit Table"); +const u8 gUnknown_Debug_083C4B80[] = _("Set full"); // Normaly these would be struct MenuAction, but the prototype of // member .func is not consistent. @@ -754,15 +756,15 @@ bool8 debug_sub_80900AC(void) CloseMenu(); return TRUE; } - -const u8 gUnknown_Debug_083C4C77[] = _("1 スクル"); -const u8 gUnknown_Debug_083C4C7D[] = _("2 ミドル"); -const u8 gUnknown_Debug_083C4C83[] = _("3 オジヨ"); -const u8 gUnknown_Debug_083C4C89[] = _("4 ボーヤ"); -const u8 gUnknown_Debug_083C4C8F[] = _("5 ボーイ"); -const u8 gUnknown_Debug_083C4C95[] = _("6 ヤング"); -const u8 gUnknown_Debug_083C4C9B[] = _("7 ヲーカ"); -const u8 gUnknown_Debug_083C4CA1[] = _("8 オルド"); +// TRN: Figure out the meaning of these abbreviations +const u8 gUnknown_Debug_083C4C77[] = DTR("1 スクル", "1 SCHOOL"); +const u8 gUnknown_Debug_083C4C7D[] = DTR("2 ミドル", "2 MIDDLE"); +const u8 gUnknown_Debug_083C4C83[] = DTR("3 オジヨ", "3 UNCLE"); +const u8 gUnknown_Debug_083C4C89[] = DTR("4 ボーヤ", "4 BOY"); +const u8 gUnknown_Debug_083C4C8F[] = DTR("5 ボーイ", "5 BOY"); +const u8 gUnknown_Debug_083C4C95[] = DTR("6 ヤング", "6 YOUNG"); +const u8 gUnknown_Debug_083C4C9B[] = DTR("7 ヲーカ", "7 WOUKA"); +const u8 gUnknown_Debug_083C4CA1[] = DTR("8 オルド", "8 OLD"); const u8 *const gUnknown_Debug_083C4CA8[] = { gUnknown_Debug_083C4C77, @@ -779,11 +781,11 @@ const u8 gUnknown_Debug_083C4CC8[] = _("Start"); const u8 gUnknown_Debug_083C4CCE[] = _("Increase"); const u8 gUnknown_Debug_083C4CD7[] = _("Reduce"); const u8 gUnknown_Debug_083C4CDE[] = _("Points"); -const u8 gUnknown_Debug_083C4CE5[] = _("Play time 6"); -const u8 gUnknown_Debug_083C4CF1[] = _("P ELITE FOUR"); -const u8 gUnknown_Debug_083C4CFE[] = _("P SECRET BASE"); -const u8 gUnknown_Debug_083C4D0C[] = _("P CONTEST"); -const u8 gUnknown_Debug_083C4D16[] = _("P BATTLE TOWER"); +const u8 gUnknown_Debug_083C4CE5[] = _("Play time 6"); +const u8 gUnknown_Debug_083C4CF1[] = _("P ELITE FOUR"); +const u8 gUnknown_Debug_083C4CFE[] = _("P SECRET BASE"); +const u8 gUnknown_Debug_083C4D0C[] = _("P CONTEST"); +const u8 gUnknown_Debug_083C4D16[] = _("P BATTLE TOWER"); const struct MenuAction gUnknown_Debug_083C4D28[] = { {gUnknown_Debug_083C4CC8, debug_sub_80901E4}, diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index 1ead5ae1b..95e71fad5 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -156,10 +156,10 @@ void CB2_StartSoundCheckMenu(void) void Task_InitSoundCheckMenu(u8 taskId) { - u8 soundcheckStr[] = _("サウンドチェック"); + u8 soundcheckStr[] = DTR("サウンドチェック", "SOUND CHECK"); u8 bgmStr[] = _("BGM"); u8 seStr[] = _("SE "); - u8 abDescStr[] = _("A‥さいせい B‥おわり"); + u8 abDescStr[] = DTR("A‥さいせい B‥おわり", "A PLAY B STOP"); u8 upDownStr[] = _("L‥UP R‥DOWN"); u8 driverStr[] = _("R‥DRIVER-TEST"); @@ -399,8 +399,8 @@ void sub_80BA79C(const u8 *const string, u16 x, u16 y) void Task_DrawDriverTestMenu(u8 taskId) // Task_DrawDriverTestMenu { - u8 bbackStr[] = _("Bぼたんで もどる"); - u8 aplayStr[] = _("Aぼたんで さいせい"); + u8 bbackStr[] = DTR("Bぼたんで もどる", "B BUTTON: BACK"); + u8 aplayStr[] = DTR("Aぼたんで さいせい", "A BUTTON: PLAY"); u8 voiceStr[] = _("VOICE‥‥‥‥"); u8 volumeStr[] = _("VOLUME‥‥‥"); u8 panpotStr[] = _("PANPOT‥‥‥"); @@ -410,9 +410,9 @@ void Task_DrawDriverTestMenu(u8 taskId) // Task_DrawDriverTestMenu u8 progressStr[] = _("PROGRESS‥"); u8 chorusStr[] = _("CHORUS‥‥‥"); u8 priorityStr[] = _("PRIORITY‥"); - u8 playingStr[] = _("さいせいちゆう‥"); // 再生中 (playing) - u8 reverseStr[] = _("はんてん‥‥‥‥"); // 反転 (reverse) - u8 stereoStr[] = _("すてれお‥‥‥‥"); // stereo + u8 playingStr[] = DTR("さいせいちゆう‥", "PLAYING"); // 再生中 (playing) + u8 reverseStr[] = DTR("はんてん‥‥‥‥", "REVERSE"); // 反転 (reverse) + u8 stereoStr[] = DTR("すてれお‥‥‥‥", "STEREO"); // stereo REG_DISPCNT = 0x3140; Menu_DrawStdWindowFrame(0, 0, 29, 19); @@ -680,7 +680,7 @@ void sub_80BAF84(u8 taskId) { u8 seStr[] = _("SE"); u8 panStr[] = _("PAN"); - u8 playingStr[] = _("さいせいちゆう‥"); + u8 playingStr[] = DTR("さいせいちゆう‥", "PLAYING"); REG_DISPCNT = 0x3140; Menu_DrawStdWindowFrame(0, 0, 29, 19); diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index 01f04b8d9..f64de18e9 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -174,8 +174,8 @@ const u8 Str_839B7D8[] = _("Transport"); const u8 Str_839B7E2[] = _("See portraits"); const u8 Str_839B7F0[] = _("Time records"); const u8 Str_839B7FD[] = _("Set time"); -const u8 Str_839B806[] = _("National オカDex"); -const u8 Str_839B815[] = _("Hoenn オカDex"); +const u8 Str_839B806[] = _("National {POKE}Dex"); +const u8 Str_839B815[] = _("Hoenn {POKE}Dex"); const u8 Str_839B821[] = _("Create {PKMN}"); const u8 Str_839B82B[] = _("See {PKMN} graphics"); const u8 Str_839B83B[] = _("See trainers"); @@ -272,21 +272,22 @@ const u8 gUnknown_Debug_839BB64[] = const u8 gUnknown_Debug_0839BBA4[] = _("Debugging Version"); const u8 gUnknown_Debug_0839BBB6[] = _("{VERSION} Version"); const u8 gUnknown_Debug_0839BBC1[] = _("Normal RTC compatible"); -const u8 Str_839BBD7[] = _("か の じっけん"); -const u8 Str_839BBE0[] = _("じっけん2"); -const u8 Str_839BBE6[] = _("BGじっけん"); + +const u8 Str_839BBD7[] = DTR("か の じっけん", "Test"); +const u8 Str_839BBE0[] = DTR("じっけん2", "Test2"); +const u8 Str_839BBE6[] = DTR("BGじっけん", "BG Test"); const u8 Str_839BBED[] = _("Battle"); -const u8 Str_839BBF4[] = _("つうしん じっけん"); +const u8 Str_839BBF4[] = DTR("つうしん じっけん", "LINK Test"); const u8 Str_839BBFE[] = _("LINK Test2"); -const u8 Str_839BC09[] = _("フィールド はじめる"); -const u8 Str_839BC14[] = _("フィールド つづき"); +const u8 Str_839BC09[] = DTR("フィールド はじめる", "Field Start"); // TRN +const u8 Str_839BC14[] = DTR("フィールド つづき", "Field Continue"); // TRN const u8 Str_839BC1E[] = _("Sound test"); const u8 Str_839BC29[] = _("{POKEBLOCK} test"); const u8 Str_839BC34[] = _("Crash backup data"); const u8 Str_839BC46[] = _("e-Card test"); -const u8 Str_839BC52[] = _("こうかんデモ "); +const u8 Str_839BC52[] = DTR("こうかんデモ ", "Trade demo"); const u8 Str_839BC5C[] = _("Time in game"); -const u8 Str_839BC69[] = _("フェスタ モード"); +const u8 Str_839BC69[] = DTR("フェスタ モード", "Festa mode"); // TRN const u8 Str_839BC72[] = _("Mimic e-Card"); const u8 Str_839BC7F[] = _("RTC reset"); const u8 Str_839BC89[] = _("Converter"); @@ -324,16 +325,20 @@ const u8 gMenuOrders_839BD14[][10] = const u8 Str_839BD26[] = {2, 0, 0, 0}; // doesn't appear to be referenced -const u8 Str_839BD2C[] = _("RTCを リセット します\n" // Reset RTC - "Aで じっこう Bでキャンセル"); - -const u8 Str_839BD4C[] = _("RTCを リセット した!"); +const u8 Str_839BD2C[] = DTR("RTCを リセット します\n" // Reset RTC + "Aで じっこう Bでキャンセル", + "Reset RTC?\n" + "A: START B: CANCEL"); -const u8 Str_839BD5A[] = _("セーブデータを コンバートします\n" - "Aで けってい Bで キャンセル"); +const u8 Str_839BD4C[] = DTR("RTCを リセット した!", "RTC reset successful!"); -const u8 Str_839BD7D[] = _("へんかんが しゅうりょう しました!"); +const u8 Str_839BD5A[] = DTR("セーブデータを コンバートします\n" + "Aで けってい Bで キャンセル", + "Convert save data?\n" + "A: CONFIRM B: CANCEL"); +const u8 Str_839BD7D[] = DTR("へんかんが しゅうりょう しました!", + "Conversion finished!"); extern const u8 Str_839BD2C[]; extern const u8 Str_839BD4C[]; @@ -593,14 +598,14 @@ u8 DebugMenu_8076EDC(void) return 0; } -const u8 Str_839BD90[] = _("ジュンイチ"); -const u8 Str_839BD96[] = _("ダイゴロウ"); -const u8 Str_839BD9C[] = _("テツジ"); -const u8 Str_839BDA0[] = _("バレンシア"); -const u8 Str_839BDA6[] = _("ハルコマチ"); +const u8 Str_839BD90[] = DTR("ジュンイチ", "JUNICHI"); +const u8 Str_839BD96[] = DTR("ダイゴロウ", "STEVEN LOW"); // TRN - likely special char +const u8 Str_839BD9C[] = DTR("テツジ", "TETSUJI"); +const u8 Str_839BDA0[] = DTR("バレンシア", "VALENCIA"); // TRN +const u8 Str_839BDA6[] = DTR("ハルコマチ", "HARUKOMACHI"); // TRN const u8 Str_839BDAC[] = _("RAYMOND"); const u8 Str_839BDB4[] = _("TIFFANY"); -const u8 Str_839BDBC[] = _("くまxちえ"); +const u8 Str_839BDBC[] = DTR("くまxちえ", "KUMA x CHIE"); // TRN const struct { const u8 * text; @@ -869,7 +874,7 @@ const u8 Str_839BE0F[] = _("HP"); const u8 Str_839BE12[] = _("PAR"); const u8 Str_839BE16[] = _("SLP"); const u8 Str_839BE1A[] = _("PSN"); -const u8 Str_839BE1E[] = _("ウマイ"); +const u8 Str_839BE1E[] = KANA("ウマイ"); u8 DebugMenu_8077434(void) { @@ -1161,10 +1166,12 @@ u8 DebugMenu_8077954(void) return TRUE; } -const u8 Str_839BE6B[] = _("さいせんかのうトレーナー:{STR_VAR_1}\n" - "さいせんじょうたいトレーナー:{STR_VAR_2}"); -const u8 Str_839BE8D[] = _("いる"); -const u8 Str_839BE90[] = _("いない"); +const u8 Str_839BE6B[] = DTR("さいせんかのうトレーナー:{STR_VAR_1}\n" + "さいせんじょうたいトレーナー:{STR_VAR_2}", + "Rematchable TRAINERS: {STR_VAR_1}\n" + "TRAINERS in rematch state: {STR_VAR_2}"); +const u8 Str_839BE8D[] = DTR("いる", "ON"); +const u8 Str_839BE90[] = DTR("いない", "OFF"); bool8 DebugMenu_8077974(void) { @@ -1251,11 +1258,15 @@ bool8 DebugMenu_8077AE8(void) return TRUE; } -const u8 Str_839BF0C[] = _("のこり {STR_VAR_1}ほ"); -const u8 Str_839BF14[] = _("{STR_VAR_1}\n" - "のこり {STR_VAR_2}ほ"); -const u8 Str_839BF1F[] = _("めのまえには\n" - "キューブが ありません!"); +const u8 Str_839BF0C[] = DTR("のこり {STR_VAR_1}ほ", "Remaining steps: {STR_VAR_1}"); +const u8 Str_839BF14[] = DTR("{STR_VAR_1}\n" + "のこり {STR_VAR_2}ほ", + "{STR_VAR_1}\n" + "Remaining steps: {STR_VAR_2}"); +const u8 Str_839BF1F[] = DTR("めのまえには\n" + "キューブが ありません!", + "There is no {POKEBLOCK}\n" + "in front of you!"); bool8 DebugMenu_8077B00(void) { @@ -1268,11 +1279,11 @@ bool8 DebugMenu_8077B00(void) return FALSE; } -const u8 Str_839BF33[] = _("ほすうをのこり1にする"); -const u8 Str_839BF3F[] = _("ボールをのこり1にする"); -const u8 Str_839BF4B[] = _("キューブおきば"); -const u8 Str_839BF53[] = _("ボールをのこり30に"); -const u8 Str_839BF5E[] = _("ほすうをのこり500に"); +const u8 Str_839BF33[] = DTR("ほすうをのこり1にする", "One step remaining"); +const u8 Str_839BF3F[] = DTR("ボールをのこり1にする", "One BALL remaining"); +const u8 Str_839BF4B[] = DTR("キューブおきば", "{POKEBLOCK} FEEDER"); +const u8 Str_839BF53[] = DTR("ボールをのこり30に", "30 BALLS remaining"); +const u8 Str_839BF5E[] = DTR("ほすうをのこり500に", "500 steps remaining"); const struct MenuAction gUnknown_Debug_839BF6C[] = { {Str_839BF4B, DebugMenu_8077B00}, @@ -1366,7 +1377,8 @@ u8 DebugMenu_8077C14(void) return FALSE; } -const u8 Str_839BFDC[] = _(" じかん ふん びょう"); + +const u8 Str_839BFDC[] = DTR(" じかん ふん びょう", " HOURS MINUTES SECONDS"); const s32 gUnknown_Debug_839BFE8[] = { 99, 10, 2, 23, @@ -1636,7 +1648,7 @@ void DebugMenu_8077F40(u8 taskId) task->func = DebugMenu_8077F7C; } -const u8 Str_839C014[] = _("How many?"); +const u8 Str_839C014[] = _("How many?"); void DebugMenu_8077F7C(u8 taskId) { @@ -1685,13 +1697,19 @@ void DebugMenu_807806C(u8 taskId) DebugMenu_8077048(); } -const u8 Str_839C01E[] = _("にがおえ ばんごう\n" - "ポケモンナンバー\n" - "ポケモンめい\n" - "ブリーダーめい\n" - "しゅるい\n" - "こせいらんすう"); -const u8 Str_839C04D[] = _("データなし"); +const u8 Str_839C01E[] = DTR("にがおえ ばんごう\n" + "ポケモンナンバー\n" + "ポケモンめい\n" + "ブリーダーめい\n" + "しゅるい\n" + "こせいらんすう", + "PORTRAIT No.\n" + "POKéMON No.\n" + "POKéMON Name\n" + "BREEDER Name\n" // TRN ? + "TYPE\n" + "Personality"); +const u8 Str_839C04D[] = DTR("データなし", "No data"); void DebugMenu_807808C(u32 a0) { @@ -1932,60 +1950,61 @@ u8 DebugMenu_OpenMysteryEvent(void) const u8 Str_839C07C[] = _("{STR_VAR_1}:{STR_VAR_2}\n" "{STR_VAR_3}"); -const u8 Str_839C085[] = _("みしよう データ"); +const u8 Str_839C085[] = DTR("みしよう データ", "Unused data"); const u8 Str_839C08E[] = _("Confirmation"); const u8 Str_839C09B[] = _("Max-1 set"); const u8 Str_839C0A5[] = _("Zero clear"); -const u8 Str_839C0B0[] = _("レポート"); -const u8 Str_839C0B5[] = _("クリア じかん"); -const u8 Str_839C0BD[] = _("りゅうこう さくせい"); -const u8 Str_839C0C8[] = _("きのみを うえたかいすう"); -const u8 Str_839C0D5[] = _("じてんしゃこうかん"); -const u8 Str_839C0DF[] = _("ほすう"); -const u8 Str_839C0E3[] = _("インタビュー"); -const u8 Str_839C0EA[] = _("バトル"); -const u8 Str_839C0EE[] = _("やせいバトル"); -const u8 Str_839C0F5[] = _("トレーナーバトル"); -const u8 Str_839C0FE[] = _("でんどういり"); -const u8 Str_839C105[] = _("ポケモンほかく"); -const u8 Str_839C10D[] = _("つった かいすう"); -const u8 Str_839C116[] = _("タマゴかえった"); -const u8 Str_839C11E[] = _("しんかした"); -const u8 Str_839C124[] = _("ポケセン かいふく"); -const u8 Str_839C12E[] = _("じたく かいふく"); -const u8 Str_839C137[] = _("サファリ りよう"); -const u8 Str_839C140[] = _("ひでん:いあいぎり"); -const u8 Str_839C14A[] = _("ひでん:いわくだき"); -const u8 Str_839C154[] = _("きち ひっこし"); -const u8 Str_839C15C[] = _("つうしんこうかん"); -const u8 Str_839C165[] = _("つうしんたいせん"); -const u8 Str_839C16E[] = _("つうしん かち"); -const u8 Str_839C176[] = _("つうしん まけ"); -const u8 Str_839C17E[] = _("つうしん ひきわけ"); -const u8 Str_839C188[] = _("わざ:はねる"); -const u8 Str_839C18F[] = _("わざ:わるあがき"); -const u8 Str_839C198[] = _("スロットおおあたりかいすう"); -const u8 Str_839C1A6[] = _("ルーレット れんしょう"); -const u8 Str_839C1B2[] = _("バトルタワー"); -const u8 Str_839C1B9[] = _("バトルタワーかち"); -const u8 Str_839C1C2[] = _("バトルタワーれんしょう"); -const u8 Str_839C1CE[] = _("ポロックさくせい"); -const u8 Str_839C1D7[] = _("つうしんでポロックつくった"); -const u8 Str_839C1E5[] = _("つうしんコンテストかち"); -const u8 Str_839C1F1[] = _("CPUコンテストさんか"); -const u8 Str_839C1FD[] = _("CPUコンテストかち"); -const u8 Str_839C208[] = _("かいもの"); -const u8 Str_839C20D[] = _("ダウジングマシン"); -const u8 Str_839C216[] = _("あめふり"); -const u8 Str_839C21B[] = _("ずかんをみた"); -const u8 Str_839C222[] = _("リボン もらった"); -const u8 Str_839C22B[] = _("だんさ とびおり"); -const u8 Str_839C234[] = _("TVを みた"); -const u8 Str_839C23B[] = _("とけいを みた"); -const u8 Str_839C243[] = _("くじが あたった"); -const u8 Str_839C24C[] = _("ポケモンあずけた"); -const u8 Str_839C255[] = _("ロープウェイりよう"); -const u8 Str_839C25F[] = _("おんせん はいった"); +const u8 Str_839C0B0[] = DTR("レポート", "SAVES"); +const u8 Str_839C0B5[] = DTR("クリア じかん", "Clear time"); +const u8 Str_839C0BD[] = DTR("りゅうこう さくせい", "TRENDS created"); +const u8 Str_839C0C8[] = DTR("きのみを うえたかいすう", "BERRIES planted"); +const u8 Str_839C0D5[] = DTR("じてんしゃこうかん", "BIKE swaps"); +const u8 Str_839C0DF[] = DTR("ほすう", "Steps"); +const u8 Str_839C0E3[] = DTR("インタビュー", "INTERVIEWS"); +const u8 Str_839C0EA[] = DTR("バトル", "BATTLES"); +const u8 Str_839C0EE[] = DTR("やせいバトル", "Wild BATTLES"); +const u8 Str_839C0F5[] = DTR("トレーナーバトル", "TRAINER BATTLES"); +const u8 Str_839C0FE[] = DTR("でんどういり", "HALL of FAME times"); +const u8 Str_839C105[] = DTR("ポケモンほかく", "POKéMON caught"); +const u8 Str_839C10D[] = DTR("つった かいすう", "Times fished"); +const u8 Str_839C116[] = DTR("タマゴかえった", "EGGS hatched"); +const u8 Str_839C11E[] = DTR("しんかした", "Evolutions"); +const u8 Str_839C124[] = DTR("ポケセン かいふく", "{PKMN} Center heals"); +const u8 Str_839C12E[] = DTR("じたく かいふく", "Home heals"); +const u8 Str_839C137[] = DTR("サファリ りよう", "SAFARI times"); +const u8 Str_839C140[] = DTR("ひでん:いあいぎり", "HM: CUT"); +const u8 Str_839C14A[] = DTR("ひでん:いわくだき", "HM: ROCK SMASH"); +const u8 Str_839C154[] = DTR("きち ひっこし", "BASE relocations"); +const u8 Str_839C15C[] = DTR("つうしんこうかん", "LINK TRADES"); +const u8 Str_839C165[] = DTR("つうしんたいせん", "LINK BATTLES"); +const u8 Str_839C16E[] = DTR("つうしん かち", "LINK WINS"); +const u8 Str_839C176[] = DTR("つうしん まけ", "LINK LOSSES"); +const u8 Str_839C17E[] = DTR("つうしん ひきわけ", "LINK TIES"); +// Idiot counter? +const u8 Str_839C188[] = DTR("わざ:はねる", "Move: SPLASH"); +const u8 Str_839C18F[] = DTR("わざ:わるあがき", "Move: STRUGGLE"); +const u8 Str_839C198[] = DTR("スロットおおあたりかいすう", "SLOTS jackpots"); +const u8 Str_839C1A6[] = DTR("ルーレット れんしょう", "ROULETTE streak"); +const u8 Str_839C1B2[] = DTR("バトルタワー", "BATTLE TOWER"); +const u8 Str_839C1B9[] = DTR("バトルタワーかち", "BATTLE TOWER wins"); +const u8 Str_839C1C2[] = DTR("バトルタワーれんしょう", "BATTLE TOWER streak"); +const u8 Str_839C1CE[] = DTR("ポロックさくせい", "{POKEBLOCK}s created"); +const u8 Str_839C1D7[] = DTR("つうしんでポロックつくった", "LINK {POKEBLOCK}s made"); +const u8 Str_839C1E5[] = DTR("つうしんコンテストかち", "LINK CONTEST wins"); +const u8 Str_839C1F1[] = DTR("CPUコンテストさんか", "CPU CONTEST entries"); +const u8 Str_839C1FD[] = DTR("CPUコンテストかち", "CPU CONTEST wins"); +const u8 Str_839C208[] = DTR("かいもの", "Shopping"); +const u8 Str_839C20D[] = DTR("ダウジングマシン", "ITEMFINDER"); +const u8 Str_839C216[] = DTR("あめふり", "Rained"); +const u8 Str_839C21B[] = DTR("ずかんをみた", "POKéDEX reads"); +const u8 Str_839C222[] = DTR("リボン もらった", "RIBBONS awarded"); +const u8 Str_839C22B[] = DTR("だんさ とびおり", "Ledge hops"); +const u8 Str_839C234[] = DTR("TVを みた", "Watched TV"); +const u8 Str_839C23B[] = DTR("とけいを みた", "Checked CLOCK"); +const u8 Str_839C243[] = DTR("くじが あたった", "LOTTERY wins"); +const u8 Str_839C24C[] = DTR("ポケモンあずけた", "POKéMON DAYCARE uses"); +const u8 Str_839C255[] = DTR("ロープウェイりよう", "CABLE CAR uses"); +const u8 Str_839C25F[] = DTR("おんせん はいった", "HOT SPRING uses"); const struct { u32 maxVal; @@ -2248,7 +2267,7 @@ u8 DebugMenu_OpenBerryInfo(void) return TRUE; } -const u8 Str_839C42E[] = _("レベル ステージ"); +const u8 Str_839C42E[] = DTR("レベル ステージ", "TOWER level stage"); void DebugMenu_8078950(void) { @@ -2337,7 +2356,7 @@ u8 DebugMenu_BattleTowerStages(void) return TRUE; } -const u8 Str_839C438[] = _("ポロック グループ{STR_VAR_1}"); +const u8 Str_839C438[] = DTR("ポロック グループ{STR_VAR_1}", "{POKEBLOCK} GROUP{STR_VAR_1}"); void DebugMenu_8078B70(u16 value) { @@ -2473,10 +2492,10 @@ bool8 DebugMenu_8078CA8(void) return FALSE; } -const u8 Str_839C5CC[] =_("かきこみ せいこう"); -const u8 Str_839C5D6[] =_("よみこみせいこう"); -const u8 Str_839C5DF[] =_("かきこみ しっぱい"); -const u8 Str_839C5E9[] =_("よみこみ しっぱい"); +const u8 Str_839C5CC[] = DTR("かきこみ せいこう", "Write successful"); +const u8 Str_839C5D6[] = DTR("よみこみせいこう", "Read successful"); +const u8 Str_839C5DF[] = DTR("かきこみ しっぱい", "Writing failed"); +const u8 Str_839C5E9[] = DTR("よみこみ しっぱい", "Reading failed"); bool8 DebugMenu_8078CE4(void) { diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index 68ccc6f9d..aa3c1d993 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -65,7 +65,7 @@ const u8 gUnknown_Debug_083C4E85[] = _("MAIL"); const u8 gUnknown_Debug_083C4E8A[] = _("MAIL salutation"); const u8 gUnknown_Debug_083C4E9A[] = _("BARD's song"); const u8 gUnknown_Debug_083C4EA6[] = _("Interview"); -const u8 gUnknown_Debug_083C4EB0[] = _("InterviewシBTス"); +const u8 gUnknown_Debug_083C4EB0[] = _("Interview(BT)"); const struct { const u8 * text; @@ -88,10 +88,10 @@ const u8 gUnknown_Debug_083C4F0E[] = _("BARD"); const u8 gUnknown_Debug_083C4F13[] = _("HIPSTER"); const u8 gUnknown_Debug_083C4F1B[] = _("RECYCLE"); const u8 gUnknown_Debug_083C4F23[] = _("STORYTELLER"); -const u8 gUnknown_Debug_083C4F2F[] = _("GIDDY GUY"); -const u8 gUnknown_Debug_083C4F39[] = _("Flag OFF"); -const u8 gUnknown_Debug_083C4F42[] = _("21 letters"); -const u8 gUnknown_Debug_083C4F4D[] = _("ナウくなる"); +const u8 gUnknown_Debug_083C4F2F[] = _("GIDDY GUY"); +const u8 gUnknown_Debug_083C4F39[] = _("Flag OFF"); +const u8 gUnknown_Debug_083C4F42[] = _("21 letters"); +const u8 gUnknown_Debug_083C4F4D[] = DTR("ナウくなる", "BECOME HIP"); const struct { const u8 * text; @@ -107,18 +107,18 @@ const struct { {gUnknown_Debug_083C4F4D} }; -const u8 gUnknown_Debug_083C4F94[] = _("しょうしょうおまちください!"); +const u8 gUnknown_Debug_083C4F94[] = DTR("しょうしょうおまちください!", "Please wait!"); const u8 gUnknown_Debug_083C4FA3[] = _("Weather"); -const u8 gUnknown_Debug_083C4FAB[] = _("LANETTE'S PC"); +const u8 gUnknown_Debug_083C4FAB[] = _("LANETTE'S PC"); const u8 gUnknown_Debug_083C4FB8[] = _("SimpleText"); const u8 gUnknown_Debug_083C4FC3[] = _("Old man"); const u8 gUnknown_Debug_083C4FCB[] = _("Trend"); -const u8 gUnknown_Debug_083C4FD1[] = _("Trend R"); -const u8 gUnknown_Debug_083C4FD9[] = _("Town flag"); -const u8 gUnknown_Debug_083C4FE3[] = _("Award a ribbon"); +const u8 gUnknown_Debug_083C4FD1[] = _("Trend R"); +const u8 gUnknown_Debug_083C4FD9[] = _("Town flag"); +const u8 gUnknown_Debug_083C4FE3[] = _("Award a ribbon"); const u8 gUnknown_Debug_083C4FF2[] = _("{PKMN}LOTTERY"); const u8 gUnknown_Debug_083C4FFC[] = _("Trainer"); -const u8 gUnknown_Debug_083C5004[] = _("POKéNAV D"); +const u8 gUnknown_Debug_083C5004[] = _("POKéNAV D"); const struct MenuAction gUnknown_Debug_083C5010[] = { {gUnknown_Debug_083C4FA3, debug_sub_808560C}, @@ -195,7 +195,7 @@ const struct { } }; -const u8 gUnknown_Debug_083C517C[] = _("Select Ribbon"); +const u8 gUnknown_Debug_083C517C[] = _("Select Ribbon"); bool8 TayaDebugMenu_Trend(void) { diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index daaca570c..eb4a046df 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -295,19 +295,19 @@ static const struct MenuAction sMenuActions_TrickRelated[] = { {sString_TrickRelated_TrickMaster, TrickRelated_TrickMaster_InitSubmenu} }; -static const u8 sString_Event1[] = _("パート1"); -static const u8 sString_Event2[] = _("パート2"); +static const u8 sString_Event1[] = DTR("パート1", "PART 1"); +static const u8 sString_Event2[] = DTR("パート2", "PART 2"); static const struct MenuAction sMenuActions_ControlEvents[] = { {sString_Event1, ControlEvents_InitSubmenu1}, {sString_Event2, ControlEvents_InitSubmenu2} }; -static const u8 sString_EventFlag[] = _("イベントFLAG"); -static const u8 sString_VanishFlag[] = _("バニシュFLAG"); -static const u8 sString_TrainerFlag[] = _("トレーナーFLAG"); +static const u8 sString_EventFlag[] = DTR("イベントFLAG", "EVENT FLAG"); +static const u8 sString_VanishFlag[] = DTR("バニシュFLAG", "VANISH FLAG"); +static const u8 sString_TrainerFlag[] = DTR("トレーナーFLAG", "TRAINER FLAG"); static const u8 sString_SysFlag[] = _("SYSFLAG"); -static const u8 sString_BallVanishFlag[] = _("BALLバニシュFLAG"); +static const u8 sString_BallVanishFlag[] = DTR("BALLバニシュFLAG", "VANISH FLAG"); static const u8 sString_FH[] = _("FH"); static const u8 sString_FH_OBJ[] = _("FH-OBJ"); @@ -326,7 +326,7 @@ static const u8 sString_SysWork[] = _("SYSWORK"); static const u8 sString_LocalWork[] = _("LOCALWORK"); static const u8 sString_ObjWork[] = _("OBJWORK"); static const u8 sString_AnsWork[] = _("ANSWORK"); -static const u8 sString_SaveWorkPart2[] = _("SAVEWORK パート2"); +static const u8 sString_SaveWorkPart2[] = DTR("SAVEWORK パート2", "SAVEWORK PART 2"); static const struct MenuAction sMenuActions_ControlWorks[] = { {sString_SaveWork, ControlWorks_SaveWork_InitSubmenu}, @@ -337,15 +337,15 @@ static const struct MenuAction sMenuActions_ControlWorks[] = { {sString_SaveWorkPart2, ControlWorks_SaveWorkPart2_InitSubmenu} }; -static const u8 sString_Clear_go[] = _("クリアご"); -static const u8 sString_Coin_kounyuuka[] = _("コインこうにゅうかのう"); -static const u8 sString_Oldale_supporter_set[] = _("コトキサポーターセット"); -static const u8 sString_New_Mauville_open[] = _("ニューキンセツOPEN"); -static const u8 sString_Renrakusen_ni_noreru[] = _("れんらくせんにのれる"); -static const u8 sString_Egg_tsuika[] = _("タマゴついか"); -static const u8 sString_Item_ippai[] = _("アイテムいっぱい"); -static const u8 sString_Gezzu_ippai[] = _("グッズいっぱい"); -static const u8 sString_Coin_ippai[] = _("COINいっぱい"); +static const u8 sString_Clear_go[] = DTR("クリアご", "POSTGAME"); +static const u8 sString_Coin_kounyuuka[] = DTR("コインこうにゅうかのう", ",Get COIN CASE"); +static const u8 sString_Oldale_supporter_set[] = DTR("コトキサポーターセット", "OLDALE POST RIVAL"); +static const u8 sString_New_Mauville_open[] = DTR("ニューキンセツOPEN", "Open NEW MAUVILLE"); +static const u8 sString_Renrakusen_ni_noreru[] = DTR("れんらくせんにのれる", "Get S.S. TICKET"); +static const u8 sString_Egg_tsuika[] = DTR("タマゴついか", "Get KYOGRE EGG"); +static const u8 sString_Item_ippai[] = DTR("アイテムいっぱい", "Max Items"); +static const u8 sString_Gezzu_ippai[] = DTR("グッズいっぱい", "Max Decorations"); +static const u8 sString_Coin_ippai[] = DTR("COINいっぱい", "Max COINS"); static const struct MenuAction sMenuActions_ControlEvents_Events1[] = { {sString_Clear_go, CallScript_DoHallOfFame}, @@ -359,12 +359,13 @@ static const struct MenuAction sMenuActions_ControlEvents_Events1[] = { {sString_Coin_ippai, CallScript_GiveAllCoins} }; -static const u8 sString_SootpolisGymOpen[] = _("ムロジムOPEN"); -static const u8 sString_MoneyTo0[] = _("おかねを0へ"); -static const u8 sString_BarboachFull[] = _("ドジョッチ FULL"); -static const u8 sString_ShroomishFull[] = _("キノココ FULL"); -static const u8 sString_BarboachEgg[] = _("ドジョッチ タマゴ"); -static const u8 sString_ShroomishEgg[] = _("キノココ タマゴ"); +// Note: JP text says Dewford Gym for some reason. +static const u8 sString_SootpolisGymOpen[] = DTR("ムロジムOPEN", "Open SOOTOPOLIS GYM"); +static const u8 sString_MoneyTo0[] = DTR("おかねを0へ", "Set money to 0"); +static const u8 sString_BarboachFull[] = DTR("ドジョッチ FULL", "Full BARBOACH PARTY"); +static const u8 sString_ShroomishFull[] = DTR("キノココ FULL", "Full SHROOMISH PARTY"); +static const u8 sString_BarboachEgg[] = DTR("ドジョッチ タマゴ", "Get BARBOACH EGG"); +static const u8 sString_ShroomishEgg[] = DTR("キノココ タマゴ", "Get SHROOMISH EGG"); static const struct MenuAction sMenuActions_ControlEvents_Events2[] = { {sString_SootpolisGymOpen, CallScript_OpenSootopolisGym}, @@ -375,7 +376,7 @@ static const struct MenuAction sMenuActions_ControlEvents_Events2[] = { {sString_ShroomishEgg, CallScript_GiveShroomishEgg} }; -static const u8 sString_Answork_Mikansei[] = _("ANSWORK みかんせい"); +static const u8 sString_Answork_Mikansei[] = DTR("ANSWORK みかんせい", "ANSWORK Incomplete"); static const struct MenuAction sMenuActions_ControlEvents_AnsWork[] = { {sString_Answork_Mikansei, DummyMenuAction} @@ -499,15 +500,15 @@ static const u16 gUnknown_Debug_083C12D2[][9] = { {0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10} }; -static const u8 gUnknown_Debug_083C12F6[] = _("BATCH"); -static const u8 gUnknown_Debug_083C12FC[] = _("タウンとうちゃく"); -static const u8 gUnknown_Debug_083C1305[] = _("シティとうちゃく"); +static const u8 gUnknown_Debug_083C12F6[] = DTR("BATCH", "BADGE"); +static const u8 gUnknown_Debug_083C12FC[] = DTR("タウンとうちゃく", "Towns arrived"); +static const u8 gUnknown_Debug_083C1305[] = DTR("シティとうちゃく", "Cities arrived"); static const u8 gUnknown_Debug_083C130E[] = _("GET"); -static const u8 gUnknown_Debug_083C1312[] = _("そのた1"); -static const u8 gUnknown_Debug_083C1317[] = _("そのた2"); -static const u8 gUnknown_Debug_083C131C[] = _("そのた3"); -static const u8 gUnknown_Debug_083C1321[] = _("そのた4"); -static const u8 gUnknown_Debug_083C1326[] = _("そのた とうちゃく"); +static const u8 gUnknown_Debug_083C1312[] = DTR("そのた1", "Other 1"); +static const u8 gUnknown_Debug_083C1317[] = DTR("そのた2", "Other 2"); +static const u8 gUnknown_Debug_083C131C[] = DTR("そのた3", "Other 3"); +static const u8 gUnknown_Debug_083C1321[] = DTR("そのた4", "Other 4"); +static const u8 gUnknown_Debug_083C1326[] = DTR("そのた とうちゃく", "Others arrived"); static const struct MenuAction gUnknown_Debug_083C1330[] = { {gUnknown_Debug_083C12F6, debug_sub_808CFA4}, @@ -717,7 +718,7 @@ static const u16 gUnknown_Debug_083C19C6[][9] = { {FLAG_LANDMARK_SEAFLOOR_CAVERN, FLAG_LANDMARK_BATTLE_TOWER, FLAG_LANDMARK_SOUTHERN_ISLAND, FLAG_SYS_POKEMON_LEAGUE_FLY, FLAG_LANDMARK_SKY_PILLAR} }; -static const u8 gDebug_0x83C1A68[] = _("FVーBALL パート1"); +static const u8 gDebug_0x83C1A68[] = DTR("FVーBALL パート1", "FV-BALL PART 1"); static const struct MenuAction gUnknown_Debug_083C1A78[] = { {gDebug_0x83C1A68, debug_sub_808D8D8} @@ -737,9 +738,9 @@ static const u16 gUnknown_Debug_083C1AAE[][9] = { {FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1} }; -static const u8 gUnknown_Debug_083C1AC0[] = _("ジムリーダー"); -static const u8 gUnknown_Debug_083C1AC7[] = _("してんのう"); -static const u8 gUnknown_Debug_083C1ACD[] = _("みつる/Champロード"); +static const u8 gUnknown_Debug_083C1AC0[] = DTR("ジムリーダー", "GYM LEADER"); +static const u8 gUnknown_Debug_083C1AC7[] = DTR("してんのう", "ELITE FOUR"); +static const u8 gUnknown_Debug_083C1ACD[] = DTR("みつる/Champロード", "WALLY/VICTORY ROAD"); static const struct MenuAction gUnknown_Debug_083C1ADC[] = { {gUnknown_Debug_083C1AC0, debug_sub_808CD08}, @@ -792,14 +793,14 @@ static const u16 gUnknown_Debug_083C1C38[][9] = { {0x04E1} }; -static const u8 gUnknown_Debug_083C1C6E[] = _("120/119ばんどうろカクレオン"); -static const u8 gUnknown_Debug_083C1C80[] = _("そのた1 / SUPPORTM/W"); -static const u8 gUnknown_Debug_083C1C92[] = _("ODAMAKI/FIGHTER1"); -static const u8 gUnknown_Debug_083C1CA3[] = _("MITSURU/TENKI"); -static const u8 gUnknown_Debug_083C1CB1[] = _("そのた2 /DAIGO"); +static const u8 gUnknown_Debug_083C1C6E[] = DTR("120/119ばんどうろカクレオン", "ROUTE 120/119 KECLEON"); +static const u8 gUnknown_Debug_083C1C80[] = DTR("そのた1 / SUPPORTM/W", "Other 1/SUPPORT/M/W"); +static const u8 gUnknown_Debug_083C1C92[] = DTR("ODAMAKI/FIGHTER1", "BIRCH/FIGHTER1"); +static const u8 gUnknown_Debug_083C1CA3[] = DTR("MITSURU/TENKI", "WALLY/WEATHER"); +static const u8 gUnknown_Debug_083C1CB1[] = DTR("そのた2 /DAIGO", "Other 2/STEVEN"); static const u8 gUnknown_Debug_083C1CBD[] = _("POKE/POKEMON"); static const u8 gUnknown_Debug_083C1CCA[] = _("MAMA/SUPPORT02"); -static const u8 gUnknown_Debug_083C1CD9[] = _("HAGI"); +static const u8 gUnknown_Debug_083C1CD9[] = DTR("HAGI", "Mr. BRINEY"); static const u8 gUnknown_Debug_083C1CDE[] = _("SUPPORT01"); static const struct MenuAction gUnknown_Debug_083C1CE8[] = { @@ -1020,15 +1021,16 @@ static const u16 gUnknown_Debug_083C271A[][9] = { {FLAG_HIDE_RIVAL_BIRCH_LAB, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, FLAG_HIDE_RIVAL_RUSTBORO, FLAG_HIDE_RIVAL_LILYCOVE_MART, FLAG_HIDE_RIVAL_ROUTE103, FLAG_HIDE_RIVAL_ROUTE110, FLAG_HIDE_RIVAL_ROUTE119, FLAG_HIDE_RIVAL_LAVARIDGE_1, FLAG_HIDE_RIVAL_OLDALE_TOWN} }; -static const u8 gUnknown_Debug_083C27BC[] = _("FEひでんわざ/デボンかんれん"); -static const u8 gUnknown_Debug_083C27CC[] = _("FEだいじなアイテムPART1"); -static const u8 gUnknown_Debug_083C27DC[] = _("そのた1"); -static const u8 gUnknown_Debug_083C27E1[] = _("MITSURU/DOOR"); -static const u8 gUnknown_Debug_083C27EE[] = _("カラクリやしき10のやじるし/GYM07"); -static const u8 gUnknown_Debug_083C2803[] = _("SUPPORT/そのた4"); -static const u8 gUnknown_Debug_083C2810[] = _("DAISUKI/そのた5"); -static const u8 gUnknown_Debug_083C281D[] = _("そのた2"); -static const u8 gUnknown_Debug_083C2822[] = _("そのた6"); +static const u8 gUnknown_Debug_083C27BC[] = DTR("FEひでんわざ/デボンかんれん", "Field HMs/DEVON-related"); +static const u8 gUnknown_Debug_083C27CC[] = DTR("FEだいじなアイテムPART1", "Field Key Items Part 1"); +static const u8 gUnknown_Debug_083C27DC[] = DTR("そのた1", "Other 1"); +static const u8 gUnknown_Debug_083C27E1[] = DTR("MITSURU/DOOR", "WALLY/Door"); +static const u8 gUnknown_Debug_083C27EE[] = DTR("カラクリやしき10のやじるし/GYM07", + "TRICK HOUSE 10 Arrows/GYM 7"); +static const u8 gUnknown_Debug_083C2803[] = DTR("SUPPORT/そのた4", "Support/Other 4"); +static const u8 gUnknown_Debug_083C2810[] = DTR("DAISUKI/そのた5", "FAN CLUB/Other 5"); +static const u8 gUnknown_Debug_083C281D[] = DTR("そのた2", "Other 2"); +static const u8 gUnknown_Debug_083C2822[] = DTR("そのた6", "Other 6"); static const struct MenuAction gUnknown_Debug_083C2828[] = { {gUnknown_Debug_083C27BC, debug_sub_808C3B0}, @@ -1254,11 +1256,11 @@ static const u16 gUnknown_Debug_83C31E6[][9] = { {FLAG_BIRCH_AIDE_MET, FLAG_DECLINED_BIKE, FLAG_RECEIVED_SECRET_POWER} }; -static const u8 gUnknown_Debug_083C3288[] = _("CYCLEかんれん"); -static const u8 gUnknown_Debug_083C3292[] = _("おおきさくらべ"); -static const u8 gUnknown_Debug_083C329A[] = _("カウンタ"); -static const u8 gUnknown_Debug_083C329F[] = _("そのた1"); -static const u8 gUnknown_Debug_083C32A4[] = _("そのた2"); +static const u8 gUnknown_Debug_083C3288[] = DTR("CYCLEかんれん", "CYCLE-related"); +static const u8 gUnknown_Debug_083C3292[] = DTR("おおきさくらべ", "Size comparison"); +static const u8 gUnknown_Debug_083C329A[] = DTR("カウンタ", "Counter"); +static const u8 gUnknown_Debug_083C329F[] = DTR("そのた1", "Other 1"); +static const u8 gUnknown_Debug_083C32A4[] = DTR("そのた2", "Other 2"); static const struct MenuAction gUnknown_Debug_083C32AC[] = { {gUnknown_Debug_083C3288, debug_sub_808E400}, @@ -1404,11 +1406,11 @@ static const u16 gUnknown_Debug_083C371E[][9] = { }; static const u8 gUnknown_Debug_083C3742[] = _("SP"); -static const u8 gUnknown_Debug_083C3745[] = _("ルーム R110 PART1/カラクリ"); -static const u8 gUnknown_Debug_083C3759[] = _("ルーム R110 PART2"); -static const u8 gUnknown_Debug_083C3768[] = _("ルーム ロード"); -static const u8 gUnknown_Debug_083C3770[] = _("ソノタ1"); -static const u8 gUnknown_Debug_083C3775[] = _("ソノタ2"); +static const u8 gUnknown_Debug_083C3745[] = DTR("ルーム R110 PART1/カラクリ", "Room R110 Part 1/TRICK"); +static const u8 gUnknown_Debug_083C3759[] = DTR("ルーム R110 PART2", "Room R110 Part 2"); +static const u8 gUnknown_Debug_083C3768[] = DTR("ルーム ロード", "Room road"); +static const u8 gUnknown_Debug_083C3770[] = DTR("ソノタ1", "Other 1"); +static const u8 gUnknown_Debug_083C3775[] = DTR("ソノタ2", "Other 2"); static const struct MenuAction sMenuActions_ControlWorks_SaveWorkPart2[] = { {gUnknown_Debug_083C3742, ControlWorks_SaveWorkPart2_SP_InitSubsubmenu}, @@ -1561,15 +1563,15 @@ static const u16 sControlWorks_SaveWork_ItemArrays[][9] = { {VAR_WEATHER_INSTITUTE_STATE, VAR_SLATEPORT_FAN_CLUB_STATE, 0x40BB, VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, VAR_GAME_CORNER_STATE, VAR_WHICH_FOSSIL_REVIVED} }; -static const u8 sString_Town[] = _("タウン"); -static const u8 sString_City[] = _("シティ"); -static const u8 sString_Route_101_to_109[] = _("ロード101ー109"); -static const u8 sString_Route_110_to_118[] = _("ロード110ー118"); -static const u8 sString_Route_119_to_127[] = _("ロード119ー127"); -static const u8 sString_Route_128_to_134[] = _("ロード128ー134"); -static const u8 sString_Room_Town[] = _("ルーム タウン"); -static const u8 sString_Room_City[] = _("ルーム シティ"); -static const u8 sString_Dungeon_nai[] = _("ダンジョンない"); +static const u8 sString_Town[] = DTR("タウン", "TOWN"); +static const u8 sString_City[] = DTR("シティ", "CITY"); +static const u8 sString_Route_101_to_109[] = DTR("ロード101ー109", "ROUTE 101-109"); +static const u8 sString_Route_110_to_118[] = DTR("ロード110ー118", "ROUTE 110-118"); +static const u8 sString_Route_119_to_127[] = DTR("ロード119ー127", "ROUTE 119-127"); +static const u8 sString_Route_128_to_134[] = DTR("ロード128ー134", "ROUTE 128-134"); +static const u8 sString_Room_Town[] = DTR("ルーム タウン", "Room Town"); +static const u8 sString_Room_City[] = DTR("ルーム シティ", "Room City"); +static const u8 sString_Dungeon_nai[] = DTR("ダンジョンない", "DUNGEON"); static const struct MenuAction sMenuAction_ControlWorks_SaveWork[] = { {sString_Town, ControlWorks_SaveWork_Town_InitSubsubmenu}, @@ -1858,13 +1860,13 @@ static const struct MenuAction gUnknown_Debug_083C47F0[] = { {gUnknown_Debug_083C47E9, DummyMenuAction} }; -static const u8 gUnknown_Debug_083C4830[] = _("Trick Master"); +static const u8 gUnknown_Debug_083C4830[] = _("Trick Master"); -static const u8 gUnknown_Debug_083C483D[] = _("Hidden MASTER"); -static const u8 gUnknown_Debug_083C484B[] = _("Inside the HOUSE"); -static const u8 gUnknown_Debug_083C485C[] = _("Pass a reward"); -static const u8 gUnknown_Debug_083C486A[] = _("Rig a trick"); -static const u8 gUnknown_Debug_083C4876[] = _("MASTER is gone"); +static const u8 gUnknown_Debug_083C483D[] = _("Hidden MASTER"); +static const u8 gUnknown_Debug_083C484B[] = _("Inside the HOUSE"); +static const u8 gUnknown_Debug_083C485C[] = _("Pass a reward"); +static const u8 gUnknown_Debug_083C486A[] = _("Rig a trick"); +static const u8 gUnknown_Debug_083C4876[] = _("MASTER is gone"); static const struct MenuAction gUnknown_Debug_083C4888[] = { {gUnknown_Debug_083C483D, DummyMenuAction}, diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index 2e3b684d9..c055781fb 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -400,16 +400,16 @@ void InitSizeComparison(void) gTasks[taskId].data[0] = 0xfc; } -const u8 gUnknown_Debug_083F7FDA[] = _("ひりつ"); -const u8 gUnknown_Debug_083F7FDE[] = _("たかさ"); -const u8 gUnknown_Debug_083F7FE2[] = _("Lキー▶しゅくしょう"); -const u8 gUnknown_Debug_083F7FED[] = _("Rキー▶かくだい"); -const u8 gUnknown_Debug_083F7FF6[] = _("Uキー▶うえ いどう"); -const u8 gUnknown_Debug_083F8001[] = _("Dキー▶した いどう"); -const u8 gUnknown_Debug_083F800C[] = _("Aボタン▶そうさきりかえ"); -const u8 gUnknown_Debug_083F8019[] = _("Bボタン▶やめる"); -const u8 gUnknown_Debug_083F8022[] = _("スタート:"); -const u8 gUnknown_Debug_083F8028[] = _(":セレクト"); +const u8 gUnknown_Debug_083F7FDA[] = DTR("ひりつ", "SCALE"); +const u8 gUnknown_Debug_083F7FDE[] = DTR("たかさ", "HEIGHT"); +const u8 gUnknown_Debug_083F7FE2[] = DTR("Lキー▶しゅくしょう", "{LEFT_ARROW}: SHRINK"); +const u8 gUnknown_Debug_083F7FED[] = DTR("Rキー▶かくだい", "{RIGHT_ARROW}: ENLARGE"); +const u8 gUnknown_Debug_083F7FF6[] = DTR("Uキー▶うえ いどう", "{UP_ARROW}: MOVE UP"); +const u8 gUnknown_Debug_083F8001[] = DTR("Dキー▶した いどう", "{DOWN_ARROW}: MOVE DOWN"); +const u8 gUnknown_Debug_083F800C[] = DTR("Aボタン▶そうさきりかえ", "A: SWITCH CONTROL"); +const u8 gUnknown_Debug_083F8019[] = DTR("Bボタン▶やめる", "B: QUIT"); +const u8 gUnknown_Debug_083F8022[] = DTR("スタート:", "START:"); +const u8 gUnknown_Debug_083F8028[] = DTR(":セレクト", ":SELECT"); #ifdef NONMATCHING void debug_80C3A50(u8 taskId) @@ -1003,11 +1003,13 @@ void debug_80C41A8(void) CreateTask(debug_80C47BC, 0); } -const u8 gUnknown_Debug_083F802E[] = _("やせいたいせん"); -const u8 gUnknown_Debug_083F8036[] = _("1VS1たいせん"); -const u8 gUnknown_Debug_083F803F[] = _("2VS2たいせん"); -const u8 gUnknown_Debug_083F8048[] = _("{COLOR BLUE}1VS1つうしんたいせん"); -const u8 gUnknown_Debug_083F8058[] = _("{COLOR BLUE}2VS2つうしんたいせん"); +const u8 gUnknown_Debug_083F802E[] = DTR("やせいたいせん", "Wild BATTLE"); +const u8 gUnknown_Debug_083F8036[] = DTR("1VS1たいせん", "1v1 BATTLE"); +const u8 gUnknown_Debug_083F803F[] = DTR("2VS2たいせん", "2v2 BATTLE"); +const u8 gUnknown_Debug_083F8048[] = DTR("{COLOR BLUE}1VS1つうしんたいせん", + "{COLOR BLUE}LINK 1v1 BATTLE"); +const u8 gUnknown_Debug_083F8058[] = DTR("{COLOR BLUE}2VS2つうしんたいせん", + "{COLOR BLUE}LINK 2v2 BATTLE"); const struct WatanabeDebugMenuItem gUnknown_Debug_083F8068[] = { {gUnknown_Debug_083F802E, {.type1 = {0x00, 0x01}}}, @@ -1017,16 +1019,16 @@ const struct WatanabeDebugMenuItem gUnknown_Debug_083F8068[] = { {gUnknown_Debug_083F8058, {.type1 = {0x0B, 0x02}}} }; -const u8 gUnknown_Debug_083F8090[] = _("きほんタイプ"); -const u8 gUnknown_Debug_083F8097[] = _("AIタイプ2"); -const u8 gUnknown_Debug_083F809E[] = _("AIタイプ3"); -const u8 gUnknown_Debug_083F80A5[] = _("AIタイプ4"); -const u8 gUnknown_Debug_083F80AC[] = _("AIタイプ5"); -const u8 gUnknown_Debug_083F80B3[] = _("AIタイプ6"); -const u8 gUnknown_Debug_083F80BA[] = _("AIタイプ7"); -const u8 gUnknown_Debug_083F80C1[] = _("AIタイプ8"); -const u8 gUnknown_Debug_083F80C8[] = _("AIタイプ9"); -const u8 gUnknown_Debug_083F80CF[] = _("AIタイプ10"); +const u8 gUnknown_Debug_083F8090[] = DTR("きほんタイプ", "Base type"); +const u8 gUnknown_Debug_083F8097[] = DTR("AIタイプ2", "AI type 2"); +const u8 gUnknown_Debug_083F809E[] = DTR("AIタイプ3", "AI type 3"); +const u8 gUnknown_Debug_083F80A5[] = DTR("AIタイプ4", "AI type 4"); +const u8 gUnknown_Debug_083F80AC[] = DTR("AIタイプ5", "AI type 5"); +const u8 gUnknown_Debug_083F80B3[] = DTR("AIタイプ6", "AI type 6"); +const u8 gUnknown_Debug_083F80BA[] = DTR("AIタイプ7", "AI type 7"); +const u8 gUnknown_Debug_083F80C1[] = DTR("AIタイプ8", "AI type 8"); +const u8 gUnknown_Debug_083F80C8[] = DTR("AIタイプ9", "AI type 9"); +const u8 gUnknown_Debug_083F80CF[] = DTR("AIタイプ10", "AI type 10"); const struct WatanabeDebugMenuItem gUnknown_Debug_083F80D8[] = { {gUnknown_Debug_083F8090, {.type2 = 0x1}}, @@ -1041,15 +1043,15 @@ const struct WatanabeDebugMenuItem gUnknown_Debug_083F80D8[] = { {gUnknown_Debug_083F80CF, {.type2 = 0x200}} }; -const u8 gUnknown_Debug_083F8128[] = _("くさ"); -const u8 gUnknown_Debug_083F812B[] = _("ながい くさ"); -const u8 gUnknown_Debug_083F8132[] = _("すな"); -const u8 gUnknown_Debug_083F8135[] = _("みず"); -const u8 gUnknown_Debug_083F8138[] = _("うみ"); -const u8 gUnknown_Debug_083F813B[] = _("いけ"); -const u8 gUnknown_Debug_083F813E[] = _("いわ"); -const u8 gUnknown_Debug_083F8141[] = _("どうくつ"); -const u8 gUnknown_Debug_083F8146[] = _("そのた"); +const u8 gUnknown_Debug_083F8128[] = DTR("くさ", "GRASS"); +const u8 gUnknown_Debug_083F812B[] = DTR("ながい くさ", "TALL GRASS"); +const u8 gUnknown_Debug_083F8132[] = DTR("すな", "SAND"); +const u8 gUnknown_Debug_083F8135[] = DTR("みず", "WATER"); +const u8 gUnknown_Debug_083F8138[] = DTR("うみ", "SEA"); +const u8 gUnknown_Debug_083F813B[] = DTR("いけ", "POND"); +const u8 gUnknown_Debug_083F813E[] = DTR("いわ", "ROCKY"); +const u8 gUnknown_Debug_083F8141[] = DTR("どうくつ", "CAVE"); +const u8 gUnknown_Debug_083F8146[] = DTR("そのた", "OTHER"); const struct WatanabeDebugMenuItem gUnknown_Debug_083F814C[] = { {gUnknown_Debug_083F8128, {.type3 = 0x0}}, @@ -1105,8 +1107,8 @@ void debug_80C4214(UNUSED u8 a0) void debug_80C42B8(u8 taskId) { - u8 sp00[] = _("ポケモンを えらんでね"); - u8 sp0c[] = _("{COLOR RED}START:つぎへ"); + u8 sp00[] = DTR("ポケモンを えらんでね", "Choose POKéMON"); + u8 sp0c[] = DTR("{COLOR RED}START:つぎへ", "{COLOR RED}START: NEXT"); Menu_DrawStdWindowFrame(0, 16, 29, 19); Menu_PrintText(sp00, 1, 17); @@ -1218,7 +1220,7 @@ void debug_80C4550(u8 taskId) void debug_80C4694(void) { u8 i; - u8 sp00[] = _("{COLOR RED}じぶんの ポケモン"); + u8 sp00[] = DTR("{COLOR RED}じぶんの ポケモン", "{COLOR RED}Enemy's POKéMON"); u8 sp10[POKEMON_NAME_LENGTH + 1]; Menu_DrawStdWindowFrame(0, 0, 14, 15); @@ -1233,7 +1235,7 @@ void debug_80C4694(void) void debug_80C4704(void) { u8 i; - u8 sp00[] = _("{COLOR RED}あいての ポケモン"); + u8 sp00[] = DTR("{COLOR RED}あいての ポケモン", "{COLOR RED}Your POKéMON"); u8 sp10[POKEMON_NAME_LENGTH + 1]; Menu_DrawStdWindowFrame(15, 0, 29, 15); @@ -1256,10 +1258,10 @@ bool8 debug_80C4774(void) void debug_80C47BC(u8 taskId) { u8 i; - u8 sp00[] = _("たいせんモードを えらんでね"); - u8 sp10[] = _("{COLOR RED}START:つぎへ"); - u8 sp20[] = _("{COLOR RED}バトルモード せんたく"); - u8 sp30[] = _("{COLOR RED}トレーナーAI せんたく"); + u8 sp00[] = DTR("たいせんモードを えらんでね", "Choose a battle mode"); + u8 sp10[] = DTR("{COLOR RED}START:つぎへ", "{COLOR RED}START: NEXT"); + u8 sp20[] = DTR("{COLOR RED}バトルモード せんたく", "{COLOR RED}Battle mode:"); + u8 sp30[] = DTR("{COLOR RED}トレーナーAI せんたく", "{COLOR RED}TRAINER AI mode:"); Menu_DrawStdWindowFrame(0, 16, 29, 19); Menu_PrintText(sp00, 1, 17); @@ -1424,9 +1426,9 @@ void debug_80C4C44(u8 a0) void debug_80C4D14(u8 taskId) { - u8 sp00[] = _("たいせんモードを えらんでね"); - u8 sp10[] = _("{COLOR RED}START:かいし"); - u8 sp20[] = _("{COLOR RED}バトルちけい せんたく"); + u8 sp00[] = DTR("たいせんモードを えらんでね", "Choose a battle mode"); + u8 sp10[] = DTR("{COLOR RED}START:かいし", "{COLOR RED}START: BEGIN"); + u8 sp20[] = DTR("{COLOR RED}バトルちけい せんたく", "{COLOR RED}Battle terrain:"); Menu_DrawStdWindowFrame(0, 16, 29, 19); Menu_PrintText(sp00, 1, 17); @@ -1499,11 +1501,11 @@ void debug_80C4F00(u8 a0) void debug_80C4F48(u8 taskId) { - u8 sp00[] = _("じぶんの せいべつを えらんでね"); - u8 sp14[] = _("{COLOR RED}START:つぎへ"); - u8 sp24[] = _("{COLOR RED}せいべつ せんたく"); - u8 sp34[] = _("おとこ"); - u8 sp38[] = _("おんな"); + u8 sp00[] = DTR("じぶんの せいべつを えらんでね", "Choose a gender"); + u8 sp14[] = DTR("{COLOR RED}START:つぎへ", "{COLOR RED}START: NEXT"); + u8 sp24[] = DTR("{COLOR RED}せいべつ せんたく", "{COLOR RED}Gender:"); + u8 sp34[] = DTR("おとこ", "BOY"); + u8 sp38[] = DTR("おんな", "GIRL"); Menu_DrawStdWindowFrame(0, 16, 29, 19); Menu_PrintText(sp00, 1, 17); @@ -1732,7 +1734,7 @@ const u8 gUnknown_Debug_083F851C[] = _("{COLOR RED}DEF "); const u8 gUnknown_Debug_083F8524[] = _("{COLOR RED}SPEED"); const u8 gUnknown_Debug_083F852D[] = _("{COLOR RED}SP。ATK"); const u8 gUnknown_Debug_083F8537[] = _("{COLOR RED}SP。DEF"); -const u8 gUnknown_Debug_083F8541[] = _("なし"); +const u8 gUnknown_Debug_083F8541[] = DTR("なし", "without"); const u8 gUnknown_Debug_083F8544[] = _("♂"); const u8 gUnknown_Debug_083F8546[] = _("♀"); const u8 gUnknown_Debug_083F8548[] = _("ー"); @@ -1828,11 +1830,11 @@ const struct WatanabeDebugMenuItem gUnknown_Debug_083F86E8[] = { {gUnknown_Debug_083F86E0, {.type3 = 0x80}} }; -const u8 gUnknown_Debug_083F8720[] = _("PKMNワLIST"); -const u8 gUnknown_Debug_083F872A[] = _("PKMNワBOX"); +const u8 gUnknown_Debug_083F8720[] = _("PKMN{RIGHT_ARROW}LIST"); +const u8 gUnknown_Debug_083F872A[] = _("PKMN{RIGHT_ARROW}BOX"); void InitCreatePokemon(void) { - u8 sp04[] = _("Create POKひMON LR:Shift START:Add"); + u8 sp04[] = _("Create POKéMON LR:Shift START:Add"); debug_80C35DC(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); @@ -2193,7 +2195,7 @@ void debug_80C5EF4(void) void debug_80C5FFC(void) { u32 ivs; - u8 sp10[] = _("たまご"); + u8 sp10[] = DTR("たまご", "EGG"); u8 sp14[] = _("DebugーG"); u8 one; u16 ff; @@ -2600,12 +2602,12 @@ const u16 gUnknown_Debug_083F8790[] = { 0x0002 }; -const u8 gUnknown_Debug_083F87D0[] = _("{COLOR RED}L{ESCAPE}ロ"); -const u8 gUnknown_Debug_083F87D8[] = _("{COLOR RED}{ESCAPE}ワR"); -const u8 gUnknown_Debug_083F87E0[] = _("かいはつナンバー"); -const u8 gUnknown_Debug_083F87E9[] = _("グラフィックナンバー"); -const u8 gUnknown_Debug_083F87F4[] = _("{COLOR RED}A:カラーせってい"); -const u8 gUnknown_Debug_083F8801[] = _("{COLOR RED}A:けってい B:キャンセル"); +const u8 gUnknown_Debug_083F87D0[] = _("{COLOR RED}L{ESCAPE}{LEFT_ARROW}"); +const u8 gUnknown_Debug_083F87D8[] = _("{COLOR RED}{ESCAPE}{RIGHT_ARROW}R"); +const u8 gUnknown_Debug_083F87E0[] = DTR("かいはつナンバー", "Devel No."); +const u8 gUnknown_Debug_083F87E9[] = DTR("グラフィックナンバー", "Graphic No."); +const u8 gUnknown_Debug_083F87F4[] = DTR("{COLOR RED}A:カラーせってい", "{COLOR RED}A: SET COLOR"); +const u8 gUnknown_Debug_083F8801[] = DTR("{COLOR RED}A:けってい B:キャンセル", "{COLOR RED}A: CONFIRM B: CANCEL"); const u8 gUnknown_Debug_083F8813[] = _(":"); void debug_80C6B00(u8 taskId) { diff --git a/src/field_weather.c b/src/field_weather.c index 9a5a83737..340445fd2 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -216,21 +216,21 @@ static const u8 sBasePaletteGammaTypes[32] = #if DEBUG -static const u8 sDebugText_Weather_None[] = _("なし "); // "none" -static const u8 sDebugText_Weather_Clear[] = _("はれ "); // "clear" -static const u8 sDebugText_Weather_Clear2[] = _("はれ2 "); // "clear2" -static const u8 sDebugText_Weather_Rain[] = _("あめ "); // "rain" -static const u8 sDebugText_Weather_Snow[] = _("ゆき "); // "snow" -static const u8 sDebugText_Weather_Lightning[] = _("かみなり "); // "lightning" -static const u8 sDebugText_Weather_Fog[] = _("きり "); // "fog" -static const u8 sDebugText_Weather_VolcanicAsh[] = _("かざんばい"); // "volcanic ash" -static const u8 sDebugText_Weather_Sandstorm[] = _("すなあらし"); // "sandstorm -static const u8 sDebugText_Weather_Fog2[] = _("きり2 "); // "fog2" -static const u8 sDebugText_Weather_Underwater[] = _("かいてい "); // "undersea" -static const u8 sDebugText_Weather_Cloudy[] = _("くもり "); // "cloudy" -static const u8 sDebugText_Weather_Clear3[] = _("はれ3 "); // "clear3" -static const u8 sDebugText_Weather_HeavyRain[] = _("おおあめ"); // "heavy rain" -static const u8 sDebugText_Weather_Underwater2[] = _("かいてい2"); // "undersea2" +static const u8 sDebugText_Weather_None[] = DTR("なし ", "NONE "); +static const u8 sDebugText_Weather_Clear[] = DTR("はれ ", "CLOUDY "); +static const u8 sDebugText_Weather_Clear2[] = DTR("はれ2 ", "SUNNY "); +static const u8 sDebugText_Weather_Rain[] = DTR("あめ ", "RAIN "); +static const u8 sDebugText_Weather_Snow[] = DTR("ゆき ", "SNOW "); +static const u8 sDebugText_Weather_Lightning[] = DTR("かみなり ", "LIGHTNING "); +static const u8 sDebugText_Weather_Fog[] = DTR("きり ", "FOG 1 "); +static const u8 sDebugText_Weather_VolcanicAsh[] = DTR("かざんばい", "ASH "); +static const u8 sDebugText_Weather_Sandstorm[] = DTR("すなあらし", "SANDSTORM "); +static const u8 sDebugText_Weather_Fog2[] = DTR("きり2 ", "FOG 2 "); +static const u8 sDebugText_Weather_Underwater[] = DTR("かいてい ", "FOG 3 "); +static const u8 sDebugText_Weather_Cloudy[] = DTR("くもり ", "SHADE "); +static const u8 sDebugText_Weather_Clear3[] = DTR("はれ3 ", "DROUGHT "); +static const u8 sDebugText_Weather_HeavyRain[] = DTR("おおあめ", "HEAVY RAIN"); +static const u8 sDebugText_Weather_Underwater2[] = DTR("かいてい2", "UNDERWATER"); static const u8 *const sDebugText_Weather[] = { diff --git a/src/mail.c b/src/mail.c index 8b4647532..27a25feba 100644 --- a/src/mail.c +++ b/src/mail.c @@ -242,9 +242,9 @@ const struct MailLayout gUnknown_083E57A4[] = #if DEBUG -const u8 Str_8411540[] = _("レイアウトを にほんごで ひょうじ?"); // Display using Japanese layout? -const u8 Str_8411553[] = _("にほんご "); // Japanese -const u8 Str_8411559[] = _("かいがい "); // Overseas +const u8 Str_8411540[] = DTR("レイアウトを にほんごで ひょうじ?", "Display using JAPANESE layout?"); +const u8 Str_8411553[] = DTR("にほんご ", "JAPANESE"); +const u8 Str_8411559[] = DTR("かいがい ", "OVERSEAS"); const u8 *const _8411560[] = { @@ -252,20 +252,20 @@ const u8 *const _8411560[] = Str_8411559, }; -const u8 Str_8411568[] = _("イメージ タイプを えらんでね"); // Choose an image type +const u8 Str_8411568[] = DTR("イメージ タイプを えらんでね", "Choose an image type"); const u8 Str_8411578[] = _("{STR_VAR_1}"); -const u8 Str_841157B[] = _("オレンジ "); // Orange -const u8 Str_8411581[] = _("ハーバー "); // Harbor -const u8 Str_8411587[] = _("キラキラ "); // Glitter -const u8 Str_841158D[] = _("メカニカル"); // Mech -const u8 Str_8411593[] = _("ウッディー"); // Wood -const u8 Str_8411599[] = _("クロス "); // Wave -const u8 Str_841159F[] = _("トレジャー"); // Bead -const u8 Str_84115A5[] = _("シャドウ "); // Shadow -const u8 Str_84115AB[] = _("トロピカル"); // Tropic -const u8 Str_84115B1[] = _("ドリーム "); // Dream -const u8 Str_84115B7[] = _("ミラクル "); // Fab -const u8 Str_84115BD[] = _("レトロ "); // Retro +const u8 Str_841157B[] = DTR("オレンジ ", "ORANGE "); +const u8 Str_8411581[] = DTR("ハーバー ", "HARBOR "); +const u8 Str_8411587[] = DTR("キラキラ ", "GLITTER"); +const u8 Str_841158D[] = DTR("メカニカル", "MECH "); +const u8 Str_8411593[] = DTR("ウッディー", "WOOD "); +const u8 Str_8411599[] = DTR("クロス ", "WAVE "); +const u8 Str_841159F[] = DTR("トレジャー", "BEAD "); +const u8 Str_84115A5[] = DTR("シャドウ ", "SHADOW "); +const u8 Str_84115AB[] = DTR("トロピカル", "TROPIC "); +const u8 Str_84115B1[] = DTR("ドリーム ", "DREAM "); +const u8 Str_84115B7[] = DTR("ミラクル ", "FAB "); +const u8 Str_84115BD[] = DTR("レトロ ", "RETRO "); const u8 *const _84115C4[] = { @@ -283,10 +283,10 @@ const u8 *const _84115C4[] = Str_84115BD, }; -const u8 Str_84115F4[] = _("メールをみる"); // View Mail -const u8 Str_84115FB[] = _("メールとうろく"); // Register Mail -const u8 Str_8411603[] = _("もたせる"); // Give to Pokémon -const u8 Str_8411608[] = _("メールをけす"); // Delete Mail +const u8 Str_84115F4[] = DTR("メールをみる", "View MAIL"); +const u8 Str_84115FB[] = DTR("メールとうろく", "Register MAIL"); +const u8 Str_8411603[] = DTR("もたせる", "Give MAIL"); +const u8 Str_8411608[] = DTR("メールをけす", "Delete MAIL"); #endif @@ -744,7 +744,7 @@ void debug_sub_810CA7C(u8 taskId) void debug_sub_810CB50(u8 taskId) { u8 sp0[] = _("{STR_VAR_1} {STR_VAR_2}"); - u8 sp8[] = _("メール{STR_VAR_1} {STR_VAR_2}"); + u8 sp8[] = DTR("メール{STR_VAR_1} {STR_VAR_2}", "MAIL{STR_VAR_1} {STR_VAR_2}"); bool8 r2 = FALSE; if (gMain.newKeys & A_BUTTON) @@ -791,7 +791,7 @@ void debug_sub_810CB50(u8 taskId) void debug_sub_810CCEC(u8 taskId) { - u8 string1[] = _("メール{STR_VAR_1}を だれに もたせる?"); + u8 string1[] = DTR("メール{STR_VAR_1}を だれに もたせる?", "Give MAIL {STR_VAR_1} to who?"); u8 string2[] = _("000 {STR_VAR_1}"); ConvertIntToDecimalStringN(gStringVar1, gSpecialVar_0x8005, 1, 1); @@ -876,8 +876,10 @@ u8 debug_sub_810CEA4(void) u8 debug_sub_810CED0(void) { - u8 text[] = _("せいきの データが とうろくずみ です\n" - "しんき とうろく できません"); + u8 text[] = DTR("せいきの データが とうろくずみ です\n" + "しんき とうろく できません", + "Normal data is registered.\n" + "Cannot register new data."); s8 input = Menu_ProcessInput(); switch (input) @@ -911,8 +913,10 @@ u8 debug_sub_810CED0(void) u8 debug_sub_810CFA4(void) { - u8 text[] = _("せいきに とうろくされたメールデータは\n" - "へんこう できません"); + u8 text[] = DTR("せいきに とうろくされたメールデータは\n" + "へんこう できません", + "Regularly, registered MAIL data\n" + "cannot be changed."); s8 input = Menu_ProcessInput(); switch (input) @@ -990,7 +994,7 @@ u8 debug_sub_810D030(void) void debug_sub_810D174(u8 a) { - u8 string[] = _("メール{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}"); + u8 string[] = DTR("メール{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}", "MAIL{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}"); u8 buffer[9][20]; struct MenuAction menuActions[9]; u8 i; diff --git a/src/main.c b/src/main.c index d7ef91df0..ad4a669b7 100644 --- a/src/main.c +++ b/src/main.c @@ -34,10 +34,12 @@ const u8 gGameVersion = GAME_VERSION; const u8 gGameLanguage = GAME_LANGUAGE; -#if defined(ENGLISH) -const char BuildDateTime[] = "2002 10 15 20:34"; -#elif defined(GERMAN) +// The debug menu expects this exact format. With the English build string, it +// will overflow on the title debug menu, outputting '9999ィ'. +#if defined(GERMAN) || DEBUG const char BuildDateTime[] = "$Name: debug-Euro-2003-05-09-A $"; +#elif defined(ENGLISH) +const char BuildDateTime[] = "2002 10 15 20:34"; #endif const IntrFunc gIntrTableTemplate[] = diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 7bccddde5..c87a5ed72 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -635,10 +635,10 @@ void debug_sub_806F9B8(void) ScriptContext2_Enable(); } -static const u8 sDebugText_Days[] = _("にっすう"); // "days" -static const u8 sDebugText_Time[] = _("じかん"); // "time" -static const u8 sDebugText_GameTime[] = _("ゲームない じかん"); // "game time" -static const u8 sDebugText_RTCTime[] = _("RTC じかん"); // "RTC time" +static const u8 sDebugText_Days[] = DTR("にっすう", "days"); +static const u8 sDebugText_Time[] = DTR("じかん", "time"); +static const u8 sDebugText_GameTime[] = DTR("ゲームない じかん", "game time"); +static const u8 sDebugText_RTCTime[] = DTR("RTC じかん", "RTC time"); void debug_sub_806F9E4(u8 taskId) { diff --git a/src/slot_machine.c b/src/slot_machine.c index 3de87e0f7..b73b1e80a 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -5616,29 +5616,30 @@ static void debug_sub_811B2E8(void) Menu_PrintText(text, 6, 1); } -static const u8 Str_841B1C4[] = _("SETTEI"); -static const u8 Str_841B1CB[] = _("MAWASITA"); -static const u8 Str_841B1D4[] = _("MODOSI"); -static const u8 Str_841B1DB[] = _("NOMARE"); -static const u8 Str_841B1E2[] = _("MAE 7"); -static const u8 Str_841B1E8[] = _("LR HENKOU"); -static const u8 Str_841B1F3[] = _("START JIDOUSU"); -static const u8 Str_841B202[] = _("SELECT SETTEI"); -static const u8 Str_841B211[] = _("TYUHSEN"); +static const u8 Str_841B1C4[] = DTR("SETTEI", "SET"); +static const u8 Str_841B1CB[] = DTR("MAWASITA", "TURNED"); +static const u8 Str_841B1D4[] = DTR("MODOSI", "RETURN"); +static const u8 Str_841B1DB[] = _("NOMARE"); // TRN: Normal, 's rare, etc? +static const u8 Str_841B1E2[] = DTR("MAE 7", "BEFORE 7"); +static const u8 Str_841B1E8[] = DTR("LR HENKOU", "LR: CHANGE"); +static const u8 Str_841B1F3[] = _("START JIDOUSU"); // TRN +static const u8 Str_841B202[] = DTR("SELECT SETTEI", "SELECT: SET"); +// Irregular Romaji: 抽選 (ちゅうせん/chuusen) +static const u8 Str_841B211[] = DTR("TYUHSEN", "LOTTERY"); static const u8 Str_841B219[] = _("CHERRY"); static const u8 Str_841B220[] = _("REPLAY"); -static const u8 Str_841B227[] = _("HASUBO"); -static const u8 Str_841B22E[] = _("RURIRI"); -static const u8 Str_841B235[] = _("INAZU"); +static const u8 Str_841B227[] = DTR("HASUBO", "LOTAD"); // TRN +static const u8 Str_841B22E[] = DTR("RURIRI", "AZURILL"); +static const u8 Str_841B235[] = DTR("INAZU", "LIGHTNING"); static const u8 Str_841B23B[] = _("REG"); static const u8 Str_841B23F[] = _("BIG"); static const u8 Str_841B243[] = _("BD"); static const u8 Str_841B246[] = _("R7"); static const u8 Str_841B249[] = _("B7"); -static const u8 Str_841B24C[] = _("A COIN"); -static const u8 Str_841B254[] = _("TYUHSEN"); -static const u8 Str_841B25C[] = _("UD 100"); -static const u8 Str_841B264[] = _("LR 1000"); +static const u8 Str_841B24C[] = _("A COIN"); +static const u8 Str_841B254[] = DTR("TYUHSEN", "LOTTERY"); +static const u8 Str_841B25C[] = _("UD 100"); +static const u8 Str_841B264[] = _("LR 1000"); static const u8 Str_841B26D[] = _("×"); void debug_sub_811B310(void) @@ -5882,10 +5883,10 @@ static void debug_sub_811B654(u8 taskId) } } -static const u8 Str_841B2B0[] = _("·カウントエラーがおきました"); -static const u8 Str_841B2BF[] = _("·リールそうさで エラーが おきました"); -static const u8 Str_841B2D3[] = _("·フラグオフエラーが おきました"); -static const u8 Str_841B2E4[] = _("·ボーナスこやくの エラーが おきました"); +static const u8 Str_841B2B0[] = DTR("·カウントエラーがおきました", "Count error occured."); +static const u8 Str_841B2BF[] = DTR("·リールそうさで エラーが おきました", "Reel processing error occurred."); +static const u8 Str_841B2D3[] = DTR("·フラグオフエラーが おきました", "FLAG OFF error occurred."); +static const u8 Str_841B2E4[] = DTR("·ボーナスこやくの エラーが おきました", "BONUS use error occurred."); // TRN static void debug_sub_811B894(void) { |