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/npc | |
| parent | 48fdf9d8277d2bd2e071cb30fc6284c58645e343 (diff) | |
define collisions
Diffstat (limited to 'src/npc')
| -rw-r--r-- | src/npc/cat.c | 2 | ||||
| -rw-r--r-- | src/npc/npc5.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/npc/cat.c b/src/npc/cat.c index a3228998..9adf40f1 100644 --- a/src/npc/cat.c +++ b/src/npc/cat.c @@ -140,7 +140,7 @@ void sub_080677EC(CatEntity* this) { super->collisionFlags = 7; super->hurtType = 0x48; super->hitType = -0x58; - super->flags2 = 1; + super->collisionMask = 1; this->unk_69 = 0xff; if (super->x.HALF.HI < gPlayerEntity.base.x.HALF.HI) { super->spriteSettings.flipX = 1; diff --git a/src/npc/npc5.c b/src/npc/npc5.c index 1b60767d..b6b17ca6 100644 --- a/src/npc/npc5.c +++ b/src/npc/npc5.c @@ -2,7 +2,7 @@ * @file npc5.c * @ingroup NPCs * - * @brief NPC 5 + * @brief Unused Zelda follower NPC. */ #include "collision.h" #include "functions.h" @@ -166,7 +166,7 @@ void sub_08060AE0(NPC5Entity* this) { super->collisionFlags = 7; super->hurtType = 0x48; super->hitType = 0x49; - super->flags2 = 3; + super->collisionMask = 3; super->hitbox = (Hitbox*)&gHitbox_0; super->followerFlag &= 0xfe; this->unk_6c = 0xff; @@ -525,7 +525,7 @@ u32 sub_080611D4(Entity* this) { u32 sub_08061230(NPC5Entity* this) { if ((((UnkHeap*)super->myHeap)->unk_0 & 1) == 0) { - if ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0) { + if ((super->contactFlags & CONTACT_NOW) != 0) { switch (super->contactFlags & 0x7f) { case 0: case 1: |