Use implicilt berry indexes in arrays

1 files changed, 133 insertions, 132 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 f5ef15af9..27d5b1f9a 100755
--- a/src/data/field_event_obj/berry_tree_graphics_tables.h
+++ b/src/data/field_event_obj/berry_tree_graphics_tables.h
@@ -423,142 +423,143 @@ const u8 gDeadBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_
 const u8 gBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES};
 
 const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
-    gEventObjectPicTable_CheriBerryTree,
-    gEventObjectPicTable_ChestoBerryTree,
-    gEventObjectPicTable_PechaBerryTree,
-    gEventObjectPicTable_RawstBerryTree,
-    gEventObjectPicTable_AspearBerryTree,
-    gEventObjectPicTable_LeppaBerryTree,
-    gEventObjectPicTable_OranBerryTree,
-    gEventObjectPicTable_PersimBerryTree,
-    gEventObjectPicTable_LumBerryTree,
-    gEventObjectPicTable_SitrusBerryTree,
-    gEventObjectPicTable_FigyBerryTree,
-    gEventObjectPicTable_WikiBerryTree,
-    gEventObjectPicTable_MagoBerryTree,
-    gEventObjectPicTable_AguavBerryTree,
-    gEventObjectPicTable_IapapaBerryTree,
-    gEventObjectPicTable_RazzBerryTree,
-    gEventObjectPicTable_RazzBerryTree,
-    gEventObjectPicTable_MagoBerryTree,
-    gEventObjectPicTable_WepearBerryTree,
-    gEventObjectPicTable_IapapaBerryTree,
-    gEventObjectPicTable_PomegBerryTree,
-    gEventObjectPicTable_KelpsyBerryTree,
-    gEventObjectPicTable_WepearBerryTree,
-    gEventObjectPicTable_HondewBerryTree,
-    gEventObjectPicTable_GrepaBerryTree,
-    gEventObjectPicTable_TamatoBerryTree,
-    gEventObjectPicTable_CornnBerryTree,
-    gEventObjectPicTable_PomegBerryTree,
-    gEventObjectPicTable_RabutaBerryTree,
-    gEventObjectPicTable_NomelBerryTree,
-    gEventObjectPicTable_SpelonBerryTree,
-    gEventObjectPicTable_PamtreBerryTree,
-    gEventObjectPicTable_RabutaBerryTree,
-    gEventObjectPicTable_DurinBerryTree,
-    gEventObjectPicTable_HondewBerryTree,
-    gEventObjectPicTable_LiechiBerryTree,
-    gEventObjectPicTable_HondewBerryTree,
-    gEventObjectPicTable_AguavBerryTree,
-    gEventObjectPicTable_PomegBerryTree,
-    gEventObjectPicTable_GrepaBerryTree,
-    gEventObjectPicTable_LansatBerryTree,
-    gEventObjectPicTable_CornnBerryTree,
-    gEventObjectPicTable_DurinBerryTree,
+    [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CheriBerryTree,
+    [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_ChestoBerryTree,
+    [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PechaBerryTree,
+    [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RawstBerryTree,
+    [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AspearBerryTree,
+    [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LeppaBerryTree,
+    [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_OranBerryTree,
+    [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PersimBerryTree,
+    [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LumBerryTree,
+    [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SitrusBerryTree,
+    [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_FigyBerryTree,
+    [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WikiBerryTree,
+    [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree,
+    [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree,
+    [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree,
+    [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree,
+    [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree,
+    [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree,
+    [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree,
+    [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree,
+    [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
+    [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_KelpsyBerryTree,
+    [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree,
+    [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
+    [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree,
+    [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_TamatoBerryTree,
+    [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree,
+    [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
+    [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree,
+    [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_NomelBerryTree,
+    [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SpelonBerryTree,
+    [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PamtreBerryTree,
+    [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree,
+    [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree,
+    [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
+    [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LiechiBerryTree,
+    [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree,
+    [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree,
+    [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree,
+    [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree,
+    [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LansatBerryTree,
+    [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree,
+    [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree,
 };
 
 const u8 *const gBerryTreePaletteSlotTablePointers[] = {
-    gBerryTreePaletteSlotTable_Cheri,
-    gBerryTreePaletteSlotTable_Chesto,
-    gBerryTreePaletteSlotTable_Pecha,
-    gBerryTreePaletteSlotTable_Rawst,
-    gBerryTreePaletteSlotTable_Aspear,
-    gBerryTreePaletteSlotTable_Leppa,
-    gBerryTreePaletteSlotTable_Oran,
-    gBerryTreePaletteSlotTable_Persim,
-    gBerryTreePaletteSlotTable_Lum,
-    gBerryTreePaletteSlotTable_Sitrus,
-    gBerryTreePaletteSlotTable_Figy,
-    gBerryTreePaletteSlotTable_Wiki,
-    gBerryTreePaletteSlotTable_Mago,
-    gBerryTreePaletteSlotTable_Aguav,
-    gBerryTreePaletteSlotTable_Iapapa,
-    gBerryTreePaletteSlotTable_Razz,
-    gBerryTreePaletteSlotTable_Razz,
-    gBerryTreePaletteSlotTable_Mago,
-    gBerryTreePaletteSlotTable_Wepear,
-    gBerryTreePaletteSlotTable_Iapapa,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Kelpsy,
-    gBerryTreePaletteSlotTable_Wepear,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Grepa,
-    gBerryTreePaletteSlotTable_Tamato,
-    gBerryTreePaletteSlotTable_Cornn,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Rabuta,
-    gBerryTreePaletteSlotTable_Nomel,
-    gBerryTreePaletteSlotTable_Spelon,
-    gBerryTreePaletteSlotTable_Pamtre,
-    gBerryTreePaletteSlotTable_Rabuta,
-    gBerryTreePaletteSlotTable_Durin,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Liechi,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Aguav,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Grepa,
-    gBerryTreePaletteSlotTable_Lansat,
-    gBerryTreePaletteSlotTable_Cornn,
-    gBerryTreePaletteSlotTable_Durin,
+    [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri,
+    [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto,
+    [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha,
+    [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst,
+    [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear,
+    [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa,
+    [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran,
+    [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim,
+    [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum,
+    [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus,
+    [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy,
+    [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki,
+    [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago,
+    [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav,
+    [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa,
+    [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz,
+    [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz,
+    [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago,
+    [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear,
+    [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa,
+    [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
+    [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy,
+    [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear,
+    [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
+    [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
+    [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato,
+    [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn,
+    [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
+    [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta,
+    [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel,
+    [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon,
+    [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre,
+    [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta,
+    [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
+    [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
+    [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi,
+    [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew,
+    [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav,
+    [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg,
+    [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
+    [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat,
+    [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn,
+    [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
 };
 
 const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = {
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
-    gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    // 3 unused berries.
+    [ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
+    [ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable,
 };