Many TRs as Move Tutors

include/species.h

@@ -253,6 +253,7 @@
 #define SPECIES_LUGIA 0xF9
 #define SPECIES_HO_OH 0xFA
 #define SPECIES_CELEBI 0xFB
+
 #define SPECIES_TREECKO 0x115
 #define SPECIES_GROVYLE 0x116
 #define SPECIES_SCEPTILE 0x117
@@ -735,6 +736,8 @@
 #define SPECIES_THUNDURUS_THERIAN 0x2F3
 #define SPECIES_LANDORUS_THERIAN 0x2F4
 #define SPECIES_KELDEO_RESOLUTE 0x2F5
+
+//Gen 6
 #define SPECIES_CHESPIN 0x2F6
 #define SPECIES_QUILLADIN 0x2F7
 #define SPECIES_CHESNAUGHT 0x2F8
@@ -917,6 +920,8 @@
 #define SPECIES_VIVILLON_SAVANNA 0x3A8
 #define SPECIES_VIVILLON_SUN 0x3A9
 #define SPECIES_VIVILLON_TUNDRA 0x3AA
+
+//Gen 7
 #define SPECIES_ROWLET 0x3AB
 #define SPECIES_DARTRIX 0x3AC
 #define SPECIES_DECIDUEYE 0x3AD
@@ -1084,5 +1089,167 @@
 #define SPECIES_PICHU_SPIKY 0x44C
 #define SPECIES_XERNEAS_NATURAL 0x44D
 
-#define NUM_SPECIES (SPECIES_XERNEAS_NATURAL + 1)
+//Gen 8
+#define SPECIES_GROOKEY 0x44E
+#define SPECIES_THWACKEY 0x44F
+#define SPECIES_RILLABOOM 0x450
+#define SPECIES_SCORBUNNY 0x451
+#define SPECIES_RABOOT 0x452
+#define SPECIES_CINDERACE 0x453
+#define SPECIES_SOBBLE 0x454
+#define SPECIES_DRIZZILE 0x455
+#define SPECIES_INTELEON 0x456
+#define SPECIES_SKWOVET 0x457
+#define SPECIES_GREEDENT 0x458
+#define SPECIES_ROOKIDEE 0x459
+#define SPECIES_CORVISQUIRE 0x45A
+#define SPECIES_CORVIKNIGHT 0x45B
+#define SPECIES_BLIPBUG 0x45C
+#define SPECIES_DOTTLER 0x45D
+#define SPECIES_ORBEETLE 0x45E
+#define SPECIES_NICKIT 0x45F
+#define SPECIES_THIEVUL 0x460
+#define SPECIES_GOSSIFLEUR 0x461
+#define SPECIES_ELDEGOSS 0x462
+#define SPECIES_WOOLOO 0x463
+#define SPECIES_DUBWOOL 0x464
+#define SPECIES_CHEWTLE 0x465
+#define SPECIES_DREDNAW 0x466
+#define SPECIES_YAMPER 0x467
+#define SPECIES_BOLTUND 0x468
+#define SPECIES_ROLYCOLY 0x469
+#define SPECIES_CARKOL 0x46A
+#define SPECIES_COALOSSAL 0x46B
+#define SPECIES_APPLIN 0x46C
+#define SPECIES_FLAPPLE 0x46D
+#define SPECIES_APPLETUN 0x46E
+#define SPECIES_SILICOBRA 0x46F
+#define SPECIES_SANDACONDA 0x470
+#define SPECIES_CRAMORANT 0x471
+#define SPECIES_ARROKUDA 0x472
+#define SPECIES_BARRASKEWDA 0x473
+#define SPECIES_TOXEL 0x474
+#define SPECIES_TOXTRICITY 0x475
+#define SPECIES_SIZZLIPEDE 0x476
+#define SPECIES_CENTISKORCH 0x477
+#define SPECIES_CLOBBOPUS 0x478
+#define SPECIES_GRAPPLOCT 0x479
+#define SPECIES_SINISTEA 0x47A
+#define SPECIES_POLTEAGEIST 0x47B
+#define SPECIES_HATENNA 0x47C
+#define SPECIES_HATTREM 0x47D
+#define SPECIES_HATTERENE 0x47E
+#define SPECIES_IMPIDIMP 0x47F
+#define SPECIES_MORGREM 0x480
+#define SPECIES_GRIMMSNARL 0x481
+#define SPECIES_OBSTAGOON 0x482
+#define SPECIES_PERRSERKER 0x483
+#define SPECIES_CURSOLA 0x484
+#define SPECIES_SIRFETCHD 0x485
+#define SPECIES_MR_RIME 0x486
+#define SPECIES_RUNERIGUS 0x487
+#define SPECIES_MILCERY 0x488
+#define SPECIES_ALCREMIE_STRAWBERRY 0x489
+#define SPECIES_FALINKS 0x48A
+#define SPECIES_PINCURCHIN 0x48B
+#define SPECIES_SNOM 0x48C
+#define SPECIES_FROSMOTH 0x48D
+#define SPECIES_STONJOURNER 0x48E
+#define SPECIES_EISCUE 0x48F
+#define SPECIES_INDEEDEE 0x490
+#define SPECIES_MORPEKO 0x491
+#define SPECIES_CUFANT 0x492
+#define SPECIES_COPPERAJAH 0x493
+#define SPECIES_DRACOZOLT 0x494
+#define SPECIES_ARCTOZOLT 0x495
+#define SPECIES_DRACOVISH 0x496
+#define SPECIES_ARCTOVISH 0x497
+#define SPECIES_DURALUDON 0x498
+#define SPECIES_DREEPY 0x499
+#define SPECIES_DRAKLOAK 0x49A
+#define SPECIES_DRAGAPULT 0x49B
+#define SPECIES_ZACIAN 0x49C
+#define SPECIES_ZAMAZENTA 0x49D
+#define SPECIES_ETERNATUS 0x49E
+#define SPECIES_KUBFU 0x49F
+#define SPECIES_URSHIFU_SINGLE 0x4A0
+#define SPECIES_CALYREX 0x4A1
+
+#define SPECIES_CRAMORANT_GULPING 0x4A2
+#define SPECIES_CRAMORANT_GORGING 0x4A3
+#define SPECIES_TOXTRICITY_LOW_KEY 0x4A4
+#define SPECIES_SINISTEA_CHIPPED 0x4A5
+#define SPECIES_POLTEAGEIST_CHIPPED 0x4A6
+#define SPECIES_ALCREMIE_BERRY 0x4A7
+#define SPECIES_ALCREMIE_CLOVER 0x4A8
+#define SPECIES_ALCREMIE_FLOWER 0x4A9
+#define SPECIES_ALCREMIE_LOVE 0x4AA
+#define SPECIES_ALCREMIE_RIBBON 0x4AB
+#define SPECIES_ALCREMIE_STAR 0x4AC
+#define SPECIES_EISCUE_NOICE 0x4AD
+#define SPECIES_INDEEDEE_FEMALE 0x4AE
+#define SPECIES_MORPEKO_HANGRY 0x4AF
+#define SPECIES_ZACIAN_CROWNED 0x4B0
+#define SPECIES_ZAMAZENTA_CROWNED 0x4B1
+#define SPECIES_ETERNATUS_ETERNAMAX 0x4B2
+#define SPECIES_URSHIFU_RAPID 0x4B3
+
+#define SPECIES_MEOWTH_G 0x4B4
+#define SPECIES_PONYTA_G 0x4B5
+#define SPECIES_RAPIDASH_G 0x4B6
+#define SPECIES_SLOWPOKE_G 0x4B7
+#define SPECIES_SLOWBRO_G 0x4B8
+#define SPECIES_FARFETCHD_G 0x4B9
+#define SPECIES_KOFFING_G 0x4BA
+#define SPECIES_WEEZING_G 0x4BB
+#define SPECIES_MR_MIME_G 0x4BC
+#define SPECIES_ARTICUNO_G 0x4BD
+#define SPECIES_ZAPDOS_G 0x4BE
+#define SPECIES_MOLTRES_G 0x4BF
+#define SPECIES_SLOWKING_G 0x4C0
+#define SPECIES_CORSOLA_G 0x4C1
+#define SPECIES_ZIGZAGOON_G 0x4C2
+#define SPECIES_LINOONE_G 0x4C3
+#define SPECIES_MIME_JR_G 0x4C4
+#define SPECIES_DARUMAKA_G 0x4C5
+#define SPECIES_DARMANITAN_G 0x4C6
+#define SPECIES_DARMANITAN_G_ZEN 0x4C7
+#define SPECIES_YAMASK_G 0x4C8
+#define SPECIES_STUNFISK_G 0x4C9
+
+#define SPECIES_VENUSAUR_GIGA 0x4CA
+#define SPECIES_CHARIZARD_GIGA 0x4CB
+#define SPECIES_BLASTOISE_GIGA 0x4CC
+#define SPECIES_BUTTERFREE_GIGA 0x4CD
+#define SPECIES_PIKACHU_GIGA 0x4CE
+#define SPECIES_MEOWTH_GIGA 0x4CF
+#define SPECIES_MACHAMP_GIGA 0x4D0
+#define SPECIES_GENGAR_GIGA 0x4D1
+#define SPECIES_KINGLER_GIGA 0x4D2
+#define SPECIES_LAPRAS_GIGA 0x4D3
+#define SPECIES_EEVEE_GIGA 0x4D4
+#define SPECIES_SNORLAX_GIGA 0x4D5
+#define SPECIES_GARBODOR_GIGA 0x4D6
+#define SPECIES_MELMETAL_GIGA 0x4D7
+#define SPECIES_RILLABOOM_GIGA 0x4D8
+#define SPECIES_CINDERACE_GIGA 0x4D9
+#define SPECIES_INTELEON_GIGA 0x4DA
+#define SPECIES_CORVIKNIGHT_GIGA 0x4DB
+#define SPECIES_ORBEETLE_GIGA 0x4DC
+#define SPECIES_DREDNAW_GIGA 0x4DD
+#define SPECIES_COALOSSAL_GIGA 0x4DE
+#define SPECIES_FLAPPLE_GIGA 0x4DF
+#define SPECIES_APPLETUN_GIGA 0x4E0
+#define SPECIES_SANDACONDA_GIGA 0x4E1
+#define SPECIES_TOXTRICITY_GIGA 0x4E2
+#define SPECIES_CENTISKORCH_GIGA 0x4E3
+#define SPECIES_HATTERENE_GIGA 0x4E4
+#define SPECIES_GRIMMSNARL_GIGA 0x4E5
+#define SPECIES_ALCREMIE_GIGA 0x4E6
+#define SPECIES_COPPERAJAH_GIGA 0x4E7
+#define SPECIES_DURALUDON_GIGA 0x4E8
+#define SPECIES_URSHIFU_SINGLE_GIGA 0x4E9
+#define SPECIES_URSHIFU_RAPID_GIGA 0x4EA
+
+#define NUM_SPECIES (SPECIES_XERNEAS_NATURAL + 1) //WILL BE UPDATED EVENTUALLY
 

include/tutors.h

@@ -66,16 +66,81 @@ enum MoveTutors
 	TUTOR61_FRENZY_PLANT,
 	TUTOR62_BLAST_BURN,
 	TUTOR63_HYDRO_CANNON,
-	
+	TUTOR64_FOCUS_ENERGY,
+	TUTOR65_COSMIC_POWER,
+	TUTOR66_BATON_PASS,
+	TUTOR67_ENCORE,
+	TUTOR68_SCREECH,
+	TUTOR69_FAKE_TEARS,
+	TUTOR70_SCARY_FACE,
+	TUTOR71_VENOM_DRENCH,
+	TUTOR72_SPIKES,
+	TUTOR73_TOXIC_SPIKES,
+	TUTOR74_DRAGON_DANCE,
+	TUTOR75_AGILITY,
+	TUTOR76_NASTY_PLOT,
+	TUTOR77_GRASSY_TERRAIN,
+	TUTOR78_MISTY_TERRAIN,
+	TUTOR79_ELECTRIC_TERRAIN,
+	TUTOR80_PSYCHIC_TERRAIN,
+	TUTOR81_WHIRLPOOL,
+	TUTOR82_FIRE_SPIN,
+	TUTOR83_SAND_TOMB,
+	TUTOR84_PIN_MISSILE,
+	TUTOR85_ICICLE_SPEAR,
+	TUTOR86_TAIL_SLAP,
+	TUTOR87_ROCK_BLAST,
+	TUTOR88_THUNDER_FANG,
+	TUTOR89_ICE_FANG,
+	TUTOR90_FIRE_FANG,
+	TUTOR91_BODY_SLAM,
+	TUTOR92_BODY_PRESS,
+	TUTOR93_HEAT_CRASH,
+	TUTOR94_HEAVY_SLAM,
+	TUTOR95_REVERSAL,
+	TUTOR96_ELECTRO_BALL,
+	TUTOR97_STORED_POWER,
+	TUTOR98_BREAKING_SWIPE,
+	TUTOR99_RAZOR_SHELL,
+	TUTOR100_HEX,
+	TUTOR101_WEATHER_BALL,
+	TUTOR102_AIR_SLASH,
+	TUTOR103_AURA_SPHERE,
+	TUTOR104_BLAZE_KICK,
+	TUTOR105_BUG_BUZZ,
+	TUTOR106_CROSS_POISON,
+	TUTOR107_CRUNCH,
+	TUTOR108_DARKEST_LARIAT,
+	TUTOR109_HIGH_HORSEPOWER,
+	TUTOR110_LEAF_BLADE,
+	TUTOR111_MUDDY_WATER,
+	TUTOR112_MYSTICAL_FIRE,
+	TUTOR113_PHANTOM_FORCE,
+	TUTOR114_PLAY_ROUGH,
+	TUTOR115_POLLEN_PUFF,
+	TUTOR116_POWER_GEM,
+	TUTOR117_PSYCHIC_FANGS,
+	TUTOR118_PSYCHO_CUT,
+	TUTOR119_BRAVE_BIRD,
+	TUTOR120_CLOSE_COMBAT,
+	TUTOR121_FLARE_BLITZ,
+	TUTOR122_HURRICANE,
+	TUTOR123_HYDRO_PUMP,
+	TUTOR124_LEAF_STORM,
+	TUTOR125_MEGAHORN,
+	TUTOR126_POWER_WHIP,
+	TUTOR127_SOLAR_BLADE,
+
 //Special Move Tutors - Not in Table
-	TUTOR_SPECIAL_DRACO_METEOR,			//64
-	TUTOR_SPECIAL_SECRET_SWORD,			//65 - Keldeo only
-	TUTOR_SPECIAL_RELIC_SONG,			//66 - Meloetta only
-	TUTOR_SPECIAL_VOLT_TACKLE,			//67 - Pikachu only
-	TUTOR_SPECIAL_DRAGON_ASCENT,		//68 - Rayquaza only
-	TUTOR_SPECIAL_THOUSAND_ARROWS,		//69 - Zygarde only
-	TUTOR_SPECIAL_THOUSAND_WAVES,		//70 - Zygarde only
-	TUTOR_SPECIAL_CORE_ENFORCER,		//71 - Zygarde only
+	TUTOR_SPECIAL_DRACO_METEOR,			//128 - Dragon Pokemon
+	TUTOR_SPECIAL_SECRET_SWORD,			//129 - Keldeo only
+	TUTOR_SPECIAL_RELIC_SONG,			//130 - Meloetta only
+	TUTOR_SPECIAL_VOLT_TACKLE,			//131 - Pikachu only
+	TUTOR_SPECIAL_DRAGON_ASCENT,		//132 - Rayquaza only
+	TUTOR_SPECIAL_THOUSAND_ARROWS,		//133 - Zygarde only
+	TUTOR_SPECIAL_THOUSAND_WAVES,		//134 - Zygarde only
+	TUTOR_SPECIAL_CORE_ENFORCER,		//135 - Zygarde only
+	TUTOR_SPECIAL_STEEL_BEAM,			//136 - Steel Pokemon
 };
 
-#define LAST_TOTAL_TUTOR_NUM 71
+#define LAST_TOTAL_TUTOR_NUM 136