From 8607c54e75e2c5606aaba4a2a78cd093c5c0eb75 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Mon, 11 Jul 2022 10:24:30 -0700 Subject: [PATCH] BossDodongo_OverrideLimbDraw Better match? (#1322) * Better match? * Update src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c Co-authored-by: EllipticEllipsis Co-authored-by: EllipticEllipsis --- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 3e298869b8..be57ae7a1f 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -1050,12 +1050,17 @@ s32 BossDodongo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Ve f32 mtxScaleZ; BossDodongo* this = (BossDodongo*)thisx; - // required for matching - if ((limbIndex == 6) || (limbIndex == 7)) { - if (this->unk_25C) {} - goto block_1; + switch (limbIndex) { + case 6: + case 7: + case 8: + if (this->unk_25C[limbIndex] != 0.0f) {} + break; + + default: + break; } -block_1: + Matrix_TranslateRotateZYX(pos, rot); if (*dList != NULL) { @@ -1088,8 +1093,7 @@ block_1: CLOSE_DISPS(play->state.gfxCtx, "../z_boss_dodongo.c", 3826); } - { s32 pad; } // Required to match - return 1; + return true; } void BossDodongo_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {