diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc index 49693032ce..dcda000062 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc @@ -685,22 +685,22 @@ BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop: .string "彷徨夜灵！\n快停下来！$" BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedToxic: - .string "奇鲁莉安使用了剧毒！$" + .string "奇鲁莉安使出了剧毒！$" BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedHypnosis: - .string "奇鲁莉安使用了催眠术！$" + .string "奇鲁莉安使出了催眠术！$" BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedThunderWave: - .string "奇鲁莉安使用了电击波！$" + .string "奇鲁莉安使出了电击波！$" BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedWillOWisp: - .string "奇鲁莉安使用了磷火！$" + .string "奇鲁莉安使出了磷火！$" BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedWillOWisp: - .string "彷徨夜灵使用了磷火！$" + .string "彷徨夜灵使出了磷火！$" BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedIceBeam: - .string "彷徨夜灵使用了冰冻光束！$" + .string "彷徨夜灵使出了冰冻光束！$" BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough: .string "适可而止吧！$" diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 1ef3cbb469..4c1265abd5 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -48,7 +48,7 @@ Text_WantToCut: .string "要用居合劈来砍吗？$" Text_MonUsedFieldMove: - .string "{STR_VAR_1}使用了{STR_VAR_2}！$" + .string "{STR_VAR_1}使出了{STR_VAR_2}！$" Text_CantCut: .string "这棵树好像可以用\n" @@ -268,7 +268,7 @@ Text_WantToStrength: .string "要使用怪力吗？$" Text_MonUsedStrength: - .string "{STR_VAR_1}使用了怪力！\p" + .string "{STR_VAR_1}使出了怪力！\p" .string "使出了怪力后，\n" .string "可以推动岩石了！$" @@ -314,7 +314,7 @@ Text_WantToWaterfall: .string "要使用攀瀑吗？$" Text_MonUsedWaterfall: - .string "{STR_VAR_1}使用了攀瀑。$" + .string "{STR_VAR_1}使出了攀瀑。$" EventScript_UseDive:: lockall @@ -408,7 +408,7 @@ Text_WantToDive: .string "要使用潜水吗？$" Text_MonUsedDive: - .string "{STR_VAR_1}使用了潜水。$" + .string "{STR_VAR_1}使出了潜水。$" Text_CantSurface: .string "上方有亮光洒下。\n" diff --git a/data/text/tv.inc b/data/text/tv.inc index ce4bc05ec7..871ff7cd7f 100644 --- a/data/text/tv.inc +++ b/data/text/tv.inc @@ -559,7 +559,7 @@ gTVBreakingNewsText06:: .string "当{STR_VAR_1}遇到稀有的\n{STR_VAR_2}时，训练家派出了\l宝可梦{STR_VAR_3}。$" gTVBreakingNewsText07:: - .string "训练家让{STR_VAR_2}\n使用了招式{STR_VAR_1}。\p一不小心，训练家使稀有宝可梦\n昏厥了……$" + .string "训练家让{STR_VAR_2}\n使出了招式{STR_VAR_1}。\p一不小心，训练家使稀有宝可梦\n昏厥了……$" gTVBreakingNewsText12:: .string "然而，{STR_VAR_1}看到稀有的\n{STR_VAR_2}时慌了神。\p慌乱中，训练家命令\n{STR_VAR_3}发动攻击。\p一不小心，训练家使稀有宝可梦\n昏厥了。$" @@ -625,7 +625,7 @@ gTVThePokemonBattleSeminarText00:: .string "宝可梦对战研讨会！\p我们通过分析对战\n来学习他人的经验。\p今天的研究案例是\n{STR_VAR_1}的对战。\p{STR_VAR_1}的{STR_VAR_2}\n正在与{STR_VAR_3}对战……$" gTVThePokemonBattleSeminarText01:: - .string "它使用了招式{STR_VAR_3}\n攻击{STR_VAR_2}……\p嗯……{STR_VAR_1}！\n这样做是不对的！$" + .string "它使出了招式{STR_VAR_3}\n攻击{STR_VAR_2}……\p嗯……{STR_VAR_1}！\n这样做是不对的！$" gTVThePokemonBattleSeminarText02:: .string "除了这个注定失败的招式外，\n训练家的{STR_VAR_1}还会$" diff --git a/python_tools/log.txt b/python_tools/log.txt index 65a7ceab1c..aa3f7e39fc 100644 --- a/python_tools/log.txt +++ b/python_tools/log.txt @@ -2961,3 +2961,28 @@ ❌ ITEM_JUBILIFE_MUFFIN 没有单独道具说明，跳过 ❌ ITEM_SWAP_SNACK 没有单独道具说明，跳过 ❌ ITEM_TWICE_SPICED_RADISH 没有单独道具说明，跳过 +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_1_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_2_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_3_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_4_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_5_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_6_families.h +❌ 未找到 SPECIES_FLOETTE_MEGA，跳过 +❌ 未找到 SPECIES_ZYGARDE_10_AURA_BREAK，跳过 +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_7_families.h +❌ 未找到 SPECIES_MIMIKYU_BUSTED_TOTEM，跳过 +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_8_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_9_families.h +❌ 未找到 SPECIES_CAPSAKID，跳过 +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_1_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_2_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_3_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_4_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_5_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_6_families.h +❌ 未找到 SPECIES_ZYGARDE_10_AURA_BREAK，跳过 +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_7_families.h +❌ 未找到 SPECIES_MIMIKYU_BUSTED_TOTEM，跳过 +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_8_families.h +✅ 处理文件：c:\Users\Nox\Documents\GitHub\pokeemerald-expansion-Chinese\src\data\pokemon\species_info\gen_9_families.h +❌ 未找到 SPECIES_CAPSAKID，跳过 diff --git a/python_tools/src/图鉴.xlsx b/python_tools/src/图鉴.xlsx index 4b8f8df5a2..9da6c25bf0 100644 Binary files a/python_tools/src/图鉴.xlsx and b/python_tools/src/图鉴.xlsx differ diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index 85b55f6603..066d4adfd9 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -5784,17 +5784,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_FIELD, EGG_GROUP_DRAGON), .abilities = { ABILITY_SHED_SKIN, ABILITY_MOXIE, ABILITY_INTIMIDATE }, .bodyColor = BODY_COLOR_RED, - .speciesName = _("Scrafty"), + .speciesName = _("头巾混混"), .cryId = CRY_SCRAFTY, .natDexNum = NATIONAL_DEX_SCRAFTY, - .categoryName = _("Hoodlum"), + .categoryName = _("恶党"), .height = 11, .weight = 310, .description = COMPOUND_STRING( - "Mega Evolution has caused Scrafty's\n" - "shed skin to turn white, growing\n" - "tough and supple. Of course, this\n" - "Pokémon is still as feisty as ever."), + "在超级进化的影响下，\n" + "皮肤变得又白又硬且有弹性。\n" + "气势当然是十足的。"), .frontPic = gMonFrontPic_CircledQuestionMark, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index ae7835d74f..9f7cf449a8 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -2290,17 +2290,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), .abilities = { ABILITY_FLOWER_VEIL, ABILITY_NONE, ABILITY_SYMBIOSIS }, .bodyColor = BODY_COLOR_WHITE, - .speciesName = _("Floette"), + .speciesName = _("花叶蒂"), .cryId = CRY_FLOETTE_ETERNAL, // CRY_FLOETTE_MEGA, .natDexNum = NATIONAL_DEX_FLOETTE, - .categoryName = _("Single Bloom"), + .categoryName = _("单朵"), // height // weight .description = COMPOUND_STRING( - "The Eternal Flower has absorbed\n" - "all the energy from Mega\n" - "Evolution. The flower now attacks\n" - "enemies on its own."), + "永恒之花会将超级进化的能量吸尽。\n" + "花可以独自袭击敌人。"), .frontPic = gMonFrontPic_CircledQuestionMark, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index ff7f14759c..617cca68d7 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -6782,10 +6782,7 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 dept case IF_REGION: case IF_NOT_REGION: { - if (condition == IF_REGION) - StringAppend(gStringVar4, COMPOUND_STRING("in ")); - else if (condition == IF_NOT_REGION) - StringAppend(gStringVar4, COMPOUND_STRING("out of ")); + StringAppend(gStringVar4, COMPOUND_STRING("在")); switch ((enum Region)evolutions[i].params[j].arg1) { @@ -6793,17 +6790,23 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 dept case REGIONS_COUNT: StringAppend(gStringVar4, COMPOUND_STRING("???")); break; - case REGION_KANTO: StringAppend(gStringVar4, COMPOUND_STRING("Kanto")); break; - case REGION_JOHTO: StringAppend(gStringVar4, COMPOUND_STRING("Johto")); break; - case REGION_HOENN: StringAppend(gStringVar4, COMPOUND_STRING("Hoenn")); break; - case REGION_SINNOH: StringAppend(gStringVar4, COMPOUND_STRING("Sinnoh")); break; - case REGION_UNOVA: StringAppend(gStringVar4, COMPOUND_STRING("Unova")); break; - case REGION_KALOS: StringAppend(gStringVar4, COMPOUND_STRING("Kalos")); break; - case REGION_ALOLA: StringAppend(gStringVar4, COMPOUND_STRING("Alola")); break; - case REGION_GALAR: StringAppend(gStringVar4, COMPOUND_STRING("Galar")); break; - case REGION_HISUI: StringAppend(gStringVar4, COMPOUND_STRING("Hisui")); break; - case REGION_PALDEA: StringAppend(gStringVar4, COMPOUND_STRING("Paldea")); break; + case REGION_KANTO: StringAppend(gStringVar4, COMPOUND_STRING("关都")); break; + case REGION_JOHTO: StringAppend(gStringVar4, COMPOUND_STRING("城都")); break; + case REGION_HOENN: StringAppend(gStringVar4, COMPOUND_STRING("丰缘")); break; + case REGION_SINNOH: StringAppend(gStringVar4, COMPOUND_STRING("神奥")); break; + case REGION_UNOVA: StringAppend(gStringVar4, COMPOUND_STRING("合众")); break; + case REGION_KALOS: StringAppend(gStringVar4, COMPOUND_STRING("卡洛斯")); break; + case REGION_ALOLA: StringAppend(gStringVar4, COMPOUND_STRING("阿罗拉")); break; + case REGION_GALAR: StringAppend(gStringVar4, COMPOUND_STRING("伽勒尔")); break; + case REGION_HISUI: StringAppend(gStringVar4, COMPOUND_STRING("洗翠")); break; + case REGION_PALDEA: StringAppend(gStringVar4, COMPOUND_STRING("帕底亚")); break; } + + if (condition == IF_REGION) + StringAppend(gStringVar4, COMPOUND_STRING("地区")); + else if (condition == IF_NOT_REGION) + StringAppend(gStringVar4, COMPOUND_STRING("之外的其他地区")); + break; } // Gen 8