diff --git a/home/names.asm b/home/names.asm
index f7751fa0..0ac39b1c 100644
--- a/home/names.asm
+++ b/home/names.asm
@@ -29,6 +29,14 @@ GetItemName::
 ;     starting at wcd6d
 	push hl
 	push bc
+	
+	;If you are going to make GetName check for wNameListType=ITEM_NAME, 
+	;then you have to make sure wNameListType get the proper value here. 
+	;Otherwise the game can crash when trying to learn TMHM items one after the other.
+	;Specifically if only TMHM items are in the current list view. - jojo
+	ld a, ITEM_NAME
+	ld [wNameListType], a
+	
 	ld a, [wd11e]
 	cp HM01 ; is this a TM/HM?
 	jr nc, .Machine
diff --git a/maps/CinnabarVolcano.blk b/maps/CinnabarVolcano.blk
index df1df773..5e27f1ed 100644
--- a/maps/CinnabarVolcano.blk
+++ b/maps/CinnabarVolcano.blk
@@ -1 +1 @@
-..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvvvvvvvvvvv45vvvvvvvv+,vvvv8-888vvNvvvvv	vvvvR}vvvv


	vvv}N}vvv
>
vv}}}}Q}}}}}}QN
\ No newline at end of file
+..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvvvvvvvvvvv45vvvvvvvv+7,vvvv8-588vvNvvvvv	vvvvR}vvvv


	vvv}N}vvv
>
vv}}}}Q}}}}}}QN
\ No newline at end of file