Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo (most) indentation changes.

Browse Source
This commit is contained in:
Ariel A 2024-02-15 22:24:20 -05:00
parent f861504cfc
commit afbb88d77a
11 changed files with 102 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,23 +12,19 @@ static const union AnimCmd *const sAnimTable_Shadow[] =
sAnim_Shadow,
};
static const struct SpriteFrameImage sPicTable_ShadowSmall[] =
{
static const struct SpriteFrameImage sPicTable_ShadowSmall[] = {
obj_frame_tiles(gFieldEffectObjectPic_ShadowSmall),
};
static const struct SpriteFrameImage sPicTable_ShadowMedium[] =
{
static const struct SpriteFrameImage sPicTable_ShadowMedium[] = {
obj_frame_tiles(gFieldEffectObjectPic_ShadowMedium),
};
static const struct SpriteFrameImage sPicTable_ShadowLarge[] =
{
static const struct SpriteFrameImage sPicTable_ShadowLarge[] = {
obj_frame_tiles(gFieldEffectObjectPic_ShadowLarge),
};
static const struct SpriteFrameImage sPicTable_ShadowExtraLarge[] =
{
static const struct SpriteFrameImage sPicTable_ShadowExtraLarge[] = {
obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge),
};
@ -40,8 +36,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {TAG_NONE,
const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {TAG_NONE, TAG_WEATHER_START, &gObjectEventBaseOam_64x32, sAnimTable_Shadow, sPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect};
static const struct SpriteFrameImage sPicTable_TallGrass[] =
{
static const struct SpriteFrameImage sPicTable_TallGrass[] = {
overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 2),
@ -64,8 +59,7 @@ static const union AnimCmd *const sAnimTable_TallGrass[] =
sAnim_TallGrass,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
@ -75,8 +69,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass =
.callback = UpdateTallGrassFieldEffect,
};
static const struct SpriteFrameImage sPicTable_Ripple[] =
{
static const struct SpriteFrameImage sPicTable_Ripple[] = {
overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 2),
@ -102,8 +95,7 @@ static const union AnimCmd *const sAnimTable_Ripple[] =
sAnim_Ripple,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
@ -113,8 +105,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple =
.callback = WaitFieldEffectSpriteAnim,
};
static const struct SpriteFrameImage sPicTable_Ash[] =
{
static const struct SpriteFrameImage sPicTable_Ash[] = {
overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 2),
@ -137,8 +128,7 @@ static const union AnimCmd *const sAnimTable_Ash[] =
sAnim_Ash,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Ash =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
@ -148,8 +138,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Ash =
.callback = UpdateAshFieldEffect,
};
static const struct SpriteFrameImage sPicTable_SurfBlob[] =
{
static const struct SpriteFrameImage sPicTable_SurfBlob[] = {
overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 0),
overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 1),
overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 2),
@ -187,8 +176,7 @@ static const union AnimCmd *const sAnimTable_SurfBlob[] =
sSurfBlobAnim_FaceEast,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_MAY,
.oam = &gObjectEventBaseOam_32x32,
@ -198,8 +186,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob =
.callback = UpdateSurfBlobFieldEffect,
};
static const struct SpriteFrameImage sPicTable_Arrow[] =
{
static const struct SpriteFrameImage sPicTable_Arrow[] = {
overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 2),
@ -246,8 +233,7 @@ static const union AnimCmd *const sAnimTable_Arrow[] =
sArrowAnim_East,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_MAY,
.oam = &gObjectEventBaseOam_16x16,
@ -257,8 +243,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow =
.callback = SpriteCallbackDummy,
};
static const struct SpriteFrameImage sPicTable_GroundImpactDust[] =
{
static const struct SpriteFrameImage sPicTable_GroundImpactDust[] = {
overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 0),
overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 1),
overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 2),
@ -277,8 +262,7 @@ static const union AnimCmd *const sAnimTable_GroundImpactDust[] =
sAnim_GroundImpactDust,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x8,
@ -288,8 +272,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust =
.callback = UpdateJumpImpactEffect,
};
static const struct SpriteFrameImage sPicTable_JumpTallGrass[] =
{
static const struct SpriteFrameImage sPicTable_JumpTallGrass[] = {
overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 0),
overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 1),
overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 2),
@ -310,8 +293,7 @@ static const union AnimCmd *const sAnimTable_JumpTallGrass[] =
sAnim_JumpTallGrass,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x8,
@ -321,8 +303,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass =
.callback = UpdateJumpImpactEffect,
};
static const struct SpriteFrameImage sPicTable_SandFootprints[] =
{
static const struct SpriteFrameImage sPicTable_SandFootprints[] = {
overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 1),
};
@ -360,8 +341,7 @@ static const union AnimCmd *const sAnimTable_SandFootprints[] =
sSandFootprintsAnim_East,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
@ -371,8 +351,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints =
.callback = UpdateFootprintsTireTracksFieldEffect,
};
static const struct SpriteFrameImage sPicTable_DeepSandFootprints[] =
{
static const struct SpriteFrameImage sPicTable_DeepSandFootprints[] = {
overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 1),
};
@ -410,8 +389,7 @@ static const union AnimCmd *const sAnimTable_DeepSandFootprints[] =
sDeepSandFootprintsAnim_East,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
@ -421,21 +399,18 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints =
.callback = UpdateFootprintsTireTracksFieldEffect,
};
static const struct SpriteFrameImage sPicTable_BugTracks[] =
{
static const struct SpriteFrameImage sPicTable_BugTracks[] = {
overworld_frame(gFieldEffectObjectPic_BugTracks, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_BugTracks, 2, 2, 1),
};
static const struct SpriteFrameImage sPicTable_SpotTracks[] =
{
static const struct SpriteFrameImage sPicTable_SpotTracks[] = {
overworld_frame(gFieldEffectObjectPic_SpotTracks, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_SpotTracks, 2, 2, 1),
};
const struct SpriteTemplate gFieldEffectObjectTemplate_BugTracks =
{
.tileTag = TAG_NONE,
const struct SpriteTemplate gFieldEffectObjectTemplate_BugTracks = {
.tileTag = 0xFFFF,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_DeepSandFootprints,
@ -444,9 +419,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_BugTracks =
.callback = UpdateFootprintsTireTracksFieldEffect,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SpotTracks =
{
.tileTag = TAG_NONE,
const struct SpriteTemplate gFieldEffectObjectTemplate_SpotTracks = {
.tileTag = 0xFFFF,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_DeepSandFootprints,
@ -455,8 +429,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SpotTracks =
.callback = UpdateFootprintsTireTracksFieldEffect,
};
static const struct SpriteFrameImage sPicTable_BikeTireTracks[] =
{
static const struct SpriteFrameImage sPicTable_BikeTireTracks[] = {
overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 2),
@ -464,8 +437,7 @@ static const struct SpriteFrameImage sPicTable_BikeTireTracks[] =
};
static const struct SpriteFrameImage sPicTable_SlitherTracks[] =
{
static const struct SpriteFrameImage sPicTable_SlitherTracks[] = {
overworld_frame(gFieldEffectObjectPic_SlitherTracks, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_SlitherTracks, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_SlitherTracks, 2, 2, 2),
@ -533,8 +505,7 @@ static const union AnimCmd *const sAnimTable_BikeTireTracks[] =
sBikeTireTracksAnim_NECornerTurn,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
@ -545,9 +516,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks =
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SlitherTracks =
{
.tileTag = TAG_NONE,
const struct SpriteTemplate gFieldEffectObjectTemplate_SlitherTracks = {
.tileTag = 0xFFFF,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
.anims = sAnimTable_BikeTireTracks,
@ -556,8 +526,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SlitherTracks =
.callback = UpdateFootprintsTireTracksFieldEffect,
};
static const struct SpriteFrameImage sPicTable_JumpBigSplash[] =
{
static const struct SpriteFrameImage sPicTable_JumpBigSplash[] = {
overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 2),
@ -578,8 +547,7 @@ static const union AnimCmd *const sAnimTable_JumpBigSplash[] =
sAnim_JumpBigSplash,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
@ -589,8 +557,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash =
.callback = UpdateJumpImpactEffect,
};
static const struct SpriteFrameImage sPicTable_Splash[] =
{
static const struct SpriteFrameImage sPicTable_Splash[] = {
overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0),
overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 1),
};
@ -621,8 +588,7 @@ static const union AnimCmd *const sAnimTable_Splash[] =
sAnim_Splash_1,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Splash =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x8,
@ -632,8 +598,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Splash =
.callback = UpdateSplashFieldEffect,
};
static const struct SpriteFrameImage sPicTable_JumpSmallSplash[] =
{
static const struct SpriteFrameImage sPicTable_JumpSmallSplash[] = {
overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 0),
overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 1),
overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 2),
@ -652,8 +617,7 @@ static const union AnimCmd *const sAnimTable_JumpSmallSplash[] =
sAnim_JumpSmallSplash,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x8,
@ -663,8 +627,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash =
.callback = UpdateJumpImpactEffect,
};
static const struct SpriteFrameImage sPicTable_LongGrass[] =
{
static const struct SpriteFrameImage sPicTable_LongGrass[] = {
overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 2),
@ -688,8 +651,7 @@ static const union AnimCmd *const sAnimTable_LongGrass[] =
sAnim_LongGrass,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
@ -699,8 +661,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass =
.callback = UpdateLongGrassFieldEffect,
};
static const struct SpriteFrameImage sPicTable_JumpLongGrass[] =
{
static const struct SpriteFrameImage sPicTable_JumpLongGrass[] = {
overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 2),
@ -725,8 +686,7 @@ static const union AnimCmd *const sAnimTable_JumpLongGrass[] =
sAnim_JumpLongGrass,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
@ -736,8 +696,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass =
.callback = UpdateJumpImpactEffect,
};
static const struct SpriteFrameImage sPicTable_UnusedGrass[] =
{
static const struct SpriteFrameImage sPicTable_UnusedGrass[] = {
overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 6),
overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 1),
@ -768,8 +727,7 @@ static const union AnimCmd *const sAnimTable_UnusedGrass[] =
sAnim_UnusedGrass,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
@ -779,8 +737,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass =
.callback = WaitFieldEffectSpriteAnim,
};
static const struct SpriteFrameImage sPicTable_UnusedGrass2[] =
{
static const struct SpriteFrameImage sPicTable_UnusedGrass2[] = {
overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 2),
@ -803,8 +760,7 @@ static const union AnimCmd *const sAnimTable_UnusedGrass2[] =
sAnim_UnusedGrass2,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
@ -814,8 +770,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 =
.callback = WaitFieldEffectSpriteAnim,
};
static const struct SpriteFrameImage sPicTable_UnusedSand[] =
{
static const struct SpriteFrameImage sPicTable_UnusedSand[] = {
overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 2),
@ -836,8 +791,7 @@ static const union AnimCmd *const sAnimTable_UnusedSand[] =
sAnim_UnusedSand,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
@ -847,8 +801,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand =
.callback = WaitFieldEffectSpriteAnim,
};
static const struct SpriteFrameImage sPicTable_SandPile[] =
{
static const struct SpriteFrameImage sPicTable_SandPile[] = {
overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 0),
overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 1),
overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 2),
@ -867,8 +820,7 @@ static const union AnimCmd *const sAnimTable_SandPile[] =
sAnim_SandPile,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x8,
@ -878,8 +830,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile =
.callback = UpdateSandPileFieldEffect,
};
static const struct SpriteFrameImage sPicTable_WaterSurfacing[] =
{
static const struct SpriteFrameImage sPicTable_WaterSurfacing[] = {
overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 2),
@ -902,8 +853,7 @@ static const union AnimCmd *const sAnimTable_WaterSurfacing[] =
sAnim_WaterSurfacing,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x16,
@ -947,8 +897,7 @@ static const union AffineAnimCmd *const sAffineAnims_ReflectionDistortion[] =
sAffineAnim_ReflectionDistortion_1,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = {
.tileTag = 0x0,
.paletteTag = TAG_NONE,
.oam = &gDummyOamData,
@ -958,8 +907,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion =
.callback = SpriteCallbackDummy,
};
static const struct SpriteFrameImage sPicTable_Sparkle[] =
{
static const struct SpriteFrameImage sPicTable_Sparkle[] = {
overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 2),
@ -998,8 +946,7 @@ static const union AnimCmd *const sAnimTable_Sparkle[] =
sAnim_Sparkle,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_NPC_2,
.oam = &gObjectEventBaseOam_16x16,
@ -1009,8 +956,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle =
.callback = WaitFieldEffectSpriteAnim,
};
static const struct SpriteFrameImage sPicTable_TreeDisguise[] =
{
static const struct SpriteFrameImage sPicTable_TreeDisguise[] = {
overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0),
overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 1),
overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 2),
@ -1044,8 +990,7 @@ static const union AnimCmd *const sAnimTable_TreeDisguise[] =
sAnim_TreeDisguiseReveal,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_NPC_3,
.oam = &gObjectEventBaseOam_16x32,
@ -1055,8 +1000,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise =
.callback = UpdateDisguiseFieldEffect,
};
static const struct SpriteFrameImage sPicTable_MountainDisguise[] =
{
static const struct SpriteFrameImage sPicTable_MountainDisguise[] = {
overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 0),
overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 1),
overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 2),
@ -1090,8 +1034,7 @@ static const union AnimCmd *const sAnimTable_MountainDisguise[] =
sAnim_MountainDisguiseReveal,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_NPC_2,
.oam = &gObjectEventBaseOam_16x32,
@ -1101,8 +1044,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise =
.callback = UpdateDisguiseFieldEffect,
};
static const struct SpriteFrameImage sPicTable_SandDisguisePlaceholder[] =
{
static const struct SpriteFrameImage sPicTable_SandDisguisePlaceholder[] = {
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 0),
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 1),
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 2),
@ -1112,8 +1054,7 @@ static const struct SpriteFrameImage sPicTable_SandDisguisePlaceholder[] =
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6),
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_16x32,
@ -1123,8 +1064,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder =
.callback = UpdateDisguiseFieldEffect,
};
static const struct SpriteFrameImage sPicTable_Bird[] =
{
static const struct SpriteFrameImage sPicTable_Bird[] = {
obj_frame_tiles(gFieldEffectObjectPic_Bird),
};
@ -1139,8 +1079,7 @@ static const union AnimCmd *const sAnimTable_Bird[] =
sAnim_Bird,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Bird =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_MAY,
.oam = &gObjectEventBaseOam_32x32,
@ -1150,8 +1089,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Bird =
.callback = SpriteCallbackDummy,
};
static const struct SpriteFrameImage sPicTable_ShortGrass[] =
{
static const struct SpriteFrameImage sPicTable_ShortGrass[] = {
overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 1),
};
@ -1168,8 +1106,7 @@ static const union AnimCmd *const sAnimTable_ShortGrass[] =
sAnim_ShortGrass,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
@ -1179,8 +1116,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass =
.callback = UpdateShortGrassFieldEffect,
};
static const struct SpriteFrameImage sPicTable_HotSpringsWater[] =
{
static const struct SpriteFrameImage sPicTable_HotSpringsWater[] = {
obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater),
};
@ -1195,8 +1131,7 @@ static const union AnimCmd *const sAnimTable_HotSpringsWater[] =
sAnim_HotSpringsWater,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
.oam = &gObjectEventBaseOam_16x16,
@ -1206,8 +1141,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater =
.callback = UpdateHotSpringsWaterFieldEffect,
};
static const struct SpriteFrameImage sPicTable_AshPuff[] =
{
static const struct SpriteFrameImage sPicTable_AshPuff[] = {
overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 2),
@ -1243,8 +1177,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff =
const struct SpritePalette gSpritePalette_Ash = {gFieldEffectPal_Ash, FLDEFF_PAL_TAG_ASH};
static const struct SpriteFrameImage sPicTable_AshLaunch[] =
{
static const struct SpriteFrameImage sPicTable_AshLaunch[] = {
overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 2),
@ -1278,8 +1211,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch =
.callback = SpriteCB_AshLaunch
};
static const struct SpriteFrameImage sPicTable_Bubbles[] =
{
static const struct SpriteFrameImage sPicTable_Bubbles[] = {
overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0),
overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 1),
overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 2),
@ -1308,8 +1240,7 @@ static const union AnimCmd *const sAnimTable_Bubbles[] =
sAnim_Bubbles,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
.oam = &gObjectEventBaseOam_16x32,
@ -1319,8 +1250,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles =
.callback = UpdateBubblesFieldEffect,
};
static const struct SpriteFrameImage sPicTable_SmallSparkle[] =
{
static const struct SpriteFrameImage sPicTable_SmallSparkle[] = {
overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 1),
};
@ -1338,8 +1268,7 @@ static const union AnimCmd *const sAnimTable_SmallSparkle[] =
sAnim_SmallSparkle,
};
const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = {
.tileTag = TAG_NONE,
.paletteTag = FLDEFF_PAL_TAG_SMALL_SPARKLE,
.oam = &gObjectEventBaseOam_16x16,
@ -1351,24 +1280,20 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle =
const struct SpritePalette gSpritePalette_SmallSparkle = {gFieldEffectPal_SmallSparkle, FLDEFF_PAL_TAG_SMALL_SPARKLE};
static const union AnimCmd sAnim_RayquazaSpotlightEffect[] =
{
static const union AnimCmd sAnim_RayquazaSpotlightEffect[] = {
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
};
static const union AnimCmd *const sAnimTable_RayquazaSpotlightEffect[] =
{
static const union AnimCmd *const sAnimTable_RayquazaSpotlightEffect[] = {
sAnim_RayquazaSpotlightEffect,
};
static const struct SpriteFrameImage sPicTable_RayquazaSpotlightEffect[] =
{
static const struct SpriteFrameImage sPicTable_RayquazaSpotlightEffect[] = {
overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0),
};
const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza =
{
const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {
.tileTag = TAG_NONE,
.paletteTag = TAG_NONE,
.oam = &gObjectEventBaseOam_32x32,

6
src/field_effect_helpers.c
View File

@ -54,8 +54,7 @@ u32 FldEff_Shadow(void);
#define sReflectionVerticalOffset data[2]
#define sIsStillReflection data[7]
void SetUpShadow(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
void SetUpShadow(struct ObjectEvent *objectEvent, struct Sprite *sprite) {
gFieldEffectArguments[0] = objectEvent->localId;
gFieldEffectArguments[1] = gSaveBlock1Ptr->location.mapNum;
gFieldEffectArguments[2] = gSaveBlock1Ptr->location.mapGroup;
@ -326,8 +325,7 @@ u32 FldEff_Shadow(void)
const struct ObjectEventGraphicsInfo *graphicsInfo;
u8 spriteId;
u8 i;
for (i = 0; i < MAX_SPRITES; i++)
{
for (i = 0; i < MAX_SPRITES; i++) {
// Return early if a shadow sprite already exists
if (gSprites[i].data[0] == gFieldEffectArguments[0] && gSprites[i].callback == UpdateShadowFieldEffect)
return 0;

3
src/field_screen_effect.c
View File

@ -687,8 +687,7 @@ static void Task_DoDoorWarp(u8 taskId)
FreezeObjectEvents();
PlayerGetDestCoords(x, y);
PlaySE(GetDoorSoundEffect(*x, *y - 1));
if (followerObject)
{
if (followerObject) {
// Put follower into pokeball
ClearObjectEventMovement(followerObject, &gSprites[followerObject->spriteId]);
ObjectEventSetHeldMovement(followerObject, MOVEMENT_ACTION_ENTER_POKEBALL);

10
src/load_save.c
View File

@ -182,8 +182,7 @@ void SaveObjectEvents(void)
{
int i;
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
for (i = 0; i < OBJECT_EVENTS_COUNT; i++) {
gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i];
// To avoid crash on vanilla, save follower as inactive
if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER)
@ -195,11 +194,12 @@ void LoadObjectEvents(void)
{
int i;
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
for (i = 0; i < OBJECT_EVENTS_COUNT; i++) {
gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i];
// Try to restore saved inactive follower
if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER && !gObjectEvents[i].active && gObjectEvents[i].extra.asU16)
if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER &&
!gObjectEvents[i].active &&
gObjectEvents[i].extra.asU16)
gObjectEvents[i].active = TRUE;
}
}

3
src/overworld.c
View File

@ -1490,8 +1490,7 @@ void CB2_Overworld(void)
if (fading)
SetVBlankCallback(NULL);
OverworldBasic();
if (fading)
{
if (fading) {
SetFieldVBlankCallback();
return;
}

21
src/palette.c
View File

@ -444,27 +444,18 @@ static u8 UpdateTimeOfDayPaletteFade(void) // Like normal, but respects sprite p
paletteOffset = 256;
}
for (paletteNum = 0; paletteNum < 16; paletteNum++, selectedPalettes >>= 1, paletteOffset += 16)
{
if (selectedPalettes & 1)
{
if (gPaletteFade.yDec)
{
for (paletteNum = 0; paletteNum < 16; paletteNum++, selectedPalettes >>= 1, paletteOffset += 16) {
if (selectedPalettes & 1) {
if (gPaletteFade.yDec) {
// sprite palettes
if (gPaletteFade.objPaletteToggle)
{
if (gPaletteFade.objPaletteToggle) {
if (gPaletteFade.y >= gPaletteFade.targetY || GetSpritePaletteTagByPaletteNum(paletteNum) & 0x8000)
BlendPalette(paletteOffset, 16, gPaletteFade.y, gPaletteFade.blendColor);
}
// tile palettes
else if (gPaletteFade.y >= gPaletteFade.targetY || (paletteNum >= 13 && paletteNum <= 15))
{
} else if (gPaletteFade.y >= gPaletteFade.targetY || (paletteNum >= 13 && paletteNum <= 15)) {
BlendPalette(paletteOffset, 16, gPaletteFade.y, gPaletteFade.blendColor);
}
}
else
{
} else {
BlendPalette(paletteOffset, 16, gPaletteFade.y, gPaletteFade.blendColor);
}
}

4
src/party_menu.c
View File

@ -3821,9 +3821,7 @@ bool8 FieldCallback_PrepareFadeInFromMenu(void)
return TRUE;
}
// same as above, but removes follower pokemon
bool8 FieldCallback_PrepareFadeInForTeleport(void)
{
bool8 FieldCallback_PrepareFadeInForTeleport(void) { // same as above, but removes follower pokemon
RemoveFollowingPokemon();
return FieldCallback_PrepareFadeInFromMenu();
}

3
src/pokeball.c
View File

@ -852,8 +852,7 @@ static void HandleBallAnimEnd(struct Sprite *sprite)
bool8 affineAnimEnded = FALSE;
u8 battlerId = sprite->sBattler;
if (sprite->data[7] == POKEBALL_PLAYER_SLIDEIN)
{
if (sprite->data[7] == POKEBALL_PLAYER_SLIDEIN) {
gSprites[gBattlerSpriteIds[sprite->sBattler]].callback = SpriteCB_PlayerMonSlideIn;
AnimateSprite(&gSprites[gBattlerSpriteIds[sprite->sBattler]]);
gSprites[gBattlerSpriteIds[sprite->sBattler]].data[1] = 0x1000;

2
src/rayquaza_scene.c
View File

@ -1303,10 +1303,8 @@ static void CB2_InitRayquazaScene(void)
ClearScheduledBgCopiesToVram();
ScanlineEffect_Stop();
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
if (gObjectEvents[i].graphicsId == OBJ_EVENT_GFX_RAYQUAZA)
gObjectEvents[i].invisible = FALSE;
}
FreeAllSpritePalettes();
ResetPaletteFade();
ResetSpriteData();

11
src/scrcmd.c
View File

@ -1004,16 +1004,14 @@ bool8 ScrCmd_applymovement(struct ScriptContext *ctx)
struct ObjectEvent *objEvent;
// When applying script movements to follower, it may have frozen animation that must be cleared
if (localId == OBJ_EVENT_ID_FOLLOWER && (objEvent = GetFollowerObject()) && objEvent->frozen)
{
if (localId == OBJ_EVENT_ID_FOLLOWER && (objEvent = GetFollowerObject()) && objEvent->frozen) {
ClearObjectEventMovement(objEvent, &gSprites[objEvent->spriteId]);
gSprites[objEvent->spriteId].animCmdIndex = 0; // Needed to set start frame of animation
}
ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript);
sMovingNpcId = localId;
// Force follower into pokeball
if (localId != OBJ_EVENT_ID_FOLLOWER && !FlagGet(FLAG_SAFE_FOLLOWER_MOVEMENT))
{
if (localId != OBJ_EVENT_ID_FOLLOWER && !FlagGet(FLAG_SAFE_FOLLOWER_MOVEMENT)) {
objEvent = GetFollowerObject();
// return early if no follower or in shadowing state
if (objEvent == NULL || gSprites[objEvent->spriteId].data[1] == 0)
@ -1038,8 +1036,7 @@ bool8 ScrCmd_applymovementat(struct ScriptContext *ctx)
static bool8 WaitForMovementFinish(void)
{
if (ScriptMovement_IsObjectMovementFinished(sMovingNpcId, sMovingNpcMapNum, sMovingNpcMapGroup))
{
if (ScriptMovement_IsObjectMovementFinished(sMovingNpcId, sMovingNpcMapNum, sMovingNpcMapGroup)) {
struct ObjectEvent *objEvent = GetFollowerObject();
// If the follower is still entering the pokeball, wait for it to finish too
// This prevents a `release` after this script command from getting the follower stuck in an intermediate state
@ -2076,7 +2073,7 @@ bool8 ScrCmd_playmoncry(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrFunc_playfirstmoncry(struct ScriptContext *ctx)
bool8 ScrFunc_playfirstmoncry(struct ScriptContext *ctx)
{
u16 species = GetMonData(GetFirstLiveMon(), MON_DATA_SPECIES);
PlayCry_Script(species, 0);

9
src/trainer_see.c
View File

@ -844,8 +844,7 @@ u8 FldEff_ExclamationMarkIcon(void)
{
u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x53);
if (spriteId != MAX_SPRITES)
{
if (spriteId != MAX_SPRITES) {
SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON, 0);
UpdateSpritePaletteByTemplate(&sSpriteTemplate_ExclamationQuestionMark, &gSprites[spriteId]);
}
@ -856,8 +855,7 @@ u8 FldEff_ExclamationMarkIcon(void)
u8 FldEff_QuestionMarkIcon(void)
{
u8 spriteId;
if (gFieldEffectArguments[7] >= 0)
{
if (gFieldEffectArguments[7] >= 0) {
// Use follower emotes
u8 emotion = gFieldEffectArguments[7];
spriteId = CreateSpriteAtEnd(&sSpriteTemplate_Emote, 0, 0, 0x52);
@ -869,8 +867,7 @@ u8 FldEff_QuestionMarkIcon(void)
}
spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x52);
if (spriteId != MAX_SPRITES)
{
if (spriteId != MAX_SPRITES) {
SetIconSpriteData(&gSprites[spriteId], FLDEFF_QUESTION_MARK_ICON, 1);
UpdateSpritePaletteByTemplate(&sSpriteTemplate_ExclamationQuestionMark, &gSprites[spriteId]);
}