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

Another fix, Conflicts 2/2

Browse Source
This commit is contained in:
Sewef
2019-10-16 19:26:08 +02:00
parent e7d36a76e1
commit c280d0e00e
2 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_anim_effects_1.c
+21 -21
View File
@@ -70,7 +70,7 @@ void AnimMoon(struct Sprite *);
void AnimMoonlightSparkle(struct Sprite *);
void AnimHornHit(struct Sprite *);
void AnimSuperFang(struct Sprite *);
void AnimWavingMusicNotes(struct Sprite *);
void AnimWavyMusicNotes(struct Sprite *);
void AnimFlyingMusicNotes(struct Sprite *);
void AnimBellyDrumHand(struct Sprite *);
void AnimSlowFlyingMusicNotes(struct Sprite *);
@@ -1878,49 +1878,49 @@ const struct SpriteTemplate gSuperFangSpriteTemplate =
.callback = AnimSuperFang,
};
const union AnimCmd gWavingMusicNotesAnimCmds1[] =
const union AnimCmd gWavyMusicNotesAnimCmds1[] =
{
ANIMCMD_FRAME(0, 10),
ANIMCMD_END,
};
const union AnimCmd gWavingMusicNotesAnimCmds2[] =
const union AnimCmd gWavyMusicNotesAnimCmds2[] =
{
ANIMCMD_FRAME(4, 10),
ANIMCMD_END,
};
const union AnimCmd gWavingMusicNotesAnimCmds3[] =
const union AnimCmd gWavyMusicNotesAnimCmds3[] =
{
ANIMCMD_FRAME(8, 41),
ANIMCMD_END,
};
const union AnimCmd gWavingMusicNotesAnimCmds4[] =
const union AnimCmd gWavyMusicNotesAnimCmds4[] =
{
ANIMCMD_FRAME(12, 10),
ANIMCMD_END,
};
const union AnimCmd gWavingMusicNotesAnimCmds5[] =
const union AnimCmd gWavyMusicNotesAnimCmds5[] =
{
ANIMCMD_FRAME(16, 10),
ANIMCMD_END,
};
const union AnimCmd gWavingMusicNotesAnimCmds6[] =
const union AnimCmd gWavyMusicNotesAnimCmds6[] =
{
ANIMCMD_FRAME(20, 10),
ANIMCMD_END,
};
const union AnimCmd gWavingMusicNotesAnimCmds7[] =
const union AnimCmd gWavyMusicNotesAnimCmds7[] =
{
ANIMCMD_FRAME(0, 10, .vFlip = TRUE),
ANIMCMD_END,
};
const union AnimCmd gWavingMusicNotesAnimCmds8[] =
const union AnimCmd gWavyMusicNotesAnimCmds8[] =
{
ANIMCMD_FRAME(4, 10, .vFlip = TRUE),
ANIMCMD_END,
@@ -1928,17 +1928,17 @@ const union AnimCmd gWavingMusicNotesAnimCmds8[] =
const union AnimCmd *const gMusicNotesAnimTable[] =
{
gWavingMusicNotesAnimCmds1,
gWavingMusicNotesAnimCmds2,
gWavingMusicNotesAnimCmds3,
gWavingMusicNotesAnimCmds4,
gWavingMusicNotesAnimCmds5,
gWavingMusicNotesAnimCmds6,
gWavingMusicNotesAnimCmds7,
gWavingMusicNotesAnimCmds8,
gWavyMusicNotesAnimCmds1,
gWavyMusicNotesAnimCmds2,
gWavyMusicNotesAnimCmds3,
gWavyMusicNotesAnimCmds4,
gWavyMusicNotesAnimCmds5,
gWavyMusicNotesAnimCmds6,
gWavyMusicNotesAnimCmds7,
gWavyMusicNotesAnimCmds8,
};
const union AffineAnimCmd gWavingMusicNotesAffineAnimCmds[] =
const union AffineAnimCmd gWavyMusicNotesAffineAnimCmds[] =
{
AFFINEANIMCMD_FRAME(0xC, 0xC, 0, 16),
AFFINEANIMCMD_FRAME(0xFFF4, 0xFFF4, 0, 16),
@@ -1947,7 +1947,7 @@ const union AffineAnimCmd gWavingMusicNotesAffineAnimCmds[] =
const union AffineAnimCmd *const gMusicNotesAffineAnimTable[] =
{
gWavingMusicNotesAffineAnimCmds,
gWavyMusicNotesAffineAnimCmds,
};
const struct SpriteTemplate gWavyMusicNotesSpriteTemplate =
@@ -1958,7 +1958,7 @@ const struct SpriteTemplate gWavyMusicNotesSpriteTemplate =
.anims = gMusicNotesAnimTable,
.images = NULL,
.affineAnims = gMusicNotesAffineAnimTable,
.callback = AnimWavingMusicNotes,
.callback = AnimWavyMusicNotes,
};
const u16 gParticlesColorBlendTable[][6] =
@@ -5273,7 +5273,7 @@ void AnimTask_MusicNotesClearRainbowBlend(u8 taskId)
DestroyAnimVisualTask(taskId);
}
void AnimWavingMusicNotes(struct Sprite* sprite)
void AnimWavyMusicNotes(struct Sprite* sprite)
{
u8 index;
u8 a;