summaryrefslogtreecommitdiff
path: root/src/pokeblock.c
diff options
context:
space:
mode:
authornullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-12-05 22:31:01 +0800
committernullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-12-06 10:38:28 +0800
commitf9ff7316d5c7277eb7482e30121388cd65f4ecfc (patch)
treeee8f4a9c338f880a3585d6e9ed9ed695f27cef3d /src/pokeblock.c
parent405f1bb529809b8169364737087189df0fcca1d2 (diff)
Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs
Diffstat (limited to 'src/pokeblock.c')
-rw-r--r--src/pokeblock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 41d6dcc8f..1418588b8 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -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;