dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

through sub_81352DC

Browse Source
This commit is contained in:
PikalaxALT
2017-11-24 22:28:13 -05:00
parent 53a7f188f8
commit 1063bcaab8
2 changed files with 52 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/wallclock.c
View File

@@ -48,8 +48,8 @@ static bool32 MoveClockHand(u8 taskId, u8 command);
static void _12HourClockFixAMPM(u8 taskId, u8 command);
static void sub_8135130(u8 taskId);
static void sub_81351AC(struct Sprite *sprite);
void sub_8135244(struct Sprite *sprite);
void sub_81352DC(struct Sprite *sprite);
static void sub_8135244(struct Sprite *sprite);
static void sub_81352DC(struct Sprite *sprite);
void sub_8135380(struct Sprite *sprite);
// rodata
@@ -957,3 +957,53 @@ static void sub_81351AC(struct Sprite *sprite)
sprite->pos2.x = xhat;
sprite->pos2.y = yhat;
}
static void sub_8135244(struct Sprite *sprite)
{
u16 angle = gTasks[sprite->data0].data[WALL_CLOCK_TASK_HOUR_HAND_ANGLE];
s16 sin = Sin2(angle) / 16;
s16 cos = Cos2(angle) / 16;
u16 xhat;
u16 yhat;
SetOamMatrix(1, cos, sin, -sin, cos);
xhat = gUnknown_085B22D0[angle][0];
yhat = gUnknown_085B22D0[angle][1];
if (xhat > 0x80)
{
xhat |= 0xff00;
}
if (yhat > 0x80)
{
yhat |= 0xff00;
}
sprite->pos2.x = xhat;
sprite->pos2.y = yhat;
}
static void sub_81352DC(struct Sprite *sprite)
{
if (gTasks[sprite->data0].data[WALL_CLOCK_TASK_12HRCLOCK_AM_PM])
{
if ((u16)(sprite->data1 - 60) < 30)
{
sprite->data1 += 5;
}
if (sprite->data1 < 60)
{
sprite->data1++;
}
}
else
{
if ((u16)(sprite->data1 - 46) < 30)
{
sprite->data1 -= 5;
}
if (sprite->data1 > 75)
{
sprite->data1--;
}
}
sprite->pos2.x = Cos2(sprite->data1) * 30 / 0x1000;
sprite->pos2.y = Sin2(sprite->data1) * 30 / 0x1000;
}