mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 15:01:17 +00:00
Code Issues Projects Releases Wiki Activity

Rumble doc (#1375)

Browse source 
* Rumble doc

* Fixes, suggested changes

* Improve padmgr retrace callback related code

* Name some rumble-adjacent things, further suggested changes

* Further suggested changes

* Suggested changes
This commit is contained in:
Tharo 2022-09-27 17:40:26 +01:00 • committed by GitHub
parent 82e04ede5f
commit 4f65d08eb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 533 additions and 393 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Mb/z_en_mb.c
View file

@ -858,7 +858,7 @@ void EnMb_ClubAttack(EnMb* this, PlayState* play) {
effSpawnPos = this->effSpawnPos;
effSpawnPos.y = this->actor.floorHeight;
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_MONBLIN_HAM_LAND);
func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96);
Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150);
EffectSsBlast_SpawnWhiteShockwave(play, &effSpawnPos, &effWhiteShockwaveDynamics,
&effWhiteShockwaveDynamics);
func_80033480(play, &effSpawnPos, 2.0f, 3, 0x12C, 0xB4, 1);
@ -1043,7 +1043,7 @@ void EnMb_ClubDamaged(EnMb* this, PlayState* play) {
if (this->timer3 != 0) {
Animation_PlayOnce(&this->skelAnime, &gEnMbClubStandUpAnim);
this->timer3 = 0;
func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96);
Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150);
Camera_AddQuake(&play->mainCamera, 2, 25, 5);
} else {
EnMb_SetupClubWaitPlayerNear(this);
@ -1102,7 +1102,7 @@ void EnMb_ClubDead(EnMb* this, PlayState* play) {
Actor_Kill(&this->actor);
}
} else if ((s32)this->skelAnime.curFrame == 15 || (s32)this->skelAnime.curFrame == 22) {
func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96);
Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150);
Actor_SpawnFloorDustRing(play, &this->actor, &effPos, 50.0f, 10, 3.0f, 400, 60, false);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_RIZA_DOWN);
Camera_AddQuake(&play->mainCamera, 2, 25, 5);