summaryrefslogtreecommitdiff
path: root/engine/menu/pc.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-12 00:54:14 -0700
committerGitHub <noreply@github.com>2016-06-12 00:54:14 -0700
commit2b2c6fefd311101c87845c8c498746dc74bd725f (patch)
tree3f917e1bf896e380cfea6d2d876ff68a4db87a57 /engine/menu/pc.asm
parenta51037eeeedb03e29d8675626018cf02750882fa (diff)
parent61ee39678695479816feff4b58baaa6953ff219f (diff)
Merge pull request #134 from YamaArashi/master
sync engine code with pokeyellow
Diffstat (limited to 'engine/menu/pc.asm')
-rwxr-xr-xengine/menu/pc.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/menu/pc.asm b/engine/menu/pc.asm
index 8ec31226..c9e2cf08 100755
--- a/engine/menu/pc.asm
+++ b/engine/menu/pc.asm
@@ -121,18 +121,18 @@ RemoveItemByID:
ld b, a
xor a
ld [hItemToRemoveIndex], a
-.asm_17f40
+.loop
ld a, [hli]
- cp $ff
+ cp -1 ; reached terminator?
ret z
cp b
- jr z, .asm_17f4f
+ jr z, .foundItem
inc hl
ld a, [hItemToRemoveIndex]
inc a
ld [hItemToRemoveIndex], a
- jr .asm_17f40
-.asm_17f4f
+ jr .loop
+.foundItem
ld a, $1
ld [wItemQuantity], a
ld a, [hItemToRemoveIndex]