Address review comments

This commit is contained in:
PikalaxALT
2019-10-09 18:12:37 -04:00
parent 5e0f0ca6dc
commit 734cada66a
5 changed files with 16 additions and 16 deletions
+1 -1
View File
@@ -95,7 +95,7 @@ void mb_berry_fix_serve(void) // noreturn
ResetSpriteData(); ResetSpriteData();
ResetTasks(); ResetTasks();
ScanlineEffect_Stop(); ScanlineEffect_Stop();
gHelpSystemEnabled = 0; gHelpSystemEnabled = FALSE;
taskId = CreateTask(mb_berry_fix_task, 0); taskId = CreateTask(mb_berry_fix_task, 0);
gTasks[taskId].data[0] = 0; gTasks[taskId].data[0] = 0;
SetMainCallback2(mb_berry_fix_maincb); SetMainCallback2(mb_berry_fix_maincb);
+2 -2
View File
@@ -1007,14 +1007,14 @@ bool8 sub_812B45C(void)
void HelpSystem_Disable(void) void HelpSystem_Disable(void)
{ {
gHelpSystemEnabled = 0; gHelpSystemEnabled = FALSE;
} }
void HelpSystem_Enable(void) void HelpSystem_Enable(void)
{ {
if (gUnknown_203ADFA != 2 && gUnknown_203ADFA != 3) if (gUnknown_203ADFA != 2 && gUnknown_203ADFA != 3)
{ {
gHelpSystemEnabled = 1; gHelpSystemEnabled = TRUE;
sub_812B4B8(); sub_812B4B8();
} }
} }
+11 -11
View File
@@ -982,7 +982,7 @@ void sub_800A3F4(void)
u8 GetMultiplayerId(void) u8 GetMultiplayerId(void)
{ {
if (gWirelessCommType == TRUE) if (gWirelessCommType == 1)
{ {
return rfu_get_multiplayer_id(); 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) bool8 SendBlock(u8 unused, const void *src, u16 size)
{ {
if (gWirelessCommType == TRUE) if (gWirelessCommType == 1)
{ {
return Rfu_InitBlockSend(src, size); return Rfu_InitBlockSend(src, size);
} }
@@ -1008,7 +1008,7 @@ bool8 SendBlock(u8 unused, const void *src, u16 size)
bool8 sub_800A474(u8 a0) bool8 sub_800A474(u8 a0)
{ {
if (gWirelessCommType == TRUE) if (gWirelessCommType == 1)
{ {
return sub_80FA0F8(a0); return sub_80FA0F8(a0);
} }
@@ -1023,7 +1023,7 @@ bool8 sub_800A474(u8 a0)
bool8 IsLinkTaskFinished(void) bool8 IsLinkTaskFinished(void)
{ {
if (gWirelessCommType == TRUE) if (gWirelessCommType == 1)
{ {
return IsRfuTaskFinished(); return IsRfuTaskFinished();
} }
@@ -1032,7 +1032,7 @@ bool8 IsLinkTaskFinished(void)
u8 GetBlockReceivedStatus(void) u8 GetBlockReceivedStatus(void)
{ {
if (gWirelessCommType == TRUE) if (gWirelessCommType == 1)
{ {
return Rfu_GetBlockReceivedStatus(); return Rfu_GetBlockReceivedStatus();
} }
@@ -1041,7 +1041,7 @@ u8 GetBlockReceivedStatus(void)
void SetBlockReceivedFlag(u8 who) void SetBlockReceivedFlag(u8 who)
{ {
if (gWirelessCommType == TRUE) if (gWirelessCommType == 1)
{ {
Rfu_SetBlockReceivedFlag(who); Rfu_SetBlockReceivedFlag(who);
} }
@@ -1055,7 +1055,7 @@ void ResetBlockReceivedFlags(void)
{ {
int i; int i;
if (gWirelessCommType == TRUE) if (gWirelessCommType == 1)
{ {
for (i = 0; i < MAX_RFU_PLAYERS; i++) for (i = 0; i < MAX_RFU_PLAYERS; i++)
{ {
@@ -1073,7 +1073,7 @@ void ResetBlockReceivedFlags(void)
void ResetBlockReceivedFlag(u8 who) void ResetBlockReceivedFlag(u8 who)
{ {
if (gWirelessCommType == TRUE) if (gWirelessCommType == 1)
{ {
Rfu_ResetBlockReceivedFlag(who); Rfu_ResetBlockReceivedFlag(who);
} }
@@ -1314,7 +1314,7 @@ u8 sub_800AA74(void)
void sub_800AA80(u16 a0) void sub_800AA80(u16 a0)
{ {
if (gWirelessCommType == TRUE) if (gWirelessCommType == 1)
{ {
task_add_05_task_del_08FA224_when_no_RfuFunc(); task_add_05_task_del_08FA224_when_no_RfuFunc();
} }
@@ -1331,7 +1331,7 @@ void sub_800AA80(u16 a0)
void sub_800AAC0(void) void sub_800AAC0(void)
{ {
if (gWirelessCommType == TRUE) if (gWirelessCommType == 1)
{ {
task_add_05_task_del_08FA224_when_no_RfuFunc(); task_add_05_task_del_08FA224_when_no_RfuFunc();
} }
@@ -1386,7 +1386,7 @@ static void sub_800AB38(void)
void sub_800AB9C(void) void sub_800AB9C(void)
{ {
if (gWirelessCommType == TRUE) if (gWirelessCommType == 1)
{ {
sub_80FA42C(); sub_80FA42C();
} }
+1 -1
View File
@@ -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_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_BLDALPHA, BLDALPHA_BLEND(0, 0));
SetGpuReg(REG_OFFSET_BLDY, 7); SetGpuReg(REG_OFFSET_BLDY, 7);
if (gTasks[taskId].tMenuType == 0) if (gTasks[taskId].tMenuType == MAIN_MENU_NEWGAME)
gTasks[taskId].func = Task_ExecuteMainMenuSelection; gTasks[taskId].func = Task_ExecuteMainMenuSelection;
else else
gTasks[taskId].func = Task_WaitFadeAndPrintMainMenuText; gTasks[taskId].func = Task_WaitFadeAndPrintMainMenuText;
+1 -1
View File
@@ -1603,7 +1603,7 @@ void sub_81120AC(u8 taskId)
gTextFlags.autoScroll = FALSE; gTextFlags.autoScroll = FALSE;
gUnknown_2036E28 = 0; gUnknown_2036E28 = 0;
sub_8082740(0); sub_8082740(0);
gHelpSystemEnabled = 1; gHelpSystemEnabled = TRUE;
DestroyTask(taskId); DestroyTask(taskId);
break; break;
} }