Skip to content

Commit b22625b

Browse files
Merge pull request ShiraTheMogul#35 from jojo-kep/master
Fix volcano softlock and TMHM learning crash
2 parents 573f908 + ebd9b99 commit b22625b

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

‎home/names.asm‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ GetItemName::
2929
; starting at wcd6d
3030
push hl
3131
push bc
32+
33+
;If you are going to make GetName check for wNameListType=ITEM_NAME,
34+
;then you have to make sure wNameListType get the proper value here.
35+
;Otherwise the game can crash when trying to learn TMHM items one after the other.
36+
;Specifically if only TMHM items are in the current list view. - jojo
37+
ld a, ITEM_NAME
38+
ld [wNameListType], a
39+
3240
ld a, [wd11e]
3341
cp HM01 ; is this a TM/HM?
3442
jr nc, .Machine

‎maps/CinnabarVolcano.blk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvvvvvvvvvvv45vvvvvvvv+,vvvv8-888vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN
1+
..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvvvvvvvvvvv45vvvvvvvv+7,vvvv8-588vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN

0 commit comments

Comments
 (0)