atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Honey functionality

Browse source
This commit is contained in:
Fontbane 2019-04-05 10:33:19 -04:00
parent 7bc3cdf527
commit e8dd8f93d1
4 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/battle_ai_scripts.s
View file

@ -3628,7 +3628,6 @@ AI_HPAware_DiscouragedEffectsWhenTargetLowHP: @ 82DE2B1
.byte EFFECT_LIGHT_SCREEN
.byte EFFECT_OHKO
.byte EFFECT_SUPER_FANG
.byte EFFECT_SUPER_FANG //Why is this here twice?
.byte EFFECT_MIST
.byte EFFECT_FOCUS_ENERGY
.byte EFFECT_CONFUSE

1
include/item_use.h
View file

@ -51,6 +51,5 @@ void ItemUseInBattle_EnigmaBerry(u8);
void ItemUseOutOfBattle_CannotUse(u8);
u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
void sub_80FDD10(u8);
void ItemUseOutOfBattle_Honey(u8);
#endif // GUARD_ITEM_USE_H

2
src/data/items.h
View file

@ -9148,7 +9148,7 @@ const struct Item gItems[] =
.unk19 = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_Honey,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 0,

9
src/item_use.c
View file

@ -1120,12 +1120,3 @@ void ItemUseOutOfBattle_CannotUse(u8 taskId)
DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].data[3]);
}
void ItemUseOutOfBattle_Honey(u8 taskId)
{
//As a placeholder, just acts like White Flute
FlagSet(FLAG_SYS_ENC_UP_ITEM);
FlagClear(FLAG_SYS_ENC_DOWN_ITEM);
StringExpandPlaceholders(gStringVar4, gText_UsedVar2WildLured);
gTasks[taskId].data[8] = 0;
gTasks[taskId].func = sub_80FE1D0;
}