diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-01 14:57:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 14:57:18 -0500 |
| commit | 80b2c0eee67ac8a008c0a8c621b51e391d94df98 (patch) | |
| tree | 00434c236b2b11b334610e2770dff78cb623bf03 /include/constants/vars.h | |
| parent | 419c897292dbfbc4f6d43880eb94597987e09e2c (diff) | |
| parent | 1f6dc0e86bca06afbb48b909c45e7794148d58bd (diff) | |
Merge pull request #382 from GriffinRichards/relativeconstants
Use trainer constants in flags, automatically update flags/vars count
Diffstat (limited to 'include/constants/vars.h')
| -rw-r--r-- | include/constants/vars.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index 358209eaf..8b7ffbfbd 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -1,8 +1,6 @@ #ifndef GUARD_CONSTANTS_VARS_H #define GUARD_CONSTANTS_VARS_H -#define VAR_0x3F20 0x3F20 - #define VARS_START 0x4000 // Temporary variables. Reset on map load. @@ -132,7 +130,7 @@ #define VAR_MAP_SCENE_PALLET_TOWN_OAK 0x4050 #define VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN 0x4051 #define VAR_MAP_SCENE_CERULEAN_CITY_RIVAL 0x4052 -#define VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER 0x4053 +#define VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER 0x4053 #define VAR_MAP_SCENE_ROUTE22 0x4054 #define VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB 0x4055 #define VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F 0x4056 @@ -308,6 +306,7 @@ #define VAR_0x40FF 0x40FF #define VARS_END 0x40FF +#define VARS_COUNT (VARS_END - VARS_START + 1) #define SPECIAL_VARS_START 0x8000 |