diff options
Diffstat (limited to 'src/object/lightableSwitch.c')
| -rw-r--r-- | src/object/lightableSwitch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c index 06bb3244..a6f0427f 100644 --- a/src/object/lightableSwitch.c +++ b/src/object/lightableSwitch.c @@ -58,7 +58,7 @@ void LightableSwitch_Type0_Init(LightableSwitchEntity* this) { super->collisionFlags = 7; super->hurtType = 0x48; super->hitType = 0x28; - super->flags2 = 10; + super->collisionMask = 10; super->hitbox = (Hitbox*)&gHitbox_0; sub_0809EAD8(this); UpdateSpriteForCollisionLayer(super); @@ -67,7 +67,7 @@ void LightableSwitch_Type0_Init(LightableSwitchEntity* this) { void LightableSwitch_Type0_Action1(LightableSwitchEntity* this) { - if ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0) { + if ((super->contactFlags & CONTACT_NOW) != 0) { if (CheckFlags(this->unk_86) != 0) { ClearFlag(this->unk_86); } else { @@ -136,7 +136,7 @@ void LightableSwitch_Type1_Init(LightableSwitchEntity* this) { super->collisionFlags = 7; super->hurtType = 0x48; super->hitType = 0x28; - super->flags2 = 10; + super->collisionMask = 10; super->hitbox = (Hitbox*)&gHitbox_0; sub_0809EAD8(this); UpdateSpriteForCollisionLayer(super); @@ -147,7 +147,7 @@ void LightableSwitch_Type1_Init(LightableSwitchEntity* this) { } void LightableSwitch_Type1_Action1(LightableSwitchEntity* this) { - if ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0) { + if ((super->contactFlags & CONTACT_NOW) != 0) { super->action = 2; super->timer = 16; super->frameIndex = 2; |