From 1c8b05e7b059a98d4259f4129896d0cc1eaa3847 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Dec 2017 10:11:43 -0600 Subject: Name and use constants for special vars --- asm/macros/event.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'asm/macros') diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 738c2418e..5727c7383 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1366,11 +1366,11 @@ .endm .macro switch var - copyvar 0x8000, \var + copyvar SPECIALVAR_0, \var .endm .macro case condition, dest - compare_var_to_value 0x8000, \condition + compare_var_to_value SPECIALVAR_0, \condition goto_if_eq \dest .endm @@ -1386,12 +1386,12 @@ NO = 0 .macro giveitem_std item, amount=1, function=0 - setorcopyvar 0x8000, \item - setorcopyvar 0x8001, \amount + setorcopyvar SPECIALVAR_0, \item + setorcopyvar SPECIALVAR_1, \amount callstd \function .endm .macro givedecoration_std decoration - setorcopyvar 0x8000, \decoration + setorcopyvar SPECIALVAR_0, \decoration callstd 7 .endm -- cgit v1.2.3 From 2c4d972f7c5a79ca94dca599b6e7b9e2c769cf70 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Dec 2017 14:00:44 -0600 Subject: 'VAR_SPECIAL_X' instead of 'SPECIALVAR_X' --- asm/macros/event.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'asm/macros') diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 5727c7383..5176beff3 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1366,11 +1366,11 @@ .endm .macro switch var - copyvar SPECIALVAR_0, \var + copyvar VAR_SPECIAL_0, \var .endm .macro case condition, dest - compare_var_to_value SPECIALVAR_0, \condition + compare_var_to_value VAR_SPECIAL_0, \condition goto_if_eq \dest .endm @@ -1386,12 +1386,12 @@ NO = 0 .macro giveitem_std item, amount=1, function=0 - setorcopyvar SPECIALVAR_0, \item - setorcopyvar SPECIALVAR_1, \amount + setorcopyvar VAR_SPECIAL_0, \item + setorcopyvar VAR_SPECIAL_1, \amount callstd \function .endm .macro givedecoration_std decoration - setorcopyvar SPECIALVAR_0, \decoration + setorcopyvar VAR_SPECIAL_0, \decoration callstd 7 .endm -- cgit v1.2.3