Skip to content

Commit

Permalink
Merge pull request #189 from BuffelSaft/balance
Browse files Browse the repository at this point in the history 
Balance
  • Loading branch information
@BuffelSaft
BuffelSaft authored Sep 2, 2021
2 parents b331263 + e45e5c7 commit 75d752a
Show file tree
Hide file tree
Showing 7 changed files with 122 additions and 83 deletions.
1 change: 1 addition & 0 deletions include/constants/spreads.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions src/battle_script_commands.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand All @@ -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,
Expand Down
53 changes: 35 additions & 18 deletions src/data/pokemon/base_stats.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
52 changes: 27 additions & 25 deletions src/data/pokemon/level_up_learnsets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
};

Expand Down
Loading

0 comments on commit 75d752a

Please sign in to comment.