Merge pull request #3693 from pagefaultgames/main

Main to Beta sync

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: patapancakes

src/data/trainer-config.ts

@@ -1577,11 +1577,11 @@ export const trainerConfigs: TrainerConfigs = {
     })),
 
   [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL)).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL)
-    .setModifierRewardFuncs(() => modifierTypes.SUPER_EXP_CHARM, () => modifierTypes.EXP_SHARE, () => modifierTypes.SHINY_CHARM, () => modifierTypes.ABILITY_CHARM)
+    .setModifierRewardFuncs(() => modifierTypes.SUPER_EXP_CHARM, () => modifierTypes.EXP_SHARE)
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, Species.TREECKO, Species.TORCHIC, Species.MUDKIP, Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, Species.SNIVY, Species.TEPIG, Species.OSHAWOTT, Species.CHESPIN, Species.FENNEKIN, Species.FROAKIE, Species.ROWLET, Species.LITTEN, Species.POPPLIO, Species.GROOKEY, Species.SCORBUNNY, Species.SOBBLE, Species.SPRIGATITO, Species.FUECOCO, Species.QUAXLY], TrainerSlot.TRAINER, true))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.PIDGEY, Species.HOOTHOOT, Species.TAILLOW, Species.STARLY, Species.PIDOVE, Species.FLETCHLING, Species.PIKIPEK, Species.ROOKIDEE, Species.WATTREL], TrainerSlot.TRAINER, true)),
   [TrainerType.RIVAL_2]: new TrainerConfig(++t).setName("Finn").setHasGenders("Ivy").setHasCharSprite().setTitle("Rival").setStaticParty().setMoneyMultiplier(1.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm("battle_rival").setMixedBattleBgm("battle_rival").setPartyTemplates(trainerPartyTemplates.RIVAL_2)
-    .setModifierRewardFuncs(() => modifierTypes.EXP_SHARE, () => modifierTypes.SHINY_CHARM)
+    .setModifierRewardFuncs(() => modifierTypes.EXP_SHARE)
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.IVYSAUR, Species.CHARMELEON, Species.WARTORTLE, Species.BAYLEEF, Species.QUILAVA, Species.CROCONAW, Species.GROVYLE, Species.COMBUSKEN, Species.MARSHTOMP, Species.GROTLE, Species.MONFERNO, Species.PRINPLUP, Species.SERVINE, Species.PIGNITE, Species.DEWOTT, Species.QUILLADIN, Species.BRAIXEN, Species.FROGADIER, Species.DARTRIX, Species.TORRACAT, Species.BRIONNE, Species.THWACKEY, Species.RABOOT, Species.DRIZZILE, Species.FLORAGATO, Species.CROCALOR, Species.QUAXWELL], TrainerSlot.TRAINER, true))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([Species.PIDGEOTTO, Species.HOOTHOOT, Species.TAILLOW, Species.STARAVIA, Species.TRANQUILL, Species.FLETCHINDER, Species.TRUMBEAK, Species.CORVISQUIRE, Species.WATTREL], TrainerSlot.TRAINER, true))
     .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450)),

src/locales/ca_ES/dialogue.ts

@@ -2573,8 +2573,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner?
                    $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way.
                    $By the way, the professor asked me to give you these items. They look pretty cool.
-                   $@c{serious_smile_fists}Good luck out there!
+                   $@c{serious_smile_fists}Good luck out there!`
-                   $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_female": {
@@ -2588,8 +2587,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}You just started and you're already this strong?!@d{96}\n@c{angry}You totally cheated, didn't you?
                     $@c{smile_wave_wink}Just kidding!@d{64} @c{smile_eclosed}I lost fair and square… I have a feeling you're going to do really well out there.
                     $@c{smile}By the way, the professor wanted me to give you some items. Hopefully they're helpful!
-                    $@c{smile_wave}Do your best like always! I believe in you!
+                    $@c{smile_wave}Do your best like always! I believe in you!`
-                    $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_2": {
@@ -2605,7 +2603,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}That's alright, though. I figured this might happen.\n@c{serious_mopen_fists}It just means I need to try harder for next time!\n
                 $@c{smile}Oh, not that you really need the help, but I had an extra one of these lying around and figured you might want it.\n
                 $@c{serious_smile_fists}Don't expect another one after this, though!\nI can't keep giving my opponent an advantage after all.
-                $@c{smile}Anyway, take care, and enjoy the event!`
+                $@c{smile}Anyway, take care!`
     },
   },
   "rival_2_female": {
@@ -2621,7 +2619,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Aw well. That just means I'll have to train even harder for next time!
                 $@c{smile_wave}I also got you another one of these!\n@c{smile_wave_wink}No need to thank me~.
                 $@c{angry_mopen}This is the last one, though! You won't be getting anymore freebies from me after this!
-                $@c{smile_wave}Keep at it, and enjoy the event!`
+                $@c{smile_wave}Keep at it!`
     },
     "defeat": {
       1: "It's OK to lose sometimes…"

src/locales/de/dialogue.ts

@@ -2641,8 +2641,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                    $@c{smile}Vielleicht war es einfach etwas Glück, aber…\nWer weiß, vielleicht schaffst du es irgendwann
                    $ja wirklich ganz groß raus zu kommen.
                    $Übrigens, der Professor hat mich gebeten dir diese Items zu geben. Die sehen wirklich cool aus.
-                   $@c{serious_smile_fists}Viel Glück da draußen!
+                   $@c{serious_smile_fists}Viel Glück da draußen!`
-                    $@c{smile}Oh-und genieße das Event!`
     },
   },
   "rival_female": {
@@ -2657,8 +2656,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Du hast gerade erst angefangen und bist schon so stark?!@d{96} @c{angry}Du hast sowas von betrogen, oder?
                     $@c{smile_wave_wink}Ich mach nur Spaß!@d{64} @c{smile_eclosed}Ich habe ehrlich verloren… Ich habe das Gefühl, dass du es dort draußen weit bringen wirst.
                     $@c{smile}Übrigens, der Professor hat mich gebeten dir diese Items zu geben. Ich hoffe sie sind hilfreich!
-                    $@c{smile_wave}Gib wie immer dein Bestes! Ich glaube an dich!
+                    $@c{smile_wave}Gib wie immer dein Bestes! Ich glaube an dich!`
-                    $@c{smile}Oh-und genieße das Event!`
     },
   },
   "rival_2": {
@@ -2676,7 +2674,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Nicht, dass du wirklich Hilfe benötigen würdest, aber ich habe hier noch eins von diesen Dingern herumliegen.
                 $Du kannst es haben.\n
                 $@c{serious_smile_fists}Erwarte aber nicht, dass ich dir noch mehr gebe!\nIch kann meinen Rivalen doch keine Vorteile verschaffen.
-                $@c{smile}Egal, pass auf dich auf und genieße das Event!`
+                $@c{smile}Egal, pass auf dich auf!`
     },
   },
   "rival_2_female": {
@@ -2692,7 +2690,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Na gut. Das bedeutet ich muss noch härter tranieren!
                 $@c{smile_wave}Ich habe noch eins von diesen Dingern!\n@c{smile_wave_wink}Kein Grund mir zu danken~.
                 $@c{angry_mopen}Das ist aber das Letzte! Du bekommst ab jett keine Geschenke mehr von mir!
-                $@c{smile_wave}Bleib stark und genieße das Event!`
+                $@c{smile_wave}Bleib stark!`
     },
     "defeat": {
       1: "Es ist Ok manchmal zu verlieren…"

src/locales/en/dialogue.ts

@@ -2574,8 +2574,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner?
                    $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way.
                    $By the way, the professor asked me to give you these items. They look pretty cool.
-                   $@c{serious_smile_fists}Good luck out there!
+                   $@c{serious_smile_fists}Good luck out there!`
-                   $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_female": {
@@ -2589,8 +2588,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}You just started and you're already this strong?!@d{96}\n@c{angry}You totally cheated, didn't you?
                     $@c{smile_wave_wink}Just kidding!@d{64} @c{smile_eclosed}I lost fair and square… I have a feeling you're going to do really well out there.
                     $@c{smile}By the way, the professor wanted me to give you some items. Hopefully they're helpful!
-                    $@c{smile_wave}Do your best like always! I believe in you!
+                    $@c{smile_wave}Do your best like always! I believe in you!`
-                    $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_2": {
@@ -2604,9 +2602,9 @@ export const PGMdialogue: DialogueTranslationEntries = {
     "victory": {
       1: `@c{neutral_eclosed}Oh. I guess I was overconfident.
                 $@c{smile}That's alright, though. I figured this might happen.\n@c{serious_mopen_fists}It just means I need to try harder for next time!\n
-                $@c{smile}Oh, not that you really need the help, but I had an extra one of each of these lying around and figured you might want them.\n
+                $@c{smile}Oh, not that you really need the help, but I had an extra one of these lying around and figured you might want it.\n
                 $@c{serious_smile_fists}Don't expect another one after this, though!\nI can't keep giving my opponent an advantage after all.
-                $@c{smile}Anyway, take care, and enjoy the event!`
+                $@c{smile}Anyway, take care!`
     },
   },
   "rival_2_female": {
@@ -2620,9 +2618,9 @@ export const PGMdialogue: DialogueTranslationEntries = {
     "victory": {
       1: `@c{neutral}I… wasn't supposed to lose that time…
                 $@c{smile}Aw well. That just means I'll have to train even harder for next time!
-                $@c{smile_wave}I also got you another two of these!\n@c{smile_wave_wink}No need to thank me~.
+                $@c{smile_wave}I also got you another one of these!\n@c{smile_wave_wink}No need to thank me~.
                 $@c{angry_mopen}This is the last one, though! You won't be getting anymore freebies from me after this!
-                $@c{smile_wave}Keep at it, and enjoy the event!`
+                $@c{smile_wave}Keep at it!`
     },
     "defeat": {
       1: "It's OK to lose sometimes…"

src/locales/es/dialogue.ts

@@ -2569,8 +2569,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner?
                    $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way.
                    $By the way, the professor asked me to give you these items. They look pretty cool.
-                   $@c{serious_smile_fists}Good luck out there!
+                   $@c{serious_smile_fists}Good luck out there!`
-                   $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_female": {
@@ -2584,8 +2583,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}You just started and you're already this strong?!@d{96}\n@c{angry}You totally cheated, didn't you?
                     $@c{smile_wave_wink}Just kidding!@d{64} @c{smile_eclosed}I lost fair and square… I have a feeling you're going to do really well out there.
                     $@c{smile}By the way, the professor wanted me to give you some items. Hopefully they're helpful!
-                    $@c{smile_wave}Do your best like always! I believe in you!
+                    $@c{smile_wave}Do your best like always! I believe in you!`
-                    $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_2": {
@@ -2601,7 +2599,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}That's alright, though. I figured this might happen.\n@c{serious_mopen_fists}It just means I need to try harder for next time!\n
                 $@c{smile}Oh, not that you really need the help, but I had an extra one of these lying around and figured you might want it.\n
                 $@c{serious_smile_fists}Don't expect another one after this, though!\nI can't keep giving my opponent an advantage after all.
-                $@c{smile}Anyway, take care, and enjoy the event!`
+                $@c{smile}Anyway, take care!`
     },
   },
   "rival_2_female": {
@@ -2617,7 +2615,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Aw well. That just means I'll have to train even harder for next time!
                 $@c{smile_wave}I also got you another one of these!\n@c{smile_wave_wink}No need to thank me~.
                 $@c{angry_mopen}This is the last one, though! You won't be getting anymore freebies from me after this!
-                $@c{smile_wave}Keep at it, and enjoy the event!`
+                $@c{smile_wave}Keep at it!`
     },
     "defeat": {
       1: "It's OK to lose sometimes…"

src/locales/fr/dialogue.ts

@@ -2372,8 +2372,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
 	  1: `@c{shock}Wah… Tu m’as vraiment lavé.\nT’es vraiment un débutant ?
 				   $@c{smile}T’as peut-être eu de la chance, mais…\nPeut-être que t’arriveras jusqu’au bout du chemin.
 				   $D’ailleurs, le prof m’a demandé de te filer ces objets.\nIls ont l’air sympas.
-                   $@c{serious_smile_fists}Bonne chance à toi !
+                   $@c{serious_smile_fists}Bonne chance à toi !`
-                   $@c{smile}Oh, et profite bien de l’évènement !`
     },
   },
   "rival_female": {
@@ -2387,8 +2386,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Tu viens de commencer et t’es déjà si fort ?!@d{96}\n@c{angry}T’as triché non ? Avoue !
                     $@c{smile_wave_wink}J’déconne !@d{64} @c{smile_eclosed}J’ai perdu dans les règles…\nJ’ai le sentiment que tu vas très bien t’en sortir.
 					$@c{smile}D’ailleurs, le prof veut que je te donne ces quelques objets. Ils te seront utiles, pour sûr !
-					$@c{smile_wave}Fais de ton mieux, comme toujours !\nJe crois fort en toi !
+					$@c{smile_wave}Fais de ton mieux, comme toujours !\nJe crois fort en toi !`
-    					$@c{smile}Oh, et profite bien de l’évènement !`
     },
   },
   "rival_2": {
@@ -2404,7 +2402,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
 				$@c{smile}Pas grave, c’est OK. Je me doutais que ça arriverait.\n@c{serious_mopen_fists}Je vais juste devoir encore plus m’entrainer !\n
                 $@c{smile}Ah, et pas que t’aies réellement besoin d’aide, mais j’ai ça en trop sur moi qui pourrait t’intéresser.\n
 				$@c{serious_smile_fists}Mais n’espère plus en avoir d’autres !\nJe peux pas passer mon temps à aider mon adversaire.
-                $@c{smile}Bref, prends soin de toi et profite bien de l’évènement !`
+                $@c{smile}Bref, prends soin de toi !`
     },
   },
   "rival_2_female": {
@@ -2419,8 +2417,8 @@ export const PGMdialogue: DialogueTranslationEntries = {
 	  1: `@c{neutral}Je… J’étais pas encore supposée perdre…
 				$@c{smile}Bon. Ça veut juste dire que je vais devoir encore plus m’entrainer !
 				$@c{smile_wave}J’ai aussi ça en rab pour toi !\n@c{smile_wave_wink}Inutile de me remercier ~.
-                $@c{angry_mopen}C’étaient les derniers, terminé les cadeaux après ceux-là !
+                $@c{angry_mopen}C’était le dernier, terminé les cadeaux après celui-là !
-                $@c{smile_wave}Allez, tiens le coup et profite bien de l’évènement !`
+                $@c{smile_wave}Allez, tiens le coup !`
     },
     "defeat": {
       1: "Je suppose que c’est parfois normal de perdre…"
@@ -5053,8 +5051,7 @@ export const PGFdialogue: DialogueTranslationEntries = {
 	  1: `@c{shock}Wah… Tu m’as vraiment lavé.\nT’es vraiment une débutante ?
 				   $@c{smile}T’as peut-être eu de la chance, mais…\nPeut-être que t’arriveras jusqu’au bout du chemin.
 				   $D’ailleurs, le prof m’a demandé de te filer ces objets.\nIls ont l’air sympas.
-                   $@c{serious_smile_fists}Bonne chance à toi !
+                   $@c{serious_smile_fists}Bonne chance à toi !`
-		   $@c{smile}Oh, et profite bien de l’évènement !`
     },
   },
   "rival_female": {
@@ -5068,8 +5065,7 @@ export const PGFdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Tu viens de commencer et t’es déjà si forte ?!@d{96}\n@c{angry}T’as triché non ? Avoue !
                     $@c{smile_wave_wink}J’déconne !@d{64} @c{smile_eclosed}J’ai perdu dans les règles…\nJ’ai le sentiment que tu vas très bien t’en sortir.
 					$@c{smile}D’ailleurs, le prof veut que je te donne ces quelques objets. Ils te seront utiles, pour sûr !
-					$@c{smile_wave}Fais de ton mieux, comme toujours !\nJe crois fort en toi !
+					$@c{smile_wave}Fais de ton mieux, comme toujours !\nJe crois fort en toi !`
-					$@c{smile}Oh, et profite bien de l’évènement !`
     },
   },
   "rival_2": {
@@ -5085,7 +5081,7 @@ export const PGFdialogue: DialogueTranslationEntries = {
 				$@c{smile}Pas grave, c’est OK. Je me doutais que ça arriverait.\n@c{serious_mopen_fists}Je vais juste devoir encore plus m’entrainer !\n
                 $@c{smile}Ah, et pas que t’aies réellement besoin d’aide, mais j’ai ça en trop sur moi qui pourrait t’intéresser.\n
 				$@c{serious_smile_fists}Mais n’espère plus en avoir d’autres !\nJe peux pas passer mon temps à aider mon adversaire.
-                $@c{smile}Bref, prends soin de toi et profite bien de l’évènement !`
+                $@c{smile}Bref, prends soin de toi !`
     },
   },
   "rival_2_female": {
@@ -5101,7 +5097,7 @@ export const PGFdialogue: DialogueTranslationEntries = {
 				$@c{smile}Bon. Ça veut juste dire que je vais devoir encore plus m’entrainer !
 				$@c{smile_wave}J’ai aussi ça en rab pour toi !\n@c{smile_wave_wink}Inutile de me remercier ~.
                 $@c{angry_mopen}C’était le dernier, terminé les cadeaux après celui-là !
-                $@c{smile_wave}Allez, tiens le coup et profite bien de l’évènement !`
+                $@c{smile_wave}Allez, tiens le coup !`
     },
     "defeat": {
       1: "Je suppose que c’est parfois normal de perdre…"

src/locales/it/dialogue.ts

@@ -2569,8 +2569,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner?
                    $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way.
                    $By the way, the professor asked me to give you these items. They look pretty cool.
-                   $@c{serious_smile_fists}Good luck out there!
+                   $@c{serious_smile_fists}Good luck out there!`
-                   $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_female": {
@@ -2584,8 +2583,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}You just started and you're already this strong?!@d{96}\n@c{angry}You totally cheated, didn't you?
                     $@c{smile_wave_wink}Just kidding!@d{64} @c{smile_eclosed}I lost fair and square… I have a feeling you're going to do really well out there.
                     $@c{smile}By the way, the professor wanted me to give you some items. Hopefully they're helpful!
-                    $@c{smile_wave}Do your best like always! I believe in you!
+                    $@c{smile_wave}Do your best like always! I believe in you!`
-                    $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_2": {
@@ -2601,7 +2599,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}That's alright, though. I figured this might happen.\n@c{serious_mopen_fists}It just means I need to try harder for next time!\n
                 $@c{smile}Oh, not that you really need the help, but I had an extra one of these lying around and figured you might want it.\n
                 $@c{serious_smile_fists}Don't expect another one after this, though!\nI can't keep giving my opponent an advantage after all.
-                $@c{smile}Anyway, take care, and enjoy the event!`
+                $@c{smile}Anyway, take care!`
     },
   },
   "rival_2_female": {
@@ -2617,7 +2615,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Aw well. That just means I'll have to train even harder for next time!
                 $@c{smile_wave}I also got you another one of these!\n@c{smile_wave_wink}No need to thank me~.
                 $@c{angry_mopen}This is the last one, though! You won't be getting anymore freebies from me after this!
-                $@c{smile_wave}Keep at it, and enjoy the event!`
+                $@c{smile_wave}Keep at it!`
     },
     "defeat": {
       1: "It's OK to lose sometimes…"

src/locales/ja/dialogue.ts

@@ -2573,8 +2573,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner?
                    $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way.
                    $By the way, the professor asked me to give you these items. They look pretty cool.
-                   $@c{serious_smile_fists}Good luck out there!
+                   $@c{serious_smile_fists}Good luck out there!`
-                   $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_female": {
@@ -2588,8 +2587,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}You just started and you're already this strong?!@d{96}\n@c{angry}You totally cheated, didn't you?
                     $@c{smile_wave_wink}Just kidding!@d{64} @c{smile_eclosed}I lost fair and square… I have a feeling you're going to do really well out there.
                     $@c{smile}By the way, the professor wanted me to give you some items. Hopefully they're helpful!
-                    $@c{smile_wave}Do your best like always! I believe in you!
+                    $@c{smile_wave}Do your best like always! I believe in you!`
-                    $@c{smile}Oh- and I hope you enjoy the event!`
     },
   },
   "rival_2": {
@@ -2605,7 +2603,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}That's alright, though. I figured this might happen.\n@c{serious_mopen_fists}It just means I need to try harder for next time!\n
                 $@c{smile}Oh, not that you really need the help, but I had an extra one of these lying around and figured you might want it.\n
                 $@c{serious_smile_fists}Don't expect another one after this, though!\nI can't keep giving my opponent an advantage after all.
-                $@c{smile}Anyway, take care, and enjoy the event!`
+                $@c{smile}Anyway, take care!`
     },
   },
   "rival_2_female": {
@@ -2621,7 +2619,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}Aw well. That just means I'll have to train even harder for next time!
                 $@c{smile_wave}I also got you another one of these!\n@c{smile_wave_wink}No need to thank me~.
                 $@c{angry_mopen}This is the last one, though! You won't be getting anymore freebies from me after this!
-                $@c{smile_wave}Keep at it, and enjoy the event!`
+                $@c{smile_wave}Keep at it!`
     },
     "defeat": {
       1: "It's OK to lose sometimes…"

src/locales/ko/dialogue.ts

@@ -2569,8 +2569,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}와… 정말 깔끔하게 당했네.\n초보자 맞아?
                    $@c{smile}운이 따른 건지도 모르겠지만…\n그래도 정말 꿈을 이룰 지도.
                    $그나저나, 박사님께서 이걸 전해달라고 하시더라.\n좋아 보이던데.
-                   $@c{serious_smile_fists}아무튼, 힘 내는거야!
+                   $@c{serious_smile_fists}아무튼, 힘 내는거야!`
-                   $@c{smile}아- 그리고 이벤트 즐겁게 보내!`
     },
   },
   "rival_female": {
@@ -2584,8 +2583,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}왜 벌써 이렇게 센 건데?!@d{96}\n@c{angry}아니면 뭔가 속임수, 그런 거?
                     $@c{smile_wave_wink}농담, 농담!@d{64} @c{smile_eclosed}내가 진 거 맞아…\n너 정말 앞으로도 잘 하겠는데.
                     $@c{smile}아 그래, 박사님께서 전해달라던 물건.\n도움이 되면 좋겠어!
-                    $@c{smile_wave}항상 최선을 다 하라구! 믿고 있을게!
+                    $@c{smile_wave}항상 최선을 다 하라구! 믿고 있을게!`
-                    $@c{smile}아- 그리고 이벤트 즐겁게 보내!`
     },
   },
   "rival_2": {
@@ -2601,7 +2599,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}그래, 또 지고 말았네.\n@c{serious_mopen_fists}좀 더 열심히 훈련을 해야겠어!\n
                 $@c{smile}너한테 도움이 필요할 것 같지는 않지만, 이거.\n남는 게 있어서 말이야.
                 $@c{serious_smile_fists}물론 이번이 마지막이야, 알겠지?\n공평하게 하지 않으면 그게 내 핑계거리가 되고 말거야.
-                $@c{smile}이제 갈게. 앞으로도 조심하고, 이벤트도 즐겁게 보내!`
+                $@c{smile}이제 갈게. 앞으로도 조심하고!`
     },
   },
   "rival_2_female": {
@@ -2617,7 +2615,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
                 $@c{smile}으, 그래. 더 열심히 훈련하면 되겠지!
                 $@c{smile_wave}이것도 하나 더 챙겨왔으니 받아!\n@c{smile_wave_wink}감사 인사는 됐다구~.
                 $@c{angry_mopen}하지만, 마지막이야!\n또 이렇게 공짜로 나눠주진 않을 테니까!
-                $@c{smile_wave}그럼! 이벤트 잘 즐기고!`
+                $@c{smile_wave}그럼!`
     },
     "defeat": {
       1: "가끔은 지는 것도 괜찮아…"

src/locales/pt_BR/dialogue.ts

@@ -2541,8 +2541,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Caramba… Você me limpou.\nVocê é mesmo um novato?
                 $@c{smile}Talvez tenha sido um pouco de sorte, mas…\nQuem sabe você consiga chegar até o fim.
                 $Aliás, o professor me pediu para te dar esses itens. Eles parecem bem legais.
-                $@c{serious_smile_fists}Boa sorte lá fora!
+                $@c{serious_smile_fists}Boa sorte lá fora!`
-                $@c{smile}Ah- e eu espero que você aproveite o evento!`
     },
   },
   "rival_female": {
@@ -2556,8 +2555,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Você acabou de começar e já está tão forte?!@d{96}\n@c{angry}Você trapaceou, não foi?
                 $@c{smile_wave_wink}Brincadeirinha!@d{64} @c{smile_eclosed}Eu perdi de forma justa… Tenho a sensação de que você vai se sair muito bem lá fora.
                 $@c{smile}Aliás, o professor pediu para eu te dar alguns itens. Espero que sejam úteis!
-                $@c{smile_wave}Dê o seu melhor, como sempre! Eu acredito em você!
+                $@c{smile_wave}Dê o seu melhor, como sempre! Eu acredito em você!`
-                $@c{smile}Ah- e eu espero que você aproveite o evento!`
     },
   },
   "rival_2": {
@@ -2573,7 +2571,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
             $@c{smile}Tudo bem, no entanto. Eu imaginei que isso poderia acontecer.\n@c{serious_mopen_fists}Isso só significa que preciso me esforçar mais para a próxima vez!\n
             $@c{smile}Ah, não que você precise realmente de ajuda, mas eu tinha um extra desses itens e pensei que você poderia querer.
             $@c{serious_smile_fists}Não espere outro depois deste!\nNão posso continuar dando vantagem ao meu oponente.
-            $@c{smile}Enfim, cuide-se, e aproveite o evento!`
+            $@c{smile}Enfim, cuide-se!`
     },
   },
   "rival_2_female": {
@@ -2587,9 +2585,9 @@ export const PGMdialogue: DialogueTranslationEntries = {
     "victory": {
       1: `@c{neutral}Eu… não era para eu perder dessa vez…
             $@c{smile}Ah bem. Isso só significa que vou ter que treinar ainda mais para a próxima vez!
-            $@c{smile_wave}Também consegui mais dois desses para você!\n@c{smile_wave_wink}Não precisa me agradecer~.
+            $@c{smile_wave}Também consegui mais um desses para você!\n@c{smile_wave_wink}Não precisa me agradecer~.
-            $@c{angry_mopen}Estes são os últimos, hein! Você não vai ganhar mais nenhum presente de mim depois desse!
+            $@c{angry_mopen}Este é o último, hein! Você não vai ganhar mais nenhum presente de mim depois desse!
-            $@c{smile_wave}Continue assim, e aproveite o evento!`
+            $@c{smile_wave}Continue assim!`
     },
     "defeat": {
       1: "Está tudo bem perder às vezes…"
@@ -5227,8 +5225,7 @@ export const PGFdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Caramba… Você me limpou.\nVocê é mesmo uma novata?
                 $@c{smile}Talvez tenha sido um pouco de sorte, mas…\nQuem sabe você consiga chegar até o fim.
                 $Aliás, o professor me pediu para te dar esses itens. Eles parecem bem legais.
-                $@c{serious_smile_fists}Boa sorte lá fora!
+                $@c{serious_smile_fists}Boa sorte lá fora!`
-                $@c{smile}Ah- e eu espero que você aproveite o evento!`
     },
   },
   "rival_female": {
@@ -5242,8 +5239,7 @@ export const PGFdialogue: DialogueTranslationEntries = {
       1: `@c{shock}Você acabou de começar e já está tão forte?!@d{96}\n@c{angry}Você trapaceou, não foi?
                 $@c{smile_wave_wink}Brincadeirinha!@d{64} @c{smile_eclosed}Eu perdi de forma justa… Tenho a sensação de que você vai se sair muito bem lá fora.
                 $@c{smile}Aliás, o professor pediu para eu te dar alguns itens. Espero que sejam úteis!
-                $@c{smile_wave}Dê o seu melhor, como sempre! Eu acredito em você!
+                $@c{smile_wave}Dê o seu melhor, como sempre! Eu acredito em você!`
-                $@c{smile}Ah- e eu espero que você aproveite o evento!`
     },
   },
   "rival_2": {
@@ -5259,7 +5255,7 @@ export const PGFdialogue: DialogueTranslationEntries = {
             $@c{smile}Tudo bem, no entanto. Eu imaginei que isso poderia acontecer.\n@c{serious_mopen_fists}Isso só significa que preciso me esforçar mais para a próxima vez!\n
             $@c{smile}Ah, não que você precise realmente de ajuda, mas eu tinha um extra desses itens e pensei que você poderia querer.
             $@c{serious_smile_fists}Não espere outro depois deste!\nNão posso continuar dando vantagem ao meu oponente.
-            $@c{smile}Enfim, cuide-se, e aproveite o evento!`
+            $@c{smile}Enfim, cuide-se!`
     },
   },
   "rival_2_female": {
@@ -5273,9 +5269,9 @@ export const PGFdialogue: DialogueTranslationEntries = {
     "victory": {
       1: `@c{neutral}Eu… não era para eu perder dessa vez…
             $@c{smile}Ah bem. Isso só significa que vou ter que treinar ainda mais para a próxima vez!
-            $@c{smile_wave}Também consegui mais dois desses para você!\n@c{smile_wave_wink}Não precisa me agradecer~.
+            $@c{smile_wave}Também consegui mais um desses para você!\n@c{smile_wave_wink}Não precisa me agradecer~.
-            $@c{angry_mopen}Estes são os últimos, hein! Você não vai ganhar mais nenhum presente de mim depois desse!
+            $@c{angry_mopen}Este é o último, hein! Você não vai ganhar mais nenhum presente de mim depois desse!
-            $@c{smile_wave}Continue assim, e aproveite o evento!`
+            $@c{smile_wave}Continue assim!`
     },
     "defeat": {
       1: "Está tudo bem perder às vezes…"

src/locales/zh_CN/dialogue.ts

@@ -2463,7 +2463,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "@c{smile}嘿，我在找你呢！我知道你急着上路，\n但至少说个再见吧…$@c{smile_eclosed}所以你终于要开始追逐梦想了？\n我几乎不敢相信。$@c{serious_smile_fists}来都来了，来一场对战怎么样？\n毕竟，我想看看你是不是准备周全了。$@c{serious_mopen_fists}不要手下留情，我想让你全力以赴！",
     },
     "victory": {
-      1: "@c{shock}哇…你彻底击败了我。\n你是真初学者吗？$@c{smile}也许是靠点运气，但是…\n谁知道，你可能真的能一路走下去。$顺便说一下，博士让我给你这些东西。它们看起来可牛了。$@c{serious_smile_fists}祝你好运！$@c{smile}哦！我希望你能喜欢这次的活动！ ",
+      1: "@c{shock}哇…你彻底击败了我。\n你是真初学者吗？$@c{smile}也许是靠点运气，但是…\n谁知道，你可能真的能一路走下去。$顺便说一下，博士让我给你这些东西。它们看起来可牛了。$@c{serious_smile_fists}祝你好运！",
     },
   },
   "rival_female": {
@@ -2471,7 +2471,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "@c{smile_wave}你在这儿啊！我到处找你呢！$@c{angry_mopen}你忘了和你最好的朋友说再见了吗？$@c{smile_ehalf}你要去追逐梦想了，对吧？\n从今天开始，是不是…$@c{smile}不管怎样，忘了我的事就原谅你吧，\n但有个条件。@c{smile_wave_wink}你必须和我对战！$@c{angry_mopen}全力以赴！\n你也不想让你的冒险在开始之前就结束了，对吧？",
     },
     "victory": {
-      1: "@c{shock}你刚开始就已经这么强了？！@d{96}$@c{angry}你是不是开了？$@c{smile_wave_wink}只是开个玩笑啦！@d{64} @c{smile_eclosed}我输地心服口服了…\n我感觉你出去挺有天赋的。$@c{smile}顺便说一下，博士想让我给你一些东西。\n希望它们能帮上忙！$@c{smile_wave}像往常一样尽力而为！\n我相信你！$@c{smile}哦！我希望你能喜欢这次的活动！ ",
+      1: "@c{shock}你刚开始就已经这么强了？！@d{96}$@c{angry}你是不是开了？$@c{smile_wave_wink}只是开个玩笑啦！@d{64} @c{smile_eclosed}我输地心服口服了…\n我感觉你出去挺有天赋的。$@c{smile}顺便说一下，博士想让我给你一些东西。\n希望它们能帮上忙！$@c{smile_wave}像往常一样尽力而为！\n我相信你！",
     },
   },
   "rival_2": {
@@ -2479,7 +2479,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "@c{smile}嘿，你也在这里吗？$@c{smile_eclosed}一路过关斩将，是吧？$@c{serious_mopen_fists}我知道看起来好像我尾随着你来到这里，\n怎么可能啦。$@c{serious_smile_fists}说真的，自从你在老家打败我后，\n我就一直很渴望再比一场。$我自己也进行了很多训练，\n所以这次我肯定会好好打一场。$@c{serious_mopen_fists}不要手下留情，就像以前一样！$让我们开始吧！",
     },
     "victory": {
-      1: "@c{neutral_eclosed}哦。我过于自信了。$@c{smile}不过没关系。我猜到可能会这样。$@c{serious_mopen_fists}这只意味着我下次需要更努力！$$@c{smile}呃，不是特意帮你，我正好有多余的这个，\n我觉得你可能想要。$$@c{serious_smile_fists}不过这次之后别指望再有了！$我不能一直给我的对手优势。$@c{smile}反正，保重，要享受活动哦！",
+      1: "@c{neutral_eclosed}哦。我过于自信了。$@c{smile}不过没关系。我猜到可能会这样。$@c{serious_mopen_fists}这只意味着我下次需要更努力！$$@c{smile}呃，不是特意帮你，我正好有多余的这个，\n我觉得你可能想要。$$@c{serious_smile_fists}不过这次之后别指望再有了！$我不能一直给我的对手优势。$@c{smile}反正，保重！",
     },
   },
   "rival_2_female": {
@@ -2487,7 +2487,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "@c{smile_wave}哦，真巧，在这里遇见你。\n看来你还没输过嘛。@c{angry_mopen}哈……好家伙！$@c{angry_mopen}我知道你在想什么，\n不，我才不会跟踪你什么呢。 @c{smile_eclosed}我只是碰巧在附近。$@c{smile_ehalf}我为你感到高兴，但我只想让你知道\n有时输了是可以接受的。$@c{smile}我们从错误中学到的东西\n往往比我们一直成功时学到的还要多。$@c{angry_mopen}无论如何，我为了我们的复赛已经努力训练了\n所以你最好全力以赴！",
     },
     "victory": {
-      1: "@c{neutral}我……没打算会输来着……$@c{smile}嗷……好吧。看来我要再更加努力训练了！$@c{smile_wave}我还给你带了个这个$@c{smile_wave_wink}不用谢我哦~.$@c{angry_mopen}不过，这是最后一个啦！\n你可别想再从我这赚小便宜了~$@c{smile_wave}要保重哦，要享受活动哦！",
+      1: "@c{neutral}我……没打算会输来着……$@c{smile}嗷……好吧。看来我要再更加努力训练了！$@c{smile_wave}我还给你带了个这个$@c{smile_wave_wink}不用谢我哦~.$@c{angry_mopen}不过，这是最后一个啦！\n你可别想再从我这赚小便宜了~$@c{smile_wave}要保重哦！",
     },
     "defeat": {
       1: "输了有时候也不要紧的…",

src/locales/zh_TW/dialogue.ts

@@ -2463,7 +2463,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "@c{smile}嘿，我在找你呢！我知道你急著上路，\n但至少說個再見吧…$@c{smile_eclosed}所以你終於要開始追逐夢想了？\n我幾乎不敢相信。$@c{serious_smile_fists}來都來了，來一場對戰怎麼樣？\n畢竟，我想看看你是不是準備周全了。$@c{serious_mopen_fists}不要手下留情，我想讓你全力以赴！",
     },
     "victory": {
-      1: "@c{shock}哇…你徹底擊敗了我。\n你是真初學者嗎？$@c{smile}也許是靠點運氣，但是…\n誰知道，你可能真的能一路走下去。$順便說一下，博士讓我給你這些東西。它們看起來可牛了。$@c{serious_smile_fists}祝你好运！$@c{smile}哦！我希望你能喜歡這次的活動！",
+      1: "@c{shock}哇…你徹底擊敗了我。\n你是真初學者嗎？$@c{smile}也許是靠點運氣，但是…\n誰知道，你可能真的能一路走下去。$順便說一下，博士讓我給你這些東西。它們看起來可牛了。$@c{serious_smile_fists}祝你好运！",
     },
   },
   "rival_female": {
@@ -2471,7 +2471,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "@c{smile_wave}你在這兒啊！我到處找你呢！$@c{angry_mopen}你忘了和你最好的朋友說再見了嗎？$@c{smile_ehalf}你要去追逐夢想了，對吧？\n從今天開始，是不是…$@c{smile}不管怎樣，忘了我的事就原諒你吧，\n但有個條件。@c{smile_wave_wink}你必須和我對戰！$@c{angry_mopen}全力以赴！\n你也不想讓你的冒險在開始之前就結束了，對吧？",
     },
     "victory": {
-      1: "@c{shock}你剛開始就已經這麼強了？！@d{96}$@c{angry}你是不是開了？$@c{smile_wave_wink}只是開個玩笑啦！@d{64} @c{smile_eclosed}我輸地心服口服了…\n我感覺你出去挺有天賦的。$@c{smile}順便說一下，博士想讓我給你一些東西。\n希望它們能幫上忙！$@c{smile_wave}像往常一樣盡力而為！\n我相信你！$@c{smile}哦！我希望你能喜歡這次的活動！",
+      1: "@c{shock}你剛開始就已經這麼強了？！@d{96}$@c{angry}你是不是開了？$@c{smile_wave_wink}只是開個玩笑啦！@d{64} @c{smile_eclosed}我輸地心服口服了…\n我感覺你出去挺有天賦的。$@c{smile}順便說一下，博士想讓我給你一些東西。\n希望它們能幫上忙！$@c{smile_wave}像往常一樣盡力而為！\n我相信你！",
     },
   },
   "rival_2": {
@@ -2479,7 +2479,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "@c{smile}嘿，你也在這裡嗎？$@c{smile_eclosed}一路過關斬將，是吧？$@c{serious_mopen_fists}我知道看起來好像我尾隨著你來到這裡，\n怎麼可能啦。$@c{serious_smile_fists}說真的，自從你在老家打敗我後，\n我就一直很渴望再比一場。$我自己也進行了很多訓練，\n所以這次我肯定會好好打一場。$@c{serious_mopen_fists}不要手下留情，就像以前一樣！$讓我們開始吧！",
     },
     "victory": {
-      1: "@c{neutral_eclosed}哦。我過於自信了。$@c{smile}不過沒關係。我猜到可能會這樣。$@c{serious_mopen_fists}這只意味著我下次需要更努力！$$@c{smile}呃，不是特意幫你，我正好有多餘的這個，\n我覺得你可能想要。$$@c{serious_smile_fists}不過這次之後別指望再有了！$我不能一直給我的對手優勢。$@c{smile}反正，保重, 要享受活動哦！",
+      1: "@c{neutral_eclosed}哦。我過於自信了。$@c{smile}不過沒關係。我猜到可能會這樣。$@c{serious_mopen_fists}這只意味著我下次需要更努力！$$@c{smile}呃，不是特意幫你，我正好有多餘的這個，\n我覺得你可能想要。$$@c{serious_smile_fists}不過這次之後別指望再有了！$我不能一直給我的對手優勢。$@c{smile}反正，保重！",
     },
   },
   "rival_2_female": {
@@ -2487,7 +2487,7 @@ export const PGMdialogue: DialogueTranslationEntries = {
       1: "@c{smile_wave}哦，真巧，在這裡遇見你。\n看來你還沒輸過嘛。@c{angry_mopen}哈……好傢伙！$@c{angry_mopen}我知道你在想什麼，\n不，我才不會跟蹤你什麼呢。 @c{smile_eclosed}我只是碰巧在附近。$@c{smile_ehalf}我為你感到高興，但我只想讓你知道\n有時輸了是可以接受的。$@c{smile}我們從錯誤中學到的東西\n往往比我們一直成功時學到的還要多。$@c{angry_mopen}無論如何，我為了我們的複賽已經努力訓練了\n所以你最好全力以赴！",
     },
     "victory": {
-      1: "@c{neutral}我……沒打算會輸來著……$@c{smile}嗷……好吧。看來我要再更加努力訓練了！$@c{smile_wave}我還給你帶了個這個$@c{smile_wave_wink}不用謝我哦~.$@c{angry_mopen}不過，這是最後一個啦！\n 你可別想再從我這賺小便宜了~$@c{smile_wave}要保重哦，要享受活動哦！",
+      1: "@c{neutral}我……沒打算會輸來著……$@c{smile}嗷……好吧。看來我要再更加努力訓練了！$@c{smile_wave}我還給你帶了個這個$@c{smile_wave_wink}不用謝我哦~.$@c{angry_mopen}不過，這是最後一個啦！\n 你可別想再從我這賺小便宜了~$@c{smile_wave}要保重哦！",
     },
     "defeat": {
       1: "輸了有時候也不要緊的…",