mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 04:24:43 +00:00
Code Issues Projects Releases Wiki Activity

Named a couple things in z_boss_ganon2.c (#1606)

Browse Source 
* Fixed minor style inconsistencies for CollisionCheckInfoInit

* Minor renaming in z_boss_ganon2.c

* Update z_boss_ganon2.c

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
Phil 2024-01-12 10:56:16 -06:00 committed by GitHub
parent f4306900ee
commit 616d6d4e46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View File

@ -1878,8 +1878,8 @@ void func_80902348(BossGanon2* this, PlayState* play) {
} }
} }
void func_80902524(BossGanon2* this, PlayState* play) { void BossGanon2_CollisionCheck(BossGanon2* this, PlayState* play) {
s8 temp_v0_4; s8 health;
ColliderElement* acHitElem; ColliderElement* acHitElem;
s16 i; s16 i;
u8 phi_v1_2; u8 phi_v1_2;
@ -1909,11 +1909,11 @@ void func_80902524(BossGanon2* this, PlayState* play) {
Actor_PlaySfx(&this->actor, NA_SE_EN_MGANON_DAMAGE); Actor_PlaySfx(&this->actor, NA_SE_EN_MGANON_DAMAGE);
Audio_StopSfxById(NA_SE_EN_MGANON_UNARI); Audio_StopSfxById(NA_SE_EN_MGANON_UNARI);
this->actor.colChkInfo.health -= 2; this->actor.colChkInfo.health -= 2;
temp_v0_4 = this->actor.colChkInfo.health; health = this->actor.colChkInfo.health;
if (temp_v0_4 < 0x15 && this->unk_334 == 0) { if (health <= 20 && this->unk_334 == 0) {
func_80900818(this, play); func_80900818(this, play);
} else { } else {
if (temp_v0_4 <= 0) { if (health <= 0) {
func_80901020(this, play); func_80901020(this, play);
} else { } else {
func_80900210(this, play); func_80900210(this, play);
@ -1943,13 +1943,13 @@ void func_80902524(BossGanon2* this, PlayState* play) {
} }
} }
this->actor.colChkInfo.health -= phi_v1_2; this->actor.colChkInfo.health -= phi_v1_2;
temp_v0_4 = this->actor.colChkInfo.health; health = this->actor.colChkInfo.health;
if ((temp_v0_4 < 0x15) && (this->unk_334 == 0)) { if ((health <= 20) && (this->unk_334 == 0)) {
func_80900818(this, play); func_80900818(this, play);
} else if ((temp_v0_4 <= 0) && (phi_v1_2 >= 2)) { } else if ((health <= 0) && (phi_v1_2 >= 2)) {
func_80901020(this, play); func_80901020(this, play);
} else { } else {
if (temp_v0_4 <= 0) { if (health <= 0) {
this->actor.colChkInfo.health = 1; this->actor.colChkInfo.health = 1;
} }
func_80900210(this, play); func_80900210(this, play);
@ -2067,7 +2067,7 @@ void BossGanon2_Update(Actor* thisx, PlayState* play) {
func_80902348(this, play); func_80902348(this, play);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->unk_424.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->unk_424.base);
if (this->actionFunc != func_8090120C) { if (this->actionFunc != func_8090120C) {
func_80902524(this, play); BossGanon2_CollisionCheck(this, play);
CollisionCheck_SetAC(play, &play->colChkCtx, &this->unk_424.base); CollisionCheck_SetAC(play, &play->colChkCtx, &this->unk_424.base);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->unk_444.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->unk_444.base);
CollisionCheck_SetAC(play, &play->colChkCtx, &this->unk_444.base); CollisionCheck_SetAC(play, &play->colChkCtx, &this->unk_444.base);