diff options
author | ehw <Knuckles500@gmail.com> | 2018-06-05 11:03:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-05 11:03:34 -0400 |
commit | a62cf40b29a814188c545e47d7534b6ea3aebcc1 (patch) | |
tree | 3db618e96e50af65d6831e4ce2540fb0435a954e /home/items.asm | |
parent | 771d125c7564a0ff1e511733114d53ad0521c3f8 (diff) | |
parent | c4c2b3cc6ede5259a1246c195a8c1d58e6d3a35d (diff) |
Merge pull request #4 from pret/master
Merge master
Diffstat (limited to 'home/items.asm')
-rwxr-xr-x | home/items.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/items.asm b/home/items.asm index 496b685..0edd72b 100755 --- a/home/items.asm +++ b/home/items.asm @@ -10,17 +10,17 @@ AddItemToInventory:: ; 3259 ; function to add an item (in varying quantities) to the player's bag or PC box
; INPUT:
; HL = address of inventory (either wNumBagItems or wNumBoxItems)
-; [wcd76] = item ID
+; [wCurItem] = item ID
; [wItemQuantity] = item quantity
; sets carry flag if successful, unsets carry flag if unsuccessful
push bc
ldh a, [hROMBank]
push af
- ld a, BANK(AddItemToInventory_)
+ ld a, BANK(_ReceiveItem)
call Bankswitch
push hl
push de
- call AddItemToInventory_
+ call _ReceiveItem
pop de
pop hl
pop bc
@@ -41,7 +41,7 @@ GiveItem:: ; Return carry on success.
ld a, b
ld [wce37], a
- ld [wcd76], a
+ ld [wCurItem], a
ld a, c
ld [wItemQuantity], a
ld hl, wNumBagItems
|