diff options
| author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
| commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
| tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /include/item_menu.h | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/item_menu.h')
| -rw-r--r-- | include/item_menu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/item_menu.h b/include/item_menu.h index d12b9f394..187674e83 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -25,7 +25,7 @@ extern u16 gSpecialVar_ItemId; // Exported ROM declarations void sub_81AAC50(void); void sub_81AAC70(void); -void sub_8108CF0(void); +void CB2_SetUpReshowBattleScreenAfterMenu(void); void sub_81089BC(void); void sub_810B108(u8); void CB2_BagMenuFromStartMenu(void); @@ -39,6 +39,6 @@ void sub_8107ECC(void); void sub_810AF74(void); void sub_8108DC8(u8 pocketId); void sub_81089F4(u8 pocketId); -void sub_8107DB4(u8 menuType, u8 pocket, MainCallback callback); +void GoToBagMenu(u8 menuType, u8 pocket, MainCallback callback); #endif //GUARD_ITEM_MENU_H |