diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-02 14:31:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-02 14:31:19 -0600 |
| commit | 7914220acd9a39e08bc09b70eaef6433a6ba9cd6 (patch) | |
| tree | b5955a26de58feb834007ee84ba036308992e422 /include | |
| parent | 2912ec0e37360ede1bae882f0ea2457ec336f16f (diff) | |
| parent | a2a99bde115e183267db6bb4b5c1dc73d57284fc (diff) | |
Merge pull request #419 from melthelesbian/trainerbattle_macro_cleanup
cleans up trainer battle scripts
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_setup.h | 17 | ||||
| -rw-r--r-- | include/constants/battle_setup.h | 18 |
2 files changed, 18 insertions, 17 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h index 0caa3df27..98c366acd 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -1,23 +1,6 @@ #ifndef GUARD_BATTLE_SETUP_H #define GUARD_BATTLE_SETUP_H -enum -{ - TRAINER_BATTLE_NORMAL, - TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, - TRAINER_BATTLE_CONTINUE_SCRIPT, - TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT, - TRAINER_BATTLE_DOUBLE, - TRAINER_BATTLE_REMATCH, - TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE, - TRAINER_BATTLE_REMATCH_DOUBLE, - TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC, - TRAINER_BATTLE_9, - TRAINER_BATTLE_SET_TRAINER_A, - TRAINER_BATTLE_SET_TRAINER_B, - TRAINER_BATTLE_12, -}; - #define REMATCHES_COUNT 5 #define REMATCH_TABLE_ENTRIES 78 #define REMATCH_WALLY_ENTRY 64 diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h new file mode 100644 index 000000000..329bfa650 --- /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_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 +#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 |