From 1a8d5132d66c731c59ac1eee7eb33ea37a8cc1c4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 20 May 2018 10:51:09 +0200 Subject: [PATCH] fix record mixing for real --- include/global.h | 1 - include/link.h | 1 - include/link_rfu.h | 1 + src/record_mixing.c | 3 ++- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/global.h b/include/global.h index a117a63919..bd2dbe7a67 100644 --- a/include/global.h +++ b/include/global.h @@ -749,7 +749,6 @@ struct SaveBlock1 /*0x3B14*/ struct RecordMixingGift recordMixingGift; /*0x3B24*/ u8 seen2[52]; /*0x3B58*/ LilycoveLady lilycoveLady; - /*0x3B88*/ u8 filler_3B88[0x10]; /*0x3B98*/ struct UnkSaveSubstruct_3b98 unk_3B98[20]; /*0x3C88*/ u8 filler_3C88[0xE8]; /*0x3D70*/ struct WaldaPhrase waldaPhrase; diff --git a/include/link.h b/include/link.h index 9dd85460e5..5b3cd26ca5 100644 --- a/include/link.h +++ b/include/link.h @@ -300,7 +300,6 @@ u8 sub_800AA48(void); void sub_8009FAC(void); bool8 sub_800A4D8(u8 a0); u8 sub_800A9D8(void); -bool8 sub_801048C(u8); u8 sub_800A0C8(s32, s32); #endif // GUARD_LINK_H diff --git a/include/link_rfu.h b/include/link_rfu.h index a6084b1386..ca39c2fb25 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -231,5 +231,6 @@ struct UnkLinkRfuStruct_02022B14 *sub_800F7DC(void); void sub_8011068(u8 a0); void sub_8011170(u32 a0); void sub_8011A64(u8 a0, u16 a1); +u8 sub_801048C(bool32 a0); #endif //GUARD_LINK_RFU_H diff --git a/src/record_mixing.c b/src/record_mixing.c index 43b87f8408..b825e72444 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -13,6 +13,7 @@ #include "pokemon.h" #include "cable_club.h" #include "link.h" +#include "link_rfu.h" #include "tv.h" #include "battle_tower.h" #include "window.h" @@ -105,7 +106,7 @@ static void sub_80E7B2C(const u8 *); static void sub_80E7B60(struct UnkStruct_80E7B60 *, size_t, u8, TVShow *); static void sub_80E7F68(u16 *item, u8 which); static void sub_80E7FF8(u8 taskId); -static void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1); +/*static*/ void sub_80E8110(struct UnkRecordMixingStruct *arg0, struct UnkRecordMixingStruct *arg1); void sub_80E8468(void *, size_t, u8); void sub_80E89AC(void *, size_t, u8); void sub_80E89F8(void *dest);