diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
| commit | 26a48d7e926d3c7841a28b2af8cbbd170923469e (patch) | |
| tree | fa83e9a7105769c66e3a66b3c6871984293db329 /include/record_mixing.h | |
| parent | 39efcb2a6d169fba0ff33f1bd25e2947b74881a0 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into use_pokeblock
Diffstat (limited to 'include/record_mixing.h')
| -rw-r--r-- | include/record_mixing.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/record_mixing.h b/include/record_mixing.h index 72a089ca1..103f5ad64 100644 --- a/include/record_mixing.h +++ b/include/record_mixing.h @@ -23,11 +23,11 @@ void sub_80B9A88(u8 *a); void sub_80B9B1C(u8 *a, size_t size, u8 index); void sub_80B9B70(u8 *a, size_t size, u8 index); u8 sub_80B9BBC(u16 *a); -void sub_80B9BC4(u32 a, u32 b, u32 c, u32 d); +void sub_80B9BC4(struct RecordMixing_UnknownStruct *, size_t, u8 [][2], u8, u8); u8 sub_80B9C4C(u8 *a); // ASM -void sub_80B9C6C(void *, u32, u8, void *); +void sub_80B9C6C(struct RecordMixing_UnknownStruct *, u32, u8, void *); void sub_80B9F3C(void *, u8); void sub_80BA00C(u8); |