summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-05-09 18:10:05 +0300
committerTal Hayon <talhayon1@gmail.com>2022-05-09 18:10:05 +0300
commitf6efbab25254e0613f5e63c03dc0948e4c87254b (patch)
treedc09915097e3e21e25245cd631d83f82864f2c59 /src/object
parentc17adeba29769d224745dea4f43f45e054f5108a (diff)
Match sub_080186C0
Diffstat (limited to 'src/object')
-rw-r--r--src/object/object6A.c2
-rw-r--r--src/object/whirlwind.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/object/object6A.c b/src/object/object6A.c
index d1296659..8ff73b6f 100644
--- a/src/object/object6A.c
+++ b/src/object/object6A.c
@@ -808,7 +808,7 @@ void sub_0809584C(Object6AEntity* this) {
u32 tmp, idx;
idx = super->health;
- if ((idx & 0x7F) != 0 && !ReadBit((u32*)gArea.filler5, idx - 1))
+ if ((idx & 0x7F) != 0 && !ReadBit((u32*)gArea.filler6, idx - 1))
DeleteThisEntity();
if (super->timer != 0 && CheckKinstoneFused(super->type2))
DeleteThisEntity();
diff --git a/src/object/whirlwind.c b/src/object/whirlwind.c
index 6017bbe7..5659a5a4 100644
--- a/src/object/whirlwind.c
+++ b/src/object/whirlwind.c
@@ -23,7 +23,7 @@ void Whirlwind(Entity* this) {
Whirlwind_Action2,
};
u32 tmp = this->health;
- if (((tmp & 0x7f) != 0) && (ReadBit(gArea.filler5, tmp - 1) == 0)) {
+ if (((tmp & 0x7f) != 0) && (ReadBit(gArea.filler6, tmp - 1) == 0)) {
DeleteThisEntity();
}
Whirlwind_Actions[this->action](this);