summaryrefslogtreecommitdiff
path: root/asm/macros
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-12 02:35:37 -0500
committerhuderlem <huderlem@gmail.com>2019-12-14 08:41:46 -0600
commit6967caefb246f9709032049b0ae2baee71f71eb6 (patch)
tree816927ab7177f74e3c6c41461282c56a00e3766e /asm/macros
parent75b0c9d7a9edabc742bc42f19d078fa2ae64870c (diff)
Split finditem_std from giveitem_std
Diffstat (limited to 'asm/macros')
-rw-r--r--asm/macros/event.inc10
1 files changed, 8 insertions, 2 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 9db57daf1..96971b583 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1665,10 +1665,16 @@
callstd \type
.endm
- .macro giveitem_std item:req, amount=1, function=0
+ .macro giveitem_std item:req, amount=1
setorcopyvar VAR_0x8000, \item
setorcopyvar VAR_0x8001, \amount
- callstd \function
+ callstd STD_OBTAIN_ITEM
+ .endm
+
+ .macro finditem_std item:req, amount=1
+ setorcopyvar VAR_0x8000, \item
+ setorcopyvar VAR_0x8001, \amount
+ callstd STD_FIND_ITEM
.endm
.macro givedecoration_std decoration:req