summaryrefslogtreecommitdiff
path: root/src/pokedex.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pokedex.c')
-rw-r--r--src/pokedex.c66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/pokedex.c b/src/pokedex.c
index 30b4d414c..729f72a7c 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1510,7 +1510,7 @@ void Task_PokedexMainScreen(u8 taskId)
sub_808E6BC();
BeginNormalPaletteFade(
~(1 << (gSprites[gPokedexView->selectedMonSpriteId].oam.paletteNum + 16)),
- 0, 0, 0x10, 0);
+ 0, 0, 16, RGB(0, 0, 0));
gSprites[gPokedexView->selectedMonSpriteId].callback = sub_808EDB8;
gTasks[taskId].func = sub_808CA64;
PlaySE(SE_PIN);
@@ -1527,7 +1527,7 @@ void Task_PokedexMainScreen(u8 taskId)
else if (gMain.newKeys & SELECT_BUTTON)
{
PlaySE(SE_SELECT);
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].data[0] = sub_8091E3C();
gPokedexView->unk64F = 0;
gPokedexView->unk62A = gPokedexView->unk62C;
@@ -1539,7 +1539,7 @@ void Task_PokedexMainScreen(u8 taskId)
}
else if (gMain.newKeys & B_BUTTON)
{
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_ClosePokedex;
PlaySE(SE_PC_OFF);
}
@@ -1592,7 +1592,7 @@ static void Task_PokedexMainScreenMenu(u8 taskId)
gMain.newKeys |= START_BUTTON; //Exit menu
break;
case 3: //CLOSE POKEDEX
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_ClosePokedex;
PlaySE(SE_PC_OFF);
break;
@@ -1703,12 +1703,12 @@ static void Task_PokedexResultsScreen(u8 taskId)
{
if ((gMain.newKeys & A_BUTTON) && gPokedexView->unk0[gPokedexView->selectedPokemon].seen)
{
- u32 a;
+ u32 excludedPalettes;
sub_808E6BC();
- a = (1 << (gSprites[gPokedexView->selectedMonSpriteId].oam.paletteNum + 16));
+ excludedPalettes = (1 << (gSprites[gPokedexView->selectedMonSpriteId].oam.paletteNum + 16));
gSprites[gPokedexView->selectedMonSpriteId].callback = sub_808EDB8;
- BeginNormalPaletteFade(~a, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(~excludedPalettes, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = sub_808D118;
PlaySE(SE_PIN);
}
@@ -1722,7 +1722,7 @@ static void Task_PokedexResultsScreen(u8 taskId)
}
else if (gMain.newKeys & SELECT_BUTTON)
{
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].data[0] = sub_8091E3C();
gPokedexView->unk64F = 0;
gTasks[taskId].func = sub_808CB8C;
@@ -1730,7 +1730,7 @@ static void Task_PokedexResultsScreen(u8 taskId)
}
else if (gMain.newKeys & B_BUTTON)
{
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen;
PlaySE(SE_PC_OFF);
}
@@ -1783,12 +1783,12 @@ static void Task_PokedexResultsScreenMenu(u8 taskId)
gMain.newKeys |= START_BUTTON;
break;
case 3: //BACK TO POKEDEX
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen;
PlaySE(SE_TRACK_DOOR);
break;
case 4: //CLOSE POKEDEX
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_PokedexResultsScreenExitPokedex;
PlaySE(SE_PC_OFF);
break;
@@ -1919,7 +1919,7 @@ static bool8 sub_808D344(u8 a)
gMain.state++;
break;
case 4:
- BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(sub_808C0B8);
gMain.state++;
break;
@@ -2957,13 +2957,13 @@ static void Task_InitPageScreenMultistep(u8 taskId)
break;
case 6:
{
- u32 r3 = 0;
+ u32 excludedPalettes = 0;
if (gTasks[taskId].data[2] != 0)
- r3 = 0x14;
+ excludedPalettes = 0x14;
if (gTasks[taskId].data[1] != 0)
- r3 |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 16));
- BeginNormalPaletteFade(~r3, 0, 16, 0, 0);
+ excludedPalettes |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 16));
+ BeginNormalPaletteFade(~excludedPalettes, 0, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(gUnknown_03005CEC);
gMain.state++;
}
@@ -3011,14 +3011,14 @@ static void Task_PageScreenProcessInput(u8 taskId)
{
if (gTasks[taskId].data[0] != 0)
{
- BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = sub_808F888;
PlaySE(SE_Z_SCROLL);
return;
}
if (gMain.newKeys & B_BUTTON)
{
- BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_ClosePageScreen;
PlaySE(SE_PC_OFF);
return;
@@ -3031,12 +3031,12 @@ static void Task_PageScreenProcessInput(u8 taskId)
sub_8090C68();
break;
case AREA_SCREEN:
- BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_InitAreaScreenMultistep;
PlaySE(SE_PIN);
break;
case CRY_SCREEN:
- BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_InitCryScreenMultistep;
PlaySE(SE_PIN);
break;
@@ -3047,7 +3047,7 @@ static void Task_PageScreenProcessInput(u8 taskId)
}
else
{
- BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_InitSizeScreenMultistep;
PlaySE(SE_PIN);
}
@@ -3219,7 +3219,7 @@ static void Task_InitCryScreenMultistep(u8 taskId)
}
break;
case 8:
- BeginNormalPaletteFade(-0x15, 0, 0x10, 0, 0);
+ BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(gUnknown_03005CEC);
gMain.state++;
break;
@@ -3260,7 +3260,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
{
if (gMain.newKeys & B_BUTTON)
{
- BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
m4aMPlayContinue(&gMPlay_BGM);
gPokedexView->unk64F = 1;
gTasks[taskId].func = sub_808FFBC;
@@ -3270,7 +3270,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
if ((gMain.newKeys & DPAD_LEFT)
|| ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
{
- BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
m4aMPlayContinue(&gMPlay_BGM);
gPokedexView->unk64F = 2;
gTasks[taskId].func = sub_808FFBC;
@@ -3286,7 +3286,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
}
else
{
- BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
m4aMPlayContinue(&gMPlay_BGM);
gPokedexView->unk64F = 3;
gTasks[taskId].func = sub_808FFBC;
@@ -3396,7 +3396,7 @@ static void Task_InitSizeScreenMultistep(u8 taskId)
gMain.state++;
break;
case 7:
- BeginNormalPaletteFade(-0x15, 0, 0x10, 0, 0);
+ BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(gUnknown_03005CEC);
gMain.state++;
break;
@@ -3423,7 +3423,7 @@ static void Task_SizeScreenProcessInput(u8 taskId)
{
if (gMain.newKeys & B_BUTTON)
{
- BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
gPokedexView->unk64F = 1;
gTasks[taskId].func = sub_8090498;
PlaySE(SE_PC_OFF);
@@ -3431,7 +3431,7 @@ static void Task_SizeScreenProcessInput(u8 taskId)
else if ((gMain.newKeys & DPAD_LEFT)
|| ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
{
- BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
gPokedexView->unk64F = 2;
gTasks[taskId].func = sub_8090498;
PlaySE(SE_Z_PAGE);
@@ -3834,7 +3834,7 @@ static void sub_8090750(u8 taskId)
case 4:
spriteId = sub_80918EC(dexNum, 0x30, 0x38, 0);
gSprites[spriteId].oam.priority = 0;
- BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
SetVBlankCallback(gUnknown_03005CEC);
gTasks[taskId].data[3] = spriteId;
gTasks[taskId].data[0]++;
@@ -3863,7 +3863,7 @@ static void sub_8090A3C(u8 taskId)
{
if (gMain.newKeys & B_BUTTON)
{
- BeginNormalPaletteFade(0x0000FFFC, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFC, 0, 0, 16, RGB(0, 0, 0));
gSprites[gTasks[taskId].data[3]].callback = sub_8090C28;
gTasks[taskId].func = sub_8090B8C;
return;
@@ -3883,7 +3883,7 @@ static void sub_8090A3C(u8 taskId)
}
else
{
- BeginNormalPaletteFade(0x0000FFFC, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFC, 0, 0, 16, RGB(0, 0, 0));
gSprites[gTasks[taskId].data[3]].callback = sub_8090C28;
gTasks[taskId].func = sub_8090B8C;
return;
@@ -4760,7 +4760,7 @@ static void sub_8091E54(u8 taskId)
gMain.state++;
break;
case 2:
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
gMain.state++;
break;
case 3:
@@ -5080,7 +5080,7 @@ static void sub_8092644(u8 taskId)
static void sub_80927B8(u8 taskId)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = sub_80927F0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 06:53:30 +0000