diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-10-16 12:21:30 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-10-16 12:21:30 -0700 |
| commit | 0a28bd17a7e3210791f44778b013c3b999573ea7 (patch) | |
| tree | f5a9755d62a2f9d6693851e1f2ccda197dd39ff4 /include/secret_base.h | |
| parent | b29c65b176bc7441ac38002e2ea9e38f8e4e9ce6 (diff) | |
| parent | e424136fc5e648084125775e45f9084c33ea7303 (diff) | |
Merge remote-tracking branch 'upstream/master' into secret_base
Diffstat (limited to 'include/secret_base.h')
| -rw-r--r-- | include/secret_base.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/secret_base.h b/include/secret_base.h index 0318445ec..0c4ae6694 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -5,12 +5,12 @@ void ResetSecretBases(void); void sub_80BB970(struct MapEvents *); u8 sub_80BBB24(void); void sub_80BBCCC(u8); -void sub_80BC038(); +void sub_80BC038(struct MapPosition *, struct MapEvents *); u8 sub_80BC050(); u8 *GetSecretBaseMapName(u8 *); void sub_80BC300(); u8 sub_80BCCA4(u8); -u8 *sub_80BCCE8(void); +const u8 *sub_80BCCE8(void); void sub_80BCF1C(u8); void sub_80BD674(void *, u32, u8); |