mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +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

10
src/overlays/actors/ovl_En_Skj/z_en_skj.c
View file

@ -183,8 +183,8 @@ static ColliderCylinderInitType1 D_80B01678 = {
ELEMTYPE_UNK0,
{ 0xFFCFFFFF, 0x0, 0x08 },
{ 0xFFCFFFFF, 0x0, 0x0 },
TOUCH_ON | TOUCH_SFX_NORMAL,
BUMP_ON,
ATELEM_ON | ATELEM_SFX_NORMAL,
ACELEM_ON,
OCELEM_ON,
},
{ 8, 48, 0, { 0, 0, 0 } },
@ -585,9 +585,9 @@ s32 EnSkj_CollisionCheck(EnSkj* this, PlayState* play) {
this->collider.base.acFlags &= ~AC_HIT;
switch (this->actor.colChkInfo.damageEffect) {
case 0xF:
effectPos.x = this->collider.elem.bumper.hitPos.x;
effectPos.y = this->collider.elem.bumper.hitPos.y;
effectPos.z = this->collider.elem.bumper.hitPos.z;
effectPos.x = this->collider.elem.acDmgInfo.hitPos.x;
effectPos.y = this->collider.elem.acDmgInfo.hitPos.y;
effectPos.z = this->collider.elem.acDmgInfo.hitPos.z;
EnSkj_SpawnBlood(play, &effectPos);
EffectSsHitMark_SpawnFixedScale(play, 1, &effectPos);