diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /include/battle_setup.h | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/battle_setup.h')
| -rw-r--r-- | include/battle_setup.h | 17 |
1 files changed, 0 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 |