From c9523aaa0b516184994e459ce494391bf109555c Mon Sep 17 00:00:00 2001 From: Arceveti Date: Tue, 4 Jan 2022 23:31:39 -0800 Subject: [PATCH 1/2] Fix wrong Y offset for Mr. I iris --- src/game/behaviors/mr_i.inc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/behaviors/mr_i.inc.c b/src/game/behaviors/mr_i.inc.c index 18c6c449..dc2eb1b2 100644 --- a/src/game/behaviors/mr_i.inc.c +++ b/src/game/behaviors/mr_i.inc.c @@ -76,7 +76,7 @@ void bhv_mr_i_iris_loop(void) { obj_build_transform_from_pos_and_angle(o, O_PARENT_RELATIVE_POS_INDEX, O_MOVE_ANGLE_INDEX); obj_translate_local(o, O_POS_INDEX, O_PARENT_RELATIVE_POS_INDEX); o->oFaceAnglePitch = o->oMoveAnglePitch; - o->oGraphYOffset = o->header.gfx.scale[1] * 100.0f; + o->oGraphYOffset = o->parentObj->oBehParams2ndByte ? 200.0f : 100.0f; } if (!o->parentObj->oMrIBlinking) { @@ -128,7 +128,7 @@ void mr_i_body_act_spin_death(void) { cur_obj_become_intangible(); spawn_mist_particles(); o->oMrIScale = scaleModifier * 0.6f; - if (o->oBehParams2ndByte != 0) { + if (o->oBehParams2ndByte != MR_I_BP_NORMAL) { o->oPosY += 100.0f; spawn_default_star(1370, 2000.0f, -320.0f); obj_mark_for_deletion(o); From 886d9841a8e0553027027ff05bef2ea2f5f4d8e9 Mon Sep 17 00:00:00 2001 From: Arceveti Date: Mon, 10 Jan 2022 18:27:08 -0800 Subject: [PATCH 2/2] Better Mr. I offset fix --- src/game/behaviors/mr_i.inc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/behaviors/mr_i.inc.c b/src/game/behaviors/mr_i.inc.c index dc2eb1b2..09099ebf 100644 --- a/src/game/behaviors/mr_i.inc.c +++ b/src/game/behaviors/mr_i.inc.c @@ -76,7 +76,7 @@ void bhv_mr_i_iris_loop(void) { obj_build_transform_from_pos_and_angle(o, O_PARENT_RELATIVE_POS_INDEX, O_MOVE_ANGLE_INDEX); obj_translate_local(o, O_POS_INDEX, O_PARENT_RELATIVE_POS_INDEX); o->oFaceAnglePitch = o->oMoveAnglePitch; - o->oGraphYOffset = o->parentObj->oBehParams2ndByte ? 200.0f : 100.0f; + o->oGraphYOffset = o->parentObj->oGraphYOffset; } if (!o->parentObj->oMrIBlinking) {