Merge master from pret

2018-05-09 05:10:23 -05:00
parent d66c1c642c f14d2765da
commit b570f87152
99 changed files with 9529 additions and 12474 deletions
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -12,5 +12,6 @@ u8 *GetSecretBaseMapName(u8 *dest);
 const u8 *GetSecretBaseTrainerLoseText(void);
 void sub_80E8EE0(struct MapEvents const *events);
 void sub_80E9238(u8 flagIn);
+bool8 CurrentMapIsSecretBase(void);

 #endif //GUARD_SECRET_BASE_H