Merge branch 'master' into battle_engine_v2
This commit is contained in:
DizzyEggg
commit
3934eac8d4
7 changed files with 792 additions and 2175 deletions
1876
asm/normal.s
1876
asm/normal.s
File diff suppressed because it is too large
Load diff
|
|
@ -123,6 +123,7 @@ u8 sub_80A89C8(int, u8, int);
|
|||
void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32);
|
||||
void sub_80A6CC0(u32, const void*, u32);
|
||||
void sub_80A6DAC(bool8);
|
||||
void sub_80A634C(struct Sprite *);
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
@ -166,7 +167,7 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId);
|
|||
// battle_anim_utility_funcs.s
|
||||
void sub_8116EB4(u8);
|
||||
|
||||
u32 sub_811583C(s16);
|
||||
u32 UnpackSelectedBattleAnimPalettes(s16);
|
||||
|
||||
u8 GetBattlerSpriteFinal_Y(u8, u16, u8);
|
||||
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ SECTIONS {
|
|||
src/dragon.o(.text);
|
||||
asm/dark.o(.text);
|
||||
src/ground.o(.text);
|
||||
asm/normal.o(.text);
|
||||
src/normal.o(.text);
|
||||
src/battle_anim_utility_funcs.o(.text);
|
||||
asm/battle_intro.o(.text);
|
||||
src/bike.o(.text);
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ const u8 gUnknown_0859741E[] = {0x08, 0x0a, 0x0c, 0x0e};
|
|||
|
||||
void sub_8116620(u8 taskId)
|
||||
{
|
||||
u32 selectedPalettes = sub_811583C(gBattleAnimArgs[0]);
|
||||
u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]);
|
||||
selectedPalettes |= sub_80A76C4((gBattleAnimArgs[0] >> 7) & 1,
|
||||
(gBattleAnimArgs[0] >> 8) & 1,
|
||||
(gBattleAnimArgs[0] >> 9) & 1,
|
||||
|
|
@ -62,7 +62,7 @@ void sub_8116664(u8 taskId)
|
|||
u8 animBattlers[2];
|
||||
|
||||
animBattlers[1] = 0xFF;
|
||||
selectedPalettes = sub_811583C(1);
|
||||
selectedPalettes = UnpackSelectedBattleAnimPalettes(1);
|
||||
switch (gBattleAnimArgs[0])
|
||||
{
|
||||
case 2:
|
||||
|
|
@ -105,7 +105,7 @@ void sub_8116664(u8 taskId)
|
|||
|
||||
void AnimTask_SetCamouflageBlend(u8 taskId)
|
||||
{
|
||||
u32 selectedPalettes = sub_811583C(gBattleAnimArgs[0]);
|
||||
u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]);
|
||||
switch (gBattleTerrain)
|
||||
{
|
||||
case BATTLE_TERRAIN_GRASS:
|
||||
|
|
|
|||
|
|
@ -981,7 +981,7 @@ static void atk00_attackcanceler(void)
|
|||
|
||||
if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattlerTarget, 0, 0, 0))
|
||||
return;
|
||||
if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200)
|
||||
if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & (HITMARKER_x800000 | HITMARKER_NO_ATTACKSTRING))
|
||||
&& !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))
|
||||
{
|
||||
gBattlescriptCurrInstr = BattleScript_NoPPForMove;
|
||||
|
|
|
|||
|
|
@ -2501,10 +2501,8 @@ static void sub_80B8584(struct Task *task)
|
|||
|
||||
static void sub_80B85F8(struct Task *task)
|
||||
{
|
||||
u16 offset;
|
||||
u16 delta;
|
||||
offset = ((REG_BG0CNT >> 2) << 14);
|
||||
delta = ((REG_BG0CNT >> 8) << 11);
|
||||
u16 offset = ((REG_BG0CNT >> 2) << 14);
|
||||
u16 delta = ((REG_BG0CNT >> 8) << 11);
|
||||
CpuCopy16(gFieldMoveStreaksTiles, (void *)(VRAM + offset), 0x200);
|
||||
CpuFill32(0, (void *)(VRAM + delta), 0x800);
|
||||
LoadPalette(gFieldMoveStreaksPalette, 0xf0, 0x20);
|
||||
|
|
@ -2580,8 +2578,7 @@ static void sub_80B871C(struct Task *task)
|
|||
|
||||
static void sub_80B8770(struct Task *task)
|
||||
{
|
||||
u16 bg0cnt;
|
||||
bg0cnt = (REG_BG0CNT >> 8) << 11;
|
||||
u16 bg0cnt = (REG_BG0CNT >> 8) << 11;
|
||||
CpuFill32(0, (void *)VRAM + bg0cnt, 0x800);
|
||||
task->data[1] = 0xf1;
|
||||
task->data[2] = 0xa1;
|
||||
|
|
@ -2603,9 +2600,8 @@ static void overworld_bg_setup_2(struct Task *task)
|
|||
|
||||
static void sub_80B880C(void)
|
||||
{
|
||||
struct Task *task;
|
||||
IntrCallback callback;
|
||||
task = &gTasks[FindTaskIdByFunc(sub_80B8554)];
|
||||
struct Task *task = &gTasks[FindTaskIdByFunc(sub_80B8554)];
|
||||
LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&callback);
|
||||
callback();
|
||||
SetGpuReg(REG_OFFSET_WIN0H, task->data[1]);
|
||||
|
|
@ -2735,7 +2731,6 @@ static void sub_80B8B28(struct Task *task)
|
|||
task->data[3] += 16;
|
||||
}
|
||||
|
||||
#ifdef NONMATCHING
|
||||
static bool8 sub_80B8B38(struct Task *task)
|
||||
{
|
||||
u16 i;
|
||||
|
|
@ -2752,116 +2747,18 @@ static bool8 sub_80B8B38(struct Task *task)
|
|||
dstOffs = (32 - dstOffs) & 0x1f;
|
||||
srcOffs = (32 - task->data[4]) & 0x1f;
|
||||
dest = (u16 *)(VRAM + 0x140 + (u16)task->data[12]);
|
||||
for (i=0; i<10; i++)
|
||||
for (i = 0; i < 10; i++)
|
||||
{
|
||||
dest[dstOffs + i * 32] = gDarknessFieldMoveStreaksTilemap[srcOffs + i * 32] | 0xf000;
|
||||
dest[dstOffs + i * 32] = gDarknessFieldMoveStreaksTilemap[srcOffs + i * 32];
|
||||
dest[dstOffs + i * 32] |= 0xf000;
|
||||
|
||||
dest[((dstOffs + 1) & 0x1f) + i * 32] = gDarknessFieldMoveStreaksTilemap[((srcOffs + 1) & 0x1f) + i * 32] | 0xf000;
|
||||
dest[((dstOffs + 1) & 0x1f) + i * 32] |= 0xf000;
|
||||
}
|
||||
task->data[4] += 2;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
#else
|
||||
NAKED
|
||||
static bool8 sub_80B8B38(struct Task *task)
|
||||
{
|
||||
asm_unified("\tpush {r4-r7,lr}\n"
|
||||
"\tmov r7, r10\n"
|
||||
"\tmov r6, r9\n"
|
||||
"\tmov r5, r8\n"
|
||||
"\tpush {r5-r7}\n"
|
||||
"\tsub sp, 0x4\n"
|
||||
"\tadds r5, r0, 0\n"
|
||||
"\tldrh r2, [r5, 0x10]\n"
|
||||
"\tmovs r1, 0x10\n"
|
||||
"\tldrsh r0, [r5, r1]\n"
|
||||
"\tcmp r0, 0x1F\n"
|
||||
"\tble _08088724\n"
|
||||
"\tmovs r0, 0x1\n"
|
||||
"\tb _080887A8\n"
|
||||
"_08088724:\n"
|
||||
"\tldrh r0, [r5, 0xE]\n"
|
||||
"\tlsls r0, 16\n"
|
||||
"\tasrs r3, r0, 19\n"
|
||||
"\tmovs r1, 0x1F\n"
|
||||
"\tands r3, r1\n"
|
||||
"\tmovs r4, 0x10\n"
|
||||
"\tldrsh r0, [r5, r4]\n"
|
||||
"\tcmp r3, r0\n"
|
||||
"\tblt _080887A6\n"
|
||||
"\tmovs r0, 0x20\n"
|
||||
"\tsubs r3, r0, r3\n"
|
||||
"\tands r3, r1\n"
|
||||
"\tsubs r0, r2\n"
|
||||
"\tmov r12, r0\n"
|
||||
"\tmov r7, r12\n"
|
||||
"\tands r7, r1\n"
|
||||
"\tmov r12, r7\n"
|
||||
"\tldrh r0, [r5, 0x20]\n"
|
||||
"\tldr r1, _080887B8 @ =0x06000140\n"
|
||||
"\tadds r1, r0\n"
|
||||
"\tmov r8, r1\n"
|
||||
"\tmovs r4, 0\n"
|
||||
"\tldr r7, _080887BC @ =gDarknessFieldMoveStreaksTilemap\n"
|
||||
"\tmov r10, r7\n"
|
||||
"\tmovs r0, 0xF0\n"
|
||||
"\tlsls r0, 8\n"
|
||||
"\tmov r9, r0\n"
|
||||
"\tadds r1, r3, 0x1\n"
|
||||
"\tmovs r0, 0x1F\n"
|
||||
"\tands r1, r0\n"
|
||||
"\tstr r1, [sp]\n"
|
||||
"\tmov r6, r12\n"
|
||||
"\tadds r6, 0x1\n"
|
||||
"\tands r6, r0\n"
|
||||
"_08088768:\n"
|
||||
"\tlsls r1, r4, 5\n"
|
||||
"\tadds r2, r1, r3\n"
|
||||
"\tlsls r2, 1\n"
|
||||
"\tadd r2, r8\n"
|
||||
"\tmov r7, r12\n"
|
||||
"\tadds r0, r7, r1\n"
|
||||
"\tlsls r0, 1\n"
|
||||
"\tadd r0, r10\n"
|
||||
"\tldrh r0, [r0]\n"
|
||||
"\tmov r7, r9\n"
|
||||
"\torrs r0, r7\n"
|
||||
"\tstrh r0, [r2]\n"
|
||||
"\tldr r0, [sp]\n"
|
||||
"\tadds r2, r1, r0\n"
|
||||
"\tlsls r2, 1\n"
|
||||
"\tadd r2, r8\n"
|
||||
"\tadds r1, r6, r1\n"
|
||||
"\tlsls r1, 1\n"
|
||||
"\tadd r1, r10\n"
|
||||
"\tldrh r0, [r1]\n"
|
||||
"\tmov r1, r9\n"
|
||||
"\torrs r0, r1\n"
|
||||
"\tstrh r0, [r2]\n"
|
||||
"\tadds r0, r4, 0x1\n"
|
||||
"\tlsls r0, 16\n"
|
||||
"\tlsrs r4, r0, 16\n"
|
||||
"\tcmp r4, 0x9\n"
|
||||
"\tbls _08088768\n"
|
||||
"\tldrh r0, [r5, 0x10]\n"
|
||||
"\tadds r0, 0x2\n"
|
||||
"\tstrh r0, [r5, 0x10]\n"
|
||||
"_080887A6:\n"
|
||||
"\tmovs r0, 0\n"
|
||||
"_080887A8:\n"
|
||||
"\tadd sp, 0x4\n"
|
||||
"\tpop {r3-r5}\n"
|
||||
"\tmov r8, r3\n"
|
||||
"\tmov r9, r4\n"
|
||||
"\tmov r10, r5\n"
|
||||
"\tpop {r4-r7}\n"
|
||||
"\tpop {r1}\n"
|
||||
"\tbx r1\n"
|
||||
"\t.align 2, 0\n"
|
||||
"_080887B8: .4byte 0x06000140\n"
|
||||
"_080887BC: .4byte gDarknessFieldMoveStreaksTilemap");
|
||||
}
|
||||
#endif
|
||||
|
||||
static bool8 sub_80B8BF0(struct Task *task)
|
||||
{
|
||||
|
|
@ -2877,7 +2774,7 @@ static bool8 sub_80B8BF0(struct Task *task)
|
|||
{
|
||||
dstOffs = (task->data[1] >> 3) & 0x1f;
|
||||
dest = (u16 *)(VRAM + 0x140 + (u16)task->data[12]);
|
||||
for (i=0; i<10; i++)
|
||||
for (i = 0; i < 10; i++)
|
||||
{
|
||||
dest[dstOffs + i * 32] = 0xf000;
|
||||
dest[((dstOffs + 1) & 0x1f) + i * 32] = 0xf000;
|
||||
|
|
@ -2913,7 +2810,8 @@ static void sub_80B8CC0(struct Sprite *sprite)
|
|||
if (sprite->data[6])
|
||||
{
|
||||
PlayCry2(sprite->data[0], 0, 0x7d, 0xa);
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
PlayCry1(sprite->data[0], 0);
|
||||
}
|
||||
|
|
@ -2933,7 +2831,8 @@ static void sub_80B8D20(struct Sprite *sprite)
|
|||
if (sprite->pos1.x < -0x40)
|
||||
{
|
||||
sprite->data[7] = 1;
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
sprite->pos1.x -= 20;
|
||||
}
|
||||
|
|
@ -2941,8 +2840,7 @@ static void sub_80B8D20(struct Sprite *sprite)
|
|||
|
||||
u8 FldEff_UseSurf(void)
|
||||
{
|
||||
u8 taskId;
|
||||
taskId = CreateTask(sub_80B8D84, 0xff);
|
||||
u8 taskId = CreateTask(sub_80B8D84, 0xff);
|
||||
gTasks[taskId].data[15] = gFieldEffectArguments[0];
|
||||
Overworld_ClearSavedMusic();
|
||||
Overworld_ChangeMusicTo(MUS_NAMINORI);
|
||||
|
|
@ -3031,13 +2929,12 @@ static void sub_80B8F24(struct Task *task)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef NONMATCHING
|
||||
u8 sub_80B8F98(void)
|
||||
{
|
||||
u8 spriteId, i, j, k, l;
|
||||
struct Sprite *sprite;
|
||||
spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[36], 0x78, -0x18, 1);
|
||||
sprite = &gSprites[spriteId];
|
||||
u8 i, j, k;
|
||||
u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[36], 0x78, -0x18, 1);
|
||||
struct Sprite *sprite = &gSprites[spriteId];
|
||||
|
||||
sprite->oam.priority = 1;
|
||||
sprite->oam.paletteNum = 4;
|
||||
sprite->data[0] = 0;
|
||||
|
|
@ -3048,7 +2945,7 @@ u8 sub_80B8F98(void)
|
|||
sprite->data[5] = 0;
|
||||
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD);
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(14, 14));
|
||||
SetGpuReg(REG_OFFSET_WININ, 0x3F3F);
|
||||
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
|
||||
LoadPalette(gUnknown_0855B610, 0xC0, sizeof(gUnknown_0855B610));
|
||||
SetGpuReg(REG_OFFSET_BG0VOFS, 120);
|
||||
for (i = 3; i < 15; i++)
|
||||
|
|
@ -3060,156 +2957,20 @@ u8 sub_80B8F98(void)
|
|||
}
|
||||
for (k = 0; k < 90; k++)
|
||||
{
|
||||
for (l = 0; l < 8; l++)
|
||||
for (i = 0; i < 8; i++)
|
||||
{
|
||||
*(u16*)(VRAM + 0x8000 + (k + 1) * 32 + l * 4) = (gUnknown_0855B630[k * 32 + l * 4 + 1] << 8) + gUnknown_0855B630[k * 32 + l * 4];
|
||||
*(u16*)(VRAM + 0x8000 + (k + 1) * 32 + l * 4 + 2) = (gUnknown_0855B630[k * 32 + l * 4 + 3] << 8) + gUnknown_0855B630[k * 32 + l * 4 + 2];
|
||||
*(u16*)(VRAM + 0x8000 + (k + 1) * 32 + i * 4) = (gUnknown_0855B630[k * 32 + i * 4 + 1] << 8) + gUnknown_0855B630[k * 32 + i * 4];
|
||||
*(u16*)(VRAM + 0x8000 + (k + 1) * 32 + i * 4 + 2) = (gUnknown_0855B630[k * 32 + i * 4 + 3] << 8) + gUnknown_0855B630[k * 32 + i * 4 + 2];
|
||||
}
|
||||
}
|
||||
return spriteId;
|
||||
}
|
||||
#else
|
||||
NAKED
|
||||
u8 sub_80B8F98(void)
|
||||
{
|
||||
asm_unified("push {r4-r7,lr}\n\
|
||||
mov r7, r8\n\
|
||||
push {r7}\n\
|
||||
ldr r0, =gFieldEffectObjectTemplatePointers\n\
|
||||
adds r0, 0x90\n\
|
||||
ldr r0, [r0]\n\
|
||||
movs r2, 0x18\n\
|
||||
negs r2, r2\n\
|
||||
movs r1, 0x78\n\
|
||||
movs r3, 0x1\n\
|
||||
bl CreateSprite\n\
|
||||
lsls r0, 24\n\
|
||||
lsrs r0, 24\n\
|
||||
mov r8, r0\n\
|
||||
lsls r1, r0, 4\n\
|
||||
add r1, r8\n\
|
||||
lsls r1, 2\n\
|
||||
ldr r0, =gSprites\n\
|
||||
adds r1, r0\n\
|
||||
ldrb r2, [r1, 0x5]\n\
|
||||
movs r0, 0xD\n\
|
||||
negs r0, r0\n\
|
||||
ands r0, r2\n\
|
||||
movs r2, 0x4\n\
|
||||
orrs r0, r2\n\
|
||||
movs r2, 0xF\n\
|
||||
ands r0, r2\n\
|
||||
movs r2, 0x40\n\
|
||||
orrs r0, r2\n\
|
||||
strb r0, [r1, 0x5]\n\
|
||||
movs r2, 0\n\
|
||||
strh r2, [r1, 0x2E]\n\
|
||||
strh r2, [r1, 0x30]\n\
|
||||
strh r2, [r1, 0x32]\n\
|
||||
ldr r0, =0x0000ffff\n\
|
||||
strh r0, [r1, 0x34]\n\
|
||||
ldrh r0, [r1, 0x22]\n\
|
||||
strh r0, [r1, 0x36]\n\
|
||||
strh r2, [r1, 0x38]\n\
|
||||
ldr r1, =0x00003e41\n\
|
||||
movs r0, 0x50\n\
|
||||
bl SetGpuReg\n\
|
||||
ldr r1, =0x00000e0e\n\
|
||||
movs r0, 0x52\n\
|
||||
bl SetGpuReg\n\
|
||||
ldr r1, =0x00003f3f\n\
|
||||
movs r0, 0x48\n\
|
||||
bl SetGpuReg\n\
|
||||
ldr r0, =gUnknown_0855B610\n\
|
||||
movs r1, 0xC0\n\
|
||||
movs r2, 0x20\n\
|
||||
bl LoadPalette\n\
|
||||
movs r0, 0x12\n\
|
||||
movs r1, 0x78\n\
|
||||
bl SetGpuReg\n\
|
||||
movs r4, 0x3\n\
|
||||
ldr r7, =0x0600f800\n\
|
||||
ldr r0, =0x0000bff4\n\
|
||||
adds r6, r0, 0\n\
|
||||
_080B901A:\n\
|
||||
movs r2, 0xC\n\
|
||||
lsls r0, r4, 1\n\
|
||||
lsls r5, r4, 5\n\
|
||||
adds r0, r4\n\
|
||||
lsls r3, r0, 1\n\
|
||||
_080B9024:\n\
|
||||
adds r0, r5, r2\n\
|
||||
lsls r0, 1\n\
|
||||
adds r0, r7\n\
|
||||
adds r1, r2, r6\n\
|
||||
adds r1, r3, r1\n\
|
||||
adds r1, 0x1\n\
|
||||
strh r1, [r0]\n\
|
||||
adds r0, r2, 0x1\n\
|
||||
lsls r0, 24\n\
|
||||
lsrs r2, r0, 24\n\
|
||||
cmp r2, 0x11\n\
|
||||
bls _080B9024\n\
|
||||
adds r0, r4, 0x1\n\
|
||||
lsls r0, 24\n\
|
||||
lsrs r4, r0, 24\n\
|
||||
cmp r4, 0xE\n\
|
||||
bls _080B901A\n\
|
||||
movs r0, 0\n\
|
||||
ldr r5, =gUnknown_0855B630\n\
|
||||
_080B904A:\n\
|
||||
movs r4, 0\n\
|
||||
adds r7, r0, 0x1\n\
|
||||
lsls r6, r0, 5\n\
|
||||
_080B9050:\n\
|
||||
lsls r1, r4, 2\n\
|
||||
adds r1, r6, r1\n\
|
||||
ldr r0, =0x06008020\n\
|
||||
adds r3, r1, r0\n\
|
||||
adds r0, r1, 0x1\n\
|
||||
adds r0, r5\n\
|
||||
ldrb r2, [r0]\n\
|
||||
lsls r2, 8\n\
|
||||
adds r0, r1, r5\n\
|
||||
ldrb r0, [r0]\n\
|
||||
adds r0, r2\n\
|
||||
strh r0, [r3]\n\
|
||||
ldr r0, =0x06008022\n\
|
||||
adds r3, r1, r0\n\
|
||||
adds r0, r1, 0x3\n\
|
||||
adds r0, r5\n\
|
||||
ldrb r2, [r0]\n\
|
||||
lsls r2, 8\n\
|
||||
adds r1, 0x2\n\
|
||||
adds r1, r5\n\
|
||||
ldrb r0, [r1]\n\
|
||||
adds r0, r2\n\
|
||||
strh r0, [r3]\n\
|
||||
adds r0, r4, 0x1\n\
|
||||
lsls r0, 24\n\
|
||||
lsrs r4, r0, 24\n\
|
||||
cmp r4, 0x7\n\
|
||||
bls _080B9050\n\
|
||||
lsls r0, r7, 24\n\
|
||||
lsrs r0, 24\n\
|
||||
cmp r0, 0x59\n\
|
||||
bls _080B904A\n\
|
||||
mov r0, r8\n\
|
||||
pop {r3}\n\
|
||||
mov r8, r3\n\
|
||||
pop {r4-r7}\n\
|
||||
pop {r1}\n\
|
||||
bx r1\n\
|
||||
.pool");
|
||||
}
|
||||
#endif // NONMATCHING
|
||||
|
||||
u8 FldEff_NPCFlyOut(void)
|
||||
{
|
||||
u8 spriteId;
|
||||
struct Sprite *sprite;
|
||||
spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0x78, 0, 1);
|
||||
sprite = &gSprites[spriteId];
|
||||
u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0x78, 0, 1);
|
||||
struct Sprite *sprite = &gSprites[spriteId];
|
||||
|
||||
sprite->oam.paletteNum = 0;
|
||||
sprite->oam.priority = 1;
|
||||
sprite->callback = sub_80B9128;
|
||||
|
|
@ -3221,6 +2982,7 @@ u8 FldEff_NPCFlyOut(void)
|
|||
static void sub_80B9128(struct Sprite *sprite)
|
||||
{
|
||||
struct Sprite *npcSprite;
|
||||
|
||||
sprite->pos2.x = Cos(sprite->data[2], 0x8c);
|
||||
sprite->pos2.y = Sin(sprite->data[2], 0x48);
|
||||
sprite->data[2] = (sprite->data[2] + 4) & 0xff;
|
||||
|
|
@ -3241,8 +3003,7 @@ static void sub_80B9128(struct Sprite *sprite)
|
|||
|
||||
u8 FldEff_UseFly(void)
|
||||
{
|
||||
u8 taskId;
|
||||
taskId = CreateTask(sub_80B91D4, 0xfe);
|
||||
u8 taskId = CreateTask(sub_80B91D4, 0xfe);
|
||||
gTasks[taskId].data[1] = gFieldEffectArguments[0];
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -3266,8 +3027,7 @@ static void sub_80B91D4(u8 taskId)
|
|||
|
||||
static void sub_80B9204(struct Task *task)
|
||||
{
|
||||
struct EventObject *eventObject;
|
||||
eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
|
||||
{
|
||||
task->data[15] = gPlayerAvatar.flags;
|
||||
|
|
@ -3281,8 +3041,7 @@ static void sub_80B9204(struct Task *task)
|
|||
|
||||
static void sub_80B925C(struct Task *task)
|
||||
{
|
||||
struct EventObject *eventObject;
|
||||
eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
if (EventObjectClearHeldMovementIfFinished(eventObject))
|
||||
{
|
||||
task->data[0]++;
|
||||
|
|
@ -3293,10 +3052,9 @@ static void sub_80B925C(struct Task *task)
|
|||
|
||||
static void sub_80B92A0(struct Task *task)
|
||||
{
|
||||
struct EventObject *eventObject;
|
||||
if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
|
||||
{
|
||||
eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
if (task->data[15] & 0x08)
|
||||
{
|
||||
sub_81555AC(eventObject->fieldEffectSpriteId, 2);
|
||||
|
|
@ -3320,8 +3078,7 @@ static void sub_80B92F8(struct Task *task)
|
|||
|
||||
static void sub_80B933C(struct Task *task)
|
||||
{
|
||||
struct EventObject *eventObject;
|
||||
eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject))
|
||||
{
|
||||
task->data[0]++;
|
||||
|
|
@ -3332,10 +3089,9 @@ static void sub_80B933C(struct Task *task)
|
|||
|
||||
static void sub_80B9390(struct Task *task)
|
||||
{
|
||||
struct EventObject *eventObject;
|
||||
if ((++task->data[2]) >= 8)
|
||||
{
|
||||
eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x03));
|
||||
StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16);
|
||||
eventObject->inanimate = 1;
|
||||
|
|
@ -3351,10 +3107,9 @@ static void sub_80B9390(struct Task *task)
|
|||
|
||||
static void sub_80B9418(struct Task *task)
|
||||
{
|
||||
struct EventObject *eventObject;
|
||||
if ((++task->data[2]) >= 10)
|
||||
{
|
||||
eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
|
||||
EventObjectClearHeldMovementIfActive(eventObject);
|
||||
eventObject->inanimate = 0;
|
||||
eventObject->hasShadow = 0;
|
||||
|
|
|
|||
765
src/normal.c
765
src/normal.c
|
|
@ -1,19 +1,42 @@
|
|||
#include "global.h"
|
||||
#include "battle_anim.h"
|
||||
#include "palette.h"
|
||||
#include "random.h"
|
||||
#include "task.h"
|
||||
#include "trig.h"
|
||||
#include "constants/rgb.h"
|
||||
|
||||
extern void sub_811572C(struct Sprite *);
|
||||
extern void sub_81157FC(struct Sprite *);
|
||||
extern void sub_81158A4(struct Sprite *);
|
||||
extern void sub_81159B4(struct Sprite *);
|
||||
extern void sub_81160A4(struct Sprite *);
|
||||
extern void sub_8116388(struct Sprite *);
|
||||
extern void sub_8116420(struct Sprite *);
|
||||
extern void sub_8116458(struct Sprite *);
|
||||
extern void sub_81164F0(struct Sprite *);
|
||||
extern void sub_8116560(struct Sprite *);
|
||||
extern void sub_81165A8(struct Sprite *);
|
||||
extern void sub_81163D0(struct Sprite *);
|
||||
void AnimConfusionDuck(struct Sprite *);
|
||||
void AnimSimplePaletteBlend(struct Sprite *);
|
||||
u32 UnpackSelectedBattleAnimPalettes(s16);
|
||||
void sub_81158A4(struct Sprite *);
|
||||
void sub_81159B4(struct Sprite *);
|
||||
void sub_81160A4(struct Sprite *);
|
||||
void sub_8116388(struct Sprite *);
|
||||
void sub_8116420(struct Sprite *);
|
||||
void sub_8116458(struct Sprite *);
|
||||
void sub_81164F0(struct Sprite *);
|
||||
void sub_8116560(struct Sprite *);
|
||||
void sub_81165A8(struct Sprite *);
|
||||
static void AnimConfusionDuckStep(struct Sprite *);
|
||||
static void AnimSimplePaletteBlendStep(struct Sprite *);
|
||||
static void sub_81158F8(struct Sprite *);
|
||||
static void sub_8115984(struct Sprite *);
|
||||
static void sub_8115A54(u8, u8, u8);
|
||||
static void sub_8115AA4(u8);
|
||||
static void sub_8115BC8(u8, u8, u8);
|
||||
static void sub_8115C18(u8);
|
||||
static void sub_8115CD0(u8, u8, u8);
|
||||
static void sub_8115D2C(u8);
|
||||
static void sub_8115E00(u8);
|
||||
static void sub_8115EB8(u8);
|
||||
static void sub_8116148(struct Sprite *);
|
||||
static void sub_81161F4(void);
|
||||
static void sub_81162F8(u8);
|
||||
static void sub_81163D0(struct Sprite *);
|
||||
static void sub_81165E4(struct Sprite *);
|
||||
|
||||
extern void sub_810E2C8(struct Sprite *);
|
||||
|
||||
const union AnimCmd gUnknown_0859722C[] =
|
||||
{
|
||||
|
|
@ -47,7 +70,7 @@ const struct SpriteTemplate gConfusionDuckSpriteTemplate =
|
|||
.anims = gUnknown_08597254,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = sub_811572C,
|
||||
.callback = AnimConfusionDuck,
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gSimplePaletteBlendSpriteTemplate =
|
||||
|
|
@ -58,7 +81,7 @@ const struct SpriteTemplate gSimplePaletteBlendSpriteTemplate =
|
|||
.anims = gDummySpriteAnimTable,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = sub_81157FC,
|
||||
.callback = AnimSimplePaletteBlend,
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gComplexPaletteBlendSpriteTemplate =
|
||||
|
|
@ -231,3 +254,717 @@ const struct SpriteTemplate gUnknown_08597400 =
|
|||
.affineAnims = gUnknown_08597348,
|
||||
.callback = sub_81163D0,
|
||||
};
|
||||
|
||||
// Moves a spinning duck around the mon's head.
|
||||
// arg 0: initial x pixel offset
|
||||
// arg 1: initial y pixel offset
|
||||
// arg 2: initial wave offset
|
||||
// arg 3: wave period (higher means faster wave)
|
||||
// arg 4: duration
|
||||
void AnimConfusionDuck(struct Sprite *sprite)
|
||||
{
|
||||
sprite->pos1.x += gBattleAnimArgs[0];
|
||||
sprite->pos1.y += gBattleAnimArgs[1];
|
||||
sprite->data[0] = gBattleAnimArgs[2];
|
||||
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
|
||||
{
|
||||
sprite->data[1] = -gBattleAnimArgs[3];
|
||||
sprite->data[4] = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
sprite->data[1] = gBattleAnimArgs[3];
|
||||
sprite->data[4] = 0;
|
||||
StartSpriteAnim(sprite, 1);
|
||||
}
|
||||
|
||||
sprite->data[3] = gBattleAnimArgs[4];
|
||||
sprite->callback = AnimConfusionDuckStep;
|
||||
sprite->callback(sprite);
|
||||
}
|
||||
|
||||
static void AnimConfusionDuckStep(struct Sprite *sprite)
|
||||
{
|
||||
sprite->pos2.x = Cos(sprite->data[0], 30);
|
||||
sprite->pos2.y = Sin(sprite->data[0], 10);
|
||||
|
||||
if ((u16)sprite->data[0] < 128)
|
||||
sprite->oam.priority = 1;
|
||||
else
|
||||
sprite->oam.priority = 3;
|
||||
|
||||
sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF;
|
||||
if (++sprite->data[2] == sprite->data[3])
|
||||
DestroyAnimSprite(sprite);
|
||||
}
|
||||
|
||||
// Performs a simple color blend on a specified sprite.
|
||||
// arg 0: palette selector
|
||||
// arg 1: delay
|
||||
// arg 2: start blend amount
|
||||
// arg 3: end blend amount
|
||||
// arg 4: blend color
|
||||
void AnimSimplePaletteBlend(struct Sprite *sprite)
|
||||
{
|
||||
u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]);
|
||||
BeginNormalPaletteFade(selectedPalettes, gBattleAnimArgs[1], gBattleAnimArgs[2], gBattleAnimArgs[3], gBattleAnimArgs[4]);
|
||||
sprite->invisible = 1;
|
||||
sprite->callback = AnimSimplePaletteBlendStep;
|
||||
}
|
||||
|
||||
// Unpacks a bitfield and returns a bitmask of its selected palettes.
|
||||
// Bits 0-6 of the selector parameter result in the following palettes being selected:
|
||||
// 0: battle background palettes (BG palettes 1, 2, and 3)
|
||||
// 1: gBattleAnimAttacker OBJ palette
|
||||
// 2: gBattleAnimTarget OBJ palette
|
||||
// 3: gBattleAnimAttacker partner OBJ palette
|
||||
// 4: gBattleAnimTarget partner OBJ palette
|
||||
// 5: BG palette 4
|
||||
// 6: BG palette 5
|
||||
u32 UnpackSelectedBattleAnimPalettes(s16 selector)
|
||||
{
|
||||
u8 arg0 = selector & 1;
|
||||
u8 arg1 = (selector >> 1) & 1;
|
||||
u8 arg2 = (selector >> 2) & 1;
|
||||
u8 arg3 = (selector >> 3) & 1;
|
||||
u8 arg4 = (selector >> 4) & 1;
|
||||
u8 arg5 = (selector >> 5) & 1;
|
||||
u8 arg6 = (selector >> 6) & 1;
|
||||
return sub_80A75AC(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
|
||||
}
|
||||
|
||||
static void AnimSimplePaletteBlendStep(struct Sprite *sprite)
|
||||
{
|
||||
if (!gPaletteFade.active)
|
||||
DestroyAnimSprite(sprite);
|
||||
}
|
||||
|
||||
void sub_81158A4(struct Sprite *sprite)
|
||||
{
|
||||
u32 selectedPalettes;
|
||||
|
||||
sprite->data[0] = gBattleAnimArgs[1];
|
||||
sprite->data[1] = gBattleAnimArgs[1];
|
||||
sprite->data[2] = gBattleAnimArgs[2];
|
||||
sprite->data[3] = gBattleAnimArgs[3];
|
||||
sprite->data[4] = gBattleAnimArgs[4];
|
||||
sprite->data[5] = gBattleAnimArgs[5];
|
||||
sprite->data[6] = gBattleAnimArgs[6];
|
||||
sprite->data[7] = gBattleAnimArgs[0];
|
||||
|
||||
selectedPalettes = UnpackSelectedBattleAnimPalettes(sprite->data[7]);
|
||||
BlendPalettes(selectedPalettes, gBattleAnimArgs[4], gBattleAnimArgs[3]);
|
||||
sprite->invisible = 1;
|
||||
sprite->callback = sub_81158F8;
|
||||
}
|
||||
|
||||
static void sub_81158F8(struct Sprite *sprite)
|
||||
{
|
||||
u32 selectedPalettes;
|
||||
|
||||
if (sprite->data[0] > 0)
|
||||
{
|
||||
sprite->data[0]--;
|
||||
return;
|
||||
}
|
||||
|
||||
if (gPaletteFade.active)
|
||||
return;
|
||||
|
||||
if (sprite->data[2] == 0)
|
||||
{
|
||||
sprite->callback = sub_8115984;
|
||||
return;
|
||||
}
|
||||
|
||||
selectedPalettes = UnpackSelectedBattleAnimPalettes(sprite->data[7]);
|
||||
if (sprite->data[1] & 0x100)
|
||||
BlendPalettes(selectedPalettes, sprite->data[4], sprite->data[3]);
|
||||
else
|
||||
BlendPalettes(selectedPalettes, sprite->data[6], sprite->data[5]);
|
||||
|
||||
sprite->data[1] ^= 0x100;
|
||||
sprite->data[0] = sprite->data[1] & 0xFF;
|
||||
sprite->data[2]--;
|
||||
}
|
||||
|
||||
static void sub_8115984(struct Sprite *sprite)
|
||||
{
|
||||
u32 selectedPalettes;
|
||||
|
||||
if (!gPaletteFade.active)
|
||||
{
|
||||
selectedPalettes = UnpackSelectedBattleAnimPalettes(sprite->data[7]);
|
||||
BlendPalettes(selectedPalettes, 0, 0);
|
||||
DestroyAnimSprite(sprite);
|
||||
}
|
||||
}
|
||||
|
||||
void sub_81159B4(struct Sprite *sprite)
|
||||
{
|
||||
sprite->pos1.x += gBattleAnimArgs[0];
|
||||
sprite->pos1.y += gBattleAnimArgs[1];
|
||||
sprite->data[0] = 0;
|
||||
sprite->data[1] = 10;
|
||||
sprite->data[2] = 8;
|
||||
sprite->data[3] = 40;
|
||||
sprite->data[4] = 112;
|
||||
sprite->data[5] = 0;
|
||||
StoreSpriteCallbackInData6(sprite, move_anim_8074EE0);
|
||||
sprite->callback = sub_80A634C;
|
||||
sprite->callback(sprite);
|
||||
}
|
||||
|
||||
void sub_8115A04(u8 taskId)
|
||||
{
|
||||
gTasks[taskId].data[0] = gBattleAnimArgs[0];
|
||||
gTasks[taskId].data[1] = gBattleAnimArgs[1];
|
||||
gTasks[taskId].data[2] = gBattleAnimArgs[2];
|
||||
gTasks[taskId].data[3] = gBattleAnimArgs[3];
|
||||
gTasks[taskId].data[4] = gBattleAnimArgs[4];
|
||||
gTasks[taskId].data[5] = gBattleAnimArgs[5];
|
||||
gTasks[taskId].data[8] = 0;
|
||||
sub_8115A54(taskId, 0, gTasks[taskId].data[4]);
|
||||
gTasks[taskId].func = sub_8115AA4;
|
||||
}
|
||||
|
||||
static void sub_8115A54(u8 taskId, u8 initialBlendAmount, u8 targetBlendAmount)
|
||||
{
|
||||
u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gTasks[taskId].data[0]);
|
||||
BeginNormalPaletteFade(
|
||||
selectedPalettes,
|
||||
gTasks[taskId].data[1],
|
||||
initialBlendAmount,
|
||||
targetBlendAmount,
|
||||
gTasks[taskId].data[5]);
|
||||
|
||||
gTasks[taskId].data[2]--;
|
||||
gTasks[taskId].data[8] ^= 1;
|
||||
}
|
||||
|
||||
static void sub_8115AA4(u8 taskId)
|
||||
{
|
||||
u8 initialBlendAmount, targetBlendAmount;
|
||||
if (!gPaletteFade.active)
|
||||
{
|
||||
if (gTasks[taskId].data[2] > 0)
|
||||
{
|
||||
if (gTasks[taskId].data[8] == 0)
|
||||
{
|
||||
initialBlendAmount = gTasks[taskId].data[3];
|
||||
targetBlendAmount = gTasks[taskId].data[4];
|
||||
}
|
||||
else
|
||||
{
|
||||
initialBlendAmount = gTasks[taskId].data[4];
|
||||
targetBlendAmount = gTasks[taskId].data[3];
|
||||
}
|
||||
|
||||
if (gTasks[taskId].data[2] == 1)
|
||||
targetBlendAmount = 0;
|
||||
|
||||
sub_8115A54(taskId, initialBlendAmount, targetBlendAmount);
|
||||
}
|
||||
else
|
||||
{
|
||||
DestroyAnimVisualTask(taskId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void sub_8115B0C(u8 taskId)
|
||||
{
|
||||
int battler;
|
||||
u32 selectedPalettes = 0;
|
||||
|
||||
gTasks[taskId].data[0] = gBattleAnimArgs[0];
|
||||
gTasks[taskId].data[1] = gBattleAnimArgs[1];
|
||||
gTasks[taskId].data[2] = gBattleAnimArgs[2];
|
||||
gTasks[taskId].data[3] = gBattleAnimArgs[3];
|
||||
gTasks[taskId].data[4] = gBattleAnimArgs[4];
|
||||
gTasks[taskId].data[5] = gBattleAnimArgs[5];
|
||||
gTasks[taskId].data[8] = 0;
|
||||
|
||||
for (battler = 0; battler < gBattlersCount; battler++)
|
||||
{
|
||||
if (battler != gBattleAnimAttacker && battler != gBattleAnimTarget)
|
||||
selectedPalettes |= 1 << (battler + 16);
|
||||
}
|
||||
|
||||
if (gBattleAnimArgs[0] == 1)
|
||||
selectedPalettes |= 0xE;
|
||||
|
||||
gTasks[taskId].data[9] = selectedPalettes >> 16;
|
||||
gTasks[taskId].data[10] = selectedPalettes & 0xFF;
|
||||
sub_8115BC8(taskId, 0, gTasks[taskId].data[4]);
|
||||
gTasks[taskId].func = sub_8115C18;
|
||||
}
|
||||
|
||||
static void sub_8115BC8(u8 taskId, u8 initialBlendAmount, u8 targetBlendAmount)
|
||||
{
|
||||
u32 selectedPalettes = ((u16)gTasks[taskId].data[9] << 16) | (u16)gTasks[taskId].data[10];
|
||||
BeginNormalPaletteFade(
|
||||
selectedPalettes,
|
||||
gTasks[taskId].data[1],
|
||||
initialBlendAmount,
|
||||
targetBlendAmount,
|
||||
gTasks[taskId].data[5]);
|
||||
|
||||
gTasks[taskId].data[2]--;
|
||||
gTasks[taskId].data[8] ^= 1;
|
||||
}
|
||||
|
||||
static void sub_8115C18(u8 taskId)
|
||||
{
|
||||
u8 initialBlendAmount, targetBlendAmount;
|
||||
if (!gPaletteFade.active)
|
||||
{
|
||||
if (gTasks[taskId].data[2] > 0)
|
||||
{
|
||||
if (gTasks[taskId].data[8] == 0)
|
||||
{
|
||||
initialBlendAmount = gTasks[taskId].data[3];
|
||||
targetBlendAmount = gTasks[taskId].data[4];
|
||||
}
|
||||
else
|
||||
{
|
||||
initialBlendAmount = gTasks[taskId].data[4];
|
||||
targetBlendAmount = gTasks[taskId].data[3];
|
||||
}
|
||||
|
||||
if (gTasks[taskId].data[2] == 1)
|
||||
targetBlendAmount = 0;
|
||||
|
||||
sub_8115BC8(taskId, initialBlendAmount, targetBlendAmount);
|
||||
}
|
||||
else
|
||||
{
|
||||
DestroyAnimVisualTask(taskId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void sub_8115C80(u8 taskId)
|
||||
{
|
||||
u8 paletteIndex;
|
||||
|
||||
gTasks[taskId].data[0] = gBattleAnimArgs[0];
|
||||
gTasks[taskId].data[1] = gBattleAnimArgs[1];
|
||||
gTasks[taskId].data[2] = gBattleAnimArgs[2];
|
||||
gTasks[taskId].data[3] = gBattleAnimArgs[3];
|
||||
gTasks[taskId].data[4] = gBattleAnimArgs[4];
|
||||
gTasks[taskId].data[5] = gBattleAnimArgs[5];
|
||||
gTasks[taskId].data[8] = 0;
|
||||
|
||||
sub_8115CD0(taskId, 0, gTasks[taskId].data[4]);
|
||||
gTasks[taskId].func = sub_8115D2C;
|
||||
}
|
||||
|
||||
static void sub_8115CD0(u8 taskId, u8 initialBlendAmount, u8 targetBlendAmount)
|
||||
{
|
||||
u8 paletteIndex = IndexOfSpritePaletteTag(gTasks[taskId].data[0]);
|
||||
BeginNormalPaletteFade(
|
||||
1 << (paletteIndex + 16),
|
||||
gTasks[taskId].data[1],
|
||||
initialBlendAmount,
|
||||
targetBlendAmount,
|
||||
gTasks[taskId].data[5]);
|
||||
|
||||
gTasks[taskId].data[2]--;
|
||||
gTasks[taskId].data[8] ^= 1;
|
||||
}
|
||||
|
||||
static void sub_8115D2C(u8 taskId)
|
||||
{
|
||||
u8 initialBlendAmount, targetBlendAmount;
|
||||
if (!gPaletteFade.active)
|
||||
{
|
||||
if (gTasks[taskId].data[2] > 0)
|
||||
{
|
||||
if (gTasks[taskId].data[8] == 0)
|
||||
{
|
||||
initialBlendAmount = gTasks[taskId].data[3];
|
||||
targetBlendAmount = gTasks[taskId].data[4];
|
||||
}
|
||||
else
|
||||
{
|
||||
initialBlendAmount = gTasks[taskId].data[4];
|
||||
targetBlendAmount = gTasks[taskId].data[3];
|
||||
}
|
||||
|
||||
if (gTasks[taskId].data[2] == 1)
|
||||
targetBlendAmount = 0;
|
||||
|
||||
sub_8115CD0(taskId, initialBlendAmount, targetBlendAmount);
|
||||
}
|
||||
else
|
||||
{
|
||||
DestroyAnimVisualTask(taskId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void sub_8115D94(u8 taskId)
|
||||
{
|
||||
u8 paletteIndex;
|
||||
|
||||
gTasks[taskId].data[0] = gBattleAnimArgs[1];
|
||||
gTasks[taskId].data[1] = gBattleAnimArgs[1];
|
||||
gTasks[taskId].data[2] = gBattleAnimArgs[2];
|
||||
gTasks[taskId].data[3] = gBattleAnimArgs[3];
|
||||
gTasks[taskId].data[4] = gBattleAnimArgs[4];
|
||||
gTasks[taskId].data[5] = gBattleAnimArgs[5];
|
||||
gTasks[taskId].data[6] = gBattleAnimArgs[6];
|
||||
gTasks[taskId].data[7] = gBattleAnimArgs[0];
|
||||
|
||||
paletteIndex = IndexOfSpritePaletteTag(gBattleAnimArgs[0]);
|
||||
BeginNormalPaletteFade(
|
||||
1 << (paletteIndex + 16),
|
||||
0,
|
||||
gBattleAnimArgs[4],
|
||||
gBattleAnimArgs[4],
|
||||
gBattleAnimArgs[3]);
|
||||
|
||||
gTasks[taskId].func = sub_8115E00;
|
||||
}
|
||||
|
||||
static void sub_8115E00(u8 taskId)
|
||||
{
|
||||
u32 selectedPalettes;
|
||||
|
||||
if (gTasks[taskId].data[0] > 0)
|
||||
{
|
||||
gTasks[taskId].data[0]--;
|
||||
return;
|
||||
}
|
||||
|
||||
if (gPaletteFade.active)
|
||||
return;
|
||||
|
||||
if (gTasks[taskId].data[2] == 0)
|
||||
{
|
||||
gTasks[taskId].func = sub_8115EB8;
|
||||
return;
|
||||
}
|
||||
|
||||
selectedPalettes = 1 << (IndexOfSpritePaletteTag(gTasks[taskId].data[7]) + 16);
|
||||
if (gTasks[taskId].data[1] & 0x100)
|
||||
{
|
||||
BeginNormalPaletteFade(
|
||||
selectedPalettes,
|
||||
0,
|
||||
gTasks[taskId].data[4],
|
||||
gTasks[taskId].data[4],
|
||||
gTasks[taskId].data[3]);
|
||||
}
|
||||
else
|
||||
{
|
||||
BeginNormalPaletteFade(
|
||||
selectedPalettes,
|
||||
0,
|
||||
gTasks[taskId].data[6],
|
||||
gTasks[taskId].data[6],
|
||||
gTasks[taskId].data[5]);
|
||||
}
|
||||
|
||||
gTasks[taskId].data[1] ^= 0x100;
|
||||
gTasks[taskId].data[0] = gTasks[taskId].data[1] & 0xFF;
|
||||
gTasks[taskId].data[2]--;
|
||||
}
|
||||
|
||||
static void sub_8115EB8(u8 taskId)
|
||||
{
|
||||
u32 selectedPalettes;
|
||||
|
||||
if (!gPaletteFade.active)
|
||||
{
|
||||
selectedPalettes = 1 << (IndexOfSpritePaletteTag(gTasks[taskId].data[7]) + 16);
|
||||
BeginNormalPaletteFade(selectedPalettes, 0, 0, 0, RGB(0, 0, 0));
|
||||
DestroyAnimVisualTask(taskId);
|
||||
}
|
||||
}
|
||||
|
||||
void sub_8115F10(u8 taskId)
|
||||
{
|
||||
u32 selectedPalettes = 0;
|
||||
u8 attackerBattler = gBattleAnimAttacker;
|
||||
u8 targetBattler = gBattleAnimTarget;
|
||||
|
||||
if (gBattleAnimArgs[0] & 0x100)
|
||||
selectedPalettes = sub_80A75AC(1, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
if (gBattleAnimArgs[1] & 0x100)
|
||||
selectedPalettes |= (0x10000 << attackerBattler);
|
||||
|
||||
if (gBattleAnimArgs[2] & 0x100)
|
||||
selectedPalettes |= (0x10000 << targetBattler);
|
||||
|
||||
InvertPlttBuffer(selectedPalettes);
|
||||
DestroyAnimVisualTask(taskId);
|
||||
}
|
||||
|
||||
void sub_8115F94(u8 taskId)
|
||||
{
|
||||
u8 attackerBattler;
|
||||
u8 targetBattler;
|
||||
u8 paletteIndex;
|
||||
u32 selectedPalettes = 0;
|
||||
|
||||
if (gTasks[taskId].data[0] == 0)
|
||||
{
|
||||
gTasks[taskId].data[2] = gBattleAnimArgs[0];
|
||||
gTasks[taskId].data[3] = gBattleAnimArgs[1];
|
||||
gTasks[taskId].data[4] = gBattleAnimArgs[2];
|
||||
gTasks[taskId].data[1] = gBattleAnimArgs[3];
|
||||
gTasks[taskId].data[5] = gBattleAnimArgs[4];
|
||||
gTasks[taskId].data[6] = gBattleAnimArgs[5];
|
||||
gTasks[taskId].data[7] = gBattleAnimArgs[6];
|
||||
}
|
||||
|
||||
gTasks[taskId].data[0]++;
|
||||
attackerBattler = gBattleAnimAttacker;
|
||||
targetBattler = gBattleAnimTarget;
|
||||
|
||||
if (gTasks[taskId].data[2] & 0x100)
|
||||
selectedPalettes = 0x0000FFFF;
|
||||
|
||||
if (gTasks[taskId].data[2] & 0x1)
|
||||
{
|
||||
paletteIndex = IndexOfSpritePaletteTag(gSprites[gHealthboxSpriteIds[attackerBattler]].template->paletteTag);
|
||||
selectedPalettes |= (1 << paletteIndex) << 16;
|
||||
}
|
||||
|
||||
if (gTasks[taskId].data[3] & 0x100)
|
||||
selectedPalettes |= (1 << attackerBattler) << 16;
|
||||
|
||||
if (gTasks[taskId].data[4] & 0x100)
|
||||
selectedPalettes |= (1 << targetBattler) << 16;
|
||||
|
||||
TintPlttBuffer(selectedPalettes, gTasks[taskId].data[5], gTasks[taskId].data[6], gTasks[taskId].data[7]);
|
||||
if (gTasks[taskId].data[0] == gTasks[taskId].data[1])
|
||||
{
|
||||
UnfadePlttBuffer(selectedPalettes);
|
||||
DestroyAnimVisualTask(taskId);
|
||||
}
|
||||
}
|
||||
|
||||
void sub_81160A4(struct Sprite *sprite)
|
||||
{
|
||||
u16 var0;
|
||||
|
||||
sprite->invisible = 1;
|
||||
sprite->data[0] = -gBattleAnimArgs[0];
|
||||
sprite->data[1] = gBattleAnimArgs[1];
|
||||
sprite->data[2] = gBattleAnimArgs[1];
|
||||
sprite->data[3] = gBattleAnimArgs[2];
|
||||
|
||||
switch (gBattleAnimArgs[3])
|
||||
{
|
||||
case 0:
|
||||
StoreSpriteCallbackInData6(sprite, (void *)&gBattle_BG3_X);
|
||||
break;
|
||||
case 1:
|
||||
StoreSpriteCallbackInData6(sprite, (void *)&gBattle_BG3_Y);
|
||||
break;
|
||||
case 2:
|
||||
StoreSpriteCallbackInData6(sprite, (void *)&gSpriteCoordOffsetX);
|
||||
break;
|
||||
default:
|
||||
StoreSpriteCallbackInData6(sprite, (void *)&gSpriteCoordOffsetY);
|
||||
break;
|
||||
}
|
||||
|
||||
sprite->data[4] = *(u16 *)(sprite->data[6] | (sprite->data[7] << 16));
|
||||
sprite->data[5] = gBattleAnimArgs[3];
|
||||
var0 = sprite->data[5] - 2;
|
||||
if (var0 < 2)
|
||||
sub_81161F4();
|
||||
|
||||
sprite->callback = sub_8116148;
|
||||
}
|
||||
|
||||
static void sub_8116148(struct Sprite *sprite)
|
||||
{
|
||||
u8 i;
|
||||
u16 var0;
|
||||
|
||||
if (sprite->data[3] > 0)
|
||||
{
|
||||
sprite->data[3]--;
|
||||
if (sprite->data[1] > 0)
|
||||
{
|
||||
sprite->data[1]--;
|
||||
}
|
||||
else
|
||||
{
|
||||
sprite->data[1] = sprite->data[2];
|
||||
*(u16 *)(sprite->data[6] | (sprite->data[7] << 16)) += sprite->data[0];
|
||||
sprite->data[0] = -sprite->data[0];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
*(u16 *)(sprite->data[6] | (sprite->data[7] << 16)) = sprite->data[4];
|
||||
var0 = sprite->data[5] - 2;
|
||||
if (var0 < 2)
|
||||
{
|
||||
for (i = 0; i < gBattlersCount; i++)
|
||||
gSprites[gBattlerSpriteIds[i]].coordOffsetEnabled = 0;
|
||||
}
|
||||
|
||||
DestroyAnimSprite(sprite);
|
||||
}
|
||||
}
|
||||
|
||||
static void sub_81161F4(void)
|
||||
{
|
||||
gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 0;
|
||||
gSprites[gBattlerSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 0;
|
||||
|
||||
if (gBattleAnimArgs[4] == 2)
|
||||
{
|
||||
gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1;
|
||||
gSprites[gBattlerSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (gBattleAnimArgs[4] == 0)
|
||||
gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1;
|
||||
else
|
||||
gSprites[gBattlerSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1;
|
||||
}
|
||||
}
|
||||
|
||||
void sub_81162A4(u8 taskId)
|
||||
{
|
||||
gTasks[taskId].data[0] = gBattleAnimArgs[0];
|
||||
gTasks[taskId].data[1] = gBattleAnimArgs[1];
|
||||
gTasks[taskId].data[2] = gBattleAnimArgs[2];
|
||||
gTasks[taskId].data[3] = gBattleAnimArgs[3];
|
||||
gTasks[taskId].data[8] = gBattleAnimArgs[3];
|
||||
gBattle_BG3_X = gBattleAnimArgs[0];
|
||||
gBattle_BG3_Y = gBattleAnimArgs[1];
|
||||
gTasks[taskId].func = sub_81162F8;
|
||||
gTasks[taskId].func(taskId);
|
||||
}
|
||||
|
||||
static void sub_81162F8(u8 taskId)
|
||||
{
|
||||
if (gTasks[taskId].data[3] == 0)
|
||||
{
|
||||
if (gBattle_BG3_X == gTasks[taskId].data[0])
|
||||
gBattle_BG3_X = -gTasks[taskId].data[0];
|
||||
else
|
||||
gBattle_BG3_X = gTasks[taskId].data[0];
|
||||
|
||||
if (gBattle_BG3_Y == -gTasks[taskId].data[1])
|
||||
gBattle_BG3_Y = 0;
|
||||
else
|
||||
gBattle_BG3_Y = -gTasks[taskId].data[1];
|
||||
|
||||
gTasks[taskId].data[3] = gTasks[taskId].data[8];
|
||||
if (--gTasks[taskId].data[2] == 0)
|
||||
{
|
||||
gBattle_BG3_X = 0;
|
||||
gBattle_BG3_Y = 0;
|
||||
DestroyAnimVisualTask(taskId);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
gTasks[taskId].data[3]--;
|
||||
}
|
||||
}
|
||||
|
||||
void sub_8116388(struct Sprite *sprite)
|
||||
{
|
||||
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
|
||||
if (gBattleAnimArgs[2] == 0)
|
||||
InitAnimSpritePos(sprite, 1);
|
||||
else
|
||||
sub_80A6980(sprite, TRUE);
|
||||
|
||||
sprite->callback = sub_80A67BC;
|
||||
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
|
||||
}
|
||||
|
||||
static void sub_81163D0(struct Sprite *sprite)
|
||||
{
|
||||
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
|
||||
if (gBattleAnimArgs[2] == 0)
|
||||
InitAnimSpritePos(sprite, 1);
|
||||
else
|
||||
sub_80A6980(sprite, TRUE);
|
||||
|
||||
sprite->data[0] = gBattleAnimArgs[4];
|
||||
sprite->callback = sub_80A67BC;
|
||||
StoreSpriteCallbackInData6(sprite, sub_810E2C8);
|
||||
}
|
||||
|
||||
void sub_8116420(struct Sprite *sprite)
|
||||
{
|
||||
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER && !IsContest())
|
||||
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
|
||||
|
||||
sub_8116388(sprite);
|
||||
}
|
||||
|
||||
void sub_8116458(struct Sprite *sprite)
|
||||
{
|
||||
if (gBattleAnimArgs[1] == -1)
|
||||
gBattleAnimArgs[1] = Random2() & 3;
|
||||
|
||||
StartSpriteAffineAnim(sprite, gBattleAnimArgs[1]);
|
||||
if (gBattleAnimArgs[0] == 0)
|
||||
InitAnimSpritePos(sprite, 0);
|
||||
else
|
||||
sub_80A6980(sprite, FALSE);
|
||||
|
||||
sprite->pos2.x += (Random2() % 48) - 24;
|
||||
sprite->pos2.y += (Random2() % 24) - 12;
|
||||
|
||||
StoreSpriteCallbackInData6(sprite, move_anim_8074EE0);
|
||||
sprite->callback = sub_80A67BC;
|
||||
}
|
||||
|
||||
void sub_81164F0(struct Sprite *sprite)
|
||||
{
|
||||
sprite->data[0] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
|
||||
sprite->pos1.x = gSprites[sprite->data[0]].pos1.x + gSprites[sprite->data[0]].pos2.x;
|
||||
sprite->pos1.y = gSprites[sprite->data[0]].pos1.y + gSprites[sprite->data[0]].pos2.y;
|
||||
sprite->pos2.x = gBattleAnimArgs[1];
|
||||
sprite->pos2.y = gBattleAnimArgs[2];
|
||||
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
|
||||
StoreSpriteCallbackInData6(sprite, move_anim_8074EE0);
|
||||
sprite->callback = sub_80A67BC;
|
||||
}
|
||||
|
||||
void sub_8116560(struct Sprite *sprite)
|
||||
{
|
||||
if (gBattleAnimArgs[2] == 0)
|
||||
InitAnimSpritePos(sprite, 1);
|
||||
else
|
||||
sub_80A6980(sprite, TRUE);
|
||||
|
||||
sprite->data[0] = gBattleAnimArgs[3];
|
||||
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
|
||||
sprite->callback = WaitAnimForDuration;
|
||||
}
|
||||
|
||||
void sub_81165A8(struct Sprite *sprite)
|
||||
{
|
||||
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
|
||||
if (gBattleAnimArgs[2] == 0)
|
||||
InitAnimSpritePos(sprite, 1);
|
||||
else
|
||||
sub_80A6980(sprite, TRUE);
|
||||
|
||||
sprite->callback = sub_81165E4;
|
||||
}
|
||||
|
||||
static void sub_81165E4(struct Sprite *sprite)
|
||||
{
|
||||
sprite->invisible ^= 1;
|
||||
if (sprite->data[0]++ > 12)
|
||||
DestroyAnimSprite(sprite);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue