diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/field_effects/field_effect_object_template_pointers.h | 5 | ||||
| -rw-r--r-- | src/data/field_effects/field_effect_objects.h | 883 | ||||
| -rw-r--r-- | src/data/object_events/object_event_graphics.h | 418 | ||||
| -rw-r--r-- | src/field_effect.c | 2 | ||||
| -rw-r--r-- | src/field_effect_helpers.c | 8 | ||||
| -rw-r--r-- | src/teachy_tv.c | 2 |
6 files changed, 681 insertions, 637 deletions
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 92a0a77f1..1f5c27ed4 100644 --- a/src/data/field_effects/field_effect_object_template_pointers.h +++ b/src/data/field_effects/field_effect_object_template_pointers.h @@ -21,6 +21,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand; const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing; const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion; const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints; +/*const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle;*/ const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise; const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise; const struct SpriteTemplate gFieldEffectObjectTemplate_Bird; @@ -34,8 +35,6 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch; const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles; const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle; -#define gFieldEffectObjectTemplate_Sparkle NULL - const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { [FLDEFFOBJ_SHADOW_S] = &gFieldEffectObjectTemplate_ShadowSmall, [FLDEFFOBJ_SHADOW_M] = &gFieldEffectObjectTemplate_ShadowMedium, @@ -59,7 +58,7 @@ const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = { [FLDEFFOBJ_UNUSED_SAND] = &gFieldEffectObjectTemplate_UnusedSand, [FLDEFFOBJ_WATER_SURFACING] = &gFieldEffectObjectTemplate_WaterSurfacing, [FLDEFFOBJ_REFLECTION_DISTORTION] = &gFieldEffectObjectTemplate_ReflectionDistortion, - [FLDEFFOBJ_SPARKLE] = gFieldEffectObjectTemplate_Sparkle, + [FLDEFFOBJ_SPARKLE] = NULL, [FLDEFFOBJ_DEEP_SAND_FOOTPRINTS] = &gFieldEffectObjectTemplate_DeepSandFootprints, [FLDEFFOBJ_TREE_DISGUISE] = &gFieldEffectObjectTemplate_TreeDisguise, [FLDEFFOBJ_MOUNTAIN_DISGUISE] = &gFieldEffectObjectTemplate_MountainDisguise, diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index 86888c056..7a764d3d5 100644 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -1,29 +1,29 @@ -const struct SpritePalette gUnknown_83A5340 = { .data = gUnknown_8398FA8, .tag = 0x1004 }; -const struct SpritePalette gUnknown_83A5348 = { .data = gUnknown_8398FC8, .tag = 0x1005 }; +const struct SpritePalette gSpritePalette_GeneralFieldEffect0 = { .data = gFieldEffectObjectPalette0, .tag = FLDEFF_PAL_TAG_GENERAL_0 }; +const struct SpritePalette gSpritePalette_GeneralFieldEffect1 = { .data = gFieldEffectObjectPalette1, .tag = FLDEFF_PAL_TAG_GENERAL_1 }; -const union AnimCmd gSpriteAnimCmd_FieldShadow0[] = +static const union AnimCmd sAnim_Shadow[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd *const gSpriteAnimTable_FieldShadow[] = +static const union AnimCmd *const sAnimTable_Shadow[] = { - gSpriteAnimCmd_FieldShadow0, + sAnim_Shadow, }; -const struct SpriteFrameImage gSpriteFrameImage_FieldShadowS[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowS) }; -const struct SpriteFrameImage gSpriteFrameImage_FieldShadowM[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowM) }; -const struct SpriteFrameImage gSpriteFrameImage_FieldShadowL[] = {obj_frame_tiles(gSpriteImageGfx_FieldShadowL) }; -const struct SpriteFrameImage gSpriteFrameImage_FieldShadowXL[] = { obj_frame_tiles(gSpriteImageGfx_FieldShadowXL) }; +static const struct SpriteFrameImage sPicTable_ShadowSmall[] = {obj_frame_tiles(gFieldEffectObjectPic_ShadowSmall) }; +static const struct SpriteFrameImage sPicTable_ShadowMedium[] = {obj_frame_tiles(gFieldEffectObjectPic_ShadowMedium) }; +static const struct SpriteFrameImage sPicTable_ShadowLarge[] = {obj_frame_tiles(gFieldEffectObjectPic_ShadowLarge) }; +static const struct SpriteFrameImage sPicTable_ShadowExtraLarge[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge) }; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = { .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_8x8, - .anims = gSpriteAnimTable_FieldShadow, - .images = gSpriteFrameImage_FieldShadowS, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowSmall, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; @@ -33,8 +33,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_16x8, - .anims = gSpriteAnimTable_FieldShadow, - .images = gSpriteFrameImage_FieldShadowM, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowMedium, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; @@ -44,8 +44,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_32x8, - .anims = gSpriteAnimTable_FieldShadow, - .images = gSpriteFrameImage_FieldShadowL, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowLarge, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; @@ -55,22 +55,22 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_64x32, - .anims = gSpriteAnimTable_FieldShadow, - .images = gSpriteFrameImage_FieldShadowXL, + .anims = sAnimTable_Shadow, + .images = sPicTable_ShadowExtraLarge, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShadowFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A53DC[] = +static const struct SpriteFrameImage sPicTable_TallGrass[] = { - overworld_frame(gUnknown_839A008, 2, 2, 0), - overworld_frame(gUnknown_839A008, 2, 2, 1), - overworld_frame(gUnknown_839A008, 2, 2, 2), - overworld_frame(gUnknown_839A008, 2, 2, 3), - overworld_frame(gUnknown_839A008, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 4), }; -const union AnimCmd gUnknown_83A5404[] = +static const union AnimCmd sAnim_TallGrass[] = { ANIMCMD_FRAME(1, 10), ANIMCMD_FRAME(2, 10), @@ -80,32 +80,32 @@ const union AnimCmd gUnknown_83A5404[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A541C[] = +static const union AnimCmd *const sAnimTable_TallGrass[] = { - gUnknown_83A5404, + sAnim_TallGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A541C, - .images = gUnknown_83A53DC, + .anims = sAnimTable_TallGrass, + .images = sPicTable_TallGrass, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateTallGrassFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5438[] = +static const struct SpriteFrameImage sPicTable_Ripple[] = { - overworld_frame(gUnknown_83986A8, 2, 2, 0), - overworld_frame(gUnknown_83986A8, 2, 2, 1), - overworld_frame(gUnknown_83986A8, 2, 2, 2), - overworld_frame(gUnknown_83986A8, 2, 2, 3), - overworld_frame(gUnknown_83986A8, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 4), }; -const union AnimCmd gUnknown_83A5460[] = +static const union AnimCmd sAnim_Ripple[] = { ANIMCMD_FRAME(0, 12), ANIMCMD_FRAME(1, 9), @@ -118,32 +118,32 @@ const union AnimCmd gUnknown_83A5460[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5484[] = +static const union AnimCmd *const sAnimTable_Ripple[] = { - gUnknown_83A5460, + sAnim_Ripple, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5484, - .images = gUnknown_83A5438, + .anims = sAnimTable_Ripple, + .images = sPicTable_Ripple, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; -const struct SpriteFrameImage gUnknown_83A54A0[] = +static const struct SpriteFrameImage sPicTable_Ash[] = { - overworld_frame(gUnknown_8398928, 2, 2, 0), - overworld_frame(gUnknown_8398928, 2, 2, 1), - overworld_frame(gUnknown_8398928, 2, 2, 2), - overworld_frame(gUnknown_8398928, 2, 2, 3), - overworld_frame(gUnknown_8398928, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 4), }; -const union AnimCmd gUnknown_83A54C8[] = +static const union AnimCmd sAnim_Ash[] = { ANIMCMD_FRAME(0, 12), ANIMCMD_FRAME(1, 12), @@ -153,23 +153,23 @@ const union AnimCmd gUnknown_83A54C8[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A54E0[] = +static const union AnimCmd *const sAnimTable_Ash[] = { - gUnknown_83A54C8, + sAnim_Ash, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A54E0, - .images = gUnknown_83A54A0, + .anims = sAnimTable_Ash, + .images = sPicTable_Ash, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateAshFieldEffect, }; -const struct SpriteFrameImage gObjectEventPicTable_SurfBlob[] = +static const struct SpriteFrameImage gObjectEventPicTable_SurfBlob[] = { overworld_frame(gObjectEventPic_SurfBlob, 2, 8, 0), overworld_frame(gObjectEventPic_SurfBlob, 2, 8, 1), @@ -179,40 +179,40 @@ const struct SpriteFrameImage gObjectEventPicTable_SurfBlob[] = overworld_frame(gObjectEventPic_SurfBlob, 2, 8, 5), }; -const union AnimCmd gUnknown_83A552C[] = +static const union AnimCmd sSurfBlobAnim_FaceSouth[] = { ANIMCMD_FRAME(0, 48), ANIMCMD_FRAME(1, 48), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A5538[] = +static const union AnimCmd sSurfBlobAnim_FaceNorth[] = { ANIMCMD_FRAME(2, 48), ANIMCMD_FRAME(3, 48), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A5544[] = +static const union AnimCmd sSurfBlobAnim_FaceWest[] = { ANIMCMD_FRAME(4, 48), ANIMCMD_FRAME(5, 48), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A5550[] = +static const union AnimCmd sSurfBlobAnim_FaceEast[] = { ANIMCMD_FRAME(4, 48, .hFlip = TRUE), ANIMCMD_FRAME(5, 48, .hFlip = TRUE), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A555C[] = +static const union AnimCmd *const sAnimTable_SurfBlob[] = { - gUnknown_83A552C, - gUnknown_83A5538, - gUnknown_83A5544, - gUnknown_83A5550, + [DIR_SOUTH - 1] = sSurfBlobAnim_FaceSouth, + [DIR_NORTH - 1] = sSurfBlobAnim_FaceNorth, + [DIR_WEST - 1] = sSurfBlobAnim_FaceWest, + [DIR_EAST - 1] = sSurfBlobAnim_FaceEast, }; const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = @@ -220,58 +220,58 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_32x32, - .anims = gUnknown_83A555C, + .anims = sAnimTable_SurfBlob, .images = gObjectEventPicTable_SurfBlob, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateSurfBlobFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5584[] = +static const struct SpriteFrameImage sPicTable_Arrow[] = { - overworld_frame(gUnknown_8398BA8, 2, 2, 0), - overworld_frame(gUnknown_8398BA8, 2, 2, 1), - overworld_frame(gUnknown_8398BA8, 2, 2, 2), - overworld_frame(gUnknown_8398BA8, 2, 2, 3), - overworld_frame(gUnknown_8398BA8, 2, 2, 4), - overworld_frame(gUnknown_8398BA8, 2, 2, 5), - overworld_frame(gUnknown_8398BA8, 2, 2, 6), - overworld_frame(gUnknown_8398BA8, 2, 2, 7), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 5), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 6), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 7), }; -const union AnimCmd gUnknown_83A55C4[] = +static const union AnimCmd sArrowAnim_South[] = { ANIMCMD_FRAME(2, 32), ANIMCMD_FRAME(3, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A55D0[] = +static const union AnimCmd sArrowAnim_North[] = { ANIMCMD_FRAME(0, 32), ANIMCMD_FRAME(1, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A55DC[] = +static const union AnimCmd sArrowAnim_West[] = { ANIMCMD_FRAME(4, 32), ANIMCMD_FRAME(5, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_83A55E8[] = +static const union AnimCmd sArrowAnim_East[] = { ANIMCMD_FRAME(6, 32), ANIMCMD_FRAME(7, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A55F4[] = +static const union AnimCmd *const sAnimTable_Arrow[] = { - gUnknown_83A55C4, - gUnknown_83A55D0, - gUnknown_83A55DC, - gUnknown_83A55E8, + [DIR_SOUTH - 1] = sArrowAnim_South, + [DIR_NORTH - 1] = sArrowAnim_North, + [DIR_WEST - 1] = sArrowAnim_West, + [DIR_EAST - 1] = sArrowAnim_East, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = @@ -279,20 +279,20 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A55F4, - .images = gUnknown_83A5584, + .anims = sAnimTable_Arrow, + .images = sPicTable_Arrow, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -const struct SpriteFrameImage gUnknown_83A561C[] = +static const struct SpriteFrameImage sPicTable_GroundImpactDust[] = { - overworld_frame(gUnknown_8399008, 2, 1, 0), - overworld_frame(gUnknown_8399008, 2, 1, 1), - overworld_frame(gUnknown_8399008, 2, 1, 2), + overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 2), }; -const union AnimCmd gUnknown_83A5634[] = +static const union AnimCmd sAnim_GroundImpactDust[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), @@ -300,31 +300,31 @@ const union AnimCmd gUnknown_83A5634[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5644[] = +static const union AnimCmd *const sAnimTable_GroundImpactDust[] = { - gUnknown_83A5634, + sAnim_GroundImpactDust, }; const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, - .anims = gUnknown_83A5644, - .images = gUnknown_83A561C, + .anims = sAnimTable_GroundImpactDust, + .images = sPicTable_GroundImpactDust, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80DCCE0, + .callback = UpdateJumpImpactEffect, }; -const struct SpriteFrameImage gUnknown_83A5660[] = +static const struct SpriteFrameImage sPicTable_JumpTallGrass[] = { - overworld_frame(gUnknown_8399188, 2, 1, 0), - overworld_frame(gUnknown_8399188, 2, 1, 1), - overworld_frame(gUnknown_8399188, 2, 1, 2), - overworld_frame(gUnknown_8399188, 2, 1, 3), + 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 gUnknown_83A5680[] = +static const union AnimCmd sAnim_JumpTallGrass[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), @@ -333,211 +333,211 @@ const union AnimCmd gUnknown_83A5680[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5694[] = +static const union AnimCmd *const sAnimTable_JumpTallGrass[] = { - gUnknown_83A5680, + sAnim_JumpTallGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x8, - .anims = gUnknown_83A5694, - .images = gUnknown_83A5660, + .anims = sAnimTable_JumpTallGrass, + .images = sPicTable_JumpTallGrass, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80DCCE0, + .callback = UpdateJumpImpactEffect, }; -const struct SpriteFrameImage gUnknown_83A56B0[] = +static const struct SpriteFrameImage sPicTable_SandFootprints[] = { - overworld_frame(gUnknown_839A388, 2, 2, 0), - overworld_frame(gUnknown_839A388, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 1), }; -const union AnimCmd gUnknown_83A56C0[] = +static const union AnimCmd sSandFootprintsAnim_South[] = { ANIMCMD_FRAME(0, 1, .vFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A56C8[] = +static const union AnimCmd sSandFootprintsAnim_North[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A56D0[] = +static const union AnimCmd sSandFootprintsAnim_West[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A56D8[] = +static const union AnimCmd sSandFootprintsAnim_East[] = { ANIMCMD_FRAME(1, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A56E0[] = +static const union AnimCmd *const sAnimTable_SandFootprints[] = { - gUnknown_83A56C0, - gUnknown_83A56C0, - gUnknown_83A56C8, - gUnknown_83A56D0, - gUnknown_83A56D8, + [DIR_NONE] = sSandFootprintsAnim_South, + [DIR_SOUTH] = sSandFootprintsAnim_South, + [DIR_NORTH] = sSandFootprintsAnim_North, + [DIR_WEST] = sSandFootprintsAnim_West, + [DIR_EAST] = sSandFootprintsAnim_East, }; const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A56E0, - .images = gUnknown_83A56B0, + .anims = sAnimTable_SandFootprints, + .images = sPicTable_SandFootprints, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateFootprintsTireTracksFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A570C[] = +static const struct SpriteFrameImage sPicTable_DeepSandFootprints[] = { - overworld_frame(gUnknown_839A488, 2, 2, 0), - overworld_frame(gUnknown_839A488, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 1), }; -const union AnimCmd gUnknown_83A571C[] = +static const union AnimCmd sDeepSandFootprintsAnim_South[] = { ANIMCMD_FRAME(0, 1, .vFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5724[] = +static const union AnimCmd sDeepSandFootprintsAnim_North[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A572C[] = +static const union AnimCmd sDeepSandFootprintsAnim_West[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5734[] = +static const union AnimCmd sDeepSandFootprintsAnim_East[] = { ANIMCMD_FRAME(1, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A573C[] = +static const union AnimCmd *const sAnimTable_DeepSandFootprints[] = { - gUnknown_83A571C, - gUnknown_83A571C, - gUnknown_83A5724, - gUnknown_83A572C, - gUnknown_83A5734, + [DIR_NONE] = sDeepSandFootprintsAnim_South, + [DIR_SOUTH] = sDeepSandFootprintsAnim_South, + [DIR_NORTH] = sDeepSandFootprintsAnim_North, + [DIR_WEST] = sDeepSandFootprintsAnim_West, + [DIR_EAST] = sDeepSandFootprintsAnim_East, }; const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A573C, - .images = gUnknown_83A570C, + .anims = sAnimTable_DeepSandFootprints, + .images = sPicTable_DeepSandFootprints, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateFootprintsTireTracksFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5768[] = +static const struct SpriteFrameImage sPicTable_BikeTireTracks[] = { - overworld_frame(gUnknown_839A588, 2, 2, 0), - overworld_frame(gUnknown_839A588, 2, 2, 1), - overworld_frame(gUnknown_839A588, 2, 2, 2), - overworld_frame(gUnknown_839A588, 2, 2, 3), + 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 gUnknown_83A5788[] = +static const union AnimCmd sBikeTireTracksAnim_South[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5790[] = +static const union AnimCmd sBikeTireTracksAnim_North[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5798[] = +static const union AnimCmd sBikeTireTracksAnim_West[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A57A0[] = +static const union AnimCmd sBikeTireTracksAnim_East[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A57A8[] = +static const union AnimCmd sBikeTireTracksAnim_SECornerTurn[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A57B0[] = +static const union AnimCmd sBikeTireTracksAnim_SWCornerTurn[] = { ANIMCMD_FRAME(0, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A57B8[] = +static const union AnimCmd sBikeTireTracksAnim_NWCornerTurn[] = { ANIMCMD_FRAME(3, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A57C0[] = +static const union AnimCmd sBikeTireTracksAnim_NECornerTurn[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A57C8[] = +static const union AnimCmd *const sAnimTable_BikeTireTracks[] = { - gUnknown_83A5788, - gUnknown_83A5788, - gUnknown_83A5790, - gUnknown_83A5798, - gUnknown_83A57A0, - gUnknown_83A57A8, - gUnknown_83A57B0, - gUnknown_83A57B8, - gUnknown_83A57C0, + [DIR_NONE] = sBikeTireTracksAnim_South, + [DIR_SOUTH] = sBikeTireTracksAnim_South, + [DIR_NORTH] = sBikeTireTracksAnim_North, + [DIR_WEST] = sBikeTireTracksAnim_West, + [DIR_EAST] = sBikeTireTracksAnim_East, + [DIR_SOUTHWEST] = sBikeTireTracksAnim_SECornerTurn, + [DIR_SOUTHEAST] = sBikeTireTracksAnim_SWCornerTurn, + [DIR_NORTHWEST] = sBikeTireTracksAnim_NWCornerTurn, + [DIR_NORTHEAST] = sBikeTireTracksAnim_NECornerTurn, }; const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A57C8, - .images = gUnknown_83A5768, + .anims = sAnimTable_BikeTireTracks, + .images = sPicTable_BikeTireTracks, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateFootprintsTireTracksFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5804[] = +static const struct SpriteFrameImage sPicTable_JumpBigSplash[] = { - overworld_frame(gUnknown_839AA48, 2, 2, 0), - overworld_frame(gUnknown_839AA48, 2, 2, 1), - overworld_frame(gUnknown_839AA48, 2, 2, 2), - overworld_frame(gUnknown_839AA48, 2, 2, 3), + 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 gUnknown_83A5824[] = +static const union AnimCmd sAnim_JumpBigSplash[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), @@ -546,36 +546,36 @@ const union AnimCmd gUnknown_83A5824[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5838[] = +static const union AnimCmd *const sAnimTable_JumpBigSplash[] = { - gUnknown_83A5824, + sAnim_JumpBigSplash, }; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5838, - .images = gUnknown_83A5804, + .anims = sAnimTable_JumpBigSplash, + .images = sPicTable_JumpBigSplash, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80DCCE0, + .callback = UpdateJumpImpactEffect, }; -const struct SpriteFrameImage gUnknown_83A5854[] = +static const struct SpriteFrameImage sPicTable_Splash[] = { - overworld_frame(gUnknown_839AC48, 2, 1, 0), - overworld_frame(gUnknown_839AC48, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 1), }; -const union AnimCmd gUnknown_83A5864[] = +static const union AnimCmd sAnim_Splash_0[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5870[] = +static const union AnimCmd sAnim_Splash_1[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -588,31 +588,31 @@ const union AnimCmd gUnknown_83A5870[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A5894[] = +static const union AnimCmd *const sAnimTable_Splash[] = { - gUnknown_83A5864, - gUnknown_83A5870, + sAnim_Splash_0, + sAnim_Splash_1, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, - .anims = gUnknown_83A5894, - .images = gUnknown_83A5854, + .anims = sAnimTable_Splash, + .images = sPicTable_Splash, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateSplashFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A58B4[] = +static const struct SpriteFrameImage sPicTable_JumpSmallSplash[] = { - overworld_frame(gUnknown_839ACC8, 2, 1, 0), - overworld_frame(gUnknown_839ACC8, 2, 1, 1), - overworld_frame(gUnknown_839ACC8, 2, 1, 2), + overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_JumpSmallSplash, 2, 1, 2), }; -const union AnimCmd gUnknown_83A58CC[] = +static const union AnimCmd sAnim_JumpSmallSplash[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -620,31 +620,31 @@ const union AnimCmd gUnknown_83A58CC[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A58DC[] = +static const union AnimCmd *const sAnimTable_JumpSmallSplash[] = { - gUnknown_83A58CC, + sAnim_JumpSmallSplash, }; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, - .anims = gUnknown_83A58DC, - .images = gUnknown_83A58B4, + .anims = sAnimTable_JumpSmallSplash, + .images = sPicTable_JumpSmallSplash, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80DCCE0, + .callback = UpdateJumpImpactEffect, }; -const struct SpriteFrameImage gUnknown_83A58F8[] = +static const struct SpriteFrameImage sPicTable_LongGrass[] = { - overworld_frame(gUnknown_8399E08, 2, 2, 0), - overworld_frame(gUnknown_8399E08, 2, 2, 1), - overworld_frame(gUnknown_8399E08, 2, 2, 2), - overworld_frame(gUnknown_8399E08, 2, 2, 3), + 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 gUnknown_83A5918[] = +static const union AnimCmd sAnim_LongGrass[] = { ANIMCMD_FRAME(1, 3), ANIMCMD_FRAME(2, 3), @@ -656,33 +656,33 @@ const union AnimCmd gUnknown_83A5918[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5938[] = +static const union AnimCmd *const sAnimTable_LongGrass[] = { - gUnknown_83A5918, + sAnim_LongGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5938, - .images = gUnknown_83A58F8, + .anims = sAnimTable_LongGrass, + .images = sPicTable_LongGrass, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateLongGrassFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5954[] = +static const struct SpriteFrameImage sPicTable_JumpLongGrass[] = { - overworld_frame(gUnknown_8399488, 2, 2, 0), - overworld_frame(gUnknown_8399488, 2, 2, 1), - overworld_frame(gUnknown_8399488, 2, 2, 2), - overworld_frame(gUnknown_8399488, 2, 2, 3), - overworld_frame(gUnknown_8399488, 2, 2, 4), - overworld_frame(gUnknown_8399488, 2, 2, 6), + 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 gUnknown_83A5984[] = +static const union AnimCmd sAnim_JumpLongGrass[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -693,36 +693,36 @@ const union AnimCmd gUnknown_83A5984[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A59A0[] = +static const union AnimCmd *const sAnimTable_JumpLongGrass[] = { - gUnknown_83A5984, + sAnim_JumpLongGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A59A0, - .images = gUnknown_83A5954, + .anims = sAnimTable_JumpLongGrass, + .images = sPicTable_JumpLongGrass, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80DCCE0, + .callback = UpdateJumpImpactEffect, }; -const struct SpriteFrameImage gUnknown_83A59BC[] = +static const struct SpriteFrameImage sPicTable_UnusedGrass[] = { - overworld_frame(gUnknown_8399788, 2, 2, 0), - overworld_frame(gUnknown_8399788, 2, 2, 1), - overworld_frame(gUnknown_8399788, 2, 2, 2), - overworld_frame(gUnknown_8399788, 2, 2, 3), - overworld_frame(gUnknown_8399788, 2, 2, 4), - overworld_frame(gUnknown_8399788, 2, 2, 5), - overworld_frame(gUnknown_8399788, 2, 2, 6), - overworld_frame(gUnknown_8399788, 2, 2, 7), - overworld_frame(gUnknown_8399788, 2, 2, 8), + 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), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 5), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 6), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 7), + overworld_frame(gFieldEffectObjectPic_UnusedGrass, 2, 2, 8), }; -const union AnimCmd gUnknown_83A5A04[] = +static const union AnimCmd sAnim_UnusedGrass[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(1, 4), @@ -736,31 +736,31 @@ const union AnimCmd gUnknown_83A5A04[] = ANIMCMD_JUMP(7), }; -const union AnimCmd *const gUnknown_83A5A2C[] = +static const union AnimCmd *const sAnimTable_UnusedGrass[] = { - gUnknown_83A5A04, + sAnim_UnusedGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5A2C, - .images = gUnknown_83A59BC, + .anims = sAnimTable_UnusedGrass, + .images = sPicTable_UnusedGrass, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; -const struct SpriteFrameImage gUnknown_83A5A48[] = +static const struct SpriteFrameImage sPicTable_UnusedGrass2[] = { - overworld_frame(gUnknown_8399C08, 2, 2, 0), - overworld_frame(gUnknown_8399C08, 2, 2, 1), - overworld_frame(gUnknown_8399C08, 2, 2, 2), - overworld_frame(gUnknown_8399C08, 2, 2, 3), + 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 gUnknown_83A5A68[] = +static const union AnimCmd sAnim_UnusedGrass2[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -771,31 +771,31 @@ const union AnimCmd gUnknown_83A5A68[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A5A84[] = +static const union AnimCmd *const sAnimTable_UnusedGrass2[] = { - gUnknown_83A5A68, + sAnim_UnusedGrass2, }; const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5A84, - .images = gUnknown_83A5A48, + .anims = sAnimTable_UnusedGrass2, + .images = sPicTable_UnusedGrass2, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; -const struct SpriteFrameImage gUnknown_83A5AA0[] = +static const struct SpriteFrameImage sPicTable_UnusedSand[] = { - overworld_frame(gUnknown_839A788, 2, 2, 0), - overworld_frame(gUnknown_839A788, 2, 2, 1), - overworld_frame(gUnknown_839A788, 2, 2, 2), - overworld_frame(gUnknown_839A788, 2, 2, 3), + 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), }; -const union AnimCmd gUnknown_83A5AC0[] = +static const union AnimCmd sAnim_UnusedSand[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -804,30 +804,30 @@ const union AnimCmd gUnknown_83A5AC0[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A5AD4[] = +static const union AnimCmd *const sAnimTable_UnusedSand[] = { - gUnknown_83A5AC0, + sAnim_UnusedSand, }; const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5AD4, - .images = gUnknown_83A5AA0, + .anims = sAnimTable_UnusedSand, + .images = sPicTable_UnusedSand, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; -const struct SpriteFrameImage gUnknown_83A5AF0[] = +static const struct SpriteFrameImage sPicTable_SandPile[] = { - overworld_frame(gUnknown_839A988, 2, 1, 0), - overworld_frame(gUnknown_839A988, 2, 1, 1), - overworld_frame(gUnknown_839A988, 2, 1, 2), + overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_SandPile, 2, 1, 2), }; -const union AnimCmd gUnknown_83A5B08[] = +static const union AnimCmd sAnim_SandPile[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -835,31 +835,31 @@ const union AnimCmd gUnknown_83A5B08[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5B18[] = +static const union AnimCmd *const sAnimTable_SandPile[] = { - gUnknown_83A5B08, + sAnim_SandPile, }; const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, - .anims = gUnknown_83A5B18, - .images = gUnknown_83A5AF0, + .anims = sAnimTable_SandPile, + .images = sPicTable_SandPile, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateSandPileFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5B34[] = +static const struct SpriteFrameImage sPicTable_WaterSurfacing[] = { - overworld_frame(gUnknown_839AD88, 2, 2, 0), - overworld_frame(gUnknown_839AD88, 2, 2, 1), - overworld_frame(gUnknown_839AD88, 2, 2, 2), - overworld_frame(gUnknown_839AD88, 2, 2, 3), + 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 gUnknown_83A5B54[] = +static const union AnimCmd sAnim_WaterSurfacing[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -870,23 +870,23 @@ const union AnimCmd gUnknown_83A5B54[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_83A5B70[] = +static const union AnimCmd *const sAnimTable_WaterSurfacing[] = { - gUnknown_83A5B54, + sAnim_WaterSurfacing, }; const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5B70, - .images = gUnknown_83A5B34, + .anims = sAnimTable_WaterSurfacing, + .images = sPicTable_WaterSurfacing, .affineAnims = gDummySpriteAffineAnimTable, .callback = WaitFieldEffectSpriteAnim, }; -const union AffineAnimCmd gUnknown_83A5B8C[] = +const union AffineAnimCmd sAffineAnim_ReflectionDistortion_0[] = { AFFINEANIMCMD_FRAME(-256, 256, 128, 0), AFFINEANIMCMD_FRAME(1, 0, 0, 4), @@ -900,7 +900,7 @@ const union AffineAnimCmd gUnknown_83A5B8C[] = AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd gUnknown_83A5BDC[] = +const union AffineAnimCmd sAffineAnim_ReflectionDistortion_1[] = { AFFINEANIMCMD_FRAME(256, 256, 128, 0), AFFINEANIMCMD_FRAME(-1, 0, 0, 4), @@ -914,10 +914,10 @@ const union AffineAnimCmd gUnknown_83A5BDC[] = AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd *const gUnknown_83A5C2C[] = +const union AffineAnimCmd *const sAffineAnims_ReflectionDistortion[] = { - gUnknown_83A5B8C, - gUnknown_83A5BDC, + sAffineAnim_ReflectionDistortion_0, + sAffineAnim_ReflectionDistortion_1, }; const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = @@ -927,28 +927,79 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = .oam = &gDummyOamData, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_83A5C2C, + .affineAnims = sAffineAnims_ReflectionDistortion, .callback = SpriteCallbackDummy, }; -const struct SpriteFrameImage gUnknown_83A5C4C[] = +/* +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), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Sparkle, 2, 2, 5), +}; + +static const union AnimCmd sAnim_Sparkle[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(5, 8), + ANIMCMD_LOOP(0), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_LOOP(3), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(5, 8), + ANIMCMD_END, +}; + +static const union AnimCmd *const sAnimTable_Sparkle[] = +{ + sAnim_Sparkle, +}; + +const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle = { + .tileTag = 0xFFFF, + .paletteTag = 0xFFFF, + .oam = &gObjectEventBaseOam_16x16, + .anims = sAnimTable_Sparkle, + .images = sPicTable_Sparkle, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = WaitFieldEffectSpriteAnim, +}; +*/ + +static const struct SpriteFrameImage sPicTable_TreeDisguise[] = { - overworld_frame(gUnknown_839B008, 2, 4, 0), - overworld_frame(gUnknown_839B008, 2, 4, 1), - overworld_frame(gUnknown_839B008, 2, 4, 2), - overworld_frame(gUnknown_839B008, 2, 4, 3), - overworld_frame(gUnknown_839B008, 2, 4, 4), - overworld_frame(gUnknown_839B008, 2, 4, 5), - overworld_frame(gUnknown_839B008, 2, 4, 6), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 6), }; -const union AnimCmd gUnknown_83A5C84[] = +static const union AnimCmd sAnim_TreeDisguise[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5C8C[] = +static const union AnimCmd sAnim_TreeDisguiseReveal[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -960,10 +1011,10 @@ const union AnimCmd gUnknown_83A5C8C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5CAC[] = +static const union AnimCmd *const sAnimTable_TreeDisguise[] = { - gUnknown_83A5C84, - gUnknown_83A5C8C, + sAnim_TreeDisguise, + sAnim_TreeDisguiseReveal, }; const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = @@ -971,30 +1022,30 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_16x32, - .anims = gUnknown_83A5CAC, - .images = gUnknown_83A5C4C, + .anims = sAnimTable_TreeDisguise, + .images = sPicTable_TreeDisguise, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateDisguiseFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5CCC[] = +static const struct SpriteFrameImage sPicTable_MountainDisguise[] = { - overworld_frame(gUnknown_839B708, 2, 4, 0), - overworld_frame(gUnknown_839B708, 2, 4, 1), - overworld_frame(gUnknown_839B708, 2, 4, 2), - overworld_frame(gUnknown_839B708, 2, 4, 3), - overworld_frame(gUnknown_839B708, 2, 4, 4), - overworld_frame(gUnknown_839B708, 2, 4, 5), - overworld_frame(gUnknown_839B708, 2, 4, 6), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 6), }; -const union AnimCmd gUnknown_83A5D04[] = +static const union AnimCmd sAnim_MountainDisguise[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5D0C[] = +static const union AnimCmd sAnim_MountainDisguiseReveal[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -1006,10 +1057,10 @@ const union AnimCmd gUnknown_83A5D0C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5D2C[] = +static const union AnimCmd *const sAnimTable_MountainDisguise[] = { - gUnknown_83A5D04, - gUnknown_83A5D0C, + sAnim_MountainDisguise, + sAnim_MountainDisguiseReveal, }; const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = @@ -1017,21 +1068,21 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_16x32, - .anims = gUnknown_83A5D2C, - .images = gUnknown_83A5CCC, + .anims = sAnimTable_MountainDisguise, + .images = sPicTable_MountainDisguise, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateDisguiseFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5D4C[] = +static const struct SpriteFrameImage sPicTable_SandDisguisePlaceholder[] = { - overworld_frame(gUnknown_839BE08, 2, 4, 0), - overworld_frame(gUnknown_839BE08, 2, 4, 1), - overworld_frame(gUnknown_839BE08, 2, 4, 2), - overworld_frame(gUnknown_839BE08, 2, 4, 3), - overworld_frame(gUnknown_839BE08, 2, 4, 4), - overworld_frame(gUnknown_839BE08, 2, 4, 5), - overworld_frame(gUnknown_839BE08, 2, 4, 6), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6), }; const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = @@ -1039,58 +1090,58 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_16x32, - .anims = gUnknown_83A5CAC, - .images = gUnknown_83A5D4C, + .anims = sAnimTable_TreeDisguise, + .images = sPicTable_SandDisguisePlaceholder, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateDisguiseFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5D9C[] = +static const struct SpriteFrameImage sPicTable_Bird[] = { - overworld_frame(gUnknown_839D3C8, 8, 8, 0), - overworld_frame(gUnknown_839D3C8, 8, 8, 1), - overworld_frame(gUnknown_839D3C8, 8, 8, 2), - overworld_frame(gUnknown_839D3C8, 8, 8, 3), - overworld_frame(gUnknown_839D3C8, 8, 8, 4), + overworld_frame(gFieldEffectObjectPic_Bird, 8, 8, 0), + overworld_frame(gFieldEffectObjectPic_Bird, 8, 8, 1), + overworld_frame(gFieldEffectObjectPic_Bird, 8, 8, 2), + overworld_frame(gFieldEffectObjectPic_Bird, 8, 8, 3), + overworld_frame(gFieldEffectObjectPic_Bird, 8, 8, 4), }; -const union AnimCmd gUnknown_83A5DC4[] = +static const union AnimCmd sAnim_Bird_0[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5DCC[] = +static const union AnimCmd sAnim_Bird_1[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5DD4[] = +static const union AnimCmd sAnim_Bird_2[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5DDC[] = +static const union AnimCmd sAnim_Bird_3[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_83A5DE4[] = +static const union AnimCmd sAnim_Bird_4[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5DEC[] = +static const union AnimCmd *const sAnimTable_Bird[] = { - gUnknown_83A5DC4, - gUnknown_83A5DCC, - gUnknown_83A5DD4, - gUnknown_83A5DDC, - gUnknown_83A5DE4, + sAnim_Bird_0, + sAnim_Bird_1, + sAnim_Bird_2, + sAnim_Bird_3, + sAnim_Bird_4, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = @@ -1098,78 +1149,78 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = .tileTag = SPRITE_INVALID_TAG, .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_64x64, - .anims = gUnknown_83A5DEC, - .images = gUnknown_83A5D9C, + .anims = sAnimTable_Bird, + .images = sPicTable_Bird, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -const struct SpriteFrameImage gUnknown_83A5E18[] = +static const struct SpriteFrameImage sPicTable_ShortGrass[] = { - overworld_frame(gUnknown_839A288, 2, 2, 0), - overworld_frame(gUnknown_839A288, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 1), }; -const union AnimCmd gUnknown_83A5E28[] = +static const union AnimCmd sAnim_ShortGrass[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5E34[] = +static const union AnimCmd *const sAnimTable_ShortGrass[] = { - gUnknown_83A5E28, + sAnim_ShortGrass, }; const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5E34, - .images = gUnknown_83A5E18, + .anims = sAnimTable_ShortGrass, + .images = sPicTable_ShortGrass, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateShortGrassFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5E50[] = +static const struct SpriteFrameImage sPicTable_HotSpringsWater[] = { - overworld_frame(gUnknown_839C508, 2, 2, 0), + obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater), }; -const union AnimCmd gUnknown_83A5E58[] = +static const union AnimCmd sAnim_HotSpringsWater[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5E60[] = +static const union AnimCmd *const sAnimTable_HotSpringsWater[] = { - gUnknown_83A5E58, + sAnim_HotSpringsWater, }; const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1005, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5E60, - .images = gUnknown_83A5E50, + .anims = sAnimTable_HotSpringsWater, + .images = sPicTable_HotSpringsWater, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateHotSpringsWaterFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5E7C[] = +static const struct SpriteFrameImage sPicTable_AshPuff[] = { - overworld_frame(gUnknown_839C5A8, 2, 2, 0), - overworld_frame(gUnknown_839C5A8, 2, 2, 1), - overworld_frame(gUnknown_839C5A8, 2, 2, 2), - overworld_frame(gUnknown_839C5A8, 2, 2, 3), - overworld_frame(gUnknown_839C5A8, 2, 2, 4), + 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 gUnknown_83A5EA4[] = +static const union AnimCmd sAnim_AshPuff[] = { ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(1, 6), @@ -1179,34 +1230,34 @@ const union AnimCmd gUnknown_83A5EA4[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5EBC[] = +static const union AnimCmd *const sAnimTable_AshPuff[] = { - gUnknown_83A5EA4, + sAnim_AshPuff, }; const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x100D, + .paletteTag = FLDEFF_PAL_TAG_ASH, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5EBC, - .images = gUnknown_83A5E7C, + .anims = sAnimTable_AshPuff, + .images = sPicTable_AshPuff, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_PopOutOfAsh, }; -const struct SpritePalette gUnknown_83A5ED8 = { .data = gUnknown_839C588, .tag = 0x100D }; +const struct SpritePalette gSpritePalette_Ash = { .data = gFieldEffectPal_Ash, .tag = FLDEFF_PAL_TAG_ASH }; -const struct SpriteFrameImage gUnknown_83A5EE0[] = +static const struct SpriteFrameImage sPicTable_AshLaunch[] = { - overworld_frame(gUnknown_839C828, 2, 2, 0), - overworld_frame(gUnknown_839C828, 2, 2, 1), - overworld_frame(gUnknown_839C828, 2, 2, 2), - overworld_frame(gUnknown_839C828, 2, 2, 3), - overworld_frame(gUnknown_839C828, 2, 2, 4), + 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 gUnknown_83A5F08[] = +static const union AnimCmd sAnim_AshLaunch[] = { ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(1, 6), @@ -1216,35 +1267,35 @@ const union AnimCmd gUnknown_83A5F08[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5F20[] = +static const union AnimCmd *const sAnimTable_AshLaunch[] = { - gUnknown_83A5F08, + sAnim_AshLaunch, }; const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x100D, + .paletteTag = FLDEFF_PAL_TAG_ASH, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5F20, - .images = gUnknown_83A5EE0, + .anims = sAnimTable_AshLaunch, + .images = sPicTable_AshLaunch, .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_LavaridgeGymWarp, + .callback = SpriteCB_AshLaunch, }; -const struct SpriteFrameImage gUnknown_83A5F3C[] = +static const struct SpriteFrameImage sPicTable_Bubbles[] = { - overworld_frame(gUnknown_839CAA8, 2, 4, 0), - overworld_frame(gUnknown_839CAA8, 2, 4, 1), - overworld_frame(gUnknown_839CAA8, 2, 4, 2), - overworld_frame(gUnknown_839CAA8, 2, 4, 3), - overworld_frame(gUnknown_839CAA8, 2, 4, 4), - overworld_frame(gUnknown_839CAA8, 2, 4, 5), - overworld_frame(gUnknown_839CAA8, 2, 4, 6), - overworld_frame(gUnknown_839CAA8, 2, 4, 7), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 6), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 7), }; -const union AnimCmd gUnknown_83A5F7C[] = +static const union AnimCmd sAnim_Bubbles[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), @@ -1257,29 +1308,29 @@ const union AnimCmd gUnknown_83A5F7C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5FA0[] = +static const union AnimCmd *const sAnimTable_Bubbles[] = { - gUnknown_83A5F7C, + sAnim_Bubbles, }; const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x1004, + .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x32, - .anims = gUnknown_83A5FA0, - .images = gUnknown_83A5F3C, + .anims = sAnimTable_Bubbles, + .images = sPicTable_Bubbles, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateBubblesFieldEffect, }; -const struct SpriteFrameImage gUnknown_83A5FBC[] = +static const struct SpriteFrameImage sPicTable_SmallSparkle[] = { - overworld_frame(gUnknown_839D2A8, 2, 2, 0), - overworld_frame(gUnknown_839D2A8, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_SmallSparkle, 2, 2, 1), }; -const union AnimCmd gUnknown_83A5FCC[] = +static const union AnimCmd sAnim_SmallSparkle[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(1, 5), @@ -1287,20 +1338,20 @@ const union AnimCmd gUnknown_83A5FCC[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_83A5FDC[] = +static const union AnimCmd *const sAnimTable_SmallSparkle[] = { - gUnknown_83A5FCC, + sAnim_SmallSparkle, }; const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = { .tileTag = SPRITE_INVALID_TAG, - .paletteTag = 0x100F, + .paletteTag = FLDEFF_PAL_TAG_SMALL_SPARKLE, .oam = &gObjectEventBaseOam_16x16, - .anims = gUnknown_83A5FDC, - .images = gUnknown_83A5FBC, + .anims = sAnimTable_SmallSparkle, + .images = sPicTable_SmallSparkle, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateSparkleFieldEffect, }; -const struct SpritePalette gUnknown_83A5FF8 = { .data = gUnknown_839D3A8, .tag = 0x100F }; +const struct SpritePalette gSpritePalette_SmallSparkle = { .data = gFieldEffectPal_SmallSparkle, .tag = FLDEFF_PAL_TAG_SMALL_SPARKLE }; diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index d2fcfd9c8..1bf1c7df2 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -14,37 +14,37 @@ const u16 gObjectEventPaletteNull11[16] = {}; const u16 gObjectEventPaletteNull12[16] = {}; const u16 gObjectEventPaletteNull13[16] = {}; const u16 gObjectEventPaletteNull14[16] = {}; -const u32 gObjectEventPic_RedNormal[] = INCBIN_U32("graphics/object_events/pics/people/red_normal.4bpp"); -const u32 gObjectEventPic_RedSurfRun[] = INCBIN_U32("graphics/object_events/pics/people/red_surf_run.4bpp"); -const u32 gObjectEventPic_GreenNormal[] = INCBIN_U32("graphics/object_events/pics/people/green_normal.4bpp"); -const u32 gObjectEventPic_GreenSurfRun[] = INCBIN_U32("graphics/object_events/pics/people/green_surf_run.4bpp"); +const u16 gObjectEventPic_RedNormal[] = INCBIN_U16("graphics/object_events/pics/people/red_normal.4bpp"); +const u16 gObjectEventPic_RedSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/red_surf_run.4bpp"); +const u16 gObjectEventPic_GreenNormal[] = INCBIN_U16("graphics/object_events/pics/people/green_normal.4bpp"); +const u16 gObjectEventPic_GreenSurfRun[] = INCBIN_U16("graphics/object_events/pics/people/green_surf_run.4bpp"); const u16 gUnknown_835E968[] = INCBIN_U16("graphics/object_events/palettes/1.gbapal"); const u16 gUnknown_835E988[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal"); -const u32 gObjectEventPic_RedItem[] = INCBIN_U32("graphics/object_events/pics/people/red_item.4bpp"); -const u32 gObjectEventPic_GreenItem[] = INCBIN_U32("graphics/object_events/pics/people/green_item.4bpp"); -const u32 gObjectEventPic_RedSurf[] = INCBIN_U32("graphics/object_events/pics/people/red_surf.4bpp"); -const u32 gObjectEventPic_GreenSurf[] = INCBIN_U32("graphics/object_events/pics/people/green_surf.4bpp"); -const u32 gObjectEventPic_RedBike[] = INCBIN_U32("graphics/object_events/pics/people/red_bike.4bpp"); -const u32 gObjectEventPic_RedVSSeekerBike[] = INCBIN_U32("graphics/object_events/pics/people/red_vs_seeker_bike.4bpp"); -const u32 gObjectEventPic_GreenBike[] = INCBIN_U32("graphics/object_events/pics/people/green_bike.4bpp"); -const u32 gObjectEventPic_GreenVSSeekerBike[] = INCBIN_U32("graphics/object_events/pics/people/green_vs_seeker_bike.4bpp"); -const u32 gObjectEventPic_RSBrendan[] = INCBIN_U32("graphics/object_events/pics/people/rs_brendan.4bpp"); -const u32 gObjectEventPic_RSMay[] = INCBIN_U32("graphics/object_events/pics/people/rs_may.4bpp"); -const u32 gObjectEventPic_RedFish[] = INCBIN_U32("graphics/object_events/pics/people/red_fish.4bpp"); -const u32 gObjectEventPic_GreenFish[] = INCBIN_U32("graphics/object_events/pics/people/green_fish.4bpp"); -const u32 gObjectEventPic_Pokedex[] = INCBIN_U32("graphics/object_events/pics/misc/pokedex.4bpp"); -const u32 gObjectEventPic_TownMap[] = INCBIN_U32("graphics/object_events/pics/misc/town_map.4bpp"); -const u32 gObjectEventPic_UnusedMan[] = INCBIN_U32("graphics/object_events/pics/people/unused_man.4bpp"); // Unused -const u32 gObjectEventPic_Giovanni[] = INCBIN_U32("graphics/object_events/pics/people/giovanni.4bpp"); -const u32 gObjectEventPic_Blaine[] = INCBIN_U32("graphics/object_events/pics/people/blaine.4bpp"); -const u32 gObjectEventPic_Sabrina[] = INCBIN_U32("graphics/object_events/pics/people/sabrina.4bpp"); -const u32 gObjectEventPic_Daisy[] = INCBIN_U32("graphics/object_events/pics/people/daisy.4bpp"); -const u32 gObjectEventPic_Lorelei[] = INCBIN_U32("graphics/object_events/pics/people/lorelei.4bpp"); -const u32 gObjectEventPic_Erika[] = INCBIN_U32("graphics/object_events/pics/people/erika.4bpp"); -const u32 gObjectEventPic_Koga[] = INCBIN_U32("graphics/object_events/pics/people/koga.4bpp"); -const u32 gObjectEventPic_Brock[] = INCBIN_U32("graphics/object_events/pics/people/brock.4bpp"); -const u32 gObjectEventPic_LtSurge[] = INCBIN_U32("graphics/object_events/pics/people/lt_surge.4bpp"); -const u32 gObjectEventPic_Bill[] = INCBIN_U32("graphics/object_events/pics/people/bill.4bpp"); +const u16 gObjectEventPic_RedItem[] = INCBIN_U16("graphics/object_events/pics/people/red_item.4bpp"); +const u16 gObjectEventPic_GreenItem[] = INCBIN_U16("graphics/object_events/pics/people/green_item.4bpp"); +const u16 gObjectEventPic_RedSurf[] = INCBIN_U16("graphics/object_events/pics/people/red_surf.4bpp"); +const u16 gObjectEventPic_GreenSurf[] = INCBIN_U16("graphics/object_events/pics/people/green_surf.4bpp"); +const u16 gObjectEventPic_RedBike[] = INCBIN_U16("graphics/object_events/pics/people/red_bike.4bpp"); +const u16 gObjectEventPic_RedVSSeekerBike[] = INCBIN_U16("graphics/object_events/pics/people/red_vs_seeker_bike.4bpp"); +const u16 gObjectEventPic_GreenBike[] = INCBIN_U16("graphics/object_events/pics/people/green_bike.4bpp"); +const u16 gObjectEventPic_GreenVSSeekerBike[] = INCBIN_U16("graphics/object_events/pics/people/green_vs_seeker_bike.4bpp"); +const u16 gObjectEventPic_RSBrendan[] = INCBIN_U16("graphics/object_events/pics/people/rs_brendan.4bpp"); +const u16 gObjectEventPic_RSMay[] = INCBIN_U16("graphics/object_events/pics/people/rs_may.4bpp"); +const u16 gObjectEventPic_RedFish[] = INCBIN_U16("graphics/object_events/pics/people/red_fish.4bpp"); +const u16 gObjectEventPic_GreenFish[] = INCBIN_U16("graphics/object_events/pics/people/green_fish.4bpp"); +const u16 gObjectEventPic_Pokedex[] = INCBIN_U16("graphics/object_events/pics/misc/pokedex.4bpp"); +const u16 gObjectEventPic_TownMap[] = INCBIN_U16("graphics/object_events/pics/misc/town_map.4bpp"); +const u16 gObjectEventPic_UnusedMan[] = INCBIN_U16("graphics/object_events/pics/people/unused_man.4bpp"); // Unused +const u16 gObjectEventPic_Giovanni[] = INCBIN_U16("graphics/object_events/pics/people/giovanni.4bpp"); +const u16 gObjectEventPic_Blaine[] = INCBIN_U16("graphics/object_events/pics/people/blaine.4bpp"); +const u16 gObjectEventPic_Sabrina[] = INCBIN_U16("graphics/object_events/pics/people/sabrina.4bpp"); +const u16 gObjectEventPic_Daisy[] = INCBIN_U16("graphics/object_events/pics/people/daisy.4bpp"); +const u16 gObjectEventPic_Lorelei[] = INCBIN_U16("graphics/object_events/pics/people/lorelei.4bpp"); +const u16 gObjectEventPic_Erika[] = INCBIN_U16("graphics/object_events/pics/people/erika.4bpp"); +const u16 gObjectEventPic_Koga[] = INCBIN_U16("graphics/object_events/pics/people/koga.4bpp"); +const u16 gObjectEventPic_Brock[] = INCBIN_U16("graphics/object_events/pics/people/brock.4bpp"); +const u16 gObjectEventPic_LtSurge[] = INCBIN_U16("graphics/object_events/pics/people/lt_surge.4bpp"); +const u16 gObjectEventPic_Bill[] = INCBIN_U16("graphics/object_events/pics/people/bill.4bpp"); const u16 gUnknown_836D828[] = INCBIN_U16("graphics/object_events/palettes/3.gbapal"); const u16 gUnknown_836D848[] = INCBIN_U16("graphics/object_events/palettes/4.gbapal"); const u16 gUnknown_836D868[] = INCBIN_U16("graphics/object_events/palettes/5.gbapal"); @@ -53,194 +53,188 @@ const u16 gUnknown_836D8A8[] = INCBIN_U16("graphics/object_events/palettes/7.gba const u16 gUnknown_836D8C8[] = INCBIN_U16("graphics/object_events/palettes/8.gbapal"); const u16 gUnknown_836D8E8[] = INCBIN_U16("graphics/object_events/palettes/9.gbapal"); const u16 gUnknown_836D908[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal"); -const u32 gObjectEventPic_LittleBoy[] = INCBIN_U32("graphics/object_events/pics/people/little_boy.4bpp"); -const u32 gObjectEventPic_LittleGirl[] = INCBIN_U32("graphics/object_events/pics/people/little_girl.4bpp"); -const u32 gObjectEventPic_SittingBoy[] = INCBIN_U32("graphics/object_events/pics/people/sitting_boy.4bpp"); -const u32 gObjectEventPic_Lass[] = INCBIN_U32("graphics/object_events/pics/people/lass.4bpp"); -const u32 gObjectEventPic_Youngster[] = INCBIN_U32("graphics/object_events/pics/people/youngster.4bpp"); -const u32 gObjectEventPic_Boy[] = INCBIN_U32("graphics/object_events/pics/people/boy.4bpp"); -const u32 gObjectEventPic_Woman1[] = INCBIN_U32("graphics/object_events/pics/people/woman_1.4bpp"); -const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/object_events/pics/people/woman_3.4bpp"); -const u32 gObjectEventPic_BugCatcher[] = INCBIN_U32("graphics/object_events/pics/people/bug_catcher.4bpp"); -const u32 gObjectEventPic_BattleGirl[] = INCBIN_U32("graphics/object_events/pics/people/battle_girl.4bpp"); -const u32 gObjectEventPic_RichBoy[] = INCBIN_U32("graphics/object_events/pics/people/rich_boy.4bpp"); // Unused -const u32 gObjectEventPic_FatMan[] = INCBIN_U32("graphics/object_events/pics/people/fat_man.4bpp"); -const u32 gObjectEventPic_BaldingMan[] = INCBIN_U32("graphics/object_events/pics/people/balding_man.4bpp"); -const u32 gObjectEventPic_Woman2[] = INCBIN_U32("graphics/object_events/pics/people/woman_2.4bpp"); -const u32 gObjectEventPic_OldMan1[] = INCBIN_U32("graphics/object_events/pics/people/old_man_1.4bpp"); -const u32 gObjectEventPic_OldManLyingDown[] = INCBIN_U32("graphics/object_events/pics/people/old_man_lying_down.4bpp"); -const u32 gObjectEventPic_WorkerM[] = INCBIN_U32("graphics/object_events/pics/people/worker_m.4bpp"); -const u32 gObjectEventPic_WorkerF[] = INCBIN_U32("graphics/object_events/pics/people/worker_f.4bpp"); -const u32 gObjectEventPic_Beauty[] = INCBIN_U32("graphics/object_events/pics/people/beauty.4bpp"); -const u32 gObjectEventPic_Chef[] = INCBIN_U32("graphics/object_events/pics/people/chef.4bpp"); -const u32 gObjectEventPic_OldMan2[] = INCBIN_U32("graphics/object_events/pics/people/old_man_2.4bpp"); -const u32 gObjectEventPic_OldWoman[] = INCBIN_U32("graphics/object_events/pics/people/old_woman.4bpp"); -const u32 gObjectEventPic_Camper[] = INCBIN_U32("graphics/object_events/pics/people/camper.4bpp"); -const u32 gObjectEventPic_Picnicker[] = INCBIN_U32("graphics/object_events/pics/people/picnicker.4bpp"); -const u32 gObjectEventPic_CooltrainerM[] = INCBIN_U32("graphics/object_events/pics/people/cooltrainer_m.4bpp"); -const u32 gObjectEventPic_CooltrainerF[] = INCBIN_U32("graphics/object_events/pics/people/cooltrainer_f.4bpp"); -const u32 gObjectEventPic_Psyduck[] = INCBIN_U32("graphics/object_events/pics/pokemon/psyduck.4bpp"); -const u32 gObjectEventPic_SuperNerd[] = INCBIN_U32("graphics/object_events/pics/people/super_nerd.4bpp"); -const u32 gObjectEventPic_Channeler[] = INCBIN_U32("graphics/object_events/pics/people/channeler.4bpp"); -const u32 gObjectEventPic_RocketF[] = INCBIN_U32("graphics/object_events/pics/people/rocket_f.4bpp"); -const u32 gObjectEventPic_SwimmerMWater[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_m_water.4bpp"); -const u32 gObjectEventPic_SwimmerFWater[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_f_water.4bpp"); -const u32 gObjectEventPic_SwimmerMLand[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_m_land.4bpp"); -const u32 gObjectEventPic_SwimmerFLand[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_f_land.4bpp"); -const u32 gObjectEventPic_Blackbelt[] = INCBIN_U32("graphics/object_events/pics/people/blackbelt.4bpp"); -const u32 gObjectEventPic_Scientist[] = INCBIN_U32("graphics/object_events/pics/people/scientist.4bpp"); -const u32 gObjectEventPic_Gentleman[] = INCBIN_U32("graphics/object_events/pics/people/gentleman.4bpp"); -const u32 gObjectEventPic_Sailor[] = INCBIN_U32("graphics/object_events/pics/people/sailor.4bpp"); -const u32 gObjectEventPic_Captain[] = INCBIN_U32("graphics/object_events/pics/people/captain.4bpp"); -const u32 gObjectEventPic_Fisher[] = INCBIN_U32("graphics/object_events/pics/people/fisher.4bpp"); -const u32 gObjectEventPic_TeachyTVHost[] = INCBIN_U32("graphics/object_events/pics/people/teachy_tv_host.4bpp"); -const u32 gObjectEventPic_UnusedWoman[] = INCBIN_U32("graphics/object_events/pics/people/unused_woman.4bpp"); -const u32 gObjectEventPic_TuberF[] = INCBIN_U32("graphics/object_events/pics/people/tuber_f.4bpp"); -const u32 gObjectEventPic_TuberMWater[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_water.4bpp"); -const u32 gObjectEventPic_TuberMLand[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_land.4bpp"); -const u32 gObjectEventPic_Hiker[] = INCBIN_U32("graphics/object_events/pics/people/hiker.4bpp"); -const u32 gObjectEventPic_Biker[] = INCBIN_U32("graphics/object_events/pics/people/biker.4bpp"); -const u32 gObjectEventPic_GymGuy[] = INCBIN_U32("graphics/object_events/pics/people/gym_guy.4bpp"); -const u32 gObjectEventPic_Man[] = INCBIN_U32("graphics/object_events/pics/people/man.4bpp"); -const u32 gObjectEventPic_Rocker[] = INCBIN_U32("graphics/object_events/pics/people/rocker.4bpp"); -const u32 gObjectEventPic_ProfOak[] = INCBIN_U32("graphics/object_events/pics/people/prof_oak.4bpp"); -const u32 gObjectEventPic_Blue[] = INCBIN_U32("graphics/object_events/pics/people/blue.4bpp"); -const u32 gObjectEventPic_Nurse[] = INCBIN_U32("graphics/object_events/pics/people/nurse.4bpp"); -const u32 gObjectEventPic_CableClubReceptionist[] = INCBIN_U32("graphics/object_events/pics/people/cable_club_receptionist.4bpp"); -const u32 gObjectEventPic_UnionRoomReceptionist[] = INCBIN_U32("graphics/object_events/pics/people/union_room_receptionist.4bpp"); -const u32 gObjectEventPic_UnusedMaleReceptionist[] = INCBIN_U32("graphics/object_events/pics/people/unused_male_receptionist.4bpp"); -const u32 gObjectEventPic_ItemBall[] = INCBIN_U32("graphics/object_events/pics/misc/item_ball.4bpp"); -const u32 gObjectEventPic_MrFuji[] = INCBIN_U32("graphics/object_events/pics/people/mr_fuji.4bpp"); -const u32 gObjectEventPic_Bruno[] = INCBIN_U32("graphics/object_events/pics/people/bruno.4bpp"); -const u32 gObjectEventPic_Clerk[] = INCBIN_U32("graphics/object_events/pics/people/clerk.4bpp"); -const u32 gObjectEventPic_MGDeliveryman[] = INCBIN_U32("graphics/object_events/pics/people/mg_deliveryman.4bpp"); -const u32 gObjectEventPic_TrainerTowerDude[] = INCBIN_U32("graphics/object_events/pics/people/trainer_tower_dude.4bpp"); -const u32 gObjectEventPic_Cameraman[] = INCBIN_U32("graphics/object_events/pics/people/cameraman.4bpp"); // Unused -const u32 gObjectEventPic_RocketM[] = INCBIN_U32("graphics/object_events/pics/people/rocket_m.4bpp"); -const u32 gObjectEventPic_Celio[] = INCBIN_U32("graphics/object_events/pics/people/celio.4bpp"); -const u32 gObjectEventPic_Lapras[] = INCBIN_U32("graphics/object_events/pics/pokemon/lapras.4bpp"); -const u32 gObjectEventPic_Zapdos[] = INCBIN_U32("graphics/object_events/pics/pokemon/zapdos.4bpp"); -const u32 gObjectEventPic_Moltres[] = INCBIN_U32("graphics/object_events/pics/pokemon/moltres.4bpp"); -const u32 gObjectEventPic_Articuno[] = INCBIN_U32("graphics/object_events/pics/pokemon/articuno.4bpp"); -const u32 gObjectEventPic_Mewtwo[] = INCBIN_U32("graphics/object_events/pics/pokemon/mewtwo.4bpp"); -const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/object_events/pics/pokemon/mew.4bpp"); -const u32 gObjectEventPic_Entei[] = INCBIN_U32("graphics/object_events/pics/pokemon/entei.4bpp"); -const u32 gObjectEventPic_Raikou[] = INCBIN_U32("graphics/object_events/pics/pokemon/raikou.4bpp"); -const u32 gObjectEventPic_Suicune[] = INCBIN_U32("graphics/object_events/pics/pokemon/suicune.4bpp"); -const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/object_events/pics/pokemon/lugia.4bpp"); -const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/object_events/pics/pokemon/ho_oh.4bpp"); -const u32 gObjectEventPic_Celebi[] = INCBIN_U32("graphics/object_events/pics/pokemon/celebi.4bpp"); -const u32 gObjectEventPic_DeoxysD[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys_d.4bpp"); -const u32 gObjectEventPic_DeoxysA[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys_a.4bpp"); -const u32 gObjectEventPic_DeoxysN[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys_n.4bpp"); -const u32 gObjectEventPic_Agatha[] = INCBIN_U32("graphics/object_events/pics/people/agatha.4bpp"); -const u32 gObjectEventPic_Misty[] = INCBIN_U32("graphics/object_events/pics/people/misty.4bpp"); -const u32 gObjectEventPic_Lance[] = INCBIN_U32("graphics/object_events/pics/people/lance.4bpp"); -const u32 gObjectEventPic_GBAKid[] = INCBIN_U32("graphics/object_events/pics/people/gba_kid.4bpp"); -const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/object_events/pics/people/mom.4bpp"); -const u32 gObjectEventPic_Pidgeot[] = INCBIN_U32("graphics/object_events/pics/pokemon/pidgeot.4bpp"); -const u32 gObjectEventPic_Omanyte[] = INCBIN_U32("graphics/object_events/pics/pokemon/omanyte.4bpp"); -const u32 gObjectEventPic_Kangaskhan[] = INCBIN_U32("graphics/object_events/pics/pokemon/kangaskhan.4bpp"); -const u32 gObjectEventPic_NidoranF[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoran_f.4bpp"); -const u32 gObjectEventPic_NidoranM[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidoran_m.4bpp"); -const u32 gObjectEventPic_Nidorino[] = INCBIN_U32("graphics/object_events/pics/pokemon/nidorino.4bpp"); -const u32 gObjectEventPic_Meowth[] = INCBIN_U32("graphics/object_events/pics/pokemon/meowth.4bpp"); -const u32 gObjectEventPic_Seel[] = INCBIN_U32("graphics/object_events/pics/pokemon/seel.4bpp"); -const u32 gObjectEventPic_Voltorb[] = INCBIN_U32("graphics/object_events/pics/pokemon/voltorb.4bpp"); -const u32 gObjectEventPic_Slowpoke[] = INCBIN_U32("graphics/object_events/pics/pokemon/slowpoke.4bpp"); -const u32 gObjectEventPic_Slowbro[] = INCBIN_U32("graphics/object_events/pics/pokemon/slowbro.4bpp"); -const u32 gObjectEventPic_Machop[] = INCBIN_U32("graphics/object_events/pics/pokemon/machop.4bpp"); -const u32 gObjectEventPic_Wigglytuff[] = INCBIN_U32("graphics/object_events/pics/pokemon/wigglytuff.4bpp"); -const u32 gObjectEventPic_Doduo[] = INCBIN_U32("graphics/object_events/pics/pokemon/doduo.4bpp"); -const u32 gObjectEventPic_Fearow[] = INCBIN_U32("graphics/object_events/pics/pokemon/fearow.4bpp"); -const u32 gObjectEventPic_Kabuto[] = INCBIN_U32("graphics/object_events/pics/pokemon/kabuto.4bpp"); -const u32 gObjectEventPic_Machoke[] = INCBIN_U32("graphics/object_events/pics/pokemon/machoke.4bpp"); -const u32 gObjectEventPic_Snorlax[] = INCBIN_U32("graphics/object_events/pics/pokemon/snorlax.4bpp"); -const u32 gObjectEventPic_Spearow[] = INCBIN_U32("graphics/object_events/pics/pokemon/spearow.4bpp"); -const u32 gObjectEventPic_Cubone[] = INCBIN_U32("graphics/object_events/pics/pokemon/cubone.4bpp"); -const u32 gObjectEventPic_Poliwrath[] = INCBIN_U32("graphics/object_events/pics/pokemon/poliwrath.4bpp"); -const u32 gObjectEventPic_Chansey[] = INCBIN_U32("graphics/object_events/pics/pokemon/chansey.4bpp"); -const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/object_events/pics/pokemon/pikachu.4bpp"); -const u32 gObjectEventPic_Jigglypuff[] = INCBIN_U32("graphics/object_events/pics/pokemon/jigglypuff.4bpp"); -const u32 gObjectEventPic_Pidgey[] = INCBIN_U32("graphics/object_events/pics/pokemon/pidgey.4bpp"); -const u32 gObjectEventPic_Clefairy[] = INCBIN_U32("graphics/object_events/pics/pokemon/clefairy.4bpp"); -const u32 gObjectEventPic_CutTree[] = INCBIN_U32("graphics/object_events/pics/misc/cut_tree.4bpp"); -const u32 gObjectEventPic_RockSmashRock[] = INCBIN_U32("graphics/object_events/pics/misc/rock_smash_rock.4bpp"); -const u32 gObjectEventPic_StrengthBoulder[] = INCBIN_U32("graphics/object_events/pics/misc/strength_boulder.4bpp"); -const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/object_events/pics/misc/fossil.4bpp"); -const u32 gObjectEventPic_Ruby[] = INCBIN_U32("graphics/object_events/pics/misc/ruby.4bpp"); -const u32 gObjectEventPic_Sapphire[] = INCBIN_U32("graphics/object_events/pics/misc/sapphire.4bpp"); -const u32 gObjectEventPic_OldAmber[] = INCBIN_U32("graphics/object_events/pics/misc/old_amber.4bpp"); -const u32 gObjectEventPic_GymSign[] = INCBIN_U32("graphics/object_events/pics/misc/gym_sign.4bpp"); -const u32 gObjectEventPic_Sign[] = INCBIN_U32("graphics/object_events/pics/misc/sign.4bpp"); -const u32 gObjectEventPic_WoodenSign[] = INCBIN_U32("graphics/object_events/pics/misc/wooden_sign.4bpp"); -const u32 gObjectEventPic_Clipboard[] = INCBIN_U32("graphics/object_events/pics/misc/clipboard.4bpp"); +const u16 gObjectEventPic_LittleBoy[] = INCBIN_U16("graphics/object_events/pics/people/little_boy.4bpp"); +const u16 gObjectEventPic_LittleGirl[] = INCBIN_U16("graphics/object_events/pics/people/little_girl.4bpp"); +const u16 gObjectEventPic_SittingBoy[] = INCBIN_U16("graphics/object_events/pics/people/sitting_boy.4bpp"); +const u16 gObjectEventPic_Lass[] = INCBIN_U16("graphics/object_events/pics/people/lass.4bpp"); +const u16 gObjectEventPic_Youngster[] = INCBIN_U16("graphics/object_events/pics/people/youngster.4bpp"); +const u16 gObjectEventPic_Boy[] = INCBIN_U16("graphics/object_events/pics/people/boy.4bpp"); +const u16 gObjectEventPic_Woman1[] = INCBIN_U16("graphics/object_events/pics/people/woman_1.4bpp"); +const u16 gObjectEventPic_Woman3[] = INCBIN_U16("graphics/object_events/pics/people/woman_3.4bpp"); +const u16 gObjectEventPic_BugCatcher[] = INCBIN_U16("graphics/object_events/pics/people/bug_catcher.4bpp"); +const u16 gObjectEventPic_BattleGirl[] = INCBIN_U16("graphics/object_events/pics/people/battle_girl.4bpp"); +const u16 gObjectEventPic_RichBoy[] = INCBIN_U16("graphics/object_events/pics/people/rich_boy.4bpp"); // Unused +const u16 gObjectEventPic_FatMan[] = INCBIN_U16("graphics/object_events/pics/people/fat_man.4bpp"); +const u16 gObjectEventPic_BaldingMan[] = INCBIN_U16("graphics/object_events/pics/people/balding_man.4bpp"); +const u16 gObjectEventPic_Woman2[] = INCBIN_U16("graphics/object_events/pics/people/woman_2.4bpp"); +const u16 gObjectEventPic_OldMan1[] = INCBIN_U16("graphics/object_events/pics/people/old_man_1.4bpp"); +const u16 gObjectEventPic_OldManLyingDown[] = INCBIN_U16("graphics/object_events/pics/people/old_man_lying_down.4bpp"); +const u16 gObjectEventPic_WorkerM[] = INCBIN_U16("graphics/object_events/pics/people/worker_m.4bpp"); +const u16 gObjectEventPic_WorkerF[] = INCBIN_U16("graphics/object_events/pics/people/worker_f.4bpp"); +const u16 gObjectEventPic_Beauty[] = INCBIN_U16("graphics/object_events/pics/people/beauty.4bpp"); +const u16 gObjectEventPic_Chef[] = INCBIN_U16("graphics/object_events/pics/people/chef.4bpp"); +const u16 gObjectEventPic_OldMan2[] = INCBIN_U16("graphics/object_events/pics/people/old_man_2.4bpp"); +const u16 gObjectEventPic_OldWoman[] = INCBIN_U16("graphics/object_events/pics/people/old_woman.4bpp"); +const u16 gObjectEventPic_Camper[] = INCBIN_U16("graphics/object_events/pics/people/camper.4bpp"); +const u16 gObjectEventPic_Picnicker[] = INCBIN_U16("graphics/object_events/pics/people/picnicker.4bpp"); +const u16 gObjectEventPic_CooltrainerM[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_m.4bpp"); +const u16 gObjectEventPic_CooltrainerF[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_f.4bpp"); +const u16 gObjectEventPic_Psyduck[] = INCBIN_U16("graphics/object_events/pics/pokemon/psyduck.4bpp"); +const u16 gObjectEventPic_SuperNerd[] = INCBIN_U16("graphics/object_events/pics/people/super_nerd.4bpp"); +const u16 gObjectEventPic_Channeler[] = INCBIN_U16("graphics/object_events/pics/people/channeler.4bpp"); +const u16 gObjectEventPic_RocketF[] = INCBIN_U16("graphics/object_events/pics/people/rocket_f.4bpp"); +const u16 gObjectEventPic_SwimmerMWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_water.4bpp"); +const u16 gObjectEventPic_SwimmerFWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_water.4bpp"); +const u16 gObjectEventPic_SwimmerMLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_land.4bpp"); +const u16 gObjectEventPic_SwimmerFLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_land.4bpp"); +const u16 gObjectEventPic_Blackbelt[] = INCBIN_U16("graphics/object_events/pics/people/blackbelt.4bpp"); +const u16 gObjectEventPic_Scientist[] = INCBIN_U16("graphics/object_events/pics/people/scientist.4bpp"); +const u16 gObjectEventPic_Gentleman[] = INCBIN_U16("graphics/object_events/pics/people/gentleman.4bpp"); +const u16 gObjectEventPic_Sailor[] = INCBIN_U16("graphics/object_events/pics/people/sailor.4bpp"); +const u16 gObjectEventPic_Captain[] = INCBIN_U16("graphics/object_events/pics/people/captain.4bpp"); +const u16 gObjectEventPic_Fisher[] = INCBIN_U16("graphics/object_events/pics/people/fisher.4bpp"); +const u16 gObjectEventPic_TeachyTVHost[] = INCBIN_U16("graphics/object_events/pics/people/teachy_tv_host.4bpp"); +const u16 gObjectEventPic_UnusedWoman[] = INCBIN_U16("graphics/object_events/pics/people/unused_woman.4bpp"); +const u16 gObjectEventPic_TuberF[] = INCBIN_U16("graphics/object_events/pics/people/tuber_f.4bpp"); +const u16 gObjectEventPic_TuberMWater[] = INCBIN_U16("graphics/object_events/pics/people/tuber_m_water.4bpp"); +const u16 gObjectEventPic_TuberMLand[] = INCBIN_U16("graphics/object_events/pics/people/tuber_m_land.4bpp"); +const u16 gObjectEventPic_Hiker[] = INCBIN_U16("graphics/object_events/pics/people/hiker.4bpp"); +const u16 gObjectEventPic_Biker[] = INCBIN_U16("graphics/object_events/pics/people/biker.4bpp"); +const u16 gObjectEventPic_GymGuy[] = INCBIN_U16("graphics/object_events/pics/people/gym_guy.4bpp"); +const u16 gObjectEventPic_Man[] = INCBIN_U16("graphics/object_events/pics/people/man.4bpp"); +const u16 gObjectEventPic_Rocker[] = INCBIN_U16("graphics/object_events/pics/people/rocker.4bpp"); +const u16 gObjectEventPic_ProfOak[] = INCBIN_U16("graphics/object_events/pics/people/prof_oak.4bpp"); +const u16 gObjectEventPic_Blue[] = INCBIN_U16("graphics/object_events/pics/people/blue.4bpp"); +const u16 gObjectEventPic_Nurse[] = INCBIN_U16("graphics/object_events/pics/people/nurse.4bpp"); +const u16 gObjectEventPic_CableClubReceptionist[] = INCBIN_U16("graphics/object_events/pics/people/cable_club_receptionist.4bpp"); +const u16 gObjectEventPic_UnionRoomReceptionist[] = INCBIN_U16("graphics/object_events/pics/people/union_room_receptionist.4bpp"); +const u16 gObjectEventPic_UnusedMaleReceptionist[] = INCBIN_U16("graphics/object_events/pics/people/unused_male_receptionist.4bpp"); +const u16 gObjectEventPic_ItemBall[] = INCBIN_U16("graphics/object_events/pics/misc/item_ball.4bpp"); +const u16 gObjectEventPic_MrFuji[] = INCBIN_U16("graphics/object_events/pics/people/mr_fuji.4bpp"); +const u16 gObjectEventPic_Bruno[] = INCBIN_U16("graphics/object_events/pics/people/bruno.4bpp"); +const u16 gObjectEventPic_Clerk[] = INCBIN_U16("graphics/object_events/pics/people/clerk.4bpp"); +const u16 gObjectEventPic_MGDeliveryman[] = INCBIN_U16("graphics/object_events/pics/people/mg_deliveryman.4bpp"); +const u16 gObjectEventPic_TrainerTowerDude[] = INCBIN_U16("graphics/object_events/pics/people/trainer_tower_dude.4bpp"); +const u16 gObjectEventPic_Cameraman[] = INCBIN_U16("graphics/object_events/pics/people/cameraman.4bpp"); // Unused +const u16 gObjectEventPic_RocketM[] = INCBIN_U16("graphics/object_events/pics/people/rocket_m.4bpp"); +const u16 gObjectEventPic_Celio[] = INCBIN_U16("graphics/object_events/pics/people/celio.4bpp"); +const u16 gObjectEventPic_Lapras[] = INCBIN_U16("graphics/object_events/pics/pokemon/lapras.4bpp"); +const u16 gObjectEventPic_Zapdos[] = INCBIN_U16("graphics/object_events/pics/pokemon/zapdos.4bpp"); +const u16 gObjectEventPic_Moltres[] = INCBIN_U16("graphics/object_events/pics/pokemon/moltres.4bpp"); +const u16 gObjectEventPic_Articuno[] = INCBIN_U16("graphics/object_events/pics/pokemon/articuno.4bpp"); +const u16 gObjectEventPic_Mewtwo[] = INCBIN_U16("graphics/object_events/pics/pokemon/mewtwo.4bpp"); +const u16 gObjectEventPic_Mew[] = INCBIN_U16("graphics/object_events/pics/pokemon/mew.4bpp"); +const u16 gObjectEventPic_Entei[] = INCBIN_U16("graphics/object_events/pics/pokemon/entei.4bpp"); +const u16 gObjectEventPic_Raikou[] = INCBIN_U16("graphics/object_events/pics/pokemon/raikou.4bpp"); +const u16 gObjectEventPic_Suicune[] = INCBIN_U16("graphics/object_events/pics/pokemon/suicune.4bpp"); +const u16 gObjectEventPic_Lugia[] = INCBIN_U16("graphics/object_events/pics/pokemon/lugia.4bpp"); +const u16 gObjectEventPic_HoOh[] = INCBIN_U16("graphics/object_events/pics/pokemon/ho_oh.4bpp"); +const u16 gObjectEventPic_Celebi[] = INCBIN_U16("graphics/object_events/pics/pokemon/celebi.4bpp"); +const u16 gObjectEventPic_DeoxysD[] = INCBIN_U16("graphics/object_events/pics/pokemon/deoxys_d.4bpp"); +const u16 gObjectEventPic_DeoxysA[] = INCBIN_U16("graphics/object_events/pics/pokemon/deoxys_a.4bpp"); +const u16 gObjectEventPic_DeoxysN[] = INCBIN_U16("graphics/object_events/pics/pokemon/deoxys_n.4bpp"); +const u16 gObjectEventPic_Agatha[] = INCBIN_U16("graphics/object_events/pics/people/agatha.4bpp"); +const u16 gObjectEventPic_Misty[] = INCBIN_U16("graphics/object_events/pics/people/misty.4bpp"); +const u16 gObjectEventPic_Lance[] = INCBIN_U16("graphics/object_events/pics/people/lance.4bpp"); +const u16 gObjectEventPic_GBAKid[] = INCBIN_U16("graphics/object_events/pics/people/gba_kid.4bpp"); +const u16 gObjectEventPic_Mom[] = INCBIN_U16("graphics/object_events/pics/people/mom.4bpp"); +const u16 gObjectEventPic_Pidgeot[] = INCBIN_U16("graphics/object_events/pics/pokemon/pidgeot.4bpp"); +const u16 gObjectEventPic_Omanyte[] = INCBIN_U16("graphics/object_events/pics/pokemon/omanyte.4bpp"); +const u16 gObjectEventPic_Kangaskhan[] = INCBIN_U16("graphics/object_events/pics/pokemon/kangaskhan.4bpp"); +const u16 gObjectEventPic_NidoranF[] = INCBIN_U16("graphics/object_events/pics/pokemon/nidoran_f.4bpp"); +const u16 gObjectEventPic_NidoranM[] = INCBIN_U16("graphics/object_events/pics/pokemon/nidoran_m.4bpp"); +const u16 gObjectEventPic_Nidorino[] = INCBIN_U16("graphics/object_events/pics/pokemon/nidorino.4bpp"); +const u16 gObjectEventPic_Meowth[] = INCBIN_U16("graphics/object_events/pics/pokemon/meowth.4bpp"); +const u16 gObjectEventPic_Seel[] = INCBIN_U16("graphics/object_events/pics/pokemon/seel.4bpp"); +const u16 gObjectEventPic_Voltorb[] = INCBIN_U16("graphics/object_events/pics/pokemon/voltorb.4bpp"); +const u16 gObjectEventPic_Slowpoke[] = INCBIN_U16("graphics/object_events/pics/pokemon/slowpoke.4bpp"); +const u16 gObjectEventPic_Slowbro[] = INCBIN_U16("graphics/object_events/pics/pokemon/slowbro.4bpp"); +const u16 gObjectEventPic_Machop[] = INCBIN_U16("graphics/object_events/pics/pokemon/machop.4bpp"); +const u16 gObjectEventPic_Wigglytuff[] = INCBIN_U16("graphics/object_events/pics/pokemon/wigglytuff.4bpp"); +const u16 gObjectEventPic_Doduo[] = INCBIN_U16("graphics/object_events/pics/pokemon/doduo.4bpp"); +const u16 gObjectEventPic_Fearow[] = INCBIN_U16("graphics/object_events/pics/pokemon/fearow.4bpp"); +const u16 gObjectEventPic_Kabuto[] = INCBIN_U16("graphics/object_events/pics/pokemon/kabuto.4bpp"); +const u16 gObjectEventPic_Machoke[] = INCBIN_U16("graphics/object_events/pics/pokemon/machoke.4bpp"); +const u16 gObjectEventPic_Snorlax[] = INCBIN_U16("graphics/object_events/pics/pokemon/snorlax.4bpp"); +const u16 gObjectEventPic_Spearow[] = INCBIN_U16("graphics/object_events/pics/pokemon/spearow.4bpp"); +const u16 gObjectEventPic_Cubone[] = INCBIN_U16("graphics/object_events/pics/pokemon/cubone.4bpp"); +const u16 gObjectEventPic_Poliwrath[] = INCBIN_U16("graphics/object_events/pics/pokemon/poliwrath.4bpp"); +const u16 gObjectEventPic_Chansey[] = INCBIN_U16("graphics/object_events/pics/pokemon/chansey.4bpp"); +const u16 gObjectEventPic_Pikachu[] = INCBIN_U16("graphics/object_events/pics/pokemon/pikachu.4bpp"); +const u16 gObjectEventPic_Jigglypuff[] = INCBIN_U16("graphics/object_events/pics/pokemon/jigglypuff.4bpp"); +const u16 gObjectEventPic_Pidgey[] = INCBIN_U16("graphics/object_events/pics/pokemon/pidgey.4bpp"); +const u16 gObjectEventPic_Clefairy[] = INCBIN_U16("graphics/object_events/pics/pokemon/clefairy.4bpp"); +const u16 gObjectEventPic_CutTree[] = INCBIN_U16("graphics/object_events/pics/misc/cut_tree.4bpp"); +const u16 gObjectEventPic_RockSmashRock[] = INCBIN_U16("graphics/object_events/pics/misc/rock_smash_rock.4bpp"); +const u16 gObjectEventPic_StrengthBoulder[] = INCBIN_U16("graphics/object_events/pics/misc/strength_boulder.4bpp"); +const u16 gObjectEventPic_Fossil[] = INCBIN_U16("graphics/object_events/pics/misc/fossil.4bpp"); +const u16 gObjectEventPic_Ruby[] = INCBIN_U16("graphics/object_events/pics/misc/ruby.4bpp"); +const u16 gObjectEventPic_Sapphire[] = INCBIN_U16("graphics/object_events/pics/misc/sapphire.4bpp"); +const u16 gObjectEventPic_OldAmber[] = INCBIN_U16("graphics/object_events/pics/misc/old_amber.4bpp"); +const u16 gObjectEventPic_GymSign[] = INCBIN_U16("graphics/object_events/pics/misc/gym_sign.4bpp"); +const u16 gObjectEventPic_Sign[] = INCBIN_U16("graphics/object_events/pics/misc/sign.4bpp"); +const u16 gObjectEventPic_WoodenSign[] = INCBIN_U16("graphics/object_events/pics/misc/wooden_sign.4bpp"); +const u16 gObjectEventPic_Clipboard[] = INCBIN_U16("graphics/object_events/pics/misc/clipboard.4bpp"); const u16 gUnknown_8394EA8[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); -const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/object_events/pics/misc/birth_island_stone.4bpp"); -const u32 gObjectEventPic_LaprasDoll[] = INCBIN_U32("graphics/object_events/pics/misc/lapras_doll.4bpp"); +const u16 gObjectEventPic_BirthIslandStone[] = INCBIN_U16("graphics/object_events/pics/misc/birth_island_stone.4bpp"); +const u16 gObjectEventPic_LaprasDoll[] = INCBIN_U16("graphics/object_events/pics/misc/lapras_doll.4bpp"); const u16 gUnknown_83952C8[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); -const u32 gObjectEventPic_Seagallop[] = INCBIN_U32("graphics/object_events/pics/misc/seagallop.4bpp"); +const u16 gObjectEventPic_Seagallop[] = INCBIN_U16("graphics/object_events/pics/misc/seagallop.4bpp"); const u16 gUnknown_8395AE8[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); -const u32 gObjectEventPic_SSAnne[] = INCBIN_U32("graphics/object_events/pics/misc/ss_anne.4bpp"); -const u32 gObjectEventPic_SurfBlob[] = INCBIN_U32("graphics/object_events/pics/misc/surf_blob.4bpp"); -const u32 gObjectEventPic_Policeman[] = INCBIN_U32("graphics/object_events/pics/people/policeman.4bpp"); +const u16 gObjectEventPic_SSAnne[] = INCBIN_U16("graphics/object_events/pics/misc/ss_anne.4bpp"); +const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/misc/surf_blob.4bpp"); +const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp"); const u16 gUnknown_8398008[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); const u16 gUnknown_8398028[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); -const u32 gSpriteImageGfx_FieldShadowS[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp"); -const u32 gSpriteImageGfx_FieldShadowM[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp"); -const u32 gSpriteImageGfx_FieldShadowL[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp"); -const u32 gSpriteImageGfx_FieldShadowXL[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); -const u32 filler_8398188[0x48] = {}; +const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_small.4bpp"); +const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_medium.4bpp"); +const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_large.4bpp"); +const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); +const u16 filler_8398188[0x90] = {}; const u16 gUnknown_8398648[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); -const u32 gUnknown_8398668[] = INCBIN_U32("graphics/field_effects/fldeff_cut.4bpp"); +const u16 gUnknown_8398668[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); const u16 gUnknown_8398688[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gbapal"); -const u32 gUnknown_83986A8[] = INCBIN_U32("graphics/object_events/pics/unknown/83986A8.4bpp"); -const u32 gUnknown_8398928[] = INCBIN_U32("graphics/object_events/pics/unknown/8398928.4bpp"); -const u32 gUnknown_8398BA8[] = INCBIN_U32("graphics/object_events/pics/unknown/8398BA8.4bpp"); -const u16 gUnknown_8398FA8[] = INCBIN_U16("graphics/object_events/palettes/8398FA8.gbapal"); -const u16 gUnknown_8398FC8[] = INCBIN_U16("graphics/object_events/palettes/8398FC8.gbapal"); +const u16 gFieldEffectObjectPic_Ripple[] = INCBIN_U16("graphics/object_events/pics/unknown/83986A8.4bpp"); +const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/object_events/pics/unknown/8398928.4bpp"); +const u16 gFieldEffectObjectPic_Arrow[] = INCBIN_U16("graphics/object_events/pics/unknown/8398BA8.4bpp"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/8398FA8.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/8398FC8.gbapal"); const u16 filler_8398FE8[16] = {0}; -const u32 gUnknown_8399008[] = INCBIN_U32("graphics/object_events/pics/unknown/8399008.4bpp"); -const u32 gUnknown_83990C8[] = INCBIN_U32("graphics/object_events/pics/unknown/83990C8.4bpp"); -const u32 gUnknown_8399188[] = INCBIN_U32("graphics/object_events/pics/unknown/8399188.4bpp"); -const u32 gUnknown_8399288[] = INCBIN_U32("graphics/object_events/pics/unknown/8399288.4bpp"); -const u32 gUnknown_8399488[] = INCBIN_U32("graphics/object_events/pics/unknown/8399488.4bpp"); -const u32 gUnknown_8399788[] = INCBIN_U32("graphics/object_events/pics/unknown/8399788.4bpp"); -const u32 gUnknown_8399C08[] = INCBIN_U32("graphics/object_events/pics/unknown/8399C08.4bpp"); -const u32 gUnknown_8399E08[] = INCBIN_U32("graphics/object_events/pics/unknown/8399E08.4bpp"); -const u32 gUnknown_8399E88[] = INCBIN_U32("graphics/object_events/pics/unknown/8399E88.4bpp"); -const u32 gUnknown_8399F08[] = INCBIN_U32("graphics/object_events/pics/unknown/8399F08.4bpp"); -const u32 gUnknown_8399F88[] = INCBIN_U32("graphics/object_events/pics/unknown/8399F88.4bpp"); -const u32 gUnknown_839A008[] = INCBIN_U32("graphics/object_events/pics/unknown/839A008.4bpp"); -const u32 gUnknown_839A288[] = INCBIN_U32("graphics/object_events/pics/unknown/839A288.4bpp"); -const u32 gUnknown_839A388[] = INCBIN_U32("graphics/object_events/pics/unknown/839A388.4bpp"); -const u32 gUnknown_839A408[] = INCBIN_U32("graphics/object_events/pics/unknown/839A408.4bpp"); -const u32 gUnknown_839A488[] = INCBIN_U32("graphics/object_events/pics/unknown/839A488.4bpp"); -const u32 gUnknown_839A508[] = INCBIN_U32("graphics/object_events/pics/unknown/839A508.4bpp"); -const u32 gUnknown_839A588[] = INCBIN_U32("graphics/object_events/pics/unknown/839A588.4bpp"); -const u32 gUnknown_839A608[] = INCBIN_U32("graphics/object_events/pics/unknown/839A608.4bpp"); -const u32 gUnknown_839A688[] = INCBIN_U32("graphics/object_events/pics/unknown/839A688.4bpp"); -const u32 gUnknown_839A708[] = INCBIN_U32("graphics/object_events/pics/unknown/839A708.4bpp"); -const u32 gUnknown_839A788[] = INCBIN_U32("graphics/object_events/pics/unknown/839A788.4bpp"); -const u32 gUnknown_839A988[] = INCBIN_U32("graphics/object_events/pics/unknown/839A988.4bpp"); -const u32 gUnknown_839AA48[] = INCBIN_U32("graphics/object_events/pics/unknown/839AA48.4bpp"); -const u32 gUnknown_839AAC8[] = INCBIN_U32("graphics/object_events/pics/unknown/839AAC8.4bpp"); -const u32 gUnknown_839AB48[] = INCBIN_U32("graphics/object_events/pics/unknown/839AB48.4bpp"); -const u32 gUnknown_839ABC8[] = INCBIN_U32("graphics/object_events/pics/unknown/839ABC8.4bpp"); -const u32 gUnknown_839AC48[] = INCBIN_U32("graphics/object_events/pics/unknown/839AC48.4bpp"); -const u32 gUnknown_839AC88[] = INCBIN_U32("graphics/object_events/pics/unknown/839AC88.4bpp"); -const u32 gUnknown_839ACC8[] = INCBIN_U32("graphics/object_events/pics/unknown/839ACC8.4bpp"); -const u32 gUnknown_839AD08[] = INCBIN_U32("graphics/object_events/pics/unknown/839AD08.4bpp"); -const u32 gUnknown_839AD48[] = INCBIN_U32("graphics/object_events/pics/unknown/839AD48.4bpp"); -const u32 gUnknown_839AD88[] = INCBIN_U32("graphics/object_events/pics/unknown/839AD88.4bpp"); -const u32 gUnknown_839B008[] = INCBIN_U32("graphics/object_events/pics/unknown/839B008.4bpp"); -const u32 gUnknown_839B708[] = INCBIN_U32("graphics/object_events/pics/unknown/839B708.4bpp"); -const u32 gUnknown_839BE08[] = INCBIN_U32("graphics/object_events/pics/unknown/839BE08.4bpp"); -const u32 gUnknown_839C508[] = INCBIN_U32("graphics/object_events/pics/unknown/839C508.4bpp"); -const u16 gUnknown_839C588[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.gbapal"); -const u16 gUnknown_839C5A8[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.4bpp"); -const u16 gUnknown_839C828[] = INCBIN_U16("graphics/object_events/pics/effects/lavaridge_warp.4bpp"); -const u16 gUnknown_839CAA8[] = INCBIN_U16("graphics/object_events/pics/effects/underwater_bubbles.4bpp"); -const u16 gUnknown_839D2A8[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.4bpp"); -const u16 gUnknown_839D3A8[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.gbapal"); -const u16 gUnknown_839D3C8[] = INCBIN_U16("graphics/object_events/pics/effects/fly_blob.4bpp"); +const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/object_events/pics/unknown/8399008.4bpp"); +const u16 gUnknown_83990C8[] = INCBIN_U16("graphics/object_events/pics/unknown/83990C8.4bpp"); +const u16 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399188.4bpp"); +const u16 gUnknown_8399288[] = INCBIN_U16("graphics/object_events/pics/unknown/8399288.4bpp"); +const u16 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399488.4bpp"); +const u16 gFieldEffectObjectPic_UnusedGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399788.4bpp"); +const u16 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U16("graphics/object_events/pics/unknown/8399C08.4bpp"); +const u16 gFieldEffectObjectPic_LongGrass[] = INCBIN_U16("graphics/object_events/pics/effects/long_grass.4bpp"); +const u16 gFieldEffectObjectPic_TallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A008.4bpp"); +const u16 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A288.4bpp"); +const u16 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U16("graphics/object_events/pics/unknown/839A388.4bpp"); +const u16 gUnknown_839A408[] = INCBIN_U16("graphics/object_events/pics/unknown/839A408.4bpp"); +const u16 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U16("graphics/object_events/pics/unknown/839A488.4bpp"); +const u16 gUnknown_839A508[] = INCBIN_U16("graphics/object_events/pics/unknown/839A508.4bpp"); +const u16 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U16("graphics/object_events/pics/unknown/839A588.4bpp"); +const u16 gUnknown_839A608[] = INCBIN_U16("graphics/object_events/pics/unknown/839A608.4bpp"); +const u16 gUnknown_839A688[] = INCBIN_U16("graphics/object_events/pics/unknown/839A688.4bpp"); +const u16 gUnknown_839A708[] = INCBIN_U16("graphics/object_events/pics/unknown/839A708.4bpp"); +const u16 gFieldEffectObjectPic_UnusedSand[] = INCBIN_U16("graphics/object_events/pics/unknown/839A788.4bpp"); +const u16 gFieldEffectObjectPic_SandPile[] = INCBIN_U16("graphics/object_events/pics/unknown/839A988.4bpp"); +const u16 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U16("graphics/object_events/pics/effects/jump_big_splash.4bpp"); +const u16 gFieldEffectObjectPic_Splash[] = INCBIN_U16("graphics/object_events/pics/unknown/839AC48.4bpp"); +const u16 gUnknown_839AC88[] = INCBIN_U16("graphics/object_events/pics/unknown/839AC88.4bpp"); +const u16 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U16("graphics/object_events/pics/unknown/839ACC8.4bpp"); +const u16 gUnknown_839AD08[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD08.4bpp"); +const u16 gUnknown_839AD48[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD48.4bpp"); +const u16 gFieldEffectObjectPic_WaterSurfacing[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD88.4bpp"); +const u16 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B008.4bpp"); +const u16 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B708.4bpp"); +const u16 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U16("graphics/object_events/pics/unknown/839BE08.4bpp"); +const u16 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U16("graphics/object_events/pics/unknown/839C508.4bpp"); +const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.gbapal"); +const u16 gFieldEffectObjectPic_AshPuff[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.4bpp"); +const u16 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U16("graphics/object_events/pics/effects/lavaridge_warp.4bpp"); +const u16 gFieldEffectObjectPic_Bubbles[] = INCBIN_U16("graphics/object_events/pics/effects/underwater_bubbles.4bpp"); +const u16 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.4bpp"); +const u16 gFieldEffectPal_SmallSparkle[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.gbapal"); +const u16 gFieldEffectObjectPic_Bird[] = INCBIN_U16("graphics/object_events/pics/effects/fly_blob.4bpp"); diff --git a/src/field_effect.c b/src/field_effect.c index e5d94e889..4cab3cff8 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1909,7 +1909,7 @@ u8 FldEff_LavaridgeGymWarp(void) return spriteId; } -void SpriteCB_LavaridgeGymWarp(struct Sprite * sprite) +void SpriteCB_AshLaunch(struct Sprite * sprite) { if (sprite->animEnded) { diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index b10df5d1b..a311a10f9 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -1223,17 +1223,17 @@ u32 FldEff_BerryTreeGrowthSparkle(void) u32 ShowTreeDisguiseFieldEffect(void) { - return ShowDisguiseFieldEffect(FLDEFF_TREE_DISGUISE, 24, 4); + return ShowDisguiseFieldEffect(FLDEFF_TREE_DISGUISE, FLDEFFOBJ_TREE_DISGUISE, 4); } u32 ShowMountainDisguiseFieldEffect(void) { - return ShowDisguiseFieldEffect(FLDEFF_MOUNTAIN_DISGUISE, 25, 3); + return ShowDisguiseFieldEffect(FLDEFF_MOUNTAIN_DISGUISE, FLDEFFOBJ_MOUNTAIN_DISGUISE, 3); } u32 ShowSandDisguiseFieldEffect(void) { - return ShowDisguiseFieldEffect(FLDEFF_SAND_DISGUISE, 28, 2); + return ShowDisguiseFieldEffect(FLDEFF_SAND_DISGUISE, FLDEFFOBJ_SAND_DISGUISE, 2); } static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) @@ -1356,7 +1356,7 @@ void UpdateSparkleFieldEffect(struct Sprite * sprite) FieldEffectStop(sprite, FLDEFF_SPARKLE); } -void sub_80DCCE0(struct Sprite * sprite) +void UpdateJumpImpactEffect(struct Sprite * sprite) { if (sprite->animEnded) { diff --git a/src/teachy_tv.c b/src/teachy_tv.c index f7cd182bb..15c1e094c 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -531,7 +531,7 @@ static void TeachyTvLoadGraphic(void) LZDecompressWram(gUnknown_8E86D6C, sResources->buffer4); LoadCompressedPalette(gUnknown_8E86F98, 0, 0x80); LoadPalette(&src, 0, sizeof(src)); - LoadSpritePalette(&gUnknown_83A5348); + LoadSpritePalette(&gSpritePalette_GeneralFieldEffect1); TeachyTvLoadBg3Map(sResources->buffer3); } |