mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 07:51:48 +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

18
src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
View file

@ -46,8 +46,8 @@ static ColliderCylinderInit sCylinderInit = {
ELEMTYPE_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0x0003F828, 0x00, 0x00 },
TOUCH_NONE,
BUMP_ON,
ATELEM_NONE,
ACELEM_ON,
OCELEM_ON,
},
{ 9, 18, 10, { 0, 0, 0 } },
@ -59,8 +59,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
ELEMTYPE_UNK0,
{ 0x00000008, 0x00, 0x08 },
{ 0x00000000, 0x00, 0x00 },
TOUCH_ON | TOUCH_SFX_NONE,
BUMP_NONE,
ATELEM_ON | ATELEM_SFX_NONE,
ACELEM_NONE,
OCELEM_NONE,
},
{ 0, { { 0, 0, 0 }, 0 }, 100 },
@ -121,7 +121,7 @@ void EnBombf_Init(Actor* thisx, PlayState* play) {
EnBombf_SetupAction(this, EnBombf_Move);
} else {
thisx->colChkInfo.mass = MASS_IMMOVABLE;
this->bumpOn = true;
this->colliderSetOC = true;
this->flowerBombScale = 1.0f;
EnBombf_SetupGrowBomb(this, thisx->params);
}
@ -320,13 +320,13 @@ void EnBombf_Update(Actor* thisx, PlayState* play) {
s32 pad[2];
EnBombf* this = (EnBombf*)thisx;
if ((this->isFuseEnabled) && (this->timer != 0)) {
if (this->isFuseEnabled && (this->timer != 0)) {
this->timer--;
}
if ((!this->bumpOn) && (!Actor_HasParent(thisx, play)) &&
if (!this->colliderSetOC && !Actor_HasParent(thisx, play) &&
((thisx->xzDistToPlayer >= 20.0f) || (ABS(thisx->yDistToPlayer) >= 80.0f))) {
this->bumpOn = true;
this->colliderSetOC = true;
}
this->actionFunc(this, play);
@ -444,7 +444,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) {
Collider_UpdateCylinder(thisx, &this->bombCollider);
if ((this->flowerBombScale >= 1.0f) && (this->bumpOn)) {
if ((this->flowerBombScale >= 1.0f) && this->colliderSetOC) {
CollisionCheck_SetOC(play, &play->colChkCtx, &this->bombCollider.base);
}

2
src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
View file

@ -16,7 +16,7 @@ typedef struct EnBombf {
/* 0x01F8 */ s16 timer;
/* 0x01FC */ EnBombfActionFunc actionFunc;
/* 0x0200 */ s32 isFuseEnabled; // enables the ability to ignite and tick down to explode
/* 0x0204 */ u8 bumpOn;
/* 0x0204 */ u8 colliderSetOC;
/* 0x0206 */ s16 flashSpeedScale;
/* 0x0208 */ f32 flashIntensity;
/* 0x020C */ f32 flowerBombScale;