diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
commit | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (patch) | |
tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /src/item_use.c | |
parent | 734403fdfafd1dc4b738f98158dcec45bb01f58b (diff) | |
parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) |
Fix conflicts
Diffstat (limited to 'src/item_use.c')
-rwxr-xr-x | 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 2a1c7883c..4ab9f6e23 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -58,7 +58,7 @@ extern void sub_81C5924(void); extern void sub_81C59BC(void); extern void sub_81AB9A8(u8); extern void sub_81ABA88(u8); -extern void sub_80B7CC8(void); +extern void StartEscapeRopeFieldEffect(void); extern u8* sub_806CF78(u16); extern void sub_81B89F0(void); extern u8 GetItemEffectType(u16); @@ -890,7 +890,7 @@ void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId) void task08_080A1C44(u8 taskId) { ResetInitialPlayerAvatarState(); - sub_80B7CC8(); + StartEscapeRopeFieldEffect(); DestroyTask(taskId); } |