dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BeginNormalPaletteFade PALETTES_ALL documentation

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-27 13:16:28 -04:00
parent deec274991
commit 3b98289de2
55 changed files with 189 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_controller_oak_old_man.c
+2 -2
View File
@@ -1874,7 +1874,7 @@ static void OakOldManHandleChooseItem(void)
{
s32 i;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler;
for (i = 0; i < 3; ++i)
@@ -1892,7 +1892,7 @@ static void OakOldManHandleChoosePokemon(void)
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
for (i = 0; i < 3; ++i)
gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i];
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler;
}
src/battle_controller_player.c
+4 -4
View File
@@ -2263,7 +2263,7 @@ static void PlayerHandleFaintAnimation(void)
static void PlayerHandlePaletteFade(void)
{
BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 2, 0, 16, RGB_BLACK);
PlayerBufferExecCompleted();
}
@@ -2449,7 +2449,7 @@ static void PlayerHandleChooseItem(void)
{
s32 i;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler;
for (i = 0; i < 3; ++i)
@@ -2467,7 +2467,7 @@ static void PlayerHandleChoosePokemon(void)
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
for (i = 0; i < 3; ++i)
gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i];
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler;
}
@@ -2475,7 +2475,7 @@ static void PlayerHandleChoosePokemon(void)
static void PlayerHandleCmd23(void)
{
BattleStopLowHpSound();
BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 2, 0, 16, RGB_BLACK);
PlayerBufferExecCompleted();
}
src/battle_controller_pokedude.c
+2 -2
View File
@@ -1610,7 +1610,7 @@ static void PokedudeHandleChooseItem(void)
{
s32 i;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler;
for (i = 0; i < 3; ++i)
@@ -1628,7 +1628,7 @@ static void PokedudeHandleChoosePokemon(void)
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
for (i = 0; i < 3; ++i)
gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i];
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler;
}
src/battle_controller_safari.c
+1 -1
View File
@@ -461,7 +461,7 @@ static void SafariHandleChooseItem(void)
{
s32 i;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
gBattlerInMenuId = gActiveBattler;
}
src/battle_main.c
+2 -2
View File
@@ -1436,7 +1436,7 @@ void BattleMainCB2(void)
{
gSpecialVar_Result = gBattleOutcome = B_OUTCOME_DREW;
ResetPaletteFadeControl();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
SetMainCallback2(CB2_QuitPokedudeBattle);
}
}
@@ -1779,7 +1779,7 @@ static void EndLinkBattleInSteps(void)
case 1:
if (--gBattleCommunication[1] == 0)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
++gBattleCommunication[MULTIUSE_STATE];
}
break;
src/battle_records.c
+2 -2
View File
@@ -127,7 +127,7 @@ static void MainCB2_SetUp(void)
gMain.state++;
break;
case 6:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
gMain.state++;
break;
case 7:
@@ -178,7 +178,7 @@ static void Task_WaitButton(u8 taskId)
static void Task_FadeOut(u8 taskId)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_DestroyAndReturnToField;
}
src/battle_script_commands.c
+2 -2
View File
@@ -5009,7 +5009,7 @@ static void atk5A_yesnoboxlearnmove(void)
if (gBattleCommunication[1] == 0)
{
HandleBattleWindow(0x17, 0x8, 0x1D, 0xD, WINDOW_CLEAR);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
++gBattleScripting.learnMoveState;
}
else
@@ -9173,7 +9173,7 @@ static void atkF2_displaydexinfo(void)
switch (gBattleCommunication[0])
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITE);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_WHITE);
++gBattleCommunication[0];
break;
case 1:
src/battle_transition.c
+4 -4
View File
@@ -711,7 +711,7 @@ static bool8 BT_Phase2Blur_Anim(struct Task *task)
{
task->tInterval = 2;
if (++task->tMosaicSize == 10)
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 0x10, RGB_BLACK);
// The mosaic size argument is shared by HSIZE and VSIZE
SetGpuReg(REG_OFFSET_MOSAIC, (task->tMosaicSize & 0xF) + ((task->tMosaicSize & 0xF) << 4));
if (task->tMosaicSize > 14)
@@ -742,7 +742,7 @@ static bool8 BT_Phase2DistortedWave_InitWave(struct Task *task)
{
BT_InitCtrlBlk();
ScanlineEffect_Clear();
BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 4, 0, 0x10, RGB_BLACK);
BT_LoadWaveIntoBuffer(gScanlineEffectRegBuffers[1], sTransitionStructPtr->bg123HOfs, 0, 2, 0, 160);
SetVBlankCallback(VBCB_BT_Phase2DistortedWave);
SetHBlankCallback(HBCB_BT_Phase2DistortedWave);
@@ -788,7 +788,7 @@ static bool8 BT_Phase2HorizontalCorrugate_Init(struct Task *task)
{
BT_InitCtrlBlk();
ScanlineEffect_Clear();
BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 4, 0, 0x10, RGB_BLACK);
memset(gScanlineEffectRegBuffers[1], sTransitionStructPtr->bg123VOfs, 320);
SetVBlankCallback(VBCB_BT_Phase2HorizontalCorrugate);
SetHBlankCallback(HBCB_BT_Phase2HorizontalCorrugate);
@@ -1382,7 +1382,7 @@ static bool8 BT_Phase2FullScreenWave_UpdateWave(struct Task *task)
if (++task->tDelayForFade == 41)
{
++task->tStartFade;
BeginNormalPaletteFade(0xFFFFFFFF, -8, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -8, 0, 0x10, RGB_BLACK);
}
if (task->tStartFade && !gPaletteFade.active)
DestroyTask(FindTaskIdByFunc(BT_Phase2FullScreenWave));
src/berry_pouch.c
+3 -3
View File
@@ -556,7 +556,7 @@ static bool8 RunBerryPouchInit(void)
gMain.state++;
break;
case 18:
BeginNormalPaletteFade(0xFFFFFFFF, -2, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -2, 16, 0, RGB_BLACK);
gMain.state++;
break;
default:
@@ -570,7 +570,7 @@ static bool8 RunBerryPouchInit(void)
static void AbortBerryPouchLoading(void)
{
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK);
CreateTask(Task_AbortBerryPouchLoading_WaitFade, 0);
SetVBlankCallback(VBlankCB_BerryPouchIdle);
SetMainCallback2(CB2_BerryPouchIdle);
@@ -859,7 +859,7 @@ static void BerryPouch_DestroyResources(void)
void BerryPouch_StartFadeToExitCallback(u8 taskId)
{
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_BerryPouchFadeToExitCallback;
}
src/clear_save_data_screen.c
+1 -1
View File
@@ -90,7 +90,7 @@ static void Task_DrawClearSaveDataScreen(u8 taskId)
switch (sClearSaveDataState->unk1)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
break;
case 1:
if (gPaletteFade.active)
src/credits.c
+7 -7
View File
@@ -899,7 +899,7 @@ static s32 RollCredits(void)
case CREDITSSCRCMD_THEENDGFX:
sCreditsMgr->mainseqno = CREDITSSCENE_THEEND_DESTROY_ASSETS;
sCreditsMgr->whichMon = sCreditsScript[sCreditsMgr->scrcmdidx].param;
BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 4, 0, 16, RGB_BLACK);
break;
case CREDITSSCRCMD_WAITBUTTON:
sCreditsMgr->mainseqno = CREDITSSCENE_WAITBUTTON;
@@ -1004,7 +1004,7 @@ static s32 RollCredits(void)
case CREDITSSCENE_WAITBUTTON:
if (JOY_NEW(A_BUTTON))
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_WHITE);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_WHITE);
sCreditsMgr->mainseqno = CREDITSSCENE_TERMINATE;
return 0;
}
@@ -1015,7 +1015,7 @@ static s32 RollCredits(void)
else
{
sCreditsMgr->mainseqno = CREDITSSCENE_TERMINATE;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_WHITE);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_WHITE);
}
return 0;
case CREDITSSCENE_TERMINATE:
@@ -1136,7 +1136,7 @@ static bool32 DoCreditsMonScene(void)
case 2:
ShowBg(2);
ShowBg(0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
sCreditsMgr->creditsMonTimer = 40;
sCreditsMgr->subseqno++;
break;
@@ -1200,7 +1200,7 @@ static bool32 DoCreditsMonScene(void)
sCreditsMgr->creditsMonTimer--;
else
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sCreditsMgr->subseqno++;
}
break;
@@ -1251,9 +1251,9 @@ static bool32 DoCopyrightOrTheEndGfxScene(void)
case 2:
ShowBg(0);
if (sCreditsMgr->whichMon != 0)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0, RGB_BLACK);
else
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
sCreditsMgr->subseqno++;
break;
case 3:
src/daycare.c
+5 -5
View File
@@ -1758,7 +1758,7 @@ void EggHatch(void)
{
ScriptContext2_Enable();
CreateTask(Task_EggHatch, 10);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0);
HelpSystem_Disable();
}
@@ -1895,7 +1895,7 @@ static void CB2_EggHatch_1(void)
switch (sEggHatchData->CB2_state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
sEggHatchData->eggSpriteID = CreateSprite(&sSpriteTemplate_EggHatch, 120, 75, 5);
ShowBg(0);
ShowBg(1);
@@ -1977,7 +1977,7 @@ static void CB2_EggHatch_1(void)
}
break;
case 11:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
sEggHatchData->CB2_state++;
break;
case 12:
@@ -2087,7 +2087,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite)
{
s16 i;
if (sprite->data[0] == 0)
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0xFFFF);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 0x10, 0xFFFF);
if (sprite->data[0] < 4u)
{
for (i = 0; i <= 3; i++)
@@ -2111,7 +2111,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite)
StartSpriteAffineAnim(&gSprites[sEggHatchData->pokeSpriteID], 1);
}
if (sprite->data[0] == 8)
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, 0xFFFF);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0x10, 0, 0xFFFF);
if (sprite->data[0] <= 9)
gSprites[sEggHatchData->pokeSpriteID].y -= 1;
if (sprite->data[0] > 40)
src/diploma.c
+2 -2
View File
@@ -138,7 +138,7 @@ static void Task_DiplomaInit(u8 taskId)
CopyBgTilemapBufferToVram(1);
break;
case 7:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
break;
case 8:
SetVBlankCallback(VCBC_DiplomaOam);
@@ -167,7 +167,7 @@ static void Task_WaitForExit(u8 taskId)
case 1:
if (JOY_NEW(A_BUTTON))
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gDiploma->state++;
}
break;
src/dodrio_berry_picking.c
+4 -4
View File
@@ -333,7 +333,7 @@ static void sub_8150A84(u8 taskId)
break;
case 6:
BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
SetVBlankCallback(sub_8152034);
gUnknown_203F3E0->unk0C++;
break;
@@ -834,7 +834,7 @@ static void sub_81514F0(void)
switch (gUnknown_203F3E0->unk10)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gUnknown_203F3E0->unk10++;
break;
case 1:
@@ -871,7 +871,7 @@ static void sub_815159C(void)
{
case 0:
sub_81549D4(9);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gUnknown_203F3E0->unk10++;
break;
case 1:
@@ -903,7 +903,7 @@ static void sub_815159C(void)
break;
case 5:
BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
gUnknown_203F3E0->unk10++;
break;
case 6:
src/easy_chat_2.c
+2 -2
View File
@@ -163,14 +163,14 @@ static void Task_RunEasyChat(u8 taskId)
case 0:
SetVBlankCallback(VBlankCallback_EasyChatScreen);
BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
data[EZCHAT_TASK_STATE]++;
break;
case 1:
action = EasyChatScreen_HandleJoypad();
if (action == 23)
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK);
data[EZCHAT_TASK_STATE] = 3;
}
else if (action != 0)
src/evolution_scene.c
+7 -7
View File
@@ -168,7 +168,7 @@ static void Task_BeginEvolutionScene(u8 taskId)
switch (gTasks[taskId].tState)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].tState++;
break;
case 1:
@@ -366,7 +366,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
SetVBlankCallback(VBlankCB_EvolutionScene);
SetMainCallback2(CB2_EvolutionSceneUpdate);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
ShowBg(0);
ShowBg(1);
@@ -450,7 +450,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
gMain.state++;
break;
case 7:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
InitTradeSequenceBgGpuRegs();
ShowBg(0);
ShowBg(1);
@@ -610,7 +610,7 @@ static void Task_EvolutionScene(u8 taskId)
switch (gTasks[taskId].tState)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
gSprites[sEvoStructPtr->preEvoSpriteId].invisible = FALSE;
gTasks[taskId].tState++;
ShowBg(0);
@@ -755,7 +755,7 @@ static void Task_EvolutionScene(u8 taskId)
}
else // no move to learn
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].tState++;
}
}
@@ -889,7 +889,7 @@ static void Task_EvolutionScene(u8 taskId)
{
gTasks[taskId].tLearnMoveState = gTasks[taskId].tData7;
if (gTasks[taskId].tLearnMoveState == 5)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
}
}
if (JOY_NEW(B_BUTTON))
@@ -1234,7 +1234,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
gTasks[taskId].tLearnMoveState = gTasks[taskId].tData7;
if (gTasks[taskId].tLearnMoveState == 5)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
break;
case 1:
case -1:
src/fame_checker.c
+2 -2
View File
@@ -695,7 +695,7 @@ static void MainCB2_LoadFameChecker(void)
LoadUISpriteSheetsAndPalettes();
CreateAllFlavorTextIcons(FAMECHECKER_OAK);
WipeMsgBoxAndTransfer();
BeginNormalPaletteFade(0xFFFFFFFF,0, 16, 0, 0);
BeginNormalPaletteFade(PALETTES_ALL,0, 16, 0, 0);
gMain.state++;
break;
case 7:
@@ -1010,7 +1010,7 @@ static bool8 SetMessageSelectorIconObjMode(u8 spriteId, u8 objMode)
static void Task_StartToCloseFameChecker(u8 taskId)
{
PlaySE(SE_M_SWIFT);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0);
gTasks[taskId].func = Task_DestroyAssetsAndCloseFameChecker;
}
src/field_weather.c
+2 -2
View File
@@ -763,7 +763,7 @@ void FadeScreen(u8 mode, s8 delay)
if (useWeatherPal)
CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_SIZE);
BeginNormalPaletteFade(0xFFFFFFFF, delay, 0, 16, fadeColor);
BeginNormalPaletteFade(PALETTES_ALL, delay, 0, 16, fadeColor);
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT;
}
else
@@ -772,7 +772,7 @@ void FadeScreen(u8 mode, s8 delay)
if (useWeatherPal)
gWeatherPtr->fadeScreenCounter = 0;
else
BeginNormalPaletteFade(0xFFFFFFFF, delay, 16, 0, fadeColor);
BeginNormalPaletteFade(PALETTES_ALL, delay, 16, 0, fadeColor);
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN;
gWeatherPtr->fadeInActive = 1;
src/fldeff_flash.c
+2 -2
View File
@@ -443,7 +443,7 @@ static void Task_MapPreviewScreen_0(u8 taskId)
case 2:
if (!IsDma3ManagerBusyWithBgCopy())
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
SetVBlankCallback((IntrCallback)GetWordTaskArg(taskId, 5));
data[0]++;
}
@@ -459,7 +459,7 @@ static void Task_MapPreviewScreen_0(u8 taskId)
data[1]++;
if (data[1] > data[2] || JOY_HELD(B_BUTTON))
{
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_WHITE);
BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_WHITE);
data[0]++;
}
break;
src/hall_of_fame.c
+3 -3
View File
@@ -339,7 +339,7 @@ static bool8 InitHallOfFameScreen(void)
if (!DrawHofBackground())
{
SetVBlankCallback(VBlankCB_HofIdle);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
gMain.state++;
}
break;
@@ -560,7 +560,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId)
{
u16 i;
BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_OBJECTS, 0, 0, 0, RGB_BLACK);
for (i = 0; i < PARTY_SIZE; i++)
{
if (gTasks[taskId].data[5 + i] != 0xFF)
@@ -656,7 +656,7 @@ static void Task_Hof_ExitOnKeyPressed(u8 taskId)
static void Task_Hof_HandlePaletteOnExit(u8 taskId)
{
CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_BUFFER_SIZE * sizeof(u16));
BeginNormalPaletteFade(0xFFFFFFFF, 8, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 8, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_Hof_HandleExit;
}
src/hof_pc.c
+2 -2
View File
@@ -22,7 +22,7 @@ static void Task_WaitFadeAndSetCallback(u8 taskId)
void HallOfFamePCBeginFade(void)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
ScriptContext2_Enable();
CreateTask(Task_WaitFadeAndSetCallback, 0);
}
@@ -39,7 +39,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void)
Overworld_PlaySpecialMapMusic();
CreatePCMenu();
ScriptMenu_DisplayPCStartupPrompt();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
CreateTask(Task_WaitForPaletteFade, 10);
}
src/intro.c
+2 -2
View File
@@ -811,7 +811,7 @@ static bool8 RunCopyrightScreen(void)
ResetTasks();
ResetSpriteData();
FreeAllSpritePalettes();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0xFFFF);
SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(7));
EnableInterrupts(INTR_FLAG_VBLANK);
SetVBlankCallback(VBlankCB_Copyright);
@@ -828,7 +828,7 @@ static bool8 RunCopyrightScreen(void)
GameCubeMultiBoot_Main(&sGcmb);
if (sGcmb.gcmb_field_2 != 1)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gMain.state++;
}
break;
src/item_menu.c
+4 -4
View File
@@ -512,7 +512,7 @@ static bool8 LoadBagMenuGraphics(void)
static void FadeOutOfBagMenu(void)
{
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK);
CreateTask(Task_WaitFadeOutOfBagMenu, 0);
SetVBlankCallback(VBlankCB_BagMenuRun);
SetMainCallback2(CB2_BagMenuRun);
@@ -897,7 +897,7 @@ static void DestroyBagMenuResources(void)
void ItemMenu_StartFadeToExitCallback(u8 taskId)
{
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_ItemMenu_WaitFadeAndSwitchToExitCallback;
}
@@ -926,7 +926,7 @@ static void ShowBagOrBeginWin0OpenTask(void)
SetGpuReg(REG_OFFSET_WININ, 0);
SetGpuReg(REG_OFFSET_WINOUT, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
if (gBagMenuState.bagOpen == TRUE)
{
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 240));
@@ -2144,7 +2144,7 @@ static void Task_Bag_OldManTutorial(u8 taskId)
static void Task_Pokedude_FadeFromBag(u8 taskId)
{
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_Pokedude_WaitFadeAndExitBag;
}
src/item_pc.c
+3 -3
View File
@@ -368,7 +368,7 @@ static bool8 ItemPc_DoGfxSetup(void)
case 19:
if (sListMenuState.initialized == 1)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
}
else
{
@@ -392,7 +392,7 @@ static bool8 ItemPc_DoGfxSetup(void)
static void ItemPc_FadeAndBail(void)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
CreateTask(Task_ItemPcWaitFadeAndBail, 0);
SetVBlankCallback(ItemPc_VBlankCB);
SetMainCallback2(ItemPc_MainCB);
@@ -632,7 +632,7 @@ static void Task_ItemPcTurnOff1(u8 taskId)
{
if (sListMenuState.initialized == 1)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
}
else
{
src/learn_move.c
+6 -6
View File
@@ -368,7 +368,7 @@ void DisplayMoveTutorMenu(void)
{
ScriptContext2_Enable();
CreateTask(Task_InitMoveRelearnerMenu, 10);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
}
static void Task_InitMoveRelearnerMenu(u8 taskId)
@@ -480,7 +480,7 @@ static void MoveRelearnerStateMachine(void)
switch (sMoveRelearner->state)
{
case MENU_STATE_FADE_TO_BLACK:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
ShowBg(0);
ShowBg(1);
LoadMoveInfoUI();
@@ -593,7 +593,7 @@ static void MoveRelearnerStateMachine(void)
break;
case MENU_STATE_PRINT_WHICH_MOVE_PROMPT:
sMoveRelearner->state = 20;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
break;
case MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN:
if (!gPaletteFade.active)
@@ -608,10 +608,10 @@ static void MoveRelearnerStateMachine(void)
sMoveRelearner->state = 14;
break;
case 22:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
break;
case MENU_STATE_FADE_AND_RETURN:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sMoveRelearner->state++;
break;
case MENU_STATE_RETURN_TO_FIELD:
@@ -623,7 +623,7 @@ static void MoveRelearnerStateMachine(void)
}
break;
case MENU_STATE_FADE_FROM_SUMMARY_SCREEN:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
ShowBg(0);
ShowBg(1);
sMoveRelearner->state++;
src/link.c
+1 -1
View File
@@ -449,7 +449,7 @@ void LinkTestProcessKeyInput(void)
}
if (JOY_NEW(L_BUTTON))
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(2, 0, 0));
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB(2, 0, 0));
}
if (JOY_NEW(START_BUTTON))
{
src/mail.c
+2 -2
View File
@@ -609,7 +609,7 @@ static bool8 DoInitMailView(void)
ShowBg(0);
ShowBg(1);
ShowBg(2);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
gPaletteFade.bufferTransferDisabled = FALSE;
sMailViewResources->showMailCallback = ShowMailCB_WaitFadeIn;
return TRUE;
@@ -707,7 +707,7 @@ static void ShowMailCB_WaitButton(void)
{
if (JOY_NEW(A_BUTTON | B_BUTTON))
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sMailViewResources->showMailCallback = ShowMailCB_Teardown;
}
}
src/main_menu.c
+6 -6
View File
@@ -280,7 +280,7 @@ static void PrintSaveErrorStatus(u8 taskId, const u8 *str)
{
PrintMessageOnWindow4(str);
gTasks[taskId].func = Task_SaveErrorStatus_RunPrinterThenWaitButton;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0xFFFF);
ShowBg(0);
SetVBlankCallback(VBlankCB_MainMenu);
}
@@ -395,7 +395,7 @@ static void Task_WaitDma3AndFadeIn(u8 taskId)
if (WaitDma3Request(-1) != -1)
{
gTasks[taskId].func = Task_UpdateVisualSelection;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0xFFFF);
ShowBg(0);
SetVBlankCallback(VBlankCB_MainMenu);
}
@@ -453,7 +453,7 @@ static void Task_ExecuteMainMenuSelection(u8 taskId)
{
SetStdFrame0OnBg(0);
gTasks[taskId].func = Task_MysteryGiftError;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
return;
}
else
@@ -515,7 +515,7 @@ static void Task_MysteryGiftError(u8 taskId)
if (JOY_NEW(A_BUTTON | B_BUTTON))
{
PlaySE(SE_SELECT);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_ReturnToTileScreen;
}
break;
@@ -571,13 +571,13 @@ static bool8 HandleMenuInput(u8 taskId)
{
PlaySE(SE_SELECT);
IsWirelessAdapterConnected(); // called for its side effects only
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_ExecuteMainMenuSelection;
}
else if (JOY_NEW(B_BUTTON))
{
PlaySE(SE_SELECT);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 240));
SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0, 160));
gTasks[taskId].func = Task_ReturnToTileScreen;
src/mevent_show_card.c
+4 -4
View File
@@ -170,7 +170,7 @@ s32 FadeToWonderCardMenu(void)
switch(sMEventScreenData->state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
break;
case 1:
if (UpdatePaletteFade())
@@ -214,7 +214,7 @@ s32 FadeToWonderCardMenu(void)
ShowBg(2);
gPaletteFade.bufferTransferDisabled = FALSE;
sub_8146060();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
UpdatePaletteFade();
break;
default:
@@ -234,7 +234,7 @@ s32 FadeOutFromWonderCard(bool32 flag)
switch (sMEventScreenData->state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
break;
case 1:
if (UpdatePaletteFade())
@@ -264,7 +264,7 @@ s32 FadeOutFromWonderCard(bool32 flag)
break;
case 6:
CopyBgTilemapBufferToVram(0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
break;
default:
if (UpdatePaletteFade())
src/mevent_show_news.c
+4 -4
View File
@@ -105,7 +105,7 @@ s32 FadeToWonderNewsMenu(void)
switch (sWork->state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
break;
case 1:
if (UpdatePaletteFade())
@@ -158,7 +158,7 @@ s32 FadeToWonderNewsMenu(void)
ShowBg(3);
gPaletteFade.bufferTransferDisabled = FALSE;
sWork->menuIndicatorsId = AddScrollIndicatorArrowPair(&sWork->scrollArrowsTemplate, &sWork->scrollOffset);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
UpdatePaletteFade();
break;
default:
@@ -179,7 +179,7 @@ s32 FadeOutFromWonderNews(bool32 flag)
switch (sWork->state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
break;
case 1:
if (UpdatePaletteFade())
@@ -223,7 +223,7 @@ s32 FadeOutFromWonderNews(bool32 flag)
MG_DrawCheckerboardPattern();
CopyBgTilemapBufferToVram(0);
CopyBgTilemapBufferToVram(3);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
break;
default:
if (UpdatePaletteFade())
src/naming_screen.c
+2 -2
View File
@@ -609,7 +609,7 @@ static bool8 MainState_BeginFadeIn(void)
CopyBgTilemapBufferToVram(2);
CopyBgTilemapBufferToVram(3);
BlendPalettes(-1, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
sNamingScreenData->state++;
return FALSE;
}
@@ -663,7 +663,7 @@ static bool8 pokemon_store(void)
static bool8 MainState_BeginFadeInOut(void)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sNamingScreenData->state++;
return FALSE;
}
src/oak_speech.c
+8 -8
View File
@@ -573,7 +573,7 @@ static void Task_OaksSpeech1(u8 taskId)
BlendPalettes(0xFFFFFFFF, 0x10, 0x00);
break;
case 10:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
ShowBg(0);
ShowBg(1);
@@ -693,7 +693,7 @@ static void Task_OakSpeech3(u8 taskId)
}
else
{
BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0);
BeginNormalPaletteFade(PALETTES_ALL, 2, 0, 16, 0);
gTasks[taskId].func = Task_OakSpeech5;
}
}
@@ -752,7 +752,7 @@ static void Task_OakSpeech6(u8 taskId)
gSprites[data[5]].oam.objMode = ST_OAM_OBJ_BLEND;
gSprites[data[5]].oam.priority = 0;
CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 2, 16, 0, 0);
BeginNormalPaletteFade(PALETTES_ALL, 2, 16, 0, 0);
gTasks[taskId].func = Task_OakSpeech7;
}
}
@@ -850,7 +850,7 @@ static void Task_OakSpeech7(u8 taskId)
SetGpuReg(REG_OFFSET_WININ, 0);
SetGpuReg(REG_OFFSET_WINOUT, 0);
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 2, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_OakSpeech8;
}
break;
@@ -894,7 +894,7 @@ static void Task_OakSpeech9(u8 taskId)
LoadOaksSpeechTrainerPic(OAK_PIC, 0);
CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 1);
PlayBGM(MUS_ROUTE24);
BeginNormalPaletteFade(0xFFFFFFFF, 5, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 5, 16, 0, RGB_BLACK);
data[3] = 80;
ShowBg(2);
gTasks[taskId].func = Task_OakSpeech10;
@@ -1150,7 +1150,7 @@ static void Task_OakSpeech24(u8 taskId)
{
if (!IsTextPrinterActive(0))
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sOakSpeechResources->hasPlayerBeenNamed = FALSE;
gTasks[taskId].func = Task_OakSpeech25;
}
@@ -1209,7 +1209,7 @@ static void Task_OakSpeech29(u8 taskId)
break;
case 0:
PlaySE(SE_SELECT);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0);
gTasks[taskId].func = Task_OakSpeech25;
break;
case -1:
@@ -1610,7 +1610,7 @@ static void CB2_ReturnFromNamingScreen(void)
gTasks[taskId].data[15] = 1;
break;
case 7:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
ShowBg(0);
ShowBg(1);
src/option_menu.c
+2 -2
View File
@@ -361,7 +361,7 @@ static void Task_OptionMenu(u8 taskId)
switch (sOptionMenuPtr->loadState)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
OptionMenu_SetVBlankCallback();
sOptionMenuPtr->loadState++;
break;
@@ -394,7 +394,7 @@ static void Task_OptionMenu(u8 taskId)
}
break;
case 3:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
sOptionMenuPtr->loadState++;
break;
case 4:
src/overworld.c
+1 -1
View File
@@ -2516,7 +2516,7 @@ static void CameraCB_CreditsPan(struct CameraObject * camera)
static void Task_OvwldCredits_FadeOut(u8 taskId)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_OvwldCredits_WaitFade;
}
src/party_menu.c
+3 -3
View File
@@ -578,7 +578,7 @@ static bool8 ShowPartyMenu(void)
++gMain.state;
break;
case 22:
BeginNormalPaletteFade(0xFFFFFFFF, -2, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -2, 16, 0, RGB_BLACK);
gPaletteFade.bufferTransferDisabled = FALSE;
++gMain.state;
break;
@@ -592,7 +592,7 @@ static bool8 ShowPartyMenu(void)
static void ExitPartyMenu(void)
{
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK);
CreateTask(Task_ExitPartyMenu, 0);
SetVBlankCallback(VBlankCB_PartyMenu);
SetMainCallback2(CB2_UpdatePartyMenu);
@@ -1077,7 +1077,7 @@ static void SwapPartyPokemon(struct Pokemon *mon1, struct Pokemon *mon2)
static void Task_ClosePartyMenu(u8 taskId)
{
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_ClosePartyMenuAndSetCB2;
}
src/party_menu_specials.c
+2 -2
View File
@@ -18,7 +18,7 @@ void ChoosePartyMon(void)
ScriptContext2_Enable();
taskId = CreateTask(sub_80BF97C, 10);
gTasks[taskId].data[0] = PARTY_MENU_TYPE_CHOOSE_MON;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
}
void SelectMoveTutorMon(void)
@@ -28,7 +28,7 @@ void SelectMoveTutorMon(void)
ScriptContext2_Enable();
taskId = CreateTask(sub_80BF97C, 10);
gTasks[taskId].data[0] = PARTY_MENU_TYPE_MOVE_RELEARNER;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
}
static void sub_80BF97C(u8 taskId)
src/pokedex_screen.c
+3 -3
View File
@@ -947,7 +947,7 @@ bool8 DoClosePokedex(void)
switch (gMain.state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gMain.state++;
return FALSE;
case 1:
@@ -1017,7 +1017,7 @@ static void Task_PokedexScreen(u8 taskId)
if (gPaletteFade.bufferTransferDisabled)
{
gPaletteFade.bufferTransferDisabled = FALSE;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0, RGB_WHITEALPHA);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0, RGB_WHITEALPHA);
}
else
BeginNormalPaletteFade(~0x8000, 0, 16, 0, RGB_WHITEALPHA);
@@ -3355,7 +3355,7 @@ static void Task_DexScreen_RegisterMonToPokedex(u8 taskId)
break;
case 4:
gPaletteFade.bufferTransferDisabled = 0;
BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0xffff);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0xffff);
ShowBg(3);
ShowBg(2);
ShowBg(1);
src/pokemon_special_anim.c
+6 -6
View File
@@ -179,7 +179,7 @@ static void Task_UseItem_Normal(u8 taskId)
case 1:
if (!PokemonSpecialAnimSceneInitIsNotFinished())
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
ptr->state++;
SetVBlankCallback(VBlankCB_PSA);
}
@@ -249,7 +249,7 @@ static void Task_UseItem_Normal(u8 taskId)
{
if (CheckIfItemIsTMHMOrEvolutionStone(ptr->itemId) != 2) // evo stone
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK);
ptr->state++;
}
else
@@ -289,7 +289,7 @@ static void Task_ForgetMove(u8 taskId)
case 1:
if (!PokemonSpecialAnimSceneInitIsNotFinished())
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
ptr->state++;
SetVBlankCallback(VBlankCB_PSA);
}
@@ -398,7 +398,7 @@ static void Task_EvoStone_CantEvolve(u8 taskId)
case 1:
if (!PokemonSpecialAnimSceneInitIsNotFinished())
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
ptr->state++;
SetVBlankCallback(VBlankCB_PSA);
}
@@ -438,7 +438,7 @@ static void Task_EvoStone_CantEvolve(u8 taskId)
case 8:
if (JOY_NEW(A_BUTTON | B_BUTTON))
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK);
ptr->state++;
}
break;
@@ -475,7 +475,7 @@ static void Task_UseTM_NoForget(u8 taskId)
case 1:
if (!PokemonSpecialAnimSceneInitIsNotFinished())
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
ptr->state++;
SetVBlankCallback(VBlankCB_PSA);
}
src/pokemon_storage_system_3.c
+4 -4
View File
@@ -584,7 +584,7 @@ static void Cb_ReshowPSS(u8 taskId)
switch (gPSSData->state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0x10, 0, RGB_BLACK);
gPSSData->state++;
break;
case 1:
@@ -1860,7 +1860,7 @@ static void Cb_NameBox(u8 taskId)
{
case 0:
sub_8093630();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gPSSData->state++;
break;
case 1:
@@ -1880,7 +1880,7 @@ static void Cb_ShowMonSummary(u8 taskId)
{
case 0:
sub_80936B8();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gPSSData->state++;
break;
case 1:
@@ -1899,7 +1899,7 @@ static void Cb_GiveItemFromBag(u8 taskId)
switch (gPSSData->state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gPSSData->state++;
break;
case 1:
src/pokemon_summary_screen.c
+5 -5
View File
@@ -1102,7 +1102,7 @@ static void Task_InputHandler_Info(u8 taskId)
{
switch (sMonSummaryScreen->state3270) {
case PSS_STATE3270_FADEIN:
BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0);
sMonSummaryScreen->state3270 = PSS_STATE3270_PLAYCRY;
break;
case PSS_STATE3270_PLAYCRY:
@@ -1211,7 +1211,7 @@ static void Task_InputHandler_Info(u8 taskId)
}
break;
case PSS_STATE3270_ATEXIT_FADEOUT:
BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0);
sMonSummaryScreen->state3270 = PSS_STATE3270_ATEXIT_WAITLINKDELAY;
break;
case PSS_STATE3270_ATEXIT_WAITLINKDELAY:
@@ -1958,7 +1958,7 @@ static void CB2_SetUpPSS(void)
CommitStaticWindowTilemaps();
break;
case 13:
BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0);
CopyWindowToVram(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME], 2);
CopyWindowToVram(sMonSummaryScreen->windowIds[POKESUM_WIN_CONTROLS], 2);
CopyWindowToVram(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2);
@@ -3782,7 +3782,7 @@ static void Task_InputHandler_SelectOrForgetMove(u8 taskId)
switch (sMonSummaryScreen->selectMoveInputHandlerState)
{
case 0:
BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0);
sMonSummaryScreen->selectMoveInputHandlerState++;
break;
case 1:
@@ -3903,7 +3903,7 @@ static void Task_InputHandler_SelectOrForgetMove(u8 taskId)
sMonSummaryScreen->selectMoveInputHandlerState = 2;
break;
case 6:
BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0);
sMonSummaryScreen->selectMoveInputHandlerState++;
break;
default:
src/quest_log.c
+1 -1
View File
@@ -852,7 +852,7 @@ static void Task_RunPlaybackCB(u8 taskId)
case 0:
if (++data[0] == 0x7F)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0);
sQuestLogCurrentScene.sceneEndMode = 2;
data[1]++;
}
src/region_map.c
+6 -6
View File
@@ -1534,7 +1534,7 @@ static void CB2_OpenRegionMap(void)
SetBg0andBg3Hidden(TRUE);
break;
default:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
CreateMainMapTask();
SetRegionMapVBlankCB();
break;
@@ -1730,7 +1730,7 @@ static void Task_RegionMap(u8 taskId)
}
break;
case 5:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
_080C0798:
sRegionMap->mainState++;
break;
@@ -2811,7 +2811,7 @@ static void Task_MapOpenAnim(u8 taskId)
case 3:
CopyBgTilemapBufferToVram(1);
BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
SetRegionMapVBlankCB();
sMapOpenCloseAnim->openState++;
break;
@@ -3909,7 +3909,7 @@ static void LoadMapIcons(u8 taskId)
break;
case 3:
BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
sMapIcons->state++;
break;
case 4:
@@ -4322,7 +4322,7 @@ static void Task_FlyMap(u8 taskId)
switch (sFlyMap->state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
InitMapIcons(GetSelectedRegionMap(), taskId, GetMainMapTask());
CreateMapCursor(0, 0);
CreatePlayerIcon(1, 1);
@@ -4422,7 +4422,7 @@ static void Task_FlyMap(u8 taskId)
sFlyMap->state++;
break;
case 6:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sFlyMap->state++;
break;
default:
src/seagallop.c
+1 -1
View File
@@ -230,7 +230,7 @@ static void CB2_SetUpSeagallopScene(void)
gMain.state++;
break;
case 6:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
gMain.state++;
break;
case 7:
src/shop.c
+2 -2
View File
@@ -404,7 +404,7 @@ static void CB2_InitBuyMenu(void)
taskId = CreateTask(Task_BuyMenu, 8);
gTasks[taskId].tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
SetVBlankCallback(VBlankCB_BuyMenu);
SetMainCallback2(CB2_BuyMenu);
break;
@@ -1045,7 +1045,7 @@ static void BuyMenuReturnToItemList(u8 taskId)
static void ExitBuyMenu(u8 taskId)
{
gFieldCallback = MapPostLoadHook_ReturnToShopMenu;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_ExitBuyMenu;
}
src/slot_machine.c
+2 -2
View File
@@ -2016,7 +2016,7 @@ static bool8 SlotsTask_GraphicsInit(u8 * state, struct SlotMachineSetupTaskData
HideBg(1);
InitReelButtonTileMem();
BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_HBLANK);
(*state)++;
}
@@ -2035,7 +2035,7 @@ static bool8 SlotsTask_FadeOut(u8 * state, struct SlotMachineSetupTaskData * ptr
switch (*state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, 0);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, 0);
(*state)++;
break;
case 1:
src/start_menu.c
+2 -2
View File
@@ -913,7 +913,7 @@ static void task50_after_link_battle_save(u8 taskId)
DrawTextBorderOuter(0, 0x008, 0x0F);
PutWindowTilemap(0);
CopyWindowToVram(0, COPYWIN_BOTH);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
if (gWirelessCommType != 0 && InUnionRoom())
data[0] = 5;
else
@@ -932,7 +932,7 @@ static void task50_after_link_battle_save(u8 taskId)
}
break;
case 3:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
data[0] = 4;
break;
case 4:
src/teachy_tv.c
+2 -2
View File
@@ -495,7 +495,7 @@ static void TeachyTvMainCallback(void)
ScheduleBgCopyTilemapToVram(3);
SetHelpContextDontCheckBattle(HELPCONTEXT_BAG);
BlendPalettes(0xFFFFFFFF, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, 0);
SetVBlankCallback(TeachyTvVblankHandler);
SetMainCallback2(TeachyTvCallback);
break;
@@ -687,7 +687,7 @@ static void TeachyTvFree(void)
static void TeachyTvQuitBeginFade(u8 taskId)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, 0);
gTasks[taskId].func = TeachyTvQuitFadeControlAndTaskDel;
}
src/title_screen.c
+1 -1
View File
@@ -638,7 +638,7 @@ static void SetTitleScreenScene_Restart(s16 * data)
if (!gPaletteFade.active && !IsSlashSpriteHidden(data[6]))
{
FadeOutMapMusic(10);
BeginNormalPaletteFade(0xFFFFFFFF, 3, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 3, 0, 0x10, RGB_BLACK);
SignalEndTitleScreenPaletteSomethingTask();
data[1]++;
}
src/tm_case.c
+3 -3
View File
@@ -395,7 +395,7 @@ static bool8 DoSetUpTMCaseUI(void)
gMain.state++;
break;
case 18:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
gMain.state++;
break;
default:
@@ -699,7 +699,7 @@ static void DestroyTMCaseBuffers(void)
static void Task_BeginFadeOutFromTMCase(u8 taskId)
{
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_FadeOutAndCloseTMCase;
}
@@ -1268,7 +1268,7 @@ static void Task_TMCaseDude_Playback(u8 taskId)
Free(sPokedudePackBackup);
CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
CB2_SetUpReshowBattleScreenAfterMenu();
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0);
BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, 0);
data[8]++;
}
break;
src/trade.c
+8 -8
View File
@@ -954,7 +954,7 @@ static void CB2_ReturnFromLinkTrade2(void)
gMain.state++;
break;
case 18:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
gMain.state++;
break;
case 19:
@@ -1143,7 +1143,7 @@ void CB2_ReturnToTradeMenuFromSummary(void)
case 18:
gPaletteFade.bufferTransferDisabled = FALSE;
BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
gMain.state++;
break;
case 19:
@@ -1183,7 +1183,7 @@ static void TradeMenuCB_9(void)
{
if (++sTradeMenuResourcesPtr->loadUISpritesState >= 16)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTradeMenuResourcesPtr->tradeMenuCBnum = 10;
}
}
@@ -1527,7 +1527,7 @@ static void Slave_HandleBlockReceivedStatus(u8 mpId, u8 blockReceivedFlags)
switch (gBlockRecvBuffer[0][0])
{
case 0xEEBB:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
PrintTradeErrorOrStatusMessage(TRADESTATMSG_WAITINGFORFRIEND);
sTradeMenuResourcesPtr->tradeMenuCBnum = 11;
break;
@@ -1543,7 +1543,7 @@ static void Slave_HandleBlockReceivedStatus(u8 mpId, u8 blockReceivedFlags)
sTradeMenuResourcesPtr->tradeMenuCBnum = 7;
break;
case 0xCCDD:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTradeMenuResourcesPtr->tradeMenuCBnum = 10;
break;
case 0xDDEE:
@@ -1594,7 +1594,7 @@ static void Master_HandleCommunication(void)
sTradeMenuResourcesPtr->linkData[0] = 0xEEBB;
sTradeMenuResourcesPtr->linkData[1] = 0;
ScheduleLinkTaskWithDelay(5, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTradeMenuResourcesPtr->unk_78 = sTradeMenuResourcesPtr->unk_79 = 0;
sTradeMenuResourcesPtr->tradeMenuCBnum = 11;
}
@@ -1737,7 +1737,7 @@ static void TradeMenuCB_0(void)
}
else if (sTradeMenuResourcesPtr->tradeMenuCursorPosition < 12)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTradeMenuResourcesPtr->tradeMenuCBnum = 2;
}
else if (sTradeMenuResourcesPtr->tradeMenuCursorPosition == 12)
@@ -1774,7 +1774,7 @@ static void TradeMenuCB_1(void)
case MENU_NOTHING_CHOSEN:
break;
case 0: // SUMMARY
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTradeMenuResourcesPtr->tradeMenuCBnum = 2;
break;
case 1: // Trade
src/trade_scene.c
+21 -21
View File
@@ -881,7 +881,7 @@ void CB2_InitTradeAnim_LinkTrade(void)
gMain.state++;
break;
case 10:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
ShowBg(0);
sTradeData->monSpecies[0] = GetMonData(&gPlayerParty[gSelectedTradeMonPositions[0]], MON_DATA_SPECIES2);
sTradeData->monSpecies[1] = GetMonData(&gEnemyParty[gSelectedTradeMonPositions[1] % 6], MON_DATA_SPECIES2);
@@ -1322,7 +1322,7 @@ static bool8 DoTradeAnim_Cable(void)
// The game waits here for the sprite to finish its animation sequence.
break;
case 14:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTradeData->state = 20;
break;
case 20:
@@ -1335,7 +1335,7 @@ static bool8 DoTradeAnim_Cable(void)
}
break;
case 21:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
sTradeData->state++;
break;
case 22:
@@ -1412,7 +1412,7 @@ static bool8 DoTradeAnim_Cable(void)
}
break;
case 29:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK);
sTradeData->state = 30;
break;
case 30:
@@ -1425,7 +1425,7 @@ static bool8 DoTradeAnim_Cable(void)
}
break;
case 31:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
sTradeData->tradeGlow1SpriteId = CreateSprite(&sGlowBallSpriteTemplate, 111, 170, 0);
sTradeData->gbaScreenSpriteId = CreateSprite(&sGlowBallSpriteTemplate, 129, -10, 0);
sTradeData->state++;
@@ -1504,7 +1504,7 @@ static bool8 DoTradeAnim_Cable(void)
gSprites[sTradeData->gbaScreenSpriteId].y2 += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].y2 <= -222)
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK);
sTradeData->state++;
DestroySprite(&gSprites[sTradeData->tradeGlow1SpriteId]);
DestroySprite(&gSprites[sTradeData->gbaScreenSpriteId]);
@@ -1522,7 +1522,7 @@ static bool8 DoTradeAnim_Cable(void)
}
break;
case 41:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
sTradeData->state++;
break;
case 42:
@@ -1600,7 +1600,7 @@ static bool8 DoTradeAnim_Cable(void)
sTradeData->sXY = 0x8000 / sTradeData->bg2Zoom;
break;
case 52:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTradeData->state = 60;
break;
@@ -1615,7 +1615,7 @@ static bool8 DoTradeAnim_Cable(void)
break;
case 61:
gPaletteFade.bufferTransferDisabled = FALSE;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
sTradeData->state++;
break;
case 62:
@@ -1733,7 +1733,7 @@ static bool8 DoTradeAnim_Cable(void)
sTradeData->state++;
break;
case 73:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTradeData->state++;
break;
case 74:
@@ -1819,7 +1819,7 @@ static bool8 DoTradeAnim_Wireless(void)
// The game waits here for the sprite to finish its animation sequence.
break;
case 14:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTradeData->state = 20;
break;
case 20:
@@ -1832,7 +1832,7 @@ static bool8 DoTradeAnim_Wireless(void)
}
break;
case 21:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
sTradeData->state++;
break;
case 22:
@@ -1914,7 +1914,7 @@ static bool8 DoTradeAnim_Wireless(void)
}
break;
case 29:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK);
sTradeData->state = 30;
break;
case 30:
@@ -1927,7 +1927,7 @@ static bool8 DoTradeAnim_Wireless(void)
}
break;
case 31:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
sTradeData->tradeGlow1SpriteId = CreateSprite(&sGlowBallSpriteTemplate, 111, 170, 0);
sTradeData->gbaScreenSpriteId = CreateSprite(&sGlowBallSpriteTemplate, 129, -10, 0);
sTradeData->state++;
@@ -2007,7 +2007,7 @@ static bool8 DoTradeAnim_Wireless(void)
gSprites[sTradeData->gbaScreenSpriteId].y2 += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].y2 <= -222)
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK);
sTradeData->state++;
DestroySprite(&gSprites[sTradeData->tradeGlow1SpriteId]);
DestroySprite(&gSprites[sTradeData->gbaScreenSpriteId]);
@@ -2028,7 +2028,7 @@ static bool8 DoTradeAnim_Wireless(void)
}
break;
case 41:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
sTradeData->state++;
break;
case 42:
@@ -2121,7 +2121,7 @@ static bool8 DoTradeAnim_Wireless(void)
sTradeData->sXY = 0x8000 / sTradeData->bg2Zoom;
break;
case 52:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTradeData->state = 60;
break;
@@ -2136,7 +2136,7 @@ static bool8 DoTradeAnim_Wireless(void)
break;
case 61:
gPaletteFade.bufferTransferDisabled = FALSE;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
sTradeData->state++;
break;
case 62:
@@ -2254,7 +2254,7 @@ static bool8 DoTradeAnim_Wireless(void)
sTradeData->state++;
break;
case 73:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTradeData->state++;
break;
case 74:
@@ -2656,7 +2656,7 @@ static void CB2_HandleTradeEnded(void)
case 6:
if (IsLinkTaskFinished())
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gMain.state ++;
}
break;
@@ -2730,7 +2730,7 @@ void DoInGameTradeScene(void)
{
ScriptContext2_Enable();
CreateTask(Task_WaitFadeAndStartInGameTradeAnim, 10);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
HelpSystem_Disable();
}
src/trainer_card.c
+5 -5
View File
@@ -533,7 +533,7 @@ static void Task_TrainerCard(u8 taskId)
LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(230, 150);
}
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
SetVBlankCallback(VBlankCB_TrainerCard);
sTrainerCardDataPtr->mainState++;
break;
@@ -572,7 +572,7 @@ static void Task_TrainerCard(u8 taskId)
}
else
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD;
}
}
@@ -593,7 +593,7 @@ static void Task_TrainerCard(u8 taskId)
}
else if (gReceivedRemoteLinkPlayers)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD;
}
else
@@ -612,7 +612,7 @@ static void Task_TrainerCard(u8 taskId)
}
else
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD;
}
}
@@ -627,7 +627,7 @@ static void Task_TrainerCard(u8 taskId)
case STATE_CLOSE_CARD_LINK:
if (!gReceivedRemoteLinkPlayers)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD;
}
break;
src/union_room_battle.c
+2 -2
View File
@@ -133,7 +133,7 @@ void CB2_UnionRoomBattle(void)
}
break;
case 2:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
ShowBg(0);
gMain.state++;
break;
@@ -158,7 +158,7 @@ void CB2_UnionRoomBattle(void)
{
if (gBlockRecvBuffer[0][0] == (ACTIVITY_ACCEPT | 0x40) && gBlockRecvBuffer[1][0] == (ACTIVITY_ACCEPT | 0x40))
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gMain.state = 50;
}
else
src/union_room_chat.c
+2 -2
View File
@@ -257,7 +257,7 @@ static void CB2_LoadInterface(void)
if (!UnionRoomChat_RunDisplaySubtask0())
{
BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK);
SetVBlankCallback(VBlankCB_UnionRoomChatMain);
gMain.state++;
}
@@ -887,7 +887,7 @@ static void ChatEntryRoutine_SaveAndExit(void)
sWork->routineState = 12;
break;
case 12:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK);
sWork->routineState = 13;
break;
case 13:
src/wireless_communication_status_screen.c
+2 -2
View File
@@ -269,7 +269,7 @@ static void Task_WirelessCommunicationScreen(u8 taskId)
gTasks[taskId].data[0]++;
break;
case 1:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
ShowBg(1);
CopyBgTilemapBufferToVram(0);
ShowBg(0);
@@ -303,7 +303,7 @@ static void Task_WirelessCommunicationScreen(u8 taskId)
WCSS_CyclePalette(&gTasks[taskId].data[7], &gTasks[taskId].data[8]);
break;
case 4:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gTasks[taskId].data[0]++;
break;
case 5: