summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-01-29 15:43:09 +0200
committerTal Hayon <talhayon1@gmail.com>2022-01-29 15:43:09 +0200
commitb34067cb0bdad6e63e830db22a17c5436c8ee9ca (patch)
tree06669acecded4eef9d828b14874fcc1c11fc4148 /src/object
parentfd9049f59801a77ced44d85329ee871fda031d22 (diff)
Use PlayerActions enum in several places
Diffstat (limited to 'src/object')
-rw-r--r--src/object/mask.c2
-rw-r--r--src/object/object6A.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/object/mask.c b/src/object/mask.c
index 5d94288f..17625019 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 29dcb2ef..a186efd2 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)) {