diff --git a/graphics/berries/babiri.png b/graphics/berries/babiri.png new file mode 100644 index 0000000000..056353bab9 Binary files /dev/null and b/graphics/berries/babiri.png differ diff --git a/graphics/berries/charti.png b/graphics/berries/charti.png new file mode 100644 index 0000000000..9f119ebac0 Binary files /dev/null and b/graphics/berries/charti.png differ diff --git a/graphics/berries/chilan.png b/graphics/berries/chilan.png new file mode 100644 index 0000000000..8f717bb82c Binary files /dev/null and b/graphics/berries/chilan.png differ diff --git a/graphics/berries/chople.png b/graphics/berries/chople.png new file mode 100644 index 0000000000..0b4b28014f Binary files /dev/null and b/graphics/berries/chople.png differ diff --git a/graphics/berries/coba.png b/graphics/berries/coba.png new file mode 100644 index 0000000000..18283bd79d Binary files /dev/null and b/graphics/berries/coba.png differ diff --git a/graphics/berries/colbur.png b/graphics/berries/colbur.png new file mode 100644 index 0000000000..d422a826e5 Binary files /dev/null and b/graphics/berries/colbur.png differ diff --git a/graphics/berries/haban.png b/graphics/berries/haban.png new file mode 100644 index 0000000000..87b27fb263 Binary files /dev/null and b/graphics/berries/haban.png differ diff --git a/graphics/berries/kasib.png b/graphics/berries/kasib.png new file mode 100644 index 0000000000..f1b09244b0 Binary files /dev/null and b/graphics/berries/kasib.png differ diff --git a/graphics/berries/kebia.png b/graphics/berries/kebia.png new file mode 100644 index 0000000000..e0dfefd672 Binary files /dev/null and b/graphics/berries/kebia.png differ diff --git a/graphics/berries/occa.png b/graphics/berries/occa.png new file mode 100644 index 0000000000..1ad829e5f1 Binary files /dev/null and b/graphics/berries/occa.png differ diff --git a/graphics/berries/passho.png b/graphics/berries/passho.png new file mode 100644 index 0000000000..c541475450 Binary files /dev/null and b/graphics/berries/passho.png differ diff --git a/graphics/berries/payapa.png b/graphics/berries/payapa.png new file mode 100644 index 0000000000..aff30a75cc Binary files /dev/null and b/graphics/berries/payapa.png differ diff --git a/graphics/berries/rindo.png b/graphics/berries/rindo.png new file mode 100644 index 0000000000..91e895d043 Binary files /dev/null and b/graphics/berries/rindo.png differ diff --git a/graphics/berries/roseli.png b/graphics/berries/roseli.png new file mode 100644 index 0000000000..4eb675a447 Binary files /dev/null and b/graphics/berries/roseli.png differ diff --git a/graphics/berries/shuca.png b/graphics/berries/shuca.png new file mode 100644 index 0000000000..618f3abace Binary files /dev/null and b/graphics/berries/shuca.png differ diff --git a/graphics/berries/tanga.png b/graphics/berries/tanga.png new file mode 100644 index 0000000000..702da676f3 Binary files /dev/null and b/graphics/berries/tanga.png differ diff --git a/graphics/berries/wacan.png b/graphics/berries/wacan.png new file mode 100644 index 0000000000..5d88c95bd2 Binary files /dev/null and b/graphics/berries/wacan.png differ diff --git a/graphics/berries/yache.png b/graphics/berries/yache.png new file mode 100644 index 0000000000..3f39782770 Binary files /dev/null and b/graphics/berries/yache.png differ diff --git a/graphics/event_objects/pics/berry_trees/chople.png b/graphics/event_objects/pics/berry_trees/chople.png new file mode 100644 index 0000000000..fc70a9af59 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/chople.png differ diff --git a/graphics/event_objects/pics/berry_trees/colbur.png b/graphics/event_objects/pics/berry_trees/colbur.png new file mode 100644 index 0000000000..241507aafd Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/colbur.png differ diff --git a/graphics/event_objects/pics/berry_trees/haban.png b/graphics/event_objects/pics/berry_trees/haban.png new file mode 100644 index 0000000000..ba4839c80b Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/haban.png differ diff --git a/graphics/event_objects/pics/berry_trees/kasib.png b/graphics/event_objects/pics/berry_trees/kasib.png new file mode 100644 index 0000000000..b8a8401e8d Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/kasib.png differ diff --git a/graphics/event_objects/pics/berry_trees/kebia.png b/graphics/event_objects/pics/berry_trees/kebia.png new file mode 100644 index 0000000000..03efc73c1f Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/kebia.png differ diff --git a/graphics/event_objects/pics/berry_trees/occa.png b/graphics/event_objects/pics/berry_trees/occa.png new file mode 100644 index 0000000000..8685264f9b Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/occa.png differ diff --git a/graphics/event_objects/pics/berry_trees/payapa.png b/graphics/event_objects/pics/berry_trees/payapa.png new file mode 100644 index 0000000000..14aed0c235 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/payapa.png differ diff --git a/graphics/event_objects/pics/berry_trees/roseli.png b/graphics/event_objects/pics/berry_trees/roseli.png new file mode 100644 index 0000000000..f59bf93a2d Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/roseli.png differ diff --git a/graphics/event_objects/pics/berry_trees/shuca.png b/graphics/event_objects/pics/berry_trees/shuca.png new file mode 100644 index 0000000000..4e95bb4f6a Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/shuca.png differ diff --git a/graphics/event_objects/pics/berry_trees/tanga.png b/graphics/event_objects/pics/berry_trees/tanga.png new file mode 100644 index 0000000000..28e86f6f4d Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/tanga.png differ diff --git a/graphics/event_objects/pics/berry_trees/yache.png b/graphics/event_objects/pics/berry_trees/yache.png new file mode 100644 index 0000000000..bde4393548 Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/yache.png differ diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index 84368ae913..feede12fbf 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -100,6 +100,7 @@ #define HOLD_EFFECT_ADAMANT_ORB 94 #define HOLD_EFFECT_LUSTROUS_ORB 95 #define HOLD_EFFECT_GRISEOUS_ORB 96 +#define HOLD_EFFECT_RESIST_BERRY 97 // Gen5 hold effects #define HOLD_EFFECT_FLOAT_STONE 115 diff --git a/include/constants/items.h b/include/constants/items.h index 5418ceee09..15e05e5acb 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -196,19 +196,19 @@ #define ITEM_COLBUR_BERRY 186 #define ITEM_BABIRI_BERRY 187 #define ITEM_CHILAN_BERRY 188 -#define ITEM_LIECHI_BERRY 189 -#define ITEM_GANLON_BERRY 190 -#define ITEM_SALAC_BERRY 191 -#define ITEM_PETAYA_BERRY 192 -#define ITEM_APICOT_BERRY 193 -#define ITEM_LANSAT_BERRY 194 -#define ITEM_STARF_BERRY 195 -#define ITEM_ENIGMA_BERRY 196 +#define ITEM_ROSELI_BERRY 189 +#define ITEM_LIECHI_BERRY 190 +#define ITEM_GANLON_BERRY 191 +#define ITEM_SALAC_BERRY 192 +#define ITEM_PETAYA_BERRY 193 +#define ITEM_APICOT_BERRY 194 +#define ITEM_LANSAT_BERRY 195 +#define ITEM_STARF_BERRY 196 #define ITEM_MICLE_BERRY 197 -#define ITEM_CUSTAP_BERRY 198 -#define ITEM_JABOCA_BERRY 199 -#define ITEM_ROWAP_BERRY 200 -#define ITEM_ROSELI_BERRY 201 +#define ITEM_ENIGMA_BERRY 198 +#define ITEM_CUSTAP_BERRY 199 +#define ITEM_JABOCA_BERRY 200 +#define ITEM_ROWAP_BERRY 201 #define ITEM_KEE_BERRY 202 #define ITEM_MARANGA_BERRY 203 // Battle Held items diff --git a/include/graphics.h b/include/graphics.h index f6119807b0..3966952f3b 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4327,6 +4327,42 @@ extern const u32 gBerryPic_Starf[]; extern const u32 gBerryPalette_Starf[]; extern const u32 gBerryPic_Enigma[]; extern const u32 gBerryPalette_Enigma[]; +extern const u32 gBerryPic_Occa[]; +extern const u32 gBerryPic_Passho[]; +extern const u32 gBerryPic_Wacan[]; +extern const u32 gBerryPic_Rindo[]; +extern const u32 gBerryPic_Yache[]; +extern const u32 gBerryPic_Chople[]; +extern const u32 gBerryPic_Kebia[]; +extern const u32 gBerryPic_Shuca[]; +extern const u32 gBerryPic_Coba[]; +extern const u32 gBerryPic_Payapa[]; +extern const u32 gBerryPic_Tanga[]; +extern const u32 gBerryPic_Charti[]; +extern const u32 gBerryPic_Kasib[]; +extern const u32 gBerryPic_Haban[]; +extern const u32 gBerryPic_Colbur[]; +extern const u32 gBerryPic_Babiri[]; +extern const u32 gBerryPic_Chilan[]; +extern const u32 gBerryPic_Roseli[]; +extern const u32 gBerryPalette_Occa[]; +extern const u32 gBerryPalette_Passho[]; +extern const u32 gBerryPalette_Wacan[]; +extern const u32 gBerryPalette_Rindo[]; +extern const u32 gBerryPalette_Yache[]; +extern const u32 gBerryPalette_Chople[]; +extern const u32 gBerryPalette_Kebia[]; +extern const u32 gBerryPalette_Shuca[]; +extern const u32 gBerryPalette_Coba[]; +extern const u32 gBerryPalette_Payapa[]; +extern const u32 gBerryPalette_Tanga[]; +extern const u32 gBerryPalette_Charti[]; +extern const u32 gBerryPalette_Kasib[]; +extern const u32 gBerryPalette_Haban[]; +extern const u32 gBerryPalette_Colbur[]; +extern const u32 gBerryPalette_Babiri[]; +extern const u32 gBerryPalette_Chilan[]; +extern const u32 gBerryPalette_Roseli[]; //credits extern const u32 gCreditsCopyrightEnd_Gfx[]; diff --git a/src/berry.c b/src/berry.c index 49acb7d101..ab88ce3858 100644 --- a/src/berry.c +++ b/src/berry.c @@ -112,6 +112,43 @@ static const u8 sBerryDescriptionPart2_Starf[] = _("world's edge. Considered a m static const u8 sBerryDescriptionPart1_Enigma[] = _("A completely enigmatic BERRY."); static const u8 sBerryDescriptionPart2_Enigma[] = _("Appears to have the power of stars."); +static const u8 sBerryDescriptionPart1_Occa[] = _("Said to grow in the tropics once,"); +static const u8 sBerryDescriptionPart2_Occa[] = _("it boasts an intensely hot spiciness."); +static const u8 sBerryDescriptionPart1_Passho[] = _("Its flesh is dotted with many tiny"); +static const u8 sBerryDescriptionPart2_Passho[] = _("bubbles that keep it afloat in water."); +static const u8 sBerryDescriptionPart1_Wacan[] = _("Energy drawn from lightning strikes"); +static const u8 sBerryDescriptionPart2_Wacan[] = _("makes this Berry grow big and rich."); +static const u8 sBerryDescriptionPart1_Rindo[] = _("This berry has a vegetable-like flavor,"); +static const u8 sBerryDescriptionPart2_Rindo[] = _("but is rich in health-promoting fiber."); +static const u8 sBerryDescriptionPart1_Yache[] = _("This Berry has a refreshing dry and"); +static const u8 sBerryDescriptionPart2_Yache[] = _("sour flavor. Tastes better chilled."); +static const u8 sBerryDescriptionPart1_Chople[] = _("Contains a substance that generates"); +static const u8 sBerryDescriptionPart2_Chople[] = _("heat. Can even fire up a chilly heart."); +static const u8 sBerryDescriptionPart1_Kebia[] = _("Brilliant green on the outside, inside"); +static const u8 sBerryDescriptionPart2_Kebia[] = _("it is packed with black-colored flesh."); +static const u8 sBerryDescriptionPart1_Shuca[] = _("The sweet pulp has just the hint of a"); +static const u8 sBerryDescriptionPart2_Shuca[] = _("a hard-edged and fragrant bite to it."); +static const u8 sBerryDescriptionPart1_Coba[] = _("This Berry is said to be a cross of"); +static const u8 sBerryDescriptionPart2_Coba[] = _("two Berries blown in from far away."); +static const u8 sBerryDescriptionPart1_Payapa[] = _("Said to sense human emotions, it swells"); +static const u8 sBerryDescriptionPart2_Payapa[] = _("roundly when a person approaches."); +static const u8 sBerryDescriptionPart1_Tanga[] = _("It grows a flower at the tip that lures"); +static const u8 sBerryDescriptionPart2_Tanga[] = _("Bug Pokémon with its stringy petals."); +static const u8 sBerryDescriptionPart1_Charti[] = _("Often used for pickles because of its"); +static const u8 sBerryDescriptionPart2_Charti[] = _("dry flavor. Sometimes eaten raw."); +static const u8 sBerryDescriptionPart1_Kasib[] = _("Old superstitions say it has an odd"); +static const u8 sBerryDescriptionPart2_Kasib[] = _("power. A popular good-luck charm."); +static const u8 sBerryDescriptionPart1_Haban[] = _("Less bitter if enough of this Berry"); +static const u8 sBerryDescriptionPart2_Haban[] = _("is boiled down. Makes a good jam."); +static const u8 sBerryDescriptionPart1_Colbur[] = _("Tiny hooks on the surface latch onto"); +static const u8 sBerryDescriptionPart2_Colbur[] = _("Pokémon to reach far-off places."); +static const u8 sBerryDescriptionPart1_Babiri[] = _("Very tough with a strong flavor. It"); +static const u8 sBerryDescriptionPart2_Babiri[] = _("was used to make medicine in the past."); +static const u8 sBerryDescriptionPart1_Chilan[] = _("It can be made into a whistle that"); +static const u8 sBerryDescriptionPart2_Chilan[] = _("produces an indescribable sound."); +static const u8 sBerryDescriptionPart1_Roseli[] = _("In nature, they grow in wide rings"); +static const u8 sBerryDescriptionPart2_Roseli[] = _("for reasons that are still unknown."); + const struct Berry gBerries[] = { [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = @@ -887,6 +924,330 @@ const struct Berry gBerries[] = .sour = 40, .smoothness = 40, }, + + [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("OCCA"), + .firmness = BERRY_FIRMNESS_SUPER_HARD, + .size = 89, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Occa, + .description2 = sBerryDescriptionPart2_Occa, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("PASSHO"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 33, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Passho, + .description2 = sBerryDescriptionPart2_Passho, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("WACAN"), + .firmness = BERRY_FIRMNESS_VERY_SOFT, + .size = 250, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Wacan, + .description2 = sBerryDescriptionPart2_Wacan, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("RINDO"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 155, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Rindo, + .description2 = sBerryDescriptionPart2_Rindo, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("YACHE"), + .firmness = BERRY_FIRMNESS_VERY_HARD, + .size = 135, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Yache, + .description2 = sBerryDescriptionPart2_Yache, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("CHOPLE"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 77, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Chople, + .description2 = sBerryDescriptionPart2_Chople, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("KEBIA"), + .firmness = BERRY_FIRMNESS_HARD, + .size = 89, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Kebia, + .description2 = sBerryDescriptionPart2_Kebia, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("SHUCA"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 42, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Shuca, + .description2 = sBerryDescriptionPart2_Shuca, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("COBA"), + .firmness = BERRY_FIRMNESS_VERY_HARD, + .size = 277, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Coba, + .description2 = sBerryDescriptionPart2_Coba, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("PAYAPA"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 251, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Payapa, + .description2 = sBerryDescriptionPart2_Payapa, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("TANGA"), + .firmness = BERRY_FIRMNESS_VERY_SOFT, + .size = 43, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Tanga, + .description2 = sBerryDescriptionPart2_Tanga, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("CHARTI"), + .firmness = BERRY_FIRMNESS_VERY_SOFT, + .size = 28, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Charti, + .description2 = sBerryDescriptionPart2_Charti, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("KASIB"), + .firmness = BERRY_FIRMNESS_HARD, + .size = 144, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Kasib, + .description2 = sBerryDescriptionPart2_Kasib, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("HABAN"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 23, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Haban, + .description2 = sBerryDescriptionPart2_Haban, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("COLBUR"), + .firmness = BERRY_FIRMNESS_SUPER_HARD, + .size = 38, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Colbur, + .description2 = sBerryDescriptionPart2_Colbur, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("BABIRI"), + .firmness = BERRY_FIRMNESS_SUPER_HARD, + .size = 265, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Babiri, + .description2 = sBerryDescriptionPart2_Babiri, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("CHILAN"), + .firmness = BERRY_FIRMNESS_VERY_SOFT, + .size = 33, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Chilan, + .description2 = sBerryDescriptionPart2_Chilan, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, + + [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = + { + .name = _("ROSELI"), + .firmness = BERRY_FIRMNESS_SOFT, + .size = 35, + .maxYield = 5, + .minYield = 1, + .description1 = sBerryDescriptionPart1_Roseli, + .description2 = sBerryDescriptionPart2_Roseli, + .stageDuration = 18, + .spicy = 10, + .dry = 0, + .sweet = 0, + .bitter = 0, + .sour = 40, + .smoothness = 70, + }, }; const struct UnkStruct_0858AB24 gUnknown_0858AB24[] = { 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 d437fa3560..00cffeb9b7 100755 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ b/src/data/field_event_obj/berry_tree_graphics_tables.h @@ -418,6 +418,160 @@ const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = { const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; +const struct SpriteFrameImage gEventObjectPicTable_OccaBerryTree[] = { + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_OccaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_OccaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_OccaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_OccaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_OccaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_OccaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Occa[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gEventObjectPicTable_YacheBerryTree[] = { + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_YacheBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_YacheBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_YacheBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_YacheBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_YacheBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_YacheBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Yache[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gEventObjectPicTable_ChopleBerryTree[] = { + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_ChopleBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_ChopleBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_ChopleBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_ChopleBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_ChopleBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_ChopleBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Chople[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gEventObjectPicTable_KebiaBerryTree[] = { + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_KebiaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_KebiaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_KebiaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_KebiaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_KebiaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_KebiaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Kebia[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gEventObjectPicTable_ShucaBerryTree[] = { + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_ShucaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_ShucaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_ShucaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_ShucaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_ShucaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_ShucaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Shuca[] = {3, 4, 5, 5, 5}; + +const struct SpriteFrameImage gEventObjectPicTable_PayapaBerryTree[] = { + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PayapaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PayapaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PayapaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PayapaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PayapaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PayapaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Payapa[] = {3, 4, 5, 5, 5}; + +const struct SpriteFrameImage gEventObjectPicTable_TangaBerryTree[] = { + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_TangaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_TangaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_TangaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_TangaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_TangaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_TangaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Tanga[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gEventObjectPicTable_KasibBerryTree[] = { + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_KasibBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_KasibBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_KasibBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_KasibBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_KasibBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_KasibBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Kasib[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gEventObjectPicTable_HabanBerryTree[] = { + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_HabanBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_HabanBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_HabanBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_HabanBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_HabanBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_HabanBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Haban[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gEventObjectPicTable_ColburBerryTree[] = { + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_ColburBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_ColburBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_ColburBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_ColburBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_ColburBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_ColburBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Colbur[] = {3, 4, 5, 5, 5}; + +const struct SpriteFrameImage gEventObjectPicTable_RoseliBerryTree[] = { + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_RoseliBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_RoseliBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_RoseliBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_RoseliBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_RoseliBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_RoseliBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Roseli[] = {3, 4, 4, 4, 4}; + const u8 gDeadBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES}; 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}; @@ -466,6 +620,30 @@ const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LansatBerryTree, [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree, [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree, + [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_OccaBerryTree, + [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree, + [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree, + [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_TamatoBerryTree, + [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_YacheBerryTree, + [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_ChopleBerryTree, + [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_KebiaBerryTree, + [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_ShucaBerryTree, + [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RawstBerryTree, + [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PayapaBerryTree, + [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_TangaBerryTree, + [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LansatBerryTree, + [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_KasibBerryTree, + [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HabanBerryTree, + [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_ColburBerryTree, + [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LiechiBerryTree, + [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree, + [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RoseliBerryTree, + [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = NULL, }; const u8 *const gBerryTreePaletteSlotTablePointers[] = { @@ -512,6 +690,30 @@ const u8 *const gBerryTreePaletteSlotTablePointers[] = { [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat, [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, + [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Occa, + [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, + [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, + [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato, + [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Yache, + [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chople, + [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kebia, + [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Shuca, + [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst, + [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Payapa, + [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tanga, + [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat, + [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kasib, + [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Haban, + [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Colbur, + [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi, + [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, + [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Roseli, + [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = NULL, + [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = NULL, }; const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = { @@ -558,4 +760,28 @@ const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = { [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, }; diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index f7f1f33ba4..d5af3c9422 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -285,6 +285,17 @@ const u32 gEventObjectPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/ const u32 gEventObjectPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); const u32 gEventObjectPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); const u32 gEventObjectPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); +const u32 gEventObjectPic_OccaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/occa.4bpp"); +const u32 gEventObjectPic_YacheBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/yache.4bpp"); +const u32 gEventObjectPic_ChopleBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chople.4bpp"); +const u32 gEventObjectPic_KebiaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kebia.4bpp"); +const u32 gEventObjectPic_ShucaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/shuca.4bpp"); +const u32 gEventObjectPic_PayapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/payapa.4bpp"); +const u32 gEventObjectPic_TangaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tanga.4bpp"); +const u32 gEventObjectPic_KasibBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kasib.4bpp"); +const u32 gEventObjectPic_HabanBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/haban.4bpp"); +const u32 gEventObjectPic_ColburBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/colbur.4bpp"); +const u32 gEventObjectPic_RoseliBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/roseli.4bpp"); const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp"); const u32 gEventObjectPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal"); diff --git a/src/data/graphics/berries.h b/src/data/graphics/berries.h index 326bd1c5be..649863663e 100644 --- a/src/data/graphics/berries.h +++ b/src/data/graphics/berries.h @@ -49,6 +49,24 @@ const u32 gBerryPic_Apicot[] = INCBIN_U32("graphics/berries/apicot.4bpp.lz"); const u32 gBerryPic_Lansat[] = INCBIN_U32("graphics/berries/lansat.4bpp.lz"); const u32 gBerryPic_Starf[] = INCBIN_U32("graphics/berries/starf.4bpp.lz"); const u32 gBerryPic_Enigma[] = INCBIN_U32("graphics/berries/enigma.4bpp.lz"); +const u32 gBerryPic_Occa[] = INCBIN_U32("graphics/berries/occa.4bpp.lz"); +const u32 gBerryPic_Passho[] = INCBIN_U32("graphics/berries/passho.4bpp.lz"); +const u32 gBerryPic_Wacan[] = INCBIN_U32("graphics/berries/wacan.4bpp.lz"); +const u32 gBerryPic_Rindo[] = INCBIN_U32("graphics/berries/rindo.4bpp.lz"); +const u32 gBerryPic_Yache[] = INCBIN_U32("graphics/berries/yache.4bpp.lz"); +const u32 gBerryPic_Chople[] = INCBIN_U32("graphics/berries/chople.4bpp.lz"); +const u32 gBerryPic_Kebia[] = INCBIN_U32("graphics/berries/kebia.4bpp.lz"); +const u32 gBerryPic_Shuca[] = INCBIN_U32("graphics/berries/shuca.4bpp.lz"); +const u32 gBerryPic_Coba[] = INCBIN_U32("graphics/berries/coba.4bpp.lz"); +const u32 gBerryPic_Payapa[] = INCBIN_U32("graphics/berries/payapa.4bpp.lz"); +const u32 gBerryPic_Tanga[] = INCBIN_U32("graphics/berries/tanga.4bpp.lz"); +const u32 gBerryPic_Charti[] = INCBIN_U32("graphics/berries/charti.4bpp.lz"); +const u32 gBerryPic_Kasib[] = INCBIN_U32("graphics/berries/kasib.4bpp.lz"); +const u32 gBerryPic_Haban[] = INCBIN_U32("graphics/berries/haban.4bpp.lz"); +const u32 gBerryPic_Colbur[] = INCBIN_U32("graphics/berries/colbur.4bpp.lz"); +const u32 gBerryPic_Babiri[] = INCBIN_U32("graphics/berries/babiri.4bpp.lz"); +const u32 gBerryPic_Chilan[] = INCBIN_U32("graphics/berries/chilan.4bpp.lz"); +const u32 gBerryPic_Roseli[] = INCBIN_U32("graphics/berries/roseli.4bpp.lz"); const u32 gBerryPalette_Cheri[] = INCBIN_U32("graphics/berries/cheri.gbapal.lz"); const u32 gBerryPalette_Oran[] = INCBIN_U32("graphics/berries/oran.gbapal.lz"); @@ -93,3 +111,21 @@ const u32 gBerryPalette_Apicot[] = INCBIN_U32("graphics/berries/apicot.gbapal.lz const u32 gBerryPalette_Lansat[] = INCBIN_U32("graphics/berries/lansat.gbapal.lz"); const u32 gBerryPalette_Starf[] = INCBIN_U32("graphics/berries/starf.gbapal.lz"); const u32 gBerryPalette_Enigma[] = INCBIN_U32("graphics/berries/enigma.gbapal.lz"); +const u32 gBerryPalette_Occa[] = INCBIN_U32("graphics/berries/occa.gbapal.lz"); +const u32 gBerryPalette_Passho[] = INCBIN_U32("graphics/berries/passho.gbapal.lz"); +const u32 gBerryPalette_Wacan[] = INCBIN_U32("graphics/berries/wacan.gbapal.lz"); +const u32 gBerryPalette_Rindo[] = INCBIN_U32("graphics/berries/rindo.gbapal.lz"); +const u32 gBerryPalette_Yache[] = INCBIN_U32("graphics/berries/yache.gbapal.lz"); +const u32 gBerryPalette_Chople[] = INCBIN_U32("graphics/berries/chople.gbapal.lz"); +const u32 gBerryPalette_Kebia[] = INCBIN_U32("graphics/berries/kebia.gbapal.lz"); +const u32 gBerryPalette_Shuca[] = INCBIN_U32("graphics/berries/shuca.gbapal.lz"); +const u32 gBerryPalette_Coba[] = INCBIN_U32("graphics/berries/coba.gbapal.lz"); +const u32 gBerryPalette_Payapa[] = INCBIN_U32("graphics/berries/payapa.gbapal.lz"); +const u32 gBerryPalette_Tanga[] = INCBIN_U32("graphics/berries/tanga.gbapal.lz"); +const u32 gBerryPalette_Charti[] = INCBIN_U32("graphics/berries/charti.gbapal.lz"); +const u32 gBerryPalette_Kasib[] = INCBIN_U32("graphics/berries/kasib.gbapal.lz"); +const u32 gBerryPalette_Haban[] = INCBIN_U32("graphics/berries/haban.gbapal.lz"); +const u32 gBerryPalette_Colbur[] = INCBIN_U32("graphics/berries/colbur.gbapal.lz"); +const u32 gBerryPalette_Babiri[] = INCBIN_U32("graphics/berries/babiri.gbapal.lz"); +const u32 gBerryPalette_Chilan[] = INCBIN_U32("graphics/berries/chilan.gbapal.lz"); +const u32 gBerryPalette_Roseli[] = INCBIN_U32("graphics/berries/roseli.gbapal.lz"); diff --git a/src/data/items.h b/src/data/items.h index 54036befa6..182be54e96 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2070,6 +2070,258 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_OCCA_BERRY] = + { + .name = _("Occa Berry"), + .itemId = ITEM_OCCA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_OccaBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PASSHO_BERRY] = + { + .name = _("Passho Berry"), + .itemId = ITEM_PASSHO_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_PasshoBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_WACAN_BERRY] = + { + .name = _("Wacan Berry"), + .itemId = ITEM_WACAN_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_WacanBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_RINDO_BERRY] = + { + .name = _("Rindo Berry"), + .itemId = ITEM_RINDO_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_RindoBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_YACHE_BERRY] = + { + .name = _("Yache Berry"), + .itemId = ITEM_YACHE_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_YacheBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CHOPLE_BERRY] = + { + .name = _("Chople Berry"), + .itemId = ITEM_CHOPLE_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_ChopleBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_KEBIA_BERRY] = + { + .name = _("Kebia Berry"), + .itemId = ITEM_KEBIA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_KebiaBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_SHUCA_BERRY] = + { + .name = _("Shuca Berry"), + .itemId = ITEM_SHUCA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_ShucaBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_COBA_BERRY] = + { + .name = _("Coba Berry"), + .itemId = ITEM_COBA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_CobaBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PAYAPA_BERRY] = + { + .name = _("Payapa Berry"), + .itemId = ITEM_PAYAPA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_PayapaBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_TANGA_BERRY] = + { + .name = _("Tanga Berry"), + .itemId = ITEM_TANGA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_TangaBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CHARTI_BERRY] = + { + .name = _("Charti Berry"), + .itemId = ITEM_CHARTI_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_ChartiBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_KASIB_BERRY] = + { + .name = _("Kasib Berry"), + .itemId = ITEM_KASIB_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_KasibBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_HABAN_BERRY] = + { + .name = _("Haban Berry"), + .itemId = ITEM_HABAN_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_HabanBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_COLBUR_BERRY] = + { + .name = _("Colbur Berry"), + .itemId = ITEM_COLBUR_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_ColburBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BABIRI_BERRY] = + { + .name = _("Babiri Berry"), + .itemId = ITEM_BABIRI_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_BabiriBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_CHILAN_BERRY] = + { + .name = _("Chilan Berry"), + .itemId = ITEM_CHILAN_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_ChilanBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_ROSELI_BERRY] = + { + .name = _("Roseli Berry"), + .itemId = ITEM_ROSELI_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = 0, + .description = gItemDescription_RoseliBerry, + .pocket = POCKET_BERRIES, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + // Hold items [ITEM_BRIGHT_POWDER] = @@ -2949,7 +3201,7 @@ const struct Item gItems[] = [ITEM_POKEBLOCK_CASE] = { - .name = _("{Pokeblock} Case"), + .name = _("{POKEBLOCK} CASE"), .itemId = ITEM_POKEBLOCK_CASE, .price = 0, .description = gPokeblockCaseItemDescription, diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 72e3bf6ae8..9cd2eb08cc 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -207,6 +207,97 @@ const u8 gApicotBerryItemDescription[] = _("A hold item that\nraises SP. DEF in\ const u8 gLansatBerryItemDescription[] = _("A hold item that\nups the critical-\nhit rate in a pinch."); const u8 gStarfBerryItemDescription[] = _("A hold item that\nsharply boosts a\nstat in a pinch."); const u8 gEnigmaBerryItemDescription[] = _("{POKEBLOCK} ingredient.\nPlant in loamy soil\nto grow a mystery."); + +static const u8 gItemDescription_OccaBerry[] = _( + "A hold item that\n" + "weakens a Fire\n" + "move if weak to it."); + +static const u8 gItemDescription_PasshoBerry[] = _( + "A hold item that\n" + "weakens a Water\n" + "move if weak to it."); + +static const u8 gItemDescription_WacanBerry[] = _( + "A hold item that\n" + "weakens a Electric\n" + "move if weak to it."); + +static const u8 gItemDescription_RindoBerry[] = _( + "A hold item that\n" + "weakens a Grass\n" + "move if weak to it."); + +static const u8 gItemDescription_YacheBerry[] = _( + "A hold item that\n" + "weakens a Ice\n" + "move if weak to it."); + +static const u8 gItemDescription_ChopleBerry[] = _( + "A hold item that\n" + "weakens a Fighting\n" + "move if weak to it."); + +static const u8 gItemDescription_KebiaBerry[] = _( + "A hold item that\n" + "weakens a Poison\n" + "move if weak to it."); + +static const u8 gItemDescription_ShucaBerry[] = _( + "A hold item that\n" + "weakens a Ground\n" + "move if weak to it."); + +static const u8 gItemDescription_CobaBerry[] = _( + "A hold item that\n" + "weakens a Flying\n" + "move if weak to it."); + +static const u8 gItemDescription_PayapaBerry[] = _( + "A hold item that\n" + "weakens a Psychic\n" + "move if weak to it."); + +static const u8 gItemDescription_TangaBerry[] = _( + "A hold item that\n" + "weakens a Bug\n" + "move if weak to it."); + +static const u8 gItemDescription_ChartiBerry[] = _( + "A hold item that\n" + "weakens a Rock\n" + "move if weak to it."); + +static const u8 gItemDescription_KasibBerry[] = _( + "A hold item that\n" + "weakens a Ghost\n" + "move if weak to it."); + +static const u8 gItemDescription_HabanBerry[] = _( + "A hold item that\n" + "weakens a Dragon\n" + "move if weak to it."); + +static const u8 gItemDescription_ColburBerry[] = _( + "A hold item that\n" + "weakens a Dark\n" + "move if weak to it."); + +static const u8 gItemDescription_BabiriBerry[] = _( + "A hold item that\n" + "weakens a Steel\n" + "move if weak to it."); + +static const u8 gItemDescription_ChilanBerry[] = _( + "A hold item that\n" + "weakens a Normal\n" + "move."); + +static const u8 gItemDescription_RoseliBerry[] = _( + "A hold item that\n" + "weakens a Fairy\n" + "move if weak to it."); + // Hold items const u8 gBrightPowderItemDescription[] = _("A hold item that\ncasts a glare to\nreduce accuracy."); const u8 gWhiteHerbItemDescription[] = _("A hold item that\nrestores any\nlowered stat."); diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 83ed3abfe4..6e2783aee0 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -312,49 +312,73 @@ static const struct SpriteTemplate gUnknown_0857FC7C = static const struct CompressedTilesPal gBerryPicTable[] = { - {gBerryPic_Cheri, gBerryPalette_Cheri}, - {gBerryPic_Chesto, gBerryPalette_Chesto}, - {gBerryPic_Pecha, gBerryPalette_Pecha}, - {gBerryPic_Rawst, gBerryPalette_Rawst}, - {gBerryPic_Aspear, gBerryPalette_Aspear}, - {gBerryPic_Leppa, gBerryPalette_Leppa}, - {gBerryPic_Oran, gBerryPalette_Oran}, - {gBerryPic_Persim, gBerryPalette_Persim}, - {gBerryPic_Lum, gBerryPalette_Lum}, - {gBerryPic_Sitrus, gBerryPalette_Sitrus}, - {gBerryPic_Figy, gBerryPalette_Figy}, - {gBerryPic_Wiki, gBerryPalette_Wiki}, - {gBerryPic_Mago, gBerryPalette_Mago}, - {gBerryPic_Aguav, gBerryPalette_Aguav}, - {gBerryPic_Iapapa, gBerryPalette_Iapapa}, - {gBerryPic_Razz, gBerryPalette_Razz}, - {gBerryPic_Bluk, gBerryPalette_Bluk}, - {gBerryPic_Nanab, gBerryPalette_Nanab}, - {gBerryPic_Wepear, gBerryPalette_Wepear}, - {gBerryPic_Pinap, gBerryPalette_Pinap}, - {gBerryPic_Pomeg, gBerryPalette_Pomeg}, - {gBerryPic_Kelpsy, gBerryPalette_Kelpsy}, - {gBerryPic_Qualot, gBerryPalette_Qualot}, - {gBerryPic_Hondew, gBerryPalette_Hondew}, - {gBerryPic_Grepa, gBerryPalette_Grepa}, - {gBerryPic_Tamato, gBerryPalette_Tamato}, - {gBerryPic_Cornn, gBerryPalette_Cornn}, - {gBerryPic_Magost, gBerryPalette_Magost}, - {gBerryPic_Rabuta, gBerryPalette_Rabuta}, - {gBerryPic_Nomel, gBerryPalette_Nomel}, - {gBerryPic_Spelon, gBerryPalette_Spelon}, - {gBerryPic_Pamtre, gBerryPalette_Pamtre}, - {gBerryPic_Watmel, gBerryPalette_Watmel}, - {gBerryPic_Durin, gBerryPalette_Durin}, - {gBerryPic_Belue, gBerryPalette_Belue}, - {gBerryPic_Liechi, gBerryPalette_Liechi}, - {gBerryPic_Ganlon, gBerryPalette_Ganlon}, - {gBerryPic_Salac, gBerryPalette_Salac}, - {gBerryPic_Petaya, gBerryPalette_Petaya}, - {gBerryPic_Apicot, gBerryPalette_Apicot}, - {gBerryPic_Lansat, gBerryPalette_Lansat}, - {gBerryPic_Starf, gBerryPalette_Starf}, - {gBerryPic_Enigma, gBerryPalette_Enigma}, + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Cheri, gBerryPalette_Cheri}, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Chesto, gBerryPalette_Chesto}, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Pecha, gBerryPalette_Pecha}, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Rawst, gBerryPalette_Rawst}, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Aspear, gBerryPalette_Aspear}, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Leppa, gBerryPalette_Leppa}, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Oran, gBerryPalette_Oran}, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Persim, gBerryPalette_Persim}, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Lum, gBerryPalette_Lum}, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Sitrus, gBerryPalette_Sitrus}, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Figy, gBerryPalette_Figy}, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Wiki, gBerryPalette_Wiki}, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Mago, gBerryPalette_Mago}, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Aguav, gBerryPalette_Aguav}, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Iapapa, gBerryPalette_Iapapa}, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Razz, gBerryPalette_Razz}, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Bluk, gBerryPalette_Bluk}, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Nanab, gBerryPalette_Nanab}, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Wepear, gBerryPalette_Wepear}, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Pinap, gBerryPalette_Pinap}, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Pomeg, gBerryPalette_Pomeg}, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Kelpsy, gBerryPalette_Kelpsy}, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Qualot, gBerryPalette_Qualot}, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Hondew, gBerryPalette_Hondew}, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Grepa, gBerryPalette_Grepa}, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Tamato, gBerryPalette_Tamato}, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Cornn, gBerryPalette_Cornn}, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Magost, gBerryPalette_Magost}, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Rabuta, gBerryPalette_Rabuta}, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Nomel, gBerryPalette_Nomel}, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Spelon, gBerryPalette_Spelon}, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Pamtre, gBerryPalette_Pamtre}, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Watmel, gBerryPalette_Watmel}, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Durin, gBerryPalette_Durin}, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Belue, gBerryPalette_Belue}, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Liechi, gBerryPalette_Liechi}, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Ganlon, gBerryPalette_Ganlon}, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Salac, gBerryPalette_Salac}, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Petaya, gBerryPalette_Petaya}, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Apicot, gBerryPalette_Apicot}, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Lansat, gBerryPalette_Lansat}, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Starf, gBerryPalette_Starf}, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Enigma, gBerryPalette_Enigma}, + [ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Occa, gBerryPalette_Occa}, + [ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Passho, gBerryPalette_Passho}, + [ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Wacan, gBerryPalette_Wacan}, + [ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Rindo, gBerryPalette_Rindo}, + [ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Yache, gBerryPalette_Yache}, + [ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Chople, gBerryPalette_Chople}, + [ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Kebia, gBerryPalette_Kebia}, + [ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Shuca, gBerryPalette_Shuca}, + [ITEM_COBA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Coba, gBerryPalette_Coba}, + [ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Payapa, gBerryPalette_Payapa}, + [ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Tanga, gBerryPalette_Tanga}, + [ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Charti, gBerryPalette_Charti}, + [ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Kasib, gBerryPalette_Kasib}, + [ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Haban, gBerryPalette_Haban}, + [ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Colbur, gBerryPalette_Colbur}, + [ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Babiri, gBerryPalette_Babiri}, + [ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Chilan, gBerryPalette_Chilan}, + [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = {gBerryPic_Roseli, gBerryPalette_Roseli}, + [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = {}, + [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = {}, + [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = {}, + [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = {}, + [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = {}, + [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = {}, }; const struct CompressedSpriteSheet gUnknown_0857FDEC =