Merge remote-tracking branch 'zeldaret/master'

This commit is contained in:
Ethan Roseman 2020-06-06 19:57:26 -04:00
commit 0a7ff1285b
3 changed files with 3 additions and 3 deletions

View File

@ -26,4 +26,4 @@ u32 sub_08052690()
{
return (gUnk_02033A90 >> 3) & 1;
}
}

View File

@ -5,4 +5,4 @@ extern u8 gUnk_02033A90;
bool32 sub_08052620(u32 r0)
{
return gUnk_02033A90 == 0x81;
}
}

View File

@ -10,4 +10,4 @@ void sub_080AD834(void)
sub_08056010(1);
}
return;
}
}