mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-19 18:04:22 +01:00
Fixed Escape Rope using bug. Thanks ExpoSeed!
This commit is contained in:
parent
14f3d69c83
commit
9eeb574ad1
@ -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
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user