diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2024-03-05 01:33:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-04 19:33:08 -0500 |
| commit | 68a86d2d00d65752983730a7489d40d3cf87cd8c (patch) | |
| tree | 79d438440418d914e719109d241becb43a64a93c /docs | |
| parent | bf37ad1368383f0b5812a7b077915a67df57041d (diff) | |
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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/tutorial/beginning_decomp.md | 4 | ||||
| -rw-r--r-- | docs/tutorial/introduction.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/tutorial/beginning_decomp.md b/docs/tutorial/beginning_decomp.md index 54fde940b..149753d43 100644 --- a/docs/tutorial/beginning_decomp.md +++ b/docs/tutorial/beginning_decomp.md @@ -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 } }, diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md index 80798cd35..b9a658d53 100644 --- a/docs/tutorial/introduction.md +++ b/docs/tutorial/introduction.md @@ -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; |