diff options
| author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
| commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
| tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /include/battle_string_ids.h | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/battle_string_ids.h')
| -rw-r--r-- | include/battle_string_ids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_string_ids.h b/include/battle_string_ids.h index 155e9f7bf..0eb6b63f4 100644 --- a/include/battle_string_ids.h +++ b/include/battle_string_ids.h @@ -387,6 +387,6 @@ #define STRINGID_TRAINER1MON2COMEBACK 384 #define STRINGID_TRAINER1MON1AND2COMEBACK 385 -#define BATTLESTRINGS_COUNT 386 +#define BATTLESTRINGS_COUNT 374 #endif // GUARD_BATTLE_STRING_IDS_H |