diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index 00c147b355..882a0793f0 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -856,7 +856,7 @@ void Boss03_ChewPlayer(Boss03* this, PlayState* play) { this->unk_25C = 15; if (this->workTimer[WORK_TIMER_CURRENT_ACTION] == 90) { - Play_EnableMotionBlur(0x96); + Play_EnableMotionBlur(150); } SkelAnime_Update(&this->skelAnime); @@ -1191,7 +1191,7 @@ void Boss03_IntroCutscene(Boss03* this, PlayState* play) { this->csState = 2; this->csTimer = 0; this->unk_240 = 0; - Play_EnableMotionBlur(0x96); + Play_EnableMotionBlur(150); this->subCamFov = 80.0f; case 2: diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index 1cf6b94edf..48051abbb9 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -110,7 +110,7 @@ void EnJs_Init(Actor* thisx, PlayState* play) { this->actionFunc = func_8096A6F4; Animation_PlayLoop(&this->skelAnime, &gMoonChildSittingAnim); - Play_EnableMotionBlur(0x3C); + Play_EnableMotionBlur(60); if (gSaveContext.save.weekEventReg[84] & 0x20) { Inventory_DeleteItem(ITEM_MASK_FIERCE_DEITY, SLOT(ITEM_MASK_FIERCE_DEITY)); diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index b0f41872b0..6cf7db1f88 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -813,7 +813,7 @@ void EnKakasi_SetupDanceNightAway(EnKakasi* this) { this->subCamFovNext = 60.0f; EnKakasi_ChangeAnim(this, ENKAKASI_ANIM_TWIRL); Math_Vec3f_Copy(&this->unk22C, &this->picto.actor.home.pos); - Play_EnableMotionBlur(0xB4); + Play_EnableMotionBlur(180); this->actionFunc = EnKakasi_DancingNightAway; } diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c index ae433012e3..e75b7328bc 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -183,11 +183,11 @@ void func_80A90730(EnTest6* this, PlayState* play) { } } -void func_80A90C08(s16 arg0) { - Play_EnableMotionBlur(arg0); +void EnTest6_EnableMotionBlur(s16 alpha) { + Play_EnableMotionBlur(alpha); } -void func_80A90C34(void) { +void EnTest6_DisableMotionBlur(void) { Play_DisableMotionBlur(); } @@ -396,7 +396,7 @@ void func_80A916F0(EnTest6* this, PlayState* play) { play->unk_18844 = false; ActorCutscene_Stop(play->playerActorCsIds[8]); func_800B7298(play, NULL, 6); - func_80A90C34(); + EnTest6_DisableMotionBlur(); Distortion_ClearType(DISTORTION_TYPE_5); Actor_MarkForDeath(&this->actor); } @@ -462,7 +462,7 @@ void func_80A91760(EnTest6* this, PlayState* play) { ((subCam->at.z - subCam->eye.z) * 0.2f); } } - func_80A90C08(0x78); + EnTest6_EnableMotionBlur(120); Distortion_SetType(DISTORTION_TYPE_5); Distortion_SetCountdown(80); play->unk_18844 = true; @@ -517,7 +517,7 @@ void func_80A91760(EnTest6* this, PlayState* play) { if (this->unk_27A == 10) { this->unk_14C = 0.1f; - func_80A90C34(); + EnTest6_DisableMotionBlur(); Distortion_ClearType(DISTORTION_TYPE_5); play->unk_18844 = false; if (this->unk_254 != NULL) { @@ -617,7 +617,7 @@ void func_80A92118(EnTest6* this, PlayState* play) { play->unk_18844 = false; ActorCutscene_Stop(play->playerActorCsIds[8]); func_800B7298(play, NULL, 6); - func_80A90C34(); + EnTest6_DisableMotionBlur(); Distortion_ClearType(DISTORTION_TYPE_5); Actor_MarkForDeath(&this->actor); } @@ -680,11 +680,11 @@ void func_80A92188(EnTest6* this, PlayState* play) { switch (this->unk_27A) { case 119: - func_80A90C08(0x32); + EnTest6_EnableMotionBlur(50); break; case 115: - func_80A90C08(0x14); + EnTest6_EnableMotionBlur(20); Distortion_SetType(DISTORTION_TYPE_5); Distortion_SetCountdown(90); this->unk_274 = 2; @@ -704,24 +704,24 @@ void func_80A92188(EnTest6* this, PlayState* play) { break; case 61: - func_80A90C08(0x96); + EnTest6_EnableMotionBlur(150); this->unk_274 = 4; break; case 51: - func_80A90C08(0xB4); + EnTest6_EnableMotionBlur(180); this->unk_274 = 5; break; case 14: case 15: - func_80A90C08(0x32); + EnTest6_EnableMotionBlur(50); Distortion_ClearType(DISTORTION_TYPE_5); this->unk_274 = 0; break; case 1: - func_80A90C34(); + EnTest6_DisableMotionBlur(); if (gSaveContext.eventInf[5] & 4) { this->unk_274 = 9; } diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c index 32ce4737fa..def825e545 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -461,7 +461,7 @@ void func_80AF1A2C(EnTest7* this, PlayState* play) { func_80AF082C(this, func_80AF1CA0); this->unk_144 |= 0x20; Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WARP_WING_OPEN); - Play_EnableMotionBlur(0x78); + Play_EnableMotionBlur(120); } } diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c index 41163c9cf0..64e15015eb 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -209,7 +209,7 @@ void EnWarpTag_RespawnPlayer(EnWarptag* this, PlayState* play) { // why are we getting player home rotation from the room data? doesnt player have home.rot.y? // especially because we are converting from deg to binang, but isnt home.rot.y already in binang?? Play_SetRespawnData( - &play->state, 0, entrance, // parameter 3 is called "sceneSetup" + &play->state, 0, entrance, play->setupEntranceList[playerSpawnIndex].room, playerParams, &newRespawnPos, ((((playerActorEntry->rot.y >> 7) & 0x1FF) / 180.0f) * 32768.0f)); // DEG_TO_BINANG ? @@ -224,7 +224,7 @@ void EnWarpTag_RespawnPlayer(EnWarptag* this, PlayState* play) { if (new15E < 0) { new15E = 0; } - Play_SetMotionBlurAlpha(new15E * 0.04f); // unknown Play_ function + Play_SetMotionBlurAlpha(new15E * 0.04f); } } diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index 5255a72e90..8dd9802190 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -11339,8 +11339,8 @@ 0x80A90478:("EnTest5_HandleBottleAction",), 0x80A905A4:("EnTest5_Update",), 0x80A90730:("func_80A90730",), - 0x80A90C08:("func_80A90C08",), - 0x80A90C34:("func_80A90C34",), + 0x80A90C08:("EnTest6_EnableMotionBlur",), + 0x80A90C34:("EnTest6_DisableMotionBlur",), 0x80A90C54:("func_80A90C54",), 0x80A90D20:("func_80A90D20",), 0x80A90D34:("func_80A90D34",),