diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-01-29 22:43:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-29 22:43:26 -0800 |
| commit | 8dfc9f47f282fc874fd1501951e91b05fcdbf546 (patch) | |
| tree | a4abd7d9f9baac09d7ef4dbb4de7f5e886fd27fd /src/object | |
| parent | 40dd696e1df6670f753406748189c508be6afbd7 (diff) | |
| parent | b34067cb0bdad6e63e830db22a17c5436c8ee9ca (diff) | |
Merge pull request #330 from hatal175/playeractions
Use PlayerActions enum in several places
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/mask.c | 2 | ||||
| -rw-r--r-- | src/object/object6A.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/object/mask.c b/src/object/mask.c index 596cb3a7..00c9e957 100644 --- a/src/object/mask.c +++ b/src/object/mask.c @@ -58,7 +58,7 @@ void sub_080929A4(Entity* this) { // Probably related to knocking it down void sub_08092A94(Entity* this) { // Check for the first frame of bonking animation - if (gPlayerEntity.action != 6) { + if (gPlayerEntity.action != PLAYER_BOUNCE) { return; } diff --git a/src/object/object6A.c b/src/object/object6A.c index 91c7108a..e3750c43 100644 --- a/src/object/object6A.c +++ b/src/object/object6A.c @@ -413,7 +413,7 @@ void sub_08094FA8(Object6AEntity* this) { } break; case 3: - if (gPlayerEntity.action != 12) { + if (gPlayerEntity.action != PLAYER_EMPTYBOTTLE) { super->action = 4; #ifndef EU if (!CheckGlobalFlag(BIN_DOGFOOD)) { |