diff --git a/include/constants/spreads.h b/include/constants/spreads.h index e8f8fd4e6925..4b41c104f8c0 100644 --- a/include/constants/spreads.h +++ b/include/constants/spreads.h @@ -52,5 +52,6 @@ #define SPREAD_HP_FIRE_MODEST_BULKY 48 // Roxanne's Probopass #define SPREAD_LYCANROC_MIDDAY 49 // Roxanne's Lycanroc #define SPREAD_STAKATAKA 50 // Roxanne's Stakataka +#define SPREAD_31_IV_HP_SPATK_MIXED 51 // Max HP, Sp Atk, Quiet. Maxie 1's Camerupt #endif // GUARD_CONSTANTS_TRAINER_SPREADS diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a0173696e690..a26b1e8abc21 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1130,16 +1130,16 @@ static const u16 sPickupItems[] = ITEM_REVIVE, ITEM_QUICK_BALL, ITEM_ETHER, - ITEM_FULL_HEAL, - ITEM_ULTRA_BALL, ITEM_HYPER_POTION, + ITEM_CHERISH_BALL, + ITEM_MAX_ETHER, ITEM_RARE_CANDY, ITEM_BOTTLE_CAP, ITEM_MAX_REVIVE, ITEM_LEFTOVERS, ITEM_FULL_RESTORE, - ITEM_MAX_REVIVE, ITEM_PP_UP, + ITEM_PP_MAX, ITEM_MAX_ELIXIR, }; @@ -1149,7 +1149,7 @@ static const u16 sRarePickupItems[] = ITEM_NUGGET, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, - ITEM_ETHER, + ITEM_PEARL_STRING, ITEM_BALM_MUSHROOM, ITEM_PP_MAX, ITEM_ELIXIR, diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 8efbe6445db0..c7ac389b0501 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -943,6 +943,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 150, .expYield = 113, .evYield_HP = 2, + .item1 = ITEM_STAR_PIECE, .item2 = ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, @@ -968,6 +969,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 25, .expYield = 217, .evYield_HP = 3, + .item1 = ITEM_STAR_PIECE, .item2 = ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, @@ -1415,6 +1417,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 58, .evYield_Speed = 1, + .item1 = ITEM_NUGGET, .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -1446,6 +1449,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 154, .evYield_Speed = 2, + .item1 = ITEM_NUGGET, .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -2361,6 +2365,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 65, .evYield_HP = 1, + .item1 = ITEM_NUGGET, .item2 = ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -2394,6 +2399,7 @@ const struct BaseStats gBaseStats[] = .evYield_HP = 1, .evYield_Attack = 1, .item1 = ITEM_BLACK_SLUDGE, + .item2 = ITEM_BIG_NUGGET, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -9070,7 +9076,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 161, .evYield_SpAttack = 2, - .item1 = ITEM_STARDUST, + .item1 = ITEM_STAR_PIECE, .item2 = ITEM_MOON_STONE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, @@ -9101,7 +9107,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 161, .evYield_Attack = 2, - .item1 = ITEM_STARDUST, + .item1 = ITEM_STAR_PIECE, .item2 = ITEM_SUN_STONE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, @@ -15302,6 +15308,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 66, .evYield_Speed = 1, + .item1 = ITEM_NUGGET, .item2 = ITEM_SILK_SCARF, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -20498,6 +20505,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 46, .evYield_Speed = 1, + .item1 = ITEM_NUGGET, + .item2 = ITEM_BIG_NUGGET, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -20554,7 +20563,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 140, .expYield = 64, .evYield_Defense = 1, - .item2 = ITEM_SPELL_TAG, + .item1 = ITEM_PEARL, + .item2 = ITEM_BIG_PEARL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -20586,7 +20596,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 168, .evYield_Defense = 2, - .item2 = ITEM_SPELL_TAG, + .item1 = ITEM_PEARL, + .item2 = ITEM_BIG_PEARL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -20692,7 +20703,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -25525,6 +25536,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 58, .evYield_Speed = 1, + .item1 = ITEM_NUGGET, .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -25556,6 +25568,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 154, .evYield_Speed = 2, + .item1 = ITEM_NUGGET, .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -25665,6 +25678,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 65, .evYield_HP = 1, + .item1 = ITEM_NUGGET, .item2 = ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, @@ -25692,6 +25706,8 @@ const struct BaseStats gBaseStats[] = .expYield = 175, .evYield_HP = 1, .evYield_Attack = 1, + .item1 = ITEM_BLACK_SLUDGE, + .item2 = ITEM_BIG_NUGGET, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -25771,6 +25787,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 58, .evYield_Attack = 1, + .item1 = ITEM_NUGGET, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -30858,7 +30875,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -30884,7 +30901,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -30910,7 +30927,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -30936,7 +30953,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -30962,7 +30979,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -30988,7 +31005,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -31014,7 +31031,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -31040,7 +31057,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -31066,7 +31083,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -31092,7 +31109,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -31118,7 +31135,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -31144,7 +31161,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -31170,7 +31187,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index efda56f14d56..c47c8ed29f43 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -2454,46 +2454,48 @@ static const struct LevelUpMove sStaryuLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 4, MOVE_WATER_GUN), - LEVEL_UP_MOVE( 7, MOVE_RAPID_SPIN), + LEVEL_UP_MOVE( 8, MOVE_CONFUSE_RAY), LEVEL_UP_MOVE(10, MOVE_RECOVER), + LEVEL_UP_MOVE(12, MOVE_RAPID_SPIN), LEVEL_UP_MOVE(13, MOVE_PSYWAVE), - LEVEL_UP_MOVE(16, MOVE_SWIFT), + LEVEL_UP_MOVE(16, MOVE_MINIMIZE), LEVEL_UP_MOVE(18, MOVE_BUBBLE_BEAM), + LEVEL_UP_MOVE(20, MOVE_SWIFT), LEVEL_UP_MOVE(22, MOVE_CAMOUFLAGE), - LEVEL_UP_MOVE(24, MOVE_GYRO_BALL), + LEVEL_UP_MOVE(24, MOVE_PSYBEAM), LEVEL_UP_MOVE(28, MOVE_BRINE), - LEVEL_UP_MOVE(31, MOVE_MINIMIZE), - LEVEL_UP_MOVE(35, MOVE_REFLECT_TYPE), - LEVEL_UP_MOVE(37, MOVE_POWER_GEM), - LEVEL_UP_MOVE(40, MOVE_CONFUSE_RAY), - LEVEL_UP_MOVE(42, MOVE_PSYCHIC), - LEVEL_UP_MOVE(46, MOVE_LIGHT_SCREEN), - LEVEL_UP_MOVE(49, MOVE_COSMIC_POWER), - LEVEL_UP_MOVE(53, MOVE_HYDRO_PUMP), + LEVEL_UP_MOVE(32, MOVE_LIGHT_SCREEN), + LEVEL_UP_MOVE(36, MOVE_POWER_GEM), + LEVEL_UP_MOVE(40, MOVE_PSYCHIC), + LEVEL_UP_MOVE(44, MOVE_SURF), + LEVEL_UP_MOVE(48, MOVE_REFLECT_TYPE), + LEVEL_UP_MOVE(52, MOVE_COSMIC_POWER), + LEVEL_UP_MOVE(56, MOVE_HYDRO_PUMP), LEVEL_UP_END }; static const struct LevelUpMove sStarmieLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SPOTLIGHT), - LEVEL_UP_MOVE( 1, MOVE_RECOVER), - LEVEL_UP_MOVE( 1, MOVE_PSYWAVE), - LEVEL_UP_MOVE( 1, MOVE_SWIFT), - LEVEL_UP_MOVE( 1, MOVE_BUBBLE_BEAM), - LEVEL_UP_MOVE( 1, MOVE_CAMOUFLAGE), - LEVEL_UP_MOVE( 1, MOVE_GYRO_BALL), - LEVEL_UP_MOVE( 1, MOVE_BRINE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_HARDEN), LEVEL_UP_MOVE( 1, MOVE_WATER_GUN), + LEVEL_UP_MOVE( 1, MOVE_CONFUSE_RAY), + LEVEL_UP_MOVE( 1, MOVE_RECOVER), LEVEL_UP_MOVE( 1, MOVE_RAPID_SPIN), - LEVEL_UP_MOVE(35, MOVE_MINIMIZE), - LEVEL_UP_MOVE(37, MOVE_REFLECT_TYPE), + LEVEL_UP_MOVE( 1, MOVE_PSYWAVE), + LEVEL_UP_MOVE( 1, MOVE_MINIMIZE), + LEVEL_UP_MOVE( 1, MOVE_BUBBLE_BEAM), + LEVEL_UP_MOVE( 1, MOVE_SWIFT), + LEVEL_UP_MOVE( 1, MOVE_CAMOUFLAGE), + LEVEL_UP_MOVE( 1, MOVE_PSYBEAM), + LEVEL_UP_MOVE(32, MOVE_BRINE), + LEVEL_UP_MOVE(36, MOVE_LIGHT_SCREEN), LEVEL_UP_MOVE(40, MOVE_POWER_GEM), - LEVEL_UP_MOVE(42, MOVE_CONFUSE_RAY), - LEVEL_UP_MOVE(46, MOVE_PSYCHIC), - LEVEL_UP_MOVE(49, MOVE_LIGHT_SCREEN), - LEVEL_UP_MOVE(53, MOVE_COSMIC_POWER), - LEVEL_UP_MOVE(57, MOVE_HYDRO_PUMP), + LEVEL_UP_MOVE(44, MOVE_PSYCHIC), + LEVEL_UP_MOVE(48, MOVE_SURF), + LEVEL_UP_MOVE(52, MOVE_REFLECT_TYPE), + LEVEL_UP_MOVE(56, MOVE_COSMIC_POWER), + LEVEL_UP_MOVE(60, MOVE_HYDRO_PUMP), LEVEL_UP_END }; diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 96526275867d..3a3830b86280 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -412,19 +412,19 @@ static const struct TrainerMonItemCustomMoves sParty_BrendanRoute110Mudkip[] = { .lvl = -1, .species = SPECIES_ARAQUANID, .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_BUG_BITE, MOVE_BUBBLE_BEAM, MOVE_ICE_FANG, MOVE_SPIDER_WEB + .moves = MOVE_BUG_BITE, MOVE_WATER_PULSE, MOVE_ICE_FANG, MOVE_SPIDER_WEB }, { .lvl = -1, .species = SPECIES_ARCANINE, .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_FLAME_BURST, MOVE_BITE, MOVE_EXTREME_SPEED, MOVE_ROAR + .moves = MOVE_FLAME_BURST, MOVE_THUNDER_FANG, MOVE_EXTREME_SPEED, MOVE_ROAR }, { .lvl = -1, .species = SPECIES_MIMIKYU, .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_HONE_CLAWS, MOVE_SLASH + .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_BULK_UP, MOVE_DRAIN_PUNCH }, { .lvl = 1, @@ -446,7 +446,7 @@ static const struct TrainerMonItemCustomMoves sParty_BrendanRoute110Treecko[] = .lvl = -1, .species = SPECIES_ARAQUANID, .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_BUG_BITE, MOVE_BUBBLE_BEAM, MOVE_ICE_FANG, MOVE_SPIDER_WEB + .moves = MOVE_BUG_BITE, MOVE_WATER_PULSE, MOVE_ICE_FANG, MOVE_SPIDER_WEB }, { .lvl = -1, @@ -459,7 +459,7 @@ static const struct TrainerMonItemCustomMoves sParty_BrendanRoute110Treecko[] = .lvl = -1, .species = SPECIES_MIMIKYU, .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_HONE_CLAWS, MOVE_SLASH + .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_BULK_UP, MOVE_DRAIN_PUNCH }, { .lvl = 1, @@ -481,7 +481,7 @@ static const struct TrainerMonItemCustomMoves sParty_BrendanRoute110Torchic[] = .lvl = -1, .species = SPECIES_ARCANINE, .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_FLAME_BURST, MOVE_BITE, MOVE_EXTREME_SPEED, MOVE_ROAR + .moves = MOVE_FLAME_BURST, MOVE_THUNDER_FANG, MOVE_EXTREME_SPEED, MOVE_ROAR }, { .lvl = -1, @@ -494,7 +494,7 @@ static const struct TrainerMonItemCustomMoves sParty_BrendanRoute110Torchic[] = .lvl = -1, .species = SPECIES_MIMIKYU, .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_HONE_CLAWS, MOVE_SLASH + .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_BULK_UP, MOVE_DRAIN_PUNCH }, { .lvl = 1, @@ -917,20 +917,20 @@ static const struct TrainerMonItemCustomMoves sParty_MayRoute110Mudkip[] = { .species = SPECIES_STARMIE, .ability = 1, // Natural Cure .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_BUBBLE_BEAM, MOVE_RECOVER, MOVE_PSYWAVE, MOVE_SWIFT + .moves = MOVE_WATER_PULSE, MOVE_RECOVER, MOVE_PSYBEAM, MOVE_ICY_WIND }, { .lvl = -1, .species = SPECIES_PONYTA, - .ability = 2, // Flame Body + .ability = 0, // Reckless .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_BLAZE_KICK, MOVE_TAIL_WHIP, MOVE_TAKE_DOWN, MOVE_DOUBLE_KICK + .moves = MOVE_BLAZE_KICK, MOVE_WILD_CHARGE, MOVE_TAKE_DOWN, MOVE_DOUBLE_KICK }, { .lvl = -1, .species = SPECIES_MIMIKYU, .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_HONE_CLAWS, MOVE_SLASH + .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_BULK_UP, MOVE_DRAIN_PUNCH }, { .lvl = 1, @@ -953,20 +953,20 @@ static const struct TrainerMonItemCustomMoves sParty_MayRoute110Treecko[] = { .species = SPECIES_STARMIE, .ability = 1, // Natural Cure .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_BUBBLE_BEAM, MOVE_RECOVER, MOVE_PSYWAVE, MOVE_SWIFT + .moves = MOVE_WATER_PULSE, MOVE_RECOVER, MOVE_PSYBEAM, MOVE_ICY_WIND }, { .lvl = -1, .species = SPECIES_TSAREENA, .ability = 1, // Queenly Majesty .spread = SPREAD_15_IV_0_EV, - .moves = MOVE_TROP_KICK, MOVE_DOUBLE_KICK, MOVE_U_TURN, MOVE_SYNTHESIS + .moves = MOVE_TROP_KICK, MOVE_LOW_SWEEP, MOVE_U_TURN, MOVE_SYNTHESIS }, { .lvl = -1, .species = SPECIES_MIMIKYU, .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_HONE_CLAWS, MOVE_SLASH + .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_BULK_UP, MOVE_DRAIN_PUNCH }, { .lvl = 1, @@ -989,20 +989,20 @@ static const struct TrainerMonItemCustomMoves sParty_MayRoute110Torchic[] = { .species = SPECIES_TSAREENA, .ability = 1, // Queenly Majesty .spread = SPREAD_15_IV_0_EV, - .moves = MOVE_TROP_KICK, MOVE_DOUBLE_KICK, MOVE_U_TURN, MOVE_SYNTHESIS + .moves = MOVE_TROP_KICK, MOVE_LOW_SWEEP, MOVE_U_TURN, MOVE_SYNTHESIS }, { .lvl = -1, .species = SPECIES_PONYTA, - .ability = 2, // Flame Body + .ability = 0, // Reckless .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_BLAZE_KICK, MOVE_TAIL_WHIP, MOVE_TAKE_DOWN, MOVE_DOUBLE_KICK + .moves = MOVE_BLAZE_KICK, MOVE_WILD_CHARGE, MOVE_TAKE_DOWN, MOVE_DOUBLE_KICK }, { .lvl = -1, .species = SPECIES_MIMIKYU, .spread = SPREAD_25_IV_0_EV, - .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_HONE_CLAWS, MOVE_SLASH + .moves = MOVE_SHADOW_CLAW, MOVE_SHADOW_SNEAK, MOVE_BULK_UP, MOVE_DRAIN_PUNCH }, { .lvl = 1, @@ -2951,31 +2951,31 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = { .heldItem = ITEM_LIGHT_CLAY, .ability = 0, // Pure Power .spread = SPREAD_BRAWLY_ONE_MON, - .moves = MOVE_DRAIN_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_SUBSTITUTE + .moves = MOVE_DRAIN_PUNCH, MOVE_LIGHT_SCREEN, MOVE_REFLECT, MOVE_ZEN_HEADBUTT }, { .lvl = -2, - .species = SPECIES_SCRAGGY, - .heldItem = ITEM_CHESTO_BERRY, - .ability = 0, // Shed Skin + .species = SPECIES_BRELOOM, + .heldItem = ITEM_TOXIC_ORB, + .ability = 1, // Poison Heal .spread = SPREAD_BRAWLY_ONE_MON, - .moves = MOVE_DRAIN_PUNCH, MOVE_BULK_UP, MOVE_REST, MOVE_FEINT_ATTACK + .moves = MOVE_DRAIN_PUNCH, MOVE_BULK_UP, MOVE_BULLET_SEED, MOVE_SPORE }, { .lvl = -2, - .species = SPECIES_CROAGUNK, + .species = SPECIES_LUCARIO, .heldItem = ITEM_CHESTO_BERRY, - .ability = 1, // Dry Skin + .ability = 0, // Steadfast .spread = SPREAD_BRAWLY_ONE_MON, - .moves = MOVE_LOW_SWEEP, MOVE_BULK_UP, MOVE_POISON_JAB, MOVE_BULLET_PUNCH + .moves = MOVE_BULLET_PUNCH, MOVE_BULK_UP, MOVE_PAYBACK, MOVE_REVERSAL }, { .lvl = -2, - .species = SPECIES_CRABRAWLER, + .species = SPECIES_HITMONCHAN, .heldItem = ITEM_COBA_BERRY, - .ability = 0, // Hyper Cutter + .ability = 0, // Keen Eye .spread = SPREAD_BRAWLY_ONE_MON, - .moves = MOVE_BRICK_BREAK, MOVE_BULK_UP, MOVE_SCALD, MOVE_ICE_PUNCH + .moves = MOVE_DRAIN_PUNCH, MOVE_BULK_UP, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH }, { .lvl = -2, @@ -2991,7 +2991,7 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = { .heldItem = ITEM_SITRUS_BERRY, .ability = 1, // Guts .spread = SPREAD_BRAWLY_ONE_MON, - .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SURF, MOVE_BULK_UP + .moves = MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_BULLDOZE, MOVE_BULK_UP } }; @@ -8577,14 +8577,14 @@ static const struct TrainerMonItemCustomMoves sParty_MaxieMtChimney[] = { .heldItem = ITEM_BLACK_SLUDGE, .ability = 0, // Levitate .spread = SPREAD_31_IV_60_EV, - .moves = MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_TOXIC, MOVE_PROTECT + .moves = MOVE_VENOSHOCK, MOVE_THUNDERBOLT, MOVE_TOXIC, MOVE_HEAT_WAVE }, { .lvl = 1, .species = SPECIES_VICTREEBEL, .heldItem = ITEM_SCOPE_LENS, .ability = 0, // Chlorophyll - .spread = SPREAD_31_IV_60_EV, + .spread = SPREAD_31_IV_ATK_SPEED_JOLLY, .moves = MOVE_LEAF_BLADE, MOVE_POISON_JAB, MOVE_SUCKER_PUNCH, MOVE_SLEEP_POWDER }, { @@ -8592,7 +8592,7 @@ static const struct TrainerMonItemCustomMoves sParty_MaxieMtChimney[] = { .species = SPECIES_CAMERUPT, .heldItem = ITEM_POWER_HERB, .ability = 0, // Sheer Force - .spread = SPREAD_31_IV_80_EV, + .spread = SPREAD_31_IV_HP_SPATK_MIXED, .moves = MOVE_EARTH_POWER, MOVE_FIRE_BLAST, MOVE_ROCK_SLIDE, MOVE_SOLAR_BEAM } }; @@ -15030,10 +15030,10 @@ static const struct TrainerMonItemCustomMoves sParty_MaxieMagmaHideout[] = { { .lvl = 0, .species = SPECIES_GROUDON, - .heldItem = ITEM_NONE, + .heldItem = ITEM_HEAT_ROCK, .ability = 0, // Drought .spread = SPREAD_31_IV_HP_ATK_MIXED, - .moves = MOVE_PRECIPICE_BLADES, MOVE_HEAT_CRASH, MOVE_SOLAR_BEAM, MOVE_BULK_UP + .moves = MOVE_PRECIPICE_BLADES, MOVE_HEAT_CRASH, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY }, { .lvl = 1, diff --git a/src/data/trainer_spreads.h b/src/data/trainer_spreads.h index 4705fd559add..2d8033809aba 100644 --- a/src/data/trainer_spreads.h +++ b/src/data/trainer_spreads.h @@ -867,4 +867,23 @@ const struct TrainerMonSpread gSets[] = { }, .nature = NATURE_LONELY }, + [SPREAD_31_IV_HP_SPATK_MIXED] = { + .EVs = { + 252, // HP + 4, // Attack + 0, // Defense + 0, // Speed + 252, // Special Attack + 0 // Special Defense + }, + .IVs = { + 31, // HP + 31, // Attack + 31, // Defense + 31, // Speed + 31, // Special Attack + 31 // Special Defense + }, + .nature = NATURE_QUIET + }, }; diff --git a/src/data/trainers.h b/src/data/trainers.h index 426736ac4bf2..4910ddba5a8e 100644 --- a/src/data/trainers.h +++ b/src/data/trainers.h @@ -3732,7 +3732,7 @@ const struct Trainer gTrainers[] = { .trainerName = _("Brawly"), .items = {ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE}, .doubleBattle = FALSE, - .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, + .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_SETUP_FIRST_TURN, .partySize = ARRAY_COUNT(sParty_Brawly1), .party = {.ItemCustomMoves = sParty_Brawly1}, },