diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
| commit | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (patch) | |
| tree | 65b32493ea3eaef107ac73f804d23563da0f9ada /include/constants | |
| parent | 949509aade2627ded031669c296453c3d0ea9e59 (diff) | |
| parent | 026e1108b26f4ce5cea362997135bd8efc7cb28a (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/field_specials.h | 2 | ||||
| -rw-r--r-- | include/constants/vars.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h index 5dde18058..a2dc117e4 100644 --- a/include/constants/field_specials.h +++ b/include/constants/field_specials.h @@ -7,7 +7,7 @@ #define PC_LOCATION_MAYS_HOUSE 2 // SS Tidal Locations -#define SS_TIDAL_LOCATION_OTHER 0 +#define SS_TIDAL_LOCATION_CURRENTS 0 #define SS_TIDAL_LOCATION_SLATEPORT 1 #define SS_TIDAL_LOCATION_LILYCOVE 2 #define SS_TIDAL_LOCATION_ROUTE124 3 diff --git a/include/constants/vars.h b/include/constants/vars.h index fead22137..4a38bde81 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -273,7 +273,9 @@ #define VAR_UNUSED_0x40FE 0x40FE // Unused Var #define VAR_UNUSED_0x40FF 0x40FF // Unused Var -#define SPECIAL_VARS_START 0x8000 +#define VARS_END 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 @@ -299,4 +301,6 @@ #define VAR_UNUSED_0x8014 0x8014 #define VAR_TRAINER_BATTLE_OPPONENT_A 0x8015 // Alias of gTrainerBattleOpponent_A +#define SPECIAL_VARS_END 0x8015 + #endif // GUARD_CONSTANTS_VARS_H |