Merge branch 'pagefaultgames:main' into main

This commit is contained in:
John Martin 2024-04-24 17:07:57 -04:00 committed by GitHub
commit 00c546bb9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 198 additions and 73 deletions

View File

@ -1069,8 +1069,6 @@
"971",
"972",
"972",
"973",
"973",
"974",
"974",
"975",
@ -2203,8 +2201,6 @@
"971b",
"972b",
"972b",
"973b",
"973b",
"974b",
"974b",
"975b",
@ -3335,8 +3331,6 @@
"971sb",
"972sb",
"972sb",
"973sb",
"973sb",
"974sb",
"974sb",
"975sb",
@ -4474,8 +4468,6 @@
"971s",
"972s",
"972s",
"973s",
"973s",
"974s",
"974s",
"975s",

View File

@ -581,6 +581,23 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.METEOR_MASH ],
[ 1, Moves.MOONBLAST ],
[ 1, Moves.LIFE_DEW ],
[ 1, Moves.POUND ],
[ 1, Moves.GROWL ],
[ 1, Moves.SING ],
[ 1, Moves.DEFENSE_CURL ],
[ 1, Moves.SPLASH ],
[ 1, Moves.SWEET_KISS ],
[ 1, Moves.CHARM ],
[ 1, Moves.ENCORE ],
[ 1, Moves.MOONLIGHT ],
[ 1, Moves.FOLLOW_ME ],
[ 1, Moves.COSMIC_POWER ],
[ 1, Moves.GRAVITY ],
[ 1, Moves.HEALING_WISH ],
[ 1, Moves.COPYCAT ],
[ 1, Moves.AFTER_YOU ],
[ 1, Moves.STORED_POWER ],
[ 1, Moves.DISARMING_VOICE ],
],
[Species.VULPIX]: [
[ 1, Moves.TAIL_WHIP ],
@ -600,9 +617,22 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 52, Moves.FIRE_BLAST ],
],
[Species.NINETALES]: [
[ 1, Moves.TAIL_WHIP ],
[ 1, Moves.FLAMETHROWER ],
[ 1, Moves.TAIL_WHIP ],
[ 1, Moves.QUICK_ATTACK ],
[ 1, Moves.DISABLE ],
[ 1, Moves.EMBER ],
[ 1, Moves.FIRE_SPIN ],
[ 1, Moves.CONFUSE_RAY ],
[ 1, Moves.FIRE_BLAST ],
[ 1, Moves.SPITE ],
[ 1, Moves.SAFEGUARD ],
[ 1, Moves.WILL_O_WISP ],
[ 1, Moves.IMPRISON ],
[ 1, Moves.EXTRASENSORY ],
[ 1, Moves.NASTY_PLOT ],
[ 1, Moves.INCINERATE ],
[ 1, Moves.INFERNO ],
],
[Species.JIGGLYPUFF]: [
[ 1, Moves.POUND ],
@ -995,9 +1025,18 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.POLIWRATH]: [
[ 0, Moves.DYNAMIC_PUNCH ],
[ 1, Moves.BODY_SLAM ],
[ 1, Moves.BUBBLE_BEAM ],
[ 1, Moves.BODY_SLAM ],
[ 1, Moves.HYPNOSIS ],
[ 1, Moves.POUND ],
[ 1, Moves.DOUBLE_EDGE ],
[ 1, Moves.WATER_GUN ],
[ 1, Moves.HYDRO_PUMP ],
[ 1, Moves.BELLY_DRUM ],
[ 1, Moves.RAIN_DANCE ],
[ 1, Moves.MUD_SHOT ],
[ 1, Moves.EARTH_POWER ],
[ 1, Moves.CIRCLE_THROW ],
],
[Species.ABRA]: [
[ 1, Moves.TELEPORT ],
@ -1121,9 +1160,14 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[Species.VICTREEBEL]: [
[ 0, Moves.LEAF_STORM ],
[ 1, Moves.VINE_WHIP ],
[ 1, Moves.RAZOR_LEAF ],
[ 1, Moves.SLEEP_POWDER ],
[ 1, Moves.SWEET_SCENT ],
[ 1, Moves.RAZOR_LEAF ],
[ 1, Moves.STOCKPILE ],
[ 1, Moves.SWALLOW ],
[ 1, Moves.SPIT_UP ],
[ 1, Moves.GASTRO_ACID ],
[ 1, Moves.POWER_WHIP ],
[ 44, Moves.LEAF_BLADE ],
],
[Species.TENTACOOL]: [
@ -1671,23 +1715,24 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.EXEGGUTOR]: [
[ 0, Moves.STOMP ],
[ 1, Moves.ABSORB ],
[ 1, Moves.SEED_BOMB ],
[ 1, Moves.PSYSHOCK ],
[ 1, Moves.WOOD_HAMMER ],
[ 1, Moves.LEAF_STORM ],
[ 1, Moves.MEGA_DRAIN ],
[ 1, Moves.LEECH_SEED ],
[ 1, Moves.SOLAR_BEAM ],
[ 1, Moves.CONFUSION ],
[ 1, Moves.SYNTHESIS ],
[ 1, Moves.BULLET_SEED ],
[ 1, Moves.GIGA_DRAIN ],
[ 1, Moves.EXTRASENSORY ],
[ 1, Moves.UPROAR ],
[ 1, Moves.WORRY_SEED ],
[ 1, Moves.SOLAR_BEAM ],
[ 1, Moves.ABSORB ],
[ 1, Moves.HYPNOSIS ],
[ 1, Moves.REFLECT ],
[ 1, Moves.GIGA_DRAIN ],
[ 1, Moves.SYNTHESIS ],
[ 1, Moves.UPROAR ],
[ 1, Moves.EXTRASENSORY ],
[ 1, Moves.BULLET_SEED ],
[ 1, Moves.WORRY_SEED ],
[ 1, Moves.SEED_BOMB ],
[ 1, Moves.LEAF_STORM ],
[ 1, Moves.WOOD_HAMMER ],
[ 1, Moves.PSYSHOCK ],
[ 1, Moves.LEECH_SEED ],
[ 1, Moves.GROWTH ],
],
[Species.CUBONE]: [
[ 1, Moves.GROWL ],
@ -3107,10 +3152,20 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.POLITOED]: [
[ 0, Moves.BOUNCE ],
[ 1, Moves.POUND ],
[ 1, Moves.RAIN_DANCE ],
[ 1, Moves.HYDRO_PUMP ],
[ 1, Moves.BELLY_DRUM ],
[ 1, Moves.RAIN_DANCE ],
[ 1, Moves.POUND ],
[ 1, Moves.BODY_SLAM ],
[ 1, Moves.DOUBLE_EDGE ],
[ 1, Moves.WATER_GUN ],
[ 1, Moves.BUBBLE_BEAM ],
[ 1, Moves.HYPNOSIS ],
[ 1, Moves.PERISH_SONG ],
[ 1, Moves.SWAGGER ],
[ 1, Moves.HYPER_VOICE ],
[ 1, Moves.MUD_SHOT ],
[ 1, Moves.EARTH_POWER ],
],
[Species.HOPPIP]: [
[ 1, Moves.TACKLE ],
@ -3336,13 +3391,15 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 60, Moves.QUASH ],
],
[Species.SLOWKING]: [
[ 1, Moves.TACKLE ],
[ 1, Moves.GROWL ],
[ 1, Moves.WATER_GUN ],
[ 1, Moves.CURSE ],
[ 1, Moves.SWAGGER ],
[ 1, Moves.POWER_GEM ],
[ 1, Moves.NASTY_PLOT ],
[ 1, Moves.SWAGGER ],
[ 1, Moves.TACKLE ],
[ 1, Moves.CURSE ],
[ 1, Moves.GROWL ],
[ 1, Moves.WATER_GUN ],
[ 1, Moves.FUTURE_SIGHT ],
[ 1, Moves.CHILLY_RECEPTION ],
[ 9, Moves.YAWN ],
[ 12, Moves.CONFUSION ],
[ 15, Moves.DISABLE ],
@ -4559,9 +4616,22 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 64, Moves.HYDRO_PUMP ],
],
[Species.LUDICOLO]: [
[ 1, Moves.FAKE_OUT ],
[ 1, Moves.BUBBLE_BEAM ],
[ 1, Moves.RAIN_DANCE ],
[ 1, Moves.FAKE_OUT ],
[ 1, Moves.GROWL ],
[ 1, Moves.MIST ],
[ 1, Moves.WATER_GUN ],
[ 1, Moves.HYDRO_PUMP ],
[ 1, Moves.ABSORB ],
[ 1, Moves.MEGA_DRAIN ],
[ 1, Moves.FURY_SWIPES ],
[ 1, Moves.FLAIL ],
[ 1, Moves.KNOCK_OFF ],
[ 1, Moves.TEETER_DANCE ],
[ 1, Moves.ASTONISH ],
[ 1, Moves.ENERGY_BALL ],
[ 1, Moves.ZEN_HEADBUTT ],
],
[Species.SEEDOT]: [
[ 1, Moves.TACKLE ],
@ -4601,10 +4671,27 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.SHIFTRY]: [
[ 0, Moves.LEAF_BLADE ],
[ 1, Moves.SUNNY_DAY ],
[ 1, Moves.AIR_CUTTER ],
[ 1, Moves.PAYBACK ],
[ 1, Moves.HURRICANE ],
[ 1, Moves.PAYBACK ],
[ 1, Moves.SUNNY_DAY ],
[ 1, Moves.WHIRLWIND ],
[ 1, Moves.TACKLE ],
[ 1, Moves.ABSORB ],
[ 1, Moves.MEGA_DRAIN ],
[ 1, Moves.GROWTH ],
[ 1, Moves.RAZOR_LEAF ],
[ 1, Moves.HARDEN ],
[ 1, Moves.EXPLOSION ],
[ 1, Moves.ROLLOUT ],
[ 1, Moves.SWAGGER ],
[ 1, Moves.SYNTHESIS ],
[ 1, Moves.BEAT_UP ],
[ 1, Moves.FAKE_OUT ],
[ 1, Moves.TORMENT ],
[ 1, Moves.ASTONISH ],
[ 1, Moves.EXTRASENSORY ],
[ 1, Moves.SUCKER_PUNCH ],
],
[Species.TAILLOW]: [
[ 1, Moves.GROWL ],
@ -9594,21 +9681,21 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 48, Moves.LAST_RESORT ],
],
[Species.CINCCINO]: [
[ 0, Moves.TAIL_SLAP ],
[ 1, Moves.BULLET_SEED ],
[ 1, Moves.SING ],
[ 1, Moves.CHARM ],
[ 1, Moves.POUND ],
[ 1, Moves.SLAM ],
[ 1, Moves.SING ],
[ 1, Moves.SWIFT ],
[ 1, Moves.CHARM ],
[ 1, Moves.ENCORE ],
[ 1, Moves.HELPING_HAND ],
[ 1, Moves.HYPER_VOICE ],
[ 1, Moves.TICKLE ],
[ 1, Moves.BULLET_SEED ],
[ 1, Moves.ROCK_BLAST ],
[ 1, Moves.LAST_RESORT ],
[ 1, Moves.AFTER_YOU ],
[ 1, Moves.ECHOED_VOICE ],
[ 1, Moves.TAIL_SLAP ],
[ 1, Moves.BABY_DOLL_EYES ],
],
[Species.GOTHITA]: [
@ -12401,10 +12488,16 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.VIKAVOLT]: [
[ 0, Moves.THUNDERBOLT ],
[ 1, Moves.STRING_SHOT ],
[ 1, Moves.CRUNCH ],
[ 1, Moves.CHARGE ],
[ 1, Moves.CRUNCH ],
[ 1, Moves.DISCHARGE ],
[ 1, Moves.STRING_SHOT ],
[ 1, Moves.VISE_GRIP ],
[ 1, Moves.DIG ],
[ 1, Moves.MUD_SLAP ],
[ 1, Moves.IRON_DEFENSE ],
[ 1, Moves.X_SCISSOR ],
[ 1, Moves.BUG_BITE ],
[ 15, Moves.BITE ],
[ 23, Moves.SPARK ],
[ 29, Moves.STICKY_WEB ],
@ -15579,9 +15672,13 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.CERULEDGE]: [
[ 0, Moves.SHADOW_CLAW ],
[ 1, Moves.LEER ],
[ 1, Moves.EMBER ],
[ 1, Moves.LEER ],
[ 1, Moves.ASTONISH ],
[ 1, Moves.NIGHT_SLASH ],
[ 1, Moves.SHADOW_SNEAK ],
[ 1, Moves.QUICK_GUARD ],
[ 1, Moves.SOLAR_BLADE ],
[ 8, Moves.CLEAR_SMOG ],
[ 12, Moves.FIRE_SPIN ],
[ 16, Moves.WILL_O_WISP ],
@ -16859,6 +16956,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.SWEET_SCENT ],
[ 1, Moves.RECYCLE ],
[ 1, Moves.ASTONISH ],
[ 1, Moves.INFESTATION ],
[ 4, Moves.DRAGON_TAIL ],
[ 8, Moves.GROWTH ],
[ 12, Moves.DRAGON_BREATH ],
@ -16985,6 +17083,9 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 1, Moves.SWEET_SCENT ],
[ 1, Moves.RECYCLE ],
[ 1, Moves.ASTONISH ],
[ 1, Moves.YAWN ],
[ 1, Moves.DOUBLE_HIT ],
[ 1, Moves.INFESTATION ],
[ 4, Moves.DRAGON_TAIL ],
[ 8, Moves.GROWTH ],
[ 12, Moves.DRAGON_BREATH ],
@ -17178,10 +17279,25 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.ALOLA_SANDSLASH]: [
[ 0, Moves.ICICLE_SPEAR ],
[ 1, Moves.SWORDS_DANCE ],
[ 1, Moves.SLASH ],
[ 1, Moves.METAL_CLAW ],
[ 1, Moves.ICICLE_CRASH ],
[ 1, Moves.METAL_CLAW ],
[ 1, Moves.SLASH ],
[ 1, Moves.SWORDS_DANCE ],
[ 1, Moves.SCRATCH ],
[ 1, Moves.MIST ],
[ 1, Moves.BLIZZARD ],
[ 1, Moves.DEFENSE_CURL ],
[ 1, Moves.SWIFT ],
[ 1, Moves.FURY_SWIPES ],
[ 1, Moves.POWDER_SNOW ],
[ 1, Moves.ROLLOUT ],
[ 1, Moves.FURY_CUTTER ],
[ 1, Moves.RAPID_SPIN ],
[ 1, Moves.IRON_DEFENSE ],
[ 1, Moves.GYRO_BALL ],
[ 1, Moves.METAL_BURST ],
[ 1, Moves.IRON_HEAD ],
[ 1, Moves.SNOWSCAPE ],
],
[Species.ALOLA_VULPIX]: [
[ 1, Moves.TAIL_WHIP ],
@ -17202,10 +17318,22 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.ALOLA_NINETALES]: [
[ 0, Moves.DAZZLING_GLEAM ],
[ 1, Moves.TAIL_WHIP ],
[ 1, Moves.BLIZZARD ],
[ 1, Moves.ICY_WIND ],
[ 1, Moves.IMPRISON ],
[ 1, Moves.BLIZZARD ],
[ 1, Moves.TAIL_WHIP ],
[ 1, Moves.DISABLE ],
[ 1, Moves.MIST ],
[ 1, Moves.ICE_BEAM ],
[ 1, Moves.AURORA_BEAM ],
[ 1, Moves.CONFUSE_RAY ],
[ 1, Moves.SPITE ],
[ 1, Moves.POWDER_SNOW ],
[ 1, Moves.EXTRASENSORY ],
[ 1, Moves.NASTY_PLOT ],
[ 1, Moves.ICE_SHARD ],
[ 1, Moves.FREEZE_DRY ],
[ 1, Moves.AURORA_VEIL ],
],
[Species.ALOLA_DIGLETT]: [
[ 1, Moves.SAND_ATTACK ],
@ -17365,23 +17493,24 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.ALOLA_EXEGGUTOR]: [
[ 0, Moves.DRAGON_HAMMER ],
[ 1, Moves.ABSORB ],
[ 1, Moves.SEED_BOMB ],
[ 1, Moves.PSYSHOCK ],
[ 1, Moves.WOOD_HAMMER ],
[ 1, Moves.LEAF_STORM ],
[ 1, Moves.MEGA_DRAIN ],
[ 1, Moves.LEECH_SEED ],
[ 1, Moves.SOLAR_BEAM ],
[ 1, Moves.CONFUSION ],
[ 1, Moves.SYNTHESIS ],
[ 1, Moves.BULLET_SEED ],
[ 1, Moves.GIGA_DRAIN ],
[ 1, Moves.EXTRASENSORY ],
[ 1, Moves.UPROAR ],
[ 1, Moves.WORRY_SEED ],
[ 1, Moves.SOLAR_BEAM ],
[ 1, Moves.ABSORB ],
[ 1, Moves.HYPNOSIS ],
[ 1, Moves.REFLECT ],
[ 1, Moves.GIGA_DRAIN ],
[ 1, Moves.SYNTHESIS ],
[ 1, Moves.UPROAR ],
[ 1, Moves.EXTRASENSORY ],
[ 1, Moves.BULLET_SEED ],
[ 1, Moves.WORRY_SEED ],
[ 1, Moves.SEED_BOMB ],
[ 1, Moves.LEAF_STORM ],
[ 1, Moves.WOOD_HAMMER ],
[ 1, Moves.PSYSHOCK ],
[ 1, Moves.LEECH_SEED ],
[ 1, Moves.GROWTH ],
],
[Species.ALOLA_MAROWAK]: [
[ 0, Moves.SHADOW_BONE ],
@ -17634,13 +17763,16 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
],
[Species.GALAR_SLOWKING]: [
[ 0, Moves.EERIE_SPELL ],
[ 1, Moves.TACKLE ],
[ 1, Moves.GROWL ],
[ 1, Moves.ACID ],
[ 1, Moves.CURSE ],
[ 1, Moves.SWAGGER ],
[ 1, Moves.POWER_GEM ],
[ 1, Moves.NASTY_PLOT ],
[ 1, Moves.SWAGGER ],
[ 1, Moves.TACKLE ],
[ 1, Moves.CURSE ],
[ 1, Moves.GROWL ],
[ 1, Moves.ACID ],
[ 1, Moves.TOXIC ],
[ 1, Moves.FUTURE_SIGHT ],
[ 1, Moves.CHILLY_RECEPTION ],
[ 9, Moves.YAWN ],
[ 12, Moves.CONFUSION ],
[ 15, Moves.DISABLE ],
@ -18111,10 +18243,11 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
[ 40, Moves.EARTHQUAKE ],
],
[Species.BLOODMOON_URSALUNA]: [
[ 1, Moves.HEADLONG_RUSH ],
[ 1, Moves.SCRATCH ],
[ 1, Moves.LEER ],
[ 1, Moves.LICK ],
[ 1, Moves.HEADLONG_RUSH ],
[ 1, Moves.MOONLIGHT ],
[ 8, Moves.FURY_SWIPES ],
[ 13, Moves.PAYBACK ],
[ 17, Moves.HARDEN ],

View File

@ -30,7 +30,7 @@ export const menu: SimpleTranslationEntries = {
"boyOrGirl": "Es-tu un garçon ou une fille ?",
"boy": "Garçon",
"girl": "Fille",
"bossAppeared": "Un {{bossName}} est apparaît.",
"bossAppeared": "Un {{bossName}} apparaît.",
"trainerAppeared": "Un combat est lancé\npar {{trainerName}} !",
"singleWildAppeared": "Un {{pokemonName}} sauvage apparaît !",
"multiWildAppeared": "Un {{pokemonName1}} et un {{pokemonName2}}\nsauvages apparaissent !",
@ -43,7 +43,7 @@ export const menu: SimpleTranslationEntries = {
"sendOutPokemon": "{{pokemonName}} ! Go !",
"levelCapUp": "La limite de niveau\na été augmentée à {{levelCap}} !",
"moveNotImplemented": "{{moveName}} n'est pas encore implémenté et ne peut pas être sélectionné.",
"moveDisabled": "{{moveName}} est désactivé !",
"moveDisabled": "{{moveName}} est sous entrave !",
"noPokeballForce": "Une force mystérieuse\nempêche l'utilisation des Poké Balls.",
"noPokeballTrainer": "Le Dresseur détourne la Ball\nVoler, c'est mal !",
"noPokeballMulti": "Impossible ! On ne peut pas viser\nquand il y a deux Pokémon!",
@ -53,5 +53,5 @@ export const menu: SimpleTranslationEntries = {
"noEscapePokemon": "{{moveName}} de {{pokemonName}}\nempêche {{escapeVerb}} !",
"escapeVerbSwitch": "le changement",
"escapeVerbFlee": "la fuite",
"notDisabled": "{{moveName}} n'est plus désactivé !",
"notDisabled": "{{moveName}} n'est plus sous entrave !",
} as const;

View File

@ -1185,7 +1185,7 @@ export class SummonPhase extends PartyMemberPokemonPhase {
}
if (this.player) {
this.scene.ui.showText(`Go! ${this.getPokemon().name}!`);
this.scene.ui.showText(i18next.t('menu:playerGo', {pokemonName: this.getPokemon().name}));
if (this.player)
this.scene.pbTray.hide();
this.scene.trainer.setTexture(`trainer_${this.scene.gameData.gender === PlayerGender.FEMALE ? 'f' : 'm'}_back_pb`);