improve TM/HM constants and add macro for TM/HM learnsets

2026-08-22 18:34:27 -05:00 · 2018-01-14 13:41:50 -06:00
parent 3e2f01c1ea
commit 58b71865c9
47 changed files with 9639 additions and 680 deletions
--- a/data/item_ball_scripts.inc
+++ b/data/item_ball_scripts.inc
@@ -43,7 +43,7 @@ Route110_EventScript_1B14BB:: @ 81B14BB
 	end

 Route111_EventScript_1B14C8:: @ 81B14C8
-	giveitem_std ITEM_TM37, 1, 1
+	giveitem_std ITEM_TM37_SANDSTORM, 1, 1
 	end

 Route111_EventScript_1B14D5:: @ 81B14D5
@@ -79,7 +79,7 @@ Route115_EventScript_1B1530:: @ 81B1530
 	end

 Route115_EventScript_1B153D:: @ 81B153D
-	giveitem_std ITEM_TM01, 1, 1
+	giveitem_std ITEM_TM01_FOCUS_PUNCH, 1, 1
 	end

 Route115_EventScript_1B154A:: @ 81B154A
@@ -291,11 +291,11 @@ FieryPath_EventScript_1B17E1:: @ 81B17E1
 	end

 FieryPath_EventScript_1B17EE:: @ 81B17EE
-	giveitem_std ITEM_TM06, 1, 1
+	giveitem_std ITEM_TM06_TOXIC, 1, 1
 	end

 MeteorFalls_1F_1R_EventScript_1B17FB:: @ 81B17FB
-	giveitem_std ITEM_TM23, 1, 1
+	giveitem_std ITEM_TM23_IRON_TAIL, 1, 1
 	end

 MeteorFalls_1F_1R_EventScript_1B1808:: @ 81B1808
@@ -311,7 +311,7 @@ MeteorFalls_1F_1R_EventScript_1B1822:: @ 81B1822
 	end

 MeteorFalls_B1F_2R_EventScript_1B182F:: @ 81B182F
-	giveitem_std ITEM_TM02, 1, 1
+	giveitem_std ITEM_TM02_DRAGON_CLAW, 1, 1
 	end

 NewMauville_Inside_EventScript_1B183C:: @ 81B183C
@@ -347,7 +347,7 @@ AbandonedShip_Rooms2_B1F_EventScript_1B1897:: @ 81B1897
 	end

 AbandonedShip_Room_B1F_EventScript_1B18A4:: @ 81B18A4
-	giveitem_std ITEM_TM13, 1, 1
+	giveitem_std ITEM_TM13_ICE_BEAM, 1, 1
 	end

 AbandonedShip_Rooms2_1F_EventScript_1B18B1:: @ 81B18B1
@@ -371,15 +371,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_1B18E5:: @ 81B18E5
 	end

 AbandonedShip_HiddenFloorRooms_EventScript_1B18F2:: @ 81B18F2
-	giveitem_std ITEM_TM18, 1, 1
+	giveitem_std ITEM_TM18_RAIN_DANCE, 1, 1
 	end

 ScorchedSlab_EventScript_1B18FF:: @ 81B18FF
-	giveitem_std ITEM_TM11, 1, 1
+	giveitem_std ITEM_TM11_SUNNY_DAY, 1, 1
 	end

 SafariZone_Northwest_EventScript_1B190C:: @ 81B190C
-	giveitem_std ITEM_TM22, 1, 1
+	giveitem_std ITEM_TM22_SOLARBEAM, 1, 1
 	end

 SafariZone_Northeast_EventScript_1B1919:: @ 81B1919
@@ -407,7 +407,7 @@ MtPyre_5F_EventScript_1B195A:: @ 81B195A
 	end

 MtPyre_6F_EventScript_1B1967:: @ 81B1967
-	giveitem_std ITEM_TM30, 1, 1
+	giveitem_std ITEM_TM30_SHADOW_BALL, 1, 1
 	end

 MtPyre_Exterior_EventScript_1B1974:: @ 81B1974
@@ -415,7 +415,7 @@ MtPyre_Exterior_EventScript_1B1974:: @ 81B1974
 	end

 MtPyre_Exterior_EventScript_1B1981:: @ 81B1981
-	giveitem_std ITEM_TM48, 1, 1
+	giveitem_std ITEM_TM48_SKILL_SWAP, 1, 1
 	end

 AquaHideout_B1F_EventScript_1B198E:: @ 81B198E
@@ -463,7 +463,7 @@ ShoalCave_LowTideStairsRoom_EventScript_1B1A10:: @ 81B1A10
 	end

 ShoalCave_LowTideIceRoom_EventScript_1B1A1D:: @ 81B1A1D
-	giveitem_std ITEM_TM07, 1, 1
+	giveitem_std ITEM_TM07_HAIL, 1, 1
 	end

 ShoalCave_LowTideIceRoom_EventScript_1B1A2A:: @ 81B1A2A
@@ -471,11 +471,11 @@ ShoalCave_LowTideIceRoom_EventScript_1B1A2A:: @ 81B1A2A
 	end

 SeafloorCavern_Room9_EventScript_1B1A37:: @ 81B1A37
-	giveitem_std ITEM_TM26, 1, 1
+	giveitem_std ITEM_TM26_EARTHQUAKE, 1, 1
 	end

 CaveOfOrigin_B3F_EventScript_1B1A44:: @ 81B1A44
-	giveitem_std ITEM_HM07, 1, 1
+	giveitem_std ITEM_HM07_WATERFALL, 1, 1
 	end

 Route110_TrickHousePuzzle1_EventScript_1B1A51:: @ 81B1A51
@@ -523,7 +523,7 @@ VictoryRoad_1F_EventScript_1B1AD3:: @ 81B1AD3
 	end

 VictoryRoad_B1F_EventScript_1B1AE0:: @ 81B1AE0
-	giveitem_std ITEM_TM29, 1, 1
+	giveitem_std ITEM_TM29_PSYCHIC, 1, 1
 	end

 VictoryRoad_B1F_EventScript_1B1AED:: @ 81B1AED
@@ -535,5 +535,5 @@ VictoryRoad_B2F_EventScript_1B1AFA:: @ 81B1AFA
 	end

@ 81B1B07
-	giveitem_std ITEM_HM08, 1, 1
+	giveitem_std ITEM_HM08_DIVE, 1, 1
 	end
--- a/data/maps/events/Route113.inc
+++ b/data/maps/events/Route113.inc
@@ -42,7 +42,7 @@ Route113_MapBGEvents:: @ 8382BE0
 	bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629
 	bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3
 	bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3
-	bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_1E
+	bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E

 Route113_MapEvents:: @ 8382C34
 	map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/scripts/maps/DewfordTown_Gym.inc
@@ -118,7 +118,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177
 	end

 DewfordTown_Gym_EventScript_1531B5:: @ 81531B5
-	giveitem_std ITEM_TM08
+	giveitem_std ITEM_TM08_BULK_UP
 	compare RESULT, 0
 	goto_if_eq DewfordTown_Gym_EventScript_1A029B
 	msgbox DewfordTown_Gym_Text_1753BF, 4
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ b/data/scripts/maps/DewfordTown_Hall.inc
@@ -254,7 +254,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D
 	call DewfordTown_Hall_EventScript_1A0102
 	goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1
 	msgbox DewfordTown_Hall_Text_175E13, 4
-	giveitem_std ITEM_TM36
+	giveitem_std ITEM_TM36_SLUDGE_BOMB
 	compare RESULT, 0
 	goto_if_eq DewfordTown_Hall_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM36
--- a/data/scripts/maps/FallarborTown_House1.inc
+++ b/data/scripts/maps/FallarborTown_House1.inc
@@ -22,7 +22,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA
 	compare RESULT, NO
 	goto_if_eq FallarborTown_House1_EventScript_153C47
 	msgbox FallarborTown_House1_Text_1778C4, 4
-	giveitem_std ITEM_TM27
+	giveitem_std ITEM_TM27_RETURN
 	compare RESULT, 0
 	goto_if_eq FallarborTown_House1_EventScript_1A029B
 	setvar VAR_SPECIAL_4, 280
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/scripts/maps/FortreeCity_Gym.inc
@@ -35,7 +35,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15
 	end

 FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E
-	giveitem_std ITEM_TM40
+	giveitem_std ITEM_TM40_AERIAL_ACE
 	compare RESULT, 0
 	goto_if_eq FortreeCity_Gym_EventScript_1A029B
 	msgbox FortreeCity_Gym_Text_185F4A, 4
--- a/data/scripts/maps/FortreeCity_House2.inc
+++ b/data/scripts/maps/FortreeCity_House2.inc
@@ -19,7 +19,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4
 	switch RESULT
 	case 0, FortreeCity_House2_EventScript_158161
 	msgbox FortreeCity_House2_Text_1864C6, 4
-	giveitem_std ITEM_TM10
+	giveitem_std ITEM_TM10_HIDDEN_POWER
 	compare RESULT, 0
 	goto_if_eq FortreeCity_House2_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM10
--- a/data/scripts/maps/GraniteCave_1F.inc
+++ b/data/scripts/maps/GraniteCave_1F.inc
@@ -6,7 +6,7 @@ GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_15CBD3
 	msgbox GraniteCave_1F_Text_194917, 4
-	giveitem_std ITEM_HM05
+	giveitem_std ITEM_HM05_FLASH
 	setflag FLAG_RECEIVED_HM05
 	msgbox GraniteCave_1F_Text_194A3E, 4
 	release
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ b/data/scripts/maps/GraniteCave_StevensRoom.inc
@@ -9,7 +9,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA
 	call GraniteCave_StevensRoom_EventScript_1A067F
 	setflag FLAG_DELIVERED_STEVEN_LETTER
 	msgbox GraniteCave_StevensRoom_Text_194BDD, 4
-	giveitem_std ITEM_TM47
+	giveitem_std ITEM_TM47_STEEL_WING
 	compare RESULT, 0
 	call_if_eq GraniteCave_StevensRoom_EventScript_15CC83
 	msgbox GraniteCave_StevensRoom_Text_194C8D, 4
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
@@ -83,7 +83,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766
 	end

 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7
-	giveitem_std ITEM_TM50
+	giveitem_std ITEM_TM50_OVERHEAT
 	compare RESULT, 0
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B
 	msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
@@ -25,10 +25,10 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A019:: @ 815A019

 	.align 2
 LilycoveCity_DepartmentStore_4F_Items1:: @ 815A030
-	.2byte ITEM_TM38
-	.2byte ITEM_TM25
-	.2byte ITEM_TM14
-	.2byte ITEM_TM15
+	.2byte ITEM_TM38_FIRE_BLAST
+	.2byte ITEM_TM25_THUNDER
+	.2byte ITEM_TM14_BLIZZARD
+	.2byte ITEM_TM15_HYPER_BEAM
 	.2byte ITEM_NONE
 	release
 	end
@@ -45,10 +45,10 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A03C:: @ 815A03C

 	.align 2
 LilycoveCity_DepartmentStore_4F_Items2:: @ 815A054
-	.2byte ITEM_TM17
-	.2byte ITEM_TM20
-	.2byte ITEM_TM33
-	.2byte ITEM_TM16
+	.2byte ITEM_TM17_PROTECT
+	.2byte ITEM_TM20_SAFEGUARD
+	.2byte ITEM_TM33_REFLECT
+	.2byte ITEM_TM16_LIGHT_SCREEN
 	.2byte ITEM_NONE
 	release
 	end
--- a/data/scripts/maps/LilycoveCity_House2.inc
+++ b/data/scripts/maps/LilycoveCity_House2.inc
@@ -6,7 +6,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA
 	msgbox LilycoveCity_House2_Text_18B83C, 4
-	giveitem_std ITEM_TM44
+	giveitem_std ITEM_TM44_REST
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_House2_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM44
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -298,7 +298,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332

 MauvilleCity_EventScript_14C33C:: @ 814C33C
 	msgbox MauvilleCity_Text_1663EB, 4
-	giveitem_std ITEM_TM24
+	giveitem_std ITEM_TM24_THUNDERBOLT
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM24
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/scripts/maps/MauvilleCity_GameCorner.inc
@@ -252,27 +252,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54

 MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6
 	setvar VAR_TEMP_1, 1
-	bufferitemname 0, ITEM_TM32
+	bufferitemname 0, ITEM_TM32_DOUBLE_TEAM
 	goto MauvilleCity_GameCorner_EventScript_156DEC

 MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4
 	setvar VAR_TEMP_1, 2
-	bufferitemname 0, ITEM_TM29
+	bufferitemname 0, ITEM_TM29_PSYCHIC
 	goto MauvilleCity_GameCorner_EventScript_156DEC

 MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2
 	setvar VAR_TEMP_1, 3
-	bufferitemname 0, ITEM_TM35
+	bufferitemname 0, ITEM_TM35_FLAMETHROWER
 	goto MauvilleCity_GameCorner_EventScript_156DEC

 MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0
 	setvar VAR_TEMP_1, 4
-	bufferitemname 0, ITEM_TM24
+	bufferitemname 0, ITEM_TM24_THUNDERBOLT
 	goto MauvilleCity_GameCorner_EventScript_156DEC

 MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE
 	setvar VAR_TEMP_1, 5
-	bufferitemname 0, ITEM_TM13
+	bufferitemname 0, ITEM_TM13_ICE_BEAM
 	goto MauvilleCity_GameCorner_EventScript_156DEC

 MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC
@@ -291,11 +291,11 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 1500
 	goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E
-	checkitemspace ITEM_TM32, 1
+	checkitemspace ITEM_TM32_DOUBLE_TEAM, 1
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
 	takecoins 1500
-	giveitem ITEM_TM32, 1
+	giveitem ITEM_TM32_DOUBLE_TEAM, 1
 	updatecoinsbox 0, 0
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_181F08, 4
@@ -306,11 +306,11 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 3500
 	goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E
-	checkitemspace ITEM_TM29, 1
+	checkitemspace ITEM_TM29_PSYCHIC, 1
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
 	takecoins 3500
-	giveitem ITEM_TM29, 1
+	giveitem ITEM_TM29_PSYCHIC, 1
 	updatecoinsbox 0, 0
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_181F08, 4
@@ -321,11 +321,11 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 4000
 	goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E
-	checkitemspace ITEM_TM35, 1
+	checkitemspace ITEM_TM35_FLAMETHROWER, 1
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
 	takecoins 4000
-	giveitem ITEM_TM35, 1
+	giveitem ITEM_TM35_FLAMETHROWER, 1
 	updatecoinsbox 0, 0
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_181F08, 4
@@ -336,11 +336,11 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 4000
 	goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E
-	checkitemspace ITEM_TM24, 1
+	checkitemspace ITEM_TM24_THUNDERBOLT, 1
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
 	takecoins 4000
-	giveitem ITEM_TM24, 1
+	giveitem ITEM_TM24_THUNDERBOLT, 1
 	updatecoinsbox 0, 0
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_181F08, 4
@@ -351,11 +351,11 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, 4000
 	goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E
-	checkitemspace ITEM_TM13, 1
+	checkitemspace ITEM_TM13_ICE_BEAM, 1
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
 	takecoins 4000
-	giveitem ITEM_TM13, 1
+	giveitem ITEM_TM13_ICE_BEAM, 1
 	updatecoinsbox 0, 0
 	playse SE_REGI
 	msgbox MauvilleCity_GameCorner_Text_181F08, 4
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/scripts/maps/MauvilleCity_Gym.inc
@@ -93,7 +93,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
 	end

 MauvilleCity_Gym_EventScript_15661D:: @ 815661D
-	giveitem_std ITEM_TM34
+	giveitem_std ITEM_TM34_SHOCK_WAVE
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_Gym_EventScript_1A029B
 	msgbox MauvilleCity_Gym_Text_180E76, 4
--- a/data/scripts/maps/MauvilleCity_House1.inc
+++ b/data/scripts/maps/MauvilleCity_House1.inc
@@ -6,7 +6,7 @@ MauvilleCity_House1_EventScript_1569FD:: @ 81569FD
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_156A29
 	msgbox MauvilleCity_House1_Text_181B1A, 4
-	giveitem_std ITEM_HM06
+	giveitem_std ITEM_HM06_ROCK_SMASH
 	setflag FLAG_RECEIVED_HM06
 	msgbox MauvilleCity_House1_Text_181B64, 4
 	release
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
@@ -67,7 +67,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594
 	end

 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6
-	giveitem_std ITEM_TM04
+	giveitem_std ITEM_TM04_CALM_MIND
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_Gym_EventScript_1A029B
 	msgbox MossdeepCity_Gym_Text_18D1CF, 4
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc
@@ -38,7 +38,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B
 	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E
 	waitmovement 0
 	msgbox MossdeepCity_StevensHouse_Text_18DA77, 4
-	giveitem_std ITEM_HM08
+	giveitem_std ITEM_HM08_DIVE
 	setflag FLAG_RECEIVED_HM08
 	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
 	msgbox MossdeepCity_StevensHouse_Text_18DB22, 4
@@ -123,6 +123,6 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16
 	end

 MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20
-	giveitem_std ITEM_HM08, 1, 1
+	giveitem_std ITEM_HM08_DIVE, 1, 1
 	setflag FLAG_RECEIVED_HM08
 	end
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/scripts/maps/PacifidlogTown_House2.inc
@@ -41,7 +41,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8

 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC
 	msgbox PacifidlogTown_House2_Text_179169, 4
-	giveitem_std ITEM_TM27
+	giveitem_std ITEM_TM27_RETURN
 	compare RESULT, 0
 	goto_if_eq PacifidlogTown_House2_EventScript_1A029B
 	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
@@ -57,7 +57,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B

 PacifidlogTown_House2_EventScript_154225:: @ 8154225
 	msgbox PacifidlogTown_House2_Text_17922D, 4
-	giveitem_std ITEM_TM21
+	giveitem_std ITEM_TM21_FRUSTRATION
 	compare RESULT, 0
 	goto_if_eq PacifidlogTown_House2_EventScript_1A029B
 	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -402,7 +402,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
 	end

 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C
-	giveitem_std ITEM_TM42
+	giveitem_std ITEM_TM42_FACADE
 	compare RESULT, 0
 	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM42
--- a/data/scripts/maps/PetalburgCity_WallysHouse.inc
+++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc
@@ -20,7 +20,7 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7

 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406
 	msgbox PetalburgCity_WallysHouse_Text_179996, 4
-	giveitem_std ITEM_HM03
+	giveitem_std ITEM_HM03_SURF
 	setflag FLAG_RECEIVED_HM03
 	msgbox PetalburgCity_WallysHouse_Text_179B14, 4
 	release
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -102,7 +102,7 @@ Route104_EventScript_14EF93:: @ 814EF93
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2
 	msgbox Route104_Text_16DC5F, 4
-	giveitem_std ITEM_TM09
+	giveitem_std ITEM_TM09_BULLET_SEED
 	compare RESULT, 0
 	goto_if_eq Route104_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM09
--- a/data/scripts/maps/Route110_TrickHouseEnd.inc
+++ b/data/scripts/maps/Route110_TrickHouseEnd.inc
@@ -112,7 +112,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB
 	msgbox Route110_TrickHouseEnd_Text_19C491, 4
 	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_TM12
+	giveitem_std ITEM_TM12_TAUNT
 	compare RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -401,7 +401,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452
 	end

 Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E
-	giveitem_std ITEM_TM12
+	giveitem_std ITEM_TM12_TAUNT
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare RESULT, 0
--- a/data/scripts/maps/Route114.inc
+++ b/data/scripts/maps/Route114.inc
@@ -28,7 +28,7 @@ Route114_EventScript_150782:: @ 8150782
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9
 	msgbox Route114_Text_170154, 4
-	giveitem_std ITEM_TM05
+	giveitem_std ITEM_TM05_ROAR
 	compare RESULT, 0
 	goto_if_eq Route114_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM05
--- a/data/scripts/maps/Route114_FossilManiacsHouse.inc
+++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc
@@ -11,7 +11,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_15C1F2
 	msgbox Route114_FossilManiacsHouse_Text_1925E1, 4
-	giveitem_std ITEM_TM28
+	giveitem_std ITEM_TM28_DIG
 	compare RESULT, 0
 	goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM28
--- a/data/scripts/maps/Route119.inc
+++ b/data/scripts/maps/Route119.inc
@@ -147,7 +147,7 @@ Route119_EventScript_151337:: @ 8151337
 	end

 Route119_EventScript_151352:: @ 8151352
-	giveitem_std ITEM_HM02
+	giveitem_std ITEM_HM02_FLY
 	setflag FLAG_RECEIVED_HM02
 	return

--- a/data/scripts/maps/Route123.inc
+++ b/data/scripts/maps/Route123.inc
@@ -15,7 +15,7 @@ Route123_EventScript_151C5D:: @ 8151C5D
 	compare RESULT, 0
 	goto_if_eq Route123_EventScript_151CAA
 	msgbox Route123_Text_171DC2, 4
-	giveitem_std ITEM_TM19
+	giveitem_std ITEM_TM19_GIGA_DRAIN
 	compare RESULT, 0
 	goto_if_eq Route123_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM19
--- a/data/scripts/maps/RustboroCity_CuttersHouse.inc
+++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc
@@ -6,7 +6,7 @@ RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53
 	msgbox RustboroCity_CuttersHouse_Text_18509C, 4
-	giveitem_std ITEM_HM01
+	giveitem_std ITEM_HM01_CUT
 	setflag FLAG_RECEIVED_HM01
 	msgbox RustboroCity_CuttersHouse_Text_1851C9, 4
 	release
--- a/data/scripts/maps/RustboroCity_Gym.inc
+++ b/data/scripts/maps/RustboroCity_Gym.inc
@@ -25,7 +25,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE
 	end

 RustboroCity_Gym_EventScript_15793C:: @ 815793C
-	giveitem_std ITEM_TM39
+	giveitem_std ITEM_TM39_ROCK_TOMB
 	compare RESULT, 0
 	goto_if_eq RustboroCity_Gym_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM39
--- a/data/scripts/maps/RusturfTunnel.inc
+++ b/data/scripts/maps/RusturfTunnel.inc
@@ -63,7 +63,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
 	call_if_eq RusturfTunnel_EventScript_15C8EB
 	compare VAR_TEMP_1, 3
 	call_if_eq RusturfTunnel_EventScript_15C8EB
-	giveitem_std ITEM_HM04
+	giveitem_std ITEM_HM04_STRENGTH
 	setflag FLAG_RECEIVED_HM04
 	msgbox RusturfTunnel_Text_194693, 4
 	closemessage
--- a/data/scripts/maps/SSTidalRooms.inc
+++ b/data/scripts/maps/SSTidalRooms.inc
@@ -6,7 +6,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D
 	msgbox SSTidalRooms_Text_199B65, 4
-	giveitem_std ITEM_TM49
+	giveitem_std ITEM_TM49_SNATCH
 	compare RESULT, 0
 	goto_if_eq SSTidalRooms_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM49
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -473,8 +473,8 @@ SlateportCity_EventScript_14BE9A:: @ 814BE9A

 	.align 2
 SlateportCity_Items2:: @ 814BEB4
-	.2byte ITEM_TM10
-	.2byte ITEM_TM43
+	.2byte ITEM_TM10_HIDDEN_POWER
+	.2byte ITEM_TM43_SECRET_POWER
 	.2byte ITEM_NONE
 	release
 	end
--- a/data/scripts/maps/SlateportCity_ContestHall.inc
+++ b/data/scripts/maps/SlateportCity_ContestHall.inc
@@ -14,7 +14,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM41, SlateportCity_ContestHall_EventScript_155595
 	msgbox SlateportCity_ContestHall_Text_17CCE2, 4
-	giveitem_std ITEM_TM41
+	giveitem_std ITEM_TM41_TORMENT
 	compare RESULT, 0
 	goto_if_eq SlateportCity_ContestHall_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM41
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
@@ -163,7 +163,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A
 	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4
-	giveitem_std ITEM_TM46
+	giveitem_std ITEM_TM46_THIEF
 	compare RESULT, 0
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2
 	setflag FLAG_RECEIVED_TM46
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
@@ -106,7 +106,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D
 	end

 SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056
-	giveitem_std ITEM_TM03
+	giveitem_std ITEM_TM03_WATER_PULSE
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B
 	msgbox SootopolisCity_Gym_1F_Text_18F466, 4
--- a/data/scripts/maps/SootopolisCity_House1.inc
+++ b/data/scripts/maps/SootopolisCity_House1.inc
@@ -6,7 +6,7 @@ SootopolisCity_House1_EventScript_15B29B:: @ 815B29B
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_15B2C7
 	msgbox SootopolisCity_House1_Text_18F991, 4
-	giveitem_std ITEM_TM31
+	giveitem_std ITEM_TM31_BRICK_BREAK
 	setflag FLAG_RECEIVED_TM31
 	msgbox SootopolisCity_House1_Text_18FA03, 4
 	release
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
@@ -103,7 +103,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76
 	msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4
-	giveitem_std ITEM_TM45
+	giveitem_std ITEM_TM45_ATTRACT
 	compare RESULT, 0
 	goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B
 	setflag FLAG_RECEIVED_TM45
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -9,7 +9,7 @@ Route111_EventScript_1A3858:: @ 81A3858
 	end

 Route111_EventScript_1A3877:: @ 81A3877
-	giveitem_std ITEM_TM43
+	giveitem_std ITEM_TM43_SECRET_POWER
 	compare RESULT, 0
 	goto_if_eq Route111_EventScript_1A38D9
 	msgbox Route111_Text_1A35C5, 4
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -290,64 +290,64 @@
 #define ITEM_ROOT_FOSSIL 286
 #define ITEM_CLAW_FOSSIL 287
 #define ITEM_DEVON_SCOPE 288
-#define ITEM_TM01 289
-#define ITEM_TM02 290
-#define ITEM_TM03 291
-#define ITEM_TM04 292
-#define ITEM_TM05 293
-#define ITEM_TM06 294
-#define ITEM_TM07 295
-#define ITEM_TM08 296
-#define ITEM_TM09 297
-#define ITEM_TM10 298
-#define ITEM_TM11 299
-#define ITEM_TM12 300
-#define ITEM_TM13 301
-#define ITEM_TM14 302
-#define ITEM_TM15 303
-#define ITEM_TM16 304
-#define ITEM_TM17 305
-#define ITEM_TM18 306
-#define ITEM_TM19 307
-#define ITEM_TM20 308
-#define ITEM_TM21 309
-#define ITEM_TM22 310
-#define ITEM_TM23 311
-#define ITEM_TM24 312
-#define ITEM_TM25 313
-#define ITEM_TM26 314
-#define ITEM_TM27 315
-#define ITEM_TM28 316
-#define ITEM_TM29 317
-#define ITEM_TM30 318
-#define ITEM_TM31 319
-#define ITEM_TM32 320
-#define ITEM_TM33 321
-#define ITEM_TM34 322
-#define ITEM_TM35 323
-#define ITEM_TM36 324
-#define ITEM_TM37 325
-#define ITEM_TM38 326
-#define ITEM_TM39 327
-#define ITEM_TM40 328
-#define ITEM_TM41 329
-#define ITEM_TM42 330
-#define ITEM_TM43 331
-#define ITEM_TM44 332
-#define ITEM_TM45 333
-#define ITEM_TM46 334
-#define ITEM_TM47 335
-#define ITEM_TM48 336
-#define ITEM_TM49 337
-#define ITEM_TM50 338
-#define ITEM_HM01 339
-#define ITEM_HM02 340
-#define ITEM_HM03 341
-#define ITEM_HM04 342
-#define ITEM_HM05 343
-#define ITEM_HM06 344
-#define ITEM_HM07 345
-#define ITEM_HM08 346
+#define ITEM_TM01_FOCUS_PUNCH 289
+#define ITEM_TM02_DRAGON_CLAW 290
+#define ITEM_TM03_WATER_PULSE 291
+#define ITEM_TM04_CALM_MIND 292
+#define ITEM_TM05_ROAR 293
+#define ITEM_TM06_TOXIC 294
+#define ITEM_TM07_HAIL 295
+#define ITEM_TM08_BULK_UP 296
+#define ITEM_TM09_BULLET_SEED 297
+#define ITEM_TM10_HIDDEN_POWER 298
+#define ITEM_TM11_SUNNY_DAY 299
+#define ITEM_TM12_TAUNT 300
+#define ITEM_TM13_ICE_BEAM 301
+#define ITEM_TM14_BLIZZARD 302
+#define ITEM_TM15_HYPER_BEAM 303
+#define ITEM_TM16_LIGHT_SCREEN 304
+#define ITEM_TM17_PROTECT 305
+#define ITEM_TM18_RAIN_DANCE 306
+#define ITEM_TM19_GIGA_DRAIN 307
+#define ITEM_TM20_SAFEGUARD 308
+#define ITEM_TM21_FRUSTRATION 309
+#define ITEM_TM22_SOLARBEAM 310
+#define ITEM_TM23_IRON_TAIL 311
+#define ITEM_TM24_THUNDERBOLT 312
+#define ITEM_TM25_THUNDER 313
+#define ITEM_TM26_EARTHQUAKE 314
+#define ITEM_TM27_RETURN 315
+#define ITEM_TM28_DIG 316
+#define ITEM_TM29_PSYCHIC 317
+#define ITEM_TM30_SHADOW_BALL 318
+#define ITEM_TM31_BRICK_BREAK 319
+#define ITEM_TM32_DOUBLE_TEAM 320
+#define ITEM_TM33_REFLECT 321
+#define ITEM_TM34_SHOCK_WAVE 322
+#define ITEM_TM35_FLAMETHROWER 323
+#define ITEM_TM36_SLUDGE_BOMB 324
+#define ITEM_TM37_SANDSTORM 325
+#define ITEM_TM38_FIRE_BLAST 326
+#define ITEM_TM39_ROCK_TOMB 327
+#define ITEM_TM40_AERIAL_ACE 328
+#define ITEM_TM41_TORMENT 329
+#define ITEM_TM42_FACADE 330
+#define ITEM_TM43_SECRET_POWER 331
+#define ITEM_TM44_REST 332
+#define ITEM_TM45_ATTRACT 333
+#define ITEM_TM46_THIEF 334
+#define ITEM_TM47_STEEL_WING 335
+#define ITEM_TM48_SKILL_SWAP 336
+#define ITEM_TM49_SNATCH 337
+#define ITEM_TM50_OVERHEAT 338
+#define ITEM_HM01_CUT 339
+#define ITEM_HM02_FLY 340
+#define ITEM_HM03_SURF 341
+#define ITEM_HM04_STRENGTH 342
+#define ITEM_HM05_FLASH 343
+#define ITEM_HM06_ROCK_SMASH 344
+#define ITEM_HM07_WATERFALL 345
+#define ITEM_HM08_DIVE 346
 #define ITEM_15B 347
 #define ITEM_15C 348

--- a/src/data/items_de.h
+++ b/src/data/items_de.h
@@ -4626,7 +4626,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM01"),
-        .itemId = ITEM_TM01,
+        .itemId = ITEM_TM01_FOCUS_PUNCH,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4642,7 +4642,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM02"),
-        .itemId = ITEM_TM02,
+        .itemId = ITEM_TM02_DRAGON_CLAW,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4658,7 +4658,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM03"),
-        .itemId = ITEM_TM03,
+        .itemId = ITEM_TM03_WATER_PULSE,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4674,7 +4674,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM04"),
-        .itemId = ITEM_TM04,
+        .itemId = ITEM_TM04_CALM_MIND,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4690,7 +4690,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM05"),
-        .itemId = ITEM_TM05,
+        .itemId = ITEM_TM05_ROAR,
        .price = 1000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4706,7 +4706,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM06"),
-        .itemId = ITEM_TM06,
+        .itemId = ITEM_TM06_TOXIC,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4722,7 +4722,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM07"),
-        .itemId = ITEM_TM07,
+        .itemId = ITEM_TM07_HAIL,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4738,7 +4738,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM08"),
-        .itemId = ITEM_TM08,
+        .itemId = ITEM_TM08_BULK_UP,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4754,7 +4754,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM09"),
-        .itemId = ITEM_TM09,
+        .itemId = ITEM_TM09_BULLET_SEED,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4770,7 +4770,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM10"),
-        .itemId = ITEM_TM10,
+        .itemId = ITEM_TM10_HIDDEN_POWER,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4786,7 +4786,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM11"),
-        .itemId = ITEM_TM11,
+        .itemId = ITEM_TM11_SUNNY_DAY,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4802,7 +4802,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM12"),
-        .itemId = ITEM_TM12,
+        .itemId = ITEM_TM12_TAUNT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4818,7 +4818,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM13"),
-        .itemId = ITEM_TM13,
+        .itemId = ITEM_TM13_ICE_BEAM,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4834,7 +4834,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM14"),
-        .itemId = ITEM_TM14,
+        .itemId = ITEM_TM14_BLIZZARD,
        .price = 5500,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4850,7 +4850,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM15"),
-        .itemId = ITEM_TM15,
+        .itemId = ITEM_TM15_HYPER_BEAM,
        .price = 7500,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4866,7 +4866,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM16"),
-        .itemId = ITEM_TM16,
+        .itemId = ITEM_TM16_LIGHT_SCREEN,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4882,7 +4882,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM17"),
-        .itemId = ITEM_TM17,
+        .itemId = ITEM_TM17_PROTECT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4898,7 +4898,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM18"),
-        .itemId = ITEM_TM18,
+        .itemId = ITEM_TM18_RAIN_DANCE,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4914,7 +4914,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM19"),
-        .itemId = ITEM_TM19,
+        .itemId = ITEM_TM19_GIGA_DRAIN,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4930,7 +4930,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM20"),
-        .itemId = ITEM_TM20,
+        .itemId = ITEM_TM20_SAFEGUARD,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4946,7 +4946,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM21"),
-        .itemId = ITEM_TM21,
+        .itemId = ITEM_TM21_FRUSTRATION,
        .price = 1000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4962,7 +4962,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM22"),
-        .itemId = ITEM_TM22,
+        .itemId = ITEM_TM22_SOLARBEAM,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4978,7 +4978,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM23"),
-        .itemId = ITEM_TM23,
+        .itemId = ITEM_TM23_IRON_TAIL,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4994,7 +4994,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM24"),
-        .itemId = ITEM_TM24,
+        .itemId = ITEM_TM24_THUNDERBOLT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5010,7 +5010,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM25"),
-        .itemId = ITEM_TM25,
+        .itemId = ITEM_TM25_THUNDER,
        .price = 5500,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5026,7 +5026,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM26"),
-        .itemId = ITEM_TM26,
+        .itemId = ITEM_TM26_EARTHQUAKE,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5042,7 +5042,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM27"),
-        .itemId = ITEM_TM27,
+        .itemId = ITEM_TM27_RETURN,
        .price = 1000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5058,7 +5058,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM28"),
-        .itemId = ITEM_TM28,
+        .itemId = ITEM_TM28_DIG,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5074,7 +5074,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM29"),
-        .itemId = ITEM_TM29,
+        .itemId = ITEM_TM29_PSYCHIC,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5090,7 +5090,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM30"),
-        .itemId = ITEM_TM30,
+        .itemId = ITEM_TM30_SHADOW_BALL,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5106,7 +5106,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM31"),
-        .itemId = ITEM_TM31,
+        .itemId = ITEM_TM31_BRICK_BREAK,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5122,7 +5122,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM32"),
-        .itemId = ITEM_TM32,
+        .itemId = ITEM_TM32_DOUBLE_TEAM,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5138,7 +5138,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM33"),
-        .itemId = ITEM_TM33,
+        .itemId = ITEM_TM33_REFLECT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5154,7 +5154,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM34"),
-        .itemId = ITEM_TM34,
+        .itemId = ITEM_TM34_SHOCK_WAVE,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5170,7 +5170,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM35"),
-        .itemId = ITEM_TM35,
+        .itemId = ITEM_TM35_FLAMETHROWER,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5186,7 +5186,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM36"),
-        .itemId = ITEM_TM36,
+        .itemId = ITEM_TM36_SLUDGE_BOMB,
        .price = 1000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5202,7 +5202,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM37"),
-        .itemId = ITEM_TM37,
+        .itemId = ITEM_TM37_SANDSTORM,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5218,7 +5218,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM38"),
-        .itemId = ITEM_TM38,
+        .itemId = ITEM_TM38_FIRE_BLAST,
        .price = 5500,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5234,7 +5234,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM39"),
-        .itemId = ITEM_TM39,
+        .itemId = ITEM_TM39_ROCK_TOMB,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5250,7 +5250,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM40"),
-        .itemId = ITEM_TM40,
+        .itemId = ITEM_TM40_AERIAL_ACE,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5266,7 +5266,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM41"),
-        .itemId = ITEM_TM41,
+        .itemId = ITEM_TM41_TORMENT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5282,7 +5282,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM42"),
-        .itemId = ITEM_TM42,
+        .itemId = ITEM_TM42_FACADE,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5298,7 +5298,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM43"),
-        .itemId = ITEM_TM43,
+        .itemId = ITEM_TM43_SECRET_POWER,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5314,7 +5314,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM44"),
-        .itemId = ITEM_TM44,
+        .itemId = ITEM_TM44_REST,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5330,7 +5330,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM45"),
-        .itemId = ITEM_TM45,
+        .itemId = ITEM_TM45_ATTRACT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5346,7 +5346,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM46"),
-        .itemId = ITEM_TM46,
+        .itemId = ITEM_TM46_THIEF,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5362,7 +5362,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM47"),
-        .itemId = ITEM_TM47,
+        .itemId = ITEM_TM47_STEEL_WING,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5378,7 +5378,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM48"),
-        .itemId = ITEM_TM48,
+        .itemId = ITEM_TM48_SKILL_SWAP,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5394,7 +5394,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM49"),
-        .itemId = ITEM_TM49,
+        .itemId = ITEM_TM49_SNATCH,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5410,7 +5410,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM50"),
-        .itemId = ITEM_TM50,
+        .itemId = ITEM_TM50_OVERHEAT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5442,7 +5442,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("VM02"),
-        .itemId = ITEM_HM02,
+        .itemId = ITEM_HM02_FLY,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5458,7 +5458,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("VM03"),
-        .itemId = ITEM_HM03,
+        .itemId = ITEM_HM03_SURF,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5474,7 +5474,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("VM04"),
-        .itemId = ITEM_HM04,
+        .itemId = ITEM_HM04_STRENGTH,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5490,7 +5490,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("VM05"),
-        .itemId = ITEM_HM05,
+        .itemId = ITEM_HM05_FLASH,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5506,7 +5506,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("VM06"),
-        .itemId = ITEM_HM06,
+        .itemId = ITEM_HM06_ROCK_SMASH,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5522,7 +5522,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("VM07"),
-        .itemId = ITEM_HM07,
+        .itemId = ITEM_HM07_WATERFALL,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5538,7 +5538,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("VM08"),
-        .itemId = ITEM_HM08,
+        .itemId = ITEM_HM08_DIVE,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
--- a/src/data/items_en.h
+++ b/src/data/items_en.h
@@ -4626,7 +4626,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM01"),
-        .itemId = ITEM_TM01,
+        .itemId = ITEM_TM01_FOCUS_PUNCH,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4642,7 +4642,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM02"),
-        .itemId = ITEM_TM02,
+        .itemId = ITEM_TM02_DRAGON_CLAW,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4658,7 +4658,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM03"),
-        .itemId = ITEM_TM03,
+        .itemId = ITEM_TM03_WATER_PULSE,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4674,7 +4674,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM04"),
-        .itemId = ITEM_TM04,
+        .itemId = ITEM_TM04_CALM_MIND,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4690,7 +4690,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM05"),
-        .itemId = ITEM_TM05,
+        .itemId = ITEM_TM05_ROAR,
        .price = 1000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4706,7 +4706,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM06"),
-        .itemId = ITEM_TM06,
+        .itemId = ITEM_TM06_TOXIC,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4722,7 +4722,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM07"),
-        .itemId = ITEM_TM07,
+        .itemId = ITEM_TM07_HAIL,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4738,7 +4738,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM08"),
-        .itemId = ITEM_TM08,
+        .itemId = ITEM_TM08_BULK_UP,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4754,7 +4754,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM09"),
-        .itemId = ITEM_TM09,
+        .itemId = ITEM_TM09_BULLET_SEED,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4770,7 +4770,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM10"),
-        .itemId = ITEM_TM10,
+        .itemId = ITEM_TM10_HIDDEN_POWER,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4786,7 +4786,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM11"),
-        .itemId = ITEM_TM11,
+        .itemId = ITEM_TM11_SUNNY_DAY,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4802,7 +4802,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM12"),
-        .itemId = ITEM_TM12,
+        .itemId = ITEM_TM12_TAUNT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4818,7 +4818,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM13"),
-        .itemId = ITEM_TM13,
+        .itemId = ITEM_TM13_ICE_BEAM,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4834,7 +4834,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM14"),
-        .itemId = ITEM_TM14,
+        .itemId = ITEM_TM14_BLIZZARD,
        .price = 5500,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4850,7 +4850,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM15"),
-        .itemId = ITEM_TM15,
+        .itemId = ITEM_TM15_HYPER_BEAM,
        .price = 7500,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4866,7 +4866,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM16"),
-        .itemId = ITEM_TM16,
+        .itemId = ITEM_TM16_LIGHT_SCREEN,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4882,7 +4882,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM17"),
-        .itemId = ITEM_TM17,
+        .itemId = ITEM_TM17_PROTECT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4898,7 +4898,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM18"),
-        .itemId = ITEM_TM18,
+        .itemId = ITEM_TM18_RAIN_DANCE,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4914,7 +4914,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM19"),
-        .itemId = ITEM_TM19,
+        .itemId = ITEM_TM19_GIGA_DRAIN,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4930,7 +4930,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM20"),
-        .itemId = ITEM_TM20,
+        .itemId = ITEM_TM20_SAFEGUARD,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4946,7 +4946,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM21"),
-        .itemId = ITEM_TM21,
+        .itemId = ITEM_TM21_FRUSTRATION,
        .price = 1000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4962,7 +4962,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM22"),
-        .itemId = ITEM_TM22,
+        .itemId = ITEM_TM22_SOLARBEAM,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4978,7 +4978,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM23"),
-        .itemId = ITEM_TM23,
+        .itemId = ITEM_TM23_IRON_TAIL,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -4994,7 +4994,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM24"),
-        .itemId = ITEM_TM24,
+        .itemId = ITEM_TM24_THUNDERBOLT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5010,7 +5010,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM25"),
-        .itemId = ITEM_TM25,
+        .itemId = ITEM_TM25_THUNDER,
        .price = 5500,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5026,7 +5026,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM26"),
-        .itemId = ITEM_TM26,
+        .itemId = ITEM_TM26_EARTHQUAKE,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5042,7 +5042,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM27"),
-        .itemId = ITEM_TM27,
+        .itemId = ITEM_TM27_RETURN,
        .price = 1000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5058,7 +5058,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM28"),
-        .itemId = ITEM_TM28,
+        .itemId = ITEM_TM28_DIG,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5074,7 +5074,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM29"),
-        .itemId = ITEM_TM29,
+        .itemId = ITEM_TM29_PSYCHIC,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5090,7 +5090,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM30"),
-        .itemId = ITEM_TM30,
+        .itemId = ITEM_TM30_SHADOW_BALL,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5106,7 +5106,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM31"),
-        .itemId = ITEM_TM31,
+        .itemId = ITEM_TM31_BRICK_BREAK,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5122,7 +5122,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM32"),
-        .itemId = ITEM_TM32,
+        .itemId = ITEM_TM32_DOUBLE_TEAM,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5138,7 +5138,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM33"),
-        .itemId = ITEM_TM33,
+        .itemId = ITEM_TM33_REFLECT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5154,7 +5154,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM34"),
-        .itemId = ITEM_TM34,
+        .itemId = ITEM_TM34_SHOCK_WAVE,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5170,7 +5170,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM35"),
-        .itemId = ITEM_TM35,
+        .itemId = ITEM_TM35_FLAMETHROWER,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5186,7 +5186,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM36"),
-        .itemId = ITEM_TM36,
+        .itemId = ITEM_TM36_SLUDGE_BOMB,
        .price = 1000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5202,7 +5202,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM37"),
-        .itemId = ITEM_TM37,
+        .itemId = ITEM_TM37_SANDSTORM,
        .price = 2000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5218,7 +5218,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM38"),
-        .itemId = ITEM_TM38,
+        .itemId = ITEM_TM38_FIRE_BLAST,
        .price = 5500,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5234,7 +5234,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM39"),
-        .itemId = ITEM_TM39,
+        .itemId = ITEM_TM39_ROCK_TOMB,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5250,7 +5250,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM40"),
-        .itemId = ITEM_TM40,
+        .itemId = ITEM_TM40_AERIAL_ACE,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5266,7 +5266,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM41"),
-        .itemId = ITEM_TM41,
+        .itemId = ITEM_TM41_TORMENT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5282,7 +5282,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM42"),
-        .itemId = ITEM_TM42,
+        .itemId = ITEM_TM42_FACADE,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5298,7 +5298,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM43"),
-        .itemId = ITEM_TM43,
+        .itemId = ITEM_TM43_SECRET_POWER,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5314,7 +5314,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM44"),
-        .itemId = ITEM_TM44,
+        .itemId = ITEM_TM44_REST,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5330,7 +5330,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM45"),
-        .itemId = ITEM_TM45,
+        .itemId = ITEM_TM45_ATTRACT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5346,7 +5346,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM46"),
-        .itemId = ITEM_TM46,
+        .itemId = ITEM_TM46_THIEF,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5362,7 +5362,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM47"),
-        .itemId = ITEM_TM47,
+        .itemId = ITEM_TM47_STEEL_WING,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5378,7 +5378,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM48"),
-        .itemId = ITEM_TM48,
+        .itemId = ITEM_TM48_SKILL_SWAP,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5394,7 +5394,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM49"),
-        .itemId = ITEM_TM49,
+        .itemId = ITEM_TM49_SNATCH,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5410,7 +5410,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("TM50"),
-        .itemId = ITEM_TM50,
+        .itemId = ITEM_TM50_OVERHEAT,
        .price = 3000,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5426,7 +5426,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("HM01"),
-        .itemId = ITEM_HM01,
+        .itemId = ITEM_HM01_CUT,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5442,7 +5442,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("HM02"),
-        .itemId = ITEM_HM02,
+        .itemId = ITEM_HM02_FLY,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5458,7 +5458,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("HM03"),
-        .itemId = ITEM_HM03,
+        .itemId = ITEM_HM03_SURF,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5474,7 +5474,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("HM04"),
-        .itemId = ITEM_HM04,
+        .itemId = ITEM_HM04_STRENGTH,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5490,7 +5490,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("HM05"),
-        .itemId = ITEM_HM05,
+        .itemId = ITEM_HM05_FLASH,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5506,7 +5506,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("HM06"),
-        .itemId = ITEM_HM06,
+        .itemId = ITEM_HM06_ROCK_SMASH,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5522,7 +5522,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("HM07"),
-        .itemId = ITEM_HM07,
+        .itemId = ITEM_HM07_WATERFALL,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
@@ -5538,7 +5538,7 @@ const struct Item gItems[] =
    },
    {
        .name = _("HM08"),
-        .itemId = ITEM_HM08,
+        .itemId = ITEM_HM08_DIVE,
        .price = 0,
        .holdEffect = HOLD_EFFECT_NONE,
        .holdEffectParam = 0,
--- a/src/data/pokemon/tmhm_learnsets.h
+++ b/src/data/pokemon/tmhm_learnsets.h
--- a/src/field/daycare.c
+++ b/src/field/daycare.c
@@ -557,7 +557,7 @@ void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxP
        {
            for (j = 0; j < NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES; j++)
            {
-                if (gHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01 + j) && CanMonLearnTMHM(egg, j))
+                if (gHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j))
                {
                    if (GiveMoveToMon(egg, gHatchedEggFatherMoves[i]) == 0xffff)
                        DeleteFirstMoveAndGiveMoveToMon(egg, gHatchedEggFatherMoves[i]);
--- a/src/field/item_use.c
+++ b/src/field/item_use.c
@@ -877,7 +877,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId)
 {
    Menu_EraseWindowRect(0, 0xD, 0xD, 0x14);

-    if (gSpecialVar_ItemId >= ITEM_HM01)
+    if (gSpecialVar_ItemId >= ITEM_HM01_CUT)
        DisplayItemMessageOnField(taskId, gOtherText_BootedHM, sub_80C9EE4, 1); // HM
    else
        DisplayItemMessageOnField(taskId, gOtherText_BootedTM, sub_80C9EE4, 1); // TM
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -3998,7 +3998,7 @@ void Task_ConfirmTakeHeldMail(u8 taskId)

 u16 ItemIdToBattleMoveId(u16 item)
 {
-    u16 machineNumber = item - ITEM_TM01;
+    u16 machineNumber = item - ITEM_TM01_FOCUS_PUNCH;
    return TMHMMoves[machineNumber];
 }

--- a/src/field/player_pc.c
+++ b/src/field/player_pc.c
@@ -853,7 +853,7 @@ static void ItemStorage_DrawTMHMEntry(struct ItemSlot *itemSlot, u8 var, int var
 {
    ItemStorage_DrawItemName(itemSlot, var, var2);

-    if(itemSlot->itemId < ITEM_HM01)
+    if(itemSlot->itemId < ITEM_HM01_CUT)
        ItemStorage_DrawItemQuantity(itemSlot->quantity, STR_CONV_MODE_RIGHT_ALIGN, var, 3, var2);
    else
        ItemStorage_DrawItemVoidQuantity(var); // HMs do not have a quantity.