diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-24 00:11:26 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-24 00:11:26 -0500 |
| commit | 17303d963ef3dd8887e28c561672a16dd1cd8bb9 (patch) | |
| tree | 95d03e1df2da949635ec59abf3ae6a5f8347343c | |
| parent | 26f9776f6fa0d74b1e89688e9c618e65b917e7f8 (diff) | |
More prep
| -rw-r--r-- | asm/macros/event.inc | 7 | ||||
| -rw-r--r-- | constants/variables.inc | 6 | ||||
| -rw-r--r-- | data/event_scripts.s | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 117629a89..c224861b0 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1490,8 +1490,13 @@ goto_eq \dest .endm - .macro giveitem item, amount=1, function=0 + .macro giveitem_std item, amount=1, function=0 setorcopyvar 0x8000, \item setorcopyvar 0x8001, \amount callstd \function .endm + + .macro givedecoration_std decoration + setorcopyvar 0x8000, \decoration + callstd 7 + .endm diff --git a/constants/variables.inc b/constants/variables.inc new file mode 100644 index 000000000..ab488a97e --- /dev/null +++ b/constants/variables.inc @@ -0,0 +1,6 @@ + .equiv FACING, 0x800C + .equiv RESULT, 0x800D + .equiv ITEM_ID, 0x800E + .equiv LAST_TALKED, 0x800F + .equiv CONTEST_RANK, 0x8010 + .equiv CONTEST_CATEGORY, 0x8011 diff --git a/data/event_scripts.s b/data/event_scripts.s index b256d4f20..05cd014dd 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,6 +1,7 @@ .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" + .include "constants/variables.inc" .section script_data, "aw", %progbits |