mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 15:04:31 +00:00
Code Issues Projects Releases Wiki Activity

Colliders: change "touch, bump" to AT and AC (elems) (#1637)

Browse source 
* 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:
Dragorn421 2024-03-05 01:33:08 +01:00 • committed by GitHub
parent bf37ad1368
commit 68a86d2d00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
253 changed files with 1509 additions and 1509 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/tutorial/beginning_decomp.md
View file

@ -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 } },

2
docs/tutorial/introduction.md
View file

@ -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;