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

Match z_en_bom.c (#1639)

Browse Source
This commit is contained in:
cadmic 2024-01-28 10:03:33 -08:00 committed by GitHub
parent 98a3238822
commit 88aa6de9ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/overlays/actors/ovl_En_Bom/z_en_bom.c
View File

@ -132,7 +132,8 @@ void EnBom_Move(EnBom* this, PlayState* play) {
// rebound bomb off the wall it hits // rebound bomb off the wall it hits
if ((this->actor.speed != 0.0f) && (this->actor.bgCheckFlags & BGCHECKFLAG_WALL)) { if ((this->actor.speed != 0.0f) && (this->actor.bgCheckFlags & BGCHECKFLAG_WALL)) {
if (ABS((s16)(this->actor.wallYaw - this->actor.world.rot.y)) > 0x4000) { s16 yawDiff = this->actor.wallYaw - this->actor.world.rot.y;
if (ABS(yawDiff) > 0x4000) {
this->actor.world.rot.y = ((this->actor.wallYaw - this->actor.world.rot.y) + this->actor.wallYaw) - 0x8000; this->actor.world.rot.y = ((this->actor.wallYaw - this->actor.world.rot.y) + this->actor.wallYaw) - 0x8000;
} }
Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_BOUND); Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_BOUND);
@ -358,7 +359,9 @@ void EnBom_Draw(Actor* thisx, PlayState* play) {
s32 pad; s32 pad;
EnBom* this = (EnBom*)thisx; EnBom* this = (EnBom*)thisx;
#ifdef OOT_DEBUG
if (1) {} if (1) {}
#endif
OPEN_DISPS(play->state.gfxCtx, "../z_en_bom.c", 913); OPEN_DISPS(play->state.gfxCtx, "../z_en_bom.c", 913);