From ef0a8c2f6d6600ecf1e569c2e8f91fe7ee4304b1 Mon Sep 17 00:00:00 2001 From: tom-overton Date: Sat, 20 Nov 2021 09:17:04 -0800 Subject: [PATCH] Respond to engineer's feedback --- src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 420625c5d6..078678378a 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -425,10 +425,10 @@ void ObjTokeidai_TowerTransformation_EndCutscene(ObjTokeidai* this, GlobalContex void ObjTokeidai_TowerTransformation_FinishTransformation(ObjTokeidai* this, GlobalContext* globalCtx) { s32 type; - if (this->clockFaceZTranslation >= -0x13F) { + if (this->clockFaceZTranslation > -320) { // Recess the clock face before ending the cutscene, since the Termina // Field version of the cutscene looks right at it. - this->clockFaceZTranslation -= 0xA; + this->clockFaceZTranslation -= 10; } else { type = OBJ_TOKEIDAI_TYPE(&this->actor); if ((type == OBJ_TOKEIDAI_TYPE_TOWER_CLOCK_CLOCK_TOWN) || @@ -524,7 +524,7 @@ void ObjTokeidai_TowerTransformation_RaiseTower(ObjTokeidai* this, GlobalContext if (this->yTranslation < 3400) { type = OBJ_TOKEIDAI_TYPE(&this->actor); - this->yTranslation += 0x19; + this->yTranslation += 25; if ((type == OBJ_TOKEIDAI_TYPE_TOWER_CLOCK_CLOCK_TOWN) || (type == OBJ_TOKEIDAI_TYPE_TOWER_CLOCK_TERMINA_FIELD)) { func_800B9010(&this->actor, NA_SE_EV_CLOCK_TOWER_UP - SFX_FLAG);