From 28234e577e580cb81ea32f50b933a460fc1b73c7 Mon Sep 17 00:00:00 2001 From: damocleas Date: Sun, 30 Mar 2025 02:21:12 -0400 Subject: [PATCH 1/3] [Balance] Beta Passive Fixes, 1.8 Egg Move Changes, Egg Tier Change, and G-Max Form Re-Evaluation finished (#5588) * Update passives.ts * Correct BB Froakie, G-Max changes for Flapple, Appletun, Toxtricity, Hatterene, Grimmsnarl, Alcremie * Update egg-moves.ts * Seviper now matches Zangoose's egg tier wow --- src/data/balance/egg-moves.ts | 36 +++++++++--------- src/data/balance/passives.ts | 54 +++++++++++++-------------- src/data/balance/species-egg-tiers.ts | 2 +- src/data/pokemon-species.ts | 14 +++---- 4 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/data/balance/egg-moves.ts b/src/data/balance/egg-moves.ts index 5829e3e10aa..19038ad824c 100644 --- a/src/data/balance/egg-moves.ts +++ b/src/data/balance/egg-moves.ts @@ -103,7 +103,7 @@ export const speciesEggMoves = { [Species.SNUBBULL]: [ Moves.FACADE, Moves.HIGH_HORSEPOWER, Moves.SWORDS_DANCE, Moves.EXTREME_SPEED ], [Species.QWILFISH]: [ Moves.BARB_BARRAGE, Moves.BANEFUL_BUNKER, Moves.RECOVER, Moves.FISHIOUS_REND ], [Species.SHUCKLE]: [ Moves.STUFF_CHEEKS, Moves.HEAL_ORDER, Moves.BODY_PRESS, Moves.SALT_CURE ], - [Species.HERACROSS]: [ Moves.ROCK_BLAST, Moves.FIRST_IMPRESSION, Moves.ICICLE_SPEAR, Moves.TIDY_UP ], + [Species.HERACROSS]: [ Moves.ROCK_BLAST, Moves.STORM_THROW, Moves.ICICLE_SPEAR, Moves.SCALE_SHOT ], [Species.SNEASEL]: [ Moves.DIRE_CLAW, Moves.DARKEST_LARIAT, Moves.TRIPLE_AXEL, Moves.CLOSE_COMBAT ], [Species.TEDDIURSA]: [ Moves.MOUNTAIN_GALE, Moves.FAKE_OUT, Moves.SLACK_OFF, Moves.PRECIPICE_BLADES ], [Species.SLUGMA]: [ Moves.BURNING_BULWARK, Moves.POWER_GEM, Moves.SOLAR_BEAM, Moves.MAGMA_STORM ], @@ -143,14 +143,14 @@ export const speciesEggMoves = { [Species.SURSKIT]: [ Moves.POLLEN_PUFF, Moves.FIERY_DANCE, Moves.BOUNCY_BUBBLE, Moves.AEROBLAST ], [Species.SHROOMISH]: [ Moves.ACCELEROCK, Moves.TRAILBLAZE, Moves.STORM_THROW, Moves.SAPPY_SEED ], [Species.SLAKOTH]: [ Moves.FACADE, Moves.DRAIN_PUNCH, Moves.KNOCK_OFF, Moves.SKILL_SWAP ], - [Species.NINCADA]: [ Moves.ATTACK_ORDER, Moves.STICKY_WEB, Moves.SPIRIT_SHACKLE, Moves.SHELL_SMASH ], + [Species.NINCADA]: [ Moves.BULLDOZE, Moves.STICKY_WEB, Moves.SHADOW_BONE, Moves.SHELL_SMASH ], [Species.WHISMUR]: [ Moves.ALLURING_VOICE, Moves.SHIFT_GEAR, Moves.SPARKLING_ARIA, Moves.TORCH_SONG ], [Species.MAKUHITA]: [ Moves.COMBAT_TORQUE, Moves.SLACK_OFF, Moves.HEAT_CRASH, Moves.DOUBLE_IRON_BASH ], [Species.AZURILL]: [ Moves.JET_PUNCH, Moves.MAGICAL_TORQUE, Moves.SWORDS_DANCE, Moves.SURGING_STRIKES ], [Species.NOSEPASS]: [ Moves.SHORE_UP, Moves.BODY_PRESS, Moves.CALM_MIND, Moves.TACHYON_CUTTER ], [Species.SKITTY]: [ Moves.THUNDEROUS_KICK, Moves.ENTRAINMENT, Moves.TIDY_UP, Moves.V_CREATE ], [Species.SABLEYE]: [ Moves.RECOVER, Moves.TOPSY_TURVY, Moves.CURSE, Moves.SALT_CURE ], - [Species.MAWILE]: [ Moves.BULLET_PUNCH, Moves.MAGICAL_TORQUE, Moves.EARTHQUAKE, Moves.SHIFT_GEAR ], + [Species.MAWILE]: [ Moves.BULLET_PUNCH, Moves.HORN_LEECH, Moves.EARTHQUAKE, Moves.MAGICAL_TORQUE ], [Species.ARON]: [ Moves.HEAD_SMASH, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.SALT_CURE ], [Species.MEDITITE]: [ Moves.THUNDEROUS_KICK, Moves.SUCKER_PUNCH, Moves.BULLET_PUNCH, Moves.PHOTON_GEYSER ], [Species.ELECTRIKE]: [ Moves.FROST_BREATH, Moves.HEAT_WAVE, Moves.NASTY_PLOT, Moves.ELECTRO_DRIFT ], @@ -191,7 +191,7 @@ export const speciesEggMoves = { [Species.RELICANTH]: [ Moves.DRAGON_DANCE, Moves.SHORE_UP, Moves.WAVE_CRASH, Moves.DIAMOND_STORM ], [Species.LUVDISC]: [ Moves.BATON_PASS, Moves.HEART_SWAP, Moves.GLITZY_GLOW, Moves.REVIVAL_BLESSING ], [Species.BAGON]: [ Moves.HEADLONG_RUSH, Moves.FIRE_LASH, Moves.DRAGON_DANCE, Moves.DRAGON_DARTS ], - [Species.BELDUM]: [ Moves.HEADLONG_RUSH, Moves.DRAIN_PUNCH, Moves.TRIPLE_AXEL, Moves.SHIFT_GEAR ], + [Species.BELDUM]: [ Moves.HEADLONG_RUSH, Moves.DRAIN_PUNCH, Moves.ICE_SPINNER, Moves.SHIFT_GEAR ], [Species.REGIROCK]: [ Moves.STONE_AXE, Moves.BODY_PRESS, Moves.SHORE_UP, Moves.SALT_CURE ], [Species.REGICE]: [ Moves.EARTH_POWER, Moves.TAKE_HEART, Moves.RECOVER, Moves.FREEZE_DRY ], [Species.REGISTEEL]: [ Moves.BODY_PRESS, Moves.SIZZLY_SLIDE, Moves.RECOVER, Moves.GIGATON_HAMMER ], @@ -230,7 +230,7 @@ export const speciesEggMoves = { [Species.HAPPINY]: [ Moves.COTTON_GUARD, Moves.SEISMIC_TOSS, Moves.SIZZLY_SLIDE, Moves.REVIVAL_BLESSING ], [Species.CHATOT]: [ Moves.SPARKLING_ARIA, Moves.BOOMBURST, Moves.BATON_PASS, Moves.TORCH_SONG ], [Species.SPIRITOMB]: [ Moves.PARTING_SHOT, Moves.BADDY_BAD, Moves.STRENGTH_SAP, Moves.SPECTRAL_THIEF ], - [Species.GIBLE]: [ Moves.DRAGON_DANCE, Moves.BITTER_BLADE, Moves.DRAGON_HAMMER, Moves.PRECIPICE_BLADES ], + [Species.GIBLE]: [ Moves.METEOR_MASH, Moves.BITTER_BLADE, Moves.LANDS_WRATH, Moves.DRAGON_DANCE ], [Species.MUNCHLAX]: [ Moves.STUFF_CHEEKS, Moves.GRAV_APPLE, Moves.SLACK_OFF, Moves.EXTREME_SPEED ], [Species.RIOLU]: [ Moves.THUNDEROUS_KICK, Moves.TACHYON_CUTTER, Moves.TRIPLE_AXEL, Moves.SUNSTEEL_STRIKE ], [Species.HIPPOPOTAS]: [ Moves.SHORE_UP, Moves.STONE_AXE, Moves.BULK_UP, Moves.SALT_CURE ], @@ -259,7 +259,7 @@ export const speciesEggMoves = { [Species.VICTINI]: [ Moves.BLUE_FLARE, Moves.BOLT_STRIKE, Moves.LUSTER_PURGE, Moves.VICTORY_DANCE ], [Species.SNIVY]: [ Moves.FLAMETHROWER, Moves.CLANGING_SCALES, Moves.MAKE_IT_RAIN, Moves.FLEUR_CANNON ], [Species.TEPIG]: [ Moves.WAVE_CRASH, Moves.VOLT_TACKLE, Moves.AXE_KICK, Moves.VICTORY_DANCE ], - [Species.OSHAWOTT]: [ Moves.TRIPLE_AXEL, Moves.SHELL_SIDE_ARM, Moves.SACRED_SWORD, Moves.SHELL_SMASH ], + [Species.OSHAWOTT]: [ Moves.FREEZE_DRY, Moves.SHELL_SIDE_ARM, Moves.SACRED_SWORD, Moves.SHELL_SMASH ], [Species.PATRAT]: [ Moves.FAKE_OUT, Moves.SWORDS_DANCE, Moves.DYNAMIC_PUNCH, Moves.EXTREME_SPEED ], [Species.LILLIPUP]: [ Moves.CLOSE_COMBAT, Moves.BODY_SLAM, Moves.HIGH_HORSEPOWER, Moves.LAST_RESPECTS ], [Species.PURRLOIN]: [ Moves.ENCORE, Moves.OBSTRUCT, Moves.PARTING_SHOT, Moves.WICKED_BLOW ], @@ -336,7 +336,7 @@ export const speciesEggMoves = { [Species.LANDORUS]: [ Moves.STONE_AXE, Moves.FLOATY_FALL, Moves.ROOST, Moves.BLEAKWIND_STORM ], [Species.KYUREM]: [ Moves.DRAGON_DARTS, Moves.GLACIAL_LANCE, Moves.NO_RETREAT, Moves.DRAGON_ENERGY ], [Species.KELDEO]: [ Moves.BOUNCY_BUBBLE, Moves.THUNDERBOLT, Moves.ICE_BEAM, Moves.STEAM_ERUPTION ], - [Species.MELOETTA]: [ Moves.BODY_SLAM, Moves.TORCH_SONG, Moves.TRIPLE_ARROWS, Moves.BOOMBURST ], + [Species.MELOETTA]: [ Moves.BODY_SLAM, Moves.PSYCHIC_NOISE, Moves.TRIPLE_ARROWS, Moves.TORCH_SONG ], [Species.GENESECT]: [ Moves.EXTREME_SPEED, Moves.SHIFT_GEAR, Moves.BEHEMOTH_BASH, Moves.TACHYON_CUTTER ], [Species.CHESPIN]: [ Moves.COMBAT_TORQUE, Moves.SYNTHESIS, Moves.CEASELESS_EDGE, Moves.SAPPY_SEED ], @@ -370,7 +370,7 @@ export const speciesEggMoves = { [Species.PUMPKABOO]: [ Moves.SPIRIT_SHACKLE, Moves.FIRE_LASH, Moves.DIRE_CLAW, Moves.SAPPY_SEED ], [Species.BERGMITE]: [ Moves.STONE_AXE, Moves.METAL_BURST, Moves.BODY_PRESS, Moves.GLACIAL_LANCE ], [Species.NOIBAT]: [ Moves.AEROBLAST, Moves.OVERDRIVE, Moves.NASTY_PLOT, Moves.CLANGING_SCALES ], - [Species.XERNEAS]: [ Moves.EARTH_POWER, Moves.SPRINGTIDE_STORM, Moves.STRENGTH_SAP, Moves.TAIL_GLOW ], + [Species.XERNEAS]: [ Moves.EARTH_POWER, Moves.SPRINGTIDE_STORM, Moves.STORED_POWER, Moves.STRENGTH_SAP ], [Species.YVELTAL]: [ Moves.SLUDGE_WAVE, Moves.POWER_TRIP, Moves.FIERY_WRATH, Moves.CLANGOROUS_SOUL ], [Species.ZYGARDE]: [ Moves.DRAGON_DARTS, Moves.V_CREATE, Moves.CLANGOROUS_SOUL, Moves.HEAL_ORDER ], [Species.DIANCIE]: [ Moves.MAGICAL_TORQUE, Moves.FIERY_DANCE, Moves.SHORE_UP, Moves.GEOMANCY ], @@ -383,7 +383,7 @@ export const speciesEggMoves = { [Species.POPPLIO]: [ Moves.PSYCHIC_NOISE, Moves.MOONLIGHT, Moves.OVERDRIVE, Moves.TORCH_SONG ], [Species.PIKIPEK]: [ Moves.DUAL_WINGBEAT, Moves.BONE_RUSH, Moves.BURNING_BULWARK, Moves.POPULATION_BOMB ], [Species.YUNGOOS]: [ Moves.EXTREME_SPEED, Moves.KNOCK_OFF, Moves.TIDY_UP, Moves.MULTI_ATTACK ], - [Species.GRUBBIN]: [ Moves.ICE_BEAM, Moves.EARTH_POWER, Moves.THUNDERCLAP, Moves.QUIVER_DANCE ], + [Species.GRUBBIN]: [ Moves.ICE_BEAM, Moves.EARTH_POWER, Moves.CALM_MIND, Moves.THUNDERCLAP ], [Species.CRABRAWLER]: [ Moves.JET_PUNCH, Moves.SHORE_UP, Moves.MACH_PUNCH, Moves.SURGING_STRIKES ], [Species.ORICORIO]: [ Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.THUNDERCLAP, Moves.OBLIVION_WING ], [Species.CUTIEFLY]: [ Moves.STICKY_WEB, Moves.SLEEP_POWDER, Moves.HEAT_WAVE, Moves.SPARKLY_SWIRL ], @@ -404,7 +404,7 @@ export const speciesEggMoves = { [Species.SANDYGAST]: [ Moves.BITTER_MALICE, Moves.SPLISHY_SPLASH, Moves.TAKE_HEART, Moves.SALT_CURE ], [Species.PYUKUMUKU]: [ Moves.COMEUPPANCE, Moves.BANEFUL_BUNKER, Moves.TOXIC_SPIKES, Moves.SALT_CURE ], [Species.TYPE_NULL]: [ Moves.DIRE_CLAW, Moves.RECOVER, Moves.COMBAT_TORQUE, Moves.NO_RETREAT ], - [Species.MINIOR]: [ Moves.EARTH_POWER, Moves.FLOATY_FALL, Moves.ZING_ZAP, Moves.DIAMOND_STORM ], + [Species.MINIOR]: [ Moves.EARTH_POWER, Moves.FLOATY_FALL, Moves.TRI_ATTACK, Moves.DIAMOND_STORM ], [Species.KOMALA]: [ Moves.SLACK_OFF, Moves.EXTREME_SPEED, Moves.KNOCK_OFF, Moves.COLLISION_COURSE ], [Species.TURTONATOR]: [ Moves.BURNING_BULWARK, Moves.MORNING_SUN, Moves.BODY_PRESS, Moves.CORE_ENFORCER ], [Species.TOGEDEMARU]: [ Moves.FAKE_OUT, Moves.METAL_BURST, Moves.METEOR_MASH, Moves.AURA_WHEEL ], @@ -423,7 +423,7 @@ export const speciesEggMoves = { [Species.PHEROMOSA]: [ Moves.SECRET_SWORD, Moves.MAKE_IT_RAIN, Moves.ATTACK_ORDER, Moves.DIAMOND_STORM ], [Species.XURKITREE]: [ Moves.FLAMETHROWER, Moves.GIGA_DRAIN, Moves.TAIL_GLOW, Moves.THUNDERCLAP ], [Species.CELESTEELA]: [ Moves.RECOVER, Moves.BUZZY_BUZZ, Moves.EARTH_POWER, Moves.OBLIVION_WING ], - [Species.KARTANA]: [ Moves.MIGHTY_CLEAVE, Moves.PSYBLADE, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ], + [Species.KARTANA]: [ Moves.MIGHTY_CLEAVE, Moves.DUAL_CHOP, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ], [Species.GUZZLORD]: [ Moves.SUCKER_PUNCH, Moves.COMEUPPANCE, Moves.SLACK_OFF, Moves.SHED_TAIL ], [Species.NECROZMA]: [ Moves.DYNAMAX_CANNON, Moves.SACRED_FIRE, Moves.ASTRAL_BARRAGE, Moves.CLANGOROUS_SOUL ], [Species.MAGEARNA]: [ Moves.STRENGTH_SAP, Moves.EARTH_POWER, Moves.MOONBLAST, Moves.MAKE_IT_RAIN ], @@ -435,7 +435,7 @@ export const speciesEggMoves = { [Species.MELTAN]: [ Moves.BULLET_PUNCH, Moves.DRAIN_PUNCH, Moves.BULK_UP, Moves.PLASMA_FISTS ], [Species.ALOLA_RATTATA]: [ Moves.FALSE_SURRENDER, Moves.PSYCHIC_FANGS, Moves.COIL, Moves.EXTREME_SPEED ], [Species.ALOLA_SANDSHREW]: [ Moves.SPIKY_SHIELD, Moves.LIQUIDATION, Moves.SHIFT_GEAR, Moves.GLACIAL_LANCE ], - [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.PARTING_SHOT, Moves.EARTH_POWER, Moves.REVIVAL_BLESSING ], + [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.GLARE, Moves.MYSTICAL_FIRE, Moves.REVIVAL_BLESSING ], [Species.ALOLA_DIGLETT]: [ Moves.THOUSAND_WAVES, Moves.SWORDS_DANCE, Moves.TRIPLE_DIVE, Moves.MOUNTAIN_GALE ], [Species.ALOLA_MEOWTH]: [ Moves.BADDY_BAD, Moves.BUZZY_BUZZ, Moves.PARTING_SHOT, Moves.MAKE_IT_RAIN ], [Species.ALOLA_GEODUDE]: [ Moves.THOUSAND_WAVES, Moves.BULK_UP, Moves.STONE_AXE, Moves.EXTREME_SPEED ], @@ -453,7 +453,7 @@ export const speciesEggMoves = { [Species.CHEWTLE]: [ Moves.ICE_FANG, Moves.PSYCHIC_FANGS, Moves.SHELL_SMASH, Moves.MIGHTY_CLEAVE ], [Species.YAMPER]: [ Moves.ICE_FANG, Moves.SWORDS_DANCE, Moves.THUNDER_FANG, Moves.BOLT_STRIKE ], [Species.ROLYCOLY]: [ Moves.BITTER_BLADE, Moves.BODY_PRESS, Moves.BULK_UP, Moves.DIAMOND_STORM ], - [Species.APPLIN]: [ Moves.CORE_ENFORCER, Moves.DRAGON_HAMMER, Moves.FLOWER_TRICK, Moves.MATCHA_GOTCHA ], + [Species.APPLIN]: [ Moves.CORE_ENFORCER, Moves.COMBAT_TORQUE, Moves.SAPPY_SEED, Moves.MATCHA_GOTCHA ], [Species.SILICOBRA]: [ Moves.SHORE_UP, Moves.SHED_TAIL, Moves.MOUNTAIN_GALE, Moves.THOUSAND_ARROWS ], [Species.CRAMORANT]: [ Moves.APPLE_ACID, Moves.SURF, Moves.BOLT_BEAK, Moves.OBLIVION_WING ], [Species.ARROKUDA]: [ Moves.SUPERCELL_SLAM, Moves.TRIPLE_DIVE, Moves.ICE_SPINNER, Moves.SWORDS_DANCE ], @@ -464,7 +464,7 @@ export const speciesEggMoves = { [Species.HATENNA]: [ Moves.RECOVER, Moves.MOONBLAST, Moves.BUZZY_BUZZ, Moves.TORCH_SONG ], [Species.IMPIDIMP]: [ Moves.SLACK_OFF, Moves.PARTING_SHOT, Moves.OCTOLOCK, Moves.WICKED_BLOW ], [Species.MILCERY]: [ Moves.MOONBLAST, Moves.CHILLY_RECEPTION, Moves.EARTH_POWER, Moves.GEOMANCY ], - [Species.FALINKS]: [ Moves.BATON_PASS, Moves.POWER_TRIP, Moves.HEAL_ORDER, Moves.COMBAT_TORQUE ], + [Species.FALINKS]: [ Moves.BATON_PASS, Moves.POWER_TRIP, Moves.COMBAT_TORQUE, Moves.HEAL_ORDER ], [Species.PINCURCHIN]: [ Moves.TRICK_ROOM, Moves.VOLT_SWITCH, Moves.STRENGTH_SAP, Moves.THUNDERCLAP ], [Species.SNOM]: [ Moves.FROST_BREATH, Moves.HEAL_ORDER, Moves.EARTH_POWER, Moves.SPORE ], [Species.STONJOURNER]: [ Moves.BODY_PRESS, Moves.HELPING_HAND, Moves.ACCELEROCK, Moves.DIAMOND_STORM ], @@ -503,7 +503,7 @@ export const speciesEggMoves = { [Species.GALAR_STUNFISK]: [ Moves.SPIKY_SHIELD, Moves.THOUSAND_ARROWS, Moves.STRENGTH_SAP, Moves.DOUBLE_IRON_BASH ], [Species.HISUI_GROWLITHE]: [ Moves.WAVE_CRASH, Moves.HEAD_SMASH, Moves.VOLT_TACKLE, Moves.DRAGON_DANCE ], [Species.HISUI_VOLTORB]: [ Moves.FROST_BREATH, Moves.NASTY_PLOT, Moves.APPLE_ACID, Moves.ELECTRO_DRIFT ], - [Species.HISUI_QWILFISH]: [ Moves.CEASELESS_EDGE, Moves.KNOCK_OFF, Moves.RECOVER, Moves.FISHIOUS_REND ], + [Species.HISUI_QWILFISH]: [ Moves.CEASELESS_EDGE, Moves.BANEFUL_BUNKER, Moves.RECOVER, Moves.FISHIOUS_REND ], [Species.HISUI_SNEASEL]: [ Moves.DRAIN_PUNCH, Moves.KNOCK_OFF, Moves.PSYCHIC_FANGS, Moves.TRIPLE_AXEL ], [Species.HISUI_ZORUA]: [ Moves.MOONBLAST, Moves.SECRET_SWORD, Moves.PARTING_SHOT, Moves.BLOOD_MOON ], @@ -521,7 +521,7 @@ export const speciesEggMoves = { [Species.NACLI]: [ Moves.BODY_PRESS, Moves.TOXIC, Moves.CURSE, Moves.DIAMOND_STORM ], [Species.CHARCADET]: [ Moves.SACRED_SWORD, Moves.PHOTON_GEYSER, Moves.MOONBLAST, Moves.SPECTRAL_THIEF ], [Species.TADBULB]: [ Moves.PARABOLIC_CHARGE, Moves.SCALD, Moves.EARTH_POWER, Moves.ELECTRO_SHOT ], - [Species.WATTREL]: [ Moves.NASTY_PLOT, Moves.SPLISHY_SPLASH, Moves.SANDSEAR_STORM, Moves.ELECTRO_SHOT ], + [Species.WATTREL]: [ Moves.NASTY_PLOT, Moves.SPLISHY_SPLASH, Moves.SANDSEAR_STORM, Moves.WILDBOLT_STORM ], [Species.MASCHIFF]: [ Moves.PARTING_SHOT, Moves.COMBAT_TORQUE, Moves.PSYCHIC_FANGS, Moves.NO_RETREAT ], [Species.SHROODLE]: [ Moves.GASTRO_ACID, Moves.PARTING_SHOT, Moves.TOXIC, Moves.SKETCH ], [Species.BRAMBLIN]: [ Moves.TAILWIND, Moves.STRENGTH_SAP, Moves.FLOWER_TRICK, Moves.LAST_RESPECTS ], @@ -565,12 +565,12 @@ export const speciesEggMoves = { [Species.ROARING_MOON]: [ Moves.FIRE_LASH, Moves.DRAGON_HAMMER, Moves.METEOR_MASH, Moves.DRAGON_ASCENT ], [Species.IRON_VALIANT]: [ Moves.PLASMA_FISTS, Moves.NO_RETREAT, Moves.SECRET_SWORD, Moves.MAGICAL_TORQUE ], [Species.KORAIDON]: [ Moves.SUNSTEEL_STRIKE, Moves.SOLAR_BLADE, Moves.DRAGON_DARTS, Moves.BITTER_BLADE ], - [Species.MIRAIDON]: [ Moves.ICE_BEAM, Moves.CLANGOROUS_SOUL, Moves.CORE_ENFORCER, Moves.RISING_VOLTAGE ], + [Species.MIRAIDON]: [ Moves.FROST_BREATH, Moves.WILDBOLT_STORM, Moves.SPACIAL_REND, Moves.RISING_VOLTAGE ], [Species.WALKING_WAKE]: [ Moves.BOUNCY_BUBBLE, Moves.FUSION_FLARE, Moves.SLUDGE_WAVE, Moves.CORE_ENFORCER ], [Species.IRON_LEAVES]: [ Moves.BITTER_BLADE, Moves.U_TURN, Moves.MIGHTY_CLEAVE, Moves.VICTORY_DANCE ], [Species.POLTCHAGEIST]: [ Moves.PARABOLIC_CHARGE, Moves.BOUNCY_BUBBLE, Moves.LEECH_SEED, Moves.SPARKLY_SWIRL ], [Species.OKIDOGI]: [ Moves.COMBAT_TORQUE, Moves.TIDY_UP, Moves.DIRE_CLAW, Moves.WICKED_BLOW ], - [Species.MUNKIDORI]: [ Moves.PSYSTRIKE, Moves.HEAT_WAVE, Moves.EARTH_POWER, Moves.MALIGNANT_CHAIN ], + [Species.MUNKIDORI]: [ Moves.TWIN_BEAM, Moves.HEAT_WAVE, Moves.EARTH_POWER, Moves.MALIGNANT_CHAIN ], [Species.FEZANDIPITI]: [ Moves.BARB_BARRAGE, Moves.BONEMERANG, Moves.TRIPLE_AXEL, Moves.VICTORY_DANCE ], [Species.OGERPON]: [ Moves.SLEEP_POWDER, Moves.BONEMERANG, Moves.TRIPLE_AXEL, Moves.FLOWER_TRICK ], [Species.GOUGING_FIRE]: [ Moves.EXTREME_SPEED, Moves.BULK_UP, Moves.SACRED_FIRE, Moves.GLAIVE_RUSH ], diff --git a/src/data/balance/passives.ts b/src/data/balance/passives.ts index f7929650e67..fe1c97e4214 100644 --- a/src/data/balance/passives.ts +++ b/src/data/balance/passives.ts @@ -13,7 +13,7 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.BULBASAUR]: { 0: Abilities.GRASSY_SURGE }, [Species.IVYSAUR]: { 0: Abilities.GRASSY_SURGE }, [Species.VENUSAUR]: { 0: Abilities.GRASSY_SURGE, 1: Abilities.SEED_SOWER, 2: Abilities.FLOWER_VEIL }, - [Species.CHARMANDER]: { 0: Abilities.BEAST_BOOST }, + [Species.CHARMANDER]: { 0: Abilities.SHEER_FORCE }, [Species.CHARMELEON]: { 0: Abilities.BEAST_BOOST }, [Species.CHARIZARD]: { 0: Abilities.BEAST_BOOST, 1: Abilities.LEVITATE, 2: Abilities.INTIMIDATE, 3: Abilities.UNNERVE }, [Species.SQUIRTLE]: { 0: Abilities.DAUNTLESS_SHIELD }, @@ -171,10 +171,10 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.MEWTWO]: { 0: Abilities.NEUROFORCE, 1: Abilities.NEUROFORCE, 2: Abilities.NEUROFORCE }, [Species.MEW]: { 0: Abilities.PROTEAN }, - [Species.CHIKORITA]: { 0: Abilities.THICK_FAT }, + [Species.CHIKORITA]: { 0: Abilities.CUTE_CHARM }, [Species.BAYLEEF]: { 0: Abilities.THICK_FAT }, [Species.MEGANIUM]: { 0: Abilities.THICK_FAT }, - [Species.CYNDAQUIL]: { 0: Abilities.DROUGHT }, + [Species.CYNDAQUIL]: { 0: Abilities.WHITE_SMOKE }, [Species.QUILAVA]: { 0: Abilities.DROUGHT }, [Species.TYPHLOSION]: { 0: Abilities.DROUGHT }, [Species.HISUI_TYPHLOSION]: { 0: Abilities.DROUGHT }, @@ -320,7 +320,7 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.SLAKOTH]: { 0: Abilities.GUTS }, [Species.VIGOROTH]: { 0: Abilities.GUTS }, [Species.SLAKING]: { 0: Abilities.GUTS }, - [Species.NINCADA]: { 0: Abilities.PICKUP }, + [Species.NINCADA]: { 0: Abilities.TECHNICIAN }, [Species.NINJASK]: { 0: Abilities.TECHNICIAN }, [Species.SHEDINJA]: { 0: Abilities.MAGIC_GUARD }, [Species.WHISMUR]: { 0: Abilities.PUNK_ROCK }, @@ -426,7 +426,7 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.GROTLE]: { 0: Abilities.SOLID_ROCK }, [Species.TORTERRA]: { 0: Abilities.THICK_FAT }, [Species.CHIMCHAR]: { 0: Abilities.UNNERVE }, - [Species.MONFERNO]: { 0: Abilities.UNNERVE }, + [Species.MONFERNO]: { 0: Abilities.BEAST_BOOST }, [Species.INFERNAPE]: { 0: Abilities.BEAST_BOOST }, [Species.PIPLUP]: { 0: Abilities.CUTE_CHARM }, [Species.PRINPLUP]: { 0: Abilities.DRIZZLE }, @@ -526,8 +526,8 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.TEPIG]: { 0: Abilities.GLUTTONY }, [Species.PIGNITE]: { 0: Abilities.ROCK_HEAD }, [Species.EMBOAR]: { 0: Abilities.ROCK_HEAD }, - [Species.OSHAWOTT]: { 0: Abilities.LONG_REACH }, - [Species.DEWOTT]: { 0: Abilities.LONG_REACH }, + [Species.OSHAWOTT]: { 0: Abilities.MOLD_BREAKER }, + [Species.DEWOTT]: { 0: Abilities.MOLD_BREAKER }, [Species.SAMUROTT]: { 0: Abilities.LIGHTNING_ROD }, [Species.HISUI_SAMUROTT]: { 0: Abilities.MOLD_BREAKER }, [Species.PATRAT]: { 0: Abilities.NO_GUARD }, @@ -695,8 +695,8 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.FLETCHLING]: { 0: Abilities.FLAME_BODY }, [Species.FLETCHINDER]: { 0: Abilities.MAGIC_GUARD }, [Species.TALONFLAME]: { 0: Abilities.MAGIC_GUARD }, - [Species.SCATTERBUG]: { 0: Abilities.SHIELD_DUST }, - [Species.SPEWPA]: { 0: Abilities.SHIELD_DUST }, + [Species.SCATTERBUG]: { 0: Abilities.RUN_AWAY }, + [Species.SPEWPA]: { 0: Abilities.COMPOUND_EYES }, [Species.VIVILLON]: { 0: Abilities.PRANKSTER }, [Species.LITLEO]: { 0: Abilities.BEAST_BOOST }, [Species.PYROAR]: { 0: Abilities.BEAST_BOOST }, @@ -757,8 +757,8 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.VOLCANION]: { 0: Abilities.NEUTRALIZING_GAS }, [Species.ETERNAL_FLOETTE]: { 0: Abilities.MAGIC_GUARD }, - [Species.ROWLET]: { 0: Abilities.SNIPER }, - [Species.DARTRIX]: { 0: Abilities.SNIPER }, + [Species.ROWLET]: { 0: Abilities.WIND_RIDER }, + [Species.DARTRIX]: { 0: Abilities.WIND_RIDER }, [Species.DECIDUEYE]: { 0: Abilities.SNIPER }, [Species.HISUI_DECIDUEYE]: { 0: Abilities.SNIPER }, [Species.LITTEN]: { 0: Abilities.OPPORTUNIST }, @@ -825,7 +825,7 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.TAPU_LELE]: { 0: Abilities.BERSERK }, [Species.TAPU_BULU]: { 0: Abilities.FLOWER_VEIL }, [Species.TAPU_FINI]: { 0: Abilities.FAIRY_AURA }, - [Species.COSMOG]: { 0: Abilities.FRIEND_GUARD }, + [Species.COSMOG]: { 0: Abilities.PICKUP }, [Species.COSMOEM]: { 0: Abilities.POWER_SPOT }, [Species.SOLGALEO]: { 0: Abilities.BEAST_BOOST }, [Species.LUNALA]: { 0: Abilities.BEAST_BOOST }, @@ -834,7 +834,7 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.PHEROMOSA]: { 0: Abilities.TINTED_LENS }, [Species.XURKITREE]: { 0: Abilities.TRANSISTOR }, [Species.CELESTEELA]: { 0: Abilities.HEATPROOF }, - [Species.KARTANA]: { 0: Abilities.LONG_REACH }, + [Species.KARTANA]: { 0: Abilities.TECHNICIAN }, [Species.GUZZLORD]: { 0: Abilities.POISON_HEAL }, [Species.NECROZMA]: { 0: Abilities.BEAST_BOOST, 1: Abilities.FULL_METAL_BODY, 2: Abilities.SHADOW_SHIELD, 3: Abilities.PRISM_ARMOR }, [Species.MAGEARNA]: { 0: Abilities.STEELY_SPIRIT, 1: Abilities.STEELY_SPIRIT }, @@ -861,19 +861,19 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.ALOLA_GRIMER]: { 0: Abilities.TOXIC_DEBRIS }, [Species.ALOLA_MUK]: { 0: Abilities.TOXIC_DEBRIS }, - [Species.GROOKEY]: { 0: Abilities.GRASS_PELT }, - [Species.THWACKEY]: { 0: Abilities.GRASS_PELT }, + [Species.GROOKEY]: { 0: Abilities.PICKPOCKET }, + [Species.THWACKEY]: { 0: Abilities.PICKPOCKET }, [Species.RILLABOOM]: { 0: Abilities.GRASS_PELT, 1: Abilities.GRASS_PELT }, - [Species.SCORBUNNY]: { 0: Abilities.NO_GUARD }, - [Species.RABOOT]: { 0: Abilities.NO_GUARD }, + [Species.SCORBUNNY]: { 0: Abilities.SHEER_FORCE }, + [Species.RABOOT]: { 0: Abilities.SHEER_FORCE }, [Species.CINDERACE]: { 0: Abilities.NO_GUARD, 1: Abilities.NO_GUARD }, [Species.SOBBLE]: { 0: Abilities.SUPER_LUCK }, [Species.DRIZZILE]: { 0: Abilities.SUPER_LUCK }, [Species.INTELEON]: { 0: Abilities.SUPER_LUCK, 1: Abilities.SUPER_LUCK }, [Species.SKWOVET]: { 0: Abilities.HARVEST }, [Species.GREEDENT]: { 0: Abilities.HARVEST }, - [Species.ROOKIDEE]: { 0: Abilities.DEFIANT }, - [Species.CORVISQUIRE]: { 0: Abilities.DEFIANT }, + [Species.ROOKIDEE]: { 0: Abilities.GALE_WINGS }, + [Species.CORVISQUIRE]: { 0: Abilities.GALE_WINGS }, [Species.CORVIKNIGHT]: { 0: Abilities.IRON_BARBS, 1: Abilities.IRON_BARBS }, [Species.BLIPBUG]: { 0: Abilities.RUN_AWAY }, [Species.DOTTLER]: { 0: Abilities.PSYCHIC_SURGE }, @@ -893,7 +893,7 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.APPLIN]: { 0: Abilities.STURDY }, [Species.FLAPPLE]: { 0: Abilities.NO_GUARD, 1: Abilities.NO_GUARD }, [Species.APPLETUN]: { 0: Abilities.WELL_BAKED_BODY, 1: Abilities.WELL_BAKED_BODY }, - [Species.DIPPLIN]: { 0: Abilities.FILTER }, + [Species.DIPPLIN]: { 0: Abilities.PARENTAL_BOND }, [Species.HYDRAPPLE]: { 0: Abilities.PARENTAL_BOND }, [Species.SILICOBRA]: { 0: Abilities.SAND_RUSH }, [Species.SANDACONDA]: { 0: Abilities.SAND_RUSH, 1: Abilities.SAND_RUSH }, @@ -944,8 +944,8 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.REGIELEKI]: { 0: Abilities.ELECTRIC_SURGE }, [Species.REGIDRAGO]: { 0: Abilities.MULTISCALE }, [Species.GLASTRIER]: { 0: Abilities.FILTER }, - [Species.SPECTRIER]: { 0: Abilities.MOLD_BREAKER }, - [Species.CALYREX]: { 0: Abilities.HARVEST, 1: Abilities.FILTER, 2: Abilities.MOLD_BREAKER }, + [Species.SPECTRIER]: { 0: Abilities.DAZZLING }, + [Species.CALYREX]: { 0: Abilities.HARVEST, 1: Abilities.FILTER, 2: Abilities.DAZZLING }, [Species.ENAMORUS]: { 0: Abilities.FAIRY_AURA, 1: Abilities.FAIRY_AURA }, [Species.GALAR_MEOWTH]: { 0: Abilities.UNBURDEN }, [Species.PERRSERKER]: { 0: Abilities.UNBURDEN }, @@ -984,16 +984,16 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.FLORAGATO]: { 0: Abilities.MAGICIAN }, [Species.MEOWSCARADA]: { 0: Abilities.MAGICIAN }, [Species.FUECOCO]: { 0: Abilities.GLUTTONY }, - [Species.CROCALOR]: { 0: Abilities.GLUTTONY }, - [Species.SKELEDIRGE]: { 0: Abilities.GLUTTONY }, - [Species.QUAXLY]: { 0: Abilities.DANCER }, + [Species.CROCALOR]: { 0: Abilities.PUNK_ROCK }, + [Species.SKELEDIRGE]: { 0: Abilities.PUNK_ROCK }, + [Species.QUAXLY]: { 0: Abilities.OPPORTUNIST }, [Species.QUAXWELL]: { 0: Abilities.OPPORTUNIST }, [Species.QUAQUAVAL]: { 0: Abilities.OPPORTUNIST }, [Species.LECHONK]: { 0: Abilities.SIMPLE }, [Species.OINKOLOGNE]: { 0: Abilities.SIMPLE, 1: Abilities.SIMPLE }, [Species.TAROUNTULA]: { 0: Abilities.HONEY_GATHER }, [Species.SPIDOPS]: { 0: Abilities.HONEY_GATHER }, - [Species.NYMBLE]: { 0: Abilities.HUSTLE }, + [Species.NYMBLE]: { 0: Abilities.TECHNICIAN }, [Species.LOKIX]: { 0: Abilities.GUTS }, [Species.PAWMI]: { 0: Abilities.TRANSISTOR }, [Species.PAWMO]: { 0: Abilities.TRANSISTOR }, @@ -1040,7 +1040,7 @@ export const starterPassiveAbilities: StarterPassiveAbilities = { [Species.FINIZEN]: { 0: Abilities.SWIFT_SWIM }, [Species.PALAFIN]: { 0: Abilities.EMERGENCY_EXIT, 1: Abilities.IRON_FIST }, [Species.VAROOM]: { 0: Abilities.LEVITATE }, - [Species.REVAVROOM]: { 0: Abilities.LEVITATE, 1: Abilities.LEVITATE, 2: Abilities.LEVITATE, 3: Abilities.LEVITATE, 4: Abilities.LEVITATE, 5: Abilities.LEVITATE }, + [Species.REVAVROOM]: { 0: Abilities.LEVITATE, 1: Abilities.DARK_AURA, 2: Abilities.FLASH_FIRE, 3: Abilities.MERCILESS, 4: Abilities.FILTER, 5: Abilities.SCRAPPY }, [Species.CYCLIZAR]: { 0: Abilities.PROTEAN }, [Species.ORTHWORM]: { 0: Abilities.REGENERATOR }, [Species.GLIMMET]: { 0: Abilities.STURDY }, diff --git a/src/data/balance/species-egg-tiers.ts b/src/data/balance/species-egg-tiers.ts index fee48695565..0db2c917589 100644 --- a/src/data/balance/species-egg-tiers.ts +++ b/src/data/balance/species-egg-tiers.ts @@ -169,7 +169,7 @@ export const speciesEggTiers = { [Species.CACNEA]: EggTier.COMMON, [Species.SWABLU]: EggTier.COMMON, [Species.ZANGOOSE]: EggTier.RARE, - [Species.SEVIPER]: EggTier.COMMON, + [Species.SEVIPER]: EggTier.RARE, [Species.LUNATONE]: EggTier.COMMON, [Species.SOLROCK]: EggTier.COMMON, [Species.BARBOACH]: EggTier.COMMON, diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 15c60d28969..8ba72e8041f 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -2357,7 +2357,7 @@ export function initSpecies() { new PokemonSpecies(Species.DELPHOX, 6, false, false, false, "Fox Pokémon", PokemonType.FIRE, PokemonType.PSYCHIC, 1.5, 39, Abilities.BLAZE, Abilities.NONE, Abilities.MAGICIAN, 534, 75, 69, 72, 114, 100, 104, 45, 70, 267, GrowthRate.MEDIUM_SLOW, 87.5, false), new PokemonSpecies(Species.FROAKIE, 6, false, false, false, "Bubble Frog Pokémon", PokemonType.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, GrowthRate.MEDIUM_SLOW, 87.5, false, false, new PokemonForm("Normal", "", PokemonType.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, null, true), - new PokemonForm("Battle Bond", "battle-bond", PokemonType.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.NONE, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, "", true), + new PokemonForm("Battle Bond", "battle-bond", PokemonType.WATER, null, 0.3, 7, Abilities.TORRENT, Abilities.NONE, Abilities.TORRENT, 314, 41, 56, 40, 62, 44, 71, 45, 70, 63, false, "", true), ), new PokemonSpecies(Species.FROGADIER, 6, false, false, false, "Bubble Frog Pokémon", PokemonType.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, GrowthRate.MEDIUM_SLOW, 87.5, false, false, new PokemonForm("Normal", "", PokemonType.WATER, null, 0.6, 10.9, Abilities.TORRENT, Abilities.NONE, Abilities.PROTEAN, 405, 54, 63, 52, 83, 56, 97, 45, 70, 142, false, null, true), @@ -2763,11 +2763,11 @@ export function initSpecies() { new PokemonSpecies(Species.APPLIN, 8, false, false, false, "Apple Core Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.2, 0.5, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.BULLETPROOF, 260, 40, 40, 80, 40, 40, 20, 255, 50, 52, GrowthRate.ERRATIC, 50, false), new PokemonSpecies(Species.FLAPPLE, 8, false, false, false, "Apple Wing Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true, new PokemonForm("Normal", "", PokemonType.GRASS, PokemonType.DRAGON, 0.3, 1, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.HUSTLE, 485, 70, 110, 80, 95, 60, 70, 45, 50, 170, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, PokemonType.DRAGON, 24, 999.9, Abilities.HUSTLE, Abilities.HUSTLE, Abilities.HUSTLE, 585, 90, 130, 100, 85, 80, 100, 45, 50, 170), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, PokemonType.DRAGON, 24, 999.9, Abilities.HUSTLE, Abilities.HUSTLE, Abilities.HUSTLE, 585, 100, 125, 90, 105, 70, 95, 45, 50, 170), ), new PokemonSpecies(Species.APPLETUN, 8, false, false, false, "Apple Nectar Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, GrowthRate.ERRATIC, 50, false, true, new PokemonForm("Normal", "", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 13, Abilities.RIPEN, Abilities.GLUTTONY, Abilities.THICK_FAT, 485, 110, 85, 80, 100, 80, 30, 45, 50, 170, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, PokemonType.DRAGON, 24, 999.9, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 585, 130, 75, 115, 125, 115, 25, 45, 50, 170), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.GRASS, PokemonType.DRAGON, 24, 999.9, Abilities.THICK_FAT, Abilities.THICK_FAT, Abilities.THICK_FAT, 585, 150, 100, 95, 115, 95, 30, 45, 50, 170), ), new PokemonSpecies(Species.SILICOBRA, 8, false, false, false, "Sand Snake Pokémon", PokemonType.GROUND, null, 2.2, 7.6, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 315, 52, 57, 75, 35, 50, 46, 255, 50, 63, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.SANDACONDA, 8, false, false, false, "Sand Snake Pokémon", PokemonType.GROUND, null, 3.8, 65.5, Abilities.SAND_SPIT, Abilities.SHED_SKIN, Abilities.SAND_VEIL, 510, 72, 107, 125, 65, 70, 71, 120, 50, 179, GrowthRate.MEDIUM_FAST, 50, false, true, @@ -2785,7 +2785,7 @@ export function initSpecies() { new PokemonSpecies(Species.TOXTRICITY, 8, false, false, false, "Punk Pokémon", PokemonType.ELECTRIC, PokemonType.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, GrowthRate.MEDIUM_SLOW, 50, false, true, new PokemonForm("Amped Form", "amped", PokemonType.ELECTRIC, PokemonType.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.PLUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "", true), new PokemonForm("Low-Key Form", "lowkey", PokemonType.ELECTRIC, PokemonType.POISON, 1.6, 40, Abilities.PUNK_ROCK, Abilities.MINUS, Abilities.TECHNICIAN, 502, 75, 98, 70, 114, 70, 75, 45, 50, 176, false, "lowkey", true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.ELECTRIC, PokemonType.POISON, 24, 999.9, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, 602, 114, 98, 82, 144, 82, 82, 45, 50, 176), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.ELECTRIC, PokemonType.POISON, 24, 999.9, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, Abilities.PUNK_ROCK, 602, 114, 105, 82, 137, 82, 82, 45, 50, 176), ), new PokemonSpecies(Species.SIZZLIPEDE, 8, false, false, false, "Radiator Pokémon", PokemonType.FIRE, PokemonType.BUG, 0.7, 1, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 305, 50, 65, 45, 50, 50, 45, 190, 50, 61, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.CENTISKORCH, 8, false, false, false, "Radiator Pokémon", PokemonType.FIRE, PokemonType.BUG, 3, 120, Abilities.FLASH_FIRE, Abilities.WHITE_SMOKE, Abilities.FLAME_BODY, 525, 100, 115, 65, 90, 90, 65, 75, 50, 184, GrowthRate.MEDIUM_FAST, 50, false, true, @@ -2806,13 +2806,13 @@ export function initSpecies() { new PokemonSpecies(Species.HATTREM, 8, false, false, false, "Serene Pokémon", PokemonType.PSYCHIC, null, 0.6, 4.8, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 370, 57, 40, 65, 86, 73, 49, 120, 50, 130, GrowthRate.SLOW, 0, false), new PokemonSpecies(Species.HATTERENE, 8, false, false, false, "Silent Pokémon", PokemonType.PSYCHIC, PokemonType.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, GrowthRate.SLOW, 0, false, true, new PokemonForm("Normal", "", PokemonType.PSYCHIC, PokemonType.FAIRY, 2.1, 5.1, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 510, 57, 90, 95, 136, 103, 29, 45, 50, 255, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.PSYCHIC, PokemonType.FAIRY, 26, 999.9, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 610, 97, 90, 105, 146, 122, 50, 45, 50, 255), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.PSYCHIC, PokemonType.FAIRY, 26, 999.9, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, Abilities.MAGIC_BOUNCE, 610, 87, 100, 110, 146, 118, 49, 45, 50, 255), ), new PokemonSpecies(Species.IMPIDIMP, 8, false, false, false, "Wily Pokémon", PokemonType.DARK, PokemonType.FAIRY, 0.4, 5.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 265, 45, 45, 30, 55, 40, 50, 255, 50, 53, GrowthRate.MEDIUM_FAST, 100, false), new PokemonSpecies(Species.MORGREM, 8, false, false, false, "Devious Pokémon", PokemonType.DARK, PokemonType.FAIRY, 0.8, 12.5, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 370, 65, 60, 45, 75, 55, 70, 120, 50, 130, GrowthRate.MEDIUM_FAST, 100, false), new PokemonSpecies(Species.GRIMMSNARL, 8, false, false, false, "Bulk Up Pokémon", PokemonType.DARK, PokemonType.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, GrowthRate.MEDIUM_FAST, 100, false, true, new PokemonForm("Normal", "", PokemonType.DARK, PokemonType.FAIRY, 1.5, 61, Abilities.PRANKSTER, Abilities.FRISK, Abilities.PICKPOCKET, 510, 95, 120, 65, 95, 75, 60, 45, 50, 255, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.DARK, PokemonType.FAIRY, 32, 999.9, Abilities.PRANKSTER, Abilities.PRANKSTER, Abilities.PRANKSTER, 610, 135, 138, 77, 110, 85, 65, 45, 50, 255), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.DARK, PokemonType.FAIRY, 32, 999.9, Abilities.PRANKSTER, Abilities.PRANKSTER, Abilities.PRANKSTER, 610, 130, 138, 75, 110, 92, 65, 45, 50, 255), ), new PokemonSpecies(Species.OBSTAGOON, 8, false, false, false, "Blocking Pokémon", PokemonType.DARK, PokemonType.NORMAL, 1.6, 46, Abilities.RECKLESS, Abilities.GUTS, Abilities.DEFIANT, 520, 93, 90, 101, 60, 81, 95, 45, 50, 260, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.PERRSERKER, 8, false, false, false, "Viking Pokémon", PokemonType.STEEL, null, 0.8, 28, Abilities.BATTLE_ARMOR, Abilities.TOUGH_CLAWS, Abilities.STEELY_SPIRIT, 440, 70, 110, 100, 50, 60, 50, 90, 50, 154, GrowthRate.MEDIUM_FAST, 50, false), @@ -2831,7 +2831,7 @@ export function initSpecies() { new PokemonForm("Ruby Swirl", "ruby-swirl", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), new PokemonForm("Caramel Swirl", "caramel-swirl", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), new PokemonForm("Rainbow Swirl", "rainbow-swirl", PokemonType.FAIRY, null, 0.3, 0.5, Abilities.SWEET_VEIL, Abilities.NONE, Abilities.AROMA_VEIL, 495, 65, 60, 75, 110, 121, 64, 100, 50, 173, false, null, true), - new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FAIRY, null, 30, 999.9, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 595, 135, 60, 75, 130, 131, 64, 100, 50, 173), + new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, PokemonType.FAIRY, null, 30, 999.9, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 595, 105, 70, 85, 130, 141, 64, 100, 50, 173), ), new PokemonSpecies(Species.FALINKS, 8, false, false, false, "Formation Pokémon", PokemonType.FIGHTING, null, 3, 62, Abilities.BATTLE_ARMOR, Abilities.NONE, Abilities.DEFIANT, 470, 65, 100, 100, 70, 60, 75, 45, 50, 165, GrowthRate.MEDIUM_FAST, null, false), new PokemonSpecies(Species.PINCURCHIN, 8, false, false, false, "Sea Urchin Pokémon", PokemonType.ELECTRIC, null, 0.3, 1, Abilities.LIGHTNING_ROD, Abilities.NONE, Abilities.ELECTRIC_SURGE, 435, 48, 101, 95, 91, 85, 15, 75, 50, 152, GrowthRate.MEDIUM_FAST, 50, false), From 111390631db85f46d3d7a6520e7748d9f01d520d Mon Sep 17 00:00:00 2001 From: Lugiad <2070109+Adri1@users.noreply.github.com> Date: Sun, 30 Mar 2025 21:29:28 +0200 Subject: [PATCH 2/3] [Localization] LATAM Spanish inclusion (#5582) * Update i18n.ts * Update settings.ts * Update settings-display-ui-handler.ts * Update starter-select-ui-handler.ts * Update utils.ts * Add files via upload * Update i18n.ts * Add files via upload * Update loading-scene.ts --------- Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com> --- public/images/statuses_es-MX.json | 188 ++++++++ public/images/statuses_es-MX.png | Bin 0 -> 2321 bytes public/images/types_es-MX.json | 440 ++++++++++++++++++ public/images/types_es-MX.png | Bin 0 -> 6131 bytes src/loading-scene.ts | 2 +- src/plugins/i18n.ts | 7 +- src/system/settings/settings.ts | 4 + .../settings/settings-display-ui-handler.ts | 6 + src/ui/starter-select-ui-handler.ts | 4 + src/utils.ts | 1 + 10 files changed, 649 insertions(+), 3 deletions(-) create mode 100644 public/images/statuses_es-MX.json create mode 100644 public/images/statuses_es-MX.png create mode 100644 public/images/types_es-MX.json create mode 100644 public/images/types_es-MX.png diff --git a/public/images/statuses_es-MX.json b/public/images/statuses_es-MX.json new file mode 100644 index 00000000000..8b09ed391c4 --- /dev/null +++ b/public/images/statuses_es-MX.json @@ -0,0 +1,188 @@ +{ + "textures": [ + { + "image": "statuses_es-MX.png", + "format": "RGBA8888", + "size": { + "w": 22, + "h": 64 + }, + "scale": 1, + "frames": [ + { + "filename": "pokerus", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 22, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 22, + "h": 8 + }, + "frame": { + "x": 0, + "y": 0, + "w": 22, + "h": 8 + } + }, + { + "filename": "burn", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 8, + "w": 20, + "h": 8 + } + }, + { + "filename": "faint", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 16, + "w": 20, + "h": 8 + } + }, + { + "filename": "freeze", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 24, + "w": 20, + "h": 8 + } + }, + { + "filename": "paralysis", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 32, + "w": 20, + "h": 8 + } + }, + { + "filename": "poison", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 40, + "w": 20, + "h": 8 + } + }, + { + "filename": "sleep", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 48, + "w": 20, + "h": 8 + } + }, + { + "filename": "toxic", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 56, + "w": 20, + "h": 8 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:37686e85605d17b806f22d43081c1139:70535ffee63ba61b3397d8470c2c8982:e6649238c018d3630e55681417c698ca$" + } +} diff --git a/public/images/statuses_es-MX.png b/public/images/statuses_es-MX.png new file mode 100644 index 0000000000000000000000000000000000000000..dc845d6fb1f2dcf09607bfce5af9f2b22a08a51f GIT binary patch literal 2321 zcmbVO3se+U7#>3t=~#&7I~WEE31(+zmwipFuCmBdt`cr8MX0kgv&+EFgPDN^(n`Zq zMo1nkGGB#{P-{&O2B`^|Cm%^#`GCyICwWQ@siZs|yUSybl|AR2nYnZCcmMzU|L?#5 znZ;StGloWtjesC%Xr|qk4c;TcZ4JL2JfrDnKLM{HlKoKyg6CtY4hn;B%%L^!pS1O|9krQlNDCn#j81?jO%f^l#fL*O2WT4+Hg2OYvWjx0D$ zlv!A>F`zV&qJ@oS4Pn5|+LUBiixWl+H)4bi#R(EOkUBHmcOk%=%y`Ib+tfZ^;LC#K ztExm|nBVW$_;ngl_F{zDY{qacrq!YVfhuK!N|mC564!6R#wxVTNh&7_aL^*<7K>F2 z0+{xOz)K;sg3^~JkT9&2k}yJp2Se%sGIR(h70bRJ=M0UpK9*+%RRLHcgq89|RaElD zzc3wI{+$DmT8AU#Tre7mOp{qk z6=kO=`uc^+>Zc5+rNI+ioWO{FCGjRWYok=wf@pEA9>ujNp?4BGQg0#&eNs?7ycg;a z8O~F7GZbj6cj7pyB}kp=cTi9;45d>42xe%~Bg#Al!sU3%%VLt?Mc_~p$u!X?%D^#T zr|V(iaFCgTqEZ6QX4)(Wh*-mM49S|!M!m^RqaFj3f@%#ZX4FlA+Vi*>#$d#0%Aoi3 z@3)C`aZuO({S4SonDhkeHtA5E(LUL&}-J8&jO== zBX=)M5k0D(lG({#kgb0xChV`MD^$tf6aRP8{h9bJi|@Y^?@KA2PYGTYG)W8zhJpp# zNv|N-AGPXPyQ%f`!$Cg_4nvI;e1uvtD*)3nXtaxWL~9`^EG*MD*_pHGJy)#sCLTE- ze{R1${_2KJQ4cSuH$7T*^`UbI4%Q?rO=z~wT3v5-!kfvL>`eR;tb0X!Mf{PqmsY&H z{2bfWmR#L1Zh-ZPf_<-#`~IHD<<=(;u6?fZLha*&8`uXJ*8ga;Yz2$6oVw7ucxMo;X#}~Z)z5uw5>h%1_yMVV6#548!xb)Ko9m34{CsHJ;Pj+NetO2|+m`#y>Di~V z423V+6N~xo&I#j2bv&~yyZWg^!Vu_-%7_Oae`iSLr>|u2PmF!(Ra<4OL&wW!7VZhOWbqrF26y5|W6F}6 zj{k6jP(B>_usqPZzUgx84tEW%9q{$KH@2SY=!_|UqZz- zjdySUW!L(T4=i%bnO$$2x+dfOfSg=h*K+jvVGHMf>9YQMPwQ~#n=85Xz7=mTyKrD_ zZEbmQI-9(rvD%d&#+Al&`5Nb5pk1E3{MB=wY} literal 0 HcmV?d00001 diff --git a/public/images/types_es-MX.json b/public/images/types_es-MX.json new file mode 100644 index 00000000000..b3dbfcd697f --- /dev/null +++ b/public/images/types_es-MX.json @@ -0,0 +1,440 @@ +{ + "textures": [ + { + "image": "types_es-MX.png", + "format": "RGBA8888", + "size": { + "w": 32, + "h": 280 + }, + "scale": 1, + "frames": [ + { + "filename": "unknown", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + } + }, + { + "filename": "bug", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 14, + "w": 32, + "h": 14 + } + }, + { + "filename": "dark", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 28, + "w": 32, + "h": 14 + } + }, + { + "filename": "dragon", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 42, + "w": 32, + "h": 14 + } + }, + { + "filename": "electric", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 56, + "w": 32, + "h": 14 + } + }, + { + "filename": "fairy", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 70, + "w": 32, + "h": 14 + } + }, + { + "filename": "fighting", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 84, + "w": 32, + "h": 14 + } + }, + { + "filename": "fire", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 98, + "w": 32, + "h": 14 + } + }, + { + "filename": "flying", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 112, + "w": 32, + "h": 14 + } + }, + { + "filename": "ghost", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 126, + "w": 32, + "h": 14 + } + }, + { + "filename": "grass", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 140, + "w": 32, + "h": 14 + } + }, + { + "filename": "ground", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 154, + "w": 32, + "h": 14 + } + }, + { + "filename": "ice", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 168, + "w": 32, + "h": 14 + } + }, + { + "filename": "normal", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 182, + "w": 32, + "h": 14 + } + }, + { + "filename": "poison", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 196, + "w": 32, + "h": 14 + } + }, + { + "filename": "psychic", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 210, + "w": 32, + "h": 14 + } + }, + { + "filename": "rock", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 224, + "w": 32, + "h": 14 + } + }, + { + "filename": "steel", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 238, + "w": 32, + "h": 14 + } + }, + { + "filename": "water", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 252, + "w": 32, + "h": 14 + } + }, + { + "filename": "stellar", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 266, + "w": 32, + "h": 14 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:f14cf47d9a8f1d40c8e03aa6ba00fff3:6fc4227b57a95d429a1faad4280f7ec8:5961efbfbf4c56b8745347e7a663a32f$" + } +} diff --git a/public/images/types_es-MX.png b/public/images/types_es-MX.png new file mode 100644 index 0000000000000000000000000000000000000000..134a68258cc403a86a43e58a8184537342314086 GIT binary patch literal 6131 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 MwT-bQ$DP9e2Z;lKtpET3 literal 0 HcmV?d00001 diff --git a/src/loading-scene.ts b/src/loading-scene.ts index 7f05634db48..d1f0b0ca242 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -250,7 +250,7 @@ export class LoadingScene extends SceneBase { this.loadAtlas("statuses", ""); this.loadAtlas("types", ""); } - const availableLangs = ["en", "de", "it", "fr", "ja", "ko", "es-ES", "pt-BR", "zh-CN", "zh-TW", "ca-ES"]; + const availableLangs = ["en", "de", "it", "fr", "ja", "ko", "es-ES", "es-MX", "pt-BR", "zh-CN", "zh-TW", "ca-ES"]; if (lang && availableLangs.includes(lang)) { this.loadImage(`pkmnday2025event-${lang}`, "events"); } else { diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts index 008bd03dc9e..5e145d08e28 100644 --- a/src/plugins/i18n.ts +++ b/src/plugins/i18n.ts @@ -170,8 +170,11 @@ export async function initI18n(): Promise { i18next.use(processor); i18next.use(new KoreanPostpositionProcessor()); await i18next.init({ - fallbackLng: "en", - supportedLngs: ["en", "es-ES", "fr", "it", "de", "zh-CN", "zh-TW", "pt-BR", "ko", "ja", "ca-ES"], + fallbackLng: { + "es-MX": ["es-ES", "en"], + default: ["en"], + }, + supportedLngs: ["en", "es-ES", "es-MX", "fr", "it", "de", "zh-CN", "zh-TW", "pt-BR", "ko", "ja", "ca-ES"], backend: { loadPath(lng: string, [ns]: string[]) { let fileName: string; diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts index 2db72dfecda..377216291e2 100644 --- a/src/system/settings/settings.ts +++ b/src/system/settings/settings.ts @@ -916,6 +916,10 @@ export function setSetting(setting: string, value: number): boolean { label: "Español (ES)", handler: () => changeLocaleHandler("es-ES"), }, + { + label: "Español (LATAM)", + handler: () => changeLocaleHandler("es-MX"), + }, { label: "Italiano", handler: () => changeLocaleHandler("it"), diff --git a/src/ui/settings/settings-display-ui-handler.ts b/src/ui/settings/settings-display-ui-handler.ts index b3505fe90f2..985aa9adca2 100644 --- a/src/ui/settings/settings-display-ui-handler.ts +++ b/src/ui/settings/settings-display-ui-handler.ts @@ -33,6 +33,12 @@ export default class SettingsDisplayUiHandler extends AbstractSettingsUiHandler label: "Español (ES)", }; break; + case "es-MX": + this.settings[languageIndex].options[0] = { + value: "Español (LATAM)", + label: "Español (LATAM)", + }; + break; case "it": this.settings[languageIndex].options[0] = { value: "Italiano", diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 7d8e29d8091..1e84b367791 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -117,6 +117,10 @@ const languageSettings: { [key: string]: LanguageSetting } = { starterInfoTextSize: "52px", instructionTextSize: "35px", }, + "es-MX": { + starterInfoTextSize: "52px", + instructionTextSize: "35px", + }, fr: { starterInfoTextSize: "54px", instructionTextSize: "38px", diff --git a/src/utils.ts b/src/utils.ts index fbca8410feb..4092b68b405 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -456,6 +456,7 @@ export function hasAllLocalizedSprites(lang?: string): boolean { switch (lang) { case "es-ES": + case "es-MX": case "fr": case "de": case "it": From 51f765d67acfeb5069fc2a8241ae5619847aef07 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Sun, 30 Mar 2025 21:00:59 -0700 Subject: [PATCH 3/3] [Move] Add message for called moves failing due to no targets (#5590) --- src/data/moves/move.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 6fb2f5b7c50..a05d63b3d3d 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -6715,6 +6715,8 @@ class CallMoveAttr extends OverrideMoveEffectAttr { const replaceMoveTarget = move.moveTarget === MoveTarget.NEAR_OTHER ? MoveTarget.NEAR_ENEMY : undefined; const moveTargets = getMoveTargets(user, move.id, replaceMoveTarget); if (moveTargets.targets.length === 0) { + globalScene.queueMessage(i18next.t("battle:attackFailed")); + console.log("CallMoveAttr failed due to no targets."); return false; } const targets = moveTargets.multiple || moveTargets.targets.length === 1