summaryrefslogtreecommitdiff
path: root/src/projectile
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2023-12-31 17:29:08 -0800
committertheo3 <arisstephenson2@gmail.com>2023-12-31 17:34:02 -0800
commit37ac9cb0fb2d9ccb64286bab2cdf648e6f2541c5 (patch)
tree1556b8aba35a82f1cc0d538b93251a1b401f32f5 /src/projectile
parent5049daabc59d113152143d123aea2798d9487a0c (diff)
document tile asm functions
Diffstat (limited to 'src/projectile')
-rw-r--r--src/projectile/boneProjectile.c2
-rw-r--r--src/projectile/cannonballProjectile.c8
-rw-r--r--src/projectile/dekuSeedProjectile.c6
-rw-r--r--src/projectile/dirtBallProjectile.c2
-rw-r--r--src/projectile/fireProjectile.c2
-rw-r--r--src/projectile/gleerokProjectile.c5
-rw-r--r--src/projectile/iceProjectile.c2
-rw-r--r--src/projectile/mandiblesProjectile.c2
-rw-r--r--src/projectile/removableDust.c2
-rw-r--r--src/projectile/rockProjectile.c4
-rw-r--r--src/projectile/spiderWeb.c2
-rw-r--r--src/projectile/windProjectile.c2
-rw-r--r--src/projectile/winder.c2
13 files changed, 21 insertions, 20 deletions
diff --git a/src/projectile/boneProjectile.c b/src/projectile/boneProjectile.c
index 82c2156c..d1052df8 100644
--- a/src/projectile/boneProjectile.c
+++ b/src/projectile/boneProjectile.c
@@ -44,7 +44,7 @@ void BoneProjectile_Action1(Entity* this) {
if (IsProjectileOffScreen(this)) {
DeleteEntity(this);
} else {
- sub_08016AD2(this);
+ UpdateCollisionLayer(this);
if (--this->timer == 0) {
this->action = 2;
this->speed = 0x120;
diff --git a/src/projectile/cannonballProjectile.c b/src/projectile/cannonballProjectile.c
index 5f2e7e04..c5b4244f 100644
--- a/src/projectile/cannonballProjectile.c
+++ b/src/projectile/cannonballProjectile.c
@@ -63,15 +63,15 @@ void CannonballProjectile_Action2(Entity* this) {
}
bool32 sub_080AB5F4(Entity* this) {
- switch (sub_080043E8(this)) {
+ switch (GetTileHazardType(this)) {
case 1:
- CreateItemOnGround(this);
+ CreatePitFallFX(this);
return TRUE;
case 2:
- sub_080043A8(this);
+ CreateDrownFX(this);
return TRUE;
case 3:
- CreateChestSpawner(this);
+ CreateLavaDrownFX(this);
return TRUE;
}
return FALSE;
diff --git a/src/projectile/dekuSeedProjectile.c b/src/projectile/dekuSeedProjectile.c
index 302615fe..c086f251 100644
--- a/src/projectile/dekuSeedProjectile.c
+++ b/src/projectile/dekuSeedProjectile.c
@@ -60,13 +60,13 @@ void DekuSeedProjectile_Action1(Entity* this) {
if (IsProjectileOffScreen(this)) {
DeleteThisEntity();
}
- sub_08016AD2(this);
+ UpdateCollisionLayer(this);
if (--this->timer == 0) {
this->action = 4;
}
} else {
sub_0800417E(this, this->collisions);
- sub_08016AD2(this);
+ UpdateCollisionLayer(this);
InitializeAnimation(this, 0x19);
sub_080A86A0(this);
}
@@ -99,7 +99,7 @@ void DekuSeedProjectile_Action2(Entity* this) {
}
} else {
sub_0800417E(this, this->collisions);
- sub_08016AD2(this);
+ UpdateCollisionLayer(this);
InitializeAnimation(this, 0x19);
sub_080A86A0(this);
}
diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c
index 3da1926c..2ef3867e 100644
--- a/src/projectile/dirtBallProjectile.c
+++ b/src/projectile/dirtBallProjectile.c
@@ -136,7 +136,7 @@ void DirtBallProjectile_Action2(Entity* this) {
return;
}
- tmp = sub_080043E8(this);
+ tmp = GetTileHazardType(this);
if (tmp != 0) {
switch (tmp) {
case 2:
diff --git a/src/projectile/fireProjectile.c b/src/projectile/fireProjectile.c
index fa5e2d5c..cd81f3d3 100644
--- a/src/projectile/fireProjectile.c
+++ b/src/projectile/fireProjectile.c
@@ -57,7 +57,7 @@ void FireProjectile_Action2(Entity* this) {
if (IsProjectileOffScreen(this)) {
DeleteEntity(this);
} else {
- sub_08016AD2(this);
+ UpdateCollisionLayer(this);
}
} else {
this->action = 3;
diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c
index cac30dd3..d40d2a92 100644
--- a/src/projectile/gleerokProjectile.c
+++ b/src/projectile/gleerokProjectile.c
@@ -28,7 +28,8 @@ void GleerokProjectile(GleerokProjectileEntity* this) {
}
void GleerokProjectile_OnTick(GleerokProjectileEntity* this) {
- if (((super->type != 3) && ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0)) && ((super->contactFlags & 0x7f) != 0x1e)) {
+ if (((super->type != 3) && ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0)) &&
+ ((super->contactFlags & 0x7f) != 0x1e)) {
super->action = 3;
COLLISION_OFF(super);
InitializeAnimation(super, 0x53);
@@ -95,7 +96,7 @@ void GleerokProjectile_Init(GleerokProjectileEntity* this) {
void GleerokProjectile_Action1(GleerokProjectileEntity* this) {
if (super->type == 3) {
if (GravityUpdate(super, Q_8_8(24.0)) == 0) {
- sub_08008790(super, 7);
+ DoTileInteractionHere(super, 7);
CreateFx(super, FX_ROCK, 0);
DeleteThisEntity();
}
diff --git a/src/projectile/iceProjectile.c b/src/projectile/iceProjectile.c
index 1fa2ea7a..7a430b38 100644
--- a/src/projectile/iceProjectile.c
+++ b/src/projectile/iceProjectile.c
@@ -59,7 +59,7 @@ void IceProjectile_Action2(Entity* this) {
if (IsProjectileOffScreen(this)) {
DeleteEntity(this);
} else {
- sub_08016AD2(this);
+ UpdateCollisionLayer(this);
}
} else {
this->action = 3;
diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c
index 0062d622..64142a9c 100644
--- a/src/projectile/mandiblesProjectile.c
+++ b/src/projectile/mandiblesProjectile.c
@@ -118,7 +118,7 @@ void MandiblesProjectile_Action2(MandiblesProjectileEntity* this) {
}
this->unk_78 = TILE(super->x.HALF.HI, super->y.HALF.HI);
if (GetTileType(this->unk_78, super->collisionLayer) == 0x4000) {
- SetTile(0x4005, this->unk_78, super->collisionLayer);
+ SetBottomTile(0x4005, this->unk_78, super->collisionLayer);
}
}
diff --git a/src/projectile/removableDust.c b/src/projectile/removableDust.c
index 40ef0640..e89cd3b4 100644
--- a/src/projectile/removableDust.c
+++ b/src/projectile/removableDust.c
@@ -91,7 +91,7 @@ void sub_080AA494(RemovableDustEntity* this) {
}
super->type2 = index;
super->spritePriority.b0 = 7;
- SetTile(0x4068, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer);
+ SetBottomTile(0x4068, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer);
}
void sub_080AA534(Entity* this) {
diff --git a/src/projectile/rockProjectile.c b/src/projectile/rockProjectile.c
index e8ebe565..7dc35d0c 100644
--- a/src/projectile/rockProjectile.c
+++ b/src/projectile/rockProjectile.c
@@ -43,7 +43,7 @@ void RockProjectile_Action1(Entity* this) {
if (IsProjectileOffScreen(this)) {
DeleteEntity(this);
} else {
- sub_08016AD2(this);
+ UpdateCollisionLayer(this);
if (--this->timer == 0) {
this->action = 3;
}
@@ -51,7 +51,7 @@ void RockProjectile_Action1(Entity* this) {
} else {
sub_0800417E(this, this->collisions);
sub_080A8178(this);
- sub_08016AD2(this);
+ UpdateCollisionLayer(this);
}
}
diff --git a/src/projectile/spiderWeb.c b/src/projectile/spiderWeb.c
index b2e97623..c1cb7adc 100644
--- a/src/projectile/spiderWeb.c
+++ b/src/projectile/spiderWeb.c
@@ -246,7 +246,7 @@ void sub_080AA9E0(Entity* this) {
void sub_080AAA68(Entity* this) {
static const u16 typeTiles[] = { 16419, 16421, 16422, 16420 };
- SetTile(typeTiles[this->type], TILE(this->x.HALF.HI, this->y.HALF.HI), this->collisionLayer);
+ SetBottomTile(typeTiles[this->type], TILE(this->x.HALF.HI, this->y.HALF.HI), this->collisionLayer);
}
void sub_080AAAA8(SpiderWebEntity* this) {
diff --git a/src/projectile/windProjectile.c b/src/projectile/windProjectile.c
index 499409f2..2682b104 100644
--- a/src/projectile/windProjectile.c
+++ b/src/projectile/windProjectile.c
@@ -64,7 +64,7 @@ void WindProjectile_Action2(Entity* this) {
if (IsProjectileOffScreen(this)) {
DeleteEntity(this);
} else {
- sub_08016AD2(this);
+ UpdateCollisionLayer(this);
}
} else {
this->action = 3;
diff --git a/src/projectile/winder.c b/src/projectile/winder.c
index 5cbea569..b8caaefb 100644
--- a/src/projectile/winder.c
+++ b/src/projectile/winder.c
@@ -119,7 +119,7 @@ void Winder_SetPositions(WinderEntity* this) {
bool32 Winder_CheckForRailings(WinderEntity* this, u32 dir) {
u32 tile;
u32 val;
- LayerStruct* layer = GetLayerByIndex(super->collisionLayer);
+ LayerStruct* layer = GetTileBuffer(super->collisionLayer);
u32 collisionData;
tile = TILE(super->x.HALF.HI, super->y.HALF.HI);