Fixed Escape Rope using bug. Thanks ExpoSeed!

This commit is contained in:
Eduardo Quezada 2020-10-25 01:08:27 -03:00
parent 14f3d69c83
commit 9eeb574ad1
2 changed files with 4 additions and 3 deletions

View File

@ -1281,13 +1281,12 @@ const struct Item gItems[] =
{ {
.name = _("Escape Rope"), .name = _("Escape Rope"),
.itemId = ITEM_ESCAPE_ROPE, .itemId = ITEM_ESCAPE_ROPE,
.price = 550,
.description = sEscapeRopeDesc, .description = sEscapeRopeDesc,
#if I_KEY_ESCAPE_ROPE >= GEN_8 #if I_KEY_ESCAPE_ROPE >= GEN_8
.price = 0,
.importance = 1, .importance = 1,
.pocket = POCKET_KEY_ITEMS, .pocket = POCKET_KEY_ITEMS,
#else #else
.price = 550,
.importance = 0, .importance = 0,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
#endif #endif

View File

@ -910,7 +910,9 @@ void Task_UseDigEscapeRopeOnField(u8 taskId)
static void ItemUseOnFieldCB_EscapeRope(u8 taskId) static void ItemUseOnFieldCB_EscapeRope(u8 taskId)
{ {
Overworld_ResetStateAfterDigEscRope(); Overworld_ResetStateAfterDigEscRope();
#if I_KEY_ESCAPE_ROPE < GEN_8
RemoveUsedItem(); RemoveUsedItem();
#endif
gTasks[taskId].data[0] = 0; gTasks[taskId].data[0] = 0;
DisplayItemMessageOnField(taskId, gStringVar4, Task_UseDigEscapeRopeOnField); DisplayItemMessageOnField(taskId, gStringVar4, Task_UseDigEscapeRopeOnField);
} }