summaryrefslogtreecommitdiff
path: root/include/item_use.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-03 18:00:47 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-11-03 18:14:15 -0700
commit415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch)
tree8793240342d37104610f34756f6fee9db706ee8f /include/item_use.h
parentae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff)
parent1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff)
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'include/item_use.h')
-rw-r--r--include/item_use.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/item_use.h b/include/item_use.h
index 1558f7691..227c0c9ee 100644
--- a/include/item_use.h
+++ b/include/item_use.h
@@ -38,7 +38,7 @@ void sub_80C9FC0(u8);
void ItemUseOutOfBattle_Repel(u8);
void ItemUseOutOfBattle_BlackWhiteFlute(u8);
void task08_080A1C44(u8);
-u8 sub_80CA1C8(void);
+u8 CanUseEscapeRopeOnCurrMap(void);
void ItemUseOutOfBattle_EscapeRope(u8);
void ItemUseOutOfBattle_EvolutionStone(u8);
void ItemUseInBattle_PokeBall(u8);
@@ -49,5 +49,6 @@ void ItemUseInBattle_Escape(u8);
void ItemUseOutOfBattle_EnigmaBerry(u8);
void ItemUseInBattle_EnigmaBerry(u8);
void ItemUseOutOfBattle_CannotUse(u8);
+u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
#endif // GUARD_ITEM_USE_H