diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2021-11-05 02:14:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 02:14:08 -0700 |
| commit | 3592e47cd6167082e866b1a391781995df253c3b (patch) | |
| tree | 4be4f5adbc56ccc7bb5159ea6ab77a15efd41fce /src/object/button.c | |
| parent | 90ed4a86cec815af8fb37d998f96a5c22945f9c2 (diff) | |
| parent | a2cf26927296d5adf356f25b24bd2b984ca79f4f (diff) | |
Merge pull request #189 from notyourav/m
Entity changes, textbox changes
Diffstat (limited to 'src/object/button.c')
| -rw-r--r-- | src/object/button.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/button.c b/src/object/button.c index 52876a45..8bbd7bca 100644 --- a/src/object/button.c +++ b/src/object/button.c @@ -153,11 +153,11 @@ Entity* sub_08081D74(Entity* this) { } ent = 0; if (sub_08081E0C(this)) { - if (!(gPlayerState.flags.all & 0x10) && !(gPlayerState.flags.all & 0x80)) { + if (!(gPlayerState.flags & 0x10) && !(gPlayerState.flags & 0x80)) { ent = &gPlayerEntity; } } else { - if (gPlayerState.flags.all & 0x400000) { + if (gPlayerState.flags & 0x400000) { if (sub_080041A0(this, gUnk_03004040[0], 5, 6)) { ent = gUnk_03004040[0]; } else if (sub_080041A0(this, gUnk_03004040[1], 5, 6)) { |