fix record mixing merge conflicts
This commit is contained in:
@@ -293,4 +293,14 @@ extern u32 gFiller_03004138;
|
||||
extern u32 gFiller_0300413C;
|
||||
extern u32 gFiller_03003080;
|
||||
|
||||
bool32 Link_AnyPartnersPlayingRubyOrSapphire(void);
|
||||
bool32 sub_800A03C(void);
|
||||
void sub_8009628(u8);
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user