summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-03-08 13:26:19 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-03-08 13:26:19 -0400
commit7a7aaab5d9ad573186a06ddedbefcd0dd62e8e2c (patch)
treeca2886c3d684ac5d584df2c69134c0b9b17f7378 /src
parent5d7c0e9bb041ec4c7d8fd3c88c02ac1f25e200a7 (diff)
Address review comments
Diffstat (limited to 'src')
-rw-r--r--src/easy_chat_2.c38
-rw-r--r--src/easy_chat_3.c4
2 files changed, 21 insertions, 21 deletions
diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c
index 38d8d752a..d099d0e77 100644
--- a/src/easy_chat_2.c
+++ b/src/easy_chat_2.c
@@ -76,25 +76,25 @@ static u16 Cancel_CreateYesNoMenu(void);
static u16 DelAll_CreateYesNoMenu(void);
static u16 Confirm_CreateYesNoMenu(void);
static u8 GetStateBackup(void);
-int OpenSelectedGroup(void);
-int BackOutFromGroupToFieldSelect(void);
-int ToggleGroupAlphaMode(void);
-int DeleteSelectedWord(void);
-int PlaceSelectedWord(void);
+static int OpenSelectedGroup(void);
+static int BackOutFromGroupToFieldSelect(void);
+static int ToggleGroupAlphaMode(void);
+static int DeleteSelectedWord(void);
+static int PlaceSelectedWord(void);
static void CommitECWords(void);
static void DeleteAllECFields(void);
static void SetEasyChatWordToField(u16 word);
static bool8 HasECMessageChanged(void);
static u16 SelectGroupCursorAction(u32 action);
-int UpdateSelectGroupCursorPos_OutsideBlueBox_GroupMode(u32 action);
-int UpdateSelectGroupCursorPos_OutsideBlueBox_AlphaMode(u32 action);
-int UpdateSelectGroupCursorPos_InsideBlueBox(u32 action);
+static int UpdateSelectGroupCursorPos_OutsideBlueBox_GroupMode(u32 action);
+static int UpdateSelectGroupCursorPos_OutsideBlueBox_AlphaMode(u32 action);
+static int UpdateSelectGroupCursorPos_InsideBlueBox(u32 action);
static void GroupCursorMoveToBlueBox(void);
static void GroupCursorWrapAroundLeft(void);
static u16 SelectWordCursorAction(u32 action);
static u16 GetSelectedFieldIndex(void);
static u16 GetSelectedGroupIndex(void);
-int GetSelectedLetter(void);
+static int GetSelectedLetter(void);
static u16 GetSelectWordCursorPos(void);
static u8 GetMaxGroupCursorXinAlphaMode(u8 unkB);
static void MoveGroupCursorXToMaxCol(void);
@@ -162,7 +162,7 @@ static void Task_RunEasyChat(u8 taskId)
{
case 0:
SetVBlankCallback(VBlankCallback_EasyChatScreen);
- BlendPalettes(0xFFFFFFFF, 16, 0);
+ BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
data[EZCHAT_TASK_STATE]++;
break;
@@ -763,7 +763,7 @@ static u8 GetStateBackup(void)
return sEasyChatScreen->stateBackup;
}
-int OpenSelectedGroup(void)
+static int OpenSelectedGroup(void)
{
u16 numDisplayedWords;
@@ -789,13 +789,13 @@ int OpenSelectedGroup(void)
return 11;
}
-int BackOutFromGroupToFieldSelect(void)
+static int BackOutFromGroupToFieldSelect(void)
{
sEasyChatScreen->state = 0;
return 10;
}
-int ToggleGroupAlphaMode(void)
+static int ToggleGroupAlphaMode(void)
{
sEasyChatScreen->selectGroupCursorX = 0;
sEasyChatScreen->selectGroupCursorY = 0;
@@ -808,13 +808,13 @@ int ToggleGroupAlphaMode(void)
return 22;
}
-int DeleteSelectedWord(void)
+static int DeleteSelectedWord(void)
{
SetEasyChatWordToField(0xFFFF);
return 1;
}
-int PlaceSelectedWord(void)
+static int PlaceSelectedWord(void)
{
u16 easyChatWord = GetDisplayedWordByIndex(GetSelectWordCursorPos());
SetEasyChatWordToField(easyChatWord);
@@ -869,7 +869,7 @@ static u16 SelectGroupCursorAction(u32 action)
}
}
-int UpdateSelectGroupCursorPos_OutsideBlueBox_GroupMode(u32 arg0)
+static int UpdateSelectGroupCursorPos_OutsideBlueBox_GroupMode(u32 arg0)
{
switch (arg0)
{
@@ -931,7 +931,7 @@ int UpdateSelectGroupCursorPos_OutsideBlueBox_GroupMode(u32 arg0)
return 0;
}
-int UpdateSelectGroupCursorPos_OutsideBlueBox_AlphaMode(u32 arg0)
+static int UpdateSelectGroupCursorPos_OutsideBlueBox_AlphaMode(u32 arg0)
{
switch (arg0)
{
@@ -968,7 +968,7 @@ int UpdateSelectGroupCursorPos_OutsideBlueBox_AlphaMode(u32 arg0)
return 0;
}
-int UpdateSelectGroupCursorPos_InsideBlueBox(u32 arg0)
+static int UpdateSelectGroupCursorPos_InsideBlueBox(u32 arg0)
{
switch (arg0)
{
@@ -1124,7 +1124,7 @@ static const u8 sAlphabetLayout[][7] = {
{20, 21, 22, 23, 24, 25, 26}
};
-int GetSelectedLetter(void)
+static int GetSelectedLetter(void)
{
int col = sEasyChatScreen->selectGroupCursorX < NELEMS(*sAlphabetLayout) ? sEasyChatScreen->selectGroupCursorX : 0;
int row = sEasyChatScreen->selectGroupCursorY < NELEMS(sAlphabetLayout) ? sEasyChatScreen->selectGroupCursorY : 0;
diff --git a/src/easy_chat_3.c b/src/easy_chat_3.c
index f3c7bedd9..a8abb21db 100644
--- a/src/easy_chat_3.c
+++ b/src/easy_chat_3.c
@@ -1270,7 +1270,7 @@ static bool8 ECInterfaceCmd_20(void)
static bool8 InitEasyChatGraphicsWork_Internal(void)
{
sEasyChatGraphicsResources = Alloc(sizeof(*sEasyChatGraphicsResources));
- if (!sEasyChatGraphicsResources)
+ if (sEasyChatGraphicsResources == NULL)
return FALSE;
sEasyChatGraphicsResources->state = 0;
@@ -1316,7 +1316,7 @@ static void PrintTitleText(void)
{
int xOffset;
const u8 *titleText = GetTitleText();
- if (!titleText)
+ if (titleText == NULL)
return;
xOffset = (128 - GetStringWidth(1, titleText, 0)) / 2u;