mirror of
https://github.com/zeldaret/tmc
synced 2026-08-09 10:54:14 -04:00
name asm funcs
This commit is contained in:
@@ -90,7 +90,7 @@ void ArrowProjectile_Action3(Entity* this) {
|
||||
}
|
||||
|
||||
void ArrowProjectile_Action4(Entity* this) {
|
||||
if (sub_08003FC4(this, 0x2800) == 0) {
|
||||
if (GravityUpdate(this, 0x2800) == 0) {
|
||||
CreateDust(this);
|
||||
DeleteThisEntity();
|
||||
} else {
|
||||
|
||||
@@ -55,7 +55,7 @@ void BoneProjectile_Action1(Entity* this) {
|
||||
void BoneProjectile_Action2(Entity* this) {
|
||||
GetNextFrame(this);
|
||||
sub_080AF090(this);
|
||||
if (sub_08003FC4(this, 0x1800) == 0) {
|
||||
if (GravityUpdate(this, 0x1800) == 0) {
|
||||
this->action = 3;
|
||||
COLLISION_OFF(this);
|
||||
this->speed = 0xe0;
|
||||
@@ -75,7 +75,7 @@ void BoneProjectile_Action3(Entity* this) {
|
||||
void BoneProjectile_Action4(Entity* this) {
|
||||
GetNextFrame(this);
|
||||
sub_0806F69C(this);
|
||||
if (sub_08003FC4(this, 0x1800) == 0) {
|
||||
if (GravityUpdate(this, 0x1800) == 0) {
|
||||
DeleteEntity(this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ void GleerokProjectile_Init(Entity* this) {
|
||||
|
||||
void GleerokProjectile_Action1(Entity* this) {
|
||||
if (this->type == 3) {
|
||||
if (sub_08003FC4(this, 0x1800) == 0) {
|
||||
if (GravityUpdate(this, 0x1800) == 0) {
|
||||
sub_08008790(this, 7);
|
||||
CreateFx(this, FX_ROCK, 0);
|
||||
DeleteThisEntity();
|
||||
@@ -101,7 +101,7 @@ void GleerokProjectile_Action1(Entity* this) {
|
||||
this->field_0xf = 0x1e;
|
||||
sub_08004596(this, GetFacingDirection(this, &gPlayerEntity));
|
||||
}
|
||||
if (sub_08003FC4(this, 0) == 0) {
|
||||
if (GravityUpdate(this, 0) == 0) {
|
||||
this->action = 2;
|
||||
sub_080A90D8(this);
|
||||
if (this->type == 2) {
|
||||
|
||||
@@ -198,7 +198,7 @@ void MandiblesProjectile_Action4(Entity* this) {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (sub_080040A8(this) == 0) {
|
||||
if (CheckOnScreen(this) == 0) {
|
||||
DeleteThisEntity();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -154,7 +154,7 @@ void OctorokBossProjectile_Action1(Entity* this) {
|
||||
OctorokBossProjectile_Action2(this);
|
||||
}
|
||||
GetNextFrame(this);
|
||||
if (sub_08003FC4(this, 0x1800) != 0) {
|
||||
if (GravityUpdate(this, 0x1800) != 0) {
|
||||
sub_080AE58C(this, this->direction >> 3, 0);
|
||||
if (this->collisions == 0) {
|
||||
sub_0806F62C(this, (s32)this->speed, (u32)this->direction);
|
||||
@@ -189,7 +189,7 @@ void OctorokBossProjectile_Action1(Entity* this) {
|
||||
DeleteThisEntity();
|
||||
break;
|
||||
case 3:
|
||||
if (sub_08003FC4(this, 0x1800) != 0) {
|
||||
if (GravityUpdate(this, 0x1800) != 0) {
|
||||
return;
|
||||
}
|
||||
CreateFx(this, FX_ROCK, 0);
|
||||
|
||||
@@ -56,7 +56,7 @@ void RockProjectile_Action1(Entity* this) {
|
||||
void RockProjectile_Action2(Entity* this) {
|
||||
sub_0806F69C(this);
|
||||
GetNextFrame(this);
|
||||
if (sub_08003FC4(this, 0x1800) == 0) {
|
||||
if (GravityUpdate(this, 0x1800) == 0) {
|
||||
DeleteEntity(this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -120,7 +120,7 @@ void StalfosProjectile_Action3(Entity* this) {
|
||||
if (this->zVelocity < 0) {
|
||||
this->spriteSettings.flipY = 1;
|
||||
}
|
||||
if (sub_08003FC4(this, 0x2000) == 0) {
|
||||
if (GravityUpdate(this, 0x2000) == 0) {
|
||||
sub_080A9BA8(this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ void V1FireProjectile_Init(Entity* this) {
|
||||
void V1FireProjectile_Action1(Entity* this) {
|
||||
GetNextFrame(this);
|
||||
sub_0806F69C(this);
|
||||
if (sub_08003FC4(this, 0) == 0) {
|
||||
if (GravityUpdate(this, 0) == 0) {
|
||||
this->action = 2;
|
||||
this->actionDelay = 0xf;
|
||||
InitializeAnimation(this, 0x54);
|
||||
|
||||
@@ -96,7 +96,7 @@ void sub_080ABD70(Entity* this) {
|
||||
ASM_FUNC("asm/non_matching/v2Projectile/sub_080ABE04.inc", void sub_080ABE04(Entity* this))
|
||||
|
||||
void sub_080ABE88(Entity* this) {
|
||||
if (sub_08003FC4(this, 0x1800) == 0) {
|
||||
if (GravityUpdate(this, 0x1800) == 0) {
|
||||
CreateFx(this, FX_ROCK, 0);
|
||||
DeleteThisEntity();
|
||||
}
|
||||
@@ -118,7 +118,7 @@ void sub_080ABEA8(Entity* this) {
|
||||
}
|
||||
|
||||
void sub_080ABF04(Entity* this) {
|
||||
if (sub_080040A8(this) == 0) {
|
||||
if (CheckOnScreen(this) == 0) {
|
||||
DeleteThisEntity();
|
||||
}
|
||||
sub_0806F69C(this);
|
||||
|
||||
Reference in New Issue
Block a user