diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 5ff81bf673..4b19bd005f 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1759,9 +1759,9 @@ static void MoveSelectionDisplayMoveDescription(u32 battler) u16 acc = GetMoveAccuracy(move); u8 pwr_num[3], acc_num[3]; - u8 cat_desc[7] = _("CAT: "); - u8 pwr_desc[7] = _("PWR: "); - u8 acc_desc[7] = _("ACC: "); + u8 cat_desc[] = _("类型: "); + u8 pwr_desc[] = _("威力: "); + u8 acc_desc[] = _("命中率: "); u8 cat_start[] = _("{CLEAR_TO 0x03}"); u8 pwr_start[] = _("{CLEAR_TO 0x38}"); u8 acc_start[] = _("{CLEAR_TO 0x6D}"); diff --git a/src/battle_main.c b/src/battle_main.c index 4834e26796..682f90b873 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -294,72 +294,72 @@ static const s8 sCenterToCornerVecXs[8] ={-32, -16, -16, -32, -32}; // [TRAINER_CLASS_XYZ] = { _("name"), , } const struct TrainerClass gTrainerClasses[TRAINER_CLASS_COUNT] = { - [TRAINER_CLASS_PKMN_TRAINER_1] = { _("{PKMN} TRAINER") }, - [TRAINER_CLASS_PKMN_TRAINER_2] = { _("{PKMN} TRAINER") }, - [TRAINER_CLASS_HIKER] = { _("HIKER"), 10 }, - [TRAINER_CLASS_TEAM_AQUA] = { _("TEAM AQUA") }, - [TRAINER_CLASS_PKMN_BREEDER] = { _("{PKMN} BREEDER"), 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_HEAL : BALL_FRIEND }, - [TRAINER_CLASS_COOLTRAINER] = { _("COOLTRAINER"), 12, BALL_ULTRA }, - [TRAINER_CLASS_BIRD_KEEPER] = { _("BIRD KEEPER"), 8 }, - [TRAINER_CLASS_COLLECTOR] = { _("COLLECTOR"), 15, BALL_PREMIER }, - [TRAINER_CLASS_SWIMMER_M] = { _("SWIMMER♂"), 2, BALL_DIVE }, - [TRAINER_CLASS_TEAM_MAGMA] = { _("TEAM MAGMA") }, - [TRAINER_CLASS_EXPERT] = { _("EXPERT"), 10 }, - [TRAINER_CLASS_AQUA_ADMIN] = { _("AQUA ADMIN"), 10 }, - [TRAINER_CLASS_BLACK_BELT] = { _("BLACK BELT"), 8, BALL_ULTRA }, - [TRAINER_CLASS_AQUA_LEADER] = { _("AQUA LEADER"), 20, BALL_MASTER }, - [TRAINER_CLASS_HEX_MANIAC] = { _("HEX MANIAC"), 6 }, - [TRAINER_CLASS_AROMA_LADY] = { _("AROMA LADY"), 10 }, - [TRAINER_CLASS_RUIN_MANIAC] = { _("RUIN MANIAC"), 15 }, - [TRAINER_CLASS_INTERVIEWER] = { _("INTERVIEWER"), 12 }, - [TRAINER_CLASS_TUBER_F] = { _("TUBER"), 1 }, - [TRAINER_CLASS_TUBER_M] = { _("TUBER"), 1 }, - [TRAINER_CLASS_LADY] = { _("LADY"), 50 }, - [TRAINER_CLASS_BEAUTY] = { _("BEAUTY"), 20 }, - [TRAINER_CLASS_RICH_BOY] = { _("RICH BOY"), 50 }, - [TRAINER_CLASS_POKEMANIAC] = { _("POKéMANIAC"), 15 }, - [TRAINER_CLASS_GUITARIST] = { _("GUITARIST"), 8 }, - [TRAINER_CLASS_KINDLER] = { _("KINDLER"), 8 }, - [TRAINER_CLASS_CAMPER] = { _("CAMPER"), 4 }, - [TRAINER_CLASS_PICNICKER] = { _("PICNICKER"), 4 }, - [TRAINER_CLASS_BUG_MANIAC] = { _("BUG MANIAC"), 15 }, - [TRAINER_CLASS_PSYCHIC] = { _("PSYCHIC"), 6 }, - [TRAINER_CLASS_GENTLEMAN] = { _("GENTLEMAN"), 20, BALL_LUXURY }, - [TRAINER_CLASS_ELITE_FOUR] = { _("ELITE FOUR"), 25, BALL_ULTRA }, - [TRAINER_CLASS_LEADER] = { _("LEADER"), 25 }, - [TRAINER_CLASS_SCHOOL_KID] = { _("SCHOOL KID") }, - [TRAINER_CLASS_SR_AND_JR] = { _("SR. AND JR."), 4 }, - [TRAINER_CLASS_WINSTRATE] = { _("WINSTRATE"), 10 }, - [TRAINER_CLASS_POKEFAN] = { _("POKéFAN"), 20 }, - [TRAINER_CLASS_YOUNGSTER] = { _("YOUNGSTER"), 4 }, - [TRAINER_CLASS_CHAMPION] = { _("CHAMPION"), 50 }, - [TRAINER_CLASS_FISHERMAN] = { _("FISHERMAN"), 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_DIVE : BALL_LURE }, - [TRAINER_CLASS_TRIATHLETE] = { _("TRIATHLETE"), 10 }, - [TRAINER_CLASS_DRAGON_TAMER] = { _("DRAGON TAMER"), 12 }, - [TRAINER_CLASS_NINJA_BOY] = { _("NINJA BOY"), 3 }, - [TRAINER_CLASS_BATTLE_GIRL] = { _("BATTLE GIRL"), 6 }, - [TRAINER_CLASS_PARASOL_LADY] = { _("PARASOL LADY"), 10 }, - [TRAINER_CLASS_SWIMMER_F] = { _("SWIMMER♀"), 2, BALL_DIVE }, - [TRAINER_CLASS_TWINS] = { _("TWINS"), 3 }, - [TRAINER_CLASS_SAILOR] = { _("SAILOR"), 8 }, - [TRAINER_CLASS_COOLTRAINER_2] = { _("COOLTRAINER"), 5, BALL_ULTRA }, - [TRAINER_CLASS_MAGMA_ADMIN] = { _("MAGMA ADMIN"), 10 }, - [TRAINER_CLASS_RIVAL] = { _("{PKMN} TRAINER"), 15 }, - [TRAINER_CLASS_BUG_CATCHER] = { _("BUG CATCHER"), 4 }, - [TRAINER_CLASS_PKMN_RANGER] = { _("{PKMN} RANGER"), 12 }, - [TRAINER_CLASS_MAGMA_LEADER] = { _("MAGMA LEADER"), 20, BALL_MASTER }, - [TRAINER_CLASS_LASS] = { _("LASS"), 4 }, - [TRAINER_CLASS_YOUNG_COUPLE] = { _("YOUNG COUPLE"), 8 }, - [TRAINER_CLASS_OLD_COUPLE] = { _("OLD COUPLE"), 10 }, - [TRAINER_CLASS_SIS_AND_BRO] = { _("SIS AND BRO"), 3 }, - [TRAINER_CLASS_SALON_MAIDEN] = { _("SALON MAIDEN") }, - [TRAINER_CLASS_DOME_ACE] = { _("DOME ACE") }, - [TRAINER_CLASS_PALACE_MAVEN] = { _("PALACE MAVEN") }, - [TRAINER_CLASS_ARENA_TYCOON] = { _("ARENA TYCOON") }, - [TRAINER_CLASS_FACTORY_HEAD] = { _("FACTORY HEAD") }, - [TRAINER_CLASS_PIKE_QUEEN] = { _("PIKE QUEEN") }, - [TRAINER_CLASS_PYRAMID_KING] = { _("PYRAMID KING") }, - [TRAINER_CLASS_RS_PROTAG] = { _("{PKMN} TRAINER") }, + [TRAINER_CLASS_PKMN_TRAINER_1] = { _("{PKMN} 训练家") }, + [TRAINER_CLASS_PKMN_TRAINER_2] = { _("{PKMN} 训练家") }, + [TRAINER_CLASS_HIKER] = { _("登山男"), 10 }, + [TRAINER_CLASS_TEAM_AQUA] = { _("海洋队") }, + [TRAINER_CLASS_PKMN_BREEDER] = { _("{PKMN} 培育家"), 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_HEAL : BALL_FRIEND }, + [TRAINER_CLASS_COOLTRAINER] = { _("精英训练家"), 12, BALL_ULTRA }, + [TRAINER_CLASS_BIRD_KEEPER] = { _("养鸟人"), 8 }, + [TRAINER_CLASS_COLLECTOR] = { _("宝可梦收藏家"), 15, BALL_PREMIER }, + [TRAINER_CLASS_SWIMMER_M] = { _("泳裤小伙子"), 2, BALL_DIVE }, + [TRAINER_CLASS_TEAM_MAGMA] = { _("熔岩队") }, + [TRAINER_CLASS_EXPERT] = { _("专家"), 10 }, + [TRAINER_CLASS_AQUA_ADMIN] = { _("海洋队干部"), 10 }, + [TRAINER_CLASS_BLACK_BELT] = { _("空手道王"), 8, BALL_ULTRA }, + [TRAINER_CLASS_AQUA_LEADER] = { _("海洋队老大"), 20, BALL_MASTER }, + [TRAINER_CLASS_HEX_MANIAC] = { _("灵异迷"), 6 }, + [TRAINER_CLASS_AROMA_LADY] = { _("香氛姐姐"), 10 }, + [TRAINER_CLASS_RUIN_MANIAC] = { _("遗迹迷"), 15 }, + [TRAINER_CLASS_INTERVIEWER] = { _("采访者"), 12 }, + [TRAINER_CLASS_TUBER_F] = { _("泳圈女孩"), 1 }, + [TRAINER_CLASS_TUBER_M] = { _("泳圈男孩"), 1 }, + [TRAINER_CLASS_LADY] = { _("千金小姐"), 50 }, + [TRAINER_CLASS_BEAUTY] = { _("大姐姐"), 20 }, + [TRAINER_CLASS_RICH_BOY] = { _("富家少爷"), 50 }, + [TRAINER_CLASS_POKEMANIAC] = { _("怪兽狂"), 15 }, + [TRAINER_CLASS_GUITARIST] = { _("吉他手"), 8 }, + [TRAINER_CLASS_KINDLER] = { _("营火专家"), 8 }, + [TRAINER_CLASS_CAMPER] = { _("露营少年"), 4 }, + [TRAINER_CLASS_PICNICKER] = { _("野餐女孩"), 4 }, + [TRAINER_CLASS_BUG_MANIAC] = { _("昆虫狂"), 15 }, + [TRAINER_CLASS_PSYCHIC] = { _("超能力者"), 6 }, + [TRAINER_CLASS_GENTLEMAN] = { _("绅士"), 20, BALL_LUXURY }, + [TRAINER_CLASS_ELITE_FOUR] = { _("四天王"), 25, BALL_ULTRA }, + [TRAINER_CLASS_LEADER] = { _("道馆馆主"), 25 }, + [TRAINER_CLASS_SCHOOL_KID] = { _("补习班学生") }, + [TRAINER_CLASS_SR_AND_JR] = { _("前辈和后辈"), 4 }, + [TRAINER_CLASS_WINSTRATE] = { _("连胜之家"), 10 }, + [TRAINER_CLASS_POKEFAN] = { _("发烧友俱乐部"), 20 }, + [TRAINER_CLASS_YOUNGSTER] = { _("短裤小子"), 4 }, + [TRAINER_CLASS_CHAMPION] = { _("冠军"), 50 }, + [TRAINER_CLASS_FISHERMAN] = { _("垂钓者"), 10, B_TRAINER_CLASS_POKE_BALLS >= GEN_8 ? BALL_DIVE : BALL_LURE }, + [TRAINER_CLASS_TRIATHLETE] = { _("铁人三项选手"), 10 }, + [TRAINER_CLASS_DRAGON_TAMER] = { _("驯龙师"), 12 }, + [TRAINER_CLASS_NINJA_BOY] = { _("忍者小子"), 3 }, + [TRAINER_CLASS_BATTLE_GIRL] = { _("对战少女"), 6 }, + [TRAINER_CLASS_PARASOL_LADY] = { _("阳伞小姐"), 10 }, + [TRAINER_CLASS_SWIMMER_F] = { _("比基尼姐姐"), 2, BALL_DIVE }, + [TRAINER_CLASS_TWINS] = { _("双胞胎"), 3 }, + [TRAINER_CLASS_SAILOR] = { _("水手"), 8 }, + [TRAINER_CLASS_COOLTRAINER_2] = { _("精英训练家"), 5, BALL_ULTRA }, + [TRAINER_CLASS_MAGMA_ADMIN] = { _("熔岩队干部"), 10 }, + [TRAINER_CLASS_RIVAL] = { _("劲敌"), 15 }, + [TRAINER_CLASS_BUG_CATCHER] = { _("捕虫少年"), 4 }, + [TRAINER_CLASS_PKMN_RANGER] = { _("宝可梦巡护员"), 12 }, + [TRAINER_CLASS_MAGMA_LEADER] = { _("熔岩队老大"), 20, BALL_MASTER }, + [TRAINER_CLASS_LASS] = { _("迷你裙"), 4 }, + [TRAINER_CLASS_YOUNG_COUPLE] = { _("热恋情侣"), 8 }, + [TRAINER_CLASS_OLD_COUPLE] = { _("金婚夫妻"), 10 }, + [TRAINER_CLASS_SIS_AND_BRO] = { _("海上兄妹"), 3 }, + [TRAINER_CLASS_SALON_MAIDEN] = { _("对战塔大君") }, + [TRAINER_CLASS_DOME_ACE] = { _("巨蛋超级巨星") }, + [TRAINER_CLASS_PALACE_MAVEN] = { _("宫殿守护者") }, + [TRAINER_CLASS_ARENA_TYCOON] = { _("竞技场主将") }, + [TRAINER_CLASS_FACTORY_HEAD] = { _("工厂头目") }, + [TRAINER_CLASS_PIKE_QUEEN] = { _("水管皇后") }, + [TRAINER_CLASS_PYRAMID_KING] = { _("金字塔法老") }, + [TRAINER_CLASS_RS_PROTAG] = { _("宝可梦训练家") }, }; static void (* const sTurnActionsFuncsTable[])(void) = diff --git a/src/battle_message.c b/src/battle_message.c index afac87d479..940da6ebde 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -61,80 +61,80 @@ EWRAM_DATA struct BattleMsgData *gBattleMsgDataPtr = NULL; static const u8 sText_EmptyString4[] = _(""); -const u8 gText_PkmnShroudedInMist[] = _("{B_ATK_TEAM1} team became shrouded in mist!"); -const u8 gText_PkmnGettingPumped[] = _("{B_DEF_NAME_WITH_PREFIX} is getting pumped!"); -const u8 gText_PkmnsXPreventsSwitching[] = _("{B_BUFF1} is preventing switching out with its {B_LAST_ABILITY} Ability!\p"); -const u8 gText_StatSharply[] = _("sharply "); -const u8 gText_StatRose[] = _("rose!"); -const u8 gText_StatFell[] = _("fell!"); -const u8 gText_DefendersStatRose[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1} {B_BUFF2}"); -static const u8 sText_GotAwaySafely[] = _("{PLAY_SE SE_FLEE}You got away safely!\p"); -static const u8 sText_PlayerDefeatedLinkTrainer[] = _("You defeated {B_LINK_OPPONENT1_NAME}!"); -static const u8 sText_TwoLinkTrainersDefeated[] = _("You defeated {B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!"); -static const u8 sText_PlayerLostAgainstLinkTrainer[] = _("You lost against {B_LINK_OPPONENT1_NAME}!"); -static const u8 sText_PlayerLostToTwo[] = _("You lost to {B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!"); -static const u8 sText_PlayerBattledToDrawLinkTrainer[] = _("You battled to a draw against {B_LINK_OPPONENT1_NAME}!"); -static const u8 sText_PlayerBattledToDrawVsTwo[] = _("You battled to a draw against {B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!"); -static const u8 sText_WildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME} fled!"); //not in gen 5+, replaced with match was forfeited text -static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME} fled!"); //not in gen 5+, replaced with match was forfeited text -static const u8 sText_PlayerDefeatedLinkTrainerTrainer1[] = _("You defeated {B_TRAINER1_NAME_WITH_CLASS}!\p"); -static const u8 sText_OpponentMon1Appeared[] = _("{B_OPPONENT_MON1_NAME} appeared!\p"); -static const u8 sText_WildPkmnAppeared[] = _("You encountered a wild {B_OPPONENT_MON1_NAME}!\p"); -static const u8 sText_LegendaryPkmnAppeared[] = _("You encountered a wild {B_OPPONENT_MON1_NAME}!\p"); -static const u8 sText_WildPkmnAppearedPause[] = _("You encountered a wild {B_OPPONENT_MON1_NAME}!{PAUSE 127}"); -static const u8 sText_TwoWildPkmnAppeared[] = _("Oh! A wild {B_OPPONENT_MON1_NAME} and {B_OPPONENT_MON2_NAME} appeared!\p"); -static const u8 sText_Trainer1WantsToBattle[] = _("You are challenged by {B_TRAINER1_NAME_WITH_CLASS}!\p"); -static const u8 sText_LinkTrainerWantsToBattle[] = _("You are challenged by {B_LINK_OPPONENT1_NAME}!"); -static const u8 sText_TwoLinkTrainersWantToBattle[] = _("You are challenged by {B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!"); -static const u8 sText_Trainer1SentOutPkmn[] = _("{B_TRAINER1_NAME_WITH_CLASS} sent out {B_OPPONENT_MON1_NAME}!"); -static const u8 sText_Trainer1SentOutTwoPkmn[] = _("{B_TRAINER1_NAME_WITH_CLASS} sent out {B_OPPONENT_MON1_NAME} and {B_OPPONENT_MON2_NAME}!"); -static const u8 sText_Trainer1SentOutPkmn2[] = _("{B_TRAINER1_NAME_WITH_CLASS} sent out {B_BUFF1}!"); -static const u8 sText_LinkTrainerSentOutPkmn[] = _("{B_LINK_OPPONENT1_NAME} sent out {B_OPPONENT_MON1_NAME}!"); -static const u8 sText_LinkTrainerSentOutTwoPkmn[] = _("{B_LINK_OPPONENT1_NAME} sent out {B_OPPONENT_MON1_NAME} and {B_OPPONENT_MON2_NAME}!"); -static const u8 sText_TwoLinkTrainersSentOutPkmn[] = _("{B_LINK_OPPONENT1_NAME} sent out {B_LINK_OPPONENT_MON1_NAME}! {B_LINK_OPPONENT2_NAME} sent out {B_LINK_OPPONENT_MON2_NAME}!"); -static const u8 sText_LinkTrainerSentOutPkmn2[] = _("{B_LINK_OPPONENT1_NAME} sent out {B_BUFF1}!"); -static const u8 sText_LinkTrainerMultiSentOutPkmn[] = _("{B_LINK_SCR_TRAINER_NAME} sent out {B_BUFF1}!"); -static const u8 sText_GoPkmn[] = _("Go! {B_PLAYER_MON1_NAME}!"); -static const u8 sText_GoTwoPkmn[] = _("Go! {B_PLAYER_MON1_NAME} and {B_PLAYER_MON2_NAME}!"); -static const u8 sText_GoPkmn2[] = _("Go! {B_BUFF1}!"); -static const u8 sText_DoItPkmn[] = _("You're in charge, {B_BUFF1}!"); -static const u8 sText_GoForItPkmn[] = _("Go for it, {B_BUFF1}!"); -static const u8 sText_JustALittleMorePkmn[] = _("Just a little more! Hang in there, {B_BUFF1}!"); //currently unused, will require code changes -static const u8 sText_YourFoesWeakGetEmPkmn[] = _("Your opponent's weak! Get 'em, {B_BUFF1}!"); -static const u8 sText_LinkPartnerSentOutPkmnGoPkmn[] = _("{B_LINK_PARTNER_NAME} sent out {B_LINK_PLAYER_MON2_NAME}! Go! {B_LINK_PLAYER_MON1_NAME}!"); -static const u8 sText_PkmnSwitchOut[] = _("{B_BUFF1}, switch out! Come back!"); //currently unused, I believe its used for when you switch on a pokemon in shift mode -static const u8 sText_PkmnThatsEnough[] = _("{B_BUFF1}, that's enough! Come back!"); -static const u8 sText_PkmnComeBack[] = _("{B_BUFF1}, come back!"); -static const u8 sText_PkmnOkComeBack[] = _("OK, {B_BUFF1}! Come back!"); -static const u8 sText_PkmnGoodComeBack[] = _("Good job, {B_BUFF1}! Come back!"); -static const u8 sText_Trainer1WithdrewPkmn[] = _("{B_TRAINER1_NAME_WITH_CLASS} withdrew {B_BUFF1}!"); -static const u8 sText_LinkTrainer1WithdrewPkmn[] = _("{B_LINK_OPPONENT1_NAME} withdrew {B_BUFF1}!"); -static const u8 sText_LinkTrainer2WithdrewPkmn[] = _("{B_LINK_SCR_TRAINER_NAME} withdrew {B_BUFF1}!"); -static const u8 sText_WildPkmnPrefix[] = _("The wild "); -static const u8 sText_FoePkmnPrefix[] = _("The opposing "); -static const u8 sText_WildPkmnPrefixLower[] = _("the wild "); -static const u8 sText_FoePkmnPrefixLower[] = _("the opposing "); +const u8 gText_PkmnShroudedInMist[] = _("{B_ATK_TEAM1}被\n白雾包围了！"); +const u8 gText_PkmnGettingPumped[] = _("{B_DEF_NAME_WITH_PREFIX}\n现在干劲十足！"); +const u8 gText_PkmnsXPreventsSwitching[] = _("因{B_BUFF1}的{B_LAST_ABILITY}\n而无法进行替换！\p"); +const u8 gText_StatSharply[] = _("大幅"); +const u8 gText_StatRose[] = _("提高了！"); +const u8 gText_StatFell[] = _("降低了！"); +const u8 gText_DefendersStatRose[] = _("{B_DEF_NAME_WITH_PREFIX}的{B_BUFF1}{B_BUFF2}"); +static const u8 sText_GotAwaySafely[] = _("{PLAY_SE SE_FLEE}顺利逃走了！\p"); +static const u8 sText_PlayerDefeatedLinkTrainer[] = _("战胜了\n{B_LINK_OPPONENT1_NAME}！"); +static const u8 sText_TwoLinkTrainersDefeated[] = _("战胜了{B_LINK_OPPONENT1_NAME} 和\n{B_LINK_OPPONENT2_NAME}！"); +static const u8 sText_PlayerLostAgainstLinkTrainer[] = _("被{B_LINK_OPPONENT1_NAME}\n打败了！"); +static const u8 sText_PlayerLostToTwo[] = _("被{B_LINK_OPPONENT1_NAME} 和\n{B_LINK_OPPONENT2_NAME}\n打败了！"); +static const u8 sText_PlayerBattledToDrawLinkTrainer[] = _("和{B_LINK_OPPONENT1_NAME}\n打成了平局！"); +static const u8 sText_PlayerBattledToDrawVsTwo[] = _("与{B_LINK_OPPONENT1_NAME} 和\n{B_LINK_OPPONENT2_NAME}\n打成了平局！"); +static const u8 sText_WildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME}\n逃走了！"); //not in gen 5+, replaced with match was forfeited text +static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME} 和 {B_LINK_OPPONENT2_NAME}\n逃走了！"); //not in gen 5+, replaced with match was forfeited text +static const u8 sText_PlayerDefeatedLinkTrainerTrainer1[] = _("战胜了\n{B_TRAINER1_NAME_WITH_CLASS}！\p"); +static const u8 sText_OpponentMon1Appeared[] = _("{B_OPPONENT_MON1_NAME}出现了！\p"); +static const u8 sText_WildPkmnAppeared[] = _("{B_OPPONENT_MON1_NAME}出现了！\p"); +static const u8 sText_LegendaryPkmnAppeared[] = _("{B_OPPONENT_MON1_NAME}出现了！\p"); +static const u8 sText_WildPkmnAppearedPause[] = _("{B_OPPONENT_MON1_NAME}出现了！{PAUSE 127}"); +static const u8 sText_TwoWildPkmnAppeared[] = _("{B_OPPONENT_MON1_NAME}和{B_OPPONENT_MON2_NAME}\n出现了！\p"); +static const u8 sText_Trainer1WantsToBattle[] = _("{B_TRAINER1_NAME_WITH_CLASS}\n前来挑战了！\p"); +static const u8 sText_LinkTrainerWantsToBattle[] = _("{B_LINK_OPPONENT1_NAME}\n前来挑战了！"); +static const u8 sText_TwoLinkTrainersWantToBattle[] = _("{B_LINK_OPPONENT1_NAME} 和\n{B_LINK_OPPONENT2_NAME}\n前来挑战了！"); +static const u8 sText_Trainer1SentOutPkmn[] = _("{B_TRAINER1_NAME_WITH_CLASS}派出了\n{B_OPPONENT_MON1_NAME}！"); +static const u8 sText_Trainer1SentOutTwoPkmn[] = _("{B_TRAINER1_NAME_WITH_CLASS}派出了\n{B_OPPONENT_MON1_NAME} 和 {B_OPPONENT_MON2_NAME}！"); +static const u8 sText_Trainer1SentOutPkmn2[] = _("{B_TRAINER1_NAME_WITH_CLASS}派出了\n{B_BUFF1}!"); +static const u8 sText_LinkTrainerSentOutPkmn[] = _("{B_LINK_OPPONENT1_NAME}派出了\n{B_OPPONENT_MON1_NAME}!"); +static const u8 sText_LinkTrainerSentOutTwoPkmn[] = _("{B_LINK_OPPONENT1_NAME}派出了\n{B_OPPONENT_MON1_NAME} 和 {B_OPPONENT_MON2_NAME}!"); +static const u8 sText_TwoLinkTrainersSentOutPkmn[] = _("{B_LINK_OPPONENT1_NAME}派出了\n{B_LINK_OPPONENT_MON1_NAME}！{B_LINK_OPPONENT2_NAME}派出了\n{B_LINK_OPPONENT_MON2_NAME}！"); +static const u8 sText_LinkTrainerSentOutPkmn2[] = _("{B_LINK_OPPONENT1_NAME}派出了\n{B_BUFF1}！"); +static const u8 sText_LinkTrainerMultiSentOutPkmn[] = _("{B_LINK_SCR_TRAINER_NAME}派出了\n{B_BUFF1}！"); +static const u8 sText_GoPkmn[] = _("上吧！{B_PLAYER_MON1_NAME}！"); +static const u8 sText_GoTwoPkmn[] = _("上吧！\n{B_PLAYER_MON1_NAME}！{B_PLAYER_MON2_NAME}!"); +static const u8 sText_GoPkmn2[] = _("上吧！{B_BUFF1}！"); +static const u8 sText_DoItPkmn[] = _("交给你了！{B_BUFF1}！"); +static const u8 sText_GoForItPkmn[] = _("加油！{B_BUFF1}！"); +static const u8 sText_JustALittleMorePkmn[] = _("只差一点了！\n加油！{B_BUFF1}！"); //currently unused, will require code changes +static const u8 sText_YourFoesWeakGetEmPkmn[] = _("对手变弱了！\n机会来了！{B_BUFF1}!"); +static const u8 sText_LinkPartnerSentOutPkmnGoPkmn[] = _("{B_LINK_PARTNER_NAME}派出了\n{B_LINK_PLAYER_MON2_NAME}！\n上吧！{B_LINK_PLAYER_MON1_NAME}！"); +static const u8 sText_PkmnSwitchOut[] = _("{B_BUFF1}，替换了！\n回来吧！"); //currently unused, I believe its used for when you switch on a pokemon in shift mode +static const u8 sText_PkmnThatsEnough[] = _("{B_BUFF1}，好！\n回来吧！"); +static const u8 sText_PkmnComeBack[] = _("{B_BUFF1}，\n回来吧！"); +static const u8 sText_PkmnOkComeBack[] = _("{B_BUFF1}，很好！\n回来吧！"); +static const u8 sText_PkmnGoodComeBack[] = _("{B_BUFF1}，干得漂亮！\n回来吧！"); +static const u8 sText_Trainer1WithdrewPkmn[] = _("{B_TRAINER1_NAME_WITH_CLASS}换下了\n{B_BUFF1}！"); +static const u8 sText_LinkTrainer1WithdrewPkmn[] = _("{B_LINK_OPPONENT1_NAME}换下了\n{B_BUFF1}！"); +static const u8 sText_LinkTrainer2WithdrewPkmn[] = _("{B_LINK_SCR_TRAINER_NAME}换下了\n{B_BUFF1}！"); +static const u8 sText_WildPkmnPrefix[] = _("野生的"); +static const u8 sText_FoePkmnPrefix[] = _("对手的"); +static const u8 sText_WildPkmnPrefixLower[] = _("野生的"); +static const u8 sText_FoePkmnPrefixLower[] = _("对手的"); static const u8 sText_EmptyString8[] = _(""); -static const u8 sText_FoePkmnPrefix2[] = _("Opposing"); -static const u8 sText_AllyPkmnPrefix[] = _("Ally"); -static const u8 sText_FoePkmnPrefix3[] = _("Opposing"); -static const u8 sText_AllyPkmnPrefix2[] = _("Ally"); -static const u8 sText_FoePkmnPrefix4[] = _("Opposing"); -static const u8 sText_AllyPkmnPrefix3[] = _("Ally"); -static const u8 sText_AttackerUsedX[] = _("{B_ATK_NAME_WITH_PREFIX} used {B_BUFF3}!"); +static const u8 sText_FoePkmnPrefix2[] = _("对手"); +static const u8 sText_AllyPkmnPrefix[] = _("我方"); +static const u8 sText_FoePkmnPrefix3[] = _("对手"); +static const u8 sText_AllyPkmnPrefix2[] = _("我方"); +static const u8 sText_FoePkmnPrefix4[] = _("对手"); +static const u8 sText_AllyPkmnPrefix3[] = _("我方"); +static const u8 sText_AttackerUsedX[] = _("{B_ATK_NAME_WITH_PREFIX}使出了{B_BUFF3}！"); static const u8 sText_ExclamationMark[] = _("!"); static const u8 sText_ExclamationMark2[] = _("!"); static const u8 sText_ExclamationMark3[] = _("!"); static const u8 sText_ExclamationMark4[] = _("!"); static const u8 sText_ExclamationMark5[] = _("!"); static const u8 sText_HP[] = _("HP"); -static const u8 sText_Attack[] = _("Attack"); -static const u8 sText_Defense[] = _("Defense"); -static const u8 sText_Speed[] = _("Speed"); -static const u8 sText_SpAttack[] = _("Sp. Atk"); -static const u8 sText_SpDefense[] = _("Sp. Def"); -static const u8 sText_Accuracy[] = _("accuracy"); -static const u8 sText_Evasiveness[] = _("evasiveness"); +static const u8 sText_Attack[] = _("攻击"); +static const u8 sText_Defense[] = _("防御"); +static const u8 sText_Speed[] = _("速度"); +static const u8 sText_SpAttack[] = _("特攻"); +static const u8 sText_SpDefense[] = _("特防"); +static const u8 sText_Accuracy[] = _("命中率"); +static const u8 sText_Evasiveness[] = _("闪避率"); const u8 *const gStatNamesTable[NUM_BATTLE_STATS] = { diff --git a/src/berry.c b/src/berry.c index fd6cac9679..127bf7e822 100644 --- a/src/berry.c +++ b/src/berry.c @@ -55,14 +55,14 @@ const struct Berry gBerries[] = { [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Cheri"), + .name = _("樱子果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 20, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = COMPOUND_STRING("Blooms with delicate pretty flowers."), - .description2 = COMPOUND_STRING("The bright red Berry is very spicy."), + .description1 = COMPOUND_STRING("绽开的花朵十分惹人喜爱。"), + .description2 = COMPOUND_STRING("鲜红色的果实非常辛辣。"), .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 10, .dry = 0, @@ -78,14 +78,14 @@ const struct Berry gBerries[] = [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Chesto"), + .name = _("零余果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_PURPLE, .size = 80, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = COMPOUND_STRING("The Berry's thick skin and fruit are"), - .description2 = COMPOUND_STRING("very tough. It is dry-tasting all over."), + .description1 = COMPOUND_STRING("外表部分和果肉都非常坚硬。"), + .description2 = COMPOUND_STRING("不管吃哪个部分都是涩味。"), .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 10, @@ -101,14 +101,14 @@ const struct Berry gBerries[] = [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Pecha"), + .name = _("桃桃果"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_PINK, .size = 40, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = COMPOUND_STRING("Very sweet and delicious."), - .description2 = COMPOUND_STRING("Also very tender - handle with care."), + .description1 = COMPOUND_STRING("非常香甜可口。"), + .description2 = COMPOUND_STRING("由于十分柔软，在运送的时候要小心。"), .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, @@ -124,14 +124,14 @@ const struct Berry gBerries[] = [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Rawst"), + .name = _("莓莓果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_GREEN, .size = 32, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = COMPOUND_STRING("If the leaves grow long and curly,"), - .description2 = COMPOUND_STRING("the Berry seems to grow very bitter."), + .description1 = COMPOUND_STRING("树叶部分较长且卷曲着的话，"), + .description2 = COMPOUND_STRING("果子似乎会很苦。"), .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, @@ -147,14 +147,14 @@ const struct Berry gBerries[] = [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Aspear"), + .name = _("利木果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_YELLOW, .size = 50, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = COMPOUND_STRING("The hard Berry is dense with a rich"), - .description2 = COMPOUND_STRING("juice. It is quite sour."), + .description1 = COMPOUND_STRING("坚硬的果实里含有非常丰富的水分。"), + .description2 = COMPOUND_STRING("味道相当酸。"), .growthDuration = GROWTH_DURATION(12, 12, 18, 24, 16, 24), .spicy = 0, .dry = 0, @@ -170,14 +170,14 @@ const struct Berry gBerries[] = [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Leppa"), + .name = _("苹野果"), .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_RED, .size = 28, .maxYield = YIELD_RATE(3, 5, 15, 22), .minYield = YIELD_RATE(2, 2, 2, 2), - .description1 = COMPOUND_STRING("Grows slower than Cheri and others."), - .description2 = COMPOUND_STRING("The smaller the Berry, the tastier."), + .description1 = COMPOUND_STRING("跟樱子果之类的树果相比，培育速度"), + .description2 = COMPOUND_STRING("较为缓慢。越小的果实口味越佳。"), .growthDuration = GROWTH_DURATION(16, 16, 24, 24, 16, 24), .spicy = 10, .dry = 0, @@ -193,14 +193,14 @@ const struct Berry gBerries[] = [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Oran"), + .name = _("橙橙果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_BLUE, .size = 35, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = COMPOUND_STRING("A peculiar Berry with a mix of flavors."), - .description2 = COMPOUND_STRING("Berries grow in half a day."), + .description1 = COMPOUND_STRING("混杂着各种滋味的奇妙树果。"), + .description2 = COMPOUND_STRING("只需要半天就能结果。"), .growthDuration = GROWTH_DURATION(12, 16, 24, 24, 16, 24), .spicy = 10, .dry = 10, @@ -216,14 +216,14 @@ const struct Berry gBerries[] = [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Persim"), + .name = _("柿仔果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PINK, .size = 47, .maxYield = YIELD_RATE(3, 5, 15, 20), .minYield = YIELD_RATE(2, 2, 4, 4), - .description1 = COMPOUND_STRING("Loves sunlight. The Berry's color"), - .description2 = COMPOUND_STRING("grows vivid when exposed to the sun."), + .description1 = COMPOUND_STRING("最喜欢晒太阳。只要晒到阳光，"), + .description2 = COMPOUND_STRING("就会越来越鲜艳。"), .growthDuration = GROWTH_DURATION(12, 16, 24, 24, 16, 24), .spicy = 10, .dry = 10, @@ -239,14 +239,14 @@ const struct Berry gBerries[] = [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Lum"), + .name = _("木子果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_GREEN, .size = 34, .maxYield = YIELD_RATE(2, 5, 20, 18), .minYield = YIELD_RATE(1, 2, 3, 2), - .description1 = COMPOUND_STRING("Slow to grow. If raised with loving"), - .description2 = COMPOUND_STRING("care, it may grow two Berries."), + .description1 = COMPOUND_STRING("生长缓慢。但是细心照料的话，"), + .description2 = COMPOUND_STRING("有时也会结出2个果实。"), .growthDuration = GROWTH_DURATION(48, 48, 72, 48, 32, 48), .spicy = 10, .dry = 10, @@ -262,14 +262,14 @@ const struct Berry gBerries[] = [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Sitrus"), + .name = _("文柚果"), .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_YELLOW, .size = 95, .maxYield = YIELD_RATE(3, 5, 20, 27), .minYield = YIELD_RATE(2, 2, 3, 3), - .description1 = COMPOUND_STRING("Closely related to Oran. The large"), - .description2 = COMPOUND_STRING("Berry has a well-rounded flavor."), + .description1 = COMPOUND_STRING("与橙橙果之间宛如兄弟一样，"), + .description2 = COMPOUND_STRING("虽然变大了，味道仍十分接近。"), .growthDuration = GROWTH_DURATION(24, 32, 48, 48, 32, 48), .spicy = 10, .dry = 10, @@ -285,14 +285,14 @@ const struct Berry gBerries[] = [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Figy"), + .name = _("勿花果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 100, .maxYield = YIELD_RATE(3, 5, 15, 15), .minYield = YIELD_RATE(2, 1, 3, 3), - .description1 = COMPOUND_STRING("The Berry, which looks chewed up,"), - .description2 = COMPOUND_STRING("brims with spicy substances."), + .description1 = COMPOUND_STRING("外表如同被吃过的样子，"), + .description2 = COMPOUND_STRING("内部富含辛辣的成分。"), .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 10, .dry = 0, @@ -308,14 +308,14 @@ const struct Berry gBerries[] = [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Wiki"), + .name = _("异奇果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PURPLE, .size = 115, .maxYield = YIELD_RATE(3, 5, 15, 15), .minYield = YIELD_RATE(2, 1, 3, 3), - .description1 = COMPOUND_STRING("The Berry is said to have grown lumpy"), - .description2 = COMPOUND_STRING("to help Pokémon grip it."), + .description1 = COMPOUND_STRING("据说外层有凸起的颗粒，"), + .description2 = COMPOUND_STRING("是为了方便宝可梦携带。"), .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 10, @@ -331,14 +331,14 @@ const struct Berry gBerries[] = [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Mago"), + .name = _("芒芒果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PINK, .size = 126, .maxYield = YIELD_RATE(3, 5, 15, 15), .minYield = YIELD_RATE(2, 1, 3, 3), - .description1 = COMPOUND_STRING("The Berry turns curvy as it grows."), - .description2 = COMPOUND_STRING("The curvier, the sweeter and tastier."), + .description1 = COMPOUND_STRING("长得越大果实越卷曲。"), + .description2 = COMPOUND_STRING("越卷曲的果实越甜，越好吃。"), .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, @@ -354,14 +354,14 @@ const struct Berry gBerries[] = [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Aguav"), + .name = _("乐芭果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_GREEN, .size = 64, .maxYield = YIELD_RATE(3, 5, 15, 15), .minYield = YIELD_RATE(2, 1, 3, 3), - .description1 = COMPOUND_STRING("The flower is dainty. It is rare in its"), - .description2 = COMPOUND_STRING("ability to grow without light."), + .description1 = COMPOUND_STRING("长有娇小花朵，"), + .description2 = COMPOUND_STRING("而且不需要阳光的稀有树果。"), .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, @@ -377,14 +377,14 @@ const struct Berry gBerries[] = [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Iapapa"), + .name = _("芭亚果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_YELLOW, .size = 223, .maxYield = YIELD_RATE(3, 5, 15, 15), .minYield = YIELD_RATE(2, 1, 3, 3), - .description1 = COMPOUND_STRING("The Berry is very big and sour."), - .description2 = COMPOUND_STRING("It takes at least a day to grow."), + .description1 = COMPOUND_STRING("这种树果又大又酸。"), + .description2 = COMPOUND_STRING("培育时间最短也要花上半天。"), .growthDuration = GROWTH_DURATION(24, 20, 30, 24, 16, 24), .spicy = 0, .dry = 0, @@ -400,14 +400,14 @@ const struct Berry gBerries[] = [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Razz"), + .name = _("蔓莓果"), .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_RED, .size = 120, .maxYield = YIELD_RATE(6, 10, 15, 20), .minYield = YIELD_RATE(3, 2, 3, 4), - .description1 = COMPOUND_STRING("The red Berry tastes slightly spicy."), - .description2 = COMPOUND_STRING("It grows quickly in just four hours."), + .description1 = COMPOUND_STRING("红色的果实吃下时会有一点辣味，"), + .description2 = COMPOUND_STRING("只需要四个小时就能结果。"), .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 10, .dry = 10, @@ -423,14 +423,14 @@ const struct Berry gBerries[] = [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Bluk"), + .name = _("墨莓果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_PURPLE, .size = 108, .maxYield = YIELD_RATE(6, 10, 15, 20), .minYield = YIELD_RATE(3, 2, 3, 4), - .description1 = COMPOUND_STRING("The Berry is blue on the outside, but"), - .description2 = COMPOUND_STRING("it blackens the mouth when eaten."), + .description1 = COMPOUND_STRING("虽然外表是蓝色的，但是一旦咬下，"), + .description2 = COMPOUND_STRING("嘴巴内部将变成一片漆黑。"), .growthDuration = GROWTH_DURATION(4, 8, 12, 24, 16, 24), .spicy = 0, .dry = 10, @@ -446,7 +446,7 @@ const struct Berry gBerries[] = [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Nanab"), + .name = _("蕉香果"), .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_PINK, .size = 77, @@ -469,7 +469,7 @@ const struct Berry gBerries[] = [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Wepear"), + .name = _("西梨果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_GREEN, .size = 74, @@ -492,7 +492,7 @@ const struct Berry gBerries[] = [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Pinap"), + .name = _("凰梨果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_YELLOW, .size = 80, @@ -515,7 +515,7 @@ const struct Berry gBerries[] = [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Pomeg"), + .name = _("榴石果"), .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_RED, .size = 135, @@ -538,7 +538,7 @@ const struct Berry gBerries[] = [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Kelpsy"), + .name = _("藻根果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_BLUE, .size = 150, @@ -561,7 +561,7 @@ const struct Berry gBerries[] = [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Qualot"), + .name = _("比巴果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_YELLOW, .size = 110, @@ -584,7 +584,7 @@ const struct Berry gBerries[] = [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Hondew"), + .name = _("哈密果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_GREEN, .size = 162, @@ -607,7 +607,7 @@ const struct Berry gBerries[] = [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Grepa"), + .name = _("萄葡果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_YELLOW, .size = 149, @@ -630,7 +630,7 @@ const struct Berry gBerries[] = [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Tamato"), + .name = _("茄番果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 200, @@ -653,7 +653,7 @@ const struct Berry gBerries[] = [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Cornn"), + .name = _("玉黍果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PURPLE, .size = 75, @@ -676,7 +676,7 @@ const struct Berry gBerries[] = [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Magost"), + .name = _("岳竹果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PINK, .size = 140, @@ -699,7 +699,7 @@ const struct Berry gBerries[] = [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Rabuta"), + .name = _("茸丹果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_GREEN, .size = 226, @@ -722,7 +722,7 @@ const struct Berry gBerries[] = [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Nomel"), + .name = _("檬柠果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_YELLOW, .size = 285, @@ -745,7 +745,7 @@ const struct Berry gBerries[] = [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Spelon"), + .name = _("刺角果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 133, @@ -768,7 +768,7 @@ const struct Berry gBerries[] = [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Pamtre"), + .name = _("椰木果"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_PURPLE, .size = 244, @@ -791,7 +791,7 @@ const struct Berry gBerries[] = [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Watmel"), + .name = _("瓜西果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_PINK, .size = 250, @@ -814,7 +814,7 @@ const struct Berry gBerries[] = [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Durin"), + .name = _("金枕果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_GREEN, .size = 280, @@ -837,7 +837,7 @@ const struct Berry gBerries[] = [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Belue"), + .name = _("靛莓果"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_PURPLE, .size = 300, @@ -860,7 +860,7 @@ const struct Berry gBerries[] = [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Chilan"), + .name = _("灯浆果"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_YELLOW, .size = 34, @@ -883,7 +883,7 @@ const struct Berry gBerries[] = [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Occa"), + .name = _("巧可果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_RED, .size = 90, @@ -906,7 +906,7 @@ const struct Berry gBerries[] = [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Passho"), + .name = _("千香果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_BLUE, .size = 33, @@ -929,7 +929,7 @@ const struct Berry gBerries[] = [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Wacan"), + .name = _("烛木果"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_YELLOW, .size = 250, @@ -952,7 +952,7 @@ const struct Berry gBerries[] = [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Rindo"), + .name = _("罗子果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_GREEN, .size = 156, @@ -975,7 +975,7 @@ const struct Berry gBerries[] = [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Yache"), + .name = _("番荔果"), .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_BLUE, .size = 135, @@ -998,7 +998,7 @@ const struct Berry gBerries[] = [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Chople"), + .name = _("莲蒲果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 77, @@ -1021,7 +1021,7 @@ const struct Berry gBerries[] = [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Kebia"), + .name = _("通通果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_GREEN, .size = 90, @@ -1044,7 +1044,7 @@ const struct Berry gBerries[] = [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Shuca"), + .name = _("腰木果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_YELLOW, .size = 42, @@ -1067,7 +1067,7 @@ const struct Berry gBerries[] = [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Coba"), + .name = _("棱瓜果"), .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_BLUE, .size = 278, @@ -1090,7 +1090,7 @@ const struct Berry gBerries[] = [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Payapa"), + .name = _("福禄果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_PURPLE, .size = 252, @@ -1113,7 +1113,7 @@ const struct Berry gBerries[] = [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Tanga"), + .name = _("扁樱果"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_GREEN, .size = 42, @@ -1136,7 +1136,7 @@ const struct Berry gBerries[] = [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Charti"), + .name = _("草蚕果"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_YELLOW, .size = 28, @@ -1159,7 +1159,7 @@ const struct Berry gBerries[] = [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Kasib"), + .name = _("佛柑果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PURPLE, .size = 144, @@ -1182,7 +1182,7 @@ const struct Berry gBerries[] = [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Haban"), + .name = _("莓榴果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 23, @@ -1205,7 +1205,7 @@ const struct Berry gBerries[] = [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Colbur"), + .name = _("刺耳果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_PURPLE, .size = 39, @@ -1228,7 +1228,7 @@ const struct Berry gBerries[] = [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Babiri"), + .name = _("霹霹果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_GREEN, .size = 265, @@ -1251,7 +1251,7 @@ const struct Berry gBerries[] = [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Roseli"), + .name = _("洛玫果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PINK, .size = 35, @@ -1274,7 +1274,7 @@ const struct Berry gBerries[] = [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Liechi"), + .name = _("枝荔果"), .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_RED, .size = 111, @@ -1297,7 +1297,7 @@ const struct Berry gBerries[] = [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Ganlon"), + .name = _("龙睛果"), .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_PURPLE, .size = 33, @@ -1320,7 +1320,7 @@ const struct Berry gBerries[] = [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Salac"), + .name = _("沙鳞果"), .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_GREEN, .size = 95, @@ -1343,7 +1343,7 @@ const struct Berry gBerries[] = [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Petaya"), + .name = _("龙火果"), .firmness = BERRY_FIRMNESS_VERY_HARD, .color = BERRY_COLOR_PINK, .size = 237, @@ -1366,7 +1366,7 @@ const struct Berry gBerries[] = [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Apicot"), + .name = _("杏仔果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_BLUE, .size = 75, @@ -1389,7 +1389,7 @@ const struct Berry gBerries[] = [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Lansat"), + .name = _("兰萨果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_RED, .size = 97, @@ -1412,7 +1412,7 @@ const struct Berry gBerries[] = [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Starf"), + .name = _("星桃果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_GREEN, .size = 153, @@ -1435,7 +1435,7 @@ const struct Berry gBerries[] = [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Enigma"), + .name = _("谜芝果"), .firmness = BERRY_FIRMNESS_HARD, .color = BERRY_COLOR_PURPLE, .size = 155, @@ -1458,7 +1458,7 @@ const struct Berry gBerries[] = [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Micle"), + .name = _("奇秘果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_GREEN, .size = 41, @@ -1481,7 +1481,7 @@ const struct Berry gBerries[] = [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Custap"), + .name = _("释陀果"), .firmness = BERRY_FIRMNESS_SUPER_HARD, .color = BERRY_COLOR_RED, .size = 267, @@ -1504,7 +1504,7 @@ const struct Berry gBerries[] = [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Jaboca"), + .name = _("嘉珍果"), .firmness = BERRY_FIRMNESS_SOFT, .color = BERRY_COLOR_YELLOW, .size = 33, @@ -1527,7 +1527,7 @@ const struct Berry gBerries[] = [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Rowap"), + .name = _("雾莲果"), .firmness = BERRY_FIRMNESS_VERY_SOFT, .color = BERRY_COLOR_BLUE, .size = 52, @@ -1550,7 +1550,7 @@ const struct Berry gBerries[] = [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Kee"), + .name = _("亚开果"), .firmness = BERRY_FIRMNESS_UNKNOWN, .color = BERRY_COLOR_YELLOW, .size = 0, @@ -1573,7 +1573,7 @@ const struct Berry gBerries[] = [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = { - .name = _("Marnga"), // "Maranga" is too long + .name = _("香罗果"), .firmness = BERRY_FIRMNESS_UNKNOWN, .color = BERRY_COLOR_BLUE, .size = 0, @@ -1596,7 +1596,7 @@ const struct Berry gBerries[] = [ITEM_ENIGMA_BERRY_E_READER - FIRST_BERRY_INDEX] = { - .name = _("Enigma"), + .name = _("谜芝果"), .firmness = BERRY_FIRMNESS_UNKNOWN, .color = BERRY_COLOR_PURPLE, .size = 0, diff --git a/src/dexnav.c b/src/dexnav.c index 1e3db82d4b..3b46621b72 100644 --- a/src/dexnav.c +++ b/src/dexnav.c @@ -181,14 +181,14 @@ static const u32 sHiddenMonIconGfx[] = INCBIN_U32("graphics/dexnav/hidden.4bpp.l // strings static const u8 sText_DexNav_NoInfo[] = _("--------"); -static const u8 sText_DexNav_CaptureToSee[] = _("Capture first!"); -static const u8 sText_DexNav_PressRToRegister[] = _("R TO REGISTER!"); -static const u8 sText_DexNav_SearchForRegisteredSpecies[] = _("Search {STR_VAR_1}"); -static const u8 sText_DexNav_NotFoundHere[] = _("This Pokémon cannot be found here!"); +static const u8 sText_DexNav_CaptureToSee[] = _("捕获后可见!"); +static const u8 sText_DexNav_PressRToRegister[] = _("R键登记!"); +static const u8 sText_DexNav_SearchForRegisteredSpecies[] = _("搜寻 {STR_VAR_1}"); +static const u8 sText_DexNav_NotFoundHere[] = _("该宝可梦无法\n在这里找到!"); static const u8 sText_ThreeQmarks[] = _("???"); -static const u8 sText_SearchLevel[] = _("SEARCH {LV}. {STR_VAR_1}"); +static const u8 sText_SearchLevel[] = _("搜寻 {LV}. {STR_VAR_1}"); static const u8 sText_MonLevel[] = _("{LV}. {STR_VAR_1}"); -static const u8 sText_EggMove[] = _("MOVE: {STR_VAR_1}"); +static const u8 sText_EggMove[] = _("招式: {STR_VAR_1}"); static const u8 sText_HeldItem[] = _("{STR_VAR_1}"); static const u8 sText_StartExit[] = _("{START_BUTTON} EXIT"); static const u8 sText_DexNavChain[] = _("{NO} {STR_VAR_1}");