From dfde40f1aeda67e41f9da65796501d1ed4cac702 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sat, 14 Dec 2024 06:55:23 -0800
Subject: [PATCH 1/4] [Misc] Update "Yda's Dex" credit (the tool is now gone)
 (#4988)

---
 CREDITS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CREDITS.md b/CREDITS.md
index 0fe0a8dc290..cded7ea90a2 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -615,6 +615,6 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - roi
 
 ## External Tools
-- Ydarissep (RogueDex)
+- Ydarissep (creator of the now defunct "Yda's Dex")
 - Admiral-Billy (Offline App - Desktop)
 - Red aka StonedModder (iOS App)

From 90c8c9743714e95b0934551c7c2660d36f155844 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sat, 14 Dec 2024 10:15:21 -0800
Subject: [PATCH 2/4] Fix BattleBond Greninja moveset: Add Mat Block, remove
 duplicate move

---
 src/data/balance/pokemon-level-moves.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/balance/pokemon-level-moves.ts b/src/data/balance/pokemon-level-moves.ts
index 2a3ab431424..8e28300eb8a 100644
--- a/src/data/balance/pokemon-level-moves.ts
+++ b/src/data/balance/pokemon-level-moves.ts
@@ -19464,7 +19464,6 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
   },
   [Species.GRENINJA]: {
     1: [
-      [ EVOLVE_MOVE, Moves.WATER_SHURIKEN ],
       [ EVOLVE_MOVE, Moves.WATER_SHURIKEN ],
       [ 1, Moves.POUND ],
       [ 1, Moves.GROWL ],
@@ -19475,6 +19474,7 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
       [ 1, Moves.SMACK_DOWN ], // Previous Stage Move
       [ 1, Moves.BOUNCE ], // Previous Stage Move
       [ 1, Moves.HAZE ],
+      [ 1, Moves.MAT_BLOCK ],
       [ 1, Moves.ROLE_PLAY ],
       [ 1, Moves.NIGHT_SLASH ],
       [ 10, Moves.LICK ],

From f6f29f0f667f259d201ba2bdfcb58a937d21deeb Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sun, 15 Dec 2024 13:38:51 -0800
Subject: [PATCH 3/4] [i18n] Update locales submodule (#4992)

---
 public/locales | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/locales b/public/locales
index 7ad20e64caa..1dc4d5dd238 160000
--- a/public/locales
+++ b/public/locales
@@ -1 +1 @@
-Subproject commit 7ad20e64caa9367b444712f10036fa9bbe4837a5
+Subproject commit 1dc4d5dd238db8bbf64535c3274056abd199d404

From cb719d99a53130dbd99aa803ee02d25f89e86a74 Mon Sep 17 00:00:00 2001
From: Lugiad <2070109+Adri1@users.noreply.github.com>
Date: Mon, 16 Dec 2024 12:34:14 +0100
Subject: [PATCH 4/4] [i18n] Update party-ui-handler.ts (#4986)

---
 src/ui/party-ui-handler.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index bd3561dd0b4..0d20753f069 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -362,12 +362,12 @@ export default class PartyUiHandler extends MessageUiHandler {
             if (p !== this.transferCursor) { // this skips adding the able/not able labels on the pokemon doing the transfer
               if (matchingModifier) { // if matchingModifier exists then the item exists on the new pokemon
                 if (matchingModifier.getMaxStackCount(this.scene) === matchingModifier.stackCount) { // checks to see if the stack of items is at max stack; if so, set the description label to "Not able"
-                  ableToTransfer = "Not able";
+                  ableToTransfer = i18next.t("partyUiHandler:notAble");
                 } else { // if the pokemon isn't at max stack, make the label "Able"
-                  ableToTransfer = "Able";
+                  ableToTransfer = i18next.t("partyUiHandler:able");
                 }
               } else { // if matchingModifier doesn't exist, that means the pokemon doesn't have any of the item, and we need to show "Able"
-                ableToTransfer = "Able";
+                ableToTransfer = i18next.t("partyUiHandler:able");
               }
             } else { // this else relates to the transfer pokemon. We set the text to be blank so there's no "Able"/"Not able" text
               ableToTransfer = "";