Merge pull request #469 from notyourav/hw

player asm stuff

20 files changed, 87 insertions, 87 deletions

diff --git a/src/object/bigIceBlock.c b/src/object/bigIceBlock.c
index 79df9f91..f86ac054 100644
--- a/src/object/bigIceBlock.c
+++ b/src/object/bigIceBlock.c
@@ -260,37 +260,37 @@ void sub_08099C18(BigIceBlockEntity* this) {
     u32 tmp = this->unk_6e;
     switch (this->unk_6c) {
         default:
-            sub_0807BA8C(tmp - 0x41, super->collisionLayer);
-            sub_0807BA8C(tmp - 0x40, super->collisionLayer);
-            sub_0807BA8C(tmp - 1, super->collisionLayer);
-            sub_0807BA8C(tmp, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 0x41, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 0x40, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 1, super->collisionLayer);
+            RestorePrevTileEntity(tmp, super->collisionLayer);
             break;
         case 1:
-            sub_0807BA8C(tmp - 0x41, super->collisionLayer);
-            sub_0807BA8C(tmp - 0x40, super->collisionLayer);
-            sub_0807BA8C(tmp - 0x3f, super->collisionLayer);
-            sub_0807BA8C(tmp - 1, super->collisionLayer);
-            sub_0807BA8C(tmp, super->collisionLayer);
-            sub_0807BA8C(tmp + 1, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 0x41, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 0x40, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 0x3f, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 1, super->collisionLayer);
+            RestorePrevTileEntity(tmp, super->collisionLayer);
+            RestorePrevTileEntity(tmp + 1, super->collisionLayer);
             break;
         case 2:
-            sub_0807BA8C(tmp - 0x41, super->collisionLayer);
-            sub_0807BA8C(tmp - 0x40, super->collisionLayer);
-            sub_0807BA8C(tmp - 1, super->collisionLayer);
-            sub_0807BA8C(tmp, super->collisionLayer);
-            sub_0807BA8C(tmp + 0x3f, super->collisionLayer);
-            sub_0807BA8C(tmp + 0x40, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 0x41, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 0x40, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 1, super->collisionLayer);
+            RestorePrevTileEntity(tmp, super->collisionLayer);
+            RestorePrevTileEntity(tmp + 0x3f, super->collisionLayer);
+            RestorePrevTileEntity(tmp + 0x40, super->collisionLayer);
             break;
         case 3:
-            sub_0807BA8C(tmp - 0x41, super->collisionLayer);
-            sub_0807BA8C(tmp - 0x40, super->collisionLayer);
-            sub_0807BA8C(tmp - 0x3f, super->collisionLayer);
-            sub_0807BA8C(tmp - 1, super->collisionLayer);
-            sub_0807BA8C(tmp, super->collisionLayer);
-            sub_0807BA8C(tmp + 1, super->collisionLayer);
-            sub_0807BA8C(tmp + 0x3f, super->collisionLayer);
-            sub_0807BA8C(tmp + 0x40, super->collisionLayer);
-            sub_0807BA8C(tmp + 0x41, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 0x41, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 0x40, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 0x3f, super->collisionLayer);
+            RestorePrevTileEntity(tmp - 1, super->collisionLayer);
+            RestorePrevTileEntity(tmp, super->collisionLayer);
+            RestorePrevTileEntity(tmp + 1, super->collisionLayer);
+            RestorePrevTileEntity(tmp + 0x3f, super->collisionLayer);
+            RestorePrevTileEntity(tmp + 0x40, super->collisionLayer);
+            RestorePrevTileEntity(tmp + 0x41, super->collisionLayer);
             break;
     }
 }
diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c
index a7072aa7..2e567789 100644
--- a/src/object/chestSpawner.c
+++ b/src/object/chestSpawner.c
@@ -279,7 +279,7 @@ void ChestSpawner_Type0Action3(ChestSpawnerEntity* this) {
                     this->unk_72--;
                 } else {
                     super->action = 1;
-                    sub_0807BA8C(this->tilePosition, super->collisionLayer);
+                    RestorePrevTileEntity(this->tilePosition, super->collisionLayer);
                     CreateDust(super);
                 }
             }
diff --git a/src/object/crenelBeanSprout.c b/src/object/crenelBeanSprout.c
index 52fe70db..ec5400b3 100644
--- a/src/object/crenelBeanSprout.c
+++ b/src/object/crenelBeanSprout.c
@@ -178,7 +178,7 @@ void CrenelBeanSprout_Action1(CrenelBeanSproutEntity* this) {
         }
         PositionRelative(&gPlayerEntity, super, 0, 0x10000);
         if (GetTileUnderEntity(super) == 0x19) {
-            sub_0807BA8C(0xdc, super->collisionLayer);
+            RestorePrevTileEntity(0xdc, super->collisionLayer);
             sub_08096A78(this);
         }
         if ((gPlayerState.field_0x92 & 0xc0) == 0) {
@@ -193,7 +193,7 @@ void CrenelBeanSprout_Action1(CrenelBeanSproutEntity* this) {
         super->zVelocity = 0x20000;
         super->spritePriority.b1 = 1;
         super->spriteSettings.shadow = 1;
-        sub_0807BA8C(0xdc, super->collisionLayer);
+        RestorePrevTileEntity(0xdc, super->collisionLayer);
         SoundReq(SFX_PLY_VO5);
     }
 }
diff --git a/src/object/cuccoMinigame.c b/src/object/cuccoMinigame.c
index 19f63c3f..2e690ab7 100644
--- a/src/object/cuccoMinigame.c
+++ b/src/object/cuccoMinigame.c
@@ -350,9 +350,9 @@ void sub_080A1648(void) {
 }
 
 void sub_080A169C(void) {
-    sub_0807BA8C(0xd36, 1);
-    sub_0807BA8C(0xd37, 1);
-    sub_0807BA8C(0xd38, 1);
-    sub_0807BA8C(0xd75, 1);
-    sub_0807BA8C(0xe75, 1);
+    RestorePrevTileEntity(0xd36, 1);
+    RestorePrevTileEntity(0xd37, 1);
+    RestorePrevTileEntity(0xd38, 1);
+    RestorePrevTileEntity(0xd75, 1);
+    RestorePrevTileEntity(0xe75, 1);
 }
diff --git a/src/object/doubleBookshelf.c b/src/object/doubleBookshelf.c
index f7093e7e..b1fd39fe 100644
--- a/src/object/doubleBookshelf.c
+++ b/src/object/doubleBookshelf.c
@@ -175,7 +175,7 @@ void sub_0809B274(DoubleBookshelfEntity* this) {
                 return;
             }
             this->unk_84 = 1;
-            sub_0807BA8C(this->unk_80 + 2, 1);
+            RestorePrevTileEntity(this->unk_80 + 2, 1);
             sub_0809B38C((DoubleBookshelfEntity*)super->child);
             return;
     }
@@ -208,7 +208,7 @@ void sub_0809B38C(DoubleBookshelfEntity* this) {
     s32 index;
     u32 uVar1 = this->unk_80 - 0x82;
     for (index = 4; index >= 0;) {
-        sub_0807BA8C(uVar1, 1);
+        RestorePrevTileEntity(uVar1, 1);
         index--;
         uVar1++;
     }
diff --git a/src/object/frozenWaterElement.c b/src/object/frozenWaterElement.c
index 7d3bd4c7..953480c4 100644
--- a/src/object/frozenWaterElement.c
+++ b/src/object/frozenWaterElement.c
@@ -147,31 +147,31 @@ void sub_0809C0A8(FrozenWaterElementEntity* this) {
 
 void sub_0809C23C(FrozenWaterElementEntity* this) {
     u32 position = COORD_TO_TILE(super);
-    sub_0807BA8C(position - 0x41, super->collisionLayer);
-    sub_0807BA8C(position - 0x40, super->collisionLayer);
-    sub_0807BA8C(position - 0x3f, super->collisionLayer);
-    sub_0807BA8C(position - 2, super->collisionLayer);
-    sub_0807BA8C(position - 1, super->collisionLayer);
-    sub_0807BA8C(position, super->collisionLayer);
-    sub_0807BA8C(position + 1, super->collisionLayer);
-    sub_0807BA8C(position + 2, super->collisionLayer);
-    sub_0807BA8C(position + 0x3e, super->collisionLayer);
-    sub_0807BA8C(position + 0x3f, super->collisionLayer);
-    sub_0807BA8C(position + 0x40, super->collisionLayer);
-    sub_0807BA8C(position + 0x41, super->collisionLayer);
-    sub_0807BA8C(position + 0x42, super->collisionLayer);
-    sub_0807BA8C(position + 0x7f, super->collisionLayer);
-    sub_0807BA8C(position + 0x80, super->collisionLayer);
-    sub_0807BA8C(position + 0x81, super->collisionLayer);
-    sub_0807BA8C(position + 0x13f, super->collisionLayer);
-    sub_0807BA8C(position + 0x140, super->collisionLayer);
-    sub_0807BA8C(position + 0x141, super->collisionLayer);
-    sub_0807BA8C(position + 0x17f, super->collisionLayer);
-    sub_0807BA8C(position + 0x181, super->collisionLayer);
-    sub_0807BA8C(position + 0x1bd, super->collisionLayer);
-    sub_0807BA8C(position + 0x1be, super->collisionLayer);
-    sub_0807BA8C(position + 0x1bf, super->collisionLayer);
-    sub_0807BA8C(position + 0x1c1, super->collisionLayer);
-    sub_0807BA8C(position + 0x1c2, super->collisionLayer);
-    sub_0807BA8C(position + 0x1c3, super->collisionLayer);
+    RestorePrevTileEntity(position - 0x41, super->collisionLayer);
+    RestorePrevTileEntity(position - 0x40, super->collisionLayer);
+    RestorePrevTileEntity(position - 0x3f, super->collisionLayer);
+    RestorePrevTileEntity(position - 2, super->collisionLayer);
+    RestorePrevTileEntity(position - 1, super->collisionLayer);
+    RestorePrevTileEntity(position, super->collisionLayer);
+    RestorePrevTileEntity(position + 1, super->collisionLayer);
+    RestorePrevTileEntity(position + 2, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x3e, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x3f, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x40, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x41, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x42, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x7f, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x80, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x81, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x13f, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x140, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x141, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x17f, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x181, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x1bd, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x1be, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x1bf, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x1c1, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x1c2, super->collisionLayer);
+    RestorePrevTileEntity(position + 0x1c3, super->collisionLayer);
 }
diff --git a/src/object/jarPortal.c b/src/object/jarPortal.c
index 6be250de..63681ad0 100644
--- a/src/object/jarPortal.c
+++ b/src/object/jarPortal.c
@@ -169,9 +169,9 @@ void sub_0808C148(Entity* this, u32 a2) {
         SetTile(16532, pos + 63, this->collisionLayer);
         SetTile(16533, pos + 64, this->collisionLayer);
     } else {
-        sub_0807BA8C(pos - 1, this->collisionLayer);
-        sub_0807BA8C(pos, this->collisionLayer);
-        sub_0807BA8C(pos + 63, this->collisionLayer);
-        sub_0807BA8C(pos + 64, this->collisionLayer);
+        RestorePrevTileEntity(pos - 1, this->collisionLayer);
+        RestorePrevTileEntity(pos, this->collisionLayer);
+        RestorePrevTileEntity(pos + 63, this->collisionLayer);
+        RestorePrevTileEntity(pos + 64, this->collisionLayer);
     }
 }
diff --git a/src/object/ladderUp.c b/src/object/ladderUp.c
index 7cdd361b..d45dd1f9 100644
--- a/src/object/ladderUp.c
+++ b/src/object/ladderUp.c
@@ -61,7 +61,7 @@ void LadderUp(Entity* this) {
                 if (gPlayerEntity.y.HALF.HI < this->y.HALF.HI) {
                     if (gPlayerState.floor_type != 0x1e && (GetTileTypeByEntity(this) == 0x4017)) {
                         SetTile(0x4023, COORD_TO_TILE(this), this->collisionLayer);
-                        sub_0807BA8C(COORD_TO_TILE_OFFSET(this, 0, 0x10), this->collisionLayer);
+                        RestorePrevTileEntity(COORD_TO_TILE_OFFSET(this, 0, 0x10), this->collisionLayer);
                     }
                 } else {
                     if (GetTileTypeByEntity(this) != 0x4017) {
diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c
index a7fd4209..0ef2bcbc 100644
--- a/src/object/lilypadLarge.c
+++ b/src/object/lilypadLarge.c
@@ -102,10 +102,10 @@ void sub_08085A1C(LilypadLargeEntity* this) {
 
 void sub_08085A44(LilypadLargeEntity* this) {
     super->speed = 0x200;
-    if (sub_080B1A8C(super, 0x10, 0x18) != 0x11) {
+    if (GetRelativeCollisionTile(super, 0x10, 0x18) != 0x11) {
         super->direction = 0x18;
     } else {
-        if (sub_080B1A8C(super, 0xfffffff0, 0x18) != 0x11) {
+        if (GetRelativeCollisionTile(super, 0xfffffff0, 0x18) != 0x11) {
             super->direction = 8;
         } else {
             super->direction = 0x10;
@@ -126,7 +126,7 @@ void sub_08085A98(LilypadLargeEntity* this) {
         this->unk_78.WORD -= 0x20000;
         SetAffineInfo(super, this->unk_78.HALF_U.HI, this->unk_78.HALF_U.HI, this->unk_7c.HALF_U.HI);
     }
-    if (sub_080B1A8C(super, 0, 0x18) != 0x11) {
+    if (GetRelativeCollisionTile(super, 0, 0x18) != 0x11) {
         super->subAction = 2;
         if (gArea.locationIndex == 0x1b) {
             super->y.HALF.HI += 0xd0;
@@ -229,7 +229,7 @@ void sub_08085D10(LilypadLargeEntity* this) {
 
 void sub_08085D28(LilypadLargeEntity* this) {
     if (((gPlayerState.framestate != PL_STATE_TALKEZLO) && ((gPlayerState.flags & PL_FLAGS2) != 0)) &&
-        (sub_080B1A8C(super, 0, 0x18) == 0x11)) {
+        (GetRelativeCollisionTile(super, 0, 0x18) == 0x11)) {
         super->action = 2;
         super->subAction = 0;
         sub_08078B48();
diff --git a/src/object/macroBook.c b/src/object/macroBook.c
index b63bfc37..a69daa92 100644
--- a/src/object/macroBook.c
+++ b/src/object/macroBook.c
@@ -159,7 +159,7 @@ void sub_0809A9D4(MacroBookEntity* this) {
     tilePos = this->tilePos - 0x82;
     for (index = 0; index < 5; index++, tilePos += 0x40) {
         for (index2 = 0; index2 < 4; index2++) {
-            sub_0807BA8C(tilePos + index2, 1);
+            RestorePrevTileEntity(tilePos + index2, 1);
         }
     }
 }
diff --git a/src/object/minecart.c b/src/object/minecart.c
index 97b0adbb..c43d574e 100644
--- a/src/object/minecart.c
+++ b/src/object/minecart.c
@@ -111,7 +111,7 @@ void sub_080918A4(MinecartEntity* this) {
             super->hurtType = 0x18;
             super->damage = 8;
             sub_0801766C(super);
-            sub_0807BA8C(COORD_TO_TILE(super), super->collisionLayer);
+            RestorePrevTileEntity(COORD_TO_TILE(super), super->collisionLayer);
             SoundReq(SFX_137);
         }
     } else {
@@ -158,8 +158,8 @@ void sub_080919AC(MinecartEntity* this) {
                 super->field_0xf = 0x3c;
             }
 
-            uVar3 = sub_080B1A8C(super, gUnk_081223C8[super->animationState * 2],
-                                 gUnk_081223C8[super->animationState * 2 + 1]);
+            uVar3 = GetRelativeCollisionTile(super, gUnk_081223C8[super->animationState * 2],
+                                             gUnk_081223C8[super->animationState * 2 + 1]);
             iVar2 = sub_08007DD6(uVar3, gUnk_081223D8[super->animationState]);
             if (iVar2 == 0) {
                 super->direction = DirectionTurnAround(super->direction);
diff --git a/src/object/object11.c b/src/object/object11.c
index ed7de0ed..884491df 100644
--- a/src/object/object11.c
+++ b/src/object/object11.c
@@ -77,7 +77,7 @@ void Object11_Init(Object11Entity* this) {
 
 void Object11_Action1(Object11Entity* this) {
     if (((gPlayerState.field_0x1c & 0xf) != 1) || ((super->bitfield & 0x7f) != 0x13)) {
-        sub_0807BA8C(COORD_TO_TILE(super), super->collisionLayer);
+        RestorePrevTileEntity(COORD_TO_TILE(super), super->collisionLayer);
         DeleteThisEntity();
     }
 }
diff --git a/src/object/object67.c b/src/object/object67.c
index f36636f8..4f794dd6 100644
--- a/src/object/object67.c
+++ b/src/object/object67.c
@@ -329,7 +329,7 @@ void sub_08094708(Object67Entity* this, u32 param_2, u32 param_3) {
     int index;
 
     for (index = this->unk74 * 2 + 8; index != 0; index--) {
-        sub_0807BA8C(TILE(param_2, param_3), 2);
+        RestorePrevTileEntity(TILE(param_2, param_3), 2);
         param_2 = param_2 + this->unk78;
         param_3 = param_3 + this->unk7c;
     }
diff --git a/src/object/objectBlockingStairs.c b/src/object/objectBlockingStairs.c
index f9aa6a1b..aa2108e0 100644
--- a/src/object/objectBlockingStairs.c
+++ b/src/object/objectBlockingStairs.c
@@ -240,7 +240,7 @@ void sub_08093248(ObjectBlockingStairsEntity* this) {
     tilePos = this->tilePos - 0x40;
     collisionLayer = super->collisionLayer;
     for (index = 0, iVar4 = 0; index < 9; index++) {
-        sub_0807BA8C(tilePos + iVar4 + index - 1, collisionLayer);
+        RestorePrevTileEntity(tilePos + iVar4 + index - 1, collisionLayer);
         switch (index) {
             case 2:
                 iVar4 = 0x3d;
diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c
index f1fbb022..b7316b8c 100644
--- a/src/object/octorokBossObject.c
+++ b/src/object/octorokBossObject.c
@@ -336,7 +336,7 @@ bool32 sub_0809A6F8(u32 param_1, u32 param_2, u32 param_3, u32 param_4) {
             if ((param_4 & 1) != 0) {
                 sub_0807B9B8(gUnk_081238A0[param_3], (param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, 1);
             } else {
-                sub_0807BA8C((param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, 1);
+                RestorePrevTileEntity((param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, 1);
             }
         }
         return TRUE;
diff --git a/src/object/playerClone.c b/src/object/playerClone.c
index cabbd7c9..3e7eadab 100644
--- a/src/object/playerClone.c
+++ b/src/object/playerClone.c
@@ -72,7 +72,7 @@ void PlayerClone_Action1(PlayerCloneEntity* this) {
         if ((this->unk78 != 0) && (this->unk7a != 0)) {
             ((PlayerCloneEntity*)gPlayerClones[super->type])->unk70 = 1;
         }
-        sub_08000152(0x315, this->tilePos, super->collisionLayer);
+        CloneTile(0x315, this->tilePos, super->collisionLayer);
         super->child = sub_08077CF8(1, super->type + 1, 0, ((GenericEntity*)gPlayerState.item)->field_0x68.HALF.LO);
         if (super->child != NULL) {
             super->child->parent = super;
@@ -81,7 +81,7 @@ void PlayerClone_Action1(PlayerCloneEntity* this) {
         sub_0806FDA0(super);
         PlayerClone_Action2(this);
     } else if (gPlayerState.chargeState.action != 4) {
-        sub_08000152(0x315, this->tilePos, super->collisionLayer);
+        CloneTile(0x315, this->tilePos, super->collisionLayer);
         gPlayerClones[super->type] = NULL;
         DeleteThisEntity();
     } else {
diff --git a/src/object/pushableFurniture.c b/src/object/pushableFurniture.c
index b4cc4a13..70213732 100644
--- a/src/object/pushableFurniture.c
+++ b/src/object/pushableFurniture.c
@@ -353,12 +353,12 @@ void sub_08090480(u32 param_1, u32 param_2) {
 
 void sub_08090498(PushableFurnitureEntity* this) {
     u32 tmp = this->unk_70 - 0x80;
-    sub_0807BA8C(tmp, 1);
+    RestorePrevTileEntity(tmp, 1);
     if (((this->unk_83 & 1) != 0) && (GetTileType(tmp, 2) == 0x306)) {
         sub_08000148(0x62, tmp, 1);
     }
     tmp = this->unk_72 - 0x80;
-    sub_0807BA8C(tmp, 1);
+    RestorePrevTileEntity(tmp, 1);
     if (((this->unk_83 & 2) != 0) && (GetTileType(tmp, 2) == 0x308)) {
         sub_08000148(99, tmp, 1);
     }
diff --git a/src/object/pushableGrave.c b/src/object/pushableGrave.c
index a3421aa2..5e882fd7 100644
--- a/src/object/pushableGrave.c
+++ b/src/object/pushableGrave.c
@@ -181,8 +181,8 @@ bool32 sub_0809785C(PushableGraveEntity* this) {
             super->field_0xf = 0x3c;
             super->direction = 0;
             super->speed = 0x40;
-            sub_0807BA8C(this->unk_68, super->collisionLayer);
-            sub_0807BA8C(this->unk_68 - 1, super->collisionLayer);
+            RestorePrevTileEntity(this->unk_68, super->collisionLayer);
+            RestorePrevTileEntity(this->unk_68 - 1, super->collisionLayer);
             return TRUE;
         }
     }
diff --git a/src/object/pushableStatue.c b/src/object/pushableStatue.c
index fd8de005..3074fcff 100644
--- a/src/object/pushableStatue.c
+++ b/src/object/pushableStatue.c
@@ -199,7 +199,7 @@ void sub_08089538(PushableStatueEntity* this) {
     EnqueueSFX(SFX_10F);
     SetTile(this->unk_80, this->unk_84, super->collisionLayer);
     if ((super->collisionLayer == 2) && (GetTileType(this->unk_84, 1) == 0x400b)) {
-        sub_08000152(0x310, this->unk_84, 1);
+        CloneTile(0x310, this->unk_84, 1);
     }
     tileType = GetTileType(this->unk_84 + gUnk_080B4488[super->direction >> 3], super->collisionLayer);
     if ((tileType == 0x79) || (tileType == 0x77)) {
diff --git a/src/object/smallIceBlock.c b/src/object/smallIceBlock.c
index 63c4c5a6..e9689baf 100644
--- a/src/object/smallIceBlock.c
+++ b/src/object/smallIceBlock.c
@@ -189,7 +189,7 @@ void sub_080994B8(SmallIceBlockEntity* this) {
     EnqueueSFX(SFX_ICE_BLOCK_SLIDE);
     SetTile(this->unk_6c, this->unk_70, super->collisionLayer);
     if ((super->collisionLayer == 2) && (GetTileType(this->unk_70, 1) == 0x405a)) {
-        sub_08000152(0x310, this->unk_70, 1);
+        CloneTile(0x310, this->unk_70, 1);
     }
     tileType = GetTileType(this->unk_70 + gUnk_080B4488[super->direction >> 3], super->collisionLayer);
     if (tileType == 0x79 || tileType == 0x77) {