Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-23 12:33:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Several minor fixes and update Chinese translation

Browse source
This commit is contained in:
wwwwwwzx 2017-05-19 21:58:42 -07:00
parent 63b3c8b020
commit 13be5201b1
4 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Legality/Tables.cs
View file

@ -170,7 +170,7 @@ namespace PKHeX.Core
555, // Darmanitan
648, // Meloetta
681, // Aegislash
719, // Xerneas
716, // Xerneas
746, // Wishiwashi
778, // Mimikyu
};

6
PKHeX.Core/Legality/Tables6.cs
View file

@ -456,7 +456,7 @@ namespace PKHeX.Core
new EncounterStatic { Species = 175, Level = 1, EggLocation = 60004, Ability = 1, Gift = true, EggCycles = 70 }, // Togepi
new EncounterStatic { Species = 374, Level = 1, Location = 196, Ability = 1, IVs = new[] {-1, -1, 31, -1, -1, 31}, Gift = true }, // Beldum
new EncounterStatic { Species = 351, Level = 30, Location = 240, Nature = Nature.Lax, Ability = 1, IVs = new[] {-1, -1, -1, -1, 31, -1}, Contest = new[] {0,100,0,0,0,0}, Gift = true }, // Castform
new EncounterStatic { Species = 351, Level = 30, Location = 240, Gender = 1, Ability = 1, Nature = Nature.Lax, IVs = new[] {-1, -1, -1, -1, 31, -1}, Contest = new[] {0,100,0,0,0,0}, Gift = true }, // Castform
new EncounterStatic { Species = 319, Level = 40, Location = 318, Gender = 1, Ability = 1, Nature = Nature.Adamant, Gift = true }, // Sharpedo
new EncounterStatic { Species = 323, Level = 40, Location = 318, Gender = 1, Ability = 1, Nature = Nature.Quiet, Gift = true }, // Camerupt
@ -505,8 +505,8 @@ namespace PKHeX.Core
new EncounterStatic { Species = 352, Level = 30, Location = 240 }, // Kecleon @ Route 119
new EncounterStatic { Species = 352, Level = 30, Location = 242 }, // Kecleon @ Route 120
new EncounterStatic { Species = 352, Level = 40, Location = 176 }, // Kecleon @ Lavaridge
new EncounterStatic { Species = 352, Level = 45, Location = 196 }, // Kecleon @ Mossdeep City
new EncounterStatic { Species = 352, Level = 40, Location = 176, Gender = 1, }, // Kecleon @ Lavaridge
new EncounterStatic { Species = 352, Level = 45, Location = 196, Ability = 4, }, // Kecleon @ Mossdeep City
new EncounterStatic { Species = 381, Level = 30, Location = 320, Version = GameVersion.AS, IV3 = true }, // Latios
new EncounterStatic { Species = 380, Level = 30, Location = 320, Version = GameVersion.OR, IV3 = true }, // Latias

59
PKHeX.Core/Resources/text/zh/LegalityCheckStrings_zh.txt
View file

@ -33,16 +33,15 @@ V356 = 通过土居忍士在第{0}世代进化为铁面忍者习得。
V361 = 默认招式。
V362 = 在第{0}世代的默认招式。
V372 = {0}树果
V380 = Encounter Type match encounter.
V382 = Encounter Type not implemented for pokemon encounter.
V382 = Encounter Type not implemented for pokemon encounter.
V391 = Porygon with valid Type A and B values.
V392 = Valid Type A, match species type.
V393 = Valid Type B, match species type.
V394 = Catch rate match a valid held item from generation 2
V398 = Catch rate match any species from pokemon evolution chain.
V403 = Valid International Stadium OT.
V404 = Valid Japanese Stadium OT.
V380 = 遇见类型与遇见方式一致。
V382 = 遇见类型功能未实现。
V391 = 多边兽有合法的类型A与B值。
V392 = 合法类型A, 与种族一致。
V393 = 合法类型B, 与种族一致。
V394 = 捕获率与合法二代持有物一致。
V398 = 捕获率与进化链中某种一致。
V403 = 合法国际版竞技场初训家。
V404 = 合法日版竞技场初训家。
V203 = 无性别宝可梦不能有性别。
V201 = 未设置加密常数。
V204 = 持有物未解禁。
@ -77,7 +76,7 @@ V3 = 宝可梦种类无法用于昵称对比
V20 = 昵称与种类名不一致。
V13 = 蛋名称与语言不一致。
V12 = 蛋必须有昵称。
V224 = Egg must be not nicknamed.
V224 = 蛋不能被改名。
V7 = 游戏内连接交换版本不合法?
V8 = 游戏内连接交换序号不合法?
V10 = 游戏内连接交换的初训家被修改。
@ -162,7 +161,7 @@ V91 = 当前来源版本不能有超级训练解锁的标记。
V92 = 当前来源版本不能有超级训练完成的标记。
V93 = 超级训练完成标记不匹配。
V94 = 配信超级训练任务未发布。
V98 = Unused Super Training Flag is flagged.
V98 = 未使用的超级训练旗标被标记。
V95 = 蛋不能接受奖章。
V96 = GBA冠军奖章
V97 = 肖像奖章
@ -301,8 +300,8 @@ V351 = 不合法遇见地点，应该为传送或王冠。
V352 = 来自初始之间的阿尔宙斯，未发布的配信。
V353 = 非日版来自边境的小岛的梦幻，未发布的配信。
V354 = 非白金版来自花之乐园的谢米，未发布的配信。
V383 = Non Platinum Darkrai from Newmoon Island. Unreleased event.
V384 = Johto Route 45 surfing encounter. Unreachable Water tiles.
V383 = 非白金版来自新月岛的达克莱伊，未发布的配信。
V384 = 城都45号道路的水面遇见类型，不可到达的水道。
V357 = 只能拥有一个铁面忍者的招式。
V358 = 遗传升级招式。与配信蛋招式冲突。
V359 = 无法在来源版本中匹配到相应的礼物蛋。
@ -322,19 +321,19 @@ V376 = {0}专属招式。与遗传招式{1}不共存。
V377 = 遗传招式。礼物蛋不应有。
V378 = 遗传升级招式。礼物蛋不应有。
V379 = {0}的遗传招式。与遗传的招式{1}不共存。
V381 = Encounter Type does not match encounter.
V385 = Moves combinations is not compatible with {0} evolution.
V386 = Porygon with invalid Type A value.
V387 = Porygon with invalid Type B value.
V388 = Porygon with invalid Type A and B values. Does not a match a valid type combination.
V389 = Invalid Type A, does not match species type.
V390 = Invalid Type B, does not match species type.
V395 = Catch rate does not match a valid held item from generation 2.
V396 = Catch rate match species without encounters. Expected a preevolution catch rate.
V397 = Catch rate does not match any species from pokemon evolution chain.
V399 = Catch rate does not match any species from pokemon evolution chain or any generation 2 held items.
V400 = Unable to match encounter conditions to a possible RNG frame.
V401 = In-game trade {0} should have evolved into {1}.
V402 = Incorrect Stadium OT.
V405 = Outsider {0} should have evolved into {1}.
V406 = Non japanese Shadow E-reader Pokémon. Unreleased encounter.
V381 = 遇见类型与遇见方式不一致。
V385 = 招式组合与{0}进化型不兼容.
V386 = 多边兽有不合法的类型A值。
V387 = 多边兽有不合法的类型B值。
V388 = 多边兽有不合法的类型A或B值。组合不合法
V389 = 不合法类型A, 与种类不一致。
V390 = 不合法类型B, 与种类不一致。
V395 = 捕获率与合法二代持有物一致。
V396 = 捕获率与不计遇见方式的种族一致。应为进化前捕获率。
V397 = 捕获率不能与该宝可梦进化链内种族一致。
V399 = 捕获率不能与该宝可梦进化链内种族或2代持有物一致。
V400 = 遇见方式无法与可能的乱数帧匹配。
V401 = 游戏内交换{0}应当进化为{1}.
V402 = 不正确竞技场初训家。
V405 = 外来的{0}应当进化为{1}.
V406 = 非日版黑暗E-reader宝可梦。未解禁遇见方式。

2
PKHeX.Core/Saves/SAV6.cs
View file

@ -592,7 +592,7 @@ namespace PKHeX.Core
if (ofs <= 0)
return null;
var data = Data.Skip(Daycare + 0x1E8).Take(DaycareSeedSize/2).Reverse().ToArray();
var data = Data.Skip(ofs + 0x1E8).Take(DaycareSeedSize/2).Reverse().ToArray();
return BitConverter.ToString(data).Replace("-", "");
}
public override bool? getDaycareHasEgg(int loc)