mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-20 14:15:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use fixed point macros where possible

Browse Source
This commit is contained in:
Tal Hayon
2022-04-01 18:19:56 +03:00
parent 9233701a5d
commit d6d7916a46
90 changed files with 223 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/acroBandits.c
+3 -3
View File
@@ -385,7 +385,7 @@ void AcroBandit_Type1Action1(Entity* this) {
if (draw == 1)
GetNextFrame(this);
if (this->zVelocity < 1) {
if (this->zVelocity <= 0) {
this->action = 2;
COLLISION_ON(this);
InitializeAnimation(this, 5);
@@ -393,7 +393,7 @@ void AcroBandit_Type1Action1(Entity* this) {
}
void AcroBandit_Type1Action2(Entity* this) {
static const u16 banditGravity[] = { 0x1600, 0x1300, 0x1000, 0xD00, 0xB00 };
static const u16 banditGravity[] = { Q_8_8(22.0), Q_8_8(19.0), Q_8_8(16.0), Q_8_8(13.0), Q_8_8(11.0) };
GravityUpdate(this, banditGravity[this->type2]);
if (this->type2 * -0xe <= this->z.HALF.HI) {
@@ -470,7 +470,7 @@ void AcroBandit_Type1Action4(Entity* this) {
}
void AcroBandit_Type1Action5(Entity* this) {
if (GravityUpdate(this, 0x2000))
if (GravityUpdate(this, Q_8_8(32.0)))
return;
sub_08032290(this);
src/enemy/beetle.c
+3 -3
View File
@@ -138,7 +138,7 @@ void sub_08021984(Entity* this) {
EnqueueSFX(SFX_12D);
}
if (GravityUpdate(this, 0x1800) == 0) {
if (GravityUpdate(this, Q_8_8(24.0)) == 0) {
this->action = 2;
this->timer = 16;
this->subtimer = 1;
@@ -205,7 +205,7 @@ void sub_08021AD8(Entity* this) {
EnqueueSFX(SFX_PLY_JUMP);
}
ProcessMovement2(this);
if (!GravityUpdate(this, 0x1800))
if (!GravityUpdate(this, Q_8_8(24.0)))
this->frameDuration = 1;
}
@@ -264,7 +264,7 @@ void sub_08021C58(Entity* this) {
GetNextFrame(this);
if (this->frame & 1) {
ProcessMovement2(this);
if (GravityUpdate(this, 0x1800) == 0)
if (GravityUpdate(this, Q_8_8(24.0)) == 0)
this->frameDuration = 1;
}
src/enemy/chuchu.c
+8 -8
View File
@@ -131,7 +131,7 @@ void Chuchu_OnGrabbed(Entity* this) {
sub_0801FB68(this);
InitializeAnimation(this, 8);
}
GravityUpdate(this, 0x1800);
GravityUpdate(this, Q_8_8(24.0));
GetNextFrame(this);
}
}
@@ -143,7 +143,7 @@ void Chuchu_OnKnockback(Entity* this) {
}
void Chuchu_OnDeath(Entity* this) {
GravityUpdate(this, 0x1800);
GravityUpdate(this, Q_8_8(24.0));
GetNextFrame(this);
if (this->type == 0) {
GenericDeath(this);
@@ -215,7 +215,7 @@ void sub_0801F1B0(Entity* this) {
EnqueueSFX(SFX_12B);
}
ProcessMovement2(this);
if (GravityUpdate(this, 0x4000) == 0)
if (GravityUpdate(this, Q_8_8(64.0)) == 0)
GetNextFrame(this);
} else {
GetNextFrame(this);
@@ -275,7 +275,7 @@ void sub_0801F2CC(Entity* this) {
}
void sub_0801F2F8(Entity* this) {
GravityUpdate(this, 0x1800);
GravityUpdate(this, Q_8_8(24.0));
GetNextFrame(this);
if (this->frame & ANIM_DONE) {
sub_0801F340(this);
@@ -411,7 +411,7 @@ void sub_0801F584(Entity* this) {
EnqueueSFX(SFX_12B);
}
ProcessMovement2(this);
if (GravityUpdate(this, 0x4000) == 0)
if (GravityUpdate(this, Q_8_8(64.0)) == 0)
GetNextFrame(this);
} else {
@@ -473,7 +473,7 @@ void sub_0801F6CC(Entity* this) {
}
void sub_0801F6F8(Entity* this) {
GravityUpdate(this, 0x1800);
GravityUpdate(this, Q_8_8(24.0));
GetNextFrame(this);
if (this->frame & ANIM_DONE) {
this->action = 4;
@@ -588,7 +588,7 @@ void sub_0801F940(Entity* this) {
EnqueueSFX(SFX_12B);
}
ProcessMovement2(this);
if (GravityUpdate(this, 0x4000) == 0)
if (GravityUpdate(this, Q_8_8(64.0)) == 0)
GetNextFrame(this);
} else {
GetNextFrame(this);
@@ -648,7 +648,7 @@ void sub_0801FA78(Entity* this) {
}
void sub_0801FAAC(Entity* this) {
GravityUpdate(this, 0x1800);
GravityUpdate(this, Q_8_8(24.0));
GetNextFrame(this);
if (this->frame & ANIM_DONE) {
sub_0801FB14(this);
src/enemy/cloudPiranha.c
+1 -1
View File
@@ -218,7 +218,7 @@ void sub_08038754(CloudPiranhaEntity* this) {
#else
super->speed = 0xc0;
#endif
super->zVelocity = 0x20000;
super->zVelocity = Q_16_16(2);
this->unk_81 = 0;
super->spritePriority.b1 = 3;
EnqueueSFX(SFX_12B);
src/enemy/cuccoAggr.c
+3 -3
View File
@@ -151,11 +151,11 @@ void sub_08038EE0(CuccoAggrEntity* this) {
ProcessMovement0(super);
GetNextFrame(super);
sub_08039298(this);
if (GravityUpdate(super, 0x1C00) == 0) {
if (GravityUpdate(super, Q_8_8(28.0)) == 0) {
if (--super->timer == 0) {
sub_0803901C(this);
} else {
super->zVelocity = 0x8000;
super->zVelocity = Q_16_16(0.5);
}
}
}
@@ -234,7 +234,7 @@ void sub_0803901C(CuccoAggrEntity* this) {
case 1:
super->action = 3;
super->timer = ((r3 >> 8) & 3) + 2;
super->zVelocity = 0x8000;
super->zVelocity = Q_16_16(0.5);
sub_080390C0(this);
InitializeAnimation(super, 1);
if (Random() & 1) {
src/enemy/cuccoChickAggr.c
+3 -3
View File
@@ -57,7 +57,7 @@ void sub_08022988(Entity* this) {
}
ProcessMovement0(this);
if (GravityUpdate(this, 0x2000) == 0) {
if (GravityUpdate(this, Q_8_8(32.0)) == 0) {
if (--this->timer == 0) {
sub_08022A88(this);
} else {
@@ -69,7 +69,7 @@ void sub_08022988(Entity* this) {
}
void sub_080229F8(Entity* this) {
if (GravityUpdate(this, 0x2800) == 0) {
if (GravityUpdate(this, Q_8_8(40.0)) == 0) {
if (--this->timer == 0) {
this->action = 4;
this->timer = 6;
@@ -93,7 +93,7 @@ void sub_08022A40(Entity* this) {
}
ProcessMovement0(this);
if (GravityUpdate(this, 0x2000) == 0) {
if (GravityUpdate(this, Q_8_8(32.0)) == 0) {
if (--this->timer == 0) {
sub_08022A88(this);
} else {
src/enemy/enemy50.c
+1 -1
View File
@@ -93,7 +93,7 @@ void sub_08040B9C(Enemy50Entity* this) {
sub_08041128(this);
}
if (super->contactFlags == 0x9d) {
super->zVelocity = 0x18000;
super->zVelocity = Q_16_16(1.5);
}
if (super->confusedTime != 0) {
super->animationState = super->knockbackDirection >> 4;
src/enemy/eyegore.c
+4 -4
View File
@@ -131,7 +131,7 @@ void Eyegore_OnCollision(EyegoreEntity* this) {
void Eyegore_OnDeath(EyegoreEntity* this) {
if (this->unk_7e != 0) {
this->unk_7e--;
GravityUpdate(super, 0x1c00);
GravityUpdate(super, Q_8_8(28.0));
} else {
if ((super->gustJarState & 2) == 0) {
CreateFx(super, FX_GIANT_EXPLOSION4, 0);
@@ -221,7 +221,7 @@ void Eyegore_Action4(EyegoreEntity* this) {
if (this->unk_7a != 0) {
sub_08031250(this);
}
if (GravityUpdate(super, 0x1c00) == 0) {
if (GravityUpdate(super, Q_8_8(28.0)) == 0) {
sub_08030E70(this);
}
@@ -256,7 +256,7 @@ void Eyegore_Action5(EyegoreEntity* this) {
super->animationState = this->unk_7f;
InitializeAnimation(super, super->animationState + 4);
}
if (GravityUpdate(super, 0x1c00) == 0) {
if (GravityUpdate(super, Q_8_8(28.0)) == 0) {
sub_08030E70(this);
}
break;
@@ -287,7 +287,7 @@ void Eyegore_Action6(EyegoreEntity* this) {
void sub_08030E3C(EyegoreEntity* this) {
super->frame = 0;
super->zVelocity = 0x11800;
super->zVelocity = Q_16_16(1.0 + 3.0 / 32.0);
EnqueueSFX(SFX_157);
}
src/enemy/fireballGuy.c
+1 -1
View File
@@ -54,7 +54,7 @@ void sub_080453E8(Entity* this) {
void sub_08045430(Entity* this) {
ProcessMovement2(this);
GetNextFrame(this);
if (GravityUpdate(this, 0x1800) == 0)
if (GravityUpdate(this, Q_8_8(24.0)) == 0)
sub_08045524(this);
}
src/enemy/flyingPot.c
+3 -3
View File
@@ -98,7 +98,7 @@ void FlyingPot_OnCollision(FlyingPotEntity* this) {
if (super->contactFlags == 0x9D) {
super->action = FLYING_POT_ACTION_6;
COLLISION_OFF(super);
super->zVelocity = 0x2A000;
super->zVelocity = Q_16_16(2.625);
super->spritePriority.b1 = 1;
SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer);
@@ -217,7 +217,7 @@ void FlyingPot_Action2(FlyingPotEntity* this) {
}
void FlyingPot_Action3(FlyingPotEntity* this) {
super->z.WORD -= 0x10000;
super->z.WORD -= Q_16_16(1.0);
if (super->z.HALF.HI <= -6) {
super->action = FLYING_POT_ACTION_4;
@@ -245,7 +245,7 @@ void FlyingPot_Action6(FlyingPotEntity* this) {
super->spriteSettings.flipY = 1;
}
if (!GravityUpdate(super, 0x2000)) {
if (!GravityUpdate(super, Q_8_8(32.0))) {
sub_08037408(this);
}
}
src/enemy/flyingSkull.c
+2 -2
View File
@@ -203,7 +203,7 @@ void sub_08039FAC(FlyingSkullEntity* this) {
void sub_0803A048(FlyingSkullEntity* this) {
GetNextFrame(super);
super->z.WORD += 0xFFFF0000;
super->z.WORD -= Q_16_16(1.0);
if (super->z.HALF.HI <= -6) {
super->action = 5;
super->timer = 10;
@@ -233,7 +233,7 @@ void sub_0803A0B8(FlyingSkullEntity* this) {
super->spriteSettings.flipY = 1;
}
if (GravityUpdate(super, 0x2000) == 0) {
if (GravityUpdate(super, Q_8_8(32.0)) == 0) {
sub_0803A0E0(this);
}
}
src/enemy/gleerok.c
+3 -3
View File
@@ -530,7 +530,7 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D86C.inc", void sub_0802D86C(GleerokE
return;
}
if (GravityUpdate(super, 0x1800))
if (GravityUpdate(super, Q_8_8(24.0)))
return;
((GleerokEntity*)(super->parent))->unk_7b = 1;
@@ -601,7 +601,7 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D86C.inc", void sub_0802D86C(GleerokE
if ((super->contactFlags & 0x80) && this->unk_74 == 0) {
if ((super->contactFlags & 0x7f) == 0x1d) {
super->zVelocity = 0x30000;
super->zVelocity = Q_16_16(3.0);
super->parent->subAction = 4;
super->parent->type2 = 0;
((GleerokEntity*)super->parent)->unk_7b = 0;
@@ -626,7 +626,7 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D86C.inc", void sub_0802D86C(GleerokE
if (super->zVelocity <= 0)
return;
GravityUpdate(super, 0x1800);
GravityUpdate(super, Q_8_8(24.0));
if (super->zVelocity > 0)
return;
src/enemy/helmasaur.c
+1 -1
View File
@@ -233,7 +233,7 @@ void sub_0802BEEC(Entity* this) {
this->direction = this->animationState << 3;
InitializeAnimation(this, this->animationState + 4);
}
} else if (!GravityUpdate(this, Q_16_16(0.109375))) {
} else if (!GravityUpdate(this, Q_8_8(28.0))) {
this->action = 8;
this->timer = 30;
this->speed = 0x120;
src/enemy/lakitu.c
+1 -1
View File
@@ -232,7 +232,7 @@ void Lakitu_LightningDelay(Entity* this) {
}
void Lakitu_Cloudless(Entity* this) {
if (GravityUpdate(this, 0x1800) == 0 && this->animIndex <= 19) {
if (GravityUpdate(this, Q_8_8(24.0)) == 0 && this->animIndex <= 19) {
InitAnimationForceUpdate(this, this->animationState + 20);
this->spritePriority.b1 = 0;
src/enemy/mazaalBracelet.c
+1 -1
View File
@@ -928,7 +928,7 @@ void sub_0803B100(Entity* this) {
void sub_0803B144(Entity* this) {
UpdateAnimationSingleFrame(this->child);
if (GravityUpdate(this, 0x2000) == 0) {
if (GravityUpdate(this, Q_8_8(32.0)) == 0) {
this->action = 0x2a;
InitializeAnimation(this, 0x16);
sub_0803B8E8(this, 0x14);
src/enemy/mazaalHead.c
+2 -2
View File
@@ -183,7 +183,7 @@ void sub_08033FFC(Entity* this) {
}
break;
case 4:
this->z.WORD += -0x8000;
this->z.WORD -= Q_16_16(0.5);
if (this->z.HALF.HI == -10) {
this->subAction = 5;
this->field_0x80.HALF.HI = 1;
@@ -320,7 +320,7 @@ void sub_080342C8(Entity* this) {
this->spriteOffsetX = gUnk_080CECEC[this->timer >> 1 & 7];
} else {
this->spriteOffsetX = 0;
if (GravityUpdate(this, 0x2000) == 0) {
if (GravityUpdate(this, Q_8_8(32.0)) == 0) {
this->action = 0xc;
this->field_0x7c.HALF.HI = 0x708;
this->field_0x7c.BYTES.byte1 = 0;
src/enemy/miniFireballGuy.c
+1 -1
View File
@@ -50,7 +50,7 @@ void sub_08045618(Entity* this) {
void sub_08045654(Entity* this) {
ProcessMovement2(this);
GetNextFrame(this);
if (GravityUpdate(this, 0x1800) == 0) {
if (GravityUpdate(this, Q_8_8(24.0)) == 0) {
sub_08045678(this);
}
}
src/enemy/peahat.c
+3 -3
View File
@@ -243,7 +243,7 @@ void Peahat_Stunned(Entity* this) {
GetNextFrame(this);
break;
case PeahatAnimation_SlicedPropeller:
GravityUpdate(this, 0x1c00);
GravityUpdate(this, Q_8_8(28.0));
if (this->z.HALF.HI == 0) {
this->action = 7;
this->timer = 150;
@@ -321,7 +321,7 @@ void Peahat_Takeoff(Entity* this) {
} else if (this->frame & 1) {
sub_0800442E(this);
} else {
GravityUpdate(this, 0x1c00);
GravityUpdate(this, Q_8_8(28.0));
ProcessMovement0(this);
}
}
@@ -347,7 +347,7 @@ void PeahatPropeller_Fly(Entity* this) {
if (this->timer < 60)
this->spriteSettings.draw ^= 1;
this->z.WORD -= 0xc000;
this->z.WORD -= Q_16_16(0.75);
LinearMoveUpdate(this);
if (--this->subtimer == 0) {
this->subtimer = 40;
src/enemy/puffstool.c
+6 -6
View File
@@ -105,7 +105,7 @@ void Puffstool_OnDeath(Entity* this) {
}
void Puffstool_OnGrabbed(Entity* this) {
GravityUpdate(this, 0x2000);
GravityUpdate(this, Q_8_8(32.0));
if (sub_0806F520(this)) {
gUnk_080CBFEC[this->subAction](this);
} else {
@@ -210,7 +210,7 @@ void sub_0802538C(Entity* this) {
if (this->frame == 0) {
GetNextFrame(this);
} else {
GravityUpdate(this, Q_16_16(0.125));
GravityUpdate(this, Q_8_8(32.0));
if (this->zVelocity < Q_16_16(0.125)) {
this->action = 4;
InitializeAnimation(this, 2);
@@ -221,7 +221,7 @@ void sub_0802538C(Entity* this) {
void sub_080253D4(Entity* this) {
GetNextFrame(this);
if (!GravityUpdate(this, 0x2000)) {
if (!GravityUpdate(this, Q_8_8(32.0))) {
if (this->subtimer == 0) {
this->action = 5;
InitializeAnimation(this, 3);
@@ -240,7 +240,7 @@ void sub_0802541C(Entity* this) {
if (this->frame & ANIM_DONE) {
this->action = 3;
this->subtimer = 1;
this->zVelocity = Q_16_16(2);
this->zVelocity = Q_16_16(2.0);
InitializeAnimation(this, 1);
}
}
@@ -257,7 +257,7 @@ void sub_0802544C(Entity* this) {
}
void sub_0802547C(Entity* this) {
GravityUpdate(this, Q_16_16(0.125));
GravityUpdate(this, Q_8_8(32.0));
GetNextFrame(this);
if ((this->timer & 7) == 0) {
sub_08025BD4(this);
@@ -269,7 +269,7 @@ void sub_0802547C(Entity* this) {
}
void sub_080254B4(Entity* this) {
GravityUpdate(this, Q_16_16(0.125));
GravityUpdate(this, Q_8_8(32.0));
if (this->frame & ANIM_DONE) {
if (this->z.HALF.HI == 0) {
if (this->cutsceneBeh.HWORD == 0) {
src/enemy/rollobite.c
+1 -1
View File
@@ -214,7 +214,7 @@ void Rollobite_Unroll(Entity* this) {
}
void Rollobite_LinedUp(Entity* this) {
if (GravityUpdate(this, 0x1c00) == 0) {
if (GravityUpdate(this, Q_8_8(28.0)) == 0) {
this->action = 7;
this->spritePriority.b0 = 7;
}
src/enemy/rope.c
+1 -1
View File
@@ -89,7 +89,7 @@ void sub_08031480(Entity* this) {
SoundReq(SFX_12D);
}
} else {
if (GravityUpdate(this, 0x1800) == 0) {
if (GravityUpdate(this, Q_8_8(24.0)) == 0) {
this->action = 2;
this->subtimer = 0xf;
this->spriteSettings.draw = 1;
src/enemy/spikedBeetle.c
+1 -1
View File
@@ -180,7 +180,7 @@ void sub_0802B8E0(Entity* this) {
}
void sub_0802B948(Entity* this) {
if (!GravityUpdate(this, 0x1800)) {
if (!GravityUpdate(this, Q_8_8(24.0))) {
this->action = 1;
this->timer = 1;
}
src/enemy/stalfos.c
+6 -6
View File
@@ -174,7 +174,7 @@ void Stalfos_Init(StalfosEntity* this) {
}
void Stalfos_Action1(StalfosEntity* this) {
if (GravityUpdate(super, 0x1800) == 0 && sub_08039758(this) == 0 && --this->unk_78 == 0) {
if (GravityUpdate(super, Q_8_8(24.0)) == 0 && sub_08039758(this) == 0 && --this->unk_78 == 0) {
super->action = 2;
super->timer = 0xa;
sub_08039858(this);
@@ -203,7 +203,7 @@ void Stalfos_Action3(StalfosEntity* this) {
void Stalfos_Action4(StalfosEntity* this) {
ProcessMovement2(super);
if (GravityUpdate(super, 0x1800) == 0) {
if (GravityUpdate(super, Q_8_8(24.0)) == 0) {
sub_0803998C(this);
this->unk_7c = 0x5a;
EnqueueSFX(SFX_PLY_LAND);
@@ -212,7 +212,7 @@ void Stalfos_Action4(StalfosEntity* this) {
void Stalfos_Action5(StalfosEntity* this) {
ProcessMovement2(super);
GravityUpdate(super, 0x1800);
GravityUpdate(super, Q_8_8(24.0));
if (super->zVelocity < 0) {
super->action = 6;
super->timer = 0x0f;
@@ -255,7 +255,7 @@ void Stalfos_Action8(StalfosEntity* this) {
}
void Stalfos_Action9(StalfosEntity* this) {
if (GravityUpdate(super, 0x1800) == 0 && --this->unk_78 == 0) {
if (GravityUpdate(super, Q_8_8(24.0)) == 0 && --this->unk_78 == 0) {
sub_08039A70(this);
}
}
@@ -297,7 +297,7 @@ bool32 sub_08039758(StalfosEntity* this) {
sub_0803981C(this);
super->hitType = 0x46;
this->unk_7d = 0x46;
super->zVelocity = 0x28000;
super->zVelocity = Q_16_16(2.5);
return TRUE;
}
} else {
@@ -314,7 +314,7 @@ bool32 sub_08039758(StalfosEntity* this) {
}
void sub_0803981C(StalfosEntity* this) {
super->zVelocity = 0x20000;
super->zVelocity = Q_16_16(2.0);
if (super->iframes == 0) {
super->iframes = -0xc;
}
src/enemy/tektite.c
+2 -2
View File
@@ -82,9 +82,9 @@ void sub_0802F210(Entity* this) {
this->subtimer = 0;
*(u8*)&this->field_0x7c = 0;
this->field_0x80.HWORD = this->type == 0 ? 0x1800 : 0x2800;
this->field_0x80.HWORD = this->type == 0 ? Q_8_8(24.0) : Q_8_8(40.0);
this->field_0x82.HWORD = this->type == 0 ? 0x2800 : 0x3000;
this->field_0x82.HWORD = this->type == 0 ? (Q_16_16(2.5) >> 4) : (Q_16_16(3.0) >> 4);
InitializeAnimation(this, 0);
}
src/enemy/tektiteGolden.c
+1 -1
View File
@@ -63,7 +63,7 @@ void TektiteGolden_OnDeath(Entity* this) {
void TektiteGolden_OnConfused(Entity* this) {
GenericConfused(this);
if (this->z.HALF.HI != 0) {
GravityUpdate(this, 0x3000);
GravityUpdate(this, Q_8_8(48.0));
}
}
src/enemy/vaatiBall.c
+1 -1
View File
@@ -509,5 +509,5 @@ void sub_08044E74(Entity* this, u32 state) {
}
this->timer = 1;
this->field_0x78.HALF.LO = 0;
this->speed = Q_8_8(5);
this->speed = Q_8_8(5.0);
}
src/enemy/vaatiTransfigured.c
+1 -1
View File
@@ -319,7 +319,7 @@ void VaatiTransfiguredType0Action3(Entity* this) {
}
break;
}
if (GravityUpdate(this, 0x2800) == 0) {
if (GravityUpdate(this, Q_8_8(40.0)) == 0) {
this->field_0x80.HALF.LO = 5;
this->timer = 0x10;
COLLISION_ON(this);
src/enemy/vaatiWrath.c
+3 -3
View File
@@ -167,7 +167,7 @@ void VaatiWrathType0Action1(Entity* this) {
break;
case 1:
this->spritePriority.b1 = 1;
this->z.WORD += 0x8000;
this->z.WORD += Q_16_16(0.5);
if ((this->z.HALF.HI & 0x3f) == 0) {
SoundReq(SFX_1A9);
}
@@ -473,7 +473,7 @@ void VaatiWrathType0ActionB(Entity* this) {
UpdateAnimationSingleFrame(this);
GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type1);
GetNextFrame(((VaatiWrathHeapStruct*)this->myHeap)->type2);
if (GravityUpdate(this, 0x2000) == 0) {
if (GravityUpdate(this, Q_8_8(32.0)) == 0) {
this->subAction = 1;
this->timer = 0xf0;
this->health = 8;
@@ -517,7 +517,7 @@ void VaatiWrathType0ActionC(Entity* this) {
}
switch (this->subAction) {
case 0:
this->z.WORD -= 0x8000;
this->z.WORD -= Q_16_16(0.5);
if (this->z.HALF.HI < -4) {
this->subAction = 1;
this->timer = 120;
src/enemy/wallMaster.c
+1 -1
View File
@@ -171,7 +171,7 @@ void sub_0802A734(Entity* this) {
SetInitializationPriority();
DoExitTransition(gUnk_0813AB1C[gArea.dungeon_idx]);
} else {
this->z.WORD -= 0x20000;
this->z.WORD -= Q_16_16(2);
gPlayerState.field_0xa |= 0x80;
gPlayerState.mobility |= 0x80;
}
src/enemy/wallMaster2.c
+1 -1
View File
@@ -147,7 +147,7 @@ void sub_0802CEF4(Entity* this) {
SetInitializationPriority();
DoExitTransition(gUnk_0813AB1C[gArea.dungeon_idx]);
} else {
this->z.WORD -= 0x20000;
this->z.WORD -= Q_16_16(2);
if (this->z.HALF.HI < -0x30) {
this->spriteSettings.shadow = 1;
}
src/enemy/waterDrop.c
+1 -1
View File
@@ -40,7 +40,7 @@ void sub_0802A250(Entity* this) {
}
void sub_0802A2B4(Entity* this) {
if (!GravityUpdate(this, 0x2800)) {
if (!GravityUpdate(this, Q_8_8(40.0))) {
this->action = 2;
this->spritePriority.b0 = 7;
EnqueueSFX(SFX_WATER_SPLASH);