diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
| commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
| tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /include/constants/vars.h | |
| parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
| parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) | |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'include/constants/vars.h')
| -rw-r--r-- | include/constants/vars.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index 043f5bc39..640bf41fd 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -90,7 +90,7 @@ #define VAR_0x402F 0x402F #define VAR_ICE_STEP_COUNT 0x4030 -#define VAR_STARTER_MON 0x4031 +#define VAR_STARTER_MON 0x4031 // 0: Bulbasaur, 1: Squirtle, 2: Charmander #define VAR_0x4032 0x4032 #define VAR_ENIGMA_BERRY_AVAILABLE 0x4033 @@ -323,11 +323,11 @@ #define VAR_RESULT 0x800D #define VAR_ITEM_ID 0x800E #define VAR_LAST_TALKED 0x800F -#define VAR_CONTEST_RANK 0x8010 -#define VAR_CONTEST_CATEGORY 0x8011 -#define VAR_MON_BOX_ID 0x8012 -#define VAR_MON_BOX_POS 0x8013 -#define VAR_TEXT_COLOR 0x8014 +#define VAR_MON_BOX_ID 0x8010 +#define VAR_MON_BOX_POS 0x8011 +#define VAR_TEXT_COLOR 0x8012 +#define VAR_PREV_TEXT_COLOR 0x8013 +#define VAR_0x8014 0x8014 // Unknown/unused #define SPECIAL_VARS_END 0x8014 |