1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00

Rumble doc (#1375)

* 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

View file

@ -1118,7 +1118,7 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) {
this->groundBlastPos.y = 0.0f;
this->groundBlastPos.z = 0.0f;
play->envCtx.lightBlend = 1.0f;
func_800AA000(0.0f, 0x64, 5, 4);
Rumble_Request(0.0f, 100, 5, 4);
} else if (beamReflection == 0) {
BossTw_BeamHitPlayerCheck(this, play);
@ -4328,7 +4328,7 @@ s32 BossTw_BlastShieldCheck(BossTw* this, PlayState* play) {
if (info->toucher.dmgFlags & DMG_SHIELD) {
this->work[INVINC_TIMER] = 7;
play->envCtx.lightBlend = 1.0f;
func_800AA000(0.0f, 100, 5, 4);
Rumble_Request(0.0f, 100, 5, 4);
if (Player_HasMirrorShieldEquipped(play)) {
if (this->blastType == 1) {