From bad5323642a0db0875ca6213370b1947c1fc105a Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 07:17:54 -0500 Subject: cleans up trainer battle scripts * adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro --- include/constants/battle_setup.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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..0256f889c --- /dev/null +++ b/include/constants/battle_setup.h @@ -0,0 +1,18 @@ +#ifndef GUARD_CONSTANTS_BATTLE_SETUP_H +#define GUARD_CONSTANTS_BATTLE_SETUP_H + +#define TRAINER_BATTLE_NORMAL 0 +#define TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC 1 +#define TRAINER_BATTLE_CONTINUE_SCRIPT 2 +#define TRAINER_BATTLE_NORMAL_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 +#define TRAINER_BATTLE_9 9 +#define TRAINER_BATTLE_SET_TRAINER_A 10 +#define TRAINER_BATTLE_SET_TRAINER_B 11 +#define TRAINER_BATTLE_12 12 + +#endif // GUARD_CONSTANTS_BATTLE_SETUP_H -- cgit v1.2.3 From 10725def8e356a6ea9346b1ea3170e1429314db3 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 13:54:48 -0500 Subject: =?UTF-8?q?trainerbattle=5Fnormal=20=E2=86=92=20trainerbattle=5Fsi?= =?UTF-8?q?ngle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * trainerbattle_normal → trainerbattle_single * TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE * improves the macro documentation a little --- include/constants/battle_setup.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/constants') diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h index 0256f889c..329bfa650 100644 --- a/include/constants/battle_setup.h +++ b/include/constants/battle_setup.h @@ -1,10 +1,10 @@ #ifndef GUARD_CONSTANTS_BATTLE_SETUP_H #define GUARD_CONSTANTS_BATTLE_SETUP_H -#define TRAINER_BATTLE_NORMAL 0 +#define TRAINER_BATTLE_SINGLE 0 #define TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC 1 #define TRAINER_BATTLE_CONTINUE_SCRIPT 2 -#define TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT 3 +#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 -- cgit v1.2.3