summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-10-23 22:18:35 -0500
committerDiegoisawesome <diego@domoreaweso.me>2017-10-23 22:18:35 -0500
commit26f9776f6fa0d74b1e89688e9c618e65b917e7f8 (patch)
treedfab3484fcf951e9bd8a4ad91df9f594fce66002
parentc23a633a44a5c3e6c53928b1d2d406195cee086d (diff)
Fix some stuff
-rw-r--r--asm/macros/event.inc6
-rw-r--r--data/event_scripts.s2
2 files changed, 7 insertions, 1 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 12aacf88d..117629a89 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1489,3 +1489,9 @@
compare_var_to_value 0x8000, \condition
goto_eq \dest
.endm
+
+ .macro giveitem item, amount=1, function=0
+ setorcopyvar 0x8000, \item
+ setorcopyvar 0x8001, \amount
+ callstd \function
+ .endm
diff --git a/data/event_scripts.s b/data/event_scripts.s
index c3d9b26c9..b256d4f20 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,5 +1,5 @@
.include "asm/macros.inc"
- .include "asm/macros/events.inc"
+ .include "asm/macros/event.inc"
.include "constants/constants.inc"
.section script_data, "aw", %progbits