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

60
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
View file

@ -54,8 +54,8 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = {
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
TOUCH_NONE,
BUMP_ON,
ATELEM_NONE,
ACELEM_ON,
OCELEM_ON,
},
{ 15, { { 0, 0, 0 }, 17 }, 100 },
@ -65,8 +65,8 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = {
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
TOUCH_NONE,
BUMP_ON,
ATELEM_NONE,
ACELEM_ON,
OCELEM_ON,
},
{ 14, { { 0, 0, 0 }, 15 }, 100 },
@ -76,8 +76,8 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = {
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
TOUCH_NONE,
BUMP_ON,
ATELEM_NONE,
ACELEM_ON,
OCELEM_ON,
},
{ 13, { { 0, 0, 0 }, 10 }, 100 },
@ -87,8 +87,8 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = {
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
TOUCH_NONE,
BUMP_NONE,
ATELEM_NONE,
ACELEM_NONE,
OCELEM_ON,
},
{ 21, { { 0, 0, 0 }, 20 }, 100 },
@ -98,8 +98,8 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = {
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
TOUCH_NONE,
BUMP_NONE,
ATELEM_NONE,
ACELEM_NONE,
OCELEM_ON,
},
{ 28, { { 0, 0, 0 }, 20 }, 100 },
@ -109,8 +109,8 @@ static ColliderJntSphElementInit sBodyElementsInit[6] = {
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x0D800691, 0x00, 0x00 },
TOUCH_NONE,
BUMP_ON,
ATELEM_NONE,
ACELEM_ON,
OCELEM_ON | OCELEM_UNK3,
},
{ 6, { { 0, 0, 0 }, 35 }, 100 },
@ -136,8 +136,8 @@ static ColliderTrisElementInit sHardElementsInit[3] = {
ELEMTYPE_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xF24BF96E, 0x00, 0x00 },
TOUCH_NONE,
BUMP_ON | BUMP_HOOKABLE | BUMP_NO_AT_INFO,
ATELEM_NONE,
ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO,
OCELEM_NONE,
},
{ { { -10.0f, 14.0f, 2.0f }, { -10.0f, -6.0f, 2.0f }, { 9.0f, 14.0f, 2.0f } } },
@ -147,8 +147,8 @@ static ColliderTrisElementInit sHardElementsInit[3] = {
ELEMTYPE_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCBF96E, 0x00, 0x00 },
TOUCH_NONE,
BUMP_ON | BUMP_HOOKABLE | BUMP_NO_AT_INFO,
ATELEM_NONE,
ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO,
OCELEM_NONE,
},
{ { { -10.0f, -6.0f, 2.0f }, { 9.0f, -6.0f, 2.0f }, { 9.0f, 14.0f, 2.0f } } },
@ -158,8 +158,8 @@ static ColliderTrisElementInit sHardElementsInit[3] = {
ELEMTYPE_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCBF96E, 0x00, 0x00 },
TOUCH_NONE,
BUMP_ON | BUMP_HOOKABLE | BUMP_NO_AT_INFO,
ATELEM_NONE,
ACELEM_ON | ACELEM_HOOKABLE | ACELEM_NO_AT_INFO,
OCELEM_NONE,
},
{ { { -10.0f, -6.0f, 2.0f }, { 9.0f, -6.0f, 2.0f }, { 9.0f, 14.0f, 2.0f } } },
@ -192,8 +192,8 @@ static ColliderQuadInit sAttackQuadInit = {
ELEMTYPE_UNK0,
{ 0x20000000, 0x01, 0x10 },
{ 0x00000000, 0x00, 0x00 },
TOUCH_ON | TOUCH_SFX_NORMAL | TOUCH_UNK7,
BUMP_NONE,
ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7,
ACELEM_NONE,
OCELEM_NONE,
},
{ { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
@ -605,13 +605,13 @@ void EnDodongo_SweepTail(EnDodongo* this, PlayState* play) {
if (SkelAnime_Update(&this->skelAnime)) {
if ((this->timer != 0) || (ABS(yawDiff1) < 0x4000)) {
this->sphElements[2].base.toucherFlags = TOUCH_NONE;
this->sphElements[1].base.toucherFlags = TOUCH_NONE;
this->sphElements[2].base.atElemFlags = ATELEM_NONE;
this->sphElements[1].base.atElemFlags = ATELEM_NONE;
this->colliderBody.base.atFlags = AT_NONE;
this->sphElements[2].base.toucher.dmgFlags = 0;
this->sphElements[1].base.toucher.dmgFlags = 0;
this->sphElements[2].base.toucher.damage = 0;
this->sphElements[1].base.toucher.damage = 0;
this->sphElements[2].base.atDmgInfo.dmgFlags = 0;
this->sphElements[1].base.atDmgInfo.dmgFlags = 0;
this->sphElements[2].base.atDmgInfo.damage = 0;
this->sphElements[1].base.atDmgInfo.damage = 0;
EnDodongo_SetupBreatheFire(this);
this->timer = Rand_S16Offset(5, 10);
} else {
@ -628,10 +628,10 @@ void EnDodongo_SweepTail(EnDodongo* this, PlayState* play) {
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_J_TAIL);
Animation_PlayOnceSetSpeed(&this->skelAnime, animation, 2.0f);
this->timer = 18;
this->colliderBody.base.atFlags = this->sphElements[1].base.toucherFlags =
this->sphElements[2].base.toucherFlags = AT_ON | AT_TYPE_ENEMY; // also TOUCH_ON | TOUCH_SFX_WOOD
this->sphElements[1].base.toucher.dmgFlags = this->sphElements[2].base.toucher.dmgFlags = DMG_DEFAULT;
this->sphElements[1].base.toucher.damage = this->sphElements[2].base.toucher.damage = 8;
this->colliderBody.base.atFlags = this->sphElements[1].base.atElemFlags =
this->sphElements[2].base.atElemFlags = AT_ON | AT_TYPE_ENEMY; // also ATELEM_ON | ATELEM_SFX_WOOD
this->sphElements[1].base.atDmgInfo.dmgFlags = this->sphElements[2].base.atDmgInfo.dmgFlags = DMG_DEFAULT;
this->sphElements[1].base.atDmgInfo.damage = this->sphElements[2].base.atDmgInfo.damage = 8;
}
} else if (this->timer > 1) {
Vec3f tailPos;