Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-10 14:44:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enable Gen1 slot location indication

Browse source 
Change "FRLG" -> "Kanto" as strings are reused

Used lines:
39c3968e5e/Gen1/DumpUtil.cs (L5)
table.Where(z => z != 0).Select(z => lines[z]).Distinct()

The only two that had FRLG are now showing "Kanto"
This commit is contained in:
Kurt 2021-01-08 13:59:18 -08:00
parent 3e0b52195a
commit 1882d284bd
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
PKHeX.Core/Game/GameStrings/GameStrings.cs
View file

@ -437,12 +437,19 @@ namespace PKHeX.Core
/// <param name="format">Current <see cref="PKM.Format"/></param>
/// <param name="generation"><see cref="PKM.Generation"/> of origin</param>
/// <param name="version">Current GameVersion (only applicable for <see cref="GameVersion.Gen7b"/> differentiation)</param>
/// <returns>Location name</returns>
/// <returns>Location name. May be an empty string if no location name is known for that location value.</returns>
public string GetLocationName(bool isEggLocation, int location, int format, int generation, GameVersion version)
{
int gen = -1;
int bankID = 0;
if (format == 1)
{
if (location == 0)
return string.Empty;
format = 3; // Legality binaries have Location IDs that were manually remapped to Gen3 location IDs.
}
if (format == 2)
{
gen = 2;
@ -474,7 +481,7 @@ namespace PKHeX.Core
location--;
}
var bank = GetLocationNames(gen, bankID, version);
var bank = GetLocationNames(gen, version, bankID);
if (bank.Count <= location)
return string.Empty;
return bank[location];
@ -484,10 +491,10 @@ namespace PKHeX.Core
/// Gets the location names array for a specified generation.
/// </summary>
/// <param name="gen">Generation to get location names for.</param>
/// <param name="bankID">BankID used to choose the text bank.</param>
/// <param name="version">Version of origin</param>
/// <param name="bankID">BankID used to choose the text bank.</param>
/// <returns>List of location names.</returns>
public IReadOnlyList<string> GetLocationNames(int gen, int bankID, GameVersion version) => gen switch
public IReadOnlyList<string> GetLocationNames(int gen, GameVersion version, int bankID = 0) => gen switch
{
2 => metGSC_00000,
3 => GameVersion.CXD.Contains(version) ? metCXD_00000 : metRSEFRLG_00000,

BIN
PKHeX.Core/Resources/text/gen3/text_rsefrlg_00000_en.txt
View file

Binary file not shown.

BIN
PKHeX.Core/Resources/text/gen3/text_rsefrlg_00000_es.txt
View file

Binary file not shown.

BIN
PKHeX.Core/Resources/text/gen3/text_rsefrlg_00000_zh.txt
View file

Binary file not shown.

4
PKHeX.Core/Resources/text/other/text_rsefrlg_00000_ja.txt
View file

@ -130,11 +130,11 @@ Ferry
ちかつうろ (５-６ばんどうろ)
ちかつうろ (７-８ばんどうろ)
ディグダのあな
チャンピオンロード (FRLG)
チャンピオンロード (カントー地方)
ロケットだんアジト
シルフカンパニー
ポケモンやしき
サファリゾーン (FRLG)
サファリゾーン (カントー地方)
ポケモンリーグ
イワヤマトンネル
ふたごじま