Merge master into ObjEvent rename and prune accidental inclusions

2020-01-08 05:43:06 -05:00
parent 68cdd7b1cb
commit ef67f2d33b
85 changed files with 4548 additions and 4729 deletions
@@ -41,10 +41,10 @@ void sub_81C5924(void);
 void sub_81C59BC(void);
 void sub_81C4EFC(void);
 void GoToBattlePyramidBagMenu(u8 a0, void (*callback)(void));
-void sub_81C6714(u8 taskId);
+void Task_CloseBattlePyramidBagMessage(u8 taskId);
 void TryStoreHeldItemsInPyramidBag(void);
 void ChooseItemsToTossFromPyramidBag(void);
-void sub_81C5B14(u8 taskId);
+void CloseBattlePyramidBagAndSetCallback(u8 taskId);
 void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId));

 #endif // GUARD_BATTLE_PYRAMID_BAG_H