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

12
src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
View file

@ -52,8 +52,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
ELEMTYPE_UNK0,
{ 0xFFCFFFFF, 0x01, 0x08 },
{ 0xFFCFFFFF, 0x00, 0x00 },
TOUCH_ON | TOUCH_SFX_HARD,
BUMP_ON,
ATELEM_ON | ATELEM_SFX_HARD,
ACELEM_ON,
OCELEM_ON,
},
{ 1, { { 0, 1000, 0 }, 15 }, 100 },
@ -118,7 +118,7 @@ static InitChainEntry sInitChain[] = {
void EnFirefly_Extinguish(EnFirefly* this) {
this->actor.params += 2;
this->collider.elements[0].base.toucher.effect = 0; // None
this->collider.elements[0].base.atDmgInfo.effect = 0; // None
this->auraType = KEESE_AURA_NONE;
this->onFire = false;
this->actor.naviEnemyId = NAVI_ENEMY_KEESE;
@ -130,7 +130,7 @@ void EnFirefly_Ignite(EnFirefly* this) {
} else {
this->actor.params -= 2;
}
this->collider.elements[0].base.toucher.effect = 1; // Fire
this->collider.elements[0].base.atDmgInfo.effect = 1; // Fire
this->auraType = KEESE_AURA_FIRE;
this->onFire = true;
this->actor.naviEnemyId = NAVI_ENEMY_FIRE_KEESE;
@ -174,10 +174,10 @@ void EnFirefly_Init(Actor* thisx, PlayState* play) {
}
if (this->actor.params == KEESE_ICE_FLY) {
this->collider.elements[0].base.toucher.effect = 2; // Ice
this->collider.elements[0].base.atDmgInfo.effect = 2; // Ice
this->actor.naviEnemyId = NAVI_ENEMY_ICE_KEESE;
} else {
this->collider.elements[0].base.toucher.effect = 0; // Nothing
this->collider.elements[0].base.atDmgInfo.effect = 0; // Nothing
this->actor.naviEnemyId = NAVI_ENEMY_KEESE;
}