Merge pull request #28 from FredrIQ/item_backups

ConsumeHeldItem is now a wrapper for ConsumeUserItem

engine/battle/consume_held_item.asm

@@ -2,21 +2,12 @@ ConsumeHeldItem:
 	push hl
 	push de
 	push bc
-	ldh a, [hBattleTurn]
-	and a
-	ld hl, wOTPartyMon1Item
-	ld de, wEnemyMonItem
-	ld a, [wCurOTMon]
-	jr z, .theirturn
-	ld hl, wPartyMon1Item
-	ld de, wBattleMonItem
-	ld a, [wCurBattleMon]
-
-.theirturn
+	farcall SwitchTurnCore
+	farcall GetUserItem
 	push hl
-	push af
-	ld a, [de]
-	ld b, a
+	farcall SwitchTurnCore
+	pop hl
+	ld b, [hl]
 	farcall GetItemHeldEffect
 	ld hl, ConsumableEffects
 .loop
@@ -25,29 +16,12 @@ ConsumeHeldItem:
 	jr z, .ok
 	inc a
 	jr nz, .loop
-	pop af
-	pop hl
-	pop bc
-	pop de
-	pop hl
-	ret
+	jr .done
 
 .ok
-	xor a
-	ld [de], a
-	pop af
-	pop hl
-	call GetPartyLocation
-	ldh a, [hBattleTurn]
-	and a
-	jr nz, .ourturn
-	ld a, [wBattleMode]
-	dec a
-	jr z, .done
-
-.ourturn
-	ld [hl], NO_ITEM
-
+	farcall SwitchTurnCore
+	farcall ConsumeUserItem
+	farcall SwitchTurnCore
 .done
 	pop bc
 	pop de