diff options
author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /include/item_use.h | |
parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) |
fix merge conflicts
Diffstat (limited to 'include/item_use.h')
-rw-r--r-- | include/item_use.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/item_use.h b/include/item_use.h index b35389ee8..61a3b4f7a 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -1,6 +1,8 @@ #ifndef GUARD_ITEM_USE_H #define GUARD_ITEM_USE_H +extern u16 gScriptItemId; + void ItemUseOnFieldCB_Bike(u8); void ItemUseOnFieldCB_Rod(u8); void ItemUseOnFieldCB_Itemfinder(u8); |