diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-01 02:30:10 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-10-16 20:22:11 -0500 |
| commit | 11170ce90c0baf77b196e378441d25e7f16e2cf3 (patch) | |
| tree | c3c37595941663287d60557ec6b98c84f06c6a43 /include | |
| parent | 3773318935a8a94a8d48fe76f3868d3826c933b7 (diff) | |
Sync specialvars with pokeemerald
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/vars.h | 37 | ||||
| -rw-r--r-- | include/macros/event.inc | 10 |
2 files changed, 24 insertions, 23 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index 856aba069..de62e4e8a 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -172,25 +172,26 @@ #define VAR_STEVENS_HOUSE_STATE 0x40C6 #define VAR_OLDALE_STATE 0x40C7 +#define SPECIAL_VARS_START 0x8000 // special vars // They are commonly used as parameters to commands, or return values from commands. -#define VAR_SPECIAL_0 0x8000 -#define VAR_SPECIAL_1 0x8001 -#define VAR_SPECIAL_2 0x8002 -#define VAR_SPECIAL_3 0x8003 -#define VAR_SPECIAL_4 0x8004 -#define VAR_SPECIAL_5 0x8005 -#define VAR_SPECIAL_6 0x8006 -#define VAR_SPECIAL_7 0x8007 -#define VAR_SPECIAL_8 0x8008 -#define VAR_SPECIAL_9 0x8009 -#define VAR_SPECIAL_A 0x800A -#define VAR_SPECIAL_B 0x800B -#define FACING 0x800C -#define RESULT 0x800D -#define ITEM_ID 0x800E -#define LAST_TALKED 0x800F -#define CONTEST_RANK 0x8010 -#define CONTEST_CATEGORY 0x8011 +#define VAR_0x8000 0x8000 +#define VAR_0x8001 0x8001 +#define VAR_0x8002 0x8002 +#define VAR_0x8003 0x8003 +#define VAR_0x8004 0x8004 +#define VAR_0x8005 0x8005 +#define VAR_0x8006 0x8006 +#define VAR_0x8007 0x8007 +#define VAR_0x8008 0x8008 +#define VAR_0x8009 0x8009 +#define VAR_0x800A 0x800A +#define VAR_0x800B 0x800B +#define VAR_FACING 0x800C +#define VAR_RESULT 0x800D +#define VAR_ITEM_ID 0x800E +#define VAR_LAST_TALKED 0x800F +#define VAR_CONTEST_RANK 0x8010 +#define VAR_CONTEST_CATEGORY 0x8011 #endif // GUARD_CONSTANTS_VARS_H diff --git a/include/macros/event.inc b/include/macros/event.inc index 8b2d587c9..7250ec5ca 100644 --- a/include/macros/event.inc +++ b/include/macros/event.inc @@ -1449,11 +1449,11 @@ .endm .macro switch var - copyvar VAR_SPECIAL_0, \var + copyvar VAR_0x8000, \var .endm .macro case condition, dest - compare_var_to_value VAR_SPECIAL_0, \condition + compare_var_to_value VAR_0x8000, \condition goto_if_eq \dest .endm @@ -1469,12 +1469,12 @@ NO = 0 .macro giveitem_std item, amount=1, function=0 - setorcopyvar VAR_SPECIAL_0, \item - setorcopyvar VAR_SPECIAL_1, \amount + setorcopyvar VAR_0x8000, \item + setorcopyvar VAR_0x8001, \amount callstd \function .endm .macro givedecoration_std decoration - setorcopyvar VAR_SPECIAL_0, \decoration + setorcopyvar VAR_0x8000, \decoration callstd 7 .endm |