Merge branch 'master' into tag-none

This commit is contained in:
GriffinR authored and GitHub committed 2021-09-24 10:17:34 -04:00
commit 42d2fefe02
469 files changed
+27059 -27106

No files matched your search

+13 -13
View File
@@ -1149,12 +1149,12 @@ static const union AnimCmd *const sAnimTable_AshPuff[] =
const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff =
{
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_ASH,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_AshPuff,
.images = sPicTable_AshPuff,
.affineAnims = gDummySpriteAffineAnimTable,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_ASH,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_AshPuff,
.images = sPicTable_AshPuff,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCB_AshPuff
};
@@ -1183,14 +1183,14 @@ static const union AnimCmd *const sAnimTable_AshLaunch[] =
sAnim_AshLaunch,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch =
const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch =
{
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_ASH,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_AshLaunch,
.images = sPicTable_AshLaunch,
.affineAnims = gDummySpriteAffineAnimTable,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_ASH,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_AshLaunch,
.images = sPicTable_AshLaunch,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCB_AshLaunch
};