From 18d57a38021a7fee9d8f2131f776946d81c83fbe Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 19 Jun 2020 19:58:56 -0400 Subject: Document some overworld and field effects --- .../field_effect_object_template_pointers.h | 92 ++++++++-------- src/data/field_effects/field_effect_objects.h | 118 ++++++++++----------- src/data/object_events/object_event_graphics.h | 18 ++-- 3 files changed, 114 insertions(+), 114 deletions(-) (limited to 'src/data') diff --git a/src/data/field_effects/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h index de39e6db3..12ed63df3 100755 --- a/src/data/field_effects/field_effect_object_template_pointers.h +++ b/src/data/field_effects/field_effect_object_template_pointers.h @@ -8,70 +8,70 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Ash; const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob; const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow; const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass; const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash; const struct SpriteTemplate gFieldEffectObjectTemplate_Splash; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash; const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18; +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown21; -const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle; +const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion; +const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle; const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints; const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise; const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise; const struct SpriteTemplate gFieldEffectObjectTemplate_Bird; const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks; const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile; const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass; const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh; const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp; const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35; +const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle; const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza; const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { - &gFieldEffectObjectTemplate_ShadowSmall, - &gFieldEffectObjectTemplate_ShadowMedium, - &gFieldEffectObjectTemplate_ShadowLarge, - &gFieldEffectObjectTemplate_ShadowExtraLarge, - &gFieldEffectObjectTemplate_TallGrass, - &gFieldEffectObjectTemplate_Ripple, - &gFieldEffectObjectTemplate_Ash, - &gFieldEffectObjectTemplate_SurfBlob, - &gFieldEffectObjectTemplate_Arrow, - &gFieldEffectObjectTemplate_GroundImpactDust, - &gFieldEffectObjectTemplate_BikeHopTallGrass, - &gFieldEffectObjectTemplate_SandFootprints, - &gFieldEffectObjectTemplate_BikeHopBigSplash, - &gFieldEffectObjectTemplate_Splash, - &gFieldEffectObjectTemplate_BikeHopSmallSplash, - &gFieldEffectObjectTemplate_LongGrass, - &gFieldEffectObjectTemplate_Unknown16, - &gFieldEffectObjectTemplate_Unknown17, - &gFieldEffectObjectTemplate_Unknown18, - &gFieldEffectObjectTemplate_Unknown19, - &gFieldEffectObjectTemplate_Unknown20, - &gFieldEffectObjectTemplate_Unknown21, - &gFieldEffectObjectTemplate_BerryTreeGrowthSparkle, - &gFieldEffectObjectTemplate_DeepSandFootprints, - &gFieldEffectObjectTemplate_TreeDisguise, - &gFieldEffectObjectTemplate_MountainDisguise, - &gFieldEffectObjectTemplate_Bird, - &gFieldEffectObjectTemplate_BikeTireTracks, - &gFieldEffectObjectTemplate_SandDisguisePlaceholder, - &gFieldEffectObjectTemplate_Unknown29, - &gFieldEffectObjectTemplate_ShortGrass, - &gFieldEffectObjectTemplate_HotSpringsWater, - &gFieldEffectObjectTemplate_JumpOutOfAsh, - &gFieldEffectObjectTemplate_LavaridgeGymWarp, - &gFieldEffectObjectTemplate_Bubbles, - &gFieldEffectObjectTemplate_Unknown35, - &gFieldEffectObjectTemplate_Rayquaza, + [FLDEFFOBJ_SHADOW_S] = &gFieldEffectObjectTemplate_ShadowSmall, + [FLDEFFOBJ_SHADOW_M] = &gFieldEffectObjectTemplate_ShadowMedium, + [FLDEFFOBJ_SHADOW_L] = &gFieldEffectObjectTemplate_ShadowLarge, + [FLDEFFOBJ_SHADOW_XL] = &gFieldEffectObjectTemplate_ShadowExtraLarge, + [FLDEFFOBJ_TALL_GRASS] = &gFieldEffectObjectTemplate_TallGrass, + [FLDEFFOBJ_RIPPLE] = &gFieldEffectObjectTemplate_Ripple, + [FLDEFFOBJ_ASH] = &gFieldEffectObjectTemplate_Ash, + [FLDEFFOBJ_SURF_BLOB] = &gFieldEffectObjectTemplate_SurfBlob, + [FLDEFFOBJ_ARROW] = &gFieldEffectObjectTemplate_Arrow, + [FLDEFFOBJ_GROUND_IMPACT_DUST] = &gFieldEffectObjectTemplate_GroundImpactDust, + [FLDEFFOBJ_JUMP_TALL_GRASS] = &gFieldEffectObjectTemplate_JumpTallGrass, + [FLDEFFOBJ_SAND_FOOTPRINTS] = &gFieldEffectObjectTemplate_SandFootprints, + [FLDEFFOBJ_JUMP_BIG_SPLASH] = &gFieldEffectObjectTemplate_JumpBigSplash, + [FLDEFFOBJ_SPLASH] = &gFieldEffectObjectTemplate_Splash, + [FLDEFFOBJ_JUMP_SMALL_SPLASH] = &gFieldEffectObjectTemplate_JumpSmallSplash, + [FLDEFFOBJ_LONG_GRASS] = &gFieldEffectObjectTemplate_LongGrass, + [FLDEFFOBJ_JUMP_LONG_GRASS] = &gFieldEffectObjectTemplate_JumpLongGrass, + [FLDEFFOBJ_17] = &gFieldEffectObjectTemplate_Unknown17, + [FLDEFFOBJ_UNUSED_GRASS] = &gFieldEffectObjectTemplate_UnusedGrass, + [FLDEFFOBJ_19] = &gFieldEffectObjectTemplate_Unknown19, + [FLDEFFOBJ_20] = &gFieldEffectObjectTemplate_Unknown20, + [FLDEFFOBJ_REFLECTION_DISTORTION] = &gFieldEffectObjectTemplate_ReflectionDistortion, + [FLDEFFOBJ_SPARKLE] = &gFieldEffectObjectTemplate_Sparkle, + [FLDEFFOBJ_DEEP_SAND_FOOTPRINTS] = &gFieldEffectObjectTemplate_DeepSandFootprints, + [FLDEFFOBJ_TREE_DISGUISE] = &gFieldEffectObjectTemplate_TreeDisguise, + [FLDEFFOBJ_MOUNTAIN_DISGUISE] = &gFieldEffectObjectTemplate_MountainDisguise, + [FLDEFFOBJ_BIRD] = &gFieldEffectObjectTemplate_Bird, + [FLDEFFOBJ_BIKE_TIRE_TRACKS] = &gFieldEffectObjectTemplate_BikeTireTracks, + [FLDEFFOBJ_SAND_DISGUISE] = &gFieldEffectObjectTemplate_SandDisguisePlaceholder, + [FLDEFFOBJ_SAND_PILE] = &gFieldEffectObjectTemplate_SandPile, + [FLDEFFOBJ_SHORT_GRASS] = &gFieldEffectObjectTemplate_ShortGrass, + [FLDEFFOBJ_HOT_SPRINGS_WATER] = &gFieldEffectObjectTemplate_HotSpringsWater, + [FLDEFFOBJ_JUMP_OUT_OF_ASH] = &gFieldEffectObjectTemplate_JumpOutOfAsh, + [FLDEFFOBJ_LAVARIDGE_GYM_WARP] = &gFieldEffectObjectTemplate_LavaridgeGymWarp, + [FLDEFFOBJ_BUBBLES] = &gFieldEffectObjectTemplate_Bubbles, + [FLDEFFOBJ_SMALL_SPARKLE] = &gFieldEffectObjectTemplate_SmallSparkle, + [FLDEFFOBJ_RAYQUAZA] = &gFieldEffectObjectTemplate_Rayquaza, }; diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index 65f35107d..4654a133a 100755 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -225,11 +225,11 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] = const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = { - overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 0), - overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 1), - overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 2), - overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 3), +const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpTallGrass[] = { + overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 2), + overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 3), }; const union AnimCmd gFieldEffectObjectImageAnim_850CCD8[] = @@ -241,12 +241,12 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CCD8[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] = +const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpTallGrass[] = { gFieldEffectObjectImageAnim_850CCD8, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_JumpTallGrass, gFieldEffectObjectPicTable_JumpTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = { overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0), @@ -398,11 +398,11 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] = const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = { - overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 0), - overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 1), - overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 2), - overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 3), +const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpBigSplash[] = { + overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 3), }; const union AnimCmd gFieldEffectObjectImageAnim_850CE7C[] = @@ -414,12 +414,12 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CE7C[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] = +const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpBigSplash[] = { gFieldEffectObjectImageAnim_850CE7C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpBigSplash, gFieldEffectObjectPicTable_JumpBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = { overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0), @@ -454,10 +454,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = { - overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 0), - overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 1), - overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 2), +const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpSmallSplash[] = { + overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 2), }; const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] = @@ -468,12 +468,12 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[] = +const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpSmallSplash[] = { gFieldEffectObjectImageAnim_850CF24, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_JumpSmallSplash, gFieldEffectObjectPicTable_JumpSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = { overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 0), @@ -501,13 +501,13 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = { - overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 0), - overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 1), - overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 2), - overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 3), - overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 4), - overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 6), +const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpLongGrass[] = { + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 6), }; const union AnimCmd gFieldEffectObjectImageAnim_850CFDC[] = @@ -521,15 +521,15 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CFDC[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] = +const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpLongGrass[] = { gFieldEffectObjectImageAnim_850CFDC, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpLongGrass, gFieldEffectObjectPicTable_JumpLongGrass, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { - overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 6), + overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 6), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 1), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 2), @@ -561,11 +561,11 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = { - overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 0), - overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 1), - overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 2), - overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 3), +const struct SpriteFrameImage gFieldEffectObjectPicTable_UnusedGrass[] = { + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 3), }; const union AnimCmd gFieldEffectObjectImageAnim_850D0C0[] = @@ -579,12 +579,12 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D0C0[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] = +const union AnimCmd *const gFieldEffectObjectImageAnimTable_UnusedGrass[] = { gFieldEffectObjectImageAnim_850D0C0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_UnusedGrass, gFieldEffectObjectPicTable_UnusedGrass, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = { overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 0), @@ -609,10 +609,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = { - overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 0), - overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 1), - overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 2), +const struct SpriteFrameImage gFieldEffectObjectPicTable_SandPile[] = { + overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 2), }; const union AnimCmd gFieldEffectObjectImageAnim_850D160[] = @@ -623,12 +623,12 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D160[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] = +const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandPile[] = { gFieldEffectObjectImageAnim_850D160, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_SandPile, gFieldEffectObjectPicTable_SandPile, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = { overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 0), @@ -683,21 +683,21 @@ const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D234[] = AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd *const gFieldEffectObjectRotScalAnimTable_Unknown21[] = +const union AffineAnimCmd *const gFieldEffectObjectRotScalAnimTable_ReflectionDistortion[] = { gFieldEffectObjectRotScalAnim_850D1E4, gFieldEffectObjectRotScalAnim_850D234, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown21 = {0x0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectObjectRotScalAnimTable_Unknown21, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = {0x0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectObjectRotScalAnimTable_ReflectionDistortion, SpriteCallbackDummy}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_BerryTreeGrowthSparkle[] = { - overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 0), - overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 1), - overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 2), - overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 3), - overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 4), - overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 5), +const struct SpriteFrameImage gFieldEffectObjectPicTable_Sparkle[] = { + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 5), }; const union AnimCmd gFieldEffectObjectImageAnim_850D2D4[] = @@ -725,12 +725,12 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D2D4[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle[] = +const union AnimCmd *const gFieldEffectObjectImageAnimTable_Sparkle[] = { gFieldEffectObjectImageAnim_850D2D4, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Sparkle, gFieldEffectObjectPicTable_Sparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = { overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0), @@ -970,9 +970,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = { - overworld_frame(gFieldEffectObjectPic_Unknown35, 2, 2, 0), - overworld_frame(gFieldEffectObjectPic_Unknown35, 2, 2, 1), +const struct SpriteFrameImage gFieldEffectObjectPicTable_SmallSparkle[] = { + overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 1), }; const union AnimCmd gFieldEffectObjectImageAnim_850D674[] = @@ -983,12 +983,12 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D674[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown35[] = +const union AnimCmd *const gFieldEffectObjectImageAnimTable_SmallSparkle[] = { gFieldEffectObjectImageAnim_850D674, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = {0xFFFF, 0x100F, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_SmallSparkle, gFieldEffectObjectPicTable_SmallSparkle, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect}; const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F}; diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 769a6bb0a..371ff3815 100755 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -252,7 +252,7 @@ const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/m const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/object_events/pics/misc/ss_tidal.4bpp"); const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effects/pics/berry_tree_growth_sparkle.4bpp"); +const u32 gFieldEffectObjectPic_Sparkle[] = INCBIN_U32("graphics/field_effects/pics/sparkle.4bpp"); const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/object_events/pics/berry_trees/dirt_pile.4bpp"); const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sprout.4bpp"); const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp"); @@ -303,11 +303,11 @@ const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/field_effects/pic const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/00.gbapal"); const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/01.gbapal"); const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/field_effects/pics/ground_impact_dust.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_tall_grass.4bpp"); -const u32 gUnusedGrass[] = INCBIN_U32("graphics/field_effects/pics/unused_grass.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/field_effects/pics/unknown_16.4bpp"); +const u32 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_tall_grass.4bpp"); +const u32 gUnusedGrass[] = INCBIN_U32("graphics/field_effects/pics/unused_grass_2.4bpp"); +const u32 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U32("graphics/field_effects/pics/unknown_16.4bpp"); const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/field_effects/pics/unknown_17.4bpp"); -const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/field_effects/pics/unknown_18.4bpp"); +const u32 gFieldEffectObjectPic_UnusedGrass[] = INCBIN_U32("graphics/field_effects/pics/unused_grass.4bpp"); const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/field_effects/pics/long_grass.4bpp"); const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/field_effects/pics/tall_grass.4bpp"); const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/field_effects/pics/short_grass.4bpp"); @@ -315,10 +315,10 @@ const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/field_ef const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/field_effects/pics/deep_sand_footprints.4bpp"); const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/field_effects/pics/bike_tire_tracks.4bpp"); const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/field_effects/pics/unknown_19.4bpp"); -const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/field_effects/pics/unknown_29.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_big_splash.4bpp"); +const u32 gFieldEffectObjectPic_SandPile[] = INCBIN_U32("graphics/field_effects/pics/sand_pile.4bpp"); +const u32 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_big_splash.4bpp"); const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/field_effects/pics/splash.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_small_splash.4bpp"); +const u32 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_small_splash.4bpp"); const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/field_effects/pics/unknown_20.4bpp"); const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/field_effects/pics/tree_disguise.4bpp"); const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/field_effects/pics/mountain_disguise.4bpp"); @@ -328,7 +328,7 @@ const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effects/pale const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/field_effects/pics/jump_out_of_ash.4bpp"); const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/field_effects/pics/lavaridge_gym_warp.4bpp"); const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/field_effects/pics/bubbles.4bpp"); -const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/field_effects/pics/unknown_35.4bpp"); +const u32 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U32("graphics/field_effects/pics/small_sparkle.4bpp"); const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effects/palettes/03.gbapal"); const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/field_effects/pics/bird.4bpp"); const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/juan.4bpp"); -- cgit v1.2.3 From 4ea6992172a53eb263d5f4342c5e08dfc3f8096a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 24 Jun 2020 16:27:00 -0400 Subject: Continue documenting overworld/field effects --- .../field_effect_object_template_pointers.h | 16 +- src/data/field_effects/field_effect_objects.h | 784 ++++++++++++++------- src/data/object_events/object_event_graphics.h | 16 +- 3 files changed, 548 insertions(+), 268 deletions(-) (limited to 'src/data') diff --git a/src/data/field_effects/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h index 12ed63df3..e455daf73 100755 --- a/src/data/field_effects/field_effect_object_template_pointers.h +++ b/src/data/field_effects/field_effect_object_template_pointers.h @@ -16,9 +16,9 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash; const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17; -const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass; +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2; const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20; +const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing; const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion; const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle; const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints; @@ -30,8 +30,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder; const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile; const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass; const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater; -const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh; -const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp; +const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff; +const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch; const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles; const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle; const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza; @@ -55,9 +55,9 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { [FLDEFFOBJ_LONG_GRASS] = &gFieldEffectObjectTemplate_LongGrass, [FLDEFFOBJ_JUMP_LONG_GRASS] = &gFieldEffectObjectTemplate_JumpLongGrass, [FLDEFFOBJ_17] = &gFieldEffectObjectTemplate_Unknown17, - [FLDEFFOBJ_UNUSED_GRASS] = &gFieldEffectObjectTemplate_UnusedGrass, + [FLDEFFOBJ_UNUSED_GRASS_2] = &gFieldEffectObjectTemplate_UnusedGrass2, [FLDEFFOBJ_19] = &gFieldEffectObjectTemplate_Unknown19, - [FLDEFFOBJ_20] = &gFieldEffectObjectTemplate_Unknown20, + [FLDEFFOBJ_WATER_SURFACING] = &gFieldEffectObjectTemplate_WaterSurfacing, [FLDEFFOBJ_REFLECTION_DISTORTION] = &gFieldEffectObjectTemplate_ReflectionDistortion, [FLDEFFOBJ_SPARKLE] = &gFieldEffectObjectTemplate_Sparkle, [FLDEFFOBJ_DEEP_SAND_FOOTPRINTS] = &gFieldEffectObjectTemplate_DeepSandFootprints, @@ -69,8 +69,8 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { [FLDEFFOBJ_SAND_PILE] = &gFieldEffectObjectTemplate_SandPile, [FLDEFFOBJ_SHORT_GRASS] = &gFieldEffectObjectTemplate_ShortGrass, [FLDEFFOBJ_HOT_SPRINGS_WATER] = &gFieldEffectObjectTemplate_HotSpringsWater, - [FLDEFFOBJ_JUMP_OUT_OF_ASH] = &gFieldEffectObjectTemplate_JumpOutOfAsh, - [FLDEFFOBJ_LAVARIDGE_GYM_WARP] = &gFieldEffectObjectTemplate_LavaridgeGymWarp, + [FLDEFFOBJ_ASH_PUFF] = &gFieldEffectObjectTemplate_AshPuff, + [FLDEFFOBJ_ASH_LAUNCH] = &gFieldEffectObjectTemplate_AshLaunch, [FLDEFFOBJ_BUBBLES] = &gFieldEffectObjectTemplate_Bubbles, [FLDEFFOBJ_SMALL_SPARKLE] = &gFieldEffectObjectTemplate_SmallSparkle, [FLDEFFOBJ_RAYQUAZA] = &gFieldEffectObjectTemplate_Rayquaza, diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index 4654a133a..071beeecd 100755 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -1,43 +1,75 @@ -const struct SpritePalette gFieldEffectObjectPaletteInfo0 = {gFieldEffectObjectPalette0, 0x1004}; +const struct SpritePalette gFieldEffectObjectPaletteInfo0 = {gFieldEffectObjectPalette0, FLDEFF_PAL_TAG_4}; -const struct SpritePalette gFieldEffectObjectPaletteInfo1 = {gFieldEffectObjectPalette1, 0x1005}; +const struct SpritePalette gFieldEffectObjectPaletteInfo1 = {gFieldEffectObjectPalette1, FLDEFF_PAL_TAG_5}; -const union AnimCmd gFieldEffectObjectImageAnim_850C9D0[] = +static const union AnimCmd sAnim_Shadow[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Shadow[] = +static const union AnimCmd *const sAnimTable_Shadow[] = { - gFieldEffectObjectImageAnim_850C9D0, + sAnim_Shadow, }; -const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowSmall[] = { +static const struct SpriteFrameImage sPicTable_ShadowSmall[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowSmall), }; -const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowMedium[] = { +static const struct SpriteFrameImage sPicTable_ShadowMedium[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowMedium), }; -const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowLarge[] = { +static const struct SpriteFrameImage sPicTable_ShadowLarge[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowLarge), }; -const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = { +static const struct SpriteFrameImage sPicTable_ShadowExtraLarge[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_8x8, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowSmall, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateShadowFieldEffect, +}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_16x8, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowMedium, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateShadowFieldEffect, +}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_32x8, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowLarge, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateShadowFieldEffect, +}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_64x32, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowExtraLarge, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateShadowFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), @@ -45,7 +77,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = { overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 4), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CA84[] = +static const union AnimCmd sAnim_TallGrass[] = { ANIMCMD_FRAME(1, 10), ANIMCMD_FRAME(2, 10), @@ -55,14 +87,22 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CA84[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] = +static const union AnimCmd *const sAnimTable_TallGrass[] = { - gFieldEffectObjectImageAnim_850CA84, + sAnim_TallGrass, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_5, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_TallGrass, + .images = sPicTable_TallGrass, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateTallGrassFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), @@ -70,7 +110,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = { overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 4), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CAE0[] = +static const union AnimCmd sAnim_Ripple[] = { ANIMCMD_FRAME(0, 12), ANIMCMD_FRAME(1, 9), @@ -83,14 +123,22 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CAE0[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] = +static const union AnimCmd *const sAnimTable_Ripple[] = { - gFieldEffectObjectImageAnim_850CAE0, + sAnim_Ripple, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_5, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_Ripple, + .images = sPicTable_Ripple, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = WaitFieldEffectSpriteAnim, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), @@ -98,7 +146,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = { overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 4), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CB48[] = +static const union AnimCmd sAnim_Ash[] = { ANIMCMD_FRAME(0, 12), ANIMCMD_FRAME(1, 12), @@ -108,54 +156,70 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CB48[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] = +static const union AnimCmd *const sAnimTable_Ash[] = { - gFieldEffectObjectImageAnim_850CB48, + sAnim_Ash, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_5, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_Ash, + .images = sPicTable_Ash, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateAshFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), }; -const union AnimCmd gSurfBlobAnim_FaceSouth[] = +static const union AnimCmd sSurfBlobAnim_FaceSouth[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd gSurfBlobAnim_FaceNorth[] = +static const union AnimCmd sSurfBlobAnim_FaceNorth[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd gSurfBlobAnim_FaceWest[] = +static const union AnimCmd sSurfBlobAnim_FaceWest[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_JUMP(0), }; -const union AnimCmd gSurfBlobAnim_FaceEast[] = +static const union AnimCmd sSurfBlobAnim_FaceEast[] = { ANIMCMD_FRAME(2, 1, .hFlip = TRUE), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] = +static const union AnimCmd *const sAnimTable_SurfBlob[] = { - gSurfBlobAnim_FaceSouth, - gSurfBlobAnim_FaceNorth, - gSurfBlobAnim_FaceWest, - gSurfBlobAnim_FaceEast, + sSurfBlobAnim_FaceSouth, + sSurfBlobAnim_FaceNorth, + sSurfBlobAnim_FaceWest, + sSurfBlobAnim_FaceEast, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_32x32, + .anims = sAnimTable_SurfBlob, + .images = sPicTable_SurfBlob, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateSurfBlobFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), @@ -166,51 +230,59 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = { overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 7), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CC1C[] = +static const union AnimCmd sArrowAnim_South[] = { ANIMCMD_FRAME(3, 32), ANIMCMD_FRAME(7, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CC28[] = +static const union AnimCmd sArrowAnim_North[] = { ANIMCMD_FRAME(0, 32), ANIMCMD_FRAME(4, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CC34[] = +static const union AnimCmd sArrowAnim_West[] = { ANIMCMD_FRAME(1, 32), ANIMCMD_FRAME(5, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CC40[] = +static const union AnimCmd sArrowAnim_East[] = { ANIMCMD_FRAME(2, 32), ANIMCMD_FRAME(6, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] = +static const union AnimCmd *const sAnimTable_Arrow[] = { - gFieldEffectObjectImageAnim_850CC1C, - gFieldEffectObjectImageAnim_850CC28, - gFieldEffectObjectImageAnim_850CC34, - gFieldEffectObjectImageAnim_850CC40, + sArrowAnim_South, + sArrowAnim_North, + sArrowAnim_West, + sArrowAnim_East, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_Arrow, + .images = sPicTable_Arrow, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CC8C[] = +static const union AnimCmd sAnim_GroundImpactDust[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), @@ -218,21 +290,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CC8C[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] = +static const union AnimCmd *const sAnimTable_GroundImpactDust[] = { - gFieldEffectObjectImageAnim_850CC8C, + sAnim_GroundImpactDust, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_4, + .oam = &gObjectEventBaseOam_16x8, + .anims = sAnimTable_GroundImpactDust, + .images = sPicTable_GroundImpactDust, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateJumpImpactEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), overworld_frame(gFieldEffectObjectPic_JumpTallGrass, 2, 1, 3), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CCD8[] = +static const union AnimCmd sAnim_JumpTallGrass[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), @@ -241,171 +321,203 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CCD8[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpTallGrass[] = +static const union AnimCmd *const sAnimTable_JumpTallGrass[] = { - gFieldEffectObjectImageAnim_850CCD8, + sAnim_JumpTallGrass, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_JumpTallGrass, gFieldEffectObjectPicTable_JumpTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_5, + .oam = &gObjectEventBaseOam_16x8, + .anims = sAnimTable_JumpTallGrass, + .images = sPicTable_JumpTallGrass, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateJumpImpactEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = { +static const struct SpriteFrameImage sPicTable_SandFootprints[] = { overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 1), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CD18[] = +static const union AnimCmd sSandFootprintsAnim_South[] = { ANIMCMD_FRAME(0, 1, .vFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CD20[] = +static const union AnimCmd sSandFootprintsAnim_North[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CD28[] = +static const union AnimCmd sSandFootprintsAnim_West[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CD30[] = +static const union AnimCmd sSandFootprintsAnim_East[] = { ANIMCMD_FRAME(1, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] = +static const union AnimCmd *const sAnimTable_SandFootprints[] = { - gFieldEffectObjectImageAnim_850CD18, - gFieldEffectObjectImageAnim_850CD18, - gFieldEffectObjectImageAnim_850CD20, - gFieldEffectObjectImageAnim_850CD28, - gFieldEffectObjectImageAnim_850CD30, + sSandFootprintsAnim_South, + sSandFootprintsAnim_South, + sSandFootprintsAnim_North, + sSandFootprintsAnim_West, + sSandFootprintsAnim_East, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_4, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_SandFootprints, + .images = sPicTable_SandFootprints, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateFootprintsTireTracksFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = { +static const struct SpriteFrameImage sPicTable_DeepSandFootprints[] = { overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 1), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CD74[] = +static const union AnimCmd sDeepSandFootprintsAnim_South[] = { ANIMCMD_FRAME(0, 1, .vFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CD7C[] = +static const union AnimCmd sDeepSandFootprintsAnim_North[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CD84[] = +static const union AnimCmd sDeepSandFootprintsAnim_West[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CD8C[] = +static const union AnimCmd sDeepSandFootprintsAnim_East[] = { ANIMCMD_FRAME(1, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[] = +static const union AnimCmd *const sAnimTable_DeepSandFootprints[] = { - gFieldEffectObjectImageAnim_850CD74, - gFieldEffectObjectImageAnim_850CD74, - gFieldEffectObjectImageAnim_850CD7C, - gFieldEffectObjectImageAnim_850CD84, - gFieldEffectObjectImageAnim_850CD8C, + sDeepSandFootprintsAnim_South, + sDeepSandFootprintsAnim_South, + sDeepSandFootprintsAnim_North, + sDeepSandFootprintsAnim_West, + sDeepSandFootprintsAnim_East, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_4, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_DeepSandFootprints, + .images = sPicTable_DeepSandFootprints, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateFootprintsTireTracksFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 3), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CDE0[] = +static const union AnimCmd sBikeTireTracksAnim_South[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CDE8[] = +static const union AnimCmd sBikeTireTracksAnim_North[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CDF0[] = +static const union AnimCmd sBikeTireTracksAnim_West[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CDF8[] = +static const union AnimCmd sBikeTireTracksAnim_East[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CE00[] = +static const union AnimCmd sBikeTireTracksAnim_SECornerTurn[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CE08[] = +static const union AnimCmd sBikeTireTracksAnim_SWCornerTurn[] = { ANIMCMD_FRAME(0, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CE10[] = +static const union AnimCmd sBikeTireTracksAnim_NWCornerTurn[] = { ANIMCMD_FRAME(3, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CE18[] = +static const union AnimCmd sBikeTireTracksAnim_NECornerTurn[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] = +static const union AnimCmd *const sAnimTable_BikeTireTracks[] = { - gFieldEffectObjectImageAnim_850CDE0, - gFieldEffectObjectImageAnim_850CDE0, - gFieldEffectObjectImageAnim_850CDE8, - gFieldEffectObjectImageAnim_850CDF0, - gFieldEffectObjectImageAnim_850CDF8, - gFieldEffectObjectImageAnim_850CE00, - gFieldEffectObjectImageAnim_850CE08, - gFieldEffectObjectImageAnim_850CE10, - gFieldEffectObjectImageAnim_850CE18, + sBikeTireTracksAnim_South, + sBikeTireTracksAnim_South, + sBikeTireTracksAnim_North, + sBikeTireTracksAnim_West, + sBikeTireTracksAnim_East, + sBikeTireTracksAnim_SECornerTurn, + sBikeTireTracksAnim_SWCornerTurn, + sBikeTireTracksAnim_NWCornerTurn, + sBikeTireTracksAnim_NECornerTurn, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_4, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_BikeTireTracks, + .images = sPicTable_BikeTireTracks, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateFootprintsTireTracksFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), overworld_frame(gFieldEffectObjectPic_JumpBigSplash, 2, 2, 3), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CE7C[] = +static const union AnimCmd sAnim_JumpBigSplash[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), @@ -414,26 +526,34 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CE7C[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpBigSplash[] = +static const union AnimCmd *const sAnimTable_JumpBigSplash[] = { - gFieldEffectObjectImageAnim_850CE7C, + sAnim_JumpBigSplash, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpBigSplash, gFieldEffectObjectPicTable_JumpBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_4, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_JumpBigSplash, + .images = sPicTable_JumpBigSplash, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateJumpImpactEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = { +static const struct SpriteFrameImage sPicTable_Splash[] = { overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0), overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 1), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CEBC[] = +static const union AnimCmd sAnim_Splash_0[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850CEC8[] = +static const union AnimCmd sAnim_Splash_1[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -446,21 +566,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CEC8[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] = +static const union AnimCmd *const sAnimTable_Splash[] = { - gFieldEffectObjectImageAnim_850CEBC, - gFieldEffectObjectImageAnim_850CEC8, + sAnim_Splash_0, + sAnim_Splash_1, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_4, + .oam = &gObjectEventBaseOam_16x8, + .anims = sAnimTable_Splash, + .images = sPicTable_Splash, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateSplashFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] = +static const union AnimCmd sAnim_JumpSmallSplash[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -468,21 +596,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpSmallSplash[] = +static const union AnimCmd *const sAnimTable_JumpSmallSplash[] = { - gFieldEffectObjectImageAnim_850CF24, + sAnim_JumpSmallSplash, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_JumpSmallSplash, gFieldEffectObjectPicTable_JumpSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_4, + .oam = &gObjectEventBaseOam_16x8, + .anims = sAnimTable_JumpSmallSplash, + .images = sPicTable_JumpSmallSplash, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateJumpImpactEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 3), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CF70[] = +static const union AnimCmd sAnim_LongGrass[] = { ANIMCMD_FRAME(1, 3), ANIMCMD_FRAME(2, 3), @@ -494,14 +630,22 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CF70[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] = +static const union AnimCmd *const sAnimTable_LongGrass[] = { - gFieldEffectObjectImageAnim_850CF70, + sAnim_LongGrass, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_5, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_LongGrass, + .images = sPicTable_LongGrass, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateLongGrassFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), @@ -510,7 +654,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpLongGrass[] = { overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 6), }; -const union AnimCmd gFieldEffectObjectImageAnim_850CFDC[] = +static const union AnimCmd sAnim_JumpLongGrass[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -521,14 +665,22 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CFDC[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpLongGrass[] = +static const union AnimCmd *const sAnimTable_JumpLongGrass[] = { - gFieldEffectObjectImageAnim_850CFDC, + sAnim_JumpLongGrass, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpLongGrass, gFieldEffectObjectPicTable_JumpLongGrass, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_5, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_JumpLongGrass, + .images = sPicTable_JumpLongGrass, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateJumpImpactEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { +static const struct SpriteFrameImage sPicTable_Unknown17[] = { overworld_frame(gFieldEffectObjectPic_JumpLongGrass, 2, 2, 6), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 1), @@ -540,7 +692,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 7), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D05C[] = +static const union AnimCmd sAnim_Unknown17[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(1, 4), @@ -554,21 +706,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D05C[] = ANIMCMD_JUMP(7), }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] = +static const union AnimCmd *const sAnimTable_Unknown17[] = { - gFieldEffectObjectImageAnim_850D05C, + sAnim_Unknown17, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_5, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_Unknown17, + .images = sPicTable_Unknown17, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = WaitFieldEffectSpriteAnim, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_UnusedGrass[] = { - overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 0), - overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 1), - overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 2), - overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 3), +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), + overworld_frame(gFieldEffectObjectPic_UnusedGrass2, 2, 2, 3), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D0C0[] = +static const union AnimCmd sAnim_UnusedGrass2[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -579,21 +739,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D0C0[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_UnusedGrass[] = +static const union AnimCmd *const sAnimTable_UnusedGrass2[] = { - gFieldEffectObjectImageAnim_850D0C0, + sAnim_UnusedGrass2, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_UnusedGrass, gFieldEffectObjectPicTable_UnusedGrass, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_5, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_UnusedGrass2, + .images = sPicTable_UnusedGrass2, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = WaitFieldEffectSpriteAnim, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = { +static const struct SpriteFrameImage sPicTable_Unknown19[] = { overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 1), overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 2), overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 3), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D118[] = +static const union AnimCmd sAnim_Unknown19[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -602,20 +770,28 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D118[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] = +static const union AnimCmd *const sAnimTable_Unknown19[] = { - gFieldEffectObjectImageAnim_850D118, + sAnim_Unknown19, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_4, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_Unknown19, + .images = sPicTable_Unknown19, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = WaitFieldEffectSpriteAnim, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D160[] = +static const union AnimCmd sAnim_SandPile[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -623,21 +799,29 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D160[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandPile[] = +static const union AnimCmd *const sAnimTable_SandPile[] = { - gFieldEffectObjectImageAnim_850D160, + sAnim_SandPile, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_SandPile, gFieldEffectObjectPicTable_SandPile, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_4, + .oam = &gObjectEventBaseOam_16x8, + .anims = sAnimTable_SandPile, + .images = sPicTable_SandPile, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateSandPileFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = { - overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 0), - overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 1), - overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 2), - overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 3), +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), + overworld_frame(gFieldEffectObjectPic_WaterSurfacing, 2, 2, 3), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D1AC[] = +static const union AnimCmd sAnim_WaterSurfacing[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -648,14 +832,22 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D1AC[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown20[] = +static const union AnimCmd *const sAnimTable_WaterSurfacing[] = { - gFieldEffectObjectImageAnim_850D1AC, + sAnim_WaterSurfacing, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_4, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_WaterSurfacing, + .images = sPicTable_WaterSurfacing, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = WaitFieldEffectSpriteAnim, +}; -const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] = +static const union AffineAnimCmd sAffineAnim_ReflectionDistortion_0[] = { AFFINEANIMCMD_FRAME(0xFF00, 0x100, -128, 0), AFFINEANIMCMD_FRAME(0x1, 0x0, 0, 4), @@ -669,7 +861,7 @@ const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] = AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D234[] = +static const union AffineAnimCmd sAffineAnim_ReflectionDistortion_1[] = { AFFINEANIMCMD_FRAME(0x100, 0x100, -128, 0), AFFINEANIMCMD_FRAME(0xFFFF, 0x0, 0, 4), @@ -683,15 +875,23 @@ const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D234[] = AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd *const gFieldEffectObjectRotScalAnimTable_ReflectionDistortion[] = +static const union AffineAnimCmd *const sAffineAnims_ReflectionDistortion[] = { - gFieldEffectObjectRotScalAnim_850D1E4, - gFieldEffectObjectRotScalAnim_850D234, + sAffineAnim_ReflectionDistortion_0, + sAffineAnim_ReflectionDistortion_1, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = {0x0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectObjectRotScalAnimTable_ReflectionDistortion, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = { + .tileTag = 0x0, + .paletteTag = 0xFFFF, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = sAffineAnims_ReflectionDistortion, + .callback = SpriteCallbackDummy, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), @@ -700,7 +900,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Sparkle[] = { overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 5), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D2D4[] = +static const union AnimCmd sAnim_Sparkle[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), @@ -725,14 +925,22 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D2D4[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Sparkle[] = +static const union AnimCmd *const sAnimTable_Sparkle[] = { - gFieldEffectObjectImageAnim_850D2D4, + sAnim_Sparkle, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Sparkle, gFieldEffectObjectPicTable_Sparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_Sparkle, + .images = sPicTable_Sparkle, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = WaitFieldEffectSpriteAnim, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), @@ -742,13 +950,13 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = { overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 6), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D37C[] = +static const union AnimCmd sAnim_TreeDisguise[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850D384[] = +static const union AnimCmd sAnim_TreeDisguiseReveal[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -760,15 +968,23 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D384[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] = +static const union AnimCmd *const sAnimTable_TreeDisguise[] = { - gFieldEffectObjectImageAnim_850D37C, - gFieldEffectObjectImageAnim_850D384, + sAnim_TreeDisguise, + sAnim_TreeDisguiseReveal, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_16x32, + .anims = sAnimTable_TreeDisguise, + .images = sPicTable_TreeDisguise, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateDisguiseFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), @@ -778,13 +994,13 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = { overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 6), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D3FC[] = +static const union AnimCmd sAnim_MountainDisguise[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -const union AnimCmd gFieldEffectObjectImageAnim_850D404[] = +static const union AnimCmd sAnim_MountainDisguiseReveal[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -796,15 +1012,23 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D404[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] = +static const union AnimCmd *const sAnimTable_MountainDisguise[] = { - gFieldEffectObjectImageAnim_850D3FC, - gFieldEffectObjectImageAnim_850D404, + sAnim_MountainDisguise, + sAnim_MountainDisguiseReveal, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_16x32, + .anims = sAnimTable_MountainDisguise, + .images = sPicTable_MountainDisguise, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateDisguiseFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), @@ -814,70 +1038,102 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_16x32, + .anims = sAnimTable_TreeDisguise, + .images = sPicTable_SandDisguisePlaceholder, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateDisguiseFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = { +static const struct SpriteFrameImage sPicTable_Bird[] = { obj_frame_tiles(gFieldEffectObjectPic_Bird), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D49C[] = +static const union AnimCmd sAnim_Bird[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] = +static const union AnimCmd *const sAnimTable_Bird[] = { - gFieldEffectObjectImageAnim_850D49C, + sAnim_Bird, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_32x32, + .anims = sAnimTable_Bird, + .images = sPicTable_Bird, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = { +static const struct SpriteFrameImage sPicTable_ShortGrass[] = { overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 1), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D4D0[] = +static const union AnimCmd sAnim_ShortGrass[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] = +static const union AnimCmd *const sAnimTable_ShortGrass[] = { - gFieldEffectObjectImageAnim_850D4D0, + sAnim_ShortGrass, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_5, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_ShortGrass, + .images = sPicTable_ShortGrass, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateShortGrassFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = { +static const struct SpriteFrameImage sPicTable_HotSpringsWater[] = { obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D500[] = +static const union AnimCmd sAnim_HotSpringsWater[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] = +static const union AnimCmd *const sAnimTable_HotSpringsWater[] = { - gFieldEffectObjectImageAnim_850D500, + sAnim_HotSpringsWater, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_5, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_HotSpringsWater, + .images = sPicTable_HotSpringsWater, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateHotSpringsWaterFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = { - overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 0), - overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 1), - overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 2), - overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 3), - overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 4), +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), + overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_AshPuff, 2, 2, 4), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D54C[] = +static const union AnimCmd sAnim_AshPuff[] = { ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(1, 6), @@ -887,33 +1143,33 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D54C[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] = +static const union AnimCmd *const sAnimTable_AshPuff[] = { - gFieldEffectObjectImageAnim_850D54C, + sAnim_AshPuff, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = +const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff = { .tileTag = 0xFFFF, - .paletteTag = 0x100D, + .paletteTag = FLDEFF_PAL_TAG_13, .oam = &gObjectEventBaseOam_16x16, - .anims = gFieldEffectObjectImageAnimTable_JumpOutOfAsh, - .images = gFieldEffectObjectPicTable_JumpOutOfAsh, + .anims = sAnimTable_AshPuff, + .images = sPicTable_AshPuff, .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_PopOutOfAsh + .callback = SpriteCB_AshPuff }; -const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D}; +const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, FLDEFF_PAL_TAG_13}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_LavaridgeGymWarp[] = { - overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 0), - overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 1), - overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 2), - overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 3), - overworld_frame(gFieldEffectObjectPic_LavaridgeGymWarp, 2, 2, 4), +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), + overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 4), }; -const union AnimCmd gFieldEffectObjectImageAnim_LavaridgeGymWarp[] = +static const union AnimCmd sAnim_AshLaunch[] = { ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(1, 6), @@ -923,23 +1179,23 @@ const union AnimCmd gFieldEffectObjectImageAnim_LavaridgeGymWarp[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_LavaridgeGymWarp[] = +static const union AnimCmd *const sAnimTable_AshLaunch[] = { - gFieldEffectObjectImageAnim_LavaridgeGymWarp, + sAnim_AshLaunch, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_LavaridgeGymWarp = +const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch = { .tileTag = 0xFFFF, - .paletteTag = 0x100D, + .paletteTag = FLDEFF_PAL_TAG_13, .oam = &gObjectEventBaseOam_16x16, - .anims = gFieldEffectObjectImageAnimTable_LavaridgeGymWarp, - .images = gFieldEffectObjectPicTable_LavaridgeGymWarp, + .anims = sAnimTable_AshLaunch, + .images = sPicTable_AshLaunch, .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_LavaridgeGymWarp + .callback = SpriteCB_AshLaunch }; -const struct SpriteFrameImage gFieldEffectObjectPicTable_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), @@ -950,7 +1206,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = { overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 7), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D624[] = +static const union AnimCmd sAnim_Bubbles[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -963,19 +1219,27 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D624[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] = +static const union AnimCmd *const sAnimTable_Bubbles[] = { - gFieldEffectObjectImageAnim_850D624, + sAnim_Bubbles, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_4, + .oam = &gObjectEventBaseOam_16x32, + .anims = sAnimTable_Bubbles, + .images = sPicTable_Bubbles, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateBubblesFieldEffect, +}; -const struct SpriteFrameImage gFieldEffectObjectPicTable_SmallSparkle[] = { +static const struct SpriteFrameImage sPicTable_SmallSparkle[] = { overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 1), }; -const union AnimCmd gFieldEffectObjectImageAnim_850D674[] = +static const union AnimCmd sAnim_SmallSparkle[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(1, 5), @@ -983,28 +1247,44 @@ const union AnimCmd gFieldEffectObjectImageAnim_850D674[] = ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_SmallSparkle[] = +static const union AnimCmd *const sAnimTable_SmallSparkle[] = { - gFieldEffectObjectImageAnim_850D674, + sAnim_SmallSparkle, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = {0xFFFF, 0x100F, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_SmallSparkle, gFieldEffectObjectPicTable_SmallSparkle, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = { + .tileTag = 0xFFFF, + .paletteTag = FLDEFF_PAL_TAG_15, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_SmallSparkle, + .images = sPicTable_SmallSparkle, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateSparkleFieldEffect, +}; -const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F}; +const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, FLDEFF_PAL_TAG_15}; -const union AnimCmd gFieldEffectObjectImageAnim_850D6A8[] = { +static const union AnimCmd sAnim_Rayquaza[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = { - gFieldEffectObjectImageAnim_850D6A8, +static const union AnimCmd *const sAnimTable_Rayquaza[] = { + sAnim_Rayquaza, }; -const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = { +const struct SpriteFrameImage sPicTable_Rayquaza[] = { overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_32x32, + .anims = sAnimTable_Rayquaza, + .images = sPicTable_Rayquaza, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = UpdateRayquazaSpotlightEffect, +}; -const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gObjectEventPalette2, 0x1011}; +const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gObjectEventPalette2, FLDEFF_PAL_TAG_17}; diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 371ff3815..87c0fa8a3 100755 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -303,11 +303,11 @@ const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/field_effects/pic const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/00.gbapal"); const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/01.gbapal"); const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/field_effects/pics/ground_impact_dust.4bpp"); -const u32 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_tall_grass.4bpp"); -const u32 gUnusedGrass[] = INCBIN_U32("graphics/field_effects/pics/unused_grass_2.4bpp"); +const u32 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U32("graphics/field_effects/pics/jump_tall_grass.4bpp"); +const u32 gUnusedGrass3[] = INCBIN_U32("graphics/field_effects/pics/unused_grass_3.4bpp"); const u32 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U32("graphics/field_effects/pics/unknown_16.4bpp"); const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/field_effects/pics/unknown_17.4bpp"); -const u32 gFieldEffectObjectPic_UnusedGrass[] = INCBIN_U32("graphics/field_effects/pics/unused_grass.4bpp"); +const u32 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U32("graphics/field_effects/pics/unused_grass_2.4bpp"); const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/field_effects/pics/long_grass.4bpp"); const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/field_effects/pics/tall_grass.4bpp"); const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/field_effects/pics/short_grass.4bpp"); @@ -316,17 +316,17 @@ const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/fiel const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/field_effects/pics/bike_tire_tracks.4bpp"); const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/field_effects/pics/unknown_19.4bpp"); const u32 gFieldEffectObjectPic_SandPile[] = INCBIN_U32("graphics/field_effects/pics/sand_pile.4bpp"); -const u32 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_big_splash.4bpp"); +const u32 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U32("graphics/field_effects/pics/jump_big_splash.4bpp"); const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/field_effects/pics/splash.4bpp"); -const u32 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_small_splash.4bpp"); -const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/field_effects/pics/unknown_20.4bpp"); +const u32 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U32("graphics/field_effects/pics/jump_small_splash.4bpp"); +const u32 gFieldEffectObjectPic_WaterSurfacing[] = INCBIN_U32("graphics/field_effects/pics/water_surfacing.4bpp"); const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/field_effects/pics/tree_disguise.4bpp"); const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/field_effects/pics/mountain_disguise.4bpp"); const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/field_effects/pics/sand_disguise_placeholder.4bpp"); const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effects/pics/hot_springs_water.4bpp"); const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effects/palettes/02.gbapal"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/field_effects/pics/jump_out_of_ash.4bpp"); -const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/field_effects/pics/lavaridge_gym_warp.4bpp"); +const u32 gFieldEffectObjectPic_AshPuff[] = INCBIN_U32("graphics/field_effects/pics/ash_puff.4bpp"); +const u32 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U32("graphics/field_effects/pics/ash_launch.4bpp"); const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/field_effects/pics/bubbles.4bpp"); const u32 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U32("graphics/field_effects/pics/small_sparkle.4bpp"); const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effects/palettes/03.gbapal"); -- cgit v1.2.3 From abdf7cbf02442fb3d5cfe9945a8e093b273317a9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 29 Jun 2020 16:53:38 -0400 Subject: Label fishing effect functions --- src/data/items.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/data') diff --git a/src/data/items.h b/src/data/items.h index 4d262e683..30beb5352 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -3426,7 +3426,7 @@ const struct Item gItems[] = .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_Rod, - .secondaryId = 0, + .secondaryId = OLD_ROD, }, [ITEM_GOOD_ROD] = @@ -3440,7 +3440,7 @@ const struct Item gItems[] = .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_Rod, - .secondaryId = 1, + .secondaryId = GOOD_ROD, }, [ITEM_SUPER_ROD] = @@ -3454,7 +3454,7 @@ const struct Item gItems[] = .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_Rod, - .secondaryId = 2, + .secondaryId = SUPER_ROD, }, [ITEM_SS_TICKET] = -- cgit v1.2.3 From 1ce929157f6e6825b54ce39d73a41374534998c6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 2 Jul 2020 04:59:52 -0400 Subject: Clean up field effect doc --- .../field_effect_object_template_pointers.h | 8 +- src/data/field_effects/field_effect_objects.h | 95 +++++++++++----------- src/data/object_events/object_event_graphics.h | 14 ++-- 3 files changed, 58 insertions(+), 59 deletions(-) (limited to 'src/data') diff --git a/src/data/field_effects/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h index e455daf73..41d6271bf 100755 --- a/src/data/field_effects/field_effect_object_template_pointers.h +++ b/src/data/field_effects/field_effect_object_template_pointers.h @@ -15,9 +15,9 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Splash; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash; const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17; +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass; const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19; +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand; const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing; const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion; const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle; @@ -54,9 +54,9 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { [FLDEFFOBJ_JUMP_SMALL_SPLASH] = &gFieldEffectObjectTemplate_JumpSmallSplash, [FLDEFFOBJ_LONG_GRASS] = &gFieldEffectObjectTemplate_LongGrass, [FLDEFFOBJ_JUMP_LONG_GRASS] = &gFieldEffectObjectTemplate_JumpLongGrass, - [FLDEFFOBJ_17] = &gFieldEffectObjectTemplate_Unknown17, + [FLDEFFOBJ_UNUSED_GRASS] = &gFieldEffectObjectTemplate_UnusedGrass, [FLDEFFOBJ_UNUSED_GRASS_2] = &gFieldEffectObjectTemplate_UnusedGrass2, - [FLDEFFOBJ_19] = &gFieldEffectObjectTemplate_Unknown19, + [FLDEFFOBJ_UNUSED_SAND] = &gFieldEffectObjectTemplate_UnusedSand, [FLDEFFOBJ_WATER_SURFACING] = &gFieldEffectObjectTemplate_WaterSurfacing, [FLDEFFOBJ_REFLECTION_DISTORTION] = &gFieldEffectObjectTemplate_ReflectionDistortion, [FLDEFFOBJ_SPARKLE] = &gFieldEffectObjectTemplate_Sparkle, diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index 071beeecd..1626b9f32 100755 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -1,6 +1,5 @@ -const struct SpritePalette gFieldEffectObjectPaletteInfo0 = {gFieldEffectObjectPalette0, FLDEFF_PAL_TAG_4}; - -const struct SpritePalette gFieldEffectObjectPaletteInfo1 = {gFieldEffectObjectPalette1, FLDEFF_PAL_TAG_5}; +const struct SpritePalette gSpritePalette_GeneralFieldEffect0 = {gFieldEffectObjectPalette0, FLDEFF_PAL_TAG_GENERAL_0}; +const struct SpritePalette gSpritePalette_GeneralFieldEffect1 = {gFieldEffectObjectPalette1, FLDEFF_PAL_TAG_GENERAL_1}; static const union AnimCmd sAnim_Shadow[] = { @@ -94,7 +93,7 @@ static const union AnimCmd *const sAnimTable_TallGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_5, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_TallGrass, .images = sPicTable_TallGrass, @@ -130,7 +129,7 @@ static const union AnimCmd *const sAnimTable_Ripple[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_5, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_Ripple, .images = sPicTable_Ripple, @@ -163,7 +162,7 @@ static const union AnimCmd *const sAnimTable_Ash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_5, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_Ash, .images = sPicTable_Ash, @@ -297,7 +296,7 @@ static const union AnimCmd *const sAnimTable_GroundImpactDust[] = const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_4, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, .anims = sAnimTable_GroundImpactDust, .images = sPicTable_GroundImpactDust, @@ -328,7 +327,7 @@ static const union AnimCmd *const sAnimTable_JumpTallGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_5, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x8, .anims = sAnimTable_JumpTallGrass, .images = sPicTable_JumpTallGrass, @@ -376,7 +375,7 @@ static const union AnimCmd *const sAnimTable_SandFootprints[] = const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_4, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_SandFootprints, .images = sPicTable_SandFootprints, @@ -424,7 +423,7 @@ static const union AnimCmd *const sAnimTable_DeepSandFootprints[] = const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_4, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_DeepSandFootprints, .images = sPicTable_DeepSandFootprints, @@ -502,7 +501,7 @@ static const union AnimCmd *const sAnimTable_BikeTireTracks[] = const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_4, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_BikeTireTracks, .images = sPicTable_BikeTireTracks, @@ -533,7 +532,7 @@ static const union AnimCmd *const sAnimTable_JumpBigSplash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_4, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_JumpBigSplash, .images = sPicTable_JumpBigSplash, @@ -574,7 +573,7 @@ static const union AnimCmd *const sAnimTable_Splash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_4, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, .anims = sAnimTable_Splash, .images = sPicTable_Splash, @@ -603,7 +602,7 @@ static const union AnimCmd *const sAnimTable_JumpSmallSplash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_4, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, .anims = sAnimTable_JumpSmallSplash, .images = sPicTable_JumpSmallSplash, @@ -637,7 +636,7 @@ static const union AnimCmd *const sAnimTable_LongGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_5, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_LongGrass, .images = sPicTable_LongGrass, @@ -672,7 +671,7 @@ static const union AnimCmd *const sAnimTable_JumpLongGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_5, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_JumpLongGrass, .images = sPicTable_JumpLongGrass, @@ -680,7 +679,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = { .callback = UpdateJumpImpactEffect, }; -static const struct SpriteFrameImage sPicTable_Unknown17[] = { +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), @@ -692,7 +691,7 @@ static const struct SpriteFrameImage sPicTable_Unknown17[] = { overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 7), }; -static const union AnimCmd sAnim_Unknown17[] = +static const union AnimCmd sAnim_UnusedGrass[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(1, 4), @@ -706,17 +705,17 @@ static const union AnimCmd sAnim_Unknown17[] = ANIMCMD_JUMP(7), }; -static const union AnimCmd *const sAnimTable_Unknown17[] = +static const union AnimCmd *const sAnimTable_UnusedGrass[] = { - sAnim_Unknown17, + sAnim_UnusedGrass, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = { +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_5, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = sAnimTable_Unknown17, - .images = sPicTable_Unknown17, + .anims = sAnimTable_UnusedGrass, + .images = sPicTable_UnusedGrass, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; @@ -746,7 +745,7 @@ static const union AnimCmd *const sAnimTable_UnusedGrass2[] = const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_5, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_UnusedGrass2, .images = sPicTable_UnusedGrass2, @@ -754,14 +753,14 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 = { .callback = WaitFieldEffectSpriteAnim, }; -static const struct SpriteFrameImage sPicTable_Unknown19[] = { - overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 0), - overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 1), - overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 2), - overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 3), +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), + overworld_frame(gFieldEffectObjectPic_UnusedSand, 2, 2, 3), }; -static const union AnimCmd sAnim_Unknown19[] = +static const union AnimCmd sAnim_UnusedSand[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -770,17 +769,17 @@ static const union AnimCmd sAnim_Unknown19[] = ANIMCMD_JUMP(0), }; -static const union AnimCmd *const sAnimTable_Unknown19[] = +static const union AnimCmd *const sAnimTable_UnusedSand[] = { - sAnim_Unknown19, + sAnim_UnusedSand, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = { +const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_4, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = sAnimTable_Unknown19, - .images = sPicTable_Unknown19, + .anims = sAnimTable_UnusedSand, + .images = sPicTable_UnusedSand, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; @@ -806,7 +805,7 @@ static const union AnimCmd *const sAnimTable_SandPile[] = const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_4, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, .anims = sAnimTable_SandPile, .images = sPicTable_SandPile, @@ -839,7 +838,7 @@ static const union AnimCmd *const sAnimTable_WaterSurfacing[] = const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_4, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_WaterSurfacing, .images = sPicTable_WaterSurfacing, @@ -1092,7 +1091,7 @@ static const union AnimCmd *const sAnimTable_ShortGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_5, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_ShortGrass, .images = sPicTable_ShortGrass, @@ -1117,7 +1116,7 @@ static const union AnimCmd *const sAnimTable_HotSpringsWater[] = const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_5, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_HotSpringsWater, .images = sPicTable_HotSpringsWater, @@ -1151,7 +1150,7 @@ static const union AnimCmd *const sAnimTable_AshPuff[] = const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_13, + .paletteTag = FLDEFF_PAL_TAG_ASH, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_AshPuff, .images = sPicTable_AshPuff, @@ -1159,7 +1158,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff = .callback = SpriteCB_AshPuff }; -const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, FLDEFF_PAL_TAG_13}; +const struct SpritePalette gSpritePalette_Ash = {gFieldEffectPal_Ash, FLDEFF_PAL_TAG_ASH}; static const struct SpriteFrameImage sPicTable_AshLaunch[] = { overworld_frame(gFieldEffectObjectPic_AshLaunch, 2, 2, 0), @@ -1187,7 +1186,7 @@ static const union AnimCmd *const sAnimTable_AshLaunch[] = const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_13, + .paletteTag = FLDEFF_PAL_TAG_ASH, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_AshLaunch, .images = sPicTable_AshLaunch, @@ -1226,7 +1225,7 @@ static const union AnimCmd *const sAnimTable_Bubbles[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_4, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x32, .anims = sAnimTable_Bubbles, .images = sPicTable_Bubbles, @@ -1254,7 +1253,7 @@ static const union AnimCmd *const sAnimTable_SmallSparkle[] = const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = { .tileTag = 0xFFFF, - .paletteTag = FLDEFF_PAL_TAG_15, + .paletteTag = FLDEFF_PAL_TAG_SMALL_SPARKLE, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_SmallSparkle, .images = sPicTable_SmallSparkle, @@ -1262,7 +1261,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = { .callback = UpdateSparkleFieldEffect, }; -const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, FLDEFF_PAL_TAG_15}; +const struct SpritePalette gSpritePalette_SmallSparkle = {gFieldEffectPal_SmallSparkle, FLDEFF_PAL_TAG_SMALL_SPARKLE}; static const union AnimCmd sAnim_Rayquaza[] = { ANIMCMD_FRAME(0, 1), @@ -1287,4 +1286,4 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = { .callback = UpdateRayquazaSpotlightEffect, }; -const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gObjectEventPalette2, FLDEFF_PAL_TAG_17}; +static const struct SpritePalette sSpritePalette_Unused = {gObjectEventPalette2, FLDEFF_PAL_TAG_UNKNOWN}; diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 87c0fa8a3..50fc6715c 100755 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -293,15 +293,15 @@ const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/field_effec const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/field_effects/pics/shadow_medium.4bpp"); const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_large.4bpp"); const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_extra_large.4bpp"); -const u32 filler_8368A08[0x48] = {}; +static const u32 sFiller[0x48] = {}; const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/field_effects/pics/cut_grass.4bpp"); const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/field_effects/pics/cut_grass.4bpp"); -const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/field_effects/palettes/06.gbapal"); +const u16 gFieldEffectPal_CutGrass[] = INCBIN_U16("graphics/field_effects/palettes/cut_grass.gbapal"); const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/field_effects/pics/ripple.4bpp"); const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/field_effects/pics/ash.4bpp"); const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/field_effects/pics/arrow.4bpp"); -const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/00.gbapal"); -const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/01.gbapal"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/general_0.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/general_1.gbapal"); const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/field_effects/pics/ground_impact_dust.4bpp"); const u32 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U32("graphics/field_effects/pics/jump_tall_grass.4bpp"); const u32 gUnusedGrass3[] = INCBIN_U32("graphics/field_effects/pics/unused_grass_3.4bpp"); @@ -314,7 +314,7 @@ const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/field_effect const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/field_effects/pics/sand_footprints.4bpp"); const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/field_effects/pics/deep_sand_footprints.4bpp"); const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/field_effects/pics/bike_tire_tracks.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/field_effects/pics/unknown_19.4bpp"); +const u32 gFieldEffectObjectPic_UnusedSand[] = INCBIN_U32("graphics/field_effects/pics/unused_sand.4bpp"); const u32 gFieldEffectObjectPic_SandPile[] = INCBIN_U32("graphics/field_effects/pics/sand_pile.4bpp"); const u32 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U32("graphics/field_effects/pics/jump_big_splash.4bpp"); const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/field_effects/pics/splash.4bpp"); @@ -324,12 +324,12 @@ const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/field_effe const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/field_effects/pics/mountain_disguise.4bpp"); const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/field_effects/pics/sand_disguise_placeholder.4bpp"); const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effects/pics/hot_springs_water.4bpp"); -const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effects/palettes/02.gbapal"); +const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/field_effects/palettes/ash.gbapal"); const u32 gFieldEffectObjectPic_AshPuff[] = INCBIN_U32("graphics/field_effects/pics/ash_puff.4bpp"); const u32 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U32("graphics/field_effects/pics/ash_launch.4bpp"); const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/field_effects/pics/bubbles.4bpp"); const u32 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U32("graphics/field_effects/pics/small_sparkle.4bpp"); -const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effects/palettes/03.gbapal"); +const u16 gFieldEffectPal_SmallSparkle[] = INCBIN_U16("graphics/field_effects/palettes/small_sparkle.gbapal"); const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/field_effects/pics/bird.4bpp"); const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/juan.4bpp"); const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/object_events/pics/people/scott.4bpp"); -- cgit v1.2.3 From aba42513d3a33cec1d8e6cd199b07317b2eece87 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 16 Jul 2020 20:12:12 -0400 Subject: Clean up some battle scr cmd data --- src/data/text/nature_names.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/data') diff --git a/src/data/text/nature_names.h b/src/data/text/nature_names.h index d0d217d9b..601898445 100644 --- a/src/data/text/nature_names.h +++ b/src/data/text/nature_names.h @@ -24,7 +24,7 @@ static const u8 sSassyNatureName[] = _("SASSY"); static const u8 sCarefulNatureName[] = _("CAREFUL"); static const u8 sQuirkyNatureName[] = _("QUIRKY"); -const u8 *const gNatureNamePointers[] = +const u8 *const gNatureNamePointers[NUM_NATURES] = { [NATURE_HARDY] = sHardyNatureName, [NATURE_LONELY] = sLonelyNatureName, -- cgit v1.2.3 From 10c4debe316ac0ed9fcc9156b6ae8c1fcd7ddff1 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 19 Jul 2020 20:37:11 -0400 Subject: Back pic coordinates --- src/data/pokemon_graphics/back_pic_coordinates.h | 1760 +++++++++++----------- 1 file changed, 880 insertions(+), 880 deletions(-) (limited to 'src/data') diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 0a89f20c8..4987ccc99 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -2,2203 +2,2203 @@ const struct MonCoords gMonBackPicCoords[] = { [SPECIES_NONE] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_BULBASAUR] = { - .size = 0x64, - .y_offset = 0x10, + .size = 100, + .y_offset = 16, }, [SPECIES_IVYSAUR] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_VENUSAUR] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_CHARMANDER] = { - .size = 0x65, - .y_offset = 0x0e, + .size = 101, + .y_offset = 14, }, [SPECIES_CHARMELEON] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_CHARIZARD] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_SQUIRTLE] = { - .size = 0x65, - .y_offset = 0x0e, + .size = 101, + .y_offset = 14, }, [SPECIES_WARTORTLE] = { - .size = 0x76, - .y_offset = 0x0a, + .size = 118, + .y_offset = 10, }, [SPECIES_BLASTOISE] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_CATERPIE] = { - .size = 0x55, - .y_offset = 0x0f, + .size = 85, + .y_offset = 15, }, [SPECIES_METAPOD] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_BUTTERFREE] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_WEEDLE] = { - .size = 0x56, - .y_offset = 0x0b, + .size = 86, + .y_offset = 11, }, [SPECIES_KAKUNA] = { - .size = 0x46, - .y_offset = 0x0a, + .size = 70, + .y_offset = 10, }, [SPECIES_BEEDRILL] = { - .size = 0x86, - .y_offset = 0x09, + .size = 134, + .y_offset = 9, }, [SPECIES_PIDGEY] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_PIDGEOTTO] = { - .size = 0x85, - .y_offset = 0x0c, + .size = 133, + .y_offset = 12, }, [SPECIES_PIDGEOT] = { - .size = 0x78, - .y_offset = 0x02, + .size = 120, + .y_offset = 2, }, [SPECIES_RATTATA] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_RATICATE] = { - .size = 0x75, - .y_offset = 0x0d, + .size = 117, + .y_offset = 13, }, [SPECIES_SPEAROW] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_FEAROW] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_EKANS] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_ARBOK] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_PIKACHU] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_RAICHU] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_SANDSHREW] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_SANDSLASH] = { - .size = 0x86, - .y_offset = 0x09, + .size = 134, + .y_offset = 9, }, [SPECIES_NIDORAN_F] = { - .size = 0x55, - .y_offset = 0x0c, + .size = 85, + .y_offset = 12, }, [SPECIES_NIDORINA] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_NIDOQUEEN] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_NIDORAN_M] = { - .size = 0x56, - .y_offset = 0x08, + .size = 86, + .y_offset = 8, }, [SPECIES_NIDORINO] = { - .size = 0x86, - .y_offset = 0x09, + .size = 134, + .y_offset = 9, }, [SPECIES_NIDOKING] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_CLEFAIRY] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_CLEFABLE] = { - .size = 0x76, - .y_offset = 0x0a, + .size = 118, + .y_offset = 10, }, [SPECIES_VULPIX] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_NINETALES] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_JIGGLYPUFF] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_WIGGLYTUFF] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_ZUBAT] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_GOLBAT] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_ODDISH] = { - .size = 0x56, - .y_offset = 0x0b, + .size = 86, + .y_offset = 11, }, [SPECIES_GLOOM] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_VILEPLUME] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_PARAS] = { - .size = 0x63, - .y_offset = 0x14, + .size = 99, + .y_offset = 20, }, [SPECIES_PARASECT] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_VENONAT] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_VENOMOTH] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_DIGLETT] = { - .size = 0x54, - .y_offset = 0x10, + .size = 84, + .y_offset = 16, }, [SPECIES_DUGTRIO] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_MEOWTH] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_PERSIAN] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_PSYDUCK] = { - .size = 0x67, - .y_offset = 0x07, + .size = 103, + .y_offset = 7, }, [SPECIES_GOLDUCK] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_MANKEY] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_PRIMEAPE] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_GROWLITHE] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_ARCANINE] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_POLIWAG] = { - .size = 0x74, - .y_offset = 0x10, + .size = 116, + .y_offset = 16, }, [SPECIES_POLIWHIRL] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_POLIWRATH] = { - .size = 0x86, - .y_offset = 0x0b, + .size = 134, + .y_offset = 11, }, [SPECIES_ABRA] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_KADABRA] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_ALAKAZAM] = { - .size = 0x67, - .y_offset = 0x05, + .size = 103, + .y_offset = 5, }, [SPECIES_MACHOP] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_MACHOKE] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_MACHAMP] = { - .size = 0x67, - .y_offset = 0x04, + .size = 103, + .y_offset = 4, }, [SPECIES_BELLSPROUT] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_WEEPINBELL] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_VICTREEBEL] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_TENTACOOL] = { - .size = 0x56, - .y_offset = 0x0a, + .size = 86, + .y_offset = 10, }, [SPECIES_TENTACRUEL] = { - .size = 0x86, - .y_offset = 0x0b, + .size = 134, + .y_offset = 11, }, [SPECIES_GEODUDE] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_GRAVELER] = { - .size = 0x75, - .y_offset = 0x0c, + .size = 117, + .y_offset = 12, }, [SPECIES_GOLEM] = { - .size = 0x84, - .y_offset = 0x10, + .size = 132, + .y_offset = 16, }, [SPECIES_PONYTA] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_RAPIDASH] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_SLOWPOKE] = { - .size = 0x85, - .y_offset = 0x0e, + .size = 133, + .y_offset = 14, }, [SPECIES_SLOWBRO] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_MAGNEMITE] = { - .size = 0x43, - .y_offset = 0x14, + .size = 67, + .y_offset = 20, }, [SPECIES_MAGNETON] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_FARFETCHD] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_DODUO] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_DODRIO] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_SEEL] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_DEWGONG] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_GRIMER] = { - .size = 0x75, - .y_offset = 0x0c, + .size = 117, + .y_offset = 12, }, [SPECIES_MUK] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_SHELLDER] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_CLOYSTER] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_GASTLY] = { - .size = 0x85, - .y_offset = 0x0e, + .size = 133, + .y_offset = 14, }, [SPECIES_HAUNTER] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_GENGAR] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_ONIX] = { - .size = 0x78, - .y_offset = 0x00, + .size = 120, + .y_offset = 0, }, [SPECIES_DROWZEE] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_HYPNO] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_KRABBY] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_KINGLER] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_VOLTORB] = { - .size = 0x55, - .y_offset = 0x0e, + .size = 85, + .y_offset = 14, }, [SPECIES_ELECTRODE] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_EXEGGCUTE] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_EXEGGUTOR] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_CUBONE] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_MAROWAK] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_HITMONLEE] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_HITMONCHAN] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_LICKITUNG] = { - .size = 0x65, - .y_offset = 0x0e, + .size = 101, + .y_offset = 14, }, [SPECIES_KOFFING] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_WEEZING] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_RHYHORN] = { - .size = 0x85, - .y_offset = 0x0c, + .size = 133, + .y_offset = 12, }, [SPECIES_RHYDON] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_CHANSEY] = { - .size = 0x86, - .y_offset = 0x0b, + .size = 134, + .y_offset = 11, }, [SPECIES_TANGELA] = { - .size = 0x85, - .y_offset = 0x0e, + .size = 133, + .y_offset = 14, }, [SPECIES_KANGASKHAN] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_HORSEA] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_SEADRA] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_GOLDEEN] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_SEAKING] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_STARYU] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_STARMIE] = { - .size = 0x85, - .y_offset = 0x0e, + .size = 133, + .y_offset = 14, }, [SPECIES_MR_MIME] = { - .size = 0x85, - .y_offset = 0x0d, + .size = 133, + .y_offset = 13, }, [SPECIES_SCYTHER] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_JYNX] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_ELECTABUZZ] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_MAGMAR] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_PINSIR] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_TAUROS] = { - .size = 0x85, - .y_offset = 0x0d, + .size = 133, + .y_offset = 13, }, [SPECIES_MAGIKARP] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_GYARADOS] = { - .size = 0x78, - .y_offset = 0x00, + .size = 120, + .y_offset = 0, }, [SPECIES_LAPRAS] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_DITTO] = { - .size = 0x54, - .y_offset = 0x11, + .size = 84, + .y_offset = 17, }, [SPECIES_EEVEE] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_VAPOREON] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_JOLTEON] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_FLAREON] = { - .size = 0x67, - .y_offset = 0x05, + .size = 103, + .y_offset = 5, }, [SPECIES_PORYGON] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_OMANYTE] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_OMASTAR] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_KABUTO] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_KABUTOPS] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_AERODACTYL] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_SNORLAX] = { - .size = 0x86, - .y_offset = 0x0b, + .size = 134, + .y_offset = 11, }, [SPECIES_ARTICUNO] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_ZAPDOS] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_MOLTRES] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_DRATINI] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_DRAGONAIR] = { - .size = 0x78, - .y_offset = 0x00, + .size = 120, + .y_offset = 0, }, [SPECIES_DRAGONITE] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_MEWTWO] = { - .size = 0x78, - .y_offset = 0x01, + .size = 120, + .y_offset = 1, }, [SPECIES_MEW] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_CHIKORITA] = { - .size = 0x56, - .y_offset = 0x0a, + .size = 86, + .y_offset = 10, }, [SPECIES_BAYLEEF] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_MEGANIUM] = { - .size = 0x78, - .y_offset = 0x00, + .size = 120, + .y_offset = 0, }, [SPECIES_CYNDAQUIL] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_QUILAVA] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_TYPHLOSION] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_TOTODILE] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_CROCONAW] = { - .size = 0x67, - .y_offset = 0x07, + .size = 103, + .y_offset = 7, }, [SPECIES_FERALIGATR] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_SENTRET] = { - .size = 0x67, - .y_offset = 0x05, + .size = 103, + .y_offset = 5, }, [SPECIES_FURRET] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_HOOTHOOT] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_NOCTOWL] = { - .size = 0x68, - .y_offset = 0x03, + .size = 104, + .y_offset = 3, }, [SPECIES_LEDYBA] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_LEDIAN] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_SPINARAK] = { - .size = 0x73, - .y_offset = 0x15, + .size = 115, + .y_offset = 21, }, [SPECIES_ARIADOS] = { - .size = 0x86, - .y_offset = 0x0b, + .size = 134, + .y_offset = 11, }, [SPECIES_CROBAT] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_CHINCHOU] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_LANTURN] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_PICHU] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_CLEFFA] = { - .size = 0x65, - .y_offset = 0x0f, + .size = 101, + .y_offset = 15, }, [SPECIES_IGGLYBUFF] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_TOGEPI] = { - .size = 0x54, - .y_offset = 0x10, + .size = 84, + .y_offset = 16, }, [SPECIES_TOGETIC] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_NATU] = { - .size = 0x54, - .y_offset = 0x11, + .size = 84, + .y_offset = 17, }, [SPECIES_XATU] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_MAREEP] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_FLAAFFY] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_AMPHAROS] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_BELLOSSOM] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_MARILL] = { - .size = 0x75, - .y_offset = 0x0c, + .size = 117, + .y_offset = 12, }, [SPECIES_AZUMARILL] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_SUDOWOODO] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_POLITOED] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_HOPPIP] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_SKIPLOOM] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_JUMPLUFF] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_AIPOM] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_SUNKERN] = { - .size = 0x56, - .y_offset = 0x0a, + .size = 86, + .y_offset = 10, }, [SPECIES_SUNFLORA] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_YANMA] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_WOOPER] = { - .size = 0x85, - .y_offset = 0x0f, + .size = 133, + .y_offset = 15, }, [SPECIES_QUAGSIRE] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_ESPEON] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_UMBREON] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_MURKROW] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_SLOWKING] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_MISDREAVUS] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_UNOWN] = { - .size = 0x36, - .y_offset = 0x08, + .size = 54, + .y_offset = 8, }, [SPECIES_WOBBUFFET] = { - .size = 0x75, - .y_offset = 0x0c, + .size = 117, + .y_offset = 12, }, [SPECIES_GIRAFARIG] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_PINECO] = { - .size = 0x65, - .y_offset = 0x0f, + .size = 101, + .y_offset = 15, }, [SPECIES_FORRETRESS] = { - .size = 0x84, - .y_offset = 0x10, + .size = 132, + .y_offset = 16, }, [SPECIES_DUNSPARCE] = { - .size = 0x85, - .y_offset = 0x0f, + .size = 133, + .y_offset = 15, }, [SPECIES_GLIGAR] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_STEELIX] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_SNUBBULL] = { - .size = 0x76, - .y_offset = 0x0a, + .size = 118, + .y_offset = 10, }, [SPECIES_GRANBULL] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_QWILFISH] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_SCIZOR] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_SHUCKLE] = { - .size = 0x56, - .y_offset = 0x0b, + .size = 86, + .y_offset = 11, }, [SPECIES_HERACROSS] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_SNEASEL] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_TEDDIURSA] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_URSARING] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_SLUGMA] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_MAGCARGO] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_SWINUB] = { - .size = 0x63, - .y_offset = 0x15, + .size = 99, + .y_offset = 21, }, [SPECIES_PILOSWINE] = { - .size = 0x75, - .y_offset = 0x0d, + .size = 117, + .y_offset = 13, }, [SPECIES_CORSOLA] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_REMORAID] = { - .size = 0x75, - .y_offset = 0x0d, + .size = 117, + .y_offset = 13, }, [SPECIES_OCTILLERY] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_DELIBIRD] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_MANTINE] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_SKARMORY] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_HOUNDOUR] = { - .size = 0x55, - .y_offset = 0x0c, + .size = 85, + .y_offset = 12, }, [SPECIES_HOUNDOOM] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_KINGDRA] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_PHANPY] = { - .size = 0x65, - .y_offset = 0x0e, + .size = 101, + .y_offset = 14, }, [SPECIES_DONPHAN] = { - .size = 0x85, - .y_offset = 0x0d, + .size = 133, + .y_offset = 13, }, [SPECIES_PORYGON2] = { - .size = 0x76, - .y_offset = 0x0a, + .size = 118, + .y_offset = 10, }, [SPECIES_STANTLER] = { - .size = 0x78, - .y_offset = 0x03, + .size = 120, + .y_offset = 3, }, [SPECIES_SMEARGLE] = { - .size = 0x76, - .y_offset = 0x0a, + .size = 118, + .y_offset = 10, }, [SPECIES_TYROGUE] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_HITMONTOP] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_SMOOCHUM] = { - .size = 0x56, - .y_offset = 0x09, + .size = 86, + .y_offset = 9, }, [SPECIES_ELEKID] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_MAGBY] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_MILTANK] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_BLISSEY] = { - .size = 0x85, - .y_offset = 0x0d, + .size = 133, + .y_offset = 13, }, [SPECIES_RAIKOU] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_ENTEI] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_SUICUNE] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_LARVITAR] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_PUPITAR] = { - .size = 0x67, - .y_offset = 0x05, + .size = 103, + .y_offset = 5, }, [SPECIES_TYRANITAR] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_LUGIA] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_HO_OH] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_CELEBI] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_OLD_UNOWN_B] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_C] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_D] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_E] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_F] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_G] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_H] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_I] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_J] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_K] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_L] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_M] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_N] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_O] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_P] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_Q] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_R] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_S] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_T] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_U] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_V] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_W] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_X] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_Y] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_OLD_UNOWN_Z] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_TREECKO] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_GROVYLE] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_SCEPTILE] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_TORCHIC] = { - .size = 0x67, - .y_offset = 0x05, + .size = 103, + .y_offset = 5, }, [SPECIES_COMBUSKEN] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_BLAZIKEN] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_MUDKIP] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_MARSHTOMP] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_SWAMPERT] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_POOCHYENA] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_MIGHTYENA] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_ZIGZAGOON] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_LINOONE] = { - .size = 0x85, - .y_offset = 0x0f, + .size = 133, + .y_offset = 15, }, [SPECIES_WURMPLE] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_SILCOON] = { - .size = 0x83, - .y_offset = 0x15, + .size = 131, + .y_offset = 21, }, [SPECIES_BEAUTIFLY] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_CASCOON] = { - .size = 0x73, - .y_offset = 0x14, + .size = 115, + .y_offset = 20, }, [SPECIES_DUSTOX] = { - .size = 0x83, - .y_offset = 0x14, + .size = 131, + .y_offset = 20, }, [SPECIES_LOTAD] = { - .size = 0x75, - .y_offset = 0x0f, + .size = 117, + .y_offset = 15, }, [SPECIES_LOMBRE] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_LUDICOLO] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_SEEDOT] = { - .size = 0x86, - .y_offset = 0x09, + .size = 134, + .y_offset = 9, }, [SPECIES_NUZLEAF] = { - .size = 0x76, - .y_offset = 0x0a, + .size = 118, + .y_offset = 10, }, [SPECIES_SHIFTRY] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_NINCADA] = { - .size = 0x83, - .y_offset = 0x14, + .size = 131, + .y_offset = 20, }, [SPECIES_NINJASK] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_SHEDINJA] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_TAILLOW] = { - .size = 0x64, - .y_offset = 0x11, + .size = 100, + .y_offset = 17, }, [SPECIES_SWELLOW] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_SHROOMISH] = { - .size = 0x85, - .y_offset = 0x0d, + .size = 133, + .y_offset = 13, }, [SPECIES_BRELOOM] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_SPINDA] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_WINGULL] = { - .size = 0x85, - .y_offset = 0x0e, + .size = 133, + .y_offset = 14, }, [SPECIES_PELIPPER] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_SURSKIT] = { - .size = 0x86, - .y_offset = 0x0b, + .size = 134, + .y_offset = 11, }, [SPECIES_MASQUERAIN] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_WAILMER] = { - .size = 0x83, - .y_offset = 0x15, + .size = 131, + .y_offset = 21, }, [SPECIES_WAILORD] = { - .size = 0x83, - .y_offset = 0x16, + .size = 131, + .y_offset = 22, }, [SPECIES_SKITTY] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_DELCATTY] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_KECLEON] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_BALTOY] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_CLAYDOL] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_NOSEPASS] = { - .size = 0x85, - .y_offset = 0x0c, + .size = 133, + .y_offset = 12, }, [SPECIES_TORKOAL] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_SABLEYE] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_BARBOACH] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_WHISCASH] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_LUVDISC] = { - .size = 0x46, - .y_offset = 0x0a, + .size = 70, + .y_offset = 10, }, [SPECIES_CORPHISH] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_CRAWDAUNT] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_FEEBAS] = { - .size = 0x67, - .y_offset = 0x07, + .size = 103, + .y_offset = 7, }, [SPECIES_MILOTIC] = { - .size = 0x68, - .y_offset = 0x02, + .size = 104, + .y_offset = 2, }, [SPECIES_CARVANHA] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_SHARPEDO] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_TRAPINCH] = { - .size = 0x75, - .y_offset = 0x0e, + .size = 117, + .y_offset = 14, }, [SPECIES_VIBRAVA] = { - .size = 0x74, - .y_offset = 0x11, + .size = 116, + .y_offset = 17, }, [SPECIES_FLYGON] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_MAKUHITA] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_HARIYAMA] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_ELECTRIKE] = { - .size = 0x84, - .y_offset = 0x10, + .size = 132, + .y_offset = 16, }, [SPECIES_MANECTRIC] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_NUMEL] = { - .size = 0x86, - .y_offset = 0x0b, + .size = 134, + .y_offset = 11, }, [SPECIES_CAMERUPT] = { - .size = 0x84, - .y_offset = 0x13, + .size = 132, + .y_offset = 19, }, [SPECIES_SPHEAL] = { - .size = 0x64, - .y_offset = 0x12, + .size = 100, + .y_offset = 18, }, [SPECIES_SEALEO] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_WALREIN] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_CACNEA] = { - .size = 0x85, - .y_offset = 0x0f, + .size = 133, + .y_offset = 15, }, [SPECIES_CACTURNE] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_SNORUNT] = { - .size = 0x76, - .y_offset = 0x0a, + .size = 118, + .y_offset = 10, }, [SPECIES_GLALIE] = { - .size = 0x85, - .y_offset = 0x0c, + .size = 133, + .y_offset = 12, }, [SPECIES_LUNATONE] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_SOLROCK] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_AZURILL] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_SPOINK] = { - .size = 0x56, - .y_offset = 0x0b, + .size = 86, + .y_offset = 11, }, [SPECIES_GRUMPIG] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_PLUSLE] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_MINUN] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_MAWILE] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_MEDITITE] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_MEDICHAM] = { - .size = 0x68, - .y_offset = 0x03, + .size = 104, + .y_offset = 3, }, [SPECIES_SWABLU] = { - .size = 0x86, - .y_offset = 0x09, + .size = 134, + .y_offset = 9, }, [SPECIES_ALTARIA] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_WYNAUT] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_DUSKULL] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_DUSCLOPS] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_ROSELIA] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_SLAKOTH] = { - .size = 0x85, - .y_offset = 0x0f, + .size = 133, + .y_offset = 15, }, [SPECIES_VIGOROTH] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_SLAKING] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_GULPIN] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_SWALOT] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_TROPIUS] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_WHISMUR] = { - .size = 0x85, - .y_offset = 0x0d, + .size = 133, + .y_offset = 13, }, [SPECIES_LOUDRED] = { - .size = 0x86, - .y_offset = 0x09, + .size = 134, + .y_offset = 9, }, [SPECIES_EXPLOUD] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_CLAMPERL] = { - .size = 0x85, - .y_offset = 0x0d, + .size = 133, + .y_offset = 13, }, [SPECIES_HUNTAIL] = { - .size = 0x68, - .y_offset = 0x02, + .size = 104, + .y_offset = 2, }, [SPECIES_GOREBYSS] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_ABSOL] = { - .size = 0x78, - .y_offset = 0x03, + .size = 120, + .y_offset = 3, }, [SPECIES_SHUPPET] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_BANETTE] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_SEVIPER] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_ZANGOOSE] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_RELICANTH] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_ARON] = { - .size = 0x54, - .y_offset = 0x11, + .size = 84, + .y_offset = 17, }, [SPECIES_LAIRON] = { - .size = 0x84, - .y_offset = 0x11, + .size = 132, + .y_offset = 17, }, [SPECIES_AGGRON] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_CASTFORM] = { - .size = 0x45, - .y_offset = 0x0d, + .size = 69, + .y_offset = 13, }, [SPECIES_VOLBEAT] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_ILLUMISE] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_LILEEP] = { - .size = 0x86, - .y_offset = 0x09, + .size = 134, + .y_offset = 9, }, [SPECIES_CRADILY] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_ANORITH] = { - .size = 0x83, - .y_offset = 0x17, + .size = 131, + .y_offset = 23, }, [SPECIES_ARMALDO] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_RALTS] = { - .size = 0x45, - .y_offset = 0x0d, + .size = 69, + .y_offset = 13, }, [SPECIES_KIRLIA] = { - .size = 0x57, - .y_offset = 0x06, + .size = 87, + .y_offset = 6, }, [SPECIES_GARDEVOIR] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_BAGON] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_SHELGON] = { - .size = 0x85, - .y_offset = 0x0d, + .size = 133, + .y_offset = 13, }, [SPECIES_SALAMENCE] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_BELDUM] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_METANG] = { - .size = 0x84, - .y_offset = 0x10, + .size = 132, + .y_offset = 16, }, [SPECIES_METAGROSS] = { - .size = 0x83, - .y_offset = 0x14, + .size = 131, + .y_offset = 20, }, [SPECIES_REGIROCK] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_REGICE] = { - .size = 0x85, - .y_offset = 0x0e, + .size = 133, + .y_offset = 14, }, [SPECIES_REGISTEEL] = { - .size = 0x85, - .y_offset = 0x0e, + .size = 133, + .y_offset = 14, }, [SPECIES_KYOGRE] = { - .size = 0x84, - .y_offset = 0x13, + .size = 132, + .y_offset = 19, }, [SPECIES_GROUDON] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_RAYQUAZA] = { - .size = 0x78, - .y_offset = 0x00, + .size = 120, + .y_offset = 0, }, [SPECIES_LATIAS] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_LATIOS] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_JIRACHI] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_DEOXYS] = { - .size = 0x86, - .y_offset = 0x09, + .size = 134, + .y_offset = 9, }, [SPECIES_CHIMECHO] = { - .size = 0x47, - .y_offset = 0x07, + .size = 71, + .y_offset = 7, }, [SPECIES_EGG] = { - .size = 0x36, - .y_offset = 0x0a, + .size = 54, + .y_offset = 10, }, [SPECIES_UNOWN_B] = { - .size = 0x56, - .y_offset = 0x09, + .size = 86, + .y_offset = 9, }, [SPECIES_UNOWN_C] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_UNOWN_D] = { - .size = 0x56, - .y_offset = 0x08, + .size = 86, + .y_offset = 8, }, [SPECIES_UNOWN_E] = { - .size = 0x56, - .y_offset = 0x0a, + .size = 86, + .y_offset = 10, }, [SPECIES_UNOWN_F] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_UNOWN_G] = { - .size = 0x57, - .y_offset = 0x05, + .size = 87, + .y_offset = 5, }, [SPECIES_UNOWN_H] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_UNOWN_I] = { - .size = 0x37, - .y_offset = 0x07, + .size = 55, + .y_offset = 7, }, [SPECIES_UNOWN_J] = { - .size = 0x46, - .y_offset = 0x09, + .size = 70, + .y_offset = 9, }, [SPECIES_UNOWN_K] = { - .size = 0x57, - .y_offset = 0x07, + .size = 87, + .y_offset = 7, }, [SPECIES_UNOWN_L] = { - .size = 0x46, - .y_offset = 0x0a, + .size = 70, + .y_offset = 10, }, [SPECIES_UNOWN_M] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_UNOWN_N] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_UNOWN_O] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_UNOWN_P] = { - .size = 0x46, - .y_offset = 0x0a, + .size = 70, + .y_offset = 10, }, [SPECIES_UNOWN_Q] = { - .size = 0x55, - .y_offset = 0x0f, + .size = 85, + .y_offset = 15, }, [SPECIES_UNOWN_R] = { - .size = 0x45, - .y_offset = 0x0c, + .size = 69, + .y_offset = 12, }, [SPECIES_UNOWN_S] = { - .size = 0x57, - .y_offset = 0x04, + .size = 87, + .y_offset = 4, }, [SPECIES_UNOWN_T] = { - .size = 0x45, - .y_offset = 0x0d, + .size = 69, + .y_offset = 13, }, [SPECIES_UNOWN_U] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_UNOWN_V] = { - .size = 0x56, - .y_offset = 0x0b, + .size = 86, + .y_offset = 11, }, [SPECIES_UNOWN_W] = { - .size = 0x55, - .y_offset = 0x0d, + .size = 85, + .y_offset = 13, }, [SPECIES_UNOWN_X] = { - .size = 0x55, - .y_offset = 0x0f, + .size = 85, + .y_offset = 15, }, [SPECIES_UNOWN_Y] = { - .size = 0x46, - .y_offset = 0x0a, + .size = 70, + .y_offset = 10, }, [SPECIES_UNOWN_Z] = { - .size = 0x46, - .y_offset = 0x0a, + .size = 70, + .y_offset = 10, }, [SPECIES_UNOWN_EMARK] = { - .size = 0x37, - .y_offset = 0x06, + .size = 55, + .y_offset = 6, }, [SPECIES_UNOWN_QMARK] = { - .size = 0x47, - .y_offset = 0x06, + .size = 71, + .y_offset = 6, }, }; -- cgit v1.2.3 From 49ee0fd95327361df04336db983c8d90eca3b022 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 19 Jul 2020 20:54:12 -0400 Subject: Front pic coordinates. --- src/data/pokemon_graphics/front_pic_coordinates.h | 1760 ++++++++++----------- 1 file changed, 880 insertions(+), 880 deletions(-) (limited to 'src/data') diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 19de9a7dd..cb331fb39 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -2,2202 +2,2202 @@ const struct MonCoords gMonFrontPicCoords[] = { [SPECIES_NONE] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_BULBASAUR] = { - .size = 0x45, - .y_offset = 0x0e, + .size = 69, + .y_offset = 14, }, [SPECIES_IVYSAUR] = { - .size = 0x56, - .y_offset = 0x0a, + .size = 86, + .y_offset = 10, }, [SPECIES_VENUSAUR] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_CHARMANDER] = { - .size = 0x55, - .y_offset = 0x0c, + .size = 85, + .y_offset = 12, }, [SPECIES_CHARMELEON] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_CHARIZARD] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_SQUIRTLE] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_WARTORTLE] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_BLASTOISE] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_CATERPIE] = { - .size = 0x45, - .y_offset = 0x10, + .size = 69, + .y_offset = 16, }, [SPECIES_METAPOD] = { - .size = 0x54, - .y_offset = 0x14, + .size = 84, + .y_offset = 20, }, [SPECIES_BUTTERFREE] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_WEEDLE] = { - .size = 0x54, - .y_offset = 0x12, + .size = 84, + .y_offset = 18, }, [SPECIES_KAKUNA] = { - .size = 0x45, - .y_offset = 0x0e, + .size = 69, + .y_offset = 14, }, [SPECIES_BEEDRILL] = { - .size = 0x86, - .y_offset = 0x09, + .size = 134, + .y_offset = 9, }, [SPECIES_PIDGEY] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_PIDGEOTTO] = { - .size = 0x67, - .y_offset = 0x0b, + .size = 103, + .y_offset = 11, }, [SPECIES_PIDGEOT] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_RATTATA] = { - .size = 0x44, - .y_offset = 0x10, + .size = 68, + .y_offset = 16, }, [SPECIES_RATICATE] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_SPEAROW] = { - .size = 0x45, - .y_offset = 0x0f, + .size = 69, + .y_offset = 15, }, [SPECIES_FEAROW] = { - .size = 0x78, - .y_offset = 0x00, + .size = 120, + .y_offset = 0, }, [SPECIES_EKANS] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_ARBOK] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_PIKACHU] = { - .size = 0x67, - .y_offset = 0x09, + .size = 103, + .y_offset = 9, }, [SPECIES_RAICHU] = { - .size = 0x67, - .y_offset = 0x04, + .size = 103, + .y_offset = 4, }, [SPECIES_SANDSHREW] = { - .size = 0x55, - .y_offset = 0x0e, + .size = 85, + .y_offset = 14, }, [SPECIES_SANDSLASH] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_NIDORAN_F] = { - .size = 0x45, - .y_offset = 0x0f, + .size = 69, + .y_offset = 15, }, [SPECIES_NIDORINA] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_NIDOQUEEN] = { - .size = 0x78, - .y_offset = 0x03, + .size = 120, + .y_offset = 3, }, [SPECIES_NIDORAN_M] = { - .size = 0x55, - .y_offset = 0x0c, + .size = 85, + .y_offset = 12, }, [SPECIES_NIDORINO] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_NIDOKING] = { - .size = 0x78, - .y_offset = 0x02, + .size = 120, + .y_offset = 2, }, [SPECIES_CLEFAIRY] = { - .size = 0x55, - .y_offset = 0x10, + .size = 85, + .y_offset = 16, }, [SPECIES_CLEFABLE] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_VULPIX] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_NINETALES] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_JIGGLYPUFF] = { - .size = 0x45, - .y_offset = 0x10, + .size = 69, + .y_offset = 16, }, [SPECIES_WIGGLYTUFF] = { - .size = 0x67, - .y_offset = 0x08, + .size = 103, + .y_offset = 8, }, [SPECIES_ZUBAT] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_GOLBAT] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_ODDISH] = { - .size = 0x45, - .y_offset = 0x0f, + .size = 69, + .y_offset = 15, }, [SPECIES_GLOOM] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_VILEPLUME] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_PARAS] = { - .size = 0x55, - .y_offset = 0x0f, + .size = 85, + .y_offset = 15, }, [SPECIES_PARASECT] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_VENONAT] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_VENOMOTH] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_DIGLETT] = { - .size = 0x54, - .y_offset = 0x12, + .size = 84, + .y_offset = 18, }, [SPECIES_DUGTRIO] = { - .size = 0x75, - .y_offset = 0x0d, + .size = 117, + .y_offset = 13, }, [SPECIES_MEOWTH] = { - .size = 0x55, - .y_offset = 0x0c, + .size = 85, + .y_offset = 12, }, [SPECIES_PERSIAN] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_PSYDUCK] = { - .size = 0x56, - .y_offset = 0x09, + .size = 86, + .y_offset = 9, }, [SPECIES_GOLDUCK] = { - .size = 0x78, - .y_offset = 0x02, + .size = 120, + .y_offset = 2, }, [SPECIES_MANKEY] = { - .size = 0x65, - .y_offset = 0x0e, + .size = 101, + .y_offset = 14, }, [SPECIES_PRIMEAPE] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_GROWLITHE] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_ARCANINE] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_POLIWAG] = { - .size = 0x74, - .y_offset = 0x13, + .size = 116, + .y_offset = 19, }, [SPECIES_POLIWHIRL] = { - .size = 0x76, - .y_offset = 0x0a, + .size = 118, + .y_offset = 10, }, [SPECIES_POLIWRATH] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_ABRA] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_KADABRA] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_ALAKAZAM] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_MACHOP] = { - .size = 0x56, - .y_offset = 0x0b, + .size = 86, + .y_offset = 11, }, [SPECIES_MACHOKE] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_MACHAMP] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_BELLSPROUT] = { - .size = 0x65, - .y_offset = 0x0f, + .size = 101, + .y_offset = 15, }, [SPECIES_WEEPINBELL] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_VICTREEBEL] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_TENTACOOL] = { - .size = 0x46, - .y_offset = 0x09, + .size = 70, + .y_offset = 9, }, [SPECIES_TENTACRUEL] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_GEODUDE] = { - .size = 0x54, - .y_offset = 0x12, + .size = 84, + .y_offset = 18, }, [SPECIES_GRAVELER] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_GOLEM] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_PONYTA] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_RAPIDASH] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_SLOWPOKE] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_SLOWBRO] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_MAGNEMITE] = { - .size = 0x43, - .y_offset = 0x15, + .size = 67, + .y_offset = 21, }, [SPECIES_MAGNETON] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_FARFETCHD] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_DODUO] = { - .size = 0x57, - .y_offset = 0x05, + .size = 87, + .y_offset = 5, }, [SPECIES_DODRIO] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_SEEL] = { - .size = 0x76, - .y_offset = 0x0a, + .size = 118, + .y_offset = 10, }, [SPECIES_DEWGONG] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_GRIMER] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_MUK] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_SHELLDER] = { - .size = 0x55, - .y_offset = 0x10, + .size = 85, + .y_offset = 16, }, [SPECIES_CLOYSTER] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_GASTLY] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_HAUNTER] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_GENGAR] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_ONIX] = { - .size = 0x78, - .y_offset = 0x02, + .size = 120, + .y_offset = 2, }, [SPECIES_DROWZEE] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_HYPNO] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_KRABBY] = { - .size = 0x65, - .y_offset = 0x0d, + .size = 101, + .y_offset = 13, }, [SPECIES_KINGLER] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_VOLTORB] = { - .size = 0x44, - .y_offset = 0x13, + .size = 68, + .y_offset = 19, }, [SPECIES_ELECTRODE] = { - .size = 0x55, - .y_offset = 0x0e, + .size = 85, + .y_offset = 14, }, [SPECIES_EXEGGCUTE] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_EXEGGUTOR] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_CUBONE] = { - .size = 0x55, - .y_offset = 0x0f, + .size = 85, + .y_offset = 15, }, [SPECIES_MAROWAK] = { - .size = 0x76, - .y_offset = 0x0b, + .size = 118, + .y_offset = 11, }, [SPECIES_HITMONLEE] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_HITMONCHAN] = { - .size = 0x67, - .y_offset = 0x04, + .size = 103, + .y_offset = 4, }, [SPECIES_LICKITUNG] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_KOFFING] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_WEEZING] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_RHYHORN] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_RHYDON] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_CHANSEY] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_TANGELA] = { - .size = 0x67, - .y_offset = 0x07, + .size = 103, + .y_offset = 7, }, [SPECIES_KANGASKHAN] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_HORSEA] = { - .size = 0x45, - .y_offset = 0x0f, + .size = 69, + .y_offset = 15, }, [SPECIES_SEADRA] = { - .size = 0x67, - .y_offset = 0x07, + .size = 103, + .y_offset = 7, }, [SPECIES_GOLDEEN] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_SEAKING] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_STARYU] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_STARMIE] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_MR_MIME] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_SCYTHER] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_JYNX] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_ELECTABUZZ] = { - .size = 0x78, - .y_offset = 0x02, + .size = 120, + .y_offset = 2, }, [SPECIES_MAGMAR] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_PINSIR] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_TAUROS] = { - .size = 0x78, - .y_offset = 0x00, + .size = 120, + .y_offset = 0, }, [SPECIES_MAGIKARP] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_GYARADOS] = { - .size = 0x88, - .y_offset = 0x08, + .size = 136, + .y_offset = 8, }, [SPECIES_LAPRAS] = { - .size = 0x85, - .y_offset = 0x0d, + .size = 133, + .y_offset = 13, }, [SPECIES_DITTO] = { - .size = 0x54, - .y_offset = 0x11, + .size = 84, + .y_offset = 17, }, [SPECIES_EEVEE] = { - .size = 0x56, - .y_offset = 0x09, + .size = 86, + .y_offset = 9, }, [SPECIES_VAPOREON] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_JOLTEON] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_FLAREON] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_PORYGON] = { - .size = 0x55, - .y_offset = 0x0d, + .size = 85, + .y_offset = 13, }, [SPECIES_OMANYTE] = { - .size = 0x45, - .y_offset = 0x0f, + .size = 69, + .y_offset = 15, }, [SPECIES_OMASTAR] = { - .size = 0x67, - .y_offset = 0x07, + .size = 103, + .y_offset = 7, }, [SPECIES_KABUTO] = { - .size = 0x54, - .y_offset = 0x11, + .size = 84, + .y_offset = 17, }, [SPECIES_KABUTOPS] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_AERODACTYL] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_SNORLAX] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_ARTICUNO] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_ZAPDOS] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_MOLTRES] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_DRATINI] = { - .size = 0x75, - .y_offset = 0x0e, + .size = 117, + .y_offset = 14, }, [SPECIES_DRAGONAIR] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_DRAGONITE] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_MEWTWO] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_MEW] = { - .size = 0x55, - .y_offset = 0x0d, + .size = 85, + .y_offset = 13, }, [SPECIES_CHIKORITA] = { - .size = 0x75, - .y_offset = 0x0d, + .size = 117, + .y_offset = 13, }, [SPECIES_BAYLEEF] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_MEGANIUM] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_CYNDAQUIL] = { - .size = 0x55, - .y_offset = 0x0e, + .size = 85, + .y_offset = 14, }, [SPECIES_QUILAVA] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_TYPHLOSION] = { - .size = 0x78, - .y_offset = 0x00, + .size = 120, + .y_offset = 0, }, [SPECIES_TOTODILE] = { - .size = 0x55, - .y_offset = 0x0f, + .size = 85, + .y_offset = 15, }, [SPECIES_CROCONAW] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_FERALIGATR] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_SENTRET] = { - .size = 0x47, - .y_offset = 0x04, + .size = 71, + .y_offset = 4, }, [SPECIES_FURRET] = { - .size = 0x67, - .y_offset = 0x07, + .size = 103, + .y_offset = 7, }, [SPECIES_HOOTHOOT] = { - .size = 0x55, - .y_offset = 0x0d, + .size = 85, + .y_offset = 13, }, [SPECIES_NOCTOWL] = { - .size = 0x58, - .y_offset = 0x03, + .size = 88, + .y_offset = 3, }, [SPECIES_LEDYBA] = { - .size = 0x56, - .y_offset = 0x0c, + .size = 86, + .y_offset = 12, }, [SPECIES_LEDIAN] = { - .size = 0x67, - .y_offset = 0x04, + .size = 103, + .y_offset = 4, }, [SPECIES_SPINARAK] = { - .size = 0x54, - .y_offset = 0x13, + .size = 84, + .y_offset = 19, }, [SPECIES_ARIADOS] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_CROBAT] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_CHINCHOU] = { - .size = 0x75, - .y_offset = 0x10, + .size = 117, + .y_offset = 16, }, [SPECIES_LANTURN] = { - .size = 0x87, - .y_offset = 0x0b, + .size = 135, + .y_offset = 11, }, [SPECIES_PICHU] = { - .size = 0x45, - .y_offset = 0x0c, + .size = 69, + .y_offset = 12, }, [SPECIES_CLEFFA] = { - .size = 0x44, - .y_offset = 0x14, + .size = 68, + .y_offset = 20, }, [SPECIES_IGGLYBUFF] = { - .size = 0x44, - .y_offset = 0x12, + .size = 68, + .y_offset = 18, }, [SPECIES_TOGEPI] = { - .size = 0x34, - .y_offset = 0x14, + .size = 52, + .y_offset = 20, }, [SPECIES_TOGETIC] = { - .size = 0x46, - .y_offset = 0x09, + .size = 70, + .y_offset = 9, }, [SPECIES_NATU] = { - .size = 0x44, - .y_offset = 0x14, + .size = 68, + .y_offset = 20, }, [SPECIES_XATU] = { - .size = 0x47, - .y_offset = 0x07, + .size = 71, + .y_offset = 7, }, [SPECIES_MAREEP] = { - .size = 0x55, - .y_offset = 0x10, + .size = 85, + .y_offset = 16, }, [SPECIES_FLAAFFY] = { - .size = 0x56, - .y_offset = 0x0a, + .size = 86, + .y_offset = 10, }, [SPECIES_AMPHAROS] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_BELLOSSOM] = { - .size = 0x45, - .y_offset = 0x0e, + .size = 69, + .y_offset = 14, }, [SPECIES_MARILL] = { - .size = 0x65, - .y_offset = 0x0e, + .size = 101, + .y_offset = 14, }, [SPECIES_AZUMARILL] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_SUDOWOODO] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_POLITOED] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_HOPPIP] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_SKIPLOOM] = { - .size = 0x55, - .y_offset = 0x0f, + .size = 85, + .y_offset = 15, }, [SPECIES_JUMPLUFF] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_AIPOM] = { - .size = 0x58, - .y_offset = 0x03, + .size = 88, + .y_offset = 3, }, [SPECIES_SUNKERN] = { - .size = 0x44, - .y_offset = 0x10, + .size = 68, + .y_offset = 16, }, [SPECIES_SUNFLORA] = { - .size = 0x56, - .y_offset = 0x08, + .size = 86, + .y_offset = 8, }, [SPECIES_YANMA] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_WOOPER] = { - .size = 0x54, - .y_offset = 0x10, + .size = 84, + .y_offset = 16, }, [SPECIES_QUAGSIRE] = { - .size = 0x77, - .y_offset = 0x07, + .size = 119, + .y_offset = 7, }, [SPECIES_ESPEON] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_UMBREON] = { - .size = 0x67, - .y_offset = 0x08, + .size = 103, + .y_offset = 8, }, [SPECIES_MURKROW] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_SLOWKING] = { - .size = 0x58, - .y_offset = 0x01, + .size = 88, + .y_offset = 1, }, [SPECIES_MISDREAVUS] = { - .size = 0x55, - .y_offset = 0x0c, + .size = 85, + .y_offset = 12, }, [SPECIES_UNOWN] = { - .size = 0x35, - .y_offset = 0x0f, + .size = 53, + .y_offset = 15, }, [SPECIES_WOBBUFFET] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_GIRAFARIG] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_PINECO] = { - .size = 0x56, - .y_offset = 0x0a, + .size = 86, + .y_offset = 10, }, [SPECIES_FORRETRESS] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_DUNSPARCE] = { - .size = 0x74, - .y_offset = 0x11, + .size = 116, + .y_offset = 17, }, [SPECIES_GLIGAR] = { - .size = 0x78, - .y_offset = 0x03, + .size = 120, + .y_offset = 3, }, [SPECIES_STEELIX] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_SNUBBULL] = { - .size = 0x55, - .y_offset = 0x0d, + .size = 85, + .y_offset = 13, }, [SPECIES_GRANBULL] = { - .size = 0x57, - .y_offset = 0x06, + .size = 87, + .y_offset = 6, }, [SPECIES_QWILFISH] = { - .size = 0x56, - .y_offset = 0x0a, + .size = 86, + .y_offset = 10, }, [SPECIES_SCIZOR] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_SHUCKLE] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_HERACROSS] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_SNEASEL] = { - .size = 0x67, - .y_offset = 0x05, + .size = 103, + .y_offset = 5, }, [SPECIES_TEDDIURSA] = { - .size = 0x45, - .y_offset = 0x0d, + .size = 69, + .y_offset = 13, }, [SPECIES_URSARING] = { - .size = 0x78, - .y_offset = 0x01, + .size = 120, + .y_offset = 1, }, [SPECIES_SLUGMA] = { - .size = 0x45, - .y_offset = 0x0d, + .size = 69, + .y_offset = 13, }, [SPECIES_MAGCARGO] = { - .size = 0x57, - .y_offset = 0x0d, + .size = 87, + .y_offset = 13, }, [SPECIES_SWINUB] = { - .size = 0x43, - .y_offset = 0x14, + .size = 67, + .y_offset = 20, }, [SPECIES_PILOSWINE] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_CORSOLA] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_REMORAID] = { - .size = 0x55, - .y_offset = 0x0e, + .size = 85, + .y_offset = 14, }, [SPECIES_OCTILLERY] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_DELIBIRD] = { - .size = 0x56, - .y_offset = 0x08, + .size = 86, + .y_offset = 8, }, [SPECIES_MANTINE] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_SKARMORY] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_HOUNDOUR] = { - .size = 0x56, - .y_offset = 0x0b, + .size = 86, + .y_offset = 11, }, [SPECIES_HOUNDOOM] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_KINGDRA] = { - .size = 0x78, - .y_offset = 0x04, + .size = 120, + .y_offset = 4, }, [SPECIES_PHANPY] = { - .size = 0x54, - .y_offset = 0x10, + .size = 84, + .y_offset = 16, }, [SPECIES_DONPHAN] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_PORYGON2] = { - .size = 0x55, - .y_offset = 0x0f, + .size = 85, + .y_offset = 15, }, [SPECIES_STANTLER] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_SMEARGLE] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_TYROGUE] = { - .size = 0x46, - .y_offset = 0x09, + .size = 70, + .y_offset = 9, }, [SPECIES_HITMONTOP] = { - .size = 0x67, - .y_offset = 0x05, + .size = 103, + .y_offset = 5, }, [SPECIES_SMOOCHUM] = { - .size = 0x35, - .y_offset = 0x0f, + .size = 53, + .y_offset = 15, }, [SPECIES_ELEKID] = { - .size = 0x76, - .y_offset = 0x0a, + .size = 118, + .y_offset = 10, }, [SPECIES_MAGBY] = { - .size = 0x45, - .y_offset = 0x0d, + .size = 69, + .y_offset = 13, }, [SPECIES_MILTANK] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_BLISSEY] = { - .size = 0x77, - .y_offset = 0x06, + .size = 119, + .y_offset = 6, }, [SPECIES_RAIKOU] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_ENTEI] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_SUICUNE] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_LARVITAR] = { - .size = 0x46, - .y_offset = 0x09, + .size = 70, + .y_offset = 9, }, [SPECIES_PUPITAR] = { - .size = 0x56, - .y_offset = 0x09, + .size = 86, + .y_offset = 9, }, [SPECIES_TYRANITAR] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_LUGIA] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_HO_OH] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_CELEBI] = { - .size = 0x55, - .y_offset = 0x0e, + .size = 85, + .y_offset = 14, }, [SPECIES_OLD_UNOWN_B] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_C] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_D] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_E] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_F] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_G] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_H] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_I] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_J] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_K] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_L] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_M] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_N] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_O] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_P] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_Q] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_R] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_S] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_T] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_U] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_V] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_W] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_X] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_Y] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_OLD_UNOWN_Z] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_TREECKO] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_GROVYLE] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_SCEPTILE] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_TORCHIC] = { - .size = 0x56, - .y_offset = 0x08, + .size = 86, + .y_offset = 8, }, [SPECIES_COMBUSKEN] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_BLAZIKEN] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_MUDKIP] = { - .size = 0x56, - .y_offset = 0x0c, + .size = 86, + .y_offset = 12, }, [SPECIES_MARSHTOMP] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_SWAMPERT] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_POOCHYENA] = { - .size = 0x55, - .y_offset = 0x0c, + .size = 85, + .y_offset = 12, }, [SPECIES_MIGHTYENA] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_ZIGZAGOON] = { - .size = 0x85, - .y_offset = 0x0f, + .size = 133, + .y_offset = 15, }, [SPECIES_LINOONE] = { - .size = 0x78, - .y_offset = 0x03, + .size = 120, + .y_offset = 3, }, [SPECIES_WURMPLE] = { - .size = 0x45, - .y_offset = 0x0e, + .size = 69, + .y_offset = 14, }, [SPECIES_SILCOON] = { - .size = 0x75, - .y_offset = 0x11, + .size = 117, + .y_offset = 17, }, [SPECIES_BEAUTIFLY] = { - .size = 0x86, - .y_offset = 0x09, + .size = 134, + .y_offset = 9, }, [SPECIES_CASCOON] = { - .size = 0x74, - .y_offset = 0x10, + .size = 116, + .y_offset = 16, }, [SPECIES_DUSTOX] = { - .size = 0x86, - .y_offset = 0x0f, + .size = 134, + .y_offset = 15, }, [SPECIES_LOTAD] = { - .size = 0x65, - .y_offset = 0x0e, + .size = 101, + .y_offset = 14, }, [SPECIES_LOMBRE] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_LUDICOLO] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_SEEDOT] = { - .size = 0x46, - .y_offset = 0x10, + .size = 70, + .y_offset = 16, }, [SPECIES_NUZLEAF] = { - .size = 0x56, - .y_offset = 0x08, + .size = 86, + .y_offset = 8, }, [SPECIES_SHIFTRY] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_NINCADA] = { - .size = 0x74, - .y_offset = 0x12, + .size = 116, + .y_offset = 18, }, [SPECIES_NINJASK] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_SHEDINJA] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_TAILLOW] = { - .size = 0x64, - .y_offset = 0x10, + .size = 100, + .y_offset = 16, }, [SPECIES_SWELLOW] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_SHROOMISH] = { - .size = 0x54, - .y_offset = 0x10, + .size = 84, + .y_offset = 16, }, [SPECIES_BRELOOM] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_SPINDA] = { - .size = 0x68, - .y_offset = 0x08, + .size = 104, + .y_offset = 8, }, [SPECIES_WINGULL] = { - .size = 0x84, - .y_offset = 0x18, + .size = 132, + .y_offset = 24, }, [SPECIES_PELIPPER] = { - .size = 0x77, - .y_offset = 0x04, + .size = 119, + .y_offset = 4, }, [SPECIES_SURSKIT] = { - .size = 0x65, - .y_offset = 0x0f, + .size = 101, + .y_offset = 15, }, [SPECIES_MASQUERAIN] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_WAILMER] = { - .size = 0x75, - .y_offset = 0x0f, + .size = 117, + .y_offset = 15, }, [SPECIES_WAILORD] = { - .size = 0x87, - .y_offset = 0x0a, + .size = 135, + .y_offset = 10, }, [SPECIES_SKITTY] = { - .size = 0x66, - .y_offset = 0x0b, + .size = 102, + .y_offset = 11, }, [SPECIES_DELCATTY] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_KECLEON] = { - .size = 0x67, - .y_offset = 0x07, + .size = 103, + .y_offset = 7, }, [SPECIES_BALTOY] = { - .size = 0x55, - .y_offset = 0x10, + .size = 85, + .y_offset = 16, }, [SPECIES_CLAYDOL] = { - .size = 0x78, - .y_offset = 0x06, + .size = 120, + .y_offset = 6, }, [SPECIES_NOSEPASS] = { - .size = 0x56, - .y_offset = 0x0c, + .size = 86, + .y_offset = 12, }, [SPECIES_TORKOAL] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_SABLEYE] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_BARBOACH] = { - .size = 0x46, - .y_offset = 0x0b, + .size = 70, + .y_offset = 11, }, [SPECIES_WHISCASH] = { - .size = 0x76, - .y_offset = 0x09, + .size = 118, + .y_offset = 9, }, [SPECIES_LUVDISC] = { - .size = 0x46, - .y_offset = 0x18, + .size = 70, + .y_offset = 24, }, [SPECIES_CORPHISH] = { - .size = 0x66, - .y_offset = 0x0c, + .size = 102, + .y_offset = 12, }, [SPECIES_CRAWDAUNT] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_FEEBAS] = { - .size = 0x46, - .y_offset = 0x0d, + .size = 70, + .y_offset = 13, }, [SPECIES_MILOTIC] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_CARVANHA] = { - .size = 0x67, - .y_offset = 0x06, + .size = 103, + .y_offset = 6, }, [SPECIES_SHARPEDO] = { - .size = 0x78, - .y_offset = 0x03, + .size = 120, + .y_offset = 3, }, [SPECIES_TRAPINCH] = { - .size = 0x54, - .y_offset = 0x10, + .size = 84, + .y_offset = 16, }, [SPECIES_VIBRAVA] = { - .size = 0x86, - .y_offset = 0x0c, + .size = 134, + .y_offset = 12, }, [SPECIES_FLYGON] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_MAKUHITA] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_HARIYAMA] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_ELECTRIKE] = { - .size = 0x64, - .y_offset = 0x12, + .size = 100, + .y_offset = 18, }, [SPECIES_MANECTRIC] = { - .size = 0x67, - .y_offset = 0x04, + .size = 103, + .y_offset = 4, }, [SPECIES_NUMEL] = { - .size = 0x65, - .y_offset = 0x0f, + .size = 101, + .y_offset = 15, }, [SPECIES_CAMERUPT] = { - .size = 0x87, - .y_offset = 0x09, + .size = 135, + .y_offset = 9, }, [SPECIES_SPHEAL] = { - .size = 0x65, - .y_offset = 0x10, + .size = 101, + .y_offset = 16, }, [SPECIES_SEALEO] = { - .size = 0x86, - .y_offset = 0x0a, + .size = 134, + .y_offset = 10, }, [SPECIES_WALREIN] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_CACNEA] = { - .size = 0x74, - .y_offset = 0x10, + .size = 116, + .y_offset = 16, }, [SPECIES_CACTURNE] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_SNORUNT] = { - .size = 0x56, - .y_offset = 0x0b, + .size = 86, + .y_offset = 11, }, [SPECIES_GLALIE] = { - .size = 0x76, - .y_offset = 0x0a, + .size = 118, + .y_offset = 10, }, [SPECIES_LUNATONE] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_SOLROCK] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_AZURILL] = { - .size = 0x55, - .y_offset = 0x0f, + .size = 85, + .y_offset = 15, }, [SPECIES_SPOINK] = { - .size = 0x46, - .y_offset = 0x09, + .size = 70, + .y_offset = 9, }, [SPECIES_GRUMPIG] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_PLUSLE] = { - .size = 0x56, - .y_offset = 0x0e, + .size = 86, + .y_offset = 14, }, [SPECIES_MINUN] = { - .size = 0x66, - .y_offset = 0x0c, + .size = 102, + .y_offset = 12, }, [SPECIES_MAWILE] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_MEDITITE] = { - .size = 0x65, - .y_offset = 0x0c, + .size = 101, + .y_offset = 12, }, [SPECIES_MEDICHAM] = { - .size = 0x68, - .y_offset = 0x01, + .size = 104, + .y_offset = 1, }, [SPECIES_SWABLU] = { - .size = 0x76, - .y_offset = 0x11, + .size = 118, + .y_offset = 17, }, [SPECIES_ALTARIA] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_WYNAUT] = { - .size = 0x55, - .y_offset = 0x0c, + .size = 85, + .y_offset = 12, }, [SPECIES_DUSKULL] = { - .size = 0x66, - .y_offset = 0x0a, + .size = 102, + .y_offset = 10, }, [SPECIES_DUSCLOPS] = { - .size = 0x77, - .y_offset = 0x05, + .size = 119, + .y_offset = 5, }, [SPECIES_ROSELIA] = { - .size = 0x76, - .y_offset = 0x08, + .size = 118, + .y_offset = 8, }, [SPECIES_SLAKOTH] = { - .size = 0x74, - .y_offset = 0x12, + .size = 116, + .y_offset = 18, }, [SPECIES_VIGOROTH] = { - .size = 0x78, - .y_offset = 0x00, + .size = 120, + .y_offset = 0, }, [SPECIES_SLAKING] = { - .size = 0x86, - .y_offset = 0x08, + .size = 134, + .y_offset = 8, }, [SPECIES_GULPIN] = { - .size = 0x55, - .y_offset = 0x12, + .size = 85, + .y_offset = 18, }, [SPECIES_SWALOT] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_TROPIUS] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_WHISMUR] = { - .size = 0x55, - .y_offset = 0x0e, + .size = 85, + .y_offset = 14, }, [SPECIES_LOUDRED] = { - .size = 0x78, - .y_offset = 0x03, + .size = 120, + .y_offset = 3, }, [SPECIES_EXPLOUD] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_CLAMPERL] = { - .size = 0x55, - .y_offset = 0x0e, + .size = 85, + .y_offset = 14, }, [SPECIES_HUNTAIL] = { - .size = 0x78, - .y_offset = 0x03, + .size = 120, + .y_offset = 3, }, [SPECIES_GOREBYSS] = { - .size = 0x86, - .y_offset = 0x0b, + .size = 134, + .y_offset = 11, }, [SPECIES_ABSOL] = { - .size = 0x68, - .y_offset = 0x00, + .size = 104, + .y_offset = 0, }, [SPECIES_SHUPPET] = { - .size = 0x56, - .y_offset = 0x0e, + .size = 86, + .y_offset = 14, }, [SPECIES_BANETTE] = { - .size = 0x55, - .y_offset = 0x0c, + .size = 85, + .y_offset = 12, }, [SPECIES_SEVIPER] = { - .size = 0x77, - .y_offset = 0x08, + .size = 119, + .y_offset = 8, }, [SPECIES_ZANGOOSE] = { - .size = 0x87, - .y_offset = 0x05, + .size = 135, + .y_offset = 5, }, [SPECIES_RELICANTH] = { - .size = 0x77, - .y_offset = 0x0b, + .size = 119, + .y_offset = 11, }, [SPECIES_ARON] = { - .size = 0x43, - .y_offset = 0x14, + .size = 67, + .y_offset = 20, }, [SPECIES_LAIRON] = { - .size = 0x75, - .y_offset = 0x0d, + .size = 117, + .y_offset = 13, }, [SPECIES_AGGRON] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_CASTFORM] = { - .size = 0x34, - .y_offset = 0x11, + .size = 52, + .y_offset = 17, }, [SPECIES_VOLBEAT] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_ILLUMISE] = { - .size = 0x56, - .y_offset = 0x08, + .size = 86, + .y_offset = 8, }, [SPECIES_LILEEP] = { - .size = 0x67, - .y_offset = 0x07, + .size = 103, + .y_offset = 7, }, [SPECIES_CRADILY] = { - .size = 0x78, - .y_offset = 0x00, + .size = 120, + .y_offset = 0, }, [SPECIES_ANORITH] = { - .size = 0x66, - .y_offset = 0x08, + .size = 102, + .y_offset = 8, }, [SPECIES_ARMALDO] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_RALTS] = { - .size = 0x35, - .y_offset = 0x0f, + .size = 53, + .y_offset = 15, }, [SPECIES_KIRLIA] = { - .size = 0x47, - .y_offset = 0x06, + .size = 71, + .y_offset = 6, }, [SPECIES_GARDEVOIR] = { - .size = 0x78, - .y_offset = 0x01, + .size = 120, + .y_offset = 1, }, [SPECIES_BAGON] = { - .size = 0x56, - .y_offset = 0x0b, + .size = 86, + .y_offset = 11, }, [SPECIES_SHELGON] = { - .size = 0x66, - .y_offset = 0x09, + .size = 102, + .y_offset = 9, }, [SPECIES_SALAMENCE] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_BELDUM] = { - .size = 0x55, - .y_offset = 0x0f, + .size = 85, + .y_offset = 15, }, [SPECIES_METANG] = { - .size = 0x87, - .y_offset = 0x07, + .size = 135, + .y_offset = 7, }, [SPECIES_METAGROSS] = { - .size = 0x87, - .y_offset = 0x06, + .size = 135, + .y_offset = 6, }, [SPECIES_REGIROCK] = { - .size = 0x78, - .y_offset = 0x04, + .size = 120, + .y_offset = 4, }, [SPECIES_REGICE] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_REGISTEEL] = { - .size = 0x88, - .y_offset = 0x03, + .size = 136, + .y_offset = 3, }, [SPECIES_KYOGRE] = { - .size = 0x87, - .y_offset = 0x04, + .size = 135, + .y_offset = 4, }, [SPECIES_GROUDON] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_RAYQUAZA] = { - .size = 0x88, - .y_offset = 0x00, + .size = 136, + .y_offset = 0, }, [SPECIES_LATIAS] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_LATIOS] = { - .size = 0x88, - .y_offset = 0x02, + .size = 136, + .y_offset = 2, }, [SPECIES_JIRACHI] = { - .size = 0x66, - .y_offset = 0x0d, + .size = 102, + .y_offset = 13, }, [SPECIES_DEOXYS] = { - .size = 0x88, - .y_offset = 0x01, + .size = 136, + .y_offset = 1, }, [SPECIES_CHIMECHO] = { - .size = 0x37, - .y_offset = 0x06, + .size = 55, + .y_offset = 6, }, [SPECIES_EGG] = { - .size = 0x33, - .y_offset = 0x14, + .size = 51, + .y_offset = 20, }, [SPECIES_UNOWN_B] = { - .size = 0x34, - .y_offset = 0x10, + .size = 52, + .y_offset = 16, }, [SPECIES_UNOWN_C] = { - .size = 0x44, - .y_offset = 0x10, + .size = 68, + .y_offset = 16, }, [SPECIES_UNOWN_D] = { - .size = 0x44, - .y_offset = 0x10, + .size = 68, + .y_offset = 16, }, [SPECIES_UNOWN_E] = { - .size = 0x44, - .y_offset = 0x11, + .size = 68, + .y_offset = 17, }, [SPECIES_UNOWN_F] = { - .size = 0x44, - .y_offset = 0x11, + .size = 68, + .y_offset = 17, }, [SPECIES_UNOWN_G] = { - .size = 0x35, - .y_offset = 0x0e, + .size = 53, + .y_offset = 14, }, [SPECIES_UNOWN_H] = { - .size = 0x44, - .y_offset = 0x10, + .size = 68, + .y_offset = 16, }, [SPECIES_UNOWN_I] = { - .size = 0x34, - .y_offset = 0x10, + .size = 52, + .y_offset = 16, }, [SPECIES_UNOWN_J] = { - .size = 0x34, - .y_offset = 0x11, + .size = 52, + .y_offset = 17, }, [SPECIES_UNOWN_K] = { - .size = 0x44, - .y_offset = 0x11, + .size = 68, + .y_offset = 17, }, [SPECIES_UNOWN_L] = { - .size = 0x34, - .y_offset = 0x13, + .size = 52, + .y_offset = 19, }, [SPECIES_UNOWN_M] = { - .size = 0x44, - .y_offset = 0x13, + .size = 68, + .y_offset = 19, }, [SPECIES_UNOWN_N] = { - .size = 0x43, - .y_offset = 0x14, + .size = 67, + .y_offset = 20, }, [SPECIES_UNOWN_O] = { - .size = 0x44, - .y_offset = 0x10, + .size = 68, + .y_offset = 16, }, [SPECIES_UNOWN_P] = { - .size = 0x34, - .y_offset = 0x13, + .size = 52, + .y_offset = 19, }, [SPECIES_UNOWN_Q] = { - .size = 0x43, - .y_offset = 0x15, + .size = 67, + .y_offset = 21, }, [SPECIES_UNOWN_R] = { - .size = 0x34, - .y_offset = 0x13, + .size = 52, + .y_offset = 19, }, [SPECIES_UNOWN_S] = { - .size = 0x45, - .y_offset = 0x0c, + .size = 69, + .y_offset = 12, }, [SPECIES_UNOWN_T] = { - .size = 0x34, - .y_offset = 0x12, + .size = 52, + .y_offset = 18, }, [SPECIES_UNOWN_U] = { - .size = 0x44, - .y_offset = 0x12, + .size = 68, + .y_offset = 18, }, [SPECIES_UNOWN_V] = { - .size = 0x44, - .y_offset = 0x12, + .size = 68, + .y_offset = 18, }, [SPECIES_UNOWN_W] = { - .size = 0x44, - .y_offset = 0x13, + .size = 68, + .y_offset = 19, }, [SPECIES_UNOWN_X] = { - .size = 0x33, - .y_offset = 0x15, + .size = 51, + .y_offset = 21, }, [SPECIES_UNOWN_Y] = { - .size = 0x34, - .y_offset = 0x11, + .size = 52, + .y_offset = 17, }, [SPECIES_UNOWN_Z] = { - .size = 0x34, - .y_offset = 0x10, + .size = 52, + .y_offset = 16, }, [SPECIES_UNOWN_EMARK] = { - .size = 0x35, - .y_offset = 0x0f, + .size = 53, + .y_offset = 15, }, [SPECIES_UNOWN_QMARK] = { - .size = 0x35, - .y_offset = 0x0d, + .size = 53, + .y_offset = 13, }, }; -- cgit v1.2.3 From f825ba875eda30041f9c141d7afb7fab52a6c41f Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 19 Jul 2020 21:17:32 -0400 Subject: Reverted size. --- src/data/pokemon_graphics/back_pic_coordinates.h | 922 ++++++++++----------- src/data/pokemon_graphics/front_pic_coordinates.h | 928 +++++++++++----------- 2 files changed, 925 insertions(+), 925 deletions(-) (limited to 'src/data') diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 4987ccc99..30ef712b1 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -2,2202 +2,2202 @@ const struct MonCoords gMonBackPicCoords[] = { [SPECIES_NONE] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_BULBASAUR] = { - .size = 100, + .size = 0x64, .y_offset = 16, }, [SPECIES_IVYSAUR] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_VENUSAUR] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_CHARMANDER] = { - .size = 101, + .size = 0x65, .y_offset = 14, }, [SPECIES_CHARMELEON] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_CHARIZARD] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_SQUIRTLE] = { - .size = 101, + .size = 0x65, .y_offset = 14, }, [SPECIES_WARTORTLE] = { - .size = 118, + .size = 0x76, .y_offset = 10, }, [SPECIES_BLASTOISE] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_CATERPIE] = { - .size = 85, + .size = 0x55, .y_offset = 15, }, [SPECIES_METAPOD] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_BUTTERFREE] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_WEEDLE] = { - .size = 86, + .size = 0x56, .y_offset = 11, }, [SPECIES_KAKUNA] = { - .size = 70, + .size = 0x46, .y_offset = 10, }, [SPECIES_BEEDRILL] = { - .size = 134, + .size = 0x86, .y_offset = 9, }, [SPECIES_PIDGEY] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_PIDGEOTTO] = { - .size = 133, + .size = 0x85, .y_offset = 12, }, [SPECIES_PIDGEOT] = { - .size = 120, + .size = 0x78, .y_offset = 2, }, [SPECIES_RATTATA] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_RATICATE] = { - .size = 117, + .size = 0x75, .y_offset = 13, }, [SPECIES_SPEAROW] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_FEAROW] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_EKANS] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_ARBOK] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_PIKACHU] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_RAICHU] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_SANDSHREW] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_SANDSLASH] = { - .size = 134, + .size = 0x86, .y_offset = 9, }, [SPECIES_NIDORAN_F] = { - .size = 85, + .size = 0x55, .y_offset = 12, }, [SPECIES_NIDORINA] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_NIDOQUEEN] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_NIDORAN_M] = { - .size = 86, + .size = 0x56, .y_offset = 8, }, [SPECIES_NIDORINO] = { - .size = 134, + .size = 0x86, .y_offset = 9, }, [SPECIES_NIDOKING] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_CLEFAIRY] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_CLEFABLE] = { - .size = 118, + .size = 0x76, .y_offset = 10, }, [SPECIES_VULPIX] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_NINETALES] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_JIGGLYPUFF] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_WIGGLYTUFF] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_ZUBAT] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_GOLBAT] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_ODDISH] = { - .size = 86, + .size = 0x56, .y_offset = 11, }, [SPECIES_GLOOM] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_VILEPLUME] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_PARAS] = { - .size = 99, - .y_offset = 20, + .size = 0x63, + .y_offset = 0x14, }, [SPECIES_PARASECT] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_VENONAT] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_VENOMOTH] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_DIGLETT] = { - .size = 84, + .size = 0x54, .y_offset = 16, }, [SPECIES_DUGTRIO] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_MEOWTH] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_PERSIAN] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_PSYDUCK] = { - .size = 103, + .size = 0x67, .y_offset = 7, }, [SPECIES_GOLDUCK] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_MANKEY] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_PRIMEAPE] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_GROWLITHE] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_ARCANINE] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_POLIWAG] = { - .size = 116, + .size = 0x74, .y_offset = 16, }, [SPECIES_POLIWHIRL] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_POLIWRATH] = { - .size = 134, + .size = 0x86, .y_offset = 11, }, [SPECIES_ABRA] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_KADABRA] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_ALAKAZAM] = { - .size = 103, + .size = 0x67, .y_offset = 5, }, [SPECIES_MACHOP] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_MACHOKE] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_MACHAMP] = { - .size = 103, + .size = 0x67, .y_offset = 4, }, [SPECIES_BELLSPROUT] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_WEEPINBELL] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_VICTREEBEL] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_TENTACOOL] = { - .size = 86, + .size = 0x56, .y_offset = 10, }, [SPECIES_TENTACRUEL] = { - .size = 134, + .size = 0x86, .y_offset = 11, }, [SPECIES_GEODUDE] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_GRAVELER] = { - .size = 117, + .size = 0x75, .y_offset = 12, }, [SPECIES_GOLEM] = { - .size = 132, + .size = 0x84, .y_offset = 16, }, [SPECIES_PONYTA] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_RAPIDASH] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_SLOWPOKE] = { - .size = 133, + .size = 0x85, .y_offset = 14, }, [SPECIES_SLOWBRO] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_MAGNEMITE] = { - .size = 67, - .y_offset = 20, + .size = 0x43, + .y_offset = 0x14, }, [SPECIES_MAGNETON] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_FARFETCHD] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_DODUO] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_DODRIO] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_SEEL] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_DEWGONG] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_GRIMER] = { - .size = 117, + .size = 0x75, .y_offset = 12, }, [SPECIES_MUK] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_SHELLDER] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_CLOYSTER] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_GASTLY] = { - .size = 133, + .size = 0x85, .y_offset = 14, }, [SPECIES_HAUNTER] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_GENGAR] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_ONIX] = { - .size = 120, + .size = 0x78, .y_offset = 0, }, [SPECIES_DROWZEE] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_HYPNO] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_KRABBY] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_KINGLER] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_VOLTORB] = { - .size = 85, + .size = 0x55, .y_offset = 14, }, [SPECIES_ELECTRODE] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_EXEGGCUTE] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_EXEGGUTOR] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_CUBONE] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_MAROWAK] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_HITMONLEE] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_HITMONCHAN] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_LICKITUNG] = { - .size = 101, + .size = 0x65, .y_offset = 14, }, [SPECIES_KOFFING] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_WEEZING] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_RHYHORN] = { - .size = 133, + .size = 0x85, .y_offset = 12, }, [SPECIES_RHYDON] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_CHANSEY] = { - .size = 134, + .size = 0x86, .y_offset = 11, }, [SPECIES_TANGELA] = { - .size = 133, + .size = 0x85, .y_offset = 14, }, [SPECIES_KANGASKHAN] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_HORSEA] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_SEADRA] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_GOLDEEN] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_SEAKING] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_STARYU] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_STARMIE] = { - .size = 133, + .size = 0x85, .y_offset = 14, }, [SPECIES_MR_MIME] = { - .size = 133, + .size = 0x85, .y_offset = 13, }, [SPECIES_SCYTHER] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_JYNX] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_ELECTABUZZ] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_MAGMAR] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_PINSIR] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_TAUROS] = { - .size = 133, + .size = 0x85, .y_offset = 13, }, [SPECIES_MAGIKARP] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_GYARADOS] = { - .size = 120, + .size = 0x78, .y_offset = 0, }, [SPECIES_LAPRAS] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_DITTO] = { - .size = 84, - .y_offset = 17, + .size = 0x54, + .y_offset = 0x11, }, [SPECIES_EEVEE] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_VAPOREON] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_JOLTEON] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_FLAREON] = { - .size = 103, + .size = 0x67, .y_offset = 5, }, [SPECIES_PORYGON] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_OMANYTE] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_OMASTAR] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_KABUTO] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_KABUTOPS] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_AERODACTYL] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_SNORLAX] = { - .size = 134, + .size = 0x86, .y_offset = 11, }, [SPECIES_ARTICUNO] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_ZAPDOS] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_MOLTRES] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_DRATINI] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_DRAGONAIR] = { - .size = 120, + .size = 0x78, .y_offset = 0, }, [SPECIES_DRAGONITE] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_MEWTWO] = { - .size = 120, + .size = 0x78, .y_offset = 1, }, [SPECIES_MEW] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_CHIKORITA] = { - .size = 86, + .size = 0x56, .y_offset = 10, }, [SPECIES_BAYLEEF] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_MEGANIUM] = { - .size = 120, + .size = 0x78, .y_offset = 0, }, [SPECIES_CYNDAQUIL] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_QUILAVA] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_TYPHLOSION] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_TOTODILE] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_CROCONAW] = { - .size = 103, + .size = 0x67, .y_offset = 7, }, [SPECIES_FERALIGATR] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_SENTRET] = { - .size = 103, + .size = 0x67, .y_offset = 5, }, [SPECIES_FURRET] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_HOOTHOOT] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_NOCTOWL] = { - .size = 104, + .size = 0x68, .y_offset = 3, }, [SPECIES_LEDYBA] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_LEDIAN] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_SPINARAK] = { - .size = 115, - .y_offset = 21, + .size = 0x73, + .y_offset = 0x15, }, [SPECIES_ARIADOS] = { - .size = 134, + .size = 0x86, .y_offset = 11, }, [SPECIES_CROBAT] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_CHINCHOU] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_LANTURN] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_PICHU] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_CLEFFA] = { - .size = 101, + .size = 0x65, .y_offset = 15, }, [SPECIES_IGGLYBUFF] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_TOGEPI] = { - .size = 84, + .size = 0x54, .y_offset = 16, }, [SPECIES_TOGETIC] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_NATU] = { - .size = 84, - .y_offset = 17, + .size = 0x54, + .y_offset = 0x11, }, [SPECIES_XATU] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_MAREEP] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_FLAAFFY] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_AMPHAROS] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_BELLOSSOM] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_MARILL] = { - .size = 117, + .size = 0x75, .y_offset = 12, }, [SPECIES_AZUMARILL] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_SUDOWOODO] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_POLITOED] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_HOPPIP] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_SKIPLOOM] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_JUMPLUFF] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_AIPOM] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_SUNKERN] = { - .size = 86, + .size = 0x56, .y_offset = 10, }, [SPECIES_SUNFLORA] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_YANMA] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_WOOPER] = { - .size = 133, + .size = 0x85, .y_offset = 15, }, [SPECIES_QUAGSIRE] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_ESPEON] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_UMBREON] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_MURKROW] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_SLOWKING] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_MISDREAVUS] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_UNOWN] = { - .size = 54, + .size = 0x36, .y_offset = 8, }, [SPECIES_WOBBUFFET] = { - .size = 117, + .size = 0x75, .y_offset = 12, }, [SPECIES_GIRAFARIG] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_PINECO] = { - .size = 101, + .size = 0x65, .y_offset = 15, }, [SPECIES_FORRETRESS] = { - .size = 132, + .size = 0x84, .y_offset = 16, }, [SPECIES_DUNSPARCE] = { - .size = 133, + .size = 0x85, .y_offset = 15, }, [SPECIES_GLIGAR] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_STEELIX] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_SNUBBULL] = { - .size = 118, + .size = 0x76, .y_offset = 10, }, [SPECIES_GRANBULL] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_QWILFISH] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_SCIZOR] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_SHUCKLE] = { - .size = 86, + .size = 0x56, .y_offset = 11, }, [SPECIES_HERACROSS] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_SNEASEL] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_TEDDIURSA] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_URSARING] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_SLUGMA] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_MAGCARGO] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_SWINUB] = { - .size = 99, - .y_offset = 21, + .size = 0x63, + .y_offset = 0x15, }, [SPECIES_PILOSWINE] = { - .size = 117, + .size = 0x75, .y_offset = 13, }, [SPECIES_CORSOLA] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_REMORAID] = { - .size = 117, + .size = 0x75, .y_offset = 13, }, [SPECIES_OCTILLERY] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_DELIBIRD] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_MANTINE] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_SKARMORY] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_HOUNDOUR] = { - .size = 85, + .size = 0x55, .y_offset = 12, }, [SPECIES_HOUNDOOM] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_KINGDRA] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_PHANPY] = { - .size = 101, + .size = 0x65, .y_offset = 14, }, [SPECIES_DONPHAN] = { - .size = 133, + .size = 0x85, .y_offset = 13, }, [SPECIES_PORYGON2] = { - .size = 118, + .size = 0x76, .y_offset = 10, }, [SPECIES_STANTLER] = { - .size = 120, + .size = 0x78, .y_offset = 3, }, [SPECIES_SMEARGLE] = { - .size = 118, + .size = 0x76, .y_offset = 10, }, [SPECIES_TYROGUE] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_HITMONTOP] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_SMOOCHUM] = { - .size = 86, + .size = 0x56, .y_offset = 9, }, [SPECIES_ELEKID] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_MAGBY] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_MILTANK] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_BLISSEY] = { - .size = 133, + .size = 0x85, .y_offset = 13, }, [SPECIES_RAIKOU] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_ENTEI] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_SUICUNE] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_LARVITAR] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_PUPITAR] = { - .size = 103, + .size = 0x67, .y_offset = 5, }, [SPECIES_TYRANITAR] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_LUGIA] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_HO_OH] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_CELEBI] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_OLD_UNOWN_B] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_C] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_D] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_E] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_F] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_G] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_H] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_I] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_J] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_K] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_L] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_M] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_N] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_O] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_P] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_Q] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_R] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_S] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_T] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_U] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_V] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_W] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_X] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_Y] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_OLD_UNOWN_Z] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_TREECKO] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_GROVYLE] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_SCEPTILE] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_TORCHIC] = { - .size = 103, + .size = 0x67, .y_offset = 5, }, [SPECIES_COMBUSKEN] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_BLAZIKEN] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_MUDKIP] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_MARSHTOMP] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_SWAMPERT] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_POOCHYENA] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_MIGHTYENA] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_ZIGZAGOON] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_LINOONE] = { - .size = 133, + .size = 0x85, .y_offset = 15, }, [SPECIES_WURMPLE] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_SILCOON] = { - .size = 131, - .y_offset = 21, + .size = 0x83, + .y_offset = 0x15, }, [SPECIES_BEAUTIFLY] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_CASCOON] = { - .size = 115, - .y_offset = 20, + .size = 0x73, + .y_offset = 0x14, }, [SPECIES_DUSTOX] = { - .size = 131, - .y_offset = 20, + .size = 0x83, + .y_offset = 0x14, }, [SPECIES_LOTAD] = { - .size = 117, + .size = 0x75, .y_offset = 15, }, [SPECIES_LOMBRE] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_LUDICOLO] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_SEEDOT] = { - .size = 134, + .size = 0x86, .y_offset = 9, }, [SPECIES_NUZLEAF] = { - .size = 118, + .size = 0x76, .y_offset = 10, }, [SPECIES_SHIFTRY] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_NINCADA] = { - .size = 131, - .y_offset = 20, + .size = 0x83, + .y_offset = 0x14, }, [SPECIES_NINJASK] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_SHEDINJA] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_TAILLOW] = { - .size = 100, - .y_offset = 17, + .size = 0x64, + .y_offset = 0x11, }, [SPECIES_SWELLOW] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_SHROOMISH] = { - .size = 133, + .size = 0x85, .y_offset = 13, }, [SPECIES_BRELOOM] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_SPINDA] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_WINGULL] = { - .size = 133, + .size = 0x85, .y_offset = 14, }, [SPECIES_PELIPPER] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_SURSKIT] = { - .size = 134, + .size = 0x86, .y_offset = 11, }, [SPECIES_MASQUERAIN] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_WAILMER] = { - .size = 131, - .y_offset = 21, + .size = 0x83, + .y_offset = 0x15, }, [SPECIES_WAILORD] = { - .size = 131, - .y_offset = 22, + .size = 0x83, + .y_offset = 0x16, }, [SPECIES_SKITTY] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_DELCATTY] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_KECLEON] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_BALTOY] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_CLAYDOL] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_NOSEPASS] = { - .size = 133, + .size = 0x85, .y_offset = 12, }, [SPECIES_TORKOAL] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_SABLEYE] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_BARBOACH] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_WHISCASH] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_LUVDISC] = { - .size = 70, + .size = 0x46, .y_offset = 10, }, [SPECIES_CORPHISH] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_CRAWDAUNT] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_FEEBAS] = { - .size = 103, + .size = 0x67, .y_offset = 7, }, [SPECIES_MILOTIC] = { - .size = 104, + .size = 0x68, .y_offset = 2, }, [SPECIES_CARVANHA] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_SHARPEDO] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_TRAPINCH] = { - .size = 117, + .size = 0x75, .y_offset = 14, }, [SPECIES_VIBRAVA] = { - .size = 116, - .y_offset = 17, + .size = 0x74, + .y_offset = 0x11, }, [SPECIES_FLYGON] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_MAKUHITA] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_HARIYAMA] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_ELECTRIKE] = { - .size = 132, + .size = 0x84, .y_offset = 16, }, [SPECIES_MANECTRIC] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_NUMEL] = { - .size = 134, + .size = 0x86, .y_offset = 11, }, [SPECIES_CAMERUPT] = { - .size = 132, - .y_offset = 19, + .size = 0x84, + .y_offset = 0x13, }, [SPECIES_SPHEAL] = { - .size = 100, - .y_offset = 18, + .size = 0x64, + .y_offset = 0x12, }, [SPECIES_SEALEO] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_WALREIN] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_CACNEA] = { - .size = 133, + .size = 0x85, .y_offset = 15, }, [SPECIES_CACTURNE] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_SNORUNT] = { - .size = 118, + .size = 0x76, .y_offset = 10, }, [SPECIES_GLALIE] = { - .size = 133, + .size = 0x85, .y_offset = 12, }, [SPECIES_LUNATONE] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_SOLROCK] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_AZURILL] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_SPOINK] = { - .size = 86, + .size = 0x56, .y_offset = 11, }, [SPECIES_GRUMPIG] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_PLUSLE] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_MINUN] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_MAWILE] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_MEDITITE] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_MEDICHAM] = { - .size = 104, + .size = 0x68, .y_offset = 3, }, [SPECIES_SWABLU] = { - .size = 134, + .size = 0x86, .y_offset = 9, }, [SPECIES_ALTARIA] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_WYNAUT] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_DUSKULL] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_DUSCLOPS] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_ROSELIA] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_SLAKOTH] = { - .size = 133, + .size = 0x85, .y_offset = 15, }, [SPECIES_VIGOROTH] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_SLAKING] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_GULPIN] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_SWALOT] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_TROPIUS] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_WHISMUR] = { - .size = 133, + .size = 0x85, .y_offset = 13, }, [SPECIES_LOUDRED] = { - .size = 134, + .size = 0x86, .y_offset = 9, }, [SPECIES_EXPLOUD] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_CLAMPERL] = { - .size = 133, + .size = 0x85, .y_offset = 13, }, [SPECIES_HUNTAIL] = { - .size = 104, + .size = 0x68, .y_offset = 2, }, [SPECIES_GOREBYSS] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_ABSOL] = { - .size = 120, + .size = 0x78, .y_offset = 3, }, [SPECIES_SHUPPET] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_BANETTE] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_SEVIPER] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_ZANGOOSE] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_RELICANTH] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_ARON] = { - .size = 84, - .y_offset = 17, + .size = 0x54, + .y_offset = 0x11, }, [SPECIES_LAIRON] = { - .size = 132, - .y_offset = 17, + .size = 0x84, + .y_offset = 0x11, }, [SPECIES_AGGRON] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_CASTFORM] = { - .size = 69, + .size = 0x45, .y_offset = 13, }, [SPECIES_VOLBEAT] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_ILLUMISE] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_LILEEP] = { - .size = 134, + .size = 0x86, .y_offset = 9, }, [SPECIES_CRADILY] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_ANORITH] = { - .size = 131, - .y_offset = 23, + .size = 0x83, + .y_offset = 0x17, }, [SPECIES_ARMALDO] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_RALTS] = { - .size = 69, + .size = 0x45, .y_offset = 13, }, [SPECIES_KIRLIA] = { - .size = 87, + .size = 0x57, .y_offset = 6, }, [SPECIES_GARDEVOIR] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_BAGON] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_SHELGON] = { - .size = 133, + .size = 0x85, .y_offset = 13, }, [SPECIES_SALAMENCE] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_BELDUM] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_METANG] = { - .size = 132, + .size = 0x84, .y_offset = 16, }, [SPECIES_METAGROSS] = { - .size = 131, - .y_offset = 20, + .size = 0x83, + .y_offset = 0x14, }, [SPECIES_REGIROCK] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_REGICE] = { - .size = 133, + .size = 0x85, .y_offset = 14, }, [SPECIES_REGISTEEL] = { - .size = 133, + .size = 0x85, .y_offset = 14, }, [SPECIES_KYOGRE] = { - .size = 132, - .y_offset = 19, + .size = 0x84, + .y_offset = 0x13, }, [SPECIES_GROUDON] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_RAYQUAZA] = { - .size = 120, + .size = 0x78, .y_offset = 0, }, [SPECIES_LATIAS] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_LATIOS] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_JIRACHI] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_DEOXYS] = { - .size = 134, + .size = 0x86, .y_offset = 9, }, [SPECIES_CHIMECHO] = { - .size = 71, + .size = 0x47, .y_offset = 7, }, [SPECIES_EGG] = { - .size = 54, + .size = 0x36, .y_offset = 10, }, [SPECIES_UNOWN_B] = { - .size = 86, + .size = 0x56, .y_offset = 9, }, [SPECIES_UNOWN_C] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_UNOWN_D] = { - .size = 86, + .size = 0x56, .y_offset = 8, }, [SPECIES_UNOWN_E] = { - .size = 86, + .size = 0x56, .y_offset = 10, }, [SPECIES_UNOWN_F] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_UNOWN_G] = { - .size = 87, + .size = 0x57, .y_offset = 5, }, [SPECIES_UNOWN_H] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_UNOWN_I] = { - .size = 55, + .size = 0x37, .y_offset = 7, }, [SPECIES_UNOWN_J] = { - .size = 70, + .size = 0x46, .y_offset = 9, }, [SPECIES_UNOWN_K] = { - .size = 87, + .size = 0x57, .y_offset = 7, }, [SPECIES_UNOWN_L] = { - .size = 70, + .size = 0x46, .y_offset = 10, }, [SPECIES_UNOWN_M] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_UNOWN_N] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_UNOWN_O] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_UNOWN_P] = { - .size = 70, + .size = 0x46, .y_offset = 10, }, [SPECIES_UNOWN_Q] = { - .size = 85, + .size = 0x55, .y_offset = 15, }, [SPECIES_UNOWN_R] = { - .size = 69, + .size = 0x45, .y_offset = 12, }, [SPECIES_UNOWN_S] = { - .size = 87, + .size = 0x57, .y_offset = 4, }, [SPECIES_UNOWN_T] = { - .size = 69, + .size = 0x45, .y_offset = 13, }, [SPECIES_UNOWN_U] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_UNOWN_V] = { - .size = 86, + .size = 0x56, .y_offset = 11, }, [SPECIES_UNOWN_W] = { - .size = 85, + .size = 0x55, .y_offset = 13, }, [SPECIES_UNOWN_X] = { - .size = 85, + .size = 0x55, .y_offset = 15, }, [SPECIES_UNOWN_Y] = { - .size = 70, + .size = 0x46, .y_offset = 10, }, [SPECIES_UNOWN_Z] = { - .size = 70, + .size = 0x46, .y_offset = 10, }, [SPECIES_UNOWN_EMARK] = { - .size = 55, + .size = 0x37, .y_offset = 6, }, [SPECIES_UNOWN_QMARK] = { - .size = 71, + .size = 0x47, .y_offset = 6, }, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index cb331fb39..90bf967af 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -2,2202 +2,2202 @@ const struct MonCoords gMonFrontPicCoords[] = { [SPECIES_NONE] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_BULBASAUR] = { - .size = 69, + .size = 0x45, .y_offset = 14, }, [SPECIES_IVYSAUR] = { - .size = 86, + .size = 0x56, .y_offset = 10, }, [SPECIES_VENUSAUR] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_CHARMANDER] = { - .size = 85, + .size = 0x55, .y_offset = 12, }, [SPECIES_CHARMELEON] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_CHARIZARD] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_SQUIRTLE] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_WARTORTLE] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_BLASTOISE] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_CATERPIE] = { - .size = 69, + .size = 0x45, .y_offset = 16, }, [SPECIES_METAPOD] = { - .size = 84, + .size = 0x54, .y_offset = 20, }, [SPECIES_BUTTERFREE] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_WEEDLE] = { - .size = 84, + .size = 0x54, .y_offset = 18, }, [SPECIES_KAKUNA] = { - .size = 69, + .size = 0x45, .y_offset = 14, }, [SPECIES_BEEDRILL] = { - .size = 134, + .size = 0x86, .y_offset = 9, }, [SPECIES_PIDGEY] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_PIDGEOTTO] = { - .size = 103, + .size = 0x67, .y_offset = 11, }, [SPECIES_PIDGEOT] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_RATTATA] = { - .size = 68, + .size = 0x44, .y_offset = 16, }, [SPECIES_RATICATE] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_SPEAROW] = { - .size = 69, + .size = 0x45, .y_offset = 15, }, [SPECIES_FEAROW] = { - .size = 120, + .size = 0x78, .y_offset = 0, }, [SPECIES_EKANS] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_ARBOK] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_PIKACHU] = { - .size = 103, + .size = 0x67, .y_offset = 9, }, [SPECIES_RAICHU] = { - .size = 103, + .size = 0x67, .y_offset = 4, }, [SPECIES_SANDSHREW] = { - .size = 85, + .size = 0x55, .y_offset = 14, }, [SPECIES_SANDSLASH] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_NIDORAN_F] = { - .size = 69, + .size = 0x45, .y_offset = 15, }, [SPECIES_NIDORINA] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_NIDOQUEEN] = { - .size = 120, + .size = 0x78, .y_offset = 3, }, [SPECIES_NIDORAN_M] = { - .size = 85, + .size = 0x55, .y_offset = 12, }, [SPECIES_NIDORINO] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_NIDOKING] = { - .size = 120, + .size = 0x78, .y_offset = 2, }, [SPECIES_CLEFAIRY] = { - .size = 85, + .size = 0x55, .y_offset = 16, }, [SPECIES_CLEFABLE] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_VULPIX] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_NINETALES] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_JIGGLYPUFF] = { - .size = 69, + .size = 0x45, .y_offset = 16, }, [SPECIES_WIGGLYTUFF] = { - .size = 103, + .size = 0x67, .y_offset = 8, }, [SPECIES_ZUBAT] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_GOLBAT] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_ODDISH] = { - .size = 69, + .size = 0x45, .y_offset = 15, }, [SPECIES_GLOOM] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_VILEPLUME] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_PARAS] = { - .size = 85, + .size = 0x55, .y_offset = 15, }, [SPECIES_PARASECT] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_VENONAT] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_VENOMOTH] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_DIGLETT] = { - .size = 84, + .size = 0x54, .y_offset = 18, }, [SPECIES_DUGTRIO] = { - .size = 117, + .size = 0x75, .y_offset = 13, }, [SPECIES_MEOWTH] = { - .size = 85, + .size = 0x55, .y_offset = 12, }, [SPECIES_PERSIAN] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_PSYDUCK] = { - .size = 86, + .size = 0x56, .y_offset = 9, }, [SPECIES_GOLDUCK] = { - .size = 120, + .size = 0x78, .y_offset = 2, }, [SPECIES_MANKEY] = { - .size = 101, + .size = 0x65, .y_offset = 14, }, [SPECIES_PRIMEAPE] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_GROWLITHE] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_ARCANINE] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_POLIWAG] = { - .size = 116, - .y_offset = 19, + .size = 0x74, + .y_offset = 0x13, }, [SPECIES_POLIWHIRL] = { - .size = 118, + .size = 0x76, .y_offset = 10, }, [SPECIES_POLIWRATH] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_ABRA] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_KADABRA] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_ALAKAZAM] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_MACHOP] = { - .size = 86, + .size = 0x56, .y_offset = 11, }, [SPECIES_MACHOKE] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_MACHAMP] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_BELLSPROUT] = { - .size = 101, + .size = 0x65, .y_offset = 15, }, [SPECIES_WEEPINBELL] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_VICTREEBEL] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_TENTACOOL] = { - .size = 70, + .size = 0x46, .y_offset = 9, }, [SPECIES_TENTACRUEL] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_GEODUDE] = { - .size = 84, + .size = 0x54, .y_offset = 18, }, [SPECIES_GRAVELER] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_GOLEM] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_PONYTA] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_RAPIDASH] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_SLOWPOKE] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_SLOWBRO] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_MAGNEMITE] = { - .size = 67, - .y_offset = 21, + .size = 0x43, + .y_offset = 0x15, }, [SPECIES_MAGNETON] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_FARFETCHD] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_DODUO] = { - .size = 87, + .size = 0x57, .y_offset = 5, }, [SPECIES_DODRIO] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_SEEL] = { - .size = 118, + .size = 0x76, .y_offset = 10, }, [SPECIES_DEWGONG] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_GRIMER] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_MUK] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_SHELLDER] = { - .size = 85, + .size = 0x55, .y_offset = 16, }, [SPECIES_CLOYSTER] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_GASTLY] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_HAUNTER] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_GENGAR] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_ONIX] = { - .size = 120, + .size = 0x78, .y_offset = 2, }, [SPECIES_DROWZEE] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_HYPNO] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_KRABBY] = { - .size = 101, + .size = 0x65, .y_offset = 13, }, [SPECIES_KINGLER] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_VOLTORB] = { - .size = 68, - .y_offset = 19, + .size = 0x44, + .y_offset = 0x13, }, [SPECIES_ELECTRODE] = { - .size = 85, + .size = 0x55, .y_offset = 14, }, [SPECIES_EXEGGCUTE] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_EXEGGUTOR] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_CUBONE] = { - .size = 85, + .size = 0x55, .y_offset = 15, }, [SPECIES_MAROWAK] = { - .size = 118, + .size = 0x76, .y_offset = 11, }, [SPECIES_HITMONLEE] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_HITMONCHAN] = { - .size = 103, + .size = 0x67, .y_offset = 4, }, [SPECIES_LICKITUNG] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_KOFFING] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_WEEZING] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_RHYHORN] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_RHYDON] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_CHANSEY] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_TANGELA] = { - .size = 103, + .size = 0x67, .y_offset = 7, }, [SPECIES_KANGASKHAN] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_HORSEA] = { - .size = 69, + .size = 0x45, .y_offset = 15, }, [SPECIES_SEADRA] = { - .size = 103, + .size = 0x67, .y_offset = 7, }, [SPECIES_GOLDEEN] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_SEAKING] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_STARYU] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_STARMIE] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_MR_MIME] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_SCYTHER] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_JYNX] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_ELECTABUZZ] = { - .size = 120, + .size = 0x78, .y_offset = 2, }, [SPECIES_MAGMAR] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_PINSIR] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_TAUROS] = { - .size = 120, + .size = 0x78, .y_offset = 0, }, [SPECIES_MAGIKARP] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_GYARADOS] = { - .size = 136, + .size = 0x88, .y_offset = 8, }, [SPECIES_LAPRAS] = { - .size = 133, + .size = 0x85, .y_offset = 13, }, [SPECIES_DITTO] = { - .size = 84, - .y_offset = 17, + .size = 0x54, + .y_offset = 0x11, }, [SPECIES_EEVEE] = { - .size = 86, + .size = 0x56, .y_offset = 9, }, [SPECIES_VAPOREON] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_JOLTEON] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_FLAREON] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_PORYGON] = { - .size = 85, + .size = 0x55, .y_offset = 13, }, [SPECIES_OMANYTE] = { - .size = 69, + .size = 0x45, .y_offset = 15, }, [SPECIES_OMASTAR] = { - .size = 103, + .size = 0x67, .y_offset = 7, }, [SPECIES_KABUTO] = { - .size = 84, - .y_offset = 17, + .size = 0x54, + .y_offset = 0x11, }, [SPECIES_KABUTOPS] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_AERODACTYL] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_SNORLAX] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_ARTICUNO] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_ZAPDOS] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_MOLTRES] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_DRATINI] = { - .size = 117, + .size = 0x75, .y_offset = 14, }, [SPECIES_DRAGONAIR] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_DRAGONITE] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_MEWTWO] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_MEW] = { - .size = 85, + .size = 0x55, .y_offset = 13, }, [SPECIES_CHIKORITA] = { - .size = 117, + .size = 0x75, .y_offset = 13, }, [SPECIES_BAYLEEF] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_MEGANIUM] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_CYNDAQUIL] = { - .size = 85, + .size = 0x55, .y_offset = 14, }, [SPECIES_QUILAVA] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_TYPHLOSION] = { - .size = 120, + .size = 0x78, .y_offset = 0, }, [SPECIES_TOTODILE] = { - .size = 85, + .size = 0x55, .y_offset = 15, }, [SPECIES_CROCONAW] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_FERALIGATR] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_SENTRET] = { - .size = 71, + .size = 0x47, .y_offset = 4, }, [SPECIES_FURRET] = { - .size = 103, + .size = 0x67, .y_offset = 7, }, [SPECIES_HOOTHOOT] = { - .size = 85, + .size = 0x55, .y_offset = 13, }, [SPECIES_NOCTOWL] = { - .size = 88, + .size = 0x58, .y_offset = 3, }, [SPECIES_LEDYBA] = { - .size = 86, + .size = 0x56, .y_offset = 12, }, [SPECIES_LEDIAN] = { - .size = 103, + .size = 0x67, .y_offset = 4, }, [SPECIES_SPINARAK] = { - .size = 84, - .y_offset = 19, + .size = 0x54, + .y_offset = 0x13, }, [SPECIES_ARIADOS] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_CROBAT] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_CHINCHOU] = { - .size = 117, + .size = 0x75, .y_offset = 16, }, [SPECIES_LANTURN] = { - .size = 135, + .size = 0x87, .y_offset = 11, }, [SPECIES_PICHU] = { - .size = 69, + .size = 0x45, .y_offset = 12, }, [SPECIES_CLEFFA] = { - .size = 68, + .size = 0x44, .y_offset = 20, }, [SPECIES_IGGLYBUFF] = { - .size = 68, + .size = 0x44, .y_offset = 18, }, [SPECIES_TOGEPI] = { - .size = 52, + .size = 0x34, .y_offset = 20, }, [SPECIES_TOGETIC] = { - .size = 70, + .size = 0x46, .y_offset = 9, }, [SPECIES_NATU] = { - .size = 68, + .size = 0x44, .y_offset = 20, }, [SPECIES_XATU] = { - .size = 71, + .size = 0x47, .y_offset = 7, }, [SPECIES_MAREEP] = { - .size = 85, + .size = 0x55, .y_offset = 16, }, [SPECIES_FLAAFFY] = { - .size = 86, + .size = 0x56, .y_offset = 10, }, [SPECIES_AMPHAROS] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_BELLOSSOM] = { - .size = 69, + .size = 0x45, .y_offset = 14, }, [SPECIES_MARILL] = { - .size = 101, + .size = 0x65, .y_offset = 14, }, [SPECIES_AZUMARILL] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_SUDOWOODO] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_POLITOED] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_HOPPIP] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_SKIPLOOM] = { - .size = 85, + .size = 0x55, .y_offset = 15, }, [SPECIES_JUMPLUFF] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_AIPOM] = { - .size = 88, + .size = 0x58, .y_offset = 3, }, [SPECIES_SUNKERN] = { - .size = 68, + .size = 0x44, .y_offset = 16, }, [SPECIES_SUNFLORA] = { - .size = 86, + .size = 0x56, .y_offset = 8, }, [SPECIES_YANMA] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_WOOPER] = { - .size = 84, + .size = 0x54, .y_offset = 16, }, [SPECIES_QUAGSIRE] = { - .size = 119, + .size = 0x77, .y_offset = 7, }, [SPECIES_ESPEON] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_UMBREON] = { - .size = 103, + .size = 0x67, .y_offset = 8, }, [SPECIES_MURKROW] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_SLOWKING] = { - .size = 88, + .size = 0x58, .y_offset = 1, }, [SPECIES_MISDREAVUS] = { - .size = 85, + .size = 0x55, .y_offset = 12, }, [SPECIES_UNOWN] = { - .size = 53, + .size = 0x35, .y_offset = 15, }, [SPECIES_WOBBUFFET] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_GIRAFARIG] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_PINECO] = { - .size = 86, + .size = 0x56, .y_offset = 10, }, [SPECIES_FORRETRESS] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_DUNSPARCE] = { - .size = 116, - .y_offset = 17, + .size = 0x74, + .y_offset = 0x11, }, [SPECIES_GLIGAR] = { - .size = 120, + .size = 0x78, .y_offset = 3, }, [SPECIES_STEELIX] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_SNUBBULL] = { - .size = 85, + .size = 0x55, .y_offset = 13, }, [SPECIES_GRANBULL] = { - .size = 87, + .size = 0x57, .y_offset = 6, }, [SPECIES_QWILFISH] = { - .size = 86, + .size = 0x56, .y_offset = 10, }, [SPECIES_SCIZOR] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_SHUCKLE] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_HERACROSS] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_SNEASEL] = { - .size = 103, + .size = 0x67, .y_offset = 5, }, [SPECIES_TEDDIURSA] = { - .size = 69, + .size = 0x45, .y_offset = 13, }, [SPECIES_URSARING] = { - .size = 120, + .size = 0x78, .y_offset = 1, }, [SPECIES_SLUGMA] = { - .size = 69, + .size = 0x45, .y_offset = 13, }, [SPECIES_MAGCARGO] = { - .size = 87, + .size = 0x57, .y_offset = 13, }, [SPECIES_SWINUB] = { - .size = 67, + .size = 0x43, .y_offset = 20, }, [SPECIES_PILOSWINE] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_CORSOLA] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_REMORAID] = { - .size = 85, + .size = 0x55, .y_offset = 14, }, [SPECIES_OCTILLERY] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_DELIBIRD] = { - .size = 86, + .size = 0x56, .y_offset = 8, }, [SPECIES_MANTINE] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_SKARMORY] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_HOUNDOUR] = { - .size = 86, + .size = 0x56, .y_offset = 11, }, [SPECIES_HOUNDOOM] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_KINGDRA] = { - .size = 120, + .size = 0x78, .y_offset = 4, }, [SPECIES_PHANPY] = { - .size = 84, + .size = 0x54, .y_offset = 16, }, [SPECIES_DONPHAN] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_PORYGON2] = { - .size = 85, + .size = 0x55, .y_offset = 15, }, [SPECIES_STANTLER] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_SMEARGLE] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_TYROGUE] = { - .size = 70, + .size = 0x46, .y_offset = 9, }, [SPECIES_HITMONTOP] = { - .size = 103, + .size = 0x67, .y_offset = 5, }, [SPECIES_SMOOCHUM] = { - .size = 53, + .size = 0x35, .y_offset = 15, }, [SPECIES_ELEKID] = { - .size = 118, + .size = 0x76, .y_offset = 10, }, [SPECIES_MAGBY] = { - .size = 69, + .size = 0x45, .y_offset = 13, }, [SPECIES_MILTANK] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_BLISSEY] = { - .size = 119, + .size = 0x77, .y_offset = 6, }, [SPECIES_RAIKOU] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_ENTEI] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_SUICUNE] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_LARVITAR] = { - .size = 70, + .size = 0x46, .y_offset = 9, }, [SPECIES_PUPITAR] = { - .size = 86, + .size = 0x56, .y_offset = 9, }, [SPECIES_TYRANITAR] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_LUGIA] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_HO_OH] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_CELEBI] = { - .size = 85, + .size = 0x55, .y_offset = 14, }, [SPECIES_OLD_UNOWN_B] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_C] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_D] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_E] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_F] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_G] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_H] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_I] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_J] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_K] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_L] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_M] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_N] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_O] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_P] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_Q] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_R] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_S] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_T] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_U] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_V] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_W] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_X] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_Y] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_OLD_UNOWN_Z] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_TREECKO] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_GROVYLE] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_SCEPTILE] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_TORCHIC] = { - .size = 86, + .size = 0x56, .y_offset = 8, }, [SPECIES_COMBUSKEN] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_BLAZIKEN] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_MUDKIP] = { - .size = 86, + .size = 0x56, .y_offset = 12, }, [SPECIES_MARSHTOMP] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_SWAMPERT] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_POOCHYENA] = { - .size = 85, + .size = 0x55, .y_offset = 12, }, [SPECIES_MIGHTYENA] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_ZIGZAGOON] = { - .size = 133, + .size = 0x85, .y_offset = 15, }, [SPECIES_LINOONE] = { - .size = 120, + .size = 0x78, .y_offset = 3, }, [SPECIES_WURMPLE] = { - .size = 69, + .size = 0x45, .y_offset = 14, }, [SPECIES_SILCOON] = { - .size = 117, - .y_offset = 17, + .size = 0x75, + .y_offset = 0x11, }, [SPECIES_BEAUTIFLY] = { - .size = 134, + .size = 0x86, .y_offset = 9, }, [SPECIES_CASCOON] = { - .size = 116, + .size = 0x74, .y_offset = 16, }, [SPECIES_DUSTOX] = { - .size = 134, + .size = 0x86, .y_offset = 15, }, [SPECIES_LOTAD] = { - .size = 101, + .size = 0x65, .y_offset = 14, }, [SPECIES_LOMBRE] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_LUDICOLO] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_SEEDOT] = { - .size = 70, + .size = 0x46, .y_offset = 16, }, [SPECIES_NUZLEAF] = { - .size = 86, + .size = 0x56, .y_offset = 8, }, [SPECIES_SHIFTRY] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_NINCADA] = { - .size = 116, + .size = 0x74, .y_offset = 18, }, [SPECIES_NINJASK] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_SHEDINJA] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_TAILLOW] = { - .size = 100, + .size = 0x64, .y_offset = 16, }, [SPECIES_SWELLOW] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_SHROOMISH] = { - .size = 84, + .size = 0x54, .y_offset = 16, }, [SPECIES_BRELOOM] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_SPINDA] = { - .size = 104, + .size = 0x68, .y_offset = 8, }, [SPECIES_WINGULL] = { - .size = 132, - .y_offset = 24, + .size = 0x84, + .y_offset = 0x18, }, [SPECIES_PELIPPER] = { - .size = 119, + .size = 0x77, .y_offset = 4, }, [SPECIES_SURSKIT] = { - .size = 101, + .size = 0x65, .y_offset = 15, }, [SPECIES_MASQUERAIN] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_WAILMER] = { - .size = 117, + .size = 0x75, .y_offset = 15, }, [SPECIES_WAILORD] = { - .size = 135, + .size = 0x87, .y_offset = 10, }, [SPECIES_SKITTY] = { - .size = 102, + .size = 0x66, .y_offset = 11, }, [SPECIES_DELCATTY] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_KECLEON] = { - .size = 103, + .size = 0x67, .y_offset = 7, }, [SPECIES_BALTOY] = { - .size = 85, + .size = 0x55, .y_offset = 16, }, [SPECIES_CLAYDOL] = { - .size = 120, + .size = 0x78, .y_offset = 6, }, [SPECIES_NOSEPASS] = { - .size = 86, + .size = 0x56, .y_offset = 12, }, [SPECIES_TORKOAL] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_SABLEYE] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_BARBOACH] = { - .size = 70, + .size = 0x46, .y_offset = 11, }, [SPECIES_WHISCASH] = { - .size = 118, + .size = 0x76, .y_offset = 9, }, [SPECIES_LUVDISC] = { - .size = 70, - .y_offset = 24, + .size = 0x46, + .y_offset = 0x18, }, [SPECIES_CORPHISH] = { - .size = 102, + .size = 0x66, .y_offset = 12, }, [SPECIES_CRAWDAUNT] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_FEEBAS] = { - .size = 70, + .size = 0x46, .y_offset = 13, }, [SPECIES_MILOTIC] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_CARVANHA] = { - .size = 103, + .size = 0x67, .y_offset = 6, }, [SPECIES_SHARPEDO] = { - .size = 120, + .size = 0x78, .y_offset = 3, }, [SPECIES_TRAPINCH] = { - .size = 84, + .size = 0x54, .y_offset = 16, }, [SPECIES_VIBRAVA] = { - .size = 134, + .size = 0x86, .y_offset = 12, }, [SPECIES_FLYGON] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_MAKUHITA] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_HARIYAMA] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_ELECTRIKE] = { - .size = 100, + .size = 0x64, .y_offset = 18, }, [SPECIES_MANECTRIC] = { - .size = 103, + .size = 0x67, .y_offset = 4, }, [SPECIES_NUMEL] = { - .size = 101, + .size = 0x65, .y_offset = 15, }, [SPECIES_CAMERUPT] = { - .size = 135, + .size = 0x87, .y_offset = 9, }, [SPECIES_SPHEAL] = { - .size = 101, + .size = 0x65, .y_offset = 16, }, [SPECIES_SEALEO] = { - .size = 134, + .size = 0x86, .y_offset = 10, }, [SPECIES_WALREIN] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_CACNEA] = { - .size = 116, + .size = 0x74, .y_offset = 16, }, [SPECIES_CACTURNE] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_SNORUNT] = { - .size = 86, + .size = 0x56, .y_offset = 11, }, [SPECIES_GLALIE] = { - .size = 118, + .size = 0x76, .y_offset = 10, }, [SPECIES_LUNATONE] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_SOLROCK] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_AZURILL] = { - .size = 85, + .size = 0x55, .y_offset = 15, }, [SPECIES_SPOINK] = { - .size = 70, + .size = 0x46, .y_offset = 9, }, [SPECIES_GRUMPIG] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_PLUSLE] = { - .size = 86, + .size = 0x56, .y_offset = 14, }, [SPECIES_MINUN] = { - .size = 102, + .size = 0x66, .y_offset = 12, }, [SPECIES_MAWILE] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_MEDITITE] = { - .size = 101, + .size = 0x65, .y_offset = 12, }, [SPECIES_MEDICHAM] = { - .size = 104, + .size = 0x68, .y_offset = 1, }, [SPECIES_SWABLU] = { - .size = 118, - .y_offset = 17, + .size = 0x76, + .y_offset = 0x11, }, [SPECIES_ALTARIA] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_WYNAUT] = { - .size = 85, + .size = 0x55, .y_offset = 12, }, [SPECIES_DUSKULL] = { - .size = 102, + .size = 0x66, .y_offset = 10, }, [SPECIES_DUSCLOPS] = { - .size = 119, + .size = 0x77, .y_offset = 5, }, [SPECIES_ROSELIA] = { - .size = 118, + .size = 0x76, .y_offset = 8, }, [SPECIES_SLAKOTH] = { - .size = 116, + .size = 0x74, .y_offset = 18, }, [SPECIES_VIGOROTH] = { - .size = 120, + .size = 0x78, .y_offset = 0, }, [SPECIES_SLAKING] = { - .size = 134, + .size = 0x86, .y_offset = 8, }, [SPECIES_GULPIN] = { - .size = 85, + .size = 0x55, .y_offset = 18, }, [SPECIES_SWALOT] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_TROPIUS] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_WHISMUR] = { - .size = 85, + .size = 0x55, .y_offset = 14, }, [SPECIES_LOUDRED] = { - .size = 120, + .size = 0x78, .y_offset = 3, }, [SPECIES_EXPLOUD] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_CLAMPERL] = { - .size = 85, + .size = 0x55, .y_offset = 14, }, [SPECIES_HUNTAIL] = { - .size = 120, + .size = 0x78, .y_offset = 3, }, [SPECIES_GOREBYSS] = { - .size = 134, + .size = 0x86, .y_offset = 11, }, [SPECIES_ABSOL] = { - .size = 104, + .size = 0x68, .y_offset = 0, }, [SPECIES_SHUPPET] = { - .size = 86, + .size = 0x56, .y_offset = 14, }, [SPECIES_BANETTE] = { - .size = 85, + .size = 0x55, .y_offset = 12, }, [SPECIES_SEVIPER] = { - .size = 119, + .size = 0x77, .y_offset = 8, }, [SPECIES_ZANGOOSE] = { - .size = 135, + .size = 0x87, .y_offset = 5, }, [SPECIES_RELICANTH] = { - .size = 119, + .size = 0x77, .y_offset = 11, }, [SPECIES_ARON] = { - .size = 67, + .size = 0x43, .y_offset = 20, }, [SPECIES_LAIRON] = { - .size = 117, + .size = 0x75, .y_offset = 13, }, [SPECIES_AGGRON] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_CASTFORM] = { - .size = 52, - .y_offset = 17, + .size = 0x34, + .y_offset = 0x11, }, [SPECIES_VOLBEAT] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_ILLUMISE] = { - .size = 86, + .size = 0x56, .y_offset = 8, }, [SPECIES_LILEEP] = { - .size = 103, + .size = 0x67, .y_offset = 7, }, [SPECIES_CRADILY] = { - .size = 120, + .size = 0x78, .y_offset = 0, }, [SPECIES_ANORITH] = { - .size = 102, + .size = 0x66, .y_offset = 8, }, [SPECIES_ARMALDO] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_RALTS] = { - .size = 53, + .size = 0x35, .y_offset = 15, }, [SPECIES_KIRLIA] = { - .size = 71, + .size = 0x47, .y_offset = 6, }, [SPECIES_GARDEVOIR] = { - .size = 120, + .size = 0x78, .y_offset = 1, }, [SPECIES_BAGON] = { - .size = 86, + .size = 0x56, .y_offset = 11, }, [SPECIES_SHELGON] = { - .size = 102, + .size = 0x66, .y_offset = 9, }, [SPECIES_SALAMENCE] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_BELDUM] = { - .size = 85, + .size = 0x55, .y_offset = 15, }, [SPECIES_METANG] = { - .size = 135, + .size = 0x87, .y_offset = 7, }, [SPECIES_METAGROSS] = { - .size = 135, + .size = 0x87, .y_offset = 6, }, [SPECIES_REGIROCK] = { - .size = 120, + .size = 0x78, .y_offset = 4, }, [SPECIES_REGICE] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_REGISTEEL] = { - .size = 136, + .size = 0x88, .y_offset = 3, }, [SPECIES_KYOGRE] = { - .size = 135, + .size = 0x87, .y_offset = 4, }, [SPECIES_GROUDON] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_RAYQUAZA] = { - .size = 136, + .size = 0x88, .y_offset = 0, }, [SPECIES_LATIAS] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_LATIOS] = { - .size = 136, + .size = 0x88, .y_offset = 2, }, [SPECIES_JIRACHI] = { - .size = 102, + .size = 0x66, .y_offset = 13, }, [SPECIES_DEOXYS] = { - .size = 136, + .size = 0x88, .y_offset = 1, }, [SPECIES_CHIMECHO] = { - .size = 55, + .size = 0x37, .y_offset = 6, }, [SPECIES_EGG] = { - .size = 51, + .size = 0x33, .y_offset = 20, }, [SPECIES_UNOWN_B] = { - .size = 52, + .size = 0x34, .y_offset = 16, }, [SPECIES_UNOWN_C] = { - .size = 68, + .size = 0x44, .y_offset = 16, }, [SPECIES_UNOWN_D] = { - .size = 68, + .size = 0x44, .y_offset = 16, }, [SPECIES_UNOWN_E] = { - .size = 68, - .y_offset = 17, + .size = 0x44, + .y_offset = 0x11, }, [SPECIES_UNOWN_F] = { - .size = 68, - .y_offset = 17, + .size = 0x44, + .y_offset = 0x11, }, [SPECIES_UNOWN_G] = { - .size = 53, + .size = 0x35, .y_offset = 14, }, [SPECIES_UNOWN_H] = { - .size = 68, + .size = 0x44, .y_offset = 16, }, [SPECIES_UNOWN_I] = { - .size = 52, + .size = 0x34, .y_offset = 16, }, [SPECIES_UNOWN_J] = { - .size = 52, - .y_offset = 17, + .size = 0x34, + .y_offset = 0x11, }, [SPECIES_UNOWN_K] = { - .size = 68, - .y_offset = 17, + .size = 0x44, + .y_offset = 0x11, }, [SPECIES_UNOWN_L] = { - .size = 52, - .y_offset = 19, + .size = 0x34, + .y_offset = 0x13, }, [SPECIES_UNOWN_M] = { - .size = 68, - .y_offset = 19, + .size = 0x44, + .y_offset = 0x13, }, [SPECIES_UNOWN_N] = { - .size = 67, + .size = 0x43, .y_offset = 20, }, [SPECIES_UNOWN_O] = { - .size = 68, + .size = 0x44, .y_offset = 16, }, [SPECIES_UNOWN_P] = { - .size = 52, - .y_offset = 19, + .size = 0x34, + .y_offset = 0x13, }, [SPECIES_UNOWN_Q] = { - .size = 67, - .y_offset = 21, + .size = 0x43, + .y_offset = 0x15, }, [SPECIES_UNOWN_R] = { - .size = 52, - .y_offset = 19, + .size = 0x34, + .y_offset = 0x13, }, [SPECIES_UNOWN_S] = { - .size = 69, + .size = 0x45, .y_offset = 12, }, [SPECIES_UNOWN_T] = { - .size = 52, + .size = 0x34, .y_offset = 18, }, [SPECIES_UNOWN_U] = { - .size = 68, + .size = 0x44, .y_offset = 18, }, [SPECIES_UNOWN_V] = { - .size = 68, + .size = 0x44, .y_offset = 18, }, [SPECIES_UNOWN_W] = { - .size = 68, - .y_offset = 19, + .size = 0x44, + .y_offset = 0x13, }, [SPECIES_UNOWN_X] = { - .size = 51, - .y_offset = 21, + .size = 0x33, + .y_offset = 0x15, }, [SPECIES_UNOWN_Y] = { - .size = 52, - .y_offset = 17, + .size = 0x34, + .y_offset = 0x11, }, [SPECIES_UNOWN_Z] = { - .size = 52, + .size = 0x34, .y_offset = 16, }, [SPECIES_UNOWN_EMARK] = { - .size = 53, + .size = 0x35, .y_offset = 15, }, [SPECIES_UNOWN_QMARK] = { - .size = 53, + .size = 0x35, .y_offset = 13, }, }; -- cgit v1.2.3 From 6eccf019dbbca1a4fc08ac09233c964524b687f2 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 21 Jul 2020 19:32:33 -0400 Subject: Fixed missing changes. --- src/data/pokemon_graphics/back_pic_coordinates.h | 42 ++++++++++---------- src/data/pokemon_graphics/front_pic_coordinates.h | 48 +++++++++++------------ 2 files changed, 45 insertions(+), 45 deletions(-) (limited to 'src/data') diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 30ef712b1..131ac13d9 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -233,7 +233,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_PARAS] = { .size = 0x63, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_PARASECT] = { @@ -408,7 +408,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_MAGNEMITE] = { .size = 0x43, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_MAGNETON] = { @@ -663,7 +663,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_DITTO] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_EEVEE] = { @@ -838,7 +838,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SPINARAK] = { .size = 0x73, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_ARIADOS] = { @@ -888,7 +888,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_NATU] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_XATU] = { @@ -1103,7 +1103,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SWINUB] = { .size = 0x63, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_PILOSWINE] = { @@ -1458,7 +1458,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_SILCOON] = { .size = 0x83, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_BEAUTIFLY] = { @@ -1468,12 +1468,12 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_CASCOON] = { .size = 0x73, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_DUSTOX] = { .size = 0x83, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_LOTAD] = { @@ -1508,7 +1508,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_NINCADA] = { .size = 0x83, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_NINJASK] = { @@ -1523,7 +1523,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_TAILLOW] = { .size = 0x64, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_SWELLOW] = { @@ -1568,12 +1568,12 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_WAILMER] = { .size = 0x83, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_WAILORD] = { .size = 0x83, - .y_offset = 0x16, + .y_offset = 22, }, [SPECIES_SKITTY] = { @@ -1668,7 +1668,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_VIBRAVA] = { .size = 0x74, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_FLYGON] = { @@ -1703,12 +1703,12 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_CAMERUPT] = { .size = 0x84, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_SPHEAL] = { .size = 0x64, - .y_offset = 0x12, + .y_offset = 18, }, [SPECIES_SEALEO] = { @@ -1913,12 +1913,12 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_ARON] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_LAIRON] = { .size = 0x84, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_AGGRON] = { @@ -1953,7 +1953,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_ANORITH] = { .size = 0x83, - .y_offset = 0x17, + .y_offset = 23, }, [SPECIES_ARMALDO] = { @@ -2003,7 +2003,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_METAGROSS] = { .size = 0x83, - .y_offset = 0x14, + .y_offset = 20, }, [SPECIES_REGIROCK] = { @@ -2023,7 +2023,7 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_KYOGRE] = { .size = 0x84, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_GROUDON] = { diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 90bf967af..b787877b9 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -303,7 +303,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_POLIWAG] = { .size = 0x74, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_POLIWHIRL] = { @@ -408,7 +408,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_MAGNEMITE] = { .size = 0x43, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_MAGNETON] = { @@ -503,7 +503,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_VOLTORB] = { .size = 0x44, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_ELECTRODE] = { @@ -663,7 +663,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_DITTO] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_EEVEE] = { @@ -703,7 +703,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_KABUTO] = { .size = 0x54, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_KABUTOPS] = { @@ -838,7 +838,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SPINARAK] = { .size = 0x54, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_ARIADOS] = { @@ -1033,7 +1033,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_DUNSPARCE] = { .size = 0x74, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_GLIGAR] = { @@ -1458,7 +1458,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SILCOON] = { .size = 0x75, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_BEAUTIFLY] = { @@ -1548,7 +1548,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_WINGULL] = { .size = 0x84, - .y_offset = 0x18, + .y_offset = 24, }, [SPECIES_PELIPPER] = { @@ -1628,7 +1628,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_LUVDISC] = { .size = 0x46, - .y_offset = 0x18, + .y_offset = 24, }, [SPECIES_CORPHISH] = { @@ -1793,7 +1793,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_SWABLU] = { .size = 0x76, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_ALTARIA] = { @@ -1928,7 +1928,7 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_CASTFORM] = { .size = 0x34, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_VOLBEAT] = { @@ -2083,12 +2083,12 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_UNOWN_E] = { .size = 0x44, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_F] = { .size = 0x44, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_G] = { @@ -2108,22 +2108,22 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_UNOWN_J] = { .size = 0x34, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_K] = { .size = 0x44, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_L] = { .size = 0x34, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_M] = { .size = 0x44, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_N] = { @@ -2138,17 +2138,17 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_UNOWN_P] = { .size = 0x34, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_Q] = { .size = 0x43, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_UNOWN_R] = { .size = 0x34, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_S] = { @@ -2173,17 +2173,17 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_UNOWN_W] = { .size = 0x44, - .y_offset = 0x13, + .y_offset = 19, }, [SPECIES_UNOWN_X] = { .size = 0x33, - .y_offset = 0x15, + .y_offset = 21, }, [SPECIES_UNOWN_Y] = { .size = 0x34, - .y_offset = 0x11, + .y_offset = 17, }, [SPECIES_UNOWN_Z] = { -- cgit v1.2.3 From 36a4764a784ec5eb0a5dbcd59bcce6804cded2f4 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 26 Jul 2020 01:17:09 -0400 Subject: Document some slot machine data --- src/data/graphics/slot_machine.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/data') diff --git a/src/data/graphics/slot_machine.h b/src/data/graphics/slot_machine.h index a94f2b622..94ab989e2 100644 --- a/src/data/graphics/slot_machine.h +++ b/src/data/graphics/slot_machine.h @@ -10,7 +10,7 @@ const u16 gUnknown_08DCF190[] = INCBIN_U16("graphics/slot_machine/reel_pikachu.g const u16 gUnknown_08DCF1B0[] = INCBIN_U16("graphics/slot_machine/shadow.gbapal"); -const u16 gSlotMachineReelTime_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time.gbapal"); +const u16 gSlotMachineDigitalDisplay_Pal[] = INCBIN_U16("graphics/slot_machine/digital_display.gbapal"); const u16 gUnknown_08DCF1F0[] = INCBIN_U16("graphics/slot_machine/smoke.gbapal"); // also duck and pika aura @@ -26,7 +26,7 @@ const u8 gSlotMachineReelSymbol5Tiles[] = INCBIN_U8("graphics/slot_machine/reel_ const u8 gSlotMachineReelSymbol6Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/6.4bpp"); const u8 gSlotMachineReelSymbol7Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/7.4bpp"); -const u32 gSlotMachineReelTime_Gfx[] = INCBIN_U32("graphics/slot_machine/reel_time.4bpp.lz"); +const u32 gSlotMachineDigitalDisplay_Gfx[] = INCBIN_U32("graphics/slot_machine/digital_display.4bpp.lz"); const u8 gSlotMachineNumber0Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/0.4bpp"); const u8 gSlotMachineNumber1Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/1.4bpp"); @@ -39,7 +39,7 @@ const u8 gSlotMachineNumber7Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/7 const u8 gSlotMachineNumber8Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/8.4bpp"); const u8 gSlotMachineNumber9Tiles[] = INCBIN_U8("graphics/slot_machine/numbers/9.4bpp"); -const u8 gSlotMachineReelTimeBolt[] = INCBIN_U8("graphics/slot_machine/bolt.4bpp"); +const u8 gSlotMachinePikaPowerBolt[] = INCBIN_U8("graphics/slot_machine/bolt.4bpp"); const u8 gSlotMachineReelTimeDuck[] = INCBIN_U8("graphics/slot_machine/duck.4bpp"); const u8 gSlotMachineReelTimeSmoke[] = INCBIN_U8("graphics/slot_machine/smoke.4bpp"); @@ -50,8 +50,8 @@ const u8 gSlotMachineReelTimeNumber3[] = INCBIN_U8("graphics/slot_machine/reel_t const u8 gSlotMachineReelTimeNumber4[] = INCBIN_U8("graphics/slot_machine/reel_time_numbers/4.4bpp"); const u8 gSlotMachineReelTimeNumber5[] = INCBIN_U8("graphics/slot_machine/reel_time_numbers/5.4bpp"); -const u8 gSlotMachineReelTimeLargeBolt0[] = INCBIN_U8("graphics/slot_machine/large_bolt/0.4bpp"); -const u8 gSlotMachineReelTimeLargeBolt1[] = INCBIN_U8("graphics/slot_machine/large_bolt/1.4bpp"); +const u8 gSlotMachineReelTimeBolt0[] = INCBIN_U8("graphics/slot_machine/large_bolt/0.4bpp"); +const u8 gSlotMachineReelTimeBolt1[] = INCBIN_U8("graphics/slot_machine/large_bolt/1.4bpp"); const u8 gSlotMachineReelTimeExplosion0[] = INCBIN_U8("graphics/slot_machine/reel_time_explosion/0.4bpp"); const u8 gSlotMachineReelTimeExplosion1[] = INCBIN_U8("graphics/slot_machine/reel_time_explosion/1.4bpp"); -- cgit v1.2.3 From b22709ee3df4c4c7b8511fd5a824b5796df84d9a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 27 Jul 2020 16:31:36 -0400 Subject: More slot machine data documentation --- src/data/graphics/slot_machine.h | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'src/data') diff --git a/src/data/graphics/slot_machine.h b/src/data/graphics/slot_machine.h index 94ab989e2..6500ad7f3 100644 --- a/src/data/graphics/slot_machine.h +++ b/src/data/graphics/slot_machine.h @@ -2,22 +2,16 @@ const u16 gSlotMachineMenu_Pal[] = INCBIN_U16("graphics/slot_machine/menu.gbapal const u32 gSlotMachineMenu_Gfx[] = INCBIN_U32("graphics/slot_machine/menu.4bpp.lz"); const u16 gSlotMachineMenu_Tilemap[] = INCBIN_U16("graphics/slot_machine/menu.bin"); -const u16 gUnknown_08DCEC70[] = INCBIN_U16("graphics/slot_machine/slots_layout.bin"); - -const u16 gUnknown_08DCF170[] = INCBIN_U16("graphics/slot_machine/reel_symbols/1.gbapal"); - -const u16 gUnknown_08DCF190[] = INCBIN_U16("graphics/slot_machine/reel_pikachu.gbapal"); - -const u16 gUnknown_08DCF1B0[] = INCBIN_U16("graphics/slot_machine/shadow.gbapal"); - +const u16 gSlotMachineInfoBox_Tilemap[] = INCBIN_U16("graphics/slot_machine/info_box.bin"); + +const u16 gSlotMachineReelSymbols_Pal[] = INCBIN_U16("graphics/slot_machine/reel_symbols/1.gbapal"); +const u16 gSlotMachineReelTimePikachu_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time_pikachu.gbapal"); +const u16 gSlotMachineReelTimeMisc_Pal[] = INCBIN_U16("graphics/slot_machine/shadow.gbapal"); +const u16 gSlotMachineReelTimeMachine_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time_machine.gbapal"); +const u16 gSlotMachineMisc_Pal[] = INCBIN_U16("graphics/slot_machine/smoke.gbapal"); +const u16 gSlotMachineReelTimeExplosion_Pal[] = INCBIN_U16("graphics/slot_machine/reel_time_explosion/0.gbapal"); const u16 gSlotMachineDigitalDisplay_Pal[] = INCBIN_U16("graphics/slot_machine/digital_display.gbapal"); -const u16 gUnknown_08DCF1F0[] = INCBIN_U16("graphics/slot_machine/smoke.gbapal"); // also duck and pika aura - -const u16 gUnknown_08DCF210[] = INCBIN_U16("graphics/slot_machine/reel_time_explosion/0.gbapal"); - -const u16 gUnknown_08DCF230[] = INCBIN_U16("graphics/slot_machine/spr6.gbapal"); - const u8 gSlotMachineReelSymbol1Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/1.4bpp"); const u8 gSlotMachineReelSymbol2Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/2.4bpp"); const u8 gSlotMachineReelSymbol3Tiles[] = INCBIN_U8("graphics/slot_machine/reel_symbols/3.4bpp"); @@ -59,5 +53,5 @@ const u8 gSlotMachineReelTimeExplosion1[] = INCBIN_U8("graphics/slot_machine/ree const u8 gSlotMachineReelTimeShadow[] = INCBIN_U8("graphics/slot_machine/shadow.4bpp"); const u8 gSlotMachineReelTimePikaAura[] = INCBIN_U8("graphics/slot_machine/pika_aura.4bpp"); -const u8 gUnknown_08DD19F8[] = INCBIN_U8("graphics/unknown/unknown_DD19F8.bin"); -const u8 gUnknown_08DD1A18[] = INCBIN_U8("graphics/unknown/unknown_DD1A18.4bpp"); +const u8 gSlotMachineReelBackground_Tilemap[] = INCBIN_U8("graphics/slot_machine/reel_background.bin"); +const u8 gSlotMachineReelTimeNumberGap_Gfx[] = INCBIN_U8("graphics/slot_machine/reel_time_number_gap.4bpp"); -- cgit v1.2.3 From cc4255d4c064384cf3516441e340b6377c99de3d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 10 Aug 2020 23:50:49 -0400 Subject: Add some charmap constant usage --- src/data/union_room.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/data') diff --git a/src/data/union_room.h b/src/data/union_room.h index 704978766..be7bfae71 100644 --- a/src/data/union_room.h +++ b/src/data/union_room.h @@ -222,7 +222,7 @@ static const u8 *const sAwaitingResponseTexts[] = { ALIGNED(4) const u8 sText_ShowTrainerCard[] = _("The other TRAINER showed\nyou their TRAINER CARD.\pWould you like to show your\nTRAINER CARD?"); ALIGNED(4) const u8 sText_BattleChallenge[] = _("The other TRAINER challenges you\nto battle.\pWill you accept the battle\nchallenge?"); ALIGNED(4) const u8 sText_ChatInvitation[] = _("The other TRAINER invites you\nto chat.\pWill you accept the chat\ninvitation?"); -ALIGNED(4) const u8 sText_OfferToTradeMon[] = _("There is an offer to trade your\nregistered Lv. {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}\pin exchange for a\nLv. {SPECIAL_F7 0x02} {SPECIAL_F7 0x03}.\pWill you accept this trade\noffer?"); +ALIGNED(4) const u8 sText_OfferToTradeMon[] = _("There is an offer to trade your\nregistered Lv. {DYNAMIC 0} {DYNAMIC 1}\pin exchange for a\nLv. {DYNAMIC 2} {DYNAMIC 3}.\pWill you accept this trade\noffer?"); ALIGNED(4) const u8 sText_OfferToTradeEgg[] = _("There is an offer to trade your\nregistered EGG.\lWill you accept this trade offer?"); ALIGNED(4) const u8 sText_ChatDropped[] = _("The chat has been dropped.\p"); ALIGNED(4) const u8 sText_OfferDeclined1[] = _("You declined the offer.\p"); @@ -567,17 +567,17 @@ static const u8 *const sCardColorTexts[] = { sText_ItsGoldCard }; -ALIGNED(4) const u8 sText_TrainerCardInfoPage1[] = _("This is {SPECIAL_F7 0x00} {SPECIAL_F7 0x01}'s\nTRAINER CARD…\l{SPECIAL_F7 0x02}\pPOKéDEX: {SPECIAL_F7 0x03}\nTIME: {SPECIAL_F7 0x04}:{SPECIAL_F7 0x05}\p"); -ALIGNED(4) const u8 sText_TrainerCardInfoPage2[] = _("BATTLES: WINS: {SPECIAL_F7 0x00} LOSSES: {SPECIAL_F7 0x02}\nTRADES: {SPECIAL_F7 0x03}\p“{SPECIAL_F7 0x04} {SPECIAL_F7 0x05}\n{SPECIAL_F7 0x06} {SPECIAL_F7 0x07}”\p"); -ALIGNED(4) const u8 sText_GladToMeetYouMale[] = _("{SPECIAL_F7 0x01}: Glad to have met you!{PAUSE 60}"); -ALIGNED(4) const u8 sText_GladToMeetYouFemale[] = _("{SPECIAL_F7 0x01}: Glad to meet you!{PAUSE 60}"); +ALIGNED(4) const u8 sText_TrainerCardInfoPage1[] = _("This is {DYNAMIC 0} {DYNAMIC 1}'s\nTRAINER CARD…\l{DYNAMIC 2}\pPOKéDEX: {DYNAMIC 3}\nTIME: {DYNAMIC 4}:{DYNAMIC 5}\p"); +ALIGNED(4) const u8 sText_TrainerCardInfoPage2[] = _("BATTLES: WINS: {DYNAMIC 0} LOSSES: {DYNAMIC 2}\nTRADES: {DYNAMIC 3}\p“{DYNAMIC 4} {DYNAMIC 5}\n{DYNAMIC 6} {DYNAMIC 7}”\p"); +ALIGNED(4) const u8 sText_GladToMeetYouMale[] = _("{DYNAMIC 1}: Glad to have met you!{PAUSE 60}"); +ALIGNED(4) const u8 sText_GladToMeetYouFemale[] = _("{DYNAMIC 1}: Glad to meet you!{PAUSE 60}"); const u8 *const sGladToMeetYouTexts[GENDER_COUNT] = { sText_GladToMeetYouMale, sText_GladToMeetYouFemale }; -ALIGNED(4) const u8 sText_FinishedCheckingPlayersTrainerCard[] = _("Finished checking {SPECIAL_F7 0x01}'s\nTRAINER CARD.{PAUSE 60}"); +ALIGNED(4) const u8 sText_FinishedCheckingPlayersTrainerCard[] = _("Finished checking {DYNAMIC 1}'s\nTRAINER CARD.{PAUSE 60}"); static const u8 *const sLinkGroupActivityNameTexts[] = { [ACTIVITY_NONE] = sText_EmptyString, -- cgit v1.2.3