diff options
author | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-07-07 16:54:14 -0500 |
commit | f719abf104e304ed2f886a413d1132a75e3379b1 (patch) | |
tree | 352be6d36f1db3f697394bc193adb7fa8142be71 /include/secret_base.h | |
parent | 2d604191592fbac2618d4a626f61ff1423cac828 (diff) | |
parent | bd4a6520eaaaac186b6b26557305be8939a7ea2a (diff) |
fix merge conflicts
Diffstat (limited to 'include/secret_base.h')
-rw-r--r-- | include/secret_base.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/secret_base.h b/include/secret_base.h index 3ca5ab182..3ea75ce27 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -10,6 +10,7 @@ u8 sub_80BC050(); void sub_80BC300(); const u8 sub_80BCCA4(u8); u8 *sub_80BCCE8(void); +void sub_80BCF1C(u8); void sub_80BD674(void *, u32, u8); #endif // GUARD_SECRET_BASE_H |