dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix record mixing for real

Browse Source
This commit is contained in:
DizzyEggg
2018-05-20 10:51:09 +02:00
parent 11d8f489c4
commit 1a8d5132d6
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/global.h
-1
View File
@@ -749,7 +749,6 @@ struct SaveBlock1
/*0x3B14*/ struct RecordMixingGift recordMixingGift; /*0x3B14*/ struct RecordMixingGift recordMixingGift;
/*0x3B24*/ u8 seen2[52]; /*0x3B24*/ u8 seen2[52];
/*0x3B58*/ LilycoveLady lilycoveLady; /*0x3B58*/ LilycoveLady lilycoveLady;
/*0x3B88*/ u8 filler_3B88[0x10];
/*0x3B98*/ struct UnkSaveSubstruct_3b98 unk_3B98[20]; /*0x3B98*/ struct UnkSaveSubstruct_3b98 unk_3B98[20];
/*0x3C88*/ u8 filler_3C88[0xE8]; /*0x3C88*/ u8 filler_3C88[0xE8];
/*0x3D70*/ struct WaldaPhrase waldaPhrase; /*0x3D70*/ struct WaldaPhrase waldaPhrase;
include/link.h
-1
View File
@@ -300,7 +300,6 @@ u8 sub_800AA48(void);
void sub_8009FAC(void); void sub_8009FAC(void);
bool8 sub_800A4D8(u8 a0); bool8 sub_800A4D8(u8 a0);
u8 sub_800A9D8(void); u8 sub_800A9D8(void);
bool8 sub_801048C(u8);
u8 sub_800A0C8(s32, s32); u8 sub_800A0C8(s32, s32);
#endif // GUARD_LINK_H #endif // GUARD_LINK_H
include/link_rfu.h
+1
View File
@@ -231,5 +231,6 @@ struct UnkLinkRfuStruct_02022B14 *sub_800F7DC(void);
void sub_8011068(u8 a0); void sub_8011068(u8 a0);
void sub_8011170(u32 a0); void sub_8011170(u32 a0);
void sub_8011A64(u8 a0, u16 a1); void sub_8011A64(u8 a0, u16 a1);
u8 sub_801048C(bool32 a0);
#endif //GUARD_LINK_RFU_H #endif //GUARD_LINK_RFU_H
src/record_mixing.c
+2 -1
View File
@@ -13,6 +13,7 @@
#include "pokemon.h" #include "pokemon.h"
#include "cable_club.h" #include "cable_club.h"
#include "link.h" #include "link.h"
#include "link_rfu.h"
#include "tv.h" #include "tv.h"
#include "battle_tower.h" #include "battle_tower.h"
#include "window.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_80E7B60(struct UnkStruct_80E7B60 *, size_t, u8, TVShow *);
static void sub_80E7F68(u16 *item, u8 which); static void sub_80E7F68(u16 *item, u8 which);
static void sub_80E7FF8(u8 taskId); 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_80E8468(void *, size_t, u8);
void sub_80E89AC(void *, size_t, u8); void sub_80E89AC(void *, size_t, u8);
void sub_80E89F8(void *dest); void sub_80E89F8(void *dest);