diff --git a/graphics/backspr/gBackShinySprite1018Magearna.png b/graphics/backspr/gBackShinySprite1018Magearna.png index bf6778a..6d67261 100644 Binary files a/graphics/backspr/gBackShinySprite1018Magearna.png and b/graphics/backspr/gBackShinySprite1018Magearna.png differ diff --git a/graphics/backspr/gBackShinySprite1065MiniorRed.png b/graphics/backspr/gBackShinySprite1065MiniorRed.png index 72dc778..5af6167 100644 Binary files a/graphics/backspr/gBackShinySprite1065MiniorRed.png and b/graphics/backspr/gBackShinySprite1065MiniorRed.png differ diff --git a/graphics/backspr/gBackShinySprite1066MiniorBlue.png b/graphics/backspr/gBackShinySprite1066MiniorBlue.png index d25a6b1..307de0d 100644 Binary files a/graphics/backspr/gBackShinySprite1066MiniorBlue.png and b/graphics/backspr/gBackShinySprite1066MiniorBlue.png differ diff --git a/graphics/backspr/gBackShinySprite1067MiniorOrange.png b/graphics/backspr/gBackShinySprite1067MiniorOrange.png index d8b5d6d..2707ff5 100644 Binary files a/graphics/backspr/gBackShinySprite1067MiniorOrange.png and b/graphics/backspr/gBackShinySprite1067MiniorOrange.png differ diff --git a/graphics/backspr/gBackShinySprite1068MiniorYellow.png b/graphics/backspr/gBackShinySprite1068MiniorYellow.png index 94193be..2c063e0 100644 Binary files a/graphics/backspr/gBackShinySprite1068MiniorYellow.png and b/graphics/backspr/gBackShinySprite1068MiniorYellow.png differ diff --git a/graphics/backspr/gBackShinySprite1069MiniorIndigo.png b/graphics/backspr/gBackShinySprite1069MiniorIndigo.png index e47bf65..4c9d88b 100644 Binary files a/graphics/backspr/gBackShinySprite1069MiniorIndigo.png and b/graphics/backspr/gBackShinySprite1069MiniorIndigo.png differ diff --git a/graphics/backspr/gBackShinySprite1070MiniorGreen.png b/graphics/backspr/gBackShinySprite1070MiniorGreen.png index cf6ad4a..bb4148c 100644 Binary files a/graphics/backspr/gBackShinySprite1070MiniorGreen.png and b/graphics/backspr/gBackShinySprite1070MiniorGreen.png differ diff --git a/graphics/backspr/gBackShinySprite1071MiniorViolet.png b/graphics/backspr/gBackShinySprite1071MiniorViolet.png index 7af5ec8..0bb0372 100644 Binary files a/graphics/backspr/gBackShinySprite1071MiniorViolet.png and b/graphics/backspr/gBackShinySprite1071MiniorViolet.png differ diff --git a/graphics/backspr/gBackShinySprite1073MagearnaP.png b/graphics/backspr/gBackShinySprite1073MagearnaP.png index e57656b..2c201d3 100644 Binary files a/graphics/backspr/gBackShinySprite1073MagearnaP.png and b/graphics/backspr/gBackShinySprite1073MagearnaP.png differ diff --git a/graphics/pokeicon/gIconSprite1041DeoxysDefense.png b/graphics/pokeicon/gIconSprite1041DeoxysDefense.png index 707f8b6..c54651b 100644 Binary files a/graphics/pokeicon/gIconSprite1041DeoxysDefense.png and b/graphics/pokeicon/gIconSprite1041DeoxysDefense.png differ diff --git a/graphics/pokeicon/gIconSprite1042DeoxysSpeed.png b/graphics/pokeicon/gIconSprite1042DeoxysSpeed.png index 779a37a..f91952d 100644 Binary files a/graphics/pokeicon/gIconSprite1042DeoxysSpeed.png and b/graphics/pokeicon/gIconSprite1042DeoxysSpeed.png differ diff --git a/include/evolution.h b/include/evolution.h index a0c962f..24608c2 100644 --- a/include/evolution.h +++ b/include/evolution.h @@ -43,6 +43,7 @@ enum EvolutionMethods EVO_MOVE, // knows a given move EVO_OTHER_PARTY_MON, //another poke in the party, arg is a specific species EVO_LEVEL_SPECIFIC_TIME_RANGE, // above given level with a range (unknown is [start][end]. eg lycanroc -> 1700-1800 hrs -> 0x1112) + EVO_FLAG_SET, //If a certain flag is set. Can be used for touching the Mossy/Icy Rock for Leafeon/Glaceon evolutions EVO_CRITICAL_HIT, // successfully land 3 critical hits in one battle EVO_NATURE_HIGH, // evolution based on high key nature at a certain level EVO_NATURE_LOW, // evolution based on low key nature at a certain level diff --git a/include/items.h b/include/items.h index 25f8736..81eb463 100644 --- a/include/items.h +++ b/include/items.h @@ -766,7 +766,7 @@ #define ITEM_RIBBON_SWEET 0x2D1 #define ITEM_STAR_SWEET 0x2D2 #define ITEM_GALARICA_CUFF 0x2D3 -#define ITEM_GALARICA_CROWN 0x2D4 //Placeholder name for G-Slowking item +#define ITEM_GALARICA_WREATH 0x2D4 //New Key Items #define ITEM_GRACIDEA 0x217 diff --git a/include/pokedex.h b/include/pokedex.h index 9fd1125..c65a1bb 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -1002,10 +1002,11 @@ enum #define NATIONAL_DEX_KUBFU 891 #define NATIONAL_DEX_URSHIFU 892 #define NATIONAL_DEX_ZARUDE 893 -#define NATIONAL_DEX_CALYREX 894 -#define NATIONAL_DEX_REGIELEKI 895 -#define NATIONAL_DEX_REGIDRAGO 896 -#define NATIONAL_DEX_UNKNOWN 897 +#define NATIONAL_DEX_REGIELEKI 894 +#define NATIONAL_DEX_REGIDRAGO 895 +#define NATIONAL_DEX_GLASTRIER 896 +#define NATIONAL_DEX_SPECTRIER 897 +#define NATIONAL_DEX_CALYREX 898 #define FINAL_DEX_ENTRY NATIONAL_DEX_MELMETAL //Not +1 b/c used like this for some asm #define NATIONAL_DEX_COUNT FINAL_DEX_ENTRY + 1 @@ -1517,10 +1518,11 @@ extern const u8 DEX_ENTRY_ETERNATUS[]; extern const u8 DEX_ENTRY_KUBFU[]; extern const u8 DEX_ENTRY_URSHIFU_SINGLE[]; extern const u8 DEX_ENTRY_ZARUDE[]; -extern const u8 DEX_ENTRY_CALYREX[]; extern const u8 DEX_ENTRY_REGIELEKI[]; extern const u8 DEX_ENTRY_REGIDRAGO[]; -extern const u8 DEX_ENTRY_UNKNWON_MYTHICAL[]; +extern const u8 DEX_ENTRY_GLASTRIER[]; +extern const u8 DEX_ENTRY_SPECTRIER[]; +extern const u8 DEX_ENTRY_CALYREX[]; extern const u8 DEX_ENTRY_RATTATA_A[]; extern const u8 DEX_ENTRY_RATICATE_A[]; @@ -1589,3 +1591,6 @@ extern const u8 DEX_ENTRY_ZACIAN_CROWNED[]; extern const u8 DEX_ENTRY_ZAMAZENTA_CROWNED[]; extern const u8 DEX_ENTRY_ETERNATUS_ETERNAMAX[]; extern const u8 DEX_ENTRY_URSHIFU_RAPID[]; +extern const u8 DEX_ENTRY_ZARUDE_DADA[]; +extern const u8 DEX_ENTRY_CALYREX_ICE_RIDER[]; +extern const u8 DEX_ENTRY_CALYREX_SHADOW_RIDER[]; diff --git a/special_inserts.asm b/special_inserts.asm index d3742cb..3da3fa2 100644 --- a/special_inserts.asm +++ b/special_inserts.asm @@ -2,9 +2,9 @@ .align 2 .thumb -.equ NUM_SPECIES, 1102 +.equ NUM_SPECIES, 1266 .equ EVOS_PER_MON, 16 -.equ FINAL_DEX_ENTRY, 809 +.equ FINAL_DEX_ENTRY, 898 @;.equ SEEN_DEX_FLAGS, 0x202583C @;.equ CAUGHT_DEX_FLAGS, (SEEN_DEX_FLAGS + (FINAL_DEX_ENTRY / 8) + 1) diff --git a/src/Base_Stats.c b/src/Base_Stats.c index f89bef5..35252e2 100644 --- a/src/Base_Stats.c +++ b/src/Base_Stats.c @@ -38362,63 +38362,29 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, -/* - [SPECIES_CALYREX] = //PLACEHOLDER DATA + [SPECIES_REGIELEKI] = { - .baseHP = 100, + .baseHP = 80, .baseAttack = 100, - .baseDefense = 100, + .baseDefense = 50, .baseSpAttack = 100, - .baseSpDefense = 100, - .baseSpeed = 100, - .type1 = TYPE_PSYCHIC, - .type2 = TYPE_GRASS, - .catchRate = 255, - .expYield = 255, - .evYield_HP = 0, - .evYield_Attack = 0, - .evYield_Defense = 0, - .evYield_SpAttack = 0, - .evYield_SpDefense = 0, - .evYield_Speed = 0, - .item1 = ITEM_NONE, - .item2 = ITEM_NONE, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .ability1 = ABILITY_UNNERVE, - .ability2 = ABILITY_NONE, - .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, - .noFlip = TRUE, - }, - - [SPECIES_REGIELEKI] = //PLACEHOLDER DATA - { - .baseHP = 100, - .baseAttack = 100, - .baseDefense = 100, - .baseSpAttack = 100, - .baseSpDefense = 100, - .baseSpeed = 100, + .baseSpDefense = 50, + .baseSpeed = 200, .type1 = TYPE_ELECTRIC, .type2 = TYPE_ELECTRIC, - .catchRate = 255, + .catchRate = 3, .expYield = 255, .evYield_HP = 0, .evYield_Attack = 0, .evYield_Defense = 0, .evYield_SpAttack = 0, .evYield_SpDefense = 0, - .evYield_Speed = 0, + .evYield_Speed = 3, .item1 = ITEM_NONE, .item2 = ITEM_NONE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, - .friendship = 0, + .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroup1 = EGG_GROUP_UNDISCOVERED, .eggGroup2 = EGG_GROUP_UNDISCOVERED, @@ -38429,19 +38395,19 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, - [SPECIES_REGIDRAGO] = //PLACEHOLDER DATA + [SPECIES_REGIDRAGO] = { - .baseHP = 100, + .baseHP = 200, .baseAttack = 100, - .baseDefense = 100, + .baseDefense = 50, .baseSpAttack = 100, - .baseSpDefense = 100, - .baseSpeed = 100, + .baseSpDefense = 50, + .baseSpeed = 80, .type1 = TYPE_DRAGON, .type2 = TYPE_DRAGON, - .catchRate = 255, + .catchRate = 3, .expYield = 255, - .evYield_HP = 0, + .evYield_HP = 3, .evYield_Attack = 0, .evYield_Defense = 0, .evYield_SpAttack = 0, @@ -38451,7 +38417,7 @@ const struct BaseStats gBaseStats[] = .item2 = ITEM_NONE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, - .friendship = 0, + .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroup1 = EGG_GROUP_UNDISCOVERED, .eggGroup2 = EGG_GROUP_UNDISCOVERED, @@ -38461,7 +38427,105 @@ const struct BaseStats gBaseStats[] = .hiddenAbility = ABILITY_NONE, .noFlip = TRUE, }, - */ + + [SPECIES_GLASTRIER] = + { + .baseHP = 100, + .baseAttack = 145, + .baseDefense = 130, + .baseSpAttack = 65, + .baseSpDefense = 110, + .baseSpeed = 30, + .type1 = TYPE_ICE, + .type2 = TYPE_ICE, + .catchRate = 3, + .expYield = 255, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .evYield_Speed = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, //NEW ABILITY CHILLING NEIGH + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .hiddenAbility = ABILITY_NONE, + .noFlip = TRUE, + }, + + [SPECIES_SPECTRIER] = + { + .baseHP = 100, + .baseAttack = 65, + .baseDefense = 60, + .baseSpAttack = 145, + .baseSpDefense = 80, + .baseSpeed = 130, + .type1 = TYPE_GHOST, + .type2 = TYPE_GHOST, + .catchRate = 3, + .expYield = 255, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .evYield_Speed = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, //NEW ABILITY GRIM NEIGH + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .hiddenAbility = ABILITY_NONE, + .noFlip = TRUE, + }, + + [SPECIES_CALYREX] = + { + .baseHP = 100, + .baseAttack = 80, + .baseDefense = 80, + .baseSpAttack = 80, + .baseSpDefense = 80, + .baseSpeed = 80, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_GRASS, + .catchRate = 3, + .expYield = 250, + .evYield_HP = 3, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .evYield_Speed = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 100, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_UNNERVE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .hiddenAbility = ABILITY_NONE, + .noFlip = TRUE, + }, [SPECIES_CRAMORANT_GULPING] = { @@ -39057,6 +39121,105 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, + [SPECIES_ZARUDE_DADA] = + { + .baseHP = 105, + .baseAttack = 120, + .baseDefense = 105, + .baseSpAttack = 70, + .baseSpDefense = 95, + .baseSpeed = 105, + .type1 = TYPE_DARK, + .type2 = TYPE_GRASS, + .catchRate = 3, + .expYield = 255, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .evYield_Speed = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_LEAFGUARD, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .hiddenAbility = ABILITY_NONE, + .noFlip = TRUE, + }, + + [SPECIES_CALYREX_ICE_RIDER] = + { + .baseHP = 100, + .baseAttack = 165, + .baseDefense = 150, + .baseSpAttack = 85, + .baseSpDefense = 130, + .baseSpeed = 50, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_ICE, + .catchRate = 3, + .expYield = 255, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .evYield_Speed = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 100, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_UNNERVE, //NEW ABILITY AS ONE + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .hiddenAbility = ABILITY_NONE, + .noFlip = TRUE, + }, + + [SPECIES_CALYREX_SHADOW_RIDER] = + { + .baseHP = 100, + .baseAttack = 85, + .baseDefense = 80, + .baseSpAttack = 165, + .baseSpDefense = 100, + .baseSpeed = 150, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_GHOST, + .catchRate = 3, + .expYield = 255, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .evYield_Speed = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 100, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_UNNERVE, //NEW ABILITY AS ONE + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .hiddenAbility = ABILITY_NONE, + .noFlip = TRUE, + }, + [SPECIES_MEOWTH_G] = { .baseHP = 50, @@ -39387,14 +39550,14 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, -/* [SPECIES_ARTICUNO_G] = //PLACEHOLDER DATA + [SPECIES_ARTICUNO_G] = { .baseHP = 90, .baseAttack = 85, - .baseDefense = 100, - .baseSpAttack = 95, - .baseSpDefense = 125, - .baseSpeed = 85, + .baseDefense = 85, + .baseSpAttack = 125, + .baseSpDefense = 100, + .baseSpeed = 95, .type1 = TYPE_PSYCHIC, .type2 = TYPE_FLYING, .catchRate = 3, @@ -39402,13 +39565,13 @@ const struct BaseStats gBaseStats[] = .evYield_HP = 0, .evYield_Attack = 0, .evYield_Defense = 0, - .evYield_SpAttack = 0, - .evYield_SpDefense = 3, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, .evYield_Speed = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, .genderRatio = MON_GENDERLESS, - .eggCycles = 80, + .eggCycles = 120, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroup1 = EGG_GROUP_UNDISCOVERED, @@ -39420,12 +39583,12 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, - [SPECIES_ZAPDOS_G] = //PLACEHOLDER DATA + [SPECIES_ZAPDOS_G] = { .baseHP = 90, - .baseAttack = 90, - .baseDefense = 85, - .baseSpAttack = 125, + .baseAttack = 125, + .baseDefense = 90, + .baseSpAttack = 85, .baseSpDefense = 90, .baseSpeed = 100, .type1 = TYPE_FIGHTING, @@ -39433,15 +39596,15 @@ const struct BaseStats gBaseStats[] = .catchRate = 3, .expYield = 216, .evYield_HP = 0, - .evYield_Attack = 0, + .evYield_Attack = 3, .evYield_Defense = 0, - .evYield_SpAttack = 3, + .evYield_SpAttack = 0, .evYield_SpDefense = 0, .evYield_Speed = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, .genderRatio = MON_GENDERLESS, - .eggCycles = 80, + .eggCycles = 120, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroup1 = EGG_GROUP_UNDISCOVERED, @@ -39453,13 +39616,13 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, - [SPECIES_MOLTRES_G] = //PLACEHOLDER DATA + [SPECIES_MOLTRES_G] = { .baseHP = 90, - .baseAttack = 100, + .baseAttack = 85, .baseDefense = 90, - .baseSpAttack = 125, - .baseSpDefense = 85, + .baseSpAttack = 105, + .baseSpDefense = 125, .baseSpeed = 90, .type1 = TYPE_DARK, .type2 = TYPE_FLYING, @@ -39468,13 +39631,13 @@ const struct BaseStats gBaseStats[] = .evYield_HP = 0, .evYield_Attack = 0, .evYield_Defense = 0, - .evYield_SpAttack = 3, - .evYield_SpDefense = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, .evYield_Speed = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, .genderRatio = MON_GENDERLESS, - .eggCycles = 80, + .eggCycles = 120, .friendship = 35, .growthRate = GROWTH_SLOW, .eggGroup1 = EGG_GROUP_UNDISCOVERED, @@ -39486,23 +39649,23 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, - [SPECIES_SLOWKING_G] = //PLACEHOLDER DATA + [SPECIES_SLOWKING_G] = { .baseHP = 95, - .baseAttack = 75, + .baseAttack = 65, .baseDefense = 80, - .baseSpAttack = 100, + .baseSpAttack = 110, .baseSpDefense = 110, .baseSpeed = 30, - .type1 = TYPE_PSYCHIC, - .type2 = TYPE_POISON, + .type1 = TYPE_POISON, + .type2 = TYPE_PSYCHIC, .catchRate = 70, - .expYield = 164, + .expYield = 172, .evYield_HP = 0, .evYield_Attack = 0, .evYield_Defense = 0, .evYield_SpAttack = 0, - .evYield_SpDefense = 3, + .evYield_SpDefense = 2, .evYield_Speed = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, @@ -39512,12 +39675,12 @@ const struct BaseStats gBaseStats[] = .growthRate = GROWTH_MEDIUM_FAST, .eggGroup1 = EGG_GROUP_MONSTER, .eggGroup2 = EGG_GROUP_WATER_1, - .ability1 = ABILITY_GLUTTONY, + .ability1 = ABILITY_GLUTTONY, //NEW ABILITY CURIOUS MEDICINE .ability2 = ABILITY_OWNTEMPO, .safariZoneFleeRate = 0, .hiddenAbility = ABILITY_REGENERATOR, .noFlip = TRUE, - }, */ + }, [SPECIES_CORSOLA_G] = { diff --git a/src/Evolution Table.c b/src/Evolution Table.c index 5619ac0..3021a09 100644 --- a/src/Evolution Table.c +++ b/src/Evolution Table.c @@ -606,81 +606,81 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_MELMETAL] = {{EVO_GIGANTAMAX, TRUE, SPECIES_MELMETAL_GIGA, 0}}, [SPECIES_GROOKEY] = {{EVO_LEVEL, 16, SPECIES_THWACKEY, 0}}, [SPECIES_THWACKEY] = {{EVO_LEVEL, 35, SPECIES_RILLABOOM, 0}}, -// [SPECIES_RILLABOOM] = {{EVO_GIGANTAMAX, TRUE, SPECIES_RILLABOOM_GIGA, 0}}, + [SPECIES_RILLABOOM] = {{EVO_GIGANTAMAX, TRUE, SPECIES_RILLABOOM_GIGA, 0}}, [SPECIES_SCORBUNNY] = {{EVO_LEVEL, 16, SPECIES_RABOOT, 0}}, [SPECIES_RABOOT] = {{EVO_LEVEL, 35, SPECIES_CINDERACE, 0}}, -// [SPECIES_CINDERACE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_CINDERACE_GIGA, 0}}, + [SPECIES_CINDERACE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_CINDERACE_GIGA, 0}}, [SPECIES_SOBBLE] = {{EVO_LEVEL, 16, SPECIES_DRIZZILE, 0}}, [SPECIES_DRIZZILE] = {{EVO_LEVEL, 35, SPECIES_INTELEON, 0}}, -// [SPECIES_INTELEON] = {{EVO_GIGANTAMAX, TRUE, SPECIES_INTELEON_GIGA, 0}}, + [SPECIES_INTELEON] = {{EVO_GIGANTAMAX, TRUE, SPECIES_INTELEON_GIGA, 0}}, [SPECIES_SKWOVET] = {{EVO_LEVEL, 24, SPECIES_GREEDENT, 0}}, [SPECIES_ROOKIDEE] = {{EVO_LEVEL, 18, SPECIES_CORVISQUIRE, 0}}, [SPECIES_CORVISQUIRE] = {{EVO_LEVEL, 38, SPECIES_CORVIKNIGHT, 0}}, -// [SPECIES_CORVIKNIGHT] = {{EVO_GIGANTAMAX, TRUE, SPECIES_CORVIKNIGHT_GIGA, 0}}, + [SPECIES_CORVIKNIGHT] = {{EVO_GIGANTAMAX, TRUE, SPECIES_CORVIKNIGHT_GIGA, 0}}, [SPECIES_BLIPBUG] = {{EVO_LEVEL, 10, SPECIES_DOTTLER, 0}}, [SPECIES_DOTTLER] = {{EVO_LEVEL, 30, SPECIES_ORBEETLE, 0}}, -// [SPECIES_ORBEETLE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_ORBEETLE_GIGA, 0}}, + [SPECIES_ORBEETLE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_ORBEETLE_GIGA, 0}}, [SPECIES_NICKIT] = {{EVO_LEVEL, 18, SPECIES_THIEVUL, 0}}, [SPECIES_GOSSIFLEUR] = {{EVO_LEVEL, 20, SPECIES_ELDEGOSS, 0}}, [SPECIES_WOOLOO] = {{EVO_LEVEL, 24, SPECIES_DUBWOOL, 0}}, [SPECIES_CHEWTLE] = {{EVO_LEVEL, 22, SPECIES_DREDNAW, 0}}, -// [SPECIES_DREDNAW] = {{EVO_GIGANTAMAX, TRUE, SPECIES_DREDNAW_GIGA, 0}}, + [SPECIES_DREDNAW] = {{EVO_GIGANTAMAX, TRUE, SPECIES_DREDNAW_GIGA, 0}}, [SPECIES_YAMPER] = {{EVO_LEVEL, 25, SPECIES_BOLTUND, 0}}, [SPECIES_ROLYCOLY] = {{EVO_LEVEL, 18, SPECIES_CARKOL, 0}}, [SPECIES_CARKOL] = {{EVO_LEVEL, 34, SPECIES_COALOSSAL, 0}}, -// [SPECIES_COALOSSAL] = {{EVO_GIGANTAMAX, TRUE, SPECIES_COALOSSAL_GIGA, 0}}, + [SPECIES_COALOSSAL] = {{EVO_GIGANTAMAX, TRUE, SPECIES_COALOSSAL_GIGA, 0}}, [SPECIES_APPLIN] = {{EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE, 0}, {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN, 0}}, -// [SPECIES_FLAPPLE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_FLAPPLE_GIGA, 0}}, -// [SPECIES_APPLETUN] = {{EVO_GIGANTAMAX, TRUE, SPECIES_APPLETUN_GIGA, 0}}, + [SPECIES_FLAPPLE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_FLAPPLE_GIGA, 0}}, + [SPECIES_APPLETUN] = {{EVO_GIGANTAMAX, TRUE, SPECIES_APPLETUN_GIGA, 0}}, [SPECIES_SILICOBRA] = {{EVO_LEVEL, 36, SPECIES_SANDACONDA, 0}}, -// [SPECIES_SANDACONDA] = {{EVO_GIGANTAMAX, TRUE, SPECIES_SANDACONDA_GIGA, 0}}, + [SPECIES_SANDACONDA] = {{EVO_GIGANTAMAX, TRUE, SPECIES_SANDACONDA_GIGA, 0}}, [SPECIES_ARROKUDA] = {{EVO_LEVEL, 26, SPECIES_BARRASKEWDA, 0}}, [SPECIES_TOXEL] = {{EVO_NATURE_HIGH, 30, SPECIES_TOXTRICITY, 0}, {EVO_NATURE_LOW, 30, SPECIES_TOXTRICITY_LOW_KEY, 0}}, -// [SPECIES_TOXTRICITY] = {{EVO_GIGANTAMAX, TRUE, SPECIES_TOXTRICITY_GIGA, 0}}, + [SPECIES_TOXTRICITY] = {{EVO_GIGANTAMAX, TRUE, SPECIES_TOXTRICITY_GIGA, 0}}, [SPECIES_SIZZLIPEDE] = {{EVO_LEVEL, 28, SPECIES_CENTISKORCH, 0}}, -// [SPECIES_CENTISKORCH] = {{EVO_GIGANTAMAX, TRUE, SPECIES_CENTISKORCH_GIGA, 0}}, + [SPECIES_CENTISKORCH] = {{EVO_GIGANTAMAX, TRUE, SPECIES_CENTISKORCH_GIGA, 0}}, [SPECIES_CLOBBOPUS] = {{EVO_MOVE, MOVE_TAUNT, SPECIES_GRAPPLOCT, 0}}, [SPECIES_SINISTEA] = {{EVO_ITEM, ITEM_CRACKED_POT, SPECIES_POLTEAGEIST, 0}}, [SPECIES_HATENNA] = {{EVO_LEVEL, 32, SPECIES_HATTREM, 0}}, [SPECIES_HATTREM] = {{EVO_LEVEL, 42, SPECIES_HATTERENE, 0}}, -// [SPECIES_HATTERENE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_HATTERENE_GIGA, 0}}, + [SPECIES_HATTERENE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_HATTERENE_GIGA, 0}}, [SPECIES_IMPIDIMP] = {{EVO_LEVEL, 32, SPECIES_MORGREM, 0}}, [SPECIES_MORGREM] = {{EVO_LEVEL, 42, SPECIES_GRIMMSNARL, 0}}, -// [SPECIES_GRIMMSNARL] = {{EVO_GIGANTAMAX, TRUE, SPECIES_GRIMMSNARL_GIGA, 0}}, + [SPECIES_GRIMMSNARL] = {{EVO_GIGANTAMAX, TRUE, SPECIES_GRIMMSNARL_GIGA, 0}}, [SPECIES_MILCERY] = {{EVO_ITEM, ITEM_STRAWBERRY_SWEET, SPECIES_ALCREMIE_STRAWBERRY, 0}, {EVO_ITEM, ITEM_BERRY_SWEET, SPECIES_ALCREMIE_BERRY, 0}, - {EVO_ITEM, ITEM_LOVE_SWEET, SPECIES_ALCREMIE_LOVE, 0}, + {EVO_ITEM, ITEM_LOVE_SWEET, SPECIES_ALCREMIE_LOVE, 0}, {EVO_ITEM, ITEM_CLOVER_SWEET, SPECIES_ALCREMIE_CLOVER, 0}, {EVO_ITEM, ITEM_FLOWER_SWEET, SPECIES_ALCREMIE_FLOWER, 0}, {EVO_ITEM, ITEM_RIBBON_SWEET, SPECIES_ALCREMIE_RIBBON, 0}, {EVO_ITEM, ITEM_STAR_SWEET, SPECIES_ALCREMIE_STAR, 0}}, -// [SPECIES_ALCREMIE_STRAWBERRY] = {{EVO_GIGANTAMAX, TRUE, SPECIES_ALCREMIE_GIGA, 0}}, + [SPECIES_ALCREMIE_STRAWBERRY] = {{EVO_GIGANTAMAX, TRUE, SPECIES_ALCREMIE_GIGA, 0}}, [SPECIES_SNOM] = {{EVO_FRIENDSHIP_NIGHT, 0, SPECIES_FROSMOTH, 0}}, [SPECIES_CUFANT] = {{EVO_LEVEL, 34, SPECIES_COPPERAJAH, 0}}, -// [SPECIES_COPPERAJAH] = {{EVO_GIGANTAMAX, TRUE, SPECIES_COPPERAJAH_GIGA, 0}}, -// [SPECIES_DURALUDON] = {{EVO_GIGANTAMAX, TRUE, SPECIES_DURALUDON_GIGA, 0}}, + [SPECIES_COPPERAJAH] = {{EVO_GIGANTAMAX, TRUE, SPECIES_COPPERAJAH_GIGA, 0}}, + [SPECIES_DURALUDON] = {{EVO_GIGANTAMAX, TRUE, SPECIES_DURALUDON_GIGA, 0}}, [SPECIES_DREEPY] = {{EVO_LEVEL, 50, SPECIES_DRAKLOAK, 0}}, [SPECIES_DRAKLOAK] = {{EVO_LEVEL, 60, SPECIES_DRAGAPULT, 0}}, - [SPECIES_KUBFU] = {{EVO_MOVE_TYPE, TYPE_DARK, SPECIES_URSHIFU_SINGLE, 0}, - {EVO_MOVE_TYPE, TYPE_WATER, SPECIES_URSHIFU_RAPID, 0}}, //Location/event based evolution -// [SPECIES_URSHIFU_SINGLE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_URSHIFU_SINGLE_GIGA, 0}}, -// [SPECIES_TOXTRICITY_LOW_KEY] = {{EVO_GIGANTAMAX, TRUE, SPECIES_TOXTRICITY_LOW_KEY_GIGA, 0}}, + [SPECIES_KUBFU] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_URSHIFU_SINGLE, 0}, + {EVO_ITEM, ITEM_WATER_STONE, SPECIES_URSHIFU_RAPID, 0}}, + + [SPECIES_URSHIFU_SINGLE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_URSHIFU_SINGLE_GIGA, 0}}, + [SPECIES_TOXTRICITY_LOW_KEY] = {{EVO_GIGANTAMAX, TRUE, SPECIES_TOXTRICITY_LOW_KEY_GIGA, 0}}, [SPECIES_SINISTEA_CHIPPED] = {{EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_CHIPPED, 0}}, -/* [SPECIES_ALCREMIE_BERRY] = {{EVO_GIGANTAMAX, TRUE, SPECIES_ALCREMIE_GIGA, 0}}, + [SPECIES_ALCREMIE_BERRY] = {{EVO_GIGANTAMAX, TRUE, SPECIES_ALCREMIE_GIGA, 0}}, [SPECIES_ALCREMIE_LOVE] = {{EVO_GIGANTAMAX, TRUE, SPECIES_ALCREMIE_GIGA, 0}}, [SPECIES_ALCREMIE_CLOVER] = {{EVO_GIGANTAMAX, TRUE, SPECIES_ALCREMIE_GIGA, 0}}, [SPECIES_ALCREMIE_FLOWER] = {{EVO_GIGANTAMAX, TRUE, SPECIES_ALCREMIE_GIGA, 0}}, [SPECIES_ALCREMIE_RIBBON] = {{EVO_GIGANTAMAX, TRUE, SPECIES_ALCREMIE_GIGA, 0}}, [SPECIES_ALCREMIE_STAR] = {{EVO_GIGANTAMAX, TRUE, SPECIES_ALCREMIE_GIGA, 0}}, - [SPECIES_URSHIFU_RAPID] = {{EVO_GIGANTAMAX, TRUE, SPECIES_URSHIFU_RAPID_GIGA, 0}}, */ + [SPECIES_URSHIFU_RAPID] = {{EVO_GIGANTAMAX, TRUE, SPECIES_URSHIFU_RAPID_GIGA, 0}}, [SPECIES_MEOWTH_G] = {{EVO_LEVEL, 28, SPECIES_PERRSERKER, 0}}, [SPECIES_PONYTA_G] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH_G, 0}}, [SPECIES_SLOWPOKE_G] = {{EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_G, 0}, - {EVO_ITEM, ITEM_GALARICA_CROWN, SPECIES_SLOWKING_G, 0}}, //Item name is a placeholder - [SPECIES_FARFETCHD_G] = {{EVO_FRIENDSHIP, 0, SPECIES_SIRFETCHD, 0}, - {EVO_CRITICAL_HIT, 0, SPECIES_SIRFETCHD, 0}}, + {EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_G, 0}}, + [SPECIES_FARFETCHD_G] = {{EVO_CRITICAL_HIT, 0, SPECIES_SIRFETCHD, 0}}, [SPECIES_KOFFING_G] = {{EVO_LEVEL, 35, SPECIES_WEEZING_G, 0}}, [SPECIES_MIME_JR_G] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME_G, 0}}, [SPECIES_MR_MIME_G] = {{EVO_LEVEL, 42, SPECIES_MR_RIME, 0}}, @@ -689,7 +689,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_LINOONE_G] = {{EVO_LEVEL_NIGHT, 35, SPECIES_OBSTAGOON, 0}}, [SPECIES_DARUMAKA_G] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_G, 0}}, [SPECIES_YAMASK_G] = {{EVO_LEVEL, 35, SPECIES_RUNERIGUS, 0}, - {EVO_DAMAGE_LOCATION, 0, SPECIES_RUNERIGUS, 0}}, + {EVO_DAMAGE_LOCATION, 49, SPECIES_RUNERIGUS, 0}}, [SPECIES_VENUSAUR_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_VENUSAUR, 0}}, [SPECIES_CHARIZARD_GIGA] = {{EVO_GIGANTAMAX, FALSE, SPECIES_CHARIZARD, 0}}, diff --git a/src/Habitat_Table.c b/src/Habitat_Table.c index 0639fff..8e471f8 100644 --- a/src/Habitat_Table.c +++ b/src/Habitat_Table.c @@ -1554,8 +1554,8 @@ const u16 gMountainPage14[] = const u16 gMountainPage15[] = { - SPECIES_TIRTOUGA, - SPECIES_CARRACOSTA, + SPECIES_MUNCHLAX, + SPECIES_SNORLAX, }; const u16 gMountainPage16[] = @@ -2306,8 +2306,6 @@ const u16 gRarePage33[] = { SPECIES_ETERNATUS, SPECIES_ETERNATUS_ETERNAMAX, - SPECIES_ZARUDE, - SPECIES_CALYREX, }; const u16 gRarePage34[] = @@ -2317,6 +2315,25 @@ const u16 gRarePage34[] = SPECIES_URSHIFU_RAPID, }; +const u16 gRarePage35[] = +{ + SPECIES_ZARUDE, + SPECIES_ZARUDE_DADA, +}; + +const u16 gRarePage36[] = +{ + SPECIES_GLASTRIER, + SPECIES_SPECTRIER, +}; + +const u16 gRarePage37[] = +{ + SPECIES_CALYREX, + SPECIES_CALYREX_ICE_RIDER, + SPECIES_CALYREX_SHADOW_RIDER, +}; + const struct HabitatPage gGrasslandPages[] = { {gGrasslandPage1, ARRAY_COUNT(gGrasslandPage1)}, @@ -2675,6 +2692,12 @@ const struct HabitatPage gRarePages[] = {gRarePage29, ARRAY_COUNT(gRarePage29)}, {gRarePage30, ARRAY_COUNT(gRarePage30)}, {gRarePage31, ARRAY_COUNT(gRarePage31)}, + {gRarePage32, ARRAY_COUNT(gRarePage32)}, + {gRarePage33, ARRAY_COUNT(gRarePage33)}, + {gRarePage34, ARRAY_COUNT(gRarePage34)}, + {gRarePage35, ARRAY_COUNT(gRarePage35)}, + {gRarePage36, ARRAY_COUNT(gRarePage36)}, + {gRarePage37, ARRAY_COUNT(gRarePage37)}, }; const struct Habitat gHabitatPtrsTable[9] = diff --git a/src/Item_Animation_Table.c b/src/Item_Animation_Table.c index c878650..c3c5f7a 100644 --- a/src/Item_Animation_Table.c +++ b/src/Item_Animation_Table.c @@ -1220,6 +1220,9 @@ const struct ItemAnimation gItemAnimationTable[NUM_SPECIES] = [SPECIES_ZAMAZENTA_CROWNED] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_ETERNATUS_ETERNAMAX] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_URSHIFU_RAPID] = {0x0, 0x0, 0x0, 0x0, 0x0}, + [SPECIES_ZARUDE_DADA] = {0x0, 0x0, 0x0, 0x0, 0x0}, + [SPECIES_CALYREX_ICE_RIDER] = {0x0, 0x0, 0x0, 0x0, 0x0}, + [SPECIES_CALYREX_SHADOW_RIDER] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_MEOWTH_G] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_PONYTA_G] = {0x0, 0x0, 0x0, 0x0, 0x0}, [SPECIES_RAPIDASH_G] = {0x0, 0x0, 0x0, 0x0, 0x0}, diff --git a/src/Pokedex_Data_Table.c b/src/Pokedex_Data_Table.c index 09f873e..1ce2d3e 100644 --- a/src/Pokedex_Data_Table.c +++ b/src/Pokedex_Data_Table.c @@ -9724,7 +9724,7 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerScale = 0, .trainerOffset = 0, }, -/* [NATIONAL_DEX_GROOKEY] = + [NATIONAL_DEX_GROOKEY] = { .categoryName = {_C, _h, _i, _m, _p, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, .height = 3, @@ -10732,23 +10732,12 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerScale = 0, .trainerOffset = 0, }, - [NATIONAL_DEX_CALYREX] = - { - .categoryName = {_K, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, - .height = 0, - .weight = 0, - .description = DEX_ENTRY_CALYREX, - .unusedDescription = (const u8*) 0x8444cb1, - .pokemonScale = 0, - .pokemonOffset = 0, - .trainerScale = 0, - .trainerOffset = 0, - }, + [NATIONAL_DEX_REGIELEKI] = { .categoryName = {_E, _l, _e, _c, _t, _r, _o, _n, _END, _SPACE, _SPACE, _SPACE}, - .height = 0, - .weight = 0, + .height = 12, + .weight = 1450, .description = DEX_ENTRY_REGIELEKI, .unusedDescription = (const u8*) 0x8444cb1, .pokemonScale = 0, @@ -10759,8 +10748,8 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = [NATIONAL_DEX_REGIDRAGO] = { .categoryName = {_D, _r, _a, _g, _o, _n, _SPACE, _O, _r, _b, _END, _SPACE}, - .height = 0, - .weight = 0, + .height = 21, + .weight = 2000, .description = DEX_ENTRY_REGIDRAGO, .unusedDescription = (const u8*) 0x8444cb1, .pokemonScale = 0, @@ -10768,18 +10757,45 @@ const struct PokedexEntry gPokedexEntries[NATIONAL_DEX_COUNT] = .trainerScale = 0, .trainerOffset = 0, }, - [NATIONAL_DEX_UNKNOWN] = + + [NATIONAL_DEX_GLASTRIER] = { - .categoryName = {_U, _n, _k, _n, _o, _w, _n, _END, _SPACE, _SPACE, _SPACE, _SPACE}, - .height = 0, - .weight = 0, - .description = DEX_ENTRY_UNKNOWN_MYTHICAL, + .categoryName = {_W, _i, _l, _d, _SPACE, _H, _o, _r, _s, _e, _END, _SPACE}, + .height = 22, + .weight = 8000, + .description = DEX_ENTRY_GLASTRIER, .unusedDescription = (const u8*) 0x8444cb1, .pokemonScale = 0, .pokemonOffset = 0, .trainerScale = 0, .trainerOffset = 0, - },*/ + }, + + [NATIONAL_DEX_SPECTRIER] = + { + .categoryName = {_S, _w, _i, _f, _t, _SPACE, _H, _o, _r, _s, _e, _END}, + .height = 20, + .weight = 445, + .description = DEX_ENTRY_SPECTRIER, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, + .pokemonOffset = 0, + .trainerScale = 0, + .trainerOffset = 0, + }, + + [NATIONAL_DEX_CALYREX] = + { + .categoryName = {_K, _i, _n, _g, _END, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE}, + .height = 11, + .weight = 77, + .description = DEX_ENTRY_CALYREX, + .unusedDescription = (const u8*) 0x8444cb1, + .pokemonScale = 0, + .pokemonOffset = 0, + .trainerScale = 0, + .trainerOffset = 0, + }, }; //Certain Pokemon forms can have alternate dex entries when viewed @@ -10803,16 +10819,16 @@ const struct AlternateDexEntries gAlternateDexEntries[] = ALTERNATE_ENTRY(GEODUDE_A), ALTERNATE_ENTRY(GRAVELER_A), ALTERNATE_ENTRY(GOLEM_A), -/* ALTERNATE_ENTRY(PONYTA_G), + ALTERNATE_ENTRY(PONYTA_G), ALTERNATE_ENTRY(RAPIDASH_G), ALTERNATE_ENTRY(SLOWPOKE_G), ALTERNATE_ENTRY(SLOWBRO_G), - ALTERNATE_ENTRY(FARFETCHD_G),*/ + ALTERNATE_ENTRY(FARFETCHD_G), ALTERNATE_ENTRY(GRIMER_A), ALTERNATE_ENTRY(MUK_A), ALTERNATE_ENTRY(EXEGGUTOR_A), ALTERNATE_ENTRY(MAROWAK_A), -/* ALTERNATE_ENTRY(WEEZING_G), + ALTERNATE_ENTRY(WEEZING_G), ALTERNATE_ENTRY(MR_MIME_G), ALTERNATE_ENTRY(ARTICUNO_G), ALTERNATE_ENTRY(ZAPDOS_G), @@ -10825,7 +10841,7 @@ const struct AlternateDexEntries gAlternateDexEntries[] = ALTERNATE_ENTRY(DARMANITAN_G), ALTERNATE_ENTRY(DARMANITAN_G_ZEN), ALTERNATE_ENTRY(YAMASK_G), - ALTERNATE_ENTRY(STUNFISK_G),*/ + ALTERNATE_ENTRY(STUNFISK_G), ALTERNATE_ENTRY(ZYGARDE_10), ALTERNATE_ENTRY(ZYGARDE_COMPLETE), ALTERNATE_ENTRY(ORICORIO_Y), @@ -10837,7 +10853,7 @@ const struct AlternateDexEntries gAlternateDexEntries[] = ALTERNATE_ENTRY(NECROZMA_DUSK_MANE), ALTERNATE_ENTRY(NECROZMA_DAWN_WINGS), ALTERNATE_ENTRY(NECROZMA_ULTRA), -/* ALTERNATE_ENTRY(CRAMORANT_GULPING), + ALTERNATE_ENTRY(CRAMORANT_GULPING), ALTERNATE_ENTRY(CRAMORANT_GORGING), ALTERNATE_ENTRY(TOXTRICITY_LOW_KEY), ALTERNATE_ENTRY(SINISTEA_CHIPPED), @@ -10854,6 +10870,9 @@ const struct AlternateDexEntries gAlternateDexEntries[] = ALTERNATE_ENTRY(ZACIAN_CROWNED), ALTERNATE_ENTRY(ZAMAZENTA_CROWNED), ALTERNATE_ENTRY(ETERNATUS_ETERNAMAX), - ALTERNATE_ENTRY(URSHIFU_RAPID),*/ + ALTERNATE_ENTRY(URSHIFU_RAPID), + ALTERNATE_ENTRY(ZARUDE_DADA), + ALTERNATE_ENTRY(CALYREX_ICE_RIDER), + ALTERNATE_ENTRY(CALYREX_SHADOW_RIDER), {SPECIES_TABLES_TERMIN, 0} }; diff --git a/src/Pokedex_Orders.c b/src/Pokedex_Orders.c index bf3ef14..9ac63e2 100644 --- a/src/Pokedex_Orders.c +++ b/src/Pokedex_Orders.c @@ -589,7 +589,7 @@ const u16 gPokedexOrder_Alphabetical[] = SPECIES_BUZZWOLE, SPECIES_CACNEA, SPECIES_CACTURNE, - //SPECIES_CALYREX, + SPECIES_CALYREX, SPECIES_CAMERUPT, SPECIES_CARBINK, SPECIES_CARKOL, @@ -791,6 +791,7 @@ const u16 gPokedexOrder_Alphabetical[] = SPECIES_GLACEON, SPECIES_GLALIE, SPECIES_GLAMEOW, + SPECIES_GLASTRIER, SPECIES_GLIGAR, SPECIES_GLISCOR, SPECIES_GLOOM, @@ -1118,8 +1119,8 @@ const u16 gPokedexOrder_Alphabetical[] = SPECIES_RATTATA, SPECIES_RAYQUAZA, SPECIES_REGICE, - //SPECIES_REGIDRAGO, - //SPECIES_REGIELEKI, + SPECIES_REGIDRAGO, + SPECIES_REGIELEKI, SPECIES_REGIGIGAS, SPECIES_REGIROCK, SPECIES_REGISTEEL, @@ -1228,6 +1229,7 @@ const u16 gPokedexOrder_Alphabetical[] = SPECIES_SOLOSIS, SPECIES_SOLROCK, SPECIES_SPEAROW, + SPECIES_SPECTRIER, SPECIES_SPEWPA, SPECIES_SPHEAL, SPECIES_SPINARAK, @@ -1602,7 +1604,7 @@ const u16 gPokedexOrder_Weight[] = SPECIES_MUDKIP, SPECIES_SILICOBRA, SPECIES_SHELMET, - //SPECIES_CALYREX, + SPECIES_CALYREX, SPECIES_MAREEP, SPECIES_SNUBBULL, SPECIES_CYNDAQUIL, @@ -1986,6 +1988,7 @@ const u16 gPokedexOrder_Weight[] = SPECIES_TOXICROAK, SPECIES_MAGMAR, SPECIES_ZERAORA, + SPECIES_SPECTRIER, SPECIES_MAROWAK, SPECIES_VIKAVOLT, SPECIES_INTELEON, @@ -2196,7 +2199,7 @@ const u16 gPokedexOrder_Weight[] = SPECIES_ELECTIVIRE, SPECIES_DRUDDIGON, SPECIES_LICKILICKY, - //SPECIES_REGIELEKI, + SPECIES_REGIELEKI, SPECIES_CRYOGONAL, SPECIES_BASTIODON, SPECIES_EMBOAR, @@ -2225,7 +2228,7 @@ const u16 gPokedexOrder_Weight[] = SPECIES_HO_OH, SPECIES_CRUSTLE, SPECIES_VIRIZION, - //SPECIES_REGIDRAGO, + SPECIES_REGIDRAGO, SPECIES_SCOLIPEDE, SPECIES_TYRANITAR, SPECIES_METANG, @@ -2285,6 +2288,7 @@ const u16 gPokedexOrder_Weight[] = SPECIES_DIALGA, SPECIES_GIRATINA, SPECIES_MELMETAL, + SPECIES_GLASTRIER, SPECIES_STAKATAKA, SPECIES_GUZZLORD, SPECIES_MUDSDALE, @@ -2836,7 +2840,7 @@ const u16 gPokedexOrder_Height[] = SPECIES_FLORGES, SPECIES_TOUCANNON, SPECIES_CARKOL, - //SPECIES_CALYREX, + SPECIES_CALYREX, SPECIES_FEAROW, SPECIES_VILEPLUME, SPECIES_SLOWPOKE, @@ -2889,7 +2893,7 @@ const u16 gPokedexOrder_Height[] = SPECIES_NIHILEGO, SPECIES_THIEVUL, SPECIES_CUFANT, - //SPECIES_REGIELEKI, + SPECIES_REGIELEKI, SPECIES_NIDOQUEEN, SPECIES_CLEFABLE, SPECIES_POLIWRATH, @@ -3114,6 +3118,7 @@ const u16 gPokedexOrder_Height[] = SPECIES_GOLISOPOD, SPECIES_TURTONATOR, SPECIES_ARCTOVISH, + SPECIES_SPECTRIER, SPECIES_SNORLAX, SPECIES_MANTINE, SPECIES_ENTEI, @@ -3124,7 +3129,7 @@ const u16 gPokedexOrder_Height[] = SPECIES_BEWEAR, SPECIES_RILLABOOM, SPECIES_HATTERENE, - //SPECIES_REGIDRAGO, + SPECIES_REGIDRAGO, SPECIES_KANGASKHAN, SPECIES_DRAGONITE, SPECIES_TORTERRA, @@ -3133,6 +3138,7 @@ const u16 gPokedexOrder_Height[] = SPECIES_JELLICENT, SPECIES_CORVIKNIGHT, SPECIES_SILICOBRA, + SPECIES_GLASTRIER, SPECIES_FERALIGATR, SPECIES_HARIYAMA, SPECIES_SILVALLY, @@ -3564,6 +3570,7 @@ const u16 gPokedexOrder_Type[] = SPECIES_SINISTEA, SPECIES_POLTEAGEIST, SPECIES_CURSOLA, + SPECIES_SPECTRIER, SPECIES_DRIFLOON, SPECIES_DRIFBLIM, SPECIES_GASTLY, @@ -3912,7 +3919,7 @@ const u16 gPokedexOrder_Type[] = SPECIES_YAMPER, SPECIES_BOLTUND, SPECIES_PINCURCHIN, - //SPECIES_REGIELEKI, + SPECIES_REGIELEKI, SPECIES_HELIOPTILE, SPECIES_HELIOLISK, SPECIES_ZAPDOS, @@ -3985,7 +3992,7 @@ const u16 gPokedexOrder_Type[] = SPECIES_SOLGALEO, SPECIES_VICTINI, SPECIES_CELEBI, - //SPECIES_CALYREX, + SPECIES_CALYREX, SPECIES_MR_MIME, SPECIES_RALTS, SPECIES_KIRLIA, @@ -4006,6 +4013,7 @@ const u16 gPokedexOrder_Type[] = SPECIES_BERGMITE, SPECIES_AVALUGG, SPECIES_EISCUE, + SPECIES_GLASTRIER, SPECIES_ARTICUNO, SPECIES_DELIBIRD, SPECIES_SWINUB, @@ -4032,7 +4040,7 @@ const u16 gPokedexOrder_Type[] = SPECIES_SLIGGOO, SPECIES_GOODRA, SPECIES_JANGMO_O, - //SPECIES_REGIDRAGO, + SPECIES_REGIDRAGO, SPECIES_HAKAMO_O, SPECIES_KOMMO_O, SPECIES_DRAGONITE, diff --git a/src/Species_To_Pokdex_Table.c b/src/Species_To_Pokdex_Table.c index 82782f9..2b0365d 100644 --- a/src/Species_To_Pokdex_Table.c +++ b/src/Species_To_Pokdex_Table.c @@ -1187,9 +1187,11 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_KUBFU - 1] = NATIONAL_DEX_KUBFU, [SPECIES_URSHIFU_SINGLE - 1] = NATIONAL_DEX_URSHIFU, [SPECIES_ZARUDE - 1] = NATIONAL_DEX_ZARUDE, -/* [SPECIES_CALYREX - 1] = NATIONAL_DEX_CALYREX, [SPECIES_REGIELEKI - 1] = NATIONAL_DEX_REGIELEKI, - [SPECIES_REGIDRAGO - 1] = NATIONAL_DEX_REGIDRAGO, */ + [SPECIES_REGIDRAGO - 1] = NATIONAL_DEX_REGIDRAGO, + [SPECIES_GLASTRIER - 1] = NATIONAL_DEX_GLASTRIER, + [SPECIES_SPECTRIER - 1] = NATIONAL_DEX_SPECTRIER, + [SPECIES_CALYREX - 1] = NATIONAL_DEX_CALYREX, [SPECIES_CRAMORANT_GULPING - 1] = NATIONAL_DEX_CRAMORANT, [SPECIES_CRAMORANT_GORGING - 1] = NATIONAL_DEX_CRAMORANT, [SPECIES_TOXTRICITY_LOW_KEY - 1] = NATIONAL_DEX_TOXTRICITY, @@ -1208,6 +1210,9 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_ZAMAZENTA_CROWNED - 1] = NATIONAL_DEX_ZAMAZENTA, [SPECIES_ETERNATUS_ETERNAMAX - 1] = NATIONAL_DEX_ETERNATUS, [SPECIES_URSHIFU_RAPID - 1] = NATIONAL_DEX_URSHIFU, + [SPECIES_ZARUDE_DADA - 1] = NATIONAL_DEX_ZARUDE, + [SPECIES_CALYREX_ICE_RIDER - 1] = NATIONAL_DEX_CALYREX, + [SPECIES_CALYREX_SHADOW_RIDER - 1] = NATIONAL_DEX_CALYREX, [SPECIES_MEOWTH_G - 1] = NATIONAL_DEX_MEOWTH, [SPECIES_PONYTA_G - 1] = NATIONAL_DEX_PONYTA, [SPECIES_RAPIDASH_G - 1] = NATIONAL_DEX_RAPIDASH, @@ -1216,10 +1221,10 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_FARFETCHD_G - 1] = NATIONAL_DEX_FARFETCHD, [SPECIES_WEEZING_G - 1] = NATIONAL_DEX_WEEZING, [SPECIES_MR_MIME_G - 1] = NATIONAL_DEX_MR_MIME, -/* [SPECIES_ARTICUNO_G - 1] = NATIONAL_DEX_ARTICUNO, + [SPECIES_ARTICUNO_G - 1] = NATIONAL_DEX_ARTICUNO, [SPECIES_ZAPDOS_G - 1] = NATIONAL_DEX_ZAPDOS, [SPECIES_MOLTRES_G - 1] = NATIONAL_DEX_MOLTRES, - [SPECIES_SLOWKING_G - 1] = NATIONAL_DEX_SLOWKING, */ + [SPECIES_SLOWKING_G - 1] = NATIONAL_DEX_SLOWKING, [SPECIES_CORSOLA_G - 1] = NATIONAL_DEX_CORSOLA, [SPECIES_ZIGZAGOON_G - 1] = NATIONAL_DEX_ZIGZAGOON, [SPECIES_LINOONE_G - 1] = NATIONAL_DEX_LINOONE, diff --git a/src/tm_compatibility/1 - Focus Punch.txt b/src/tm_compatibility/1 - Focus Punch.txt index a0eb868..d1b9475 100644 --- a/src/tm_compatibility/1 - Focus Punch.txt +++ b/src/tm_compatibility/1 - Focus Punch.txt @@ -226,4 +226,34 @@ TAPU_BULU BUZZWOLE MARSHADOW ZERAORA -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +COALOSSAL +TOXTRICITY +TOXTRICITY_LOW_KEY +CLOBBOPUS +GRAPPLOCT +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +MR_RIME +STONJOURNER +INDEEDEE +INDEEDEE_FEMALE +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +SLOWBRO_G +MR_MIME_G +SLOWKING_G +MIME_JR_G +DARUMAKA_G +DARMANITAN_G diff --git a/src/tm_compatibility/10 - Hidden Power.txt b/src/tm_compatibility/10 - Hidden Power.txt index cda3d2b..bc5fb31 100644 --- a/src/tm_compatibility/10 - Hidden Power.txt +++ b/src/tm_compatibility/10 - Hidden Power.txt @@ -998,4 +998,126 @@ STAKATAKA BLACEPHALON ZERAORA MELTAN -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +SOBBLE +DRIZZILE +INTELEON +SKWOVET +GREEDENT +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +DOTTLER +ORBEETLE +NICKIT +THIEVUL +GOSSIFLEUR +ELDEGOSS +WOOLOO +DUBWOOL +CHEWTLE +DREDNAW +YAMPER +BOLTUND +ROLYCOLY +CARKOL +COALOSSAL +APPLIN +FLAPPLE +APPLETUN +SILICOBRA +SANDACONDA +CRAMORANT +ARROKUDA +BARRASKEWDA +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +CURSOLA +SIRFETCHD +MR_RIME +RUNERIGUS +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_LOVE +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_RIBBON +ALCREMIE_STAR +FALINKS +PINCURCHIN +FROSMOTH +STONJOURNER +EISCUE +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +CUFANT +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +DURALUDON +DREEPY +DRAKLOAK +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MEOWTH_G +PONYTA_G +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +FARFETCHD_G +KOFFING_G +WEEZING_G +MR_MIME_G +ARTICUNO_G +ZAPDOS_G +MOLTRES_G +SLOWKING_G +CORSOLA_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G +DARUMAKA_G +DARMANITAN_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/100 - Infestation.txt b/src/tm_compatibility/100 - Infestation.txt index 25a8b42..ff55636 100644 --- a/src/tm_compatibility/100 - Infestation.txt +++ b/src/tm_compatibility/100 - Infestation.txt @@ -135,4 +135,25 @@ SANDYGAST PALOSSAND MIMIKYU MIMIKYU_BUSTED -STAKATAKA \ No newline at end of file +STAKATAKA +BLIPBUG +DOTTLER +ORBEETLE +GOSSIFLEUR +ELDEGOSS +SIZZLIPEDE +CENTISKORCH +MR_RIME +RUNERIGUS +PINCURCHIN +SNOM +FROSMOTH +DREEPY +DRAKLOAK +DRAGAPULT +KOFFING_G +WEEZING_G +MR_MIME_G +MIME_JR_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/101 - Power-Up Punch.txt b/src/tm_compatibility/101 - Power-Up Punch.txt index a142fe6..1f94a31 100644 --- a/src/tm_compatibility/101 - Power-Up Punch.txt +++ b/src/tm_compatibility/101 - Power-Up Punch.txt @@ -174,6 +174,8 @@ KROOKODILE DARUMAKA DARMANITAN DARMANITANZEN +DARUMAKA_G +DARMANITAN_G SCRAGGY SCRAFTY GOTHITELLE @@ -230,4 +232,29 @@ BUZZWOLE GUZZLORD MARSHADOW ZERAORA -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +COALOSSAL +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +CLOBBOPUS +GRAPPLOCT +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +MR_RIME +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +SLOWBRO_G +MR_MIME_G +SLOWKING_G diff --git a/src/tm_compatibility/103 - Sludge Wave.txt b/src/tm_compatibility/103 - Sludge Wave.txt index 869b79f..f7dde64 100644 --- a/src/tm_compatibility/103 - Sludge Wave.txt +++ b/src/tm_compatibility/103 - Sludge Wave.txt @@ -9,6 +9,7 @@ DUGTRIO DUGTRIO_A TENTACOOL TENTACRUEL +SLOWBRO_G GRIMER GRIMER_A MUK @@ -23,6 +24,7 @@ WEEZING_G MEW WOOPER QUAGSIRE +SLOWKING_G QWILFISH SHUCKLE OCTILLERY diff --git a/src/tm_compatibility/104 - Psyshock.txt b/src/tm_compatibility/104 - Psyshock.txt index 1bdc8b5..c004b41 100644 --- a/src/tm_compatibility/104 - Psyshock.txt +++ b/src/tm_compatibility/104 - Psyshock.txt @@ -12,6 +12,7 @@ ALAKAZAM SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G DROWZEE HYPNO EXEGGUTOR @@ -21,6 +22,7 @@ MR_MIME MR_MIME_G JYNX PORYGON +ARTICUNO_G MEWTWO MEW CLEFFA @@ -30,6 +32,7 @@ NATU XATU ESPEON SLOWKING +SLOWKING_G GIRAFARIG PORYGON2 STANTLER @@ -145,3 +148,6 @@ ALCREMIE_RIBBON ALCREMIE_STAR INDEEDEE INDEEDEE_FEMALE +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/105 - Brutal Swing.txt b/src/tm_compatibility/105 - Brutal Swing.txt index c8e1a17..922f99f 100644 --- a/src/tm_compatibility/105 - Brutal Swing.txt +++ b/src/tm_compatibility/105 - Brutal Swing.txt @@ -12,6 +12,7 @@ GRAVELER GRAVELER_A GOLEM GOLEM_A +SLOWBRO_G FARFETCHD FARFETCHD_G GRIMER @@ -164,3 +165,5 @@ DRACOVISH ZACIAN ZACIAN_CROWNED ETERNATUS +ZARUDE +ZARUDE_DADA diff --git a/src/tm_compatibility/106 - Smart Strike.txt b/src/tm_compatibility/106 - Smart Strike.txt index aab695e..e40ca7d 100644 --- a/src/tm_compatibility/106 - Smart Strike.txt +++ b/src/tm_compatibility/106 - Smart Strike.txt @@ -44,3 +44,5 @@ NECROZMA_DAWN_WINGS NAGANADEL DREDNAW FALINKS +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tm_compatibility/107 - Acrobatics.txt b/src/tm_compatibility/107 - Acrobatics.txt index d197436..0bc0bac 100644 --- a/src/tm_compatibility/107 - Acrobatics.txt +++ b/src/tm_compatibility/107 - Acrobatics.txt @@ -149,3 +149,10 @@ FLAPPLE FROSMOTH DRAKLOAK DRAGAPULT +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +ZAPDOS_G diff --git a/src/tm_compatibility/108 - Snarl.txt b/src/tm_compatibility/108 - Snarl.txt index 2e64eac..05d1d2e 100644 --- a/src/tm_compatibility/108 - Snarl.txt +++ b/src/tm_compatibility/108 - Snarl.txt @@ -141,3 +141,11 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +URSHIFU_SINGLE +ZARUDE +ZARUDE_DADA +GLASTRIER +SPECTRIER +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MOLTRES_G diff --git a/src/tm_compatibility/109 - Defog.txt b/src/tm_compatibility/109 - Defog.txt index 6c4028b..0781e9e 100644 --- a/src/tm_compatibility/109 - Defog.txt +++ b/src/tm_compatibility/109 - Defog.txt @@ -210,4 +210,17 @@ DRAMPA TAPU_KOKO TAPU_FINI LUNALA -KARTANA \ No newline at end of file +KARTANA +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +FLAPPLE +CRAMORANT +SIRFETCHD +FROSMOTH +DRAKLOAK +DRAGAPULT +FARFETCHD_G +ARTICUNO_G +ZAPDOS_G +MOLTRES_G diff --git a/src/tm_compatibility/11 - Sunny Day.txt b/src/tm_compatibility/11 - Sunny Day.txt index bdeb3c6..5dc6148 100644 --- a/src/tm_compatibility/11 - Sunny Day.txt +++ b/src/tm_compatibility/11 - Sunny Day.txt @@ -688,3 +688,9 @@ CURSOLA SIRFETCHD MR_RIME DRACOZOLT +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +SLOWKING_G diff --git a/src/tm_compatibility/111 - Smack Down.txt b/src/tm_compatibility/111 - Smack Down.txt index 774224a..f375945 100644 --- a/src/tm_compatibility/111 - Smack Down.txt +++ b/src/tm_compatibility/111 - Smack Down.txt @@ -123,6 +123,20 @@ GUZZLORD MARSHADOW STAKATAKA BLACEPHALON +DREDNAW ROLYCOLY CARKOL COALOSSAL +SANDACONDA +GRAPPLOCT +GRIMMSNARL +OBSTAGOON +RUNERIGUS +STONJOURNER +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +ZAPDOS_G +DARMANITAN_G +YAMASK_G diff --git a/src/tm_compatibility/112 - Round.txt b/src/tm_compatibility/112 - Round.txt index 73728bb..b7a71f9 100644 --- a/src/tm_compatibility/112 - Round.txt +++ b/src/tm_compatibility/112 - Round.txt @@ -1065,3 +1065,16 @@ ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +SLOWKING_G diff --git a/src/tm_compatibility/113 - Echoed Voice.txt b/src/tm_compatibility/113 - Echoed Voice.txt index 1932043..c24b4e9 100644 --- a/src/tm_compatibility/113 - Echoed Voice.txt +++ b/src/tm_compatibility/113 - Echoed Voice.txt @@ -291,4 +291,40 @@ POIPOLE NAGANADEL ZERAORA MELTAN -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +CRAMORANT +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +GRIMMSNARL +OBSTAGOON +PERRSERKER +MR_RIME +FALINKS +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRAKLOAK +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MEOWTH_G +PONYTA_G +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +MR_MIME_G +MOLTRES_G +SLOWKING_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G diff --git a/src/tm_compatibility/114 - Natural Gift.txt b/src/tm_compatibility/114 - Natural Gift.txt index 9bca0b3..6e35207 100644 --- a/src/tm_compatibility/114 - Natural Gift.txt +++ b/src/tm_compatibility/114 - Natural Gift.txt @@ -1023,4 +1023,126 @@ NECROZMA_ULTRA LYCANROC_DUSK VIVILLON_FANCY MELTAN -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +SOBBLE +DRIZZILE +INTELEON +SKWOVET +GREEDENT +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +DOTTLER +ORBEETLE +NICKIT +THIEVUL +GOSSIFLEUR +ELDEGOSS +WOOLOO +DUBWOOL +CHEWTLE +DREDNAW +YAMPER +BOLTUND +ROLYCOLY +CARKOL +COALOSSAL +APPLIN +FLAPPLE +APPLETUN +SILICOBRA +SANDACONDA +CRAMORANT +ARROKUDA +BARRASKEWDA +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +CURSOLA +SIRFETCHD +MR_RIME +RUNERIGUS +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_LOVE +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_RIBBON +ALCREMIE_STAR +FALINKS +PINCURCHIN +FROSMOTH +STONJOURNER +EISCUE +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +CUFANT +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +DURALUDON +DREEPY +DRAKLOAK +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MEOWTH_G +PONYTA_G +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +FARFETCHD_G +KOFFING_G +WEEZING_G +MR_MIME_G +ARTICUNO_G +ZAPDOS_G +MOLTRES_G +SLOWKING_G +CORSOLA_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G +DARUMAKA_G +DARMANITAN_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/115 - Quash.txt b/src/tm_compatibility/115 - Quash.txt index c0fa839..bc8cb8e 100644 --- a/src/tm_compatibility/115 - Quash.txt +++ b/src/tm_compatibility/115 - Quash.txt @@ -53,4 +53,27 @@ ORANGURU PALOSSAND PYUKUMUKU KOMALA -BLACEPHALON \ No newline at end of file +BLACEPHALON +INTELEON +CORVIKNIGHT +NICKIT +THIEVUL +CLOBBOPUS +GRAPPLOCT +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +MORPEKO +ZARUDE +ZARUDE_DADA +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MOLTRES_G +ZIGZAGOON_G +LINOONE_G diff --git a/src/tm_compatibility/116 - Trick Room.txt b/src/tm_compatibility/116 - Trick Room.txt index 1f5502b..2c2e241 100644 --- a/src/tm_compatibility/116 - Trick Room.txt +++ b/src/tm_compatibility/116 - Trick Room.txt @@ -155,3 +155,15 @@ HATTERENE MR_RIME RUNERIGUS INDEEDEE +INDEEDEE_FEMALE +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +ARTICUNO_G +SLOWKING_G +MIME_JR_G +MR_MIME_G +YAMASK_G diff --git a/src/tm_compatibility/117 - Fling.txt b/src/tm_compatibility/117 - Fling.txt index cd0e2c3..2fa174d 100644 --- a/src/tm_compatibility/117 - Fling.txt +++ b/src/tm_compatibility/117 - Fling.txt @@ -54,6 +54,7 @@ GRAVELER_A GOLEM GOLEM_A SLOWBRO +SLOWBRO_G SEEL DEWGONG GRIMER @@ -110,6 +111,7 @@ POLITOED AIPOM QUAGSIRE SLOWKING +SLOWKING_G GLIGAR SNUBBULL GRANBULL @@ -377,3 +379,6 @@ ALCREMIE_STAR MORPEKO CUFANT COPPERAJAH +URSHIFU_SINGLE +ZARUDE +ZARUDE_DADA diff --git a/src/tm_compatibility/118 - Aurora Veil.txt b/src/tm_compatibility/118 - Aurora Veil.txt index 9adc847..a07feb5 100644 --- a/src/tm_compatibility/118 - Aurora Veil.txt +++ b/src/tm_compatibility/118 - Aurora Veil.txt @@ -20,6 +20,15 @@ AMAURA AURORUS BERGMITE AVALUGG +MR_RIME FROSMOTH EISCUE +ARCTOZOLT ARCTOVISH +GLASTRIER +CALYREX_ICE_RIDER +MR_MIME_G +ARTICUNO_G +MIME_JR_G +DARUMAKA_G +DARMANITAN_G diff --git a/src/tm_compatibility/119 - Sky Drop.txt b/src/tm_compatibility/119 - Sky Drop.txt index 260e1ac..d6caede 100644 --- a/src/tm_compatibility/119 - Sky Drop.txt +++ b/src/tm_compatibility/119 - Sky Drop.txt @@ -23,3 +23,8 @@ VIKAVOLT TAPU_KOKO LUNALA NAGANADEL +CORVIKNIGHT +DRAGAPULT +ETERNATUS +ARTICUNO_G +MOLTRES_G diff --git a/src/tm_compatibility/12 - Taunt.txt b/src/tm_compatibility/12 - Taunt.txt index d9bd3fa..499de2c 100644 --- a/src/tm_compatibility/12 - Taunt.txt +++ b/src/tm_compatibility/12 - Taunt.txt @@ -304,3 +304,13 @@ MORPEKO COPPERAJAH DRACOZOLT ARCTOZOLT +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +GLASTRIER +SPECTRIER +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +ZAPDOS_G +MOLTRES_G diff --git a/src/tm_compatibility/120 - Nature Power.txt b/src/tm_compatibility/120 - Nature Power.txt index ae82b53..d7e7a86 100644 --- a/src/tm_compatibility/120 - Nature Power.txt +++ b/src/tm_compatibility/120 - Nature Power.txt @@ -161,4 +161,37 @@ TAPU_KOKO TAPU_LELE TAPU_BULU TAPU_FINI -XURKITREE \ No newline at end of file +XURKITREE +GROOKEY +THWACKEY +RILLABOOM +GOSSIFLEUR +ELDEGOSS +DREDNAW +APPLIN +FLAPPLE +APPLETUN +SILICOBRA +SANDACONDA +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +CURSOLA +PINCURCHIN +FROSMOTH +INDEEDEE +INDEEDEE_FEMALE +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +ETERNATUS +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +CORSOLA_G diff --git a/src/tm_compatibility/121 - Cut.txt b/src/tm_compatibility/121 - Cut.txt index 29cf53c..b059887 100644 --- a/src/tm_compatibility/121 - Cut.txt +++ b/src/tm_compatibility/121 - Cut.txt @@ -348,3 +348,41 @@ NECROZMA_ULTRA POIPOLE NAGANADEL ZERAORA +GROOKEY +THWACKEY +RILLABOOM +SKWOVET +GREEDENT +NICKIT +THIEVUL +CHEWTLE +DREDNAW +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +SIRFETCHD +MORPEKO +DRACOZOLT +ARCTOZOLT +DURALUDON +DREEPY +DRAKLOAK +DRAGAPULT +ZACIAN +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +MEOWTH_G +FARFETCHD_G +ZIGZAGOON_G +LINOONE_G +STUNFISK_G diff --git a/src/tm_compatibility/122 - Fly.txt b/src/tm_compatibility/122 - Fly.txt index 9b82c76..fbc3b6a 100644 --- a/src/tm_compatibility/122 - Fly.txt +++ b/src/tm_compatibility/122 - Fly.txt @@ -129,3 +129,6 @@ FLAPPLE CRAMORANT DRAGAPULT ETERNATUS +ARTICUNO_G +ZAPDOS_G +MOLTRES_G diff --git a/src/tm_compatibility/123 - Surf.txt b/src/tm_compatibility/123 - Surf.txt index 8e18cfb..e14c11a 100644 --- a/src/tm_compatibility/123 - Surf.txt +++ b/src/tm_compatibility/123 - Surf.txt @@ -32,6 +32,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G SEEL DEWGONG SHELLDER @@ -75,6 +76,7 @@ POLITOED WOOPER QUAGSIRE SLOWKING +SLOWKING_G QWILFISH SNEASEL CORSOLA @@ -278,3 +280,4 @@ DRACOVISH ARCTOVISH DRAKLOAK DRAGAPULT +URSHIFU_RAPID diff --git a/src/tm_compatibility/124 - Strength.txt b/src/tm_compatibility/124 - Strength.txt index 5d40169..8eeb357 100644 --- a/src/tm_compatibility/124 - Strength.txt +++ b/src/tm_compatibility/124 - Strength.txt @@ -436,4 +436,61 @@ NECROZMA_ULTRA MARSHADOW STAKATAKA ZERAORA -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +SKWOVET +GREEDENT +THIEVUL +WOOLOO +DUBWOOL +DREDNAW +BOLTUND +CARKOL +COALOSSAL +APPLETUN +SANDACONDA +TOXTRICITY +TOXTRICITY_LOW_KEY +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +GRIMMSNARL +OBSTAGOON +PERRSERKER +SIRFETCHD +RUNERIGUS +FALINKS +STONJOURNER +INDEEDEE +INDEEDEE_FEMALE +CUFANT +COPPERAJAH +DRACOZOLT +DRACOVISH +ARCTOZOLT +DURALUDON +ZAMAZENTA +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +GLASTRIER +CALYREX_ICE_RIDER +MEOWTH_G +PONYTA_G +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +FARFETCHD_G +ZAPDOS_G +SLOWKING_G +ZIGZAGOON_G +LINOONE_G +DARUMAKA_G +DARMANITAN_G diff --git a/src/tm_compatibility/125 - Dive.txt b/src/tm_compatibility/125 - Dive.txt index e272aea..2c29218 100644 --- a/src/tm_compatibility/125 - Dive.txt +++ b/src/tm_compatibility/125 - Dive.txt @@ -12,6 +12,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G SEEL DEWGONG SHELLDER @@ -44,6 +45,7 @@ POLITOED WOOPER QUAGSIRE SLOWKING +SLOWKING_G QWILFISH REMORAID OCTILLERY @@ -159,3 +161,4 @@ DRACOVISH ARCTOVISH DRAKLOAK DRAGAPULT +URSHIFU_RAPID diff --git a/src/tm_compatibility/126 - Rock Smash.txt b/src/tm_compatibility/126 - Rock Smash.txt index b214e3d..3d0b1d1 100644 --- a/src/tm_compatibility/126 - Rock Smash.txt +++ b/src/tm_compatibility/126 - Rock Smash.txt @@ -473,4 +473,68 @@ PASSIMIAN GOLISOPOD MAROWAK_A RAICHU_A -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +SKWOVET +GREEDENT +CORVIKNIGHT +NICKIT +THIEVUL +WOOLOO +DUBWOOL +CHEWTLE +DREDNAW +CARKOL +COALOSSAL +APPLETUN +SILICOBRA +SANDACONDA +ARROKUDA +BARRASKEWDA +TOXTRICITY +TOXTRICITY_LOW_KEY +CLOBBOPUS +GRAPPLOCT +MORGREM +GRIMMSNARL +OBSTAGOON +SIRFETCHD +MR_RIME +RUNERIGUS +FALINKS +STONJOURNER +CUFANT +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +DURALUDON +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +GLASTRIER +CALYREX +CALYREX_ICE_RIDER +SLOWBRO_G +FARFETCHD_G +MR_MIME_G +ZAPDOS_G +SLOWKING_G +ZIGZAGOON_G +LINOONE_G +DARUMAKA_G +DARMANITAN_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/127 - Waterfall.txt b/src/tm_compatibility/127 - Waterfall.txt index 18127aa..6d4335f 100644 --- a/src/tm_compatibility/127 - Waterfall.txt +++ b/src/tm_compatibility/127 - Waterfall.txt @@ -145,3 +145,4 @@ GRAPPLOCT EISCUE DRACOVISH ARCTOVISH +URSHIFU_RAPID diff --git a/src/tm_compatibility/128 - Rock Climb.txt b/src/tm_compatibility/128 - Rock Climb.txt index daab175..75dcbea 100644 --- a/src/tm_compatibility/128 - Rock Climb.txt +++ b/src/tm_compatibility/128 - Rock Climb.txt @@ -208,4 +208,27 @@ BUZZWOLE PHEROMOSA GUZZLORD MELMETAL +RILLABOOM +CINDERACE +DUBWOOL +DREDNAW +COALOSSAL +APPLETUN +SANDACONDA +TOXTRICITY +TOXTRICITY_LOW_KEY +GRAPPLOCT +GRIMMSNARL OBSTAGOON +FALINKS +STONJOURNER +COPPERAJAH +DURALUDON +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +GLASTRIER +CALYREX_ICE_RIDER +DARMANITAN_G diff --git a/src/tm_compatibility/13 - Ice Beam.txt b/src/tm_compatibility/13 - Ice Beam.txt index eeaa53c..bae601d 100644 --- a/src/tm_compatibility/13 - Ice Beam.txt +++ b/src/tm_compatibility/13 - Ice Beam.txt @@ -28,6 +28,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G SEEL DEWGONG SHELLDER @@ -80,6 +81,7 @@ POLITOED WOOPER QUAGSIRE SLOWKING +SLOWKING_G DUNSPARCE QWILFISH SNEASEL @@ -318,3 +320,5 @@ FROSMOTH EISCUE ARCTOZOLT ARCTOVISH +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tm_compatibility/14 - Blizzard.txt b/src/tm_compatibility/14 - Blizzard.txt index de43ad1..05db64f 100644 --- a/src/tm_compatibility/14 - Blizzard.txt +++ b/src/tm_compatibility/14 - Blizzard.txt @@ -30,6 +30,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G SEEL DEWGONG SHELLDER @@ -82,6 +83,7 @@ POLITOED WOOPER QUAGSIRE SLOWKING +SLOWKING_G DUNSPARCE QWILFISH SNEASEL @@ -274,3 +276,5 @@ FROSMOTH EISCUE ARCTOZOLT ARCTOVISH +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tm_compatibility/15 - Hyper Beam.txt b/src/tm_compatibility/15 - Hyper Beam.txt index 9100316..e4d0d6c 100644 --- a/src/tm_compatibility/15 - Hyper Beam.txt +++ b/src/tm_compatibility/15 - Hyper Beam.txt @@ -40,6 +40,7 @@ GOLEM_A RAPIDASH RAPIDASH_G SLOWBRO +SLOWBRO_G MAGNETON DODRIO DEWGONG @@ -83,8 +84,11 @@ KABUTOPS AERODACTYL SNORLAX ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRATINI DRAGONAIR DRAGONITE @@ -111,6 +115,7 @@ QUAGSIRE ESPEON UMBREON SLOWKING +SLOWKING_G FORRETRESS STEELIX GRANBULL @@ -571,3 +576,12 @@ ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/16 - Light Screen.txt b/src/tm_compatibility/16 - Light Screen.txt index d300e73..1a68af7 100644 --- a/src/tm_compatibility/16 - Light Screen.txt +++ b/src/tm_compatibility/16 - Light Screen.txt @@ -37,6 +37,7 @@ MACHAMP SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G MAGNEMITE MAGNETON CLOYSTER @@ -57,7 +58,9 @@ SCYTHER JYNX ELECTABUZZ JOLTEON +ARTICUNO_G ZAPDOS +ZAPDOS_G DRATINI DRAGONAIR DRAGONITE @@ -85,6 +88,7 @@ SUNKERN SUNFLORA ESPEON SLOWKING +SLOWKING_G GIRAFARIG PINECO FORRETRESS @@ -378,3 +382,8 @@ DRAGAPULT ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +REGIELEKI +REGIDRAGO +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/17 - Protect.txt b/src/tm_compatibility/17 - Protect.txt index 0bd88a9..e5fcd79 100644 --- a/src/tm_compatibility/17 - Protect.txt +++ b/src/tm_compatibility/17 - Protect.txt @@ -108,6 +108,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G MAGNEMITE MAGNETON FARFETCHD @@ -180,8 +181,11 @@ KABUTOPS AERODACTYL SNORLAX ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRATINI DRAGONAIR DRAGONITE @@ -236,6 +240,7 @@ ESPEON UMBREON MURKROW SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG PINECO @@ -1070,3 +1075,15 @@ ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/18 - Rain Dance.txt b/src/tm_compatibility/18 - Rain Dance.txt index 37398d7..a2a3935 100644 --- a/src/tm_compatibility/18 - Rain Dance.txt +++ b/src/tm_compatibility/18 - Rain Dance.txt @@ -69,6 +69,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G MAGNEMITE MAGNETON SEEL @@ -165,6 +166,7 @@ ESPEON UMBREON MURKROW SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG DUNSPARCE @@ -699,3 +701,5 @@ DRACOZOLT ARCTOZOLT DRACOVISH ARCTOVISH +URSHIFU_RAPID +REGIELEKI diff --git a/src/tm_compatibility/19 - Giga Drain.txt b/src/tm_compatibility/19 - Giga Drain.txt index 2f07b58..95c528d 100644 --- a/src/tm_compatibility/19 - Giga Drain.txt +++ b/src/tm_compatibility/19 - Giga Drain.txt @@ -273,3 +273,8 @@ ALCREMIE_LOVE ALCREMIE_RIBBON ALCREMIE_STAR FROSMOTH +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/2 - Dragon Claw.txt b/src/tm_compatibility/2 - Dragon Claw.txt index 752d7ca..231dc6e 100644 --- a/src/tm_compatibility/2 - Dragon Claw.txt +++ b/src/tm_compatibility/2 - Dragon Claw.txt @@ -99,3 +99,4 @@ NAGANADEL DRACOZOLT DURALUDON DRAGAPULT +REGIDRAGO diff --git a/src/tm_compatibility/20 - Safeguard.txt b/src/tm_compatibility/20 - Safeguard.txt index 0d2a244..5e401df 100644 --- a/src/tm_compatibility/20 - Safeguard.txt +++ b/src/tm_compatibility/20 - Safeguard.txt @@ -28,6 +28,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G SEEL DEWGONG DROWZEE @@ -39,6 +40,7 @@ MR_MIME_G SCYTHER LAPRAS MOLTRES +MOLTRES_G DRATINI DRAGONAIR DRAGONITE @@ -62,6 +64,7 @@ SUNFLORA WOOPER QUAGSIRE SLOWKING +SLOWKING_G WOBBUFFET SCIZOR SHUCKLE @@ -361,3 +364,6 @@ STONJOURNER INDEEDEE_FEMALE ZAMAZENTA ZAMAZENTA_CROWNED +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/21 - Frustration.txt b/src/tm_compatibility/21 - Frustration.txt index 2b0396d..84e796d 100644 --- a/src/tm_compatibility/21 - Frustration.txt +++ b/src/tm_compatibility/21 - Frustration.txt @@ -964,4 +964,126 @@ POIPOLE NAGANADEL STAKATAKA BLACEPHALON -ZERAORA \ No newline at end of file +ZERAORA +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +SOBBLE +DRIZZILE +INTELEON +SKWOVET +GREEDENT +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +DOTTLER +ORBEETLE +NICKIT +THIEVUL +GOSSIFLEUR +ELDEGOSS +WOOLOO +DUBWOOL +CHEWTLE +DREDNAW +YAMPER +BOLTUND +ROLYCOLY +CARKOL +COALOSSAL +APPLIN +FLAPPLE +APPLETUN +SILICOBRA +SANDACONDA +CRAMORANT +ARROKUDA +BARRASKEWDA +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +CURSOLA +SIRFETCHD +MR_RIME +RUNERIGUS +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_LOVE +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_RIBBON +ALCREMIE_STAR +FALINKS +PINCURCHIN +FROSMOTH +STONJOURNER +EISCUE +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +CUFANT +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +DURALUDON +DREEPY +DRAKLOAK +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MEOWTH_G +PONYTA_G +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +FARFETCHD_G +KOFFING_G +WEEZING_G +MR_MIME_G +ARTICUNO_G +ZAPDOS_G +MOLTRES_G +SLOWKING_G +CORSOLA_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G +DARUMAKA_G +DARMANITAN_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/22 - Solarbeam.txt b/src/tm_compatibility/22 - Solarbeam.txt index 181decd..a0eb8ad 100644 --- a/src/tm_compatibility/22 - Solarbeam.txt +++ b/src/tm_compatibility/22 - Solarbeam.txt @@ -372,6 +372,7 @@ ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS ZARUDE +ZARUDE_DADA CALYREX CALYREX_ICE_RIDER CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/23 - Iron Tail.txt b/src/tm_compatibility/23 - Iron Tail.txt index 733e500..ac91f41 100644 --- a/src/tm_compatibility/23 - Iron Tail.txt +++ b/src/tm_compatibility/23 - Iron Tail.txt @@ -66,6 +66,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G FARFETCHD SEEL DEWGONG @@ -118,6 +119,7 @@ QUAGSIRE ESPEON UMBREON SLOWKING +SLOWKING_G GIRAFARIG DUNSPARCE GLIGAR @@ -378,3 +380,5 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +ZARUDE +ZARUDE_DADA diff --git a/src/tm_compatibility/24 - Thunderbolt.txt b/src/tm_compatibility/24 - Thunderbolt.txt index aaed281..8516fc4 100644 --- a/src/tm_compatibility/24 - Thunderbolt.txt +++ b/src/tm_compatibility/24 - Thunderbolt.txt @@ -317,3 +317,4 @@ ARCTOZOLT DURALUDON DRAKLOAK DRAGAPULT +REGIELEKI diff --git a/src/tm_compatibility/25 - Thunder.txt b/src/tm_compatibility/25 - Thunder.txt index f1d5d81..89e5035 100644 --- a/src/tm_compatibility/25 - Thunder.txt +++ b/src/tm_compatibility/25 - Thunder.txt @@ -259,3 +259,4 @@ ARCTOZOLT DURALUDON DRAKLOAK DRAGAPULT +REGIELEKI diff --git a/src/tm_compatibility/26 - Earthquake.txt b/src/tm_compatibility/26 - Earthquake.txt index 7a388fc..b3872b6 100644 --- a/src/tm_compatibility/26 - Earthquake.txt +++ b/src/tm_compatibility/26 - Earthquake.txt @@ -30,6 +30,7 @@ GOLEM_A SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G ONIX EXEGGUTOR_A CUBONE @@ -59,6 +60,7 @@ POLITOED WOOPER QUAGSIRE SLOWKING +SLOWKING_G GIRAFARIG PINECO FORRETRESS diff --git a/src/tm_compatibility/27 - Return.txt b/src/tm_compatibility/27 - Return.txt index 7097477..5842abd 100644 --- a/src/tm_compatibility/27 - Return.txt +++ b/src/tm_compatibility/27 - Return.txt @@ -966,4 +966,126 @@ STAKATAKA BLACEPHALON ZERAORA MELTAN -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +SOBBLE +DRIZZILE +INTELEON +SKWOVET +GREEDENT +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +DOTTLER +ORBEETLE +NICKIT +THIEVUL +GOSSIFLEUR +ELDEGOSS +WOOLOO +DUBWOOL +CHEWTLE +DREDNAW +YAMPER +BOLTUND +ROLYCOLY +CARKOL +COALOSSAL +APPLIN +FLAPPLE +APPLETUN +SILICOBRA +SANDACONDA +CRAMORANT +ARROKUDA +BARRASKEWDA +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +CURSOLA +SIRFETCHD +MR_RIME +RUNERIGUS +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_LOVE +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_RIBBON +ALCREMIE_STAR +FALINKS +PINCURCHIN +FROSMOTH +STONJOURNER +EISCUE +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +CUFANT +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +DURALUDON +DREEPY +DRAKLOAK +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MEOWTH_G +PONYTA_G +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +FARFETCHD_G +KOFFING_G +WEEZING_G +MR_MIME_G +ARTICUNO_G +ZAPDOS_G +MOLTRES_G +SLOWKING_G +CORSOLA_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G +DARUMAKA_G +DARMANITAN_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/28 - Dig.txt b/src/tm_compatibility/28 - Dig.txt index 4b47d87..b17eb03 100644 --- a/src/tm_compatibility/28 - Dig.txt +++ b/src/tm_compatibility/28 - Dig.txt @@ -79,6 +79,7 @@ GOLEM_A SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G GRIMER GRIMER_A MUK @@ -126,6 +127,7 @@ QUAGSIRE ESPEON UMBREON SLOWKING +SLOWKING_G PINECO FORRETRESS DUNSPARCE @@ -372,3 +374,8 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA diff --git a/src/tm_compatibility/29 - Psychic.txt b/src/tm_compatibility/29 - Psychic.txt index 819efce..716abd8 100644 --- a/src/tm_compatibility/29 - Psychic.txt +++ b/src/tm_compatibility/29 - Psychic.txt @@ -20,6 +20,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G GASTLY HAUNTER GENGAR @@ -40,6 +41,7 @@ MAGMAR LAPRAS PORYGON SNORLAX +ARTICUNO_G MEWTWO MEW HOOTHOOT @@ -58,6 +60,7 @@ ESPEON UMBREON MURKROW SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG CORSOLA @@ -322,3 +325,6 @@ ALCREMIE_RIBBON ALCREMIE_STAR INDEEDEE INDEEDEE_FEMALE +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/3 - Water Pulse.txt b/src/tm_compatibility/3 - Water Pulse.txt index f3049ce..390dd57 100644 --- a/src/tm_compatibility/3 - Water Pulse.txt +++ b/src/tm_compatibility/3 - Water Pulse.txt @@ -24,7 +24,9 @@ POLIWRATH TENTACOOL TENTACRUEL SLOWPOKE +SLOWPOKE_G SLOWBRO +SLOWBRO_G SEEL DEWGONG SHELLDER @@ -74,11 +76,13 @@ AIPOM WOOPER QUAGSIRE SLOWKING +SLOWKING_G DUNSPARCE SNUBBULL GRANBULL QWILFISH CORSOLA +CORSOLA_G REMORAID OCTILLERY DELIBIRD @@ -272,4 +276,21 @@ GOLISOPOD BRUXISH DRAMPA KOMMO_O -TAPU_FINI \ No newline at end of file +TAPU_FINI +SOBBLE +DRIZZILE +INTELEON +CHEWTLE +DREDNAW +CRAMORANT +ARROKUDA +BARRASKEWDA +CLOBBOPUS +GRAPPLOCT +CURSOLA +EISCUE +DRACOVISH +ARCTOVISH +DRAKLOAK +DRAGAPULT +URSHIFU_RAPID diff --git a/src/tm_compatibility/30 - Shadow Ball.txt b/src/tm_compatibility/30 - Shadow Ball.txt index a3890ae..cb0890d 100644 --- a/src/tm_compatibility/30 - Shadow Ball.txt +++ b/src/tm_compatibility/30 - Shadow Ball.txt @@ -24,6 +24,7 @@ ALAKAZAM SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G GRIMER GRIMER_A MUK @@ -53,6 +54,8 @@ JOLTEON FLAREON PORYGON SNORLAX +ARTICUNO_G +MOLTRES_G MEWTWO MEW SENTRET @@ -72,6 +75,7 @@ ESPEON UMBREON MURKROW SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG DUNSPARCE @@ -365,3 +369,5 @@ INDEEDEE_FEMALE DRAKLOAK DRAGAPULT ETERNATUS +SPECTRIER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/31 - Brick Break.txt b/src/tm_compatibility/31 - Brick Break.txt index b7dbbe2..2a12ea9 100644 --- a/src/tm_compatibility/31 - Brick Break.txt +++ b/src/tm_compatibility/31 - Brick Break.txt @@ -52,6 +52,7 @@ GRAVELER_A GOLEM GOLEM_A SLOWBRO +SLOWBRO_G FARFETCHD_G MUK MUK_A @@ -80,6 +81,7 @@ MAGMAR PINSIR KABUTOPS SNORLAX +ZAPDOS_G DRAGONITE MEWTWO MEW @@ -102,6 +104,7 @@ POLITOED AIPOM QUAGSIRE SLOWKING +SLOWKING_G GLIGAR SNUBBULL GRANBULL @@ -344,3 +347,8 @@ COPPERAJAH DURALUDON ZACIAN ZACIAN_CROWNED +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA diff --git a/src/tm_compatibility/32 - Double Team.txt b/src/tm_compatibility/32 - Double Team.txt index eadce0e..9289811 100644 --- a/src/tm_compatibility/32 - Double Team.txt +++ b/src/tm_compatibility/32 - Double Team.txt @@ -964,4 +964,126 @@ NAGANADEL BLACEPHALON ZERAORA MELTAN -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +SOBBLE +DRIZZILE +INTELEON +SKWOVET +GREEDENT +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +DOTTLER +ORBEETLE +NICKIT +THIEVUL +GOSSIFLEUR +ELDEGOSS +WOOLOO +DUBWOOL +CHEWTLE +DREDNAW +YAMPER +BOLTUND +ROLYCOLY +CARKOL +COALOSSAL +APPLIN +FLAPPLE +APPLETUN +SILICOBRA +SANDACONDA +CRAMORANT +ARROKUDA +BARRASKEWDA +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +CURSOLA +SIRFETCHD +MR_RIME +RUNERIGUS +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_LOVE +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_RIBBON +ALCREMIE_STAR +FALINKS +PINCURCHIN +FROSMOTH +STONJOURNER +EISCUE +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +CUFANT +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +DURALUDON +DREEPY +DRAKLOAK +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MEOWTH_G +PONYTA_G +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +FARFETCHD_G +KOFFING_G +WEEZING_G +MR_MIME_G +ARTICUNO_G +ZAPDOS_G +MOLTRES_G +SLOWKING_G +CORSOLA_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G +DARUMAKA_G +DARMANITAN_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/33 - Reflect.txt b/src/tm_compatibility/33 - Reflect.txt index 58e61b2..c539b12 100644 --- a/src/tm_compatibility/33 - Reflect.txt +++ b/src/tm_compatibility/33 - Reflect.txt @@ -44,6 +44,7 @@ MR_MIME MR_MIME_G JYNX ARTICUNO +ARTICUNO_G MEWTWO MEW CHIKORITA @@ -272,3 +273,8 @@ DRAGAPULT ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +REGIELEKI +REGIDRAGO +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/34 - Shock Wave.txt b/src/tm_compatibility/34 - Shock Wave.txt index b340bc4..fcbf092 100644 --- a/src/tm_compatibility/34 - Shock Wave.txt +++ b/src/tm_compatibility/34 - Shock Wave.txt @@ -324,4 +324,42 @@ NECROZMA_ULTRA MAGEARNA MAGEARNA_P NAGANADEL -ZERAORA \ No newline at end of file +ZERAORA +DOTTLER +ORBEETLE +WOOLOO +DUBWOOL +YAMPER +BOLTUND +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +CURSOLA +MR_RIME +RUNERIGUS +PINCURCHIN +INDEEDEE +INDEEDEE_FEMALE +DRACOZOLT +ARCTOZOLT +DRAGAPULT +REGIELEKI +MEOWTH_G +KOFFING_G +WEEZING_G +MR_MIME_G +ZAPDOS_G +CORSOLA_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/35 - Flamethrower.txt b/src/tm_compatibility/35 - Flamethrower.txt index 06ca01c..1db4d15 100644 --- a/src/tm_compatibility/35 - Flamethrower.txt +++ b/src/tm_compatibility/35 - Flamethrower.txt @@ -26,6 +26,7 @@ RAPIDASH SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G GRIMER GRIMER_A MUK @@ -66,6 +67,7 @@ IGGLYBUFF TOGEPI TOGETIC SLOWKING +SLOWKING_G DUNSPARCE SNUBBULL GRANBULL diff --git a/src/tm_compatibility/36 - Sludge Bomb.txt b/src/tm_compatibility/36 - Sludge Bomb.txt index 4f34a78..726a4ab 100644 --- a/src/tm_compatibility/36 - Sludge Bomb.txt +++ b/src/tm_compatibility/36 - Sludge Bomb.txt @@ -33,6 +33,7 @@ WEEPINBELL VICTREEBEL TENTACOOL TENTACRUEL +SLOWBRO_G GRIMER GRIMER_A MUK @@ -58,6 +59,7 @@ SUNKERN SUNFLORA WOOPER QUAGSIRE +SLOWKING_G GLIGAR SNUBBULL GRANBULL diff --git a/src/tm_compatibility/38 - Fire Blast.txt b/src/tm_compatibility/38 - Fire Blast.txt index af25ee5..f49a740 100644 --- a/src/tm_compatibility/38 - Fire Blast.txt +++ b/src/tm_compatibility/38 - Fire Blast.txt @@ -26,6 +26,7 @@ RAPIDASH SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G GRIMER GRIMER_A MUK @@ -63,6 +64,7 @@ IGGLYBUFF TOGEPI TOGETIC SLOWKING +SLOWKING_G DUNSPARCE SNUBBULL GRANBULL diff --git a/src/tm_compatibility/39 - Rock Tomb.txt b/src/tm_compatibility/39 - Rock Tomb.txt index 062063e..ee7e175 100644 --- a/src/tm_compatibility/39 - Rock Tomb.txt +++ b/src/tm_compatibility/39 - Rock Tomb.txt @@ -389,3 +389,7 @@ ARCTOZOLT DRACOVISH ARCTOVISH DURALUDON +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA diff --git a/src/tm_compatibility/4 - Calm Mind.txt b/src/tm_compatibility/4 - Calm Mind.txt index f52634b..83cf29d 100644 --- a/src/tm_compatibility/4 - Calm Mind.txt +++ b/src/tm_compatibility/4 - Calm Mind.txt @@ -14,6 +14,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G DROWZEE HYPNO EXEGGUTOR @@ -21,6 +22,7 @@ CHANSEY MR_MIME MR_MIME_G JYNX +ARTICUNO_G MEWTWO MEW HOOTHOOT @@ -31,6 +33,7 @@ SUDOWOODO ESPEON MURKROW SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG DUNSPARCE @@ -272,3 +275,7 @@ ALCREMIE_STAR FROSMOTH INDEEDEE INDEEDEE_FEMALE +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/40 - Aerial Ace.txt b/src/tm_compatibility/40 - Aerial Ace.txt index 353b10b..5b7d771 100644 --- a/src/tm_compatibility/40 - Aerial Ace.txt +++ b/src/tm_compatibility/40 - Aerial Ace.txt @@ -36,6 +36,7 @@ PRIMEAPE GROWLITHE ARCANINE SLOWBRO +SLOWBRO_G FARFETCHD DODUO DODRIO @@ -50,8 +51,11 @@ KABUTO KABUTOPS AERODACTYL ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRAGONITE MEWTWO MEW @@ -358,4 +362,35 @@ NECROZMA_DUSK_MANE NECROZMA_DAWN_WINGS NECROZMA_ULTRA NAGANADEL -ZERAORA \ No newline at end of file +ZERAORA +SCORBUNNY +RABOOT +CINDERACE +SOBBLE +DRIZZILE +INTELEON +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +ORBEETLE +NICKIT +THIEVUL +BOLTUND +FLAPPLE +CRAMORANT +ARROKUDA +BARRASKEWDA +PERRSERKER +MR_RIME +FROSMOTH +DRACOZOLT +DRAGAPULT +ZACIAN +ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +MEOWTH_G +MR_MIME_G diff --git a/src/tm_compatibility/41 - Torment.txt b/src/tm_compatibility/41 - Torment.txt index 1eb4fd4..94d2605 100644 --- a/src/tm_compatibility/41 - Torment.txt +++ b/src/tm_compatibility/41 - Torment.txt @@ -186,4 +186,39 @@ TAPU_LELE TAPU_BULU TAPU_FINI PHEROMOSA -BLACEPHALON \ No newline at end of file +BLACEPHALON +SOBBLE +DRIZZILE +INTELEON +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +NICKIT +THIEVUL +ARROKUDA +BARRASKEWDA +TOXTRICITY +TOXTRICITY_LOW_KEY +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +MR_RIME +MORPEKO +URSHIFU_SINGLE +ZARUDE +ZARUDE_DADA +GLASTRIER +CALYREX_ICE_RIDER +MEOWTH_G +KOFFING_G +WEEZING_G +MR_MIME_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G +DARMANITAN_G diff --git a/src/tm_compatibility/42 - Facade.txt b/src/tm_compatibility/42 - Facade.txt index 323a342..ed617ec 100644 --- a/src/tm_compatibility/42 - Facade.txt +++ b/src/tm_compatibility/42 - Facade.txt @@ -1,4 +1,4 @@ -TM42: Façade +TM42: Façade BULBASAUR IVYSAUR VENUSAUR @@ -957,4 +957,126 @@ NAGANADEL STAKATAKA BLACEPHALON ZERAORA -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +SOBBLE +DRIZZILE +INTELEON +SKWOVET +GREEDENT +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +DOTTLER +ORBEETLE +NICKIT +THIEVUL +GOSSIFLEUR +ELDEGOSS +WOOLOO +DUBWOOL +CHEWTLE +DREDNAW +YAMPER +BOLTUND +ROLYCOLY +CARKOL +COALOSSAL +APPLIN +FLAPPLE +APPLETUN +SILICOBRA +SANDACONDA +CRAMORANT +ARROKUDA +BARRASKEWDA +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +CURSOLA +SIRFETCHD +MR_RIME +RUNERIGUS +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_LOVE +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_RIBBON +ALCREMIE_STAR +FALINKS +PINCURCHIN +FROSMOTH +STONJOURNER +EISCUE +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +CUFANT +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +DURALUDON +DREEPY +DRAKLOAK +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MEOWTH_G +PONYTA_G +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +FARFETCHD_G +KOFFING_G +WEEZING_G +MR_MIME_G +ARTICUNO_G +ZAPDOS_G +MOLTRES_G +SLOWKING_G +CORSOLA_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G +DARUMAKA_G +DARMANITAN_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/43 - Secret Power.txt b/src/tm_compatibility/43 - Secret Power.txt index 4d50d67..3e87d15 100644 --- a/src/tm_compatibility/43 - Secret Power.txt +++ b/src/tm_compatibility/43 - Secret Power.txt @@ -966,4 +966,126 @@ NECROZMA_DAWN_WINGS NECROZMA_ULTRA LYCANROC_DUSK MELTAN -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +SOBBLE +DRIZZILE +INTELEON +SKWOVET +GREEDENT +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +DOTTLER +ORBEETLE +NICKIT +THIEVUL +GOSSIFLEUR +ELDEGOSS +WOOLOO +DUBWOOL +CHEWTLE +DREDNAW +YAMPER +BOLTUND +ROLYCOLY +CARKOL +COALOSSAL +APPLIN +FLAPPLE +APPLETUN +SILICOBRA +SANDACONDA +CRAMORANT +ARROKUDA +BARRASKEWDA +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +CURSOLA +SIRFETCHD +MR_RIME +RUNERIGUS +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_LOVE +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_RIBBON +ALCREMIE_STAR +FALINKS +PINCURCHIN +FROSMOTH +STONJOURNER +EISCUE +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +CUFANT +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +DURALUDON +DREEPY +DRAKLOAK +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MEOWTH_G +PONYTA_G +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +FARFETCHD_G +KOFFING_G +WEEZING_G +MR_MIME_G +ARTICUNO_G +ZAPDOS_G +MOLTRES_G +SLOWKING_G +CORSOLA_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G +DARUMAKA_G +DARMANITAN_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/44 - Rest.txt b/src/tm_compatibility/44 - Rest.txt index 8ee7a4c..67f501a 100644 --- a/src/tm_compatibility/44 - Rest.txt +++ b/src/tm_compatibility/44 - Rest.txt @@ -108,6 +108,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G MAGNEMITE MAGNETON FARFETCHD @@ -180,8 +181,11 @@ KABUTOPS AERODACTYL SNORLAX ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRATINI DRAGONAIR DRAGONITE @@ -236,6 +240,7 @@ ESPEON UMBREON MURKROW SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG PINECO @@ -1065,3 +1070,15 @@ ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/45 - Attract.txt b/src/tm_compatibility/45 - Attract.txt index 6dc9a9e..179ec12 100644 --- a/src/tm_compatibility/45 - Attract.txt +++ b/src/tm_compatibility/45 - Attract.txt @@ -108,6 +108,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G FARFETCHD FARFETCHD_G DODUO @@ -225,6 +226,7 @@ ESPEON UMBREON MURKROW SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG PINECO diff --git a/src/tm_compatibility/46 - Thief.txt b/src/tm_compatibility/46 - Thief.txt index b7bb4f2..4e8c2d9 100644 --- a/src/tm_compatibility/46 - Thief.txt +++ b/src/tm_compatibility/46 - Thief.txt @@ -418,3 +418,6 @@ RUNERIGUS MORPEKO DRAKLOAK DRAGAPULT +URSHIFU_SINGLE +ZARUDE +ZARUDE_DADA diff --git a/src/tm_compatibility/47 - Steel Wing.txt b/src/tm_compatibility/47 - Steel Wing.txt index 3771ac4..f632e2f 100644 --- a/src/tm_compatibility/47 - Steel Wing.txt +++ b/src/tm_compatibility/47 - Steel Wing.txt @@ -14,8 +14,11 @@ DODRIO SCYTHER AERODACTYL ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRAGONITE MEW HOOTHOOT diff --git a/src/tm_compatibility/48 - Skill Swap.txt b/src/tm_compatibility/48 - Skill Swap.txt index a65dc73..47f0061 100644 --- a/src/tm_compatibility/48 - Skill Swap.txt +++ b/src/tm_compatibility/48 - Skill Swap.txt @@ -8,6 +8,7 @@ ALAKAZAM SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G GASTLY HAUNTER GENGAR @@ -22,6 +23,7 @@ STARMIE MR_MIME MR_MIME_G JYNX +ARTICUNO_G MEWTWO MEW NATU @@ -129,3 +131,6 @@ HATTREM HATTERENE MR_RIME RUNERIGUS +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/5 - Roar.txt b/src/tm_compatibility/5 - Roar.txt index 1ab25f4..fcf11a4 100644 --- a/src/tm_compatibility/5 - Roar.txt +++ b/src/tm_compatibility/5 - Roar.txt @@ -27,8 +27,11 @@ JOLTEON FLAREON AERODACTYL ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRAGONITE MEW QUILAVA @@ -149,7 +152,9 @@ SANDILE KROKOROK KROOKODILE DARUMAKA +DARUMAKA_G DARMANITAN +DARMANITAN_G DARMANITANZEN SCRAGGY SCRAFTY @@ -238,4 +243,36 @@ KOMMO_O TAPU_KOKO TAPU_BULU SOLGALEO -LUNALA \ No newline at end of file +LUNALA +RILLABOOM +CINDERACE +INTELEON +THIEVUL +YAMPER +BOLTUND +COALOSSAL +APPLETUN +TOXTRICITY +TOXTRICITY_LOW_KEY +GRIMMSNARL +OBSTAGOON +FALINKS +CUFANT +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +DURALUDON +DRAKLOAK +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIDRAGO +ZIGZAGOON_G +LINOONE_G diff --git a/src/tm_compatibility/50 - Overheat.txt b/src/tm_compatibility/50 - Overheat.txt index 49ee9aa..b4e749d 100644 --- a/src/tm_compatibility/50 - Overheat.txt +++ b/src/tm_compatibility/50 - Overheat.txt @@ -14,6 +14,7 @@ WEEZING_G MAGMAR FLAREON MOLTRES +MOLTRES_G MEW CYNDAQUIL QUILAVA diff --git a/src/tm_compatibility/51 - Roost.txt b/src/tm_compatibility/51 - Roost.txt index d9b977c..418a5de 100644 --- a/src/tm_compatibility/51 - Roost.txt +++ b/src/tm_compatibility/51 - Roost.txt @@ -16,8 +16,11 @@ DODRIO SCYTHER AERODACTYL ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRAGONITE MEW HOOTHOOT @@ -133,4 +136,14 @@ DRAMPA TAPU_KOKO LUNALA BUZZWOLE -PHEROMOSA \ No newline at end of file +PHEROMOSA +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +ORBEETLE +FLAPPLE +CRAMORANT +SIRFETCHD +FROSMOTH +DRAGAPULT +FARFETCHD_G diff --git a/src/tm_compatibility/52 - Focus Blast.txt b/src/tm_compatibility/52 - Focus Blast.txt index aa2e350..7400363 100644 --- a/src/tm_compatibility/52 - Focus Blast.txt +++ b/src/tm_compatibility/52 - Focus Blast.txt @@ -20,6 +20,7 @@ MACHAMP GOLEM GOLEM_A SLOWBRO +SLOWBRO_G MUK MUK_A GENGAR @@ -48,6 +49,7 @@ AZUMARILL POLITOED QUAGSIRE SLOWKING +SLOWKING_G GRANBULL HERACROSS URSARING @@ -234,3 +236,8 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +URSHIFU_SINGLE +URSHIFU_RAPID +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/53 - Energy Ball.txt b/src/tm_compatibility/53 - Energy Ball.txt index fda26cf..730948a 100644 --- a/src/tm_compatibility/53 - Energy Ball.txt +++ b/src/tm_compatibility/53 - Energy Ball.txt @@ -291,3 +291,8 @@ ALCREMIE_RIBBON ALCREMIE_STAR INDEEDEE INDEEDEE_FEMALE +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/54 - False Swipe.txt b/src/tm_compatibility/54 - False Swipe.txt index 00bdcf5..6633418 100644 --- a/src/tm_compatibility/54 - False Swipe.txt +++ b/src/tm_compatibility/54 - False Swipe.txt @@ -102,3 +102,5 @@ DREDNAW FALINKS ZACIAN ZACIAN_CROWNED +URSHIFU_SINGLE +URSHIFU_RAPID diff --git a/src/tm_compatibility/55 - Brine.txt b/src/tm_compatibility/55 - Brine.txt index 80f3fee..e50b379 100644 --- a/src/tm_compatibility/55 - Brine.txt +++ b/src/tm_compatibility/55 - Brine.txt @@ -9,6 +9,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G SEEL DEWGONG SHELLDER @@ -30,6 +31,7 @@ MEW CHINCHOU LANTURN SLOWKING +SLOWKING_G QWILFISH CORSOLA CORSOLA_G @@ -130,3 +132,4 @@ DRACOVISH ARCTOVISH DRAKLOAK DRAGAPULT +URSHIFU_RAPID diff --git a/src/tm_compatibility/56 - Hone Claws.txt b/src/tm_compatibility/56 - Hone Claws.txt index 9bf991b..7ae1756 100644 --- a/src/tm_compatibility/56 - Hone Claws.txt +++ b/src/tm_compatibility/56 - Hone Claws.txt @@ -223,3 +223,23 @@ NECROZMA_DUSK_MANE NECROZMA_DAWN_WINGS NECROZMA_ULTRA ZERAORA +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +NICKIT +THIEVUL +YAMPER +BOLTUND +FLAPPLE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +DURALUDON +DRAGAPULT +ZARUDE +ZARUDE_DADA +MEOWTH_G +ZIGZAGOON_G +LINOONE_G diff --git a/src/tm_compatibility/57 - Charge Beam.txt b/src/tm_compatibility/57 - Charge Beam.txt index 221cea6..31a388b 100644 --- a/src/tm_compatibility/57 - Charge Beam.txt +++ b/src/tm_compatibility/57 - Charge Beam.txt @@ -243,4 +243,45 @@ NECROZMA_DUSK_MANE NECROZMA_DAWN_WINGS NECROZMA_ULTRA MAGEARNA -MAGEARNA_P \ No newline at end of file +MAGEARNA_P +SKWOVET +GREEDENT +DOTTLER +ORBEETLE +WOOLOO +DUBWOOL +YAMPER +BOLTUND +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +POLTEAGEIST +POLTEAGEIST_CHIPPED +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +CURSOLA +MR_RIME +PINCURCHIN +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +DRACOZOLT +ARCTOZOLT +DURALUDON +DRAKLOAK +DRAGAPULT +REGIELEKI +SPECTRIER +CALYREX +CALYREX_SHADOW_RIDER +RAPIDASH_G +ZAPDOS_G +CORSOLA_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G diff --git a/src/tm_compatibility/58 - Endure.txt b/src/tm_compatibility/58 - Endure.txt index 25012d7..9f5f856 100644 --- a/src/tm_compatibility/58 - Endure.txt +++ b/src/tm_compatibility/58 - Endure.txt @@ -108,6 +108,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G MAGNEMITE MAGNETON FARFETCHD @@ -180,8 +181,11 @@ KABUTOPS AERODACTYL SNORLAX ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRATINI DRAGONAIR DRAGONITE @@ -236,6 +240,7 @@ ESPEON UMBREON MURKROW SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG PINECO @@ -1066,3 +1071,15 @@ ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/59 - Dragon Pulse.txt b/src/tm_compatibility/59 - Dragon Pulse.txt index 48b278c..7aa2dfb 100644 --- a/src/tm_compatibility/59 - Dragon Pulse.txt +++ b/src/tm_compatibility/59 - Dragon Pulse.txt @@ -128,3 +128,4 @@ DURALUDON DRAKLOAK DRAGAPULT ETERNATUS +REGIDRAGO diff --git a/src/tm_compatibility/6 - Toxic.txt b/src/tm_compatibility/6 - Toxic.txt index fa82084..5eae704 100644 --- a/src/tm_compatibility/6 - Toxic.txt +++ b/src/tm_compatibility/6 - Toxic.txt @@ -957,4 +957,126 @@ STAKATAKA BLACEPHALON ZERAORA MELTAN -MELMETAL \ No newline at end of file +MELMETAL +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +SOBBLE +DRIZZILE +INTELEON +SKWOVET +GREEDENT +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +DOTTLER +ORBEETLE +NICKIT +THIEVUL +GOSSIFLEUR +ELDEGOSS +WOOLOO +DUBWOOL +CHEWTLE +DREDNAW +YAMPER +BOLTUND +ROLYCOLY +CARKOL +COALOSSAL +APPLIN +FLAPPLE +APPLETUN +SILICOBRA +SANDACONDA +CRAMORANT +ARROKUDA +BARRASKEWDA +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +CURSOLA +SIRFETCHD +MR_RIME +RUNERIGUS +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_LOVE +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_RIBBON +ALCREMIE_STAR +FALINKS +PINCURCHIN +FROSMOTH +STONJOURNER +EISCUE +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +CUFANT +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +DURALUDON +DREEPY +DRAKLOAK +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MEOWTH_G +PONYTA_G +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +FARFETCHD_G +KOFFING_G +WEEZING_G +MR_MIME_G +ARTICUNO_G +ZAPDOS_G +MOLTRES_G +SLOWKING_G +CORSOLA_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G +DARUMAKA_G +DARMANITAN_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/60 - Drain Punch.txt b/src/tm_compatibility/60 - Drain Punch.txt index 45ece83..ad5a5a3 100644 --- a/src/tm_compatibility/60 - Drain Punch.txt +++ b/src/tm_compatibility/60 - Drain Punch.txt @@ -10,6 +10,7 @@ ABRA KADABRA ALAKAZAM SLOWBRO +SLOWBRO_G GENGAR DROWZEE HYPNO @@ -26,6 +27,7 @@ LEDIAN TOGETIC BELLOSSOM SLOWKING +SLOWKING_G BLISSEY TREECKO GROVYLE @@ -126,3 +128,7 @@ ALCREMIE_RIBBON ALCREMIE_STAR INDEEDEE INDEEDEE_FEMALE +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA diff --git a/src/tm_compatibility/61 - Will-o-Wisp.txt b/src/tm_compatibility/61 - Will-o-Wisp.txt index 2c6f30a..bef4ad8 100644 --- a/src/tm_compatibility/61 - Will-o-Wisp.txt +++ b/src/tm_compatibility/61 - Will-o-Wisp.txt @@ -137,4 +137,26 @@ MIMIKYU MIMIKYU_BUSTED LUNALA MARSHADOW -BLACEPHALON \ No newline at end of file +BLACEPHALON +ROLYCOLY +CARKOL +COALOSSAL +SIZZLIPEDE +CENTISKORCH +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +CURSOLA +RUNERIGUS +DREEPY +DRAKLOAK +DRAGAPULT +SPECTRIER +CALYREX_SHADOW_RIDER +WEEZING_G +MOLTRES_G +CORSOLA_G +DARUMAKA_G +DARMANITAN_G +YAMASK_G diff --git a/src/tm_compatibility/62 - Silver Wind.txt b/src/tm_compatibility/62 - Silver Wind.txt index 9527416..f7d636d 100644 --- a/src/tm_compatibility/62 - Silver Wind.txt +++ b/src/tm_compatibility/62 - Silver Wind.txt @@ -115,3 +115,6 @@ COMFEY PHEROMOSA CELESTEELA NAGANADEL +ORBEETLE +ELDEGOSS +FROSMOTH diff --git a/src/tm_compatibility/63 - Venoshock.txt b/src/tm_compatibility/63 - Venoshock.txt index 0b646fb..3ee32f2 100644 --- a/src/tm_compatibility/63 - Venoshock.txt +++ b/src/tm_compatibility/63 - Venoshock.txt @@ -27,6 +27,7 @@ WEEPINBELL VICTREEBEL TENTACOOL TENTACRUEL +SLOWBRO_G GRIMER GRIMER_A MUK @@ -43,6 +44,7 @@ SPINARAK ARIADOS CROBAT BELLOSSOM +SLOWKING_G PINECO FORRETRESS GLIGAR diff --git a/src/tm_compatibility/64 - Explosion.txt b/src/tm_compatibility/64 - Explosion.txt index a3e2c90..a400d52 100644 --- a/src/tm_compatibility/64 - Explosion.txt +++ b/src/tm_compatibility/64 - Explosion.txt @@ -23,7 +23,9 @@ EXEGGCUTE EXEGGUTOR EXEGGUTOR_A KOFFING +KOFFING_G WEEZING +WEEZING_G MEW SUDOWOODO PINECO @@ -124,4 +126,17 @@ CELESTEELA MAGEARNA MAGEARNA_P BLACEPHALON -MELMETAL \ No newline at end of file +MELMETAL +ROLYCOLY +CARKOL +COALOSSAL +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +CURSOLA +STONJOURNER +DURALUDON +REGIELEKI +REGIDRAGO +CORSOLA_G diff --git a/src/tm_compatibility/66 - Payback.txt b/src/tm_compatibility/66 - Payback.txt index 1af0794..3718ae0 100644 --- a/src/tm_compatibility/66 - Payback.txt +++ b/src/tm_compatibility/66 - Payback.txt @@ -336,3 +336,12 @@ ARCTOZOLT ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +URSHIFU_SINGLE +ZARUDE +ZARUDE_DADA +GLASTRIER +SPECTRIER +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +ZAPDOS_G +MOLTRES_G diff --git a/src/tm_compatibility/67 - Recycle.txt b/src/tm_compatibility/67 - Recycle.txt index 489dd7b..5a66999 100644 --- a/src/tm_compatibility/67 - Recycle.txt +++ b/src/tm_compatibility/67 - Recycle.txt @@ -8,7 +8,9 @@ ABRA KADABRA ALAKAZAM SLOWPOKE +SLOWPOKE_G SLOWBRO +SLOWBRO_G MAGNEMITE MAGNETON MUK_A @@ -18,6 +20,7 @@ CHANSEY STARYU STARMIE MR_MIME +MR_MIME_G JYNX PORYGON SNORLAX @@ -28,6 +31,7 @@ NOCTOWL CLEFFA IGGLYBUFF SLOWKING +SLOWKING_G GIRAFARIG DELIBIRD PORYGON2 @@ -58,6 +62,7 @@ CHINGLING BRONZOR BRONZONG MIME_JR +MIME_JR_G HAPPINY MUNCHLAX MAGNEZONE @@ -130,4 +135,29 @@ NECROZMA_DUSK_MANE NECROZMA_DAWN_WINGS NECROZMA_ULTRA STAKATAKA -BLACEPHALON \ No newline at end of file +BLACEPHALON +SKWOVET +GREEDENT +GOSSIFLEUR +ELDEGOSS +APPLIN +FLAPPLE +APPLETUN +HATENNA +HATTREM +HATTERENE +MR_RIME +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_LOVE +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_RIBBON +ALCREMIE_STAR +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/68 - Giga Impact.txt b/src/tm_compatibility/68 - Giga Impact.txt index 11979ab..cba510e 100644 --- a/src/tm_compatibility/68 - Giga Impact.txt +++ b/src/tm_compatibility/68 - Giga Impact.txt @@ -40,6 +40,7 @@ GOLEM_A RAPIDASH RAPIDASH_G SLOWBRO +SLOWBRO_G MAGNETON DODRIO DEWGONG @@ -83,8 +84,11 @@ KABUTOPS AERODACTYL SNORLAX ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRATINI DRAGONAIR DRAGONITE @@ -111,6 +115,7 @@ QUAGSIRE ESPEON UMBREON SLOWKING +SLOWKING_G FORRETRESS STEELIX GRANBULL @@ -588,3 +593,14 @@ ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/69 - Rock Polish.txt b/src/tm_compatibility/69 - Rock Polish.txt index 4edbd67..a7bd12d 100644 --- a/src/tm_compatibility/69 - Rock Polish.txt +++ b/src/tm_compatibility/69 - Rock Polish.txt @@ -116,4 +116,11 @@ NECROZMA NECROZMA_DUSK_MANE NECROZMA_DAWN_WINGS NECROZMA_ULTRA -STAKATAKA \ No newline at end of file +STAKATAKA +DREDNAW +ROLYCOLY +CARKOL +COALOSSAL +SANDACONDA +STONJOURNER +DURALUDON diff --git a/src/tm_compatibility/7 - Hail.txt b/src/tm_compatibility/7 - Hail.txt index ba6108c..692ec8d 100644 --- a/src/tm_compatibility/7 - Hail.txt +++ b/src/tm_compatibility/7 - Hail.txt @@ -16,6 +16,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G SEEL DEWGONG SHELLDER @@ -58,6 +59,7 @@ POLITOED WOOPER QUAGSIRE SLOWKING +SLOWKING_G QWILFISH SNEASEL SWINUB @@ -219,3 +221,5 @@ FROSMOTH EISCUE ARCTOZOLT ARCTOVISH +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tm_compatibility/70 - Flash.txt b/src/tm_compatibility/70 - Flash.txt index ff2e1a2..1ea22c0 100644 --- a/src/tm_compatibility/70 - Flash.txt +++ b/src/tm_compatibility/70 - Flash.txt @@ -52,7 +52,9 @@ BELLSPROUT WEEPINBELL VICTREEBEL SLOWPOKE +SLOWPOKE_G SLOWBRO +SLOWBRO_G MAGNEMITE MAGNETON DROWZEE @@ -63,17 +65,22 @@ EXEGGCUTE EXEGGUTOR EXEGGUTOR_A KOFFING +KOFFING_G WEEZING +WEEZING_G CHANSEY TANGELA STARYU STARMIE MR_MIME +MR_MIME_G JYNX ELECTABUZZ JOLTEON PORYGON +ARTICUNO_G ZAPDOS +ZAPDOS_G MEWTWO MEW CHIKORITA @@ -110,6 +117,7 @@ QUAGSIRE ESPEON UMBREON SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG SHUCKLE @@ -218,6 +226,7 @@ CHINGLING BRONZOR BRONZONG MIME_JR +MIME_JR_G HAPPINY SPIRITOMB SKORUPI @@ -293,6 +302,7 @@ PETILIL LILLIGANT SIGILYPH YAMASK +YAMASK_G COFAGRIGUS GOTHITA GOTHORITA @@ -327,6 +337,7 @@ LITWICK LAMPENT CHANDELURE STUNFISK +STUNFISK_G GOLETT GOLURK VIRIZION @@ -448,6 +459,13 @@ NECROZMA_ULTRA MAGEARNA MAGEARNA_P ZERAORA +DOTTLER +ORBEETLE +YAMPER +BOLTUND +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY HATENNA HATTREM HATTERENE @@ -455,6 +473,7 @@ IMPIDIMP MORGREM GRIMMSNARL MR_RIME +RUNERIGUS MILCERY ALCREMIE_STRAWBERRY ALCREMIE_BERRY @@ -463,7 +482,15 @@ ALCREMIE_FLOWER ALCREMIE_LOVE ALCREMIE_RIBBON ALCREMIE_STAR +PINCURCHIN FROSMOTH INDEEDEE INDEEDEE_FEMALE +MORPEKO +DRACOZOLT +ARCTOZOLT ZAMAZENTA +REGIELEKI +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/71 - Stone Edge.txt b/src/tm_compatibility/71 - Stone Edge.txt index b61eb0a..c1de5ae 100644 --- a/src/tm_compatibility/71 - Stone Edge.txt +++ b/src/tm_compatibility/71 - Stone Edge.txt @@ -224,3 +224,5 @@ ARCTOZOLT DRACOVISH ARCTOVISH DURALUDON +URSHIFU_SINGLE +URSHIFU_RAPID diff --git a/src/tm_compatibility/72 - Avalanche.txt b/src/tm_compatibility/72 - Avalanche.txt index b8a8c21..4571c14 100644 --- a/src/tm_compatibility/72 - Avalanche.txt +++ b/src/tm_compatibility/72 - Avalanche.txt @@ -6,6 +6,7 @@ NIDOQUEEN NIDOKING NINETALES_A SLOWBRO +SLOWBRO_G DEWGONG SHELLDER CLOYSTER @@ -21,6 +22,7 @@ MEWTWO MEW FERALIGATR SLOWKING +SLOWKING_G SNEASEL URSARING SWINUB @@ -101,3 +103,5 @@ FROSMOTH EISCUE ARCTOZOLT ARCTOVISH +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tm_compatibility/73 - Thunder Wave.txt b/src/tm_compatibility/73 - Thunder Wave.txt index 8cd09e8..f2ae6dc 100644 --- a/src/tm_compatibility/73 - Thunder Wave.txt +++ b/src/tm_compatibility/73 - Thunder Wave.txt @@ -31,6 +31,7 @@ ALAKAZAM SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G MAGNEMITE MAGNETON DROWZEE @@ -68,6 +69,7 @@ AMPHAROS AIPOM MURKROW SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG DUNSPARCE @@ -332,3 +334,4 @@ DURALUDON DREEPY DRAKLOAK DRAGAPULT +REGIELEKI diff --git a/src/tm_compatibility/75 - Swords Dance.txt b/src/tm_compatibility/75 - Swords Dance.txt index 1b629e9..c78918e 100644 --- a/src/tm_compatibility/75 - Swords Dance.txt +++ b/src/tm_compatibility/75 - Swords Dance.txt @@ -286,3 +286,5 @@ FALINKS DURALUDON ZACIAN ZACIAN_CROWNED +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tm_compatibility/77 - Flame Charge.txt b/src/tm_compatibility/77 - Flame Charge.txt index 2550b70..5209a64 100644 --- a/src/tm_compatibility/77 - Flame Charge.txt +++ b/src/tm_compatibility/77 - Flame Charge.txt @@ -43,7 +43,9 @@ SIMISEAR BLITZLE ZEBSTRIKA DARUMAKA +DARUMAKA_G DARMANITAN +DARMANITAN_G DARMANITANZEN LITWICK LAMPENT @@ -104,4 +106,15 @@ SILVALLY_FAIRY TURTONATOR SOLGALEO CELESTEELA -BLACEPHALON \ No newline at end of file +BLACEPHALON +SCORBUNNY +RABOOT +CINDERACE +YAMPER +BOLTUND +ROLYCOLY +CARKOL +COALOSSAL +SIZZLIPEDE +CENTISKORCH +ZAPDOS_G diff --git a/src/tm_compatibility/78 - Low Sweep.txt b/src/tm_compatibility/78 - Low Sweep.txt index e90ddec..ce1f627 100644 --- a/src/tm_compatibility/78 - Low Sweep.txt +++ b/src/tm_compatibility/78 - Low Sweep.txt @@ -105,3 +105,7 @@ SCORBUNNY RABOOT CINDERACE GRIMMSNARL +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZAPDOS_G diff --git a/src/tm_compatibility/79 - Dark Pulse.txt b/src/tm_compatibility/79 - Dark Pulse.txt index 5ca75bd..17276c3 100644 --- a/src/tm_compatibility/79 - Dark Pulse.txt +++ b/src/tm_compatibility/79 - Dark Pulse.txt @@ -216,3 +216,9 @@ PERRSERKER RUNERIGUS MORPEKO DURALUDON +URSHIFU_SINGLE +ZARUDE +ZARUDE_DADA +SPECTRIER +CALYREX_SHADOW_RIDER +MOLTRES_G diff --git a/src/tm_compatibility/8 - Bulk Up.txt b/src/tm_compatibility/8 - Bulk Up.txt index 9787f50..d8d359b 100644 --- a/src/tm_compatibility/8 - Bulk Up.txt +++ b/src/tm_compatibility/8 - Bulk Up.txt @@ -110,3 +110,9 @@ GRAPPLOCT GRIMMSNARL OBSTAGOON FALINKS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +ZAPDOS_G diff --git a/src/tm_compatibility/80 - Rock Slide.txt b/src/tm_compatibility/80 - Rock Slide.txt index a044440..877833e 100644 --- a/src/tm_compatibility/80 - Rock Slide.txt +++ b/src/tm_compatibility/80 - Rock Slide.txt @@ -410,3 +410,7 @@ ARCTOZOLT DRACOVISH ARCTOVISH DURALUDON +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA diff --git a/src/tm_compatibility/82 - Sleep Talk.txt b/src/tm_compatibility/82 - Sleep Talk.txt index 30d3a5e..cc0f125 100644 --- a/src/tm_compatibility/82 - Sleep Talk.txt +++ b/src/tm_compatibility/82 - Sleep Talk.txt @@ -108,6 +108,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G MAGNEMITE MAGNETON FARFETCHD @@ -180,8 +181,11 @@ KABUTOPS AERODACTYL SNORLAX ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRATINI DRAGONAIR DRAGONITE @@ -236,6 +240,7 @@ ESPEON UMBREON MURKROW SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG PINECO @@ -1064,3 +1069,15 @@ ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/83 - Scald.txt b/src/tm_compatibility/83 - Scald.txt index eaa1f0b..336d099 100644 --- a/src/tm_compatibility/83 - Scald.txt +++ b/src/tm_compatibility/83 - Scald.txt @@ -12,6 +12,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G KRABBY KINGLER HORSEA @@ -38,6 +39,7 @@ POLITOED WOOPER QUAGSIRE SLOWKING +SLOWKING_G QWILFISH CORSOLA CORSOLA_G @@ -152,3 +154,4 @@ PINCURCHIN DRACOVISH DRAKLOAK DRAGAPULT +URSHIFU_RAPID diff --git a/src/tm_compatibility/84 - Poison Jab.txt b/src/tm_compatibility/84 - Poison Jab.txt index 4a9cd41..ab4394e 100644 --- a/src/tm_compatibility/84 - Poison Jab.txt +++ b/src/tm_compatibility/84 - Poison Jab.txt @@ -24,6 +24,7 @@ VICTREEBEL TENTACOOL TENTACRUEL RAPIDASH +SLOWBRO_G FARFETCHD FARFETCHD_G GRIMER @@ -43,6 +44,7 @@ MEWTWO MEW SPINARAK ARIADOS +SLOWKING_G DUNSPARCE GLIGAR QWILFISH @@ -178,3 +180,5 @@ SIRFETCHD FALINKS PINCURCHIN ETERNATUS +URSHIFU_SINGLE +URSHIFU_RAPID diff --git a/src/tm_compatibility/85 - Dream Eater.txt b/src/tm_compatibility/85 - Dream Eater.txt index fc163bc..725bd8e 100644 --- a/src/tm_compatibility/85 - Dream Eater.txt +++ b/src/tm_compatibility/85 - Dream Eater.txt @@ -31,6 +31,7 @@ MR_MIME JYNX LAPRAS PORYGON +ARTICUNO_G MEWTWO MEW HOOTHOOT @@ -239,4 +240,35 @@ ORANGURU MIMIKYU MIMIKYU_BUSTED BRUXISH -LUNALA \ No newline at end of file +LUNALA +DOTTLER +ORBEETLE +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +HATENNA +HATTREM +HATTERENE +CURSOLA +MR_RIME +RUNERIGUS +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_LOVE +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_RIBBON +ALCREMIE_STAR +INDEEDEE +INDEEDEE_FEMALE +DRAGAPULT +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MR_MIME_G +CORSOLA_G +MIME_JR_G +YAMASK_G diff --git a/src/tm_compatibility/86 - Grass Knot.txt b/src/tm_compatibility/86 - Grass Knot.txt index fef032f..ce34bce 100644 --- a/src/tm_compatibility/86 - Grass Knot.txt +++ b/src/tm_compatibility/86 - Grass Knot.txt @@ -42,6 +42,7 @@ VICTREEBEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G DROWZEE HYPNO EXEGGCUTE @@ -80,6 +81,7 @@ SUNKERN SUNFLORA ESPEON SLOWKING +SLOWKING_G GIRAFARIG SMOOCHUM BLISSEY @@ -372,3 +374,8 @@ APPLETUN OBSTAGOON MR_RIME RUNERIGUS +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/87 - Swagger.txt b/src/tm_compatibility/87 - Swagger.txt index 0d405db..e9a608c 100644 --- a/src/tm_compatibility/87 - Swagger.txt +++ b/src/tm_compatibility/87 - Swagger.txt @@ -959,4 +959,126 @@ NECROZMA_ULTRA MAGEARNA MAGEARNA_P MARSHADOW -BLACEPHALON \ No newline at end of file +BLACEPHALON +GROOKEY +THWACKEY +RILLABOOM +SCORBUNNY +RABOOT +CINDERACE +SOBBLE +DRIZZILE +INTELEON +SKWOVET +GREEDENT +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +DOTTLER +ORBEETLE +NICKIT +THIEVUL +GOSSIFLEUR +ELDEGOSS +WOOLOO +DUBWOOL +CHEWTLE +DREDNAW +YAMPER +BOLTUND +ROLYCOLY +CARKOL +COALOSSAL +APPLIN +FLAPPLE +APPLETUN +SILICOBRA +SANDACONDA +CRAMORANT +ARROKUDA +BARRASKEWDA +TOXEL +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON +PERRSERKER +CURSOLA +SIRFETCHD +MR_RIME +RUNERIGUS +MILCERY +ALCREMIE_STRAWBERRY +ALCREMIE_BERRY +ALCREMIE_LOVE +ALCREMIE_CLOVER +ALCREMIE_FLOWER +ALCREMIE_RIBBON +ALCREMIE_STAR +FALINKS +PINCURCHIN +FROSMOTH +STONJOURNER +EISCUE +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +CUFANT +COPPERAJAH +DRACOZOLT +ARCTOZOLT +DRACOVISH +ARCTOVISH +DURALUDON +DREEPY +DRAKLOAK +DRAGAPULT +ZACIAN +ZAMAZENTA +ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +MEOWTH_G +PONYTA_G +RAPIDASH_G +SLOWPOKE_G +SLOWBRO_G +FARFETCHD_G +KOFFING_G +WEEZING_G +MR_MIME_G +ARTICUNO_G +ZAPDOS_G +MOLTRES_G +SLOWKING_G +CORSOLA_G +ZIGZAGOON_G +LINOONE_G +MIME_JR_G +DARUMAKA_G +DARMANITAN_G +YAMASK_G +STUNFISK_G diff --git a/src/tm_compatibility/88 - Pluck.txt b/src/tm_compatibility/88 - Pluck.txt index 4be35b2..382997b 100644 --- a/src/tm_compatibility/88 - Pluck.txt +++ b/src/tm_compatibility/88 - Pluck.txt @@ -14,8 +14,11 @@ FARFETCHD DODUO DODRIO ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G MEW HOOTHOOT NOCTOWL @@ -74,4 +77,18 @@ ORICORIO ORICORIO_Y ORICORIO_P ORICORIO_S -BRUXISH \ No newline at end of file +BRUXISH +SKWOVET +GREEDENT +ROOKIDEE +CORVISQUIRE +CORVIKNIGHT +CHEWTLE +DREDNAW +FLAPPLE +CRAMORANT +SIRFETCHD +EISCUE +DRACOZOLT +ARCTOZOLT +FARFETCHD_G diff --git a/src/tm_compatibility/89 - U-Turn.txt b/src/tm_compatibility/89 - U-Turn.txt index 2d6cdf7..549c30a 100644 --- a/src/tm_compatibility/89 - U-Turn.txt +++ b/src/tm_compatibility/89 - U-Turn.txt @@ -23,8 +23,11 @@ PRIMEAPE FARFETCHD SCYTHER ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G MEW SENTRET FURRET @@ -241,3 +244,8 @@ PERRSERKER FROSMOTH DRAKLOAK DRAGAPULT +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA diff --git a/src/tm_compatibility/9 - Bullet Seed.txt b/src/tm_compatibility/9 - Bullet Seed.txt index 8824075..a6b91a1 100644 --- a/src/tm_compatibility/9 - Bullet Seed.txt +++ b/src/tm_compatibility/9 - Bullet Seed.txt @@ -112,3 +112,8 @@ ELDEGOSS FLAPPLE APPLETUN MORPEKO +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/90 - Substitute.txt b/src/tm_compatibility/90 - Substitute.txt index eb19dae..99137d2 100644 --- a/src/tm_compatibility/90 - Substitute.txt +++ b/src/tm_compatibility/90 - Substitute.txt @@ -1066,3 +1066,20 @@ ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +SLOWBRO_G +ARTICUNO_G +ZAPDOS_G +MOLTRES_G +SLOWKING_G diff --git a/src/tm_compatibility/92 - Volt Switch.txt b/src/tm_compatibility/92 - Volt Switch.txt index 0750636..45eb22d 100644 --- a/src/tm_compatibility/92 - Volt Switch.txt +++ b/src/tm_compatibility/92 - Volt Switch.txt @@ -86,3 +86,4 @@ BOLTUND TOXTRICITY TOXTRICITY_LOW_KEY MORPEKO +REGIELEKI diff --git a/src/tm_compatibility/93 - Dragon Tail.txt b/src/tm_compatibility/93 - Dragon Tail.txt index 7cfd44d..7e27495 100644 --- a/src/tm_compatibility/93 - Dragon Tail.txt +++ b/src/tm_compatibility/93 - Dragon Tail.txt @@ -72,4 +72,18 @@ JANGMO_O HAKAMO_O KOMMO_O GUZZLORD -NAGANADEL \ No newline at end of file +NAGANADEL +INTELEON +CHEWTLE +DREDNAW +FLAPPLE +APPLETUN +SANDACONDA +DRACOZOLT +DRACOVISH +DURALUDON +DREEPY +DRAKLOAK +DRAGAPULT +ETERNATUS +SLOWKING_G diff --git a/src/tm_compatibility/94 - Incinerate.txt b/src/tm_compatibility/94 - Incinerate.txt index b4fb3e6..d09a4f9 100644 --- a/src/tm_compatibility/94 - Incinerate.txt +++ b/src/tm_compatibility/94 - Incinerate.txt @@ -232,3 +232,21 @@ CELESTEELA GUZZLORD NAGANADEL BLACEPHALON +SCORBUNNY +RABOOT +CINDERACE +ROLYCOLY +CARKOL +COALOSSAL +SIZZLIPEDE +CENTISKORCH +DRAGAPULT +ETERNATUS +SLOWPOKE_G +SLOWBRO_G +KOFFING_G +WEEZING_G +MOLTRES_G +SLOWKING_G +DARUMAKA_G +DARMANITAN_G diff --git a/src/tm_compatibility/95 - Struggle Bug.txt b/src/tm_compatibility/95 - Struggle Bug.txt index 801dad2..b004d38 100644 --- a/src/tm_compatibility/95 - Struggle Bug.txt +++ b/src/tm_compatibility/95 - Struggle Bug.txt @@ -96,3 +96,10 @@ WIMPOD GOLISOPOD BUZZWOLE PHEROMOSA +BLIPBUG +DOTTLER +ORBEETLE +SIZZLIPEDE +CENTISKORCH +SNOM +FROSMOTH diff --git a/src/tm_compatibility/96 - Bulldoze.txt b/src/tm_compatibility/96 - Bulldoze.txt index 9c5ace1..71d19b6 100644 --- a/src/tm_compatibility/96 - Bulldoze.txt +++ b/src/tm_compatibility/96 - Bulldoze.txt @@ -32,6 +32,7 @@ GOLEM_A SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G ONIX EXEGGUTOR EXEGGUTOR_A @@ -65,6 +66,7 @@ POLITOED WOOPER QUAGSIRE SLOWKING +SLOWKING_G GIRAFARIG PINECO FORRETRESS @@ -329,3 +331,7 @@ COPPERAJAH DRACOZOLT ARCTOZOLT DRACOVISH +GLASTRIER +SPECTRIER +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tm_compatibility/97 - Frost Breath.txt b/src/tm_compatibility/97 - Frost Breath.txt index 71f8e2e..7ebf025 100644 --- a/src/tm_compatibility/97 - Frost Breath.txt +++ b/src/tm_compatibility/97 - Frost Breath.txt @@ -38,4 +38,14 @@ TOXAPEX DEWPIDER ARAQUANID GOLISOPOD -BRUXISH \ No newline at end of file +BRUXISH +MR_RIME +FROSMOTH +EISCUE +ARCTOZOLT +ARCTOVISH +GLASTRIER +CALYREX_ICE_RIDER +MR_MIME_G +DARUMAKA_G +DARMANITAN_G diff --git a/src/tm_compatibility/98 - Work Up.txt b/src/tm_compatibility/98 - Work Up.txt index c8d5860..1ba28d5 100644 --- a/src/tm_compatibility/98 - Work Up.txt +++ b/src/tm_compatibility/98 - Work Up.txt @@ -349,3 +349,6 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID diff --git a/src/tm_compatibility/99 - Wild Charge.txt b/src/tm_compatibility/99 - Wild Charge.txt index ef38757..70171c5 100644 --- a/src/tm_compatibility/99 - Wild Charge.txt +++ b/src/tm_compatibility/99 - Wild Charge.txt @@ -147,3 +147,4 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +REGIELEKI diff --git a/src/tutor_compatibility/1 - Fire Punch.txt b/src/tutor_compatibility/1 - Fire Punch.txt index 75c7464..f3f7a35 100644 --- a/src/tutor_compatibility/1 - Fire Punch.txt +++ b/src/tutor_compatibility/1 - Fire Punch.txt @@ -168,3 +168,6 @@ TOXTRICITY TOXTRICITY_LOW_KEY GRIMMSNARL OBSTAGOON +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID diff --git a/src/tutor_compatibility/10 - Helping Hand.txt b/src/tutor_compatibility/10 - Helping Hand.txt index d58a905..151597a 100644 --- a/src/tutor_compatibility/10 - Helping Hand.txt +++ b/src/tutor_compatibility/10 - Helping Hand.txt @@ -368,3 +368,9 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/100 - Razor Shell.txt b/src/tutor_compatibility/100 - Razor Shell.txt index a330472..f1e66e3 100644 --- a/src/tutor_compatibility/100 - Razor Shell.txt +++ b/src/tutor_compatibility/100 - Razor Shell.txt @@ -1,5 +1,6 @@ Tutor 100: Razor Shell SLOWBRO +SLOWBRO_G SHELLDER CLOYSTER KRABBY @@ -7,6 +8,7 @@ KINGLER KABUTOPS MEW SLOWKING +SLOWKING_G CORPHISH CRAWDAUNT OSHAWOTT diff --git a/src/tutor_compatibility/101 - Hex.txt b/src/tutor_compatibility/101 - Hex.txt index 8a23309..d43c8f3 100644 --- a/src/tutor_compatibility/101 - Hex.txt +++ b/src/tutor_compatibility/101 - Hex.txt @@ -11,8 +11,10 @@ GASTLY HAUNTER GENGAR MAROWAK_A +MOLTRES_G MEW CROBAT +SLOWKING_G MISDREAVUS DUNSPARCE QWILFISH @@ -93,3 +95,5 @@ RUNERIGUS PINCURCHIN DRAKLOAK DRAGAPULT +SPECTRIER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/102 - Weather Ball.txt b/src/tutor_compatibility/102 - Weather Ball.txt index ba2ad7f..ad78e4d 100644 --- a/src/tutor_compatibility/102 - Weather Ball.txt +++ b/src/tutor_compatibility/102 - Weather Ball.txt @@ -18,6 +18,7 @@ VICTREEBEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G CLOYSTER LAPRAS EEVEE @@ -33,6 +34,7 @@ SUNFLORA ESPEON UMBREON SLOWKING +SLOWKING_G DELIBIRD RAIKOU ENTEI diff --git a/src/tutor_compatibility/103 - Air Slash.txt b/src/tutor_compatibility/103 - Air Slash.txt index e594993..d15606d 100644 --- a/src/tutor_compatibility/103 - Air Slash.txt +++ b/src/tutor_compatibility/103 - Air Slash.txt @@ -9,8 +9,10 @@ GOLBAT FARFETCHD SCYTHER ARTICUNO +ARTICUNO_G ZAPDOS MOLTRES +MOLTRES_G DRAGONITE MEW HOOTHOOT diff --git a/src/tutor_compatibility/104 - Aura Sphere.txt b/src/tutor_compatibility/104 - Aura Sphere.txt index 9ab9c18..df0e9b9 100644 --- a/src/tutor_compatibility/104 - Aura Sphere.txt +++ b/src/tutor_compatibility/104 - Aura Sphere.txt @@ -31,3 +31,5 @@ MAGEARNA MAGEARNA_P MARSHADOW ZERAORA +URSHIFU_SINGLE +URSHIFU_RAPID diff --git a/src/tutor_compatibility/105 - Blaze Kick.txt b/src/tutor_compatibility/105 - Blaze Kick.txt index a88d0a8..3061e14 100644 --- a/src/tutor_compatibility/105 - Blaze Kick.txt +++ b/src/tutor_compatibility/105 - Blaze Kick.txt @@ -1,6 +1,7 @@ Tutor 105: Blaze Kick CHARIZARD HITMONLEE +ZAPDOS_G MEW BLAZIKEN MEDICHAM diff --git a/src/tutor_compatibility/108 - Crunch.txt b/src/tutor_compatibility/108 - Crunch.txt index e7195dc..4a234a5 100644 --- a/src/tutor_compatibility/108 - Crunch.txt +++ b/src/tutor_compatibility/108 - Crunch.txt @@ -198,3 +198,11 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +URSHIFU_SINGLE +ZARUDE +ZARUDE_DADA +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/109 - Darkest Lariat.txt b/src/tutor_compatibility/109 - Darkest Lariat.txt index 2db3b9e..97fceb6 100644 --- a/src/tutor_compatibility/109 - Darkest Lariat.txt +++ b/src/tutor_compatibility/109 - Darkest Lariat.txt @@ -17,3 +17,6 @@ BUZZWOLE MELMETAL RILLABOOM GRIMMSNARL +URSHIFU_SINGLE +ZARUDE +ZARUDE_DADA diff --git a/src/tutor_compatibility/11 - Block.txt b/src/tutor_compatibility/11 - Block.txt index b3e4d96..a0d745e 100644 --- a/src/tutor_compatibility/11 - Block.txt +++ b/src/tutor_compatibility/11 - Block.txt @@ -134,3 +134,4 @@ COALOSSAL MR_RIME RUNERIGUS STONJOURNER +DURALUDON diff --git a/src/tutor_compatibility/110 - High Horsepower.txt b/src/tutor_compatibility/110 - High Horsepower.txt index b77c163..3aa0807 100644 --- a/src/tutor_compatibility/110 - High Horsepower.txt +++ b/src/tutor_compatibility/110 - High Horsepower.txt @@ -82,3 +82,5 @@ SANDACONDA CUFANT COPPERAJAH DRACOZOLT +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tutor_compatibility/111 - Leaf Blade.txt b/src/tutor_compatibility/111 - Leaf Blade.txt index 0d6f60f..5837884 100644 --- a/src/tutor_compatibility/111 - Leaf Blade.txt +++ b/src/tutor_compatibility/111 - Leaf Blade.txt @@ -28,3 +28,5 @@ FOMANTIS LURANTIS KARTANA SIRFETCHD +ZARUDE +ZARUDE_DADA diff --git a/src/tutor_compatibility/112 - Muddy Water.txt b/src/tutor_compatibility/112 - Muddy Water.txt index 19544ee..1d6d6a6 100644 --- a/src/tutor_compatibility/112 - Muddy Water.txt +++ b/src/tutor_compatibility/112 - Muddy Water.txt @@ -9,6 +9,7 @@ POLIWRATH TENTACOOL TENTACRUEL SLOWBRO +SLOWBRO_G LICKITUNG HORSEA SEADRA @@ -26,6 +27,7 @@ POLITOED WOOPER QUAGSIRE SLOWKING +SLOWKING_G KINGDRA LARVITAR PUPITAR @@ -87,3 +89,6 @@ DREDNAW CLOBBOPUS GRAPPLOCT PINCURCHIN +DRACOVISH +ARCTOVISH +URSHIFU_SINGLE diff --git a/src/tutor_compatibility/114 - Phantom Force.txt b/src/tutor_compatibility/114 - Phantom Force.txt index 5b19a3a..2a223a2 100644 --- a/src/tutor_compatibility/114 - Phantom Force.txt +++ b/src/tutor_compatibility/114 - Phantom Force.txt @@ -34,3 +34,5 @@ POLTEAGEIST_CHIPPED RUNERIGUS DRAKLOAK DRAGAPULT +SPECTRIER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/115 - Play Rough.txt b/src/tutor_compatibility/115 - Play Rough.txt index e67d114..c14904f 100644 --- a/src/tutor_compatibility/115 - Play Rough.txt +++ b/src/tutor_compatibility/115 - Play Rough.txt @@ -49,6 +49,7 @@ TEDDIURSA URSARING PHANPY DONPHAN +MILTANK POOCHYENA MIGHTYENA LINOONE @@ -97,6 +98,8 @@ SWIRLIX SLURPUFF SKRELP DRAGALGE +TYRUNT +TYRANTRUM SYLVEON DEDENNE KLEFKI @@ -119,9 +122,7 @@ COMFEY KOMALA MIMIKYU DRAMPA -TAPU_KOKO TAPU_LELE -TAPU_BULU TAPU_FINI ZERAORA NICKIT diff --git a/src/tutor_compatibility/116 - Pollen Puff.txt b/src/tutor_compatibility/116 - Pollen Puff.txt index 22d4f74..519b7ea 100644 --- a/src/tutor_compatibility/116 - Pollen Puff.txt +++ b/src/tutor_compatibility/116 - Pollen Puff.txt @@ -20,3 +20,6 @@ SHIINOTIC COMFEY GOSSIFLEUR ELDEGOSS +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/117 - Power Gem.txt b/src/tutor_compatibility/117 - Power Gem.txt index e5ebafd..0a0fa20 100644 --- a/src/tutor_compatibility/117 - Power Gem.txt +++ b/src/tutor_compatibility/117 - Power Gem.txt @@ -10,6 +10,7 @@ FLAAFFY AMPHAROS ESPEON SLOWKING +SLOWKING_G MISDREAVUS CORSOLA CORSOLA_G diff --git a/src/tutor_compatibility/118 - Psychic Fangs.txt b/src/tutor_compatibility/118 - Psychic Fangs.txt index b41ac0c..f58d55c 100644 --- a/src/tutor_compatibility/118 - Psychic Fangs.txt +++ b/src/tutor_compatibility/118 - Psychic Fangs.txt @@ -27,6 +27,8 @@ STOUTLAND SWOOBAT BASCULIN_RED BASCULIN_BLUE +TYRUNT +TYRANTRUM LYCANROC LYCANROC_N LYCANROC_DUSK diff --git a/src/tutor_compatibility/119 - Psycho Cut.txt b/src/tutor_compatibility/119 - Psycho Cut.txt index a91f4ec..5509430 100644 --- a/src/tutor_compatibility/119 - Psycho Cut.txt +++ b/src/tutor_compatibility/119 - Psycho Cut.txt @@ -9,6 +9,7 @@ STARMIE SCYTHER JYNX KABUTOPS +ARTICUNO_G MEWTWO MEW SCIZOR @@ -52,3 +53,5 @@ ORBEETLE HATTERENE ZACIAN ZACIAN_CROWNED +SPECTRIER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/12 - Worry Seed.txt b/src/tutor_compatibility/12 - Worry Seed.txt index 5384564..9526b37 100644 --- a/src/tutor_compatibility/12 - Worry Seed.txt +++ b/src/tutor_compatibility/12 - Worry Seed.txt @@ -134,3 +134,11 @@ THWACKEY RILLABOOM GOSSIFLEUR ELDEGOSS +APPLIN +FLAPPLE +APPLETUN +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/120 - Brave Bird.txt b/src/tutor_compatibility/120 - Brave Bird.txt index ba8fdcc..a2f153a 100644 --- a/src/tutor_compatibility/120 - Brave Bird.txt +++ b/src/tutor_compatibility/120 - Brave Bird.txt @@ -10,8 +10,11 @@ FARFETCHD_G DODUO DODRIO ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G MEW CROBAT MURKROW diff --git a/src/tutor_compatibility/121 - Close Combat.txt b/src/tutor_compatibility/121 - Close Combat.txt index 7037c31..68722f6 100644 --- a/src/tutor_compatibility/121 - Close Combat.txt +++ b/src/tutor_compatibility/121 - Close Combat.txt @@ -15,6 +15,7 @@ HITMONLEE HITMONCHAN PINSIR TAUROS +ZAPDOS_G MEW SNUBBULL GRANBULL @@ -97,3 +98,10 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tutor_compatibility/123 - Hurricane.txt b/src/tutor_compatibility/123 - Hurricane.txt index f1c7ab3..d76fc90 100644 --- a/src/tutor_compatibility/123 - Hurricane.txt +++ b/src/tutor_compatibility/123 - Hurricane.txt @@ -7,8 +7,11 @@ PIDGEOT GYARADOS AERODACTYL ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRAGONITE MEWTWO MEW diff --git a/src/tutor_compatibility/124 - Hydro Pump.txt b/src/tutor_compatibility/124 - Hydro Pump.txt index d6ecdf4..37a694b 100644 --- a/src/tutor_compatibility/124 - Hydro Pump.txt +++ b/src/tutor_compatibility/124 - Hydro Pump.txt @@ -12,6 +12,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G DEWGONG SHELLDER CLOYSTER @@ -49,6 +50,7 @@ POLITOED WOOPER QUAGSIRE SLOWKING +SLOWKING_G QWILFISH CORSOLA CORSOLA_G @@ -155,3 +157,4 @@ DRACOVISH ARCTOVISH DRAKLOAK DRAGAPULT +URSHIFU_RAPID diff --git a/src/tutor_compatibility/125 - Leaf Storm.txt b/src/tutor_compatibility/125 - Leaf Storm.txt index 670d719..3d015b6 100644 --- a/src/tutor_compatibility/125 - Leaf Storm.txt +++ b/src/tutor_compatibility/125 - Leaf Storm.txt @@ -54,3 +54,10 @@ TSAREENA RILLABOOM GOSSIFLEUR ELDEGOSS +FLAPPLE +APPLETUN +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/126 - Megahorn.txt b/src/tutor_compatibility/126 - Megahorn.txt index 4670d39..938ab6e 100644 --- a/src/tutor_compatibility/126 - Megahorn.txt +++ b/src/tutor_compatibility/126 - Megahorn.txt @@ -35,3 +35,5 @@ TAPU_BULU CELESTEELA DREDNAW FALINKS +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tutor_compatibility/127 - Power Whip.txt b/src/tutor_compatibility/127 - Power Whip.txt index d37d504..1ecf47a 100644 --- a/src/tutor_compatibility/127 - Power Whip.txt +++ b/src/tutor_compatibility/127 - Power Whip.txt @@ -37,3 +37,8 @@ HATTERENE GRIMMSNARL CUFANT COPPERAJAH +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/128 - Solar Blade.txt b/src/tutor_compatibility/128 - Solar Blade.txt index 08abd30..7f38589 100644 --- a/src/tutor_compatibility/128 - Solar Blade.txt +++ b/src/tutor_compatibility/128 - Solar Blade.txt @@ -35,3 +35,8 @@ RILLABOOM SIRFETCHD ZACIAN ZACIAN_CROWNED +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/13 - Covet.txt b/src/tutor_compatibility/13 - Covet.txt index c797b97..3e122f1 100644 --- a/src/tutor_compatibility/13 - Covet.txt +++ b/src/tutor_compatibility/13 - Covet.txt @@ -243,8 +243,24 @@ TOGEDEMARU MIMIKYU MIMIKYU_BUSTED POIPOLE +SKWOVET GREEDENT +NICKIT +THIEVUL +WOOLOO +DUBWOOL +HATENNA +HATTREM +HATTERENE +IMPIDIMP +MORGREM +GRIMMSNARL OBSTAGOON PERRSERKER SIRFETCHD MR_RIME +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +ZARUDE +ZARUDE_DADA diff --git a/src/tutor_compatibility/14 - Bug Bite.txt b/src/tutor_compatibility/14 - Bug Bite.txt index 9112448..0d4f56a 100644 --- a/src/tutor_compatibility/14 - Bug Bite.txt +++ b/src/tutor_compatibility/14 - Bug Bite.txt @@ -115,6 +115,8 @@ LURANTIS GOLISOPOD BUZZWOLE PHEROMOSA +DOTTLER +ORBEETLE SIZZLIPEDE CENTISKORCH SNOM diff --git a/src/tutor_compatibility/15 - Snatch.txt b/src/tutor_compatibility/15 - Snatch.txt index 3a28f60..d824ef2 100644 --- a/src/tutor_compatibility/15 - Snatch.txt +++ b/src/tutor_compatibility/15 - Snatch.txt @@ -167,6 +167,22 @@ MARSHADOW POIPOLE NAGANADEL ZERAORA +NICKIT +THIEVUL +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON PERRSERKER MR_RIME RUNERIGUS +MORPEKO +DRAGAPULT +URSHIFU_SINGLE +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +ZIGZAGOON_G +LINOONE_G diff --git a/src/tutor_compatibility/16 - Spite.txt b/src/tutor_compatibility/16 - Spite.txt index 2c3662d..f41c9d7 100644 --- a/src/tutor_compatibility/16 - Spite.txt +++ b/src/tutor_compatibility/16 - Spite.txt @@ -164,5 +164,11 @@ ROOKIDEE CORVISQUIRE CORVIKNIGHT PERRSERKER +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED CURSOLA RUNERIGUS +SPECTRIER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/17 - After You.txt b/src/tutor_compatibility/17 - After You.txt index d577ee9..9a3726a 100644 --- a/src/tutor_compatibility/17 - After You.txt +++ b/src/tutor_compatibility/17 - After You.txt @@ -122,3 +122,5 @@ HATTERENE MR_RIME RUNERIGUS INDEEDEE +INDEEDEE_FEMALE +MOLTRES_G diff --git a/src/tutor_compatibility/18 - Synthesis.txt b/src/tutor_compatibility/18 - Synthesis.txt index fd04a7b..1c01ed8 100644 --- a/src/tutor_compatibility/18 - Synthesis.txt +++ b/src/tutor_compatibility/18 - Synthesis.txt @@ -123,5 +123,16 @@ COMFEY DHELMISE TAPU_BULU KARTANA +GROOKEY +THWACKEY +RILLABOOM GOSSIFLEUR ELDEGOSS +APPLIN +FLAPPLE +APPLETUN +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/19 - Signal Beam.txt b/src/tutor_compatibility/19 - Signal Beam.txt index 276f17e..459ba8c 100644 --- a/src/tutor_compatibility/19 - Signal Beam.txt +++ b/src/tutor_compatibility/19 - Signal Beam.txt @@ -318,6 +318,27 @@ MAGEARNA MAGEARNA_P POIPOLE NAGANADEL +DOTTLER ORBEETLE -FROSMOTH +YAMPER +BOLTUND +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +HATENNA +HATTREM +HATTERENE MR_RIME +FROSMOTH +INDEEDEE +INDEEDEE_FEMALE +MORPEKO +DRACOZOLT +ARCTOZOLT +REGIELEKI +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +PONYTA_G +RAPIDASH_G diff --git a/src/tutor_compatibility/2 - Ice Punch.txt b/src/tutor_compatibility/2 - Ice Punch.txt index 7a66453..9131714 100644 --- a/src/tutor_compatibility/2 - Ice Punch.txt +++ b/src/tutor_compatibility/2 - Ice Punch.txt @@ -29,6 +29,7 @@ GRAVELER_A GOLEM GOLEM_A SLOWBRO +SLOWBRO_G GRIMER GRIMER_A MUK @@ -66,6 +67,7 @@ AIPOM WOOPER QUAGSIRE SLOWKING +SLOWKING_G SNUBBULL GRANBULL SNEASEL @@ -186,3 +188,6 @@ GRIMMSNARL OBSTAGOON MR_RIME EISCUE +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID diff --git a/src/tutor_compatibility/20 - Gravity.txt b/src/tutor_compatibility/20 - Gravity.txt index 06a3884..7cb3ad0 100644 --- a/src/tutor_compatibility/20 - Gravity.txt +++ b/src/tutor_compatibility/20 - Gravity.txt @@ -140,3 +140,4 @@ NECROZMA_ULTRA STAKATAKA ORBEETLE STONJOURNER +ETERNATUS diff --git a/src/tutor_compatibility/21 - Iron Defense.txt b/src/tutor_compatibility/21 - Iron Defense.txt index 21f5d04..8f71d8e 100644 --- a/src/tutor_compatibility/21 - Iron Defense.txt +++ b/src/tutor_compatibility/21 - Iron Defense.txt @@ -18,6 +18,7 @@ GRAVELER_A GOLEM GOLEM_A SLOWBRO +SLOWBRO_G MAGNEMITE MAGNETON SHELLDER @@ -39,6 +40,7 @@ KABUTOPS MEW SUDOWOODO SLOWKING +SLOWKING_G PINECO FORRETRESS STEELIX @@ -290,3 +292,7 @@ ARCTOVISH DURALUDON ZAMAZENTA ZAMAZENTA_CROWNED +URSHIFU_SINGLE +URSHIFU_RAPID +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tutor_compatibility/22 - Telekinesis.txt b/src/tutor_compatibility/22 - Telekinesis.txt index f7f6479..c76de7f 100644 --- a/src/tutor_compatibility/22 - Telekinesis.txt +++ b/src/tutor_compatibility/22 - Telekinesis.txt @@ -28,6 +28,7 @@ MR_MIME MR_MIME_G JYNX PORYGON +ARTICUNO_G MEWTWO MEW CLEFFA @@ -212,3 +213,8 @@ INDEEDEE INDEEDEE_FEMALE MR_RIME RUNERIGUS +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER +PONYTA_G +RAPIDASH_G diff --git a/src/tutor_compatibility/23 - Magnet Rise.txt b/src/tutor_compatibility/23 - Magnet Rise.txt index d962323..474fded 100644 --- a/src/tutor_compatibility/23 - Magnet Rise.txt +++ b/src/tutor_compatibility/23 - Magnet Rise.txt @@ -127,3 +127,15 @@ NECROZMA_ULTRA MAGEARNA MAGEARNA_P STAKATAKA +YAMPER +BOLTUND +TOXTRICITY +TOXTRICITY_LOW_KEY +HATENNA +HATTREM +HATTERENE +PINCURCHIN +MORPEKO +DRACOZOLT +ARCTOZOLT +REGIELEKI diff --git a/src/tutor_compatibility/24 - Bounce.txt b/src/tutor_compatibility/24 - Bounce.txt index 238ad7c..0cb547d 100644 --- a/src/tutor_compatibility/24 - Bounce.txt +++ b/src/tutor_compatibility/24 - Bounce.txt @@ -14,6 +14,7 @@ GOLDEEN SEAKING MAGIKARP GYARADOS +ZAPDOS_G MEW SPINARAK ARIADOS @@ -127,3 +128,4 @@ INTELEON DUBWOOL ARROKUDA BARRASKEWDA +REGIELEKI diff --git a/src/tutor_compatibility/25 - Role Play.txt b/src/tutor_compatibility/25 - Role Play.txt index ccb1f8e..2619b4a 100644 --- a/src/tutor_compatibility/25 - Role Play.txt +++ b/src/tutor_compatibility/25 - Role Play.txt @@ -155,5 +155,15 @@ DHELMISE NIHILEGO MARSHADOW STAKATAKA +ORBEETLE +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED MR_RIME RUNERIGUS +INDEEDEE +INDEEDEE_FEMALE +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/26 - Iron Head.txt b/src/tutor_compatibility/26 - Iron Head.txt index ade5304..31eeece 100644 --- a/src/tutor_compatibility/26 - Iron Head.txt +++ b/src/tutor_compatibility/26 - Iron Head.txt @@ -220,3 +220,6 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID diff --git a/src/tutor_compatibility/28 - Pain Split.txt b/src/tutor_compatibility/28 - Pain Split.txt index e286825..a4bb9c2 100644 --- a/src/tutor_compatibility/28 - Pain Split.txt +++ b/src/tutor_compatibility/28 - Pain Split.txt @@ -138,4 +138,12 @@ MAGEARNA_P BLACEPHALON CLOBBOPUS GRAPPLOCT +SINISTEA +SINISTEA_CHIPPED +POLTEAGEIST +POLTEAGEIST_CHIPPED +CURSOLA RUNERIGUS +SPECTRIER +CALYREX_SHADOW_RIDER +CORSOLA_G diff --git a/src/tutor_compatibility/29 - Tailwind.txt b/src/tutor_compatibility/29 - Tailwind.txt index 75bf0d4..fea317e 100644 --- a/src/tutor_compatibility/29 - Tailwind.txt +++ b/src/tutor_compatibility/29 - Tailwind.txt @@ -182,5 +182,6 @@ NAGANADEL ROOKIDEE CORVISQUIRE CORVIKNIGHT +CRAMORANT SIRFETCHD FROSMOTH diff --git a/src/tutor_compatibility/3 - Thunder Punch.txt b/src/tutor_compatibility/3 - Thunder Punch.txt index 7e92c98..1c56fcd 100644 --- a/src/tutor_compatibility/3 - Thunder Punch.txt +++ b/src/tutor_compatibility/3 - Thunder Punch.txt @@ -218,3 +218,6 @@ OBSTAGOON MORPEKO DRACOZOLT ARCTOZOLT +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID diff --git a/src/tutor_compatibility/30 - Endeavor.txt b/src/tutor_compatibility/30 - Endeavor.txt index b8723d3..e20675d 100644 --- a/src/tutor_compatibility/30 - Endeavor.txt +++ b/src/tutor_compatibility/30 - Endeavor.txt @@ -252,3 +252,13 @@ ZERAORA GROOKEY THWACKEY RILLABOOM +GREEDENT +CORVIKNIGHT +WOOLOO +DUBWOOL +OBSTAGOON +INDEEDEE +INDEEDEE_FEMALE +DURALUDON +URSHIFU_SINGLE +URSHIFU_RAPID diff --git a/src/tutor_compatibility/31 - Icy Wind.txt b/src/tutor_compatibility/31 - Icy Wind.txt index 8eed92f..3110399 100644 --- a/src/tutor_compatibility/31 - Icy Wind.txt +++ b/src/tutor_compatibility/31 - Icy Wind.txt @@ -28,6 +28,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G SEEL DEWGONG SHELLDER @@ -85,6 +86,7 @@ WOOPER QUAGSIRE MURKROW SLOWKING +SLOWKING_G MISDREAVUS QWILFISH SNEASEL @@ -335,3 +337,5 @@ FROSMOTH EISCUE ARCTOZOLT ARCTOVISH +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tutor_compatibility/32 - Zen Headbutt.txt b/src/tutor_compatibility/32 - Zen Headbutt.txt index ff82961..e1c6d11 100644 --- a/src/tutor_compatibility/32 - Zen Headbutt.txt +++ b/src/tutor_compatibility/32 - Zen Headbutt.txt @@ -26,6 +26,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G DROWZEE HYPNO ONIX @@ -52,6 +53,7 @@ NATU XATU ESPEON SLOWKING +SLOWKING_G GIRAFARIG DUNSPARCE STEELIX @@ -303,3 +305,9 @@ CUFANT COPPERAJAH DRACOVISH ARCTOVISH +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/33 - Seed Bomb.txt b/src/tutor_compatibility/33 - Seed Bomb.txt index eac1885..bd72563 100644 --- a/src/tutor_compatibility/33 - Seed Bomb.txt +++ b/src/tutor_compatibility/33 - Seed Bomb.txt @@ -176,3 +176,8 @@ APPLETUN OBSTAGOON PERRSERKER MORPEKO +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/34 - Laser Focus.txt b/src/tutor_compatibility/34 - Laser Focus.txt index 91d91e8..2db269b 100644 --- a/src/tutor_compatibility/34 - Laser Focus.txt +++ b/src/tutor_compatibility/34 - Laser Focus.txt @@ -268,3 +268,4 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +REGIDRAGO diff --git a/src/tutor_compatibility/35 - Trick.txt b/src/tutor_compatibility/35 - Trick.txt index 13e8353..556e6fe 100644 --- a/src/tutor_compatibility/35 - Trick.txt +++ b/src/tutor_compatibility/35 - Trick.txt @@ -7,6 +7,7 @@ ALAKAZAM SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G GASTLY HAUNTER GENGAR @@ -28,6 +29,7 @@ NATU XATU ESPEON SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG PORYGON2 @@ -183,3 +185,6 @@ MR_RIME RUNERIGUS INDEEDEE INDEEDEE_FEMALE +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/38 - Magic Room.txt b/src/tutor_compatibility/38 - Magic Room.txt index de9cf1a..74c33b4 100644 --- a/src/tutor_compatibility/38 - Magic Room.txt +++ b/src/tutor_compatibility/38 - Magic Room.txt @@ -74,3 +74,7 @@ ALCREMIE_LOVE ALCREMIE_RIBBON ALCREMIE_STAR INDEEDEE +INDEEDEE_FEMALE +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/39 - Wonder Room.txt b/src/tutor_compatibility/39 - Wonder Room.txt index eef1ddb..0a969e2 100644 --- a/src/tutor_compatibility/39 - Wonder Room.txt +++ b/src/tutor_compatibility/39 - Wonder Room.txt @@ -11,6 +11,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G GASTLY HAUNTER GENGAR @@ -25,6 +26,7 @@ MEW CLEFFA UMBREON SLOWKING +SLOWKING_G MISDREAVUS PORYGON2 SMOOCHUM @@ -116,3 +118,6 @@ ALCREMIE_RIBBON ALCREMIE_STAR STONJOURNER INDEEDEE +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/4 - Snore.txt b/src/tutor_compatibility/4 - Snore.txt index 54c682e..d2e58bd 100644 --- a/src/tutor_compatibility/4 - Snore.txt +++ b/src/tutor_compatibility/4 - Snore.txt @@ -108,6 +108,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G MAGNEMITE MAGNETON FARFETCHD @@ -180,8 +181,11 @@ KABUTOPS AERODACTYL SNORLAX ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRATINI DRAGONAIR DRAGONITE @@ -236,6 +240,7 @@ ESPEON UMBREON MURKROW SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG PINECO @@ -1066,3 +1071,15 @@ ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/40 - Liquidation.txt b/src/tutor_compatibility/40 - Liquidation.txt index 189ebc5..4709e77 100644 --- a/src/tutor_compatibility/40 - Liquidation.txt +++ b/src/tutor_compatibility/40 - Liquidation.txt @@ -5,6 +5,7 @@ POLIWRATH SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G DEWGONG SHELLDER CLOYSTER @@ -23,6 +24,7 @@ AZUMARILL POLITOED QUAGSIRE SLOWKING +SLOWKING_G QWILFISH CORSOLA CORSOLA_G @@ -110,3 +112,4 @@ PINCURCHIN EISCUE DRACOVISH ARCTOVISH +URSHIFU_RAPID diff --git a/src/tutor_compatibility/41 - Gastro Acid.txt b/src/tutor_compatibility/41 - Gastro Acid.txt index e54766b..908f88c 100644 --- a/src/tutor_compatibility/41 - Gastro Acid.txt +++ b/src/tutor_compatibility/41 - Gastro Acid.txt @@ -47,5 +47,15 @@ PYUKUMUKU GUZZLORD POIPOLE NAGANADEL +SOBBLE +DRIZZILE +INTELEON CHEWTLE DREDNAW +FLAPPLE +APPLETUN +TOXTRICITY +TOXTRICITY_LOW_KEY +SLOWPOKE_G +SLOWBRO_G +SLOWKING_G diff --git a/src/tutor_compatibility/42 - Foul Play.txt b/src/tutor_compatibility/42 - Foul Play.txt index 1233dfe..e2f37a1 100644 --- a/src/tutor_compatibility/42 - Foul Play.txt +++ b/src/tutor_compatibility/42 - Foul Play.txt @@ -11,6 +11,9 @@ PERSIAN_A ABRA KADABRA ALAKAZAM +SLOWPOKE_G +SLOWBRO +SLOWBRO_G GASTLY HAUNTER GENGAR @@ -21,6 +24,7 @@ ELECTRODE MR_MIME MR_MIME_G PORYGON +MOLTRES_G MEWTWO MEW SPINARAK @@ -29,6 +33,7 @@ XATU SUDOWOODO AIPOM UMBREON +SLOWKING_G MURKROW MISDREAVUS GIRAFARIG @@ -137,3 +142,6 @@ PERRSERKER MR_RIME MORPEKO DURALUDON +URSHIFU_SINGLE +SPECTRIER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/44 - Outrage.txt b/src/tutor_compatibility/44 - Outrage.txt index 0d51594..681dfcf 100644 --- a/src/tutor_compatibility/44 - Outrage.txt +++ b/src/tutor_compatibility/44 - Outrage.txt @@ -162,3 +162,6 @@ DRACOVISH DURALUDON DRAKLOAK DRAGAPULT +REGIDRAGO +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tutor_compatibility/45 - Sky Attack.txt b/src/tutor_compatibility/45 - Sky Attack.txt index eaae59e..a415286 100644 --- a/src/tutor_compatibility/45 - Sky Attack.txt +++ b/src/tutor_compatibility/45 - Sky Attack.txt @@ -67,4 +67,5 @@ NAGANADEL ROOKIDEE CORVISQUIRE CORVIKNIGHT +CRAMORANT SIRFETCHD diff --git a/src/tutor_compatibility/46 - Throat Chop.txt b/src/tutor_compatibility/46 - Throat Chop.txt index d004d88..c4aa739 100644 --- a/src/tutor_compatibility/46 - Throat Chop.txt +++ b/src/tutor_compatibility/46 - Throat Chop.txt @@ -31,6 +31,7 @@ GOLDEEN SEAKING PINSIR TAUROS +ZAPDOS_G MEW TYPHLOSION ARIADOS @@ -91,6 +92,7 @@ EELEKTRIK EELEKTROSS BEARTIC BISHARP +BOUFFALANT HEATMOR HYDREIGON PANGORO @@ -119,3 +121,8 @@ CURSOLA SIRFETCHD FALINKS PINCURCHIN +URSHIFU_SINGLE +ZARUDE +ZARUDE_DADA +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tutor_compatibility/47 - Stomping Tantrum.txt b/src/tutor_compatibility/47 - Stomping Tantrum.txt index 9fa5878..15af834 100644 --- a/src/tutor_compatibility/47 - Stomping Tantrum.txt +++ b/src/tutor_compatibility/47 - Stomping Tantrum.txt @@ -36,6 +36,7 @@ CHANSEY MR_MIME_G TAUROS SNORLAX +ZAPDOS_G MEW MEGANIUM TYPHLOSION @@ -197,3 +198,9 @@ DRACOZOLT ARCTOZOLT DRACOVISH DURALUDON +ZARUDE +ZARUDE_DADA +GLASTRIER +SPECTRIER +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/49 - Gunk Shot.txt b/src/tutor_compatibility/49 - Gunk Shot.txt index 6b2d065..13dc4d1 100644 --- a/src/tutor_compatibility/49 - Gunk Shot.txt +++ b/src/tutor_compatibility/49 - Gunk Shot.txt @@ -91,3 +91,4 @@ TOXTRICITY TOXTRICITY_LOW_KEY OBSTAGOON PERRSERKER +ETERNATUS diff --git a/src/tutor_compatibility/50 - Dual Chop.txt b/src/tutor_compatibility/50 - Dual Chop.txt index 6249968..88dddc8 100644 --- a/src/tutor_compatibility/50 - Dual Chop.txt +++ b/src/tutor_compatibility/50 - Dual Chop.txt @@ -64,3 +64,12 @@ TAPU_BULU BUZZWOLE GUZZLORD ZERAORA +TOXTRICITY +TOXTRICITY_LOW_KEY +GRAPPLOCT +GRIMMSNARL +OBSTAGOON +DURALUDON +DRAGAPULT +URSHIFU_SINGLE +URSHIFU_RAPID diff --git a/src/tutor_compatibility/52 - Hyper Voice.txt b/src/tutor_compatibility/52 - Hyper Voice.txt index 6b74dbd..42fedd7 100644 --- a/src/tutor_compatibility/52 - Hyper Voice.txt +++ b/src/tutor_compatibility/52 - Hyper Voice.txt @@ -17,6 +17,8 @@ VAPOREON JOLTEON FLAREON SNORLAX +ARTICUNO_G +MOLTRES_G MEW SENTRET FURRET @@ -223,3 +225,5 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +ZARUDE +ZARUDE_DADA diff --git a/src/tutor_compatibility/53 - Superpower.txt b/src/tutor_compatibility/53 - Superpower.txt index 235bbc5..23aa383 100644 --- a/src/tutor_compatibility/53 - Superpower.txt +++ b/src/tutor_compatibility/53 - Superpower.txt @@ -22,6 +22,7 @@ PINSIR FLAREON KABUTOPS SNORLAX +ZAPDOS_G DRAGONITE MEW TOTODILE @@ -188,3 +189,10 @@ FALINKS STONJOURNER CUFANT COPPERAJAH +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tutor_compatibility/54 - Knock Off.txt b/src/tutor_compatibility/54 - Knock Off.txt index 0c3e182..fd97a25 100644 --- a/src/tutor_compatibility/54 - Knock Off.txt +++ b/src/tutor_compatibility/54 - Knock Off.txt @@ -252,6 +252,27 @@ ZERAORA GROOKEY THWACKEY RILLABOOM +CINDERACE +INTELEON +NICKIT +THIEVUL +SANDACONDA +TOXTRICITY +TOXTRICITY_LOW_KEY +SIZZLIPEDE +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +IMPIDIMP +MORGREM +GRIMMSNARL +OBSTAGOON PERRSERKER SIRFETCHD RUNERIGUS +DURALUDON +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA diff --git a/src/tutor_compatibility/55 - Psych Up.txt b/src/tutor_compatibility/55 - Psych Up.txt index 608710c..b87f908 100644 --- a/src/tutor_compatibility/55 - Psych Up.txt +++ b/src/tutor_compatibility/55 - Psych Up.txt @@ -324,3 +324,6 @@ INDEEDEE_FEMALE SIRFETCHD MR_RIME RUNERIGUS +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/58 - Confide.txt b/src/tutor_compatibility/58 - Confide.txt index c1ab899..81db7f1 100644 --- a/src/tutor_compatibility/58 - Confide.txt +++ b/src/tutor_compatibility/58 - Confide.txt @@ -1079,5 +1079,13 @@ ZAMAZENTA_CROWNED ETERNATUS KUBFU URSHIFU_SINGLE -URSHIFU_RAPID -CALYREX +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/6 - Electroweb.txt b/src/tutor_compatibility/6 - Electroweb.txt index f749bb3..2bbd0f7 100644 --- a/src/tutor_compatibility/6 - Electroweb.txt +++ b/src/tutor_compatibility/6 - Electroweb.txt @@ -114,3 +114,4 @@ MAGEARNA MAGEARNA_P ZERAORA MORPEKO +REGIELEKI diff --git a/src/tutor_compatibility/62 - Frenzy Plant.txt b/src/tutor_compatibility/62 - Frenzy Plant.txt index 4412174..5bfedc8 100644 --- a/src/tutor_compatibility/62 - Frenzy Plant.txt +++ b/src/tutor_compatibility/62 - Frenzy Plant.txt @@ -5,7 +5,7 @@ SCEPTILE TORTERRA SERPERIOR CHESNAUGHT -DECIDUEYE +DECIDUEYE GROOKEY THWACKEY RILLABOOM diff --git a/src/tutor_compatibility/65 - Focus Energy.txt b/src/tutor_compatibility/65 - Focus Energy.txt index dc6b7c7..b3c2cec 100644 --- a/src/tutor_compatibility/65 - Focus Energy.txt +++ b/src/tutor_compatibility/65 - Focus Energy.txt @@ -35,6 +35,7 @@ EEVEE VAPOREON JOLTEON FLAREON +ZAPDOS_G MEW SENTRET FURRET @@ -149,3 +150,7 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +REGIDRAGO diff --git a/src/tutor_compatibility/67 - Baton Pass.txt b/src/tutor_compatibility/67 - Baton Pass.txt index 61ef80d..021503d 100644 --- a/src/tutor_compatibility/67 - Baton Pass.txt +++ b/src/tutor_compatibility/67 - Baton Pass.txt @@ -154,3 +154,6 @@ INDEEDEE_FEMALE DREEPY DRAKLOAK DRAGAPULT +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/68 - Encore.txt b/src/tutor_compatibility/68 - Encore.txt index b95a102..ff39167 100644 --- a/src/tutor_compatibility/68 - Encore.txt +++ b/src/tutor_compatibility/68 - Encore.txt @@ -167,3 +167,9 @@ ALCREMIE_LOVE ALCREMIE_RIBBON ALCREMIE_STAR INDEEDEE +INDEEDEE_FEMALE +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/69 - Screech.txt b/src/tutor_compatibility/69 - Screech.txt index 067fc14..106c79b 100644 --- a/src/tutor_compatibility/69 - Screech.txt +++ b/src/tutor_compatibility/69 - Screech.txt @@ -57,6 +57,7 @@ MAGMAR KABUTO KABUTOPS SNORLAX +ZAPDOS_G MEW TOTODILE CROCONAW @@ -224,3 +225,4 @@ CUFANT COPPERAJAH DURALUDON ETERNATUS +REGIELEKI diff --git a/src/tutor_compatibility/7 - Low Kick.txt b/src/tutor_compatibility/7 - Low Kick.txt index 74875ef..d614408 100644 --- a/src/tutor_compatibility/7 - Low Kick.txt +++ b/src/tutor_compatibility/7 - Low Kick.txt @@ -23,6 +23,7 @@ KANGASKHAN ELECTABUZZ MAGMAR KABUTOPS +ZAPDOS_G MEWTWO MEW TYPHLOSION @@ -164,3 +165,8 @@ OBSTAGOON DRACOZOLT ARCTOZOLT DRACOVISH +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA diff --git a/src/tutor_compatibility/71 - Scary Face.txt b/src/tutor_compatibility/71 - Scary Face.txt index 97b2054..d83b11a 100644 --- a/src/tutor_compatibility/71 - Scary Face.txt +++ b/src/tutor_compatibility/71 - Scary Face.txt @@ -28,6 +28,9 @@ TAUROS GYARADOS FLAREON AERODACTYL +ARTICUNO_G +ZAPDOS_G +MOLTRES_G MEW TOTODILE CROCONAW @@ -211,3 +214,13 @@ ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +GLASTRIER +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/72 - Venom Drench.txt b/src/tutor_compatibility/72 - Venom Drench.txt index 20aac0d..740b3c1 100644 --- a/src/tutor_compatibility/72 - Venom Drench.txt +++ b/src/tutor_compatibility/72 - Venom Drench.txt @@ -20,6 +20,7 @@ WEEZING_G MEW ARIADOS CROBAT +SLOWKING_G QWILFISH DUSTOX GULPIN diff --git a/src/tutor_compatibility/75 - Dragon Dance.txt b/src/tutor_compatibility/75 - Dragon Dance.txt index 84acadf..602c4ad 100644 --- a/src/tutor_compatibility/75 - Dragon Dance.txt +++ b/src/tutor_compatibility/75 - Dragon Dance.txt @@ -64,3 +64,4 @@ FLAPPLE DRAKLOAK DRAGAPULT ETERNATUS +REGIDRAGO diff --git a/src/tutor_compatibility/76 - Agility.txt b/src/tutor_compatibility/76 - Agility.txt index 6262d71..479d17c 100644 --- a/src/tutor_compatibility/76 - Agility.txt +++ b/src/tutor_compatibility/76 - Agility.txt @@ -63,8 +63,11 @@ JOLTEON PORYGON AERODACTYL ARTICUNO +ARTICUNO_G ZAPDOS +ZAPDOS_G MOLTRES +MOLTRES_G DRATINI DRAGONAIR DRAGONITE @@ -250,3 +253,8 @@ ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED ETERNATUS +REGIELEKI +SPECTRIER +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/77 - Nasty Plot.txt b/src/tutor_compatibility/77 - Nasty Plot.txt index 15059df..9cabc12 100644 --- a/src/tutor_compatibility/77 - Nasty Plot.txt +++ b/src/tutor_compatibility/77 - Nasty Plot.txt @@ -28,12 +28,14 @@ PERSIAN PERSIAN_A ALAKAZAM SLOWBRO +SLOWBRO_G GENGAR DROWZEE HYPNO MR_MIME MR_MIME_G JYNX +MOLTRES_G MEWTWO MEW HOOTHOOT @@ -45,6 +47,7 @@ TOGEPI TOGETIC AIPOM SLOWKING +SLOWKING_G MISDREAVUS GIRAFARIG HOUNDOUR @@ -173,3 +176,7 @@ PERRSERKER MR_RIME RUNERIGUS MORPEKO +ZARUDE +ZARUDE_DADA +SPECTRIER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/78 - Grassy Terrain.txt b/src/tutor_compatibility/78 - Grassy Terrain.txt index a96bbe0..2ca6cba 100644 --- a/src/tutor_compatibility/78 - Grassy Terrain.txt +++ b/src/tutor_compatibility/78 - Grassy Terrain.txt @@ -73,3 +73,8 @@ TAPU_BULU RILLABOOM GOSSIFLEUR ELDEGOSS +ZARUDE +ZARUDE_DADA +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/8 - Uproar.txt b/src/tutor_compatibility/8 - Uproar.txt index 2f65c15..e2776ae 100644 --- a/src/tutor_compatibility/8 - Uproar.txt +++ b/src/tutor_compatibility/8 - Uproar.txt @@ -323,3 +323,7 @@ GRIMMSNARL PERRSERKER MR_RIME MORPEKO +GLASTRIER +SPECTRIER +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/80 - Electric Terrain.txt b/src/tutor_compatibility/80 - Electric Terrain.txt index 96c87ec..3d14820 100644 --- a/src/tutor_compatibility/80 - Electric Terrain.txt +++ b/src/tutor_compatibility/80 - Electric Terrain.txt @@ -50,3 +50,4 @@ MELMETAL BOLTUND PINCURCHIN MORPEKO +REGIELEKI diff --git a/src/tutor_compatibility/81 - Psychic Terrain.txt b/src/tutor_compatibility/81 - Psychic Terrain.txt index 913e3b0..9ce2be7 100644 --- a/src/tutor_compatibility/81 - Psychic Terrain.txt +++ b/src/tutor_compatibility/81 - Psychic Terrain.txt @@ -6,6 +6,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G DROWZEE HYPNO MR_MIME @@ -14,6 +15,7 @@ JYNX MEWTWO MEW SLOWKING +SLOWKING_G GIRAFARIG CELEBI GARDEVOIR @@ -40,3 +42,6 @@ ORBEETLE MR_RIME INDEEDEE INDEEDEE_FEMALE +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/82 - Whirlpool.txt b/src/tutor_compatibility/82 - Whirlpool.txt index 064bf06..44d3c42 100644 --- a/src/tutor_compatibility/82 - Whirlpool.txt +++ b/src/tutor_compatibility/82 - Whirlpool.txt @@ -14,6 +14,7 @@ TENTACRUEL SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G SEEL DEWGONG SHELLDER @@ -55,6 +56,7 @@ POLITOED WOOPER QUAGSIRE SLOWKING +SLOWKING_G QWILFISH SNEASEL CORSOLA @@ -175,3 +177,4 @@ CURSOLA EISCUE DRACOVISH ARCTOVISH +URSHIFU_RAPID diff --git a/src/tutor_compatibility/86 - Icicle Spear.txt b/src/tutor_compatibility/86 - Icicle Spear.txt index 4cce731..a393855 100644 --- a/src/tutor_compatibility/86 - Icicle Spear.txt +++ b/src/tutor_compatibility/86 - Icicle Spear.txt @@ -41,3 +41,5 @@ FROSMOTH EISCUE ARCTOZOLT ARCTOVISH +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tutor_compatibility/89 - Thunder Fang.txt b/src/tutor_compatibility/89 - Thunder Fang.txt index f6929a7..999f124 100644 --- a/src/tutor_compatibility/89 - Thunder Fang.txt +++ b/src/tutor_compatibility/89 - Thunder Fang.txt @@ -82,3 +82,4 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +REGIDRAGO diff --git a/src/tutor_compatibility/9 - Bind.txt b/src/tutor_compatibility/9 - Bind.txt index 072fe6e..c528917 100644 --- a/src/tutor_compatibility/9 - Bind.txt +++ b/src/tutor_compatibility/9 - Bind.txt @@ -58,6 +58,7 @@ KLINKLANG EELEKTRIK EELEKTROSS CRYOGONAL +STUNFISK_G HEATMOR INKAY MALAMAR @@ -73,3 +74,15 @@ COMFEY NIHILEGO XURKITREE STAKATAKA +SOBBLE +DRIZZILE +INTELEON +SILICOBRA +SANDACONDA +SIZZLIPEDE +CENTISKORCH +CLOBBOPUS +GRAPPLOCT +ETERNATUS +ZARUDE +ZARUDE_DADA diff --git a/src/tutor_compatibility/91 - Fire Fang.txt b/src/tutor_compatibility/91 - Fire Fang.txt index 13a805d..6d127bf 100644 --- a/src/tutor_compatibility/91 - Fire Fang.txt +++ b/src/tutor_compatibility/91 - Fire Fang.txt @@ -101,3 +101,4 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +REGIDRAGO diff --git a/src/tutor_compatibility/92 - Body Slam.txt b/src/tutor_compatibility/92 - Body Slam.txt index b054a0c..8aaa150 100644 --- a/src/tutor_compatibility/92 - Body Slam.txt +++ b/src/tutor_compatibility/92 - Body Slam.txt @@ -91,6 +91,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G FARFETCHD FARFETCHD_G DODUO @@ -173,6 +174,7 @@ QUAGSIRE ESPEON UMBREON SLOWKING +SLOWKING_G GIRAFARIG PINECO FORRETRESS @@ -457,3 +459,14 @@ DRACOVISH ARCTOVISH DURALUDON DRAGAPULT +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +ZARUDE +ZARUDE_DADA +REGIELEKI +REGIDRAGO +GLASTRIER +SPECTRIER +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/93 - Body Press.txt b/src/tutor_compatibility/93 - Body Press.txt index bc58a6d..15a8956 100644 --- a/src/tutor_compatibility/93 - Body Press.txt +++ b/src/tutor_compatibility/93 - Body Press.txt @@ -96,3 +96,7 @@ STONJOURNER CUFANT COPPERAJAH DURALUDON +URSHIFU_SINGLE +URSHIFU_RAPID +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tutor_compatibility/95 - Heavy Slam.txt b/src/tutor_compatibility/95 - Heavy Slam.txt index a5201a4..f609916 100644 --- a/src/tutor_compatibility/95 - Heavy Slam.txt +++ b/src/tutor_compatibility/95 - Heavy Slam.txt @@ -79,3 +79,5 @@ PERRSERKER STONJOURNER COPPERAJAH DURALUDON +GLASTRIER +CALYREX_ICE_RIDER diff --git a/src/tutor_compatibility/96 - Reversal.txt b/src/tutor_compatibility/96 - Reversal.txt index 31c4b52..d2b3e98 100644 --- a/src/tutor_compatibility/96 - Reversal.txt +++ b/src/tutor_compatibility/96 - Reversal.txt @@ -40,6 +40,7 @@ KANGASKHAN SCYTHER PINSIR TAUROS +ZAPDOS_G MEW CYNDAQUIL QUILAVA @@ -164,3 +165,7 @@ ZACIAN ZACIAN_CROWNED ZAMAZENTA ZAMAZENTA_CROWNED +KUBFU +URSHIFU_SINGLE +URSHIFU_RAPID +REGIDRAGO diff --git a/src/tutor_compatibility/97 - Electro Ball.txt b/src/tutor_compatibility/97 - Electro Ball.txt index e662f14..e963e6e 100644 --- a/src/tutor_compatibility/97 - Electro Ball.txt +++ b/src/tutor_compatibility/97 - Electro Ball.txt @@ -76,3 +76,4 @@ TOXTRICITY_LOW_KEY MORPEKO DRACOZOLT ARCTOZOLT +REGIELEKI diff --git a/src/tutor_compatibility/98 - Stored Power.txt b/src/tutor_compatibility/98 - Stored Power.txt index 8ae556a..c209cbf 100644 --- a/src/tutor_compatibility/98 - Stored Power.txt +++ b/src/tutor_compatibility/98 - Stored Power.txt @@ -10,6 +10,7 @@ RAPIDASH_G SLOWPOKE SLOWPOKE_G SLOWBRO +SLOWBRO_G CHANSEY MR_MIME MR_MIME_G @@ -18,6 +19,7 @@ EEVEE VAPOREON JOLTEON FLAREON +ARTICUNO_G MEWTWO MEW HOOTHOOT @@ -30,6 +32,7 @@ XATU ESPEON UMBREON SLOWKING +SLOWKING_G DUNSPARCE SMOOCHUM BLISSEY @@ -117,3 +120,6 @@ ALCREMIE_RIBBON ALCREMIE_STAR INDEEDEE INDEEDEE_FEMALE +CALYREX +CALYREX_ICE_RIDER +CALYREX_SHADOW_RIDER diff --git a/src/tutor_compatibility/99 - Breaking Swipe.txt b/src/tutor_compatibility/99 - Breaking Swipe.txt index dc21dec..d1dceec 100644 --- a/src/tutor_compatibility/99 - Breaking Swipe.txt +++ b/src/tutor_compatibility/99 - Breaking Swipe.txt @@ -51,3 +51,4 @@ DRACOZOLT DURALUDON DRAKLOAK DRAGAPULT +REGIDRAGO diff --git a/strings/Pokedex_Data.string b/strings/Pokedex_Data.string index 0966529..52da866 100644 --- a/strings/Pokedex_Data.string +++ b/strings/Pokedex_Data.string @@ -1267,7 +1267,6 @@ It melts particles of iron and other\nmetals found in the subsoil, so it can\nab #org @DEX_ENTRY_MELMETAL Revered long ago for its capacity\nto create iron from nothing, it has\ncome back to life after 3000 years. -/* #org @DEX_ENTRY_GROOKEY It attacks with rapid beats of its\nstick. As it strikes with amazing speed,\nit gets more and more pumped. @@ -1520,20 +1519,21 @@ Inhabiting the mountains of a distant\nregion, it races across sheer cliffs, tra #org @DEX_ENTRY_ZARUDE Once the vines on its body tear off,\nthey become nutrients in the soil. This helps\nthe plants of the forest grow. -#org @DEX_ENTRY_UNKNOWN_MYTHICAL -This is a newly discovered Pok\emon.\nIt is currently under investigation. No\ninformation is available at this time. +#org @DEX_ENTRY_REGIELEKI +Its entire body is made of an organ\nthat generates electricity. It is capable of\ngenerating a region's worth of electricity. + +#org @DEX_ENTRY_REGIDRAGO +Its body is composed of crystallized\ndragon energy. It is said to contain the\npower of every Dragon Pok\emon. + +#org @DEX_ENTRY_GLASTRIER +Glastrier has tremendous physical\nstrength. The mask covering its face is\n100 times stronger than diamond. + +#org @DEX_ENTRY_SPECTRIER +As it dashes through the night, it\nabsorbs the life energy of sleeping Pok\emon. It\ncraves silence and solitude. #org @DEX_ENTRY_CALYREX Its every move is filled with grace\nand dignity. Extremely intelligent, it is said\nto see past, present, and future events. -#org @DEX_ENTRY_REGIELEKI -This is a newly discovered Pok\emon.\nIt is currently under investigation. No\ninformation is available at this time. - -#org @DEX_ENTRY_REGIDRAGO -This is a newly discovered Pok\emon.\nIt is currently under investigation. No\ninformation is available at this time. - -*/ - //Special Form Entries #org @DEX_ENTRY_RATTATA_A @@ -1615,16 +1615,16 @@ This Pok\emon consumes particles that\ncontaminate the air. Instead of leaving\n It can radiate chilliness from the\nbottoms of its feet. It'll spend its\nday tap dancing on a frozen floor. #org @DEX_ENTRY_ARTICUNO_G -This is a newly discovered Pok\emon.\nIt is currently under investigation. No\ninformation is available at this time. +Known as Articuno, this Pok\emon fires\nbeams that can immobilize opponents as\nif they had been frozen solid. #org @DEX_ENTRY_ZAPDOS_G -This is a newly discovered Pok\emon.\nIt is currently under investigation. No\ninformation is available at this time. +One kick from its powerful legs will\npulverize a dump truck. It supposedly runs\nthrough the mountains at over 180 mph. #org @DEX_ENTRY_MOLTRES_G -This is a newly discovered Pok\emon.\nIt is currently under investigation. No\ninformation is available at this time. +Its sinister, flame-like aura consumes\nthe spirit of any creature it hits. Victims\nbecome burned-out shadows of themselves. #org @DEX_ENTRY_SLOWKING_G -This is a newly discovered Pok\emon.\nIt is currently under investigation. No\ninformation is available at this time. +While chanting strange spells, this\nPok\emon combines its internal toxins with what\nit's eaten, creating a strange potion. #org @DEX_ENTRY_CORSOLA_G Sudden climate change wiped out this\nancient kind of Corsola. It absorbs the\nlife force of others through its branches. @@ -1736,4 +1736,12 @@ Infinite amounts of energy pour from\nthis Pok\emon's enlarged core, warping\nth #org @DEX_ENTRY_URSHIFU_RAPID This form of Urshifu strongly believes\nin defeating foes by raining many blows down\non them. Its strikes flow like a river. -*/ + +#org @DEX_ENTRY_ZARUDE_DADA +This Zarude left its pack to raise a\nhuman child. It would wrap the child with its\ncloth to calm the child's crying. + +#org @DEX_ENTRY_CALYREX_ICE_RIDER +It is said that it once moved a\nlarge forest,and all the Pok\emon living there,\nto a new location overnight. + +#org @DEX_ENTRY_CALYREX_SHADOW_RIDER +Legends say that by using its power\nto see all from the past and future, this Pok\emon\nsaved forest creatures from a meteor strike.