mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-02 16:37:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

InitScreenShake time -> dec

Browse Source
This commit is contained in:
Elliptic Ellipsis
2022-06-21 23:12:06 +01:00
parent 2cd62531cc
commit 0e60387579
17 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/crenelBeanSprout.c
+1 -1
View File
@@ -221,7 +221,7 @@ void CrenelBeanSprout_Action2SubAction2(CrenelBeanSproutEntity* this) {
}
void CrenelBeanSprout_Action2SubAction3(CrenelBeanSproutEntity* this) {
InitScreenShake(0x10, 0);
InitScreenShake(16, 0);
super->action = 1;
super->subAction = 0;
}
src/object/gyorgBossObject.c
+7 -7
View File
@@ -126,7 +126,7 @@ void GyorgBossObject_FemalePhase1(GyorgBossObjectEntity* this) {
this->unk_7b = 1;
((GyorgHeap*)super->myHeap)->male1->base.health = 12;
SoundReq(SFX_BOSS_DIE);
InitScreenShake(0x96, 1);
InitScreenShake(150, 1);
}
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
@@ -161,7 +161,7 @@ void GyorgBossObject_FemalePhase2(GyorgBossObjectEntity* this) {
this->unk_78 = 0x400;
this->unk_7b = 1;
SoundReq(SFX_BOSS_DIE);
InitScreenShake(0x96, 1);
InitScreenShake(150, 1);
}
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
@@ -195,7 +195,7 @@ void GyorgBossObject_FemalePhase3(GyorgBossObjectEntity* this) {
this->unk_6c = 0x104;
this->unk_78 = 0x400;
SoundReq(SFX_BOSS_DIE);
InitScreenShake(0x96, 1);
InitScreenShake(150, 1);
}
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
@@ -219,7 +219,7 @@ void GyorgBossObject_MalePhase3(GyorgBossObjectEntity* this) {
void GyorgBossObject_FemalePhase4(GyorgBossObjectEntity* this) {
if (((GyorgHeap*)super->myHeap)->female->base.health == 0) {
if (this->unk_6c != 0) {
InitScreenShake(0x2d, 1);
InitScreenShake(45, 1);
SoundReq(SFX_BOSS_DIE);
this->unk_78 = 0x600;
}
@@ -263,11 +263,11 @@ void GyorgBossObject_FightEnd(GyorgBossObjectEntity* this) {
switch (this->timer) {
case 0xb4:
SoundReq(SFX_BOSS_DIE);
InitScreenShake(0x2d0, 2);
InitScreenShake(720, 2);
break;
case 0x12C:
SoundReq(SFX_BOSS_DIE);
InitScreenShake(0x4b, 1);
InitScreenShake(75, 1);
break;
}
}
@@ -466,7 +466,7 @@ void sub_080A1FF0(GyorgBossObjectEntity* this) {
super->timer = 0x78;
} else {
if (super->timer == 0x23) {
InitScreenShake(0x1e, 0);
InitScreenShake(30, 0);
}
}
} else {
src/object/ladderUp.c
+1 -1
View File
@@ -39,7 +39,7 @@ void LadderUp(Entity* this) {
if (fxEnt) {
fxEnt->y.HALF.HI += 8;
}
InitScreenShake(0x1e, 0);
InitScreenShake(30, 0);
SoundReq(SFX_10B);
this->action = 2;
#ifndef EU