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

Merge branch 'master' into tag-none

Browse Source
This commit is contained in:
GriffinR
2021-09-24 10:17:34 -04:00
committed by GitHub
parent f8f7617946 09fd4fc4c5
commit 42d2fefe02
469 changed files with 27059 additions and 27106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/data/field_effects/field_effect_objects.h
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
};