ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 12:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

ray changes

Browse Source
This commit is contained in:
DizzyEggg 2018-02-07 19:47:55 +01:00
parent af068e74ad
commit 593031904b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rayquaza_scene.c
View File

@ -1264,7 +1264,7 @@ static void CB2_RayquazaScene(void)
UpdatePaletteFade(); UpdatePaletteFade();
} }
static void VblankCB_RayquazaScene(void) static void VBlankCB_RayquazaScene(void)
{ {
LoadOam(); LoadOam();
ProcessSpriteCopyRequests(); ProcessSpriteCopyRequests();
@ -1493,9 +1493,9 @@ static void sub_81D6D20(struct Sprite *sprite)
} }
} }
static void VblankCB_DuoFight(void) static void VBlankCB_DuoFight(void)
{ {
VblankCB_RayquazaScene(); VBlankCB_RayquazaScene();
ScanlineEffect_InitHBlankDmaTransfer(); ScanlineEffect_InitHBlankDmaTransfer();
} }
@ -1564,7 +1564,7 @@ static void Task_DuoFightAnim(u8 taskId)
BlendPalettes(-1, 0x10, 0); BlendPalettes(-1, 0x10, 0);
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
SetVBlankCallback(VblankCB_DuoFight); SetVBlankCallback(VBlankCB_DuoFight);
PlaySE(SE_T_OOAME); PlaySE(SE_T_OOAME);
} }
@ -1654,7 +1654,7 @@ static void Task_HandleDuoFight(u8 taskId)
DuoFightEnd(taskId, 2); DuoFightEnd(taskId, 2);
return; return;
case 380: case 380:
SetGpuReg(REG_OFFSET_BLDCNT, 0x244); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG2 | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND);
gTasks[data[1]].func = sub_81D752C; gTasks[data[1]].func = sub_81D752C;
gTasks[data[1]].data[0] = 0; gTasks[data[1]].data[0] = 0;
gTasks[data[1]].data[2] = data[2]; gTasks[data[1]].data[2] = data[2];
@ -1953,10 +1953,10 @@ static void Task_RayTakesFlightAnim(u8 taskId)
PlayNewMapMusic(MUS_REKKUU_KOURIN); PlayNewMapMusic(MUS_REKKUU_KOURIN);
sub_81D7E10(); sub_81D7E10();
sub_81D7E9C(); sub_81D7E9C();
SetGpuReg(REG_OFFSET_BLDCNT, 0x250); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_OBJ | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND);
SetGpuReg(REG_OFFSET_BLDALPHA, 0x808); SetGpuReg(REG_OFFSET_BLDALPHA, 0x808);
BlendPalettes(-1, 0x10, 0); BlendPalettes(-1, 0x10, 0);
SetVBlankCallback(VblankCB_RayquazaScene); SetVBlankCallback(VBlankCB_RayquazaScene);
CreateTask(sub_81D81A4, 0); CreateTask(sub_81D81A4, 0);
data[0] = 0; data[0] = 0;
data[1] = 0; data[1] = 0;
@ -2152,10 +2152,10 @@ static void Task_RayDescendsAnim(u8 taskId)
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
sub_81D82B0(); sub_81D82B0();
sub_81D8358(); sub_81D8358();
SetGpuRegBits(REG_OFFSET_BLDCNT, 0x1E41); 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, 0x1000); SetGpuReg(REG_OFFSET_BLDALPHA, 0x1000);
BlendPalettes(-1, 0x10, 0); BlendPalettes(-1, 0x10, 0);
SetVBlankCallback(VblankCB_RayquazaScene); SetVBlankCallback(VBlankCB_RayquazaScene);
sRayScene->field_2008 = 0; sRayScene->field_2008 = 0;
sRayScene->field_200A = 0; sRayScene->field_200A = 0;
data[0] = 0; data[0] = 0;
@ -2346,7 +2346,7 @@ static void Task_RayChargesAnim(u8 taskId)
sub_81D88D0(); sub_81D88D0();
sub_81D68C8(); sub_81D68C8();
BlendPalettes(-1, 0x10, 0); BlendPalettes(-1, 0x10, 0);
SetVBlankCallback(VblankCB_RayquazaScene); SetVBlankCallback(VBlankCB_RayquazaScene);
data[0] = 0; data[0] = 0;
data[1] = 0; data[1] = 0;
data[2] = CreateTask(sub_81D8AD8, 0); data[2] = CreateTask(sub_81D8AD8, 0);
@ -2508,10 +2508,10 @@ static void Task_RayChasesAwayAnim(u8 taskId)
sub_81D8CC4(); sub_81D8CC4();
sub_81D68C8(); sub_81D68C8();
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
SetGpuReg(REG_OFFSET_BLDCNT, 0x241); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND);
SetGpuReg(REG_OFFSET_BLDALPHA, 0xE09); SetGpuReg(REG_OFFSET_BLDALPHA, 0xE09);
BlendPalettes(-1, 0x10, 0); BlendPalettes(-1, 0x10, 0);
SetVBlankCallback(VblankCB_RayquazaScene); SetVBlankCallback(VBlankCB_RayquazaScene);
data[0] = 0; data[0] = 0;
data[1] = 0; data[1] = 0;
gTasks[taskId].func = Task_HandleRayChasesAway; gTasks[taskId].func = Task_HandleRayChasesAway;