1 files changed, 15 insertions, 76 deletions

diff --git a/engine/items/tmhm2.asm b/engine/items/tmhm2.asm
index 18218a06..eb3eb58e 100755
--- a/engine/items/tmhm2.asm
+++ b/engine/items/tmhm2.asm
@@ -1,107 +1,46 @@
-CanLearnTMHMMove: ; 11a25 (4:5a25)
+CanLearnTMHMMove:
 	ld a, [wCurPartySpecies]
 	ld [wCurSpecies], a
 	call GetBaseData
-	ld hl, wd138
+	ld hl, wBaseTMHM
 	push hl
+
 	ld a, [wPutativeTMHMMove]
 	ld b, a
-	ld c, $0
+	ld c, 0
 	ld hl, TMHMMoves
-.asm_11a3b
+.loop
 	ld a, [hli]
 	and a
-	jr z, .asm_11a52
+	jr z, .end
 	cp b
 	jr z, .asm_11a45
 	inc c
-	jr .asm_11a3b
+	jr .loop
 
 .asm_11a45
 	pop hl
 	ld b, CHECK_FLAG
 	push de
-	ld d, $0
+	ld d, 0
 	predef SmallFarFlagAction
 	pop de
 	ret
 
-.asm_11a52
+.end
 	pop hl
-	ld c, $0
+	ld c, 0
 	ret
 
-GetTMHMMove: ; 11a56 (4:5a56)
-	ld a, [wd151]
+GetTMHMMove:
+	ld a, [wTempTMHM]
 	dec a
 	ld hl, TMHMMoves
-	ld b, $0
+	ld b, 0
 	ld c, a
 	add hl, bc
 	ld a, [hl]
-	ld [wd151], a
+	ld [wTempTMHM], a
 	ret
 
-TMHMMoves:
-	db DYNAMICPUNCH
-	db HEADBUTT
-	db CURSE
-	db ROLLOUT
-	db ROAR
-	db TOXIC
-	db ZAP_CANNON
-	db ROCK_SMASH
-	db PSYCH_UP
-	db HIDDEN_POWER
-	db SUNNY_DAY
-	db SWEET_SCENT
-	db SNORE
-	db BLIZZARD
-	db HYPER_BEAM
-	db ICY_WIND
-	db PROTECT
-	db RAIN_DANCE
-	db GIGA_DRAIN
-	db ENDURE
-	db FRUSTRATION
-	db SOLARBEAM
-	db IRON_TAIL
-	db DRAGONBREATH
-	db THUNDER
-	db EARTHQUAKE
-	db RETURN
-	db DIG
-	db PSYCHIC_M
-	db SHADOW_BALL
-	db MUD_SLAP
-	db DOUBLE_TEAM
-	db ICE_PUNCH
-	db SWAGGER
-	db SLEEP_TALK
-	db SLUDGE_BOMB
-	db SANDSTORM
-	db FIRE_BLAST
-	db SWIFT
-	db DEFENSE_CURL
-	db THUNDERPUNCH
-	db DREAM_EATER
-	db DETECT
-	db REST
-	db ATTRACT
-	db THIEF
-	db STEEL_WING
-	db FIRE_PUNCH
-	db FURY_CUTTER
-	db NIGHTMARE
-	db CUT
-	db FLY
-	db SURF
-	db STRENGTH
-	db FLASH
-	db WHIRLPOOL
-	db WATERFALL
-
-	db 0
-	db 0
-	db 0
-	db 0
+INCLUDE "data/moves/tmhm_moves.asm"