Merge pull request #334 from hatal175/playerstateflags

This commit is contained in:
notyourav
2022-02-01 15:04:56 -08:00
committed by GitHub
16 changed files with 40 additions and 35 deletions
+2 -2
View File
@@ -137,8 +137,8 @@ u32 sub_0805B1CC(Manager1A* this) {
u32 re = 0;
if (CheckPlayerProximity(this->unk_20, this->unk_22, this->unk_24, this->unk_26)) {
if ((gPlayerState.flags & PL_DROWNING) && (gPlayerState.flags & PL_BUSY)) {
gPlayerState.flags |= 0x8000;
} else if (gPlayerState.flags & 0x8000) {
gPlayerState.flags |= PL_FLAGS8000;
} else if (gPlayerState.flags & PL_FLAGS8000) {
re = 1;
}
}