Merge branch 'master' into mistress

This commit is contained in:
Thorn Avery 2024-01-09 08:29:03 +11:00
commit b418e23a88
2 changed files with 9 additions and 1 deletions

View file

@ -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

View file

@ -1 +1 @@
..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvvvvvvvvvvv45vvvvvvvv+,vvvv8-888vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN
..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvvvvvvvvvvv45vvvvvvvv+7,vvvv8-588vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN