falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into doc_pause_24_drawinfopanel_quads

This commit is contained in:
Dragorn421 2025-06-22 18:02:46 +02:00
parent 2320b4f9c7 ad7ef14b5d
commit 1a3b728a7a
No known key found for this signature in database
GPG Key ID: 05949E029F4EF294
11 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/collision_check.h
View File

@ -81,11 +81,11 @@ typedef struct ColliderInitToActor {
} ColliderInitToActor; // size = 0x08 } ColliderInitToActor; // size = 0x08
typedef enum HitSpecialEffect { typedef enum HitSpecialEffect {
HIT_SPECIAL_EFFECT_0, // None HIT_SPECIAL_EFFECT_NONE,
HIT_SPECIAL_EFFECT_1, // Fire HIT_SPECIAL_EFFECT_FIRE,
HIT_SPECIAL_EFFECT_2, // Ice HIT_SPECIAL_EFFECT_ICE,
HIT_SPECIAL_EFFECT_3, HIT_SPECIAL_EFFECT_ELECTRIC,
HIT_SPECIAL_EFFECT_4 HIT_SPECIAL_EFFECT_KNOCKBACK
} HitSpecialEffect; } HitSpecialEffect;
typedef struct ColliderElementDamageInfoAT { typedef struct ColliderElementDamageInfoAT {
@ -95,8 +95,8 @@ typedef struct ColliderElementDamageInfoAT {
} ColliderElementDamageInfoAT; // size = 0x08 } ColliderElementDamageInfoAT; // size = 0x08
typedef enum HitBacklash { typedef enum HitBacklash {
HIT_BACKLASH_0, HIT_BACKLASH_NONE,
HIT_BACKLASH_1 // Shock? HIT_BACKLASH_ELECTRIC
} HitBacklash; } HitBacklash;
typedef struct ColliderElementDamageInfoAC { typedef struct ColliderElementDamageInfoAC {

4
src/code/z_collision_check.c
View File

@ -3015,8 +3015,8 @@ void CollisionCheck_InitInfo(CollisionCheckInfo* info) {
void CollisionCheck_ResetDamage(CollisionCheckInfo* info) { void CollisionCheck_ResetDamage(CollisionCheckInfo* info) {
info->damage = 0; info->damage = 0;
info->damageReaction = 0; info->damageReaction = 0;
info->atHitBacklash = HIT_BACKLASH_0; info->atHitBacklash = HIT_BACKLASH_NONE;
info->acHitSpecialEffect = HIT_SPECIAL_EFFECT_0; info->acHitSpecialEffect = HIT_SPECIAL_EFFECT_NONE;
info->displacement.x = info->displacement.y = info->displacement.z = 0.0f; info->displacement.x = info->displacement.y = info->displacement.z = 0.0f;
} }

2
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View File

@ -492,7 +492,7 @@ void BossTw_Init(Actor* thisx, PlayState* play2) {
if (this->actor.params == TW_FIRE_BLAST || this->actor.params == TW_FIRE_BLAST_GROUND) { if (this->actor.params == TW_FIRE_BLAST || this->actor.params == TW_FIRE_BLAST_GROUND) {
this->actionFunc = BossTw_BlastFire; this->actionFunc = BossTw_BlastFire;
this->collider.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_1; this->collider.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_FIRE;
} else if (this->actor.params == TW_ICE_BLAST || this->actor.params == TW_ICE_BLAST_GROUND) { } else if (this->actor.params == TW_ICE_BLAST || this->actor.params == TW_ICE_BLAST_GROUND) {
this->actionFunc = BossTw_BlastIce; this->actionFunc = BossTw_BlastIce;
} else if (this->actor.params >= TW_DEATHBALL_KOTAKE) { } else if (this->actor.params >= TW_DEATHBALL_KOTAKE) {

2
src/overlays/actors/ovl_En_Bb/z_en_bb.c
View File

@ -369,7 +369,7 @@ void EnBb_Init(Actor* thisx, PlayState* play) {
thisx->naviEnemyId = NAVI_ENEMY_RED_BUBBLE; thisx->naviEnemyId = NAVI_ENEMY_RED_BUBBLE;
thisx->colChkInfo.damageTable = &sDamageTableRed; thisx->colChkInfo.damageTable = &sDamageTableRed;
this->flameEnvColor.r = 255; this->flameEnvColor.r = 255;
this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_1; this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_FIRE;
EnBb_SetupRed(play, this); EnBb_SetupRed(play, this);
break; break;
case ENBB_WHITE: case ENBB_WHITE:

4
src/overlays/actors/ovl_En_Bili/z_en_bili.c
View File

@ -157,7 +157,7 @@ void EnBili_Destroy(Actor* thisx, PlayState* play) {
void EnBili_SetupFloatIdle(EnBili* this) { void EnBili_SetupFloatIdle(EnBili* this) {
this->actor.speed = 0.7f; this->actor.speed = 0.7f;
this->collider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_1; this->collider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_ELECTRIC;
this->timer = 32; this->timer = 32;
this->actor.home.pos.y = this->actor.world.pos.y; this->actor.home.pos.y = this->actor.world.pos.y;
this->actor.gravity = 0.0f; this->actor.gravity = 0.0f;
@ -253,7 +253,7 @@ void EnBili_SetupDie(EnBili* this) {
*/ */
void EnBili_SetupStunned(EnBili* this) { void EnBili_SetupStunned(EnBili* this) {
this->timer = 80; this->timer = 80;
this->collider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_0; this->collider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_NONE;
this->actor.gravity = -1.0f; this->actor.gravity = -1.0f;
this->actor.speed = 0.0f; this->actor.speed = 0.0f;
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 150, COLORFILTER_BUFFLAG_XLU, 80); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 150, COLORFILTER_BUFFLAG_XLU, 80);

2
src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
View File

@ -110,7 +110,7 @@ u32 func_809CBCBC(EnBubble* this) {
ColliderElement* elem = &this->colliderJntSph.elements[0].base; ColliderElement* elem = &this->colliderJntSph.elements[0].base;
elem->atDmgInfo.dmgFlags = DMG_EXPLOSIVE; elem->atDmgInfo.dmgFlags = DMG_EXPLOSIVE;
elem->atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_0; elem->atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_NONE;
elem->atDmgInfo.damage = 4; elem->atDmgInfo.damage = 4;
elem->atElemFlags = ATELEM_ON; elem->atElemFlags = ATELEM_ON;
this->actor.velocity.y = 0.0f; this->actor.velocity.y = 0.0f;

4
src/overlays/actors/ovl_En_Bw/z_en_bw.c
View File

@ -786,7 +786,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) {
func_8002836C(play, &thisx->world.pos, &velocity, &accel, &sp50, &sp4C, 0x3C, 0, 0x14); func_8002836C(play, &thisx->world.pos, &velocity, &accel, &sp50, &sp4C, 0x3C, 0, 0x14);
} }
if (this->unk_248 <= 0.4f) { if (this->unk_248 <= 0.4f) {
this->collider1.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_0; this->collider1.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_NONE;
if (((play->gameplayFrames & 1) == 0) && (this->unk_220 < 5) && (this->unk_23C == 0)) { if (((play->gameplayFrames & 1) == 0) && (this->unk_220 < 5) && (this->unk_23C == 0)) {
accel.y = -0.1f; accel.y = -0.1f;
velocity.x = Rand_CenteredFloat(4.0f); velocity.x = Rand_CenteredFloat(4.0f);
@ -806,7 +806,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) {
20.0f - (this->unk_248 * 40.0f)); 20.0f - (this->unk_248 * 40.0f));
} }
} else { } else {
this->collider1.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_1; this->collider1.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_FIRE;
} }
this->unk_234 = Actor_TestFloorInDirection(thisx, play, 50.0f, thisx->world.rot.y); this->unk_234 = Actor_TestFloorInDirection(thisx, play, 50.0f, thisx->world.rot.y);

8
src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
View File

@ -134,7 +134,7 @@ static InitChainEntry sInitChain[] = {
void EnFirefly_Extinguish(EnFirefly* this) { void EnFirefly_Extinguish(EnFirefly* this) {
this->actor.params += 2; this->actor.params += 2;
this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_0; this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_NONE;
this->auraType = KEESE_AURA_NONE; this->auraType = KEESE_AURA_NONE;
this->onFire = false; this->onFire = false;
this->actor.naviEnemyId = NAVI_ENEMY_KEESE; this->actor.naviEnemyId = NAVI_ENEMY_KEESE;
@ -146,7 +146,7 @@ void EnFirefly_Ignite(EnFirefly* this) {
} else { } else {
this->actor.params -= 2; this->actor.params -= 2;
} }
this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_1; this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_FIRE;
this->auraType = KEESE_AURA_FIRE; this->auraType = KEESE_AURA_FIRE;
this->onFire = true; this->onFire = true;
this->actor.naviEnemyId = NAVI_ENEMY_FIRE_KEESE; this->actor.naviEnemyId = NAVI_ENEMY_FIRE_KEESE;
@ -190,10 +190,10 @@ void EnFirefly_Init(Actor* thisx, PlayState* play) {
} }
if (this->actor.params == KEESE_ICE_FLY) { if (this->actor.params == KEESE_ICE_FLY) {
this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_2; this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_ICE;
this->actor.naviEnemyId = NAVI_ENEMY_ICE_KEESE; this->actor.naviEnemyId = NAVI_ENEMY_ICE_KEESE;
} else { } else {
this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_0; this->collider.elements[0].base.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_NONE;
this->actor.naviEnemyId = NAVI_ENEMY_KEESE; this->actor.naviEnemyId = NAVI_ENEMY_KEESE;
} }

2
src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
View File

@ -151,7 +151,7 @@ void EnReeba_Init(Actor* thisx, PlayState* play) {
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Reeba boss appears ☆☆☆☆☆ %f\n") VT_RST, PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Reeba boss appears ☆☆☆☆☆ %f\n") VT_RST,
this->scale); this->scale);
this->actor.colChkInfo.health = 20; this->actor.colChkInfo.health = 20;
this->collider.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_4; this->collider.elem.atDmgInfo.hitSpecialEffect = HIT_SPECIAL_EFFECT_KNOCKBACK;
this->collider.elem.atDmgInfo.damage = 16; this->collider.elem.atDmgInfo.damage = 16;
Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY); Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY);
} }

4
src/overlays/actors/ovl_En_Vali/z_en_vali.c
View File

@ -272,7 +272,7 @@ void EnVali_SetupStunned(EnVali* this) {
this->timer = 80; this->timer = 80;
this->actor.velocity.y = 0.0f; this->actor.velocity.y = 0.0f;
Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_XLU, 80); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 255, COLORFILTER_BUFFLAG_XLU, 80);
this->bodyCollider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_0; this->bodyCollider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_NONE;
Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); Actor_PlaySfx(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
this->actor.velocity.y = 1.0f; this->actor.velocity.y = 1.0f;
this->actionFunc = EnVali_Stunned; this->actionFunc = EnVali_Stunned;
@ -462,7 +462,7 @@ void EnVali_Stunned(EnVali* this, PlayState* play) {
} }
if (this->timer == 0) { if (this->timer == 0) {
this->bodyCollider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_1; this->bodyCollider.elem.acDmgInfo.hitBacklash = HIT_BACKLASH_ELECTRIC;
EnVali_SetupFloatIdle(this); EnVali_SetupFloatIdle(this);
} }
} }

12
src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -4798,7 +4798,7 @@ void func_8083821C(Player* this) {
} }
void func_80838280(Player* this) { void func_80838280(Player* this) {
if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_1) { if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_FIRE) {
func_8083821C(this); func_8083821C(this);
} }
Player_PlayVoiceSfx(this, NA_SE_VO_LI_FALL_L); Player_PlayVoiceSfx(this, NA_SE_VO_LI_FALL_L);
@ -4915,7 +4915,7 @@ s32 func_808382DC(Player* this, PlayState* play) {
} }
} }
if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.hitSpecialEffect == HIT_SPECIAL_EFFECT_1)) { if (sp64 && (this->shieldQuad.elem.acHitElem->atDmgInfo.hitSpecialEffect == HIT_SPECIAL_EFFECT_FIRE)) {
func_8083819C(this, play); func_8083819C(this, play);
} }
@ -4938,11 +4938,11 @@ s32 func_808382DC(Player* this, PlayState* play) {
if (this->stateFlags1 & PLAYER_STATE1_27) { if (this->stateFlags1 & PLAYER_STATE1_27) {
sp4C = PLAYER_HIT_RESPONSE_NONE; sp4C = PLAYER_HIT_RESPONSE_NONE;
} else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_2) { } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_ICE) {
sp4C = PLAYER_HIT_RESPONSE_ICE_TRAP; sp4C = PLAYER_HIT_RESPONSE_ICE_TRAP;
} else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_3) { } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_ELECTRIC) {
sp4C = PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK; sp4C = PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK;
} else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_4) { } else if (this->actor.colChkInfo.acHitSpecialEffect == HIT_SPECIAL_EFFECT_KNOCKBACK) {
sp4C = PLAYER_HIT_RESPONSE_KNOCKBACK_LARGE; sp4C = PLAYER_HIT_RESPONSE_KNOCKBACK_LARGE;
} else { } else {
func_80838280(this); func_80838280(this);
@ -9145,7 +9145,7 @@ s32 func_80842DF4(PlayState* play, Player* this) {
if ((func_80842AC4(play, this) == 0) && (this->heldItemAction != PLAYER_IA_HAMMER)) { if ((func_80842AC4(play, this) == 0) && (this->heldItemAction != PLAYER_IA_HAMMER)) {
func_80842B7C(play, this); func_80842B7C(play, this);
if (this->actor.colChkInfo.atHitBacklash == HIT_BACKLASH_1) { if (this->actor.colChkInfo.atHitBacklash == HIT_BACKLASH_ELECTRIC) {
this->actor.colChkInfo.damage = 8; this->actor.colChkInfo.damage = 8;
func_80837C0C(play, this, PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK, 0.0f, 0.0f, this->actor.shape.rot.y, func_80837C0C(play, this, PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK, 0.0f, 0.0f, this->actor.shape.rot.y,
20); 20);