dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs

Browse Source
This commit is contained in:
nullableVoidPtr
2018-12-05 22:31:01 +08:00
parent 405f1bb529
commit f9ff7316d5
140 changed files with 27697 additions and 23904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pokeblock.c
View File

@@ -435,7 +435,7 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void))
sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu));
sPokeblockMenu->caseId = caseId;
sPokeblockMenu->callbackOnUse = NULL;
sPokeblockMenu->unkTaskId = INVALID_U8;
sPokeblockMenu->unkTaskId = 0xFF;
sPokeblockMenu->isSwapping = FALSE;
sSavedPokeblockData.callback = callback;
@@ -901,7 +901,7 @@ static void sub_8136344(void)
static void sub_81363BC(void)
{
if (sPokeblockMenu->unkTaskId == INVALID_U8)
if (sPokeblockMenu->unkTaskId == 0xFF)
{
sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed,
0x456, 0x456, &sSavedPokeblockData.lastItemPage);
@@ -910,10 +910,10 @@ static void sub_81363BC(void)
static void sub_8136418(void)
{
if (sPokeblockMenu->unkTaskId != INVALID_U8)
if (sPokeblockMenu->unkTaskId != 0xFF)
{
RemoveScrollIndicatorArrowPair(sPokeblockMenu->unkTaskId);
sPokeblockMenu->unkTaskId = INVALID_U8;
sPokeblockMenu->unkTaskId = 0xFF;
}
}
@@ -1016,7 +1016,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId)
break;
case LIST_B_PRESSED:
PlaySE(SE_SELECT);
gSpecialVar_Result = INVALID_U16;
gSpecialVar_Result = 0xFFFF;
gSpecialVar_ItemId = 0;
FadePaletteAndSetTaskToClosePokeblockCase(taskId);
break;