mirror of
https://github.com/zeldaret/oot
synced 2026-07-10 23:12:08 -04:00
Colliders: change "touch, bump" to AT and AC (elems) (#1637)
* toucherFlags, bumperFlags -> atElemFlags, acElemFlags * TOUCH_ -> ATELEM_ * BUMP_ -> ACELEM_ * ColliderElementTouch,Bump -> ColliderElementDamageInfoAT,AC * toucher,bumper -> atDmgInfo,acDmgInfo * Update docs and zcolchk funcs names * run formatter * remove the last mentions of "bump" for colliders * Update renamed functions in disasm
This commit is contained in:
@@ -666,8 +666,8 @@ extern ColliderCylinderInit D_80A88CB4;
|
||||
// ELEMTYPE_UNK0,
|
||||
// { 0x00000000, 0x00, 0x00 },
|
||||
// { 0x00000004, 0x00, 0x00 },
|
||||
// TOUCH_NONE,
|
||||
// BUMP_ON,
|
||||
// ATELEM_NONE,
|
||||
// ACELEM_ON,
|
||||
// OCELEM_ON,
|
||||
// },
|
||||
// { 170, 150, 0, { 0, 0, 0 } },
|
||||
|
||||
@@ -33,7 +33,7 @@ void func_80A13098(EnFirefly* this) {
|
||||
} else {
|
||||
this->actor.params -= 2;
|
||||
}
|
||||
this->collider.list->body.toucher.effect = 1;
|
||||
this->collider.list->body.atDmgInfo.effect = 1;
|
||||
this->auraType = 1;
|
||||
this->onFire = 1;
|
||||
this->actor.naviEnemyId = 0x11;
|
||||
|
||||
Reference in New Issue
Block a user