From 9f1a8d1da1d8a98bd9c87f253e11ee33ff1f138f Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 23 Aug 2021 23:06:51 -0700 Subject: [PATCH] Split memory text string resources Much easier to maintain and reference now --- PKHeX.Core/Game/GameStrings/GameStrings.cs | 5 ++- PKHeX.Core/Game/GameStrings/MemoryStrings.cs | 7 ++-- .../text/memories/text_Feeling_de.txt | 25 ++++++++++++ .../text/memories/text_Feeling_en.txt | 25 ++++++++++++ .../text/memories/text_Feeling_es.txt | 25 ++++++++++++ .../text/memories/text_Feeling_fr.txt | 25 ++++++++++++ .../text/memories/text_Feeling_it.txt | 25 ++++++++++++ .../text/memories/text_Feeling_ja.txt | 25 ++++++++++++ .../text/memories/text_Feeling_ko.txt | 25 ++++++++++++ .../text/memories/text_Feeling_zh.txt | 25 ++++++++++++ .../{other/de => memories}/text_GenLoc_de.txt | 0 .../{other/en => memories}/text_GenLoc_en.txt | 0 .../{other/es => memories}/text_GenLoc_es.txt | 0 .../{other/fr => memories}/text_GenLoc_fr.txt | 0 .../{other/it => memories}/text_GenLoc_it.txt | 0 .../{other/ja => memories}/text_GenLoc_ja.txt | 0 .../{other/ko => memories}/text_GenLoc_ko.txt | 0 .../{other/zh => memories}/text_GenLoc_zh.txt | 0 .../text/memories/text_Intensity_de.txt | 8 ++++ .../text/memories/text_Intensity_en.txt | 8 ++++ .../text/memories/text_Intensity_es.txt | 8 ++++ .../text/memories/text_Intensity_fr.txt | 8 ++++ .../text/memories/text_Intensity_it.txt | 8 ++++ .../text/memories/text_Intensity_ja.txt | 8 ++++ .../text/memories/text_Intensity_ko.txt | 8 ++++ .../text/memories/text_Intensity_zh.txt | 8 ++++ .../de => memories}/text_Memories_de.txt | 40 +------------------ .../en => memories}/text_Memories_en.txt | 40 +------------------ .../es => memories}/text_Memories_es.txt | 40 +------------------ .../fr => memories}/text_Memories_fr.txt | 40 +------------------ .../it => memories}/text_Memories_it.txt | 40 +------------------ .../ja => memories}/text_Memories_ja.txt | 40 +------------------ .../ko => memories}/text_Memories_ko.txt | 40 +------------------ .../zh => memories}/text_Memories_zh.txt | 40 +------------------ .../Subforms/PKM Editors/MemoryAmie.cs | 11 +++-- 35 files changed, 284 insertions(+), 323 deletions(-) create mode 100644 PKHeX.Core/Resources/text/memories/text_Feeling_de.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Feeling_en.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Feeling_es.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Feeling_fr.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Feeling_it.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Feeling_ja.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Feeling_ko.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Feeling_zh.txt rename PKHeX.Core/Resources/text/{other/de => memories}/text_GenLoc_de.txt (100%) rename PKHeX.Core/Resources/text/{other/en => memories}/text_GenLoc_en.txt (100%) rename PKHeX.Core/Resources/text/{other/es => memories}/text_GenLoc_es.txt (100%) rename PKHeX.Core/Resources/text/{other/fr => memories}/text_GenLoc_fr.txt (100%) rename PKHeX.Core/Resources/text/{other/it => memories}/text_GenLoc_it.txt (100%) rename PKHeX.Core/Resources/text/{other/ja => memories}/text_GenLoc_ja.txt (100%) rename PKHeX.Core/Resources/text/{other/ko => memories}/text_GenLoc_ko.txt (100%) rename PKHeX.Core/Resources/text/{other/zh => memories}/text_GenLoc_zh.txt (100%) create mode 100644 PKHeX.Core/Resources/text/memories/text_Intensity_de.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Intensity_en.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Intensity_es.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Intensity_fr.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Intensity_it.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Intensity_ja.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Intensity_ko.txt create mode 100644 PKHeX.Core/Resources/text/memories/text_Intensity_zh.txt rename PKHeX.Core/Resources/text/{other/de => memories}/text_Memories_de.txt (87%) rename PKHeX.Core/Resources/text/{other/en => memories}/text_Memories_en.txt (88%) rename PKHeX.Core/Resources/text/{other/es => memories}/text_Memories_es.txt (87%) rename PKHeX.Core/Resources/text/{other/fr => memories}/text_Memories_fr.txt (87%) rename PKHeX.Core/Resources/text/{other/it => memories}/text_Memories_it.txt (88%) rename PKHeX.Core/Resources/text/{other/ja => memories}/text_Memories_ja.txt (89%) rename PKHeX.Core/Resources/text/{other/ko => memories}/text_Memories_ko.txt (87%) rename PKHeX.Core/Resources/text/{other/zh => memories}/text_Memories_zh.txt (89%) diff --git a/PKHeX.Core/Game/GameStrings/GameStrings.cs b/PKHeX.Core/Game/GameStrings/GameStrings.cs index 28d3e431e..2d3610ffa 100644 --- a/PKHeX.Core/Game/GameStrings/GameStrings.cs +++ b/PKHeX.Core/Game/GameStrings/GameStrings.cs @@ -10,7 +10,8 @@ public sealed class GameStrings : IBasicStrings { // PKM Info public readonly string[] specieslist, movelist, itemlist, abilitylist, types, natures, forms, - memories, genloc, trainingbags, trainingstage, characteristics, + memories, genloc, feeling, intensity, + trainingbags, trainingstage, characteristics, groundtiletypes, balllist, gamelist, pokeblocks, ribbons; private readonly string[] g4items, g3coloitems, g3xditems, g3items, g2items, g1items; @@ -94,6 +95,8 @@ public GameStrings(string l) pokeblocks = Get("pokeblock"); forms = Get("forms"); memories = Get("memories"); + feeling = Get("feeling"); + intensity = Get("intensity"); genloc = Get("genloc"); trainingbags = Get("trainingbag"); trainingstage = Get("supertraining"); diff --git a/PKHeX.Core/Game/GameStrings/MemoryStrings.cs b/PKHeX.Core/Game/GameStrings/MemoryStrings.cs index 5287f58e8..7f6c9b7b3 100644 --- a/PKHeX.Core/Game/GameStrings/MemoryStrings.cs +++ b/PKHeX.Core/Game/GameStrings/MemoryStrings.cs @@ -46,15 +46,14 @@ private List GetItems(int format) private List GetMemories() { - const int offset = 38; - var mems = s.memories.AsSpan(offset); + var mems = s.memories.AsSpan(0); var list = new List {new(mems[0], 0)}; // none at top Util.AddCBWithOffset(list, mems[1..], 1); // sorted the rest return list; } - public ReadOnlySpan GetMemoryQualities() => s.memories.AsSpan(2, 7); - public ReadOnlySpan GetMemoryFeelings(int format) => format >= 8 ? s.memories.AsSpan(9, 25) : s.memories.AsSpan(10, 24); // empty line for 0 in gen8+ + public ReadOnlySpan GetMemoryQualities() => s.intensity; + public ReadOnlySpan GetMemoryFeelings(int memoryGen) => memoryGen >= 8 ? s.feeling.AsSpan(0, 25) : s.feeling.AsSpan(1, 24); // empty line for 0 in gen8+ public List GetArgumentStrings(MemoryArgType type) => type switch { diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_de.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_de.txt new file mode 100644 index 000000000..fc79d622c --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_de.txt @@ -0,0 +1,25 @@ + +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 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_en.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_en.txt new file mode 100644 index 000000000..f094eec07 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_en.txt @@ -0,0 +1,25 @@ + +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 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_es.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_es.txt new file mode 100644 index 000000000..b4481d1c4 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_es.txt @@ -0,0 +1,25 @@ + +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ó \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_fr.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_fr.txt new file mode 100644 index 000000000..3fbf4b6ce --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_fr.txt @@ -0,0 +1,25 @@ + +ç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 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_it.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_it.txt new file mode 100644 index 000000000..195fbcbac --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_it.txt @@ -0,0 +1,25 @@ + +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 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_ja.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_ja.txt new file mode 100644 index 000000000..3fc91e755 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_ja.txt @@ -0,0 +1,25 @@ + +うれしかった +たのしかった +よろこんだ +ニヤニヤした +たまらない　きもちになった +なんともいえない　きもちだった +いい　きぶんになった +うるうるした +うかれてしまった +きんちょうした +きもちよかった +もぞもぞした +クセになりそうに　なった +もうしわけない　きぶんになった +せつない　きもちになった +なつかしい　きもちになった +てこずった +きつかった +すなおに　なれなかった +ほこらしく　おもった +けんあくな　ムードになった +おこってしまった +しっとした +ねむくなった \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_ko.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_ko.txt new file mode 100644 index 000000000..12afebda4 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_ko.txt @@ -0,0 +1,25 @@ + +고마웠던 +즐거웠던 +기뻤던 +히죽히죽 웃었던 +참을 수 없는 기분이 되었던 +말로는 표현할 수 없는 기분이 되었던 +좋은 기분이 되었던 +눈물이 글썽글썽했던 +마음이 들뜨고 말았던 +긴장했던 +기분이 좋았던 +꼼지락거렸던 +완전히 푹 빠졌던 +미안한 기분이 들었던 +슬픈 기분이 되었던 +그리운 기분이 되었던 +어려웠던 +힘들었던 +솔직할 수 없었던 +자랑스럽게 생각했던 +험악한 분위기가 되었던 +화를 내고 말았던 +질투했던 +졸렸던 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Feeling_zh.txt b/PKHeX.Core/Resources/text/memories/text_Feeling_zh.txt new file mode 100644 index 000000000..1d17df522 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Feeling_zh.txt @@ -0,0 +1,25 @@ + +它很高兴 +它玩的开心 +它很开心 +它咧嘴笑 +它变得不知所措 +它的感觉难以形容 +它感觉很好 +它变得饱含泪水 +它感到轻松 +它感到紧张了 +它感觉很舒服 +它感到焦躁不安 +它变得有点得意忘形 +它感到惋惜 +它变得很敏感 +它变得很怀旧 +它遇到了一些困难 +它感到精疲力尽 +它感觉不像是真的 +它感到骄傲 +他们以坏心情收场 +它变得愤怒 +它感到嫉妒 +它想睡觉 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/de/text_GenLoc_de.txt b/PKHeX.Core/Resources/text/memories/text_GenLoc_de.txt similarity index 100% rename from PKHeX.Core/Resources/text/other/de/text_GenLoc_de.txt rename to PKHeX.Core/Resources/text/memories/text_GenLoc_de.txt diff --git a/PKHeX.Core/Resources/text/other/en/text_GenLoc_en.txt b/PKHeX.Core/Resources/text/memories/text_GenLoc_en.txt similarity index 100% rename from PKHeX.Core/Resources/text/other/en/text_GenLoc_en.txt rename to PKHeX.Core/Resources/text/memories/text_GenLoc_en.txt diff --git a/PKHeX.Core/Resources/text/other/es/text_GenLoc_es.txt b/PKHeX.Core/Resources/text/memories/text_GenLoc_es.txt similarity index 100% rename from PKHeX.Core/Resources/text/other/es/text_GenLoc_es.txt rename to PKHeX.Core/Resources/text/memories/text_GenLoc_es.txt diff --git a/PKHeX.Core/Resources/text/other/fr/text_GenLoc_fr.txt b/PKHeX.Core/Resources/text/memories/text_GenLoc_fr.txt similarity index 100% rename from PKHeX.Core/Resources/text/other/fr/text_GenLoc_fr.txt rename to PKHeX.Core/Resources/text/memories/text_GenLoc_fr.txt diff --git a/PKHeX.Core/Resources/text/other/it/text_GenLoc_it.txt b/PKHeX.Core/Resources/text/memories/text_GenLoc_it.txt similarity index 100% rename from PKHeX.Core/Resources/text/other/it/text_GenLoc_it.txt rename to PKHeX.Core/Resources/text/memories/text_GenLoc_it.txt diff --git a/PKHeX.Core/Resources/text/other/ja/text_GenLoc_ja.txt b/PKHeX.Core/Resources/text/memories/text_GenLoc_ja.txt similarity index 100% rename from PKHeX.Core/Resources/text/other/ja/text_GenLoc_ja.txt rename to PKHeX.Core/Resources/text/memories/text_GenLoc_ja.txt diff --git a/PKHeX.Core/Resources/text/other/ko/text_GenLoc_ko.txt b/PKHeX.Core/Resources/text/memories/text_GenLoc_ko.txt similarity index 100% rename from PKHeX.Core/Resources/text/other/ko/text_GenLoc_ko.txt rename to PKHeX.Core/Resources/text/memories/text_GenLoc_ko.txt diff --git a/PKHeX.Core/Resources/text/other/zh/text_GenLoc_zh.txt b/PKHeX.Core/Resources/text/memories/text_GenLoc_zh.txt similarity index 100% rename from PKHeX.Core/Resources/text/other/zh/text_GenLoc_zh.txt rename to PKHeX.Core/Resources/text/memories/text_GenLoc_zh.txt diff --git a/PKHeX.Core/Resources/text/memories/text_Intensity_de.txt b/PKHeX.Core/Resources/text/memories/text_Intensity_de.txt new file mode 100644 index 000000000..3acad95a6 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Intensity_de.txt @@ -0,0 +1,8 @@ + +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, \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Intensity_en.txt b/PKHeX.Core/Resources/text/memories/text_Intensity_en.txt new file mode 100644 index 000000000..2bdb77fd2 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Intensity_en.txt @@ -0,0 +1,8 @@ + +The Pokémon remembers +The Pokémon remembers +The Pokémon remembers +The Pokémon remembers +The Pokémon clearly remembers +The Pokémon definitely remembers +The Pokémon fondly remembers \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Intensity_es.txt b/PKHeX.Core/Resources/text/memories/text_Intensity_es.txt new file mode 100644 index 000000000..075d34332 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Intensity_es.txt @@ -0,0 +1,8 @@ + +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 recuerda intensamente +El Pokémon recuerda a la perfección \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Intensity_fr.txt b/PKHeX.Core/Resources/text/memories/text_Intensity_fr.txt new file mode 100644 index 000000000..877f1e0df --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Intensity_fr.txt @@ -0,0 +1,8 @@ + +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 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Intensity_it.txt b/PKHeX.Core/Resources/text/memories/text_Intensity_it.txt new file mode 100644 index 000000000..48af2b11b --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Intensity_it.txt @@ -0,0 +1,8 @@ + +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 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Intensity_ja.txt b/PKHeX.Core/Resources/text/memories/text_Intensity_ja.txt new file mode 100644 index 000000000..60f71a97f --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Intensity_ja.txt @@ -0,0 +1,8 @@ + +おもいで　らしいわ +おもいで　らしいわ +おもいで　らしいわ +おもいで　らしいわ +きおくにのこる　おもいで　らしいわ +かんがいぶかい　おもいで　だって +さいこうの　おもいで　だって！ \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Intensity_ko.txt b/PKHeX.Core/Resources/text/memories/text_Intensity_ko.txt new file mode 100644 index 000000000..bca45054d --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Intensity_ko.txt @@ -0,0 +1,8 @@ + +추억인 것 같아 +추억인 것 같아 +추억인 것 같아 +추억인 것 같아 +기억에 남는 추억인 것 같아 +마음에 깊이 남았던 추억이래 +최고의 추억이었대! \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/memories/text_Intensity_zh.txt b/PKHeX.Core/Resources/text/memories/text_Intensity_zh.txt new file mode 100644 index 000000000..ff01978c1 --- /dev/null +++ b/PKHeX.Core/Resources/text/memories/text_Intensity_zh.txt @@ -0,0 +1,8 @@ + +宝可梦记得 +宝可梦记得 +宝可梦记得 +宝可梦记得 +宝可梦清晰得记得 +宝可梦肯定得记得 +宝可梦美美得记得 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/other/de/text_Memories_de.txt b/PKHeX.Core/Resources/text/memories/text_Memories_de.txt similarity index 87% rename from PKHeX.Core/Resources/text/other/de/text_Memories_de.txt rename to PKHeX.Core/Resources/text/memories/text_Memories_de.txt index 6a8489940..32f607647 100644 --- a/PKHeX.Core/Resources/text/other/de/text_Memories_de.txt +++ b/PKHeX.Core/Resources/text/memories/text_Memories_de.txt @@ -1,42 +1,4 @@ - - -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 -{0} scheint schöne Erinnerungen zu haben, kann sich aber gerade nicht entsinnen. +{0} scheint schöne Erinnerungen zu haben, kann sich aber gerade nicht entsinnen. {0} ist {1} {2} begegnet. Die gemeinsame Reise begann mit einem gezielten Pokéball-Wurf. {4} {3}. {0} hat {1} zum ersten Mal gesehen, als es {2} aus seinem Ei geschlüpft ist. {4} {3}. {0} ist {1} {2} begegnet. {4} {3}. diff --git a/PKHeX.Core/Resources/text/other/en/text_Memories_en.txt b/PKHeX.Core/Resources/text/memories/text_Memories_en.txt similarity index 88% rename from PKHeX.Core/Resources/text/other/en/text_Memories_en.txt rename to PKHeX.Core/Resources/text/memories/text_Memories_en.txt index 1cc78e138..64fcc91cd 100644 --- a/PKHeX.Core/Resources/text/other/en/text_Memories_en.txt +++ b/PKHeX.Core/Resources/text/memories/text_Memories_en.txt @@ -1,42 +1,4 @@ - - -The Pokémon remembers -The Pokémon remembers -The Pokémon remembers -The Pokémon remembers -The Pokémon clearly remembers -The Pokémon definitely 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 -{0} seems to have a fond memory, but it doesn’t seem to be able to remember the details... +{0} seems to have a fond memory, but it doesn’t seem to be able to remember the details... {0} met {1} {2}. {1} threw a Poké Ball at it, and they started to travel together. {4} that {3}. {0} hatched from an Egg and saw {1} for the first time {2}. {4} that {3}. {0} met {1} {2}. {4} that {3}. diff --git a/PKHeX.Core/Resources/text/other/es/text_Memories_es.txt b/PKHeX.Core/Resources/text/memories/text_Memories_es.txt similarity index 87% rename from PKHeX.Core/Resources/text/other/es/text_Memories_es.txt rename to PKHeX.Core/Resources/text/memories/text_Memories_es.txt index 5f73b5606..5d6b584ac 100644 --- a/PKHeX.Core/Resources/text/other/es/text_Memories_es.txt +++ b/PKHeX.Core/Resources/text/memories/text_Memories_es.txt @@ -1,42 +1,4 @@ - - -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 recuerda intensamente -El Pokémon recuerda a la perfecció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 su memoria. +Aunque parece guardar un grato recuerdo, no es capaz de rescatarlo de su memoria. {0} {4} {3} cuando {1} le lanzó una Poké Ball en {2}, marcando el punto de partida de su viaje conjunto. {0} {4} {3} cuando salió del cascarón y vio por primera vez la cara de {1}. {0} {4} {3} cuando conoció a {1} en {2}. diff --git a/PKHeX.Core/Resources/text/other/fr/text_Memories_fr.txt b/PKHeX.Core/Resources/text/memories/text_Memories_fr.txt similarity index 87% rename from PKHeX.Core/Resources/text/other/fr/text_Memories_fr.txt rename to PKHeX.Core/Resources/text/memories/text_Memories_fr.txt index d88a2be6e..5bf8dd45d 100644 --- a/PKHeX.Core/Resources/text/other/fr/text_Memories_fr.txt +++ b/PKHeX.Core/Resources/text/memories/text_Memories_fr.txt @@ -1,42 +1,4 @@ - - -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 -{0} se rappelle un bon souvenir, mais les détails lui semblent flous... +{0} se rappelle un bon souvenir, mais les détails lui semblent flous... {0} a rencontré {1} {2}. Il a accepté d’entrer dans sa Poké Ball, et c’est ainsi que leur amitié a commencé. {4} {3}. {0} a brisé la coquille de son Œuf {2} et a fait la rencontre {1}. {4} {3}. {0} a rencontré {1} {2}. {4} {3}. diff --git a/PKHeX.Core/Resources/text/other/it/text_Memories_it.txt b/PKHeX.Core/Resources/text/memories/text_Memories_it.txt similarity index 88% rename from PKHeX.Core/Resources/text/other/it/text_Memories_it.txt rename to PKHeX.Core/Resources/text/memories/text_Memories_it.txt index e89c4987e..8109bc7f6 100644 --- a/PKHeX.Core/Resources/text/other/it/text_Memories_it.txt +++ b/PKHeX.Core/Resources/text/memories/text_Memories_it.txt @@ -1,42 +1,4 @@ - - -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 -{0} ha dei bei ricordi, ma adesso non è possibile richiamarli... +{0} ha dei bei ricordi, ma adesso non è possibile richiamarli... {0} ha incontrato {1} {2}. Ha lanciato una Poké Ball per catturarlo e da quel momento hanno iniziato a viaggiare insieme. {4} {3} {0} ha incontrato {1} per la prima volta quando il Pokémon è nato da un Uovo {2}. {4} {3} {0} ha incontrato {1} {2}. {4} {3} diff --git a/PKHeX.Core/Resources/text/other/ja/text_Memories_ja.txt b/PKHeX.Core/Resources/text/memories/text_Memories_ja.txt similarity index 89% rename from PKHeX.Core/Resources/text/other/ja/text_Memories_ja.txt rename to PKHeX.Core/Resources/text/memories/text_Memories_ja.txt index 2edb1f7f1..988500bb2 100644 --- a/PKHeX.Core/Resources/text/other/ja/text_Memories_ja.txt +++ b/PKHeX.Core/Resources/text/memories/text_Memories_ja.txt @@ -1,42 +1,4 @@ - - -おもいで　らしいわ -おもいで　らしいわ -おもいで　らしいわ -おもいで　らしいわ -きおくにのこる　おもいで　らしいわ -かんがいぶかい　おもいで　だって -さいこうの　おもいで　だって！ - -うれしかった -たのしかった -よろこんだ -ニヤニヤした -たまらない　きもちになった -なんともいえない　きもちだった -いい　きぶんになった -うるうるした -うかれてしまった -きんちょうした -きもちよかった -もぞもぞした -クセになりそうに　なった -もうしわけない　きぶんになった -せつない　きもちになった -なつかしい　きもちになった -てこずった -きつかった -すなおに　なれなかった -ほこらしく　おもった -けんあくな　ムードになった -おこってしまった -しっとした -ねむくなった - -なにかのどうぐ -なにかのわざ -だれか -{0}には いい　おもいでが　あるようだけど ちょっと　おもいおこせないみたい…… +{0}には いい　おもいでが　あるようだけど ちょっと　おもいおこせないみたい…… {0}は {1}に {2}で　であい モンスターボールを　なげられ いっしょに　たびすることに　なり {3}ことが {4} {0}は {2}で タマゴの　カラを　やぶって　でてきたとき はじめて　{1}と　であい {3}ことが {4} {0}は {1}と {2}で　であえて {3}ことが {4} diff --git a/PKHeX.Core/Resources/text/other/ko/text_Memories_ko.txt b/PKHeX.Core/Resources/text/memories/text_Memories_ko.txt similarity index 87% rename from PKHeX.Core/Resources/text/other/ko/text_Memories_ko.txt rename to PKHeX.Core/Resources/text/memories/text_Memories_ko.txt index dfcc0add7..ec540653c 100644 --- a/PKHeX.Core/Resources/text/other/ko/text_Memories_ko.txt +++ b/PKHeX.Core/Resources/text/memories/text_Memories_ko.txt @@ -1,42 +1,4 @@ - - -추억인 것 같아 -추억인 것 같아 -추억인 것 같아 -추억인 것 같아 -기억에 남는 추억인 것 같아 -마음에 깊이 남았던 추억이래 -최고의 추억이었대! - -고마웠던 -즐거웠던 -기뻤던 -히죽히죽 웃었던 -참을 수 없는 기분이 되었던 -말로는 표현할 수 없는 기분이 되었던 -좋은 기분이 되었던 -눈물이 글썽글썽했던 -마음이 들뜨고 말았던 -긴장했던 -기분이 좋았던 -꼼지락거렸던 -완전히 푹 빠졌던 -미안한 기분이 들었던 -슬픈 기분이 되었던 -그리운 기분이 되었던 -어려웠던 -힘들었던 -솔직할 수 없었던 -자랑스럽게 생각했던 -험악한 분위기가 되었던 -화를 내고 말았던 -질투했던 -졸렸던 - -어떤 도구 -어떤 기술 -누군가 -{0}에게는 좋은 추억이 있는 것 같지만 기억이 잘 떠오르지는 않는 모양이군... +{0}에게는 좋은 추억이 있는 것 같지만 기억이 잘 떠오르지는 않는 모양이군... {0} {1} {2}에서 만나 몬스터볼에 들어가게 되고 함께 여행하게 되어 {3} 게 {4} {0} {2}에서 알의 껍데기를 깨고 나왔을 때 처음 {1} 만나서 {3} 게 {4} {0} {1} {2}에서 만나 {3} 게 {4} diff --git a/PKHeX.Core/Resources/text/other/zh/text_Memories_zh.txt b/PKHeX.Core/Resources/text/memories/text_Memories_zh.txt similarity index 89% rename from PKHeX.Core/Resources/text/other/zh/text_Memories_zh.txt rename to PKHeX.Core/Resources/text/memories/text_Memories_zh.txt index a2493b8ac..ebcb6badc 100644 --- a/PKHeX.Core/Resources/text/other/zh/text_Memories_zh.txt +++ b/PKHeX.Core/Resources/text/memories/text_Memories_zh.txt @@ -1,42 +1,4 @@ - - -宝可梦记得 -宝可梦记得 -宝可梦记得 -宝可梦记得 -宝可梦清晰得记得 -宝可梦肯定得记得 -宝可梦美美得记得 - -它很高兴 -它玩的开心 -它很开心 -它咧嘴笑 -它变得不知所措 -它的感觉难以形容 -它感觉很好 -它变得饱含泪水 -它感到轻松 -它感到紧张了 -它感觉很舒服 -它感到焦躁不安 -它变得有点得意忘形 -它感到惋惜 -它变得很敏感 -它变得很怀旧 -它遇到了一些困难 -它感到精疲力尽 -它感觉不像是真的 -它感到骄傲 -他们以坏心情收场 -它变得愤怒 -它感到嫉妒 -它想睡觉 - -某一道具 -某一技能 -宝可梦 -{0}好像拥有美好的回忆， 但它似乎有点想不起来了…… +{0}好像拥有美好的回忆， 但它似乎有点想不起来了…… {0}在 {2} 与{1}相遇。 在进入了精灵球之后， 和{1}一起踏上旅途。 {3} {4}。 {0}在 {2} 从蛋里破壳而出时第一次与 {1}相遇。 {3} {4}。 {0}与 {1}相遇于 {2}。 {3} {4}。 diff --git a/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs b/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs index 625a00d99..9a692697e 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs @@ -227,11 +227,10 @@ private void GetLangStrings() } // Feeling Chooser - foreach (var q in strings.GetMemoryFeelings(pkm.Format)) - { - CB_CTFeel.Items.Add(q); + foreach (var q in strings.GetMemoryFeelings(pkm.Generation)) CB_OTFeel.Items.Add(q); - } + foreach (var q in strings.GetMemoryFeelings(pkm.Format)) + CB_CTFeel.Items.Add(q); } private void UpdateMemoryDisplay(object sender) @@ -266,14 +265,14 @@ private string GetMemoryString(ComboBox m, Control arg, Control q, Control f, st if (mem == 0) { string nn = pkm.Nickname; - result = string.Format(GameInfo.Strings.memories[38], nn); + result = string.Format(GameInfo.Strings.memories[0], nn); enabled = false; } else { string nn = pkm.Nickname; string a = arg.Text; - result = string.Format(GameInfo.Strings.memories[mem + 38], nn, tr, a, f.Text, q.Text); + result = string.Format(GameInfo.Strings.memories[mem], nn, tr, a, f.Text, q.Text); enabled = true; }