Merge branch 'beta' into global-scene

This commit is contained in:
NightKev 2024-12-17 18:37:06 -08:00
commit dcb7f50344
4 changed files with 6 additions and 6 deletions

View File

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

@ -1 +1 @@
Subproject commit 7ad20e64caa9367b444712f10036fa9bbe4837a5 Subproject commit 1dc4d5dd238db8bbf64535c3274056abd199d404

View File

@ -19464,7 +19464,6 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
}, },
[Species.GRENINJA]: { [Species.GRENINJA]: {
1: [ 1: [
[ EVOLVE_MOVE, Moves.WATER_SHURIKEN ],
[ EVOLVE_MOVE, Moves.WATER_SHURIKEN ], [ EVOLVE_MOVE, Moves.WATER_SHURIKEN ],
[ 1, Moves.POUND ], [ 1, Moves.POUND ],
[ 1, Moves.GROWL ], [ 1, Moves.GROWL ],
@ -19475,6 +19474,7 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
[ 1, Moves.SMACK_DOWN ], // Previous Stage Move [ 1, Moves.SMACK_DOWN ], // Previous Stage Move
[ 1, Moves.BOUNCE ], // Previous Stage Move [ 1, Moves.BOUNCE ], // Previous Stage Move
[ 1, Moves.HAZE ], [ 1, Moves.HAZE ],
[ 1, Moves.MAT_BLOCK ],
[ 1, Moves.ROLE_PLAY ], [ 1, Moves.ROLE_PLAY ],
[ 1, Moves.NIGHT_SLASH ], [ 1, Moves.NIGHT_SLASH ],
[ 10, Moves.LICK ], [ 10, Moves.LICK ],

View File

@ -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 (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) { // if matchingModifier exists then the item exists on the new pokemon
if (matchingModifier.getMaxStackCount() === matchingModifier.stackCount) { // checks to see if the stack of items is at max stack; if so, set the description label to "Not able" if (matchingModifier.getMaxStackCount() === 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" } 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" } 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 } else { // this else relates to the transfer pokemon. We set the text to be blank so there's no "Able"/"Not able" text
ableToTransfer = ""; ableToTransfer = "";