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_message.h | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/battle_message.h')
| -rw-r--r-- | include/battle_message.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/battle_message.h b/include/battle_message.h index 2bbfffa43..612b253cf 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -51,13 +51,9 @@ #define B_TXT_DEF_PREFIX2 0x2B #define B_TXT_ATK_PREFIX3 0x2C #define B_TXT_DEF_PREFIX3 0x2D -#define B_TXT_TRAINER2_CLASS 0x2E -#define B_TXT_TRAINER2_NAME 0x2F -#define B_TXT_TRAINER2_LOSE_TEXT 0x30 -#define B_TXT_TRAINER2_WIN_TEXT 0x31 -#define B_TXT_PARTNER_CLASS 0x32 -#define B_TXT_PARTNER_NAME 0x33 -#define B_TXT_BUFF3 0x34 +#define B_TXT_TRAINER2_LOSE_TEXT 0x2E +#define B_TXT_TRAINER2_WIN_TEXT 0x2F +#define B_TXT_BUFF3 0x30 // for B_TXT_BUFF1, B_TXT_BUFF2 and B_TXT_BUFF3 |