diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:09:53 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:09:53 -0500 |
| commit | 88636dfc2a07790d9bdbba1ca56f4ca252d16f5b (patch) | |
| tree | 9b31cc1b61577ee20fa50b8feec5c7780cbce3ef /include/battle_message.h | |
| parent | 9840be1f0041e697f1aefbdc839a5227b7100112 (diff) | |
| parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) | |
Merge branch 'master' into clock
Diffstat (limited to 'include/battle_message.h')
| -rw-r--r-- | include/battle_message.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/battle_message.h b/include/battle_message.h index 3f9b38cad..30ddca469 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -67,13 +67,21 @@ #define B_BUFF_STAT 5 #define B_BUFF_SPECIES 6 #define B_BUFF_MON_NICK 7 -#define B_BUFF_NEGATIVE_FLAVOUR 8 +#define B_BUFF_NEGATIVE_FLAVOR 8 #define B_BUFF_ABILITY 9 #define B_BUFF_ITEM 10 #define B_BUFF_PLACEHOLDER_BEGIN 0xFD #define B_BUFF_EOS 0xFF +#define PREPARE_FLAVOR_BUFFER(textVar, flavorId) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_NEGATIVE_FLAVOR; \ + textVar[2] = flavorId; \ + textVar[3] = B_BUFF_EOS; \ +} + #define PREPARE_STAT_BUFFER(textVar, statId) \ { \ textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ @@ -189,7 +197,7 @@ struct StringInfoBattle { u16 currentMove; - u16 lastMove; + u16 originallyUsedMove; u16 lastItem; u8 lastAbility; u8 scrActive; |