summaryrefslogtreecommitdiff
path: root/src/item
diff options
context:
space:
mode:
authoroctorock <79596758+octorock@users.noreply.github.com>2024-01-06 14:59:48 +0100
committeroctorock <79596758+octorock@users.noreply.github.com>2024-01-06 15:01:44 +0100
commitaced0bef691dbc41bdd39b6e62662d2436877a4b (patch)
treee90f9fd8e4c4c3471c2fb246bb1372974294b469 /src/item
parentc3b771a20923b335bbea2ab97a68ac29d04fcc43 (diff)
Rename metaTiles
Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles.
Diffstat (limited to 'src/item')
-rw-r--r--src/item/itemMoleMitts.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/item/itemMoleMitts.c b/src/item/itemMoleMitts.c
index ae4b1a95..ae776075 100644
--- a/src/item/itemMoleMitts.c
+++ b/src/item/itemMoleMitts.c
@@ -177,18 +177,18 @@ void sub_08077448(ItemBehavior* this, u32 index) {
s32 sub_080774A0(void) {
static const s8 gUnk_0811BE1E[] = { 0, -13, 13, 0, 0, 16, -13, 0, 0, 0 };
u32 collisionData;
- u32 metaTilePos;
+ u32 tilePos;
- metaTilePos = COORD_TO_TILE_OFFSET((&gPlayerEntity.base), -gUnk_0811BE1E[gPlayerEntity.base.animationState & 6],
+ tilePos = COORD_TO_TILE_OFFSET((&gPlayerEntity.base), -gUnk_0811BE1E[gPlayerEntity.base.animationState & 6],
-gUnk_0811BE1E[(gPlayerEntity.base.animationState & 6) + 1]);
- collisionData = GetCollisionDataAtMetaTilePos(metaTilePos, gPlayerEntity.base.collisionLayer);
+ collisionData = GetCollisionDataAtTilePos(tilePos, gPlayerEntity.base.collisionLayer);
if (collisionData > 0x16)
return 0;
if (collisionData < 0xf)
return 0;
- if (GetVvvAtMetaTilePos(metaTilePos, gPlayerEntity.base.collisionLayer) != VVV_86) {
+ if (GetVvvAtTilePos(tilePos, gPlayerEntity.base.collisionLayer) != VVV_86) {
return 1;
} else {
return 0x56;