From 26f9776f6fa0d74b1e89688e9c618e65b917e7f8 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Mon, 23 Oct 2017 22:18:35 -0500 Subject: [PATCH] Fix some stuff --- asm/macros/event.inc | 6 ++++++ data/event_scripts.s | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 12aacf88db..117629a892 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 c3d9b26c9b..b256d4f201 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