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

Add TAG_NONE

Browse Source
This commit is contained in:
GriffinR
2021-09-14 13:14:14 -04:00
parent 4dbaca9dc6
commit f8f7617946
31 changed files with 437 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/data/field_effects/field_effect_objects.h
View File

@@ -29,8 +29,8 @@ static const struct SpriteFrameImage sPicTable_ShadowExtraLarge[] = {
};
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_8x8,
.anims = sAnimTable_Shadow,
.images = sPicTable_ShadowSmall,
@@ -39,8 +39,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {
};
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_16x8,
.anims = sAnimTable_Shadow,
.images = sPicTable_ShadowMedium,
@@ -49,8 +49,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {
};
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_32x8,
.anims = sAnimTable_Shadow,
.images = sPicTable_ShadowLarge,
@@ -59,8 +59,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {
};
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_64x32,
.anims = sAnimTable_Shadow,
.images = sPicTable_ShadowExtraLarge,
@@ -92,7 +92,7 @@ static const union AnimCmd *const sAnimTable_TallGrass[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_TallGrass,
@@ -128,7 +128,7 @@ static const union AnimCmd *const sAnimTable_Ripple[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_Ripple,
@@ -161,7 +161,7 @@ static const union AnimCmd *const sAnimTable_Ash[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_Ash,
@@ -209,8 +209,8 @@ static const union AnimCmd *const sAnimTable_SurfBlob[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_32x32,
.anims = sAnimTable_SurfBlob,
.images = sPicTable_SurfBlob,
@@ -266,8 +266,8 @@ static const union AnimCmd *const sAnimTable_Arrow[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_Arrow,
.images = sPicTable_Arrow,
@@ -295,7 +295,7 @@ static const union AnimCmd *const sAnimTable_GroundImpactDust[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x8,
.anims = sAnimTable_GroundImpactDust,
@@ -326,7 +326,7 @@ static const union AnimCmd *const sAnimTable_JumpTallGrass[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x8,
.anims = sAnimTable_JumpTallGrass,
@@ -374,7 +374,7 @@ static const union AnimCmd *const sAnimTable_SandFootprints[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_SandFootprints,
@@ -422,7 +422,7 @@ static const union AnimCmd *const sAnimTable_DeepSandFootprints[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_DeepSandFootprints,
@@ -500,7 +500,7 @@ static const union AnimCmd *const sAnimTable_BikeTireTracks[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_BikeTireTracks,
@@ -531,7 +531,7 @@ static const union AnimCmd *const sAnimTable_JumpBigSplash[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_JumpBigSplash,
@@ -572,7 +572,7 @@ static const union AnimCmd *const sAnimTable_Splash[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x8,
.anims = sAnimTable_Splash,
@@ -601,7 +601,7 @@ static const union AnimCmd *const sAnimTable_JumpSmallSplash[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x8,
.anims = sAnimTable_JumpSmallSplash,
@@ -635,7 +635,7 @@ static const union AnimCmd *const sAnimTable_LongGrass[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_LongGrass,
@@ -670,7 +670,7 @@ static const union AnimCmd *const sAnimTable_JumpLongGrass[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_JumpLongGrass,
@@ -711,7 +711,7 @@ static const union AnimCmd *const sAnimTable_UnusedGrass[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_UnusedGrass,
@@ -744,7 +744,7 @@ static const union AnimCmd *const sAnimTable_UnusedGrass2[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_UnusedGrass2,
@@ -775,7 +775,7 @@ static const union AnimCmd *const sAnimTable_UnusedSand[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_UnusedSand,
@@ -804,7 +804,7 @@ static const union AnimCmd *const sAnimTable_SandPile[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x8,
.anims = sAnimTable_SandPile,
@@ -837,7 +837,7 @@ static const union AnimCmd *const sAnimTable_WaterSurfacing[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_WaterSurfacing,
@@ -882,7 +882,7 @@ static const union AffineAnimCmd *const sAffineAnims_ReflectionDistortion[] =
const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = {
.tileTag = 0x0,
.paletteTag = 0xFFFF,
.paletteTag = TAG_NONE,
.oam = &gDummyOamData,
.anims = gDummySpriteAnimTable,
.images = NULL,
@@ -930,8 +930,8 @@ static const union AnimCmd *const sAnimTable_Sparkle[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_Sparkle,
.images = sPicTable_Sparkle,
@@ -974,8 +974,8 @@ static const union AnimCmd *const sAnimTable_TreeDisguise[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_16x32,
.anims = sAnimTable_TreeDisguise,
.images = sPicTable_TreeDisguise,
@@ -1018,8 +1018,8 @@ static const union AnimCmd *const sAnimTable_MountainDisguise[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_16x32,
.anims = sAnimTable_MountainDisguise,
.images = sPicTable_MountainDisguise,
@@ -1038,8 +1038,8 @@ static const struct SpriteFrameImage sPicTable_SandDisguisePlaceholder[] = {
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_16x32,
.anims = sAnimTable_TreeDisguise,
.images = sPicTable_SandDisguisePlaceholder,
@@ -1063,8 +1063,8 @@ static const union AnimCmd *const sAnimTable_Bird[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_32x32,
.anims = sAnimTable_Bird,
.images = sPicTable_Bird,
@@ -1090,7 +1090,7 @@ static const union AnimCmd *const sAnimTable_ShortGrass[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_ShortGrass,
@@ -1115,7 +1115,7 @@ static const union AnimCmd *const sAnimTable_HotSpringsWater[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_HotSpringsWater,
@@ -1149,7 +1149,7 @@ static const union AnimCmd *const sAnimTable_AshPuff[] =
const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff =
{
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_ASH,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_AshPuff,
@@ -1185,7 +1185,7 @@ static const union AnimCmd *const sAnimTable_AshLaunch[] =
const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch =
{
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_ASH,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_AshLaunch,
@@ -1224,7 +1224,7 @@ static const union AnimCmd *const sAnimTable_Bubbles[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x32,
.anims = sAnimTable_Bubbles,
@@ -1252,7 +1252,7 @@ static const union AnimCmd *const sAnimTable_SmallSparkle[] =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = {
.tileTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_SMALL_SPARKLE,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_SmallSparkle,
@@ -1277,8 +1277,8 @@ const struct SpriteFrameImage sPicTable_RayquazaSpotlightEffect[] = {
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {
.tileTag = 0xFFFF,
.paletteTag = 0xFFFF,
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_32x32,
.anims = sAnimTable_RayquazaSpotlightEffect,
.images = sPicTable_RayquazaSpotlightEffect,