diff options
| -rw-r--r-- | data/graphics/field_objects/field_effect_objects.s | 218 |
1 files changed, 109 insertions, 109 deletions
diff --git a/data/graphics/field_objects/field_effect_objects.s b/data/graphics/field_objects/field_effect_objects.s index 98acbcd9d..635e20cfe 100644 --- a/data/graphics/field_objects/field_effect_objects.s +++ b/data/graphics/field_objects/field_effect_objects.s @@ -7,13 +7,13 @@ gFieldEffectObjectPaletteInfo1:: @ 837452C obj_pal gFieldEffectObjectPalette1, 0x1005 .align 2 -gFieldEffectObjectImageAnim_8374534: @ 8374534 +gFieldEffectAnim_8374534: @ 8374534 obj_image_anim_frame 0, 1 obj_image_anim_end .align 2 gFieldEffectAnimTable_Shadow: @ 837453C - .4byte gFieldEffectObjectImageAnim_8374534 + .4byte gFieldEffectAnim_8374534 .align 2 gFieldEffectPicTable_ShadowSmall: @ 8374540 @@ -56,7 +56,7 @@ gFieldEffectPicTable_TallGrass: @ 83745C0 obj_frame_tiles gFieldEffectPic_TallGrass_4, 0x80 .align 2 -gFieldEffectObjectImageAnim_83745E8: @ 83745E8 +gFieldEffectAnim_83745E8: @ 83745E8 obj_image_anim_frame 1, 10 obj_image_anim_frame 2, 10 obj_image_anim_frame 3, 10 @@ -66,7 +66,7 @@ gFieldEffectObjectImageAnim_83745E8: @ 83745E8 .align 2 gFieldEffectAnimTable_TallGrass: @ 8374600 - .4byte gFieldEffectObjectImageAnim_83745E8 + .4byte gFieldEffectAnim_83745E8 .align 2 gFieldEffectSpriteTemplate_TallGrass: @ 8374604 @@ -81,7 +81,7 @@ gFieldEffectPicTable_Ripple: @ 837461C obj_frame_tiles gFieldEffectPic_Ripple_4, 0x80 .align 2 -gFieldEffectObjectImageAnim_8374644: @ 8374644 +gFieldEffectAnim_8374644: @ 8374644 obj_image_anim_frame 0, 12 obj_image_anim_frame 1, 9 obj_image_anim_frame 2, 9 @@ -94,7 +94,7 @@ gFieldEffectObjectImageAnim_8374644: @ 8374644 .align 2 gFieldEffectAnimTable_Ripple: @ 8374668 - .4byte gFieldEffectObjectImageAnim_8374644 + .4byte gFieldEffectAnim_8374644 .align 2 gFieldEffectSpriteTemplate_Ripple: @ 837466C @@ -109,7 +109,7 @@ gFieldEffectPicTable_Ash: @ 8374684 obj_frame_tiles gFieldEffectPic_Ash_4, 0x80 .align 2 -gFieldEffectObjectImageAnim_83746AC: @ 83746AC +gFieldEffectAnim_83746AC: @ 83746AC obj_image_anim_frame 0, 12 obj_image_anim_frame 1, 12 obj_image_anim_frame 2, 8 @@ -119,7 +119,7 @@ gFieldEffectObjectImageAnim_83746AC: @ 83746AC .align 2 gFieldEffectAnimTable_Ash: @ 83746C4 - .4byte gFieldEffectObjectImageAnim_83746AC + .4byte gFieldEffectAnim_83746AC .align 2 gFieldEffectSpriteTemplate_Ash: @ 83746C8 @@ -132,31 +132,31 @@ gFieldEffectPicTable_SurfBlob: @ 83746E0 obj_frame_tiles gFieldEffectPic_SurfBlob_2, 0x200 .align 2 -gFieldEffectObjectImageAnim_83746F8: @ 83746F8 +gFieldEffectAnim_83746F8: @ 83746F8 obj_image_anim_frame 0, 1 obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnim_8374700: @ 8374700 +gFieldEffectAnim_8374700: @ 8374700 obj_image_anim_frame 1, 1 obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnim_8374708: @ 8374708 +gFieldEffectAnim_8374708: @ 8374708 obj_image_anim_frame 2, 1 obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnim_8374710: @ 8374710 +gFieldEffectAnim_8374710: @ 8374710 obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_jump 0 .align 2 gFieldEffectAnimTable_SurfBlob: @ 8374718 - .4byte gFieldEffectObjectImageAnim_83746F8 - .4byte gFieldEffectObjectImageAnim_8374700 - .4byte gFieldEffectObjectImageAnim_8374708 - .4byte gFieldEffectObjectImageAnim_8374710 + .4byte gFieldEffectAnim_83746F8 + .4byte gFieldEffectAnim_8374700 + .4byte gFieldEffectAnim_8374708 + .4byte gFieldEffectAnim_8374710 .align 2 gFieldEffectSpriteTemplate_SurfBlob: @ 8374728 @@ -174,35 +174,35 @@ gFieldEffectPicTable_Arrow: @ 8374740 obj_frame_tiles gFieldEffectPic_Arrow_7, 0x80 .align 2 -gFieldEffectObjectImageAnim_8374780: @ 8374780 +gFieldEffectAnim_8374780: @ 8374780 obj_image_anim_frame 3, 32 obj_image_anim_frame 7, 32 obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnim_837478C: @ 837478C +gFieldEffectAnim_837478C: @ 837478C obj_image_anim_frame 0, 32 obj_image_anim_frame 4, 32 obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnim_8374798: @ 8374798 +gFieldEffectAnim_8374798: @ 8374798 obj_image_anim_frame 1, 32 obj_image_anim_frame 5, 32 obj_image_anim_jump 0 .align 2 -gFieldEffectObjectImageAnim_83747A4: @ 83747A4 +gFieldEffectAnim_83747A4: @ 83747A4 obj_image_anim_frame 2, 32 obj_image_anim_frame 6, 32 obj_image_anim_jump 0 .align 2 gFieldEffectAnimTable_Arrow: @ 83747B0 - .4byte gFieldEffectObjectImageAnim_8374780 - .4byte gFieldEffectObjectImageAnim_837478C - .4byte gFieldEffectObjectImageAnim_8374798 - .4byte gFieldEffectObjectImageAnim_83747A4 + .4byte gFieldEffectAnim_8374780 + .4byte gFieldEffectAnim_837478C + .4byte gFieldEffectAnim_8374798 + .4byte gFieldEffectAnim_83747A4 .align 2 gFieldEffectSpriteTemplate_Arrow: @ 83747C0 @@ -215,7 +215,7 @@ gFieldEffectPicTable_Dust: @ 83747D8 obj_frame_tiles gFieldEffectPic_Dust_2, 0x40 .align 2 -gFieldEffectObjectImageAnim_83747F0: @ 83747F0 +gFieldEffectAnim_83747F0: @ 83747F0 obj_image_anim_frame 0, 8 obj_image_anim_frame 1, 8 obj_image_anim_frame 2, 8 @@ -223,7 +223,7 @@ gFieldEffectObjectImageAnim_83747F0: @ 83747F0 .align 2 gFieldEffectAnimTable_Dust: @ 8374800 - .4byte gFieldEffectObjectImageAnim_83747F0 + .4byte gFieldEffectAnim_83747F0 .align 2 gFieldEffectSpriteTemplate_Dust: @ 8374804 @@ -237,7 +237,7 @@ gFieldEffectPicTable_JumpTallGrass: @ 837481C obj_frame_tiles gFieldEffectPic_JumpTallGrass_3, 0x40 .align 2 -gFieldEffectObjectImageAnim_837483C: @ 837483C +gFieldEffectAnim_837483C: @ 837483C obj_image_anim_frame 0, 8 obj_image_anim_frame 1, 8 obj_image_anim_frame 2, 8 @@ -246,7 +246,7 @@ gFieldEffectObjectImageAnim_837483C: @ 837483C .align 2 gFieldEffectAnimTable_JumpTallGrass: @ 8374850 - .4byte gFieldEffectObjectImageAnim_837483C + .4byte gFieldEffectAnim_837483C .align 2 gFieldEffectSpriteTemplate_JumpTallGrass: @ 8374854 @@ -258,32 +258,32 @@ gFieldEffectPicTable_SandFootprints: @ 837486C obj_frame_tiles gFieldEffectPic_SandFootprints_1, 0x80 .align 2 -gFieldEffectObjectImageAnim_837487C: @ 837487C +gFieldEffectAnim_837487C: @ 837487C obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_8374884: @ 8374884 +gFieldEffectAnim_8374884: @ 8374884 obj_image_anim_frame 0, 1 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_837488C: @ 837488C +gFieldEffectAnim_837488C: @ 837488C obj_image_anim_frame 1, 1 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_8374894: @ 8374894 +gFieldEffectAnim_8374894: @ 8374894 obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_end .align 2 gFieldEffectAnimTable_SandFootprints: @ 837489C - .4byte gFieldEffectObjectImageAnim_837487C - .4byte gFieldEffectObjectImageAnim_837487C - .4byte gFieldEffectObjectImageAnim_8374884 - .4byte gFieldEffectObjectImageAnim_837488C - .4byte gFieldEffectObjectImageAnim_8374894 + .4byte gFieldEffectAnim_837487C + .4byte gFieldEffectAnim_837487C + .4byte gFieldEffectAnim_8374884 + .4byte gFieldEffectAnim_837488C + .4byte gFieldEffectAnim_8374894 .align 2 gFieldEffectSpriteTemplate_SandFootprints: @ 83748B0 @@ -295,32 +295,32 @@ gFieldEffectPicTable_DeepSandFootprints: @ 83748C8 obj_frame_tiles gFieldEffectPic_DeepSandFootprints_1, 0x80 .align 2 -gFieldEffectObjectImageAnim_83748D8: @ 83748D8 +gFieldEffectAnim_83748D8: @ 83748D8 obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_83748E0: @ 83748E0 +gFieldEffectAnim_83748E0: @ 83748E0 obj_image_anim_frame 0, 1 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_83748E8: @ 83748E8 +gFieldEffectAnim_83748E8: @ 83748E8 obj_image_anim_frame 1, 1 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_83748F0: @ 83748F0 +gFieldEffectAnim_83748F0: @ 83748F0 obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_end .align 2 gFieldEffectAnimTable_DeepSandFootprints: @ 83748F8 - .4byte gFieldEffectObjectImageAnim_83748D8 - .4byte gFieldEffectObjectImageAnim_83748D8 - .4byte gFieldEffectObjectImageAnim_83748E0 - .4byte gFieldEffectObjectImageAnim_83748E8 - .4byte gFieldEffectObjectImageAnim_83748F0 + .4byte gFieldEffectAnim_83748D8 + .4byte gFieldEffectAnim_83748D8 + .4byte gFieldEffectAnim_83748E0 + .4byte gFieldEffectAnim_83748E8 + .4byte gFieldEffectAnim_83748F0 .align 2 gFieldEffectSpriteTemplate_DeepSandFootprints: @ 837490C @@ -334,56 +334,56 @@ gFieldEffectPicTable_BikeTireTracks: @ 8374924 obj_frame_tiles gFieldEffectPic_BikeTireTracks_3, 0x80 .align 2 -gFieldEffectObjectImageAnim_8374944: @ 8374944 +gFieldEffectAnim_8374944: @ 8374944 obj_image_anim_frame 2, 1 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_837494C: @ 837494C +gFieldEffectAnim_837494C: @ 837494C obj_image_anim_frame 2, 1 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_8374954: @ 8374954 +gFieldEffectAnim_8374954: @ 8374954 obj_image_anim_frame 1, 1 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_837495C: @ 837495C +gFieldEffectAnim_837495C: @ 837495C obj_image_anim_frame 1, 1 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_8374964: @ 8374964 +gFieldEffectAnim_8374964: @ 8374964 obj_image_anim_frame 0, 1 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_837496C: @ 837496C +gFieldEffectAnim_837496C: @ 837496C obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_8374974: @ 8374974 +gFieldEffectAnim_8374974: @ 8374974 obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_837497C: @ 837497C +gFieldEffectAnim_837497C: @ 837497C obj_image_anim_frame 3, 1 obj_image_anim_end .align 2 gFieldEffectAnimTable_BikeTireTracks: @ 8374984 - .4byte gFieldEffectObjectImageAnim_8374944 - .4byte gFieldEffectObjectImageAnim_8374944 - .4byte gFieldEffectObjectImageAnim_837494C - .4byte gFieldEffectObjectImageAnim_8374954 - .4byte gFieldEffectObjectImageAnim_837495C - .4byte gFieldEffectObjectImageAnim_8374964 - .4byte gFieldEffectObjectImageAnim_837496C - .4byte gFieldEffectObjectImageAnim_8374974 - .4byte gFieldEffectObjectImageAnim_837497C + .4byte gFieldEffectAnim_8374944 + .4byte gFieldEffectAnim_8374944 + .4byte gFieldEffectAnim_837494C + .4byte gFieldEffectAnim_8374954 + .4byte gFieldEffectAnim_837495C + .4byte gFieldEffectAnim_8374964 + .4byte gFieldEffectAnim_837496C + .4byte gFieldEffectAnim_8374974 + .4byte gFieldEffectAnim_837497C .align 2 gFieldEffectSpriteTemplate_BikeTireTracks: @ 83749A8 @@ -397,7 +397,7 @@ gFieldEffectPicTable_JumpBigSplash: @ 83749C0 obj_frame_tiles gFieldEffectPic_JumpBigSplash_3, 0x80 .align 2 -gFieldEffectObjectImageAnim_83749E0: @ 83749E0 +gFieldEffectAnim_83749E0: @ 83749E0 obj_image_anim_frame 0, 8 obj_image_anim_frame 1, 8 obj_image_anim_frame 2, 8 @@ -406,7 +406,7 @@ gFieldEffectObjectImageAnim_83749E0: @ 83749E0 .align 2 gFieldEffectAnimTable_JumpBigSplash: @ 83749F4 - .4byte gFieldEffectObjectImageAnim_83749E0 + .4byte gFieldEffectAnim_83749E0 .align 2 gFieldEffectSpriteTemplate_JumpBigSplash: @ 83749F8 @@ -418,13 +418,13 @@ gFieldEffectPicTable_Splash: @ 8374A10 obj_frame_tiles gFieldEffectPic_Splash_1, 0x40 .align 2 -gFieldEffectObjectImageAnim_8374A20: @ 8374A20 +gFieldEffectAnim_8374A20: @ 8374A20 obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_8374A2C: @ 8374A2C +gFieldEffectAnim_8374A2C: @ 8374A2C obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_frame 0, 6 @@ -437,8 +437,8 @@ gFieldEffectObjectImageAnim_8374A2C: @ 8374A2C .align 2 gFieldEffectAnimTable_Splash: @ 8374A50 - .4byte gFieldEffectObjectImageAnim_8374A20 - .4byte gFieldEffectObjectImageAnim_8374A2C + .4byte gFieldEffectAnim_8374A20 + .4byte gFieldEffectAnim_8374A2C .align 2 gFieldEffectSpriteTemplate_Splash: @ 8374A58 @@ -451,7 +451,7 @@ gFieldEffectPicTable_JumpSmallSplash: @ 8374A70 obj_frame_tiles gFieldEffectPic_JumpSmallSplash_2, 0x40 .align 2 -gFieldEffectObjectImageAnim_8374A88: @ 8374A88 +gFieldEffectAnim_8374A88: @ 8374A88 obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_frame 2, 4 @@ -459,7 +459,7 @@ gFieldEffectObjectImageAnim_8374A88: @ 8374A88 .align 2 gFieldEffectAnimTable_JumpSmallSplash: @ 8374A98 - .4byte gFieldEffectObjectImageAnim_8374A88 + .4byte gFieldEffectAnim_8374A88 .align 2 gFieldEffectSpriteTemplate_JumpSmallSplash: @ 8374A9C @@ -473,7 +473,7 @@ gFieldEffectPicTable_LongGrass: @ 8374AB4 obj_frame_tiles gFieldEffectPic_LongGrass_3, 0x80 .align 2 -gFieldEffectObjectImageAnim_8374AD4: @ 8374AD4 +gFieldEffectAnim_8374AD4: @ 8374AD4 obj_image_anim_frame 1, 3 obj_image_anim_frame 2, 3 obj_image_anim_frame 0, 4 @@ -485,7 +485,7 @@ gFieldEffectObjectImageAnim_8374AD4: @ 8374AD4 .align 2 gFieldEffectAnimTable_LongGrass: @ 8374AF4 - .4byte gFieldEffectObjectImageAnim_8374AD4 + .4byte gFieldEffectAnim_8374AD4 .align 2 gFieldEffectSpriteTemplate_LongGrass: @ 8374AF8 @@ -501,7 +501,7 @@ gFieldEffectPicTable_JumpLongGrass: @ 8374B10 obj_frame_tiles gFieldEffectPic_JumpLongGrass_5, 0x80 .align 2 -gFieldEffectObjectImageAnim_8374B40: @ 8374B40 +gFieldEffectAnim_8374B40: @ 8374B40 obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_frame 2, 8 @@ -512,7 +512,7 @@ gFieldEffectObjectImageAnim_8374B40: @ 8374B40 .align 2 gFieldEffectAnimTable_JumpLongGrass: @ 8374B5C - .4byte gFieldEffectObjectImageAnim_8374B40 + .4byte gFieldEffectAnim_8374B40 .align 2 gFieldEffectSpriteTemplate_JumpLongGrass: @ 8374B60 @@ -531,7 +531,7 @@ gFieldEffectPicTable_Unknown17: @ 8374B78 obj_frame_tiles gFieldEffectPic_Unknown17_7, 0x80 .align 2 -gFieldEffectObjectImageAnim_8374BC0: @ 8374BC0 +gFieldEffectAnim_8374BC0: @ 8374BC0 obj_image_anim_frame 0, 10 obj_image_anim_frame 1, 4 obj_image_anim_frame 2, 4 @@ -545,7 +545,7 @@ gFieldEffectObjectImageAnim_8374BC0: @ 8374BC0 .align 2 gFieldEffectAnimTable_Unknown17: @ 8374BE8 - .4byte gFieldEffectObjectImageAnim_8374BC0 + .4byte gFieldEffectAnim_8374BC0 .align 2 gFieldEffectSpriteTemplate_Unknown17: @ 8374BEC @@ -559,7 +559,7 @@ gFieldEffectPicTable_Unknown18: @ 8374C04 obj_frame_tiles gFieldEffectPic_Unknown18_3, 0x80 .align 2 -gFieldEffectObjectImageAnim_8374C24: @ 8374C24 +gFieldEffectAnim_8374C24: @ 8374C24 obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_frame 2, 4 @@ -570,7 +570,7 @@ gFieldEffectObjectImageAnim_8374C24: @ 8374C24 .align 2 gFieldEffectAnimTable_Unknown18: @ 8374C40 - .4byte gFieldEffectObjectImageAnim_8374C24 + .4byte gFieldEffectAnim_8374C24 .align 2 gFieldEffectSpriteTemplate_Unknown18: @ 8374C44 @@ -584,7 +584,7 @@ gFieldEffectPicTable_Unknown19: @ 8374C5C obj_frame_tiles gFieldEffectPic_Unknown19_3, 0x80 .align 2 -gFieldEffectObjectImageAnim_8374C7C: @ 8374C7C +gFieldEffectAnim_8374C7C: @ 8374C7C obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_frame 2, 4 @@ -593,7 +593,7 @@ gFieldEffectObjectImageAnim_8374C7C: @ 8374C7C .align 2 gFieldEffectAnimTable_Unknown19: @ 8374C90 - .4byte gFieldEffectObjectImageAnim_8374C7C + .4byte gFieldEffectAnim_8374C7C .align 2 gFieldEffectSpriteTemplate_Unknown19: @ 8374C94 @@ -606,7 +606,7 @@ gFieldEffectPicTable_Unknown29: @ 8374CAC obj_frame_tiles gFieldEffectPic_Unknown29_2, 0x40 .align 2 -gFieldEffectObjectImageAnim_8374CC4: @ 8374CC4 +gFieldEffectAnim_8374CC4: @ 8374CC4 obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_frame 2, 4 @@ -614,7 +614,7 @@ gFieldEffectObjectImageAnim_8374CC4: @ 8374CC4 .align 2 gFieldEffectAnimTable_Unknown29: @ 8374CD4 - .4byte gFieldEffectObjectImageAnim_8374CC4 + .4byte gFieldEffectAnim_8374CC4 .align 2 gFieldEffectSpriteTemplate_Unknown29: @ 8374CD8 @@ -628,7 +628,7 @@ gFieldEffectPicTable_Unknown20: @ 8374CF0 obj_frame_tiles gFieldEffectPic_Unknown20_3, 0x80 .align 2 -gFieldEffectObjectImageAnim_8374D10: @ 8374D10 +gFieldEffectAnim_8374D10: @ 8374D10 obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_frame 2, 4 @@ -639,7 +639,7 @@ gFieldEffectObjectImageAnim_8374D10: @ 8374D10 .align 2 gFieldEffectAnimTable_Unknown20: @ 8374D2C - .4byte gFieldEffectObjectImageAnim_8374D10 + .4byte gFieldEffectAnim_8374D10 .align 2 gFieldEffectSpriteTemplate_Unknown20: @ 8374D30 @@ -690,7 +690,7 @@ gFieldEffectPicTable_BerryTreeGrowthSparkle: @ 8374E08 obj_frame_tiles gFieldEffectPic_BerryTreeGrowthSparkle_5, 0x80 .align 2 -gFieldEffectObjectImageAnim_8374E38: @ 8374E38 +gFieldEffectAnim_8374E38: @ 8374E38 obj_image_anim_frame 0, 8 obj_image_anim_frame 1, 8 obj_image_anim_frame 2, 8 @@ -715,7 +715,7 @@ gFieldEffectObjectImageAnim_8374E38: @ 8374E38 .align 2 gFieldEffectAnimTable_BerryTreeGrowthSparkle: @ 8374E8C - .4byte gFieldEffectObjectImageAnim_8374E38 + .4byte gFieldEffectAnim_8374E38 .align 2 gFieldEffectSpriteTemplate_BerryTreeGrowthSparkle: @ 8374E90 @@ -732,12 +732,12 @@ gFieldEffectPicTable_TreeDisguise: @ 8374EA8 obj_frame_tiles gFieldEffectPic_TreeDisguise_6, 0x100 .align 2 -gFieldEffectObjectImageAnim_8374EE0: @ 8374EE0 +gFieldEffectAnim_8374EE0: @ 8374EE0 obj_image_anim_frame 0, 16 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_8374EE8: @ 8374EE8 +gFieldEffectAnim_8374EE8: @ 8374EE8 obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_frame 2, 4 @@ -749,8 +749,8 @@ gFieldEffectObjectImageAnim_8374EE8: @ 8374EE8 .align 2 gFieldEffectAnimTable_TreeDisguise: @ 8374F08 - .4byte gFieldEffectObjectImageAnim_8374EE0 - .4byte gFieldEffectObjectImageAnim_8374EE8 + .4byte gFieldEffectAnim_8374EE0 + .4byte gFieldEffectAnim_8374EE8 .align 2 gFieldEffectSpriteTemplate_TreeDisguise: @ 8374F10 @@ -767,12 +767,12 @@ gFieldEffectPicTable_MountainDisguise: @ 8374F28 obj_frame_tiles gFieldEffectPic_MountainDisguise_6, 0x100 .align 2 -gFieldEffectObjectImageAnim_8374F60: @ 8374F60 +gFieldEffectAnim_8374F60: @ 8374F60 obj_image_anim_frame 0, 16 obj_image_anim_end .align 2 -gFieldEffectObjectImageAnim_8374F68: @ 8374F68 +gFieldEffectAnim_8374F68: @ 8374F68 obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_frame 2, 4 @@ -784,8 +784,8 @@ gFieldEffectObjectImageAnim_8374F68: @ 8374F68 .align 2 gFieldEffectAnimTable_MountainDisguise: @ 8374F88 - .4byte gFieldEffectObjectImageAnim_8374F60 - .4byte gFieldEffectObjectImageAnim_8374F68 + .4byte gFieldEffectAnim_8374F60 + .4byte gFieldEffectAnim_8374F68 .align 2 gFieldEffectSpriteTemplate_MountainDisguise: @ 8374F90 @@ -810,13 +810,13 @@ gFieldEffectPicTable_Bird: @ 8374FF8 obj_frame_tiles gFieldEffectPic_Bird, 0x200 .align 2 -gFieldEffectObjectImageAnim_8375000: @ 8375000 +gFieldEffectAnim_8375000: @ 8375000 obj_image_anim_frame 0, 1 obj_image_anim_end .align 2 gFieldEffectAnimTable_Bird: @ 8375008 - .4byte gFieldEffectObjectImageAnim_8375000 + .4byte gFieldEffectAnim_8375000 .align 2 gFieldEffectSpriteTemplate_Bird: @ 837500C @@ -828,14 +828,14 @@ gFieldEffectPicTable_ShortGrass: @ 8375024 obj_frame_tiles gFieldEffectPic_ShortGrass_1, 0x80 .align 2 -gFieldEffectObjectImageAnim_8375034: @ 8375034 +gFieldEffectAnim_8375034: @ 8375034 obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_end .align 2 gFieldEffectAnimTable_ShortGrass: @ 8375040 - .4byte gFieldEffectObjectImageAnim_8375034 + .4byte gFieldEffectAnim_8375034 .align 2 gFieldEffectSpriteTemplate_ShortGrass: @ 8375044 @@ -846,13 +846,13 @@ gFieldEffectPicTable_HotSpringsWater: @ 837505C obj_frame_tiles gFieldEffectPic_HotSpringsWater, 0x80 .align 2 -gFieldEffectObjectImageAnim_8375064: @ 8375064 +gFieldEffectAnim_8375064: @ 8375064 obj_image_anim_frame 0, 4 obj_image_anim_end .align 2 gFieldEffectAnimTable_HotSpringsWater: @ 837506C - .4byte gFieldEffectObjectImageAnim_8375064 + .4byte gFieldEffectAnim_8375064 .align 2 gFieldEffectSpriteTemplate_HotSpringsWater: @ 8375070 @@ -867,7 +867,7 @@ gFieldEffectPicTable_PopOutOfAsh: @ 8375088 obj_frame_tiles gFieldEffectPic_PopOutOfAsh_4, 0x80 .align 2 -gFieldEffectObjectImageAnim_83750B0: @ 83750B0 +gFieldEffectAnim_83750B0: @ 83750B0 obj_image_anim_frame 0, 6 obj_image_anim_frame 1, 6 obj_image_anim_frame 2, 6 @@ -877,7 +877,7 @@ gFieldEffectObjectImageAnim_83750B0: @ 83750B0 .align 2 gFieldEffectAnimTable_PopOutOfAsh: @ 83750C8 - .4byte gFieldEffectObjectImageAnim_83750B0 + .4byte gFieldEffectAnim_83750B0 .align 2 gFieldEffectSpriteTemplate_PopOutOfAsh: @ 83750CC @@ -896,7 +896,7 @@ gFieldEffectPicTable_Unknown33: @ 83750EC obj_frame_tiles gFieldEffectPic_Unknown33_4, 0x80 .align 2 -gFieldEffectObjectImageAnim_8375114: @ 8375114 +gFieldEffectAnim_8375114: @ 8375114 obj_image_anim_frame 0, 6 obj_image_anim_frame 1, 6 obj_image_anim_frame 2, 6 @@ -906,7 +906,7 @@ gFieldEffectObjectImageAnim_8375114: @ 8375114 .align 2 gFieldEffectAnimTable_Unknown33: @ 837512C - .4byte gFieldEffectObjectImageAnim_8375114 + .4byte gFieldEffectAnim_8375114 .align 2 gFieldEffectSpriteTemplate_Unknown33: @ 8375130 @@ -924,7 +924,7 @@ gFieldEffectPicTable_Bubbles: @ 8375148 obj_frame_tiles gFieldEffectPic_Bubbles_7, 0x100 .align 2 -gFieldEffectObjectImageAnim_8375188: @ 8375188 +gFieldEffectAnim_8375188: @ 8375188 obj_image_anim_frame 0, 4 obj_image_anim_frame 1, 4 obj_image_anim_frame 2, 4 @@ -937,7 +937,7 @@ gFieldEffectObjectImageAnim_8375188: @ 8375188 .align 2 gFieldEffectAnimTable_Bubbles: @ 83751AC - .4byte gFieldEffectObjectImageAnim_8375188 + .4byte gFieldEffectAnim_8375188 .align 2 gFieldEffectSpriteTemplate_Bubbles: @ 83751B0 @@ -949,7 +949,7 @@ gFieldEffectPicTable_Unknown35: @ 83751C8 obj_frame_tiles gFieldEffectPic_Unknown35_1, 0x80 .align 2 -gFieldEffectObjectImageAnim_83751D8: @ 83751D8 +gFieldEffectAnim_83751D8: @ 83751D8 obj_image_anim_frame 0, 3 obj_image_anim_frame 1, 5 obj_image_anim_frame 0, 5 @@ -957,7 +957,7 @@ gFieldEffectObjectImageAnim_83751D8: @ 83751D8 .align 2 gFieldEffectAnimTable_Unknown35: @ 83751E8 - .4byte gFieldEffectObjectImageAnim_83751D8 + .4byte gFieldEffectAnim_83751D8 .align 2 gFieldEffectSpriteTemplate_Unknown35: @ 83751EC |