summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2017-11-27 15:08:26 -0600
committerGitHub <noreply@github.com>2017-11-27 15:08:26 -0600
commit877ad2271186db94e12b3fcfd5acee2a1155b4cb (patch)
tree1c4c70f5e1dc3ea3093bba2c690f0133ab384786 /include
parent6e317c64637fd3d041d3224e0bb0ca626454e8d4 (diff)
parent7275585d564ba7c619d6c585fc64d71666ae9eb1 (diff)
Merge pull request #127 from DizzyEggg/make_it_compile
EMERGENCY PULL REQUEST
Diffstat (limited to 'include')
-rw-r--r--include/battle_message.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/battle_message.h b/include/battle_message.h
index a820ff287..30ddca469 100644
--- a/include/battle_message.h
+++ b/include/battle_message.h
@@ -67,18 +67,18 @@
#define B_BUFF_STAT 5
#define B_BUFF_SPECIES 6
#define B_BUFF_MON_NICK 7
-#define B_BUFF_NEGATIVE_FLAVOR 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_FLAVOUR_BUFFER(textVar, flavourId) \
+#define PREPARE_FLAVOR_BUFFER(textVar, flavorId) \
{ \
textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \
- textVar[1] = B_BUFF_NEGATIVE_FLAVOUR; \
- textVar[2] = flavourId; \
+ textVar[1] = B_BUFF_NEGATIVE_FLAVOR; \
+ textVar[2] = flavorId; \
textVar[3] = B_BUFF_EOS; \
}