diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
commit | 4488bbe9e69a8551cb5bb34e70b8ffb9d8e554db (patch) | |
tree | d9c5a70fd1c4f42dc29f43becd142cc89456f19d /src/item_use.c | |
parent | c15b50ac686632130512de37d01037bff6e10cd2 (diff) | |
parent | 3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff) |
Merge branch 'master' into contest
Diffstat (limited to 'src/item_use.c')
-rwxr-xr-x | src/item_use.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/item_use.c b/src/item_use.c index 80b33220e..d036da6d3 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -91,7 +91,6 @@ extern u8* sub_806CF78(u16); extern void sub_81B89F0(void); extern u8 GetItemEffectType(u16); extern struct MapConnection *sub_8088A8C(s16, s16); -extern void (*gFieldCallback)(void); void MapPostLoadHook_UseItem(void); void sub_80AF6D4(void); @@ -167,7 +166,7 @@ void MapPostLoadHook_UseItem(void) void Task_CallItemUseOnFieldCallback(u8 taskId) { - if (sub_80ABDFC() == 1) + if (IsWeatherNotFadingIn() == 1) gUnknown_0203A0F4(taskId); } |