3 files changed, 136 insertions, 31 deletions
diff --git a/include/constants/items.h b/include/constants/items.h
index 98c3dd97..433532a4 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -445,4 +445,109 @@
 #define ITEM_STORAGE_KEY         463
 #define ITEM_SECRETPOTION        464
 
+#define TM_FOCUS_PUNCH  ITEM_TM01
+#define TM_DRAGON_CLAW  ITEM_TM02
+#define TM_WATER_PULSE  ITEM_TM03
+#define TM_CALM_MIND    ITEM_TM04
+#define TM_ROAR         ITEM_TM05
+#define TM_TOXIC        ITEM_TM06
+#define TM_HAIL         ITEM_TM07
+#define TM_BULK_UP      ITEM_TM08
+#define TM_BULLET_SEED  ITEM_TM09
+#define TM_HIDDEN_POWER ITEM_TM10
+#define TM_SUNNY_DAY    ITEM_TM11
+#define TM_TAUNT        ITEM_TM12
+#define TM_ICE_BEAM     ITEM_TM13
+#define TM_BLIZZARD     ITEM_TM14
+#define TM_HYPER_BEAM   ITEM_TM15
+#define TM_LIGHT_SCREEN ITEM_TM16
+#define TM_PROTECT      ITEM_TM17
+#define TM_RAIN_DANCE   ITEM_TM18
+#define TM_GIGA_DRAIN   ITEM_TM19
+#define TM_SAFEGUARD    ITEM_TM20
+#define TM_FRUSTRATION  ITEM_TM21
+#define TM_SOLARBEAM    ITEM_TM22
+#define TM_IRON_TAIL    ITEM_TM23
+#define TM_THUNDERBOLT  ITEM_TM24
+#define TM_THUNDER      ITEM_TM25
+#define TM_EARTHQUAKE   ITEM_TM26
+#define TM_RETURN       ITEM_TM27
+#define TM_DIG          ITEM_TM28
+#define TM_PSYCHIC      ITEM_TM29
+#define TM_SHADOW_BALL  ITEM_TM30
+#define TM_BRICK_BREAK  ITEM_TM31
+#define TM_DOUBLE_TEAM  ITEM_TM32
+#define TM_REFLECT      ITEM_TM33
+#define TM_SHOCK_WAVE   ITEM_TM34
+#define TM_FLAMETHROWER ITEM_TM35
+#define TM_SLUDGE_BOMB  ITEM_TM36
+#define TM_SANDSTORM    ITEM_TM37
+#define TM_FIRE_BLAST   ITEM_TM38
+#define TM_ROCK_TOMB    ITEM_TM39
+#define TM_AERIAL_ACE   ITEM_TM40
+#define TM_TORMENT      ITEM_TM41
+#define TM_FACADE       ITEM_TM42
+#define TM_SECRET_POWER ITEM_TM43
+#define TM_REST         ITEM_TM44
+#define TM_ATTRACT      ITEM_TM45
+#define TM_THIEF        ITEM_TM46
+#define TM_STEEL_WING   ITEM_TM47
+#define TM_SKILL_SWAP   ITEM_TM48
+#define TM_SNATCH       ITEM_TM49
+#define TM_OVERHEAT     ITEM_TM50
+#define TM_ROOST        ITEM_TM51
+#define TM_FOCUS_BLAST  ITEM_TM52
+#define TM_ENERGY_BALL  ITEM_TM53
+#define TM_FALSE_SWIPE  ITEM_TM54
+#define TM_BRINE        ITEM_TM55
+#define TM_FLING        ITEM_TM56
+#define TM_CHARGE_BEAM  ITEM_TM57
+#define TM_ENDURE       ITEM_TM58
+#define TM_DRAGON_PULSE ITEM_TM59
+#define TM_DRAIN_PUNCH  ITEM_TM60
+#define TM_WILL_O_WISP  ITEM_TM61
+#define TM_SILVER_WIND  ITEM_TM62
+#define TM_EMBARGO      ITEM_TM63
+#define TM_EXPLOSION    ITEM_TM64
+#define TM_SHADOW_CLAW  ITEM_TM65
+#define TM_PAYBACK      ITEM_TM66
+#define TM_RECYCLE      ITEM_TM67
+#define TM_GIGA_IMPACT  ITEM_TM68
+#define TM_ROCK_POLISH  ITEM_TM69
+#define TM_FLASH        ITEM_TM70
+#define TM_STONE_EDGE   ITEM_TM71
+#define TM_AVALANCHE    ITEM_TM72
+#define TM_THUNDER_WAVE ITEM_TM73
+#define TM_GYRO_BALL    ITEM_TM74
+#define TM_SWORDS_DANCE ITEM_TM75
+#define TM_STEALTH_ROCK ITEM_TM76
+#define TM_PSYCH_UP     ITEM_TM77
+#define TM_CAPTIVATE    ITEM_TM78
+#define TM_DARK_PULSE   ITEM_TM79
+#define TM_ROCK_SLIDE   ITEM_TM80
+#define TM_X_SCISSOR    ITEM_TM81
+#define TM_SLEEP_TALK   ITEM_TM82
+#define TM_NATURAL_GIFT ITEM_TM83
+#define TM_POISON_JAB   ITEM_TM84
+#define TM_DREAM_EATER  ITEM_TM85
+#define TM_GRASS_KNOT   ITEM_TM86
+#define TM_SWAGGER      ITEM_TM87
+#define TM_PLUCK        ITEM_TM88
+#define TM_U_TURN       ITEM_TM89
+#define TM_SUBSTITUTE   ITEM_TM90
+#define TM_FLASH_CANNON ITEM_TM91
+#define TM_TRICK_ROOM   ITEM_TM92
+#define HM_CUT          ITEM_HM01
+#define HM_FLY          ITEM_HM02
+#define HM_SURF         ITEM_HM03
+#define HM_STRENGTH     ITEM_HM04
+#define HM_DEFOG        ITEM_HM05
+#define HM_WHIRLPOOL    ITEM_HM05
+#define HM_ROCK_SMASH   ITEM_HM06
+#define HM_WATERFALL    ITEM_HM07
+#define HM_ROCK_CLIMB   ITEM_HM08
+
+#define NUM_TMS 92
+#define NUM_HMS 8
+
 #endif //POKEDIAMOND_CONSTANTS_ITEMS_H
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 9accbad1..5c8c32d4 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -404,4 +404,35 @@ typedef enum {
     UNOWN_QUESTION_MARK = 27
 } AlternateForms;
 
+typedef enum EvoMethod
+{
+    EVO_NONE = 0,
+    EVO_FRIENDSHIP,
+    EVO_FRIENDSHIP_DAY,
+    EVO_FRIENDSHIP_NIGHT,
+    EVO_LEVEL,
+    EVO_TRADE,
+    EVO_TRADE_ITEM,
+    EVO_STONE,
+    EVO_LEVEL_ATK_GT_DEF,
+    EVO_LEVEL_ATK_EQ_DEF,
+    EVO_LEVEL_ATK_LT_DEF,
+    EVO_LEVEL_PID_LO,
+    EVO_LEVEL_PID_HI,
+    EVO_LEVEL_NINJASK,
+    EVO_LEVEL_SHEDINJA,
+    EVO_BEAUTY,
+    EVO_STONE_MALE,
+    EVO_STONE_FEMALE,
+    EVO_ITEM_DAY,
+    EVO_ITEM_NIGHT,
+    EVO_HAS_MOVE,
+    EVO_OTHER_PARTY_MON,
+    EVO_LEVEL_MALE,
+    EVO_LEVEL_FEMALE,
+    EVO_CORONET,
+    EVO_ETERNA,
+    EVO_ROUTE217,
+} EvoMethod;
+
 #endif //POKEDIAMOND_CONSTANTS_POKEMON_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 01a03763..2387ef78 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -46,37 +46,6 @@ struct BaseStats {
     /* 0x28 */ u32 unk28;
 };
 
-typedef enum EvoMethod
-{
-    EVO_NONE = 0,
-    EVO_FRIENDSHIP,
-    EVO_FRIENDSHIP_DAY,
-    EVO_FRIENDSHIP_NIGHT,
-    EVO_LEVEL,
-    EVO_TRADE,
-    EVO_TRADE_ITEM,
-    EVO_STONE,
-    EVO_LEVEL_ATK_GT_DEF,
-    EVO_LEVEL_ATK_EQ_DEF,
-    EVO_LEVEL_ATK_LT_DEF,
-    EVO_LEVEL_PID_LO,
-    EVO_LEVEL_PID_HI,
-    EVO_LEVEL_NINJASK,
-    EVO_LEVEL_SHEDINJA,
-    EVO_BEAUTY,
-    EVO_STONE_MALE,
-    EVO_STONE_FEMALE,
-    EVO_ITEM_DAY,
-    EVO_ITEM_NIGHT,
-    EVO_HAS_MOVE,
-    EVO_OTHER_PARTY_MON,
-    EVO_LEVEL_MALE,
-    EVO_LEVEL_FEMALE,
-    EVO_CORONET,
-    EVO_ETERNA,
-    EVO_ROUTE217,
-} EvoMethod;
-
 // Structs
 
 typedef struct {