Use spritesheets for event object and field effect pics (#686)

Use spritesheets for event object pics

1 files changed, 139 insertions, 139 deletions

diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h
index 8533b3cdd..d5d2f2016 100644
--- a/src/data/field_event_obj/field_effect_objects.h
+++ b/src/data/field_event_obj/field_effect_objects.h
@@ -19,19 +19,19 @@ const union AnimCmd *const gFieldEffectAnimTable_Shadow[] = {
 };
 
 const struct SpriteFrameImage gFieldEffectPicTable_ShadowSmall[] = {
-    obj_frame_tiles(gFieldEffectPic_ShadowSmall)
+    overworld_frame(gFieldEffectPic_ShadowSmall, 1, 1, 0)
 };
 
 const struct SpriteFrameImage gFieldEffectPicTable_ShadowMedium[] = {
-    obj_frame_tiles(gFieldEffectPic_ShadowMedium)
+    overworld_frame(gFieldEffectPic_ShadowMedium, 2, 1, 0)
 };
 
 const struct SpriteFrameImage gFieldEffectPicTable_ShadowLarge[] = {
-    obj_frame_tiles(gFieldEffectPic_ShadowLarge)
+    overworld_frame(gFieldEffectPic_ShadowLarge, 4, 1, 0)
 };
 
 const struct SpriteFrameImage gFieldEffectPicTable_ShadowExtraLarge[] = {
-    obj_frame_tiles(gFieldEffectPic_ShadowExtraLarge)
+    overworld_frame(gFieldEffectPic_ShadowExtraLarge, 8, 4, 0)
 };
 
 const struct SpriteTemplate gFieldEffectSpriteTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gFieldOamData_8x8, gFieldEffectAnimTable_Shadow, gFieldEffectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect};
@@ -43,11 +43,11 @@ const struct SpriteTemplate gFieldEffectSpriteTemplate_ShadowLarge = {0xFFFF, 0x
 const struct SpriteTemplate gFieldEffectSpriteTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gFieldOamData_64x32, gFieldEffectAnimTable_Shadow, gFieldEffectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_TallGrass[] = {
-    obj_frame_tiles(gFieldEffectPic_TallGrass_0),
-    obj_frame_tiles(gFieldEffectPic_TallGrass_1),
-    obj_frame_tiles(gFieldEffectPic_TallGrass_2),
-    obj_frame_tiles(gFieldEffectPic_TallGrass_3),
-    obj_frame_tiles(gFieldEffectPic_TallGrass_4)
+    overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 3),
+    overworld_frame(gFieldEffectPic_TallGrass, 2, 2, 4)
 };
 
 const union AnimCmd gFieldEffectAnim_83745E8[] = {
@@ -66,11 +66,11 @@ const union AnimCmd *const gFieldEffectAnimTable_TallGrass[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_TallGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_TallGrass, gFieldEffectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Ripple[] = {
-    obj_frame_tiles(gFieldEffectPic_Ripple_0),
-    obj_frame_tiles(gFieldEffectPic_Ripple_1),
-    obj_frame_tiles(gFieldEffectPic_Ripple_2),
-    obj_frame_tiles(gFieldEffectPic_Ripple_3),
-    obj_frame_tiles(gFieldEffectPic_Ripple_4)
+    overworld_frame(gFieldEffectPic_Ripple, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_Ripple, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_Ripple, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_Ripple, 2, 2, 3),
+    overworld_frame(gFieldEffectPic_Ripple, 2, 2, 4)
 };
 
 const union AnimCmd gFieldEffectAnim_8374644[] = {
@@ -92,11 +92,11 @@ const union AnimCmd *const gFieldEffectAnimTable_Ripple[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_Ripple = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Ripple, gFieldEffectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Ash[] = {
-    obj_frame_tiles(gFieldEffectPic_Ash_0),
-    obj_frame_tiles(gFieldEffectPic_Ash_1),
-    obj_frame_tiles(gFieldEffectPic_Ash_2),
-    obj_frame_tiles(gFieldEffectPic_Ash_3),
-    obj_frame_tiles(gFieldEffectPic_Ash_4)
+    overworld_frame(gFieldEffectPic_Ash, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_Ash, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_Ash, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_Ash, 2, 2, 3),
+    overworld_frame(gFieldEffectPic_Ash, 2, 2, 4)
 };
 
 const union AnimCmd gFieldEffectAnim_83746AC[] = {
@@ -115,9 +115,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Ash[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_Ash = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Ash, gFieldEffectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_SurfBlob[] = {
-    obj_frame_tiles(gFieldEffectPic_SurfBlob_0),
-    obj_frame_tiles(gFieldEffectPic_SurfBlob_1),
-    obj_frame_tiles(gFieldEffectPic_SurfBlob_2)
+    overworld_frame(gFieldEffectPic_SurfBlob, 4, 4, 0),
+    overworld_frame(gFieldEffectPic_SurfBlob, 4, 4, 1),
+    overworld_frame(gFieldEffectPic_SurfBlob, 4, 4, 2)
 };
 
 const union AnimCmd gFieldEffectAnim_83746F8[] = {
@@ -150,14 +150,14 @@ const union AnimCmd *const gFieldEffectAnimTable_SurfBlob[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gFieldOamData_32x32, gFieldEffectAnimTable_SurfBlob, gFieldEffectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Arrow[] = {
-    obj_frame_tiles(gFieldEffectPic_Arrow_0),
-    obj_frame_tiles(gFieldEffectPic_Arrow_1),
-    obj_frame_tiles(gFieldEffectPic_Arrow_2),
-    obj_frame_tiles(gFieldEffectPic_Arrow_3),
-    obj_frame_tiles(gFieldEffectPic_Arrow_4),
-    obj_frame_tiles(gFieldEffectPic_Arrow_5),
-    obj_frame_tiles(gFieldEffectPic_Arrow_6),
-    obj_frame_tiles(gFieldEffectPic_Arrow_7)
+    overworld_frame(gFieldEffectPic_Arrow, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_Arrow, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_Arrow, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_Arrow, 2, 2, 3),
+    overworld_frame(gFieldEffectPic_Arrow, 2, 2, 4),
+    overworld_frame(gFieldEffectPic_Arrow, 2, 2, 5),
+    overworld_frame(gFieldEffectPic_Arrow, 2, 2, 6),
+    overworld_frame(gFieldEffectPic_Arrow, 2, 2, 7)
 };
 
 const union AnimCmd gFieldEffectAnim_8374780[] = {
@@ -194,9 +194,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Arrow[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_Arrow = {0xFFFF, 0xFFFF, &gFieldOamData_16x16, gFieldEffectAnimTable_Arrow, gFieldEffectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Dust[] = {
-    obj_frame_tiles(gFieldEffectPic_Dust_0),
-    obj_frame_tiles(gFieldEffectPic_Dust_1),
-    obj_frame_tiles(gFieldEffectPic_Dust_2)
+    overworld_frame(gFieldEffectPic_Dust, 2, 1, 0),
+    overworld_frame(gFieldEffectPic_Dust, 2, 1, 1),
+    overworld_frame(gFieldEffectPic_Dust, 2, 1, 2)
 };
 
 const union AnimCmd gFieldEffectAnim_83747F0[] = {
@@ -213,10 +213,10 @@ const union AnimCmd *const gFieldEffectAnimTable_Dust[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_Dust = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_Dust, gFieldEffectPicTable_Dust, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_JumpTallGrass[] = {
-    obj_frame_tiles(gFieldEffectPic_JumpTallGrass_0),
-    obj_frame_tiles(gFieldEffectPic_JumpTallGrass_1),
-    obj_frame_tiles(gFieldEffectPic_JumpTallGrass_2),
-    obj_frame_tiles(gFieldEffectPic_JumpTallGrass_3)
+    overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 0),
+    overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 1),
+    overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 2),
+    overworld_frame(gFieldEffectPic_JumpTallGrass, 2, 1, 3)
 };
 
 const union AnimCmd gFieldEffectAnim_837483C[] = {
@@ -234,8 +234,8 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpTallGrass[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpTallGrass = {0xFFFF, 0x1005, &gFieldOamData_16x8, gFieldEffectAnimTable_JumpTallGrass, gFieldEffectPicTable_JumpTallGrass, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_SandFootprints[] = {
-    obj_frame_tiles(gFieldEffectPic_SandFootprints_0),
-    obj_frame_tiles(gFieldEffectPic_SandFootprints_1)
+    overworld_frame(gFieldEffectPic_SandFootprints, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_SandFootprints, 2, 2, 1)
 };
 
 const union AnimCmd gFieldEffectAnim_837487C[] = {
@@ -269,8 +269,8 @@ const union AnimCmd *const gFieldEffectAnimTable_SandFootprints[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_SandFootprints = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_SandFootprints, gFieldEffectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_DeepSandFootprints[] = {
-    obj_frame_tiles(gFieldEffectPic_DeepSandFootprints_0),
-    obj_frame_tiles(gFieldEffectPic_DeepSandFootprints_1)
+    overworld_frame(gFieldEffectPic_DeepSandFootprints, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_DeepSandFootprints, 2, 2, 1)
 };
 
 const union AnimCmd gFieldEffectAnim_83748D8[] = {
@@ -304,10 +304,10 @@ const union AnimCmd *const gFieldEffectAnimTable_DeepSandFootprints[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_DeepSandFootprints, gFieldEffectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_BikeTireTracks[] = {
-    obj_frame_tiles(gFieldEffectPic_BikeTireTracks_0),
-    obj_frame_tiles(gFieldEffectPic_BikeTireTracks_1),
-    obj_frame_tiles(gFieldEffectPic_BikeTireTracks_2),
-    obj_frame_tiles(gFieldEffectPic_BikeTireTracks_3)
+    overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_BikeTireTracks, 2, 2, 3)
 };
 
 const union AnimCmd gFieldEffectAnim_8374944[] = {
@@ -365,10 +365,10 @@ const union AnimCmd *const gFieldEffectAnimTable_BikeTireTracks[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_BikeTireTracks, gFieldEffectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_JumpBigSplash[] = {
-    obj_frame_tiles(gFieldEffectPic_JumpBigSplash_0),
-    obj_frame_tiles(gFieldEffectPic_JumpBigSplash_1),
-    obj_frame_tiles(gFieldEffectPic_JumpBigSplash_2),
-    obj_frame_tiles(gFieldEffectPic_JumpBigSplash_3)
+    overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_JumpBigSplash, 2, 2, 3)
 };
 
 const union AnimCmd gFieldEffectAnim_83749E0[] = {
@@ -386,8 +386,8 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpBigSplash[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpBigSplash = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_JumpBigSplash, gFieldEffectPicTable_JumpBigSplash, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Splash[] = {
-    obj_frame_tiles(gFieldEffectPic_Splash_0),
-    obj_frame_tiles(gFieldEffectPic_Splash_1)
+    overworld_frame(gFieldEffectPic_Splash, 2, 1, 0),
+    overworld_frame(gFieldEffectPic_Splash, 2, 1, 1)
 };
 
 const union AnimCmd gFieldEffectAnim_8374A20[] = {
@@ -416,9 +416,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Splash[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_Splash = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_Splash, gFieldEffectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_JumpSmallSplash[] = {
-    obj_frame_tiles(gFieldEffectPic_JumpSmallSplash_0),
-    obj_frame_tiles(gFieldEffectPic_JumpSmallSplash_1),
-    obj_frame_tiles(gFieldEffectPic_JumpSmallSplash_2)
+    overworld_frame(gFieldEffectPic_JumpSmallSplash, 2, 1, 0),
+    overworld_frame(gFieldEffectPic_JumpSmallSplash, 2, 1, 1),
+    overworld_frame(gFieldEffectPic_JumpSmallSplash, 2, 1, 2)
 };
 
 const union AnimCmd gFieldEffectAnim_8374A88[] = {
@@ -435,10 +435,10 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpSmallSplash[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpSmallSplash = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_JumpSmallSplash, gFieldEffectPicTable_JumpSmallSplash, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_LongGrass[] = {
-    obj_frame_tiles(gFieldEffectPic_LongGrass_0),
-    obj_frame_tiles(gFieldEffectPic_LongGrass_1),
-    obj_frame_tiles(gFieldEffectPic_LongGrass_2),
-    obj_frame_tiles(gFieldEffectPic_LongGrass_3)
+    overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_LongGrass, 2, 2, 3)
 };
 
 const union AnimCmd gFieldEffectAnim_8374AD4[] = {
@@ -459,12 +459,12 @@ const union AnimCmd *const gFieldEffectAnimTable_LongGrass[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_LongGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_LongGrass, gFieldEffectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_JumpLongGrass[] = {
-    obj_frame_tiles(gFieldEffectPic_JumpLongGrass_0),
-    obj_frame_tiles(gFieldEffectPic_JumpLongGrass_1),
-    obj_frame_tiles(gFieldEffectPic_JumpLongGrass_2),
-    obj_frame_tiles(gFieldEffectPic_JumpLongGrass_3),
-    obj_frame_tiles(gFieldEffectPic_JumpLongGrass_4),
-    obj_frame_tiles(gFieldEffectPic_JumpLongGrass_5)
+    overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 3),
+    overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 4),
+    overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 6)
 };
 
 const union AnimCmd gFieldEffectAnim_8374B40[] = {
@@ -484,15 +484,15 @@ const union AnimCmd *const gFieldEffectAnimTable_JumpLongGrass[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_JumpLongGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_JumpLongGrass, gFieldEffectPicTable_JumpLongGrass, gDummySpriteAffineAnimTable, UpdateJumpLandingFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Unknown17[] = {
-    obj_frame_tiles(gFieldEffectPic_JumpLongGrass_5),
-    obj_frame_tiles(gFieldEffectPic_Unknown17_0),
-    obj_frame_tiles(gFieldEffectPic_Unknown17_1),
-    obj_frame_tiles(gFieldEffectPic_Unknown17_2),
-    obj_frame_tiles(gFieldEffectPic_Unknown17_3),
-    obj_frame_tiles(gFieldEffectPic_Unknown17_4),
-    obj_frame_tiles(gFieldEffectPic_Unknown17_5),
-    obj_frame_tiles(gFieldEffectPic_Unknown17_6),
-    obj_frame_tiles(gFieldEffectPic_Unknown17_7)
+    overworld_frame(gFieldEffectPic_JumpLongGrass, 2, 2, 6),
+    overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 3),
+    overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 4),
+    overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 5),
+    overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 6),
+    overworld_frame(gFieldEffectPic_Unknown17, 2, 2, 7)
 };
 
 const union AnimCmd gFieldEffectAnim_8374BC0[] = {
@@ -515,10 +515,10 @@ const union AnimCmd *const gFieldEffectAnimTable_Unknown17[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_Unknown17 = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Unknown17, gFieldEffectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Unknown18[] = {
-    obj_frame_tiles(gFieldEffectPic_Unknown18_0),
-    obj_frame_tiles(gFieldEffectPic_Unknown18_1),
-    obj_frame_tiles(gFieldEffectPic_Unknown18_2),
-    obj_frame_tiles(gFieldEffectPic_Unknown18_3)
+    overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_Unknown18, 2, 2, 3)
 };
 
 const union AnimCmd gFieldEffectAnim_8374C24[] = {
@@ -538,10 +538,10 @@ const union AnimCmd *const gFieldEffectAnimTable_Unknown18[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_Unknown18 = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_Unknown18, gFieldEffectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Unknown19[] = {
-    obj_frame_tiles(gFieldEffectPic_Unknown19_0),
-    obj_frame_tiles(gFieldEffectPic_Unknown19_1),
-    obj_frame_tiles(gFieldEffectPic_Unknown19_2),
-    obj_frame_tiles(gFieldEffectPic_Unknown19_3)
+    overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_Unknown19, 2, 2, 3)
 };
 
 const union AnimCmd gFieldEffectAnim_8374C7C[] = {
@@ -559,9 +559,9 @@ const union AnimCmd *const gFieldEffectAnimTable_Unknown19[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_Unknown19 = {0xFFFF, 0x1004, &gFieldOamData_16x16, gFieldEffectAnimTable_Unknown19, gFieldEffectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
 
 const struct SpriteFrameImage gFieldEffectPicTable_SandPile[] = {
-    obj_frame_tiles(gFieldEffectPic_SandPile_0),
-    obj_frame_tiles(gFieldEffectPic_SandPile_1),
-    obj_frame_tiles(gFieldEffectPic_SandPile_2)
+    overworld_frame(gFieldEffectPic_SandPile, 2, 1, 0),
+    overworld_frame(gFieldEffectPic_SandPile, 2, 1, 1),
+    overworld_frame(gFieldEffectPic_SandPile, 2, 1, 2)
 };
 
 const union AnimCmd gFieldEffectAnim_8374CC4[] = {
@@ -578,10 +578,10 @@ const union AnimCmd *const gFieldEffectAnimTable_SandPile[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_SandPile = {0xFFFF, 0x1004, &gFieldOamData_16x8, gFieldEffectAnimTable_SandPile, gFieldEffectPicTable_SandPile, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Unknown20[] = {
-    obj_frame_tiles(gFieldEffectPic_Unknown20_0),
-    obj_frame_tiles(gFieldEffectPic_Unknown20_1),
-    obj_frame_tiles(gFieldEffectPic_Unknown20_2),
-    obj_frame_tiles(gFieldEffectPic_Unknown20_3)
+    overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_Unknown20, 2, 2, 3)
 };
 
 const union AnimCmd gFieldEffectAnim_8374D10[] = {
@@ -634,12 +634,12 @@ const union AffineAnimCmd *const gFieldEffectAffineAnimTable_Reflection[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_Reflection = {0x0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectAffineAnimTable_Reflection, SpriteCallbackDummy};
 
 const struct SpriteFrameImage gFieldEffectPicTable_BerryTreeGrowthSparkle[] = {
-    obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_0),
-    obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_1),
-    obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_2),
-    obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_3),
-    obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_4),
-    obj_frame_tiles(gFieldEffectPic_BerryTreeGrowthSparkle_5)
+    overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 3),
+    overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 4),
+    overworld_frame(gFieldEffectPic_BerryTreeGrowthSparkle, 2, 2, 5)
 };
 
 const union AnimCmd gFieldEffectAnim_8374E38[] = {
@@ -673,13 +673,13 @@ const union AnimCmd *const gFieldEffectAnimTable_BerryTreeGrowthSparkle[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gFieldOamData_16x16, gFieldEffectAnimTable_BerryTreeGrowthSparkle, gFieldEffectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim};
 
 const struct SpriteFrameImage gFieldEffectPicTable_TreeDisguise[] = {
-    obj_frame_tiles(gFieldEffectPic_TreeDisguise_0),
-    obj_frame_tiles(gFieldEffectPic_TreeDisguise_1),
-    obj_frame_tiles(gFieldEffectPic_TreeDisguise_2),
-    obj_frame_tiles(gFieldEffectPic_TreeDisguise_3),
-    obj_frame_tiles(gFieldEffectPic_TreeDisguise_4),
-    obj_frame_tiles(gFieldEffectPic_TreeDisguise_5),
-    obj_frame_tiles(gFieldEffectPic_TreeDisguise_6)
+    overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 0),
+    overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 1),
+    overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 2),
+    overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 3),
+    overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 4),
+    overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 5),
+    overworld_frame(gFieldEffectPic_TreeDisguise, 2, 4, 6)
 };
 
 const union AnimCmd gFieldEffectAnim_8374EE0[] = {
@@ -706,13 +706,13 @@ const union AnimCmd *const gFieldEffectAnimTable_TreeDisguise[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gFieldOamData_16x32, gFieldEffectAnimTable_TreeDisguise, gFieldEffectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_MountainDisguise[] = {
-    obj_frame_tiles(gFieldEffectPic_MountainDisguise_0),
-    obj_frame_tiles(gFieldEffectPic_MountainDisguise_1),
-    obj_frame_tiles(gFieldEffectPic_MountainDisguise_2),
-    obj_frame_tiles(gFieldEffectPic_MountainDisguise_3),
-    obj_frame_tiles(gFieldEffectPic_MountainDisguise_4),
-    obj_frame_tiles(gFieldEffectPic_MountainDisguise_5),
-    obj_frame_tiles(gFieldEffectPic_MountainDisguise_6)
+    overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 0),
+    overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 1),
+    overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 2),
+    overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 3),
+    overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 4),
+    overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 5),
+    overworld_frame(gFieldEffectPic_MountainDisguise, 2, 4, 6)
 };
 
 const union AnimCmd gFieldEffectAnim_8374F60[] = {
@@ -739,19 +739,19 @@ const union AnimCmd *const gFieldEffectAnimTable_MountainDisguise[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gFieldOamData_16x32, gFieldEffectAnimTable_MountainDisguise, gFieldEffectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_SandDisguise[] = {
-    obj_frame_tiles(gFieldEffectPic_SandDisguise_0),
-    obj_frame_tiles(gFieldEffectPic_SandDisguise_1),
-    obj_frame_tiles(gFieldEffectPic_SandDisguise_2),
-    obj_frame_tiles(gFieldEffectPic_SandDisguise_3),
-    obj_frame_tiles(gFieldEffectPic_SandDisguise_4),
-    obj_frame_tiles(gFieldEffectPic_SandDisguise_5),
-    obj_frame_tiles(gFieldEffectPic_SandDisguise_6)
+    overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 0),
+    overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 1),
+    overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 2),
+    overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 3),
+    overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 4),
+    overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 5),
+    overworld_frame(gFieldEffectPic_SandDisguise, 2, 4, 6)
 };
 
 const struct SpriteTemplate gFieldEffectSpriteTemplate_SandDisguise = {0xFFFF, 0xFFFF, &gFieldOamData_16x32, gFieldEffectAnimTable_TreeDisguise, gFieldEffectPicTable_SandDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Bird[] = {
-    obj_frame_tiles(gFieldEffectPic_Bird)
+    overworld_frame(gFieldEffectPic_Bird, 4, 4, 0)
 };
 
 const union AnimCmd gFieldEffectAnim_8375000[] = {
@@ -766,8 +766,8 @@ const union AnimCmd *const gFieldEffectAnimTable_Bird[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_Bird = {0xFFFF, 0xFFFF, &gFieldOamData_32x32, gFieldEffectAnimTable_Bird, gFieldEffectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
 
 const struct SpriteFrameImage gFieldEffectPicTable_ShortGrass[] = {
-    obj_frame_tiles(gFieldEffectPic_ShortGrass_0),
-    obj_frame_tiles(gFieldEffectPic_ShortGrass_1)
+    overworld_frame(gFieldEffectPic_ShortGrass, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_ShortGrass, 2, 2, 1)
 };
 
 const union AnimCmd gFieldEffectAnim_8375034[] = {
@@ -783,7 +783,7 @@ const union AnimCmd *const gFieldEffectAnimTable_ShortGrass[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_ShortGrass = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_ShortGrass, gFieldEffectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_HotSpringsWater[] = {
-    obj_frame_tiles(gFieldEffectPic_HotSpringsWater)
+    overworld_frame(gFieldEffectPic_HotSpringsWater, 2, 2, 0)
 };
 
 const union AnimCmd gFieldEffectAnim_8375064[] = {
@@ -798,11 +798,11 @@ const union AnimCmd *const gFieldEffectAnimTable_HotSpringsWater[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gFieldOamData_16x16, gFieldEffectAnimTable_HotSpringsWater, gFieldEffectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_PopOutOfAsh[] = {
-    obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_0),
-    obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_1),
-    obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_2),
-    obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_3),
-    obj_frame_tiles(gFieldEffectPic_PopOutOfAsh_4)
+    overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 3),
+    overworld_frame(gFieldEffectPic_PopOutOfAsh, 2, 2, 4)
 };
 
 const union AnimCmd gFieldEffectAnim_83750B0[] = {
@@ -823,11 +823,11 @@ const struct SpriteTemplate gFieldEffectSpriteTemplate_PopOutOfAsh = {0xFFFF, 0x
 const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D};
 
 const struct SpriteFrameImage gFieldEffectPicTable_LavaridgeGymWarp[] = {
-    obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_0),
-    obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_1),
-    obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_2),
-    obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_3),
-    obj_frame_tiles(gFieldEffectPic_LavaridgeGymWarp_4)
+    overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 1),
+    overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 2),
+    overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 3),
+    overworld_frame(gFieldEffectPic_LavaridgeGymWarp, 2, 2, 4)
 };
 
 const union AnimCmd gFieldEffectAnim_8375114[] = {
@@ -846,14 +846,14 @@ const union AnimCmd *const gFieldEffectAnimTable_LavaridgeGymWarp[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_LavaridgeGymWarp = {0xFFFF, 0x100D, &gFieldOamData_16x16, gFieldEffectAnimTable_LavaridgeGymWarp, gFieldEffectPicTable_LavaridgeGymWarp, gDummySpriteAffineAnimTable, sub_8087638};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Bubbles[] = {
-    obj_frame_tiles(gFieldEffectPic_Bubbles_0),
-    obj_frame_tiles(gFieldEffectPic_Bubbles_1),
-    obj_frame_tiles(gFieldEffectPic_Bubbles_2),
-    obj_frame_tiles(gFieldEffectPic_Bubbles_3),
-    obj_frame_tiles(gFieldEffectPic_Bubbles_4),
-    obj_frame_tiles(gFieldEffectPic_Bubbles_5),
-    obj_frame_tiles(gFieldEffectPic_Bubbles_6),
-    obj_frame_tiles(gFieldEffectPic_Bubbles_7)
+    overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 0),
+    overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 1),
+    overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 2),
+    overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 3),
+    overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 4),
+    overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 5),
+    overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 6),
+    overworld_frame(gFieldEffectPic_Bubbles, 2, 4, 7)
 };
 
 const union AnimCmd gFieldEffectAnim_8375188[] = {
@@ -875,8 +875,8 @@ const union AnimCmd *const gFieldEffectAnimTable_Bubbles[] = {
 const struct SpriteTemplate gFieldEffectSpriteTemplate_Bubbles = {0xFFFF, 0x1004, &gFieldOamData_16x32, gFieldEffectAnimTable_Bubbles, gFieldEffectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect};
 
 const struct SpriteFrameImage gFieldEffectPicTable_Sparkle[] = {
-    obj_frame_tiles(gFieldEffectPic_Sparkle_0),
-    obj_frame_tiles(gFieldEffectPic_Sparkle_1)
+    overworld_frame(gFieldEffectPic_Sparkle, 2, 2, 0),
+    overworld_frame(gFieldEffectPic_Sparkle, 2, 2, 1)
 };
 
 const union AnimCmd gFieldEffectAnim_83751D8[] = {