ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-23 20:55:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1997 from ultima-soul/ie/enigma_berry_2

Browse Source 
Add Back Enigma Berry e-Reader Constant With Less Conflicts and Update Berry Data
This commit is contained in:
Eduardo Quezada D'Ottone 2021-12-16 21:07:21 -03:00 committed by GitHub
commit 8422ad6ccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 1117 additions and 1100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/maps/PetalburgCity_Gym/scripts.inc
View File

@ -351,9 +351,9 @@ PetalburgCity_Gym_EventScript_NormanRematch::
PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry::
specialvar VAR_RESULT, IsEnigmaBerryValid
goto_if_eq VAR_RESULT, FALSE, PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry
checkitem ITEM_ENIGMA_BERRY
checkitem ITEM_ENIGMA_BERRY_E_READER
goto_if_eq VAR_RESULT, TRUE, PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry
checkpcitem ITEM_ENIGMA_BERRY
checkpcitem ITEM_ENIGMA_BERRY_E_READER
goto_if_eq VAR_RESULT, TRUE, PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry
goto_if_eq VAR_ENIGMA_BERRY_AVAILABLE, 0, PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry
msgbox PetalburgCity_Gym_Text_GiveEnigmaBerry, MSGBOX_DEFAULT
@ -365,7 +365,7 @@ PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry::
return
PetalburgCity_Gym_EventScript_GiveEnigmaBerry::
giveitem ITEM_ENIGMA_BERRY
giveitem ITEM_ENIGMA_BERRY_E_READER
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
release

6
include/constants/items.h
View File

@ -668,17 +668,17 @@
#define ITEM_APICOT_BERRY 572
#define ITEM_LANSAT_BERRY 573
#define ITEM_STARF_BERRY 574
#define ITEM_ENIGMA_BERRY_NEW 575
#define ITEM_ENIGMA_BERRY 575
#define ITEM_MICLE_BERRY 576
#define ITEM_CUSTAP_BERRY 577
#define ITEM_JABOCA_BERRY 578
#define ITEM_ROWAP_BERRY 579
#define ITEM_KEE_BERRY 580
#define ITEM_MARANGA_BERRY 581
#define ITEM_ENIGMA_BERRY 582
#define ITEM_ENIGMA_BERRY_E_READER 582
#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY
#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY_E_READER
// TMs/HMs
#define ITEM_TM01 583

106
include/graphics.h
View File

@ -4778,91 +4778,41 @@ extern const u32 gPartyMenuBg_Pal[];
// berry pics
extern const u32 gBerryPic_Cheri[];
extern const u32 gBerryPalette_Cheri[];
extern const u32 gBerryPic_Chesto[];
extern const u32 gBerryPalette_Chesto[];
extern const u32 gBerryPic_Pecha[];
extern const u32 gBerryPalette_Pecha[];
extern const u32 gBerryPic_Rawst[];
extern const u32 gBerryPalette_Rawst[];
extern const u32 gBerryPic_Aspear[];
extern const u32 gBerryPalette_Aspear[];
extern const u32 gBerryPic_Leppa[];
extern const u32 gBerryPalette_Leppa[];
extern const u32 gBerryPic_Oran[];
extern const u32 gBerryPalette_Oran[];
extern const u32 gBerryPic_Persim[];
extern const u32 gBerryPalette_Persim[];
extern const u32 gBerryPic_Lum[];
extern const u32 gBerryPalette_Lum[];
extern const u32 gBerryPic_Sitrus[];
extern const u32 gBerryPalette_Sitrus[];
extern const u32 gBerryPic_Figy[];
extern const u32 gBerryPalette_Figy[];
extern const u32 gBerryPic_Wiki[];
extern const u32 gBerryPalette_Wiki[];
extern const u32 gBerryPic_Mago[];
extern const u32 gBerryPalette_Mago[];
extern const u32 gBerryPic_Aguav[];
extern const u32 gBerryPalette_Aguav[];
extern const u32 gBerryPic_Iapapa[];
extern const u32 gBerryPalette_Iapapa[];
extern const u32 gBerryPic_Razz[];
extern const u32 gBerryPalette_Razz[];
extern const u32 gBerryPic_Bluk[];
extern const u32 gBerryPalette_Bluk[];
extern const u32 gBerryPic_Nanab[];
extern const u32 gBerryPalette_Nanab[];
extern const u32 gBerryPic_Wepear[];
extern const u32 gBerryPalette_Wepear[];
extern const u32 gBerryPic_Pinap[];
extern const u32 gBerryPalette_Pinap[];
extern const u32 gBerryPic_Pomeg[];
extern const u32 gBerryPalette_Pomeg[];
extern const u32 gBerryPic_Kelpsy[];
extern const u32 gBerryPalette_Kelpsy[];
extern const u32 gBerryPic_Qualot[];
extern const u32 gBerryPalette_Qualot[];
extern const u32 gBerryPic_Hondew[];
extern const u32 gBerryPalette_Hondew[];
extern const u32 gBerryPic_Grepa[];
extern const u32 gBerryPalette_Grepa[];
extern const u32 gBerryPic_Tamato[];
extern const u32 gBerryPalette_Tamato[];
extern const u32 gBerryPic_Cornn[];
extern const u32 gBerryPalette_Cornn[];
extern const u32 gBerryPic_Magost[];
extern const u32 gBerryPalette_Magost[];
extern const u32 gBerryPic_Rabuta[];
extern const u32 gBerryPalette_Rabuta[];
extern const u32 gBerryPic_Nomel[];
extern const u32 gBerryPalette_Nomel[];
extern const u32 gBerryPic_Spelon[];
extern const u32 gBerryPalette_Spelon[];
extern const u32 gBerryPic_Pamtre[];
extern const u32 gBerryPalette_Pamtre[];
extern const u32 gBerryPic_Watmel[];
extern const u32 gBerryPalette_Watmel[];
extern const u32 gBerryPic_Durin[];
extern const u32 gBerryPalette_Durin[];
extern const u32 gBerryPic_Belue[];
extern const u32 gBerryPalette_Belue[];
extern const u32 gBerryPic_Liechi[];
extern const u32 gBerryPalette_Liechi[];
extern const u32 gBerryPic_Ganlon[];
extern const u32 gBerryPalette_Ganlon[];
extern const u32 gBerryPic_Salac[];
extern const u32 gBerryPalette_Salac[];
extern const u32 gBerryPic_Petaya[];
extern const u32 gBerryPalette_Petaya[];
extern const u32 gBerryPic_Apicot[];
extern const u32 gBerryPalette_Apicot[];
extern const u32 gBerryPic_Lansat[];
extern const u32 gBerryPalette_Lansat[];
extern const u32 gBerryPic_Starf[];
extern const u32 gBerryPalette_Starf[];
extern const u32 gBerryPic_Enigma[];
extern const u32 gBerryPalette_Enigma[];
extern const u32 gBerryPic_Chilan[];
extern const u32 gBerryPic_Occa[];
extern const u32 gBerryPic_Passho[];
extern const u32 gBerryPic_Wacan[];
@ -4879,14 +4829,57 @@ 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 gBerryPic_Liechi[];
extern const u32 gBerryPic_Ganlon[];
extern const u32 gBerryPic_Salac[];
extern const u32 gBerryPic_Petaya[];
extern const u32 gBerryPic_Apicot[];
extern const u32 gBerryPic_Lansat[];
extern const u32 gBerryPic_Starf[];
extern const u32 gBerryPic_Enigma[];
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_Cheri[];
extern const u32 gBerryPalette_Chesto[];
extern const u32 gBerryPalette_Pecha[];
extern const u32 gBerryPalette_Rawst[];
extern const u32 gBerryPalette_Aspear[];
extern const u32 gBerryPalette_Leppa[];
extern const u32 gBerryPalette_Oran[];
extern const u32 gBerryPalette_Persim[];
extern const u32 gBerryPalette_Lum[];
extern const u32 gBerryPalette_Sitrus[];
extern const u32 gBerryPalette_Figy[];
extern const u32 gBerryPalette_Wiki[];
extern const u32 gBerryPalette_Mago[];
extern const u32 gBerryPalette_Aguav[];
extern const u32 gBerryPalette_Iapapa[];
extern const u32 gBerryPalette_Razz[];
extern const u32 gBerryPalette_Bluk[];
extern const u32 gBerryPalette_Nanab[];
extern const u32 gBerryPalette_Wepear[];
extern const u32 gBerryPalette_Pinap[];
extern const u32 gBerryPalette_Pomeg[];
extern const u32 gBerryPalette_Kelpsy[];
extern const u32 gBerryPalette_Qualot[];
extern const u32 gBerryPalette_Hondew[];
extern const u32 gBerryPalette_Grepa[];
extern const u32 gBerryPalette_Tamato[];
extern const u32 gBerryPalette_Cornn[];
extern const u32 gBerryPalette_Magost[];
extern const u32 gBerryPalette_Rabuta[];
extern const u32 gBerryPalette_Nomel[];
extern const u32 gBerryPalette_Spelon[];
extern const u32 gBerryPalette_Pamtre[];
extern const u32 gBerryPalette_Watmel[];
extern const u32 gBerryPalette_Durin[];
extern const u32 gBerryPalette_Belue[];
extern const u32 gBerryPalette_Chilan[];
extern const u32 gBerryPalette_Occa[];
extern const u32 gBerryPalette_Passho[];
extern const u32 gBerryPalette_Wacan[];
@ -4903,8 +4896,15 @@ 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[];
extern const u32 gBerryPalette_Liechi[];
extern const u32 gBerryPalette_Ganlon[];
extern const u32 gBerryPalette_Salac[];
extern const u32 gBerryPalette_Petaya[];
extern const u32 gBerryPalette_Apicot[];
extern const u32 gBerryPalette_Lansat[];
extern const u32 gBerryPalette_Starf[];
extern const u32 gBerryPalette_Enigma[];
extern const u32 gBerryPalette_Micle[];
extern const u32 gBerryPalette_Custap[];
extern const u32 gBerryPalette_Jaboca[];

2
src/battle_ai_switch_items.c
View File

@ -835,7 +835,7 @@ static bool8 ShouldUseItem(void)
if (gItemEffectTable[item - ITEM_POTION] == NULL)
continue;
if (item == ITEM_ENIGMA_BERRY)
if (item == ITEM_ENIGMA_BERRY_E_READER)
itemEffects = gSaveBlock1Ptr->enigmaBerry.itemEffect;
else
itemEffects = gItemEffectTable[item - ITEM_POTION];

10
src/battle_main.c
View File

@ -756,7 +756,7 @@ static void SetPlayerBerryDataInBattleStruct(void)
}
else
{
const struct Berry *berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY));
const struct Berry *berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY_E_READER));
for (i = 0; i < BERRY_NAME_LENGTH; i++)
battleBerry->name[i] = berryData->name[i];
@ -800,7 +800,7 @@ static void SetAllPlayersBerryData(void)
}
else
{
const struct Berry *berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY));
const struct Berry *berryData = GetBerryInfo(ItemIdToBerryType(ITEM_ENIGMA_BERRY_E_READER));
for (i = 0; i < BERRY_NAME_LENGTH; i++)
{
@ -3992,7 +3992,7 @@ u8 IsRunningFromBattleImpossible(void)
u8 side;
s32 i;
if (gBattleMons[gActiveBattler].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[gActiveBattler].item == ITEM_ENIGMA_BERRY_E_READER)
holdEffect = gEnigmaBerries[gActiveBattler].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
@ -4597,7 +4597,7 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
* (gStatStageRatios[gBattleMons[battler1].statStages[STAT_SPEED]][0])
/ (gStatStageRatios[gBattleMons[battler1].statStages[STAT_SPEED]][1]);
if (gBattleMons[battler1].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[battler1].item == ITEM_ENIGMA_BERRY_E_READER)
{
holdEffect = gEnigmaBerries[battler1].holdEffect;
holdEffectParam = gEnigmaBerries[battler1].holdEffectParam;
@ -4631,7 +4631,7 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
* (gStatStageRatios[gBattleMons[battler2].statStages[STAT_SPEED]][0])
/ (gStatStageRatios[gBattleMons[battler2].statStages[STAT_SPEED]][1]);
if (gBattleMons[battler2].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[battler2].item == ITEM_ENIGMA_BERRY_E_READER)
{
holdEffect = gEnigmaBerries[battler2].holdEffect;
holdEffectParam = gEnigmaBerries[battler2].holdEffectParam;

4
src/battle_message.c
View File

@ -2554,7 +2554,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
case B_TXT_LAST_ITEM: // last used item
if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK))
{
if (gLastUsedItem == ITEM_ENIGMA_BERRY)
if (gLastUsedItem == ITEM_ENIGMA_BERRY_E_READER)
{
if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
{
@ -2935,7 +2935,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst)
hword = T1_READ_16(&src[srcID + 1]);
if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK))
{
if (hword == ITEM_ENIGMA_BERRY)
if (hword == ITEM_ENIGMA_BERRY_E_READER)
{
if (gLinkPlayers[gBattleScripting.multiplayerId].id == gPotentialItemEffectBattler)
{

24
src/battle_script_commands.c
View File

@ -1146,7 +1146,7 @@ static void Cmd_accuracycheck(void)
if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && IS_TYPE_PHYSICAL(type))
calc = (calc * 80) / 100; // 1.2 hustle loss
if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY_E_READER)
{
holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
param = gEnigmaBerries[gBattlerTarget].holdEffectParam;
@ -1246,7 +1246,7 @@ static void Cmd_critcalc(void)
item = gBattleMons[gBattlerAttacker].item;
if (item == ITEM_ENIGMA_BERRY)
if (item == ITEM_ENIGMA_BERRY_E_READER)
holdEffect = gEnigmaBerries[gBattlerAttacker].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(item);
@ -1649,7 +1649,7 @@ static void Cmd_adjustnormaldamage(void)
ApplyRandomDmgMultiplier();
if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY_E_READER)
{
holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
param = gEnigmaBerries[gBattlerTarget].holdEffectParam;
@ -1691,7 +1691,7 @@ static void Cmd_adjustnormaldamage2(void) // The same as adjustnormaldamage exce
ApplyRandomDmgMultiplier();
if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY_E_READER)
{
holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
param = gEnigmaBerries[gBattlerTarget].holdEffectParam;
@ -2735,7 +2735,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
RecordAbilityBattle(gBattlerTarget, gLastUsedAbility);
}
else if (gBattleMons[gBattlerAttacker].item != 0
|| gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY
|| gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY_E_READER
|| IS_ITEM_MAIL(gBattleMons[gBattlerTarget].item)
|| gBattleMons[gBattlerTarget].item == 0)
{
@ -3254,7 +3254,7 @@ static void Cmd_getexp(void)
item = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
if (item == ITEM_ENIGMA_BERRY)
if (item == ITEM_ENIGMA_BERRY_E_READER)
holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
else
holdEffect = ItemId_GetHoldEffect(item);
@ -3293,7 +3293,7 @@ static void Cmd_getexp(void)
{
item = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HELD_ITEM);
if (item == ITEM_ENIGMA_BERRY)
if (item == ITEM_ENIGMA_BERRY_E_READER)
holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
else
holdEffect = ItemId_GetHoldEffect(item);
@ -4183,7 +4183,7 @@ static void Cmd_moveend(void)
endMode = gBattlescriptCurrInstr[1];
endState = gBattlescriptCurrInstr[2];
if (gBattleMons[gBattlerAttacker].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[gBattlerAttacker].item == ITEM_ENIGMA_BERRY_E_READER)
holdEffectAtk = gEnigmaBerries[gBattlerAttacker].holdEffect;
else
holdEffectAtk = ItemId_GetHoldEffect(gBattleMons[gBattlerAttacker].item);
@ -5811,7 +5811,7 @@ static void Cmd_adjustsetdamage(void) // The same as adjustnormaldamage, except
{
u8 holdEffect, param;
if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY_E_READER)
{
holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
param = gEnigmaBerries[gBattlerTarget].holdEffectParam;
@ -7394,7 +7394,7 @@ static void Cmd_tryKO(void)
{
u8 holdEffect, param;
if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY_E_READER)
{
holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
param = gEnigmaBerries[gBattlerTarget].holdEffectParam;
@ -9084,8 +9084,8 @@ static void Cmd_tryswapitems(void) // trick
// can't swap if two pokemon don't have an item
// or if either of them is an enigma berry or a mail
else if ((gBattleMons[gBattlerAttacker].item == 0 && gBattleMons[gBattlerTarget].item == 0)
|| gBattleMons[gBattlerAttacker].item == ITEM_ENIGMA_BERRY
|| gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY
|| gBattleMons[gBattlerAttacker].item == ITEM_ENIGMA_BERRY_E_READER
|| gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY_E_READER
|| IS_ITEM_MAIL(gBattleMons[gBattlerAttacker].item)
|| IS_ITEM_MAIL(gBattleMons[gBattlerTarget].item))
{

14
src/battle_util.c
View File

@ -406,7 +406,7 @@ bool8 TryRunFromBattle(u8 battler)
u8 pyramidMultiplier;
u8 speedVar;
if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY_E_READER)
holdEffect = gEnigmaBerries[battler].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(gBattleMons[battler].item);
@ -1021,7 +1021,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
}
}
if (gBattleMons[gActiveBattler].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[gActiveBattler].item == ITEM_ENIGMA_BERRY_E_READER)
holdEffect = gEnigmaBerries[gActiveBattler].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item);
@ -1065,7 +1065,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
u16 *choicedMove = &gBattleStruct->choicedMove[battlerId];
s32 i;
if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY_E_READER)
holdEffect = gEnigmaBerries[battlerId].holdEffect;
else
holdEffect = ItemId_GetHoldEffect(gBattleMons[battlerId].item);
@ -3243,7 +3243,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
u16 atkItem, defItem;
gLastUsedItem = gBattleMons[battlerId].item;
if (gLastUsedItem == ITEM_ENIGMA_BERRY)
if (gLastUsedItem == ITEM_ENIGMA_BERRY_E_READER)
{
battlerHoldEffect = gEnigmaBerries[battlerId].holdEffect;
battlerHoldEffectParam = gEnigmaBerries[battlerId].holdEffectParam;
@ -3255,7 +3255,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
}
atkItem = gBattleMons[gBattlerAttacker].item;
if (atkItem == ITEM_ENIGMA_BERRY)
if (atkItem == ITEM_ENIGMA_BERRY_E_READER)
{
atkHoldEffect = gEnigmaBerries[gBattlerAttacker].holdEffect;
atkHoldEffectParam = gEnigmaBerries[gBattlerAttacker].holdEffectParam;
@ -3268,7 +3268,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
// def variables are unused
defItem = gBattleMons[gBattlerTarget].item;
if (defItem == ITEM_ENIGMA_BERRY)
if (defItem == ITEM_ENIGMA_BERRY_E_READER)
{
defHoldEffect = gEnigmaBerries[gBattlerTarget].holdEffect;
defHoldEffectParam = gEnigmaBerries[gBattlerTarget].holdEffectParam;
@ -3605,7 +3605,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
for (battlerId = 0; battlerId < gBattlersCount; battlerId++)
{
gLastUsedItem = gBattleMons[battlerId].item;
if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY)
if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY_E_READER)
{
battlerHoldEffect = gEnigmaBerries[battlerId].holdEffect;
battlerHoldEffectParam = gEnigmaBerries[battlerId].holdEffectParam;

925
src/berry.c
View File

@ -95,23 +95,8 @@ static const u8 sBerryDescriptionPart1_Durin[] = _("Bitter to even look at. It i
static const u8 sBerryDescriptionPart2_Durin[] = _("bitter, no one has ever eaten it as is.");
static const u8 sBerryDescriptionPart1_Belue[] = _("It is glossy and looks delicious, but");
static const u8 sBerryDescriptionPart2_Belue[] = _("it is awfully sour. Takes time to grow.");
static const u8 sBerryDescriptionPart1_Liechi[] = _("A mysterious BERRY. It is rumored to");
static const u8 sBerryDescriptionPart2_Liechi[] = _("contain the power of the sea.");
static const u8 sBerryDescriptionPart1_Ganlon[] = _("A mysterious BERRY. It is rumored to");
static const u8 sBerryDescriptionPart2_Ganlon[] = _("contain the power of the land.");
static const u8 sBerryDescriptionPart1_Salac[] = _("A mysterious BERRY. It is rumored to");
static const u8 sBerryDescriptionPart2_Salac[] = _("contain the power of the sky.");
static const u8 sBerryDescriptionPart1_Petaya[] = _("A mysterious BERRY. It is rumored to");
static const u8 sBerryDescriptionPart2_Petaya[] = _("contain the power of all living things.");
static const u8 sBerryDescriptionPart1_Apicot[] = _("A very mystifying BERRY. No telling");
static const u8 sBerryDescriptionPart2_Apicot[] = _("what may happen or how it can be used.");
static const u8 sBerryDescriptionPart1_Lansat[] = _("Said to be a legendary BERRY.");
static const u8 sBerryDescriptionPart2_Lansat[] = _("Holding it supposedly brings joy.");
static const u8 sBerryDescriptionPart1_Starf[] = _("So strong, it was abandoned at the");
static const u8 sBerryDescriptionPart2_Starf[] = _("world's edge. Considered a mirage.");
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_Chilan[] = _("It can be made into a whistle that");
static const u8 sBerryDescriptionPart2_Chilan[] = _("produces an indescribable sound.");
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");
@ -144,10 +129,24 @@ static const u8 sBerryDescriptionPart1_Colbur[] = _("Tiny hooks on the surface l
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.");
static const u8 sBerryDescriptionPart1_Liechi[] = _("A mysterious BERRY. It is rumored to");
static const u8 sBerryDescriptionPart2_Liechi[] = _("contain the power of the sea.");
static const u8 sBerryDescriptionPart1_Ganlon[] = _("A mysterious BERRY. It is rumored to");
static const u8 sBerryDescriptionPart2_Ganlon[] = _("contain the power of the land.");
static const u8 sBerryDescriptionPart1_Salac[] = _("A mysterious BERRY. It is rumored to");
static const u8 sBerryDescriptionPart2_Salac[] = _("contain the power of the sky.");
static const u8 sBerryDescriptionPart1_Petaya[] = _("A mysterious BERRY. It is rumored to");
static const u8 sBerryDescriptionPart2_Petaya[] = _("contain the power of all living things.");
static const u8 sBerryDescriptionPart1_Apicot[] = _("A very mystifying BERRY. No telling");
static const u8 sBerryDescriptionPart2_Apicot[] = _("what may happen or how it can be used.");
static const u8 sBerryDescriptionPart1_Lansat[] = _("Said to be a legendary BERRY.");
static const u8 sBerryDescriptionPart2_Lansat[] = _("Holding it supposedly brings joy.");
static const u8 sBerryDescriptionPart1_Starf[] = _("So strong, it was abandoned at the");
static const u8 sBerryDescriptionPart2_Starf[] = _("world's edge. Considered a mirage.");
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_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");
@ -793,6 +792,330 @@ const struct Berry gBerries[] =
.smoothness = 70,
},
[ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("CHILAN"),
.firmness = BERRY_FIRMNESS_VERY_SOFT,
.size = 34,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Chilan,
.description2 = sBerryDescriptionPart2_Chilan,
.stageDuration = 18,
.spicy = 0,
.dry = 25,
.sweet = 10,
.bitter = 0,
.sour = 0,
.smoothness = 35,
},
[ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("OCCA"),
.firmness = BERRY_FIRMNESS_SUPER_HARD,
.size = 90,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Occa,
.description2 = sBerryDescriptionPart2_Occa,
.stageDuration = 18,
.spicy = 15,
.dry = 0,
.sweet = 10,
.bitter = 0,
.sour = 0,
.smoothness = 30,
},
[ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("PASSHO"),
.firmness = BERRY_FIRMNESS_SOFT,
.size = 33,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Passho,
.description2 = sBerryDescriptionPart2_Passho,
.stageDuration = 18,
.spicy = 0,
.dry = 15,
.sweet = 0,
.bitter = 10,
.sour = 0,
.smoothness = 30,
},
[ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("WACAN"),
.firmness = BERRY_FIRMNESS_VERY_SOFT,
.size = 250,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Wacan,
.description2 = sBerryDescriptionPart2_Wacan,
.stageDuration = 18,
.spicy = 0,
.dry = 0,
.sweet = 15,
.bitter = 0,
.sour = 10,
.smoothness = 30,
},
[ITEM_RINDO_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("RINDO"),
.firmness = BERRY_FIRMNESS_SOFT,
.size = 156,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Rindo,
.description2 = sBerryDescriptionPart2_Rindo,
.stageDuration = 18,
.spicy = 10,
.dry = 0,
.sweet = 0,
.bitter = 15,
.sour = 0,
.smoothness = 30,
},
[ITEM_YACHE_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("YACHE"),
.firmness = BERRY_FIRMNESS_VERY_HARD,
.size = 135,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Yache,
.description2 = sBerryDescriptionPart2_Yache,
.stageDuration = 18,
.spicy = 0,
.dry = 10,
.sweet = 0,
.bitter = 0,
.sour = 15,
.smoothness = 30,
},
[ITEM_CHOPLE_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("CHOPLE"),
.firmness = BERRY_FIRMNESS_SOFT,
.size = 77,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Chople,
.description2 = sBerryDescriptionPart2_Chople,
.stageDuration = 18,
.spicy = 15,
.dry = 0,
.sweet = 0,
.bitter = 10,
.sour = 0,
.smoothness = 30,
},
[ITEM_KEBIA_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("KEBIA"),
.firmness = BERRY_FIRMNESS_HARD,
.size = 90,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Kebia,
.description2 = sBerryDescriptionPart2_Kebia,
.stageDuration = 18,
.spicy = 0,
.dry = 15,
.sweet = 0,
.bitter = 0,
.sour = 10,
.smoothness = 30,
},
[ITEM_SHUCA_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("SHUCA"),
.firmness = BERRY_FIRMNESS_SOFT,
.size = 42,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Shuca,
.description2 = sBerryDescriptionPart2_Shuca,
.stageDuration = 18,
.spicy = 10,
.dry = 0,
.sweet = 15,
.bitter = 0,
.sour = 0,
.smoothness = 30,
},
[ITEM_COBA_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("COBA"),
.firmness = BERRY_FIRMNESS_VERY_HARD,
.size = 278,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Coba,
.description2 = sBerryDescriptionPart2_Coba,
.stageDuration = 18,
.spicy = 0,
.dry = 10,
.sweet = 0,
.bitter = 15,
.sour = 0,
.smoothness = 30,
},
[ITEM_PAYAPA_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("PAYAPA"),
.firmness = BERRY_FIRMNESS_SOFT,
.size = 252,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Payapa,
.description2 = sBerryDescriptionPart2_Payapa,
.stageDuration = 18,
.spicy = 0,
.dry = 0,
.sweet = 10,
.bitter = 0,
.sour = 15,
.smoothness = 30,
},
[ITEM_TANGA_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("TANGA"),
.firmness = BERRY_FIRMNESS_VERY_SOFT,
.size = 42,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Tanga,
.description2 = sBerryDescriptionPart2_Tanga,
.stageDuration = 18,
.spicy = 20,
.dry = 0,
.sweet = 0,
.bitter = 0,
.sour = 10,
.smoothness = 35,
},
[ITEM_CHARTI_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("CHARTI"),
.firmness = BERRY_FIRMNESS_VERY_SOFT,
.size = 28,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Charti,
.description2 = sBerryDescriptionPart2_Charti,
.stageDuration = 18,
.spicy = 10,
.dry = 20,
.sweet = 0,
.bitter = 0,
.sour = 0,
.smoothness = 35,
},
[ITEM_KASIB_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("KASIB"),
.firmness = BERRY_FIRMNESS_HARD,
.size = 144,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Kasib,
.description2 = sBerryDescriptionPart2_Kasib,
.stageDuration = 18,
.spicy = 0,
.dry = 10,
.sweet = 20,
.bitter = 0,
.sour = 0,
.smoothness = 35,
},
[ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("HABAN"),
.firmness = BERRY_FIRMNESS_SOFT,
.size = 23,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Haban,
.description2 = sBerryDescriptionPart2_Haban,
.stageDuration = 18,
.spicy = 0,
.dry = 0,
.sweet = 10,
.bitter = 20,
.sour = 0,
.smoothness = 35,
},
[ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("COLBUR"),
.firmness = BERRY_FIRMNESS_SUPER_HARD,
.size = 39,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Colbur,
.description2 = sBerryDescriptionPart2_Colbur,
.stageDuration = 18,
.spicy = 0,
.dry = 0,
.sweet = 0,
.bitter = 10,
.sour = 20,
.smoothness = 35,
},
[ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("BABIRI"),
.firmness = BERRY_FIRMNESS_SUPER_HARD,
.size = 265,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Babiri,
.description2 = sBerryDescriptionPart2_Babiri,
.stageDuration = 18,
.spicy = 25,
.dry = 10,
.sweet = 0,
.bitter = 0,
.sour = 0,
.smoothness = 35,
},
[ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("ROSELI"),
.firmness = BERRY_FIRMNESS_HARD,
.size = 35,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Roseli,
.description2 = sBerryDescriptionPart2_Roseli,
.stageDuration = 18,
.spicy = 0,
.dry = 0,
.sweet = 25,
.bitter = 10,
.sour = 0,
.smoothness = 35,
},
[ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("LIECHI"),
@ -919,7 +1242,133 @@ const struct Berry gBerries[] =
.smoothness = 30,
},
[ITEM_ENIGMA_BERRY_NEW - FIRST_BERRY_INDEX] =
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("ENIGMA"),
.firmness = BERRY_FIRMNESS_HARD,
.size = 155,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Enigma,
.description2 = sBerryDescriptionPart2_Enigma,
.stageDuration = 24,
.spicy = 40,
.dry = 10,
.sweet = 0,
.bitter = 0,
.sour = 0,
.smoothness = 60,
},
[ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("MICLE"),
.firmness = BERRY_FIRMNESS_SOFT,
.size = 41,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Micle,
.description2 = sBerryDescriptionPart2_Micle,
.stageDuration = 24,
.spicy = 0,
.dry = 40,
.sweet = 10,
.bitter = 0,
.sour = 0,
.smoothness = 60,
},
[ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("CUSTAP"),
.firmness = BERRY_FIRMNESS_SUPER_HARD,
.size = 267,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Custap,
.description2 = sBerryDescriptionPart2_Custap,
.stageDuration = 24,
.spicy = 0,
.dry = 0,
.sweet = 40,
.bitter = 10,
.sour = 0,
.smoothness = 60,
},
[ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("JABOCA"),
.firmness = BERRY_FIRMNESS_SOFT,
.size = 33,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Jaboca,
.description2 = sBerryDescriptionPart2_Jaboca,
.stageDuration = 24,
.spicy = 0,
.dry = 0,
.sweet = 0,
.bitter = 40,
.sour = 10,
.smoothness = 60,
},
[ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("ROWAP"),
.firmness = BERRY_FIRMNESS_VERY_SOFT,
.size = 52,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Rowap,
.description2 = sBerryDescriptionPart2_Rowap,
.stageDuration = 24,
.spicy = 10,
.dry = 0,
.sweet = 0,
.bitter = 0,
.sour = 40,
.smoothness = 60,
},
[ITEM_KEE_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("KEE"),
.firmness = BERRY_FIRMNESS_UNKNOWN,
.size = 0,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Kee,
.description2 = sBerryDescriptionPart2_Kee,
.stageDuration = 24,
.spicy = 30,
.dry = 30,
.sweet = 10,
.bitter = 10,
.sour = 10,
.smoothness = 60,
},
[ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] =
{
.name = _("MARNGA"), // "Maranga" is too long
.firmness = BERRY_FIRMNESS_UNKNOWN,
.size = 0,
.maxYield = 5,
.minYield = 2,
.description1 = sBerryDescriptionPart1_Maranga,
.description2 = sBerryDescriptionPart2_Maranga,
.stageDuration = 24,
.spicy = 10,
.dry = 10,
.sweet = 30,
.bitter = 30,
.sour = 10,
.smoothness = 60,
},
[ITEM_ENIGMA_BERRY_E_READER - FIRST_BERRY_INDEX] =
{
.name = _("ENIGMA"),
.firmness = BERRY_FIRMNESS_UNKNOWN,
@ -936,438 +1385,6 @@ 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,
},
[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[] = {
@ -1413,7 +1430,7 @@ const struct BerryCrushBerryData gBerryCrush_BerryData[] = {
[ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = {.difficulty = 180, .powder = 500},
[ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = {.difficulty = 200, .powder = 750},
[ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = {.difficulty = 200, .powder = 750},
[ITEM_ENIGMA_BERRY_NEW - FIRST_BERRY_INDEX] = {.difficulty = 150, .powder = 200}
[ITEM_ENIGMA_BERRY_E_READER - FIRST_BERRY_INDEX] = {.difficulty = 150, .powder = 200}
};
const struct BerryTree gBlankBerryTree = {};
@ -1460,7 +1477,7 @@ bool32 IsEnigmaBerryValid(void)
const struct Berry *GetBerryInfo(u8 berry)
{
if (berry == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) && IsEnigmaBerryValid())
if (berry == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY_E_READER) && IsEnigmaBerryValid())
return (struct Berry*)(&gSaveBlock1Ptr->enigmaBerry.berry);
else
{

4
src/berry_blender.c
View File

@ -1538,7 +1538,7 @@ static void SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, struct B
u16 berryMasterDiff;
u16 i;
if (playerBerryItemId == ITEM_ENIGMA_BERRY)
if (playerBerryItemId == ITEM_ENIGMA_BERRY_E_READER)
{
for (i = 0; i < FLAVOR_COUNT; i++)
{
@ -2286,7 +2286,7 @@ static u32 CalculatePokeblockColor(struct BlenderBerry* berries, s16* _flavors,
for (j = 0; j < numPlayers; j++)
{
if (berries[i].itemId == berries[j].itemId && i != j
&& (berries[i].itemId != ITEM_ENIGMA_BERRY || AreBlenderBerriesSame(berries, i, j)))
&& (berries[i].itemId != ITEM_ENIGMA_BERRY_E_READER || AreBlenderBerriesSame(berries, i, j)))
return PBLOCK_CLR_BLACK;
}
}

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

@ -7,12 +7,12 @@ const u32 gBerryTag_Pal[] = INCBIN_U32("graphics/interface/berry_tag_title.bin.l
const u32 gBerryCheckCircle_Gfx[] = INCBIN_U32("graphics/interface/check_berry_circle.4bpp.lz");
const u32 gBerryPic_Cheri[] = INCBIN_U32("graphics/berries/cheri.4bpp.lz");
const u32 gBerryPic_Oran[] = INCBIN_U32("graphics/berries/oran.4bpp.lz");
const u32 gBerryPic_Chesto[] = INCBIN_U32("graphics/berries/chesto.4bpp.lz");
const u32 gBerryPic_Pecha[] = INCBIN_U32("graphics/berries/pecha.4bpp.lz");
const u32 gBerryPic_Rawst[] = INCBIN_U32("graphics/berries/rawst.4bpp.lz");
const u32 gBerryPic_Aspear[] = INCBIN_U32("graphics/berries/aspear.4bpp.lz");
const u32 gBerryPic_Leppa[] = INCBIN_U32("graphics/berries/leppa.4bpp.lz");
const u32 gBerryPic_Chesto[] = INCBIN_U32("graphics/berries/chesto.4bpp.lz");
const u32 gBerryPic_Oran[] = INCBIN_U32("graphics/berries/oran.4bpp.lz");
const u32 gBerryPic_Persim[] = INCBIN_U32("graphics/berries/persim.4bpp.lz");
const u32 gBerryPic_Lum[] = INCBIN_U32("graphics/berries/lum.4bpp.lz");
const u32 gBerryPic_Sitrus[] = INCBIN_U32("graphics/berries/sitrus.4bpp.lz");
@ -41,14 +41,7 @@ const u32 gBerryPic_Pamtre[] = INCBIN_U32("graphics/berries/pamtre.4bpp.lz");
const u32 gBerryPic_Watmel[] = INCBIN_U32("graphics/berries/watmel.4bpp.lz");
const u32 gBerryPic_Durin[] = INCBIN_U32("graphics/berries/durin.4bpp.lz");
const u32 gBerryPic_Belue[] = INCBIN_U32("graphics/berries/belue.4bpp.lz");
const u32 gBerryPic_Liechi[] = INCBIN_U32("graphics/berries/liechi.4bpp.lz");
const u32 gBerryPic_Ganlon[] = INCBIN_U32("graphics/berries/ganlon.4bpp.lz");
const u32 gBerryPic_Salac[] = INCBIN_U32("graphics/berries/salac.4bpp.lz");
const u32 gBerryPic_Petaya[] = INCBIN_U32("graphics/berries/petaya.4bpp.lz");
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_Chilan[] = INCBIN_U32("graphics/berries/chilan.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");
@ -65,8 +58,15 @@ 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 gBerryPic_Liechi[] = INCBIN_U32("graphics/berries/liechi.4bpp.lz");
const u32 gBerryPic_Ganlon[] = INCBIN_U32("graphics/berries/ganlon.4bpp.lz");
const u32 gBerryPic_Salac[] = INCBIN_U32("graphics/berries/salac.4bpp.lz");
const u32 gBerryPic_Petaya[] = INCBIN_U32("graphics/berries/petaya.4bpp.lz");
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_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");
@ -75,12 +75,12 @@ 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");
const u32 gBerryPalette_Chesto[] = INCBIN_U32("graphics/berries/chesto.gbapal.lz");
const u32 gBerryPalette_Pecha[] = INCBIN_U32("graphics/berries/pecha.gbapal.lz");
const u32 gBerryPalette_Rawst[] = INCBIN_U32("graphics/berries/rawst.gbapal.lz");
const u32 gBerryPalette_Aspear[] = INCBIN_U32("graphics/berries/aspear.gbapal.lz");
const u32 gBerryPalette_Leppa[] = INCBIN_U32("graphics/berries/leppa.gbapal.lz");
const u32 gBerryPalette_Chesto[] = INCBIN_U32("graphics/berries/chesto.gbapal.lz");
const u32 gBerryPalette_Oran[] = INCBIN_U32("graphics/berries/oran.gbapal.lz");
const u32 gBerryPalette_Persim[] = INCBIN_U32("graphics/berries/persim.gbapal.lz");
const u32 gBerryPalette_Lum[] = INCBIN_U32("graphics/berries/lum.gbapal.lz");
const u32 gBerryPalette_Sitrus[] = INCBIN_U32("graphics/berries/sitrus.gbapal.lz");
@ -109,14 +109,7 @@ const u32 gBerryPalette_Pamtre[] = INCBIN_U32("graphics/berries/pamtre.gbapal.lz
const u32 gBerryPalette_Watmel[] = INCBIN_U32("graphics/berries/watmel.gbapal.lz");
const u32 gBerryPalette_Durin[] = INCBIN_U32("graphics/berries/durin.gbapal.lz");
const u32 gBerryPalette_Belue[] = INCBIN_U32("graphics/berries/belue.gbapal.lz");
const u32 gBerryPalette_Liechi[] = INCBIN_U32("graphics/berries/liechi.gbapal.lz");
const u32 gBerryPalette_Ganlon[] = INCBIN_U32("graphics/berries/ganlon.gbapal.lz");
const u32 gBerryPalette_Salac[] = INCBIN_U32("graphics/berries/salac.gbapal.lz");
const u32 gBerryPalette_Petaya[] = INCBIN_U32("graphics/berries/petaya.gbapal.lz");
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_Chilan[] = INCBIN_U32("graphics/berries/chilan.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");
@ -133,8 +126,15 @@ 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");
const u32 gBerryPalette_Liechi[] = INCBIN_U32("graphics/berries/liechi.gbapal.lz");
const u32 gBerryPalette_Ganlon[] = INCBIN_U32("graphics/berries/ganlon.gbapal.lz");
const u32 gBerryPalette_Salac[] = INCBIN_U32("graphics/berries/salac.gbapal.lz");
const u32 gBerryPalette_Petaya[] = INCBIN_U32("graphics/berries/petaya.gbapal.lz");
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_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");

4
src/data/item_icon_table.h
View File

@ -614,14 +614,14 @@ const u32 *const gItemIconTable[][2] =
[ITEM_APICOT_BERRY] = {gItemIcon_ApicotBerry, gItemIconPalette_ApicotBerry},
[ITEM_LANSAT_BERRY] = {gItemIcon_LansatBerry, gItemIconPalette_LansatBerry},
[ITEM_STARF_BERRY] = {gItemIcon_StarfBerry, gItemIconPalette_StarfBerry},
[ITEM_ENIGMA_BERRY_NEW] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo
[ITEM_ENIGMA_BERRY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo
[ITEM_MICLE_BERRY] = {gItemIcon_MicleBerry, gItemIconPalette_MicleBerry},
[ITEM_CUSTAP_BERRY] = {gItemIcon_CustapBerry, gItemIconPalette_CustapBerry},
[ITEM_JABOCA_BERRY] = {gItemIcon_JabocaBerry, gItemIconPalette_JabocaBerry},
[ITEM_ROWAP_BERRY] = {gItemIcon_RowapBerry, gItemIconPalette_RowapBerry},
[ITEM_KEE_BERRY] = {gItemIcon_KeeBerry, gItemIconPalette_KeeBerry},
[ITEM_MARANGA_BERRY] = {gItemIcon_MarangaBerry, gItemIconPalette_MarangaBerry},
[ITEM_ENIGMA_BERRY] = {gItemIcon_EnigmaBerry, gItemIconPalette_EnigmaBerry},
[ITEM_ENIGMA_BERRY_E_READER] = {gItemIcon_EnigmaBerry, gItemIconPalette_EnigmaBerry},
// TMs/HMs
[ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
[ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM},

8
src/data/items.h
View File

@ -7211,12 +7211,12 @@ const struct Item gItems[] =
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_ENIGMA_BERRY_NEW] = // Todo
[ITEM_ENIGMA_BERRY] = // Todo
{
.name = _("????????"),
.itemId = ITEM_NONE,
.price = 0,
.description = sEnigmaBerryNewDesc,
.description = sDummyDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -7296,12 +7296,12 @@ const struct Item gItems[] =
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_ENIGMA_BERRY] =
[ITEM_ENIGMA_BERRY_E_READER] =
{
.name = _("Enigma Berry"),
.itemId = ITEM_ENIGMA_BERRY,
.price = 20,
.description = sEnigmaBerryDesc,
.description = sEnigmaBerryEReaderDesc,
.pocket = POCKET_BERRIES,
.type = ITEM_USE_BAG_MENU, // Type handled by ItemUseOutOfBattle_EnigmaBerry
.fieldUseFunc = ItemUseOutOfBattle_EnigmaBerry,

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

@ -1,59 +1,3 @@
static const struct SpriteFrameImage sPicTable_PechaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_KelpsyBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2};
static const struct SpriteFrameImage sPicTable_WepearBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2};
static const struct SpriteFrameImage sPicTable_IapapaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_CheriBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
@ -68,187 +12,33 @@ static const struct SpriteFrameImage sPicTable_CheriBerryTree[] = {
const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_FigyBerryTree[] = {
static const struct SpriteFrameImage sPicTable_ChestoBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 5),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3};
const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2};
static const struct SpriteFrameImage sPicTable_MagoBerryTree[] = {
static const struct SpriteFrameImage sPicTable_PechaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 5),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_LumBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_RazzBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_GrepaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_RabutaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_NomelBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_LeppaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_LiechiBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_HondewBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5};
static const struct SpriteFrameImage sPicTable_AguavBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_WikiBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_PomegBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3};
const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_RawstBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
@ -264,33 +54,33 @@ static const struct SpriteFrameImage sPicTable_RawstBerryTree[] = {
const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_SpelonBerryTree[] = {
static const struct SpriteFrameImage sPicTable_AspearBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 5),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3};
const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_ChestoBerryTree[] = {
static const struct SpriteFrameImage sPicTable_LeppaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 5),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2};
const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_OranBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
@ -320,6 +110,20 @@ static const struct SpriteFrameImage sPicTable_PersimBerryTree[] = {
const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2};
static const struct SpriteFrameImage sPicTable_LumBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_SitrusBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
@ -334,33 +138,173 @@ static const struct SpriteFrameImage sPicTable_SitrusBerryTree[] = {
const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_AspearBerryTree[] = {
static const struct SpriteFrameImage sPicTable_FigyBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 5),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3};
const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_PamtreBerryTree[] = {
static const struct SpriteFrameImage sPicTable_WikiBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 5),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2};
const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_MagoBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_AguavBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_IapapaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_RazzBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_WepearBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2};
static const struct SpriteFrameImage sPicTable_PomegBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_KelpsyBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2};
static const struct SpriteFrameImage sPicTable_HondewBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5};
static const struct SpriteFrameImage sPicTable_GrepaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_TamatoBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2};
static const struct SpriteFrameImage sPicTable_CornnBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
@ -376,19 +320,61 @@ static const struct SpriteFrameImage sPicTable_CornnBerryTree[] = {
const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2};
static const struct SpriteFrameImage sPicTable_LansatBerryTree[] = {
static const struct SpriteFrameImage sPicTable_RabutaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 5),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2};
const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_NomelBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_SpelonBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3};
static const struct SpriteFrameImage sPicTable_PamtreBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2};
static const struct SpriteFrameImage sPicTable_DurinBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
@ -404,20 +390,6 @@ static const struct SpriteFrameImage sPicTable_DurinBerryTree[] = {
const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_TamatoBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2};
static const struct SpriteFrameImage sPicTable_OccaBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
@ -572,6 +544,34 @@ static const struct SpriteFrameImage sPicTable_RoseliBerryTree[] = {
const u8 gBerryTreePaletteSlotTable_Roseli[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_LiechiBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4};
static const struct SpriteFrameImage sPicTable_LansatBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 0),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 1),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 2),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 3),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 4),
overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 5),
};
const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage sPicTable_MicleBerryTree[] = {
overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0),
@ -668,14 +668,7 @@ const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
[ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = sPicTable_RabutaBerryTree,
[ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = sPicTable_DurinBerryTree,
[ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = sPicTable_HondewBerryTree,
[ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = sPicTable_LiechiBerryTree,
[ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = sPicTable_HondewBerryTree,
[ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = sPicTable_AguavBerryTree,
[ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = sPicTable_PomegBerryTree,
[ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = sPicTable_GrepaBerryTree,
[ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = sPicTable_LansatBerryTree,
[ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = sPicTable_CornnBerryTree,
[ITEM_ENIGMA_BERRY_NEW - FIRST_BERRY_INDEX] = sPicTable_DurinBerryTree,
[ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = sPicTable_GrepaBerryTree,
[ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = sPicTable_OccaBerryTree,
[ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = sPicTable_CornnBerryTree,
[ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = sPicTable_RazzBerryTree,
@ -692,15 +685,22 @@ const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
[ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = sPicTable_HabanBerryTree,
[ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = sPicTable_ColburBerryTree,
[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_LIECHI_BERRY - FIRST_BERRY_INDEX] = sPicTable_LiechiBerryTree,
[ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = sPicTable_HondewBerryTree,
[ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = sPicTable_AguavBerryTree,
[ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = sPicTable_PomegBerryTree,
[ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = sPicTable_GrepaBerryTree,
[ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = sPicTable_LansatBerryTree,
[ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = sPicTable_CornnBerryTree,
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = sPicTable_DurinBerryTree,
[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,
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = sPicTable_DurinBerryTree,
[ITEM_ENIGMA_BERRY_E_READER - FIRST_BERRY_INDEX] = sPicTable_DurinBerryTree,
};
const u8 *const gBerryTreePaletteSlotTablePointers[] = {
@ -739,14 +739,7 @@ const u8 *const gBerryTreePaletteSlotTablePointers[] = {
[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_NEW - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
[ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa,
[ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Occa,
[ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn,
[ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz,
@ -763,15 +756,22 @@ const u8 *const gBerryTreePaletteSlotTablePointers[] = {
[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_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,
[ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Micle,
[ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Custap,
[ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Jaboca,
[ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rowap,
[ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha,
[ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Occa,
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
[ITEM_ENIGMA_BERRY_E_READER - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin,
};
const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = {
@ -810,14 +810,7 @@ const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = {
[ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_ENIGMA_BERRY_NEW - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_OCCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_PASSHO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_WACAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
@ -834,13 +827,20 @@ const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = {
[ITEM_HABAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_COLBUR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_BABIRI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_CHILAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
[ITEM_ENIGMA_BERRY_E_READER - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
};

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

@ -255,36 +255,34 @@ const u16 gObjectEventPal_SSTidal[] = INCBIN_U16("graphics/object_events/palette
const u32 gFieldEffectObjectPic_Sparkle[] = INCBIN_U32("graphics/field_effects/pics/sparkle.4bpp");
const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/object_events/pics/berry_trees/dirt_pile.4bpp");
const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sprout.4bpp");
const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp");
const u32 gObjectEventPic_KelpsyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/kelpsy.4bpp");
const u32 gObjectEventPic_WepearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wepear.4bpp");
const u32 gObjectEventPic_IapapaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/iapapa.4bpp");
const u32 gObjectEventPic_CheriBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/cheri.4bpp");
const u32 gObjectEventPic_FigyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/figy.4bpp");
const u32 gObjectEventPic_MagoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/mago.4bpp");
const u32 gObjectEventPic_LumBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lum.4bpp");
const u32 gObjectEventPic_RazzBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/razz.4bpp");
const u32 gObjectEventPic_GrepaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/grepa.4bpp");
const u32 gObjectEventPic_RabutaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rabuta.4bpp");
const u32 gObjectEventPic_NomelBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/nomel.4bpp");
const u32 gObjectEventPic_LeppaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/leppa.4bpp");
const u32 gObjectEventPic_LiechiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/liechi.4bpp");
const u32 gObjectEventPic_HondewBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/hondew.4bpp");
const u32 gObjectEventPic_AguavBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aguav.4bpp");
const u32 gObjectEventPic_WikiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wiki.4bpp");
const u32 gObjectEventPic_PomegBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pomeg.4bpp");
const u32 gObjectEventPic_RawstBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rawst.4bpp");
const u32 gObjectEventPic_SpelonBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/spelon.4bpp");
const u32 gObjectEventPic_ChestoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/chesto.4bpp");
const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp");
const u32 gObjectEventPic_RawstBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rawst.4bpp");
const u32 gObjectEventPic_AspearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aspear.4bpp");
const u32 gObjectEventPic_LeppaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/leppa.4bpp");
const u32 gObjectEventPic_OranBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/oran.4bpp");
const u32 gObjectEventPic_PersimBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/persim.4bpp");
const u32 gObjectEventPic_LumBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lum.4bpp");
const u32 gObjectEventPic_SitrusBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sitrus.4bpp");
const u32 gObjectEventPic_AspearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aspear.4bpp");
const u32 gObjectEventPic_PamtreBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pamtre.4bpp");
const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/cornn.4bpp");
const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lansat.4bpp");
const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/durin.4bpp");
const u32 gObjectEventPic_FigyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/figy.4bpp");
const u32 gObjectEventPic_WikiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wiki.4bpp");
const u32 gObjectEventPic_MagoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/mago.4bpp");
const u32 gObjectEventPic_AguavBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aguav.4bpp");
const u32 gObjectEventPic_IapapaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/iapapa.4bpp");
const u32 gObjectEventPic_RazzBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/razz.4bpp");
const u32 gObjectEventPic_WepearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wepear.4bpp");
const u32 gObjectEventPic_PomegBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pomeg.4bpp");
const u32 gObjectEventPic_KelpsyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/kelpsy.4bpp");
const u32 gObjectEventPic_HondewBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/hondew.4bpp");
const u32 gObjectEventPic_GrepaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/grepa.4bpp");
const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/tamato.4bpp");
const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/cornn.4bpp");
const u32 gObjectEventPic_RabutaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rabuta.4bpp");
const u32 gObjectEventPic_NomelBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/nomel.4bpp");
const u32 gObjectEventPic_SpelonBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/spelon.4bpp");
const u32 gObjectEventPic_PamtreBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pamtre.4bpp");
const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/durin.4bpp");
const u32 gObjectEventPic_OccaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/occa.4bpp");
const u32 gObjectEventPic_YacheBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/yache.4bpp");
const u32 gObjectEventPic_ChopleBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/chople.4bpp");
@ -296,6 +294,8 @@ 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_LiechiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/liechi.4bpp");
const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lansat.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");

4
src/data/text/item_descriptions.h
View File

@ -2710,7 +2710,7 @@ static const u8 sStarfBerryDesc[] = _(
"sharply boosts a\n"
"stat in a pinch.");
static const u8 sEnigmaBerryNewDesc[] = _( // Todo
static const u8 sEnigmaBerryDesc[] = _( // Todo
"?????");
static const u8 sMicleBerryDesc[] = _(
@ -2743,7 +2743,7 @@ static const u8 sMarangaBerryDesc[] = _(
"move, it raises the\n"
"Sp. Def. a bit.");
static const u8 sEnigmaBerryDesc[] = _(
static const u8 sEnigmaBerryEReaderDesc[] = _(
"{POKEBLOCK} ingredient.\n"
"Plant in loamy soil\n"
"to grow a mystery.");

6
src/item_menu.c
View File

@ -1549,7 +1549,7 @@ static void OpenContextMenu(u8 taskId)
gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_BerryBlenderCrush);
break;
case ITEMMENULOCATION_APPRENTICE:
if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY_E_READER)
{
gBagMenu->contextMenuItemsPtr = sContextMenuItems_Apprentice;
gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Apprentice);
@ -1561,7 +1561,7 @@ static void OpenContextMenu(u8 taskId)
}
break;
case ITEMMENULOCATION_FAVOR_LADY:
if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY_E_READER)
{
gBagMenu->contextMenuItemsPtr = sContextMenuItems_FavorLady;
gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_FavorLady);
@ -1573,7 +1573,7 @@ static void OpenContextMenu(u8 taskId)
}
break;
case ITEMMENULOCATION_QUIZ_LADY:
if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY_E_READER)
{
gBagMenu->contextMenuItemsPtr = sContextMenuItems_QuizLady;
gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_QuizLady);

24
src/item_menu_icons.c
View File

@ -356,14 +356,7 @@ static const struct CompressedTilesPal sBerryPicTable[] =
[ITEM_TO_BERRY(ITEM_WATMEL_BERRY) - 1] = {gBerryPic_Watmel, gBerryPalette_Watmel},
[ITEM_TO_BERRY(ITEM_DURIN_BERRY) - 1] = {gBerryPic_Durin, gBerryPalette_Durin},
[ITEM_TO_BERRY(ITEM_BELUE_BERRY) - 1] = {gBerryPic_Belue, gBerryPalette_Belue},
[ITEM_TO_BERRY(ITEM_LIECHI_BERRY) - 1] = {gBerryPic_Liechi, gBerryPalette_Liechi},
[ITEM_TO_BERRY(ITEM_GANLON_BERRY) - 1] = {gBerryPic_Ganlon, gBerryPalette_Ganlon},
[ITEM_TO_BERRY(ITEM_SALAC_BERRY) - 1] = {gBerryPic_Salac, gBerryPalette_Salac},
[ITEM_TO_BERRY(ITEM_PETAYA_BERRY) - 1] = {gBerryPic_Petaya, gBerryPalette_Petaya},
[ITEM_TO_BERRY(ITEM_APICOT_BERRY) - 1] = {gBerryPic_Apicot, gBerryPalette_Apicot},
[ITEM_TO_BERRY(ITEM_LANSAT_BERRY) - 1] = {gBerryPic_Lansat, gBerryPalette_Lansat},
[ITEM_TO_BERRY(ITEM_STARF_BERRY) - 1] = {gBerryPic_Starf, gBerryPalette_Starf},
[ITEM_TO_BERRY(ITEM_ENIGMA_BERRY_NEW) - 1] = {gBerryPic_Enigma, gBerryPalette_Enigma},
[ITEM_TO_BERRY(ITEM_CHILAN_BERRY) - 1] = {gBerryPic_Chilan, gBerryPalette_Chilan},
[ITEM_TO_BERRY(ITEM_OCCA_BERRY) - 1] = {gBerryPic_Occa, gBerryPalette_Occa},
[ITEM_TO_BERRY(ITEM_PASSHO_BERRY) - 1] = {gBerryPic_Passho, gBerryPalette_Passho},
[ITEM_TO_BERRY(ITEM_WACAN_BERRY) - 1] = {gBerryPic_Wacan, gBerryPalette_Wacan},
@ -380,15 +373,22 @@ static const struct CompressedTilesPal sBerryPicTable[] =
[ITEM_TO_BERRY(ITEM_HABAN_BERRY) - 1] = {gBerryPic_Haban, gBerryPalette_Haban},
[ITEM_TO_BERRY(ITEM_COLBUR_BERRY) - 1] = {gBerryPic_Colbur, gBerryPalette_Colbur},
[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_LIECHI_BERRY) - 1] = {gBerryPic_Liechi, gBerryPalette_Liechi},
[ITEM_TO_BERRY(ITEM_GANLON_BERRY) - 1] = {gBerryPic_Ganlon, gBerryPalette_Ganlon},
[ITEM_TO_BERRY(ITEM_SALAC_BERRY) - 1] = {gBerryPic_Salac, gBerryPalette_Salac},
[ITEM_TO_BERRY(ITEM_PETAYA_BERRY) - 1] = {gBerryPic_Petaya, gBerryPalette_Petaya},
[ITEM_TO_BERRY(ITEM_APICOT_BERRY) - 1] = {gBerryPic_Apicot, gBerryPalette_Apicot},
[ITEM_TO_BERRY(ITEM_LANSAT_BERRY) - 1] = {gBerryPic_Lansat, gBerryPalette_Lansat},
[ITEM_TO_BERRY(ITEM_STARF_BERRY) - 1] = {gBerryPic_Starf, gBerryPalette_Starf},
[ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) - 1] = {gBerryPic_Enigma, gBerryPalette_Enigma},
[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},
[ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) - 1] = {gBerryPic_Enigma, gBerryPalette_Enigma},
[ITEM_TO_BERRY(ITEM_MARANGA_BERRY)- 1] = {gBerryPic_Maranga, gBerryPalette_Maranga},
[ITEM_TO_BERRY(ITEM_ENIGMA_BERRY_E_READER) - 1] = {gBerryPic_Enigma, gBerryPalette_Enigma},
};
const struct CompressedSpriteSheet gBerryCheckCircleSpriteSheet =
@ -619,7 +619,7 @@ static void LoadBerryGfx(u8 berryId)
{
struct CompressedSpritePalette pal;
if (berryId == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) - 1 && IsEnigmaBerryValid())
if (berryId == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY_E_READER) - 1 && IsEnigmaBerryValid())
{
// unknown empty if statement
}

2
src/item_use.c
View File

@ -98,7 +98,7 @@ static const struct YesNoFuncTable sUseTMHMYesNoFuncTable =
static void SetUpItemUseCallback(u8 taskId)
{
u8 type;
if (gSpecialVar_ItemId == ITEM_ENIGMA_BERRY)
if (gSpecialVar_ItemId == ITEM_ENIGMA_BERRY_E_READER)
type = gTasks[taskId].tEnigmaBerryType - 1;
else
type = ItemId_GetType(gSpecialVar_ItemId) - 1;

4
src/menu_helpers.c
View File

@ -276,8 +276,8 @@ u8 GetLRKeysPressedAndHeld(void)
bool8 IsHoldingItemAllowed(u16 itemId)
{
// Enigma Berry can't be held in link areas
if (itemId == ITEM_ENIGMA_BERRY
// e-Reader Enigma Berry can't be held in link areas
if (itemId == ITEM_ENIGMA_BERRY_E_READER
&& ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRADE_CENTER)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRADE_CENTER))
|| InUnionRoom() == TRUE))

6
src/party_menu.c
View File

@ -4220,7 +4220,7 @@ static bool8 IsHPRecoveryItem(u16 item)
{
const u8 *effect;
if (item == ITEM_ENIGMA_BERRY)
if (item == ITEM_ENIGMA_BERRY_E_READER)
effect = gSaveBlock1Ptr->enigmaBerry.itemEffect;
else
effect = gItemEffectTable[item - ITEM_POTION];
@ -4637,7 +4637,7 @@ void ItemUseCB_PPRecovery(u8 taskId, TaskFunc task)
const u8 *effect;
u16 item = gSpecialVar_ItemId;
if (item == ITEM_ENIGMA_BERRY)
if (item == ITEM_ENIGMA_BERRY_E_READER)
effect = gSaveBlock1Ptr->enigmaBerry.itemEffect;
else
effect = gItemEffectTable[item - ITEM_POTION];
@ -5279,7 +5279,7 @@ u8 GetItemEffectType(u16 item)
return ITEM_EFFECT_NONE;
// Read the item's effect properties.
if (item == ITEM_ENIGMA_BERRY)
if (item == ITEM_ENIGMA_BERRY_E_READER)
itemEffect = gSaveBlock1Ptr->enigmaBerry.itemEffect;
else
itemEffect = gItemEffectTable[item - ITEM_POTION];

24
src/pokemon.c
View File

@ -2599,7 +2599,7 @@ void ConvertPokemonToBattleTowerPokemon(struct Pokemon *mon, struct BattleTowerP
dest->species = GetMonData(mon, MON_DATA_SPECIES, NULL);
heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, NULL);
if (heldItem == ITEM_ENIGMA_BERRY)
if (heldItem == ITEM_ENIGMA_BERRY_E_READER)
heldItem = ITEM_NONE;
dest->heldItem = heldItem;
@ -3125,7 +3125,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
spDefense = defender->spDefense;
// Get attacker hold item info
if (attacker->item == ITEM_ENIGMA_BERRY)
if (attacker->item == ITEM_ENIGMA_BERRY_E_READER)
{
attackerHoldEffect = gEnigmaBerries[battlerIdAtk].holdEffect;
attackerHoldEffectParam = gEnigmaBerries[battlerIdAtk].holdEffectParam;
@ -3137,7 +3137,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
}
// Get defender hold item info
if (defender->item == ITEM_ENIGMA_BERRY)
if (defender->item == ITEM_ENIGMA_BERRY_E_READER)
{
defenderHoldEffect = gEnigmaBerries[battlerIdDef].holdEffect;
defenderHoldEffectParam = gEnigmaBerries[battlerIdDef].holdEffectParam;
@ -4727,7 +4727,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
// Get item hold effect
heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, NULL);
if (heldItem == ITEM_ENIGMA_BERRY)
if (heldItem == ITEM_ENIGMA_BERRY_E_READER)
{
if (gMain.inBattle)
holdEffect = gEnigmaBerries[gBattlerInMenuId].holdEffect;
@ -4764,11 +4764,11 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
// Skip using the item if it won't do anything
if (!ITEM_HAS_EFFECT(item))
return TRUE;
if (gItemEffectTable[item - ITEM_POTION] == NULL && item != ITEM_ENIGMA_BERRY)
if (gItemEffectTable[item - ITEM_POTION] == NULL && item != ITEM_ENIGMA_BERRY_E_READER)
return TRUE;
// Get item effect
if (item == ITEM_ENIGMA_BERRY)
if (item == ITEM_ENIGMA_BERRY_E_READER)
{
if (gMain.inBattle)
itemEffect = gEnigmaBerries[gActiveBattler].itemEffect;
@ -5305,10 +5305,10 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit)
temp = gItemEffectTable[itemId - ITEM_POTION];
if (!temp && itemId != ITEM_ENIGMA_BERRY)
if (!temp && itemId != ITEM_ENIGMA_BERRY_E_READER)
return 0;
if (itemId == ITEM_ENIGMA_BERRY)
if (itemId == ITEM_ENIGMA_BERRY_E_READER)
{
temp = gEnigmaBerries[gActiveBattler].itemEffect;
}
@ -5419,7 +5419,7 @@ u8 *UseStatIncreaseItem(u16 itemId)
int i;
const u8 *itemEffect;
if (itemId == ITEM_ENIGMA_BERRY)
if (itemId == ITEM_ENIGMA_BERRY_E_READER)
{
if (gMain.inBattle)
itemEffect = gEnigmaBerries[gBattlerInMenuId].itemEffect;
@ -5484,7 +5484,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem)
u16 upperPersonality = personality >> 16;
u8 holdEffect;
if (heldItem == ITEM_ENIGMA_BERRY)
if (heldItem == ITEM_ENIGMA_BERRY_E_READER)
holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
else
holdEffect = ItemId_GetHoldEffect(heldItem);
@ -5858,7 +5858,7 @@ void AdjustFriendship(struct Pokemon *mon, u8 event)
species = GetMonData(mon, MON_DATA_SPECIES2, 0);
heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, 0);
if (heldItem == ITEM_ENIGMA_BERRY)
if (heldItem == ITEM_ENIGMA_BERRY_E_READER)
{
if (gMain.inBattle)
holdEffect = gEnigmaBerries[0].holdEffect;
@ -5951,7 +5951,7 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies)
}
heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, 0);
if (heldItem == ITEM_ENIGMA_BERRY)
if (heldItem == ITEM_ENIGMA_BERRY_E_READER)
{
if (gMain.inBattle)
holdEffect = gEnigmaBerries[0].holdEffect;

4
src/pokemon_summary_screen.c
View File

@ -3317,11 +3317,11 @@ static void PrintHeldItemName(void)
const u8 *text;
int x;
if (sMonSummaryScreen->summary.item == ITEM_ENIGMA_BERRY
if (sMonSummaryScreen->summary.item == ITEM_ENIGMA_BERRY_E_READER
&& IsMultiBattle() == TRUE
&& (sMonSummaryScreen->curMonIndex == 1 || sMonSummaryScreen->curMonIndex == 4 || sMonSummaryScreen->curMonIndex == 5))
{
text = ItemId_GetName(ITEM_ENIGMA_BERRY);
text = ItemId_GetName(ITEM_ENIGMA_BERRY_E_READER);
}
else if (sMonSummaryScreen->summary.item == ITEM_NONE)
{

4
src/script_pokemon_util.c
View File

@ -127,9 +127,9 @@ static bool8 CheckPartyMonHasHeldItem(u16 item)
bool8 DoesPartyHaveEnigmaBerry(void)
{
bool8 hasItem = CheckPartyMonHasHeldItem(ITEM_ENIGMA_BERRY);
bool8 hasItem = CheckPartyMonHasHeldItem(ITEM_ENIGMA_BERRY_E_READER);
if (hasItem == TRUE)
GetBerryNameByBerryType(ItemIdToBerryType(ITEM_ENIGMA_BERRY), gStringVar1);
GetBerryNameByBerryType(ItemIdToBerryType(ITEM_ENIGMA_BERRY_E_READER), gStringVar1);
return hasItem;
}