Merge branch 'master' into continue_union_room

2019-03-30 12:41:10 -04:00
parent 3b9275b133 35cffea987
commit ccac4694cd
26 changed files with 3595 additions and 8781 deletions
@@ -4741,7 +4741,7 @@ bool32 sub_8011A80(void)
        return FALSE;
 }

-u8 sub_8011A9C(void)
+bool32 sub_8011A9C(void)
 {
    return gUnknown_03005000.unk_ce8;
 }