Merge pull request #684 from notyourav/tiles

Tiles documentation

5 files changed, 8 insertions, 8 deletions

diff --git a/src/manager/diggingCaveEntranceManager.c b/src/manager/diggingCaveEntranceManager.c
index 7491eea4..8698db9e 100644
--- a/src/manager/diggingCaveEntranceManager.c
+++ b/src/manager/diggingCaveEntranceManager.c
@@ -53,9 +53,9 @@ void DiggingCaveEntranceManager_Init(DiggingCaveEntranceManager* this) {
         tile = 0x81 << 7; // 0x4080
         for (entrance = GetDiggingCaveEntranceForRoom(entrance, room); entrance != 0;
              entrance = GetDiggingCaveEntranceForRoom(entrance, room)) {
-            SetTile(tile, entrance->sourceTilePosition + TILE_POS(-1, 1), 1);
-            SetTile(tile, entrance->sourceTilePosition + TILE_POS(0, 1), 1);
-            SetTile(tile, entrance->sourceTilePosition + TILE_POS(1, 1), 1);
+            SetBottomTile(tile, entrance->sourceTilePosition + TILE_POS(-1, 1), 1);
+            SetBottomTile(tile, entrance->sourceTilePosition + TILE_POS(0, 1), 1);
+            SetBottomTile(tile, entrance->sourceTilePosition + TILE_POS(1, 1), 1);
             entrance++;
         }
     }
diff --git a/src/manager/flameManager.c b/src/manager/flameManager.c
index 880324fd..46d2ad32 100644
--- a/src/manager/flameManager.c
+++ b/src/manager/flameManager.c
@@ -16,7 +16,7 @@ void FlameManager_Main(FlameManager* this) {
         this->field_0x38 = TILE(this->field_0x38, this->field_0x3a);
         if (GetTileType(this->field_0x38, 2) == 0x75) {
             super->action = 1;
-            SetTile(0x406a, this->field_0x38, 1);
+            SetBottomTile(0x406a, this->field_0x38, 1);
         } else {
             DeleteThisEntity();
         }
@@ -26,7 +26,7 @@ void FlameManager_Main(FlameManager* this) {
         DeleteThisEntity();
     }
     if (GetTileType(this->field_0x38, 2) == 0x76) {
-        SetTile(0x406b, this->field_0x38, 1);
+        SetBottomTile(0x406b, this->field_0x38, 1);
         DeleteThisEntity();
     }
 }
diff --git a/src/manager/manager29.c b/src/manager/manager29.c
index 02ed52ba..55a5548f 100644
--- a/src/manager/manager29.c
+++ b/src/manager/manager29.c
@@ -33,7 +33,7 @@ void sub_0805CBD0(Manager29* this) {
     this->unk_38 = (this->unk_38 >> 4 & 0x3fU) | (((this->unk_3a << 0x10) >> 0x14 & 0x3fU) << 6);
     this->unk_3a = (this->unk_3c >> 4 & 0x3f) | (((this->unk_36 + this->unk_37 * 0x100) >> 4 & 0x3fU) << 6);
     this->unk_3c = GetTileType(this->unk_38, this->unk_34);
-    layer = GetLayerByIndex(this->unk_34);
+    layer = GetTileBuffer(this->unk_34);
     this->unk_28 = (u16*)layer->metatileTypes;
     this->unk_2c = &layer->mapData[(s16)this->unk_3a];
 }
diff --git a/src/manager/tileChangeObserveManager.c b/src/manager/tileChangeObserveManager.c
index f2ada610..77c24677 100644
--- a/src/manager/tileChangeObserveManager.c
+++ b/src/manager/tileChangeObserveManager.c
@@ -31,7 +31,7 @@ void TileChangeObserveManager_Init(TileChangeObserveManager* this) {
         DeleteThisEntity();
     } else {
         super->action = 1;
-        tile = &GetLayerByIndex(this->field_0x3a)->mapData[this->tilePosition];
+        tile = &GetTileBuffer(this->field_0x3a)->mapData[this->tilePosition];
         this->observedTile = tile;
         this->initialTile = tile[0];
     }
diff --git a/src/manager/waterfallBottomManager.c b/src/manager/waterfallBottomManager.c
index a8e3f4c4..11b93c99 100644
--- a/src/manager/waterfallBottomManager.c
+++ b/src/manager/waterfallBottomManager.c
@@ -10,7 +10,7 @@
 #include "functions.h"
 
 void WaterfallBottomManager_Main(WaterfallBottomManager* this) {
-    SetTile(0x4014, 0x5c3, 1);
+    SetBottomTile(0x4014, 0x5c3, 1);
     if ((gRoomControls.origin_y + 200 < gPlayerEntity.base.y.HALF.HI) &&
         ((u32)(gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x) - 0x30 < 0x11)) {
         gPlayerEntity.base.collisionLayer = 3;