diff options
| author | theo3 <arisstephenson2@gmail.com> | 2023-12-31 21:24:07 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2023-12-31 21:26:12 -0800 |
| commit | dcc596ed8763efd9f71ce9a669cb67a1849d7c2b (patch) | |
| tree | 108145ce0ee3172e48ac6529d9d49da53e9719b9 /src/object/objectA8.c | |
| parent | 48fdf9d8277d2bd2e071cb30fc6284c58645e343 (diff) | |
define collisions
Diffstat (limited to 'src/object/objectA8.c')
| -rw-r--r-- | src/object/objectA8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/objectA8.c b/src/object/objectA8.c index 6f47de25..4f602fd0 100644 --- a/src/object/objectA8.c +++ b/src/object/objectA8.c @@ -39,7 +39,7 @@ void ObjectA8(ObjectA8Entity* this) { ObjectA8_Init, ObjectA8_Action1, ObjectA8_Action2, ObjectA8_Action3, ObjectA8_Action4, ObjectA8_Action5, ObjectA8_Action6, }; - if ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0) { + if ((super->contactFlags & CONTACT_NOW) != 0) { switch (super->contactFlags & 0x7f) { case 0: case 1: @@ -77,7 +77,7 @@ void ObjectA8_Init(ObjectA8Entity* this) { super->collisionFlags = 0x17; super->hurtType = 0x48; super->hitType = 7; - super->flags2 = 0x17; + super->collisionMask = 0x17; super->hitbox = (Hitbox*)&gUnk_080FD1A8; super->gustJarFlags = 1; this->unk_74 = super->x.HALF.HI; |
