diff --git a/data/scripts/apricorn_tree.inc b/data/scripts/apricorn_tree.inc index 019b2b76b0..de1f39978b 100644 --- a/data/scripts/apricorn_tree.inc +++ b/data/scripts/apricorn_tree.inc @@ -60,30 +60,30 @@ ApricornTree_EventScript_CancelPickingApricorn:: end ApricornTree_Text_Intro: - .string "It's an Apricorn Tree!$" + .string "是一棵球果树！$" ApricornTree_Text_Empty: - .string "There are no Apricorns…$" + .string "树上没有球果……$" ApricornTree_Text_WantToPick: - .string "…It's {STR_VAR_2} {STR_VAR_1}!\p" - .string "Do you want to pick the\n" - .string "{STR_VAR_1}?$" + .string "……是{STR_VAR_2}{STR_VAR_1}！\p" + .string "要摘下这颗\n" + .string "{STR_VAR_1}吗？$" ApricornTree_Text_PickedTheApricorn: - .string "{PLAYER} obtained\n" - .string "{STR_VAR_2} {STR_VAR_1}.$" + .string "{PLAYER}获得了\n" + .string "{STR_VAR_2}{STR_VAR_1}。$" ApricornTree_Text_PutAwayApricorn: - .string "{PLAYER} put away the\n" - .string "{STR_VAR_1} in\l" - .string "the BAG's {STR_VAR_3} POCKET.$" + .string "{PLAYER}将{STR_VAR_1}\n" + .string "放入了背包的\l" + .string "{STR_VAR_3}口袋。$" ApricornTree_Text_PocketFull: - .string "The BAG's {STR_VAR_3} POCKET is full.\p" - .string "{PLAYER} gave up on the\p" - .string "{STR_VAR_1}…$" + .string "背包的{STR_VAR_3}口袋已经满了。\p" + .string "{PLAYER}只好放弃了\p" + .string "{STR_VAR_1}……$" ApricornTree_Text_ApricornLeftUnpicked: - .string "{PLAYER} gave up on the\p" - .string "{STR_VAR_1}…$" + .string "{PLAYER}放弃了\p" + .string "{STR_VAR_1}……$" diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc index 28e7df5990..c33c3d5a62 100644 --- a/data/scripts/debug.inc +++ b/data/scripts/debug.inc @@ -531,55 +531,55 @@ Debug_EventScript_InflictStatus1_Text_Frostbite: .string "冻伤$" Debug_EventScript_ChangeNature_Text_Hardy: - .string "Hardy$" + .string "勤奋$" Debug_EventScript_ChangeNature_Text_Lonely: - .string "Lonely$" + .string "怕寂寞$" Debug_EventScript_ChangeNature_Text_Brave: - .string "Brave$" + .string "勇敢$" Debug_EventScript_ChangeNature_Text_Adamant: - .string "Adamant$" + .string "固执$" Debug_EventScript_ChangeNature_Text_Naughty: - .string "Naughty$" + .string "顽皮$" Debug_EventScript_ChangeNature_Text_Bold: - .string "Bold$" + .string "大胆$" Debug_EventScript_ChangeNature_Text_Docile: - .string "Docile$" + .string "坦率$" Debug_EventScript_ChangeNature_Text_Relaxed: - .string "Relaxed$" + .string "悠闲$" Debug_EventScript_ChangeNature_Text_Impish: - .string "Impish$" + .string "淘气$" Debug_EventScript_ChangeNature_Text_Lax: - .string "Lax$" + .string "乐天$" Debug_EventScript_ChangeNature_Text_Timid: - .string "Timid$" + .string "胆小$" Debug_EventScript_ChangeNature_Text_Hasty: - .string "Hasty$" + .string "急躁$" Debug_EventScript_ChangeNature_Text_Serious: - .string "Serious$" + .string "认真$" Debug_EventScript_ChangeNature_Text_Jolly: - .string "Jolly$" + .string "爽朗$" Debug_EventScript_ChangeNature_Text_Naive: - .string "Naive$" + .string "天真$" Debug_EventScript_ChangeNature_Text_Modest: - .string "Modest$" + .string "内敛$" Debug_EventScript_ChangeNature_Text_Mild: - .string "Mild$" + .string "慢吞吞$" Debug_EventScript_ChangeNature_Text_Quiet: - .string "Quiet$" + .string "冷静$" Debug_EventScript_ChangeNature_Text_Bashful: - .string "Bashful$" + .string "害羞$" Debug_EventScript_ChangeNature_Text_Rash: - .string "Rash$" + .string "马虎$" Debug_EventScript_ChangeNature_Text_Calm: - .string "Calm$" + .string "温和$" Debug_EventScript_ChangeNature_Text_Gentle: - .string "Gentle$" + .string "温顺$" Debug_EventScript_ChangeNature_Text_Sassy: - .string "Sassy$" + .string "自大$" Debug_EventScript_ChangeNature_Text_Careful: - .string "Careful$" + .string "慎重$" Debug_EventScript_ChangeNature_Text_Quirky: - .string "Quirky$" + .string "浮躁$" Debug_EventScript_EWRAMCounters:: callnative CheckEWRAMCounters diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index c4965ea818..1ef3cbb469 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -465,12 +465,10 @@ EventScript_EndRockClimb:: end Text_WantToRockClimb: - .string "The cliff is steep.\n" - .string "Would you like to use Rock Climb?$" + .string "岩石表面看起来非常粗糙……\n要使用攀岩吗？$" Text_MonUsedRockClimb: - .string "{STR_VAR_1} used Rock Climb!$" + .string "{STR_VAR_1}使出了攀岩！$" Text_CantRockClimb: - .string "The cliff is steep.\n" - .string "A Pokémon may be able to climb it.$" + .string "岩石表面看起来非常粗糙……\n或许可以用秘传招式攀爬？$" diff --git a/data/text/move_relearner.inc b/data/text/move_relearner.inc index b9400fd62b..9aa0586d7d 100644 --- a/data/text/move_relearner.inc +++ b/data/text/move_relearner.inc @@ -1,55 +1,50 @@ MoveRelearner_Text_WouldLearnNewMoves: - .string "Hi, I'm the Move Relearner.\n" - .string "Would you like to learn new moves?$" + .string "大家都叫我\n宝可梦招式爱好者！\p宝可梦成长过程中能学会的\n所有招式我都一清二楚。\p要把招式教给你的宝可梦吗？$" MoveRelearner_Text_LevelUpMoves: - .string "Level Up Moves$" + .string "升级招式$" MoveRelearner_Text_EggMoves: - .string "Egg Moves$" + .string "蛋招式$" MoveRelearner_Text_TMMoves: - .string "TM Moves$" + .string "学习器招式$" MoveRelearner_Text_TutormoveMoves: - .string "Tutor Moves$" + .string "教授招式$" MoveRelearner_Text_SeeYa: - .string "See ya!$" + .string "再见！$" MoveRelearner_Text_AnythingElse: - .string "Is there anything else I may do for you?$" + .string "还有其他要做的事吗？$" MoveRelearner_Text_ChoosePkmn: - .string "Please choose your Pokémon.$" + .string "要选择哪只宝可梦？$" MoveRelearner_Text_HaveNoPkmn: - .string "You have no Pokémon.$" + .string "你没有同行的宝可梦！$" MoveRelearner_Text_CantTeachMoveToEgg: - .string "Sorry…\n" - .string "But an Egg can't learn moves.$" + .string "嗯……\p蛋应该没法学习招式吧？$" MoveRelearner_Text_CantTeachMoveToPkmn: - .string "Sorry…\p" - .string "It doesn't appear as if I have any move\n" - .string "I can teach that Pokémon.$" + .string "抱歉……\p我看来没有能够教给\n这只宝可梦的招式。$" MoveRelearner_Text_LevelUpMoveLWR:: - .string "level up move$" + .string "升级招式$" MoveRelearner_Text_EggMoveLWR:: - .string "egg move$" + .string "蛋招式$" MoveRelearner_Text_TMMoveLWR:: - .string "TM move$" + .string "学习器招式$" MoveRelearner_Text_TutorMoveLWR:: - .string "tutor move$" + .string "教授招式$" MoveRelearner_Text_WhichXmoveShouldTeach: - .string "Which {STR_VAR_3} should I teach?$" + .string "要学习哪个{STR_VAR_3}？$" MoveRelearner_Text_ThankYouComeAgain: - .string "Thank you for using our services.\n" - .string "Please come again!$" + .string "想让宝可梦学习招式时再过来吧。$" diff --git a/data/text/surf.inc b/data/text/surf.inc index bd09a92250..baaec1d654 100644 --- a/data/text/surf.inc +++ b/data/text/surf.inc @@ -2,4 +2,4 @@ gText_WantToUseSurf:: .string "水面呈现出一片湛蓝。\n要使用冲浪吗？$" gText_PlayerUsedSurf:: - .string "{STR_VAR_1}使用冲浪！$" + .string "{STR_VAR_1}使出了冲浪！$" diff --git a/python_tools/src/图鉴.xlsx b/python_tools/src/图鉴.xlsx index ff90ae3ebc..4b8f8df5a2 100644 Binary files a/python_tools/src/图鉴.xlsx and b/python_tools/src/图鉴.xlsx differ diff --git a/src/contest.c b/src/contest.c index c04aa306a2..a6e515bbe0 100644 --- a/src/contest.c +++ b/src/contest.c @@ -717,7 +717,7 @@ const struct ContestCategory gContestCategoryInfo[CONTEST_CATEGORIES_COUNT + 1] .name = COMPOUND_STRING("帅气"), .condition = COMPOUND_STRING("帅气"), .generic = COMPOUND_STRING("帅气"), - .negativeTrait = COMPOUND_STRING("害羞"), + .negativeTrait = COMPOUND_STRING("扑通扑通"), .palette = 13, }, @@ -726,7 +726,7 @@ const struct ContestCategory gContestCategoryInfo[CONTEST_CATEGORIES_COUNT + 1] .name = COMPOUND_STRING("美丽"), .condition = COMPOUND_STRING("美丽"), .generic = COMPOUND_STRING("美丽招式"), - .negativeTrait = COMPOUND_STRING("焦虑"), + .negativeTrait = COMPOUND_STRING("慌慌张张"), .palette = 14, }, @@ -735,7 +735,7 @@ const struct ContestCategory gContestCategoryInfo[CONTEST_CATEGORIES_COUNT + 1] .name = COMPOUND_STRING("可爱"), .condition = COMPOUND_STRING("可爱"), .generic = COMPOUND_STRING("可爱招式"), - .negativeTrait = COMPOUND_STRING("懒惰"), + .negativeTrait = COMPOUND_STRING("散散漫漫"), .palette = 14, }, @@ -744,7 +744,7 @@ const struct ContestCategory gContestCategoryInfo[CONTEST_CATEGORIES_COUNT + 1] .name = COMPOUND_STRING("聪明"), .condition = COMPOUND_STRING("聪明"), .generic = COMPOUND_STRING("聪明招式"), - .negativeTrait = COMPOUND_STRING("犹豫"), + .negativeTrait = COMPOUND_STRING("犹犹豫豫"), .palette = 15, }, @@ -753,7 +753,7 @@ const struct ContestCategory gContestCategoryInfo[CONTEST_CATEGORIES_COUNT + 1] .name = COMPOUND_STRING("强壮"), .condition = COMPOUND_STRING("强壮"), .generic = COMPOUND_STRING("强壮招式"), - .negativeTrait = COMPOUND_STRING("害怕"), + .negativeTrait = COMPOUND_STRING("战战栗栗"), .palette = 13, }, diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 56d9cd0943..038f4a62ff 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -553,7 +553,7 @@ static const struct WindowTemplate sSummaryTemplate[] = .bg = 0, .tilemapLeft = 18, .tilemapTop = 2, - .width = 11, + .width = 13, .height = 2, .paletteNum = 15, .baseBlock = 800, diff --git a/src/strings.c b/src/strings.c index bb3c656d3f..d2985419fb 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1218,7 +1218,7 @@ const u8 gText_TrainerHill1F[] = _("1F"); const u8 gText_TrainerHill2F[] = _("2F"); const u8 gText_TrainerHill3F[] = _("3F"); const u8 gText_TrainerHill4F[] = _("4F"); -const u8 gText_TeachWhichMoveToPkmn[] = _("要让{STR_VAR_1}学习哪个{STR_VAR_3}呢？"); +const u8 gText_TeachWhichMoveToPkmn[] = _("要让{STR_VAR_1}学习哪个\n{STR_VAR_3}呢？"); const u8 gText_MoveRelearnerTeachMoveConfirm[] = _("要学习{STR_VAR_2}吗？"); const u8 gText_MoveRelearnerPkmnLearnedMove[] = _("{STR_VAR_1}学会了\n{STR_VAR_2}！"); const u8 gText_MoveRelearnerPkmnTryingToLearnMove[] = _("{STR_VAR_1}想要学习\n{STR_VAR_2}……\p为了学习{STR_VAR_2}，\n要忘记其他的招式吗？"); @@ -1226,7 +1226,7 @@ const u8 gText_MoveRelearnerStopTryingToTeachMove[] = _("放弃学习{STR_VAR_2} const u8 gText_MoveRelearnerAndPoof[] = _("{PAUSE 32}1， {PAUSE 15}2， {PAUSE 15}……{PAUSE 15}……{PAUSE 15}……{PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}空！\p"); const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1}忘记了{STR_VAR_3}！\p并且学会了{STR_VAR_2}！"); const u8 gText_MoveRelearnedPkmnDidNotLearnMove[] = _("{STR_VAR_1}没有学习{STR_VAR_2}。"); // Unused -const u8 gText_MoveRelearnerGiveUp[] = _("要放弃让{STR_VAR_1}学习新招式吗？"); +const u8 gText_MoveRelearnerGiveUp[] = _("要放弃让{STR_VAR_1}学习\n新招式吗？"); const u8 gText_MoveRelearnerWhichMoveToForget[] = _("要忘记哪个招式呢？\p"); const u8 gText_MoveRelearnerBattleMoves[] = _("战斗招式"); const u8 gText_MoveRelearnerContestMovesTitle[] = _("华丽大赛招式"); @@ -1250,7 +1250,7 @@ const u8 gText_Cancel4[] = _("取消"); const u8 gText_CommStandbyAwaitingOtherPlayer[] = _("正在等待连接……\n等待其他玩家选择。"); const u8 gText_BattleWasRefused[] = _("对战要求被拒绝。{PAUSE 60}！"); const u8 gText_RefusedBattle[] = _("拒绝对战。{PAUSE 60}！"); -const u8 gText_NoWeather[] = _("天气正常 // Below are unused debug names for weather types"); // Below are unused debug names for weather types +const u8 gText_NoWeather[] = _("天气正常"); // Below are unused debug names for weather types const u8 gText_Sunny[] = _("晴天"); // Unused const u8 gText_Sunny2[] = _("晴天2"); // Unused const u8 gText_Rain[] = _("下雨"); // Unused @@ -1279,10 +1279,10 @@ const u8 gText_BasePointsResetToZero[] = _("{STR_VAR_1}的\n基础点数消失 const u8 gText_AM[] = _("AM"); const u8 gText_PM[] = _("PM"); const u8 gText_Relearn[] = _("{START_BUTTON} 回忆"); // future note: don't decap this, because it mimics the summary screen BG graphics which will not get decapped -const u8 gText_Relearn_LevelUp[] = _("{START_BUTTON}回忆升级招式"); -const u8 gText_Relearn_Egg[] = _("{START_BUTTON}回忆蛋招式"); +const u8 gText_Relearn_LevelUp[] = _("{START_BUTTON} 回忆升级招式"); +const u8 gText_Relearn_Egg[] = _("{START_BUTTON} 回忆蛋招式"); const u8 gText_Relearn_TM[] = _("{START_BUTTON}回忆学习器招式"); -const u8 gText_Relearn_Tutor[] = _("{START_BUTTON}回忆教授招式"); +const u8 gText_Relearn_Tutor[] = _("{START_BUTTON} 回忆教授招式"); const u8 gText_Rename[] = _("更改昵称"); const u8 gText_CannotSendMonToBoxHM[] = _("无法将那只宝可梦送回盒子，\n因为它学会了秘传招式。{PAUSE_UNTIL_PRESS}"); const u8 gText_CannotSendMonToBoxActive[] = _("无法将正在战斗的宝可梦\n送回盒子。{PAUSE_UNTIL_PRESS}");