diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 15:42:40 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 16:06:44 -0800 |
| commit | 267ada5ce6e2876c4df64275da9ee879a385c6f6 (patch) | |
| tree | 559417726bbd5f3b18c153c1435f872decfe18b1 /include/item_use.h | |
| parent | 20d00c58ef49fa88533fa07ab1801c381f02b7bf (diff) | |
| parent | 67ad331441f29545b84d152cbbb4f188098a9c5a (diff) | |
Merge remote-tracking branch 'upstream/master' into 80c
Diffstat (limited to 'include/item_use.h')
| -rw-r--r-- | include/item_use.h | 3 |
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 |