summaryrefslogtreecommitdiff
path: root/src/item_use.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-12 12:30:41 -0700
committerGitHub <noreply@github.com>2018-04-12 12:30:41 -0700
commitcff12d7907f03a8fe939be854555c2e6353bcab8 (patch)
tree9003393ec7c964e42c39b09b871ea1e252b7372c /src/item_use.c
parenta5cd6e8ef4717aad4a055d5acb6ef250e359fc45 (diff)
parentac7d69eb6e491541837455a2fba0ee63586c6191 (diff)
Merge pull request #234 from KDSKardabox/master
Port map_obj_lock, map_name_popup, rom6 & script_movement
Diffstat (limited to 'src/item_use.c')
-rwxr-xr-xsrc/item_use.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/item_use.c b/src/item_use.c
index 3b6b286b7..80b33220e 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -912,7 +912,7 @@ void re_escape_rope(u8 taskId)
DisplayItemMessageOnField(taskId, gStringVar4, task08_080A1C44);
}
-bool8 sub_80FE314(void)
+bool8 CanUseEscapeRopeOnCurrMap(void)
{
if (gMapHeader.flags & 2)
return TRUE;
@@ -922,7 +922,7 @@ bool8 sub_80FE314(void)
void ItemUseOutOfBattle_EscapeRope(u8 taskId)
{
- if (sub_80FE314() == TRUE)
+ if (CanUseEscapeRopeOnCurrMap() == TRUE)
{
gUnknown_0203A0F4 = re_escape_rope;
SetUpItemUseOnFieldCallback(taskId);