Change overworld_frame macro to use tiles

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 679a0e5a5..beb59974f 100755
--- a/src/data/field_event_obj/berry_tree_graphics_tables.h
+++ b/src/data/field_event_obj/berry_tree_graphics_tables.h
@@ -2,421 +2,421 @@
 #define GUARD_BERRY_TREE_GRAPHICS_TABLES_H
 
 const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 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[] = {
-    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
-    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
-    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 0),
-    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 1),
-    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 2),
-    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 3),
-    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 4),
-    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 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};