From 2b95f9fc43bf05d498a50efe999b9abdfa38a56c Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Fri, 16 Oct 2020 21:04:11 -0300
Subject: [PATCH 1/4] Updated types and stats in config.

---
 include/constants/pokemon_config.h |  19 ++
 include/pokemon.h                  |   1 +
 src/data/pokemon/base_stats.h      | 370 +++++++++++++++++++++++++++++
 3 files changed, 390 insertions(+)
 create mode 100644 include/constants/pokemon_config.h

diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h
new file mode 100644
index 0000000000..f0fcc5fc07
--- /dev/null
+++ b/include/constants/pokemon_config.h
@@ -0,0 +1,19 @@
+#ifndef GUARD_CONSTANTS_POKEMON_CONFIG_H
+#define GUARD_CONSTANTS_POKEMON_CONFIG_H
+
+// Used by other branches to communicate with each other.
+#define POKEMON_EXPANSION
+
+#ifndef GEN_3
+#define GEN_3 0
+#define GEN_4 1
+#define GEN_5 2
+#define GEN_6 3
+#define GEN_7 4
+#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.
+
+#endif // GUARD_CONSTANTS_POKEMON_CONFIG_H
diff --git a/include/pokemon.h b/include/pokemon.h
index a9ce1d1496..f503f30cff 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -4,6 +4,7 @@
 #include "constants/pokemon.h"
 #include "sprite.h"
 #include "constants/region_map_sections.h"
+#include "constants/pokemon_config.h"
 
 struct PokemonSubstruct0
 {
diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h
index 2dca94a4ad..4ce1409492 100644
--- a/src/data/pokemon/base_stats.h
+++ b/src/data/pokemon/base_stats.h
@@ -290,7 +290,11 @@ const struct BaseStats gBaseStats[] =
         .baseAttack    = 45,
         .baseDefense   = 50,
         .baseSpeed     = 70,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpAttack  = 90,
+        #else
+        .baseSpAttack  = 80,
+        #endif
         .baseSpDefense = 80,
         .type1 = TYPE_BUG,
         .type2 = TYPE_FLYING,
@@ -363,7 +367,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_BEEDRILL] =
     {
         .baseHP        = 65,
+        #if P_UPDATED_STATS >= GEN_6
         .baseAttack    = 90,
+        #else
+        .baseAttack    = 80,
+        #endif
         .baseDefense   = 40,
         .baseSpeed     = 75,
         .baseSpAttack  = 45,
@@ -442,7 +450,11 @@ const struct BaseStats gBaseStats[] =
         .baseHP        = 83,
         .baseAttack    = 80,
         .baseDefense   = 75,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpeed     = 101,
+        #else
+        .baseSpeed     = 91,
+        #endif
         .baseSpAttack  = 70,
         .baseSpDefense = 70,
         .type1 = TYPE_NORMAL,
@@ -592,7 +604,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_ARBOK] =
     {
         .baseHP        = 60,
+        #if P_UPDATED_STATS >= GEN_7
         .baseAttack    = 95,
+        #else
+        .baseAttack    = 85,
+        #endif
         .baseDefense   = 69,
         .baseSpeed     = 80,
         .baseSpAttack  = 65,
@@ -618,10 +634,17 @@ const struct BaseStats gBaseStats[] =
     {
         .baseHP        = 35,
         .baseAttack    = 55,
+        #if P_UPDATED_STATS >= GEN_6
         .baseDefense   = 40,
         .baseSpeed     = 90,
         .baseSpAttack  = 50,
         .baseSpDefense = 50,
+        #else
+        .baseDefense   = 30,
+        .baseSpeed     = 90,
+        .baseSpAttack  = 50,
+        .baseSpDefense = 40,
+        #endif
         .type1 = TYPE_ELECTRIC,
         .type2 = TYPE_ELECTRIC,
         .catchRate = 190,
@@ -645,7 +668,11 @@ const struct BaseStats gBaseStats[] =
         .baseHP        = 60,
         .baseAttack    = 90,
         .baseDefense   = 55,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpeed     = 110,
+        #else
+        .baseSpeed     = 100,
+        #endif
         .baseSpAttack  = 90,
         .baseSpDefense = 80,
         .type1 = TYPE_ELECTRIC,
@@ -770,7 +797,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_NIDOQUEEN] =
     {
         .baseHP        = 90,
+        #if P_UPDATED_STATS >= GEN_6
         .baseAttack    = 92,
+        #else
+        .baseAttack    = 82,
+        #endif
         .baseDefense   = 87,
         .baseSpeed     = 76,
         .baseSpAttack  = 75,
@@ -845,7 +876,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_NIDOKING] =
     {
         .baseHP        = 81,
+        #if P_UPDATED_STATS >= GEN_6
         .baseAttack    = 102,
+        #else
+        .baseAttack    = 92,
+        #endif
         .baseDefense   = 77,
         .baseSpeed     = 85,
         .baseSpAttack  = 85,
@@ -875,8 +910,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 35,
         .baseSpAttack  = 60,
         .baseSpDefense = 65,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_FAIRY,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_NORMAL,
+        #endif
         .catchRate = 150,
         .expYield = 113,
         .evYield_HP        = 2,
@@ -899,10 +939,19 @@ const struct BaseStats gBaseStats[] =
         .baseAttack    = 70,
         .baseDefense   = 73,
         .baseSpeed     = 60,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpAttack  = 95,
+        #else
+        .baseSpAttack  = 85,
+        #endif
         .baseSpDefense = 90,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_FAIRY,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_NORMAL,
+        #endif
         .catchRate = 25,
         .expYield = 217,
         .evYield_HP        = 3,
@@ -980,8 +1029,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 20,
         .baseSpAttack  = 45,
         .baseSpDefense = 25,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_NORMAL,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_NORMAL,
+        #endif
         .catchRate = 170,
         .expYield = 95,
         .evYield_HP        = 2,
@@ -1004,10 +1058,19 @@ const struct BaseStats gBaseStats[] =
         .baseAttack    = 70,
         .baseDefense   = 45,
         .baseSpeed     = 45,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpAttack  = 85,
+        #else
+        .baseSpAttack  = 75,
+        #endif
         .baseSpDefense = 50,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_NORMAL,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_NORMAL,
+        #endif
         .catchRate = 50,
         .expYield = 196,
         .evYield_HP        = 3,
@@ -1132,7 +1195,11 @@ const struct BaseStats gBaseStats[] =
         .baseAttack    = 80,
         .baseDefense   = 85,
         .baseSpeed     = 50,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpAttack  = 110,
+        #else
+        .baseSpAttack  = 100,
+        #endif
         .baseSpDefense = 90,
         .type1 = TYPE_GRASS,
         .type2 = TYPE_POISON,
@@ -1288,7 +1355,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_DUGTRIO] =
     {
         .baseHP        = 35,
+        #if P_UPDATED_STATS >= GEN_7
         .baseAttack    = 100,
+        #else
+        .baseAttack    = 80,
+        #endif
         .baseDefense   = 50,
         .baseSpeed     = 120,
         .baseSpAttack  = 50,
@@ -1567,7 +1638,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_POLIWRATH] =
     {
         .baseHP        = 90,
+        #if P_UPDATED_STATS >= GEN_6
         .baseAttack    = 95,
+        #else
+        .baseAttack    = 85,
+        #endif
         .baseDefense   = 95,
         .baseSpeed     = 70,
         .baseSpAttack  = 70,
@@ -1649,7 +1724,11 @@ const struct BaseStats gBaseStats[] =
         .baseDefense   = 45,
         .baseSpeed     = 120,
         .baseSpAttack  = 135,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpDefense = 95,
+        #else
+        .baseSpDefense = 85,
+        #endif
         .type1 = TYPE_PSYCHIC,
         .type2 = TYPE_PSYCHIC,
         .catchRate = 50,
@@ -1803,7 +1882,11 @@ const struct BaseStats gBaseStats[] =
         .baseDefense   = 65,
         .baseSpeed     = 70,
         .baseSpAttack  = 100,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpDefense = 70,
+        #else
+        .baseSpDefense = 60,
+        #endif
         .type1 = TYPE_GRASS,
         .type2 = TYPE_POISON,
         .catchRate = 45,
@@ -1928,7 +2011,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_GOLEM] =
     {
         .baseHP        = 80,
+        #if P_UPDATED_STATS >= GEN_6
         .baseAttack    = 120,
+        #else
+        .baseAttack    = 110,
+        #endif
         .baseDefense   = 130,
         .baseSpeed     = 45,
         .baseSpAttack  = 55,
@@ -2108,7 +2195,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_FARFETCHD] =
     {
         .baseHP        = 52,
+        #if P_UPDATED_STATS >= GEN_7
         .baseAttack    = 90,
+        #else
+        .baseAttack    = 65,
+        #endif
         .baseDefense   = 55,
         .baseSpeed     = 60,
         .baseSpAttack  = 58,
@@ -2162,7 +2253,11 @@ const struct BaseStats gBaseStats[] =
         .baseHP        = 60,
         .baseAttack    = 110,
         .baseDefense   = 70,
+        #if P_UPDATED_STATS >= GEN_7
         .baseSpeed     = 110,
+        #else
+        .baseSpeed     = 100,
+        #endif
         .baseSpAttack  = 60,
         .baseSpDefense = 60,
         .type1 = TYPE_NORMAL,
@@ -2567,7 +2662,11 @@ const struct BaseStats gBaseStats[] =
         .baseHP        = 60,
         .baseAttack    = 50,
         .baseDefense   = 70,
+        #if P_UPDATED_STATS >= GEN_7
         .baseSpeed     = 150,
+        #else
+        .baseSpeed     = 140,
+        #endif
         .baseSpAttack  = 80,
         .baseSpDefense = 80,
         .type1 = TYPE_ELECTRIC,
@@ -2620,7 +2719,11 @@ const struct BaseStats gBaseStats[] =
         .baseDefense   = 85,
         .baseSpeed     = 55,
         .baseSpAttack  = 125,
+        #if P_UPDATED_STATS >= GEN_7
         .baseSpDefense = 75,
+        #else
+        .baseSpDefense = 65,
+        #endif
         .type1 = TYPE_GRASS,
         .type2 = TYPE_PSYCHIC,
         .catchRate = 45,
@@ -3109,8 +3212,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 90,
         .baseSpAttack  = 100,
         .baseSpDefense = 120,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_PSYCHIC,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_PSYCHIC,
+        .type2 = TYPE_PSYCHIC,
+        #endif
         .catchRate = 45,
         .expYield = 161,
         .evYield_SpDefense = 2,
@@ -4175,7 +4283,11 @@ const struct BaseStats gBaseStats[] =
         .baseAttack    = 50,
         .baseDefense   = 50,
         .baseSpeed     = 70,
+        #if P_UPDATED_STATS >= GEN_7
         .baseSpAttack  = 86,
+        #else
+        .baseSpAttack  = 76,
+        #endif
         .baseSpDefense = 96,
         .type1 = TYPE_NORMAL,
         .type2 = TYPE_FLYING,
@@ -4276,7 +4388,11 @@ const struct BaseStats gBaseStats[] =
         .baseDefense   = 70,
         .baseSpeed     = 40,
         .baseSpAttack  = 60,
+        #if P_UPDATED_STATS >= GEN_7
         .baseSpDefense = 70,
+        #else
+        .baseSpDefense = 60,
+        #endif
         .type1 = TYPE_BUG,
         .type2 = TYPE_POISON,
         .catchRate = 90,
@@ -4404,8 +4520,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 15,
         .baseSpAttack  = 45,
         .baseSpDefense = 55,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_FAIRY,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_NORMAL,
+        #endif
         .catchRate = 150,
         .expYield = 44,
         .evYield_SpDefense = 1,
@@ -4430,8 +4551,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 15,
         .baseSpAttack  = 40,
         .baseSpDefense = 20,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_NORMAL,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_NORMAL,
+        #endif
         .catchRate = 170,
         .expYield = 42,
         .evYield_HP        = 1,
@@ -4455,8 +4581,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 20,
         .baseSpAttack  = 40,
         .baseSpDefense = 65,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_FAIRY,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_NORMAL,
+        #endif
         .catchRate = 190,
         .expYield = 49,
         .evYield_SpDefense = 1,
@@ -4480,8 +4611,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 40,
         .baseSpAttack  = 80,
         .baseSpDefense = 105,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_FAIRY,
         .type2 = TYPE_FLYING,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_FLYING,
+        #endif
         .catchRate = 75,
         .expYield = 142,
         .evYield_SpDefense = 2,
@@ -4602,7 +4738,11 @@ const struct BaseStats gBaseStats[] =
     {
         .baseHP        = 90,
         .baseAttack    = 75,
+        #if P_UPDATED_STATS >= GEN_6
         .baseDefense   = 85,
+        #else
+        .baseDefense   = 75,
+        #endif
         .baseSpeed     = 55,
         .baseSpAttack  = 115,
         .baseSpDefense = 90,
@@ -4627,7 +4767,11 @@ const struct BaseStats gBaseStats[] =
     {
         .baseHP        = 75,
         .baseAttack    = 80,
+        #if P_UPDATED_STATS >= GEN_6
         .baseDefense   = 95,
+        #else
+        .baseDefense   = 85,
+        #endif
         .baseSpeed     = 50,
         .baseSpAttack  = 90,
         .baseSpDefense = 100,
@@ -4657,8 +4801,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 40,
         .baseSpAttack  = 20,
         .baseSpDefense = 50,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_WATER,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_WATER,
+        .type2 = TYPE_WATER,
+        #endif
         .catchRate = 190,
         .expYield = 88,
         .evYield_HP        = 2,
@@ -4680,10 +4829,19 @@ const struct BaseStats gBaseStats[] =
         .baseAttack    = 50,
         .baseDefense   = 80,
         .baseSpeed     = 50,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpAttack  = 60,
+        #else
+        .baseSpAttack  = 50,
+        #endif
         .baseSpDefense = 80,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_WATER,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_WATER,
+        .type2 = TYPE_WATER,
+        #endif
         .catchRate = 75,
         .expYield = 189,
         .evYield_HP        = 3,
@@ -4807,7 +4965,11 @@ const struct BaseStats gBaseStats[] =
         .baseDefense   = 70,
         .baseSpeed     = 110,
         .baseSpAttack  = 55,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpDefense = 95,
+        #else
+        .baseSpDefense = 85,
+        #endif
         .type1 = TYPE_GRASS,
         .type2 = TYPE_FLYING,
         .catchRate = 45,
@@ -5310,8 +5472,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 30,
         .baseSpAttack  = 40,
         .baseSpDefense = 40,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_FAIRY,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_NORMAL,
+        #endif
         .catchRate = 190,
         .expYield = 60,
         .evYield_Attack    = 1,
@@ -5335,8 +5502,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 45,
         .baseSpAttack  = 60,
         .baseSpDefense = 60,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_FAIRY,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_NORMAL,
+        #endif
         .catchRate = 75,
         .expYield = 158,
         .evYield_Attack    = 2,
@@ -5356,7 +5528,11 @@ const struct BaseStats gBaseStats[] =
     {
         .baseHP        = 65,
         .baseAttack    = 95,
+        #if P_UPDATED_STATS >= GEN_7
         .baseDefense   = 85,
+        #else
+        .baseDefense   = 75,
+        #endif
         .baseSpeed     = 85,
         .baseSpAttack  = 55,
         .baseSpDefense = 55,
@@ -5559,11 +5735,19 @@ const struct BaseStats gBaseStats[] =
 
     [SPECIES_MAGCARGO] =
     {
+        #if P_UPDATED_STATS >= GEN_7
         .baseHP        = 60,
         .baseAttack    = 50,
         .baseDefense   = 120,
         .baseSpeed     = 30,
         .baseSpAttack  = 90,
+        #else
+        .baseHP        = 50,
+        .baseAttack    = 50,
+        .baseDefense   = 120,
+        .baseSpeed     = 30,
+        .baseSpAttack  = 80,
+        #endif
         .baseSpDefense = 80,
         .type1 = TYPE_FIRE,
         .type2 = TYPE_ROCK,
@@ -5635,12 +5819,21 @@ const struct BaseStats gBaseStats[] =
 
     [SPECIES_CORSOLA] =
     {
+        #if P_UPDATED_STATS >= GEN_7
         .baseHP        = 65,
         .baseAttack    = 55,
         .baseDefense   = 95,
         .baseSpeed     = 35,
         .baseSpAttack  = 65,
         .baseSpDefense = 95,
+        #else
+        .baseHP        = 55,
+        .baseAttack    = 55,
+        .baseDefense   = 85,
+        .baseSpeed     = 35,
+        .baseSpAttack  = 65,
+        .baseSpDefense = 85,
+        #endif
         .type1 = TYPE_WATER,
         .type2 = TYPE_ROCK,
         .catchRate = 60,
@@ -5738,7 +5931,11 @@ const struct BaseStats gBaseStats[] =
 
     [SPECIES_MANTINE] =
     {
+        #if P_UPDATED_STATS >= GEN_7
         .baseHP        = 85,
+        #else
+        .baseHP        = 65,
+        #endif
         .baseAttack    = 40,
         .baseDefense   = 70,
         .baseSpeed     = 70,
@@ -6788,7 +6985,11 @@ const struct BaseStats gBaseStats[] =
         .baseAttack    = 70,
         .baseDefense   = 50,
         .baseSpeed     = 65,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpAttack  = 100,
+        #else
+        .baseSpAttack  = 90,
+        #endif
         .baseSpDefense = 50,
         .type1 = TYPE_BUG,
         .type2 = TYPE_FLYING,
@@ -7045,7 +7246,11 @@ const struct BaseStats gBaseStats[] =
         .baseAttack    = 85,
         .baseDefense   = 60,
         .baseSpeed     = 125,
+        #if P_UPDATED_STATS >= GEN_7
         .baseSpAttack  = 75,
+        #else
+        .baseSpAttack  = 50,
+        #endif
         .baseSpDefense = 50,
         .type1 = TYPE_NORMAL,
         .type2 = TYPE_FLYING,
@@ -7096,7 +7301,11 @@ const struct BaseStats gBaseStats[] =
         .baseAttack    = 50,
         .baseDefense   = 100,
         .baseSpeed     = 65,
+        #if P_UPDATED_STATS >= GEN_7
         .baseSpAttack  = 95,
+        #else
+        .baseSpAttack  = 85,
+        #endif
         .baseSpDefense = 70,
         .type1 = TYPE_WATER,
         .type2 = TYPE_FLYING,
@@ -7124,8 +7333,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 40,
         .baseSpAttack  = 45,
         .baseSpDefense = 35,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_PSYCHIC,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_PSYCHIC,
+        .type2 = TYPE_PSYCHIC,
+        #endif
         .catchRate = 235,
         .expYield = 40,
         .evYield_SpAttack  = 1,
@@ -7149,8 +7363,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 50,
         .baseSpAttack  = 65,
         .baseSpDefense = 55,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_PSYCHIC,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_PSYCHIC,
+        .type2 = TYPE_PSYCHIC,
+        #endif
         .catchRate = 120,
         .expYield = 97,
         .evYield_SpAttack  = 2,
@@ -7174,8 +7393,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 80,
         .baseSpAttack  = 125,
         .baseSpDefense = 115,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_PSYCHIC,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_PSYCHIC,
+        .type2 = TYPE_PSYCHIC,
+        #endif
         .catchRate = 45,
         .expYield = 233,
         .evYield_SpAttack  = 3,
@@ -7222,8 +7446,13 @@ const struct BaseStats gBaseStats[] =
         .baseHP        = 70,
         .baseAttack    = 60,
         .baseDefense   = 62,
+        #if P_UPDATED_STATS >= GEN_7
         .baseSpeed     = 80,
         .baseSpAttack  = 100,
+        #else
+        .baseSpeed     = 60,
+        .baseSpAttack  = 80,
+        #endif
         .baseSpDefense = 82,
         .type1 = TYPE_BUG,
         .type2 = TYPE_FLYING,
@@ -7502,7 +7731,11 @@ const struct BaseStats gBaseStats[] =
         .baseDefense   = 63,
         .baseSpeed     = 68,
         .baseSpAttack  = 91,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpDefense = 73,
+        #else
+        .baseSpDefense = 63,
+        #endif
         .type1 = TYPE_NORMAL,
         .type2 = TYPE_NORMAL,
         .catchRate = 45,
@@ -7580,8 +7813,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 20,
         .baseSpAttack  = 20,
         .baseSpDefense = 40,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_NORMAL,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_NORMAL,
+        #endif
         .catchRate = 150,
         .expYield = 38,
         .evYield_HP        = 1,
@@ -7653,7 +7891,11 @@ const struct BaseStats gBaseStats[] =
         .baseHP        = 70,
         .baseAttack    = 65,
         .baseDefense   = 65,
+        #if P_UPDATED_STATS >= GEN_7
         .baseSpeed     = 90,
+        #else
+        .baseSpeed     = 70,
+        #endif
         .baseSpAttack  = 55,
         .baseSpDefense = 55,
         .type1 = TYPE_NORMAL,
@@ -7709,8 +7951,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 50,
         .baseSpAttack  = 55,
         .baseSpDefense = 55,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_STEEL,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_STEEL,
+        .type2 = TYPE_STEEL,
+        #endif
         .catchRate = 45,
         .expYield = 133,
         .evYield_Attack    = 1,
@@ -7962,10 +8209,17 @@ const struct BaseStats gBaseStats[] =
     {
         .baseHP        = 65,
         .baseAttack    = 73,
+        #if P_UPDATED_STATS >= GEN_7
         .baseDefense   = 75,
         .baseSpeed     = 85,
         .baseSpAttack  = 47,
         .baseSpDefense = 85,
+        #else
+        .baseDefense   = 55,
+        .baseSpeed     = 85,
+        .baseSpAttack  = 47,
+        .baseSpDefense = 75,
+        #endif
         .type1 = TYPE_BUG,
         .type2 = TYPE_BUG,
         .catchRate = 150,
@@ -7988,10 +8242,17 @@ const struct BaseStats gBaseStats[] =
     {
         .baseHP        = 65,
         .baseAttack    = 47,
+        #if P_UPDATED_STATS >= GEN_7
         .baseDefense   = 75,
         .baseSpeed     = 85,
         .baseSpAttack  = 73,
         .baseSpDefense = 85,
+        #else
+        .baseDefense   = 55,
+        .baseSpeed     = 85,
+        .baseSpAttack  = 73,
+        .baseSpDefense = 75,
+        #endif
         .type1 = TYPE_BUG,
         .type2 = TYPE_BUG,
         .catchRate = 150,
@@ -8578,7 +8839,11 @@ const struct BaseStats gBaseStats[] =
 
     [SPECIES_LUNATONE] =
     {
+        #if P_UPDATED_STATS >= GEN_7
         .baseHP        = 90,
+        #else
+        .baseHP        = 70,
+        #endif
         .baseAttack    = 55,
         .baseDefense   = 65,
         .baseSpeed     = 70,
@@ -8604,7 +8869,11 @@ const struct BaseStats gBaseStats[] =
 
     [SPECIES_SOLROCK] =
     {
+        #if P_UPDATED_STATS >= GEN_7
         .baseHP        = 90,
+        #else
+        .baseHP        = 70,
+        #endif
         .baseAttack    = 95,
         .baseDefense   = 85,
         .baseSpeed     = 70,
@@ -9113,12 +9382,21 @@ const struct BaseStats gBaseStats[] =
 
     [SPECIES_CHIMECHO] =
     {
+        #if P_UPDATED_STATS >= GEN_7
         .baseHP        = 75,
         .baseAttack    = 50,
         .baseDefense   = 80,
         .baseSpeed     = 65,
         .baseSpAttack  = 95,
         .baseSpDefense = 90,
+        #else
+        .baseHP        = 65,
+        .baseAttack    = 50,
+        .baseDefense   = 70,
+        .baseSpeed     = 65,
+        .baseSpAttack  = 95,
+        .baseSpDefense = 80,
+        #endif
         .type1 = TYPE_PSYCHIC,
         .type2 = TYPE_PSYCHIC,
         .catchRate = 45,
@@ -10138,7 +10416,11 @@ const struct BaseStats gBaseStats[] =
         .baseDefense   = 70,
         .baseSpeed     = 100,
         .baseSpAttack  = 50,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpDefense = 60,
+        #else
+        .baseSpDefense = 50,
+        #endif
         .type1 = TYPE_NORMAL,
         .type2 = TYPE_FLYING,
         .catchRate = 45,
@@ -10363,7 +10645,11 @@ const struct BaseStats gBaseStats[] =
     {
         .baseHP        = 60,
         .baseAttack    = 70,
+        #if P_UPDATED_STATS >= GEN_6
         .baseDefense   = 65,
+        #else
+        .baseDefense   = 55,
+        #endif
         .baseSpeed     = 90,
         .baseSpAttack  = 125,
         .baseSpDefense = 105,
@@ -11278,8 +11564,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 60,
         .baseSpAttack  = 70,
         .baseSpDefense = 90,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_PSYCHIC,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_PSYCHIC,
+        .type2 = TYPE_PSYCHIC,
+        #endif
         .catchRate = 145,
         .expYield = 62,
         .evYield_SpDefense = 1,
@@ -12021,8 +12312,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 80,
         .baseSpAttack  = 120,
         .baseSpDefense = 115,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_FAIRY,
         .type2 = TYPE_FLYING,
+        #else
+        .type1 = TYPE_NORMAL,
+        .type2 = TYPE_FLYING,
+        #endif
         .catchRate = 30,
         .expYield = 245,
         .evYield_SpAttack  = 2,
@@ -13143,7 +13439,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_STOUTLAND] =
     {
         .baseHP        = 85,
+        #if P_UPDATED_STATS >= GEN_6
         .baseAttack    = 110,
+        #else
+        .baseAttack    = 100,
+        #endif
         .baseDefense   = 90,
         .baseSpeed     = 80,
         .baseSpAttack  = 45,
@@ -13468,7 +13768,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_UNFEZANT] =
     {
         .baseHP        = 80,
+        #if P_UPDATED_STATS >= GEN_6
         .baseAttack    = 115,
+        #else
+        .baseAttack    = 105,
+        #endif
         .baseDefense   = 80,
         .baseSpeed     = 93,
         .baseSpAttack  = 65,
@@ -13602,7 +13906,11 @@ const struct BaseStats gBaseStats[] =
         .baseDefense   = 130,
         .baseSpeed     = 25,
         .baseSpAttack  = 60,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpDefense = 80,
+        #else
+        .baseSpDefense = 70,
+        #endif
         .type1 = TYPE_ROCK,
         .type2 = TYPE_ROCK,
         .catchRate = 45,
@@ -13624,7 +13932,11 @@ const struct BaseStats gBaseStats[] =
 
     [SPECIES_WOOBAT] =
     {
+        #if P_UPDATED_STATS >= GEN_7
         .baseHP        = 65,
+        #else
+        .baseHP        = 55,
+        #endif
         .baseAttack    = 45,
         .baseDefense   = 43,
         .baseSpeed     = 72,
@@ -13877,7 +14189,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_SEISMITOAD] =
     {
         .baseHP        = 105,
+        #if P_UPDATED_STATS >= GEN_6
         .baseAttack    = 95,
+        #else
+        .baseAttack    = 85,
+        #endif
         .baseDefense   = 75,
         .baseSpeed     = 74,
         .baseSpAttack  = 85,
@@ -14010,7 +14326,11 @@ const struct BaseStats gBaseStats[] =
         .baseDefense   = 80,
         .baseSpeed     = 92,
         .baseSpAttack  = 70,
+        #if P_UPDATED_STATS >= GEN_6
         .baseSpDefense = 80,
+        #else
+        .baseSpDefense = 70,
+        #endif
         .type1 = TYPE_BUG,
         .type2 = TYPE_GRASS,
         .catchRate = 45,
@@ -14084,7 +14404,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_SCOLIPEDE] =
     {
         .baseHP        = 60,
+        #if P_UPDATED_STATS >= GEN_6
         .baseAttack    = 100,
+        #else
+        .baseAttack    = 90,
+        #endif
         .baseDefense   = 89,
         .baseSpeed     = 112,
         .baseSpAttack  = 55,
@@ -14115,8 +14439,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 66,
         .baseSpAttack  = 37,
         .baseSpDefense = 50,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_GRASS,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_GRASS,
+        .type2 = TYPE_GRASS,
+        #endif
         .catchRate = 190,
         .expYield = 56,
         .evYield_Speed     = 1,
@@ -14141,8 +14470,13 @@ const struct BaseStats gBaseStats[] =
         .baseSpeed     = 116,
         .baseSpAttack  = 77,
         .baseSpDefense = 75,
+        #if P_UPDATED_TYPES >= GEN_6
         .type1 = TYPE_GRASS,
         .type2 = TYPE_FAIRY,
+        #else
+        .type1 = TYPE_GRASS,
+        .type2 = TYPE_GRASS,
+        #endif
         .catchRate = 75,
         .expYield = 168,
         .evYield_Speed     = 2,
@@ -14293,7 +14627,11 @@ const struct BaseStats gBaseStats[] =
     {
         .baseHP        = 95,
         .baseAttack    = 117,
+        #if P_UPDATED_STATS >= GEN_6
         .baseDefense   = 80,
+        #else
+        .baseDefense   = 70,
+        #endif
         .baseSpeed     = 92,
         .baseSpAttack  = 65,
         .baseSpDefense = 70,
@@ -14420,7 +14758,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_CRUSTLE] =
     {
         .baseHP        = 70,
+        #if P_UPDATED_STATS >= GEN_7
         .baseAttack    = 105,
+        #else
+        .baseAttack    = 95,
+        #endif
         .baseDefense   = 125,
         .baseSpeed     = 45,
         .baseSpAttack  = 65,
@@ -15828,7 +16170,11 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_BEARTIC] =
     {
         .baseHP        = 95,
+        #if P_UPDATED_STATS >= GEN_7
         .baseAttack    = 130,
+        #else
+        .baseAttack    = 110,
+        #endif
         .baseDefense   = 80,
         .baseSpeed     = 50,
         .baseSpAttack  = 70,
@@ -15852,9 +16198,15 @@ const struct BaseStats gBaseStats[] =
 
     [SPECIES_CRYOGONAL] =
     {
+        #if P_UPDATED_STATS >= GEN_7
         .baseHP        = 80,
         .baseAttack    = 50,
         .baseDefense   = 50,
+        #else
+        .baseHP        = 70,
+        .baseAttack    = 50,
+        .baseDefense   = 30,
+        #endif
         .baseSpeed     = 105,
         .baseSpAttack  = 95,
         .baseSpDefense = 135,
@@ -17580,10 +17932,17 @@ const struct BaseStats gBaseStats[] =
     {
         .baseHP        = 60,
         .baseAttack    = 50,
+        #if P_UPDATED_STATS >= GEN_8
+        .baseDefense   = 140,
+        .baseSpeed     = 60,
+        .baseSpAttack  = 50,
+        .baseSpDefense = 140,
+        #else
         .baseDefense   = 150,
         .baseSpeed     = 60,
         .baseSpAttack  = 50,
         .baseSpDefense = 150,
+        #endif
         .type1 = TYPE_STEEL,
         .type2 = TYPE_GHOST,
         .catchRate = 45,
@@ -21376,7 +21735,11 @@ const struct BaseStats gBaseStats[] =
         .baseDefense   = 65,
         .baseSpeed     = 150,
         .baseSpAttack  = 175,
+        #if P_UPDATED_STATS >= GEN_7
         .baseSpDefense = 105,
+        #else
+        .baseSpDefense = 95,
+        #endif
         .type1 = TYPE_PSYCHIC,
         .type2 = TYPE_PSYCHIC,
         .catchRate = 50,
@@ -22671,10 +23034,17 @@ const struct BaseStats gBaseStats[] =
     [SPECIES_AEGISLASH_BLADE] =
     {
         .baseHP        = 60,
+        #if P_UPDATED_STATS >= GEN_8
+        .baseAttack    = 140,
+        .baseDefense   = 50,
+        .baseSpeed     = 60,
+        .baseSpAttack  = 140,
+        #else
         .baseAttack    = 150,
         .baseDefense   = 50,
         .baseSpeed     = 60,
         .baseSpAttack  = 150,
+        #endif
         .baseSpDefense = 50,
         .type1 = TYPE_STEEL,
         .type2 = TYPE_GHOST,

From 5ecac6ff9537a02e8097a95df4a12e30bd89f93a Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Wed, 21 Oct 2020 07:29:50 -0300
Subject: [PATCH 2/4] Corrected Tsareena's sprites Some of its palettes were
 buggy as reported by Ryuhouji. This was fixed by Discord user Blackforest.

---
 graphics/pokemon/tsareena/back.png  | Bin 763 -> 722 bytes
 graphics/pokemon/tsareena/front.png | Bin 897 -> 849 bytes
 graphics/pokemon/tsareena/shiny.pal |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphics/pokemon/tsareena/back.png b/graphics/pokemon/tsareena/back.png
index 01177ce419a13ce0ef720516b3d96053e4bfca04..ea66ff8a2949873ef3744f0166e8a1b287639589 100644
GIT binary patch
delta 668
zcmV;N0%QIA1=0nOBor`EOjJbxu;_>gKyWya=wN`D0ML<DA%D>B{d52T0$oW&K~zYI
z-P18^+dvctaMeSJx2iOSWD2+FOd*r=0Rm3xWGJZ&+3XH3UA3IDg<Jfz2pd{Qs!K|i
zfW37om@{NH7W7Ma&=mR&+<PZWKFPB8_68a0|GW3@PO@SAhvQkd`(kh2u`l251D(2U
zH`=@N=XU+fu768FPRhX-`@@C(s%=!5bF%|nUc7&OA_3#&;LJWZKam>=SZR~$x%m<t
z<`M~<GC;zQ(6eNSV7o+xFo#f1<a~)3*~%?OEau3JC}7cieqcFrs*4e`@anqxCRAk<
zbLQeATy~vnpfZOgL;d#Lz6LDy%vu9>ivWmTz|smNz<&X6X93rf7XZk59P|Jm_fi1d
zVy+I74m>LWqX2MZJ#Me%WFWmX=WnKY5D>hjpacd&s1mib168+4SsX-&DFxu^8me60
zfx0APB!mcohuIoE)iBFF1f4L;4O#>;|JBhBIv_qi_G3(+*5F8c5katweIUyw__5!J
zAw;0RDSsL?;$<8(ny_plz$N_FUp3rqftk=im7gNGQvlZ>L8N!6dUBdC%e+INb~&3H
z1t8DqR06dT&-`irDS#&KvJtP3;r@86=Xj7Yp3~F%oND*uehw55^4lbz8$kht`3Boy
z5S9Xx=6rb6E(6);;*C3>`+LD;XtvsW!Nc&dwS5QFjwcVH-QEob=4!S2+A4z0Cp%b0
zQPkB-D6lz(A2N^T_SG)HzbkOK0ToJg;6-W-HlV83R|NC0p9k4V*AfsdRvGZ9zRPe8
z#54sYw@W^nseCqjOnU^Oz6ANFK_M0kQTS~B<?$CxVh36QKx#e!0000<MNUMnLSTYk
C>^XY?

delta 694
zcmV;n0!jVS1^We%BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks%ZVuxQAUI3a)1
zK_(9X000SaNLh0L01m?d01m?e$8V@)00071Nkl<ZNXOliF>BjE6vx#N3f`*H6p|?%
z0$~c7oIN>SYP1MSDnmEBgG*N-IPxuQP#vx=E?ENh)}>(1(AikfFQGZ~8@TVCEcqnM
z-rEN{bNBz<`@eg4w*JR>*6+VKsP}(@+qZ{+UMmQoyI+4Ev@U}d0_?mVh=cbx!K<!y
zB*Lpb!0pYu*XIZbUJqOb*Y+oNg@C9vX<XYcAruiqAglwJ{0MCqMFMtH95E3xhcn!d
zkYGEyE0`-n)R+cbr>q~lA#ROG5-yEVR5o$6=8!HTDk2hhB?GO6A`AW7js|}Q;OaGZ
z1BiP9fSCzgBS8j);O$Kic{l(-;c?ssT5jh6a92bokU8)o0gPjyC_L`(a5J!WuJbqZ
zG7vMGI-m&>l+r1hxr3vpSy~FF)Z78!c?}JYGtfg8W2KY?E{hsHZCL0Y0X-?V_fQ2;
z|JgGd9W$Sn{gl+F4RC5)L>zyosSgZ4AHNhN0p?BNA<{IB0Y#qxD&e<z)iBus7Rmq`
z{DOdq2B-!E64RmKX=Q>HrhazH#nP$(*ry8|^g%rPhyAAl_;gB0H*I)0o0>W`GNnE}
zZTi%Fm<~!nwUJ+EW!;J^ot9;TU0^6{0ha50blR;0is#}@d!Gjff!Tk^?sN|VkE4^$
z0iby{dz3+UKQOe{>-CpT71%!6;W|l@zL`P;+ctbhJy`}H_5u8x22QrXk;6>DOLPpk
zKttD81(tG928vEMGay;53&3;CQ_2mX<~hJhr{v>>))$LkxkoI`67Ww$gj%gs<=OnZ
cVOf6x7ip3I+bwou000UA07*qoM6N<$g8mOFivR!s

diff --git a/graphics/pokemon/tsareena/front.png b/graphics/pokemon/tsareena/front.png
index 664c9c27945f979c803deb7697a0f68ea52fd6a4..9072ce8651bf8d7a3ad55bd90beb69972fcd013d 100644
GIT binary patch
delta 769
zcmV+c1OEJh2hj$QB#}Woe*)Y|L_t(YiLKPnYtv910PxsbPUBHFtSFQmY*A23onS8_
zMyQv9jMNnooFipp!k{48xrFo^4`Wd`-?IZjL9m`gR*(#a2M^K*#s8s5PrK|gSYdu&
z(x2;VJ?NJvdA#qZ-|sg`siOSvAVj_&(ZcJw8^)Y8pRnS=!n|wTe|sVUNvj9$5E+PA
zU7%?RdsYGxU7%T3DWPf70thrsTuYWUCPJWDiHcYxdh-n8P58}H(&~be3|Ly259-8a
zpc`d)I0ooY9yD#Sa<+#W47VW;xbk`LX>x1`2AF(a*?_Y4A+xYjuABu5qX5q0i}zRk
zbowT)$AF?Tc6ojwf8+BMc_sxoDJ-X=oL_ppkDx38DmdmZ&I<zAa^UW5bN=JePmlwJ
zx($Q#?}UKemV?|bxyYkY26lD=Akoy9%&nL9;RMirm5P!YE!$auxb!~nvrO${aSF&e
zZ)=~(%C(8$_tJ%0ip?cq0&vV&G@XL&BFG;lbqZcOoj&gxf5qa894tl=q<|R)l>pT-
z*N;w*(zj2K8Iuh$W9B<wJI$jGZyrmh>=f5|lk?_29x^b)`2lZm-ax>QCAWc~!$oxd
z22QXFmGn^e8@nRksQUhaY|85=epTds1m8gNER$7{^8K~y>H(F22)OlCzwX!bJB4=;
zMEneZoxE=rf9rX(P!7Rp34Fzlv1Xd4(F1laK3V|4EE)(53dsQI<<SBN@&@L6U{i;|
ze^sP~zcTD$<om$R;i)f@dNwE_KmouFI<)b;73MY25A^_Gj}YKSwhvTXwRG&cGjA*l
z02K6GYZTx{ALwlgEinSP$^f)+i<u8%Mhx_<ixr1}cM?2%J?E-RBt~W_cBh*G*ct(C
zS9QspM+(@T!Ek|~N8qVP7>S9c5N@wPw*-0wuRTJAWsD8-ib_L|Jt%$#wFjc>SpbG=
zk3qti7n__{6mLuMVpH-0sQ(NUHVvrLlJfWic7VlxD;2dm00000NkvXXu0mjf{rG1%

delta 816
zcmV-01JC@?27w2VBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks&^R010qNS#tmY
z4#NNd4#NS*Z>VGd00P=cL_t(Y$F0=QYtv910PxsbPUBHFtSFRsut7m7ae}>w7@=MY
zGE!GWaE_FX34?;fa|rD>9!9HfzGnx5f?z#~tRNW-4<4isivL5Ao_5(~u)_Q%{k^_U
zM87o2<9$E<e!orHD*ruy2$AncX!m;NnmH%UC+v8*ux^`o9!Y>^_rWb90};CiC{4Jt
z5|HQtYTJbbrP2ZjC=IR!+op0r?L;Y9B>M9V<8}9)1<me(f(+QSn-A;6WuO-h+@An!
zBoCA>mQMCi!{MF<2VDBJ^H`f0f&(U>mY#t_-=`K<oYG04a0XC+TzvlSvajpcaXkSP
zmGg`93n^bD$rCBSNntq|72?9fT?CE<s8F<i3XuzdD+k`rrV!sB`~W#nnAb3c_(ll0
zZ8^wnlk*}P<>02L01{1pPThFn?oR>jm&qupF~>~<#AN{P@>K0Z{uGcYzNvjAD_5q1
zUrXm|Nj|5+6i~E(Vo^N_n|YAmN><EObX`B|nfd&R94tl=B!QbIlK{17tsfj8=r@lK
zIhPGFV`V#EI?aQQXdX(Z?Bv%)Q;6m+9x^Z^#GYsf(Lf*$B_9JpM+DLN6F9;uOwvQ$
zZEOemM%DNCWK&)}@~c7KNAMLS_fo3{Dc@hKuI@1jh=5mrU-j#LJ-d~A3t_}h0NBd<
zR=%FKa!wbFm%v9{G}kQ4GW)>I#K#K&Sa}nH$v_K%;fxnRkTo&i2O9<q|EnS`{FY%4
zGdloo22TT_8R@V@0CE6c*rAQ*ayL)G*f&CeJ-Prl(gUF4s%2o$t$A}f0KmY=w8jB$
z41m#Q&<aL>08bf$Hg0k2Ud)Vvk@m3S2*6)NSi@77NQ}%f?9MhqP#yzqPxZ)Lh2*e1
zhtUFIkI=IU;UpF;1L2hiH;VN<f>#y70?Roc<`tE7J@#Pu8rB|)p64MLsXYM+=aty>
uyrNXfN+qV84%B}J3O@~~%3p?}{04S_#eSvhXhr}F0000<MNUMnLSTZy18Nii

diff --git a/graphics/pokemon/tsareena/shiny.pal b/graphics/pokemon/tsareena/shiny.pal
index 4c8171637b..83672b5114 100644
--- a/graphics/pokemon/tsareena/shiny.pal
+++ b/graphics/pokemon/tsareena/shiny.pal
@@ -5,7 +5,7 @@ JASC-PAL
 136 8 64
 112 56 144
 232 96 128
-176 104 200
+152 0 208
 200 0 112
 96 16 48
 216 160 232

From d005287c50ef03df1478da1565ebc576de4facbe Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Wed, 21 Oct 2020 10:24:03 -0300
Subject: [PATCH 3/4] Fixed Magnemite's and Magneton's battle sprites Their
 normal back sprite palettes were glitchy. Discord users Jaizu and Blackforest
 fixed them

---
 graphics/pokemon/magnemite/anim_front.png | Bin 626 -> 574 bytes
 graphics/pokemon/magnemite/back.png       | Bin 498 -> 481 bytes
 graphics/pokemon/magnemite/front.png      | Bin 468 -> 417 bytes
 graphics/pokemon/magneton/back.png        | Bin 753 -> 747 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/graphics/pokemon/magnemite/anim_front.png b/graphics/pokemon/magnemite/anim_front.png
index e4355ee27611eb371eaf3a670c3deb93a55b51a6..7d3dc54ec6f428f97b5ecb52a5d33ef408d439db 100644
GIT binary patch
delta 492
zcmV<I0Tcf61il22B#}Woe*wu!L_t(oh3%FxOT$1E$FGnG**s}xK{vNTyIZ&$q)RG2
zrCqFp?cxXM2k;X}J3P9H4mmf$Auad`+O^+7931Q>7%z9(d@mVA%zw%7etGv^2>1Up
zR;kjjs>XMV>-)_{A>n;U(LyUbBlnbb-bR7(M7T4Qig4hDX9P?ef5-UY{u$>H1AWgs
z#CV2~!GYFdjvg@@GQS(18bIp@?Df@#v2OTulmRi)!e8@|*9~>NOmKji5f$&~m-K6)
zVMZ*$2l0EFzT$vgV(^%z>1PZxUtx$+4gi?-1pYY<aA5%<M2I!1pO_im08E2RzW&*x
zwr!d%5(CI9b&UZ+f6SLjHiC>8HmBDN0p_xA0aP+lFx|EypI9Q(b5APf6H8e6E%QsN
zHlL6^Y<G1|19>Czh)R_zRr&)eyTr<_!Genv09esg48}H>jK0hR>%0+Z2kh2aGi4|&
zxO3J_SrQAh6=`a0kpqM+3gv*9Fjir#*)_neS!Cw!8ldK$V#fnp$ACOwfUN_TKvtWf
zi6{vG0pua4Z|i8ja0$aVWg;f!LCaV(mv{pc)w1PPkBVyJiTgNY*ei{Txx7OvaOSG*
il|<Ik&|9g}f6zCgG|*BL9R9Qb0000<MNUMnLSTaJROImh

delta 542
zcmV+(0^$9>1o8xsBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks&^R010qNS#tmY
z4#NNd4#NS*Z>VGd00GNML_t(o!|j%_PQx$|hK<xzin?Irz`_*7(t(Kwz)dn#EU6k-
zDrG1OuTUO<?x>=JgTw?w-KDBvX!{B<Fz^DbyaaX}Chn3Ef$|S+rTcO|SJC}HsZ{Bg
zMQKU>ASfnU$4L-_mCIp&_Eqa}whh(mqwACGhbQ0$^()Ra;mUv^hl>m95jRzwEl`5R
zlcsuTKZ7Ue5d{@~Q)xj%oWBl<LkGU8t0@G$?G7V)rtUT=444r+Y(4+*Kh;deFhM<a
z@B2q7446v@we)>|EoBV;S&p#4N=gw%0&3!@<zWUSVaTB-TcMeMVI`+w)T8_FKY^X#
zRNq2speK4S0KmfbW+TlAdIIQ(fcK?*5*C0|6HZ^Y0zr}pAqZ*cr(=@9m$2$~W8x%q
zZ;Szs$Ua6WkPAPeQl(0j{(wrBSlJpZSfs9$H>6+{Yim~XMZq$k80UR-FgqZwwPw^%
zNSa$SW=SN?>NC`N)EdeHh%MHlfdvp_4Y{^v+W@rYkQ;Ni4Ip#R<AJS1fDIV^G^>LN
z#6}b;F(3~)7C>GF6O*(x-@-8|4_exqIYXnG7n@fJi)!`J*glDcz0$b&Ej)1MDvhkA
gp|?_{e=kD50A1U_nNFU2=l}o!07*qoM6N<$f_75vGXMYp

diff --git a/graphics/pokemon/magnemite/back.png b/graphics/pokemon/magnemite/back.png
index 2b96c2946db5365269c9d6e191092bdfeb104777..ec4214010338709582afbf933884a3dcf179f0ff 100644
GIT binary patch
delta 455
zcmV;&0XY8h1K|UZB!4haOjJdf(4dHji2wi1(9qCONJtP65I8U}w6wHRN=n7Fl;+;7
zl#5cdw6s!6O0=}J==k^`THF=@00C@CL_t(YiS5y`O2beT2H*_64-j+{3SQ`ty0tz)
z1D6gKOO>38NFl;a#%`JysJ5dNDqP2cLpLdQ>MIoAKv0mn-G68BBrz%Wp1L~Ne+ZYH
zFF7YCmbJ|`e;Xm_+xfw*P@=G?rw3Lkom6TjI9|NS6zsdAN`TI*)|UyetGjlK0<M1d
z<CACGK+M28!qrPWsAr(+C?pEsn)3tqf&^9|MbV%0^5fy@oG2G+R$I7xysSn$NBr(b
z?Jd5XU4i9^DSvmA0yTEb38F}Y*Wi4jFc1960E1ppdsEI;lCiM}1j3fn^aV-{OGXdq
z3DNj|9($O80fKS{lw&R%MZ?JfC;kS5V3GrK%0%RKH4MNf#0p5Q>)|ipUSpPqVCNa=
zYFgx=iAC&ky*>x5I)o6)&**l;5C{SWvLD@S7-H1?Xh7jt5BlpM>oMx;x*rSkr>0`o
x#vx)s>?#(sR=b%9DhvRye~4=^H@VF}$QNJi!`}Vz;Ftga002ovPDHLkV1gP2*+u{W

delta 472
zcmV;}0Vn?91M&lqB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000mP)t-sn9!hz
zh=}<3_|VYMP)JA+5D+*pFtD(&P)JC?u#n)`sE~+Iu&}UDNJy}-u=x1MOoQME00009
za7bBm000id000id0mpBsWB>pGOG!jQR7l6|(J@bhP!I?3H-Gef01^`hzl9F2C3%)a
z7ECydaS#)rbCZ_)8ZMYTmrf3y>R_i1d@2X(@H{|h(sy-ru>a}8{os!G#3`rzag^d8
z4~2Kdi4jh^LS8IxFUQOW5YrCKJcSI1NIbQ`!80f1fQPfBtsDoK9b_X4D)a|%eG(~&
zL~PBM_rL;?rGLszwr2M>f7~+d(OAUFJ2yLBx;N(826qdfMJrQl4SHSM8_-`u6d1G8
zlvnd^1La~=8Kc{*Lk1`(t-23rz5KLh0Eyt|eVSndNg~+wK-VEBf_eakxeW=~Y5;2n
zkQn-UnL)ycJxCEJ`7huFDTO8EeGjI{ivjr5q$$PW9#OELkV7LTN0uOvNl1OXKC(pV
zW7wRWe+c>+<+K@3!oJi_Y+_oX5kjzH6UKfkxJUq?`8gd!E>8J(5#k$b62L!qQN9`g
O0000<MNUMnLSTZ(2g`u~

diff --git a/graphics/pokemon/magnemite/front.png b/graphics/pokemon/magnemite/front.png
index 198a2d1b9031a9b9547728fb307f88389194b874..f39c25b7ab263e60c6a72df6f61b2ab48a03db89 100644
GIT binary patch
delta 334
zcmV-U0kQtn1EB+uB#}Woe*r8>L_t(YiS3fHPQx$|hFvK}V#881BQdg7O7>Q=2h=4&
zJrG@hfpp;k`T#saGn}%*5VIjMgi1UCU3mw@z(6-7%*C*A?%E~)a>IT8{r{GQ=+tSe
z>Z!fW`~76Fk%&HxPT9>)ap9-ws}T##=6dMw0N}l6H%imM#bC$-fAU1BOrX70<3Kzj
z%<h4;y2`k9K|~%O6JYHfcl_m5h&+BcY=N4wkSkS0d2H)t696b8sIh%^-%l3HKnXRi
zKb(8x0bgQz@0|Opv6Sp%0sI1p<wOJ9m4I^(Xsu(;q<=&i-Vw>*Qmy`b^wtTrXb3P@
zaLoZ)SIef2U^2nwM2wOcu`*{KU}ZAE#X8MophT<3i2)%4CA?%xUlK-Y9`x|;a2f{w
gjDlBm>a=bB01XIjIiNO+O8@`>07*qoM6N<$f<3pK;s5{u

delta 383
zcmV-_0f7FY1JnbMBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks&^R010qNS#tmY
z4#NNd4#NS*Z>VGd00AvYL_t(Y$L)}@PQx$|hK*ELs#q{`U|}+1>A=JTklGn47FW$h
zDlmkFS11nvFM!nHg2cpvSx^N-n^!0U124eJOW-7IoMG&eZ*VN#m%IPWT3XhO5dYNo
z_20(eDAks%T;}zsGm7PZ7FF*~uaE0X1ayP$RV=;HLoEZt;X*{LSGZU{2MuX&`|e@*
zN>1<*L4fKz4;AA4EoWSusjBW~l<>ZjC*suIl?5$S5l3?Q^r^nwBU;)Jk-Jywu%Lx%
z32<|z)DqE>kHw)87KmUHpqg+uKd6P&n3!s^VX6!ZoS7sOdmq1Ag>8M}w?HpskgW(o
znqgUD6~QN<M(B8g_yUbU(E&cefd-Z)0fVtk|F>l+y+p%!Y#C3*?oCMGP#@Ev@I!b+
dOUqhe>>G`)T_(O{)L8%k002ovPDHLkV1hm!s#gF2

diff --git a/graphics/pokemon/magneton/back.png b/graphics/pokemon/magneton/back.png
index a4638a1c11a9214bcb1b318f450122a795f76229..7a45ee78ddca83e9bc23ecc0b8ff22e3239b01ec 100644
GIT binary patch
delta 667
zcmV;M0%ZO11?vTnB#}Woe*$(%L_t(YiPhCHiyA=`0N`C&(%9UJ@dzO#PK-e;LRix8
zZKe>6MTG6MLFUrggowSxK(z1(9R7+6hlQ}%Sy-HfVF|+S{D?FbY0S**%#J6!TBN!u
zcRt>m_vVdi+5=qXiGAHV`%m!LdV3taLf&yusBVwu(7%><CjjWOe;nJaL{F}r=YKTq
z5iVx*qc(QR^bmUY=5KnY+_(r3-MT<Gom604QBe2&DKv}eIh+D`I>WeRLOTP1`V6l~
z(E6ECh5=@HL<m`a&jNMKL4>nH&;zU}Ae%u(ga{7_Ul}>_qq|iMmg!}DpxbvGY|=qv
zMbF1U<eO|AcDzAke}uJ(5VGEVOabvKAr9JyXOR1A#DV+b0JQc%0RY!MJZej2=s>pU
zH{JZCfFVH@c~E>i?|E@8c?j(Ulo9eomFL&rxbSCq7(kih7pvm3H>Mf-6BBi8&F7a8
zHYEU5^!iscYkvaDsM8de6wHNiK<TpAXH~))U;>K`5h8>Re|X)S@G1?+#4`Z~EX0(T
zSeyJ{`}B!0;R&#Sa{}i}dSDy!$<-~B%_=Agu%X}C)I@j@cTu-2^GpYzB0ywoEq>q#
z2QhFh+LA&7$RLm7ilPw@@zQOVkq1C>3kx~7WXVIkciVui1cX?Eh)=fRaFApm^PwDU
z66erpOF$(Fe?S^5IoJe?X)qvE`-Dy1QXE2!ivj_Q&z~RdNsxf10wWb+@BJC~f$ZuY
zm?vPB3RI3MNd-uT2rK(wk$^96AQ$27J)o-4t2Pti)KH*!5ve}pKHC~>`nMG$xfFAU
zOa(OlyJ!Ffes{OX+XFc$fylAm(T8#3@8{vHe<Lw55o%p*0!aV>002ovPDHLkV1nEj
BI0OIy

delta 670
zcmV;P0%85@1@Q%tBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks&^R010qNS#tmY
z4#NNd4#NS*Z>VGd00K%$L_t(Y$JLdwj@m#FhHc`G<`&aMQR0D)BC(eu9X@9ZB*I%!
ztQ2^bi%t|smOBcHb3x()$=-*E=&m8N>s{MN?4w9^(^%U1^w0dWvtYf&AUE<hz57pK
zK>gPNxCIPG=T~dkQ}1$r1Av*VarQeaL?8cH);m7zm<M=~hfUbChv)W6J#Pqd68H3B
z+6p*;z$A{hj11drL<4xg<J=`I>;Pc0<EhA&Kil(IW5+i_h{KOAV8Rtp@Gc2#AVol&
zRviijUkeo-HTs*Uv;+?AHojx}Ndc#JV4h-s3MgVC<9gzAVHA#kgkl6<3s8nj6#&;g
znEX-YDSWyDmJMJ47-1LS(kYXHXEym#1C9Yk)Mxt4rGDw9&sbOi9;Lo^=^`w@@s6)E
zW@`K@U7$-l079ps6{}0g7X|=VyL18ok4_i*lCne-kt71?lA#$SxK3z^oJBCArAr49
zkABd=N=j^%MS!t?%o8Qz`5M@>M6l$54Tnr^u1%4M0EQYk;kn$Jg73>I+LV$z8`U&W
zgw|3uT=1*}K#pWk0b<qXrK4h_Bu3Ju4^Z90-t4V7D2Z=SMg`>D0EOCYCsIIFK_qLl
z*rKdq;YeUy35a=W7F%$=4Gv><UdXLG=qAE{7e!=JUp+s0oJm#ziyGL}3XS*Yyadct
z8$eP4X)93I*oszw8i{<|1ojp1^)pjM{`dl@UD%^g68YAtf#H2o&!HED7F)!RW2d?l
za-pR0uGH_M12yn_cBXy<=rIH68pjK+{f)n$w-T217cemz14&aimH+?%07*qoM6N<$
Ef)%4HF#rGn


From 753d6bb3a19efc8e2d16da4ceaca480323300ae6 Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Fri, 23 Oct 2020 10:16:49 -0300
Subject: [PATCH 4/4] Fixed the animation of Deoxys' Attack, Defense and Speed
 forms

---
 src/data/pokemon_graphics/front_pic_anims.h | 47 +++++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index 8e971c523e..51edda2778 100644
--- a/src/data/pokemon_graphics/front_pic_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -8418,19 +8418,57 @@ static const union AnimCmd sAnim_ZYGARDE_COMPLETE_1[] =
 
 static const union AnimCmd sAnim_DEOXYS_ATTACK_1[] =
 {
-    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_FRAME(0, 26),
+    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_FRAME(0, 16),
+};
+
+static const union AnimCmd sAnim_DEOXYS_ATTACK_2[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(2, 20),
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(2, 20),
     ANIMCMD_END,
 };
 
 static const union AnimCmd sAnim_DEOXYS_DEFENSE_1[] =
 {
-    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_FRAME(0, 26),
+    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sAnim_DEOXYS_DEFENSE_2[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(2, 20),
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(2, 20),
     ANIMCMD_END,
 };
 
 static const union AnimCmd sAnim_DEOXYS_SPEED_1[] =
 {
-    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_FRAME(0, 26),
+    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_END,
+};
+
+static const union AnimCmd sAnim_DEOXYS_SPEED_2[] =
+{
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(2, 20),
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(2, 20),
     ANIMCMD_END,
 };
 
@@ -13147,16 +13185,19 @@ static const union AnimCmd *const sAnims_ZYGARDE_COMPLETE[] ={
 static const union AnimCmd *const sAnims_DEOXYS_ATTACK[] ={
     sAnim_GeneralFrame0,
     sAnim_DEOXYS_ATTACK_1,
+    sAnim_DEOXYS_ATTACK_2,
 };
 
 static const union AnimCmd *const sAnims_DEOXYS_DEFENSE[] ={
     sAnim_GeneralFrame0,
     sAnim_DEOXYS_DEFENSE_1,
+    sAnim_DEOXYS_DEFENSE_2,
 };
 
 static const union AnimCmd *const sAnims_DEOXYS_SPEED[] ={
     sAnim_GeneralFrame0,
     sAnim_DEOXYS_SPEED_1,
+    sAnim_DEOXYS_SPEED_2,
 };
 
 #define ANIM_CMD(name)             [SPECIES_##name] = sAnims_##name