diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-01 19:03:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-01 19:03:47 -0800 |
| commit | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (patch) | |
| tree | b4c05276d2e5d65f5bf7cf55a054947c92235f8e /include/constants | |
| parent | 79a9ff94719b5397647ddf11efc1d3dc1d388e1d (diff) | |
| parent | 664b42470fb6c590dd2bd8b02707a790feda23fe (diff) | |
Merge pull request #503 from huderlem/specials
Label a bunch of specials
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/battle_constants.h | 2 | ||||
| -rw-r--r-- | include/constants/vars.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/constants/battle_constants.h b/include/constants/battle_constants.h index c61d54f76..f7efb0dfd 100644 --- a/include/constants/battle_constants.h +++ b/include/constants/battle_constants.h @@ -105,6 +105,8 @@ #define BATTLE_TYPE_REGI 0x4000 #define BATTLE_TYPE_LINK_DOUBLE (BATTLE_TYPE_MULTI | BATTLE_TYPE_TRAINER | BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE) +#define SECRET_BASE_OPPONENT 0x400 + #define BATTLE_WON 0x1 #define BATTLE_LOST 0x2 #define BATTLE_DREW 0x3 diff --git a/include/constants/vars.h b/include/constants/vars.h index 13114e09b..682d45003 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -3,6 +3,8 @@ #define VAR_0x3F20 0x3F20 +#define VARS_START 0x4000 + // temporary vars // The first 0x10 vars are are temporary--they are cleared every time a map is loaded. #define VAR_TEMP_0 0x4000 @@ -60,7 +62,8 @@ #define VAR_ENIGMA_BERRY_AVAILABLE 0x402D #define VAR_DAYS 0x4040 - +#define VAR_FANCLUB_UNKNOWN_1 0x4041 // TODO: document these two fanclub vars +#define VAR_FANCLUB_UNKNOWN_2 0x4042 #define VAR_DEPT_STORE_FLOOR 0x4043 #define VAR_TRICK_HOUSE_ROOMS_COMPLETED 0x4044 #define VAR_LOTTERY_PRIZE 0x4045 |