Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-FixTrapinchAbility

# Conflicts: # src/data/pokemon/base_stats.h
2024-11-17 03:57:38 +01:00 · 2020-11-02 19:39:18 -03:00 · 2020-11-02 19:39:18 -03:00 · c598daf228
commit c598daf228
parent 014afea3df d6cbbc71a5
9 changed files with 3636 additions and 1322 deletions
--- a/graphics/pokemon/bidoof/footprint.png
+++ b/graphics/pokemon/bidoof/footprint.png
--- a/graphics/pokemon/lucario/footprint.png
+++ b/graphics/pokemon/lucario/footprint.png
--- a/graphics/pokemon/luxray/footprint.png
+++ b/graphics/pokemon/luxray/footprint.png
--- a/graphics/pokemon/regigigas/footprint.png
+++ b/graphics/pokemon/regigigas/footprint.png
--- a/graphics/pokemon/staraptor/footprint.png
+++ b/graphics/pokemon/staraptor/footprint.png
--- a/graphics/pokemon/staravia/footprint.png
+++ b/graphics/pokemon/staravia/footprint.png
--- a/graphics/pokemon/starly/footprint.png
+++ b/graphics/pokemon/starly/footprint.png
--- a/include/constants/pokemon_config.h
+++ b/include/constants/pokemon_config.h
@ -13,7 +13,9 @@
 #define GEN_8 5
 #endif

-#define P_UPDATED_TYPES     GEN_8 // In Gen6+, several Pokémon were changed to be partially or fully Fairy type.
-#define P_UPDATED_STATS     GEN_8 // Since Gen 6, Pokémon stats are updated with each passing generation.
+#define P_UPDATED_TYPES         GEN_8 // In Gen6+, several Pokémon were changed to be partially or fully Fairy type.
+#define P_UPDATED_STATS         GEN_8 // Since Gen 6, Pokémon stats are updated with each passing generation.
+#define P_UPDATED_ABILITIES     GEN_8 // Since Gen 6, certain Pokémon have their abilities changed. Requires BATTLE_ENGINE for Gen4+ abilities.
+#define P_UPDATED_EGG_GROUPS    GEN_8 // Since Gen 8, certain Pokémon have gained new egg groups.

 #endif // GUARD_CONSTANTS_POKEMON_CONFIG_H
--- a/src/data/pokemon/base_stats.h
+++ b/src/data/pokemon/base_stats.h