summaryrefslogtreecommitdiff
path: root/src/code_08049DF4.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/code_08049DF4.c')
-rw-r--r--src/code_08049DF4.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/code_08049DF4.c b/src/code_08049DF4.c
index 91029146..01063df0 100644
--- a/src/code_08049DF4.c
+++ b/src/code_08049DF4.c
@@ -21,7 +21,10 @@ Entity* sub_08049DF4(u32 arg0) {
}
Entity* sub_08049E18(void) {
- if ((gPlayerState.field_0x3c[0] == 0) && !(gPlayerState.flags & 0x22189b75)) {
+ if ((gPlayerState.field_0x3c[0] == 0) &&
+ !(gPlayerState.flags &
+ (PL_BUSY | PL_DROWNING | PL_CAPTURED | PL_USE_PORTAL | PL_HIDDEN | PL_DISABLE_ITEMS | PL_FALLING | PL_FROZEN |
+ PL_IN_MINECART | PL_PIT_IS_EXIT | PL_MOLDWORM_CAPTURED | PL_IN_HOLE | PL_FLAGS2000000 | PL_CLIMBING))) {
gUnk_020000B0 = &gPlayerEntity;
return &gPlayerEntity;
}
@@ -29,7 +32,10 @@ Entity* sub_08049E18(void) {
}
Entity* sub_08049E4C(void) {
- if ((gPlayerState.field_0x3c[0] == 0) && !(gPlayerState.flags & 0x22189bf5)) {
+ if ((gPlayerState.field_0x3c[0] == 0) &&
+ !(gPlayerState.flags & (PL_BUSY | PL_DROWNING | PL_CAPTURED | PL_USE_PORTAL | PL_HIDDEN | PL_MINISH |
+ PL_DISABLE_ITEMS | PL_FALLING | PL_FROZEN | PL_IN_MINECART | PL_PIT_IS_EXIT |
+ PL_MOLDWORM_CAPTURED | PL_IN_HOLE | PL_FLAGS2000000 | PL_CLIMBING))) {
gUnk_020000B0 = &gPlayerEntity;
return &gPlayerEntity;
}