falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InitScreenShake time -> dec

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/enemy/gleerok.c
View File

@ -403,7 +403,7 @@ void sub_0802D6F0(GleerokEntity* this) {
if (--this->unk_7c.WORD == -1) {
super->subAction = 2;
this->unk_7c.WORD = 0x5a;
InitScreenShake(0x96, 0);
InitScreenShake(150, 0);
}
}
@ -1018,7 +1018,7 @@ void sub_0802E1D0(GleerokEntity* this) {
if (i == 5) {
if (!(this->unk_79 & 0x80)) {
this->unk_7c.HALF_U.LO = 0xF0;
InitScreenShake(0xF0, 0);
InitScreenShake(240, 0);
} else {
for (this->unk_7c.HALF_U.LO = 0; this->unk_7c.HALF_U.LO < 4; this->unk_7c.HALF_U.LO++) {
CreateObjectWithParent(super, OBJECT_67, 1, this->unk_7c.HALF_U.LO);
@ -1028,7 +1028,7 @@ void sub_0802E1D0(GleerokEntity* this) {
this->unk_7c.HALF_U.LO = 0xB;
gScreen.controls.alphaBlend = this->unk_74 | (this->unk_75 << 8);
gScreen.controls.layerFXControl = 0x240;
InitScreenShake(0x1e, 0);
InitScreenShake(30, 0);
}
super->type2 = 5;
}

2
src/enemy/gyorgMaleEye.c
View File

@ -53,7 +53,7 @@ void GyorgMaleEye_OnCollision(GyorgMaleEyeEntity* this) {
} else {
entity->health = 0;
SoundReq(SFX_BOSS_DIE);
InitScreenShake(0x28, 0);
InitScreenShake(40, 0);
}
if (super->iframes > 0) {
entity->iframes = super->iframes;

2
src/enemy/mazaalBracelet.c
View File

@ -860,7 +860,7 @@ void sub_0803AFE0(Entity* this) {
this->timer = 240;
*(u8*)&this->cutsceneBeh = 3;
this->z.HALF.HI = 0;
InitScreenShake(0xa0, 0);
InitScreenShake(160, 0);
SoundReq(SFX_158);
}
}

2
src/enemy/mazaalHead.c
View File

@ -325,7 +325,7 @@ void sub_080342C8(Entity* this) {
this->field_0x7c.HALF.HI = 0x708;
this->field_0x7c.BYTES.byte1 = 0;
this->field_0x80.HALF.HI = 0;
InitScreenShake(0x1e, 0);
InitScreenShake(30, 0);
SoundReq(SFX_1A1);
}
}

2
src/enemy/mazaalMacro.c
View File

@ -202,7 +202,7 @@ void sub_08034F70(Entity* this) {
void sub_08034FA0(Entity* this) {
if (0 < this->iframes) {
this->child->iframes = this->iframes;
InitScreenShake(0xc, 1);
InitScreenShake(12, 1);
}
switch (this->type2) {
case 0:

4
src/enemy/octorokBoss.c
View File

@ -654,7 +654,7 @@ void OctorokBoss_Action1_ChargeAttack(OctorokBossEntity* this) {
super->knockbackDirection = super->direction ^ 0x10;
this->heap->fallingStonesTimer += 0x3c;
OctorokBoss_SetAttackTimer(this);
InitScreenShake(0x3c, 0);
InitScreenShake(60, 0);
SoundReq(SFX_158);
SoundReq(SFX_14C);
}
@ -937,7 +937,7 @@ void OctorokBoss_Burning_SubAction1(OctorokBossEntity* this) {
super->knockbackSpeed = 0x200;
super->knockbackDirection = super->direction ^ 0x10;
this->heap->fallingStonesTimer += 0x1e;
InitScreenShake(0x1e, 0);
InitScreenShake(30, 0);
SoundReq(SFX_158);
SoundReq(SFX_14C);
}

2
src/enemy/vaatiRebornEnemy.c
View File

@ -667,7 +667,7 @@ void VaatiRebornEnemyType1PreAction(Entity* this) {
}
if (0 < this->iframes) {
SoundReq(SFX_BOSS_HIT);
InitScreenShake(0xc, 1);
InitScreenShake(12, 1);
if (this->timer == 0)
this->timer = 0x48;
}

8
src/enemy/vaatiTransfigured.c
View File

@ -272,7 +272,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
this->timer = 0xc0;
COLLISION_ON(this);
SoundReq(SFX_14C);
InitScreenShake(0x14, 4);
InitScreenShake(20, 4);
break;
case 1:
if (--this->timer == 0) {
@ -327,7 +327,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
this->field_0x86.HALF.LO = 0;
sub_080408EC(this);
SoundReq(SFX_14C);
InitScreenShake(0x1e, 4);
InitScreenShake(30, 4);
} else {
if (this->subtimer != 0) {
if (--this->subtimer == 0) {
@ -405,7 +405,7 @@ void VaatiTransfiguredType0Action4(Entity* this) {
this->subtimer = 1;
}
SoundReq(SFX_14C);
InitScreenShake(0x1e, 4);
InitScreenShake(30, 4);
break;
case 2:
if (--this->timer == 0) {
@ -1075,7 +1075,7 @@ void sub_080409B0(Entity* this) {
}
} else {
if (((this->contactFlags & 0x80) != 0) && (0 < this->iframes)) {
InitScreenShake(0xc, 1);
InitScreenShake(12, 1);
SoundReq(SFX_BOSS_HIT);
}
if ((this->contactFlags == 0x8a) && (gPlayerState.chargeState.action == 5)) {

2
src/enemy/vaatiWrath.c
View File

@ -478,7 +478,7 @@ void VaatiWrathType0ActionB(Entity* this) {
this->timer = 0xf0;
this->health = 8;
this->hitType = 0x38;
InitScreenShake(0x14, 0);
InitScreenShake(20, 0);
InitAnimationForceUpdate(this, 6);
InitializeAnimation(((VaatiWrathHeapStruct*)this->myHeap)->type2, 0x16);
}

6
src/manager/vaati3InsideArmManager.c
View File

@ -47,11 +47,11 @@ void sub_0805DBF0(Vaati3InsideArmManager* this) {
sub_0805DC70();
} else {
if (this->field_0x20 == 0x78) {
InitScreenShake(0x78, 2);
InitScreenShake(120, 2);
} else if (this->field_0x20 == 0xd2) {
InitScreenShake(0x5a, 1);
InitScreenShake(90, 1);
} else if (this->field_0x20 == 0x12c) {
InitScreenShake(0x5a, 0);
InitScreenShake(90, 0);
}
if (this->field_0x20 < 0x78) {

2
src/npc/carlov.c
View File

@ -13,7 +13,7 @@ void Carlov(Entity* this) {
if ((this->frame & 0x10) != 0) {
this->frame = this->frame & 0xef;
EnqueueSFX(SFX_PLACE_OBJ);
InitScreenShake(0x10, 0);
InitScreenShake(16, 0);
}
if ((this->frame & 0x20) != 0) {
this->frame = this->frame & 0xdf;

2
src/npc/castorWildsStatue.c
View File

@ -109,7 +109,7 @@ void sub_08067534(Entity* this) {
}
}
EnqueueSFX(SFX_14C);
InitScreenShake(0x28, 4);
InitScreenShake(40, 4);
}
void sub_0806757C(Entity* this) {

2
src/object/crenelBeanSprout.c
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;
}

14
src/object/gyorgBossObject.c
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 {

2
src/object/ladderUp.c
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

2
src/player.c
View File

@ -3081,7 +3081,7 @@ void sub_08073B8C(Entity* this) {
}
gPlayerState.jump_status++;
this->timer = 15;
InitScreenShake(0x10, 0);
InitScreenShake(16, 0);
SoundReq(SFX_14C);
}
}

2
src/vram.c
View File

@ -153,7 +153,7 @@ bool32 LoadFixedGFX(Entity* entity, u32 gfxIndex) {
CleanUpGFXSlots();
index = FindFreeGFXSlots(count);
if (index == 0) {
return 0;
return FALSE;
}
}
ReserveGFXSlots(index, gfxIndex, count);