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

Clean up Task_BarnDoorWipeChild

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-12-27 16:54:49 +00:00
committed by Martin Griffin
parent 8fb5ce5790
commit da2ff948a6
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_screen_effect.c
+16 -22
View File
@@ -261,17 +261,17 @@ void Task_BarnDoorWipe(u8 taskId)
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON);
if (data[10] == 0) if (data[10] == 0)
{ {
SetGpuReg(REG_OFFSET_WIN0H, 0); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 0));
SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE(240, 255)); SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE(240, 255));
SetGpuReg(REG_OFFSET_WIN0V, 255); SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0, 255));
SetGpuReg(REG_OFFSET_WIN1V, 255); SetGpuReg(REG_OFFSET_WIN1V, WIN_RANGE(0, 255));
} }
else else
{ {
SetGpuReg(REG_OFFSET_WIN0H, 120); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 120));
SetGpuReg(REG_OFFSET_WIN0V, 255); SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0, 255));
SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE(120, 255)); SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE(120, 255));
SetGpuReg(REG_OFFSET_WIN1V, 255); SetGpuReg(REG_OFFSET_WIN1V, WIN_RANGE(0, 255));
} }
SetGpuReg(REG_OFFSET_WININ, 0); SetGpuReg(REG_OFFSET_WININ, 0);
SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR); SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR);
@@ -294,17 +294,16 @@ void Task_BarnDoorWipe(u8 taskId)
} }
} }
// TODO: Find an implicit way to generate lhs/rhs shifts.
static void Task_BarnDoorWipeChild(u8 taskId) static void Task_BarnDoorWipeChild(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
u8 parentTaskId = FindTaskIdByFunc(Task_BarnDoorWipe); u8 parentTaskId = FindTaskIdByFunc(Task_BarnDoorWipe);
u32 lhs, rhs; s16 lhs, rhs;
if (gTasks[parentTaskId].tDirection == DIR_WIPE_IN) if (gTasks[parentTaskId].tDirection == DIR_WIPE_IN)
{ {
lhs = (u16)tChildOffset; lhs = tChildOffset;
rhs = (u16)(240 - lhs); rhs = 240 - tChildOffset;
if ((s16)lhs > 120) if (lhs > 120)
{ {
DestroyTask(taskId); DestroyTask(taskId);
return; return;
@@ -312,22 +311,17 @@ static void Task_BarnDoorWipeChild(u8 taskId)
} }
else else
{ {
u16 offset = tChildOffset; lhs = 120 - tChildOffset;
u32 lhs2 = (120 - offset) << 16; rhs = 120 + tChildOffset;
u32 rhs2 = (120 + offset) << 16; if (lhs < 0)
lhs = lhs2 >> 16;
rhs = rhs2 >> 16;
if ((s16)(lhs2 >> 16) < 0)
{ {
DestroyTask(taskId); DestroyTask(taskId);
return; return;
} }
} }
lhs <<= 16; SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, lhs));
SetGpuReg(REG_OFFSET_WIN0H, lhs >> 16); SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE(rhs, 240));
SetGpuReg(REG_OFFSET_WIN1H, WIN_RANGE((((s16)rhs) << 16) >> 16, 240)); if (lhs <= 89)
lhs = (s32)lhs >> 16;
if ((s32)lhs <= 89)
{ {
tChildOffset += 4; tChildOffset += 4;
} }