summaryrefslogtreecommitdiff
path: root/src/data/field_effects/field_effect_objects.h
diff options
context:
space:
mode:
authorFrogg <froggestspirit@gmail.com>2021-04-10 19:04:59 -0400
committerGitHub <noreply@github.com>2021-04-10 19:04:59 -0400
commitec6b1ea3735ff98a9714b219e4a999894ecc6010 (patch)
treefff7823aa15ce633de1bc4132574c1d081a84a93 /src/data/field_effects/field_effect_objects.h
parent677b4fc394516deab5b5c86c94a2a1443cb52151 (diff)
parent09a9efd5c57909c215a66b85f3255190c8882940 (diff)
Merge pull request #2 from pret/master
update
Diffstat (limited to 'src/data/field_effects/field_effect_objects.h')
-rwxr-xr-xsrc/data/field_effects/field_effect_objects.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h
index 4fc3ecff6..54145efbc 100755
--- a/src/data/field_effects/field_effect_objects.h
+++ b/src/data/field_effects/field_effect_objects.h
@@ -1263,16 +1263,16 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = {
const struct SpritePalette gSpritePalette_SmallSparkle = {gFieldEffectPal_SmallSparkle, FLDEFF_PAL_TAG_SMALL_SPARKLE};
-static const union AnimCmd sAnim_Rayquaza[] = {
+static const union AnimCmd sAnim_RayquazaSpotlightEffect[] = {
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
-static const union AnimCmd *const sAnimTable_Rayquaza[] = {
- sAnim_Rayquaza,
+static const union AnimCmd *const sAnimTable_RayquazaSpotlightEffect[] = {
+ sAnim_RayquazaSpotlightEffect,
};
-const struct SpriteFrameImage sPicTable_Rayquaza[] = {
+const struct SpriteFrameImage sPicTable_RayquazaSpotlightEffect[] = {
overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0),
};
@@ -1280,8 +1280,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.oam = &gObjectEventBaseOam_32x32,
- .anims = sAnimTable_Rayquaza,
- .images = sPicTable_Rayquaza,
+ .anims = sAnimTable_RayquazaSpotlightEffect,
+ .images = sPicTable_RayquazaSpotlightEffect,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = UpdateRayquazaSpotlightEffect,
};