diff --git a/PKHeX.csproj b/PKHeX.csproj index 80413c45d..087d645c1 100644 --- a/PKHeX.csproj +++ b/PKHeX.csproj @@ -337,27 +337,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/PKX/f1-Main.Designer.cs b/PKX/f1-Main.Designer.cs index 192298fd0..7249e5a57 100644 --- a/PKX/f1-Main.Designer.cs +++ b/PKX/f1-Main.Designer.cs @@ -1547,7 +1547,7 @@ public void InitializeComponent() this.Label_Smart.Name = "Label_Smart"; this.Label_Smart.Size = new System.Drawing.Size(43, 13); this.Label_Smart.TabIndex = 37; - this.Label_Smart.Text = "Smart"; + this.Label_Smart.Text = "Clever"; this.Label_Smart.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // Label_Cute diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index c7ebd918f..6d172491f 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -226,7 +226,6 @@ public Form1() public static string[] trainingstage = { }; public static string[] wallpapernames = { }; public static string[] puffs = { }; - public static string[] ribbonlist = { }; public static string[] itempouch = { }; public static int[] speciesability = { }; public static int[] saveoffsets = { }; @@ -1442,6 +1441,8 @@ private void InitializeLanguage() // lazy text table... 8 columns string[] langlistorigin = new string[] { // ID // EN // JP // FR // IT // DE // ES // KO + "27", "OR", "OR", "OR", "OR", "OR", "OR", "OR", + "26", "AS", "AS", "AS", "AS", "AS", "AS", "AS", "24", "X", "X", "X", "X", "X", "X", "X", "25", "Y", "Y", "Y", "Y", "Y", "Y", "Y", "20", "White", "ホワイト", "Blanche", "Bianca", "Weiße", "Blanca", "화이트", @@ -1932,44 +1933,44 @@ private void setForms(int species) }; var form_castform = new[] { new { Text = types[0], Value = 0 }, // Normal - new { Text = forms[773], Value = 1 }, // Sunny - new { Text = forms[774], Value = 2 }, // Rainy - new { Text = forms[775], Value = 3 }, // Snowy + new { Text = forms[789], Value = 1 }, // Sunny + new { Text = forms[790], Value = 2 }, // Rainy + new { Text = forms[791], Value = 3 }, // Snowy }; var form_shellos = new[] { new { Text = forms[422], Value = 0 }, // West - new { Text = forms[788], Value = 1 }, // East + new { Text = forms[811], Value = 1 }, // East }; var form_deoxys = new[] { new { Text = types[0], Value = 0 }, // Normal - new { Text = forms[780], Value = 1 }, // Attack - new { Text = forms[781], Value = 2 }, // Defense - new { Text = forms[782], Value = 3 }, // Speed + new { Text = forms[802], Value = 1 }, // Attack + new { Text = forms[803], Value = 2 }, // Defense + new { Text = forms[804], Value = 3 }, // Speed }; var form_burmy = new[] { new { Text = forms[412], Value = 0 }, // Plant - new { Text = forms[783], Value = 1 }, // Sandy - new { Text = forms[784], Value = 2 }, // Trash + new { Text = forms[805], Value = 1 }, // Sandy + new { Text = forms[806], Value = 2 }, // Trash }; var form_cherrim = new[] { new { Text = forms[421], Value = 0 }, // Overcast - new { Text = forms[787], Value = 1 }, // Sunshine + new { Text = forms[809], Value = 1 }, // Sunshine }; var form_rotom = new[] { new { Text = types[0], Value = 0 }, // Normal - new { Text = forms[793], Value = 1 }, // Heat - new { Text = forms[794], Value = 2 }, // Wash - new { Text = forms[795], Value = 3 }, // Frost - new { Text = forms[796], Value = 4 }, // Fan - new { Text = forms[797], Value = 5 }, // Mow + new { Text = forms[817], Value = 1 }, // Heat + new { Text = forms[818], Value = 2 }, // Wash + new { Text = forms[819], Value = 3 }, // Frost + new { Text = forms[820], Value = 4 }, // Fan + new { Text = forms[821], Value = 5 }, // Mow }; var form_giratina = new[] { new { Text = forms[487], Value = 0 }, // Altered - new { Text = forms[798], Value = 1 }, // Origin + new { Text = forms[822], Value = 1 }, // Origin }; var form_shaymin = new[] { new { Text = forms[492], Value = 0 }, // Land - new { Text = forms[799], Value = 1 }, // Sky + new { Text = forms[823], Value = 1 }, // Sky }; var form_arceus = new[] { new { Text = types[0], Value = 0 }, // Normal @@ -1993,17 +1994,17 @@ private void setForms(int species) }; var form_basculin = new[] { new { Text = forms[550], Value = 0 }, // Red - new { Text = forms[817], Value = 1 }, // Blue + new { Text = forms[842], Value = 1 }, // Blue }; var form_darmanitan = new[] { new { Text = forms[555], Value = 0 }, // Standard - new { Text = forms[818], Value = 1 }, // Zen + new { Text = forms[843], Value = 1 }, // Zen }; var form_deerling = new[] { new { Text = forms[585], Value = 0 }, // Spring - new { Text = forms[819], Value = 1 }, // Summer - new { Text = forms[820], Value = 2 }, // Autumn - new { Text = forms[821], Value = 3 }, // Winter + new { Text = forms[844], Value = 1 }, // Summer + new { Text = forms[845], Value = 2 }, // Autumn + new { Text = forms[846], Value = 3 }, // Winter }; var form_gender = new[] { new { Text = "♂", Value = 0 }, // Male @@ -2011,12 +2012,12 @@ private void setForms(int species) }; var form_therian = new[] { new { Text = forms[641], Value = 0 }, // Incarnate - new { Text = forms[825], Value = 1 }, // Therian + new { Text = forms[852], Value = 1 }, // Therian }; var form_kyurem = new[] { new { Text = types[0], Value = 0 }, // Normal - new { Text = forms[828], Value = 1 }, // White - new { Text = forms[829], Value = 2 }, // Black + new { Text = forms[853], Value = 1 }, // White + new { Text = forms[854], Value = 2 }, // Black }; var form_keldeo = new[] { new { Text = forms[647], Value = 0 }, // Ordinary @@ -2028,72 +2029,72 @@ private void setForms(int species) }; var form_genesect = new[] { new { Text = types[0], Value = 0 }, // Normal - new { Text = itemlist[116], Value = 1 }, // Douse - new { Text = itemlist[117], Value = 2 }, // Shock - new { Text = itemlist[118], Value = 3 }, // Burn - new { Text = itemlist[119], Value = 4 }, // Chill + new { Text = types[10], Value = 1 }, // Douse + new { Text = types[12], Value = 2 }, // Shock + new { Text = types[9], Value = 3 }, // Burn + new { Text = types[14], Value = 4 }, // Chill }; var form_flabebe = new[] { new { Text = forms[669], Value = 0 }, // Red - new { Text = forms[855], Value = 1 }, // Yellow - new { Text = forms[856], Value = 2 }, // Orange - new { Text = forms[867], Value = 3 }, // Blue - new { Text = forms[868], Value = 4 }, // White + new { Text = forms[884], Value = 1 }, // Yellow + new { Text = forms[885], Value = 2 }, // Orange + new { Text = forms[886], Value = 3 }, // Blue + new { Text = forms[887], Value = 4 }, // White }; var form_floette = new[] { new { Text = forms[669], Value = 0 }, // Red - new { Text = forms[855], Value = 1 }, // Yellow - new { Text = forms[856], Value = 2 }, // Orange - new { Text = forms[867], Value = 3 }, // Blue - new { Text = forms[868], Value = 4 }, // White - new { Text = forms[863], Value = 5 }, // Eternal + new { Text = forms[884], Value = 1 }, // Yellow + new { Text = forms[885], Value = 2 }, // Orange + new { Text = forms[886], Value = 3 }, // Blue + new { Text = forms[887], Value = 4 }, // White + new { Text = forms[888], Value = 5 }, // Eternal }; var form_furfrou = new[] { new { Text = forms[676], Value = 0 }, // Natural - new { Text = forms[868], Value = 1 }, // Heart - new { Text = forms[869], Value = 2 }, // Star - new { Text = forms[870], Value = 3 }, // Diamond - new { Text = forms[871], Value = 4 }, // Deputante - new { Text = forms[872], Value = 5 }, // Matron - new { Text = forms[873], Value = 6 }, // Dandy - new { Text = forms[874], Value = 7 }, // La Reine - new { Text = forms[875], Value = 8 }, // Kabuki - new { Text = forms[876], Value = 9 }, // Pharaoh + new { Text = forms[893], Value = 1 }, // Heart + new { Text = forms[894], Value = 2 }, // Star + new { Text = forms[895], Value = 3 }, // Diamond + new { Text = forms[896], Value = 4 }, // Deputante + new { Text = forms[897], Value = 5 }, // Matron + new { Text = forms[898], Value = 6 }, // Dandy + new { Text = forms[899], Value = 7 }, // La Reine + new { Text = forms[900], Value = 8 }, // Kabuki + new { Text = forms[901], Value = 9 }, // Pharaoh }; var form_aegislash = new[] { new { Text = forms[681], Value = 0 }, // Shield - new { Text = forms[878], Value = 1 }, // Blade + new { Text = forms[903], Value = 1 }, // Blade }; var form_butterfly = new[] { new { Text = forms[666], Value = 0 }, // Icy Snow - new { Text = forms[836], Value = 1 }, // Polar - new { Text = forms[837], Value = 2 }, // Tundra - new { Text = forms[838], Value = 3 }, // Continental - new { Text = forms[839], Value = 4 }, // Garden - new { Text = forms[840], Value = 5 }, // Elegant - new { Text = forms[841], Value = 6 }, // Meadow - new { Text = forms[842], Value = 7 }, // Modern - new { Text = forms[843], Value = 8 }, // Marine - new { Text = forms[844], Value = 9 }, // Archipelago - new { Text = forms[845], Value = 10 }, // High-Plains - new { Text = forms[846], Value = 11 }, // Sandstorm - new { Text = forms[847], Value = 12 }, // River - new { Text = forms[848], Value = 13 }, // Monsoon - new { Text = forms[849], Value = 14 }, // Savannah - new { Text = forms[850], Value = 15 }, // Sun - new { Text = forms[851], Value = 16 }, // Ocean - new { Text = forms[852], Value = 17 }, // Jungle - new { Text = forms[853], Value = 18 }, // Fancy - new { Text = forms[854], Value = 19 }, // Poké Ball + new { Text = forms[861], Value = 1 }, // Polar + new { Text = forms[862], Value = 2 }, // Tundra + new { Text = forms[863], Value = 3 }, // Continental + new { Text = forms[864], Value = 4 }, // Garden + new { Text = forms[865], Value = 5 }, // Elegant + new { Text = forms[866], Value = 6 }, // Meadow + new { Text = forms[867], Value = 7 }, // Modern + new { Text = forms[868], Value = 8 }, // Marine + new { Text = forms[869], Value = 9 }, // Archipelago + new { Text = forms[870], Value = 10 }, // High-Plains + new { Text = forms[871], Value = 11 }, // Sandstorm + new { Text = forms[872], Value = 12 }, // River + new { Text = forms[873], Value = 13 }, // Monsoon + new { Text = forms[874], Value = 14 }, // Savannah + new { Text = forms[875], Value = 15 }, // Sun + new { Text = forms[876], Value = 16 }, // Ocean + new { Text = forms[877], Value = 17 }, // Jungle + new { Text = forms[878], Value = 18 }, // Fancy + new { Text = forms[879], Value = 19 }, // Poké Ball }; var form_list = new[] { new { Text = "", Value = 0}, // None }; var form_pump = new[] { - new { Text = forms[879], Value = 0 }, // Small + new { Text = forms[904], Value = 0 }, // Small new { Text = forms[710], Value = 1 }, // Average - new { Text = forms[880], Value = 2 }, // Large - new { Text = forms[881], Value = 3 }, // Super + new { Text = forms[905], Value = 2 }, // Large + new { Text = forms[907], Value = 3 }, // Super }; var form_mega = new[] { new { Text = types[0], Value = 0}, // Normal @@ -2101,17 +2102,26 @@ private void setForms(int species) }; var form_megaxy = new[] { new { Text = types[0], Value = 0}, // Normal - new { Text = forms[723] + " X", Value = 1}, // Mega X - new { Text = forms[723] + " Y", Value = 2}, // Mega Y + new { Text = forms[724], Value = 1}, // Mega X + new { Text = forms[725], Value = 2}, // Mega Y }; var form_primal = new[] { new { Text = types[0], Value = 0}, - new { Text = "Primal", Value = 1}, + new { Text = forms[800], Value = 1}, }; var form_hoopa = new[] { new { Text = types[0], Value = 0}, - new { Text = "???", Value = 1}, + new { Text = forms[912], Value = 1}, + }; + var form_pikachu = new[] { + new { Text = types[0], Value = 0}, + new { Text = forms[729], Value = 1}, + new { Text = forms[730], Value = 2}, + new { Text = forms[731], Value = 3}, + new { Text = forms[732], Value = 4}, + new { Text = forms[733], Value = 5}, + new { Text = forms[734], Value = 6}, }; CB_Form.DataSource = form_list; @@ -2936,9 +2946,14 @@ private void updateLocations(int gameorigin) metlocs = new int[] { 2,6,8,10,12,14,16,17,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,78,82,84,86,88,90,92,94,96,98,100,102,104,106,108,110,112,114,116,118,120,122,124,126,128,130,132,134,136,138,140,142,144,146,148,150,152,154,156,158,160,162,164,166,168, + // ORAS + 170,172,174,176,178,180,182,184,186,188,190,192,194,196,198,200,202,204,206,208,210,212,214,216,218,220,222,224,226,228,230,232,234,236,238,240,242,244,246,248,250,252,254,256,258,260,262,264,266,268,270,272,274,276,278,280,282,284,286,288,290,292,294,296,298,300,302,304,306,308,310,312,314,316,318,320,322,324,326,328,330,332,334,336,338,340,342,344,346,348,350,352,354, + 30001,30003,30004,30005,30006,30007,30008,30009,30010,30011, 40001,40002,40003,40004,40005,40006,40007,40008,40009,40010,40011,40012,40013,40014,40015,40016,40017,40018,40019,40020,40021,40022,40023,40024,40025,40026,40027,40028,40029,40030,40031,40032,40033,40034,40035,40036,40037,40038,40039,40040,40041,40042,40043,40044,40045,40046,40047,40048,40049,40050,40051,40052,40053,40054,40055,40056,40057,40058,40059,40060,40061,40062,40063,40064,40065,40066,40067,40068,40069,40070,40071,40072,40073,40074,40075,40076,40077,40078,40079, - 60001,60003 + 60001,60003, + // ORAS + 60004, }; // Sort the Rest based on String Name @@ -3734,7 +3749,7 @@ private void openFile(byte[] input, string path, string ext) } #endregion #region Saves - else if ((input.Length == 0xAAAAA) && BitConverter.ToUInt32(input, 0xAAAAA) == 0x42454546) // ORAS + else if ((input.Length == 0x76000) && BitConverter.ToUInt32(input, 0x75E10) == 0x42454546) // ORAS openMAIN(input, path, "ORAS", true); else if ((input.Length == 0x65600) && BitConverter.ToUInt32(input, 0x65410) == 0x42454546) // XY openMAIN(input, path, "XY", false); @@ -3919,7 +3934,10 @@ private void openSave(bool oras) setSAVLabel(); // Reload the label indicating current save // temp ORAS save-editing disable - GB_SAVtools.Enabled = !oras; + // GB_SAVtools.Enabled = !oras; + B_OpenBerryField.Enabled = B_JPEG.Enabled = B_OpenBoxLayout.Enabled = B_OpenEventFlags.Enabled = B_OpenTrainerInfo.Enabled = + B_OpenOPowers.Enabled = B_OpenPokedex.Enabled = B_OpenPokepuffs.Enabled = B_OpenSuperTraining.Enabled = + B_OpenTrainerInfo.Enabled = B_OUTHallofFame.Enabled = B_OUTPasserby.Enabled = (!oras); this.Width = largeWidth; } @@ -4372,29 +4390,30 @@ private void B_VerifyCHK_Click(object sender, EventArgs e) // Verify Checksums RTB_S.Text = ""; int invalid1 = 0; - uint[] start = { - 0x05400, 0x05800, 0x06400, 0x06600, 0x06800, 0x06A00, 0x06C00, 0x06E00, 0x07000, 0x07200, 0x07400, 0x09600, 0x09800, 0x09E00, 0x0A400, 0x0F400, 0x14400, 0x19400, 0x19600, 0x19E00, 0x1A400, 0x1AC00, 0x1B400, 0x1B600, 0x1B800, 0x1BE00, 0x1C000, 0x1C400, 0x1CC00, 0x1CE00, 0x1D000, 0x1D200, 0x1D400, 0x1D600, 0x1DE00, 0x1E400, 0x1E800, 0x20400, 0x20600, 0x20800, 0x20C00, 0x21000, 0x22C00, 0x23000, 0x23800, 0x23C00, 0x24600, 0x24A00, 0x25200, 0x26000, 0x26200, 0x26400, 0x27200, 0x27A00, 0x5C600, - }; - uint[] length = { - 0x000002C8, 0x00000B88, 0x0000002C, 0x00000038, 0x00000150, 0x00000004, 0x00000008, 0x000001C0, 0x000000BE, 0x00000024, 0x00002100, 0x00000140, 0x00000440, 0x00000574, 0x00004E28, 0x00004E28, 0x00004E28, 0x00000170, 0x0000061C, 0x00000504, 0x000006A0, 0x00000644, 0x00000104, 0x00000004, 0x00000420, 0x00000064, 0x000003F0, 0x0000070C, 0x00000180, 0x00000004, 0x0000000C, 0x00000048, 0x00000054, 0x00000644, 0x000005C8, 0x000002F8, 0x00001B40, 0x000001F4, 0x000001F0, 0x00000216, 0x00000390, 0x00001A90, 0x00000308, 0x00000618, 0x0000025C, 0x00000834, 0x00000318, 0x000007D0, 0x00000C48, 0x00000078, 0x00000200, 0x00000C84, 0x00000628, 0x00034AD0, 0x0000E058, - }; - + uint[] start = { 0x05400, 0x05800, 0x06400, 0x06600, 0x06800, 0x06A00, 0x06C00, 0x06E00, 0x07000, 0x07200, 0x07400, 0x09600, 0x09800, 0x09E00, 0x0A400, 0x0F400, 0x14400, 0x19400, 0x19600, 0x19E00, 0x1A400, 0x1AC00, 0x1B400, 0x1B600, 0x1B800, 0x1BE00, 0x1C000, 0x1C400, 0x1CC00, 0x1CE00, 0x1D000, 0x1D200, 0x1D400, 0x1D600, 0x1DE00, 0x1E400, 0x1E800, 0x20400, 0x20600, 0x20800, 0x20C00, 0x21000, 0x22C00, 0x23000, 0x23800, 0x23C00, 0x24600, 0x24A00, 0x25200, 0x26000, 0x26200, 0x26400, 0x27200, 0x27A00, 0x5C600, }; + uint[] length = { 0x000002C8, 0x00000B88, 0x0000002C, 0x00000038, 0x00000150, 0x00000004, 0x00000008, 0x000001C0, 0x000000BE, 0x00000024, 0x00002100, 0x00000140, 0x00000440, 0x00000574, 0x00004E28, 0x00004E28, 0x00004E28, 0x00000170, 0x0000061C, 0x00000504, 0x000006A0, 0x00000644, 0x00000104, 0x00000004, 0x00000420, 0x00000064, 0x000003F0, 0x0000070C, 0x00000180, 0x00000004, 0x0000000C, 0x00000048, 0x00000054, 0x00000644, 0x000005C8, 0x000002F8, 0x00001B40, 0x000001F4, 0x000001F0, 0x00000216, 0x00000390, 0x00001A90, 0x00000308, 0x00000618, 0x0000025C, 0x00000834, 0x00000318, 0x000007D0, 0x00000C48, 0x00000078, 0x00000200, 0x00000C84, 0x00000628, 0x00034AD0, 0x0000E058, }; int csoff = 0x6A81A; + if (savegame_oras) + { + start = new uint[] { 0x05400, 0x05800, 0x06400, 0x06600, 0x06800, 0x06A00, 0x06C00, 0x06E00, 0x07000, 0x07200, 0x07400, 0x09600, 0x09800, 0x09E00, 0x0A400, 0x0F400, 0x14400, 0x19400, 0x19600, 0x19E00, 0x1A400, 0x1B600, 0x1BE00, 0x1C000, 0x1C200, 0x1C800, 0x1CA00, 0x1CE00, 0x1D600, 0x1D800, 0x1DA00, 0x1DC00, 0x1DE00, 0x1E000, 0x1E800, 0x1EE00, 0x1F200, 0x20E00, 0x21000, 0x21400, 0x21800, 0x22000, 0x23C00, 0x24000, 0x24800, 0x24C00, 0x25600, 0x25A00, 0x26200, 0x27000, 0x27200, 0x27400, 0x28200, 0x28A00, 0x28E00, 0x30A00, 0x38400, 0x6D000, }; + length = new uint[] { 0x000002C8, 0x00000B90, 0x0000002C, 0x00000038, 0x00000150, 0x00000004, 0x00000008, 0x000001C0, 0x000000BE, 0x00000024, 0x00002100, 0x00000130, 0x00000440, 0x00000574, 0x00004E28, 0x00004E28, 0x00004E28, 0x00000170, 0x0000061C, 0x00000504, 0x000011CC, 0x00000644, 0x00000104, 0x00000004, 0x00000420, 0x00000064, 0x000003F0, 0x0000070C, 0x00000180, 0x00000004, 0x0000000C, 0x00000048, 0x00000054, 0x00000644, 0x000005C8, 0x000002F8, 0x00001B40, 0x000001F4, 0x000003E0, 0x00000216, 0x00000640, 0x00001A90, 0x00000400, 0x00000618, 0x0000025C, 0x00000834, 0x00000318, 0x000007D0, 0x00000C48, 0x00000078, 0x00000200, 0x00000C84, 0x00000628, 0x00000400, 0x00007AD0, 0x000078B0, 0x00034AD0, 0x0000E058, }; + csoff = 0x7B21A; + } + for (int i = 0; i < length.Length; i++) { - byte[] data = new Byte[length[i]]; Array.Copy(savefile, start[i], data, 0, length[i]); ushort checksum = PKX.ccitt16(data); - ushort actualsum = (ushort)(savefile[csoff + i * 0x8] + savefile[csoff + i * 0x8 + 1] * 0x100); + ushort actualsum = BitConverter.ToUInt16(savefile, csoff + i * 0x8); if (checksum != actualsum) { invalid1++; RTB_S.Text += "Invalid: " + i.ToString("X2") + " @ region " + start[i].ToString("X5") + "\r\n"; } } - RTB_S.Text += "1st SAV: " + (0x37 - invalid1).ToString() + "/" + 0x37.ToString() + "\r\n"; + RTB_S.Text += "1st SAV: " + (start.Length - invalid1).ToString() + "/" + start.Length.ToString() + "\r\n"; // Do it again, but for the second SAV. csoff += 0x7F000; @@ -4405,22 +4424,19 @@ private void B_VerifyCHK_Click(object sender, EventArgs e) int invalid2 = 0; for (int i = 0; i < length.Length; i++) { - byte[] data = new Byte[length[i]]; Array.Copy(savefile, start[i], data, 0, length[i]); ushort checksum = PKX.ccitt16(data); - ushort actualsum = (ushort)(savefile[csoff + i * 0x8] + savefile[csoff + i * 0x8 + 1] * 0x100); + ushort actualsum = BitConverter.ToUInt16(savefile,csoff + i * 0x8); if (checksum != actualsum) { invalid2++; RTB_S.Text += "Invalid: " + i.ToString("X2") + " @ region " + start[i].ToString("X5") + "\r\n"; } } - RTB_S.Text += "2nd SAV: " + (0x37 - invalid2).ToString() + "/" + 0x37.ToString() + "\r\n"; - if (invalid1 + invalid2 == (0x37 * 2)) - { + RTB_S.Text += "2nd SAV: " + (start.Length - invalid2).ToString() + "/" + start.Length.ToString() + "\r\n"; + if (invalid1 + invalid2 == (start.Length * 2)) RTB_S.Text = "No checksums are valid."; - } } private void B_VerifySHA_Click(object sender, EventArgs e) { @@ -4659,15 +4675,17 @@ private void exportSAV(object sender, EventArgs e) // Fix Checksums { - uint[] start = { - 0x05400, 0x05800, 0x06400, 0x06600, 0x06800, 0x06A00, 0x06C00, 0x06E00, 0x07000, 0x07200, 0x07400, 0x09600, 0x09800, 0x09E00, 0x0A400, 0x0F400, 0x14400, 0x19400, 0x19600, 0x19E00, 0x1A400, 0x1AC00, 0x1B400, 0x1B600, 0x1B800, 0x1BE00, 0x1C000, 0x1C400, 0x1CC00, 0x1CE00, 0x1D000, 0x1D200, 0x1D400, 0x1D600, 0x1DE00, 0x1E400, 0x1E800, 0x20400, 0x20600, 0x20800, 0x20C00, 0x21000, 0x22C00, 0x23000, 0x23800, 0x23C00, 0x24600, 0x24A00, 0x25200, 0x26000, 0x26200, 0x26400, 0x27200, 0x27A00, 0x5C600, - }; - uint[] length = { - 0x000002C8, 0x00000B88, 0x0000002C, 0x00000038, 0x00000150, 0x00000004, 0x00000008, 0x000001C0, 0x000000BE, 0x00000024, 0x00002100, 0x00000140, 0x00000440, 0x00000574, 0x00004E28, 0x00004E28, 0x00004E28, 0x00000170, 0x0000061C, 0x00000504, 0x000006A0, 0x00000644, 0x00000104, 0x00000004, 0x00000420, 0x00000064, 0x000003F0, 0x0000070C, 0x00000180, 0x00000004, 0x0000000C, 0x00000048, 0x00000054, 0x00000644, 0x000005C8, 0x000002F8, 0x00001B40, 0x000001F4, 0x000001F0, 0x00000216, 0x00000390, 0x00001A90, 0x00000308, 0x00000618, 0x0000025C, 0x00000834, 0x00000318, 0x000007D0, 0x00000C48, 0x00000078, 0x00000200, 0x00000C84, 0x00000628, 0x00034AD0, 0x0000E058, - }; - + uint[] start = { 0x05400, 0x05800, 0x06400, 0x06600, 0x06800, 0x06A00, 0x06C00, 0x06E00, 0x07000, 0x07200, 0x07400, 0x09600, 0x09800, 0x09E00, 0x0A400, 0x0F400, 0x14400, 0x19400, 0x19600, 0x19E00, 0x1A400, 0x1AC00, 0x1B400, 0x1B600, 0x1B800, 0x1BE00, 0x1C000, 0x1C400, 0x1CC00, 0x1CE00, 0x1D000, 0x1D200, 0x1D400, 0x1D600, 0x1DE00, 0x1E400, 0x1E800, 0x20400, 0x20600, 0x20800, 0x20C00, 0x21000, 0x22C00, 0x23000, 0x23800, 0x23C00, 0x24600, 0x24A00, 0x25200, 0x26000, 0x26200, 0x26400, 0x27200, 0x27A00, 0x5C600, }; + uint[] length = { 0x000002C8, 0x00000B88, 0x0000002C, 0x00000038, 0x00000150, 0x00000004, 0x00000008, 0x000001C0, 0x000000BE, 0x00000024, 0x00002100, 0x00000140, 0x00000440, 0x00000574, 0x00004E28, 0x00004E28, 0x00004E28, 0x00000170, 0x0000061C, 0x00000504, 0x000006A0, 0x00000644, 0x00000104, 0x00000004, 0x00000420, 0x00000064, 0x000003F0, 0x0000070C, 0x00000180, 0x00000004, 0x0000000C, 0x00000048, 0x00000054, 0x00000644, 0x000005C8, 0x000002F8, 0x00001B40, 0x000001F4, 0x000001F0, 0x00000216, 0x00000390, 0x00001A90, 0x00000308, 0x00000618, 0x0000025C, 0x00000834, 0x00000318, 0x000007D0, 0x00000C48, 0x00000078, 0x00000200, 0x00000C84, 0x00000628, 0x00034AD0, 0x0000E058, }; int csoff = 0x6A81A; + if (savegame_oras) + { + start = new uint[] { 0x05400, 0x05800, 0x06400, 0x06600, 0x06800, 0x06A00, 0x06C00, 0x06E00, 0x07000, 0x07200, 0x07400, 0x09600, 0x09800, 0x09E00, 0x0A400, 0x0F400, 0x14400, 0x19400, 0x19600, 0x19E00, 0x1A400, 0x1B600, 0x1BE00, 0x1C000, 0x1C200, 0x1C800, 0x1CA00, 0x1CE00, 0x1D600, 0x1D800, 0x1DA00, 0x1DC00, 0x1DE00, 0x1E000, 0x1E800, 0x1EE00, 0x1F200, 0x20E00, 0x21000, 0x21400, 0x21800, 0x22000, 0x23C00, 0x24000, 0x24800, 0x24C00, 0x25600, 0x25A00, 0x26200, 0x27000, 0x27200, 0x27400, 0x28200, 0x28A00, 0x28E00, 0x30A00, 0x38400, 0x6D000, }; + length = new uint[] { 0x000002C8, 0x00000B90, 0x0000002C, 0x00000038, 0x00000150, 0x00000004, 0x00000008, 0x000001C0, 0x000000BE, 0x00000024, 0x00002100, 0x00000130, 0x00000440, 0x00000574, 0x00004E28, 0x00004E28, 0x00004E28, 0x00000170, 0x0000061C, 0x00000504, 0x000011CC, 0x00000644, 0x00000104, 0x00000004, 0x00000420, 0x00000064, 0x000003F0, 0x0000070C, 0x00000180, 0x00000004, 0x0000000C, 0x00000048, 0x00000054, 0x00000644, 0x000005C8, 0x000002F8, 0x00001B40, 0x000001F4, 0x000003E0, 0x00000216, 0x00000640, 0x00001A90, 0x00000400, 0x00000618, 0x0000025C, 0x00000834, 0x00000318, 0x000007D0, 0x00000C48, 0x00000078, 0x00000200, 0x00000C84, 0x00000628, 0x00000400, 0x00007AD0, 0x000078B0, 0x00034AD0, 0x0000E058, }; + csoff = 0x7B21A; + } + if (savindex == 1) { csoff += 0x7F000; @@ -4682,6 +4700,8 @@ private void exportSAV(object sender, EventArgs e) ushort checksum = PKX.ccitt16(data); Array.Copy(BitConverter.GetBytes(checksum), 0, editedsav, csoff + i * 8, 2); } + + if (cybergadget) goto export; } // Fix Hashes @@ -4871,17 +4891,20 @@ private void exportSAV(object sender, EventArgs e) Array.Copy(hashValue, 0, editedsav, 0x16C, 0x20); } } - - // File Integrity has been restored as well as it can. Export! // Write the active save index - editedsav[0x168] = (byte)(savindex^1); + editedsav[0x168] = (byte)(savindex ^ 1); + export: + // File Integrity has been restored as well as it can. Export! // If CyberGadget - if (BitConverter.ToUInt32(editedsav, 0x100) != 0x41534944) + if (cybergadget) { byte[] cybersav = new Byte[0x65600]; - Array.Copy(editedsav, 0x5400, cybersav, 0, 0x65600); - + if (savegame_oras) cybersav = new Byte[0x76000]; + Array.Copy(editedsav, 0x5400, cybersav, 0, cybersav.Length); + ushort wtf = BitConverter.ToUInt16(editedsav, 0x75E1A); + ushort wtf2 = BitConverter.ToUInt16(cybersav, 0x75E1A); + if (savegame_oras) goto postcheck; // Chunk Error Checking byte[] FFFF = new Byte[0x200]; byte[] section = new Byte[0x200]; @@ -4909,7 +4932,7 @@ private void exportSAV(object sender, EventArgs e) return; } } - + postcheck: SaveFileDialog cySAV = new SaveFileDialog(); // Try for file path @@ -5234,7 +5257,7 @@ private int getSlot(object sender) } public void setPKXBoxes() { - int boxoffset = 0x27A00 + 0x7F000 * savindex + C_BoxSelect.SelectedIndex * (0xE8 * 30); + int boxoffset = SaveGame.Box + 0x7F000 * savindex + C_BoxSelect.SelectedIndex * (0xE8 * 30); int boxbgofst = (0x7F000 * savindex) + 0x9C1E + C_BoxSelect.SelectedIndex; int boxbgval = 1 + savefile[boxbgofst]; @@ -5938,7 +5961,6 @@ private void InitializeStrings() trainingbags = Util.getStringList("TrainingBag", l); trainingstage = Util.getStringList("SuperTraining", l); puffs = Util.getStringList("Puff", l); - ribbonlist = Util.getStringList("Ribbon", l); itempouch = Util.getStringList("ItemPouch", l); wallpapernames = Util.getStringList("Wallpaper", l); @@ -6052,9 +6074,9 @@ public SaveStruct(string GameID) { // Temp Name = "ORAS"; - Box = 0x27A00; - Party = 0x19600; - BattleBox = 0x09E00; + Box = 0x38400; // Confirmed + Party = 0x19600; // Confirmed + BattleBox = 0x09E00;// Confirmed Daycare = 0x20600; GTS = 0x1CC00; Fused = 0x1B400; @@ -6065,7 +6087,7 @@ public SaveStruct(string GameID) Trainer1 = 0x6800; Trainer2 = 0x9600; PCLayout = 0x9800; - Wondercard = 0x21000; + Wondercard = 0x22000;// Confirmed BerryField = 0x20C00; OPower = 0x1BE00; EventFlag = 0x19E00; diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 9e3c3e314..b3bf29d3d 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -23002,300 +23002,6 @@ internal class Resources { } } - /// - /// Looks up a localized string similar to Band des Kalos-Champs - ///Band des Champs - ///Band des Sinnoh-Champs - ///Zutraulichkeitsband - ///Trainingsband - ///Profikampfband - ///Meisterkampfband - ///Fleiß-Band - ///Band der Wachsamkeit - ///Band des Schocks - ///Band des Niederschlags - ///Band der Sorglosigkeit - ///Band der Entspannung - ///Band des Schlafens - ///Band des Lächelns - ///Hinreißendes Band - ///Königliches Band - ///Hinreißendes Königliches Band - ///Band des Künstlers - ///Fußabdruck-Band - ///Rekordband - ///Band der Legende - ///Band des Landes - ///Band der Nation - ///Band der Erde - ///Band der Welt - ///Klassisches Band - ///Premierband - ///Veranstaltungsb [rest of string was truncated]";. - /// - internal static string text_Ribbon_de { - get { - return ResourceManager.GetString("text_Ribbon_de", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kalos Champion Ribbon - ///Champion Ribbon - ///Sinnoh Champion Ribbon - ///Best Friends Ribbon - ///Training Ribbon - ///Skillful Battler Ribbon - ///Expert Battler Ribbon - ///Effort Ribbon - ///Alert Ribbon - ///Shock Ribbon - ///Downcast Ribbon - ///Careless Ribbon - ///Relax Ribbon - ///Snooze Ribbon - ///Smile Ribbon - ///Gorgeous Ribbon - ///Royal Ribbon - ///Gorgeous Royal Ribbon - ///Artist Ribbon - ///Footprint Ribbon - ///Record Ribbon - ///Legend Ribbon - ///Country Ribbon - ///National Ribbon - ///Earth Ribbon - ///World Ribbon - ///Classic Ribbon - ///Premier Ribbon - ///Event Ribbon - ///Birthday Ribbon - ///Special Ribbon - ///Souvenir Ribbon - /// [rest of string was truncated]";. - /// - internal static string text_Ribbon_en { - get { - return ResourceManager.GetString("text_Ribbon_en", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Cinta Campeón de Kalos - ///Cinta de Campeón - ///Cinta Campeón de Sinnoh - ///Cinta Afecto - ///Cinta Ejercicio - ///Cinta Figura del Combate - ///Cinta As del Combate - ///Cinta Esfuerzo - ///Cinta Alerta - ///Cinta Impacto - ///Cinta Abatimiento - ///Cinta Descuido - ///Cinta Relax - ///Cinta Cabezada - ///Cinta Sonrisa - ///Cinta Maravilla - ///Cinta Realeza - ///Cinta Realeza Maravilla - ///Cinta Artista - ///Cinta Huella - ///Cinta Récord - ///Cinta Leyenda - ///Cinta Campo - ///Cinta Nacional - ///Cinta Planeta - ///Cinta Mundo - ///Cinta Clásica - ///Cinta Principal - ///Cinta Evento - ///Cinta Cumpleaños - ///Cinta Especial - ///Cinta Recuerdo - ///Cinta [rest of string was truncated]";. - /// - internal static string text_Ribbon_es { - get { - return ResourceManager.GetString("text_Ribbon_es", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Ruban Maître de Kalos - ///Ruban Maître - ///Ruban Maître de Sinnoh - ///Ruban Affection - ///Ruban Perfectionnement - ///Ruban Élite du Combat - ///Ruban Génie du Combat - ///Ruban Effort - ///Ruban Alerte - ///Ruban Choc - ///Ruban Déprime - ///Ruban Négligence - ///Ruban Détente - ///Ruban Sieste - ///Ruban Sourire - ///Ruban Sublime - ///Ruban Royal - ///Ruban Royal Sublime - ///Ruban Artiste - ///Ruban Empreinte - ///Ruban Record - ///Ruban Légende - ///Ruban Pays - ///Ruban National - ///Ruban Terre - ///Ruban Monde - ///Ruban Classique - ///Ruban Premier - ///Ruban Événement - ///Ruban Anniversaire - ///Ruban Spécial - ///Ruban Souvenir - ///Ruban Souhait - ///R [rest of string was truncated]";. - /// - internal static string text_Ribbon_fr { - get { - return ResourceManager.GetString("text_Ribbon_fr", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Fiocco Campione Kalos - ///Fiocco Campione - ///Fiocco Campione Sinnoh - ///Fiocco Amicizia - ///Fiocco Training - ///Fiocco Asso della Lotta - ///Fiocco Genio della Lotta - ///Fiocco Merito - ///Fiocco Allarme - ///Fiocco Stupore - ///Fiocco Sconforto - ///Fiocco Indolenza - ///Fiocco Relax - ///Fiocco Pisolino - ///Fiocco Sorriso - ///Fiocco Meraviglia - ///Fiocco Reale - ///Fiocco Meraviglia Reale - ///Fiocco Artista - ///Fiocco Orma - ///Fiocco Record - ///Fiocco Leggenda - ///Fiocco Paese - ///Fiocco Nazionale - ///Fiocco Geo - ///Fiocco Mondiale - ///Fiocco Classico - ///Fiocco Principale - ///Fiocco Evento - ///Fiocco Compleanno - ///Fiocco Specia [rest of string was truncated]";. - /// - internal static string text_Ribbon_it { - get { - return ResourceManager.GetString("text_Ribbon_it", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to カロス チャンプリボン - ///チャンプリボン - ///シンオウ チャンプリボン - ///なかよしリボン - ///しゅぎょうリボン - ///グレートバトルリボン - ///マスターバトルリボン - ///がんばリボン - ///しゃっきリボン - ///どっきリボン - ///しょんぼリボン - ///うっかリボン - ///すっきリボン - ///ぐっすリボン - ///にっこリボン - ///ゴージャスリボン - ///ロイヤルリボン - ///ゴージャスロイヤルリボン - ///ブロマイドリボン - ///あしあとリボン - ///レコードリボン - ///レジェンドリボン - ///カントリーリボン - ///ナショナルリボン - ///アースリボン - ///ワールドリボン - ///クラシックリボン - ///プレミアリボン - ///イベントリボン - ///バースデーリボン - ///スペシャルリボン - ///メモリアルリボン - ///ウィッシュリボン - ///バトルチャンプリボン - ///エリアチャンプリボン - ///ナショナルチャンプリボン - ///ワールドチャンプリボン - ///おもいでコンテストリボン - ///おもいでバトルリボン. - /// - internal static string text_Ribbon_ja { - get { - return ResourceManager.GetString("text_Ribbon_ja", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 칼로스챔피언리본 - ///챔피언리본 - ///신오챔피언리본 - ///절친리본 - ///수행리본 - ///그레이트배틀리본 - ///마스터배틀리본 - ///노력리본 - ///뚝심리본 - ///철렁리본 - ///풀죽기리본 - ///덜렁이리본 - ///상쾌리본 - ///잠보리본 - ///방글방글리본 - ///고저스리본 - ///로열리본 - ///고저스로열리본 - ///브로마이드리본 - ///발자국리본 - ///레코드리본 - ///레전드리본 - ///컨트리리본 - ///내셔널리본 - ///어스리본 - ///월드리본 - ///클래식리본 - ///프리미어리본 - ///이벤트리본 - ///버스데이리본 - ///스페셜리본 - ///메모리얼리본 - ///위시리본 - ///배틀챔피언리본 - ///에리어챔피언리본 - ///내셔널챔피언리본 - ///월드챔피언리본 - ///추억콘테스트리본 - ///추억배틀리본. - /// - internal static string text_Ribbon_ko { - get { - return ResourceManager.GetString("text_Ribbon_ko", resourceCulture); - } - } - /// /// Looks up a localized string similar to Ei ///Bisasam diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 9f38c4a79..9d2523117 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -4906,27 +4906,6 @@ ..\Resources\text\ko\text_Puff_ko.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - ..\Resources\text\de\text_Ribbon_de.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - ..\Resources\text\en\text_Ribbon_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - ..\Resources\text\es\text_Ribbon_es.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - ..\Resources\text\fr\text_Ribbon_fr.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - ..\Resources\text\it\text_Ribbon_it.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - ..\Resources\text\ja\text_Ribbon_ja.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - - - ..\Resources\text\ko\text_Ribbon_ko.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - ..\Resources\text\de\text_SuperTraining_de.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 diff --git a/Resources/text/changelog.txt b/Resources/text/changelog.txt index bbaa49ac6..4e47165a4 100644 --- a/Resources/text/changelog.txt +++ b/Resources/text/changelog.txt @@ -343,4 +343,7 @@ http://projectpokemon.org/forums/showthread.php?36986 - Changed: Reorganized and cleaned up the source code in prep for future usage/updates. 11/05/14 - New Update: - - Fixed: Casting error for base happiness. \ No newline at end of file + - Fixed: Casting error for base happiness. + +11/21/14 - New Update: + - Added: Basic ORAS Support \ No newline at end of file diff --git a/Resources/text/de/text_Abilities_de.txt b/Resources/text/de/text_Abilities_de.txt index 961d40372..1f6a29559 100644 --- a/Resources/text/de/text_Abilities_de.txt +++ b/Resources/text/de/text_Abilities_de.txt @@ -1,4 +1,4 @@ -Nichts +- Duftnote Niesel Temposchub @@ -186,4 +186,7 @@ Zenithaut Familienbande Dunkelaura Feenaura -Aura-Umkehr \ No newline at end of file +Aura-Umkehr +Urmeer +Endland +Delta-Wind \ No newline at end of file diff --git a/Resources/text/de/text_Forms_de.txt b/Resources/text/de/text_Forms_de.txt index 714304bfa..5636ee61f 100644 --- a/Resources/text/de/text_Forms_de.txt +++ b/Resources/text/de/text_Forms_de.txt @@ -1,3 +1,4 @@ + @@ -198,6 +199,7 @@ +Einform @@ -347,9 +349,9 @@ +Formeo -eo @@ -378,13 +380,15 @@ eo +Kyogre +Groudon +Normalform -Normal @@ -406,20 +410,16 @@ Normal +Pflanzenumhang +Pflanzenumhang -Pflanzen -Pflanzen - - - - -Wolken +Wolkenform Westliches Meer Westliches Meer @@ -485,12 +485,12 @@ Rotom -Wandel +Wandelform -Land +Landform Arceus @@ -548,7 +548,7 @@ Arceus -Rotlinige +Rotlinige Form @@ -583,8 +583,8 @@ Normalmodus -Frühlings -Frühlings +Frühlingsform +Frühlingsform @@ -639,14 +639,14 @@ Frühlings -Inkarnations -Inkarnations +Inkarnationsform +Inkarnationsform -Inkarnations +Inkarnationsform Kyurem -Standard -Gesangs +Standardform +Gesangsform Genesect @@ -664,22 +664,22 @@ Genesect -Frost +Frostmuster -Rot -Rot -Rot +Rotblütler +Rotblütler +Rotblütler -Zottel +Zottelform Männlich -Schild +Schildform @@ -718,86 +718,110 @@ Ruhe-Modus +Gebanntes Hoopa - -Mega -Mega X -Mega Y - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Sonnen -Regen -Schnee - - - - -Angriffs -Verteidigungs -Initiative -Sand -Lumpen -Sand -Lumpen -Sonnen +Mega-Bisaflor +Mega-Glurak X +Mega-Glurak Y +Mega-Turtok +Mega-Bibor +Mega-Tauboss +Rocker-Pikachu +Damen-Pikachu +Star-Pikachu +Professoren-Pikachu +Wrestler-Pikachu +Cosplay-Pikachu +Mega-Simsala +Mega-Lahmus +Mega-Gengar +Mega-Kangama +Mega-Pinsir +Mega-Garados +Mega-Aerodactyl +Mega-Mewtu X +Mega-Mewtu Y +Mega-Ampharos +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Einform +Mega-Stahlos +Mega-Scherox +Mega-Skaraborn +Mega-Hundemon +Mega-Despotar +Mega-Gewaldro +Mega-Lohgock +Mega-Sumpex +Mega-Guardevoir +Mega-Zobiris +Mega-Flunkifer +Mega-Stolloss +Mega-Meditalis +Mega-Voltenso +Mega-Tohaido +Mega-Camerupt +Mega-Altaria +Sonnenform +Regenform +Schneeform +Mega-Banette +Mega-Absol +Mega-Firnontor +Mega-Brutalanda +Mega-Metagross +Mega-Latias +Mega-Latios +Protomorphose +Protomorphose +Mega-Rayquaza +Angriffsform +Verteidigungsform +Initiativeform +Sandumhang +Lumpenumhang +Sandumhang +Lumpenumhang +Sonnenform Östliches Meer Östliches Meer - - - -Hitze -Wasch -Frost -Wirbel -Schneid -Ur -Zenit +Mega-Schlapor +Mega-Knakrack +Mega-Lucario +Mega-Rexblisar +Mega-Galagladi +Hitze-Rotom +Wasch-Rotom +Frost-Rotom +Wirbel-Rotom +Schneid-Rotom +Urform +Zenitform Arceus Arceus Arceus @@ -815,68 +839,69 @@ Arceus Arceus Arceus Arceus -Blaulinige +Mega-Ohrdoch +Blaulinige Form Trance-Modus -Sommer -Herbst -Winter -Sommer -Herbst -Winter -Tiergeist -Tiergeist -Tiergeist -Weißes -Schwarzes -Resolut -Tanz +Sommerform +Herbstform +Winterform +Sommerform +Herbstform +Winterform +Tiergeistform +Tiergeistform +Tiergeistform +Weißes Kyurem +Schwarzes Kyurem +Resolutform +Tanzform Genesect Genesect Genesect Genesect -Schneefeld -Flocken -Kontinental -Ziergarten -Prunk -Blumenmeer -Innovations -Aquamarin -Archipel -Dürre -Sand -Flussdelta -Monsun -Savannen -Sonnen -Ozean -Dschungel -Fantasie -Pokéball -Gelb -Orange -Blau -Weiß -Gelb -Orange -Blau -Weiß -Ewig -Gelb -Orange -Blau -Weiß -Herzchen -Sternchen -Diamanten -Fräul -Damen -Kavaliers -Königinnen -Kabuki -Herrscher +Schneefeldmuster +Flockenmuster +Kontinentalmuster +Ziergartenmuster +Prunkmuster +Blumenmeermuster +Innovationsmuster +Aquamarinmuster +Archipelmuster +Dürremuster +Sandmuster +Flussdeltamuster +Monsunmuster +Savannenmuster +Sonnenmuster +Ozeanmuster +Dschungelmuster +Fantasiemuster +Pokéball-Muster +Gelbblütler +Orangeblütler +Blaublütler +Weißblütler +Gelbblütler +Orangeblütler +Blaublütler +Weißblütler +Ewigblütler +Gelbblütler +Orangeblütler +Blaublütler +Weißblütler +Herzchenschnitt +Sternchenschnitt +Diamantenschnitt +Fräuleinschnitt +Damenschnitt +Kavaliersschnitt +Königinnenschnitt +Kabuki-Schnitt +Herrscherschnitt Weiblich -Klingen +Klingenform Größe S Größe L Größe XL @@ -884,3 +909,5 @@ Größe S Größe L Größe XL Aktiv-Modus +Mega-Diancie +Entfesseltes Hoopa \ No newline at end of file diff --git a/Resources/text/de/text_GenLoc_de.txt b/Resources/text/de/text_GenLoc_de.txt index 654ccdfbc..cb4aa214b 100644 --- a/Resources/text/de/text_GenLoc_de.txt +++ b/Resources/text/de/text_GenLoc_de.txt @@ -1,6 +1,6 @@ -irgendwo +irgendwo in der ersten Stadt -in \x10\x04ᄀÿԆ\x00dessenderen Zuhause +in [VAR GENDBR(00FF,0506,0000)]dessenderen Zuhause im Zuhause eines Freundes in irgendjemandes Zuhause in einer lebhaften Stadt @@ -27,7 +27,7 @@ in einem Geheimversteck in einem Museum in einem Filmstudio in einem Bahnhof -auf einem Kampfschauplatz +an einem Kampfschauplatz in einem Schönheitssalon in einem Restaurant in einem Edelrestaurant @@ -58,5 +58,14 @@ auf einem schneebedeckten Berg in einem Kraftwerk auf einem Feld in einer Ruine -in einem Abwasserkanal -auf einer Safari \ No newline at end of file +auf einer Wasserroute +auf einer Safari +in einer Geheimbasis +in einer Wettbewerbshalle +in der Tiefe des Meeres +an einem wundersamen Ort +auf einem großen Schiff +auf einem aschebedeckten Weg +auf einer kleinen Insel +an einem geheimnisvollen Ort +beim Flug durch die Lüfte \ No newline at end of file diff --git a/Resources/text/de/text_Items_de.txt b/Resources/text/de/text_Items_de.txt index 9d311ab52..0cdc50093 100644 --- a/Resources/text/de/text_Items_de.txt +++ b/Resources/text/de/text_Items_de.txt @@ -1,4 +1,4 @@ -(Nichts) +Kein Item Meisterball Hyperball Superball @@ -455,13 +455,13 @@ Lunarfeder Mitgl.Karte Azurflöte Bootsticket -Wettb.-Karte +Wettbewerbskarte Magmastein Paket Kupon 1 Kupon 2 Kupon 3 -L-Schlüssel +Lagerschlüssel Geheimtrank Kampfkamera Gracidea @@ -532,8 +532,8 @@ Datenkarte26 Datenkarte27 Grüne Kugel Tresorkapsel -Rote Kugel -Blaue Kugel +Roter Edelstein +Blauer Edelstein Mytokristall Schönschuppe Evolith @@ -715,4 +715,62 @@ Fahrrad Holo-Log Feenjuwel Megaillon -Mega-Handschuh \ No newline at end of file +Mega-Handschuh +Eilrad +Kunstrad +Wailmerkanne +Devon-Waren +Aschetasche +Kelleröffner +Pokériegel-Set +Brief an Troy +Äon-Ticket +Scanner +Wüstenglas +Meteorit +R1-Schlüssel +R2-Schlüssel +R4-Schlüssel +R6-Schlüssel +Lagerschlüssel +Devon-Scope +Bootsticket +VM07 +Devon-Atemgerät +Live-Anzug +Live-Kleid +Magma-Anzug +Aqua-Anzug +Zweierticket +Mega-Armreif +Mega-Anhänger +Mega-Brille +Mega-Anker +Mega-Anstecker +Mega-Diadem +Mega-Beinreif +Meteorit +Sumpexnit +Gewaldronit +Zobirisnit +Altarianit +Galagladinit +Ohrdochnit +Metagrossnit +Tohaidonit +Lahmusnit +Stahlosnit +Taubossnit +Firnontornit +Diancienit +Banngefäß +Mega-Armband +Cameruptnit +Schlapornit +Brutalandanit +Bibornit +Meteorit +Meteorit +Schlüssel-Stein +Meteoritenstück +Äon-Flöte \ No newline at end of file diff --git a/Resources/text/de/text_Memories_de.txt b/Resources/text/de/text_Memories_de.txt index 3fe1431c9..9f76e35fd 100644 --- a/Resources/text/de/text_Memories_de.txt +++ b/Resources/text/de/text_Memories_de.txt @@ -1,4 +1,4 @@ - + Es erinnert sich daran, Es erinnert sich daran, @@ -37,67 +37,78 @@ irgendein Item irgendeine Attacke Pokémon Es scheint ein gutes Gedächtnis zu haben, aber es sieht so aus, als könnte es sich nicht erinnern... -{0} ist {1} {2} begegnet. {1} warf einen Pokéball und ihre gemeinsame Reise begann. {4} {3}. -{0} sah {1} zum ersten Mal, als es {2} aus seinem Ei geschlüpft ist. {4} {3}. -{0} ist {1} {2} begegnet. {4} {3}. -{0} gelangte per Tausch {2} in das Team von {1}. {4} {3}. -{0} ist mit {1} in ein Pokémon-Center gegangen, um {2} zu kaufen. {4} {3}. -{0} wurde von {1} irgendwo in ein Pokémon-Center gebracht und dort wieder aufgepäppelt.Wo war das noch gleich? Ach ja, {2}! {4} {3}. -{0} war mit {1} fischen. Zusammen haben sie ein {2} geangelt! {4} {3}. -{0} war mit {1} angeln und {1} hat ein mühsam an Land gezogenes Pokémon entkommen lassen. {4} {3}. -{0} hat gesehen, wie {1} sich um ein {2} gekümmert hat. {4} {3}. -{0} hat von {1} Süßigkeiten bekommen. {4} {3}. -{0} war mit {1} shoppen. {4} {3}. -{0} hat von {1} {2} gelernt. {4} {3}. -{0} hat {1} dabei geholfen, ein {2} aus einem Ei schlüpfen zu lassen. {4} {3}. -{0} war dabei, als {1} ein {2} gefangen hat. {4} {3}. -Als {0} nur noch wenige KP hatte, setzte {1} ein Item ein.Wie hieß das Item noch gleich? Ach ja, {2}! {4} {3}. -{0} hat auf Anweisung von {1} {2} eingesetzt, aber die Attacke hat keinerlei Wirkung gezeigt. {4} {3}. -{0} hat zusammen mit {1} gekämpft und ein {2} besiegt. {4} {3}. -{0} wurde von einem {2} besiegt und ist mit {1} geflüchtet. {4} {3}. -{0} wurde von {1} trainiert und hat sich {2} entwickelt. {4} {3}. -{0} ist mit {1} auf seinem Rücken übers Wasser gesurft. {4} {3}. -{0} hat gesehen, wie {1} von einem {2} auf dessen Rücken getragen wurde. {4} {3}. -{0} und {1} haben zusammen einen Arenaorden errungen. {4} {3}. -Als {1} sich der Herausforderung im Kampfhaus gestellt hat, war {0} extrem nervös. {4} {3}. -{0} ist mit {1} auf seinem Rücken geflogen und sie landeten {2}. {4} {3}. -{0} wurde zusammen mit {1} von einem wilden {2} überrascht. {4} {3}. -{0} hat gesehen, wie {1} ein Item eingesetzt hat.Wie hieß das Item noch gleich? Ach ja, {2}! {4} {3}. -{0} hat zusammen mit {1} den Champ besiegt. {4} {3}. -{0} war dabei, als {1} den Pokédex vervollständigt hat. {4} {3}. -{0} und {1} sind zusammen {2} begegnet. {4} {3}. -{0} war dabei, als {1} eine Kampf-Châtelaine besiegt hat. {4} {3}. -{0} hat mit {1} {2} mit dem Itemradar nach versteckten Items gesucht. {4} {3}. -{0} war mit {1} {2} Radfahren. {4} {3}. -{0} hat mit {1} {2} ein neues Reiseziel auf der Karte festgelegt. {4} {3}. -{0} hat zusammen mit {1} eine {2} gepflanzt und sich vorgestellt, wie reich die Ernte sein würde. {4} {3}. -{0} hat auf Befehl von {1} {2} die Attacke Stärke eingesetzt. {4} {3}. -{0} hat auf Befehl von {1} {2} die Attacke Zerschneider eingesetzt. {4} {3}. -{0} hat auf Befehl von {1} {2} einen Felsen zertrümmert. {4} {3}. -{0} hat mit {1} auf seinem Rücken {2} die Attacke Kaskade eingesetzt. {4} {3}. -{0} hat gesehen, wie {1} {2} heimlich etwas aufgehoben hat. {4} {3}. -{0} hat von {1} ein Item zum Tragen bekommen.Wie hieß das Item noch gleich? Ach ja, {2}! {4} {3}. -{0} ist mit {1} zur Siegesstraße aufgebrochen. {4} {3}. -{0} hat mit {1} ein Schild {2} gelesen. {4} {3}. -{0} war sehr beeindruckt von der Geschwindigkeit des Zugs, den es mit {1} genommen hatte. {4} {3}. -{0} hat mit {1} das Pokéradar benutzt und zusammen sind sie einem {2} begegnet. {4} {3}. -{0} war mit {1} unterwegs, als sie plötzlich von einem wilden {2} angegriffen wurden. Völlig überrumpelt haben sie das Weite gesucht. {4} {3}. -{0} hat mit {1} im Haus der Prüfung eine hohe Punktzahl erzielt. {4} {3}. -{0} hat über {1} den Richter kennengelernt, der es unverwandt angestarrt hat. {4} {3}. -{0} hat über {1} den Attacken-Verlerner kennengelernt, durch den es {2} vergessen hat. {4} {3}. -{0} konnte sich unter Anleitung von {1} wieder an {2} erinnern. {4} {3}. -{0} wurde von {1} in der Pokémon-Pension abgegeben und verbrachte seine Zeit dort zusammen mit einem {2}. {4} {3}. -{0} war neidisch, als {1} mit einem Los ein Item gewonnen hat.Wie hieß das Item noch gleich? Ach ja, {2}! {4} {3}. -{0} war dabei, als {1} {2} das Item Schutz eingesetzt hat. {4} {3}. -{0} hatte ein anstrengendes Spezialtraining mit {1}. {4} {3}. -{0} ist mit {1} Fahrstuhl gefahren. {4} {3}. -{0} wurde von {1} zum Namenbewerter gebracht und hat einen schicksalhaften Namen erhalten. {4} {3}. -{0} war mit {1} in einer Boutique. {1} hat einiges anprobiert, aber nichts gekauft. {4} {3}. -{0} war mit {1} in einem tollen Restaurant und hat dort ordentlich gemampft. {4} {3}. -{0} wurde von {1} zu einer freundlichen Frau gebracht, die sich liebevoll um es gekümmert hat. {4} {3}. -{0} hat zusammen mit {1} {2} einen Abfalleimer durchstöbert. {4} {3}. -{0} hat mit {1} gegen ein {2} gekämpft und sich dabei so sehr angestrengt, dass es sogar Verzweifler eingesetzt hat. {4} {3}. -{0} war mit {1} auf einem hohen Turm und hat von dort auf die Welt hinabgeblickt. {4} {3}. -{0} war mit {1} in der Spiegelhöhle und hat dort sein Spiegelbild gesehen. {4} {3}. -{0} hat sich mit {1} fast verlaufen, als sie gemeinsam einen Wald erkundet haben. {4} {3}. -{0} war mit {1} in einer Fabrik und hat dort viele kompliziert erscheinende Maschinen gesehen. {4} {3}. \ No newline at end of file +[VAR PKNICK(0000)] ist [VAR TRNAME(0001)] [VAR GENLOC(0002)] begegnet. [VAR TRNAME(0001)] warf einen Pokéball und ihre gemeinsame Reise begann. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] sah [VAR TRNAME(0001)] zum ersten Mal, als es [VAR GENLOC(0002)] aus seinem Ei geschlüpft ist. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist [VAR TRNAME(0001)] [VAR GENLOC(0002)] begegnet. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] gelangte per Tausch [VAR GENLOC(0002)] in das Team von [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist mit [VAR TRNAME(0001)] in einen Pokémon-Supermarkt gegangen, um [VAR ITEMPLUR1][VAR ITEM2(0002)] zu kaufen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 44] +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] fischen. Zusammen haben sie ein [VAR PKNAME(0002)] geangelt! [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] angeln und [VAR TRNAME(0001)] hat ein mühsam an Land gezogenes Pokémon entkommen lassen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 47] +[VAR PKNICK(0000)] hat von [VAR TRNAME(0001)] Süßigkeiten bekommen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] shoppen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 50] +[VAR PKNICK(0000)] hat [VAR TRNAME(0001)] dabei geholfen, ein [VAR PKNAME(0002)] aus einem Ei schlüpfen zu lassen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war dabei, als [VAR TRNAME(0001)] ein [VAR PKNAME(0002)] gefangen hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Als [VAR PKNICK(0000)] nur noch wenige KP hatte, setzte [VAR TRNAME(0001)] ein Item ein. Wie hieß das Item noch gleich? Ach ja, [VAR ITEM2(0002)]! [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 54] +[VAR PKNICK(0000)] hat zusammen mit [VAR TRNAME(0001)] gekämpft und ein [VAR PKNAME(0002)] besiegt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von einem [VAR PKNAME(0002)] besiegt und ist mit [VAR TRNAME(0001)] geflüchtet. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von [VAR TRNAME(0001)] trainiert und hat sich [VAR GENLOC(0002)] entwickelt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist mit [VAR TRNAME(0001)] auf seinem Rücken übers Wasser gesurft. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 59] +[VAR PKNICK(0000)] und [VAR TRNAME(0001)] haben zusammen einen Arenaorden errungen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Als [VAR TRNAME(0001)] sich der Herausforderung im Kampfhaus gestellt hat, war [VAR PKNICK(0000)] extrem nervös. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist mit [VAR TRNAME(0001)] auf seinem Rücken [VAR GENLOC(0002)] losgeflogen und sauste mit [VAR GENDBR(0001,0303,0000)]ihmihr durch die Lüfte. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 63] +[VAR PKNICK(0000)] hat gesehen, wie [VAR TRNAME(0001)] ein Item eingesetzt hat. Wie hieß das Item noch gleich? Ach ja, [VAR ITEM2(0002)]! [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat zusammen mit [VAR TRNAME(0001)] den Champ besiegt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war dabei, als [VAR TRNAME(0001)] den Pokédex vervollständigt hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] und [VAR TRNAME(0001)] sind zusammen [VAR PKNAME(0002)] begegnet. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war dabei, als [VAR TRNAME(0001)] eine Kampf-Châtelaine besiegt hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 69] +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] [VAR GENLOC(0002)] Radfahren. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] [VAR GENLOC(0002)] ein neues Reiseziel auf der Karte festgelegt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat zusammen mit [VAR TRNAME(0001)] eine [VAR ITEM2(0002)] gepflanzt und sich vorgestellt, wie reich die Ernte sein würde. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat auf Wunsch von [VAR TRNAME(0001)] [VAR GENLOC(0002)] die Attacke Stärke eingesetzt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat auf Wunsch von [VAR TRNAME(0001)] [VAR GENLOC(0002)] die Attacke Zerschneider eingesetzt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat auf Wunsch von [VAR TRNAME(0001)] [VAR GENLOC(0002)] einen Felsen zertrümmert. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] auf seinem Rücken [VAR GENLOC(0002)] die Attacke Kaskade eingesetzt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat gesehen, wie [VAR TRNAME(0001)] [VAR GENLOC(0002)] heimlich etwas aufgehoben hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat von [VAR TRNAME(0001)] ein Item zum Tragen bekommen. Wie hieß das Item noch gleich? Ach ja, [VAR ITEM2(0002)]! [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist mit [VAR TRNAME(0001)] zur Siegesstraße gegangen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 80] +[VAR PKNICK(0000)] war sehr beeindruckt von der Geschwindigkeit des Zugs, den es mit [VAR TRNAME(0001)] genommen hatte. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 82] +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] unterwegs, als sie plötzlich von einem wilden [VAR PKNAME(0002)] angegriffen wurden. Völlig überrumpelt haben sie das Weite gesucht. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] im Haus der Prüfung eine hohe Punktzahl erzielt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat über [VAR TRNAME(0001)] den Richter kennengelernt, der es unverwandt angestarrt hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat über [VAR TRNAME(0001)] den Attacken-Verlerner kennengelernt, durch den es [VAR MOVE(0002)] vergessen hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] konnte sich unter Anleitung von [VAR TRNAME(0001)] wieder an [VAR MOVE(0002)] erinnern. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von [VAR TRNAME(0001)] in der Pokémon-Pension abgegeben und verbrachte seine Zeit dort zusammen mit einem [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war neidisch, als [VAR TRNAME(0001)] mit einem Los ein Item gewonnen hat. Wie hieß das Item noch gleich? Ach ja, [VAR ITEM2(0002)]! [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war dabei, als [VAR TRNAME(0001)] [VAR GENLOC(0002)] das Item Schutz eingesetzt hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hatte ein anstrengendes Spezialtraining mit [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist mit [VAR TRNAME(0001)] Fahrstuhl gefahren. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von [VAR TRNAME(0001)] zum Namenbewerter gebracht. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] in einer Boutique. [VAR TRNAME(0001)] hat einiges anprobiert, aber nichts gekauft. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] in einem tollen Restaurant und hat dort ordentlich gemampft. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von [VAR TRNAME(0001)] zu einer freundlichen Frau gebracht, die sich liebevoll um es gekümmert hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat zusammen mit [VAR TRNAME(0001)] [VAR GENLOC(0002)] einen Abfalleimer durchstöbert. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 98] +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] auf einem hohen Turm und hat von dort nach unten geschaut. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] in der Spiegelhöhle und hat dort sein Spiegelbild gesehen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat sich mit [VAR TRNAME(0001)] fast verlaufen, als sie gemeinsam einen Wald erkundet haben. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] in einer Fabrik und hat dort viele kompliziert erscheinende Maschinen gesehen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] eine Geheimbasis eingerichtet. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] an einem Wettbewerb teilgenommen und dabei viele Leute beeindruckt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] an einem Wettbewerb teilgenommen und einen spektakulären Sieg errungen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist zusammen mit [VAR TRNAME(0001)] per Überflieger durch die Lüfte gesaust und zu verschiedenen Orten geflogen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von [VAR TRNAME(0001)] gebeten, in die Tiefe hinabzutauchen und den Meeresboden zu erkunden. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. + +Ich kann die Erinnerungen von Pokémon lesen. Deswegen nennt man mich Miss Memory. Möchtest du wissen, woran sich die Pokémon in deinem Team erinnern? +Spitze! Über die Erinnerungen welches deiner Pokémon möchtest du etwas wissen? +Komm jederzeit wieder! +Es erinnert sich noch an etwas anderes. +Möchtest du auch etwas über die Erinnerungen eines anderen Pokémon erfahren? \ No newline at end of file diff --git a/Resources/text/de/text_Moves_de.txt b/Resources/text/de/text_Moves_de.txt index 256715d7c..1a912f020 100644 --- a/Resources/text/de/text_Moves_de.txt +++ b/Resources/text/de/text_Moves_de.txt @@ -1,4 +1,4 @@ -(Nichts) +----- Pfund Karateschlag Duplexhieb @@ -615,4 +615,8 @@ Unheilsschwingen Tausend Pfeile Tausend Wellen Bodengewalt -Lux Calamitatis \ No newline at end of file +Lux Calamitatis +Ursprungswoge +Abgrundsklinge +Zenitstürmer +Dimensionswahn \ No newline at end of file diff --git a/Resources/text/de/text_Ribbon_de.txt b/Resources/text/de/text_Ribbon_de.txt deleted file mode 100644 index 727eab212..000000000 --- a/Resources/text/de/text_Ribbon_de.txt +++ /dev/null @@ -1,39 +0,0 @@ -Band des Kalos-Champs -Band des Champs -Band des Sinnoh-Champs -Zutraulichkeitsband -Trainingsband -Profikampfband -Meisterkampfband -Fleiß-Band -Band der Wachsamkeit -Band des Schocks -Band des Niederschlags -Band der Sorglosigkeit -Band der Entspannung -Band des Schlafens -Band des Lächelns -Hinreißendes Band -Königliches Band -Hinreißendes Königliches Band -Band des Künstlers -Fußabdruck-Band -Rekordband -Band der Legende -Band des Landes -Band der Nation -Band der Erde -Band der Welt -Klassisches Band -Premierband -Veranstaltungsband -Geburtstagsband -Sonderband -Gedenkband -Wunschband -Kampfmeisterband -Regionalmeisterband -Nationalmeisterband -Weltmeisterband -Wettbewerbsgedenkband -Kampfgedenkband \ No newline at end of file diff --git a/Resources/text/de/text_xy_00000_de.txt b/Resources/text/de/text_xy_00000_de.txt index e94b66a92..b5ce419fa 100644 --- a/Resources/text/de/text_xy_00000_de.txt +++ b/Resources/text/de/text_xy_00000_de.txt @@ -1,4 +1,4 @@ -－－－－－－－－－－ +－－－－－－－－－－ Mysteriöser Ort @@ -78,8 +78,8 @@ Frescora Route 16 Tristesse-Weg -\x10\x02뷿P -\x10\x02뷿Q +[~ 80] +[~ 81] Frosthöhle Route 17 @@ -168,3 +168,188 @@ Petrophia-Aquarium Geheimdungeon +Wurzelheim + +Rosaltstadt + +Faustauhaven + +Bad Lavastadt + +Laubwechselfeld + +Wiesenflur + +Floßbrunn + +Blütenburg City + +Graphitport City + +Malvenfroh City + +Metarost City + +Baumhausen City + +Seegrasulb City + +Moosbach City + +Xeneroville + +Prachtpolis City + +Pokémon Liga + +Route 101 + +Route 102 + +Route 103 + +Route 104 + +Route 105 + +Route 106 + +Route 107 + +Route 108 + +Route 109 + +Route 110 + +Route 111 + +Route 112 + +Route 113 + +Route 114 + +Route 115 + +Route 116 + +Route 117 + +Route 118 + +Route 119 + +Route 120 + +Route 121 + +Route 122 + +Route 123 + +Route 124 + +Route 125 + +Route 126 + +Route 127 + +Route 128 + +Route 129 + +Route 130 + +Route 131 + +Route 132 + +Route 133 + +Route 134 + +Meteorfälle + +Metaflurtunnel + +??? + +Wüstenruine + +Granithöhle + +Blütenburgwald + +Schlotberg + +Steilpass + +Feuriger Pfad + +Pyroberg + +Team Aquas Versteck + +Tiefseehöhle + +Urzeithöhle + +Siegesstraße + +Küstenhöhle + +Neu Malvenfroh + +Seewoge Malvenfroh + +Inselhöhle + +Grabmal + +Siegelkammer + +Sonnengrotte + +Team Magmas Versteck + +Himmelturm + +Kampfresort + +Insel im Süden + +MS Tide + +Safari-Zone + +Wunderwald + +Wunderhöhle + +Wundereiland + +Wunderberg + +Wilder Wald + +Namenlose Ebene + +Unerforschte Höhle + +Rätselhafte Höhle + +Höhle der Spaltung + +Sichelinsel + +Geheiminsel + +Luftraum + +Geheime Küste + +Geheime Blumenwiese + +Geheimbasis diff --git a/Resources/text/de/text_xy_60000_de.txt b/Resources/text/de/text_xy_60000_de.txt index e80b34d77..1d2dfa88c 100644 --- a/Resources/text/de/text_xy_60000_de.txt +++ b/Resources/text/de/text_xy_60000_de.txt @@ -1,3 +1,4 @@ -Ferne Person +Ferne Person Pensionsleiter -Schatzjäger +Schatzsucher +Dame der Heißen Quellen \ No newline at end of file diff --git a/Resources/text/en/text_Abilities_en.txt b/Resources/text/en/text_Abilities_en.txt index f8273707f..6c6464ffc 100644 --- a/Resources/text/en/text_Abilities_en.txt +++ b/Resources/text/en/text_Abilities_en.txt @@ -1,4 +1,4 @@ -None +— Stench Drizzle Speed Boost diff --git a/Resources/text/en/text_Forms_en.txt b/Resources/text/en/text_Forms_en.txt index 7af55cb7b..a5e2e241b 100644 --- a/Resources/text/en/text_Forms_en.txt +++ b/Resources/text/en/text_Forms_en.txt @@ -1,3 +1,4 @@ + @@ -198,8 +199,7 @@ - - +One form @@ -380,11 +380,11 @@ Normal +Kyogre +Groudon - - -Normal +Normal Forme @@ -410,8 +410,8 @@ Normal -Plant -Plant +Plant Cloak +Plant Cloak @@ -419,7 +419,7 @@ Plant -Overcast +Overcast Form West Sea West Sea @@ -485,12 +485,12 @@ Rotom -Altered +Altered Forme -Land +Land Forme Arceus @@ -548,7 +548,7 @@ Arceus -Red-Striped +Red-Striped Form @@ -583,8 +583,8 @@ Standard Mode -Spring -Spring +Spring Form +Spring Form @@ -639,14 +639,14 @@ Spring -Incarnate -Incarnate +Incarnate Forme +Incarnate Forme -Incarnate +Incarnate Forme Kyurem -Ordinary -Aria +Ordinary Form +Aria Forme Genesect @@ -664,22 +664,22 @@ Genesect -Icy Snow +Icy Snow Pattern -Red -Red -Red +Red Flower +Red Flower +Red Flower -Natural +Natural Form Male -Shield +Shield Forme @@ -718,86 +718,110 @@ Neutral Mode +Hoopa Confined - -Mega -Mega X -Mega Y - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Sunny -Rainy -Snowy - - - - -Attack -Defense -Speed -Sandy -Trash -Sandy -Trash -Sunshine +Mega Venusaur +Mega Charizard X +Mega Charizard Y +Mega Blastoise +Mega Beedrill +Mega Pidgeot +Pikachu Rock Star +Pikachu Belle +Pikachu Pop Star +Pikachu, Ph.D. +Pikachu Libre +Cosplay Pikachu +Mega Alakazam +Mega Slowbro +Mega Gengar +Mega Kangaskhan +Mega Pinsir +Mega Gyarados +Mega Aerodactyl +Mega Mewtwo X +Mega Mewtwo Y +Mega Ampharos +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +One form +Mega Steelix +Mega Scizor +Mega Heracross +Mega Houndoom +Mega Tyranitar +Mega Sceptile +Mega Blaziken +Mega Swampert +Mega Gardevoir +Mega Sableye +Mega Mawile +Mega Aggron +Mega Medicham +Mega Manectric +Mega Sharpedo +Mega Camerupt +Mega Altaria +Sunny Form +Rainy Form +Snowy Form +Mega Banette +Mega Absol +Mega Glalie +Mega Salamence +Mega Metagross +Mega Latias +Mega Latios +Primal Reversion +Primal Reversion +Mega Rayquaza +Attack Forme +Defense Forme +Speed Forme +Sandy Cloak +Trash Cloak +Sandy Cloak +Trash Cloak +Sunshine Form East Sea East Sea - - - -Heat -Wash -Frost -Fan -Mow -Origin -Sky +Mega Lopunny +Mega Garchomp +Mega Lucario +Mega Abomasnow +Mega Gallade +Heat Rotom +Wash Rotom +Frost Rotom +Fan Rotom +Mow Rotom +Origin Forme +Sky Forme Arceus Arceus Arceus @@ -815,68 +839,69 @@ Arceus Arceus Arceus Arceus -Blue-Striped +Mega Audino +Blue-Striped Form Zen Mode -Summer -Autumn -Winter -Summer -Autumn -Winter -Therian -Therian -Therian -White -Black -Resolute -Pirouette +Summer Form +Autumn Form +Winter Form +Summer Form +Autumn Form +Winter Form +Therian Forme +Therian Forme +Therian Forme +White Kyurem +Black Kyurem +Resolute Form +Pirouette Forme Genesect Genesect Genesect Genesect -Polar -Tundra -Continental -Garden -Elegant -Meadow -Modern -Marine -Archipelago -High Plains -Sandstorm -River -Monsoon -Savanna -Sun -Ocean -Jungle -Fancy -Poké Ball -Yellow -Orange -Blue -White -Yellow -Orange -Blue -White -Eternal -Yellow -Orange -Blue -White -Heart -Star -Diamond -Debutante -Matron -Dandy -La Re -Kabuki -Pharaoh +Polar Pattern +Tundra Pattern +Continental Pattern +Garden Pattern +Elegant Pattern +Meadow Pattern +Modern Pattern +Marine Pattern +Archipelago Pattern +High Plains Pattern +Sandstorm Pattern +River Pattern +Monsoon Pattern +Savanna Pattern +Sun Pattern +Ocean Pattern +Jungle Pattern +Fancy Pattern +Poké Ball Pattern +Yellow Flower +Orange Flower +Blue Flower +White Flower +Yellow Flower +Orange Flower +Blue Flower +White Flower +Eternal Flower +Yellow Flower +Orange Flower +Blue Flower +White Flower +Heart Trim +Star Trim +Diamond Trim +Debutante Trim +Matron Trim +Dandy Trim +La Reine Trim +Kabuki Trim +Pharaoh Trim Female -Blade +Blade Forme Small Size Large Size Super Size @@ -884,3 +909,5 @@ Small Size Large Size Super Size Active Mode +Mega Diancie +Hoopa Unbound \ No newline at end of file diff --git a/Resources/text/en/text_GenLoc_en.txt b/Resources/text/en/text_GenLoc_en.txt index 0bba25858..761c5daff 100644 --- a/Resources/text/en/text_GenLoc_en.txt +++ b/Resources/text/en/text_GenLoc_en.txt @@ -1,4 +1,4 @@ -somewhere +somewhere the first town home a friend’s house @@ -23,7 +23,7 @@ a school a large city a building a stylish café -a secret base +a hideout a museum a studio a train station @@ -58,5 +58,14 @@ a snowy mountain a power plant a field a ruin -a sewer -a safari \ No newline at end of file +a watery route +a safari +a Secret Base +a Contest Spectacular Hall +a place deep in the ocean +a Mirage spot +a large ship +an ash-covered path +a tiny island +a mystical place +oh, while soaring in the sky \ No newline at end of file diff --git a/Resources/text/en/text_Items_en.txt b/Resources/text/en/text_Items_en.txt index 1a3b1601a..dd2c88ba5 100644 --- a/Resources/text/en/text_Items_en.txt +++ b/Resources/text/en/text_Items_en.txt @@ -1,4 +1,4 @@ -(None) +None Master Ball Ultra Ball Great Ball @@ -448,7 +448,7 @@ Good Rod Super Rod Sprayduck Poffin Case -Bicycle +Bike Suite Key Oak’s Letter Lunar Wing @@ -711,7 +711,7 @@ Shalour Sable Jaw Fossil Sail Fossil Looker Ticket -Bicycle +Bike Holo Caster Fairy Gem Mega Charm diff --git a/Resources/text/en/text_Moves_en.txt b/Resources/text/en/text_Moves_en.txt index c724e7633..e50138b7a 100644 --- a/Resources/text/en/text_Moves_en.txt +++ b/Resources/text/en/text_Moves_en.txt @@ -1,4 +1,4 @@ -(None) +——— Pound Karate Chop Double Slap diff --git a/Resources/text/en/text_Ribbon_en.txt b/Resources/text/en/text_Ribbon_en.txt deleted file mode 100644 index 48105827a..000000000 --- a/Resources/text/en/text_Ribbon_en.txt +++ /dev/null @@ -1,39 +0,0 @@ -Kalos Champion Ribbon -Champion Ribbon -Sinnoh Champion Ribbon -Best Friends Ribbon -Training Ribbon -Skillful Battler Ribbon -Expert Battler Ribbon -Effort Ribbon -Alert Ribbon -Shock Ribbon -Downcast Ribbon -Careless Ribbon -Relax Ribbon -Snooze Ribbon -Smile Ribbon -Gorgeous Ribbon -Royal Ribbon -Gorgeous Royal Ribbon -Artist Ribbon -Footprint Ribbon -Record Ribbon -Legend Ribbon -Country Ribbon -National Ribbon -Earth Ribbon -World Ribbon -Classic Ribbon -Premier Ribbon -Event Ribbon -Birthday Ribbon -Special Ribbon -Souvenir Ribbon -Wishing Ribbon -Battle Champion Ribbon -Regional Champion Ribbon -National Champion Ribbon -World Champion Ribbon -Contest Memory Ribbon -Battle Memory Ribbon \ No newline at end of file diff --git a/Resources/text/en/text_xy_00000_en.txt b/Resources/text/en/text_xy_00000_en.txt index c7b1b2ec4..d19d31b9c 100644 --- a/Resources/text/en/text_xy_00000_en.txt +++ b/Resources/text/en/text_xy_00000_en.txt @@ -1,4 +1,4 @@ ----------- +—————— Mystery Zone @@ -78,8 +78,8 @@ Dendemille Town Route 16 Mélancolie Path -\x10\x02뷿P -\x10\x02뷿Q +[~ 80] +[~ 81] Frost Cavern Route 17 @@ -168,3 +168,188 @@ Ambrette Aquarium Unknown Dungeon +Littleroot Town + +Oldale Town + +Dewford Town + +Lavaridge Town + +Fallarbor Town + +Verdanturf Town + +Pacifidlog Town + +Petalburg City + +Slateport City + +Mauville City + +Rustboro City + +Fortree City + +Lilycove City + +Mossdeep City + +Sootopolis City + +Ever Grande City + +Pokémon League + +Route 101 + +Route 102 + +Route 103 + +Route 104 + +Route 105 + +Route 106 + +Route 107 + +Route 108 + +Route 109 + +Route 110 + +Route 111 + +Route 112 + +Route 113 + +Route 114 + +Route 115 + +Route 116 + +Route 117 + +Route 118 + +Route 119 + +Route 120 + +Route 121 + +Route 122 + +Route 123 + +Route 124 + +Route 125 + +Route 126 + +Route 127 + +Route 128 + +Route 129 + +Route 130 + +Route 131 + +Route 132 + +Route 133 + +Route 134 + +Meteor Falls + +Rusturf Tunnel + +??? + +Desert Ruins + +Granite Cave + +Petalburg Woods + +Mt. Chimney + +Jagged Pass + +Fiery Path + +Mt. Pyre + +Team Aqua Hideout + +Seafloor Cavern + +Cave of Origin + +Victory Road + +Shoal Cave + +New Mauville + +Sea Mauville + +Island Cave + +Ancient Tomb + +Sealed Chamber + +Scorched Slab + +Team Magma Hideout + +Sky Pillar + +Battle Resort + +Southern Island + +S.S. Tidal + +Safari Zone + +Mirage Forest + +Mirage Cave + +Mirage Island + +Mirage Mountain + +Trackless Forest + +Pathless Plain + +Nameless Cavern + +Fabled Cave + +Gnarled Den + +Crescent Isle + +Secret Islet + +Soaring in the sky + +Secret Shore + +Secret Meadow + +Secret Base diff --git a/Resources/text/en/text_xy_60000_en.txt b/Resources/text/en/text_xy_60000_en.txt index 153d61661..0824af578 100644 --- a/Resources/text/en/text_xy_60000_en.txt +++ b/Resources/text/en/text_xy_60000_en.txt @@ -1,3 +1,4 @@ -a stranger -a Day-Care Couple +a stranger +Day Care helpers a treasure hunter +an old hot-springs visitor \ No newline at end of file diff --git a/Resources/text/es/text_Abilities_es.txt b/Resources/text/es/text_Abilities_es.txt index e82348840..795aa5110 100644 --- a/Resources/text/es/text_Abilities_es.txt +++ b/Resources/text/es/text_Abilities_es.txt @@ -1,4 +1,4 @@ -Ninguno +- Hedor Llovizna Impulso @@ -186,4 +186,7 @@ Piel Celeste Amor Filial Aura Oscura Aura Feérica -Rompeaura \ No newline at end of file +Rompeaura +Mar del Albor +Tierra del Ocaso +Ráfaga Delta \ No newline at end of file diff --git a/Resources/text/es/text_Forms_es.txt b/Resources/text/es/text_Forms_es.txt index 0d0cbd23a..10d7877b9 100644 --- a/Resources/text/es/text_Forms_es.txt +++ b/Resources/text/es/text_Forms_es.txt @@ -1,3 +1,4 @@ + @@ -198,6 +199,7 @@ +Una forma @@ -347,9 +349,9 @@ +Forma de Castform -a de Cast @@ -378,13 +380,15 @@ a de Cast +Kyogre +Groudon +Forma Normal -a Normal @@ -406,20 +410,16 @@ a Normal +Tronco Planta +Tronco Planta -Planta -Planta - - - - -a Encapotado +Forma Encapotado Mar Oeste Mar Oeste @@ -477,7 +477,7 @@ Mar Oeste -a de +Forma de Rotom @@ -485,12 +485,13 @@ a de -a Modificada +Forma Modificada -a Tierra +Forma Tierra +Forma de Arceus @@ -547,8 +548,7 @@ a Tierra - -a Raya Roja +Forma Raya Roja @@ -583,8 +583,8 @@ Modo Normal -a Primavera -a Primavera +Forma Primavera +Forma Primavera @@ -639,15 +639,15 @@ a Primavera -a Avatar -a Avatar +Forma Avatar +Forma Avatar -a Avatar -a Kyurem -a Habitual -a Lírica -a de Genesect +Forma Avatar +Forma Kyurem +Forma Habitual +Forma Lírica +Forma de Genesect @@ -664,22 +664,22 @@ a de Genesect -Polar +Motivo Polar -Roja -Roja -Roja +Flor Roja +Flor Roja +Flor Roja -a Salvaje +Forma Salvaje Macho -a Escudo +Forma Escudo @@ -708,8 +708,8 @@ a Escudo -Normal -Normal +Tamaño Normal +Tamaño Normal @@ -718,169 +718,196 @@ Modo Relajado +Hoopa Contenido - -Mega -Mega X -Mega Y - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -a Sol -a Lluvia -a Nieve - - - - -a Ataque -a Defensa -a Velocidad -Arena -Basura -Arena -Basura -a Soleado +Mega-Venusaur +Mega-Charizard X +Mega-Charizard Y +Mega-Blastoise +Mega-Beedrill +Mega-Pidgeot +Pikachu Roquera +Pikachu Aristócrata +Pikachu Superstar +Pikachu Erudita +Pikachu Enmascarada +Pikachu Coqueta +Mega-Alakazam +Mega-Slowbro +Mega-Gengar +Mega-Kangaskhan +Mega-Pinsir +Mega-Gyarados +Mega-Aerodactyl +Mega-Mewtwo X +Mega-Mewtwo Y +Mega-Ampharos +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Una forma +Mega-Steelix +Mega-Scizor +Mega-Heracross +Mega-Houndoom +Mega-Tyranitar +Mega-Sceptile +Mega-Blaziken +Mega-Swampert +Mega-Gardevoir +Mega-Sableye +Mega-Mawile +Mega-Aggron +Mega-Medicham +Mega-Manectric +Mega-Sharpedo +Mega-Camerupt +Mega-Altaria +Forma Sol +Forma Lluvia +Forma Nieve +Mega-Banette +Mega-Absol +Mega-Glalie +Mega-Salamence +Mega-Metagross +Mega-Latias +Mega-Latios +Regresión Primigenia +Regresión Primigenia +Mega-Rayquaza +Forma Ataque +Forma Defensa +Forma Velocidad +Tronco Arena +Tronco Basura +Tronco Arena +Tronco Basura +Forma Soleado Mar Este Mar Este - - - -Calor -Lavado -Frío -Ventilador -Corte -a Origen -a Cielo - - - - - - - - - - - - - - - - - -a Raya Azul +Mega-Lopunny +Mega-Garchomp +Mega-Lucario +Mega-Abomasnow +Mega-Gallade +Rotom Calor +Rotom Lavado +Rotom Frío +Rotom Ventilador +Rotom Corte +Forma Origen +Forma Cielo +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Forma de Arceus +Mega-Audino +Forma Raya Azul Modo Daruma -a Verano -a Otoño -a Invierno -a Verano -a Otoño -a Invierno -a Tótem -a Tótem -a Tótem -Blanco -Negro -a Brío -a Danza - - - - -Taiga -Tundra -Continental -Vergel -Oriental -Floral -Moderno -Marino -Isleño -Estepa -Desierto -Oasis -Monzón -Pantano -Solar -Océano -Jungla -Fantasía -Poké Ball -Amarilla -Naranja -Azul -Blanca -Amarilla -Naranja -Azul -Blanca -Eterna -Amarilla -Naranja -Azul -Blanca -Corazón -Estrella -Rombo -Señorita -Dama -Caballero -Aristocrático -Kabuki -Faraónico +Forma Verano +Forma Otoño +Forma Invierno +Forma Verano +Forma Otoño +Forma Invierno +Forma Tótem +Forma Tótem +Forma Tótem +Kyurem Blanco +Kyurem Negro +Forma Brío +Forma Danza +Forma de Genesect +Forma de Genesect +Forma de Genesect +Forma de Genesect +Motivo Taiga +Motivo Tundra +Motivo Continental +Motivo Vergel +Motivo Oriental +Motivo Floral +Motivo Moderno +Motivo Marino +Motivo Isleño +Motivo Estepa +Motivo Desierto +Motivo Oasis +Motivo Monzón +Motivo Pantano +Motivo Solar +Motivo Océano +Motivo Jungla +Motivo Fantasía +Motivo Poké Ball +Flor Amarilla +Flor Naranja +Flor Azul +Flor Blanca +Flor Amarilla +Flor Naranja +Flor Azul +Flor Blanca +Flor Eterna +Flor Amarilla +Flor Naranja +Flor Azul +Flor Blanca +Corte Corazón +Corte Estrella +Corte Rombo +Corte Señorita +Corte Dama +Corte Caballero +Corte Aristocrático +Corte Kabuki +Corte Faraónico Hembra -a Filo -Pequeño -Grande -Extragrande -Pequeño -Grande -Extragrande +Forma Filo +Tamaño Pequeño +Tamaño Grande +Tamaño Extragrande +Tamaño Pequeño +Tamaño Grande +Tamaño Extragrande Modo Activo +Mega-Diancie +Hoopa Desatado \ No newline at end of file diff --git a/Resources/text/es/text_GenLoc_es.txt b/Resources/text/es/text_GenLoc_es.txt index edafca4a6..0a579d6fc 100644 --- a/Resources/text/es/text_GenLoc_es.txt +++ b/Resources/text/es/text_GenLoc_es.txt @@ -1,4 +1,4 @@ -algún lugar +algún lugar el pueblo de partida casa casa de un amigo @@ -59,4 +59,13 @@ una central eléctrica un huerto unas ruinas unas alcantarillas -un safari \ No newline at end of file +un safari +una Base Secreta +un Auditorio del Gran Concurso +el fondo del mar +un paraje irreal +un gran navío +una ruta cubierta de ceniza +un islote +un lugar misterioso +el firmamento \ No newline at end of file diff --git a/Resources/text/es/text_Items_es.txt b/Resources/text/es/text_Items_es.txt index 4fcecdd15..6c587892b 100644 --- a/Resources/text/es/text_Items_es.txt +++ b/Resources/text/es/text_Items_es.txt @@ -1,4 +1,4 @@ -(Ninguno) +Ningún objeto Master Ball Ultra Ball Super Ball @@ -532,8 +532,8 @@ Tarjeta Datos 26 Tarjeta Datos 27 Esfera Verde Cápsula Candado -Esfera Roja -Esfera Azul +Prisma Rojo +Prisma Azul Misticristal Escama Bella Mineral Evol @@ -715,4 +715,62 @@ Bici Holomisor Gema Hada Megacolgante -Megaguante \ No newline at end of file +Megaguante +Bici de Carreras +Bici Acrobática +Wailmegadera +Piezas Devon +Saco Hollín +Llave del Sótano +Kit de Pokécubos +Carta a Máximo +Ticket Eón +Escáner +Gafas Aislantes +Meteorito +Ll. Habitación 1 +Ll. Habitación 2 +Ll. Habitación 4 +Ll. Habitación 6 +Llave Almacén +Detector Devon +Ticket Barco +MO07 +Bombona Devon +Traje de Gala +Vestido de Gala +Traje Magma +Traje Aqua +Entrada para dos +Megapulsera +Megacollar +Megagafas +Megaancla +Megabroche +Megatiara +Megatobillera +Meteorito +Swampertita +Sceptilita +Sableynita +Altarianita +Galladita +Audinita +Metagrossita +Sharpedonita +Slowbronita +Steelixita +Pidgeotita +Glalita +Diancita +Vasija Castigo +Megabrazalete +Cameruptita +Lopunnita +Salamencita +Beedrillita +Meteorito +Meteorito +Piedra Activadora +Frag. Meteorito +Flauta Eón \ No newline at end of file diff --git a/Resources/text/es/text_Moves_es.txt b/Resources/text/es/text_Moves_es.txt index ccdfceb46..fe1a7bd8b 100644 --- a/Resources/text/es/text_Moves_es.txt +++ b/Resources/text/es/text_Moves_es.txt @@ -1,4 +1,4 @@ -(Ninguno) +- Destructor Golpe Kárate Doble Bofetón @@ -615,4 +615,8 @@ Ala Mortífera Mil Flechas Mil Temblores Fuerza Telúrica -Luz Aniquiladora \ No newline at end of file +Luz Aniquiladora +Pulso Primigenio +Filo del Abismo +Ascenso Draco +Cerco Dimensión \ No newline at end of file diff --git a/Resources/text/es/text_Ribbon_es.txt b/Resources/text/es/text_Ribbon_es.txt deleted file mode 100644 index ca68f5390..000000000 --- a/Resources/text/es/text_Ribbon_es.txt +++ /dev/null @@ -1,39 +0,0 @@ -Cinta Campeón de Kalos -Cinta de Campeón -Cinta Campeón de Sinnoh -Cinta Afecto -Cinta Ejercicio -Cinta Figura del Combate -Cinta As del Combate -Cinta Esfuerzo -Cinta Alerta -Cinta Impacto -Cinta Abatimiento -Cinta Descuido -Cinta Relax -Cinta Cabezada -Cinta Sonrisa -Cinta Maravilla -Cinta Realeza -Cinta Realeza Maravilla -Cinta Artista -Cinta Huella -Cinta Récord -Cinta Leyenda -Cinta Campo -Cinta Nacional -Cinta Planeta -Cinta Mundo -Cinta Clásica -Cinta Principal -Cinta Evento -Cinta Cumpleaños -Cinta Especial -Cinta Recuerdo -Cinta Deseo -Cinta Campeón de Torneo -Cinta Campeón de Área -Cinta Campeón Nacional -Cinta Campeón Mundial -Cinta Recue. de Concurso -Cinta Recue. de Combate \ No newline at end of file diff --git a/Resources/text/es/text_xy_00000_es.txt b/Resources/text/es/text_xy_00000_es.txt index 8a8509600..000704a39 100644 --- a/Resources/text/es/text_xy_00000_es.txt +++ b/Resources/text/es/text_xy_00000_es.txt @@ -1,4 +1,4 @@ -－ +－ Lugar misterioso @@ -78,8 +78,8 @@ Pueblo Fresco Ruta 16 Senda Melancolía -\x10\x02뷿P -\x10\x02뷿Q +[~ 80] +[~ 81] Gruta Helada Ruta 17 @@ -168,3 +168,188 @@ Acuario Petroglifo Mazmorra Rara +Villa Raíz + +Pueblo Escaso + +Pueblo Azuliza + +Pueblo Lavacalda + +Pueblo Pardal + +Pueblo Verdegal + +Pueblo Oromar + +Ciudad Petalia + +Ciudad Portual + +Ciudad Malvalona + +Ciudad Férrica + +Ciudad Arborada + +Ciudad Calagua + +Ciudad Algaria + +Arrecípolis + +Ciudad Colosalia + +Liga Pokémon + +Ruta 101 + +Ruta 102 + +Ruta 103 + +Ruta 104 + +Ruta 105 + +Ruta 106 + +Ruta 107 + +Ruta 108 + +Ruta 109 + +Ruta 110 + +Ruta 111 + +Ruta 112 + +Ruta 113 + +Ruta 114 + +Ruta 115 + +Ruta 116 + +Ruta 117 + +Ruta 118 + +Ruta 119 + +Ruta 120 + +Ruta 121 + +Ruta 122 + +Ruta 123 + +Ruta 124 + +Ruta 125 + +Ruta 126 + +Ruta 127 + +Ruta 128 + +Ruta 129 + +Ruta 130 + +Ruta 131 + +Ruta 132 + +Ruta 133 + +Ruta 134 + +Cascada Meteoro + +Túnel Fervergal + +(?) + +Ruinas del Desierto + +Cueva Granito + +Bosque Petalia + +Monte Cenizo + +Desfiladero + +Senda Ígnea + +Monte Pírico + +Guarida Aqua + +Caverna Abisal + +Cueva Ancestral + +Calle Victoria + +Cueva Cardumen + +Malvalanova + +Malvamar + +Cueva Insular + +Tumba Antigua + +Cámara Sellada + +Gruta Solar + +Guarida Magma + +Pilar Celeste + +Resort Batalla + +Isla del Sur + +S.S. Marea + +Zona Safari + +Bosque Espejismo + +Cueva Espejismo + +Isla Espejismo + +Monte Espejismo + +Bosque Virgen + +Llanura Sinnombre + +Cueva Ignota + +Cueva Incierta + +Boquete Irregular + +Isla Creciente + +Islote Secreto + +Firmamento + +Costa Secreta + +Prado Secreto + +Base Secreta diff --git a/Resources/text/es/text_xy_60000_es.txt b/Resources/text/es/text_xy_60000_es.txt index c426e5212..44cdb763e 100644 --- a/Resources/text/es/text_xy_60000_es.txt +++ b/Resources/text/es/text_xy_60000_es.txt @@ -1,3 +1,4 @@ -Persona lejana +Persona lejana Pareja de la Guardería Buscatesoros +Anciana del Balneario \ No newline at end of file diff --git a/Resources/text/fr/text_Abilities_fr.txt b/Resources/text/fr/text_Abilities_fr.txt index 6fc96a57b..f2be543f5 100644 --- a/Resources/text/fr/text_Abilities_fr.txt +++ b/Resources/text/fr/text_Abilities_fr.txt @@ -1,4 +1,4 @@ -Aucun + Puanteur Crachin Turbo @@ -186,4 +186,7 @@ Peau Céleste Amour Filial Aura Ténébreuse Aura Féérique -Aura Inversée \ No newline at end of file +Aura Inversée +Mer Primaire +Terre Finale +Souffle Delta \ No newline at end of file diff --git a/Resources/text/fr/text_Forms_fr.txt b/Resources/text/fr/text_Forms_fr.txt index 69acafb68..871a44597 100644 --- a/Resources/text/fr/text_Forms_fr.txt +++ b/Resources/text/fr/text_Forms_fr.txt @@ -1,3 +1,4 @@ + @@ -198,6 +199,7 @@ +Forme Unique @@ -347,9 +349,9 @@ +Forme de Morphéo -e de Morphéo @@ -378,13 +380,15 @@ e de Morphéo +Kyogre +Groudon +Forme Normale -e Normale @@ -406,12 +410,8 @@ e Normale - - - - -Plante -Plante +Cape Plante +Cape Plante @@ -477,7 +477,7 @@ Mer Occident -e de Motisma +Forme de Motisma @@ -485,12 +485,13 @@ e de Motisma -e Alternative +Forme Alternative -e Terrestre +Forme Terrestre +Forme de Arceus @@ -547,8 +548,7 @@ e Terrestre - -Rouge +Motif Rouge @@ -583,8 +583,8 @@ Mode Normal -e Printemps -e Printemps +Forme Printemps +Forme Printemps @@ -639,14 +639,15 @@ e Printemps -e Avatar -e Avatar +Forme Avatar +Forme Avatar -e Avatar -e de Kyurem +Forme Avatar +Forme de Kyurem Aspect Normal -e Chant +Forme Chant +Forme de Genesect @@ -663,23 +664,22 @@ e Chant - -Blizzard +Motif Blizzard -Rouge -Rouge -Rouge +Fleur Rouge +Fleur Rouge +Fleur Rouge -e Sauvage +Forme Sauvage Mâle -e Parade +Forme Parade @@ -718,165 +718,190 @@ Mode Paisible +Hoopa Enchaîné - -Méga -Méga X -Méga Y - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -e Solaire -e Eau de Pluie -e Blizzard - - - - -e Attaque -e Défense -e Vitesse -Sable -Déchet -Sable -Déchet +Méga-Florizarre +Méga-Dracaufeu X +Méga-Dracaufeu Y +Méga-Tortank +Méga-Dardargnan +Méga-Roucarnage +Pikachu Rockeur +Pikachu Lady +Pikachu Star +Pikachu Docteur +Pikachu Catcheur +Pikachu Cosplayeur +Méga-Alakazam +Méga-Flagadoss +Méga-Ectoplasma +Méga-Kangourex +Méga-Scarabrute +Méga-Léviator +Méga-Ptéra +Méga-Mewtwo X +Méga-Mewtwo Y +Méga-Pharamp +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Forme Unique +Méga-Steelix +Méga-Cizayox +Méga-Scarhino +Méga-Démolosse +Méga-Tyranocif +Méga-Jungko +Méga-Braségali +Méga-Laggron +Méga-Gardevoir +Méga-Ténéfix +Méga-Mysdibule +Méga-Galeking +Méga-Charmina +Méga-Élecsprint +Méga-Sharpedo +Méga-Camérupt +Méga-Altaria +Forme Solaire +Forme Eau de Pluie +Forme Blizzard +Méga-Branette +Méga-Absol +Méga-Oniglali +Méga-Drattak +Méga-Métalosse +Méga-Latias +Méga-Latios +Primo-Résurgence +Primo-Résurgence +Méga-Rayquaza +Forme Attaque +Forme Défense +Forme Vitesse +Cape Sable +Cape Déchet +Cape Sable +Cape Déchet Temps Ensoleillé Mer Orient Mer Orient - - - -Chaleur -Lavage -Froid -Hélice -Tonte -e Originelle -e Céleste - - - - - - - - - - - - - - - - - -Bleu +Méga-Lockpin +Méga-Carchacrok +Méga-Lucario +Méga-Blizzaroi +Méga-Gallame +Motisma Chaleur +Motisma Lavage +Motisma Froid +Motisma Hélice +Motisma Tonte +Forme Originelle +Forme Céleste +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Forme de Arceus +Méga-Nanméouïe +Motif Bleu Mode Transe -e Été -e Automne -e Hiver -e Été -e Automne -e Hiver -e Totémique -e Totémique -e Totémique +Forme Été +Forme Automne +Forme Hiver +Forme Été +Forme Automne +Forme Hiver +Forme Totémique +Forme Totémique +Forme Totémique Kyurem Blanc Kyurem Noir Aspect Décidé -e Danse - - - - -Banquise -Glace -Continent -Verdure -Monarchie -Floraison -Métropole -Rivage -Archipel -Sécheresse -Sable -Delta -Cyclone -Mangrove -Zénith -Soleil Levant -Jungle -Fantaisie -Poké Ball -Jaune -Orange -Bleue -Blanche -Jaune -Orange -Bleue -Blanche +Forme Danse +Forme de Genesect +Forme de Genesect +Forme de Genesect +Forme de Genesect +Motif Banquise +Motif Glace +Motif Continent +Motif Verdure +Motif Monarchie +Motif Floraison +Motif Métropole +Motif Rivage +Motif Archipel +Motif Sécheresse +Motif Sable +Motif Delta +Motif Cyclone +Motif Mangrove +Motif Zénith +Motif Soleil Levant +Motif Jungle +Motif Fantaisie +Motif Poké Ball +Fleur Jaune +Fleur Orange +Fleur Bleue +Fleur Blanche +Fleur Jaune +Fleur Orange +Fleur Bleue +Fleur Blanche Éternelle -Jaune -Orange -Bleue -Blanche -Cœur -Étoile -Diamant -Demoiselle -Madame -Monsieur -Re -Kabuki -Pharaon +Fleur Jaune +Fleur Orange +Fleur Bleue +Fleur Blanche +Coupe Cœur +Coupe Étoile +Coupe Diamant +Coupe Demoiselle +Coupe Madame +Coupe Monsieur +Coupe Reine +Coupe Kabuki +Coupe Pharaon Femelle -e Assaut +Forme Assaut Taille Mini Taille Maxi Taille Ultra @@ -884,3 +909,5 @@ Taille Mini Taille Maxi Taille Ultra Mode Déchaîné +Méga-Diancie +Hoopa Déchaîné \ No newline at end of file diff --git a/Resources/text/fr/text_GenLoc_fr.txt b/Resources/text/fr/text_GenLoc_fr.txt index 1c15bcdea..4948b3415 100644 --- a/Resources/text/fr/text_GenLoc_fr.txt +++ b/Resources/text/fr/text_GenLoc_fr.txt @@ -1,4 +1,4 @@ -quelque part +quelque part dans la ville de départ dans sa maison chez un ami @@ -12,7 +12,7 @@ dans un château dans un hôtel dans une ville mystérieuse dans une ville très venteuse -à une Porte +à une porte dans une ville en bord de rivière dans un laboratoire dans un aquarium @@ -23,7 +23,7 @@ dans une école dans une ville immense dans un immeuble dans un café à la mode -dans une base secrète +dans une planque dans un musée dans un studio vidéo dans une gare @@ -58,5 +58,14 @@ sur une montagne enneigée dans une centrale électrique dans un champ dans des ruines -dans des égouts -au cours d’un safari \ No newline at end of file +dans un Chenal +au cours d’un safari +dans une Base Secrète +au Concours Pokémon +tout au fond de la mer +dans un endroit irréel +dans un grand bateau +sur une route pleine de cendres +sur un tout petit îlot +dans un lieu très impressionnant +dans le Grand Ciel \ No newline at end of file diff --git a/Resources/text/fr/text_Items_fr.txt b/Resources/text/fr/text_Items_fr.txt index b81b7ce26..996b05d20 100644 --- a/Resources/text/fr/text_Items_fr.txt +++ b/Resources/text/fr/text_Items_fr.txt @@ -1,4 +1,4 @@ -(Aucun) +Aucun objet Master Ball Hyper Ball Super Ball @@ -532,8 +532,8 @@ Carte Mémo26 Carte Mémo27 Orbe Vert Poké Écrin -Orbe Rouge -Orbe Bleu +Gemme Rouge +Gemme Bleue Mystécristal Bel’Écaille Évoluroc @@ -715,4 +715,62 @@ Bicyclette Holokit Joyau Fée Méga-Charme -Méga-Gant \ No newline at end of file +Méga-Gant +Vélo de Course +Vélo Cross +Wailmerrosoir +Pack Devon +Sac à Suie +Clé Sous-Sol +Kit Pokébloc +Lettre à Pierre +Passe Éon +Scanner +Lunettes Sable +Météorite +Clé Salle 1 +Clé Salle 2 +Clé Salle 4 +Clé Salle 6 +Clé Stockage +Devon Scope +Passe Bateau +CS07 +Plongeur Devon +Costume Live +Robe Live +Scaph. Magma +Scaphandre Aqua +Ticket Duo +Méga-Bracelet +Méga-Pendentif +Méga-Lunettes +Méga-Ancre +Méga-Pin’s +Méga-Tiare +Méga-Grève +Météorite +Laggronite +Jungkite +Ténéfixite +Altarite +Gallamite +Nanméouïte +Métalossite +Sharpedite +Flagadossite +Steelixite +Roucarnagite +Oniglalite +Diancite +Vase Scellé +Méga-Manchette +Caméruptite +Lockpinite +Drattakite +Dardargnite +Météorite +Météorite +Gemme Sésame +Éclat Météorite +Flûte Éon \ No newline at end of file diff --git a/Resources/text/fr/text_Moves_fr.txt b/Resources/text/fr/text_Moves_fr.txt index aadb4af91..d12287409 100644 --- a/Resources/text/fr/text_Moves_fr.txt +++ b/Resources/text/fr/text_Moves_fr.txt @@ -1,4 +1,4 @@ -(Aucun) +――――― Écras’Face Poing-Karaté Torgnoles @@ -615,4 +615,8 @@ Mort-Ailes Myria-Flèches Myria-Vagues Force Chtonienne -Lumière du Néant \ No newline at end of file +Lumière du Néant +Onde Originelle +Lame Pangéenne +Draco Ascension +Furie Dimension \ No newline at end of file diff --git a/Resources/text/fr/text_Ribbon_fr.txt b/Resources/text/fr/text_Ribbon_fr.txt deleted file mode 100644 index 3342cfc59..000000000 --- a/Resources/text/fr/text_Ribbon_fr.txt +++ /dev/null @@ -1,39 +0,0 @@ -Ruban Maître de Kalos -Ruban Maître -Ruban Maître de Sinnoh -Ruban Affection -Ruban Perfectionnement -Ruban Élite du Combat -Ruban Génie du Combat -Ruban Effort -Ruban Alerte -Ruban Choc -Ruban Déprime -Ruban Négligence -Ruban Détente -Ruban Sieste -Ruban Sourire -Ruban Sublime -Ruban Royal -Ruban Royal Sublime -Ruban Artiste -Ruban Empreinte -Ruban Record -Ruban Légende -Ruban Pays -Ruban National -Ruban Terre -Ruban Monde -Ruban Classique -Ruban Premier -Ruban Événement -Ruban Anniversaire -Ruban Spécial -Ruban Souvenir -Ruban Souhait -Ruban Vainqueur Championnat -Ruban Champion Régional -Ruban Champion National -Ruban Champion du Monde -Ruban Souvenir Concours -Ruban Souvenir Combat \ No newline at end of file diff --git a/Resources/text/fr/text_xy_00000_fr.txt b/Resources/text/fr/text_xy_00000_fr.txt index 05bd95794..7a9af4586 100644 --- a/Resources/text/fr/text_xy_00000_fr.txt +++ b/Resources/text/fr/text_xy_00000_fr.txt @@ -1,8 +1,8 @@ -－－－－－－－－－－ +－－－－－－－－－－ Endroit Mystérieux -Endroit lointain +Endroit Lointain Bourg Croquis @@ -78,8 +78,8 @@ La Frescale Route 16 Chemin Tristesse -\x10\x02뷿P -\x10\x02뷿Q +[~ 80] +[~ 81] Caverne Gelée Route 17 @@ -168,3 +168,188 @@ Aquarium R. s/Gliffe Grotte Inconnue +Bourg-en-Vol + +Rosyères + +Myokara + +Vermilava + +Autéquia + +Vergazon + +Pacifiville + +Clémenti-Ville + +Poivressel + +Lavandia + +Mérouville + +Cimetronelle + +Nénucrique + +Algatia + +Atalanopolis + +Éternara + +Ligue Pokémon + +Route 101 + +Route 102 + +Route 103 + +Route 104 + +Chenal 105 + +Chenal 106 + +Chenal 107 + +Chenal 108 + +Chenal 109 + +Route 110 + +Route 111 + +Route 112 + +Route 113 + +Route 114 + +Route 115 + +Route 116 + +Route 117 + +Route 118 + +Route 119 + +Route 120 + +Route 121 + +Chenal 122 + +Route 123 + +Chenal 124 + +Chenal 125 + +Chenal 126 + +Chenal 127 + +Chenal 128 + +Chenal 129 + +Chenal 130 + +Chenal 131 + +Chenal 132 + +Chenal 133 + +Chenal 134 + +Site Météore + +Tunnel Mérazon + +??? + +Ruines Désert + +Grotte Granite + +Bois Clémenti + +Mont Chimnée + +Sentier Sinuroc + +Chemin Ardent + +Mont Mémoria + +Planque Aqua + +Caverne Fondmer + +Grotte Origine + +Route Victoire + +Grotte Tréfonds + +New Lavandia + +Lavandia Sea + +Grotte de l’Îlot + +Tombeau Antique + +Sanctuaire + +Grotte Zénith + +Planque Magma + +Pilier Céleste + +Atoll de Combat + +Île du Sud + +Le Marina + +Parc Safari + +Forêt Mirage + +Grotte Mirage + +Île Mirage + +Mont Mirage + +Forêt Impénétrable + +Plaine Sans Nom + +Grotte Oubliée + +Grotte Évanescente + +Gouffre Informe + +Île de l’Arc + +Îlot Secret + +Grand Ciel + +Plage Secrète + +Champ Fleuri Secret + +Base Secrète diff --git a/Resources/text/fr/text_xy_60000_fr.txt b/Resources/text/fr/text_xy_60000_fr.txt index 2ea9d0143..b6443d353 100644 --- a/Resources/text/fr/text_xy_60000_fr.txt +++ b/Resources/text/fr/text_xy_60000_fr.txt @@ -1,3 +1,4 @@ -Personne lointaine -Couple de la Pension -Chasseur de trésors +Personne lointaine +Responsable de la Pension +Chercheur de Trésors +Dame des Eaux Thermales \ No newline at end of file diff --git a/Resources/text/it/text_Abilities_it.txt b/Resources/text/it/text_Abilities_it.txt index 24b20e0ab..acac8d172 100644 --- a/Resources/text/it/text_Abilities_it.txt +++ b/Resources/text/it/text_Abilities_it.txt @@ -1,4 +1,4 @@ -Niente +- Tanfo Piovischio Acceleratore @@ -186,4 +186,7 @@ Pellecielo Amorefiliale Auratetra Aurafolletto -Frangiaura \ No newline at end of file +Frangiaura +Mare Primordiale +Terra Estrema +Flusso Delta \ No newline at end of file diff --git a/Resources/text/it/text_Forms_it.txt b/Resources/text/it/text_Forms_it.txt index d4bcdec60..d6d0fe6e5 100644 --- a/Resources/text/it/text_Forms_it.txt +++ b/Resources/text/it/text_Forms_it.txt @@ -1,3 +1,4 @@ + @@ -198,6 +199,7 @@ +Forma Vaga @@ -347,9 +349,9 @@ +Forma Castform -a Cast @@ -382,9 +384,9 @@ a Cast +Forma Normale -a Normale @@ -408,18 +410,16 @@ a Normale +Manto Pianta +Manto Pianta -Pianta -Pianta - - -a Nuvola +Forma Nuvola Mare Ovest Mare Ovest @@ -477,7 +477,7 @@ Mare Ovest -a +Forma Rotom @@ -485,12 +485,13 @@ a -a Alterata +Forma Alterata -a Terra +Forma Terra +Forma di Arceus @@ -547,13 +548,13 @@ a Terra +Forma Linearossa -a Linearossa +Forma Normalità -a Normalità @@ -582,9 +583,9 @@ a Normalità +Forma Primavera +Forma Primavera -a Primavera -a Primavera @@ -638,15 +639,16 @@ a Primavera +Forma Incarnazione +Forma Incarnazione -a Incarnazione -a Incarnazione +Forma Incarnazione +Forma di Kyurem +Forma Normale +Forma Canto +Forma di Genesect -a Incarnazione -a di Kyurem -a Normale -a Canto @@ -662,24 +664,22 @@ a Canto +Motivo Nevi Perenni -Nevi Perenni +Fiore Rosso +Fiore Rosso +Fiore Rosso -Rosso -Rosso -Rosso - - -a Selvatica +Forma Selvatica Maschio -a Scudo +Forma Scudo @@ -718,165 +718,190 @@ Modo Relax +Hoopa Vincolato - -Mega -Mega X -Mega Y - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -a Sole -a Pioggia -a Nuvola di Neve - - - - -a Attacco -a Difesa -a Velocità -Sabbia -Scarti -Sabbia -Scarti -a Splendore +MegaVenusaur +MegaCharizard X +MegaCharizard Y +MegaBlastoise +MegaBeedrill +MegaPidgeot +Pikachu rockstar +Pikachu damigella +Pikachu confetto +Pikachu scienziata +Pikachu wrestler +Pikachu Cosplay +MegaAlakazam +MegaSlowbro +MegaGengar +MegaKangaskhan +MegaPinsir +MegaGyarados +MegaAerodactyl +MegaMewtwo X +MegaMewtwo Y +MegaAmpharos +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +Forma Vaga +MegaSteelix +MegaScizor +MegaHeracross +MegaHoundoom +MegaTyranitar +MegaSceptile +MegaBlaziken +MegaSwampert +MegaGardevoir +MegaSableye +MegaMawile +MegaAggron +MegaMedicham +MegaManectric +MegaSharpedo +MegaCamerupt +MegaAltaria +Forma Sole +Forma Pioggia +Forma Nuvola di Neve +MegaBanette +MegaAbsol +MegaGlalie +MegaSalamence +MegaMetagross +MegaLatias +MegaLatios +Archeorisveglio +Archeorisveglio +MegaRayquaza +Forma Attacco +Forma Difesa +Forma Velocità +Manto Sabbia +Manto Scarti +Manto Sabbia +Manto Scarti +Forma Splendore Mare Est Mare Est - - - -Calore -Lavaggio -Gelo -Vortice -Taglio -a Originale -a Cielo - - - - - - - - - - - - - - - - - -a Lineablu +MegaLopunny +MegaGarchomp +MegaLucario +MegaAbomasnow +MegaGallade +Rotom Calore +Rotom Lavaggio +Rotom Gelo +Rotom Vortice +Rotom Taglio +Forma Originale +Forma Cielo +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +Forma di Arceus +MegaAudino +Forma Lineablu Stato Zen -a Estate -a Autunno -a Inverno -a Estate -a Autunno -a Inverno -a Totem -a Totem -a Totem -Bianco -Nero -a Risoluta -a Danza - - - - -Nordico -di Neve -Continentale -Prato -Eleganza -Giardinfiore -Trendy -Marino -Arcipelago -Deserto -Sabbia -Fluviale -Pluviale -Savana -Solare -Oceanico -Giungla -Sbarazzino -Poké Ball -Giallo -Arancione -Blu -Bianco -Giallo -Arancione -Blu -Bianco -Eterno -Giallo -Arancione -Blu -Bianco -Cuore -Stella -Diamante -Signorina -Gentildonna -Gentiluomo -Regina -Kabuki -Faraone +Forma Estate +Forma Autunno +Forma Inverno +Forma Estate +Forma Autunno +Forma Inverno +Forma Totem +Forma Totem +Forma Totem +Kyurem Bianco +Kyurem Nero +Forma Risoluta +Forma Danza +Forma di Genesect +Forma di Genesect +Forma di Genesect +Forma di Genesect +Motivo Nordico +Motivo Manto di Neve +Motivo Continentale +Motivo Prato +Motivo Eleganza +Motivo Giardinfiore +Motivo Trendy +Motivo Marino +Motivo Arcipelago +Motivo Deserto +Motivo Sabbia +Motivo Fluviale +Motivo Pluviale +Motivo Savana +Motivo Solare +Motivo Oceanico +Motivo Giungla +Motivo Sbarazzino +Motivo Poké Ball +Fiore Giallo +Fiore Arancione +Fiore Blu +Fiore Bianco +Fiore Giallo +Fiore Arancione +Fiore Blu +Fiore Bianco +Fiore Eterno +Fiore Giallo +Fiore Arancione +Fiore Blu +Fiore Bianco +Taglio Cuore +Taglio Stella +Taglio Diamante +Taglio Signorina +Taglio Gentildonna +Taglio Gentiluomo +Taglio Regina +Taglio Kabuki +Taglio Faraone Femmina -a Spada +Forma Spada Mini Grande Maxi @@ -884,3 +909,5 @@ Mini Grande Maxi Modo Attivo +MegaDiancie +Hoopa Libero \ No newline at end of file diff --git a/Resources/text/it/text_GenLoc_it.txt b/Resources/text/it/text_GenLoc_it.txt index 6e1155099..bb481b4d6 100644 --- a/Resources/text/it/text_GenLoc_it.txt +++ b/Resources/text/it/text_GenLoc_it.txt @@ -1,4 +1,4 @@ -da qualche parte +da qualche parte nella città iniziale a casa a casa di amici @@ -23,7 +23,7 @@ in una scuola in una grande città in un edificio in un caffè elegante -in una base segreta +in un covo segreto in un museo in uno studio in una stazione @@ -58,5 +58,14 @@ su una montagna innevata in una centrale elettrica in un orto in mezzo a delle rovine -in un canale -in un Safari \ No newline at end of file +in una via d’acqua +in un safari +in una Base Segreta +in un’Arena delle Virtù +sul fondo del mare +in una zona miraggio +in una grande nave +in una strada coperta di cenere +su una piccola isola +in un luogo misterioso +nell’Ipersfera \ No newline at end of file diff --git a/Resources/text/it/text_Items_it.txt b/Resources/text/it/text_Items_it.txt index 65cb73cec..c7dddebc2 100644 --- a/Resources/text/it/text_Items_it.txt +++ b/Resources/text/it/text_Items_it.txt @@ -1,4 +1,4 @@ -(Niente) +Niente Master Ball Ultra Ball Mega Ball @@ -474,7 +474,7 @@ Carta Blu Codaslowpoke Campana Chiara Apriporta -Chiave Sotterr. +Chiave sotterr. Annaffiatoio Squama Rossa Strumento perso @@ -532,8 +532,8 @@ Scheda Dati 26 Scheda Dati 27 Sfera Verde Capsula Scrigno -Sfera Rossa -Sfera Blu +Gemma rossa +Gemma blu Misticristal Squama Bella Evolcondensa @@ -715,4 +715,62 @@ Bicicletta Holovox Bijoufolletto Megaciondolo -Megaguanto \ No newline at end of file +Megaguanto +Bici da corsa +Bici da cross +Vaso Wailmer +Merce Devon +Sacco cenere +Chiave sotterr. +Kit Pokémelle +Lettera +Biglietto Eone +Scanner +Occhialoni +Meteorite +Chiave stanza 1 +Chiave stanza 2 +Chiave stanza 4 +Chiave stanza 6 +Chiave magazzino +Devonscopio +Biglietto Nave +MN07 +Maschera Devon +Costume Live +Vestito Live +Tuta Magma +Tuta Idro +Biglietto doppio +Megabracciale +Megapendente +Megaocchiali +Megaancora +Megaspilla +Megadiadema +Megagambale +Meteorite +Swampertite +Sceptilite +Sableyite +Altarite +Galladite +Audinite +Metagrossite +Sharpedite +Slowbroite +Steelixite +Pidgeotite +Glalite +Diancite +Vaso del vincolo +Megapolsiera +Cameruptite +Lopunnite +Salamencite +Beedrillite +Meteorite +Meteorite +Pietrachiave +Framm. meteorite +Flauto Eone \ No newline at end of file diff --git a/Resources/text/it/text_Moves_it.txt b/Resources/text/it/text_Moves_it.txt index 036e11705..16393e0ef 100644 --- a/Resources/text/it/text_Moves_it.txt +++ b/Resources/text/it/text_Moves_it.txt @@ -1,4 +1,4 @@ -(Niente) +----- Botta Colpokarate Doppiasberla @@ -615,4 +615,8 @@ Ali del Fato Mille Frecce Mille Onde Forza Tellurica -Luce Nefasta \ No newline at end of file +Luce Nefasta +Primopulsar +Spade Telluriche +Ascesa del Drago +Urtodimensionale \ No newline at end of file diff --git a/Resources/text/it/text_Ribbon_it.txt b/Resources/text/it/text_Ribbon_it.txt deleted file mode 100644 index a94ad4026..000000000 --- a/Resources/text/it/text_Ribbon_it.txt +++ /dev/null @@ -1,39 +0,0 @@ -Fiocco Campione Kalos -Fiocco Campione -Fiocco Campione Sinnoh -Fiocco Amicizia -Fiocco Training -Fiocco Asso della Lotta -Fiocco Genio della Lotta -Fiocco Merito -Fiocco Allarme -Fiocco Stupore -Fiocco Sconforto -Fiocco Indolenza -Fiocco Relax -Fiocco Pisolino -Fiocco Sorriso -Fiocco Meraviglia -Fiocco Reale -Fiocco Meraviglia Reale -Fiocco Artista -Fiocco Orma -Fiocco Record -Fiocco Leggenda -Fiocco Paese -Fiocco Nazionale -Fiocco Geo -Fiocco Mondiale -Fiocco Classico -Fiocco Principale -Fiocco Evento -Fiocco Compleanno -Fiocco Speciale -Fiocco Ricordo -Fiocco Desiderio -Fiocco Campione Lotta -Fiocco Campione Locale -Fiocco Campione Nazionale -Fiocco Campione Mondiale -Fiocco Ricordo delle Gare -Fiocco Ricordo delle Lotte \ No newline at end of file diff --git a/Resources/text/it/text_xy_00000_it.txt b/Resources/text/it/text_xy_00000_it.txt index 169a346f0..b4de7474a 100644 --- a/Resources/text/it/text_xy_00000_it.txt +++ b/Resources/text/it/text_xy_00000_it.txt @@ -1,4 +1,4 @@ ----------- +---------- Zona Misteriosa @@ -78,8 +78,8 @@ Frescovilla Percorso 16 Via Malinconia -\x10\x02뷿P -\x10\x02뷿Q +[~ 80] +[~ 81] Caverna Gelata Percorso 17 @@ -168,3 +168,188 @@ Acquario Grotta Ignota +Albanova + +Solarosa + +Bluruvia + +Cuordilava + +Brunifoglia + +Mentania + +Orocea + +Petalipoli + +Porto Selcepoli + +Ciclamipoli + +Ferrugipoli + +Forestopoli + +Porto Alghepoli + +Verdeazzupoli + +Ceneride + +Iridopoli + +Lega Pokémon + +Percorso 101 + +Percorso 102 + +Percorso 103 + +Percorso 104 + +Percorso 105 + +Percorso 106 + +Percorso 107 + +Percorso 108 + +Percorso 109 + +Percorso 110 + +Percorso 111 + +Percorso 112 + +Percorso 113 + +Percorso 114 + +Percorso 115 + +Percorso 116 + +Percorso 117 + +Percorso 118 + +Percorso 119 + +Percorso 120 + +Percorso 121 + +Percorso 122 + +Percorso 123 + +Percorso 124 + +Percorso 125 + +Percorso 126 + +Percorso 127 + +Percorso 128 + +Percorso 129 + +Percorso 130 + +Percorso 131 + +Percorso 132 + +Percorso 133 + +Percorso 134 + +Cascate Meteora + +Tunnel Menferro + +??? + +Rovine Sabbiose + +Grotta Pietrosa + +Bosco Petalo + +Monte Camino + +Passo Selvaggio + +Cammino Ardente + +Monte Pira + +Rifugio Idro + +Antro Abissale + +Grotta dei Tempi + +Via Vittoria + +Grotta Ondosa + +Ciclanova + +Ciclamare + +Grotta Insulare + +Tomba Antica + +Sala Incisa + +Grottino Solare + +Rifugio Magma + +Torre dei Cieli + +Resort Lotta + +Isola Remota + +Motonave Marea + +Zona Safari + +Selva Miraggio + +Grotta Miraggio + +Isola Miraggio + +Monte Miraggio + +Foresta Vergine + +Piana Senza Nome + +Caverna Ignota + +Grotta Sfuggente + +Fossa Informe + +Isola Arcodiluna + +Isolotto Segreto + +Ipersfera + +Baia Segreta + +Valle Segreta + +Base Segreta diff --git a/Resources/text/it/text_xy_60000_it.txt b/Resources/text/it/text_xy_60000_it.txt index b7b9b580b..b8810465a 100644 --- a/Resources/text/it/text_xy_60000_it.txt +++ b/Resources/text/it/text_xy_60000_it.txt @@ -1,3 +1,4 @@ -Persona Lontana -Coppia Pensione +Persona Lontana +Pensione Pokémon Cercatesori +Vecchina delle terme \ No newline at end of file diff --git a/Resources/text/ja/text_Abilities_ja.txt b/Resources/text/ja/text_Abilities_ja.txt index 990ad4cfd..16d366f15 100644 --- a/Resources/text/ja/text_Abilities_ja.txt +++ b/Resources/text/ja/text_Abilities_ja.txt @@ -1,4 +1,4 @@ -なし +― あくしゅう あめふらし かそく @@ -186,4 +186,7 @@ おやこあい ダークオーラ フェアリーオーラ -オーラブレイク \ No newline at end of file +オーラブレイク +はじまりのうみ +おわりのだいち +デルタストリーム \ No newline at end of file diff --git a/Resources/text/ja/text_Forms_ja.txt b/Resources/text/ja/text_Forms_ja.txt index 113f16ddb..7c583c5fb 100644 --- a/Resources/text/ja/text_Forms_ja.txt +++ b/Resources/text/ja/text_Forms_ja.txt @@ -1,4 +1,4 @@ - + @@ -380,8 +380,8 @@ - - +カイオーガのすがた +グラードンのすがた ノーマルフォルム @@ -718,22 +718,31 @@ +いましめられしフーパ - -メガ -メガＸ -メガＹ - - - - - - - - - - +メガフシギバナ +メガリザードンＸ +メガリザードンＹ +メガカメックス +メガスピアー +メガピジョット +ハードロック・ピカチュウ +マダム・ピカチュウ +アイドル・ピカチュウ +ドクター・ピカチュウ +マスク・ド・ピカチュウ +おきがえピカチュウ +メガフーディン +メガヤドラン +メガゲンガー +メガガルーラ +メガカイロス +メガギャラドス +メガプテラ +メガミュウツーＸ +メガミュウツーＹ +メガデンリュウ あるすがた あるすがた あるすがた @@ -761,23 +770,36 @@ あるすがた あるすがた あるすがた +メガハガネール メガハッサム メガヘラクロス メガヘルガー メガバンギラス +メガジュカイン メガバシャーモ +メガラグラージ メガサーナイト +メガヤミラミ メガクチート メガボスゴドラ メガチャーレム メガライボルト +メガサメハダー +メガバクーダ +メガチルタリス たいようのすがた あまみずのすがた ゆきぐものすがた メガジュペッタ メガアブソル +メガオニゴーリ +メガボーマンダ +メガメタグロス メガラティアス メガラティオス +ゲンシカイキのすがた +ゲンシカイキのすがた +メガレックウザ アタックフォルム ディフェンスフォルム スピードフォルム @@ -788,9 +810,11 @@ ポジフォルム ひがしのうみ ひがしのうみ +メガミミロップ メガガブリアス メガルカリオ メガユキノオー +メガエルレイド ヒートロトム ウォッシュロトム フロストロトム @@ -815,6 +839,7 @@ アルセウスのすがた アルセウスのすがた アルセウスのすがた +メガタブンネ あおすじのすがた ダルマモード なつのすがた @@ -884,3 +909,5 @@ おおきいサイズ とくだいサイズ アクティブモード +メガディアンシー +ときはなたれしフーパ \ No newline at end of file diff --git a/Resources/text/ja/text_GenLoc_ja.txt b/Resources/text/ja/text_GenLoc_ja.txt index 0bb7a8e34..9671da207 100644 --- a/Resources/text/ja/text_GenLoc_ja.txt +++ b/Resources/text/ja/text_GenLoc_ja.txt @@ -1,4 +1,4 @@ -どこか +どこか さいしょのまち うち ともだちのいえ @@ -59,4 +59,13 @@ はたけ はいきょ すいどう -サファリ \ No newline at end of file +サファリ +ひみつきち +コンテストライブかいじょう +ふかいうみのそこ +マボロシのばしょ +おおきなふね +はいがふりつもるみち +ちいさなしま +しんぴてきなばしょ +おおぞら \ No newline at end of file diff --git a/Resources/text/ja/text_Items_ja.txt b/Resources/text/ja/text_Items_ja.txt index 0afd8350a..c19d34645 100644 --- a/Resources/text/ja/text_Items_ja.txt +++ b/Resources/text/ja/text_Items_ja.txt @@ -1,4 +1,4 @@ -(なし) +なし マスターボール ハイパーボール スーパーボール @@ -500,7 +500,7 @@ コンペボール パークボール フォトアルバム -ジービープレイヤー +ＧＢプレイヤー うみなりのスズ いかりまんじゅう データカード０１ @@ -592,20 +592,20 @@ ヒウンアイス クリティカット２ スピーダー２ -スペシャルアップ２ -スペシャルガード２ +ＳＰアップ２ +ＳＰガード２ ディフェンダー２ プラスパワー２ ヨクアタール２ スピーダー３ -スペシャルアップ３ -スペシャルガード３ +ＳＰアップ３ +ＳＰガード３ ディフェンダー３ プラスパワー３ ヨクアタール３ スピーダー６ -スペシャルアップ６ -スペシャルガード６ +ＳＰアップ６ +ＳＰガード６ ディフェンダー６ プラスパワー６ ヨクアタール６ @@ -699,7 +699,7 @@ ありふれたいし バーゲンチケット エレベータのキー -ティーエムブイパス +ＴＭＶパス カロスエンブレム たんけんこころえ ふしぎなおきもの @@ -715,4 +715,62 @@ ホロキャスター ようせいジュエル メガチャーム -メガグローブ \ No newline at end of file +メガグローブ +マッハじてんしゃ +ダートじてんしゃ +ホエルコじょうろ +デボンのにもつ +はいぶくろ +ちかのカギ +ポロックキット +ダイゴへのてがみ +むげんのチケット +たんちき +ゴーゴーゴーグル +いんせき +１ごうしつのカギ +２ごうしつのカギ +４ごうしつのカギ +６ごうしつのカギ +そうこのカギ +デボンスコープ +ふねのチケット +ひでんマシン０７ +デボンボンベ +ライブスーツ +ライブドレス +マグマスーツ +アクアスーツ +ペアチケット +メガバングル +メガペンダント +メガメガネ +メガイカリ +メガラペルピン +メガティアラ +メガアンクレット +いんせき +ラグラージナイト +ジュカインナイト +ヤミラミナイト +チルタリスナイト +エルレイドナイト +タブンネナイト +メタグロスナイト +サメハダナイト +ヤドランナイト +ハガネールナイト +ピジョットナイト +オニゴーリナイト +ディアンシナイト +いましめのツボ +メガブレス +バクーダナイト +ミミロップナイト +ボーマンダナイト +スピアナイト +いんせき +いんせき +キーストーン +いんせきのかけら +むげんのふえ \ No newline at end of file diff --git a/Resources/text/ja/text_Moves_ja.txt b/Resources/text/ja/text_Moves_ja.txt index a5a25bab6..56663ea81 100644 --- a/Resources/text/ja/text_Moves_ja.txt +++ b/Resources/text/ja/text_Moves_ja.txt @@ -1,4 +1,4 @@ -(なし) +――――― はたく からてチョップ おうふくビンタ @@ -83,7 +83,7 @@ りゅうのいかり ほのおのうず でんきショック -じゅうまんボルト +１０まんボルト でんじは かみなり いわおとし @@ -555,7 +555,7 @@ コールドフレア バークアウト つららおとし -ブイジェネレート +Ｖジェネレート クロスフレイム クロスサンダー フライングプレス @@ -615,4 +615,8 @@ サウザンアロー サウザンウェーブ グランドフォース -はめつのひかり \ No newline at end of file +はめつのひかり +こんげんのはどう +だんがいのつるぎ +ガリョウテンセイ +いじげんラッシュ \ No newline at end of file diff --git a/Resources/text/ja/text_Ribbon_ja.txt b/Resources/text/ja/text_Ribbon_ja.txt deleted file mode 100644 index b05bf949c..000000000 --- a/Resources/text/ja/text_Ribbon_ja.txt +++ /dev/null @@ -1,39 +0,0 @@ -カロス チャンプリボン -チャンプリボン -シンオウ チャンプリボン -なかよしリボン -しゅぎょうリボン -グレートバトルリボン -マスターバトルリボン -がんばリボン -しゃっきリボン -どっきリボン -しょんぼリボン -うっかリボン -すっきリボン -ぐっすリボン -にっこリボン -ゴージャスリボン -ロイヤルリボン -ゴージャスロイヤルリボン -ブロマイドリボン -あしあとリボン -レコードリボン -レジェンドリボン -カントリーリボン -ナショナルリボン -アースリボン -ワールドリボン -クラシックリボン -プレミアリボン -イベントリボン -バースデーリボン -スペシャルリボン -メモリアルリボン -ウィッシュリボン -バトルチャンプリボン -エリアチャンプリボン -ナショナルチャンプリボン -ワールドチャンプリボン -おもいでコンテストリボン -おもいでバトルリボン \ No newline at end of file diff --git a/Resources/text/ja/text_xy_00000_ja.txt b/Resources/text/ja/text_xy_00000_ja.txt index 3e7a89fce..cd6d8ff35 100644 --- a/Resources/text/ja/text_xy_00000_ja.txt +++ b/Resources/text/ja/text_xy_00000_ja.txt @@ -1,4 +1,4 @@ -－－－－－－－－－－ +－－－－－－－－－－ なぞのばしょ @@ -78,8 +78,8 @@ １６ばんどうろ トリストどおり -\x10\x02뷿P -\x10\x02뷿Q +[~ 80] +[~ 81] フロストケイブ １７ばんどうろ @@ -168,3 +168,188 @@ ななしのどうくつ +ミシロタウン + +コトキタウン + +ムロタウン + +フエンタウン + +ハジツゲタウン + +シダケタウン + +キナギタウン + +トウカシティ + +カイナシティ + +キンセツシティ + +カナズミシティ + +ヒワマキシティ + +ミナモシティ + +トクサネシティ + +ルネシティ + +サイユウシティ + +ポケモンリーグ + +１０１ばんどうろ + +１０２ばんどうろ + +１０３ばんどうろ + +１０４ばんどうろ + +１０５ばんすいどう + +１０６ばんすいどう + +１０７ばんすいどう + +１０８ばんすいどう + +１０９ばんすいどう + +１１０ばんどうろ + +１１１ばんどうろ + +１１２ばんどうろ + +１１３ばんどうろ + +１１４ばんどうろ + +１１５ばんどうろ + +１１６ばんどうろ + +１１７ばんどうろ + +１１８ばんどうろ + +１１９ばんどうろ + +１２０ばんどうろ + +１２１ばんどうろ + +１２２ばんすいどう + +１２３ばんどうろ + +１２４ばんすいどう + +１２５ばんすいどう + +１２６ばんすいどう + +１２７ばんすいどう + +１２８ばんすいどう + +１２９ばんすいどう + +１３０ばんすいどう + +１３１ばんすいどう + +１３２ばんすいどう + +１３３ばんすいどう + +１３４ばんすいどう + +りゅうせいのたき + +カナシダトンネル + +？？？ + +さばくいせき + +いしのどうくつ + +トウカのもり + +えんとつやま + +デコボコさんどう + +ほのおのぬけみち + +おくりびやま + +アクアだんアジト + +かいていどうくつ + +めざめのほこら + +チャンピオンロード + +あさせのほらあな + +ニューキンセツ + +シーキンセツ + +こじまのよこあな + +こだいづか + +おふれのせきしつ + +ひでりのいわと + +マグマだんアジト + +そらのはしら + +バトルリゾート + +みなみのことう + +タイドリップごう + +サファリゾーン + +マボロシもり + +マボロシどうくつ + +マボロシじま + +マボロシやま + +みかいのもり + +なもなきへいげん + +みちのどうくつ + +おぼろのどうくつ + +いびつなあな + +ゆみなりのしま + +ひみつのこじま + +おおぞら + +ひみつのいそべ + +ひみつのはなばたけ + +ひみつきち diff --git a/Resources/text/ja/text_xy_60000_ja.txt b/Resources/text/ja/text_xy_60000_ja.txt index 0848ebd9e..fbbde7bb5 100644 --- a/Resources/text/ja/text_xy_60000_ja.txt +++ b/Resources/text/ja/text_xy_60000_ja.txt @@ -1,3 +1,4 @@ -とおくにいるひと -そだてやふうふ +とおくにいるひと +そだてやさん トレジャーハンター +おんせんばあさん \ No newline at end of file diff --git a/Resources/text/ko/text_Abilities_ko.txt b/Resources/text/ko/text_Abilities_ko.txt index 9a80155c4..e95cf4a25 100644 --- a/Resources/text/ko/text_Abilities_ko.txt +++ b/Resources/text/ko/text_Abilities_ko.txt @@ -1,4 +1,4 @@ -없음 +- 악취 잔비 가속 @@ -186,4 +186,7 @@ 부자유친 다크오라 페어리오라 -오라브레이크 \ No newline at end of file +오라브레이크 +시작의바다 +끝의대지 +델타스트림 \ No newline at end of file diff --git a/Resources/text/ko/text_Forms_ko.txt b/Resources/text/ko/text_Forms_ko.txt index fd2c9e9b1..b466ea678 100644 --- a/Resources/text/ko/text_Forms_ko.txt +++ b/Resources/text/ko/text_Forms_ko.txt @@ -1,4 +1,4 @@ - + @@ -380,8 +380,8 @@ - - +가이오가의 모습 +그란돈의 모습 노말폼 @@ -718,22 +718,31 @@ +굴레에 빠진 후파 - -메가 -메가X -메가Y - - - - - - - - - - +메가이상해꽃 +메가리자몽X +메가리자몽Y +메가거북왕 +메가독침붕 +메가피죤투 +하드록 피카츄 +마담 피카츄 +아이돌 피카츄 +닥터 피카츄 +마스크드 피카츄 +옷갈아입기 피카츄 +메가후딘 +메가야도란 +메가팬텀 +메가캥카 +메가쁘사이저 +메가갸라도스 +메가프테라 +메가뮤츠X +메가뮤츠Y +메가전룡 형태별 모습 형태별 모습 형태별 모습 @@ -761,23 +770,36 @@ 형태별 모습 형태별 모습 형태별 모습 +메가강철톤 메가핫삼 메가헤라크로스 메가헬가 메가마기라스 +메가나무킹 메가번치코 +메가대짱이 메가가디안 +메가깜까미 메가입치트 메가보스로라 메가요가램 메가썬더볼트 +메가샤크니아 +메가폭타 +메가파비코리 태양의 모습 빗방울의 모습 설운의 모습 메가다크펫 메가앱솔 +메가얼음귀신 +메가보만다 +메가메타그로스 메가라티아스 메가라티오스 +원시회귀의 모습 +원시회귀의 모습 +메가레쿠쟈 어택폼 디펜스폼 스피드폼 @@ -788,9 +810,11 @@ 포지폼 동쪽바다 동쪽바다 +메가이어롭 메가한카리아스 메가루카리오 메가눈설왕 +메가엘레이드 히트로토무 워시로토무 프로스트로토무 @@ -815,6 +839,7 @@ 아르세우스의 모습 아르세우스의 모습 아르세우스의 모습 +메가다부니 청색근의 모습 달마모드 여름의 모습 @@ -884,3 +909,5 @@ 큰 사이즈 특대 사이즈 액티브모드 +메가디안시 +굴레를 벗어난 후파 \ No newline at end of file diff --git a/Resources/text/ko/text_GenLoc_ko.txt b/Resources/text/ko/text_GenLoc_ko.txt index 09779dff5..7db328dbe 100644 --- a/Resources/text/ko/text_GenLoc_ko.txt +++ b/Resources/text/ko/text_GenLoc_ko.txt @@ -1,4 +1,4 @@ -어딘가 +어딘가 최초의 마을 집 친구의 집 @@ -59,4 +59,13 @@ 밭 폐허 수로 -사파리 \ No newline at end of file +사파리 +비밀기지 +콘테스트 라이브 회장 +깊은 바다 밑 +환상의 장소 +커다란 배 +재가 떨어져 쌓이는 길 +작은 섬 +신비스러운 장소 +창공 \ No newline at end of file diff --git a/Resources/text/ko/text_Items_ko.txt b/Resources/text/ko/text_Items_ko.txt index 993e3c76f..6e696d50d 100644 --- a/Resources/text/ko/text_Items_ko.txt +++ b/Resources/text/ko/text_Items_ko.txt @@ -1,4 +1,4 @@ -(없음) +없음 마스터볼 하이퍼볼 수퍼볼 @@ -36,10 +36,10 @@ 힘의뿌리 만능가루 부활초 -피피에이드 -피피회복 -피피에이더 -피피맥스 +PP에이드 +PP회복 +PP에이더 +PP맥스 용암전병 나무열매쥬스 성스러운분말 @@ -500,7 +500,7 @@ 콤페볼 파크볼 포토앨범 -지비플레이어 +GB플레이어 해명의방울 분노의호두과자 데이터카드01 @@ -699,7 +699,7 @@ 흔해빠진돌 바겐세일티켓 엘리베이터키 -티엠브이패스 +TMV패스 칼로스엠블럼 탐험수칙 이상한장식품 @@ -715,4 +715,62 @@ 홀로캐스터 페어리주얼 메가참 -메가글러브 \ No newline at end of file +메가글러브 +마하자전거 +더트자전거 +고래왕자물뿌리개 +데봉화물 +재주머니 +지하열쇠 +포켓몬스넥키트 +성호에게줄편지 +무한티켓 +탐지기 +고고고글 +운석 +1호실열쇠 +2호실열쇠 +4호실열쇠 +6호실열쇠 +창고열쇠 +데봉스코프 +승선티켓 +비전머신07 +데봉봄베 +라이브슈트 +라이브드레스 +마그마슈트 +아쿠아슈트 +페어티켓 +메가뱅글 +메가펜던트 +메가글라스 +메가앵커 +메가라펠핀 +메가티아러 +메가앵클릿 +운석 +대짱이나이트 +나무킹나이트 +깜까미나이트 +파비코리나이트 +엘레이드나이트 +다부니나이트 +메타그로스나이트 +샤크니아나이트 +야도란나이트 +강철톤나이트 +피죤투나이트 +얼음귀신나이트 +디안시나이트 +굴레의항아리 +메가블레스 +폭타나이트 +이어롭나이트 +보만다나이트 +독침붕나이트 +운석 +운석 +키스톤 +운석조각 +무한의피리 \ No newline at end of file diff --git a/Resources/text/ko/text_Moves_ko.txt b/Resources/text/ko/text_Moves_ko.txt index dcac6fd79..0bbabe5a4 100644 --- a/Resources/text/ko/text_Moves_ko.txt +++ b/Resources/text/ko/text_Moves_ko.txt @@ -1,4 +1,4 @@ -(없음) +――――― 막치기 태권당수 연속뺨치기 @@ -83,7 +83,7 @@ 용의분노 회오리불꽃 전기쇼크 -십만볼트 +10만볼트 전기자석파 번개 돌떨구기 @@ -103,7 +103,7 @@ 흉내내기 싫은소리 그림자분신 -에이치피회복 +HP회복 단단해지기 작아지기 연막 @@ -555,7 +555,7 @@ 콜드플레어 바크아웃 고드름떨구기 -브이제너레이트 +V제너레이트 크로스플레임 크로스썬더 플라잉프레스 @@ -615,4 +615,8 @@ 사우전드애로 사우전드웨이브 그라운드포스 -파멸의빛 \ No newline at end of file +파멸의빛 +근원의파동 +단애의칼 +화룡점정 +다른차원러시 \ No newline at end of file diff --git a/Resources/text/ko/text_Ribbon_ko.txt b/Resources/text/ko/text_Ribbon_ko.txt deleted file mode 100644 index 272a578d5..000000000 --- a/Resources/text/ko/text_Ribbon_ko.txt +++ /dev/null @@ -1,39 +0,0 @@ -칼로스챔피언리본 -챔피언리본 -신오챔피언리본 -절친리본 -수행리본 -그레이트배틀리본 -마스터배틀리본 -노력리본 -뚝심리본 -철렁리본 -풀죽기리본 -덜렁이리본 -상쾌리본 -잠보리본 -방글방글리본 -고저스리본 -로열리본 -고저스로열리본 -브로마이드리본 -발자국리본 -레코드리본 -레전드리본 -컨트리리본 -내셔널리본 -어스리본 -월드리본 -클래식리본 -프리미어리본 -이벤트리본 -버스데이리본 -스페셜리본 -메모리얼리본 -위시리본 -배틀챔피언리본 -에리어챔피언리본 -내셔널챔피언리본 -월드챔피언리본 -추억콘테스트리본 -추억배틀리본 \ No newline at end of file diff --git a/Resources/text/ko/text_xy_00000_ko.txt b/Resources/text/ko/text_xy_00000_ko.txt index 9054e092a..fda6b250b 100644 --- a/Resources/text/ko/text_xy_00000_ko.txt +++ b/Resources/text/ko/text_xy_00000_ko.txt @@ -1,4 +1,4 @@ -－－－－－－－－－－ +－－－－－－－－－－ 수수께끼의 장소 @@ -78,8 +78,8 @@ 16번도로 트리스트 도로 -\x10\x02뷿P -\x10\x02뷿Q +[~ 80] +[~ 81] 프로스트케이브 17번도로 @@ -168,3 +168,188 @@ 이름없는 동굴 +미로마을 + +고도마을 + +무로마을 + +용암마을 + +단풍마을 + +잔디마을 + +황금마을 + +등화도시 + +잿빛도시 + +보라시티 + +금탄도시 + +검방울시티 + +해안시티 + +이끼시티 + +루네시티 + +그랜드시티 + +포켓몬리그 + +101번도로 + +102번도로 + +103번도로 + +104번도로 + +105번수로 + +106번수로 + +107번수로 + +108번수로 + +109번수로 + +110번도로 + +111번도로 + +112번도로 + +113번도로 + +114번도로 + +115번도로 + +116번도로 + +117번도로 + +118번도로 + +119번도로 + +120번도로 + +121번도로 + +122번수로 + +123번도로 + +124번수로 + +125번수로 + +126번수로 + +127번수로 + +128번수로 + +129번수로 + +130번수로 + +131번수로 + +132번수로 + +133번수로 + +134번수로 + +유성의 폭포 + +금잔터널 + +??? + +사막유적 + +바위 동굴 + +등화숲 + +굴뚝산 + +울퉁불퉁 산길 + +불꽃샛길 + +송화산 + +아쿠아단아지트 + +해저동굴 + +각성의 사당 + +챔피언로드 + +여울의 동굴 + +뉴보라 + +씨보라 + +작은 섬 옆굴 + +고대의 무덤 + +고시의 석실 + +가뭄의 암굴 + +마그마단아지트 + +하늘기둥 + +배틀리조트 + +남쪽의 외딴섬 + +타이드립호 + +사파리존 + +환상숲 + +환상동굴 + +환상섬 + +환상산 + +미개척의 숲 + +이름없는 평원 + +미지의 동굴 + +희미한 동굴 + +비틀린 굴 + +궁형의 섬 + +비밀의 작은 섬 + +창공 + +비밀의 바위해변 + +비밀의 꽃밭 + +비밀기지 diff --git a/Resources/text/ko/text_xy_60000_ko.txt b/Resources/text/ko/text_xy_60000_ko.txt index 12ce36d2c..352c2e52f 100644 --- a/Resources/text/ko/text_xy_60000_ko.txt +++ b/Resources/text/ko/text_xy_60000_ko.txt @@ -1,3 +1,4 @@ -멀리 있는 사람 +멀리 있는 사람 키우미집 트레져헌터 +온천할머니 \ No newline at end of file diff --git a/Resources/text/todo/text_Memories_de.txt b/Resources/text/todo/text_Memories_de.txt new file mode 100644 index 000000000..eddda7e2e --- /dev/null +++ b/Resources/text/todo/text_Memories_de.txt @@ -0,0 +1,114 @@ + + +Es erinnert sich daran, +Es erinnert sich daran, +Es erinnert sich daran, +Es erinnert sich daran, +Es erinnert sich klar und deutlich daran, +Es erinnert sich ergriffen daran zurück, +Es erinnert sich sehr gern daran, + +wie glücklich es war +wie viel Spaß es hatte +wie sehr es sich gefreut hat +wie es gegrinst hat +wie überwältigt es war +wie unbeschreiblich seine Gefühle waren +wie gut gelaunt es war +dass es feuchte Augen bekommen hat +wie sehr es sich amüsiert hat +wie nervös es war +wie wohl es sich gefühlt hat +wie unruhig es war +wie sehr es das genossen hat +wie leid es ihm getan hat +wie herzzerreißend das war +wie nostalgisch es geworden ist +was für Schwierigkeiten es hatte +wie anstrengend das war +wie es im Unreinen mit sich war +wie stolz es war +wie schlecht gelaunt es war +wie wütend es war +wie eifersüchtig es war +wie müde es war + +irgendein Item +irgendeine Attacke +Pokémon +Es scheint ein gutes Gedächtnis zu haben, aber es sieht so aus, als könnte es sich nicht erinnern... +[VAR PKNICK(0000)] ist [VAR TRNAME(0001)] [VAR GENLOC(0002)] begegnet. [VAR TRNAME(0001)] warf einen Pokéball und ihre gemeinsame Reise begann. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] sah [VAR TRNAME(0001)] zum ersten Mal, als es [VAR GENLOC(0002)] aus seinem Ei geschlüpft ist. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist [VAR TRNAME(0001)] [VAR GENLOC(0002)] begegnet. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] gelangte per Tausch [VAR GENLOC(0002)] in das Team von [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist mit [VAR TRNAME(0001)] in einen Pokémon-Supermarkt gegangen, um [VAR ITEMPLUR1][VAR ITEM2(0002)] zu kaufen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 44] +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] fischen. Zusammen haben sie ein [VAR PKNAME(0002)] geangelt! [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] angeln und [VAR TRNAME(0001)] hat ein mühsam an Land gezogenes Pokémon entkommen lassen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 47] +[VAR PKNICK(0000)] hat von [VAR TRNAME(0001)] Süßigkeiten bekommen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] shoppen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 50] +[VAR PKNICK(0000)] hat [VAR TRNAME(0001)] dabei geholfen, ein [VAR PKNAME(0002)] aus einem Ei schlüpfen zu lassen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war dabei, als [VAR TRNAME(0001)] ein [VAR PKNAME(0002)] gefangen hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Als [VAR PKNICK(0000)] nur noch wenige KP hatte, setzte [VAR TRNAME(0001)] ein Item ein. Wie hieß das Item noch gleich? Ach ja, [VAR ITEM2(0002)]! [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 54] +[VAR PKNICK(0000)] hat zusammen mit [VAR TRNAME(0001)] gekämpft und ein [VAR PKNAME(0002)] besiegt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von einem [VAR PKNAME(0002)] besiegt und ist mit [VAR TRNAME(0001)] geflüchtet. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von [VAR TRNAME(0001)] trainiert und hat sich [VAR GENLOC(0002)] entwickelt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist mit [VAR TRNAME(0001)] auf seinem Rücken übers Wasser gesurft. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 59] +[VAR PKNICK(0000)] und [VAR TRNAME(0001)] haben zusammen einen Arenaorden errungen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Als [VAR TRNAME(0001)] sich der Herausforderung im Kampfhaus gestellt hat, war [VAR PKNICK(0000)] extrem nervös. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist mit [VAR TRNAME(0001)] auf seinem Rücken [VAR GENLOC(0002)] losgeflogen und sauste mit [VAR GENDBR(0001,0303,0000)]ihmihr durch die Lüfte. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 63] +[VAR PKNICK(0000)] hat gesehen, wie [VAR TRNAME(0001)] ein Item eingesetzt hat. Wie hieß das Item noch gleich? Ach ja, [VAR ITEM2(0002)]! [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat zusammen mit [VAR TRNAME(0001)] den Champ besiegt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war dabei, als [VAR TRNAME(0001)] den Pokédex vervollständigt hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] und [VAR TRNAME(0001)] sind zusammen [VAR PKNAME(0002)] begegnet. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war dabei, als [VAR TRNAME(0001)] eine Kampf-Châtelaine besiegt hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 69] +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] [VAR GENLOC(0002)] Radfahren. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] [VAR GENLOC(0002)] ein neues Reiseziel auf der Karte festgelegt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat zusammen mit [VAR TRNAME(0001)] eine [VAR ITEM2(0002)] gepflanzt und sich vorgestellt, wie reich die Ernte sein würde. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat auf Wunsch von [VAR TRNAME(0001)] [VAR GENLOC(0002)] die Attacke Stärke eingesetzt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat auf Wunsch von [VAR TRNAME(0001)] [VAR GENLOC(0002)] die Attacke Zerschneider eingesetzt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat auf Wunsch von [VAR TRNAME(0001)] [VAR GENLOC(0002)] einen Felsen zertrümmert. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] auf seinem Rücken [VAR GENLOC(0002)] die Attacke Kaskade eingesetzt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat gesehen, wie [VAR TRNAME(0001)] [VAR GENLOC(0002)] heimlich etwas aufgehoben hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat von [VAR TRNAME(0001)] ein Item zum Tragen bekommen. Wie hieß das Item noch gleich? Ach ja, [VAR ITEM2(0002)]! [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist mit [VAR TRNAME(0001)] zur Siegesstraße gegangen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 80] +[VAR PKNICK(0000)] war sehr beeindruckt von der Geschwindigkeit des Zugs, den es mit [VAR TRNAME(0001)] genommen hatte. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 82] +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] unterwegs, als sie plötzlich von einem wilden [VAR PKNAME(0002)] angegriffen wurden. Völlig überrumpelt haben sie das Weite gesucht. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] im Haus der Prüfung eine hohe Punktzahl erzielt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat über [VAR TRNAME(0001)] den Richter kennengelernt, der es unverwandt angestarrt hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat über [VAR TRNAME(0001)] den Attacken-Verlerner kennengelernt, durch den es [VAR MOVE(0002)] vergessen hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] konnte sich unter Anleitung von [VAR TRNAME(0001)] wieder an [VAR MOVE(0002)] erinnern. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von [VAR TRNAME(0001)] in der Pokémon-Pension abgegeben und verbrachte seine Zeit dort zusammen mit einem [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war neidisch, als [VAR TRNAME(0001)] mit einem Los ein Item gewonnen hat. Wie hieß das Item noch gleich? Ach ja, [VAR ITEM2(0002)]! [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war dabei, als [VAR TRNAME(0001)] [VAR GENLOC(0002)] das Item Schutz eingesetzt hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hatte ein anstrengendes Spezialtraining mit [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist mit [VAR TRNAME(0001)] Fahrstuhl gefahren. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von [VAR TRNAME(0001)] zum Namenbewerter gebracht. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] in einer Boutique. [VAR TRNAME(0001)] hat einiges anprobiert, aber nichts gekauft. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] in einem tollen Restaurant und hat dort ordentlich gemampft. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von [VAR TRNAME(0001)] zu einer freundlichen Frau gebracht, die sich liebevoll um es gekümmert hat. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat zusammen mit [VAR TRNAME(0001)] [VAR GENLOC(0002)] einen Abfalleimer durchstöbert. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 98] +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] auf einem hohen Turm und hat von dort nach unten geschaut. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] in der Spiegelhöhle und hat dort sein Spiegelbild gesehen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat sich mit [VAR TRNAME(0001)] fast verlaufen, als sie gemeinsam einen Wald erkundet haben. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] war mit [VAR TRNAME(0001)] in einer Fabrik und hat dort viele kompliziert erscheinende Maschinen gesehen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] eine Geheimbasis eingerichtet. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] an einem Wettbewerb teilgenommen und dabei viele Leute beeindruckt. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hat mit [VAR TRNAME(0001)] an einem Wettbewerb teilgenommen und einen spektakulären Sieg errungen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ist zusammen mit [VAR TRNAME(0001)] per Überflieger durch die Lüfte gesaust und zu verschiedenen Orten geflogen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] wurde von [VAR TRNAME(0001)] gebeten, in die Tiefe hinabzutauchen und den Meeresboden zu erkunden. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. + +Ich kann die Erinnerungen von Pokémon lesen. Deswegen nennt man mich Miss Memory. Möchtest du wissen, woran sich die Pokémon in deinem Team erinnern? +Spitze! Über die Erinnerungen welches deiner Pokémon möchtest du etwas wissen? +Komm jederzeit wieder! +Es erinnert sich noch an etwas anderes. +Möchtest du auch etwas über die Erinnerungen eines anderen Pokémon erfahren? diff --git a/Resources/text/todo/text_Memories_en.txt b/Resources/text/todo/text_Memories_en.txt new file mode 100644 index 000000000..cffae0b65 --- /dev/null +++ b/Resources/text/todo/text_Memories_en.txt @@ -0,0 +1,114 @@ + + +The Pokémon remembers +The Pokémon remembers +The Pokémon remembers +The Pokémon remembers +The Pokémon still remembers +The Pokémon always remembers +The Pokémon fondly remembers + +it was happy +it had fun +it was glad +it grinned +it got overwhelmed by emotion +its feelings were indescribable +it felt good +it got teary eyed +it got lighthearted +it got nervous +it felt comfortable +it was restless +it got a bit carried away +it felt sorry +it got emotional +it felt nostalgic +it had some difficulty +it felt exhausted +it couldn’t be true to its feelings +it felt proud +they ended up in a foul mood +it got angry +it got jealous +it got sleepy + +a certain item +a certain move +a Pokémon +The Pokémon seems to have a good memory, but it doesn’t seem to be able to remember... +[VAR PKNICK(0000)] met [VAR TRNAME(0001)] at...[VAR GENLOC(0002)]. [VAR TRNAME(0001)] threw a Poké Ball at it, and they started to travel together. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] hatched from an Egg and saw [VAR TRNAME(0001)] for the first time at... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] met [VAR TRNAME(0001)] at... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] became [VAR TRNAME(0001)]’s friend when it came through Link Trade at... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] went to a Poké Mart with [VAR TRNAME(0001)] to buy [VAR ITEMPLUR1][VAR ITEM2(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[~ 44] +[VAR PKNICK(0000)] went fishing with [VAR TRNAME(0001)], and they caught [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] went fishing with [VAR TRNAME(0001)], but the hooked Pokémon got away! [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[~ 47] +[VAR PKNICK(0000)] got treats from [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] went clothes shopping with [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[~ 50] +[VAR PKNICK(0000)] helped [VAR TRNAME(0001)] hatch [VAR PKNAME(0002)] from an Egg. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] was with [VAR TRNAME(0001)] when [VAR GENDBR(00FF,0100)]she caught [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR TRNAME(0001)] used [VAR ITEMPLUR1][VAR ITEM2(0002)] when [VAR PKNICK(0000)] was in trouble. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[~ 54] +[VAR PKNICK(0000)] battled at [VAR TRNAME(0001)]’s side and beat [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] lost to [VAR PKNAME(0002)] and [VAR TRNAME(0001)] ran away. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] was brought up by [VAR TRNAME(0001)] and evolved at [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] surfed across the water, carrying [VAR TRNAME(0001)] on its back. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[~ 59] +[VAR PKNICK(0000)] battled at [VAR TRNAME(0001)]’s side and defeated a Gym Leader. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +When [VAR PKNICK(0000)] challenged the Battle Maison, [VAR TRNAME(0001)] got really nervous. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] flew, carrying [VAR TRNAME(0001)] on its back from [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[~ 63] +[VAR PKNICK(0000)] saw [VAR TRNAME(0001)] using [VAR ITEMPLUR1][VAR ITEM2(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] battled at [VAR TRNAME(0001)]’s side and defeated the Champion. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] was with [VAR TRNAME(0001)] when [VAR GENDBR(0001,0100)]she completed h[VAR GENDBR(0001,0202)]iser Pokédex. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] encountered [VAR PKNAME(0002)] when it was with [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] battled at [VAR TRNAME(0001)]’s side and defeated a Battle Chatelaine. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[~ 69] +[VAR PKNICK(0000)] rode a Bike with [VAR TRNAME(0001)] at... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] checked a destination with [VAR TRNAME(0001)] using the Town Map at... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] planted [VAR ITEMPLUR1][VAR ITEM2(0002)] with [VAR TRNAME(0001)] and imagined a big harvest. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR TRNAME(0001)] asked [VAR PKNICK(0000)] to use Strength, and it proudly used the move in... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR TRNAME(0001)] asked [VAR PKNICK(0000)] to use Cut, and it proudly used the move in... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR TRNAME(0001)] asked [VAR PKNICK(0000)] to shatter rocks, which it did to its heart’s content in... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] used Waterfall while carrying [VAR TRNAME(0001)] on its back in... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] saw [VAR TRNAME(0001)] secretly picking up something in... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR TRNAME(0001)] had [VAR PKNICK(0000)] hold items like [VAR ITEMPLUR1][VAR ITEM2(0002)] to help it along. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] went to Victory Road with [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[~ 80] +[VAR PKNICK(0000)] was impressed by the speed of the train it took with [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[~ 82] +When [VAR PKNAME(0002)] jumped out, [VAR PKNICK(0000)] was surprised and ran away with [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] got a high score at the Battle Institute where it challenged others with [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] was stared at by the Judge when it met him with [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +The Move Deleter that [VAR PKNICK(0000)] met through [VAR TRNAME(0001)] made it forget [VAR MOVE(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR TRNAME(0001)] asked [VAR PKNICK(0000)] to remember [VAR MOVE(0002)], and it was able to remember the move. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] was taken to the Pokémon Day Care by [VAR TRNAME(0001)] and left with [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] was excited when [VAR TRNAME(0001)] won with h[VAR GENDBR(0001,0202)]iser Loto Ticket and won prizes like [VAR ITEMPLUR1][VAR ITEM2(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] was with [VAR TRNAME(0001)] when [VAR GENDBR(0001,0100)]she used a repellent at... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] had a very hard training session with [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] took an elevator with [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] was taken to the Name Rater by [VAR TRNAME(0001)] and given a fateful name. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] was with [VAR TRNAME(0001)] when [VAR GENDBR(0001,0100)]she went to a boutique and tried on clothes, but [VAR GENDBR(0001,0100)]she left the boutique without buying anything. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] went to a nice restaurant with [VAR TRNAME(0001)] and ate until it got totally full. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] was taken to a nice lady by [VAR TRNAME(0001)] and pampered. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] checked a trash can with [VAR TRNAME(0001)] at... [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[~ 98] +[VAR PKNICK(0000)] went to a tall tower with [VAR TRNAME(0001)] and looked down at the world. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] saw itself in a mirror in a mirror cave that it explored with [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] almost got lost when it explored a forest with [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] went to a factory with [VAR TRNAME(0001)] and saw a lot of machines that looked very complicated. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] was with [VAR TRNAME(0001)] when [VAR GENDBR(0000,0100)]she built a Secret Base. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] participated in a contest with [VAR TRNAME(0001)] and impressed many people. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] participated in a contest with [VAR TRNAME(0001)] and won the title. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] soared through the sky with [VAR TRNAME(0001)] and went to many different places. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. +[VAR TRNAME(0001)] asked [VAR PKNICK(0000)] to dive. Down it went, deep into the ocean, to explore the bottom of the sea. [VAR REMQUAL(0004)] that [VAR REMFEEL(0003)]. + +I’m the Memory Girl! I can read Pokémon memories. Do you want to know the memory of your Pokémon? +OK! Which Pokémon’s memory do you want to know? +Come back anytime! +And... +Do you want to know another Pokémon’s memory? diff --git a/Resources/text/todo/text_Memories_es.txt b/Resources/text/todo/text_Memories_es.txt new file mode 100644 index 000000000..7783ffd0e --- /dev/null +++ b/Resources/text/todo/text_Memories_es.txt @@ -0,0 +1,114 @@ + + +El Pokémon recuerda muy vagamente +El Pokémon recuerda vagamente +El Pokémon recuerda más o menos +El Pokémon recuerda bastante bien +El Pokémon recuerda con claridad +El Pokémon nunca podrá olvidar +El Pokémon tiene grabado en el corazón + +cuánto se alegró +lo bien que lo pasó +la felicidad que sintió +la sonrisa que esbozó +cómo le embargó la emoción +la sensación inenarrable que experimentó +lo mucho que le agradó +las lágrimas que le vinieron a los ojos +la ilusión que le hizo +lo nervioso que se puso +lo bien que se sintió +el hormigueo que sintió +la experiencia y le gustaría revivirla +el regusto amargo que le quedó +la pena que sintió +la nostalgia que sintió +lo difícil que le pareció +lo extenuante que resultó +cómo le costó aceptar lo que sentía +el orgullo que sintió +el mal humor que le sobrevino +cuánto se enfadó +los celos que sintió +el sueño que le entró + +objeto determinado +cierto movimiento +cierto Pokémon +Aunque parece guardar un grato recuerdo, no es capaz de rescatarlo de la memoria, por lo que veo. +Los caminos de [VAR PKNICK(0000)] y [VAR TRNAME(0001)] se cruzaron en [VAR GENLOC(0002)]. La Poké Ball lanzada por [VAR TRNAME(0001)] marcó el punto de partida de su viaje conjunto. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Lo primero que vio [VAR PKNICK(0000)] cuando salió del cascarón en [VAR GENLOC(0002)] fue la cara de [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Los caminos de [VAR PKNICK(0000)] y [VAR TRNAME(0001)] se cruzaron en [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] y [VAR TRNAME(0001)] se conocieron como consecuencia de un intercambio Pokémon en [VAR GENLOC(0002)] y ambos sintieron que era el comienzo de una gran amistad. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En una ocasión, [VAR PKNICK(0000)] y [VAR TRNAME(0001)] fueron juntos a una Tienda Pokémon para comprar [VAR 1702(0002)][VAR ITEM2(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 44] +En una ocasión, [VAR TRNAME(0001)] y [VAR PKNICK(0000)] pescaron juntos un ejemplar de [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Cuando [VAR TRNAME(0001)] y [VAR PKNICK(0000)] fueron juntos de pesca en una ocasión, [VAR TRNAME(0001)] dejó escapar un Pokémon que ya tenía en el bote. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 47] +En una ocasión, [VAR TRNAME(0001)] le dio un dulce a [VAR PKNICK(0000)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En una ocasión, [VAR PKNICK(0000)] y [VAR TRNAME(0001)] fueron juntos a comprar ropa. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 50] +[VAR PKNICK(0000)] ayudó una vez a [VAR TRNAME(0001)] a eclosionar el Huevo de [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] estaba presente cuando [VAR TRNAME(0001)] atrapó a [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Cuando [VAR PKNICK(0000)] estaba contra las cuerdas, [VAR TRNAME(0001)] usó [VAR 1702(0002)][VAR ITEM2(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 54] +[VAR PKNICK(0000)] y [VAR TRNAME(0001)] lucharon codo con codo para derrotar a [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Cuando [VAR PKNICK(0000)] perdió el combate contra [VAR PKNAME(0002)], [VAR TRNAME(0001)] se vio obligad[VAR GENDBR(0001,0101)]oa a poner pies en polvorosa. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Gracias al entrenamiento de [VAR TRNAME(0001)], llegó el día en que [VAR PKNICK(0000)] logró evolucionar. Todo ocurrió en [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En cierta ocasión, [VAR TRNAME(0001)] surcó las aguas a lomos de [VAR PKNICK(0000)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 59] +[VAR PKNICK(0000)] y [VAR TRNAME(0001)] lucharon codo con codo para derrotar a un Líder de Gimnasio. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Cuando [VAR TRNAME(0001)] afrontó el reto de la Mansión Batalla, [VAR PKNICK(0000)] era un manojo de nervios. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] llevó volando a [VAR TRNAME(0001)] desde [VAR GENLOC(0002)] en cierta ocasión. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 63] +Una vez [VAR PKNICK(0000)] vio como [VAR TRNAME(0001)] utilizaba [VAR 1702(0002)][VAR ITEM2(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] y [VAR TRNAME(0001)] lucharon codo con codo para derrotar al Campeón. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] estaba junto a [VAR TRNAME(0001)] cuando consiguió completar su Pokédex. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] se hallaba junto a [VAR TRNAME(0001)] cuando ambos se toparon con [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En una ocasión, [VAR TRNAME(0001)] derrotó a una Dama del Combate. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 69] +[VAR PKNICK(0000)] se montó en Bici con [VAR TRNAME(0001)] en [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] y [VAR TRNAME(0001)] utilizaron el Mapa en [VAR GENLOC(0002)] para comprobar adónde se dirigían. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Mientras plantaba una [VAR ITEM2(0002)] con [VAR TRNAME(0001)], [VAR PKNICK(0000)] se imaginaba lo abundante que sería la cosecha. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Siguiendo las indicaciones de [VAR TRNAME(0001)], [VAR PKNICK(0000)] se sintió muy orgulloso una vez al usar Fuerza en [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Siguiendo las indicaciones de [VAR TRNAME(0001)], una vez [VAR PKNICK(0000)] hizo gala de su destreza al usar Corte en [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Siguiendo las indicaciones de [VAR TRNAME(0001)], una vez [VAR PKNICK(0000)] hizo añicos una roca en [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una vez [VAR PKNICK(0000)] utilizó Cascada en [VAR GENLOC(0002)] llevando a cuestas a [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una vez [VAR PKNICK(0000)] vio como [VAR TRNAME(0001)] recogía un objeto sin que nadie se diese cuenta en [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En cierta ocasión, [VAR TRNAME(0001)] equipó a [VAR PKNICK(0000)] con [VAR 1702(0002)][VAR ITEM2(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En cierto momento, [VAR PKNICK(0000)] emprendió el camino hacia la Calle Victoria con [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 80] +Cuando [VAR PKNICK(0000)] montó en el tren junto a [VAR TRNAME(0001)], se quedó de piedra por la velocidad vertiginosa que podía alcanzar. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 82] +[VAR PKNICK(0000)] y [VAR TRNAME(0001)] tomaron las de Villadiego cuando [VAR PKNAME(0002)] les sorprendió con su repentina emboscada. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] se hallaba junto a [VAR TRNAME(0001)] cuando ambos obtuvieron una puntuación alta en la Casa Examinadora. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Cuando [VAR TRNAME(0001)] llevó a [VAR PKNICK(0000)] ante el Juez, este realizó un riguroso examen. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Cuando [VAR PKNICK(0000)] se encontró con el Quita-Movimientos gracias a [VAR TRNAME(0001)], olvidó [VAR MOVE(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Siguiendo las instrucciones de [VAR TRNAME(0001)], [VAR PKNICK(0000)] fue capaz de recordar [VAR MOVE(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR TRNAME(0001)] llevó a [VAR PKNICK(0000)] a una Guardería Pokémon para que se criara junto a [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Cuando a [VAR TRNAME(0001)] le tocó la lotería, [VAR PKNICK(0000)] vio con envidia que se llevaba [VAR 1702(0002)][VAR ITEM2(0002)] como premio. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Cuando [VAR TRNAME(0001)] usó un Repelente en [VAR GENLOC(0002)], [VAR PKNICK(0000)] se hallaba a su lado. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En una ocasión, [VAR PKNICK(0000)] se sometió a un duro entrenamiento impartido por [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En una ocasión, [VAR PKNICK(0000)] se subió a un ascensor junto a [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En una ocasión, [VAR TRNAME(0001)] y [VAR PKNICK(0000)] fueron a ver juntos al Inspector de Motes, y este le puso un nombre de buen augurio. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En una ocasión, [VAR PKNICK(0000)] acompañó a [VAR TRNAME(0001)] cuando fue a una boutique para probarse ropa, aunque al final no compró nada. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una vez [VAR PKNICK(0000)] y [VAR TRNAME(0001)] fueron a un restaurante y se pusieron las botas. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una vez [VAR TRNAME(0001)] llevó a [VAR PKNICK(0000)] a un sitio donde una chica encantadora le dio todo tipo de mimos. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En una ocasión, [VAR PKNICK(0000)] y [VAR TRNAME(0001)] rebuscaron juntos en una papelera que hay en [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 98] +Cuando [VAR TRNAME(0001)] y [VAR PKNICK(0000)] estaban en una torre muy alta, [VAR PKNICK(0000)] miró hacia abajo y todo le pareció muy pequeñito. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Cuando [VAR TRNAME(0001)] y [VAR PKNICK(0000)] visitaron una cueva llena de espejos, [VAR PKNICK(0000)] contempló su reflejo. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] estuvo a punto de perderse al explorar un bosque junto a [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Al acompañar a [VAR TRNAME(0001)] hasta una fábrica, [VAR PKNICK(0000)] se encontró allí con un montón de máquinas que parecían muy complejas. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En cierto momento, [VAR PKNICK(0000)] y [VAR TRNAME(0001)] construyeron juntos una Base Secreta. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En una ocasión, [VAR PKNICK(0000)] y [VAR TRNAME(0001)] participaron en un concurso y se exhibieron delante de muchas personas. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En determinado momento, [VAR PKNICK(0000)] y [VAR TRNAME(0001)] participaron en un concurso y se alzaron con la victoria. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +En cierta ocasión, [VAR PKNICK(0000)] y [VAR TRNAME(0001)] visitaron numerosos lugares gracias al Ultravuelo. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una vez, [VAR PKNICK(0000)], siguiendo las instrucciones de [VAR TRNAME(0001)] se sumergió en las profundidades del mar para explorar el fondo oceánico. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. + +Me llaman la Evocadora porque puedo ver los recuerdos de los Pokémon. ¿Quieres que saque a la luz los recuerdos que residen en el interior de alguno de los Pokémon que te acompañan? +¡Muy bien! ¿A qué Pokémon en concreto? +Vale, vuelve cuando quieras. +Eso no es todo. También recuerda otra cosa... +¿Quieres evocar los recuerdos de otro Pokémon? diff --git a/Resources/text/todo/text_Memories_fr.txt b/Resources/text/todo/text_Memories_fr.txt new file mode 100644 index 000000000..4e25a5915 --- /dev/null +++ b/Resources/text/todo/text_Memories_fr.txt @@ -0,0 +1,114 @@ + + +se souvient vaguement que +se souvient vaguement que +se souvient vaguement que +se souvient vaguement que +se souvient clairement que +se souvient très bien que +n’oubliera jamais que + +ça lui a fait plaisir +c’était amusant +ça l’a rendu heureux +ça l’a fait sourire +ça l’a ému +c’était une drôle de sensation +c’était agréable +ça lui a mis les larmes aux yeux +ça lui a donné du baume au cœur +ça l’a rendu nerveux +c’était apaisant +ça chatouillait +ça ne lui a laissé aucun regret +ça lui a laissé un goût amer +ça lui a fait beaucoup de peine +ça l’a rendu nostalgique +c’était difficile +c’était épuisant +ça n’était pas facile à accepter +ça l’a rendu fier +ça l’a mis de mauvaise humeur +ça l’a rendu furieux +ça l’a rendu jaloux +ça lui a donné sommeil + +certain objet +une capacité +Pokémon +Il se rappelle un bon souvenir, mais les détails lui semblent flous… +[VAR PKNICK(0000)] a fait la rencontre de [VAR TRNAME(0001)] [VAR GENLOC(0002)]. Il a accepté d’entrer dans sa Poké Ball, et c’est ainsi que leur amitié a commencé. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a brisé la coquille de son Œuf et a fait la rencontre de [VAR TRNAME(0001)] [VAR GENLOC(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a fait la rencontre de [VAR TRNAME(0001)] [VAR GENLOC(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] est devenu l’ami de [VAR TRNAME(0001)] lors d’un échange [VAR GENLOC(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] est allé dans une Boutique Pokémon avec [VAR TRNAME(0001)] pour acheter [VAR 1402(0002)][VAR ITEM2(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 44] +[VAR PKNICK(0000)] est allé à la pêche avec [VAR TRNAME(0001)] et ils ont attrapé un [VAR PKNAME(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] est allé à la pêche avec [VAR TRNAME(0001)]. Quelque chose a mordu à l’hameçon, mais la prise s’est échappée. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 47] +[VAR PKNICK(0000)] a reçu une sucrerie de [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] est allé acheter des vêtements avec [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 50] +[VAR PKNICK(0000)] était avec [VAR TRNAME(0001)] quand il a aidé un [VAR PKNAME(0002)] à sortir de son Œuf. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] était avec [VAR TRNAME(0001)] lorsque ce Dresseur a attrapé un [VAR PKNAME(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] était en mauvaise posture, quand [VAR TRNAME(0001)] a utilisé [VAR 1402(0002)][VAR ITEM2(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 54] +[VAR PKNICK(0000)] a aidé [VAR TRNAME(0001)] à vaincre un [VAR PKNAME(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a été battu par un [VAR PKNAME(0002)] et s’est enfui avec [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a été entraîné par [VAR TRNAME(0001)] et a évolué [VAR GENLOC(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a transporté [VAR TRNAME(0001)] sur son dos pour lui permettre de traverser une étendue d’eau. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 59] +[VAR PKNICK(0000)] a aidé [VAR TRNAME(0001)] à vaincre un Champion d’Arène. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a aidé [VAR TRNAME(0001)] à relever le défi de la Maison de Combat. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a été appelé par [VAR TRNAME(0001)] [VAR GENLOC(0002)] pour s’envoler ensemble vers un autre endroit. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 63] +[VAR PKNICK(0000)] a vu [VAR TRNAME(0001)] utiliser [VAR 1402(0002)][VAR ITEM2(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a aidé [VAR TRNAME(0001)] à vaincre le Maître de la Ligue. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] était avec [VAR TRNAME(0001)] quand ce Dresseur a complété son Pokédex. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] était aux côtés de [VAR TRNAME(0001)] quand ce Dresseur a croisé un [VAR PKNAME(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a aidé [VAR TRNAME(0001)] à vaincre une Châtelaine Combat. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 69] +[VAR PKNICK(0000)] est monté à Bicyclette avec [VAR TRNAME(0001)] [VAR GENLOC(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a consulté la Carte avec [VAR TRNAME(0001)] [VAR GENLOC(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a planté des Baies avec [VAR TRNAME(0001)], et s’est imaginé à quel point les arbustes seraient jolis à l’heure de la récolte. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a utilisé Force [VAR GENLOC(0002)] sur les instructions de [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a utilisé Coupe [VAR GENLOC(0002)] sur les instructions de [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a utilisé Éclate-Roc [VAR GENLOC(0002)] sur les instructions de [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a utilisé Cascade pour aider [VAR TRNAME(0001)] à remonter le courant [VAR GENLOC(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a vu [VAR TRNAME(0001)] ramasser un objet [VAR GENLOC(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a reçu [VAR 1402(0002)][VAR ITEM2(0002)] des mains de [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a aidé [VAR TRNAME(0001)] à relever le défi de la Route Victoire. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 80] +[VAR PKNICK(0000)] a été impressionné par la vitesse du train qu’il a pris avec [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 82] +[VAR PKNICK(0000)] a fui avec [VAR TRNAME(0001)] face à un [VAR PKNAME(0002)] sorti de nulle part. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a aidé [VAR TRNAME(0001)] à obtenir un bon score à un Test Combat, au Club des Épreuves. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] s’est fait examiner de près par le Juge, que [VAR TRNAME(0001)] lui avait présenté. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a oublié [VAR MOVE(0002)] grâce à l’Effaceur de Capacités, que [VAR TRNAME(0001)] lui avait présenté. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] s’est remémoré [VAR MOVE(0002)], à la demande de [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a été amené à la Pension Pokémon par [VAR TRNAME(0001)]. Il y est resté avec un [VAR PKNAME(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a vu [VAR TRNAME(0001)] gagner [VAR 1402(0002)][VAR ITEM2(0002)] à la Loterie ID. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] était avec [VAR TRNAME(0001)] quand ce Dresseur a utilisé un Repousse [VAR GENLOC(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] se rappelle d’une session d’entraînement particulièrement dure avec [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] est monté dans un ascenseur avec [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] est allé voir le Spécialiste des Noms avec [VAR TRNAME(0001)], et son surnom a eu beaucoup de succès ! Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] était avec [VAR TRNAME(0001)] quand ce Dresseur a essayé des vêtements dans une boutique, mais n’a rien acheté. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] était avec [VAR TRNAME(0001)] quand ce Dresseur est allé dans un grand restaurant s’offrir un menu gastronomique. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a été amené par [VAR TRNAME(0001)] chez une gentille dame qui aime les Pokémon. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a fouillé les poubelles avec [VAR TRNAME(0001)] [VAR GENLOC(0002)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 98] +[VAR PKNICK(0000)] a admiré le monde du haut d’une grande tour aux côtés de [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] est allé avec [VAR TRNAME(0001)] dans une grotte qui semblait couverte de miroirs, et y a aperçu son reflet. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a failli se perdre dans une forêt avec [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] est allé avec [VAR TRNAME(0001)] dans une usine remplie de machines étranges. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a vu [VAR TRNAME(0001)] créer sa propre Base Secrète. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a participé à un Concours Pokémon aux côtés de [VAR TRNAME(0001)]. Il a pu faire son show en faisant toutes sortes de Démonstrations devant un large public. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a participé à un Concours Pokémon aux côtés de [VAR TRNAME(0001)] et il a réussi à gagner ! Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a pris son Grand Envol aux côtés de [VAR TRNAME(0001)] et a visité quelques endroits exotiques. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] a plongé au cœur de l’océan sur les instructions de [VAR TRNAME(0001)]. Il [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. + +Je suis Sue Veunyre ! Je peux lire les souvenirs des Pokémon ! Ça t’intéresse ? +Okay ! De quel Pokémon dois-je lire les souvenirs ? +Reviens quand tu veux. Les souvenirs sont faits pour durer ! Yeah ! +Et puis… +Est-ce que tu veux que je lise les souvenirs d’un autre Pokémon ? diff --git a/Resources/text/todo/text_Memories_it.txt b/Resources/text/todo/text_Memories_it.txt new file mode 100644 index 000000000..23ace17cf --- /dev/null +++ b/Resources/text/todo/text_Memories_it.txt @@ -0,0 +1,114 @@ + + +Il Pokémon ricorda ancora +Il Pokémon ricorda ancora +Il Pokémon ricorda ancora +Il Pokémon ricorda ancora +Il Pokémon ricorda molto bene +Il Pokémon ricorda distintamente +Il Pokémon ricorderà per sempre + +la sua felicità +quanto sia stato divertente +la sua gioia +le sue risate +la sua emozione +quella sensazione indescrivibile +quanto è stato piacevole +la sua commozione +la sua allegria +quanto era nervoso +quella bella sensazione +che non riusciva a star fermo +il suo entusiasmo +il suo dispiacere +la sua tristezza +quella sensazione di malinconia +la sua preoccupazione +la sensazione di sfinimento +il suo dilemma +quanto questo lo abbia reso orgoglioso +la tensione di quei momenti +quanto questo lo abbia fatto arrabbiare +quanto questo lo abbia reso geloso +quanto sonno gli era venuto + +certo strumento +una certa mossa +Pokémon +Questo Pokémon ha dei bei ricordi, ma adesso non è possibile richiamarli... +Un giorno [VAR PKNICK(0000)] ha incontrato [VAR TRNAME(0001)] [VAR GENLOC(0002)]. [VAR TRNAME(0001)] ha lanciato una Poké Ball per catturarlo e da quel momento hanno iniziato a viaggiare insieme. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] uscì dal suo Uovo incontrando [VAR TRNAME(0001)] per la prima volta [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ha incontrato [VAR TRNAME(0001)] [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ha fatto amicizia con [VAR TRNAME(0001)] [VAR GENLOC(0002)] grazie a uno scambio di Pokémon. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha visitato con [VAR TRNAME(0001)] il Pokémon-Market per comprare [VAR 1502(0002)][VAR ITEM2(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 44] +Quando [VAR TRNAME(0001)] ha pescato [VAR 1002][VAR 1502(0002)][VAR PKNAME(0002)], [VAR PKNICK(0000)] era con l[VAR GENDBR(0001,0101)]uei. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] stava pescando con [VAR TRNAME(0001)], ma il Pokémon che aveva abboccato è riuscito a fuggire. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 47] +Una volta [VAR PKNICK(0000)] ha ricevuto un dolcetto da [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] è andato a comprare dei vestiti con [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 50] +Una volta [VAR PKNICK(0000)] ha aiutato [VAR TRNAME(0001)] a far schiudere un Uovo di [VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Quando [VAR TRNAME(0001)] ha catturato [VAR 1502(0002)][VAR PKNAME(0002)], [VAR PKNICK(0000)] era con l[VAR GENDBR(0001,0101)]uei. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR TRNAME(0001)] ha usato [VAR 1502(0002)][VAR ITEM2(0002)] quando [VAR PKNICK(0000)] era in difficoltà. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 54] +Una volta [VAR PKNICK(0000)] ha lottato insieme a [VAR TRNAME(0001)] e ha sconfitto [VAR 1002][VAR 1502(0002)][VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)], lottando contro [VAR 1502(0002)][VAR 1002][VAR PKNAME(0002)], è stato sconfitto ed è fuggito con [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] si è allenato con [VAR TRNAME(0001)] fino a evolversi [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha usato Surf trasportando sul dorso [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 59] +Una volta [VAR PKNICK(0000)], lottando con [VAR TRNAME(0001)], ha sconfitto la squadra di un Capopalestra. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha affrontato le sfide della Villa Lotta con [VAR TRNAME(0001)] in un’atmosfera di grande tensione. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha usato Volo per trasportare [VAR TRNAME(0001)] che si trovava [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 63] +Una volta [VAR PKNICK(0000)] ha visto [VAR TRNAME(0001)] usare [VAR 1502(0002)][VAR ITEM2(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha lottato insieme a [VAR TRNAME(0001)] e ha sconfitto il Campione. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Quando [VAR TRNAME(0001)] ha completato il Pokédex, [VAR PKNICK(0000)] era con l[VAR GENDBR(0001,0101)]uei. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Mentre era con [VAR TRNAME(0001)], [VAR PKNICK(0000)] ha incontrato [VAR 1002][VAR 1502(0002)][VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)], lottando insieme a [VAR TRNAME(0001)], ha sconfitto la squadra di una Dama della lotta. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 69] +Una volta [VAR TRNAME(0001)] ha portato [VAR PKNICK(0000)] in Bicicletta [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha controllato la mappa con [VAR TRNAME(0001)] [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[VAR PKNICK(0000)] ha piantato con [VAR TRNAME(0001)] [VAR 1502(0002)][VAR ITEM2(0002)] ed è impaziente di vederne spuntare i frutti. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)], su indicazione di [VAR TRNAME(0001)], ha usato Forza, la sua mossa migliore, [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)], su indicazione di [VAR TRNAME(0001)], ha usato fieramente Taglio [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)], su indicazione di [VAR TRNAME(0001)], ha spaccato una roccia [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha usato Cascata mentre trasportava [VAR TRNAME(0001)] [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha visto [VAR TRNAME(0001)] raccogliere di nascosto qualcosa [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR TRNAME(0001)] ha dato a [VAR PKNICK(0000)] [VAR 1502(0002)][VAR ITEM2(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] si è diretto verso Via Vittoria assieme a [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 80] +Una volta [VAR PKNICK(0000)] ha preso il treno con [VAR TRNAME(0001)] ed è rimasto colpito dalla velocità a cui sfrecciava. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 82] +Una volta [VAR PKNICK(0000)] e [VAR TRNAME(0001)] sono fuggiti via spaventati da [VAR 1502(0002)][VAR 1002][VAR PKNAME(0002)] sbucato fuori all’improvviso. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha affrontato la Casa Esami con [VAR TRNAME(0001)] e ha ottenuto un ottimo punteggio. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] è stato attentamente esaminato da un Giudice da cui lo aveva portato [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha dimenticato [VAR MOVE(0002)] grazie al Cancellamosse presentatogli da [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha ricordato [VAR MOVE(0002)] su indicazione di [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR TRNAME(0001)] ha affidato [VAR PKNICK(0000)] alla Pensione Pokémon assieme a [VAR 1002][VAR 1502(0002)][VAR PKNAME(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha visto [VAR TRNAME(0001)] vincere [VAR 1502(0002)][VAR ITEM2(0002)] al Centro Lotteria ID. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR TRNAME(0001)] ha usato un Repellente [VAR GENLOC(0002)] quando [VAR PKNICK(0000)] era con l[VAR GENDBR(0001,0101)]uei. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha fatto un allenamento faticoso con [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] ha preso l’ascensore con [VAR TRNAME(0001)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR TRNAME(0001)] ha portato [VAR PKNICK(0000)] dal Giudice Onomastico per dargli un nome significativo. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] e [VAR TRNAME(0001)] sono andati in un negozio di vestiti. [VAR TRNAME(0001)] ha provato degli abiti, ma non ha comprato nulla. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] è andato con [VAR TRNAME(0001)] in un bel ristorante dove hanno mangiato a volontà. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR TRNAME(0001)] ha portato [VAR PKNICK(0000)] da una signorina molto carina che lo ha riempito di coccole. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] e [VAR TRNAME(0001)] hanno esaminato insieme un cestino dei rifiuti [VAR GENLOC(0002)]. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +[~ 98] +Una volta [VAR PKNICK(0000)] è salito su una torre altissima con [VAR TRNAME(0001)] e insieme hanno guardato il mondo da lassù. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] è andato con [VAR TRNAME(0001)] in una grotta piena di specchi e ha visto la propria immagine riflessa. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] e [VAR TRNAME(0001)] hanno smarrito la strada durante un’escursione nel bosco. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] è andato con [VAR TRNAME(0001)] in una fabbrica dove c’erano un sacco di macchinari complicati. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] e [VAR TRNAME(0001)] hanno costruito una Base Segreta. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] e [VAR TRNAME(0001)] hanno partecipato a una gara con un’esibizione che ha conquistato il pubblico. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] e [VAR TRNAME(0001)] hanno partecipato a una gara riportando una splendida vittoria. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)] e [VAR TRNAME(0001)] hanno visitato posti meravigliosi usando Ipervolo. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. +Una volta [VAR PKNICK(0000)], su indicazione di [VAR TRNAME(0001)], si è immerso negli abissi e ha esplorato il fondale marino. [VAR REMQUAL(0004)] [VAR REMFEEL(0003)]. + +Ciao, io sono Memory e posso leggere i ricordi dei Pokémon. Vuoi conoscere i ricordi dei tuoi Pokémon? +Quale Pokémon scegli? +Torna pure quando vuoi. Un ricordo è per sempre. +E poi... +Vuoi conoscere i ricordi di un altro Pokémon? diff --git a/Resources/text/todo/text_Memories_ja.txt b/Resources/text/todo/text_Memories_ja.txt new file mode 100644 index 000000000..fba8e5be5 --- /dev/null +++ b/Resources/text/todo/text_Memories_ja.txt @@ -0,0 +1,114 @@ + + +おもいで　らしいよー +おもいで　らしいよー +おもいで　らしいよー +おもいで　らしいよー +こころにのこる　おもいで　らしいよ +わすれられない　おもいで　なんだって +さいこうの　おもいで　だってさー！ + +うれしかった +たのしかった +よろこんだ +ニヤニヤした +たまらない　きもちになった +なんともいえない　きもちだった +いい　きぶんになった +うるうるした +うかれてしまった +きんちょうした +きもちよかった +もぞもぞした +クセになりそうに　なった +もうしわけない　きぶんになった +せつない　きもちになった +なつかしい　きもちになった +てこずった +きつかった +すなおに　なれなかった +ほこらしく　おもった +けんあくな　ムードになった +おこってしまった +しっとした +ねむくなった + +なにかのどうぐ +なにかのわざ +だれか +いい　おもいでが　あるようだけど ちょっと　おもいおこせないみたい…… +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]に [VAR GENLOC(0002)]で　であって モンスターボールを　なげられてから いっしょに　たびする　ことになって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR GENLOC(0002)]で タマゴの　からをやぶって　でてきたとき はじめて　[VAR TRNAME(0001)]と　であって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]と [VAR GENLOC(0002)]で　であえて [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR GENLOC(0002)]で ポケモンこうかんで [VAR TRNAME(0001)]の　なかまになって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]と フレンドリィショップに　[VAR ITEM2(0002)]を かいに　いって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[~ 44] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]と いっしょに　つりをして [VAR PKNAME(0002)]を つりあげちゃったとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]と いっしょに　つりをしたとき [VAR TRNAME(0001)]が　せっかく　つれた ポケモンを　のがしてしまって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[~ 47] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]に おかしを　もらって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と いっしょに　ようふくを　かいにいって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[~ 50] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]が [VAR PKNAME(0002)]の タマゴを　かえすのを　てつだって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]が [VAR PKNAME(0002)]を つかまえた　ときに [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は ピンチの　ときに [VAR TRNAME(0001)]に [VAR ITEM2(0002)]を　つかってもらって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[~ 54] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]と いっしょに　たたかって [VAR PKNAME(0002)]を たおしたとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR PKNAME(0002)]との たたかいに　まけちゃって [VAR TRNAME(0001)]と いっしょに　にげかえったとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]に そだてられて [VAR GENLOC(0002)]で しんかしたとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は なみのりで　[VAR TRNAME(0001)]を じぶんの　せなかに　のせて [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[~ 59] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]と いっしょに　たたかって ジムリーダーに　かったとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]が バトルハウスに　いどんだとき すごく　きんちょうして [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は そらをとぶで　[VAR TRNAME(0001)]を [VAR GENLOC(0002)]から　はこんで [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[~ 63] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]が [VAR ITEM2(0002)]を　つかったのを　みて [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]と いっしょに　たたかって チャンピオンを　たおしたとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]が ポケモンずかんを　かんせい　させたとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR PKNAME(0002)]と　そうぐうして [VAR TRNAME(0001)]と　いっしょに [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]が バトルシャトレーヌを　たおしたとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[~ 69] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]と [VAR GENLOC(0002)]で じてんしゃに　のって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]と [VAR GENLOC(0002)]で タウンマップを　つかって もくてきの　ばしょを　かくにんし [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]と [VAR ITEM2(0002)]を　つちに　うめて たくさんの　みが　なったときの ことを　そうぞうしながら [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]に　たのまれて [VAR GENLOC(0002)]で じまんの　かいりきを　つかって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]に　たのまれて [VAR GENLOC(0002)]で じまんの　いあいぎりを　やってみせて [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]に　たのまれて [VAR GENLOC(0002)]で おもいっきり　いわを　くだいたとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR GENLOC(0002)]で [VAR TRNAME(0001)]を　のせて たきのぼりを　つかったとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR GENLOC(0002)]で [VAR TRNAME(0001)]が　なにかを こっそり　ひろったのを　みて [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]に [VAR ITEM2(0002)]を とつぜん　もたされて [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　いっしょに チャンピオンロードに　はいって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[~ 80] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　いっしょに のった　でんしゃの　スピードが とても　はやいことに　かんどうし [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[~ 82] +[VAR PKNICK(0000)]は [VAR PKNAME(0002)]が　とびだしてきたとき びっくりして　[VAR TRNAME(0001)]と いっしょに　にげだして [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　いっしょに チャレンジした　トライアルハウスで こうとくてんを　だして [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]の　しょうかいで であった　ジャッジに じろじろと　みられすぎて [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]の　しょうかいで であった　わすれジイさんに [VAR MOVE(0002)]を　わすれさせられて [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]に　たのまれて [VAR MOVE(0002)]を おもいだすことが　できたとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]に そだてやさんへ　つれていって　もらって [VAR PKNAME(0002)]と いっしょに　あずけられ [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]が くじびきで　[VAR ITEM2(0002)]を もらったことを　うらやましく　おもって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は　[VAR TRNAME(0001)]が [VAR GENLOC(0002)]で むしよけスプレーを　ふりまいたとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　いっしょに ハードな　とっくんを　して [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　いっしょに エレベータに　のって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]に　つれられて せいめいはんだんし　に うんめいてきな　なまえを　つけてもらった　とき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　いっしょに ブティックにいき　しちゃくしたけど なにも　かわずに　でてきて [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　いっしょに すてきな　レストランに　いき おなか　いっぱい　たべて [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]に　つれられて すてきな　おねえさんに かわいがって　もらったとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　いっしょに [VAR GENLOC(0002)]に　あった ゴミばこを　あさって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[~ 98] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　いっしょに たかい　タワーの　おくじょうから したを　みおろして [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　いった かがみの　どうくつの　なかで かがみに　うつった　じぶんを　みて [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と もりの　なかを　たんさくしたとき まよいそうに　なって [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　こうじょうに　いき たくさんの　むずかしそうな　きかいを まのあたりにして [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]が ひみつきちを　つくったとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と コンテストに　さんかして たくさんの　ひとに　アピールしたとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と コンテストに　さんかして みごと　ゆうしょう　したとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]と　いっしょに おおぞらを　とんで いろんなばしょに　いったとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] +[VAR PKNICK(0000)]は [VAR TRNAME(0001)]に　たのまれて ふかいうみに　もぐって うみのそこを　たんさくしたとき [VAR REMFEEL(0003)]ことが [VAR REMQUAL(0004)] + +あたしねー　おもいでむすめ！ ポケモンの　おもいでが　わかるんだよ あなたと　いっしょに　いる ポケモンの　おもいで　しりたいー？ +いいよー！ どのコの　おもいでを　しりたいの？ +また　あそびに　きてねー！ +それとねー +ほかのコの　おもいでも　しりたいー？ diff --git a/Resources/text/todo/text_Memories_ko.txt b/Resources/text/todo/text_Memories_ko.txt new file mode 100644 index 000000000..72381836b --- /dev/null +++ b/Resources/text/todo/text_Memories_ko.txt @@ -0,0 +1,114 @@ + + +추억인 것 같아 +추억인 것 같아 +추억인 것 같아 +추억인 것 같아 +기억에 남는 추억인 것 같아 +마음에 깊이 남았던 추억이래 +최고의 추억이었대! + +고마웠던 +즐거웠던 +기뻤던 +히죽히죽 웃었던 +참을 수 없는 기분이 되었던 +말로는 표현할 수 없는 기분이 되었던 +좋은 기분이 되었던 +눈물이 글썽글썽했던 +마음이 들뜨고 말았던 +긴장했던 +기분이 좋았던 +꼼지락거렸던 +완전히 푹 빠졌던 +미안한 기분이 들었던 +슬픈 기분이 되었던 +그리운 기분이 되었던 +어려웠던 +힘들었던 +솔직할 수 없었던 +자랑스럽게 생각했던 +험악한 분위기가 되었던 +화를 내고 말았던 +질투했던 +졸렸던 + +어떤 도구 +어떤 기술 +누군가 +좋은 추억이 있는 것 같은데 기억이 잘 떠오르지 않는 것 같아... +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] [VAR GENLOC(0002)]에서 만나 몬스터볼에 들어가게 되고 함께 여행하게 되어 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR GENLOC(0002)]에서 알의 껍데기를 깨고 나왔을 때 처음 [VAR TRNAME(0001)][VAR 1900(0004)] 만나서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] [VAR GENLOC(0002)]에서 만나서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR GENLOC(0002)]에서 포켓몬 교환으로 [VAR TRNAME(0001)]의 동료가 되어 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 프렌들리숍에 [VAR ITEM2(0002)][VAR 1900(0002)] 사러가서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[~ 44] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 낚시로 [VAR PKNAME(0002)][VAR 1900(0002)] 낚아 올렸을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 낚시했을 때 [VAR TRNAME(0001)][VAR 1900(0003)] 모처럼 낚은 포켓몬을 놓쳐 버려 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[~ 47] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]에게 과자를 받고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 옷을 사러 가서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[~ 50] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0003)] [VAR PKNAME(0002)]의 알을 부화시키는 걸 돕고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0003)] [VAR PKNAME(0002)][VAR 1900(0002)] 잡았을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] 위기에 몰렸을 때 [VAR TRNAME(0001)][VAR 1900(0003)] [VAR ITEM2(0002)][VAR 1900(0002)] 써줘서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[~ 54] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 싸우고 [VAR PKNAME(0002)][VAR 1900(0002)] 쓰러뜨렸을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR PKNAME(0002)][VAR 1900(0004)]의 싸움에서 지고 [VAR TRNAME(0001)][VAR 1900(0004)] 함께 도망치고 돌아왔을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]에게 키워지고 [VAR GENLOC(0002)]에서 진화했을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] 파도타기로 [VAR TRNAME(0001)][VAR 1900(0002)] 자기 등에 태워서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[~ 59] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 싸워 체육관 관장을 이겼을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0003)] 배틀하우스에 도전했을 때 너무 긴장해서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] 공중날기로 [VAR TRNAME(0001)][VAR 1900(0002)] [VAR GENLOC(0002)][VAR 1900(0005)]로부터 옮겨서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[~ 63] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0003)] [VAR ITEM2(0002)][VAR 1900(0002)] 쓰는 걸 보고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 싸워 챔피언을 쓰러뜨리고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0003)] 포켓몬 도감을 완성했을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR PKNAME(0002)][VAR 1900(0004)] 조우해서 [VAR TRNAME(0001)][VAR 1900(0004)] 함께 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0003)] 배틀샤틀레느를 쓰러뜨렸을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[~ 69] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] [VAR GENLOC(0002)]에서 자전거를 타고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] [VAR GENLOC(0002)]에서 타운맵으로 목적지를 확인하고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] [VAR ITEM2(0002)][VAR 1900(0002)] 땅에 묻고 열매가 많이 열렸을 때를 상상하며 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]에게 부탁받아 [VAR GENLOC(0002)]에서 특기인 괴력을 쓰고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]에게 부탁받아 [VAR GENLOC(0002)]에서 풀베기를 해 보이고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]에게 부탁받아 [VAR GENLOC(0002)]에서 힘껏 바위를 깼을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR GENLOC(0002)]에서 [VAR TRNAME(0001)][VAR 1900(0002)] 태우고 폭포오르기를 썼을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR GENLOC(0002)]에서 [VAR TRNAME(0001)][VAR 1900(0003)] 뭔가를 슬쩍 줍는 걸 보고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]에게 [VAR ITEM2(0002)][VAR 1900(0002)] 갑자기 받고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 챔피언로드에 들어가서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[~ 80] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 탄 열차의 엄청나게 빠른 스피드에 감동해서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[~ 82] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR PKNAME(0002)][VAR 1900(0003)] 튀어나왔을 때 깜짝 놀라서 [VAR TRNAME(0001)][VAR 1900(0004)] 함께 도망치고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 도전한 트라이얼하우스에서 높은 점수를 얻고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]의 소개로 만난 심판이 너무 빤히 쳐다봐서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]의 소개로 만난 깜빡할아버지가 [VAR MOVE(0002)][VAR 1900(0002)] 잊어버리게 해서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]에게 부탁받아 [VAR MOVE(0002)][VAR 1900(0002)] 떠올릴 수 있게 되었을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0003)] 데리고 가 준 키우미집에 [VAR PKNAME(0002)][VAR 1900(0004)] 함께 맡겨져 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0003)] 추첨에 당첨되어 [VAR ITEM2(0002)][VAR 1900(0002)] 받은 게 부러워서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0003)] [VAR GENLOC(0002)]에서 벌레회피스프레이를 주변에 뿌렸을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 하드한 특훈을 해서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 엘리베이터를 타고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]에게 이끌려서 이름 감정사에게 운명적인 이름을 받았을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 부티크에 가서 착용해 보고도 아무것도 사지 않고 나와서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 멋진 레스토랑에서 잔뜩 먹고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]에게 이끌려 멋진 아가씨에게 귀여움을 받았을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 [VAR GENLOC(0002)]에 있었던 쓰레기통을 뒤지고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[~ 98] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 높은 타워의 옥상에서 세상을 내려다보고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 간 거울로 된 동굴 안에서 거울에 비친 자신을 보고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 숲 속을 탐색하러 갔을 때 길을 잃을 뻔해서 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 공장에 가서 수많은 어려워 보이는 기계를 눈앞에서 보고 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0003)] 비밀기지를 만들었을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 콘테스트에 참가해서 많은 사람들에게 어필했을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 콘테스트에 참가해서 멋지게 우승했을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)][VAR 1900(0004)] 함께 넓은 하늘을 날고 여러 장소에 갔을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] +[VAR PKNICK(0000)][VAR 1900(0001)] [VAR TRNAME(0001)]에게 부탁받아 깊은 바다에 잠수하여 해저 바닥을 탐사했을 때 [VAR REMFEEL(0003)] 게 [VAR REMQUAL(0004)] + +나는 있잖아 추억소녀야! 포켓몬의 추억을 알 수 있어 너랑 함께 있는 포켓몬의 추억을 알고 싶니? +좋아~! 누구의 추억을 알고 싶니? +또 놀러 와~! +그리고~ +다른 아이의 추억도 알고 싶니? diff --git a/SAV/SAV_Inventory.cs b/SAV/SAV_Inventory.cs index d4736a2d2..99b6c36be 100644 --- a/SAV/SAV_Inventory.cs +++ b/SAV/SAV_Inventory.cs @@ -19,6 +19,18 @@ public SAV_Inventory(Form1 frm1) savindex = m_parent.savindex; shiftval = savindex * 0x7F000; + if (m_parent.savegame_oras) + { + bagoffsets = new int[] + { + 0x05800, + 0x05E40, + 0x05FC0, + 0x06170, + 0x06270, + }; + } + getListItems(); getListKeyItems(); getListTMHM(); @@ -46,6 +58,14 @@ public SAV_Inventory(Form1 frm1) public string[] medicine_val; public string[] berries_val; + public int[] bagoffsets = new int[] { + 0x05800, + 0x05E40, + 0x05FC0, + 0x06168, + 0x06268, + }; + // Initialize String Tables private void getListItems() { @@ -67,6 +87,31 @@ private void getListItems() 667,668,669,670,671,672,673,674,675,676,677,678,679,680,681,682,683,684,685, 699,704,710,711,715, }; + if (m_parent.savegame_oras) + { + itemlist = new int[] { + 000,001,002,003,004,005,006,007,008,009,010,011,012,013,014,015,016,055,056, + 057,058,059,060,061,062,063,064, 068,069,070,071,072,073,074,075, + 076,077,078,079,080,081,082,083,084,085,086,087,088,089,090,091,092,093,094, + 099,100,101,102,103,104,105,106,107,108,109,110,112,116,117,118,119,135,136, + 213,214,215,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232, + 233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251, + 252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270, + 271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289, + 290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308, + 309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327, + 492,493,494,495,496,497,498,499,500,537,538,539,540,541,542,543,544,545,546, + 547,548,549,550,551,552,553,554,555,556,557,558,559,560,561,562,563,564,571, + 572,573,576,577,580,581,582,583,584,585,586,587,588,589,590,639,640,644,646, + 647,648,649,650,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666, + 667,668,669,670,671,672,673,674,675,676,677,678,679,680,681,682,683,684,685, + 699,704,710,711,715, + + // ORAS + 534,535, + 752,753,754,755,756,757,758,759,760,761,762,763,764,767,768,769,770, + }; + } item_val = new string[itemlist.Length]; for (int i = 0; i < itemlist.Length; i++) item_val[i] = Form1.itemlist[itemlist[i]]; @@ -78,8 +123,29 @@ private void getListKeyItems() 000,216,431,442,445,446,447,450,465,466,471,628, 629,631,632,638,641,642,643,689,695,696,697,698, 700,701,702,703,705,706,707,712,713,714, + + // Illegal 716,717, // For the cheaters who want useless items... }; + if (m_parent.savegame_oras) + { + itemlist = new int[] { + 000,216, 445,446,447, 465,466,471,628, + 629,631,632,638, + + // Illegal + 716,717,745,746,747,748,749,750, // For the cheaters who want useless items... + + // ORAS + 457,474,503, + + 718,719, + 720,721,722,723,724,725,726,727,728,729, + 730,731,732,733,734,735,736, 738,739, + 740,741,742,743,744, + 751,765,766,771,772,774,775, + }; + } keyitem_val = new string[itemlist.Length]; for (int i = 0; i < itemlist.Length; i++) keyitem_val[i] = Form1.itemlist[itemlist[i]]; @@ -98,6 +164,23 @@ private void getListTMHM() 420,421,422,423,424, }; + if (m_parent.savegame_oras) + { + itemlist = new int[] { + 0, + 328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345, + 346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363, + 364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381, + 382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399, + 400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417, + 418,419,618,619,620,690,691,692,693,694, + + 420,421,422,423,424, + + // ORAS + 425,737, + }; + } tmhm_val = new string[itemlist.Length]; for (int i = 0; i < itemlist.Length; i++) tmhm_val[i] = Form1.itemlist[itemlist[i]]; @@ -130,31 +213,30 @@ private void getListBerries() Array.Sort(berries_val); } - // Populate DataGrid private void popItems() { - int offset = 0x05800 + shiftval; + int offset = bagoffsets[0] + shiftval; populateList(item_val, offset, 200); // max 400 } private void popKeyItems() { - int offset = 0x05E40 + shiftval; + int offset = bagoffsets[1] + shiftval; populateList(keyitem_val, offset, 50); // max 96 } private void popTMHM() { - int offset = 0x05FC0 + shiftval; + int offset = bagoffsets[2] + shiftval; populateList(tmhm_val, offset, 105); // 106 total tho } private void popMedicine() { - int offset = 0x06168 + shiftval; + int offset = bagoffsets[3] + shiftval; populateList(medicine_val, offset, 60); // 64 total slots } private void popBerries() { - int offset = 0x06268 + shiftval; + int offset = bagoffsets[4] + shiftval; populateList(berries_val, offset, 70); // 102 slots } @@ -174,9 +256,8 @@ private void populateList(string[] itemarr, int offset, int itemcount) dgvItemVal.DisplayStyle = DataGridViewComboBoxDisplayStyle.Nothing; { for (int i = 0; i < itemarr.Length; i++) - { dgvItemVal.Items.Add(itemarr[i]); // add only the Item Names - } + dgvItemVal.DisplayIndex = 0; dgvItemVal.Width = 135; dgvItemVal.FlatStyle = FlatStyle.Flat; @@ -228,27 +309,27 @@ private void saveBag(object sender) if (B_DisplayItems.ForeColor == Color.Red) { itemstrarr = item_val; - offset = 0x05800 + shiftval; + offset = bagoffsets[0] + shiftval; } else if (B_DisplayKeyItems.ForeColor == Color.Red) { itemstrarr = keyitem_val; - offset = 0x05E40 + shiftval; + offset = bagoffsets[1] + shiftval; } else if (B_DisplayTMHM.ForeColor == Color.Red) { itemstrarr = tmhm_val; - offset = 0x05FC0 + shiftval; + offset = bagoffsets[2] + shiftval; } else if (B_DisplayMedicine.ForeColor == Color.Red) { itemstrarr = medicine_val; - offset = 0x06168 + shiftval; + offset = bagoffsets[3] + shiftval; } else if (B_DisplayBerries.ForeColor == Color.Red) { itemstrarr = berries_val; - offset = 0x06268 + shiftval; + offset = bagoffsets[4] + shiftval; } // Fetch Data @@ -259,12 +340,11 @@ private void saveBag(object sender) string item = dataGridView1.Rows[i].Cells[0].Value.ToString(); int itemindex = Array.IndexOf(Form1.itemlist, item); int itemcnt = 0; - try { + try + { itemcnt = Convert.ToUInt16(dataGridView1.Rows[i].Cells[1].Value.ToString()); } - catch { - itemcnt = 0; - } + catch { itemcnt = 0; } if (itemindex == 0) // Compression of Empty Slots { @@ -284,7 +364,7 @@ private void saveBag(object sender) // Delete Empty Trash for (int i = itemcount - emptyslots; i < itemcount; i++) { - Array.Copy(BitConverter.GetBytes(0), 0, sav, offset + 4 * (i), 2); + Array.Copy(BitConverter.GetBytes(0), 0, sav, offset + 4 * (i) + 0, 2); Array.Copy(BitConverter.GetBytes(0), 0, sav, offset + 4 * (i) + 2, 2); } @@ -343,10 +423,9 @@ private void B_DisplayItems_Click(object sender, EventArgs e) { // Store Current Items back to the save file saveBag(sender); - if (ModifierKeys == Keys.Alt) - { + if (ModifierKeys == Keys.Alt && !m_parent.savegame_oras) giveAllItems(); - } + popItems(); } private void B_DisplayKeyItems_Click(object sender, EventArgs e) diff --git a/SAV/SAV_Wondercard.cs b/SAV/SAV_Wondercard.cs index 7aaabc846..67aa78a22 100644 --- a/SAV/SAV_Wondercard.cs +++ b/SAV/SAV_Wondercard.cs @@ -18,16 +18,14 @@ public SAV_Wondercard(Form1 frm1) m_parent = frm1; Array.Copy(m_parent.savefile, sav, 0x100000); savindex = m_parent.savindex; + if (m_parent.savegame_oras) wcoffset = 0x22100; populateWClist(); populateReceived(); LB_WCs.SelectedIndex = 0; if (LB_Received.Items.Count > 0) - { - LB_Received.SelectedIndex = 0; - } - + LB_Received.SelectedIndex = 0; } Form1 m_parent; public byte[] sav = new Byte[0x100000]; @@ -40,6 +38,7 @@ private static uint ToUInt32(String value) return 0; return UInt32.Parse(value); } + private int wcoffset = 0x21100; // Repopulation Functions private void populateWClist() @@ -47,16 +46,12 @@ private void populateWClist() LB_WCs.Items.Clear(); for (int i = 0; i < 24; i++) { - int offset = 0x21100 + savindex * 0x7F000 + i * 0x108; + int offset = wcoffset + savindex * 0x7F000 + i * 0x108; int cardID = BitConverter.ToUInt16(sav, offset); if (cardID == 0) - { LB_WCs.Items.Add((i + 1).ToString("00") + " - Empty"); - } else - { LB_WCs.Items.Add((i + 1).ToString("00") + " - " + cardID.ToString("0000")); - } } } private void loadwcdata() @@ -107,21 +102,15 @@ private void loadwcdata() + "ID: " + TID.ToString() + "/" + SID.ToString(); } else - { RTB.Text = "Unsupported Wondercard Type!"; - } } private void populateReceived() { - int offset = 0x21000 + savindex * 0x7F000; + int offset = wcoffset - 0x100 + savindex * 0x7F000; LB_Received.Items.Clear(); for (int i = 1; i < 2048; i++) - { if ((((sav[offset + i / 8]) >> (i % 8)) & 0x1) == 1) - { LB_Received.Items.Add(i.ToString("0000")); - } - } } // Wondercard IO (.wc6<->window) @@ -170,7 +159,7 @@ private void B_SAV2WC(object sender, EventArgs e) { // Load Wondercard from Save File int index = LB_WCs.SelectedIndex; - int offset = 0x21100 + savindex * 0x7F000 + index * 0x108; + int offset = wcoffset + savindex * 0x7F000 + index * 0x108; Array.Copy(sav, offset, wondercard_data, 0, 0x108); loadwcdata(); } @@ -178,22 +167,19 @@ private void B_WC2SAV(object sender, EventArgs e) { // Write Wondercard to Save File int index = LB_WCs.SelectedIndex; - int offset = 0x21100 + savindex * 0x7F000 + index * 0x108; + int offset = wcoffset + savindex * 0x7F000 + index * 0x108; Array.Copy(wondercard_data, 0, sav, offset, 0x108); populateWClist(); int cardID = BitConverter.ToUInt16(wondercard_data, 0); + if (cardID > 0) - { if (!LB_Received.Items.Contains(cardID.ToString("0000"))) - { LB_Received.Items.Add(cardID.ToString("0000")); - } - } } private void B_DeleteWC_Click(object sender, EventArgs e) { int index = LB_WCs.SelectedIndex; - int offset = 0x21100 + savindex * 0x7F000 + index * 0x108; + int offset = wcoffset + savindex * 0x7F000 + index * 0x108; byte[] zeros = new Byte[0x108]; Array.Copy(zeros, 0, sav, offset, 0x108); populateWClist(); @@ -209,7 +195,7 @@ private void B_Save_Click(object sender, EventArgs e) // Make sure all of the Received Flags are flipped! for (int i = 0; i < LB_Received.Items.Count; i++) { - int offset = 0x21000 + savindex * 0x7F000; + int offset = wcoffset - 0x100 + savindex * 0x7F000; string cardID = LB_Received.Items[i].ToString(); uint cardnum = ToUInt32(cardID); @@ -218,18 +204,11 @@ private void B_Save_Click(object sender, EventArgs e) // Make sure there's no space between wondercards { - int offset = 0x21100 + savindex * 0x7F000; + int offset = wcoffset + savindex * 0x7F000; for (int i = 0; i < 24; i++) - { if (BitConverter.ToUInt16(sav, offset+i*0x108) == 0) - { - // Shift everything down - for (int j = (i+1); j < 24 - i; j++) - { + for (int j = (i + 1); j < 24 - i; j++) // Shift everything down Array.Copy(sav, offset + (j) * 0x108, sav, offset + (j-1) * 0x108, 0x108); - } - } - } } Array.Copy(sav, m_parent.savefile, 0x100000); @@ -241,10 +220,9 @@ private void B_Save_Click(object sender, EventArgs e) private void B_DeleteReceived_Click(object sender, EventArgs e) { + if (LB_Received.SelectedIndex > -1) if (LB_Received.Items.Count > 0) - { LB_Received.Items.Remove(LB_Received.Items[LB_Received.SelectedIndex]); - } } } }