summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-09 18:12:37 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-09 18:12:37 -0400
commit734cada66a2d9938cdc9a2806f68352d06da6e9a (patch)
tree57199b9dae5c803a0ce9b193fa7f0e923ee8d6fa
parent5e0f0ca6dcf9699b5cd8252c74e4a7676470dbc4 (diff)
Address review comments
-rw-r--r--src/berry_fix_program.c2
-rw-r--r--src/help_system_812B1E0.c4
-rw-r--r--src/link.c22
-rw-r--r--src/main_menu.c2
-rw-r--r--src/quest_log.c2
5 files changed, 16 insertions, 16 deletions
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 7c7c452f3..e60a53ef9 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -95,7 +95,7 @@ void mb_berry_fix_serve(void) // noreturn
ResetSpriteData();
ResetTasks();
ScanlineEffect_Stop();
- gHelpSystemEnabled = 0;
+ gHelpSystemEnabled = FALSE;
taskId = CreateTask(mb_berry_fix_task, 0);
gTasks[taskId].data[0] = 0;
SetMainCallback2(mb_berry_fix_maincb);
diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c
index 6fd069f1c..a527525f8 100644
--- a/src/help_system_812B1E0.c
+++ b/src/help_system_812B1E0.c
@@ -1007,14 +1007,14 @@ bool8 sub_812B45C(void)
void HelpSystem_Disable(void)
{
- gHelpSystemEnabled = 0;
+ gHelpSystemEnabled = FALSE;
}
void HelpSystem_Enable(void)
{
if (gUnknown_203ADFA != 2 && gUnknown_203ADFA != 3)
{
- gHelpSystemEnabled = 1;
+ gHelpSystemEnabled = TRUE;
sub_812B4B8();
}
}
diff --git a/src/link.c b/src/link.c
index c51ec80af..52f5aeddb 100644
--- a/src/link.c
+++ b/src/link.c
@@ -982,7 +982,7 @@ void sub_800A3F4(void)
u8 GetMultiplayerId(void)
{
- if (gWirelessCommType == TRUE)
+ if (gWirelessCommType == 1)
{
return rfu_get_multiplayer_id();
}
@@ -999,7 +999,7 @@ u8 bitmask_all_link_players_but_self(void)
bool8 SendBlock(u8 unused, const void *src, u16 size)
{
- if (gWirelessCommType == TRUE)
+ if (gWirelessCommType == 1)
{
return Rfu_InitBlockSend(src, size);
}
@@ -1008,7 +1008,7 @@ bool8 SendBlock(u8 unused, const void *src, u16 size)
bool8 sub_800A474(u8 a0)
{
- if (gWirelessCommType == TRUE)
+ if (gWirelessCommType == 1)
{
return sub_80FA0F8(a0);
}
@@ -1023,7 +1023,7 @@ bool8 sub_800A474(u8 a0)
bool8 IsLinkTaskFinished(void)
{
- if (gWirelessCommType == TRUE)
+ if (gWirelessCommType == 1)
{
return IsRfuTaskFinished();
}
@@ -1032,7 +1032,7 @@ bool8 IsLinkTaskFinished(void)
u8 GetBlockReceivedStatus(void)
{
- if (gWirelessCommType == TRUE)
+ if (gWirelessCommType == 1)
{
return Rfu_GetBlockReceivedStatus();
}
@@ -1041,7 +1041,7 @@ u8 GetBlockReceivedStatus(void)
void SetBlockReceivedFlag(u8 who)
{
- if (gWirelessCommType == TRUE)
+ if (gWirelessCommType == 1)
{
Rfu_SetBlockReceivedFlag(who);
}
@@ -1055,7 +1055,7 @@ void ResetBlockReceivedFlags(void)
{
int i;
- if (gWirelessCommType == TRUE)
+ if (gWirelessCommType == 1)
{
for (i = 0; i < MAX_RFU_PLAYERS; i++)
{
@@ -1073,7 +1073,7 @@ void ResetBlockReceivedFlags(void)
void ResetBlockReceivedFlag(u8 who)
{
- if (gWirelessCommType == TRUE)
+ if (gWirelessCommType == 1)
{
Rfu_ResetBlockReceivedFlag(who);
}
@@ -1314,7 +1314,7 @@ u8 sub_800AA74(void)
void sub_800AA80(u16 a0)
{
- if (gWirelessCommType == TRUE)
+ if (gWirelessCommType == 1)
{
task_add_05_task_del_08FA224_when_no_RfuFunc();
}
@@ -1331,7 +1331,7 @@ void sub_800AA80(u16 a0)
void sub_800AAC0(void)
{
- if (gWirelessCommType == TRUE)
+ if (gWirelessCommType == 1)
{
task_add_05_task_del_08FA224_when_no_RfuFunc();
}
@@ -1386,7 +1386,7 @@ static void sub_800AB38(void)
void sub_800AB9C(void)
{
- if (gWirelessCommType == TRUE)
+ if (gWirelessCommType == 1)
{
sub_80FA42C();
}
diff --git a/src/main_menu.c b/src/main_menu.c
index 4307e9696..72056d750 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -321,7 +321,7 @@ static void Task_SetWin0BldRegsNoSaveFileCheck(u8 taskId)
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 0));
SetGpuReg(REG_OFFSET_BLDY, 7);
- if (gTasks[taskId].tMenuType == 0)
+ if (gTasks[taskId].tMenuType == MAIN_MENU_NEWGAME)
gTasks[taskId].func = Task_ExecuteMainMenuSelection;
else
gTasks[taskId].func = Task_WaitFadeAndPrintMainMenuText;
diff --git a/src/quest_log.c b/src/quest_log.c
index 71cab91a1..c8bd19174 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -1603,7 +1603,7 @@ void sub_81120AC(u8 taskId)
gTextFlags.autoScroll = FALSE;
gUnknown_2036E28 = 0;
sub_8082740(0);
- gHelpSystemEnabled = 1;
+ gHelpSystemEnabled = TRUE;
DestroyTask(taskId);
break;
}