Skip to content

Commit

Permalink
Merge branch 'beta' into shell-side-arm-implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
geeilhan authored Dec 17, 2024
2 parents ce78edc + cb719d9 commit e035c77
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion public/locales
Submodule locales updated 54 files
+17 −7 README.md
+2 −1 ca-ES/common.json
+1 −0 ca-ES/menu.json
+2 −1 de/ability.json
+1 −0 de/bgm-name.json
+3 −1 de/menu.json
+2 −1 de/move-trigger.json
+3 −1 en/menu.json
+3 −3 en/mystery-encounters/department-store-sale-dialogue.json
+1 −0 es-ES/menu.json
+1 −1 fr/achv.json
+1 −0 fr/bgm-name.json
+7 −5 fr/menu.json
+1 −1 fr/settings.json
+12 −4 he/ability.json
+3 −0 he/battle-info.json
+4 −0 he/battle.json
+10 −0 he/battler-tags.json
+8 −0 he/common.json
+14 −0 he/egg.json
+3 −1 he/splash-texts.json
+2 −0 he/trainer-names.json
+6 −5 it/ability.json
+4 −0 it/achv.json
+3 −1 it/bgm-name.json
+3 −1 it/menu.json
+2 −1 it/move-trigger.json
+2 −1 ja/ability.json
+2 −2 ja/achv.json
+1 −0 ja/bgm-name.json
+2 −0 ja/menu-ui-handler.json
+1 −0 ja/menu.json
+2 −1 ja/move-trigger.json
+3 −1 ja/settings.json
+5 −5 ja/splash-texts.json
+2 −1 ko/arena-flyout.json
+1 −0 ko/menu.json
+2 −1 pt-BR/ability.json
+2 −1 pt-BR/achv.json
+1 −0 pt-BR/bgm-name.json
+1 −1 pt-BR/biome.json
+3 −1 pt-BR/menu.json
+2 −1 pt-BR/move-trigger.json
+31 −31 pt-BR/mystery-encounters/the-expert-pokemon-breeder-dialogue.json
+1 −1 pt-BR/trainer-names.json
+4 −0 ro/menu.json
+23 −0 ro/pokemon-info.json
+29 −0 ro/pokemon-summary.json
+1,063 −0 ro/pokemon.json
+2 −1 zh-CN/ability.json
+1 −0 zh-CN/bgm-name.json
+3 −1 zh-CN/menu.json
+2 −1 zh-CN/move-trigger.json
+1 −0 zh-TW/menu.json
2 changes: 1 addition & 1 deletion src/data/balance/pokemon-level-moves.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand All @@ -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 ],
Expand Down
6 changes: 3 additions & 3 deletions src/ui/party-ui-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand Down

0 comments on commit e035c77

Please sign in to comment.