diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
| commit | e44f35c7b7fb49a55073c5b40257a4b8052cd5a0 (patch) | |
| tree | ad35f76e058386824229a64290a1ef15a9f120c2 /include/link.h | |
| parent | 0c1f85f2002e911f64a3b188fa30d8f465c0fc7e (diff) | |
| parent | db898d0e4854c70a356d037919ea48aed1f62816 (diff) | |
fix record mixing merge conflicts
Diffstat (limited to 'include/link.h')
| -rw-r--r-- | include/link.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/link.h b/include/link.h index 051370897..9dd85460e 100644 --- a/include/link.h +++ b/include/link.h @@ -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 |