Merge branch 'master' into continue_union_room

This commit is contained in:
PikalaxALT
2019-03-30 12:41:10 -04:00
26 changed files with 3595 additions and 8781 deletions
+4
View File
@@ -285,5 +285,9 @@ bool8 sub_800DF34(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx);
s32 sub_800E87C(u8 idx);
void sub_8011BA4(void);
void sub_8010198(void);
bool32 sub_8011A9C(void);
void sub_80104B0(void);
void sub_8011A50(void);
void sub_80110B8(u32 a0);
#endif //GUARD_LINK_RFU_H