split item interfaces into common/item.asm

2 files changed, 77 insertions, 74 deletions

diff --git a/common/item.asm b/common/item.asm
new file mode 100644
index 000000000..0906a19f6
--- /dev/null
+++ b/common/item.asm
@@ -0,0 +1,76 @@
+DoItemEffect: ; 2f3f
+	callba _DoItemEffect
+	ret
+; 2f46
+
+CheckTossableItem: ; 2f46
+	push hl
+	push de
+	push bc
+	callba _CheckTossableItem
+	pop bc
+	pop de
+	pop hl
+	ret
+; 2f53
+
+TossItem: ; 2f53
+	push hl
+	push de
+	push bc
+	ld a, [hROMBank]
+	push af
+	ld a, BANK(_TossItem)
+	rst Bankswitch
+
+	call _TossItem
+
+	pop bc
+	ld a, b
+	rst Bankswitch
+	pop bc
+	pop de
+	pop hl
+	ret
+; 2f66
+
+ReceiveItem: ; 2f66
+	push bc
+	ld a, [hROMBank]
+	push af
+	ld a, BANK(_ReceiveItem)
+	rst Bankswitch
+	push hl
+	push de
+
+	call _ReceiveItem
+
+	pop de
+	pop hl
+	pop bc
+	ld a, b
+	rst Bankswitch
+	pop bc
+	ret
+; 2f79
+
+CheckItem: ; 2f79
+	push hl
+	push de
+	push bc
+	ld a, [hROMBank]
+	push af
+	ld a, BANK(_CheckItem)
+	rst Bankswitch
+
+	call _CheckItem
+
+	pop bc
+	ld a, b
+	rst Bankswitch
+	pop bc
+	pop de
+	pop hl
+	ret
+; 2f8c
+
diff --git a/main.asm b/main.asm
index a18461f51..b514c8fbb 100644
--- a/main.asm
+++ b/main.asm
@@ -807,81 +807,8 @@ Function2f3e: ; 2f3e
 	ret
 ; 2f3f
 
-DoItemEffect: ; 2f3f
-	callba _DoItemEffect
-	ret
-; 2f46
 
-CheckTossableItem: ; 2f46
-	push hl
-	push de
-	push bc
-	callba _CheckTossableItem
-	pop bc
-	pop de
-	pop hl
-	ret
-; 2f53
-
-TossItem: ; 2f53
-	push hl
-	push de
-	push bc
-	ld a, [hROMBank]
-	push af
-	ld a, BANK(_TossItem)
-	rst Bankswitch
-
-	call _TossItem
-
-	pop bc
-	ld a, b
-	rst Bankswitch
-	pop bc
-	pop de
-	pop hl
-	ret
-; 2f66
-
-ReceiveItem: ; 2f66
-	push bc
-	ld a, [hROMBank]
-	push af
-	ld a, BANK(_ReceiveItem)
-	rst Bankswitch
-	push hl
-	push de
-
-	call _ReceiveItem
-
-	pop de
-	pop hl
-	pop bc
-	ld a, b
-	rst Bankswitch
-	pop bc
-	ret
-; 2f79
-
-CheckItem: ; 2f79
-	push hl
-	push de
-	push bc
-	ld a, [hROMBank]
-	push af
-	ld a, BANK(_CheckItem)
-	rst Bankswitch
-
-	call _CheckItem
-
-	pop bc
-	ld a, b
-	rst Bankswitch
-	pop bc
-	pop de
-	pop hl
-	ret
-; 2f8c
+INCLUDE "common/item.asm"
 
 
 Random: ; 2f8c