From 71094356313801bf20191f3db1efa0decd3c3dcb Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 23 Apr 2020 17:20:34 -0400 Subject: Sync event macros --- include/constants/battle_setup.h | 14 ++++++++++++++ include/constants/vars.h | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 include/constants/battle_setup.h (limited to 'include/constants') diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h new file mode 100644 index 000000000..e1a663e44 --- /dev/null +++ b/include/constants/battle_setup.h @@ -0,0 +1,14 @@ +#ifndef GUARD_CONSTANTS_BATTLE_SETUP_H +#define GUARD_CONSTANTS_BATTLE_SETUP_H + +#define TRAINER_BATTLE_SINGLE 0 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC 1 +#define TRAINER_BATTLE_CONTINUE_SCRIPT 2 +#define TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT 3 +#define TRAINER_BATTLE_DOUBLE 4 +#define TRAINER_BATTLE_REMATCH 5 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6 +#define TRAINER_BATTLE_REMATCH_DOUBLE 7 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC 8 + +#endif // GUARD_CONSTANTS_BATTLE_SETUP_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 795498212..8f478b794 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 vars @@ -172,6 +170,8 @@ #define VAR_STEVENS_HOUSE_STATE 0x40C6 #define VAR_OLDALE_STATE 0x40C7 +#define VARS_END 0x40FF + #define SPECIAL_VARS_START 0x8000 // special vars // They are commonly used as parameters to commands, or return values from commands. @@ -194,4 +194,6 @@ #define VAR_CONTEST_RANK 0x8010 #define VAR_CONTEST_CATEGORY 0x8011 +#define SPECIAL_VARS_END 0x8015 + #endif // GUARD_CONSTANTS_VARS_H -- cgit v1.2.3