dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
PikalaxALT
2020-03-08 13:26:19 -04:00
parent 5d7c0e9bb0
commit 7a7aaab5d9
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/easy_chat_2.c
+19 -19
View File
@@ -76,25 +76,25 @@ static u16 Cancel_CreateYesNoMenu(void);
static u16 DelAll_CreateYesNoMenu(void); static u16 DelAll_CreateYesNoMenu(void);
static u16 Confirm_CreateYesNoMenu(void); static u16 Confirm_CreateYesNoMenu(void);
static u8 GetStateBackup(void); static u8 GetStateBackup(void);
int OpenSelectedGroup(void); static int OpenSelectedGroup(void);
int BackOutFromGroupToFieldSelect(void); static int BackOutFromGroupToFieldSelect(void);
int ToggleGroupAlphaMode(void); static int ToggleGroupAlphaMode(void);
int DeleteSelectedWord(void); static int DeleteSelectedWord(void);
int PlaceSelectedWord(void); static int PlaceSelectedWord(void);
static void CommitECWords(void); static void CommitECWords(void);
static void DeleteAllECFields(void); static void DeleteAllECFields(void);
static void SetEasyChatWordToField(u16 word); static void SetEasyChatWordToField(u16 word);
static bool8 HasECMessageChanged(void); static bool8 HasECMessageChanged(void);
static u16 SelectGroupCursorAction(u32 action); static u16 SelectGroupCursorAction(u32 action);
int UpdateSelectGroupCursorPos_OutsideBlueBox_GroupMode(u32 action); static int UpdateSelectGroupCursorPos_OutsideBlueBox_GroupMode(u32 action);
int UpdateSelectGroupCursorPos_OutsideBlueBox_AlphaMode(u32 action); static int UpdateSelectGroupCursorPos_OutsideBlueBox_AlphaMode(u32 action);
int UpdateSelectGroupCursorPos_InsideBlueBox(u32 action); static int UpdateSelectGroupCursorPos_InsideBlueBox(u32 action);
static void GroupCursorMoveToBlueBox(void); static void GroupCursorMoveToBlueBox(void);
static void GroupCursorWrapAroundLeft(void); static void GroupCursorWrapAroundLeft(void);
static u16 SelectWordCursorAction(u32 action); static u16 SelectWordCursorAction(u32 action);
static u16 GetSelectedFieldIndex(void); static u16 GetSelectedFieldIndex(void);
static u16 GetSelectedGroupIndex(void); static u16 GetSelectedGroupIndex(void);
int GetSelectedLetter(void); static int GetSelectedLetter(void);
static u16 GetSelectWordCursorPos(void); static u16 GetSelectWordCursorPos(void);
static u8 GetMaxGroupCursorXinAlphaMode(u8 unkB); static u8 GetMaxGroupCursorXinAlphaMode(u8 unkB);
static void MoveGroupCursorXToMaxCol(void); static void MoveGroupCursorXToMaxCol(void);
@@ -162,7 +162,7 @@ static void Task_RunEasyChat(u8 taskId)
{ {
case 0: case 0:
SetVBlankCallback(VBlankCallback_EasyChatScreen); SetVBlankCallback(VBlankCallback_EasyChatScreen);
BlendPalettes(0xFFFFFFFF, 16, 0); BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
data[EZCHAT_TASK_STATE]++; data[EZCHAT_TASK_STATE]++;
break; break;
@@ -763,7 +763,7 @@ static u8 GetStateBackup(void)
return sEasyChatScreen->stateBackup; return sEasyChatScreen->stateBackup;
} }
int OpenSelectedGroup(void) static int OpenSelectedGroup(void)
{ {
u16 numDisplayedWords; u16 numDisplayedWords;
@@ -789,13 +789,13 @@ int OpenSelectedGroup(void)
return 11; return 11;
} }
int BackOutFromGroupToFieldSelect(void) static int BackOutFromGroupToFieldSelect(void)
{ {
sEasyChatScreen->state = 0; sEasyChatScreen->state = 0;
return 10; return 10;
} }
int ToggleGroupAlphaMode(void) static int ToggleGroupAlphaMode(void)
{ {
sEasyChatScreen->selectGroupCursorX = 0; sEasyChatScreen->selectGroupCursorX = 0;
sEasyChatScreen->selectGroupCursorY = 0; sEasyChatScreen->selectGroupCursorY = 0;
@@ -808,13 +808,13 @@ int ToggleGroupAlphaMode(void)
return 22; return 22;
} }
int DeleteSelectedWord(void) static int DeleteSelectedWord(void)
{ {
SetEasyChatWordToField(0xFFFF); SetEasyChatWordToField(0xFFFF);
return 1; return 1;
} }
int PlaceSelectedWord(void) static int PlaceSelectedWord(void)
{ {
u16 easyChatWord = GetDisplayedWordByIndex(GetSelectWordCursorPos()); u16 easyChatWord = GetDisplayedWordByIndex(GetSelectWordCursorPos());
SetEasyChatWordToField(easyChatWord); 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) switch (arg0)
{ {
@@ -931,7 +931,7 @@ int UpdateSelectGroupCursorPos_OutsideBlueBox_GroupMode(u32 arg0)
return 0; return 0;
} }
int UpdateSelectGroupCursorPos_OutsideBlueBox_AlphaMode(u32 arg0) static int UpdateSelectGroupCursorPos_OutsideBlueBox_AlphaMode(u32 arg0)
{ {
switch (arg0) switch (arg0)
{ {
@@ -968,7 +968,7 @@ int UpdateSelectGroupCursorPos_OutsideBlueBox_AlphaMode(u32 arg0)
return 0; return 0;
} }
int UpdateSelectGroupCursorPos_InsideBlueBox(u32 arg0) static int UpdateSelectGroupCursorPos_InsideBlueBox(u32 arg0)
{ {
switch (arg0) switch (arg0)
{ {
@@ -1124,7 +1124,7 @@ static const u8 sAlphabetLayout[][7] = {
{20, 21, 22, 23, 24, 25, 26} {20, 21, 22, 23, 24, 25, 26}
}; };
int GetSelectedLetter(void) static int GetSelectedLetter(void)
{ {
int col = sEasyChatScreen->selectGroupCursorX < NELEMS(*sAlphabetLayout) ? sEasyChatScreen->selectGroupCursorX : 0; int col = sEasyChatScreen->selectGroupCursorX < NELEMS(*sAlphabetLayout) ? sEasyChatScreen->selectGroupCursorX : 0;
int row = sEasyChatScreen->selectGroupCursorY < NELEMS(sAlphabetLayout) ? sEasyChatScreen->selectGroupCursorY : 0; int row = sEasyChatScreen->selectGroupCursorY < NELEMS(sAlphabetLayout) ? sEasyChatScreen->selectGroupCursorY : 0;
src/easy_chat_3.c
+2 -2
View File
@@ -1270,7 +1270,7 @@ static bool8 ECInterfaceCmd_20(void)
static bool8 InitEasyChatGraphicsWork_Internal(void) static bool8 InitEasyChatGraphicsWork_Internal(void)
{ {
sEasyChatGraphicsResources = Alloc(sizeof(*sEasyChatGraphicsResources)); sEasyChatGraphicsResources = Alloc(sizeof(*sEasyChatGraphicsResources));
if (!sEasyChatGraphicsResources) if (sEasyChatGraphicsResources == NULL)
return FALSE; return FALSE;
sEasyChatGraphicsResources->state = 0; sEasyChatGraphicsResources->state = 0;
@@ -1316,7 +1316,7 @@ static void PrintTitleText(void)
{ {
int xOffset; int xOffset;
const u8 *titleText = GetTitleText(); const u8 *titleText = GetTitleText();
if (!titleText) if (titleText == NULL)
return; return;
xOffset = (128 - GetStringWidth(1, titleText, 0)) / 2u; xOffset = (128 - GetStringWidth(1, titleText, 0)) / 2u;