summaryrefslogtreecommitdiff
path: root/src/enemy
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-02-18 18:18:40 +0200
committerTal Hayon <talhayon1@gmail.com>2022-02-18 18:18:40 +0200
commit0e224cf2323a76539730ee35f4e8a0856cf7a1fd (patch)
tree4153b4359e569ce555626b85c63a0533d26eb348 /src/enemy
parent10f8096abd9533e14a5ad03eedcbee4fcbb9019a (diff)
Add playeritem enum and use ids and kinds in all Findentity calls
Diffstat (limited to 'src/enemy')
-rw-r--r--src/enemy/pesto.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c
index 9fa20418..f89f23e0 100644
--- a/src/enemy/pesto.c
+++ b/src/enemy/pesto.c
@@ -10,6 +10,7 @@
#include "game.h"
#include "functions.h"
#include "save.h"
+#include "playeritem.h"
void sub_080249F4(Entity*);
void sub_08024940(Entity*);
@@ -659,7 +660,7 @@ bool32 sub_08024B38(Entity* this) {
}
}
- ent = FindEntityByID(8, 2, 2);
+ ent = FindEntityByID(PLAYER_ITEM, PLAYER_ITEM_BOMB, 2);
if (ent) {
do {
if (ent->action != 2 && ent->z.HALF.HI == 0 && sub_08049F1C(this, ent, 0xa0)) {
@@ -676,7 +677,7 @@ bool32 sub_08024B38(Entity* this) {
return iVar4;
}
- ent = FindEntityByID(6, 5, 6);
+ ent = FindEntityByID(OBJECT, POT, 6);
if (ent) {
do {
if (ent->action == 1 && sub_08049F1C(this, ent, 0xa0)) {