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