Merge branch 'master' of https://github.com/pret/pokegold-spaceworld

1 files changed, 69 insertions, 69 deletions

diff --git a/home/items.asm b/home/items.asm
index dd4e8d3..332d5e1 100755
--- a/home/items.asm
+++ b/home/items.asm
@@ -1,69 +1,69 @@
-INCLUDE "constants.asm"

-

-if DEBUG

-SECTION "TossItem", ROM0[$3243]

-else

-SECTION "TossItem", ROM0[$3207]

-endc

-

-TossItem: ; 00:3243

-	ldh a, [hROMBank]

-	push af

-	ld a, BANK(_TossItem)

-	call Bankswitch

-	push hl

-	push de

-	push bc

-	call _TossItem

-	pop bc

-	pop de

-	pop hl

-	pop af

-	call Bankswitch

-	ret

-

-ReceiveItem:: ; 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)

-; [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(_ReceiveItem)

-	call Bankswitch

-	push hl

-	push de

-	call _ReceiveItem

-	pop de

-	pop hl

-	pop bc

-	ld a, b

-	call Bankswitch

-	pop bc

-	ret

-

-if DEBUG

-SECTION "GiveItem", ROM0[$366C]

-else

-SECTION "GiveItem", ROM0[$3630]

-endc

-

-GiveItem::

-; Give player quantity c of item b,

-; and copy the item's name to wcf4b.

-; Return carry on success.

-	ld a, b

-	ld [wNamedObjectIndexBuffer], a

-	ld [wCurItem], a

-	ld a, c

-	ld [wItemQuantity], a

-	ld hl, wNumBagItems

-	call ReceiveItem

-	ret nc

-	call GetItemName

-	call CopyStringToStringBuffer2

-	scf

-	ret

+INCLUDE "constants.asm"
+
+if DEBUG
+SECTION "TossItem", ROM0[$3243]
+else
+SECTION "TossItem", ROM0[$3207]
+endc
+
+TossItem: ; 00:3243
+	ldh a, [hROMBank]
+	push af
+	ld a, BANK(_TossItem)
+	call Bankswitch
+	push hl
+	push de
+	push bc
+	call _TossItem
+	pop bc
+	pop de
+	pop hl
+	pop af
+	call Bankswitch
+	ret
+
+ReceiveItem:: ; 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)
+; [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(_ReceiveItem)
+	call Bankswitch
+	push hl
+	push de
+	call _ReceiveItem
+	pop de
+	pop hl
+	pop bc
+	ld a, b
+	call Bankswitch
+	pop bc
+	ret
+
+if DEBUG
+SECTION "GiveItem", ROM0[$366C]
+else
+SECTION "GiveItem", ROM0[$3630]
+endc
+
+GiveItem::
+; Give player quantity c of item b,
+; and copy the item's name to wcf4b.
+; Return carry on success.
+	ld a, b
+	ld [wNamedObjectIndexBuffer], a
+	ld [wCurItem], a
+	ld a, c
+	ld [wItemQuantity], a
+	ld hl, wNumBagItems
+	call ReceiveItem
+	ret nc
+	call GetItemName
+	call CopyStringToStringBuffer2
+	scf
+	ret