through sub_8134CE8

This commit is contained in:
PikalaxALT
2017-11-24 20:46:29 -05:00
parent efd23cb91b
commit 2746967bef
4 changed files with 427 additions and 157 deletions

View File

@@ -21,9 +21,13 @@
// static declarations
void sub_8134C9C(void);
void sub_8134CB8(u8 taskId);
static void sub_8134C9C(void);
static void sub_8134CB8(u8 taskId);
void sub_8134DC4(u8 taskId);
void sub_8134CE8(u8 taskId);
void sub_8134F10(u8 taskId);
u16 sub_8134FFC(u16 a0, u8 a1, u8 a2);
void sub_813504C(u8 taskId, u8 a1);
void sub_8135130(u8 taskId);
void sub_81351AC(struct Sprite *sprite);
void sub_8135244(struct Sprite *sprite);
@@ -145,6 +149,368 @@ const struct SpriteTemplate gUnknown_085B22B8 = {
gDummySpriteAffineAnimTable,
sub_8135380
};
const s8 gUnknown_085B22D0[][2] = {
{ 0x00, -0x18},
{ 0x01, -0x19},
{ 0x01, -0x19},
{ 0x02, -0x19},
{ 0x02, -0x19},
{ 0x02, -0x19},
{ 0x03, -0x18},
{ 0x03, -0x19},
{ 0x04, -0x19},
{ 0x04, -0x19},
{ 0x04, -0x19},
{ 0x05, -0x19},
{ 0x05, -0x19},
{ 0x06, -0x18},
{ 0x06, -0x18},
{ 0x06, -0x18},
{ 0x07, -0x18},
{ 0x07, -0x18},
{ 0x07, -0x18},
{ 0x08, -0x18},
{ 0x08, -0x18},
{ 0x09, -0x18},
{ 0x09, -0x18},
{ 0x0a, -0x17},
{ 0x0a, -0x17},
{ 0x0b, -0x16},
{ 0x0b, -0x16},
{ 0x0b, -0x16},
{ 0x0c, -0x16},
{ 0x0c, -0x15},
{ 0x0d, -0x15},
{ 0x0d, -0x15},
{ 0x0d, -0x15},
{ 0x0e, -0x15},
{ 0x0e, -0x15},
{ 0x0e, -0x14},
{ 0x0e, -0x14},
{ 0x0f, -0x14},
{ 0x0f, -0x13},
{ 0x10, -0x13},
{ 0x10, -0x13},
{ 0x10, -0x13},
{ 0x10, -0x12},
{ 0x10, -0x12},
{ 0x11, -0x12},
{ 0x11, -0x11},
{ 0x11, -0x11},
{ 0x12, -0x11},
{ 0x12, -0x11},
{ 0x12, -0x10},
{ 0x12, -0x10},
{ 0x13, -0x10},
{ 0x13, -0x0f},
{ 0x13, -0x0f},
{ 0x14, -0x0f},
{ 0x14, -0x0e},
{ 0x14, -0x0e},
{ 0x14, -0x0d},
{ 0x14, -0x0d},
{ 0x15, -0x0d},
{ 0x15, -0x0d},
{ 0x15, -0x0c},
{ 0x16, -0x0c},
{ 0x16, -0x0c},
{ 0x16, -0x0b},
{ 0x16, -0x0b},
{ 0x16, -0x0a},
{ 0x17, -0x0a},
{ 0x17, -0x09},
{ 0x17, -0x09},
{ 0x17, -0x09},
{ 0x17, -0x09},
{ 0x17, -0x08},
{ 0x17, -0x08},
{ 0x17, -0x07},
{ 0x17, -0x07},
{ 0x17, -0x06},
{ 0x18, -0x06},
{ 0x18, -0x06},
{ 0x19, -0x05},
{ 0x19, -0x05},
{ 0x18, -0x04},
{ 0x19, -0x04},
{ 0x18, -0x03},
{ 0x19, -0x03},
{ 0x19, -0x03},
{ 0x19, -0x02},
{ 0x19, -0x02},
{ 0x18, -0x01},
{ 0x19, -0x01},
{ 0x18, 0x00},
{ 0x18, 0x00},
{ 0x18, 0x00},
{ 0x18, 0x01},
{ 0x18, 0x01},
{ 0x19, 0x02},
{ 0x18, 0x02},
{ 0x19, 0x02},
{ 0x18, 0x03},
{ 0x18, 0x03},
{ 0x19, 0x04},
{ 0x18, 0x04},
{ 0x18, 0x05},
{ 0x18, 0x05},
{ 0x18, 0x05},
{ 0x18, 0x06},
{ 0x17, 0x06},
{ 0x17, 0x06},
{ 0x17, 0x07},
{ 0x17, 0x08},
{ 0x17, 0x08},
{ 0x17, 0x08},
{ 0x17, 0x09},
{ 0x17, 0x09},
{ 0x17, 0x0a},
{ 0x16, 0x0a},
{ 0x16, 0x0a},
{ 0x16, 0x0b},
{ 0x16, 0x0b},
{ 0x16, 0x0b},
{ 0x16, 0x0c},
{ 0x15, 0x0c},
{ 0x15, 0x0c},
{ 0x15, 0x0d},
{ 0x14, 0x0d},
{ 0x14, 0x0d},
{ 0x13, 0x0d},
{ 0x13, 0x0d},
{ 0x13, 0x0e},
{ 0x13, 0x0e},
{ 0x13, 0x0f},
{ 0x13, 0x0f},
{ 0x12, 0x0f},
{ 0x12, 0x10},
{ 0x11, 0x10},
{ 0x11, 0x10},
{ 0x11, 0x11},
{ 0x11, 0x11},
{ 0x10, 0x11},
{ 0x10, 0x12},
{ 0x10, 0x12},
{ 0x0f, 0x12},
{ 0x0e, 0x12},
{ 0x0f, 0x13},
{ 0x0e, 0x13},
{ 0x0e, 0x13},
{ 0x0d, 0x13},
{ 0x0d, 0x14},
{ 0x0d, 0x14},
{ 0x0d, 0x14},
{ 0x0c, 0x14},
{ 0x0c, 0x14},
{ 0x0c, 0x15},
{ 0x0b, 0x15},
{ 0x0b, 0x15},
{ 0x0b, 0x15},
{ 0x0a, 0x15},
{ 0x0a, 0x16},
{ 0x0a, 0x16},
{ 0x09, 0x16},
{ 0x09, 0x16},
{ 0x08, 0x16},
{ 0x07, 0x16},
{ 0x07, 0x17},
{ 0x07, 0x17},
{ 0x06, 0x17},
{ 0x06, 0x17},
{ 0x05, 0x17},
{ 0x05, 0x17},
{ 0x05, 0x18},
{ 0x04, 0x18},
{ 0x04, 0x18},
{ 0x04, 0x18},
{ 0x03, 0x18},
{ 0x02, 0x18},
{ 0x02, 0x18},
{ 0x01, 0x18},
{ 0x01, 0x18},
{ 0x00, 0x18},
{ 0x00, 0x18},
{-0x01, 0x17},
{ 0x00, 0x18},
{ 0x00, 0x18},
{-0x01, 0x18},
{-0x01, 0x18},
{-0x02, 0x18},
{-0x02, 0x18},
{-0x03, 0x18},
{-0x03, 0x18},
{-0x04, 0x18},
{-0x04, 0x18},
{-0x05, 0x18},
{-0x05, 0x17},
{-0x05, 0x17},
{-0x06, 0x17},
{-0x06, 0x17},
{-0x07, 0x17},
{-0x07, 0x17},
{-0x07, 0x17},
{-0x08, 0x17},
{-0x08, 0x16},
{-0x09, 0x16},
{-0x09, 0x16},
{-0x0a, 0x16},
{-0x0a, 0x16},
{-0x0a, 0x15},
{-0x0b, 0x15},
{-0x0b, 0x15},
{-0x0b, 0x15},
{-0x0b, 0x14},
{-0x0c, 0x14},
{-0x0c, 0x14},
{-0x0d, 0x14},
{-0x0d, 0x14},
{-0x0d, 0x13},
{-0x0e, 0x13},
{-0x0e, 0x13},
{-0x0e, 0x13},
{-0x0e, 0x12},
{-0x0f, 0x12},
{-0x0f, 0x12},
{-0x0f, 0x11},
{-0x10, 0x11},
{-0x10, 0x11},
{-0x11, 0x11},
{-0x11, 0x10},
{-0x11, 0x10},
{-0x12, 0x10},
{-0x11, 0x0f},
{-0x12, 0x0f},
{-0x12, 0x0f},
{-0x13, 0x0f},
{-0x13, 0x0e},
{-0x13, 0x0e},
{-0x13, 0x0d},
{-0x13, 0x0d},
{-0x14, 0x0d},
{-0x14, 0x0c},
{-0x14, 0x0c},
{-0x15, 0x0c},
{-0x15, 0x0c},
{-0x15, 0x0b},
{-0x15, 0x0b},
{-0x15, 0x0a},
{-0x15, 0x0a},
{-0x15, 0x09},
{-0x16, 0x09},
{-0x16, 0x09},
{-0x16, 0x08},
{-0x16, 0x08},
{-0x16, 0x07},
{-0x17, 0x07},
{-0x17, 0x07},
{-0x17, 0x06},
{-0x17, 0x06},
{-0x17, 0x05},
{-0x18, 0x05},
{-0x17, 0x04},
{-0x17, 0x04},
{-0x18, 0x04},
{-0x18, 0x04},
{-0x18, 0x03},
{-0x18, 0x03},
{-0x18, 0x02},
{-0x18, 0x02},
{-0x18, 0x01},
{-0x18, 0x01},
{-0x18, 0x01},
{-0x18, 0x00},
{-0x19, 0x00},
{-0x18, -0x01},
{-0x19, -0x01},
{-0x18, -0x01},
{-0x18, -0x02},
{-0x18, -0x02},
{-0x18, -0x03},
{-0x18, -0x03},
{-0x18, -0x04},
{-0x18, -0x04},
{-0x18, -0x04},
{-0x18, -0x05},
{-0x18, -0x05},
{-0x18, -0x06},
{-0x18, -0x06},
{-0x17, -0x06},
{-0x17, -0x07},
{-0x17, -0x07},
{-0x17, -0x08},
{-0x17, -0x08},
{-0x17, -0x09},
{-0x17, -0x09},
{-0x16, -0x09},
{-0x16, -0x09},
{-0x16, -0x0a},
{-0x16, -0x0a},
{-0x15, -0x0a},
{-0x15, -0x0b},
{-0x16, -0x0b},
{-0x16, -0x0c},
{-0x15, -0x0c},
{-0x15, -0x0d},
{-0x15, -0x0d},
{-0x14, -0x0d},
{-0x15, -0x0e},
{-0x14, -0x0e},
{-0x14, -0x0e},
{-0x13, -0x0e},
{-0x13, -0x0f},
{-0x13, -0x0f},
{-0x12, -0x10},
{-0x12, -0x10},
{-0x12, -0x10},
{-0x12, -0x11},
{-0x12, -0x11},
{-0x11, -0x11},
{-0x11, -0x12},
{-0x11, -0x12},
{-0x10, -0x12},
{-0x10, -0x12},
{-0x10, -0x13},
{-0x10, -0x13},
{-0x0f, -0x13},
{-0x0f, -0x13},
{-0x0f, -0x14},
{-0x0e, -0x14},
{-0x0e, -0x14},
{-0x0e, -0x15},
{-0x0d, -0x15},
{-0x0d, -0x15},
{-0x0d, -0x15},
{-0x0c, -0x15},
{-0x0c, -0x16},
{-0x0b, -0x16},
{-0x0b, -0x16},
{-0x0b, -0x16},
{-0x0a, -0x16},
{-0x0a, -0x16},
{-0x09, -0x16},
{-0x09, -0x17},
{-0x09, -0x17},
{-0x08, -0x17},
{-0x08, -0x17},
{-0x07, -0x17},
{-0x07, -0x17},
{-0x07, -0x18},
{-0x06, -0x18},
{-0x06, -0x18},
{-0x05, -0x18},
{-0x05, -0x18},
{-0x04, -0x18},
{-0x04, -0x18},
{-0x04, -0x18},
{-0x04, -0x19},
{-0x03, -0x19},
{-0x02, -0x19},
{-0x02, -0x18},
{-0x02, -0x18},
{-0x01, -0x19},
{-0x01, -0x19},
{ 0x00, -0x19}
};
// text
@@ -290,3 +656,62 @@ void Cb2_ViewWallClock(void)
PutWindowTilemap(1);
schedule_bg_copy_tilemap_to_vram(2);
}
static void sub_8134C9C(void)
{
RunTasks();
AnimateSprites();
BuildOamBuffer();
do_scheduled_bg_tilemap_copies_to_vram();
UpdatePaletteFade();
}
static void sub_8134CB8(u8 taskId)
{
if (!gPaletteFade.active)
{
gTasks[taskId].func = sub_8134CE8;
}
}
void sub_8134CE8(u8 taskId)
{
if (gTasks[taskId].data[0] % 6)
{
gTasks[taskId].data[0] = sub_8134FFC(gTasks[taskId].data[0], gTasks[taskId].data[4], gTasks[taskId].data[6]);
}
else
{
gTasks[taskId].data[0] = gTasks[taskId].data[3] * 6;
gTasks[taskId].data[1] = (gTasks[taskId].data[2] % 12) * 30 + (gTasks[taskId].data[3] / 10) * 5;
if (gMain.newKeys & A_BUTTON)
{
gTasks[taskId].func = sub_8134DC4;
}
else
{
gTasks[taskId].data[4] = 0;
if (gMain.heldKeys & DPAD_LEFT)
{
gTasks[taskId].data[4] = 1;
}
if (gMain.heldKeys & DPAD_RIGHT)
{
gTasks[taskId].data[4] = 2;
}
if (gTasks[taskId].data[4] != 0)
{
if (gTasks[taskId].data[6] <= 0xFE)
{
gTasks[taskId].data[6]++;
}
gTasks[taskId].data[0] = sub_8134FFC(gTasks[taskId].data[0], gTasks[taskId].data[4], gTasks[taskId].data[6]);
sub_813504C(taskId, gTasks[taskId].data[4]);
}
else
{
gTasks[taskId].data[6] = 0;
}
}
}
}