Icon Fixes + TM/Tutor Start

bytereplacement

@@ -1,4 +1,5 @@
-##
+#include "include/tutors.h"
+
 ##Use New Name Table
 08041000 C0 46 C0 46 C0 46
 
@@ -17,6 +18,7 @@
 #Icon Palette Fixes
 08096F90 C0 46
 08096E7A C0 46 C0 46
+080970A6 C0 46 C0 46 C0 46 C0 46 C0 46
 080971DA C0 46
 
 #Update Pokedex
@@ -74,4 +76,8 @@
 
 ##Fix Pokedex Species Issue
 0810583C FF
-08105856 FF
+08105856 FF
+
+##Increase Tutors to 72 (64 Regular + 8 Special)
+0811F456 LAST_TOTAL_TUTOR_NUM
+08127824 LAST_TOTAL_TUTOR_NUM

include/tutors.h

@@ -0,0 +1,81 @@
+#pragma once
+
+enum MoveTutors
+{
+	TUTOR00_FIRE_PUNCH,
+	TUTOR01_ICE_PUNCH,
+	TUTOR02_THUNDER_PUNCH,
+	TUTOR03_SNORE,
+	TUTOR04_HEAL_BELL,
+	TUTOR05_ELECTROWEB,
+	TUTOR06_LOW_KICK,
+	TUTOR07_UPROAR,
+	TUTOR08_BIND,
+	TUTOR09_HELPING_HAND,
+	TUTOR10_BLOCK,
+	TUTOR11_WORRY_SEED,
+	TUTOR12_COVET,
+	TUTOR13_BUG_BITE,
+	TUTOR14_SNATCH,
+	TUTOR15_SPITE,
+	TUTOR16_AFTER_YOU,
+	TUTOR17_SYNTHESIS,
+	TUTOR18_SIGNAL_BEAM,
+	TUTOR19_GRAVITY,
+	TUTOR20_IRON_DEFENSE,
+	TUTOR21_TELEKINESIS,
+	TUTOR22_MAGNET_RISE,
+	TUTOR23_BOUNCE,
+	TUTOR24_ROLE_PLAY,
+	TUTOR25_IRON_HEAD,
+	TUTOR26_AQUA_TAIL,
+	TUTOR27_PAIN_SPLIT,
+	TUTOR28_TAILWIND,
+	TUTOR29_ENDEAVOR,
+	TUTOR30_ICY_WIND,
+	TUTOR31_ZEN_HEADBUTT,
+	TUTOR32_SEED_BOMB,
+	TUTOR33_LASER_FOCUS,
+	TUTOR34_TRICK,
+	TUTOR35_DRILL_RUN,
+	TUTOR36_MAGIC_COAT,
+	TUTOR37_MAGIC_ROOM,
+	TUTOR38_WONDER_ROOM,
+	TUTOR39_LIQUIDATION,
+	TUTOR40_GASTRO_ACID,
+	TUTOR41_FOUL_PLAY,
+	TUTOR42_SUPER_FANG,
+	TUTOR43_OUTRAGE,
+	TUTOR44_SKY_ATTACK,
+	TUTOR45_THROAT_CHOP,
+	TUTOR46_STOMPING_TANTRUM,
+	TUTOR47_EARTH_POWER,
+	TUTOR48_GUNK_SHOT,
+	TUTOR49_DUAL_CHOP,
+	TUTOR50_HEAT_WAVE,
+	TUTOR51_HYPER_VOICE,
+	TUTOR52_SUPERPOWER,
+	TUTOR53_KNOCK_OFF,
+	TUTOR54_PSYCH_UP,
+	TUTOR55_VACUUM_WAVE,
+	TUTOR56_LAST_RESORT,
+	TUTOR57_CONFIDE,
+	TUTOR58_GRASS_PLEDGE,
+	TUTOR59_FIRE_PLEDGE,
+	TUTOR60_WATER_PLEDGE,
+	TUTOR61_FRENZY_PLANT,
+	TUTOR62_BLAST_BURN,
+	TUTOR63_HYDRO_CANNON,
+	
+//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
+};
+
+#define LAST_TOTAL_TUTOR_NUM 71

repointall

@@ -27,4 +27,7 @@ gPokedexOrder_Height 08103868
 
 gMonIconTable 08000138
 gMonIconPaletteIndices 0800013C
-gItemAnimationTable 0812EAE0
+gItemAnimationTable 0812EAE0
+
+gTMHMMoves 08125A8C
+gMoveTutorMoves 08120BE4

src/TM_Tutor_Tables.c

@@ -0,0 +1,203 @@
+#include "defines.h"
+#include "../include/moves.h"
+
+const u16 gTMHMMoves[NUM_TMSHMS] =
+{
+	MOVE_FOCUSPUNCH,	//1
+	MOVE_DRAGONCLAW,	//2
+	MOVE_WATERPULSE,	//3
+	MOVE_CALMMIND,		//4
+	MOVE_ROAR,			//5
+	MOVE_TOXIC,			//6
+	MOVE_HAIL,			//7
+	MOVE_BULKUP,		//8
+	MOVE_BULLETSEED,	//9
+	MOVE_HIDDENPOWER,	//10
+	MOVE_SUNNYDAY,		//11
+	MOVE_TAUNT,			//12
+	MOVE_ICEBEAM,		//13
+	MOVE_BLIZZARD,		//14
+	MOVE_HYPERBEAM,		//15
+	MOVE_LIGHTSCREEN,	//16
+	MOVE_PROTECT,		//17
+	MOVE_RAINDANCE,		//18
+	MOVE_GIGADRAIN,		//19
+	MOVE_SAFEGUARD,		//20
+	MOVE_FRUSTRATION,	//21
+	MOVE_SOLARBEAM,		//22
+	MOVE_IRONTAIL,		//23
+	MOVE_THUNDERBOLT,	//24
+	MOVE_THUNDER,		//25
+	MOVE_EARTHQUAKE,	//26
+	MOVE_RETURN,		//27
+	MOVE_DIG,			//28
+	MOVE_PSYCHIC,		//29
+	MOVE_SHADOWBALL,	//30
+	MOVE_BRICKBREAK,	//31
+	MOVE_DOUBLETEAM,	//32
+	MOVE_REFLECT,		//33
+	MOVE_SHOCKWAVE,		//34
+	MOVE_FLAMETHROWER,	//35
+	MOVE_SLUDGEBOMB,	//36
+	MOVE_SANDSTORM,		//37
+	MOVE_FIREBLAST,		//38
+	MOVE_ROCKTOMB,		//39
+	MOVE_AERIALACE,		//40
+	MOVE_TORMENT,		//41
+	MOVE_FACADE,		//42
+	MOVE_SECRETPOWER,	//43
+	MOVE_REST,			//44
+	MOVE_ATTRACT,		//45
+	MOVE_THIEF,			//46
+	MOVE_STEELWING,		//47
+	MOVE_SKILLSWAP,		//48
+	MOVE_LEECHFANG,		//49
+	MOVE_OVERHEAT,		//50
+	MOVE_ROOST,			//51
+	MOVE_FOCUSBLAST,	//52
+	MOVE_ENERGYBALL,	//53
+	MOVE_FALSESWIPE,	//54
+	MOVE_BRINE,			//55
+	MOVE_HONECLAWS,		//56
+	MOVE_CHARGEBEAM,	//57
+	MOVE_ENDURE,		//58
+	MOVE_DRAGONPULSE,	//59
+	MOVE_DRAINPUNCH,	//60
+	MOVE_WILLOWISP,		//61
+	MOVE_SILVERWIND,	//62
+	MOVE_VENOSHOCK,		//63
+	MOVE_EXPLOSION,		//64
+	MOVE_SHADOWCLAW,	//65
+	MOVE_PAYBACK,		//66
+	MOVE_RECYCLE,		//67
+	MOVE_GIGAIMPACT,	//68
+	MOVE_ROCKPOLISH,	//69
+	MOVE_FLASH,			//70
+	MOVE_STONEEDGE,		//71
+	MOVE_AVALANCHE,		//72
+	MOVE_THUNDERWAVE,	//73
+	MOVE_GYROBALL,		//74
+	MOVE_SWORDSDANCE,	//75
+	MOVE_STEALTHROCK,	//76
+	MOVE_FLAMECHARGE,	//77
+	MOVE_LOWSWEEP,		//78
+	MOVE_DARKPULSE,		//79
+	MOVE_ROCKSLIDE,		//80
+	MOVE_XSCISSOR,		//81
+	MOVE_SLEEPTALK,		//82
+	MOVE_SCALD,			//83
+	MOVE_POISONJAB,		//84
+	MOVE_DREAMEATER,	//85
+	MOVE_GRASSKNOT,		//86
+	MOVE_SWAGGER,		//87
+	MOVE_PLUCK,			//88
+	MOVE_UTURN,			//89
+	MOVE_SUBSTITUTE,	//90
+	MOVE_FLASHCANNON,	//91
+	MOVE_VOLTSWITCH,	//92
+	MOVE_DRAGONTAIL,	//93
+	MOVE_INCINERATE,	//94
+	MOVE_STRUGGLEBUG,	//95
+	MOVE_BULLDOZE,		//96
+	MOVE_FROSTBREATH,	//97
+	MOVE_WORKUP,		//98
+	MOVE_WILDCHARGE,	//99
+	MOVE_INFESTATION,	//100
+	MOVE_POWERUPPUNCH,	//101
+	MOVE_DAZZLINGGLEAM,	//102
+	MOVE_SLUDGEWAVE,	//103
+	MOVE_PSYSHOCK,		//104
+	MOVE_BRUTALSWING,	//105
+	MOVE_SMARTSTRIKE,	//106
+	MOVE_ACROBATICS,	//107
+	MOVE_SNARL,			//108
+	MOVE_DEFOG,			//109
+	MOVE_CAPTIVATE,		//110
+	MOVE_SMACKDOWN,		//111
+	MOVE_ROUND,			//112
+	MOVE_ECHOEDVOICE,	//113
+	MOVE_NATURALGIFT,	//114
+	MOVE_QUASH,			//115
+	MOVE_TRICKROOM,		//116
+	MOVE_FLING,			//117
+	MOVE_AURORAVEIL,	//118
+	MOVE_LAVAPLUME,		//119
+	MOVE_NATUREPOWER,	//120
+	MOVE_CUT,			//121
+	MOVE_FLY,			//122
+	MOVE_SURF,			//123
+	MOVE_STRENGTH,		//124
+	MOVE_DIVE,			//125
+	MOVE_ROCKSMASH,		//126
+	MOVE_WATERFALL,		//127
+	MOVE_ROCKCLIMB,		//128
+};
+
+const u16 gMoveTutorMoves[NUM_MOVE_TUTOR_MOVES] =
+{
+	MOVE_FIREPUNCH,			//1
+	MOVE_ICEPUNCH,			//2
+	MOVE_THUNDERPUNCH,		//3
+	MOVE_SNORE,				//4
+	MOVE_HEALBELL,			//5
+	MOVE_ELECTROWEB,		//6
+	MOVE_LOWKICK,			//7
+	MOVE_UPROAR,			//8
+	MOVE_BIND,				//9
+	MOVE_HELPINGHAND,		//10
+	MOVE_BLOCK,				//11
+	MOVE_WORRYSEED,			//12
+	MOVE_COVET,				//13
+	MOVE_BUGBITE,			//14
+	MOVE_SNATCH,			//15
+	MOVE_SPITE,				//16
+	MOVE_AFTERYOU,			//17
+	MOVE_SYNTHESIS,			//18
+	MOVE_SIGNALBEAM,		//19
+	MOVE_GRAVITY,			//20
+	MOVE_IRONDEFENSE,		//21
+	MOVE_TELEKINESIS,		//22
+	MOVE_MAGNETRISE,		//23
+	MOVE_BOUNCE,			//24
+	MOVE_ROLEPLAY,			//25
+	MOVE_IRONHEAD,			//26
+	MOVE_AQUATAIL,			//27
+	MOVE_PAINSPLIT,			//28
+	MOVE_TAILWIND,			//29
+	MOVE_ENDEAVOR,			//30
+	MOVE_ICYWIND,			//31
+	MOVE_ZENHEADBUTT,		//32
+	MOVE_SEEDBOMB,			//33
+	MOVE_LASERFOCUS,		//34
+	MOVE_TRICK,				//35
+	MOVE_DRILLRUN,			//36
+	MOVE_MAGICCOAT,			//37
+	MOVE_MAGICROOM,			//38
+	MOVE_WONDERROOM,		//39
+	MOVE_LIQUIDATION,		//40
+	MOVE_GASTROACID,		//41
+	MOVE_FOULPLAY,			//42
+	MOVE_SUPERFANG,			//43
+	MOVE_OUTRAGE,			//44
+	MOVE_SKYATTACK,			//45
+	MOVE_THROATCHOP,		//46
+	MOVE_STOMPINGTANTRUM,	//47
+	MOVE_EARTHPOWER,		//48
+	MOVE_GUNKSHOT,			//49
+	MOVE_DUALCHOP,			//50
+	MOVE_HEATWAVE,			//51
+	MOVE_HYPERVOICE,		//52
+	MOVE_SUPERPOWER,		//53
+	MOVE_KNOCKOFF,			//54
+	MOVE_PSYCHUP,			//55
+	MOVE_VACUUMWAVE,		//56
+	MOVE_LASTRESORT,		//57
+	MOVE_CONFIDE,			//58
+	MOVE_GRASSPLEDGE,		//59
+	MOVE_FIREPLEDGE,		//60
+	MOVE_WATERPLEDGE,		//61
+	MOVE_FRENZYPLANT,		//62
+	MOVE_BLASTBURN,			//63
+	MOVE_HYDROCANNON,		//64
+};
+	

src/updated_code.c

@@ -147,4 +147,28 @@ u16 TryGetFemaleGenderedSpecies(u16 species, u32 personality)
 		species = SPECIES_XERNEAS_NATURAL;
 	
 	return species;
-}
+}
+
+u16 GetIconSpecies(u16 species, u32 personality)
+{
+    u16 result;
+
+    if (species == SPECIES_UNOWN)
+    {
+        u16 letter = GetUnownLetterFromPersonality(personality);
+        if (letter == 0)
+            letter = SPECIES_UNOWN;
+        else
+            letter += (SPECIES_UNOWN_B - 1);
+        result = letter;
+    }
+    else
+    {
+        if (species > NUM_SPECIES)
+            result = 0;
+        else
+            result = TryGetFemaleGenderedSpecies(species, personality);
+    }
+
+    return result;
+}