diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-08-12 13:17:51 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-08-12 13:17:51 -0700 |
| commit | bd2b7beb075f87478190062eb4317656cb1c2210 (patch) | |
| tree | 7771ad16f3c3478fe06348e362a3f4229eddbe1a /include | |
| parent | 9a73a47dddbd84b03987cc9caba52bbb797cb9fa (diff) | |
| parent | 335f4c1e81453218d1e319b7ee54a61fe02ff2c3 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 1 | ||||
| -rw-r--r-- | include/constants/vars.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 6c1400410..a74dffccf 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1570,6 +1570,7 @@ #define FLAG_0x95E (SYSTEM_FLAGS + 0xFE) #define FLAG_0x95F (SYSTEM_FLAGS + 0xFF) +#define SPECIAL_FLAGS_START 0x4000 // SPECIAL FLAGS (unknown purpose) #define FLAG_SPECIAL_FLAG_0x4000 0x4000 #define FLAG_SPECIAL_FLAG_0x4001 0x4001 diff --git a/include/constants/vars.h b/include/constants/vars.h index 7cf232efe..e2c59b4fb 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -273,6 +273,7 @@ #define VAR_0x40FE 0x40FE #define VAR_0x40FF 0x40FF +#define SPECIAL_VARS_START 0x8000 // special vars // They are commonly used as parameters to commands, or return values from commands. #define VAR_0x8000 0x8000 |