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

Ended battle_anims_effects_1 SpriteTemplates

Browse Source
This commit is contained in:
Sewef
2019-10-14 21:05:40 +02:00
parent a49756a8fe
commit 63b5be9259
8 changed files with 355 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

419
src/battle_anim_effects_1.c
View File

File diff suppressed because it is too large Load Diff

20
src/battle_anim_effects_2.c
View File

@@ -195,7 +195,7 @@ const struct SpriteTemplate gUnknown_08593304 =
.anims = gUnknown_085932E4,
.images = NULL,
.affineAnims = gUnknown_08593300,
.callback = sub_80A77C8,
.callback = AnimSparklingParticle,
};
const union AnimCmd gUnknown_0859331C[] =
@@ -651,7 +651,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_859371C =
.anims = gUnknown_08593718,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A77C8,
.callback = AnimSparklingParticle,
};
const union AffineAnimCmd gUnknown_08593734[] =
@@ -738,7 +738,7 @@ const struct SpriteTemplate gUnknown_0859381C =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_08593810,
.callback = sub_80A77C8,
.callback = AnimSparklingParticle,
};
//*
const union AffineAnimCmd gUnknown_08593834[] =
@@ -761,7 +761,7 @@ const struct SpriteTemplate gUnknown_08593850 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_0859384C,
.callback = sub_80A77C8,
.callback = AnimSparklingParticle,
};
const struct SpriteTemplate gUnknown_08593868 =
@@ -868,7 +868,7 @@ const struct SpriteTemplate gUnknown_08593938 =
.anims = gUnknown_08593934,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A77C8,
.callback = AnimSparklingParticle,
};
const u16 gUnknown_08593950[] =
@@ -1199,13 +1199,13 @@ const union AffineAnimCmd *const gUnknown_08593C00[] =
gUnknown_08593BF0,
};
extern const union AnimCmd *const gUnknown_08592FCC[];
extern const union AnimCmd *const gMusicNotesAnimTable[];
const struct SpriteTemplate gUnknown_08593C0C =
{
.tileTag = ANIM_TAG_MUSIC_NOTES_2,
.paletteTag = ANIM_TAG_MUSIC_NOTES_2,
.oam = &gUnknown_0852496C,
.anims = gUnknown_08592FCC,
.anims = gMusicNotesAnimTable,
.images = NULL,
.affineAnims = gUnknown_08593C00,
.callback = sub_8106F60,
@@ -1216,7 +1216,7 @@ const struct SpriteTemplate gUnknown_08593C24 =
.tileTag = ANIM_TAG_MUSIC_NOTES_2,
.paletteTag = ANIM_TAG_MUSIC_NOTES_2,
.oam = &gUnknown_0852496C,
.anims = gUnknown_08592FCC,
.anims = gMusicNotesAnimTable,
.images = NULL,
.affineAnims = gUnknown_08593C00,
.callback = sub_8106F00,
@@ -2554,7 +2554,7 @@ void sub_81051C4(struct Sprite *sprite)
gBattleAnimArgs[0] = sp0 - r4;
}
sprite->callback = sub_80A77C8;
sprite->callback = AnimSparklingParticle;
sprite->callback(sprite);
}
@@ -2661,7 +2661,7 @@ void sub_81054E8(struct Sprite *sprite)
}
StartSpriteAffineAnim(sprite, 1);
sprite->callback = sub_80A77C8;
sprite->callback = AnimSparklingParticle;
sprite->callback(sprite);
}

12
src/battle_anim_effects_3.c
View File

@@ -24,7 +24,7 @@
#include "constants/species.h"
#include "constants/weather.h"
extern const struct SpriteTemplate gUnknown_08593114;
extern const struct SpriteTemplate gThroughtBubbleSpriteTemplate;
void sub_815A0D4(struct Sprite *);
void sub_815A1B0(struct Sprite *);
@@ -144,7 +144,7 @@ const struct SpriteTemplate gUnknown_085CE020 =
.anims = gUnknown_085CE01C,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A77C8,
.callback = AnimSparklingParticle,
};
const struct SpriteTemplate gUnknown_085CE038 =
@@ -190,7 +190,7 @@ const struct SpriteTemplate gUnknown_085CE07C =
.anims = gUnknown_085CE078,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A77C8,
.callback = AnimSparklingParticle,
};
const struct SpriteTemplate gUnknown_085CE094 =
@@ -502,7 +502,7 @@ const struct SpriteTemplate gUnknown_085CE338 =
.anims = gUnknown_085CE334,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A77C8,
.callback = AnimSparklingParticle,
};
const union AffineAnimCmd gUnknown_085CE350[] =
@@ -1929,7 +1929,7 @@ static void sub_815B054(u8 taskId)
}
y = task->data[3] + task->data[5];
spriteId = CreateSprite(&gUnknown_08593114, x, y, 6 - task->data[1]);
spriteId = CreateSprite(&gThroughtBubbleSpriteTemplate, x, y, 6 - task->data[1]);
PlaySE12WithPanning(SE_W118, BattleAnimAdjustPanning(-64));
if (spriteId != MAX_SPRITES)
@@ -1982,7 +1982,7 @@ static void sub_815B054(u8 taskId)
case 4:
for (i = 0, j = 0; i < MAX_SPRITES; i++)
{
if (gSprites[i].template == &gUnknown_08593114)
if (gSprites[i].template == &gThroughtBubbleSpriteTemplate)
{
gSprites[i].data[0] = taskId;
gSprites[i].data[1] = 6;

2
src/battle_anim_mons.c
View File

@@ -1456,7 +1456,7 @@ static u8 GetBattlerAtPosition_(u8 position)
return GetBattlerAtPosition(position);
}
void sub_80A77C8(struct Sprite *sprite)
void AnimSparklingParticle(struct Sprite *sprite)
{
bool8 var;

2
src/poison.c
View File

@@ -37,7 +37,7 @@ const struct SpriteTemplate gUnknown_08596134 =
.anims = gUnknown_08596130,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A77C8,
.callback = AnimSparklingParticle,
};
const union AnimCmd gUnknown_0859614C[] =

4
src/psychic.c
View File

@@ -49,7 +49,7 @@ const struct SpriteTemplate gUnknown_08596548 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_08596544,
.callback = sub_80A77C8,
.callback = AnimSparklingParticle,
};
const struct SpriteTemplate gUnknown_08596560 =
@@ -378,7 +378,7 @@ const struct SpriteTemplate gUnknown_08596898 =
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gUnknown_08596894,
.callback = sub_80A77C8,
.callback = AnimSparklingParticle,
};
const union AffineAnimCmd gUnknown_085968B0[] =