summaryrefslogtreecommitdiff
path: root/src/easy_chat.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-11-01 19:46:38 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-11-01 19:46:38 -0400
commita20a2b415c89e94c8bae0c9b1b678469db81c9a1 (patch)
tree954cdbe5cf6abdfece1b99c441414b53e9fb2d4a /src/easy_chat.c
parentb5de3ab0123def8c6de850ddb19df03c1214ebcc (diff)
Address review comments
Diffstat (limited to 'src/easy_chat.c')
-rw-r--r--src/easy_chat.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 089991e73..ab998a2ae 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -51,7 +51,7 @@ static u16 GetUnlockedWordsInECGroup(u16);
static u16 GetUnlockedWordsInAlphabeticalGroup(u16);
static bool8 UnlockedECMonOrMove(u16, u8);
static int EC_IsDeoxys(u16 species);
-static u8 IsWordUnlocked(u16 word);
+static bool8 IsWordUnlocked(u16 word);
#include "data/easy_chat/easy_chat_groups.h"
#include "data/easy_chat/easy_chat_words_by_letter.h"
@@ -496,7 +496,7 @@ void ResetSomeMEventECBuffer_3120_338(void)
bool8 InitEasyChatSelection(void)
{
sEasyChatSelectionData = Alloc(sizeof(*sEasyChatSelectionData));
- if (!sEasyChatSelectionData)
+ if (sEasyChatSelectionData == NULL)
return FALSE;
PopulateECGroups();
@@ -731,7 +731,7 @@ static int EC_IsDeoxys(u16 species)
return FALSE;
}
-static u8 IsWordUnlocked(u16 easyChatWord)
+static bool8 IsWordUnlocked(u16 easyChatWord)
{
u8 groupId = EC_GROUP(easyChatWord);
u32 index = EC_INDEX(easyChatWord);
@@ -740,4 +740,3 @@ static u8 IsWordUnlocked(u16 easyChatWord)
else
return UnlockedECMonOrMove(index, groupId);
}
-