mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-27 05:43:51 +01:00
Merge pull request #1718 from AsparagusEduardo/pret_cleanEvoScene
Cleaned by comparing evolution_scene.c with pokefirered
This commit is contained in:
commit
456d45985f
@ -426,7 +426,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
|
|||||||
GetBattleAnimBg1Data(&animBg);
|
GetBattleAnimBg1Data(&animBg);
|
||||||
task->data[10] = gBattle_BG1_Y;
|
task->data[10] = gBattle_BG1_Y;
|
||||||
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1);
|
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1);
|
||||||
FillPalette(0, animBg.paletteId * 16, 32);
|
FillPalette(RGB_BLACK, animBg.paletteId * 16, 32);
|
||||||
scanlineParams.dmaDest = ®_BG1VOFS;
|
scanlineParams.dmaDest = ®_BG1VOFS;
|
||||||
var0 = WINOUT_WIN01_BG1;
|
var0 = WINOUT_WIN01_BG1;
|
||||||
if (!IsContest())
|
if (!IsContest())
|
||||||
@ -436,7 +436,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
|
|||||||
{
|
{
|
||||||
task->data[10] = gBattle_BG2_Y;
|
task->data[10] = gBattle_BG2_Y;
|
||||||
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG2);
|
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG2);
|
||||||
FillPalette(0, 144, 32);
|
FillPalette(RGB_BLACK, 144, 32);
|
||||||
scanlineParams.dmaDest = ®_BG2VOFS;
|
scanlineParams.dmaDest = ®_BG2VOFS;
|
||||||
var0 = WINOUT_WIN01_BG2;
|
var0 = WINOUT_WIN01_BG2;
|
||||||
if (!IsContest())
|
if (!IsContest())
|
||||||
@ -566,12 +566,12 @@ void AnimTask_MoveTargetMementoShadow(u8 taskId)
|
|||||||
{
|
{
|
||||||
GetBattleAnimBg1Data(&animBg);
|
GetBattleAnimBg1Data(&animBg);
|
||||||
task->data[10] = gBattle_BG1_Y;
|
task->data[10] = gBattle_BG1_Y;
|
||||||
FillPalette(0, animBg.paletteId * 16, 32);
|
FillPalette(RGB_BLACK, animBg.paletteId * 16, 32);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
task->data[10] = gBattle_BG2_Y;
|
task->data[10] = gBattle_BG2_Y;
|
||||||
FillPalette(0, 9 * 16, 32);
|
FillPalette(RGB_BLACK, 9 * 16, 32);
|
||||||
}
|
}
|
||||||
|
|
||||||
SetAllBattlersSpritePriority(3);
|
SetAllBattlersSpritePriority(3);
|
||||||
|
@ -1037,7 +1037,7 @@ static void Cmd_jumpifaffectedbyprotect(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool8 JumpIfMoveAffectedByProtect(u16 move)
|
static bool8 JumpIfMoveAffectedByProtect(u16 move)
|
||||||
{
|
{
|
||||||
bool8 affected = FALSE;
|
bool8 affected = FALSE;
|
||||||
if (DEFENDER_IS_PROTECTED)
|
if (DEFENDER_IS_PROTECTED)
|
||||||
|
@ -276,7 +276,7 @@ static bool8 InitBerryTagScreen(void)
|
|||||||
gMain.state++;
|
gMain.state++;
|
||||||
break;
|
break;
|
||||||
case 14:
|
case 14:
|
||||||
BlendPalettes(PALETTES_ALL, 0x10, 0);
|
BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
|
||||||
gMain.state++;
|
gMain.state++;
|
||||||
break;
|
break;
|
||||||
case 15:
|
case 15:
|
||||||
|
@ -212,7 +212,7 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u
|
|||||||
u16 currSpecies;
|
u16 currSpecies;
|
||||||
u32 trainerId, personality;
|
u32 trainerId, personality;
|
||||||
const struct CompressedSpritePalette* pokePal;
|
const struct CompressedSpritePalette* pokePal;
|
||||||
u8 ID;
|
u8 id;
|
||||||
|
|
||||||
SetHBlankCallback(NULL);
|
SetHBlankCallback(NULL);
|
||||||
SetVBlankCallback(NULL);
|
SetVBlankCallback(NULL);
|
||||||
@ -267,11 +267,11 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u
|
|||||||
|
|
||||||
SetMultiuseSpriteTemplateToPokemon(currSpecies, B_POSITION_OPPONENT_LEFT);
|
SetMultiuseSpriteTemplateToPokemon(currSpecies, B_POSITION_OPPONENT_LEFT);
|
||||||
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
|
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
|
||||||
sEvoStructPtr->preEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
|
sEvoStructPtr->preEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
|
||||||
|
|
||||||
gSprites[ID].callback = SpriteCallbackDummy_2;
|
gSprites[id].callback = SpriteCallbackDummy_2;
|
||||||
gSprites[ID].oam.paletteNum = 1;
|
gSprites[id].oam.paletteNum = 1;
|
||||||
gSprites[ID].invisible = TRUE;
|
gSprites[id].invisible = TRUE;
|
||||||
|
|
||||||
// postEvo sprite
|
// postEvo sprite
|
||||||
DecompressPicFromTable_2(&gMonFrontPicTable[postEvoSpecies],
|
DecompressPicFromTable_2(&gMonFrontPicTable[postEvoSpecies],
|
||||||
@ -282,21 +282,21 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u
|
|||||||
|
|
||||||
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT);
|
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT);
|
||||||
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
|
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
|
||||||
sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
|
sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
|
||||||
gSprites[ID].callback = SpriteCallbackDummy_2;
|
gSprites[id].callback = SpriteCallbackDummy_2;
|
||||||
gSprites[ID].oam.paletteNum = 2;
|
gSprites[id].oam.paletteNum = 2;
|
||||||
gSprites[ID].invisible = TRUE;
|
gSprites[id].invisible = TRUE;
|
||||||
|
|
||||||
LoadEvoSparkleSpriteAndPal();
|
LoadEvoSparkleSpriteAndPal();
|
||||||
|
|
||||||
sEvoStructPtr->evoTaskId = ID = CreateTask(Task_EvolutionScene, 0);
|
sEvoStructPtr->evoTaskId = id = CreateTask(Task_EvolutionScene, 0);
|
||||||
gTasks[ID].tState = 0;
|
gTasks[id].tState = 0;
|
||||||
gTasks[ID].tPreEvoSpecies = currSpecies;
|
gTasks[id].tPreEvoSpecies = currSpecies;
|
||||||
gTasks[ID].tPostEvoSpecies = postEvoSpecies;
|
gTasks[id].tPostEvoSpecies = postEvoSpecies;
|
||||||
gTasks[ID].tCanStop = canStopEvo;
|
gTasks[id].tCanStop = canStopEvo;
|
||||||
gTasks[ID].tLearnsFirstMove = TRUE;
|
gTasks[id].tLearnsFirstMove = TRUE;
|
||||||
gTasks[ID].tEvoWasStopped = FALSE;
|
gTasks[id].tEvoWasStopped = FALSE;
|
||||||
gTasks[ID].tPartyId = partyId;
|
gTasks[id].tPartyId = partyId;
|
||||||
|
|
||||||
memcpy(&sEvoStructPtr->savedPalette, &gPlttBufferUnfaded[0x20], sizeof(sEvoStructPtr->savedPalette));
|
memcpy(&sEvoStructPtr->savedPalette, &gPlttBufferUnfaded[0x20], sizeof(sEvoStructPtr->savedPalette));
|
||||||
|
|
||||||
@ -310,7 +310,7 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u
|
|||||||
|
|
||||||
static void CB2_EvolutionSceneLoadGraphics(void)
|
static void CB2_EvolutionSceneLoadGraphics(void)
|
||||||
{
|
{
|
||||||
u8 ID;
|
u8 id;
|
||||||
const struct CompressedSpritePalette* pokePal;
|
const struct CompressedSpritePalette* pokePal;
|
||||||
u16 postEvoSpecies;
|
u16 postEvoSpecies;
|
||||||
u32 trainerId, personality;
|
u32 trainerId, personality;
|
||||||
@ -360,10 +360,10 @@ static void CB2_EvolutionSceneLoadGraphics(void)
|
|||||||
|
|
||||||
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT);
|
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT);
|
||||||
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
|
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
|
||||||
sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
|
sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
|
||||||
|
|
||||||
gSprites[ID].callback = SpriteCallbackDummy_2;
|
gSprites[id].callback = SpriteCallbackDummy_2;
|
||||||
gSprites[ID].oam.paletteNum = 2;
|
gSprites[id].oam.paletteNum = 2;
|
||||||
|
|
||||||
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP);
|
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP);
|
||||||
|
|
||||||
@ -433,14 +433,14 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
|
|||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
{
|
{
|
||||||
u8 ID;
|
u8 id;
|
||||||
|
|
||||||
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_LEFT);
|
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_LEFT);
|
||||||
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
|
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
|
||||||
sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
|
sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
|
||||||
|
|
||||||
gSprites[ID].callback = SpriteCallbackDummy_2;
|
gSprites[id].callback = SpriteCallbackDummy_2;
|
||||||
gSprites[ID].oam.paletteNum = 2;
|
gSprites[id].oam.paletteNum = 2;
|
||||||
gMain.state++;
|
gMain.state++;
|
||||||
LinkTradeDrawWindow();
|
LinkTradeDrawWindow();
|
||||||
}
|
}
|
||||||
@ -451,7 +451,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
|
|||||||
LoadWirelessStatusIndicatorSpriteGfx();
|
LoadWirelessStatusIndicatorSpriteGfx();
|
||||||
CreateWirelessStatusIndicatorSprite(0, 0);
|
CreateWirelessStatusIndicatorSprite(0, 0);
|
||||||
}
|
}
|
||||||
BlendPalettes(PALETTES_ALL, 0x10, 0);
|
BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
|
||||||
gMain.state++;
|
gMain.state++;
|
||||||
break;
|
break;
|
||||||
case 7:
|
case 7:
|
||||||
@ -471,7 +471,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSprit
|
|||||||
u16 currSpecies;
|
u16 currSpecies;
|
||||||
u32 trainerId, personality;
|
u32 trainerId, personality;
|
||||||
const struct CompressedSpritePalette* pokePal;
|
const struct CompressedSpritePalette* pokePal;
|
||||||
u8 ID;
|
u8 id;
|
||||||
|
|
||||||
GetMonData(mon, MON_DATA_NICKNAME, name);
|
GetMonData(mon, MON_DATA_NICKNAME, name);
|
||||||
StringCopy_Nickname(gStringVar1, name);
|
StringCopy_Nickname(gStringVar1, name);
|
||||||
@ -496,21 +496,21 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSprit
|
|||||||
|
|
||||||
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_LEFT);
|
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_LEFT);
|
||||||
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
|
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
|
||||||
sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
|
sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
|
||||||
|
|
||||||
gSprites[ID].callback = SpriteCallbackDummy_2;
|
gSprites[id].callback = SpriteCallbackDummy_2;
|
||||||
gSprites[ID].oam.paletteNum = 2;
|
gSprites[id].oam.paletteNum = 2;
|
||||||
gSprites[ID].invisible = TRUE;
|
gSprites[id].invisible = TRUE;
|
||||||
|
|
||||||
LoadEvoSparkleSpriteAndPal();
|
LoadEvoSparkleSpriteAndPal();
|
||||||
|
|
||||||
sEvoStructPtr->evoTaskId = ID = CreateTask(Task_TradeEvolutionScene, 0);
|
sEvoStructPtr->evoTaskId = id = CreateTask(Task_TradeEvolutionScene, 0);
|
||||||
gTasks[ID].tState = 0;
|
gTasks[id].tState = 0;
|
||||||
gTasks[ID].tPreEvoSpecies = currSpecies;
|
gTasks[id].tPreEvoSpecies = currSpecies;
|
||||||
gTasks[ID].tPostEvoSpecies = postEvoSpecies;
|
gTasks[id].tPostEvoSpecies = postEvoSpecies;
|
||||||
gTasks[ID].tLearnsFirstMove = TRUE;
|
gTasks[id].tLearnsFirstMove = TRUE;
|
||||||
gTasks[ID].tEvoWasStopped = FALSE;
|
gTasks[id].tEvoWasStopped = FALSE;
|
||||||
gTasks[ID].tPartyId = partyId;
|
gTasks[id].tPartyId = partyId;
|
||||||
|
|
||||||
gBattle_BG0_X = 0;
|
gBattle_BG0_X = 0;
|
||||||
gBattle_BG0_Y = 0;
|
gBattle_BG0_Y = 0;
|
||||||
@ -521,7 +521,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSprit
|
|||||||
gBattle_BG3_X = 256;
|
gBattle_BG3_X = 256;
|
||||||
gBattle_BG3_Y = 0;
|
gBattle_BG3_Y = 0;
|
||||||
|
|
||||||
gTextFlags.useAlternateDownArrow = 1;
|
gTextFlags.useAlternateDownArrow = TRUE;
|
||||||
|
|
||||||
SetVBlankCallback(VBlankCB_TradeEvolutionScene);
|
SetVBlankCallback(VBlankCB_TradeEvolutionScene);
|
||||||
SetMainCallback2(CB2_TradeEvolutionSceneUpdate);
|
SetMainCallback2(CB2_TradeEvolutionSceneUpdate);
|
||||||
@ -839,9 +839,9 @@ static void Task_EvolutionScene(u8 taskId)
|
|||||||
case EVOSTATE_CANCEL_MSG:
|
case EVOSTATE_CANCEL_MSG:
|
||||||
if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteId))
|
if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteId))
|
||||||
{
|
{
|
||||||
if (gTasks[taskId].tEvoWasStopped)
|
if (gTasks[taskId].tEvoWasStopped) // FRLG auto cancellation
|
||||||
StringExpandPlaceholders(gStringVar4, gText_EllipsisQuestionMark);
|
StringExpandPlaceholders(gStringVar4, gText_EllipsisQuestionMark);
|
||||||
else // Fire Red leftover probably
|
else
|
||||||
StringExpandPlaceholders(gStringVar4, gText_PkmnStoppedEvolving);
|
StringExpandPlaceholders(gStringVar4, gText_PkmnStoppedEvolving);
|
||||||
|
|
||||||
BattlePutTextOnWindow(gStringVar4, B_WIN_MSG);
|
BattlePutTextOnWindow(gStringVar4, B_WIN_MSG);
|
||||||
@ -1223,7 +1223,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
|
|||||||
{
|
{
|
||||||
DestroyTask(taskId);
|
DestroyTask(taskId);
|
||||||
FREE_AND_SET_NULL(sEvoStructPtr);
|
FREE_AND_SET_NULL(sEvoStructPtr);
|
||||||
gTextFlags.useAlternateDownArrow = 0;
|
gTextFlags.useAlternateDownArrow = FALSE;
|
||||||
SetMainCallback2(gCB2_AfterEvolution);
|
SetMainCallback2(gCB2_AfterEvolution);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -1644,7 +1644,7 @@ static void PauseBgPaletteAnim(void)
|
|||||||
if (taskId != TASK_NONE)
|
if (taskId != TASK_NONE)
|
||||||
gTasks[taskId].tPaused = TRUE;
|
gTasks[taskId].tPaused = TRUE;
|
||||||
|
|
||||||
FillPalette(0, 0xA0, 0x20);
|
FillPalette(RGB_BLACK, 0xA0, 0x20);
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef tPaused
|
#undef tPaused
|
||||||
@ -1658,7 +1658,7 @@ static void StopBgAnimation(void)
|
|||||||
if ((taskId = FindTaskIdByFunc(Task_AnimateBg)) != TASK_NONE)
|
if ((taskId = FindTaskIdByFunc(Task_AnimateBg)) != TASK_NONE)
|
||||||
DestroyTask(taskId);
|
DestroyTask(taskId);
|
||||||
|
|
||||||
FillPalette(0, 0xA0, 0x20);
|
FillPalette(RGB_BLACK, 0xA0, 0x20);
|
||||||
RestoreBgAfterAnim();
|
RestoreBgAfterAnim();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1595,7 +1595,7 @@ void CB2_LinkError(void)
|
|||||||
ResetSpriteData();
|
ResetSpriteData();
|
||||||
FreeAllSpritePalettes();
|
FreeAllSpritePalettes();
|
||||||
ResetPaletteFadeControl();
|
ResetPaletteFadeControl();
|
||||||
FillPalette(0, 0, 2);
|
FillPalette(RGB_BLACK, 0, 2);
|
||||||
ResetTasks();
|
ResetTasks();
|
||||||
ScanlineEffect_Stop();
|
ScanlineEffect_Stop();
|
||||||
if (gWirelessCommType)
|
if (gWirelessCommType)
|
||||||
|
@ -102,7 +102,7 @@ void CB2_InitMysteryEventMenu(void)
|
|||||||
BuildOamBuffer();
|
BuildOamBuffer();
|
||||||
RunTextPrinters();
|
RunTextPrinters();
|
||||||
UpdatePaletteFade();
|
UpdatePaletteFade();
|
||||||
FillPalette(0, 0, 2);
|
FillPalette(RGB_BLACK, 0, 2);
|
||||||
SetMainCallback2(CB2_MysteryEventMenu);
|
SetMainCallback2(CB2_MysteryEventMenu);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1627,7 +1627,7 @@ static void Task_DuoFightAnim(u8 taskId)
|
|||||||
StopMapMusic();
|
StopMapMusic();
|
||||||
}
|
}
|
||||||
|
|
||||||
BlendPalettes(PALETTES_ALL, 0x10, 0);
|
BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
|
||||||
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
|
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
|
||||||
SetVBlankCallback(VBlankCB_DuoFight);
|
SetVBlankCallback(VBlankCB_DuoFight);
|
||||||
PlaySE(SE_DOWNPOUR);
|
PlaySE(SE_DOWNPOUR);
|
||||||
@ -2284,7 +2284,7 @@ static void Task_RayDescendsAnim(u8 taskId)
|
|||||||
LoadDescendsSceneGfx();
|
LoadDescendsSceneGfx();
|
||||||
SetGpuRegBits(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_EFFECT_BLEND);
|
SetGpuRegBits(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_EFFECT_BLEND);
|
||||||
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
|
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
|
||||||
BlendPalettes(PALETTES_ALL, 0x10, 0);
|
BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
|
||||||
SetVBlankCallback(VBlankCB_RayquazaScene);
|
SetVBlankCallback(VBlankCB_RayquazaScene);
|
||||||
sRayScene->revealedLightLine = 0;
|
sRayScene->revealedLightLine = 0;
|
||||||
sRayScene->revealedLightTimer = 0;
|
sRayScene->revealedLightTimer = 0;
|
||||||
@ -2501,7 +2501,7 @@ static void Task_RayChargesAnim(u8 taskId)
|
|||||||
InitChargesSceneBgs();
|
InitChargesSceneBgs();
|
||||||
LoadChargesSceneGfx();
|
LoadChargesSceneGfx();
|
||||||
SetWindowsHideVertBorders();
|
SetWindowsHideVertBorders();
|
||||||
BlendPalettes(PALETTES_ALL, 0x10, 0);
|
BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
|
||||||
SetVBlankCallback(VBlankCB_RayquazaScene);
|
SetVBlankCallback(VBlankCB_RayquazaScene);
|
||||||
tState = 0;
|
tState = 0;
|
||||||
tTimer = 0;
|
tTimer = 0;
|
||||||
@ -2697,7 +2697,7 @@ static void Task_RayChasesAwayAnim(u8 taskId)
|
|||||||
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
|
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
|
||||||
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND);
|
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND);
|
||||||
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(9, 14));
|
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(9, 14));
|
||||||
BlendPalettes(PALETTES_ALL, 0x10, 0);
|
BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
|
||||||
SetVBlankCallback(VBlankCB_RayquazaScene);
|
SetVBlankCallback(VBlankCB_RayquazaScene);
|
||||||
tState = 0;
|
tState = 0;
|
||||||
tTimer = 0;
|
tTimer = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user