Merge branch 'master' into decomp_record_mixing

2018-05-20 12:16:45 +02:00
parent 1a8d5132d6 de60bdf2fe
commit 4d5bfc149e
161 changed files with 2902 additions and 4845 deletions
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -15,5 +15,6 @@ const u8 *GetSecretBaseTrainerLoseText(void);
 void sub_80E8EE0(struct MapEvents const *events);
 void sub_80E9238(u8 flagIn);
 bool8 CurrentMapIsSecretBase(void);
+void sub_80EA3E4(u8 taskId);

 #endif //GUARD_SECRET_BASE_H