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

Use spritesheets for event object pics

1 files changed, 270 insertions, 270 deletions

diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h
index 185efc68e..69f33c393 100644
--- a/src/data/field_event_obj/berry_tree_graphics_tables.h
+++ b/src/data/field_event_obj/berry_tree_graphics_tables.h
@@ -6,421 +6,421 @@
 #define POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H
 
 const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5};
 
 const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_5)
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 0),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 1),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 2),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 3),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 4),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 5)
 };
 
 const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2};