Use same names for arm functions and their trampolines

To easier jump to the corresponding source code.

55 files changed, 131 insertions, 131 deletions

diff --git a/src/affine.c b/src/affine.c
index bd11f972..723c5e90 100644
--- a/src/affine.c
+++ b/src/affine.c
@@ -6,9 +6,9 @@
 
 extern u32 gFrameObjLists[];
 
-extern void gUnk_03006164(void);
-extern void gUnk_0300659C(OAMCommand*, void*);
-extern void gUnk_03006580(OAMCommand*, u32, u32);
+extern void ram_sub_080B23F0(void);
+extern void ram_sub_080B2828(OAMCommand*, void*);
+extern void ram_sub_080B280C(OAMCommand*, u32, u32);
 
 // regalloc
 NONMATCH("asm/non_matching/vram/sub_080AD8F0.inc", void* sub_080AD8F0(u32 sprite, u32 frame)) {
@@ -59,16 +59,16 @@ void DrawEntities(void) {
     gOAMControls._4 = gRoomControls.aff_x + gRoomControls.scroll_x;
     gOAMControls._6 = gRoomControls.aff_y + gRoomControls.scroll_y;
     gOAMControls.field_0x1++;
-    fn = &gUnk_03006164;
+    fn = &ram_sub_080B23F0;
     fn();
 }
 
 void sub_080ADA04(OAMCommand* cmd, void* dst) {
-    void (*fn)(OAMCommand*, void*) = gUnk_0300659C;
+    void (*fn)(OAMCommand*, void*) = ram_sub_080B2828;
     fn(cmd, dst);
 }
 
 void DrawDirect(u32 a1, u32 a2) {
-    void (*fn)(OAMCommand*, u32, u32) = gUnk_03006580;
+    void (*fn)(OAMCommand*, u32, u32) = ram_sub_080B280C;
     fn(&gOamCmd, a1, a2);
 }
diff --git a/src/collision.c b/src/collision.c
index 649055cf..6a402be9 100644
--- a/src/collision.c
+++ b/src/collision.c
@@ -29,7 +29,7 @@ typedef struct {
 
 extern ColSettings gCollisionMtx[173 * 34];
 
-extern void gDoCollision(void);
+extern void ram_CollideAll(void);
 u32 sub_08081420(Entity*);
 extern void SoundReqClipped(Entity*, u32);
 s32 sub_08018308(Entity*, Entity*, u32, ColSettings*);
@@ -64,7 +64,7 @@ void CollisionMain(void) {
     if (prio)
         return;
 
-    doCollision = &gDoCollision;
+    doCollision = &ram_CollideAll;
     // Check to see if we should disable collision this frame
     if (gPlayerState.controlMode != CONTROL_ENABLED) {
         u32 flags = gPlayerEntity.flags;
diff --git a/src/coord.c b/src/coord.c
index 2a634b66..760888cb 100644
--- a/src/coord.c
+++ b/src/coord.c
@@ -223,7 +223,7 @@ u32 sub_0806F824(Entity* a, Entity* b, s32 x, s32 y) {
 u32 sub_0806F854(Entity* ent, s32 x, s32 y) {
     if (ent->z.WORD == 0 || (ent->collisionLayer & 2))
         return 0;
-    if (!sub_080002F0(TILE(ent->x.HALF.HI + x, ent->y.HALF.HI + y), 2, 8)) {
+    if (!sub_080B1BA4(TILE(ent->x.HALF.HI + x, ent->y.HALF.HI + y), 2, 8)) {
         ent->spriteRendering.b3 = 1;
         ent->spriteOrientation.flipY = 1;
         return 0;
diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
index 2d2fdd81..0edf6d34 100644
--- a/src/enemy/acroBandits.c
+++ b/src/enemy/acroBandits.c
@@ -138,7 +138,7 @@ void sub_08031AC8(Entity* this)
             rand = Random();
             x = this->field_0x74.HWORD + ((s32)rand % 5) * 0x10 - 0x20;
             y = this->field_0x76.HWORD + ((s32)(rand >> 4) % 5) * 0x10 - 0x20;
-            if (sub_080002D4(x, y, this->collisionLayer) == 0) {
+            if (sub_080B1B18(x, y, this->collisionLayer) == 0) {
                 this->action = 2;
                 this->spriteSettings.draw = 1;
                 this->x.HALF.HI = x;
diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c
index 4602b3a2..5a1a80f3 100644
--- a/src/enemy/bombPeahat.c
+++ b/src/enemy/bombPeahat.c
@@ -203,7 +203,7 @@ void sub_0802AAC0(Entity* this) {
             this->child = NULL;
 #ifdef EU
         } else if (ent->actionDelay == 0) {
-            if (sub_080002E0(COORD_TO_TILE(this), 1) == 0) {
+            if (sub_080B1B44(COORD_TO_TILE(this), 1) == 0) {
                 if (EntityInRectRadius(this, &gPlayerEntity, 0x10, 0x10) && ent->field_0xf <= 0x50) {
                     this->field_0x80.HALF.HI = 0;
                 }
diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c
index 6b01d0a9..8521f64b 100644
--- a/src/enemy/chuchu.c
+++ b/src/enemy/chuchu.c
@@ -705,7 +705,7 @@ void sub_0801FB68(Entity* this) {
 }
 
 u32 sub_0801FBD0(Entity* this) {
-    if (sub_080002B8(this) == 0x10) {
+    if (sub_080B1AA8(this) == 0x10) {
         return 1;
     } else {
         return 0;
diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c
index 2de3ae0b..6922958c 100644
--- a/src/enemy/cloudPiranha.c
+++ b/src/enemy/cloudPiranha.c
@@ -249,13 +249,13 @@ void sub_080387F0(CloudPiranhaEntity* this) {
     const s8* ptr;
 
     if ((super->action != 4) && (this->unk_82 == 0)) {
-        iVar4 = sub_080002E0(COORD_TO_TILE(super), super->collisionLayer);
+        iVar4 = sub_080B1B44(COORD_TO_TILE(super), super->collisionLayer);
         if ((iVar4 == 0xf) || (iVar4 == 0x2a)) {
             this->unk_82 = 0x20;
         }
         ptr = &gUnk_080CF520[super->direction >> 1];
         bVar1 = super->direction;
-        iVar4 = sub_080002CC(super, ptr[0], ptr[1]);
+        iVar4 = sub_080B1AF0(super, ptr[0], ptr[1]);
         if ((iVar4 == 0xf) || (iVar4 == 0x2a)) {
             super->direction = (super->direction + 0x10) & 0x1f;
         } else {
diff --git a/src/enemy/leever.c b/src/enemy/leever.c
index 776ec72b..4226da39 100644
--- a/src/enemy/leever.c
+++ b/src/enemy/leever.c
@@ -8,8 +8,8 @@
 #include "enemy.h"
 #include "functions.h"
 
-extern u32 sub_080002D4(s32, s32, u32);
-extern u32 sub_080002BC(s32, s32, u32);
+extern u32 sub_080B1B18(s32, s32, u32);
+extern u32 sub_080B1AB4(s32, s32, u32);
 
 extern Entity* gUnk_020000B0;
 
@@ -124,10 +124,10 @@ u32 sub_0801FDE4(Entity* ent, s32 x, s32 y) {
     u32 uVar3;
     const u16* puVar4;
 
-    if (sub_080002D4(x, y, gUnk_020000B0->collisionLayer) != 0) {
+    if (sub_080B1B18(x, y, gUnk_020000B0->collisionLayer) != 0) {
         return 0;
     } else {
-        uVar3 = sub_080002BC(x, y, gUnk_020000B0->collisionLayer);
+        uVar3 = sub_080B1AB4(x, y, gUnk_020000B0->collisionLayer);
         for (puVar4 = gUnk_080CA4CA; *puVar4 != (u16)-1;) {
             if (*puVar4++ == uVar3) {
                 ent->x.HALF.HI = (x & 0xfff0) + 8;
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c
index f89f23e0..f7f8baf1 100644
--- a/src/enemy/pesto.c
+++ b/src/enemy/pesto.c
@@ -336,7 +336,7 @@ void sub_080244E8(Entity* this) {
     switch (this->field_0x80.HALF.LO) {
         case 0:
             if (--this->actionDelay == 0) {
-                if (sub_080002E0(COORD_TO_TILE(this), 1) == 0) {
+                if (sub_080B1B44(COORD_TO_TILE(this), 1) == 0) {
                     this->field_0x80.HALF.LO += 1;
                     this->field_0x82.HALF.LO += 1;
                     this->field_0xf = 0;
diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c
index 54e0f92d..94111c8f 100644
--- a/src/enemy/puffstool.c
+++ b/src/enemy/puffstool.c
@@ -416,22 +416,22 @@ bool32 sub_0802571C(Entity* this) {
 bool32 sub_080257EC(Entity* this, u32 x, u32 y) {
     u16 tmp;
 
-    tmp = sub_080002A8(x - 0x00, y - 0x00, this->collisionLayer);
+    tmp = sub_080B1A48(x - 0x00, y - 0x00, this->collisionLayer);
     if (tmp != 0x312 && gUnk_080B37A0[tmp] != 0x16 && gUnk_080B3E80[tmp] == 0) {
         return TRUE;
     }
 
-    tmp = sub_080002A8(x - 0x10, y - 0x00, this->collisionLayer);
+    tmp = sub_080B1A48(x - 0x10, y - 0x00, this->collisionLayer);
     if (tmp != 0x312 && gUnk_080B37A0[tmp] != 0x16 && gUnk_080B3E80[tmp] == 0) {
         return TRUE;
     }
 
-    tmp = sub_080002A8(x - 0x00, y - 0x10, this->collisionLayer);
+    tmp = sub_080B1A48(x - 0x00, y - 0x10, this->collisionLayer);
     if (tmp != 0x312 && gUnk_080B37A0[tmp] != 0x16 && gUnk_080B3E80[tmp] == 0) {
         return TRUE;
     }
 
-    tmp = sub_080002A8(x - 0x10, y - 0x10, this->collisionLayer);
+    tmp = sub_080B1A48(x - 0x10, y - 0x10, this->collisionLayer);
     if (tmp != 0x312 && gUnk_080B37A0[tmp] != 0x16 && gUnk_080B3E80[tmp] == 0) {
         return TRUE;
     }
@@ -484,10 +484,10 @@ bool32 sub_0802594C(Entity* this, u32 param_2) {
         u8 bVar6;
         iVar9 = xDiff + unk[0];
         iVar11 = yDiff + unk[1];
-        bVar4 = sub_080002D4(iVar9 - 0x00, iVar11 - 0x00, uVar1);
-        bVar5 = sub_080002D4(iVar9 - 0x10, iVar11 - 0x00, uVar1);
-        bVar6 = sub_080002D4(iVar9 - 0x00, iVar11 - 0x10, uVar1);
-        bVar7 = sub_080002D4(iVar9 - 0x10, iVar11 - 0x10, uVar1);
+        bVar4 = sub_080B1B18(iVar9 - 0x00, iVar11 - 0x00, uVar1);
+        bVar5 = sub_080B1B18(iVar9 - 0x10, iVar11 - 0x00, uVar1);
+        bVar6 = sub_080B1B18(iVar9 - 0x00, iVar11 - 0x10, uVar1);
+        bVar7 = sub_080B1B18(iVar9 - 0x10, iVar11 - 0x10, uVar1);
         if ((bVar4 | bVar5 | bVar6 | bVar7) == 0) {
             this->field_0x7c.HALF.LO = gRoomControls.origin_x + iVar9;
             this->field_0x7c.HALF.HI = gRoomControls.origin_y + iVar11;
@@ -513,10 +513,10 @@ void sub_08025A54(Entity* this) {
 }
 
 bool32 sub_08025AB8(u32 tile, u32 layer) {
-    if (sub_080002E0(tile, layer))
+    if (sub_080B1B44(tile, layer))
         return FALSE;
 
-    if (sub_080002C8(tile, layer) == 10) {
+    if (sub_080B1AE0(tile, layer) == 10) {
         sub_0807B7D8(0x61, tile, layer);
         return TRUE;
     }
diff --git a/src/enemy/rope.c b/src/enemy/rope.c
index a26c1088..48a59799 100644
--- a/src/enemy/rope.c
+++ b/src/enemy/rope.c
@@ -174,7 +174,7 @@ void sub_08031600(Entity* this) {
 
 u32 sub_0803163C(Entity* this) {
     u32 h;
-    if (sub_080002B8(this) == 0x13) {
+    if (sub_080B1AA8(this) == 0x13) {
         h = this->field_0x7a.HWORD / 2;
     } else {
         h = this->field_0x7a.HWORD;
diff --git a/src/enemy/slime.c b/src/enemy/slime.c
index 7857c3d6..3c88ae1c 100644
--- a/src/enemy/slime.c
+++ b/src/enemy/slime.c
@@ -129,7 +129,7 @@ void sub_08045178(Entity* this, Entity* child, int h, int v) {
         return;
 
     sub_0804A4E4(this, child);
-    if (sub_080002CC(child, h, v))
+    if (sub_080B1AF0(child, h, v))
         return;
 
     x = child->x.HALF.HI + h;
diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c
index 5ed5c17d..6ab1efcd 100644
--- a/src/enemy/spinyBeetle.c
+++ b/src/enemy/spinyBeetle.c
@@ -323,7 +323,7 @@ void sub_08033D78(SpinyBeetleEntity* this) {
         case 0x1c5:
             break;
         default:
-            if (sub_080002E0(tile, super->collisionLayer) - 1 > 0x3e)
+            if (sub_080B1B44(tile, super->collisionLayer) - 1 > 0x3e)
                 ProcessMovement0(super);
             break;
     }
diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c
index 67fb91a6..ddeb53d2 100644
--- a/src/enemy/tektite.c
+++ b/src/enemy/tektite.c
@@ -137,7 +137,7 @@ void sub_0802F300(Entity* this) {
         return;
     } else if (this->collisions != 0) {
         sub_0800417E(this, this->collisions);
-    } else if ((sub_080002B8(this) & 0xf0) == 0x50) {
+    } else if ((sub_080B1AA8(this) & 0xf0) == 0x50) {
         this->direction = (this->direction + 0x10) & 0x1f;
     }
 
diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c
index 22d7c260..b35f8f2c 100644
--- a/src/enemy/tektiteGolden.c
+++ b/src/enemy/tektiteGolden.c
@@ -116,7 +116,7 @@ void sub_08038048(Entity* this) {
         return;
     } else if (this->collisions != 0) {
         sub_0800417E(this, this->collisions);
-    } else if ((sub_080002B8(this) & 0xf0) == 0x50) {
+    } else if ((sub_080B1AA8(this) & 0xf0) == 0x50) {
         this->direction = (this->direction + 0x10) & 0x1f;
     }
 
diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c
index 7d84c1a5..2d26cd89 100644
--- a/src/enemy/vaatiEyesMacro.c
+++ b/src/enemy/vaatiEyesMacro.c
@@ -230,7 +230,7 @@ void sub_0802EFB8(Entity* this) {
         uVar3 = GetFacingDirection(&gPlayerEntity, this);
         uVar1 = (uVar3 + 4) & 0x18;
     }
-    iVar4 = sub_080002E0(TILE(this->x.HALF.HI, this->y.HALF.HI) + gUnk_080B4488[((uVar1) >> 3)], 1);
+    iVar4 = sub_080B1B44(TILE(this->x.HALF.HI, this->y.HALF.HI) + gUnk_080B4488[((uVar1) >> 3)], 1);
     if (iVar4 != 0) {
         this->direction = 0xff;
     } else {
diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c
index 9cd3c973..9c875dd0 100644
--- a/src/enemy/vaatiProjectile.c
+++ b/src/enemy/vaatiProjectile.c
@@ -275,7 +275,7 @@ void sub_0803E4D8(Entity* this) {
     u32 tile;
 
     tile = TILE(this->x.HALF.HI, this->y.HALF.HI + 8);
-    if (sub_080002E0(tile, gPlayerEntity.collisionLayer) != 0xff) {
+    if (sub_080B1B44(tile, gPlayerEntity.collisionLayer) != 0xff) {
         SetTile(0x4074, tile, gPlayerEntity.collisionLayer);
     }
 }
diff --git a/src/enemy/wizzrobeWind.c b/src/enemy/wizzrobeWind.c
index adb291e6..4ea7da19 100644
--- a/src/enemy/wizzrobeWind.c
+++ b/src/enemy/wizzrobeWind.c
@@ -235,7 +235,7 @@ void sub_0802F8E4(WizzrobeEntity* this) {
             iVar4 = ((s32)(rand)&0x7ff0) % (this->unk_6f << 3);
             uVar7 = (uVar1 + iVar4) | 8;
             uVar6 = TILE(uVar8, uVar7);
-            if ((sub_080002E0(uVar6, super->collisionLayer) == 0) &&
+            if ((sub_080B1B44(uVar6, super->collisionLayer) == 0) &&
                 (GetTileIndex(uVar6, super->collisionLayer) != 0x4071)) {
                 super->x.HALF.HI = (s16)uVar8;
                 super->y.HALF.HI = (s16)uVar7;
diff --git a/src/entity.c b/src/entity.c
index 0cb64131..4bd014e5 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -21,8 +21,8 @@ extern void UnloadHitbox(Entity*);
 extern void sub_0804AA1C(Entity*);
 
 void ClearDeletedEntity(Entity*);
-extern void _ClearAndUpdateEntities(void);
-extern void UpdateEntities_arm(u32);
+extern void ram_ClearAndUpdateEntities(void);
+extern void ram_UpdateEntities(u32);
 
 static void UpdatePriorityTimer(void);
 static void ReleaseTransitionManager(void*);
@@ -205,7 +205,7 @@ void UpdateEntities(void) {
     UpdatePriority();
     ClearHitboxList();
     sub_0806F0A4();
-    f = UpdateEntities_arm;
+    f = ram_UpdateEntities;
     f(0);
     ClearAllDeletedEntities();
     sub_0805EE88();
@@ -213,7 +213,7 @@ void UpdateEntities(void) {
 
 void UpdateManagers(void) {
     void (*f)(u32);
-    f = UpdateEntities_arm;
+    f = ram_UpdateEntities;
     f(1);
     ClearAllDeletedEntities();
 }
@@ -323,7 +323,7 @@ void* GetEmptyEntityByKind(u32 kind) {
 void DeleteThisEntity(void) {
     void (*f)(void);
     DeleteEntityAny(gUpdateContext.current_entity);
-    f = _ClearAndUpdateEntities;
+    f = ram_ClearAndUpdateEntities;
     f();
 }
 
diff --git a/src/fade.c b/src/fade.c
index fc95752b..c245a021 100644
--- a/src/fade.c
+++ b/src/fade.c
@@ -13,7 +13,7 @@ extern u16 gPaletteBuffer[];
 extern u16 gUnk_080FC3C4[];
 
 // function pointer to overlay (0x03005e98) in ram calls rom function MakeFadeBuff256
-extern u32 gMakeFadeBuff256;
+extern u32 ram_MakeFadeBuff256;
 typedef void (*fptrMakeFadeBuff256)(u8*, u8*, u16, u8);
 
 void SetBrightness(u32 brightness) {
@@ -32,7 +32,7 @@ void FadeVBlank(void) {
 
     while (usedPalettesTmp != 0) {
         if ((usedPalettesTmp & 1) == 1) {
-            func = (fptrMakeFadeBuff256)&gMakeFadeBuff256;
+            func = (fptrMakeFadeBuff256)&ram_MakeFadeBuff256;
             func(&((u8*)gPaletteBuffer)[palIdx], &PAL_RAM[palIdx], ptrUnk->unk2, ptrUnk->unk1);
         }
         palIdx += 0x20;
diff --git a/src/interrupts.c b/src/interrupts.c
index fe96466e..e92e1ac6 100644
--- a/src/interrupts.c
+++ b/src/interrupts.c
@@ -18,7 +18,7 @@ extern Entity gUnk_03003BE0;
 extern Entity* gPlayerClones[3];
 extern u16 gUnk_080B2CD8[];
 
-void gIntrMain(void);
+void ram_IntrMain(void);
 
 struct {
     u8 ready;
@@ -36,7 +36,7 @@ void DummyIntr(void) {
 }
 
 void EnableVBlankIntr(void) {
-    INTR_VECTOR = gIntrMain;
+    INTR_VECTOR = ram_IntrMain;
     REG_DISPSTAT = DISPSTAT_VCOUNT_INTR | DISPSTAT_VBLANK_INTR | (80 << 8);
     REG_IE = INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_GAMEPAK;
     REG_IME = 1;
diff --git a/src/item/itemLantern.c b/src/item/itemLantern.c
index 625e66b8..e4aabd31 100644
--- a/src/item/itemLantern.c
+++ b/src/item/itemLantern.c
@@ -87,7 +87,7 @@ void sub_08075B54(ItemBehavior* this, u32 arg1) {
                 tmp = &gUnk_08126EEC[gPlayerEntity.animationState & 6];
 
                 if ((gPlayerState.jump_status == 0) &&
-                    (sub_080002F0(TILE(gPlayerEntity.x.HALF.HI + tmp[0], gPlayerEntity.y.HALF.HI + tmp[1]),
+                    (sub_080B1BA4(TILE(gPlayerEntity.x.HALF.HI + tmp[0], gPlayerEntity.y.HALF.HI + tmp[1]),
                                   gPlayerEntity.collisionLayer, 0x40) != 0)) {
                     this->field_0xf = 0xf;
                     this->stateID += 1;
diff --git a/src/main.c b/src/main.c
index 254d5711..b05555a5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,7 +84,7 @@ void AgbMain(void) {
 
 // Interrupt handlers that are loaded into RAM.
 extern u8 sub_080B197C[];
-extern u8 gUnk_030056F0[];
+extern u8 ram_sub_080B197C[];
 extern u8 gUnk_02038560[];
 extern u8 gUnk_080B2CD8[];
 extern u8 gUnk_080B2CD8_2[];
@@ -102,7 +102,7 @@ static void InitOverlays(void) {
     MemClear(gUnk_02000030, size);
     size = (u32)gUnk_080B2CD8 - (u32)sub_080B197C;
     if (size != 0) {
-        MemCopy(sub_080B197C, gUnk_030056F0, size);
+        MemCopy(sub_080B197C, ram_sub_080B197C, size);
     }
 
     size = (u32)gUnk_080B2CD8_2 - (u32)gUnk_080B2CD8_3;
diff --git a/src/manager/manager24.c b/src/manager/manager24.c
index e4e5bc04..4f230475 100644
--- a/src/manager/manager24.c
+++ b/src/manager/manager24.c
@@ -10,7 +10,7 @@ extern void (*const gUnk_08108CDC[])(Manager24*);
 u32 sub_0805BFC4(u32, u32);
 void sub_0805C02C(Manager24*);
 
-extern u32 sub_080002C8(u16, u8);
+extern u32 sub_080B1AE0(u16, u8);
 
 extern void (*const gUnk_08108CE8[])(u32, u32);
 
@@ -33,7 +33,7 @@ void sub_0805BF30(Manager24* manager) {
 }
 
 void sub_0805BF78(Manager24* this) {
-    if (sub_080002C8(this->tile, this->field_0x35) != 0x2e) {
+    if (sub_080B1AE0(this->tile, this->field_0x35) != 0x2e) {
         this->manager.action = 2;
         this->manager.unk_0e = 0x5a;
         sub_0805C02C(this);
diff --git a/src/manager/manager3.c b/src/manager/manager3.c
index db0f0237..7d9b085b 100644
--- a/src/manager/manager3.c
+++ b/src/manager/manager3.c
@@ -27,7 +27,7 @@ typedef struct {
 
 extern s8 gUnk_08107C6C[];
 extern u32 sub_08057810(void);
-extern u32 sub_080002C0(u16, u16, u8);
+extern u32 sub_080B1AC8(u16, u16, u8);
 
 void Manager3_Main(Manager3* this) {
     s8 tmp;
@@ -53,7 +53,7 @@ void Manager3_Main(Manager3* this) {
                     gArea.field_0x18 = 3;
                 }
             }
-            if (sub_080002C0(this->unk_38, this->unk_3a, this->manager.unk_0e) == 0x3d) {
+            if (sub_080B1AC8(this->unk_38, this->unk_3a, this->manager.unk_0e) == 0x3d) {
                 CreateMagicSparkles(this->unk_38 + gRoomControls.origin_x, this->unk_3a + gRoomControls.origin_y,
                                     this->manager.unk_0e);
                 if (!this->manager.unk_0f) {
diff --git a/src/manager/managerF.c b/src/manager/managerF.c
index 60b9b064..d9fe80e4 100644
--- a/src/manager/managerF.c
+++ b/src/manager/managerF.c
@@ -116,7 +116,7 @@ void sub_08058EE4(ManagerF* this) {
 void sub_08058F44(u32 unk0, u32 unk1, u32 unk2) {
     if (CheckRoomFlag(unk2))
         return;
-    if (sub_080002A8(unk0, unk1, 1) != 0x61)
+    if (sub_080B1A48(unk0, unk1, 1) != 0x61)
         return;
     SetTileType(0x26, ((unk0 >> 4) & 0x3F) | (((unk1 >> 4) & 0x3F) << 6), 1);
     sub_08058F84(unk0, unk1);
diff --git a/src/npc/npc5.c b/src/npc/npc5.c
index 2921b2bc..2f8ae154 100644
--- a/src/npc/npc5.c
+++ b/src/npc/npc5.c
@@ -484,7 +484,7 @@ u32 sub_080611D4(Entity* this) {
     ptr = (s8*)gUnk_0810AC4C;
     a = ptr[x];
     b = ptr[x + 1];
-    uVar2 = sub_080002B4(this, a, b);
+    uVar2 = sub_080B1A8C(this, a, b);
     ptr2 = gUnk_0810AC54;
 
     do {
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index eb7809cc..7f7ffa88 100644
--- a/src/npc/townMinish.c
+++ b/src/npc/townMinish.c
@@ -4,7 +4,7 @@
 #include "functions.h"
 #include "item.h"
 
-extern u32 sub_080002C0(u32, u32, u32);
+extern u32 sub_080B1AC8(u32, u32, u32);
 extern void sub_0806ACC4(Entity*);
 extern void sub_0806AEA8(Entity*);
 extern void sub_0806AEE4(Entity*);
@@ -298,8 +298,8 @@ void sub_0806B098(Entity* this) {
 void sub_0806B0E0(Entity* this) {
     int idx = 0;
 
-    if (sub_080002C0(0x38, 0xb8, 1) == 0x57 && sub_080002C0(0x48, 0xb8, 1) == 0x57 &&
-        sub_080002C0(0x38, 200, 1) == 0x57 && sub_080002C0(0x48, 200, 1) == 0x57) {
+    if (sub_080B1AC8(0x38, 0xb8, 1) == 0x57 && sub_080B1AC8(0x48, 0xb8, 1) == 0x57 &&
+        sub_080B1AC8(0x38, 200, 1) == 0x57 && sub_080B1AC8(0x48, 200, 1) == 0x57) {
         idx = 1;
     }
 
diff --git a/src/object/beanstalk.c b/src/object/beanstalk.c
index 0e748a85..729d0fe0 100644
--- a/src/object/beanstalk.c
+++ b/src/object/beanstalk.c
@@ -335,18 +335,18 @@ void Beanstalk_Action1Type9(BeanstalkEntity* this) {
     if (super->subAction == 0) {
         super->subAction = 1;
         super->y.HALF.HI += 0x28;
-        this->unk_72 = sub_0800029C(super, 0, -0x18);
+        this->unk_72 = sub_080B1A0C(super, 0, -0x18);
     }
     super->spriteOrientation.flipY = gPlayerEntity.spriteOrientation.flipY;
     super->spriteRendering.b3 = gPlayerEntity.spriteRendering.b3;
     if (gPlayerState.floor_type == 0x1e) {
         super->spritePriority.b0 = 0;
-        if (sub_0800029C(super, 0, -0x18) != 0x4014) {
+        if (sub_080B1A0C(super, 0, -0x18) != 0x4014) {
             SetTile(0x4014, COORD_TO_TILE_OFFSET(super, 0, 0x18), 1);
         }
     } else {
         super->spritePriority.b0 = 5;
-        if (this->unk_72 != sub_0800029C(super, 0, -0x18)) {
+        if (this->unk_72 != sub_080B1A0C(super, 0, -0x18)) {
             SetTile(this->unk_72, COORD_TO_TILE_OFFSET(super, 0, 0x18), 1);
         }
     }
diff --git a/src/object/bigIceBlock.c b/src/object/bigIceBlock.c
index b5580c12..c7d7a2bd 100644
--- a/src/object/bigIceBlock.c
+++ b/src/object/bigIceBlock.c
@@ -145,27 +145,27 @@ void sub_08099910(BigIceBlockEntity* this) {
             SetTile(0x4022, position, super->collisionLayer);
             break;
         case 1:
-            iVar1 = sub_080002C8(position - 0x41, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer);
             uVar3 = 0x4024;
             if (iVar1 == 0x12) {
                 uVar3 = 0x4079;
             }
             SetTile(uVar3, position - 0x41, super->collisionLayer);
             SetTile(0x4022, position - 0x40, super->collisionLayer);
-            iVar1 = sub_080002C8(position - 0x3f, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position - 0x3f, super->collisionLayer);
             uVar3 = 0x4025;
             if (iVar1 == 0x12) {
                 uVar3 = 0x407b;
             }
             SetTile(uVar3, position - 0x3f, super->collisionLayer);
-            iVar1 = sub_080002C8(position - 1, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position - 1, super->collisionLayer);
             uVar3 = 0x4024;
             if (iVar1 == 0x12) {
                 uVar3 = 0x4079;
             }
             SetTile(uVar3, position - 1, super->collisionLayer);
             SetTile(0x4022, position, super->collisionLayer);
-            iVar1 = sub_080002C8(position + 1, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position + 1, super->collisionLayer);
             uVar3 = 0x4025;
             if (iVar1 == 0x12) {
                 uVar3 = 0x407b;
@@ -174,13 +174,13 @@ void sub_08099910(BigIceBlockEntity* this) {
             return;
             break;
         case 2:
-            iVar1 = sub_080002C8(position - 0x41, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer);
             uVar3 = 0x4023;
             if (iVar1 == 0x12) {
                 uVar3 = 0x4077;
             }
             SetTile(uVar3, position - 0x41, super->collisionLayer);
-            iVar1 = sub_080002C8(position - 0x40, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position - 0x40, super->collisionLayer);
             uVar3 = 0x4023;
             if (iVar1 == 0x12) {
                 uVar3 = 0x4077;
@@ -188,13 +188,13 @@ void sub_08099910(BigIceBlockEntity* this) {
             SetTile(uVar3, position - 0x40, super->collisionLayer);
             SetTile(0x4022, position - 1, super->collisionLayer);
             SetTile(0x4022, position, super->collisionLayer);
-            iVar1 = sub_080002C8(position + 0x3f, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position + 0x3f, super->collisionLayer);
             uVar3 = 0x4026;
             if (iVar1 == 0x12) {
                 uVar3 = 0x407c;
             }
             SetTile(uVar3, position + 0x3f, super->collisionLayer);
-            iVar1 = sub_080002C8(position + 0x40, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position + 0x40, super->collisionLayer);
             uVar3 = 0x4026;
             if (iVar1 == 0x12) {
                 uVar3 = 0x407c;
@@ -202,50 +202,50 @@ void sub_08099910(BigIceBlockEntity* this) {
             SetTile(uVar3, position + 0x40, super->collisionLayer);
             break;
         case 3:
-            iVar1 = sub_080002C8(position - 0x41, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer);
             uVar3 = 0x4027;
             if (iVar1 == 0x12) {
                 uVar3 = 0x4075;
             }
             SetTile(uVar3, position - 0x41, super->collisionLayer);
-            iVar1 = sub_080002C8(position - 0x40, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position - 0x40, super->collisionLayer);
             uVar3 = 0x4023;
             if (iVar1 == 0x12) {
                 uVar3 = 0x4077;
             }
             SetTile(uVar3, position - 0x40, super->collisionLayer);
-            iVar1 = sub_080002C8(position - 0x3f, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position - 0x3f, super->collisionLayer);
             uVar3 = 0x4028;
             if (iVar1 == 0x12) {
                 uVar3 = 0x4076;
             }
             SetTile(uVar3, position - 0x3f, super->collisionLayer);
-            iVar1 = sub_080002C8(position - 1, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position - 1, super->collisionLayer);
             uVar3 = 0x4024;
             if (iVar1 == 0x12) {
                 uVar3 = 0x4079;
             }
             SetTile(uVar3, position - 1, super->collisionLayer);
             SetTile(0x4022, position, super->collisionLayer);
-            iVar1 = sub_080002C8(position + 1, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position + 1, super->collisionLayer);
             uVar3 = 0x4025;
             if (iVar1 == 0x12) {
                 uVar3 = 0x407b;
             }
             SetTile(uVar3, position + 1, super->collisionLayer);
-            iVar1 = sub_080002C8(position + 0x3f, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position + 0x3f, super->collisionLayer);
             uVar3 = 0x4029;
             if (iVar1 == 0x12) {
                 uVar3 = 0x4078;
             }
             SetTile(uVar3, position + 0x3f, super->collisionLayer);
-            iVar1 = sub_080002C8(position + 0x40, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position + 0x40, super->collisionLayer);
             uVar3 = 0x4026;
             if (iVar1 == 0x12) {
                 uVar3 = 0x407c;
             }
             SetTile(uVar3, position + 0x40, super->collisionLayer);
-            iVar1 = sub_080002C8(position + 0x41, super->collisionLayer);
+            iVar1 = sub_080B1AE0(position + 0x41, super->collisionLayer);
             uVar3 = 0x402a;
             if (iVar1 == 0x12) {
                 uVar3 = 0x407a;
diff --git a/src/object/bollard.c b/src/object/bollard.c
index 5f1b0bf7..3a7d13b7 100644
--- a/src/object/bollard.c
+++ b/src/object/bollard.c
@@ -89,7 +89,7 @@ void sub_0808B3AC(BollardEntity* this) {
     super->spritePriority.b0 = 4;
     this->tile = COORD_TO_TILE(super);
     this->tileIndex = GetTileIndex(this->tile, super->collisionLayer);
-    this->unk74 = sub_080002E0(this->tile, super->collisionLayer);
+    this->unk74 = sub_080B1B44(this->tile, super->collisionLayer);
     SetTile(0x400b, this->tile, super->collisionLayer);
 }
 
diff --git a/src/object/button.c b/src/object/button.c
index fcfad6ac..5a29e636 100644
--- a/src/object/button.c
+++ b/src/object/button.c
@@ -140,7 +140,7 @@ u32 sub_08081E0C(Entity*);
 
 Entity* sub_08081D74(Entity* this) {
     Entity* ent;
-    if (sub_080002E0(this->field_0x74.HWORD, this->collisionLayer) == 0xF) {
+    if (sub_080B1B44(this->field_0x74.HWORD, this->collisionLayer) == 0xF) {
         return 0;
     }
     ent = 0;
diff --git a/src/object/crenelBeanSprout.c b/src/object/crenelBeanSprout.c
index 7fb66a06..39af67c9 100644
--- a/src/object/crenelBeanSprout.c
+++ b/src/object/crenelBeanSprout.c
@@ -18,7 +18,7 @@ typedef struct {
     /*0x72*/ u16 unk_72;
 } CrenelBeanSproutEntity;
 
-extern u32 sub_080002BC(s32, s32, u32);
+extern u32 sub_080B1AB4(s32, s32, u32);
 
 void sub_080969A4(CrenelBeanSproutEntity*);
 void sub_08096A78(CrenelBeanSproutEntity*);
@@ -171,13 +171,13 @@ void CrenelBeanSprout_Action1(CrenelBeanSproutEntity* this) {
         tmp = gPlayerEntity.animationState & 6;
         this->unk_70 = ((super->x.HALF.HI + (s8)gUnk_08123184[tmp]) & -0x10) | 8;
         this->unk_72 = ((super->y.HALF.HI + (s8)gUnk_08123184[(tmp) + 1]) & -0x10) | 8;
-        if (sub_080002BC(this->unk_70, this->unk_72, super->collisionLayer) == 0x19) {
+        if (sub_080B1AB4(this->unk_70, this->unk_72, super->collisionLayer) == 0x19) {
             gUnk_0200AF00.filler25[10] = 3;
         } else {
             gUnk_0200AF00.filler25[10] = 0;
         }
         PositionRelative(&gPlayerEntity, super, 0, 0x10000);
-        if (sub_080002B8(super) == 0x19) {
+        if (sub_080B1AA8(super) == 0x19) {
             sub_0807BA8C(0xdc, super->collisionLayer);
             sub_08096A78(this);
         }
diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c
index 59b5feab..b4683933 100644
--- a/src/object/itemOnGround.c
+++ b/src/object/itemOnGround.c
@@ -247,7 +247,7 @@ void sub_080812A0(Entity* this) {
 }
 
 void sub_080812A8(Entity* this) {
-    if (sub_080002D0(this) != 0xF && this->field_0x6e.HWORD != GetTileTypeByEntity(this)) {
+    if (sub_080B1B0C(this) != 0xF && this->field_0x6e.HWORD != GetTileTypeByEntity(this)) {
         this->direction = 0;
         this->speed = 0;
         this->spriteSettings.draw = 1;
diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c
index 6d326946..d7f653df 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_080002B4(super, 0x10, 0x18) != 0x11) {
+    if (sub_080B1A8C(super, 0x10, 0x18) != 0x11) {
         super->direction = 0x18;
     } else {
-        if (sub_080002B4(super, 0xfffffff0, 0x18) != 0x11) {
+        if (sub_080B1A8C(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;
         sub_0805EC9C(super, this->unk_78.HALF_U.HI, this->unk_78.HALF_U.HI, this->unk_7c.HALF_U.HI);
     }
-    if (sub_080002B4(super, 0, 0x18) != 0x11) {
+    if (sub_080B1A8C(super, 0, 0x18) != 0x11) {
         super->subAction = 2;
         if (gArea.locationIndex == 0x1b) {
             super->y.HALF.HI += 0xd0;
@@ -159,7 +159,7 @@ void sub_08085B40(LilypadLargeEntity* this) {
         }
     } else {
         ResetCollisionLayer(super);
-        if (sub_080002B8(super) == 0xd) {
+        if (sub_080B1AA8(super) == 0xd) {
             ResetCollisionLayer(&gPlayerEntity);
             sub_08085CDC(this);
             super->direction = GetFacingDirection(&gPlayerEntity, super);
@@ -181,7 +181,7 @@ void sub_08085B40(LilypadLargeEntity* this) {
             super->actionDelay |= 0x80;
             this->unk_70 = 0;
             this->unk_6c = 0;
-            if (sub_080002B8(super) == 0xd) {
+            if (sub_080B1AA8(super) == 0xd) {
                 super->action = 4;
             }
         }
@@ -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_080002B4(super, 0, 0x18) == 0x11)) {
+        (sub_080B1A8C(super, 0, 0x18) == 0x11)) {
         super->action = 2;
         super->subAction = 0;
         sub_08078B48();
@@ -261,7 +261,7 @@ NONMATCH("asm/non_matching/lilypadLarge/sub_08085D60.inc", void sub_08085D60(Lil
                     u32 tmp = r4 >> 2;
                     s32 tmpX = gUnk_08120638[tmp];
                     s32 tmpY = gUnk_08120638[tmp + 1];
-                    if (sub_080002CC(super, tmpX, tmpY) == 0xff) {
+                    if (sub_080B1AF0(super, tmpX, tmpY) == 0xff) {
 
                         if (sub_080806BC((super->x.HALF.HI - gRoomControls.origin_x) + tmpX,
                                          (super->y.HALF.HI - gRoomControls.origin_y) + tmpY, r4, 5) == 0) {
@@ -280,7 +280,7 @@ NONMATCH("asm/non_matching/lilypadLarge/sub_08085D60.inc", void sub_08085D60(Lil
                     u32 tmp = r6 >> 2;
                     s32 tmpX = (u8)gUnk_08120638[tmp];
                     s32 tmpY = gUnk_08120638[tmp + 1];
-                    if (sub_080002CC(super, tmpX, tmpY) == 0xff) {
+                    if (sub_080B1AF0(super, tmpX, tmpY) == 0xff) {
                         if (sub_0807BD14(&gPlayerEntity, r6 >> 3) != 0) {
                             super->direction = (u8)r6;
                             sub_08085E74(this);
diff --git a/src/object/mask.c b/src/object/mask.c
index b79eeec6..df9a4e7a 100644
--- a/src/object/mask.c
+++ b/src/object/mask.c
@@ -46,7 +46,7 @@ void sub_080929A4(Entity* this) {
     this->field_0x7c.HALF_U.HI = COORD_TO_TILE(this);
     this->field_0x7c.HALF_U.LO = GetTileIndex(this->field_0x7c.HALF_U.HI, 1);
 
-    this->field_0x7a.HWORD = sub_080002E0((u16)this->field_0x7c.HALF.HI, 1);
+    this->field_0x7a.HWORD = sub_080B1B44((u16)this->field_0x7c.HALF.HI, 1);
 
     SetTile(0x4022, this->field_0x7c.HALF_U.HI, 1);
 }
diff --git a/src/object/minecart.c b/src/object/minecart.c
index 7c7305b6..5b2538f2 100644
--- a/src/object/minecart.c
+++ b/src/object/minecart.c
@@ -141,7 +141,7 @@ void sub_080919AC(Entity* this) {
                 this->field_0xf = 0x3c;
             }
 
-            uVar3 = sub_080002B4(this, gUnk_081223C8[this->animationState * 2],
+            uVar3 = sub_080B1A8C(this, gUnk_081223C8[this->animationState * 2],
                                  gUnk_081223C8[this->animationState * 2 + 1]);
             iVar2 = sub_08007DD6(uVar3, gUnk_081223D8[this->animationState]);
             if (iVar2 == 0) {
@@ -177,7 +177,7 @@ void sub_080919AC(Entity* this) {
                     case 0x6d:
                     case 0x6e:
                     case 0x6f:
-                        if (uVar3 == sub_080002B8(this)) {
+                        if (uVar3 == sub_080B1AA8(this)) {
                             sub_08091C0C(this);
                             gPlayerEntity.animationState = this->animationState << 1;
                             return;
diff --git a/src/object/object68.c b/src/object/object68.c
index 83913606..e5265aa9 100644
--- a/src/object/object68.c
+++ b/src/object/object68.c
@@ -16,7 +16,7 @@ typedef struct {
     /*0x68*/ u8 unk_68;
 } Object68Entity;
 
-extern u32 sub_0800029C(Entity*, s32, s32);
+extern u32 sub_080B1A0C(Entity*, s32, s32);
 
 void sub_08094774(Object68Entity*);
 void sub_080948D0(Object68Entity*);
@@ -117,7 +117,7 @@ void sub_08094980(Object68Entity* this, u32 searchTileIndex, u32 replaceTileInde
     while (index < 10) {
         xOffset = gUnk_08122A28[index];
         yOffset = gUnk_08122A28[index + 1];
-        if (searchTileIndex == sub_0800029C(super, xOffset, yOffset)) {
+        if (searchTileIndex == sub_080B1A0C(super, xOffset, yOffset)) {
             SetTile(replaceTileIndex, TILE(super->x.HALF.HI + xOffset, super->y.HALF.HI + yOffset),
                     super->collisionLayer);
         }
diff --git a/src/object/object6A.c b/src/object/object6A.c
index c46bcf30..9ae71669 100644
--- a/src/object/object6A.c
+++ b/src/object/object6A.c
@@ -327,7 +327,7 @@ void sub_08094E30(Object6AEntity* this) {
                 super->zVelocity = 0;
                 SetDefaultPriority(super, PRIO_PLAYER_EVENT);
                 InitializeAnimation(super, 0);
-                if (sub_080002B8(super) == 13) {
+                if (sub_080B1AA8(super) == 13) {
                     super->action = 3;
                 }
                 break;
diff --git a/src/object/objectOnPillar.c b/src/object/objectOnPillar.c
index 26173613..5582f707 100644
--- a/src/object/objectOnPillar.c
+++ b/src/object/objectOnPillar.c
@@ -211,7 +211,7 @@ void sub_080970F4(ObjectOnPillarEntity* this) {
 bool32 sub_08097144(ObjectOnPillarEntity* this) {
     LinearMoveUpdate(super);
     sub_0800445C(super);
-    if (sub_080002B8(super) == 0x19) {
+    if (sub_080B1AA8(super) == 0x19) {
         super->spriteOffsetY = 2;
     }
     if ((--this->unk_76 == 0) && sub_08097194(this) == FALSE) {
diff --git a/src/object/pot.c b/src/object/pot.c
index c67721a9..239d0732 100644
--- a/src/object/pot.c
+++ b/src/object/pot.c
@@ -94,7 +94,7 @@ void sub_08082310(Entity* this) {
                         DeleteThisEntity();
                         break;
                     default:
-                        if (sub_080002B8(this) == 13) {
+                        if (sub_080B1AA8(this) == 13) {
                             CreateFx(this, FX_FALL_DOWN, 0);
                         } else if (tileType == 0x4005) {
                             gPlayerState.field_0xab = 4;
diff --git a/src/object/pullableLever.c b/src/object/pullableLever.c
index 4b100533..35088834 100644
--- a/src/object/pullableLever.c
+++ b/src/object/pullableLever.c
@@ -114,7 +114,7 @@ void PullableLever_HandleSubAction0(PullableLeverEntity* this) {
         if (-player->animationState + super->type2 * 2 == 0) {
             x = gUnk_081222B8[super->type2 * 2] + super->x.HALF_U.HI;
             y = gUnk_081222B8[super->type2 * 2 + 1] + super->y.HALF_U.HI;
-            if (0x10 < sub_080002D4(x, y, player->collisionLayer) - 0xf) {
+            if (0x10 < sub_080B1B18(x, y, player->collisionLayer) - 0xf) {
                 player->x.HALF.HI = x;
                 player->y.HALF.HI = y;
             }
diff --git a/src/object/pushableFurniture.c b/src/object/pushableFurniture.c
index 01bf646f..0d1f98a9 100644
--- a/src/object/pushableFurniture.c
+++ b/src/object/pushableFurniture.c
@@ -152,7 +152,7 @@ bool32 sub_0808FC5C(PushableFurnitureEntity* this) {
         } else {
             super->spriteOffsetY = 0;
         }
-        if (sub_080002D0(super)) {
+        if (sub_080B1B0C(super)) {
             return 0;
         }
         if (super->field_0xf == 0) {
@@ -239,27 +239,27 @@ void sub_0808FDE8(PushableFurnitureEntity* this) {
     u32 uVar3;
 
     uVar3 = (u32)this->unk_70;
-    uVar1 = sub_080002E0(uVar3 - 1, 1);
+    uVar1 = sub_080B1B44(uVar3 - 1, 1);
     iVar2 = GetTileIndex(uVar3, 1);
     if (iVar2 == 0x402e) {
         if ((((uVar1 & 0xf0) != 0) && ((uVar1 & 0xf0) != 0x50)) || ((uVar1 & 5) == 0)) {
             SetTile(0x402c, uVar3, 1);
         }
     } else {
-        iVar2 = sub_080002E0(uVar3, 1);
+        iVar2 = sub_080B1B44(uVar3, 1);
         if ((iVar2 == 5) && ((((uVar1 & 0xf0) == 0 || ((uVar1 & 0xf0) == 0x50)) && ((uVar1 & 5) != 0)))) {
             SetTile(0x402e, uVar3, 1);
         }
     }
     uVar3 = (u32)this->unk_72;
-    uVar1 = sub_080002E0(uVar3 + 1, 1);
+    uVar1 = sub_080B1B44(uVar3 + 1, 1);
     iVar2 = GetTileIndex(uVar3, 1);
     if (iVar2 == 0x402f) {
         if ((((uVar1 & 0xf0) != 0) && ((uVar1 & 0xf0) != 0x50)) || ((uVar1 & 10) == 0)) {
             SetTile(0x402d, uVar3, 1);
         }
     } else {
-        iVar2 = sub_080002E0(uVar3, 1);
+        iVar2 = sub_080B1B44(uVar3, 1);
         if (((iVar2 == 10) && (((uVar1 & 0xf0) == 0 || ((uVar1 & 0xf0) == 0x50)))) && ((uVar1 & 10) != 0)) {
             SetTile(0x402f, uVar3, 1);
         }
diff --git a/src/object/pushableRock.c b/src/object/pushableRock.c
index a176e2da..75a9733e 100644
--- a/src/object/pushableRock.c
+++ b/src/object/pushableRock.c
@@ -92,8 +92,8 @@ void sub_0808A644(PushableRockEntity* this) {
     u32 tmp;
     this->tilePosition = COORD_TO_TILE(super);
     this->tileIndex = GetTileIndex(this->tilePosition, super->collisionLayer);
-    this->unk_72 = sub_080002E0(this->tilePosition, super->collisionLayer);
-    tmp = sub_080002C8(this->tilePosition, super->collisionLayer);
+    this->unk_72 = sub_080B1B44(this->tilePosition, super->collisionLayer);
+    tmp = sub_080B1AE0(this->tilePosition, super->collisionLayer);
     if ((tmp == 0x19) || (tmp == 0xf0)) {
         SetTile(0x4015, this->tilePosition, super->collisionLayer);
         super->action = 3;
diff --git a/src/object/pushableStatue.c b/src/object/pushableStatue.c
index f499f565..c47ebfba 100644
--- a/src/object/pushableStatue.c
+++ b/src/object/pushableStatue.c
@@ -213,7 +213,7 @@ bool32 sub_080895C0(PushableStatueEntity* this) {
     LinearMoveUpdate(super);
     if ((--this->unk_86 == 0) && (sub_0800442E(super) == 0)) {
         super->spriteOffsetY = 0;
-        if (!sub_080002D0(super)) {
+        if (!sub_080B1B0C(super)) {
             sub_08089454(this);
             return TRUE;
         }
diff --git a/src/player.c b/src/player.c
index 076b684a..5f15068c 100644
--- a/src/player.c
+++ b/src/player.c
@@ -2006,7 +2006,7 @@ static void PlayerRoomTransition(Entity* this) {
 static void sub_080724DC(Entity* this) {
     this->knockbackDuration = 0;
     DeleteClones();
-    if (sub_080002B8(this) != 0x29) {
+    if (sub_080B1AA8(this) != 0x29) {
         if ((gPlayerState.field_0x82[7] == 0) && (gPlayerState.swim_state != 0)) {
             sub_0807AE20(this);
         }
@@ -2648,7 +2648,7 @@ static void sub_080731D8(Entity* this) {
 
 static void sub_080732D0(Entity* this) {
     UpdateAnimationSingleFrame(this);
-    if (sub_080002B8(this) != 40) {
+    if (sub_080B1AA8(this) != 40) {
         this->direction = DirectionNorth;
         LinearMoveUpdate(this);
     } else {
@@ -2910,7 +2910,7 @@ static void sub_080737BC(Entity* this) {
         pos = this->y.HALF.HI;
     tmp = 0xf;
     tmp &= pos;
-    if (tmp == 8 && !sub_080002D0(this)) {
+    if (tmp == 8 && !sub_080B1B0C(this)) {
         gPlayerState.jump_status |= 0x40;
         sub_0807921C();
     }
@@ -4130,7 +4130,7 @@ void sub_0807529C(Entity* this) {
 void sub_080752AC(Entity* this, ScriptExecutionContext* ctx) {
     LinearMoveUpdate(this);
     if (!ctx->unk_18) {
-        if (sub_080002B8(this) != 41) {
+        if (sub_080B1AA8(this) != 41) {
             ctx->unk_18 = 1;
             ctx->unk_19 = 6;
         }
diff --git a/src/playerItem/playerItem12.c b/src/playerItem/playerItem12.c
index 36ff936a..170c107e 100644
--- a/src/playerItem/playerItem12.c
+++ b/src/playerItem/playerItem12.c
@@ -107,9 +107,9 @@ void sub_080701F8(Entity* this) {
         if (this->type == 0) {
             sub_0800451C(this);
         }
-        if (sub_080002F0(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) == 0) {
+        if (sub_080B1BA4(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) == 0) {
             if (sub_080040D8(this, &gUnk_08003E44, this->x.HALF.HI, this->y.HALF.HI) == 0) {
-                if (sub_080002B8(this) == 0x19) {
+                if (sub_080B1AA8(this) == 0x19) {
                     this->action = 4;
                     COLLISION_OFF(this);
                     this->x.HALF.HI = (this->x.HALF.HI & 0xfff0) | 8;
diff --git a/src/playerItem/playerItem14.c b/src/playerItem/playerItem14.c
index 3e50c389..b4e400a8 100644
--- a/src/playerItem/playerItem14.c
+++ b/src/playerItem/playerItem14.c
@@ -44,7 +44,7 @@ void sub_0805FC74(Entity* this) {
         if (this->type2 == 0) {
             sub_0800451C(this);
         }
-        if (!sub_080002F0(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) &&
+        if (!sub_080B1BA4(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) &&
             sub_080040D8(this, &gUnk_08003E44, this->x.HALF.HI, this->y.HALF.HI)) {
             CreateFx(this, FX_SWORD_MAGIC, 0);
             DeleteThisEntity();
diff --git a/src/playerItem/playerItem3.c b/src/playerItem/playerItem3.c
index b0d44d66..81f89bfc 100644
--- a/src/playerItem/playerItem3.c
+++ b/src/playerItem/playerItem3.c
@@ -152,7 +152,7 @@ void sub_0801B680(Entity* this) {
         uVar6 = ((u32)(-uvar1 | uvar1)) >> 0x1f;
     }
 
-    if (sub_080002F0(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) == 0) {
+    if (sub_080B1BA4(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) == 0) {
         if (uVar6 == 0) {
             uVar6 = sub_080040E2(this, &gUnk_08003E44);
         }
diff --git a/src/playerItem/playerItemBottle.c b/src/playerItem/playerItemBottle.c
index cc60f94c..14ee8449 100644
--- a/src/playerItem/playerItemBottle.c
+++ b/src/playerItem/playerItemBottle.c
@@ -273,7 +273,7 @@ void PlayerItemBottle_UseEmptyBottle(Entity* this) {
             if (this->spriteSettings.flipX != 0) {
                 iVar2 = -iVar2;
             }
-            if (sub_080002B4(this, iVar2, (s8)ptr2[1]) == 0x10) {
+            if (sub_080B1A8C(this, iVar2, (s8)ptr2[1]) == 0x10) {
                 this->type2 = ITEM_BOTTLE_WATER;
             }
         }
diff --git a/src/playerItem/playerItemSwordBeam.c b/src/playerItem/playerItemSwordBeam.c
index b39ce936..6bdc04eb 100644
--- a/src/playerItem/playerItemSwordBeam.c
+++ b/src/playerItem/playerItemSwordBeam.c
@@ -71,7 +71,7 @@ void sub_08019580(Entity* this) {
         if (this->type2 == 0) {
             sub_0800451C(this);
         }
-        if ((sub_080002F0(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.collisionLayer, 0x80) == 0) &&
+        if ((sub_080B1BA4(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.collisionLayer, 0x80) == 0) &&
             (sub_080040D8(this, &gUnk_08003E44, this->x.HALF.HI, this->y.HALF.HI) != 0)) {
             CreateFx(this, FX_SWORD_MAGIC, 0);
             DeleteThisEntity();
diff --git a/src/playerUtils.c b/src/playerUtils.c
index ada94b39..feed47a8 100644
--- a/src/playerUtils.c
+++ b/src/playerUtils.c
@@ -23,7 +23,7 @@ extern Entity* sub_0805E744();
 extern void sub_0809D738(Entity*);
 extern s32 Mod(s32, s32);
 extern void sub_08003FDE(Entity*, u32, u32, u32);
-extern u32 sub_080002EC(u32, u32);
+extern u32 sub_080B1B84(u32, u32);
 extern u32 sub_08007DD6(u32, const u16*);
 
 typedef struct {
@@ -1187,7 +1187,7 @@ bool32 sub_08079D48(void) {
         return TRUE;
     } else {
         if (!sub_08008B22()) {
-            if (!sub_08007DD6((u16)sub_080002B8(&gPlayerEntity), gUnk_0811C268)) {
+            if (!sub_08007DD6((u16)sub_080B1AA8(&gPlayerEntity), gUnk_0811C268)) {
                 return TRUE;
             }
         }
@@ -1349,20 +1349,20 @@ NONMATCH("asm/non_matching/playerUtils/sub_0807A8D8.inc", void sub_0807A8D8(Enti
     u32 tmp;
 
     if ((gPlayerState.flags & PL_MINISH) == 0) {
-        tmp = sub_080002EC(COORD_TO_TILE_OFFSET(this, 0, 1), gPlayerEntity.collisionLayer) & 0x20;
+        tmp = sub_080B1B84(COORD_TO_TILE_OFFSET(this, 0, 1), gPlayerEntity.collisionLayer) & 0x20;
         if (tmp != 0) {
             sub_0807AAF8(this, COORD_TO_TILE_OFFSET(this, 0, 1));
         }
-        tmp = sub_080002EC(COORD_TO_TILE_OFFSET(this, -2, 0), gPlayerEntity.collisionLayer) & 0x20;
+        tmp = sub_080B1B84(COORD_TO_TILE_OFFSET(this, -2, 0), gPlayerEntity.collisionLayer) & 0x20;
         if (tmp != 0) {
             sub_0807AAF8(this, COORD_TO_TILE_OFFSET(this, -2, 0));
         }
-        tmp = sub_080002EC(COORD_TO_TILE_OFFSET(this, 2, 0), gPlayerEntity.collisionLayer) & 0x20;
+        tmp = sub_080B1B84(COORD_TO_TILE_OFFSET(this, 2, 0), gPlayerEntity.collisionLayer) & 0x20;
         if (tmp != 0) {
             sub_0807AAF8(this, COORD_TO_TILE_OFFSET(this, 2, 0));
         }
     }
-    tmp = sub_080002EC(COORD_TO_TILE(this), gPlayerEntity.collisionLayer);
+    tmp = sub_080B1B84(COORD_TO_TILE(this), gPlayerEntity.collisionLayer);
     if ((tmp & 0x20) != 0) {
         sub_0807AAF8(this, COORD_TO_TILE(this));
     }
@@ -1643,12 +1643,12 @@ bool32 sub_0807B434(u32 position, u32 layer) {
         case 0x37:
             return FALSE;
         default:
-            return sub_080002C8(position, layer) != 0xd;
+            return sub_080B1AE0(position, layer) != 0xd;
     }
 }
 
 bool32 sub_0807B464(u32 param_1, u32 param_2) {
-    return sub_080002C8(param_1, param_2) == 0x56;
+    return sub_080B1AE0(param_1, param_2) == 0x56;
 }
 
 ASM_FUNC("asm/non_matching/playerUtils/sub_0807B480.inc", void sub_0807B480())
diff --git a/src/projectile/projectile5.c b/src/projectile/projectile5.c
index 5d99e015..84004de0 100644
--- a/src/projectile/projectile5.c
+++ b/src/projectile/projectile5.c
@@ -4,7 +4,7 @@
 #include "room.h"
 #include "coord.h"
 
-extern u32 sub_080002E0(u32, u32);
+extern u32 sub_080B1B44(u32, u32);
 
 extern void (*const Projectile5_Functions[])(Entity*);
 extern void (*const Projectile5_Actions[])(Entity*);
@@ -28,7 +28,7 @@ void sub_080A86F0(Entity* this) {
         pbVar2 = &this->parent->field_0x82.HALF.HI;
         if ((this->parent->field_0x82.HALF.HI & 0x3f) == 3) {
             if (gPlayerState.hurtBlinkSpeed != 0) {
-                if (sub_080002E0(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.collisionLayer) == 0) {
+                if (sub_080B1B44(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.collisionLayer) == 0) {
                     if (this->bitfield == 0x80) {
                         *pbVar2 = *pbVar2 & 0x7f;
                         DeleteThisEntity();
diff --git a/src/projectile/removableDust.c b/src/projectile/removableDust.c
index 58107064..d8437976 100644
--- a/src/projectile/removableDust.c
+++ b/src/projectile/removableDust.c
@@ -4,7 +4,7 @@
 #include "functions.h"
 #include "object.h"
 
-extern u32 sub_080002C8(u16, u8);
+extern u32 sub_080B1AE0(u16, u8);
 extern Entity* LoadRoomEntity(EntityData*);
 
 extern void (*const RemovableDust_Functions[])(Entity*);
@@ -101,7 +101,7 @@ void sub_080AA544(Entity* this) {
         uVar3 = 0;
         iVar4 = 0;
         do {
-            iVar2 = sub_080002C8((param - tmp[uVar3]) & 0xffff, this->collisionLayer);
+            iVar2 = sub_080B1AE0((param - tmp[uVar3]) & 0xffff, this->collisionLayer);
             if (iVar2 == 0x3e) {
                 iVar4 += 1;
             }
diff --git a/src/projectile/spiderWeb.c b/src/projectile/spiderWeb.c
index 5671b9c9..9d173880 100644
--- a/src/projectile/spiderWeb.c
+++ b/src/projectile/spiderWeb.c
@@ -135,7 +135,7 @@ void SpiderWeb_SubAction0(Entity* this) {
         if (tmp * 2 - entity->animationState == 0) {
             x = gUnk_0812A064[tmp * 2] + this->x.HALF.HI;
             y = gUnk_0812A064[tmp * 2 + 1] + this->y.HALF.HI;
-            if (sub_080002D4(x, y, entity->collisionLayer) == 0) {
+            if (sub_080B1B18(x, y, entity->collisionLayer) == 0) {
                 entity->x.HALF.HI = x;
                 entity->y.HALF.HI = y;
             }