ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp

Browse Source
This commit is contained in:
ultima-soul 2021-11-09 20:58:19 -08:00
commit c74e19c062
25 changed files with 270 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/berries/custap.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 527 B

BIN
graphics/berries/jaboca.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 512 B

BIN
graphics/berries/kee.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 589 B

BIN
graphics/berries/maranga.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 568 B

BIN
graphics/berries/micle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 383 B

BIN
graphics/berries/rowap.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 565 B

30
graphics/items/icon_palettes/blue_orb.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
180 180 180
49 49 49
106 115 230
156 156 222
74 82 197
57 65 148
205 205 255
255 255 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
255 126 0
48 48 48
136 160 248
104 128 248
72 104 240
240 240 248
168 184 248
128 208 248
48 72 192
248 248 248
224 248 248
232 248 248
40 40 168
184 248 248
80 152 248
0 0 0

26
graphics/items/icon_palettes/red_orb.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
180 180 180
49 49 49
230 115 106
222 156 156
197 82 74
148 65 57
255 205 205
255 255 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
255 126 0
48 48 48
248 248 248
248 88 112
248 128 128
248 40 56
248 216 216
216 32 56
176 32 56
248 136 72
248 224 96
144 24 64
248 200 96
0 0 0
0 0 0
0 0 0

BIN
graphics/items/icons/blue_orb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 299 B

BIN
graphics/items/icons/orb.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 264 B

BIN
graphics/items/icons/red_orb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 309 B

BIN
graphics/object_events/pics/berry_trees/custap.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 669 B

BIN
graphics/object_events/pics/berry_trees/jaboca.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 693 B

BIN
graphics/object_events/pics/berry_trees/micle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 627 B

BIN
graphics/object_events/pics/berry_trees/rowap.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 665 B

2
include/constants/hold_effects.h
View File

@ -130,7 +130,7 @@
// Gen6 hold effects
#define HOLD_EFFECT_FAIRY_POWER 139
#define HOLD_EFFECT_MEGA_STONE 140
#define HOLD_EFFECT_SAFETY_GOOGLES 141
#define HOLD_EFFECT_SAFETY_GOGGLES 141
#define HOLD_EFFECT_LUMINOUS_MOSS 142
#define HOLD_EFFECT_SNOWBALL 143
#define HOLD_EFFECT_WEAKNESS_POLICY 144

15
include/graphics.h
View File

@ -3958,8 +3958,9 @@ extern const u32 gItemIconPalette_FairyMemory[];
//extern const u32 gItemIcon_RustedShield[];
//extern const u32 gItemIconPalette_RustedShield[];
// Colored Orbs
extern const u32 gItemIcon_Orb[];
extern const u32 gItemIcon_RedOrb[];
extern const u32 gItemIconPalette_RedOrb[];
extern const u32 gItemIcon_BlueOrb[];
extern const u32 gItemIconPalette_BlueOrb[];
//extern const u32 gItemIcon_JadeOrb[];
//extern const u32 gItemIconPalette_JadeOrb[];
@ -4848,6 +4849,12 @@ extern const u32 gBerryPic_Colbur[];
extern const u32 gBerryPic_Babiri[];
extern const u32 gBerryPic_Chilan[];
extern const u32 gBerryPic_Roseli[];
extern const u32 gBerryPic_Micle[];
extern const u32 gBerryPic_Custap[];
extern const u32 gBerryPic_Jaboca[];
extern const u32 gBerryPic_Rowap[];
extern const u32 gBerryPic_Kee[];
extern const u32 gBerryPic_Maranga[];
extern const u32 gBerryPalette_Occa[];
extern const u32 gBerryPalette_Passho[];
extern const u32 gBerryPalette_Wacan[];
@ -4866,6 +4873,12 @@ extern const u32 gBerryPalette_Colbur[];
extern const u32 gBerryPalette_Babiri[];
extern const u32 gBerryPalette_Chilan[];
extern const u32 gBerryPalette_Roseli[];
extern const u32 gBerryPalette_Micle[];
extern const u32 gBerryPalette_Custap[];
extern const u32 gBerryPalette_Jaboca[];
extern const u32 gBerryPalette_Rowap[];
extern const u32 gBerryPalette_Kee[];
extern const u32 gBerryPalette_Maranga[];
//pokenav
extern const u16 gPokenavCondition_Pal[];

120
src/berry.c
View File

@ -148,6 +148,18 @@ static const u8 sBerryDescriptionPart1_Chilan[] = _("It can be made into a whist
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.");
static const u8 sBerryDescriptionPart1_Micle[] = _("It makes other food eaten at the");
static const u8 sBerryDescriptionPart2_Micle[] = _("same time taste sweet.");
static const u8 sBerryDescriptionPart1_Custap[] = _("The flesh underneath the Custap");
static const u8 sBerryDescriptionPart2_Custap[] = _("Berry's skin is sweet and creamy soft.");
static const u8 sBerryDescriptionPart1_Jaboca[] = _("The drupelets that make up this berry");
static const u8 sBerryDescriptionPart2_Jaboca[] = _("pop rythmically if handled roughly.");
static const u8 sBerryDescriptionPart1_Rowap[] = _("People once worked top-shaped pieces");
static const u8 sBerryDescriptionPart2_Rowap[] = _("of this berry free to use as toys.");
static const u8 sBerryDescriptionPart1_Kee[] = _("A berry that is incredibly spicy at");
static const u8 sBerryDescriptionPart2_Kee[] = _("first, then extremely bitter.");
static const u8 sBerryDescriptionPart1_Maranga[] = _("Its outside is very bitter, but its");
static const u8 sBerryDescriptionPart2_Maranga[] = _("inside tastes like a sweet drink.");
const struct Berry gBerries[] =
{
@ -1248,6 +1260,114 @@ const struct Berry gBerries[] =
.sour = 40,
.smoothness = 70,
},
[ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("MICLE"),
.firmness = BERRY_FIRMNESS_SOFT,
.size = 35,
.maxYield = 5,
.minYield = 1,
.description1 = sBerryDescriptionPart1_Micle,
.description2 = sBerryDescriptionPart2_Micle,
.stageDuration = 24,
.spicy = 0,
.dry = 40,
.sweet = 10,
.bitter = 0,
.sour = 0,
.smoothness = 35,
},
[ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("CUSTAP"),
.firmness = BERRY_FIRMNESS_SUPER_HARD,
.size = 35,
.maxYield = 5,
.minYield = 1,
.description1 = sBerryDescriptionPart1_Custap,
.description2 = sBerryDescriptionPart2_Custap,
.stageDuration = 24,
.spicy = 0,
.dry = 0,
.sweet = 40,
.bitter = 10,
.sour = 0,
.smoothness = 35,
},
[ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("JABOCA"),
.firmness = BERRY_FIRMNESS_SOFT,
.size = 35,
.maxYield = 5,
.minYield = 1,
.description1 = sBerryDescriptionPart1_Jaboca,
.description2 = sBerryDescriptionPart2_Jaboca,
.stageDuration = 24,
.spicy = 0,
.dry = 0,
.sweet = 0,
.bitter = 40,
.sour = 10,
.smoothness = 35,
},
[ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("ROWAP"),
.firmness = BERRY_FIRMNESS_VERY_SOFT,
.size = 35,
.maxYield = 5,
.minYield = 1,
.description1 = sBerryDescriptionPart1_Rowap,
.description2 = sBerryDescriptionPart2_Rowap,
.stageDuration = 24,
.spicy = 10,
.dry = 0,
.sweet = 0,
.bitter = 0,
.sour = 40,
.smoothness = 35,
},
[ITEM_KEE_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("KEE"),
.firmness = BERRY_FIRMNESS_HARD,
.size = 35,
.maxYield = 8,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Kee,
.description2 = sBerryDescriptionPart2_Kee,
.stageDuration = 18,
.spicy = 40,
.dry = 40,
.sweet = 10,
.bitter = 10,
.sour = 10,
.smoothness = 35,
},
[ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("MARNGA"), // "Maranga" is too long
.firmness = BERRY_FIRMNESS_SOFT,
.size = 35,
.maxYield = 8,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Maranga,
.description2 = sBerryDescriptionPart2_Maranga,
.stageDuration = 18,
.spicy = 10,
.dry = 10,
.sweet = 40,
.bitter = 40,
.sour = 10,
.smoothness = 35,
},
};
const struct BerryCrushBerryData gBerryCrush_BerryData[] = {

12
src/data/graphics/berries.h
View File

@ -67,6 +67,12 @@ 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 gBerryPic_Micle[] = INCBIN_U32("graphics/berries/micle.4bpp.lz");
const u32 gBerryPic_Custap[] = INCBIN_U32("graphics/berries/custap.4bpp.lz");
const u32 gBerryPic_Jaboca[] = INCBIN_U32("graphics/berries/jaboca.4bpp.lz");
const u32 gBerryPic_Rowap[] = INCBIN_U32("graphics/berries/rowap.4bpp.lz");
const u32 gBerryPic_Kee[] = INCBIN_U32("graphics/berries/kee.4bpp.lz");
const u32 gBerryPic_Maranga[] = INCBIN_U32("graphics/berries/maranga.4bpp.lz");
const u32 gBerryPalette_Cheri[] = INCBIN_U32("graphics/berries/cheri.gbapal.lz");
const u32 gBerryPalette_Oran[] = INCBIN_U32("graphics/berries/oran.gbapal.lz");
@ -129,3 +135,9 @@ 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");
const u32 gBerryPalette_Micle[] = INCBIN_U32("graphics/berries/micle.gbapal.lz");
const u32 gBerryPalette_Custap[] = INCBIN_U32("graphics/berries/custap.gbapal.lz");
const u32 gBerryPalette_Jaboca[] = INCBIN_U32("graphics/berries/jaboca.gbapal.lz");
const u32 gBerryPalette_Rowap[] = INCBIN_U32("graphics/berries/rowap.gbapal.lz");
const u32 gBerryPalette_Kee[] = INCBIN_U32("graphics/berries/kee.gbapal.lz");
const u32 gBerryPalette_Maranga[] = INCBIN_U32("graphics/berries/maranga.gbapal.lz");

3
src/data/graphics/items.h
View File

@ -884,9 +884,10 @@ const u32 gItemIconPalette_FairyMemory[] = INCBIN_U32("graphics/items/icon_palet
// Colored Orbs
const u32 gItemIcon_Orb[] = INCBIN_U32("graphics/items/icons/orb.4bpp.lz");
const u32 gItemIcon_RedOrb[] = INCBIN_U32("graphics/items/icons/red_orb.4bpp.lz");
const u32 gItemIconPalette_RedOrb[] = INCBIN_U32("graphics/items/icon_palettes/red_orb.gbapal.lz");
const u32 gItemIcon_BlueOrb[] = INCBIN_U32("graphics/items/icons/blue_orb.4bpp.lz");
const u32 gItemIconPalette_BlueOrb[] = INCBIN_U32("graphics/items/icon_palettes/blue_orb.gbapal.lz");
//const u32 gItemIcon_JadeOrb[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz");

4
src/data/item_icon_table.h
View File

@ -314,8 +314,8 @@ const u32 *const gItemIconTable[][2] =
[ITEM_RUSTED_SWORD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo
[ITEM_RUSTED_SHIELD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo
// Colored Orbs
[ITEM_RED_ORB] = {gItemIcon_Orb, gItemIconPalette_RedOrb},
[ITEM_BLUE_ORB] = {gItemIcon_Orb, gItemIconPalette_BlueOrb},
[ITEM_RED_ORB] = {gItemIcon_RedOrb, gItemIconPalette_RedOrb},
[ITEM_BLUE_ORB] = {gItemIcon_BlueOrb, gItemIconPalette_BlueOrb},
[ITEM_JADE_ORB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo
// Mega Stones
[ITEM_VENUSAURITE] = {gItemIcon_Venusaurite, gItemIconPalette_Venusaurite},

18
src/data/items.h
View File

@ -3593,9 +3593,9 @@ const struct Item gItems[] =
.name = _("Red Orb"),
.itemId = ITEM_RED_ORB,
.price = 0,
.holdEffect = HOLD_EFFECT_PRIMAL_ORB,
.description = sRedOrbDesc,
.importance = 2,
.pocket = POCKET_KEY_ITEMS,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
@ -3605,9 +3605,9 @@ const struct Item gItems[] =
.name = _("Blue Orb"),
.itemId = ITEM_BLUE_ORB,
.price = 0,
.holdEffect = HOLD_EFFECT_PRIMAL_ORB,
.description = sBlueOrbDesc,
.importance = 2,
.pocket = POCKET_KEY_ITEMS,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
@ -5004,6 +5004,11 @@ const struct Item gItems[] =
.itemId = ITEM_SOUL_DEW,
.price = 0,
.holdEffect = HOLD_EFFECT_SOUL_DEW,
#if defined(BATTLE_ENGINE) && B_SOUL_DEW_BOOST >= GEN_7
.holdEffectParam = 20,
#else
.holdEffectParam = 50,
#endif
.description = sSoulDewDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -5016,6 +5021,7 @@ const struct Item gItems[] =
.itemId = ITEM_ADAMANT_ORB,
.price = 0,
.holdEffect = HOLD_EFFECT_ADAMANT_ORB,
.holdEffectParam = 20,
.description = sAdamantOrbDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -5028,6 +5034,7 @@ const struct Item gItems[] =
.itemId = ITEM_LUSTROUS_ORB,
.price = 0,
.holdEffect = HOLD_EFFECT_LUSTROUS_ORB,
.holdEffectParam = 20,
.description = sLustrousOrbDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -5040,6 +5047,7 @@ const struct Item gItems[] =
.itemId = ITEM_GRISEOUS_ORB,
.price = 0,
.holdEffect = HOLD_EFFECT_GRISEOUS_ORB,
.holdEffectParam = 20,
.description = sGriseousOrbDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -6334,7 +6342,7 @@ const struct Item gItems[] =
.name = _("SafetyGoggles"),
.itemId = ITEM_SAFETY_GOGGLES,
.price = 4000,
.holdEffect = HOLD_EFFECT_SAFETY_GOOGLES,
.holdEffect = HOLD_EFFECT_SAFETY_GOGGLES,
.description = sSafetyGogglesDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,

80
src/data/object_events/berry_tree_graphics_tables.h
View File

@ -572,6 +572,62 @@ static const struct SpriteFrameImage sPicTable_RoseliBerryTree[] = {
const u8 gBerryTreePaletteSlotTable_Roseli[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage sPicTable_MicleBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_MicleBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Micle[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage sPicTable_CustapBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_CustapBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Custap[] = {3, 4, 5, 5, 5};
const struct SpriteFrameImage sPicTable_JabocaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_JabocaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Jaboca[] = {3, 4, 5, 5, 5};
const struct SpriteFrameImage sPicTable_RowapBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_RowapBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Rowap[] = {3, 4, 5, 5, 5};
const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES};
const u8 gBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES};
@ -638,12 +694,12 @@ const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
[ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = sPicTable_LiechiBerryTree,
[ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = sPicTable_GrepaBerryTree,
[ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = sPicTable_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,
[ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = sPicTable_MicleBerryTree,
[ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = sPicTable_CustapBerryTree,
[ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = sPicTable_JabocaBerryTree,
[ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = sPicTable_RowapBerryTree,
[ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = sPicTable_PechaBerryTree,
[ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = sPicTable_OccaBerryTree,
};
const u8 *const gBerryTreePaletteSlotTablePointers[] = {
@ -708,12 +764,12 @@ const u8 *const gBerryTreePaletteSlotTablePointers[] = {
[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,
[ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Micle,
[ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Custap,
[ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Custap,
[ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rowap,
[ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha,
[ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Occa,
};
const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = {

4
src/data/object_events/object_event_graphics.h
View File

@ -296,6 +296,10 @@ const u32 gObjectEventPic_KasibBerryTree[] = INCBIN_U32("graphics/object_events/
const u32 gObjectEventPic_HabanBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/haban.4bpp");
const u32 gObjectEventPic_ColburBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/colbur.4bpp");
const u32 gObjectEventPic_RoseliBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/roseli.4bpp");
const u32 gObjectEventPic_MicleBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/micle.4bpp");
const u32 gObjectEventPic_CustapBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/custap.4bpp");
const u32 gObjectEventPic_JabocaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/jaboca.4bpp");
const u32 gObjectEventPic_RowapBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rowap.4bpp");
const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/field_effects/pics/surf_blob.4bpp");
const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/object_events/pics/people/quinty_plump.4bpp");
const u16 gObjectEventPal_QuintyPlump[] = INCBIN_U16("graphics/object_events/palettes/quinty_plump.gbapal");

12
src/item_menu_icons.c
View File

@ -382,12 +382,12 @@ static const struct CompressedTilesPal sBerryPicTable[] =
[ITEM_TO_BERRY(ITEM_BABIRI_BERRY) - 1] = {gBerryPic_Babiri, gBerryPalette_Babiri},
[ITEM_TO_BERRY(ITEM_CHILAN_BERRY) - 1] = {gBerryPic_Chilan, gBerryPalette_Chilan},
[ITEM_TO_BERRY(ITEM_ROSELI_BERRY) - 1] = {gBerryPic_Roseli, gBerryPalette_Roseli},
[ITEM_TO_BERRY(ITEM_MICLE_BERRY) - 1] = {},
[ITEM_TO_BERRY(ITEM_CUSTAP_BERRY) - 1] = {},
[ITEM_TO_BERRY(ITEM_JABOCA_BERRY) - 1] = {},
[ITEM_TO_BERRY(ITEM_ROWAP_BERRY) - 1] = {},
[ITEM_TO_BERRY(ITEM_KEE_BERRY) - 1] = {},
[ITEM_TO_BERRY(ITEM_MARANGA_BERRY)- 1] = {},
[ITEM_TO_BERRY(ITEM_MICLE_BERRY) - 1] = {gBerryPic_Micle, gBerryPalette_Micle},
[ITEM_TO_BERRY(ITEM_CUSTAP_BERRY) - 1] = {gBerryPic_Custap, gBerryPalette_Custap},
[ITEM_TO_BERRY(ITEM_JABOCA_BERRY) - 1] = {gBerryPic_Jaboca, gBerryPalette_Jaboca},
[ITEM_TO_BERRY(ITEM_ROWAP_BERRY) - 1] = {gBerryPic_Rowap, gBerryPalette_Rowap},
[ITEM_TO_BERRY(ITEM_KEE_BERRY) - 1] = {gBerryPic_Kee, gBerryPalette_Kee},
[ITEM_TO_BERRY(ITEM_MARANGA_BERRY)- 1] = {gBerryPic_Maranga, gBerryPalette_Maranga},
};
const struct CompressedSpriteSheet gBerryCheckCircleSpriteSheet =