diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 1018894058..1f072b734f 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -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 diff --git a/include/item_use.h b/include/item_use.h index 31221aa099..37343f6e7a 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -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 diff --git a/src/data/items.h b/src/data/items.h index ee47c7f89d..9ee44dcdcd 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -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, diff --git a/src/item_use.c b/src/item_use.c index a20aecc648..5cfd9b435a 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -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; -}