Merge master into ObjEvent rename

2019-12-15 02:00:00 -05:00
parent 6556b556dd 6967caefb2
commit 82f55f2381
49 changed files with 1845 additions and 1829 deletions
@@ -16,8 +16,8 @@ bool32 IsMysteryEventEnabled(void);
 void DisableMysteryGift(void);
 void EnableMysteryGift(void);
 bool32 IsMysteryGiftEnabled(void);
-void sub_809D4D8(void);
-void sub_809D570(void);
+void ClearMysteryEventFlags(void);
+void ClearMysteryEventVars(void);
 void DisableResetRTC(void);
 void EnableResetRTC(void);
 bool32 CanResetRTC(void);