diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-29 09:27:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 09:27:45 -0400 |
| commit | 75ae00beff77e166c4ae573300ed5cb31175e8ac (patch) | |
| tree | ec15c56d3b09c2cec74ac907110c9111e18e8729 /src/item_use.c | |
| parent | d8c9214e0a911882daf28dec07204de3c3c2df80 (diff) | |
| parent | 9cfc34f2ec26d45085d9c4006b21406f8f968ed6 (diff) | |
Merge pull request #315 from PikalaxALT/overworld
Overworld
Diffstat (limited to 'src/item_use.c')
| -rw-r--r-- | src/item_use.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/item_use.c b/src/item_use.c index df3dbaceb..af3243678 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -268,7 +268,7 @@ void FieldUseFunc_MachBike(u8 taskId) || MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE) sub_80A10C4(taskId, gTasks[taskId].data[3], 2, gUnknown_8416451); - else if (sub_8055C9C() == TRUE && !sub_80BD540()) + else if (Overworld_IsBikingAllowed() == TRUE && !sub_80BD540()) { sItemUseOnFieldCB = ItemUseOnFieldCB_Bicycle; sub_80A103C(taskId); @@ -618,7 +618,7 @@ static void sub_80A1B48(u8 taskId) bool8 CanUseEscapeRopeOnCurrMap(void) { - if (gMapHeader.escapeRope & 1) + if (gMapHeader.flags & MAP_ALLOW_ESCAPE_ROPE) return TRUE; else return FALSE; |