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

clean fldeff file

Browse Source
This commit is contained in:
garak 2018-12-19 20:52:41 -05:00 committed by GitHub
parent e292d0ca83
commit f801eed3a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/fldeff_80F9BCC.c
View File

@ -320,7 +320,6 @@ static const struct SpriteTemplate gUnknown_0858E880 =
.callback = SpriteCallbackDummy, .callback = SpriteCallbackDummy,
}; };
// TODO: name these functions and arguments
void sub_80F9BCC(u16 a0, u16 a1, u8 a2) void sub_80F9BCC(u16 a0, u16 a1, u8 a2)
{ {
sub_80F9C44(sub_80F9C90, a0, a1, a2); sub_80F9C44(sub_80F9C90, a0, a1, a2);
@ -369,26 +368,25 @@ void sub_80F9C44(void (*taskfunc) (u8), u16 a1, u16 a2, u8 a3)
#ifdef NONMATCHING #ifdef NONMATCHING
void sub_80F9C90(u8 taskId) void sub_80F9C90(u8 taskId)
{ {
//
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
switch(task->data[0]) switch(task->data[0])
{ {
case 0:// correct case 0:
task->data[3] = 0x78; task->data[3] = 0x78;
task->data[4] = 0x78; task->data[4] = 0x78;
task->data[5] = 0x50; task->data[5] = 0x50;
task->data[6] = 0x51; task->data[6] = 0x51;
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
SetGpuReg(REG_OFFSET_WIN0H, task->data[3] << 8 | task->data[4]); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
SetGpuReg(REG_OFFSET_WIN0H, task->data[5] << 8 | task->data[6]); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[5], task->data[6]));
SetGpuReg(REG_OFFSET_WININ, 0x3F); SetGpuReg(REG_OFFSET_WININ, 0x3F);
SetGpuReg(REG_OFFSET_WINOUT, 0); SetGpuReg(REG_OFFSET_WINOUT, 0);
break; break;
case 1:// correct case 1:
task->data[7] = GetGpuReg(REG_OFFSET_BLDCNT); task->data[7] = GetGpuReg(REG_OFFSET_BLDCNT);
task->data[8] = GetGpuReg(REG_OFFSET_BLDY); task->data[8] = GetGpuReg(REG_OFFSET_BLDY);
@ -398,26 +396,20 @@ void sub_80F9C90(u8 taskId)
break; break;
case 2: case 2:
//r5 = 0 somewhere in here
task->data[3] -= task->data[1]; task->data[3] -= task->data[1];
task->data[4] += task->data[1]; task->data[4] += task->data[1];
if (task->data[3] <= 0 || task->data[4] > 0xEF) if (task->data[3] < 1 || task->data[4] > 0xEF)
{ {
// task->data[3] = 0;
task->data[3] = 0;// r5
task->data[4] = 0xF0; task->data[4] = 0xF0;
SetGpuReg(REG_OFFSET_BLDY, 0); SetGpuReg(REG_OFFSET_BLDY, 0);
SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]); SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]);
//BlendPalettes(0xFFFF, 0, 0); BlendPalettes(0xFFFFFFFF, 0, 0);
BlendPalettes(-1, 0, 0);// 0xFFFFFFFF ? gPlttBufferFaded[0] = 0;
*gPlttBufferFaded = 0;// r5
} }
//SetGpuReg(REG_OFFSET_WIN0H, task->data[3] << 8 | task->data[4]);
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4])); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
//break;
// can I ternary this? NO stupid
if (task->data[3] != 0) return; if (task->data[3] != 0) return;
break; break;
@ -425,27 +417,22 @@ void sub_80F9C90(u8 taskId)
task->data[5] -= task->data[2]; task->data[5] -= task->data[2];
task->data[6] += task->data[2]; task->data[6] += task->data[2];
if (task->data[5] <= 0 || task->data[2] > 0x9F) if (task->data[5] < 1 || task->data[2] > 0x9F)
{ {
//
task->data[5] = 0; task->data[5] = 0;
task->data[6] = 0xA0; task->data[6] = 0xA0;
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
} }
//SetGpuReg(REG_OFFSET_WIN0V, task->data[5] << 8 | task->data[6]);
SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6])); SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
if (task->data[5] != 0) return; if (task->data[5] != 0) return;
break; break;
//break;
default: default:
SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]); SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]);
DestroyTask(taskId); DestroyTask(taskId);
return; return;
} }
//
task->data[0] += 1; task->data[0] += 1;
} }
#else #else
@ -657,7 +644,7 @@ void sub_80F9DFC(u8 taskId)
task->data[5] += task->data[2]; task->data[5] += task->data[2];
task->data[6] -= task->data[2]; task->data[6] -= task->data[2];
if (task->data[5] > 0x4F || task->data[6] <= 0x51) if (task->data[5] > 0x4F || task->data[6] < 0x52)
{ {
task->data[5] = 0x50; task->data[5] = 0x50;
task->data[6] = 0x51; task->data[6] = 0x51;
@ -673,7 +660,7 @@ void sub_80F9DFC(u8 taskId)
task->data[3] += task->data[1]; task->data[3] += task->data[1];
task->data[4] -= task->data[1]; task->data[4] -= task->data[1];
if (task->data[3] > 0x77 || task->data[4] <= 0x78) if (task->data[3] > 0x77 || task->data[4] < 0x79)
{ {
task->data[3] = 0x78; task->data[3] = 0x78;
task->data[4] = 0x78; task->data[4] = 0x78;
@ -1387,27 +1374,19 @@ void GetShieldToyTVDecorationInfo(void)
} }
#ifdef NONMATCHING #ifdef NONMATCHING
//
bool8 sub_80FADE4(u16 arg0, u8 arg1) bool8 sub_80FADE4(u16 arg0, u8 arg1)
{ {
//
if (CurrentMapIsSecretBase()) if (CurrentMapIsSecretBase())
{ {
// return TRUE;
if (arg1 == 0) if (arg1 == 0)
{ {
//
if ((u16)(arg0 + 0xfffffd7b) <= 1 || (arg0 == 0x237)) if ((u16)(arg0 + 0xfffffd7b) <= 1 || (arg0 == 0x237))
return TRUE; return TRUE;
//if (arg0 == 0x237)
//else return FALSE;
} }
else else
{ {
//
if (arg0 == 0x28d || arg0 == 0x23f) if (arg0 == 0x28d || arg0 == 0x23f)
return TRUE; return TRUE;
//return FALSE;
} }
} }
return FALSE; return FALSE;