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/enemy | |
| parent | 40dd696e1df6670f753406748189c508be6afbd7 (diff) | |
| parent | b34067cb0bdad6e63e830db22a17c5436c8ee9ca (diff) | |
Merge pull request #330 from hatal175/playeractions
Use PlayerActions enum in several places
Diffstat (limited to 'src/enemy')
| -rw-r--r-- | src/enemy/businessScrub.c | 2 | ||||
| -rw-r--r-- | src/enemy/pesto.c | 4 | ||||
| -rw-r--r-- | src/enemy/treeItem.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index 59868dd7..580ece27 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -297,7 +297,7 @@ void sub_08028CE8(Entity* this) { } void sub_08028DE8(Entity* this) { - if (gPlayerEntity.action == 8) { + if (gPlayerEntity.action == PLAYER_ITEMGET) { if (this->field_0x80.HALF.HI == 0) { SetPlayerControl(1); this->field_0x80.HALF.HI = 1; diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index 9533a963..3de6ecab 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -182,7 +182,7 @@ void sub_080241C0(Entity* this) { switch (this->field_0x80.HALF.LO) { case 0: if (PlayerInRange(this, 3, (gPlayerState.hurtBlinkSpeed != 0) ? 0xa0 : 0x40) && sub_08049FDC(this, 3) && - gPlayerEntity.action != 0x1e) { + gPlayerEntity.action != PLAYER_USEENTRANCE) { this->field_0x80.HALF.LO++; this->speed = 0; sub_08024A14(this, 3, 10); @@ -829,7 +829,7 @@ void sub_08024F50(Entity* this) { gPlayerState.field_0xa = 0; gPlayerState.flags &= ~PL_DISABLE_ITEMS; CopyPosition(this, &gPlayerEntity); - gPlayerEntity.action = 1; + gPlayerEntity.action = PLAYER_NORMAL; COLLISION_ON(&gPlayerEntity); gPlayerEntity.iframes = -0x3c; gPlayerEntity.direction = gPlayerEntity.animationState << 2; diff --git a/src/enemy/treeItem.c b/src/enemy/treeItem.c index 188476a4..3e5eca1e 100644 --- a/src/enemy/treeItem.c +++ b/src/enemy/treeItem.c @@ -80,7 +80,7 @@ static bool32 ShouldSpawnTreeItem(Entity* this) { int expectedStateX, expectedStateY; int playerState; - if (gPlayerEntity.action != 0x6) { + if (gPlayerEntity.action != PLAYER_BOUNCE) { return FALSE; } |