diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2024-01-06 14:59:48 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2024-01-06 15:01:44 +0100 |
| commit | aced0bef691dbc41bdd39b6e62662d2436877a4b (patch) | |
| tree | e90f9fd8e4c4c3471c2fb246bb1372974294b469 /src | |
| parent | c3b771a20923b335bbea2ab97a68ac29d04fcc43 (diff) | |
Rename metaTiles
Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles.
Diffstat (limited to 'src')
156 files changed, 5099 insertions, 5100 deletions
diff --git a/src/beanstalkSubtask.c b/src/beanstalkSubtask.c index 59f839ee..1f30686e 100644 --- a/src/beanstalkSubtask.c +++ b/src/beanstalkSubtask.c @@ -54,9 +54,9 @@ extern const Data gUnk_080B44C2[]; void sub_0801AD6C(const Data*, u32); bool32 sub_0801A4F8(void); bool32 sub_0801AA58(Entity*, u32, u32); -void RenderMapLayerToTileMap(u16* tileMap, MapLayer* mapLayer); +void RenderMapLayerToSubTileMap(u16* subTileMap, MapLayer* mapLayer); -u32 GetMetaTileSetIndexForSpecialTile(u32 position, u32 data); +u32 GetTileSetIndexForSpecialTile(u32 position, u32 tileIndex); extern u32 sub_0807BDB8(Entity* this, u32 param_2); extern void sub_0804B388(u32 a1, u32 a2); @@ -202,7 +202,7 @@ u32 UpdatePlayerCollision(void) { index = sub_0807BDB8(&gPlayerEntity.base, direction >> 2); if (index != 0xff && (gRoomControls.scroll_flags & 4) == 0) { ptr1 = &gUnk_080B4490[index * 2]; - if (GetCollisionDataAtMetaTilePos(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr1[0], -ptr1[1]), + if (GetCollisionDataAtTilePos(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr1[0], -ptr1[1]), gPlayerEntity.base.collisionLayer) == COLLISION_DATA_255) { if ((((gPlayerState.flags & (PL_FLAGS10000 | PL_FLAGS2)) != 0) || ((gPlayerState.sword_state & 0x10) != 0)) || @@ -220,9 +220,9 @@ u32 UpdatePlayerCollision(void) { mapLayer = GetLayerByIndex(gPlayerEntity.base.collisionLayer); ptr1 = &gUnk_080B4468[gPlayerEntity.base.animationState & 6]; position = COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr1[0], -ptr1[1]); - tileType = GetMetaTileType(position, gPlayerEntity.base.collisionLayer); + tileType = GetTileType(position, gPlayerEntity.base.collisionLayer); if (tileType < 0x4000) { - direction = GetVvvForMetaTileType(tileType); + direction = GetVvvForTileType(tileType); } else { direction = tileType; } @@ -230,7 +230,7 @@ u32 UpdatePlayerCollision(void) { animationState2 = animationState1 & 0xff; switch (direction) { - case SPECIAL_META_TILE_0: + case SPECIAL_TILE_0: if (sub_0801A458(mapLayer, position, 2) == 0) { return 0; } @@ -261,7 +261,7 @@ u32 UpdatePlayerCollision(void) { if ((gPlayerEntity.base.direction & DIR_NOT_MOVING_CHECK) != 0) { return 0; } - if (GetCollisionDataAtMetaTilePos(position, gPlayerEntity.base.collisionLayer) != COLLISION_DATA_15) { + if (GetCollisionDataAtTilePos(position, gPlayerEntity.base.collisionLayer) != COLLISION_DATA_15) { return 0; } if (sub_08079778() == 0) { @@ -281,12 +281,12 @@ u32 UpdatePlayerCollision(void) { } sub_08078AC0(4, 0, 1); return 0; - case SPECIAL_META_TILE_27: + case SPECIAL_TILE_27: if (sub_0801A2B0(mapLayer, position, 0xb) == 0) { return 0; } // Start moving the boulder. - mapLayer->mapData[position] = SPECIAL_META_TILE_28 + (gPlayerEntity.base.animationState / 2); + mapLayer->mapData[position] = SPECIAL_TILE_28 + (gPlayerEntity.base.animationState / 2); gPlayerState.pushedObject = 0xa0; gPlayerState.queued_action = PLAYER_PUSH; gPlayerState.flags |= PL_BUSY; @@ -306,7 +306,7 @@ u32 UpdatePlayerCollision(void) { return 0; case VVV_58: case VVV_91: - case SPECIAL_META_TILE_81: + case SPECIAL_TILE_81: if (gPlayerState.flags & PL_MINISH) { return 0; } @@ -346,7 +346,7 @@ u32 UpdatePlayerCollision(void) { sub_0804B388(position, gPlayerEntity.base.collisionLayer); return 2; case VVV_61: - case SPECIAL_META_TILE_64 ... SPECIAL_META_TILE_72: + case SPECIAL_TILE_64 ... SPECIAL_TILE_72: if ((gPlayerState.flags & PL_DRUGGED) != 0) { return 0; } @@ -374,14 +374,14 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.zVelocity = 0x20000; COLLISION_OFF(&gPlayerEntity.base); return 1; - case SPECIAL_META_TILE_11: + case SPECIAL_TILE_11: if (sub_0801A2B0(mapLayer, position, 8) == 0) { return 0; } - if ((gPlayerEntity.base.collisionLayer == 3) && (gMapTop.mapData[position] == SPECIAL_META_TILE_11)) { - gMapTop.mapData[position] = SPECIAL_META_TILE_12 + (gPlayerEntity.base.animationState >> 1); + if ((gPlayerEntity.base.collisionLayer == 3) && (gMapTop.mapData[position] == SPECIAL_TILE_11)) { + gMapTop.mapData[position] = SPECIAL_TILE_12 + (gPlayerEntity.base.animationState >> 1); } else { - mapLayer->mapData[position] = SPECIAL_META_TILE_12 + (gPlayerEntity.base.animationState >> 1); + mapLayer->mapData[position] = SPECIAL_TILE_12 + (gPlayerEntity.base.animationState >> 1); } gPlayerState.pushedObject = 0xa0; gPlayerState.queued_action = PLAYER_PUSH; @@ -390,12 +390,12 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case SPECIAL_META_TILE_90: + case SPECIAL_TILE_90: if (sub_0801A2B0(mapLayer, position, 2) == 0) { return 0; } // Move ice block. - mapLayer->mapData[position] = SPECIAL_META_TILE_91 + (gPlayerEntity.base.animationState >> 1); + mapLayer->mapData[position] = SPECIAL_TILE_91 + (gPlayerEntity.base.animationState >> 1); gPlayerState.pushedObject = 0x98; gPlayerState.queued_action = PLAYER_PUSH; gPlayerState.flags |= PL_BUSY; @@ -403,11 +403,11 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case SPECIAL_META_TILE_54: + case SPECIAL_TILE_54: if (sub_0801A2B0(mapLayer, position, 0xb) == 0) { return 0; } - mapLayer->mapData[position] = SPECIAL_META_TILE_55 + (gPlayerEntity.base.animationState >> 1); + mapLayer->mapData[position] = SPECIAL_TILE_55 + (gPlayerEntity.base.animationState >> 1); gPlayerState.pushedObject = 0xa0; gPlayerState.queued_action = PLAYER_PUSH; gPlayerState.flags |= PL_BUSY; @@ -415,7 +415,7 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case SPECIAL_META_TILE_62: + case SPECIAL_TILE_62: if ((animationState1 & 0xff) != 0) { return 0; } @@ -425,7 +425,7 @@ u32 UpdatePlayerCollision(void) { if ((gPlayerEntity.base.frame & 2) == 0) { return 0; } - mapLayer->mapData[position] = SPECIAL_META_TILE_63; + mapLayer->mapData[position] = SPECIAL_TILE_63; gPlayerState.pushedObject = 0x82; gPlayerState.queued_action = PLAYER_PUSH; gPlayerState.flags |= PL_BUSY; @@ -474,9 +474,9 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = pushedBlock->direction; return 1; - case SPECIAL_META_TILE_43 ... SPECIAL_META_TILE_45: + case SPECIAL_TILE_43 ... SPECIAL_TILE_45: if (sub_0801A370(mapLayer, position) != 0) { - mapLayer->mapData[position] = SPECIAL_META_TILE_48 + ((gPlayerEntity.base.animationState & 4) >> 2); + mapLayer->mapData[position] = SPECIAL_TILE_48 + ((gPlayerEntity.base.animationState & 4) >> 2); if ((gPlayerState.flags & PL_MINISH) != 0) { gPlayerState.pushedObject = 0xa0; } else { @@ -491,11 +491,11 @@ u32 UpdatePlayerCollision(void) { } else { return 0; } - case SPECIAL_META_TILE_74: + case SPECIAL_TILE_74: if (sub_0801A458(mapLayer, position, 8) == 0) { return 0; } - mapLayer->mapData[position] = SPECIAL_META_TILE_75 + (gPlayerEntity.base.animationState >> 1); + mapLayer->mapData[position] = SPECIAL_TILE_75 + (gPlayerEntity.base.animationState >> 1); if ((gPlayerState.flags & PL_MINISH) != 0) { gPlayerState.pushedObject = 0xc0; } else { @@ -507,22 +507,22 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case SPECIAL_META_TILE_82: + case SPECIAL_TILE_82: if (gPlayerState.field_0x35 != 0) { return 0; } - SetMetaTile(SPECIAL_META_TILE_84, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_84, position, gPlayerEntity.base.collisionLayer); return 4; - case SPECIAL_META_TILE_83: + case SPECIAL_TILE_83: if (gPlayerState.field_0x35 != 6) { return 0; } - SetMetaTile(SPECIAL_META_TILE_84, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_84, position, gPlayerEntity.base.collisionLayer); return 4; - case SPECIAL_META_TILE_85: + case SPECIAL_TILE_85: position--; // fallthrough - case SPECIAL_META_TILE_86: + case SPECIAL_TILE_86: if (gPlayerState.field_0x35 != 0) { return 0; } @@ -531,15 +531,15 @@ u32 UpdatePlayerCollision(void) { } for (index = 0; index < 3; index++) { if (sub_0801A8D0(gPlayerClones[index], 0) == position) { - SetMetaTile(SPECIAL_META_TILE_89, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_89, position, gPlayerEntity.base.collisionLayer); return 4; } } return 0; - case SPECIAL_META_TILE_87: + case SPECIAL_TILE_87: position -= 0x40; // fallthrough - case SPECIAL_META_TILE_88: + case SPECIAL_TILE_88: if (gPlayerState.field_0x35 != 6) { return 0; } @@ -548,12 +548,12 @@ u32 UpdatePlayerCollision(void) { } for (index = 0; index < 3; index++) { if (sub_0801A8D0(gPlayerClones[index], 6) == position) { - SetMetaTile(SPECIAL_META_TILE_89, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_89, position, gPlayerEntity.base.collisionLayer); return 4; } } return 0; - case SPECIAL_META_TILE_95: + case SPECIAL_TILE_95: animationState3 = 2; animationState3 &= animationState1; if (animationState3 == 0) { @@ -565,7 +565,7 @@ u32 UpdatePlayerCollision(void) { if ((gPlayerEntity.base.frame & 1) == 0) { return 0; } - SetMetaTile(SPECIAL_META_TILE_116, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_116, position, gPlayerEntity.base.collisionLayer); gPlayerState.pushedObject = 0xa0; gPlayerState.queued_action = PLAYER_PUSH; gPlayerState.flags |= PL_BUSY; @@ -573,7 +573,7 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case SPECIAL_META_TILE_125: + case SPECIAL_TILE_125: animationState3 = gPlayerEntity.base.animationState; if ((animationState2) != 4) { return 0; @@ -584,8 +584,8 @@ u32 UpdatePlayerCollision(void) { if ((gPlayerEntity.base.frame & 1) == 0) { return 0; } - SetMetaTile(SPECIAL_META_TILE_116, position, gPlayerEntity.base.collisionLayer); - SetVvvAtMetaTilePos(VVV_13, position, gPlayerEntity.base.collisionLayer); + SetTile(SPECIAL_TILE_116, position, gPlayerEntity.base.collisionLayer); + SetVvvAtTilePos(VVV_13, position, gPlayerEntity.base.collisionLayer); return 1; default: return 0; @@ -602,7 +602,7 @@ bool32 sub_0801A2B0(MapLayer* mapLayer, u32 position, u32 collisionType) { if ((((gPlayerState.field_0x35 | gPlayerState.direction) & DIR_NOT_MOVING_CHECK) == 0) && ((gPlayerEntity.base.frame & 1) != 0)) { position = (u16)(position - (-uVar1)); // necessary for match - temp4 = GetVvvForMetaTileType(GetMetaTileType(position, gPlayerEntity.base.collisionLayer)); + temp4 = GetVvvForTileType(GetTileType(position, gPlayerEntity.base.collisionLayer)); switch (temp4) { case 0x52: break; @@ -643,18 +643,18 @@ bool32 sub_0801A370(MapLayer* mapLayer, u32 position) { topLayer = GetLayerByIndex(LAYER_TOP); offset = gUnk_080B4488[gPlayerEntity.base.animationState >> 1]; pos = position + offset; - tileType = GetMetaTileType(pos, gPlayerEntity.base.collisionLayer); + tileType = GetTileType(pos, gPlayerEntity.base.collisionLayer); switch (tileType) { - case SPECIAL_META_TILE_43: + case SPECIAL_TILE_43: pos += offset; break; - case SPECIAL_META_TILE_44 ... SPECIAL_META_TILE_47: + case SPECIAL_TILE_44 ... SPECIAL_TILE_47: return TRUE; } if (topLayer->collisionData[pos - 0x80] == 0x46) { return FALSE; } - switch ((u16)GetVvvForMetaTileType(GetMetaTileType(pos, gPlayerEntity.base.collisionLayer))) { + switch ((u16)GetVvvForTileType(GetTileType(pos, gPlayerEntity.base.collisionLayer))) { case 0x52: return FALSE; case 0x26: @@ -690,8 +690,8 @@ bool32 sub_0801A458(MapLayer* mapLayer, u32 position, u32 collisionType) { s32 offset = gUnk_080B4488[gPlayerEntity.base.animationState >> 1]; if (sub_0801A4F8()) { pos = position + offset; - tileType = GetMetaTileType(pos, gPlayerEntity.base.collisionLayer); - switch (GetVvvForMetaTileType(tileType)) { + tileType = GetTileType(pos, gPlayerEntity.base.collisionLayer); + switch (GetVvvForTileType(tileType)) { case 0x52: case 0x26: case 0x27: @@ -744,14 +744,14 @@ u32 sub_0801A570(Entity* this, u32 param_2) { u32 position; u32 index1; u32 index2; - u16* metatileTypes; + u16* tileTypes; u8* collisionData; if (this == NULL) { return 0xffff; } layer = GetLayerByIndex(this->collisionLayer); - metatileTypes = layer->metatileTypes; + tileTypes = layer->tileTypes; index1 = 4; index2 = 2; switch (this->animationState >> 1) { @@ -759,7 +759,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { default: position = COORD_TO_TILE_OFFSET(this, 0, 10); do { - if (metatileTypes[layer->mapData[position]] == 0x370) + if (tileTypes[layer->mapData[position]] == 0x370) break; position--; index1--; @@ -767,7 +767,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { position = position - 0x40; do { - if (metatileTypes[layer->mapData[(position)]] != 0x374) + if (tileTypes[layer->mapData[(position)]] != 0x374) break; index2++; position -= 0x40; @@ -777,7 +777,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetMetaTileType(position, this->collisionLayer); + index1 = GetTileType(position, this->collisionLayer); if ((index1 - 0x369) > 1) { position = 0xffff; } else { @@ -793,7 +793,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { case 1: position = COORD_TO_TILE_OFFSET(this, -10, 0); do { - if (layer->metatileTypes[layer->mapData[position]] == 0x370) + if (layer->tileTypes[layer->mapData[position]] == 0x370) break; position += 0x40; index1--; @@ -801,7 +801,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { position = position - 0x40; do { - if (metatileTypes[layer->mapData[(position)]] != 0x374) + if (tileTypes[layer->mapData[(position)]] != 0x374) break; index2++; position -= 0x40; @@ -811,7 +811,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetMetaTileType(position, this->collisionLayer); + index1 = GetTileType(position, this->collisionLayer); if (!(index1 == 0x369) && !(index1 == 0x36d)) position = 0xffff; else { @@ -827,7 +827,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { case 2: position = COORD_TO_TILE_OFFSET(this, 0, -10); do { - if (layer->metatileTypes[layer->mapData[position]] == 0x36f) + if (layer->tileTypes[layer->mapData[position]] == 0x36f) break; position++; index1--; @@ -835,7 +835,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { position = position - 1; do { - if (metatileTypes[layer->mapData[position]] != 0x372) + if (tileTypes[layer->mapData[position]] != 0x372) break; index2++; position--; @@ -845,7 +845,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetMetaTileType(position, this->collisionLayer); + index1 = GetTileType(position, this->collisionLayer); if (!(index1 == 0x369) && !(index1 == 0x36b)) position = 0xffff; else { @@ -861,7 +861,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { case 3: position = COORD_TO_TILE_OFFSET(this, 10, 0); do { - if (layer->metatileTypes[layer->mapData[position]] == 0x36f) + if (layer->tileTypes[layer->mapData[position]] == 0x36f) break; position -= 0x40; index1--; @@ -869,7 +869,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { position = position - 1; do { - if (metatileTypes[layer->mapData[position]] != 0x372) + if (tileTypes[layer->mapData[position]] != 0x372) break; index2++; position--; @@ -879,7 +879,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetMetaTileType(position, this->collisionLayer); + index1 = GetTileType(position, this->collisionLayer); if (!(index1 == 0x369) && !(index1 == 0x36c)) position = 0xffff; else { @@ -900,7 +900,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { u32 sub_0801A8D0(Entity* this, u32 param_2) { u16* mapData; - u32 tile; + u32 tileIndex; u32 position; if (this == NULL) @@ -909,20 +909,20 @@ u32 sub_0801A8D0(Entity* this, u32 param_2) { mapData = GetLayerByIndex(this->collisionLayer)->mapData; if (param_2 == 0) { position = COORD_TO_TILE_OFFSET(this, 0, 8); - tile = mapData[position]; - if (tile == SPECIAL_META_TILE_85) { + tileIndex = mapData[position]; + if (tileIndex == SPECIAL_TILE_85) { return position - 1; } - if (tile == SPECIAL_META_TILE_86) { + if (tileIndex == SPECIAL_TILE_86) { return position; } } else { position = COORD_TO_TILE_OFFSET(this, 8, 0); - tile = mapData[position]; - if (tile == SPECIAL_META_TILE_87) { + tileIndex = mapData[position]; + if (tileIndex == SPECIAL_TILE_87) { return position - 0x40; } - if (tile == SPECIAL_META_TILE_88) { + if (tileIndex == SPECIAL_TILE_88) { return position; } } @@ -935,9 +935,9 @@ bool32 sub_0801A980(void) { GetLayerByIndex(gPlayerEntity.base.collisionLayer); // TODO result unused? ptr = &gUnk_080B44A8[gPlayerEntity.base.animationState & 6]; tileType = - GetMetaTileType(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), gPlayerEntity.base.collisionLayer); + GetTileType(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), gPlayerEntity.base.collisionLayer); if (tileType < 0x4000) { - GetVvvForMetaTileType(tileType); + GetVvvForTileType(tileType); } return FALSE; } @@ -1006,99 +1006,99 @@ bool32 sub_0801AA58(Entity* this, u32 param_2, u32 param_3) { return FALSE; } -void RenderMapLayerToTileMap(u16* tileMap, MapLayer* mapLayer) { +void RenderMapLayerToSubTileMap(u16* subTileMap, MapLayer* mapLayer) { u16* tiles; u16* mapData; u16* mapDataOriginal; - u16 metaTileY; - u16 metaTileX; - u32 metaTilePositionAndLayer; + u16 tileY; + u16 tileX; + u32 tilePosAndLayer; u32 layerIndex; - // Index into the metatileset at MapLayer.metatiles - u32 metaTileSetIndex; + // Index into the tileset at MapLayer.tiles + u32 tileSetIndex; if (mapLayer == &gMapBottom) { layerIndex = 1; } else { layerIndex = 2; } - metaTilePositionAndLayer = layerIndex << 0xc; + tilePosAndLayer = layerIndex << 0xc; mapDataOriginal = mapLayer->mapDataOriginal; mapData = mapLayer->mapData; - for (metaTileY = 0; metaTileY < 0x40; metaTileY++) { - for (metaTileX = 0; metaTileX < 0x10; metaTileX++) { + for (tileY = 0; tileY < 0x40; tileY++) { + for (tileX = 0; tileX < 0x10; tileX++) { // inner loop seems to be unrolled four times for some reason? if (mapData[0] < 0x4000) { - metaTileSetIndex = mapData[0] * 4; + tileSetIndex = mapData[0] * 4; } else { - metaTileSetIndex = GetMetaTileSetIndexForSpecialTile(metaTilePositionAndLayer, mapDataOriginal[0]); + tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer, mapDataOriginal[0]); } - tiles = mapLayer->metatiles + metaTileSetIndex; - tileMap[0] = tiles[0]; - tileMap[1] = tiles[1]; - tileMap[0x80 + 0] = tiles[2]; - tileMap[0x80 + 1] = tiles[3]; - tileMap += 2; + tiles = mapLayer->tiles + tileSetIndex; + subTileMap[0] = tiles[0]; + subTileMap[1] = tiles[1]; + subTileMap[0x80 + 0] = tiles[2]; + subTileMap[0x80 + 1] = tiles[3]; + subTileMap += 2; if (mapData[1] < 0x4000) { - metaTileSetIndex = mapData[1] * 4; + tileSetIndex = mapData[1] * 4; } else { - metaTileSetIndex = GetMetaTileSetIndexForSpecialTile(metaTilePositionAndLayer + 1, mapDataOriginal[1]); + tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer + 1, mapDataOriginal[1]); } - tiles = mapLayer->metatiles + metaTileSetIndex; - tileMap[0] = tiles[0]; - tileMap[1] = tiles[1]; - tileMap[0x80 + 0] = tiles[2]; - tileMap[0x80 + 1] = tiles[3]; - tileMap += 2; + tiles = mapLayer->tiles + tileSetIndex; + subTileMap[0] = tiles[0]; + subTileMap[1] = tiles[1]; + subTileMap[0x80 + 0] = tiles[2]; + subTileMap[0x80 + 1] = tiles[3]; + subTileMap += 2; if (mapData[2] < 0x4000) { - metaTileSetIndex = mapData[2] * 4; + tileSetIndex = mapData[2] * 4; } else { - metaTileSetIndex = GetMetaTileSetIndexForSpecialTile(metaTilePositionAndLayer + 2, mapDataOriginal[2]); + tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer + 2, mapDataOriginal[2]); } - tiles = mapLayer->metatiles + metaTileSetIndex; - tileMap[0] = tiles[0]; - tileMap[1] = tiles[1]; - tileMap[0x80 + 0] = tiles[2]; - tileMap[0x80 + 1] = tiles[3]; - tileMap += 2; + tiles = mapLayer->tiles + tileSetIndex; + subTileMap[0] = tiles[0]; + subTileMap[1] = tiles[1]; + subTileMap[0x80 + 0] = tiles[2]; + subTileMap[0x80 + 1] = tiles[3]; + subTileMap += 2; if (mapData[3] < 0x4000) { - metaTileSetIndex = mapData[3] * 4; + tileSetIndex = mapData[3] * 4; } else { - metaTileSetIndex = GetMetaTileSetIndexForSpecialTile(metaTilePositionAndLayer + 3, mapDataOriginal[3]); + tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer + 3, mapDataOriginal[3]); } - tiles = mapLayer->metatiles + metaTileSetIndex; - tileMap[0] = tiles[0]; - tileMap[1] = tiles[1]; - tileMap[0x80 + 0] = tiles[2]; - tileMap[0x80 + 1] = tiles[3]; - tileMap += 2; + tiles = mapLayer->tiles + tileSetIndex; + subTileMap[0] = tiles[0]; + subTileMap[1] = tiles[1]; + subTileMap[0x80 + 0] = tiles[2]; + subTileMap[0x80 + 1] = tiles[3]; + subTileMap += 2; mapData += 4; mapDataOriginal += 4; - metaTilePositionAndLayer = (u16)(metaTilePositionAndLayer + 4); + tilePosAndLayer = (u16)(tilePosAndLayer + 4); } - tileMap = tileMap + 0x80; + subTileMap = subTileMap + 0x80; } } -u32 GetMetaTileSetIndexForSpecialTile(u32 metaTilePosAndLayer, u32 mapDataClone) { +u32 GetTileSetIndexForSpecialTile(u32 tilePosAndLayer, u32 tileIndex) { u32 index; SpecialTileEntry* ptr; u32 count; - ptr = gMetaTilesForSpecialTiles; + ptr = gTilesForSpecialTiles; count = gRoomVars.tileEntityCount; for (index = 0; index < count; ptr++, index++) { - if (metaTilePosAndLayer == ptr->metaTilePosAndLayer) { - return ptr->metaTileIndex * 4; + if (tilePosAndLayer == ptr->tilePosAndLayer) { + return ptr->tileIndex * 4; } } - return mapDataClone * 4; + return tileIndex * 4; } void sub_0801AC98(void) { @@ -1116,7 +1116,7 @@ void sub_0801AC98(void) { for (indexY = 0; indexY < height; indexY++) { for (indexX = 0; indexX < width; indexX++, position++) { for (ptr = gUnk_080B44C0; ptr->tileType != 0xffff; ptr++) { - if (ptr->tileType == GetMetaTileType(position, 1)) { + if (ptr->tileType == GetTileType(position, 1)) { if (gUnk_080B44B8[ptr->unk_a] != 0) { sub_0801AD6C(ptr, position); break; @@ -1125,7 +1125,7 @@ void sub_0801AC98(void) { } for (ptr = gUnk_080B44C2; ptr->tileType != 0xffff; ptr++) { - if (ptr->tileType == GetMetaTileType(position, 2)) { + if (ptr->tileType == GetTileType(position, 2)) { if (gUnk_080B44B8[ptr->unk_a] != 0) { sub_0801AD6C(ptr, position); break; @@ -1137,7 +1137,7 @@ void sub_0801AC98(void) { } } -void sub_0801AD6C(const Data* param_1, u32 tilePosition) { +void sub_0801AD6C(const Data* param_1, u32 tilePos) { Entity* entity; Manager* manager; s32 tmpX1; @@ -1152,9 +1152,9 @@ void sub_0801AD6C(const Data* param_1, u32 tilePosition) { entity->id = (u8)param_1->id; entity->type = (u8)param_1->type; entity->type2 = (u8)param_1->type2; - tmpX1 = ((u16)tilePosition & 0x3f) * 0x10 + 8; + tmpX1 = ((u16)tilePos & 0x3f) * 0x10 + 8; entity->x.HALF.HI = tmpX1 + gRoomControls.origin_x; - tmpY1 = (s16)((tilePosition & 0xfc0) >> 2) + 8; + tmpY1 = (s16)((tilePos & 0xfc0) >> 2) + 8; entity->y.HALF.HI = tmpY1 + gRoomControls.origin_y; entity->collisionLayer = 0; ResolveCollisionLayer(entity); @@ -1168,9 +1168,9 @@ void sub_0801AD6C(const Data* param_1, u32 tilePosition) { manager->type = (u8)param_1->type; manager->type2 = (u8)param_1->type2; // TODO are these fields common for all managers or does this usually create managers of certain types? - tmpX2 = ((u16)tilePosition & 0x3f) * 0x10 + 8; + tmpX2 = ((u16)tilePos & 0x3f) * 0x10 + 8; *(u16*)(&manager[1].timer + 10) = tmpX2 + gRoomControls.origin_x; - tmpY2 = (s16)((tilePosition & 0xfc0) >> 2) + 8; + tmpY2 = (s16)((tilePos & 0xfc0) >> 2) + 8; *(u16*)(&manager[1].timer + 12) = tmpY2 + gRoomControls.origin_y; AppendEntityToList((Entity*)manager, gEntityListLUT[manager->kind]); } @@ -1210,10 +1210,10 @@ void sub_0801AE44(bool32 loadGfx) { } if ((gRoomControls.scroll_flags & 1) == 0) { if (gMapBottom.bgSettings != NULL) { - RenderMapLayerToTileMap(gMapDataBottomSpecial, &gMapBottom); + RenderMapLayerToSubTileMap(gMapDataBottomSpecial, &gMapBottom); } if (gMapTop.bgSettings != NULL) { - RenderMapLayerToTileMap(gMapDataTopSpecial, &gMapTop); + RenderMapLayerToSubTileMap(gMapDataTopSpecial, &gMapTop); } } else { sub_0807C4F8(); @@ -1222,34 +1222,34 @@ void sub_0801AE44(bool32 loadGfx) { } void SetMultipleTiles(const TileData* tileData, u32 basePosition, u32 layer) { - while (tileData->tile != -1) { - SetMetaTile((u16)tileData->tile, basePosition + tileData->position, layer); + while (tileData->tileIndex != -1) { + SetTile((u16)tileData->tileIndex, basePosition + tileData->tilePosOffset, layer); tileData++; } } -// Add a new entry at the end of gMetaTilesForSpecialTiles -void RegisterInteractTile(u32 metaTileIndex, u32 metaTilePos, u32 layer) { +// Add a new entry at the end of gTilesForSpecialTiles +void RegisterInteractTile(u32 tileIndex, u32 tilePos, u32 layer) { u32 index; - if ((metaTileIndex < 0x4000) && (gRoomTransition.field30 == 0)) { + if ((tileIndex < 0x4000) && (gRoomTransition.field30 == 0)) { index = gRoomVars.tileEntityCount; if (index < 0x100) { - gMetaTilesForSpecialTiles[index].metaTileIndex = metaTileIndex; - gMetaTilesForSpecialTiles[index].metaTilePosAndLayer = (layer << 12) | metaTilePos; + gTilesForSpecialTiles[index].tileIndex = tileIndex; + gTilesForSpecialTiles[index].tilePosAndLayer = (layer << 12) | tilePos; gRoomVars.tileEntityCount = index + 1; } } } -void UnregisterInteractTile(u32 metaTilePos, s32 layer) { +void UnregisterInteractTile(u32 tilePos, s32 layer) { u32 count; SpecialTileEntry* ptr; - u32 metaTilePosAndLayer; + u32 tilePosAndLayer; u32 t; layer = layer << 12; - metaTilePosAndLayer = metaTilePos | layer; - ptr = gMetaTilesForSpecialTiles; + tilePosAndLayer = tilePos | layer; + ptr = gTilesForSpecialTiles; count = gRoomVars.tileEntityCount; t = 0; @@ -1257,13 +1257,13 @@ void UnregisterInteractTile(u32 metaTilePos, s32 layer) { return; } - if (metaTilePosAndLayer == ptr->metaTilePosAndLayer) { + if (tilePosAndLayer == ptr->tilePosAndLayer) { count--; gRoomVars.tileEntityCount = count; ptr[0] = ptr[count]; return; } - while (metaTilePosAndLayer != ptr->metaTilePosAndLayer) { + while (tilePosAndLayer != ptr->tilePosAndLayer) { ptr++; t++; if (t >= count) { @@ -1272,15 +1272,15 @@ void UnregisterInteractTile(u32 metaTilePos, s32 layer) { } count--; gRoomVars.tileEntityCount = count; - ptr = gMetaTilesForSpecialTiles; + ptr = gTilesForSpecialTiles; ptr[t] = ptr[count]; } const struct_080B44D0 gUnk_080B44D0[] = { - { 0x67, SPECIAL_META_TILE_132 }, { 0x68, SPECIAL_META_TILE_133 }, - { 0x69, SPECIAL_META_TILE_134 }, { 0x6a, SPECIAL_META_TILE_135 }, - { 0x6b, SPECIAL_META_TILE_136 }, { 0x27, SPECIAL_META_TILE_131 }, - { 0x23, SPECIAL_META_TILE_141 }, { 0x0, 0x0 }, + { 0x67, SPECIAL_TILE_132 }, { 0x68, SPECIAL_TILE_133 }, + { 0x69, SPECIAL_TILE_134 }, { 0x6a, SPECIAL_TILE_135 }, + { 0x6b, SPECIAL_TILE_136 }, { 0x27, SPECIAL_TILE_131 }, + { 0x23, SPECIAL_TILE_141 }, { 0x0, 0x0 }, }; // used for minish houses, seems to overwrite all tiles with certain collision values on layer 1 for them? @@ -1299,7 +1299,7 @@ void sub_0801AFE4(void) { for (x = 0; x < width; x++) { for (ptr = gUnk_080B44D0; ptr->collision != 0; ptr++) { if (ptr->collision == *collisionData) { - SetMetaTile(ptr->tileIndex, y * 0x40 + x, LAYER_BOTTOM); + SetTile(ptr->tileIndex, y * 0x40 + x, LAYER_BOTTOM); break; } } diff --git a/src/collision.c b/src/collision.c index 3767a1af..60bf067a 100644 --- a/src/collision.c +++ b/src/collision.c @@ -790,1463 +790,1463 @@ CollisionResult CollisionDefault(Entity* org, Entity* tgt, u32 direction, ColSet } // vvv for tileType? -const u8 gMapMetaTileTypeToVvv[] = { - VVV_0, // META_TILE_TYPE_0 - VVV_1, // META_TILE_TYPE_1 - VVV_2, // META_TILE_TYPE_2 - VVV_3, // META_TILE_TYPE_3 - VVV_4, // META_TILE_TYPE_4 - VVV_5, // META_TILE_TYPE_5 - VVV_6, // META_TILE_TYPE_6 - VVV_7, // META_TILE_TYPE_7 - VVV_8, // META_TILE_TYPE_8 - VVV_9, // META_TILE_TYPE_9 - VVV_9, // META_TILE_TYPE_10 - VVV_10, // META_TILE_TYPE_11 - VVV_9, // META_TILE_TYPE_12 - VVV_9, // META_TILE_TYPE_13 - VVV_9, // META_TILE_TYPE_14 - VVV_9, // META_TILE_TYPE_15 - VVV_9, // META_TILE_TYPE_16 - VVV_9, // META_TILE_TYPE_17 - VVV_11, // META_TILE_TYPE_18 - VVV_12, // META_TILE_TYPE_19 - VVV_11, // META_TILE_TYPE_20 - VVV_11, // META_TILE_TYPE_21 - VVV_11, // META_TILE_TYPE_22 - VVV_11, // META_TILE_TYPE_23 - VVV_11, // META_TILE_TYPE_24 - VVV_11, // META_TILE_TYPE_25 - VVV_10, // META_TILE_TYPE_26 - VVV_10, // META_TILE_TYPE_27 - VVV_10, // META_TILE_TYPE_28 - VVV_10, // META_TILE_TYPE_29 - VVV_10, // META_TILE_TYPE_30 - VVV_10, // META_TILE_TYPE_31 - VVV_10, // META_TILE_TYPE_32 - VVV_10, // META_TILE_TYPE_33 - VVV_10, // META_TILE_TYPE_34 - VVV_10, // META_TILE_TYPE_35 - VVV_10, // META_TILE_TYPE_36 - VVV_10, // META_TILE_TYPE_37 - VVV_10, // META_TILE_TYPE_38 - VVV_10, // META_TILE_TYPE_39 - VVV_10, // META_TILE_TYPE_40 - VVV_12, // META_TILE_TYPE_41 - VVV_12, // META_TILE_TYPE_42 - VVV_12, // META_TILE_TYPE_43 - VVV_12, // META_TILE_TYPE_44 - VVV_12, // META_TILE_TYPE_45 - VVV_12, // META_TILE_TYPE_46 - VVV_12, // META_TILE_TYPE_47 - VVV_12, // META_TILE_TYPE_48 - VVV_12, // META_TILE_TYPE_49 - VVV_12, // META_TILE_TYPE_50 - VVV_12, // META_TILE_TYPE_51 - VVV_12, // META_TILE_TYPE_52 - VVV_13, // META_TILE_TYPE_53 - VVV_14, // META_TILE_TYPE_54 - VVV_14, // META_TILE_TYPE_55 - VVV_15, // META_TILE_TYPE_56 - VVV_16, // META_TILE_TYPE_57 - VVV_15, // META_TILE_TYPE_58 - VVV_14, // META_TILE_TYPE_59 - VVV_17, // META_TILE_TYPE_60 - VVV_18, // META_TILE_TYPE_61 - VVV_19, // META_TILE_TYPE_62 - VVV_20, // META_TILE_TYPE_63 - VVV_20, // META_TILE_TYPE_64 - VVV_20, // META_TILE_TYPE_65 - VVV_20, // META_TILE_TYPE_66 - VVV_20, // META_TILE_TYPE_67 - VVV_20, // META_TILE_TYPE_68 - VVV_20, // META_TILE_TYPE_69 - VVV_20, // META_TILE_TYPE_70 - VVV_20, // META_TILE_TYPE_71 - VVV_20, // META_TILE_TYPE_72 - VVV_20, // META_TILE_TYPE_73 - VVV_20, // META_TILE_TYPE_74 - VVV_20, // META_TILE_TYPE_75 - VVV_20, // META_TILE_TYPE_76 - VVV_20, // META_TILE_TYPE_77 - VVV_20, // META_TILE_TYPE_78 - VVV_20, // META_TILE_TYPE_79 - VVV_20, // META_TILE_TYPE_80 - VVV_20, // META_TILE_TYPE_81 - VVV_20, // META_TILE_TYPE_82 - VVV_20, // META_TILE_TYPE_83 - VVV_20, // META_TILE_TYPE_84 - VVV_21, // META_TILE_TYPE_85 - VVV_21, // META_TILE_TYPE_86 - VVV_21, // META_TILE_TYPE_87 - VVV_21, // META_TILE_TYPE_88 - VVV_21, // META_TILE_TYPE_89 - VVV_21, // META_TILE_TYPE_90 - VVV_21, // META_TILE_TYPE_91 - VVV_21, // META_TILE_TYPE_92 - VVV_21, // META_TILE_TYPE_93 - VVV_21, // META_TILE_TYPE_94 - VVV_21, // META_TILE_TYPE_95 - VVV_21, // META_TILE_TYPE_96 - VVV_22, // META_TILE_TYPE_97 - VVV_22, // META_TILE_TYPE_98 - VVV_22, // META_TILE_TYPE_99 - VVV_22, // META_TILE_TYPE_100 - VVV_22, // META_TILE_TYPE_101 - VVV_22, // META_TILE_TYPE_102 - VVV_22, // META_TILE_TYPE_103 - VVV_22, // META_TILE_TYPE_104 - VVV_23, // META_TILE_TYPE_105 - VVV_23, // META_TILE_TYPE_106 - VVV_24, // META_TILE_TYPE_107 - VVV_24, // META_TILE_TYPE_108 - VVV_24, // META_TILE_TYPE_109 - VVV_24, // META_TILE_TYPE_110 - VVV_0, // META_TILE_TYPE_111 - VVV_0, // META_TILE_TYPE_112 - VVV_25, // META_TILE_TYPE_113 - VVV_25, // META_TILE_TYPE_114 - VVV_26, // META_TILE_TYPE_115 - VVV_0, // META_TILE_TYPE_116 - VVV_0, // META_TILE_TYPE_117 - VVV_0, // META_TILE_TYPE_118 - VVV_27, // META_TILE_TYPE_119 - VVV_28, // META_TILE_TYPE_120 - VVV_29, // META_TILE_TYPE_121 - VVV_30, // META_TILE_TYPE_122 - VVV_31, // META_TILE_TYPE_123 - VVV_32, // META_TILE_TYPE_124 - VVV_33, // META_TILE_TYPE_125 - VVV_34, // META_TILE_TYPE_126 - VVV_35, // META_TILE_TYPE_127 - VVV_36, // META_TILE_TYPE_128 - VVV_0, // META_TILE_TYPE_129 - VVV_36, // META_TILE_TYPE_130 - VVV_36, // META_TILE_TYPE_131 - VVV_36, // META_TILE_TYPE_132 - VVV_36, // META_TILE_TYPE_133 - VVV_37, // META_TILE_TYPE_134 - VVV_38, // META_TILE_TYPE_135 - VVV_38, // META_TILE_TYPE_136 - VVV_39, // META_TILE_TYPE_137 - VVV_39, // META_TILE_TYPE_138 - VVV_40, // META_TILE_TYPE_139 - VVV_40, // META_TILE_TYPE_140 - VVV_40, // META_TILE_TYPE_141 - VVV_40, // META_TILE_TYPE_142 - VVV_40, // META_TILE_TYPE_143 - VVV_40, // META_TILE_TYPE_144 - VVV_40, // META_TILE_TYPE_145 - VVV_40, // META_TILE_TYPE_146 - VVV_40, // META_TILE_TYPE_147 - VVV_40, // META_TILE_TYPE_148 - VVV_40, // META_TILE_TYPE_149 - VVV_40, // META_TILE_TYPE_150 - VVV_40, // META_TILE_TYPE_151 - VVV_40, // META_TILE_TYPE_152 - VVV_40, // META_TILE_TYPE_153 - VVV_40, // META_TILE_TYPE_154 - VVV_40, // META_TILE_TYPE_155 - VVV_40, // META_TILE_TYPE_156 - VVV_41, // META_TILE_TYPE_157 - VVV_41, // META_TILE_TYPE_158 - VVV_40, // META_TILE_TYPE_159 - VVV_40, // META_TILE_TYPE_160 - VVV_42, // META_TILE_TYPE_161 - VVV_41, // META_TILE_TYPE_162 - VVV_40, // META_TILE_TYPE_163 - VVV_43, // META_TILE_TYPE_164 - VVV_41, // META_TILE_TYPE_165 - VVV_40, // META_TILE_TYPE_166 - VVV_44, // META_TILE_TYPE_167 - VVV_41, // META_TILE_TYPE_168 - VVV_40, // META_TILE_TYPE_169 - VVV_45, // META_TILE_TYPE_170 - VVV_0, // META_TILE_TYPE_171 - VVV_0, // META_TILE_TYPE_172 - VVV_0, // META_TILE_TYPE_173 - VVV_0, // META_TILE_TYPE_174 - VVV_46, // META_TILE_TYPE_175 - VVV_0, // META_TILE_TYPE_176 - VVV_0, // META_TILE_TYPE_177 +const u8 gMapTileTypeToVvv[] = { + VVV_0, // TILE_TYPE_0 + VVV_1, // TILE_TYPE_1 + VVV_2, // TILE_TYPE_2 + VVV_3, // TILE_TYPE_3 + VVV_4, // TILE_TYPE_4 + VVV_5, // TILE_TYPE_5 + VVV_6, // TILE_TYPE_6 + VVV_7, // TILE_TYPE_7 + VVV_8, // TILE_TYPE_8 + VVV_9, // TILE_TYPE_9 + VVV_9, // TILE_TYPE_10 + VVV_10, // TILE_TYPE_11 + VVV_9, // TILE_TYPE_12 + VVV_9, // TILE_TYPE_13 + VVV_9, // TILE_TYPE_14 + VVV_9, // TILE_TYPE_15 + VVV_9, // TILE_TYPE_16 + VVV_9, // TILE_TYPE_17 + VVV_11, // TILE_TYPE_18 + VVV_12, // TILE_TYPE_19 + VVV_11, // TILE_TYPE_20 + VVV_11, // TILE_TYPE_21 + VVV_11, // TILE_TYPE_22 + VVV_11, // TILE_TYPE_23 + VVV_11, // TILE_TYPE_24 + VVV_11, // TILE_TYPE_25 + VVV_10, // TILE_TYPE_26 + VVV_10, // TILE_TYPE_27 + VVV_10, // TILE_TYPE_28 + VVV_10, // TILE_TYPE_29 + VVV_10, // TILE_TYPE_30 + VVV_10, // TILE_TYPE_31 + VVV_10, // TILE_TYPE_32 + VVV_10, // TILE_TYPE_33 + VVV_10, // TILE_TYPE_34 + VVV_10, // TILE_TYPE_35 + VVV_10, // TILE_TYPE_36 + VVV_10, // TILE_TYPE_37 + VVV_10, // TILE_TYPE_38 + VVV_10, // TILE_TYPE_39 + VVV_10, // TILE_TYPE_40 + VVV_12, // TILE_TYPE_41 + VVV_12, // TILE_TYPE_42 + VVV_12, // TILE_TYPE_43 + VVV_12, // TILE_TYPE_44 + VVV_12, // TILE_TYPE_45 + VVV_12, // TILE_TYPE_46 + VVV_12, // TILE_TYPE_47 + VVV_12, // TILE_TYPE_48 + VVV_12, // TILE_TYPE_49 + VVV_12, // TILE_TYPE_50 + VVV_12, // TILE_TYPE_51 + VVV_12, // TILE_TYPE_52 + VVV_13, // TILE_TYPE_53 + VVV_14, // TILE_TYPE_54 + VVV_14, // TILE_TYPE_55 + VVV_15, // TILE_TYPE_56 + VVV_16, // TILE_TYPE_57 + VVV_15, // TILE_TYPE_58 + VVV_14, // TILE_TYPE_59 + VVV_17, // TILE_TYPE_60 + VVV_18, // TILE_TYPE_61 + VVV_19, // TILE_TYPE_62 + VVV_20, // TILE_TYPE_63 + VVV_20, // TILE_TYPE_64 + VVV_20, // TILE_TYPE_65 + VVV_20, // TILE_TYPE_66 + VVV_20, // TILE_TYPE_67 + VVV_20, // TILE_TYPE_68 + VVV_20, // TILE_TYPE_69 + VVV_20, // TILE_TYPE_70 + VVV_20, // TILE_TYPE_71 + VVV_20, // TILE_TYPE_72 + VVV_20, // TILE_TYPE_73 + VVV_20, // TILE_TYPE_74 + VVV_20, // TILE_TYPE_75 + VVV_20, // TILE_TYPE_76 + VVV_20, // TILE_TYPE_77 + VVV_20, // TILE_TYPE_78 + VVV_20, // TILE_TYPE_79 + VVV_20, // TILE_TYPE_80 + VVV_20, // TILE_TYPE_81 + VVV_20, // TILE_TYPE_82 + VVV_20, // TILE_TYPE_83 + VVV_20, // TILE_TYPE_84 + VVV_21, // TILE_TYPE_85 + VVV_21, // TILE_TYPE_86 + VVV_21, // TILE_TYPE_87 + VVV_21, // TILE_TYPE_88 + VVV_21, // TILE_TYPE_89 + VVV_21, // TILE_TYPE_90 + VVV_21, // TILE_TYPE_91 + VVV_21, // TILE_TYPE_92 + VVV_21, // TILE_TYPE_93 + VVV_21, // TILE_TYPE_94 + VVV_21, // TILE_TYPE_95 + VVV_21, // TILE_TYPE_96 + VVV_22, // TILE_TYPE_97 + VVV_22, // TILE_TYPE_98 + VVV_22, // TILE_TYPE_99 + VVV_22, // TILE_TYPE_100 + VVV_22, // TILE_TYPE_101 + VVV_22, // TILE_TYPE_102 + VVV_22, // TILE_TYPE_103 + VVV_22, // TILE_TYPE_104 + VVV_23, // TILE_TYPE_105 + VVV_23, // TILE_TYPE_106 + VVV_24, // TILE_TYPE_107 + VVV_24, // TILE_TYPE_108 + VVV_24, // TILE_TYPE_109 + VVV_24, // TILE_TYPE_110 + VVV_0, // TILE_TYPE_111 + VVV_0, // TILE_TYPE_112 + VVV_25, // TILE_TYPE_113 + VVV_25, // TILE_TYPE_114 + VVV_26, // TILE_TYPE_115 + VVV_0, // TILE_TYPE_116 + VVV_0, // TILE_TYPE_117 + VVV_0, // TILE_TYPE_118 + VVV_27, // TILE_TYPE_119 + VVV_28, // TILE_TYPE_120 + VVV_29, // TILE_TYPE_121 + VVV_30, // TILE_TYPE_122 + VVV_31, // TILE_TYPE_123 + VVV_32, // TILE_TYPE_124 + VVV_33, // TILE_TYPE_125 + VVV_34, // TILE_TYPE_126 + VVV_35, // TILE_TYPE_127 + VVV_36, // TILE_TYPE_128 + VVV_0, // TILE_TYPE_129 + VVV_36, // TILE_TYPE_130 + VVV_36, // TILE_TYPE_131 + VVV_36, // TILE_TYPE_132 + VVV_36, // TILE_TYPE_133 + VVV_37, // TILE_TYPE_134 + VVV_38, // TILE_TYPE_135 + VVV_38, // TILE_TYPE_136 + VVV_39, // TILE_TYPE_137 + VVV_39, // TILE_TYPE_138 + VVV_40, // TILE_TYPE_139 + VVV_40, // TILE_TYPE_140 + VVV_40, // TILE_TYPE_141 + VVV_40, // TILE_TYPE_142 + VVV_40, // TILE_TYPE_143 + VVV_40, // TILE_TYPE_144 + VVV_40, // TILE_TYPE_145 + VVV_40, // TILE_TYPE_146 + VVV_40, // TILE_TYPE_147 + VVV_40, // TILE_TYPE_148 + VVV_40, // TILE_TYPE_149 + VVV_40, // TILE_TYPE_150 + VVV_40, // TILE_TYPE_151 + VVV_40, // TILE_TYPE_152 + VVV_40, // TILE_TYPE_153 + VVV_40, // TILE_TYPE_154 + VVV_40, // TILE_TYPE_155 + VVV_40, // TILE_TYPE_156 + VVV_41, // TILE_TYPE_157 + VVV_41, // TILE_TYPE_158 + VVV_40, // TILE_TYPE_159 + VVV_40, // TILE_TYPE_160 + VVV_42, // TILE_TYPE_161 + VVV_41, // TILE_TYPE_162 + VVV_40, // TILE_TYPE_163 + VVV_43, // TILE_TYPE_164 + VVV_41, // TILE_TYPE_165 + VVV_40, // TILE_TYPE_166 + VVV_44, // TILE_TYPE_167 + VVV_41, // TILE_TYPE_168 + VVV_40, // TILE_TYPE_169 + VVV_45, // TILE_TYPE_170 + VVV_0, // TILE_TYPE_171 + VVV_0, // TILE_TYPE_172 + VVV_0, // TILE_TYPE_173 + VVV_0, // TILE_TYPE_174 + VVV_46, // TILE_TYPE_175 + VVV_0, // TILE_TYPE_176 + VVV_0, // TILE_TYPE_177 #ifdef EU - VVV_0, // META_TILE_TYPE_178 + VVV_0, // TILE_TYPE_178 #else - VVV_41, // META_TILE_TYPE_178 + VVV_41, // TILE_TYPE_178 #endif - VVV_0, // META_TILE_TYPE_179 - VVV_0, // META_TILE_TYPE_180 + VVV_0, // TILE_TYPE_179 + VVV_0, // TILE_TYPE_180 #ifdef EU - VVV_0, // META_TILE_TYPE_181 + VVV_0, // TILE_TYPE_181 #else - VVV_41, // META_TILE_TYPE_181 + VVV_41, // TILE_TYPE_181 #endif - VVV_40, // META_TILE_TYPE_182 - VVV_0, // META_TILE_TYPE_183 - VVV_42, // META_TILE_TYPE_184 - VVV_42, // META_TILE_TYPE_185 - VVV_42, // META_TILE_TYPE_186 - VVV_0, // META_TILE_TYPE_187 - VVV_0, // META_TILE_TYPE_188 - VVV_0, // META_TILE_TYPE_189 - VVV_0, // META_TILE_TYPE_190 - VVV_46, // META_TILE_TYPE_191 - VVV_0, // META_TILE_TYPE_192 - VVV_0, // META_TILE_TYPE_193 + VVV_40, // TILE_TYPE_182 + VVV_0, // TILE_TYPE_183 + VVV_42, // TILE_TYPE_184 + VVV_42, // TILE_TYPE_185 + VVV_42, // TILE_TYPE_186 + VVV_0, // TILE_TYPE_187 + VVV_0, // TILE_TYPE_188 + VVV_0, // TILE_TYPE_189 + VVV_0, // TILE_TYPE_190 + VVV_46, // TILE_TYPE_191 + VVV_0, // TILE_TYPE_192 + VVV_0, // TILE_TYPE_193 #ifdef EU - VVV_0, // META_TILE_TYPE_194 + VVV_0, // TILE_TYPE_194 #else - VVV_41, // META_TILE_TYPE_194 + VVV_41, // TILE_TYPE_194 #endif - VVV_0, // META_TILE_TYPE_195 - VVV_0, // META_TILE_TYPE_196 + VVV_0, // TILE_TYPE_195 + VVV_0, // TILE_TYPE_196 #ifdef EU - VVV_0, // META_TILE_TYPE_197 + VVV_0, // TILE_TYPE_197 #else - VVV_41, // META_TILE_TYPE_197 + VVV_41, // TILE_TYPE_197 #endif - VVV_40, // META_TILE_TYPE_198 - VVV_0, // META_TILE_TYPE_199 - VVV_42, // META_TILE_TYPE_200 - VVV_42, // META_TILE_TYPE_201 - VVV_42, // META_TILE_TYPE_202 - VVV_0, // META_TILE_TYPE_203 - VVV_46, // META_TILE_TYPE_204 - VVV_0, // META_TILE_TYPE_205 - VVV_0, // META_TILE_TYPE_206 - VVV_0, // META_TILE_TYPE_207 - VVV_0, // META_TILE_TYPE_208 - VVV_0, // META_TILE_TYPE_209 + VVV_40, // TILE_TYPE_198 + VVV_0, // TILE_TYPE_199 + VVV_42, // TILE_TYPE_200 + VVV_42, // TILE_TYPE_201 + VVV_42, // TILE_TYPE_202 + VVV_0, // TILE_TYPE_203 + VVV_46, // TILE_TYPE_204 + VVV_0, // TILE_TYPE_205 + VVV_0, // TILE_TYPE_206 + VVV_0, // TILE_TYPE_207 + VVV_0, // TILE_TYPE_208 + VVV_0, // TILE_TYPE_209 #ifdef EU - VVV_0, // META_TILE_TYPE_210 + VVV_0, // TILE_TYPE_210 #else - VVV_41, // META_TILE_TYPE_210 + VVV_41, // TILE_TYPE_210 #endif - VVV_40, // META_TILE_TYPE_211 - VVV_0, // META_TILE_TYPE_212 - VVV_0, // META_TILE_TYPE_213 + VVV_40, // TILE_TYPE_211 + VVV_0, // TILE_TYPE_212 + VVV_0, // TILE_TYPE_213 #ifdef EU - VVV_0, // META_TILE_TYPE_214 + VVV_0, // TILE_TYPE_214 #else - VVV_41, // META_TILE_TYPE_214 + VVV_41, // TILE_TYPE_214 #endif - VVV_0, // META_TILE_TYPE_215 - VVV_43, // META_TILE_TYPE_216 - VVV_43, // META_TILE_TYPE_217 - VVV_43, // META_TILE_TYPE_218 - VVV_0, // META_TILE_TYPE_219 - VVV_0, // META_TILE_TYPE_220 - VVV_0, // META_TILE_TYPE_221 - VVV_0, // META_TILE_TYPE_222 - VVV_46, // META_TILE_TYPE_223 - VVV_0, // META_TILE_TYPE_224 - VVV_0, // META_TILE_TYPE_225 + VVV_0, // TILE_TYPE_215 + VVV_43, // TILE_TYPE_216 + VVV_43, // TILE_TYPE_217 + VVV_43, // TILE_TYPE_218 + VVV_0, // TILE_TYPE_219 + VVV_0, // TILE_TYPE_220 + VVV_0, // TILE_TYPE_221 + VVV_0, // TILE_TYPE_222 + VVV_46, // TILE_TYPE_223 + VVV_0, // TILE_TYPE_224 + VVV_0, // TILE_TYPE_225 #ifdef EU - VVV_0, // META_TILE_TYPE_226 + VVV_0, // TILE_TYPE_226 #else - VVV_41, // META_TILE_TYPE_226 + VVV_41, // TILE_TYPE_226 #endif - VVV_0, // META_TILE_TYPE_227 - VVV_0, // META_TILE_TYPE_228 + VVV_0, // TILE_TYPE_227 + VVV_0, // TILE_TYPE_228 #ifdef EU - VVV_0, // META_TILE_TYPE_229 + VVV_0, // TILE_TYPE_229 #else - VVV_41, // META_TILE_TYPE_229 + VVV_41, // TILE_TYPE_229 #endif - VVV_40, // META_TILE_TYPE_230 - VVV_0, // META_TILE_TYPE_231 - VVV_44, // META_TILE_TYPE_232 - VVV_44, // META_TILE_TYPE_233 - VVV_44, // META_TILE_TYPE_234 - VVV_0, // META_TILE_TYPE_235 - VVV_46, // META_TILE_TYPE_236 - VVV_0, // META_TILE_TYPE_237 - VVV_0, // META_TILE_TYPE_238 - VVV_0, // META_TILE_TYPE_239 - VVV_0, // META_TILE_TYPE_240 - VVV_0, // META_TILE_TYPE_241 + VVV_40, // TILE_TYPE_230 + VVV_0, // TILE_TYPE_231 + VVV_44, // TILE_TYPE_232 + VVV_44, // TILE_TYPE_233 + VVV_44, // TILE_TYPE_234 + VVV_0, // TILE_TYPE_235 + VVV_46, // TILE_TYPE_236 + VVV_0, // TILE_TYPE_237 + VVV_0, // TILE_TYPE_238 + VVV_0, // TILE_TYPE_239 + VVV_0, // TILE_TYPE_240 + VVV_0, // TILE_TYPE_241 #ifdef EU - VVV_0, // META_TILE_TYPE_242 + VVV_0, // TILE_TYPE_242 #else - VVV_41, // META_TILE_TYPE_242 + VVV_41, // TILE_TYPE_242 #endif - VVV_40, // META_TILE_TYPE_243 - VVV_0, // META_TILE_TYPE_244 - VVV_0, // META_TILE_TYPE_245 + VVV_40, // TILE_TYPE_243 + VVV_0, // TILE_TYPE_244 + VVV_0, // TILE_TYPE_245 #ifdef EU - VVV_0, // META_TILE_TYPE_246 + VVV_0, // TILE_TYPE_246 #else - VVV_41, // META_TILE_TYPE_246 + VVV_41, // TILE_TYPE_246 #endif - VVV_0, // META_TILE_TYPE_247 - VVV_45, // META_TILE_TYPE_248 - VVV_45, // META_TILE_TYPE_249 - VVV_45, // META_TILE_TYPE_250 - VVV_0, // META_TILE_TYPE_251 - VVV_0, // META_TILE_TYPE_252 - VVV_0, // META_TILE_TYPE_253 - VVV_0, // META_TILE_TYPE_254 - VVV_46, // META_TILE_TYPE_255 - VVV_0, // META_TILE_TYPE_256 - VVV_0, // META_TILE_TYPE_257 - VVV_0, // META_TILE_TYPE_258 - VVV_0, // META_TILE_TYPE_259 - VVV_0, // META_TILE_TYPE_260 - VVV_46, // META_TILE_TYPE_261 - VVV_0, // META_TILE_TYPE_262 - VVV_0, // META_TILE_TYPE_263 - VVV_46, // META_TILE_TYPE_264 - VVV_0, // META_TILE_TYPE_265 - VVV_0, // META_TILE_TYPE_266 - VVV_0, // META_TILE_TYPE_267 - VVV_0, // META_TILE_TYPE_268 - VVV_0, // META_TILE_TYPE_269 - VVV_0, // META_TILE_TYPE_270 - VVV_0, // META_TILE_TYPE_271 - VVV_46, // META_TILE_TYPE_272 - VVV_0, // META_TILE_TYPE_273 - VVV_0, // META_TILE_TYPE_274 - VVV_0, // META_TILE_TYPE_275 - VVV_0, // META_TILE_TYPE_276 - VVV_46, // META_TILE_TYPE_277 - VVV_0, // META_TILE_TYPE_278 - VVV_0, // META_TILE_TYPE_279 - VVV_0, // META_TILE_TYPE_280 - VVV_0, // META_TILE_TYPE_281 - VVV_0, // META_TILE_TYPE_282 - VVV_0, // META_TILE_TYPE_283 - VVV_0, // META_TILE_TYPE_284 - VVV_0, // META_TILE_TYPE_285 - VVV_0, // META_TILE_TYPE_286 - VVV_0, // META_TILE_TYPE_287 - VVV_0, // META_TILE_TYPE_288 - VVV_0, // META_TILE_TYPE_289 - VVV_0, // META_TILE_TYPE_290 - VVV_0, // META_TILE_TYPE_291 - VVV_0, // META_TILE_TYPE_292 - VVV_0, // META_TILE_TYPE_293 - VVV_0, // META_TILE_TYPE_294 - VVV_0, // META_TILE_TYPE_295 - VVV_0, // META_TILE_TYPE_296 - VVV_0, // META_TILE_TYPE_297 - VVV_0, // META_TILE_TYPE_298 - VVV_0, // META_TILE_TYPE_299 - VVV_0, // META_TILE_TYPE_300 - VVV_0, // META_TILE_TYPE_301 - VVV_0, // META_TILE_TYPE_302 - VVV_0, // META_TILE_TYPE_303 - VVV_0, // META_TILE_TYPE_304 - VVV_0, // META_TILE_TYPE_305 - VVV_0, // META_TILE_TYPE_306 - VVV_0, // META_TILE_TYPE_307 - VVV_0, // META_TILE_TYPE_308 - VVV_0, // META_TILE_TYPE_309 - VVV_0, // META_TILE_TYPE_310 - VVV_0, // META_TILE_TYPE_311 - VVV_0, // META_TILE_TYPE_312 - VVV_0, // META_TILE_TYPE_313 - VVV_0, // META_TILE_TYPE_314 - VVV_0, // META_TILE_TYPE_315 - VVV_0, // META_TILE_TYPE_316 - VVV_0, // META_TILE_TYPE_317 - VVV_0, // META_TILE_TYPE_318 - VVV_0, // META_TILE_TYPE_319 - VVV_0, // META_TILE_TYPE_320 - VVV_0, // META_TILE_TYPE_321 - VVV_0, // META_TILE_TYPE_322 - VVV_0, // META_TILE_TYPE_323 - VVV_0, // META_TILE_TYPE_324 - VVV_0, // META_TILE_TYPE_325 - VVV_0, // META_TILE_TYPE_326 - VVV_0, // META_TILE_TYPE_327 - VVV_0, // META_TILE_TYPE_328 - VVV_0, // META_TILE_TYPE_329 - VVV_0, // META_TILE_TYPE_330 - VVV_0, // META_TILE_TYPE_331 - VVV_0, // META_TILE_TYPE_332 - VVV_0, // META_TILE_TYPE_333 - VVV_0, // META_TILE_TYPE_334 - VVV_0, // META_TILE_TYPE_335 - VVV_0, // META_TILE_TYPE_336 - VVV_0, // META_TILE_TYPE_337 - VVV_0, // META_TILE_TYPE_338 - VVV_0, // META_TILE_TYPE_339 - VVV_0, // META_TILE_TYPE_340 - VVV_0, // META_TILE_TYPE_341 - VVV_0, // META_TILE_TYPE_342 - VVV_0, // META_TILE_TYPE_343 - VVV_0, // META_TILE_TYPE_344 - VVV_0, // META_TILE_TYPE_345 - VVV_0, // META_TILE_TYPE_346 - VVV_0, // META_TILE_TYPE_347 - VVV_0, // META_TILE_TYPE_348 - VVV_0, // META_TILE_TYPE_349 - VVV_0, // META_TILE_TYPE_350 - VVV_0, // META_TILE_TYPE_351 - VVV_0, // META_TILE_TYPE_352 - VVV_47, // META_TILE_TYPE_353 - VVV_47, // META_TILE_TYPE_354 - VVV_47, // META_TILE_TYPE_355 - VVV_0, // META_TILE_TYPE_356 - VVV_0, // META_TILE_TYPE_357 - VVV_40, // META_TILE_TYPE_358 - VVV_0, // META_TILE_TYPE_359 - VVV_40, // META_TILE_TYPE_360 - VVV_48, // META_TILE_TYPE_361 - VVV_49, // META_TILE_TYPE_362 - VVV_50, // META_TILE_TYPE_363 - VVV_51, // META_TILE_TYPE_364 - VVV_52, // META_TILE_TYPE_365 - VVV_52, // META_TILE_TYPE_366 - VVV_53, // META_TILE_TYPE_367 - VVV_53, // META_TILE_TYPE_368 - VVV_54, // META_TILE_TYPE_369 - VVV_55, // META_TILE_TYPE_370 - VVV_0, // META_TILE_TYPE_371 - VVV_56, // META_TILE_TYPE_372 - VVV_57, // META_TILE_TYPE_373 - VVV_58, // META_TILE_TYPE_374 - VVV_59, // META_TILE_TYPE_375 - VVV_0, // META_TILE_TYPE_376 - VVV_0, // META_TILE_TYPE_377 - VVV_60, // META_TILE_TYPE_378 - VVV_60, // META_TILE_TYPE_379 - VVV_60, // META_TILE_TYPE_380 - VVV_60, // META_TILE_TYPE_381 - VVV_0, // META_TILE_TYPE_382 - VVV_0, // META_TILE_TYPE_383 - VVV_0, // META_TILE_TYPE_384 - VVV_0, // META_TILE_TYPE_385 - VVV_61, // META_TILE_TYPE_386 - VVV_61, // META_TILE_TYPE_387 - VVV_62, // META_TILE_TYPE_388 - VVV_9, // META_TILE_TYPE_389 - VVV_9, // META_TILE_TYPE_390 - VVV_9, // META_TILE_TYPE_391 - VVV_9, // META_TILE_TYPE_392 - VVV_9, // META_TILE_TYPE_393 - VVV_9, // META_TILE_TYPE_394 - VVV_61, // META_TILE_TYPE_395 - VVV_61, // META_TILE_TYPE_396 - VVV_61, // META_TILE_TYPE_397 - VVV_9, // META_TILE_TYPE_398 - VVV_9, // META_TILE_TYPE_399 - VVV_61, // META_TILE_TYPE_400 - VVV_61, // META_TILE_TYPE_401 - VVV_61, // META_TILE_TYPE_402 - VVV_9, // META_TILE_TYPE_403 - VVV_9, // META_TILE_TYPE_404 - VVV_9, // META_TILE_TYPE_405 - VVV_9, // META_TILE_TYPE_406 - VVV_9, // META_TILE_TYPE_407 - VVV_9, // META_TILE_TYPE_408 - VVV_0, // META_TILE_TYPE_409 - VVV_0, // META_TILE_TYPE_410 - VVV_0, // META_TILE_TYPE_411 - VVV_0, // META_TILE_TYPE_412 - VVV_63, // META_TILE_TYPE_413 - VVV_0, // META_TILE_TYPE_414 - VVV_0, // META_TILE_TYPE_415 - VVV_0, // META_TILE_TYPE_416 - VVV_0, // META_TILE_TYPE_417 - VVV_0, // META_TILE_TYPE_418 - VVV_0, // META_TILE_TYPE_419 - VVV_0, // META_TILE_TYPE_420 - VVV_0, // META_TILE_TYPE_421 - VVV_63, // META_TILE_TYPE_422 - VVV_0, // META_TILE_TYPE_423 - VVV_0, // META_TILE_TYPE_424 - VVV_0, // META_TILE_TYPE_425 - VVV_0, // META_TILE_TYPE_426 - VVV_0, // META_TILE_TYPE_427 - VVV_42, // META_TILE_TYPE_428 - VVV_43, // META_TILE_TYPE_429 - VVV_44, // META_TILE_TYPE_430 - VVV_45, // META_TILE_TYPE_431 - VVV_0, // META_TILE_TYPE_432 - VVV_0, // META_TILE_TYPE_433 - VVV_0, // META_TILE_TYPE_434 - VVV_0, // META_TILE_TYPE_435 - VVV_64, // META_TILE_TYPE_436 - VVV_65, // META_TILE_TYPE_437 - VVV_66, // META_TILE_TYPE_438 - VVV_67, // META_TILE_TYPE_439 - VVV_68, // META_TILE_TYPE_440 - VVV_69, // META_TILE_TYPE_441 - VVV_70, // META_TILE_TYPE_442 - VVV_71, // META_TILE_TYPE_443 - VVV_72, // META_TILE_TYPE_444 - VVV_73, // META_TILE_TYPE_445 - VVV_74, // META_TILE_TYPE_446 - VVV_75, // META_TILE_TYPE_447 - VVV_76, // META_TILE_TYPE_448 - VVV_77, // META_TILE_TYPE_449 - VVV_78, // META_TILE_TYPE_450 - VVV_79, // META_TILE_TYPE_451 - VVV_80, // META_TILE_TYPE_452 - VVV_81, // META_TILE_TYPE_453 - VVV_82, // META_TILE_TYPE_454 - VVV_83, // META_TILE_TYPE_455 - VVV_63, // META_TILE_TYPE_456 - VVV_0, // META_TILE_TYPE_457 - VVV_63, // META_TILE_TYPE_458 - VVV_83, // META_TILE_TYPE_459 - VVV_83, // META_TILE_TYPE_460 - VVV_0, // META_TILE_TYPE_461 - VVV_0, // META_TILE_TYPE_462 - VVV_43, // META_TILE_TYPE_463 - VVV_43, // META_TILE_TYPE_464 - VVV_43, // META_TILE_TYPE_465 - VVV_0, // META_TILE_TYPE_466 - VVV_21, // META_TILE_TYPE_467 - VVV_21, // META_TILE_TYPE_468 - VVV_21, // META_TILE_TYPE_469 - VVV_21, // META_TILE_TYPE_470 - VVV_0, // META_TILE_TYPE_471 - VVV_0, // META_TILE_TYPE_472 - VVV_0, // META_TILE_TYPE_473 - VVV_0, // META_TILE_TYPE_474 - VVV_0, // META_TILE_TYPE_475 - VVV_0, // META_TILE_TYPE_476 - VVV_0, // META_TILE_TYPE_477 - VVV_0, // META_TILE_TYPE_478 - VVV_0, // META_TILE_TYPE_479 - VVV_0, // META_TILE_TYPE_480 - VVV_0, // META_TILE_TYPE_481 - VVV_0, // META_TILE_TYPE_482 - VVV_0, // META_TILE_TYPE_483 - VVV_0, // META_TILE_TYPE_484 - VVV_0, // META_TILE_TYPE_485 - VVV_0, // META_TILE_TYPE_486 - VVV_84, // META_TILE_TYPE_487 - VVV_0, // META_TILE_TYPE_488 - VVV_0, // META_TILE_TYPE_489 - VVV_0, // META_TILE_TYPE_490 - VVV_0, // META_TILE_TYPE_491 - VVV_0, // META_TILE_TYPE_492 - VVV_0, // META_TILE_TYPE_493 - VVV_0, // META_TILE_TYPE_494 - VVV_0, // META_TILE_TYPE_495 - VVV_0, // META_TILE_TYPE_496 - VVV_0, // META_TILE_TYPE_497 - VVV_0, // META_TILE_TYPE_498 - VVV_0, // META_TILE_TYPE_499 - VVV_0, // META_TILE_TYPE_500 - VVV_0, // META_TILE_TYPE_501 - VVV_0, // META_TILE_TYPE_502 - VVV_0, // META_TILE_TYPE_503 - VVV_0, // META_TILE_TYPE_504 - VVV_0, // META_TILE_TYPE_505 - VVV_0, // META_TILE_TYPE_506 - VVV_0, // META_TILE_TYPE_507 - VVV_0, // META_TILE_TYPE_508 - VVV_0, // META_TILE_TYPE_509 - VVV_0, // META_TILE_TYPE_510 - VVV_0, // META_TILE_TYPE_511 - VVV_0, // META_TILE_TYPE_512 - VVV_0, // META_TILE_TYPE_513 - VVV_0, // META_TILE_TYPE_514 - VVV_0, // META_TILE_TYPE_515 - VVV_0, // META_TILE_TYPE_516 - VVV_0, // META_TILE_TYPE_517 - VVV_0, // META_TILE_TYPE_518 - VVV_0, // META_TILE_TYPE_519 - VVV_0, // META_TILE_TYPE_520 - VVV_0, // META_TILE_TYPE_521 - VVV_0, // META_TILE_TYPE_522 - VVV_0, // META_TILE_TYPE_523 - VVV_40, // META_TILE_TYPE_524 - VVV_0, // META_TILE_TYPE_525 - VVV_0, // META_TILE_TYPE_526 - VVV_0, // META_TILE_TYPE_527 - VVV_0, // META_TILE_TYPE_528 - VVV_0, // META_TILE_TYPE_529 - VVV_0, // META_TILE_TYPE_530 - VVV_0, // META_TILE_TYPE_531 - VVV_0, // META_TILE_TYPE_532 - VVV_0, // META_TILE_TYPE_533 - VVV_0, // META_TILE_TYPE_534 - VVV_0, // META_TILE_TYPE_535 - VVV_0, // META_TILE_TYPE_536 - VVV_0, // META_TILE_TYPE_537 - VVV_0, // META_TILE_TYPE_538 - VVV_0, // META_TILE_TYPE_539 - VVV_0, // META_TILE_TYPE_540 - VVV_0, // META_TILE_TYPE_541 - VVV_0, // META_TILE_TYPE_542 - VVV_0, // META_TILE_TYPE_543 - VVV_0, // META_TILE_TYPE_544 - VVV_0, // META_TILE_TYPE_545 - VVV_0, // META_TILE_TYPE_546 - VVV_0, // META_TILE_TYPE_547 - VVV_0, // META_TILE_TYPE_548 - VVV_40, // META_TILE_TYPE_549 - VVV_0, // META_TILE_TYPE_550 - VVV_0, // META_TILE_TYPE_551 - VVV_0, // META_TILE_TYPE_552 - VVV_0, // META_TILE_TYPE_553 - VVV_0, // META_TILE_TYPE_554 - VVV_0, // META_TILE_TYPE_555 - VVV_0, // META_TILE_TYPE_556 - VVV_0, // META_TILE_TYPE_557 - VVV_0, // META_TILE_TYPE_558 - VVV_0, // META_TILE_TYPE_559 - VVV_0, // META_TILE_TYPE_560 - VVV_0, // META_TILE_TYPE_561 - VVV_16, // META_TILE_TYPE_562 - VVV_16, // META_TILE_TYPE_563 - VVV_16, // META_TILE_TYPE_564 - VVV_16, // META_TILE_TYPE_565 - VVV_16, // META_TILE_TYPE_566 - VVV_16, // META_TILE_TYPE_567 - VVV_16, // META_TILE_TYPE_568 - VVV_16, // META_TILE_TYPE_569 - VVV_16, // META_TILE_TYPE_570 - VVV_16, // META_TILE_TYPE_571 - VVV_16, // META_TILE_TYPE_572 - VVV_16, // META_TILE_TYPE_573 - VVV_16, // META_TILE_TYPE_574 - VVV_16, // META_TILE_TYPE_575 - VVV_16, // META_TILE_TYPE_576 - VVV_16, // META_TILE_TYPE_577 - VVV_16, // META_TILE_TYPE_578 - VVV_16, // META_TILE_TYPE_579 - VVV_16, // META_TILE_TYPE_580 - VVV_16, // META_TILE_TYPE_581 - VVV_16, // META_TILE_TYPE_582 - VVV_16, // META_TILE_TYPE_583 - VVV_16, // META_TILE_TYPE_584 - VVV_16, // META_TILE_TYPE_585 - VVV_16, // META_TILE_TYPE_586 - VVV_16, // META_TILE_TYPE_587 - VVV_16, // META_TILE_TYPE_588 - VVV_16, // META_TILE_TYPE_589 - VVV_85, // META_TILE_TYPE_590 - VVV_85, // META_TILE_TYPE_591 - VVV_85, // META_TILE_TYPE_592 - VVV_85, // META_TILE_TYPE_593 - VVV_85, // META_TILE_TYPE_594 - VVV_85, // META_TILE_TYPE_595 - VVV_85, // META_TILE_TYPE_596 - VVV_85, // META_TILE_TYPE_597 - VVV_85, // META_TILE_TYPE_598 - VVV_0, // META_TILE_TYPE_599 - VVV_0, // META_TILE_TYPE_600 - VVV_0, // META_TILE_TYPE_601 - VVV_0, // META_TILE_TYPE_602 - VVV_0, // META_TILE_TYPE_603 - VVV_0, // META_TILE_TYPE_604 - VVV_0, // META_TILE_TYPE_605 - VVV_0, // META_TILE_TYPE_606 - VVV_0, // META_TILE_TYPE_607 - VVV_0, // META_TILE_TYPE_608 - VVV_0, // META_TILE_TYPE_609 - VVV_9, // META_TILE_TYPE_610 - VVV_9, // META_TILE_TYPE_611 - VVV_0, // META_TILE_TYPE_612 - VVV_0, // META_TILE_TYPE_613 - VVV_0, // META_TILE_TYPE_614 - VVV_86, // META_TILE_TYPE_615 - VVV_0, // META_TILE_TYPE_616 - VVV_0, // META_TILE_TYPE_617 - VVV_86, // META_TILE_TYPE_618 - VVV_0, // META_TILE_TYPE_619 - VVV_0, // META_TILE_TYPE_620 - VVV_41, // META_TILE_TYPE_621 - VVV_0, // META_TILE_TYPE_622 - VVV_0, // META_TILE_TYPE_623 - VVV_41, // META_TILE_TYPE_624 - VVV_40, // META_TILE_TYPE_625 - VVV_0, // META_TILE_TYPE_626 - VVV_0, // META_TILE_TYPE_627 - VVV_0, // META_TILE_TYPE_628 - VVV_0, // META_TILE_TYPE_629 - VVV_0, // META_TILE_TYPE_630 - VVV_86, // META_TILE_TYPE_631 - VVV_0, // META_TILE_TYPE_632 - VVV_0, // META_TILE_TYPE_633 - VVV_86, // META_TILE_TYPE_634 - VVV_0, // META_TILE_TYPE_635 - VVV_0, // META_TILE_TYPE_636 - VVV_41, // META_TILE_TYPE_637 - VVV_0, // META_TILE_TYPE_638 - VVV_0, // META_TILE_TYPE_639 - VVV_41, // META_TILE_TYPE_640 - VVV_40, // META_TILE_TYPE_641 - VVV_0, // META_TILE_TYPE_642 - VVV_0, // META_TILE_TYPE_643 - VVV_0, // META_TILE_TYPE_644 - VVV_0, // META_TILE_TYPE_645 - VVV_0, // META_TILE_TYPE_646 - VVV_86, // META_TILE_TYPE_647 - VVV_0, // META_TILE_TYPE_648 - VVV_0, // META_TILE_TYPE_649 - VVV_86, // META_TILE_TYPE_650 - VVV_0, // META_TILE_TYPE_651 - VVV_0, // META_TILE_TYPE_652 + VVV_0, // TILE_TYPE_247 + VVV_45, // TILE_TYPE_248 + VVV_45, // TILE_TYPE_249 + VVV_45, // TILE_TYPE_250 + VVV_0, // TILE_TYPE_251 + VVV_0, // TILE_TYPE_252 + VVV_0, // TILE_TYPE_253 + VVV_0, // TILE_TYPE_254 + VVV_46, // TILE_TYPE_255 + VVV_0, // TILE_TYPE_256 + VVV_0, // TILE_TYPE_257 + VVV_0, // TILE_TYPE_258 + VVV_0, // TILE_TYPE_259 + VVV_0, // TILE_TYPE_260 + VVV_46, // TILE_TYPE_261 + VVV_0, // TILE_TYPE_262 + VVV_0, // TILE_TYPE_263 + VVV_46, // TILE_TYPE_264 + VVV_0, // TILE_TYPE_265 + VVV_0, // TILE_TYPE_266 + VVV_0, // TILE_TYPE_267 + VVV_0, // TILE_TYPE_268 + VVV_0, // TILE_TYPE_269 + VVV_0, // TILE_TYPE_270 + VVV_0, // TILE_TYPE_271 + VVV_46, // TILE_TYPE_272 + VVV_0, // TILE_TYPE_273 + VVV_0, // TILE_TYPE_274 + VVV_0, // TILE_TYPE_275 + VVV_0, // TILE_TYPE_276 + VVV_46, // TILE_TYPE_277 + VVV_0, // TILE_TYPE_278 + VVV_0, // TILE_TYPE_279 + VVV_0, // TILE_TYPE_280 + VVV_0, // TILE_TYPE_281 + VVV_0, // TILE_TYPE_282 + VVV_0, // TILE_TYPE_283 + VVV_0, // TILE_TYPE_284 + VVV_0, // TILE_TYPE_285 + VVV_0, // TILE_TYPE_286 + VVV_0, // TILE_TYPE_287 + VVV_0, // TILE_TYPE_288 + VVV_0, // TILE_TYPE_289 + VVV_0, // TILE_TYPE_290 + VVV_0, // TILE_TYPE_291 + VVV_0, // TILE_TYPE_292 + VVV_0, // TILE_TYPE_293 + VVV_0, // TILE_TYPE_294 + VVV_0, // TILE_TYPE_295 + VVV_0, // TILE_TYPE_296 + VVV_0, // TILE_TYPE_297 + VVV_0, // TILE_TYPE_298 + VVV_0, // TILE_TYPE_299 + VVV_0, // TILE_TYPE_300 + VVV_0, // TILE_TYPE_301 + VVV_0, // TILE_TYPE_302 + VVV_0, // TILE_TYPE_303 + VVV_0, // TILE_TYPE_304 + VVV_0, // TILE_TYPE_305 + VVV_0, // TILE_TYPE_306 + VVV_0, // TILE_TYPE_307 + VVV_0, // TILE_TYPE_308 + VVV_0, // TILE_TYPE_309 + VVV_0, // TILE_TYPE_310 + VVV_0, // TILE_TYPE_311 + VVV_0, // TILE_TYPE_312 + VVV_0, // TILE_TYPE_313 + VVV_0, // TILE_TYPE_314 + VVV_0, // TILE_TYPE_315 + VVV_0, // TILE_TYPE_316 + VVV_0, // TILE_TYPE_317 + VVV_0, // TILE_TYPE_318 + VVV_0, // TILE_TYPE_319 + VVV_0, // TILE_TYPE_320 + VVV_0, // TILE_TYPE_321 + VVV_0, // TILE_TYPE_322 + VVV_0, // TILE_TYPE_323 + VVV_0, // TILE_TYPE_324 + VVV_0, // TILE_TYPE_325 + VVV_0, // TILE_TYPE_326 + VVV_0, // TILE_TYPE_327 + VVV_0, // TILE_TYPE_328 + VVV_0, // TILE_TYPE_329 + VVV_0, // TILE_TYPE_330 + VVV_0, // TILE_TYPE_331 + VVV_0, // TILE_TYPE_332 + VVV_0, // TILE_TYPE_333 + VVV_0, // TILE_TYPE_334 + VVV_0, // TILE_TYPE_335 + VVV_0, // TILE_TYPE_336 + VVV_0, // TILE_TYPE_337 + VVV_0, // TILE_TYPE_338 + VVV_0, // TILE_TYPE_339 + VVV_0, // TILE_TYPE_340 + VVV_0, // TILE_TYPE_341 + VVV_0, // TILE_TYPE_342 + VVV_0, // TILE_TYPE_343 + VVV_0, // TILE_TYPE_344 + VVV_0, // TILE_TYPE_345 + VVV_0, // TILE_TYPE_346 + VVV_0, // TILE_TYPE_347 + VVV_0, // TILE_TYPE_348 + VVV_0, // TILE_TYPE_349 + VVV_0, // TILE_TYPE_350 + VVV_0, // TILE_TYPE_351 + VVV_0, // TILE_TYPE_352 + VVV_47, // TILE_TYPE_353 + VVV_47, // TILE_TYPE_354 + VVV_47, // TILE_TYPE_355 + VVV_0, // TILE_TYPE_356 + VVV_0, // TILE_TYPE_357 + VVV_40, // TILE_TYPE_358 + VVV_0, // TILE_TYPE_359 + VVV_40, // TILE_TYPE_360 + VVV_48, // TILE_TYPE_361 + VVV_49, // TILE_TYPE_362 + VVV_50, // TILE_TYPE_363 + VVV_51, // TILE_TYPE_364 + VVV_52, // TILE_TYPE_365 + VVV_52, // TILE_TYPE_366 + VVV_53, // TILE_TYPE_367 + VVV_53, // TILE_TYPE_368 + VVV_54, // TILE_TYPE_369 + VVV_55, // TILE_TYPE_370 + VVV_0, // TILE_TYPE_371 + VVV_56, // TILE_TYPE_372 + VVV_57, // TILE_TYPE_373 + VVV_58, // TILE_TYPE_374 + VVV_59, // TILE_TYPE_375 + VVV_0, // TILE_TYPE_376 + VVV_0, // TILE_TYPE_377 + VVV_60, // TILE_TYPE_378 + VVV_60, // TILE_TYPE_379 + VVV_60, // TILE_TYPE_380 + VVV_60, // TILE_TYPE_381 + VVV_0, // TILE_TYPE_382 + VVV_0, // TILE_TYPE_383 + VVV_0, // TILE_TYPE_384 + VVV_0, // TILE_TYPE_385 + VVV_61, // TILE_TYPE_386 + VVV_61, // TILE_TYPE_387 + VVV_62, // TILE_TYPE_388 + VVV_9, // TILE_TYPE_389 + VVV_9, // TILE_TYPE_390 + VVV_9, // TILE_TYPE_391 + VVV_9, // TILE_TYPE_392 + VVV_9, // TILE_TYPE_393 + VVV_9, // TILE_TYPE_394 + VVV_61, // TILE_TYPE_395 + VVV_61, // TILE_TYPE_396 + VVV_61, // TILE_TYPE_397 + VVV_9, // TILE_TYPE_398 + VVV_9, // TILE_TYPE_399 + VVV_61, // TILE_TYPE_400 + VVV_61, // TILE_TYPE_401 + VVV_61, // TILE_TYPE_402 + VVV_9, // TILE_TYPE_403 + VVV_9, // TILE_TYPE_404 + VVV_9, // TILE_TYPE_405 + VVV_9, // TILE_TYPE_406 + VVV_9, // TILE_TYPE_407 + VVV_9, // TILE_TYPE_408 + VVV_0, // TILE_TYPE_409 + VVV_0, // TILE_TYPE_410 + VVV_0, // TILE_TYPE_411 + VVV_0, // TILE_TYPE_412 + VVV_63, // TILE_TYPE_413 + VVV_0, // TILE_TYPE_414 + VVV_0, // TILE_TYPE_415 + VVV_0, // TILE_TYPE_416 + VVV_0, // TILE_TYPE_417 + VVV_0, // TILE_TYPE_418 + VVV_0, // TILE_TYPE_419 + VVV_0, // TILE_TYPE_420 + VVV_0, // TILE_TYPE_421 + VVV_63, // TILE_TYPE_422 + VVV_0, // TILE_TYPE_423 + VVV_0, // TILE_TYPE_424 + VVV_0, // TILE_TYPE_425 + VVV_0, // TILE_TYPE_426 + VVV_0, // TILE_TYPE_427 + VVV_42, // TILE_TYPE_428 + VVV_43, // TILE_TYPE_429 + VVV_44, // TILE_TYPE_430 + VVV_45, // TILE_TYPE_431 + VVV_0, // TILE_TYPE_432 + VVV_0, // TILE_TYPE_433 + VVV_0, // TILE_TYPE_434 + VVV_0, // TILE_TYPE_435 + VVV_64, // TILE_TYPE_436 + VVV_65, // TILE_TYPE_437 + VVV_66, // TILE_TYPE_438 + VVV_67, // TILE_TYPE_439 + VVV_68, // TILE_TYPE_440 + VVV_69, // TILE_TYPE_441 + VVV_70, // TILE_TYPE_442 + VVV_71, // TILE_TYPE_443 + VVV_72, // TILE_TYPE_444 + VVV_73, // TILE_TYPE_445 + VVV_74, // TILE_TYPE_446 + VVV_75, // TILE_TYPE_447 + VVV_76, // TILE_TYPE_448 + VVV_77, // TILE_TYPE_449 + VVV_78, // TILE_TYPE_450 + VVV_79, // TILE_TYPE_451 + VVV_80, // TILE_TYPE_452 + VVV_81, // TILE_TYPE_453 + VVV_82, // TILE_TYPE_454 + VVV_83, // TILE_TYPE_455 + VVV_63, // TILE_TYPE_456 + VVV_0, // TILE_TYPE_457 + VVV_63, // TILE_TYPE_458 + VVV_83, // TILE_TYPE_459 + VVV_83, // TILE_TYPE_460 + VVV_0, // TILE_TYPE_461 + VVV_0, // TILE_TYPE_462 + VVV_43, // TILE_TYPE_463 + VVV_43, // TILE_TYPE_464 + VVV_43, // TILE_TYPE_465 + VVV_0, // TILE_TYPE_466 + VVV_21, // TILE_TYPE_467 + VVV_21, // TILE_TYPE_468 + VVV_21, // TILE_TYPE_469 + VVV_21, // TILE_TYPE_470 + VVV_0, // TILE_TYPE_471 + VVV_0, // TILE_TYPE_472 + VVV_0, // TILE_TYPE_473 + VVV_0, // TILE_TYPE_474 + VVV_0, // TILE_TYPE_475 + VVV_0, // TILE_TYPE_476 + VVV_0, // TILE_TYPE_477 + VVV_0, // TILE_TYPE_478 + VVV_0, // TILE_TYPE_479 + VVV_0, // TILE_TYPE_480 + VVV_0, // TILE_TYPE_481 + VVV_0, // TILE_TYPE_482 + VVV_0, // TILE_TYPE_483 + VVV_0, // TILE_TYPE_484 + VVV_0, // TILE_TYPE_485 + VVV_0, // TILE_TYPE_486 + VVV_84, // TILE_TYPE_487 + VVV_0, // TILE_TYPE_488 + VVV_0, // TILE_TYPE_489 + VVV_0, // TILE_TYPE_490 + VVV_0, // TILE_TYPE_491 + VVV_0, // TILE_TYPE_492 + VVV_0, // TILE_TYPE_493 + VVV_0, // TILE_TYPE_494 + VVV_0, // TILE_TYPE_495 + VVV_0, // TILE_TYPE_496 + VVV_0, // TILE_TYPE_497 + VVV_0, // TILE_TYPE_498 + VVV_0, // TILE_TYPE_499 + VVV_0, // TILE_TYPE_500 + VVV_0, // TILE_TYPE_501 + VVV_0, // TILE_TYPE_502 + VVV_0, // TILE_TYPE_503 + VVV_0, // TILE_TYPE_504 + VVV_0, // TILE_TYPE_505 + VVV_0, // TILE_TYPE_506 + VVV_0, // TILE_TYPE_507 + VVV_0, // TILE_TYPE_508 + VVV_0, // TILE_TYPE_509 + VVV_0, // TILE_TYPE_510 + VVV_0, // TILE_TYPE_511 + VVV_0, // TILE_TYPE_512 + VVV_0, // TILE_TYPE_513 + VVV_0, // TILE_TYPE_514 + VVV_0, // TILE_TYPE_515 + VVV_0, // TILE_TYPE_516 + VVV_0, // TILE_TYPE_517 + VVV_0, // TILE_TYPE_518 + VVV_0, // TILE_TYPE_519 + VVV_0, // TILE_TYPE_520 + VVV_0, // TILE_TYPE_521 + VVV_0, // TILE_TYPE_522 + VVV_0, // TILE_TYPE_523 + VVV_40, // TILE_TYPE_524 + VVV_0, // TILE_TYPE_525 + VVV_0, // TILE_TYPE_526 + VVV_0, // TILE_TYPE_527 + VVV_0, // TILE_TYPE_528 + VVV_0, // TILE_TYPE_529 + VVV_0, // TILE_TYPE_530 + VVV_0, // TILE_TYPE_531 + VVV_0, // TILE_TYPE_532 + VVV_0, // TILE_TYPE_533 + VVV_0, // TILE_TYPE_534 + VVV_0, // TILE_TYPE_535 + VVV_0, // TILE_TYPE_536 + VVV_0, // TILE_TYPE_537 + VVV_0, // TILE_TYPE_538 + VVV_0, // TILE_TYPE_539 + VVV_0, // TILE_TYPE_540 + VVV_0, // TILE_TYPE_541 + VVV_0, // TILE_TYPE_542 + VVV_0, // TILE_TYPE_543 + VVV_0, // TILE_TYPE_544 + VVV_0, // TILE_TYPE_545 + VVV_0, // TILE_TYPE_546 + VVV_0, // TILE_TYPE_547 + VVV_0, // TILE_TYPE_548 + VVV_40, // TILE_TYPE_549 + VVV_0, // TILE_TYPE_550 + VVV_0, // TILE_TYPE_551 + VVV_0, // TILE_TYPE_552 + VVV_0, // TILE_TYPE_553 + VVV_0, // TILE_TYPE_554 + VVV_0, // TILE_TYPE_555 + VVV_0, // TILE_TYPE_556 + VVV_0, // TILE_TYPE_557 + VVV_0, // TILE_TYPE_558 + VVV_0, // TILE_TYPE_559 + VVV_0, // TILE_TYPE_560 + VVV_0, // TILE_TYPE_561 + VVV_16, // TILE_TYPE_562 + VVV_16, // TILE_TYPE_563 + VVV_16, // TILE_TYPE_564 + VVV_16, // TILE_TYPE_565 + VVV_16, // TILE_TYPE_566 + VVV_16, // TILE_TYPE_567 + VVV_16, // TILE_TYPE_568 + VVV_16, // TILE_TYPE_569 + VVV_16, // TILE_TYPE_570 + VVV_16, // TILE_TYPE_571 + VVV_16, // TILE_TYPE_572 + VVV_16, // TILE_TYPE_573 + VVV_16, // TILE_TYPE_574 + VVV_16, // TILE_TYPE_575 + VVV_16, // TILE_TYPE_576 + VVV_16, // TILE_TYPE_577 + VVV_16, // TILE_TYPE_578 + VVV_16, // TILE_TYPE_579 + VVV_16, // TILE_TYPE_580 + VVV_16, // TILE_TYPE_581 + VVV_16, // TILE_TYPE_582 + VVV_16, // TILE_TYPE_583 + VVV_16, // TILE_TYPE_584 + VVV_16, // TILE_TYPE_585 + VVV_16, // TILE_TYPE_586 + VVV_16, // TILE_TYPE_587 + VVV_16, // TILE_TYPE_588 + VVV_16, // TILE_TYPE_589 + VVV_85, // TILE_TYPE_590 + VVV_85, // TILE_TYPE_591 + VVV_85, // TILE_TYPE_592 + VVV_85, // TILE_TYPE_593 + VVV_85, // TILE_TYPE_594 + VVV_85, // TILE_TYPE_595 + VVV_85, // TILE_TYPE_596 + VVV_85, // TILE_TYPE_597 + VVV_85, // TILE_TYPE_598 + VVV_0, // TILE_TYPE_599 + VVV_0, // TILE_TYPE_600 + VVV_0, // TILE_TYPE_601 + VVV_0, // TILE_TYPE_602 + VVV_0, // TILE_TYPE_603 + VVV_0, // TILE_TYPE_604 + VVV_0, // TILE_TYPE_605 + VVV_0, // TILE_TYPE_606 + VVV_0, // TILE_TYPE_607 + VVV_0, // TILE_TYPE_608 + VVV_0, // TILE_TYPE_609 + VVV_9, // TILE_TYPE_610 + VVV_9, // TILE_TYPE_611 + VVV_0, // TILE_TYPE_612 + VVV_0, // TILE_TYPE_613 + VVV_0, // TILE_TYPE_614 + VVV_86, // TILE_TYPE_615 + VVV_0, // TILE_TYPE_616 + VVV_0, // TILE_TYPE_617 + VVV_86, // TILE_TYPE_618 + VVV_0, // TILE_TYPE_619 + VVV_0, // TILE_TYPE_620 + VVV_41, // TILE_TYPE_621 + VVV_0, // TILE_TYPE_622 + VVV_0, // TILE_TYPE_623 + VVV_41, // TILE_TYPE_624 + VVV_40, // TILE_TYPE_625 + VVV_0, // TILE_TYPE_626 + VVV_0, // TILE_TYPE_627 + VVV_0, // TILE_TYPE_628 + VVV_0, // TILE_TYPE_629 + VVV_0, // TILE_TYPE_630 + VVV_86, // TILE_TYPE_631 + VVV_0, // TILE_TYPE_632 + VVV_0, // TILE_TYPE_633 + VVV_86, // TILE_TYPE_634 + VVV_0, // TILE_TYPE_635 + VVV_0, // TILE_TYPE_636 + VVV_41, // TILE_TYPE_637 + VVV_0, // TILE_TYPE_638 + VVV_0, // TILE_TYPE_639 + VVV_41, // TILE_TYPE_640 + VVV_40, // TILE_TYPE_641 + VVV_0, // TILE_TYPE_642 + VVV_0, // TILE_TYPE_643 + VVV_0, // TILE_TYPE_644 + VVV_0, // TILE_TYPE_645 + VVV_0, // TILE_TYPE_646 + VVV_86, // TILE_TYPE_647 + VVV_0, // TILE_TYPE_648 + VVV_0, // TILE_TYPE_649 + VVV_86, // TILE_TYPE_650 + VVV_0, // TILE_TYPE_651 + VVV_0, // TILE_TYPE_652 #ifdef EU - VVV_0, // META_TILE_TYPE_653 + VVV_0, // TILE_TYPE_653 #else - VVV_41, // META_TILE_TYPE_653 + VVV_41, // TILE_TYPE_653 #endif - VVV_0, // META_TILE_TYPE_654 - VVV_0, // META_TILE_TYPE_655 + VVV_0, // TILE_TYPE_654 + VVV_0, // TILE_TYPE_655 #ifdef EU - VVV_0, // META_TILE_TYPE_656 + VVV_0, // TILE_TYPE_656 #else - VVV_41, // META_TILE_TYPE_656 + VVV_41, // TILE_TYPE_656 #endif - VVV_40, // META_TILE_TYPE_657 - VVV_0, // META_TILE_TYPE_658 - VVV_0, // META_TILE_TYPE_659 - VVV_0, // META_TILE_TYPE_660 - VVV_0, // META_TILE_TYPE_661 - VVV_86, // META_TILE_TYPE_662 - VVV_86, // META_TILE_TYPE_663 - VVV_86, // META_TILE_TYPE_664 - VVV_86, // META_TILE_TYPE_665 - VVV_86, // META_TILE_TYPE_666 - VVV_86, // META_TILE_TYPE_667 - VVV_86, // META_TILE_TYPE_668 - VVV_86, // META_TILE_TYPE_669 - VVV_86, // META_TILE_TYPE_670 - VVV_86, // META_TILE_TYPE_671 - VVV_86, // META_TILE_TYPE_672 - VVV_86, // META_TILE_TYPE_673 - VVV_86, // META_TILE_TYPE_674 - VVV_86, // META_TILE_TYPE_675 - VVV_86, // META_TILE_TYPE_676 - VVV_86, // META_TILE_TYPE_677 - VVV_86, // META_TILE_TYPE_678 - VVV_86, // META_TILE_TYPE_679 - VVV_86, // META_TILE_TYPE_680 - VVV_86, // META_TILE_TYPE_681 - VVV_86, // META_TILE_TYPE_682 - VVV_86, // META_TILE_TYPE_683 - VVV_86, // META_TILE_TYPE_684 - VVV_86, // META_TILE_TYPE_685 - VVV_86, // META_TILE_TYPE_686 - VVV_86, // META_TILE_TYPE_687 - VVV_86, // META_TILE_TYPE_688 - VVV_86, // META_TILE_TYPE_689 - VVV_86, // META_TILE_TYPE_690 - VVV_86, // META_TILE_TYPE_691 - VVV_86, // META_TILE_TYPE_692 - VVV_86, // META_TILE_TYPE_693 - VVV_86, // META_TILE_TYPE_694 - VVV_86, // META_TILE_TYPE_695 - VVV_86, // META_TILE_TYPE_696 - VVV_86, // META_TILE_TYPE_697 - VVV_86, // META_TILE_TYPE_698 - VVV_86, // META_TILE_TYPE_699 - VVV_86, // META_TILE_TYPE_700 - VVV_86, // META_TILE_TYPE_701 - VVV_86, // META_TILE_TYPE_702 - VVV_86, // META_TILE_TYPE_703 - VVV_86, // META_TILE_TYPE_704 - VVV_86, // META_TILE_TYPE_705 - VVV_86, // META_TILE_TYPE_706 - VVV_86, // META_TILE_TYPE_707 - VVV_86, // META_TILE_TYPE_708 - VVV_86, // META_TILE_TYPE_709 - VVV_86, // META_TILE_TYPE_710 - VVV_86, // META_TILE_TYPE_711 - VVV_86, // META_TILE_TYPE_712 - VVV_86, // META_TILE_TYPE_713 - VVV_86, // META_TILE_TYPE_714 - VVV_86, // META_TILE_TYPE_715 - VVV_86, // META_TILE_TYPE_716 - VVV_86, // META_TILE_TYPE_717 - VVV_86, // META_TILE_TYPE_718 - VVV_86, // META_TILE_TYPE_719 - VVV_86, // META_TILE_TYPE_720 - VVV_86, // META_TILE_TYPE_721 - VVV_86, // META_TILE_TYPE_722 - VVV_86, // META_TILE_TYPE_723 - VVV_86, // META_TILE_TYPE_724 - VVV_86, // META_TILE_TYPE_725 - VVV_86, // META_TILE_TYPE_726 - VVV_86, // META_TILE_TYPE_727 - VVV_86, // META_TILE_TYPE_728 - VVV_86, // META_TILE_TYPE_729 - VVV_86, // META_TILE_TYPE_730 - VVV_86, // META_TILE_TYPE_731 - VVV_86, // META_TILE_TYPE_732 - VVV_86, // META_TILE_TYPE_733 - VVV_86, // META_TILE_TYPE_734 - VVV_86, // META_TILE_TYPE_735 - VVV_86, // META_TILE_TYPE_736 - VVV_86, // META_TILE_TYPE_737 - VVV_86, // META_TILE_TYPE_738 - VVV_86, // META_TILE_TYPE_739 - VVV_86, // META_TILE_TYPE_740 - VVV_86, // META_TILE_TYPE_741 - VVV_86, // META_TILE_TYPE_742 - VVV_86, // META_TILE_TYPE_743 - VVV_86, // META_TILE_TYPE_744 - VVV_86, // META_TILE_TYPE_745 - VVV_86, // META_TILE_TYPE_746 - VVV_86, // META_TILE_TYPE_747 - VVV_86, // META_TILE_TYPE_748 - VVV_86, // META_TILE_TYPE_749 - VVV_86, // META_TILE_TYPE_750 - VVV_86, // META_TILE_TYPE_751 - VVV_86, // META_TILE_TYPE_752 - VVV_86, // META_TILE_TYPE_753 - VVV_10, // META_TILE_TYPE_754 - VVV_9, // META_TILE_TYPE_755 - VVV_10, // META_TILE_TYPE_756 - VVV_10, // META_TILE_TYPE_757 - VVV_13, // META_TILE_TYPE_758 - VVV_0, // META_TILE_TYPE_759 - VVV_0, // META_TILE_TYPE_760 - VVV_0, // META_TILE_TYPE_761 - VVV_0, // META_TILE_TYPE_762 - VVV_63, // META_TILE_TYPE_763 - VVV_0, // META_TILE_TYPE_764 - VVV_0, // META_TILE_TYPE_765 - VVV_0, // META_TILE_TYPE_766 - VVV_0, // META_TILE_TYPE_767 - VVV_0, // META_TILE_TYPE_768 - VVV_0, // META_TILE_TYPE_769 - VVV_0, // META_TILE_TYPE_770 - VVV_0, // META_TILE_TYPE_771 - VVV_0, // META_TILE_TYPE_772 - VVV_0, // META_TILE_TYPE_773 - VVV_0, // META_TILE_TYPE_774 - VVV_0, // META_TILE_TYPE_775 - VVV_0, // META_TILE_TYPE_776 - VVV_0, // META_TILE_TYPE_777 - VVV_0, // META_TILE_TYPE_778 - VVV_0, // META_TILE_TYPE_779 - VVV_0, // META_TILE_TYPE_780 - VVV_16, // META_TILE_TYPE_781 - VVV_16, // META_TILE_TYPE_782 - VVV_0, // META_TILE_TYPE_783 - VVV_12, // META_TILE_TYPE_784 - VVV_0, // META_TILE_TYPE_785 - VVV_0, // META_TILE_TYPE_786 - VVV_1, // META_TILE_TYPE_787 - VVV_24, // META_TILE_TYPE_788 - VVV_87, // META_TILE_TYPE_789 - VVV_88, // META_TILE_TYPE_790 - VVV_89, // META_TILE_TYPE_791 - VVV_89, // META_TILE_TYPE_792 - VVV_90, // META_TILE_TYPE_793 - VVV_91, // META_TILE_TYPE_794 - VVV_92, // META_TILE_TYPE_795 - VVV_93, // META_TILE_TYPE_796 - VVV_94, // META_TILE_TYPE_797 - VVV_95, // META_TILE_TYPE_798 - VVV_96, // META_TILE_TYPE_799 - VVV_0, // META_TILE_TYPE_800 - VVV_0, // META_TILE_TYPE_801 - VVV_0, // META_TILE_TYPE_802 - VVV_13, // META_TILE_TYPE_803 - VVV_13, // META_TILE_TYPE_804 - VVV_13, // META_TILE_TYPE_805 - VVV_13, // META_TILE_TYPE_806 - VVV_13, // META_TILE_TYPE_807 - VVV_13, // META_TILE_TYPE_808 - VVV_13, // META_TILE_TYPE_809 - VVV_13, // META_TILE_TYPE_810 - VVV_13, // META_TILE_TYPE_811 - VVV_13, // META_TILE_TYPE_812 - VVV_13, // META_TILE_TYPE_813 - VVV_13, // META_TILE_TYPE_814 - VVV_13, // META_TILE_TYPE_815 - VVV_13, // META_TILE_TYPE_816 - VVV_13, // META_TILE_TYPE_817 - VVV_13, // META_TILE_TYPE_818 - VVV_13, // META_TILE_TYPE_819 - VVV_13, // META_TILE_TYPE_820 - VVV_13, // META_TILE_TYPE_821 - VVV_13, // META_TILE_TYPE_822 - VVV_13, // META_TILE_TYPE_823 - VVV_13, // META_TILE_TYPE_824 - VVV_13, // META_TILE_TYPE_825 - VVV_13, // META_TILE_TYPE_826 - VVV_13, // META_TILE_TYPE_827 - VVV_13, // META_TILE_TYPE_828 - VVV_13, // META_TILE_TYPE_829 - VVV_13, // META_TILE_TYPE_830 - VVV_13, // META_TILE_TYPE_831 - VVV_13, // META_TILE_TYPE_832 - VVV_12, // META_TILE_TYPE_833 - VVV_12, // META_TILE_TYPE_834 - VVV_12, // META_TILE_TYPE_835 - VVV_12, // META_TILE_TYPE_836 - VVV_12, // META_TILE_TYPE_837 - VVV_12, // META_TILE_TYPE_838 - VVV_97, // META_TILE_TYPE_839 - VVV_97, // META_TILE_TYPE_840 - VVV_97, // META_TILE_TYPE_841 - VVV_97, // META_TILE_TYPE_842 - VVV_98, // META_TILE_TYPE_843 - VVV_98, // META_TILE_TYPE_844 - VVV_0, // META_TILE_TYPE_845 - VVV_0, // META_TILE_TYPE_846 - VVV_99, // META_TILE_TYPE_847 - VVV_99, // META_TILE_TYPE_848 - VVV_99, // META_TILE_TYPE_849 - VVV_99, // META_TILE_TYPE_850 - VVV_100, // META_TILE_TYPE_851 - VVV_0, // META_TILE_TYPE_852 - VVV_101, // META_TILE_TYPE_853 - VVV_102, // META_TILE_TYPE_854 - VVV_103, // META_TILE_TYPE_855 - VVV_104, // META_TILE_TYPE_856 - VVV_105, // META_TILE_TYPE_857 - VVV_106, // META_TILE_TYPE_858 - VVV_107, // META_TILE_TYPE_859 - VVV_108, // META_TILE_TYPE_860 - VVV_109, // META_TILE_TYPE_861 - VVV_110, // META_TILE_TYPE_862 - VVV_111, // META_TILE_TYPE_863 - VVV_112, // META_TILE_TYPE_864 - VVV_112, // META_TILE_TYPE_865 - VVV_112, // META_TILE_TYPE_866 - VVV_112, // META_TILE_TYPE_867 - VVV_112, // META_TILE_TYPE_868 - VVV_0, // META_TILE_TYPE_869 - VVV_113, // META_TILE_TYPE_870 - VVV_46, // META_TILE_TYPE_871 - VVV_46, // META_TILE_TYPE_872 - VVV_114, // META_TILE_TYPE_873 - VVV_114, // META_TILE_TYPE_874 - VVV_114, // META_TILE_TYPE_875 - VVV_114, // META_TILE_TYPE_876 - VVV_114, // META_TILE_TYPE_877 - VVV_114, // META_TILE_TYPE_878 - VVV_114, // META_TILE_TYPE_879 - VVV_114, // META_TILE_TYPE_880 - VVV_114, // META_TILE_TYPE_881 - VVV_114, // META_TILE_TYPE_882 - VVV_114, // META_TILE_TYPE_883 - VVV_114, // META_TILE_TYPE_884 - VVV_114, // META_TILE_TYPE_885 - VVV_114, // META_TILE_TYPE_886 - VVV_115, // META_TILE_TYPE_887 - VVV_115, // META_TILE_TYPE_888 - VVV_0, // META_TILE_TYPE_889 - VVV_0, // META_TILE_TYPE_890 - VVV_0, // META_TILE_TYPE_891 - VVV_0, // META_TILE_TYPE_892 - VVV_0, // META_TILE_TYPE_893 - VVV_0, // META_TILE_TYPE_894 - VVV_0, // META_TILE_TYPE_895 - VVV_0, // META_TILE_TYPE_896 - VVV_0, // META_TILE_TYPE_897 - VVV_0, // META_TILE_TYPE_898 - VVV_0, // META_TILE_TYPE_899 - VVV_0, // META_TILE_TYPE_900 - VVV_0, // META_TILE_TYPE_901 - VVV_0, // META_TILE_TYPE_902 - VVV_0, // META_TILE_TYPE_903 - VVV_0, // META_TILE_TYPE_904 - VVV_0, // META_TILE_TYPE_905 - VVV_0, // META_TILE_TYPE_906 - VVV_0, // META_TILE_TYPE_907 - VVV_0, // META_TILE_TYPE_908 - VVV_0, // META_TILE_TYPE_909 - VVV_0, // META_TILE_TYPE_910 - VVV_0, // META_TILE_TYPE_911 - VVV_0, // META_TILE_TYPE_912 - VVV_0, // META_TILE_TYPE_913 - VVV_0, // META_TILE_TYPE_914 - VVV_0, // META_TILE_TYPE_915 - VVV_42, // META_TILE_TYPE_916 - VVV_43, // META_TILE_TYPE_917 - VVV_44, // META_TILE_TYPE_918 - VVV_45, // META_TILE_TYPE_919 - VVV_0, // META_TILE_TYPE_920 - VVV_0, // META_TILE_TYPE_921 - VVV_0, // META_TILE_TYPE_922 - VVV_0, // META_TILE_TYPE_923 - VVV_0, // META_TILE_TYPE_924 - VVV_0, // META_TILE_TYPE_925 - VVV_0, // META_TILE_TYPE_926 - VVV_0, // META_TILE_TYPE_927 - VVV_0, // META_TILE_TYPE_928 - VVV_116, // META_TILE_TYPE_929 - VVV_116, // META_TILE_TYPE_930 - VVV_116, // META_TILE_TYPE_931 - VVV_0, // META_TILE_TYPE_932 - VVV_0, // META_TILE_TYPE_933 - VVV_0, // META_TILE_TYPE_934 - VVV_0, // META_TILE_TYPE_935 - VVV_43, // META_TILE_TYPE_936 - VVV_42, // META_TILE_TYPE_937 - VVV_45, // META_TILE_TYPE_938 - VVV_44, // META_TILE_TYPE_939 - VVV_117, // META_TILE_TYPE_940 - VVV_0, // META_TILE_TYPE_941 - VVV_82, // META_TILE_TYPE_942 - VVV_0, // META_TILE_TYPE_943 - VVV_0, // META_TILE_TYPE_944 - VVV_0, // META_TILE_TYPE_945 - VVV_0, // META_TILE_TYPE_946 - VVV_0, // META_TILE_TYPE_947 - VVV_0, // META_TILE_TYPE_948 - VVV_43, // META_TILE_TYPE_949 - VVV_42, // META_TILE_TYPE_950 - VVV_0, // META_TILE_TYPE_951 - VVV_0, // META_TILE_TYPE_952 - VVV_44, // META_TILE_TYPE_953 - VVV_0, // META_TILE_TYPE_954 - VVV_0, // META_TILE_TYPE_955 - VVV_45, // META_TILE_TYPE_956 - VVV_0, // META_TILE_TYPE_957 - VVV_0, // META_TILE_TYPE_958 - VVV_0, // META_TILE_TYPE_959 - VVV_0, // META_TILE_TYPE_960 - VVV_41, // META_TILE_TYPE_961 - VVV_40, // META_TILE_TYPE_962 - VVV_38, // META_TILE_TYPE_963 - VVV_38, // META_TILE_TYPE_964 - VVV_116, // META_TILE_TYPE_965 - VVV_116, // META_TILE_TYPE_966 - VVV_116, // META_TILE_TYPE_967 - VVV_116, // META_TILE_TYPE_968 - VVV_116, // META_TILE_TYPE_969 - VVV_116, // META_TILE_TYPE_970 - VVV_116, // META_TILE_TYPE_971 - VVV_116, // META_TILE_TYPE_972 - VVV_116, // META_TILE_TYPE_973 - VVV_116, // META_TILE_TYPE_974 - VVV_116, // META_TILE_TYPE_975 - VVV_116, // META_TILE_TYPE_976 - VVV_116, // META_TILE_TYPE_977 - VVV_90, // META_TILE_TYPE_978 - VVV_41, // META_TILE_TYPE_979 - VVV_41, // META_TILE_TYPE_980 - VVV_41, // META_TILE_TYPE_981 - VVV_12, // META_TILE_TYPE_982 - VVV_0, // META_TILE_TYPE_983 - VVV_12, // META_TILE_TYPE_984 - VVV_12, // META_TILE_TYPE_985 - VVV_41, // META_TILE_TYPE_986 - VVV_41, // META_TILE_TYPE_987 - VVV_116, // META_TILE_TYPE_988 - VVV_0, // META_TILE_TYPE_989 - VVV_0, // META_TILE_TYPE_990 - VVV_10, // META_TILE_TYPE_991 - VVV_0, // META_TILE_TYPE_992 - VVV_0, // META_TILE_TYPE_993 - VVV_0, // META_TILE_TYPE_994 - VVV_0, // META_TILE_TYPE_995 - VVV_0, // META_TILE_TYPE_996 - VVV_0, // META_TILE_TYPE_997 - VVV_40, // META_TILE_TYPE_998 - VVV_0, // META_TILE_TYPE_999 - VVV_0, // META_TILE_TYPE_1000 - VVV_0, // META_TILE_TYPE_1001 - VVV_40, // META_TILE_TYPE_1002 - VVV_0, // META_TILE_TYPE_1003 - VVV_10, // META_TILE_TYPE_1004 - VVV_10, // META_TILE_TYPE_1005 - VVV_10, // META_TILE_TYPE_1006 - VVV_10, // META_TILE_TYPE_1007 - VVV_10, // META_TILE_TYPE_1008 - VVV_10, // META_TILE_TYPE_1009 - VVV_10, // META_TILE_TYPE_1010 - VVV_40, // META_TILE_TYPE_1011 - VVV_40, // META_TILE_TYPE_1012 - VVV_84, // META_TILE_TYPE_1013 - VVV_84, // META_TILE_TYPE_1014 - VVV_84, // META_TILE_TYPE_1015 - VVV_84, // META_TILE_TYPE_1016 - VVV_0, // META_TILE_TYPE_1017 - VVV_61, // META_TILE_TYPE_1018 - VVV_61, // META_TILE_TYPE_1019 - VVV_61, // META_TILE_TYPE_1020 - VVV_61, // META_TILE_TYPE_1021 - VVV_61, // META_TILE_TYPE_1022 - VVV_61, // META_TILE_TYPE_1023 - VVV_61, // META_TILE_TYPE_1024 - VVV_61, // META_TILE_TYPE_1025 - VVV_62, // META_TILE_TYPE_1026 - VVV_62, // META_TILE_TYPE_1027 - VVV_62, // META_TILE_TYPE_1028 - VVV_62, // META_TILE_TYPE_1029 - VVV_62, // META_TILE_TYPE_1030 - VVV_62, // META_TILE_TYPE_1031 - VVV_62, // META_TILE_TYPE_1032 - VVV_62, // META_TILE_TYPE_1033 - VVV_9, // META_TILE_TYPE_1034 - VVV_9, // META_TILE_TYPE_1035 - VVV_9, // META_TILE_TYPE_1036 - VVV_9, // META_TILE_TYPE_1037 - VVV_9, // META_TILE_TYPE_1038 - VVV_9, // META_TILE_TYPE_1039 - VVV_9, // META_TILE_TYPE_1040 - VVV_9, // META_TILE_TYPE_1041 - VVV_9, // META_TILE_TYPE_1042 - VVV_9, // META_TILE_TYPE_1043 - VVV_9, // META_TILE_TYPE_1044 - VVV_9, // META_TILE_TYPE_1045 - VVV_9, // META_TILE_TYPE_1046 - VVV_9, // META_TILE_TYPE_1047 - VVV_9, // META_TILE_TYPE_1048 - VVV_9, // META_TILE_TYPE_1049 - VVV_9, // META_TILE_TYPE_1050 - VVV_42, // META_TILE_TYPE_1051 - VVV_10, // META_TILE_TYPE_1052 - VVV_10, // META_TILE_TYPE_1053 - VVV_10, // META_TILE_TYPE_1054 - VVV_10, // META_TILE_TYPE_1055 - VVV_10, // META_TILE_TYPE_1056 - VVV_10, // META_TILE_TYPE_1057 - VVV_15, // META_TILE_TYPE_1058 - VVV_10, // META_TILE_TYPE_1059 - VVV_42, // META_TILE_TYPE_1060 - VVV_13, // META_TILE_TYPE_1061 - VVV_0, // META_TILE_TYPE_1062 - VVV_42, // META_TILE_TYPE_1063 - VVV_0, // META_TILE_TYPE_1064 - VVV_0, // META_TILE_TYPE_1065 - VVV_0, // META_TILE_TYPE_1066 - VVV_0, // META_TILE_TYPE_1067 - VVV_16, // META_TILE_TYPE_1068 - VVV_16, // META_TILE_TYPE_1069 - VVV_16, // META_TILE_TYPE_1070 - VVV_16, // META_TILE_TYPE_1071 - VVV_16, // META_TILE_TYPE_1072 - VVV_16, // META_TILE_TYPE_1073 - VVV_16, // META_TILE_TYPE_1074 - VVV_16, // META_TILE_TYPE_1075 - VVV_16, // META_TILE_TYPE_1076 - VVV_9, // META_TILE_TYPE_1077 - VVV_9, // META_TILE_TYPE_1078 - VVV_9, // META_TILE_TYPE_1079 - VVV_56, // META_TILE_TYPE_1080 - VVV_10, // META_TILE_TYPE_1081 - VVV_42, // META_TILE_TYPE_1082 - VVV_0, // META_TILE_TYPE_1083 - VVV_10, // META_TILE_TYPE_1084 - VVV_79, // META_TILE_TYPE_1085 - VVV_77, // META_TILE_TYPE_1086 - VVV_0, // META_TILE_TYPE_1087 - VVV_0, // META_TILE_TYPE_1088 - VVV_0, // META_TILE_TYPE_1089 - VVV_0, // META_TILE_TYPE_1090 - VVV_10, // META_TILE_TYPE_1091 - VVV_0, // META_TILE_TYPE_1092 - VVV_0, // META_TILE_TYPE_1093 - VVV_0, // META_TILE_TYPE_1094 - VVV_78, // META_TILE_TYPE_1095 - VVV_78, // META_TILE_TYPE_1096 - VVV_12, // META_TILE_TYPE_1097 - VVV_12, // META_TILE_TYPE_1098 - VVV_12, // META_TILE_TYPE_1099 - VVV_12, // META_TILE_TYPE_1100 - VVV_61, // META_TILE_TYPE_1101 - VVV_61, // META_TILE_TYPE_1102 - VVV_61, // META_TILE_TYPE_1103 - VVV_40, // META_TILE_TYPE_1104 - VVV_12, // META_TILE_TYPE_1105 - VVV_40, // META_TILE_TYPE_1106 - VVV_10, // META_TILE_TYPE_1107 - VVV_10, // META_TILE_TYPE_1108 - VVV_10, // META_TILE_TYPE_1109 - VVV_0, // META_TILE_TYPE_1110 - VVV_0, // META_TILE_TYPE_1111 - VVV_39, // META_TILE_TYPE_1112 - VVV_39, // META_TILE_TYPE_1113 - VVV_39, // META_TILE_TYPE_1114 - VVV_39, // META_TILE_TYPE_1115 - VVV_39, // META_TILE_TYPE_1116 - VVV_39, // META_TILE_TYPE_1117 - VVV_38, // META_TILE_TYPE_1118 - VVV_38, // META_TILE_TYPE_1119 - VVV_52, // META_TILE_TYPE_1120 - VVV_52, // META_TILE_TYPE_1121 - VVV_12, // META_TILE_TYPE_1122 - VVV_55, // META_TILE_TYPE_1123 - VVV_0, // META_TILE_TYPE_1124 - VVV_0, // META_TILE_TYPE_1125 - VVV_0, // META_TILE_TYPE_1126 - VVV_0, // META_TILE_TYPE_1127 - VVV_0, // META_TILE_TYPE_1128 - VVV_54, // META_TILE_TYPE_1129 - VVV_0, // META_TILE_TYPE_1130 - VVV_0, // META_TILE_TYPE_1131 - VVV_0, // META_TILE_TYPE_1132 - VVV_0, // META_TILE_TYPE_1133 - VVV_40, // META_TILE_TYPE_1134 - VVV_53, // META_TILE_TYPE_1135 - VVV_53, // META_TILE_TYPE_1136 - VVV_40, // META_TILE_TYPE_1137 - VVV_55, // META_TILE_TYPE_1138 - VVV_12, // META_TILE_TYPE_1139 - VVV_0, // META_TILE_TYPE_1140 - VVV_12, // META_TILE_TYPE_1141 - VVV_12, // META_TILE_TYPE_1142 - VVV_12, // META_TILE_TYPE_1143 - VVV_12, // META_TILE_TYPE_1144 - VVV_12, // META_TILE_TYPE_1145 - VVV_54, // META_TILE_TYPE_1146 - VVV_13, // META_TILE_TYPE_1147 - VVV_40, // META_TILE_TYPE_1148 - VVV_0, // META_TILE_TYPE_1149 - VVV_0, // META_TILE_TYPE_1150 - VVV_0, // META_TILE_TYPE_1151 - VVV_52, // META_TILE_TYPE_1152 - VVV_52, // META_TILE_TYPE_1153 - VVV_52, // META_TILE_TYPE_1154 - VVV_10, // META_TILE_TYPE_1155 - VVV_10, // META_TILE_TYPE_1156 - VVV_0, // META_TILE_TYPE_1157 - VVV_0, // META_TILE_TYPE_1158 - VVV_0, // META_TILE_TYPE_1159 - VVV_0, // META_TILE_TYPE_1160 - VVV_40, // META_TILE_TYPE_1161 - VVV_15, // META_TILE_TYPE_1162 - VVV_15, // META_TILE_TYPE_1163 - VVV_51, // META_TILE_TYPE_1164 - VVV_16, // META_TILE_TYPE_1165 - VVV_10, // META_TILE_TYPE_1166 - VVV_10, // META_TILE_TYPE_1167 - VVV_16, // META_TILE_TYPE_1168 - VVV_16, // META_TILE_TYPE_1169 - VVV_10, // META_TILE_TYPE_1170 - VVV_10, // META_TILE_TYPE_1171 - VVV_10, // META_TILE_TYPE_1172 - VVV_10, // META_TILE_TYPE_1173 - VVV_0, // META_TILE_TYPE_1174 - VVV_0, // META_TILE_TYPE_1175 - VVV_15, // META_TILE_TYPE_1176 - VVV_9, // META_TILE_TYPE_1177 - VVV_14, // META_TILE_TYPE_1178 - VVV_15, // META_TILE_TYPE_1179 - VVV_14, // META_TILE_TYPE_1180 - VVV_15, // META_TILE_TYPE_1181 - VVV_15, // META_TILE_TYPE_1182 - VVV_15, // META_TILE_TYPE_1183 - VVV_0, // META_TILE_TYPE_1184 - VVV_0, // META_TILE_TYPE_1185 - VVV_0, // META_TILE_TYPE_1186 - VVV_0, // META_TILE_TYPE_1187 - VVV_0, // META_TILE_TYPE_1188 - VVV_0, // META_TILE_TYPE_1189 - VVV_0, // META_TILE_TYPE_1190 - VVV_0, // META_TILE_TYPE_1191 - VVV_0, // META_TILE_TYPE_1192 - VVV_0, // META_TILE_TYPE_1193 - VVV_116, // META_TILE_TYPE_1194 - VVV_116, // META_TILE_TYPE_1195 - VVV_116, // META_TILE_TYPE_1196 - VVV_116, // META_TILE_TYPE_1197 - VVV_116, // META_TILE_TYPE_1198 - VVV_116, // META_TILE_TYPE_1199 - VVV_116, // META_TILE_TYPE_1200 - VVV_116, // META_TILE_TYPE_1201 - VVV_116, // META_TILE_TYPE_1202 - VVV_116, // META_TILE_TYPE_1203 - VVV_116, // META_TILE_TYPE_1204 - VVV_116, // META_TILE_TYPE_1205 - VVV_116, // META_TILE_TYPE_1206 - VVV_15, // META_TILE_TYPE_1207 - VVV_40, // META_TILE_TYPE_1208 - VVV_15, // META_TILE_TYPE_1209 - VVV_40, // META_TILE_TYPE_1210 - VVV_40, // META_TILE_TYPE_1211 - VVV_15, // META_TILE_TYPE_1212 - VVV_12, // META_TILE_TYPE_1213 - VVV_12, // META_TILE_TYPE_1214 - VVV_12, // META_TILE_TYPE_1215 - VVV_12, // META_TILE_TYPE_1216 - VVV_12, // META_TILE_TYPE_1217 - VVV_25, // META_TILE_TYPE_1218 - VVV_40, // META_TILE_TYPE_1219 - VVV_40, // META_TILE_TYPE_1220 - VVV_40, // META_TILE_TYPE_1221 - VVV_0, // META_TILE_TYPE_1222 - VVV_16, // META_TILE_TYPE_1223 - VVV_16, // META_TILE_TYPE_1224 - VVV_116, // META_TILE_TYPE_1225 - VVV_0, // META_TILE_TYPE_1226 - VVV_0, // META_TILE_TYPE_1227 - VVV_12, // META_TILE_TYPE_1228 - VVV_45, // META_TILE_TYPE_1229 - VVV_0, // META_TILE_TYPE_1230 - VVV_40, // META_TILE_TYPE_1231 - VVV_40, // META_TILE_TYPE_1232 - VVV_43, // META_TILE_TYPE_1233 - VVV_25, // META_TILE_TYPE_1234 - VVV_0, // META_TILE_TYPE_1235 - VVV_10, // META_TILE_TYPE_1236 - VVV_0, // META_TILE_TYPE_1237 - VVV_40, // META_TILE_TYPE_1238 - VVV_0, // META_TILE_TYPE_1239 - VVV_43, // META_TILE_TYPE_1240 - VVV_43, // META_TILE_TYPE_1241 - VVV_43, // META_TILE_TYPE_1242 - VVV_0, // META_TILE_TYPE_1243 - VVV_42, // META_TILE_TYPE_1244 - VVV_42, // META_TILE_TYPE_1245 - VVV_42, // META_TILE_TYPE_1246 - VVV_42, // META_TILE_TYPE_1247 - VVV_0, // META_TILE_TYPE_1248 - VVV_116, // META_TILE_TYPE_1249 - VVV_116, // META_TILE_TYPE_1250 - VVV_116, // META_TILE_TYPE_1251 - VVV_116, // META_TILE_TYPE_1252 - VVV_116, // META_TILE_TYPE_1253 - VVV_116, // META_TILE_TYPE_1254 - VVV_116, // META_TILE_TYPE_1255 - VVV_116, // META_TILE_TYPE_1256 - VVV_116, // META_TILE_TYPE_1257 - VVV_116, // META_TILE_TYPE_1258 - VVV_116, // META_TILE_TYPE_1259 - VVV_44, // META_TILE_TYPE_1260 - VVV_42, // META_TILE_TYPE_1261 - VVV_42, // META_TILE_TYPE_1262 - VVV_0, // META_TILE_TYPE_1263 - VVV_38, // META_TILE_TYPE_1264 - VVV_38, // META_TILE_TYPE_1265 - VVV_0, // META_TILE_TYPE_1266 - VVV_0, // META_TILE_TYPE_1267 - VVV_0, // META_TILE_TYPE_1268 - VVV_0, // META_TILE_TYPE_1269 - VVV_0, // META_TILE_TYPE_1270 - VVV_0, // META_TILE_TYPE_1271 - VVV_0, // META_TILE_TYPE_1272 - VVV_0, // META_TILE_TYPE_1273 - VVV_0, // META_TILE_TYPE_1274 - VVV_63, // META_TILE_TYPE_1275 - VVV_83, // META_TILE_TYPE_1276 - VVV_0, // META_TILE_TYPE_1277 - VVV_0, // META_TILE_TYPE_1278 - VVV_0, // META_TILE_TYPE_1279 - VVV_0, // META_TILE_TYPE_1280 - VVV_38, // META_TILE_TYPE_1281 - VVV_38, // META_TILE_TYPE_1282 - VVV_40, // META_TILE_TYPE_1283 - VVV_12, // META_TILE_TYPE_1284 - VVV_12, // META_TILE_TYPE_1285 - VVV_12, // META_TILE_TYPE_1286 - VVV_12, // META_TILE_TYPE_1287 - VVV_12, // META_TILE_TYPE_1288 - VVV_12, // META_TILE_TYPE_1289 - VVV_12, // META_TILE_TYPE_1290 - VVV_12, // META_TILE_TYPE_1291 - VVV_12, // META_TILE_TYPE_1292 - VVV_12, // META_TILE_TYPE_1293 - VVV_12, // META_TILE_TYPE_1294 - VVV_41, // META_TILE_TYPE_1295 - VVV_41, // META_TILE_TYPE_1296 - VVV_38, // META_TILE_TYPE_1297 - VVV_38, // META_TILE_TYPE_1298 - VVV_12, // META_TILE_TYPE_1299 - VVV_12, // META_TILE_TYPE_1300 - VVV_41, // META_TILE_TYPE_1301 - VVV_41, // META_TILE_TYPE_1302 - VVV_12, // META_TILE_TYPE_1303 - VVV_12, // META_TILE_TYPE_1304 - VVV_116, // META_TILE_TYPE_1305 - VVV_116, // META_TILE_TYPE_1306 - VVV_116, // META_TILE_TYPE_1307 - VVV_116, // META_TILE_TYPE_1308 - VVV_116, // META_TILE_TYPE_1309 - VVV_0, // META_TILE_TYPE_1310 - VVV_0, // META_TILE_TYPE_1311 - VVV_40, // META_TILE_TYPE_1312 - VVV_0, // META_TILE_TYPE_1313 - VVV_0, // META_TILE_TYPE_1314 - VVV_43, // META_TILE_TYPE_1315 - VVV_42, // META_TILE_TYPE_1316 - VVV_0, // META_TILE_TYPE_1317 - VVV_0, // META_TILE_TYPE_1318 - VVV_44, // META_TILE_TYPE_1319 - VVV_13, // META_TILE_TYPE_1320 - VVV_40, // META_TILE_TYPE_1321 - VVV_40, // META_TILE_TYPE_1322 - VVV_42, // META_TILE_TYPE_1323 - VVV_44, // META_TILE_TYPE_1324 - VVV_45, // META_TILE_TYPE_1325 - VVV_44, // META_TILE_TYPE_1326 - VVV_45, // META_TILE_TYPE_1327 - VVV_44, // META_TILE_TYPE_1328 - VVV_45, // META_TILE_TYPE_1329 - VVV_42, // META_TILE_TYPE_1330 - VVV_42, // META_TILE_TYPE_1331 - VVV_42, // META_TILE_TYPE_1332 - VVV_43, // META_TILE_TYPE_1333 - VVV_43, // META_TILE_TYPE_1334 - VVV_43, // META_TILE_TYPE_1335 - VVV_100, // META_TILE_TYPE_1336 - VVV_101, // META_TILE_TYPE_1337 - VVV_104, // META_TILE_TYPE_1338 - VVV_106, // META_TILE_TYPE_1339 - VVV_102, // META_TILE_TYPE_1340 - VVV_107, // META_TILE_TYPE_1341 - VVV_105, // META_TILE_TYPE_1342 - VVV_103, // META_TILE_TYPE_1343 - VVV_0, // META_TILE_TYPE_1344 - VVV_14, // META_TILE_TYPE_1345 - VVV_14, // META_TILE_TYPE_1346 - VVV_41, // META_TILE_TYPE_1347 - VVV_40, // META_TILE_TYPE_1348 + VVV_40, // TILE_TYPE_657 + VVV_0, // TILE_TYPE_658 + VVV_0, // TILE_TYPE_659 + VVV_0, // TILE_TYPE_660 + VVV_0, // TILE_TYPE_661 + VVV_86, // TILE_TYPE_662 + VVV_86, // TILE_TYPE_663 + VVV_86, // TILE_TYPE_664 + VVV_86, // TILE_TYPE_665 + VVV_86, // TILE_TYPE_666 + VVV_86, // TILE_TYPE_667 + VVV_86, // TILE_TYPE_668 + VVV_86, // TILE_TYPE_669 + VVV_86, // TILE_TYPE_670 + VVV_86, // TILE_TYPE_671 + VVV_86, // TILE_TYPE_672 + VVV_86, // TILE_TYPE_673 + VVV_86, // TILE_TYPE_674 + VVV_86, // TILE_TYPE_675 + VVV_86, // TILE_TYPE_676 + VVV_86, // TILE_TYPE_677 + VVV_86, // TILE_TYPE_678 + VVV_86, // TILE_TYPE_679 + VVV_86, // TILE_TYPE_680 + VVV_86, // TILE_TYPE_681 + VVV_86, // TILE_TYPE_682 + VVV_86, // TILE_TYPE_683 + VVV_86, // TILE_TYPE_684 + VVV_86, // TILE_TYPE_685 + VVV_86, // TILE_TYPE_686 + VVV_86, // TILE_TYPE_687 + VVV_86, // TILE_TYPE_688 + VVV_86, // TILE_TYPE_689 + VVV_86, // TILE_TYPE_690 + VVV_86, // TILE_TYPE_691 + VVV_86, // TILE_TYPE_692 + VVV_86, // TILE_TYPE_693 + VVV_86, // TILE_TYPE_694 + VVV_86, // TILE_TYPE_695 + VVV_86, // TILE_TYPE_696 + VVV_86, // TILE_TYPE_697 + VVV_86, // TILE_TYPE_698 + VVV_86, // TILE_TYPE_699 + VVV_86, // TILE_TYPE_700 + VVV_86, // TILE_TYPE_701 + VVV_86, // TILE_TYPE_702 + VVV_86, // TILE_TYPE_703 + VVV_86, // TILE_TYPE_704 + VVV_86, // TILE_TYPE_705 + VVV_86, // TILE_TYPE_706 + VVV_86, // TILE_TYPE_707 + VVV_86, // TILE_TYPE_708 + VVV_86, // TILE_TYPE_709 + VVV_86, // TILE_TYPE_710 + VVV_86, // TILE_TYPE_711 + VVV_86, // TILE_TYPE_712 + VVV_86, // TILE_TYPE_713 + VVV_86, // TILE_TYPE_714 + VVV_86, // TILE_TYPE_715 + VVV_86, // TILE_TYPE_716 + VVV_86, // TILE_TYPE_717 + VVV_86, // TILE_TYPE_718 + VVV_86, // TILE_TYPE_719 + VVV_86, // TILE_TYPE_720 + VVV_86, // TILE_TYPE_721 + VVV_86, // TILE_TYPE_722 + VVV_86, // TILE_TYPE_723 + VVV_86, // TILE_TYPE_724 + VVV_86, // TILE_TYPE_725 + VVV_86, // TILE_TYPE_726 + VVV_86, // TILE_TYPE_727 + VVV_86, // TILE_TYPE_728 + VVV_86, // TILE_TYPE_729 + VVV_86, // TILE_TYPE_730 + VVV_86, // TILE_TYPE_731 + VVV_86, // TILE_TYPE_732 + VVV_86, // TILE_TYPE_733 + VVV_86, // TILE_TYPE_734 + VVV_86, // TILE_TYPE_735 + VVV_86, // TILE_TYPE_736 + VVV_86, // TILE_TYPE_737 + VVV_86, // TILE_TYPE_738 + VVV_86, // TILE_TYPE_739 + VVV_86, // TILE_TYPE_740 + VVV_86, // TILE_TYPE_741 + VVV_86, // TILE_TYPE_742 + VVV_86, // TILE_TYPE_743 + VVV_86, // TILE_TYPE_744 + VVV_86, // TILE_TYPE_745 + VVV_86, // TILE_TYPE_746 + VVV_86, // TILE_TYPE_747 + VVV_86, // TILE_TYPE_748 + VVV_86, // TILE_TYPE_749 + VVV_86, // TILE_TYPE_750 + VVV_86, // TILE_TYPE_751 + VVV_86, // TILE_TYPE_752 + VVV_86, // TILE_TYPE_753 + VVV_10, // TILE_TYPE_754 + VVV_9, // TILE_TYPE_755 + VVV_10, // TILE_TYPE_756 + VVV_10, // TILE_TYPE_757 + VVV_13, // TILE_TYPE_758 + VVV_0, // TILE_TYPE_759 + VVV_0, // TILE_TYPE_760 + VVV_0, // TILE_TYPE_761 + VVV_0, // TILE_TYPE_762 + VVV_63, // TILE_TYPE_763 + VVV_0, // TILE_TYPE_764 + VVV_0, // TILE_TYPE_765 + VVV_0, // TILE_TYPE_766 + VVV_0, // TILE_TYPE_767 + VVV_0, // TILE_TYPE_768 + VVV_0, // TILE_TYPE_769 + VVV_0, // TILE_TYPE_770 + VVV_0, // TILE_TYPE_771 + VVV_0, // TILE_TYPE_772 + VVV_0, // TILE_TYPE_773 + VVV_0, // TILE_TYPE_774 + VVV_0, // TILE_TYPE_775 + VVV_0, // TILE_TYPE_776 + VVV_0, // TILE_TYPE_777 + VVV_0, // TILE_TYPE_778 + VVV_0, // TILE_TYPE_779 + VVV_0, // TILE_TYPE_780 + VVV_16, // TILE_TYPE_781 + VVV_16, // TILE_TYPE_782 + VVV_0, // TILE_TYPE_783 + VVV_12, // TILE_TYPE_784 + VVV_0, // TILE_TYPE_785 + VVV_0, // TILE_TYPE_786 + VVV_1, // TILE_TYPE_787 + VVV_24, // TILE_TYPE_788 + VVV_87, // TILE_TYPE_789 + VVV_88, // TILE_TYPE_790 + VVV_89, // TILE_TYPE_791 + VVV_89, // TILE_TYPE_792 + VVV_90, // TILE_TYPE_793 + VVV_91, // TILE_TYPE_794 + VVV_92, // TILE_TYPE_795 + VVV_93, // TILE_TYPE_796 + VVV_94, // TILE_TYPE_797 + VVV_95, // TILE_TYPE_798 + VVV_96, // TILE_TYPE_799 + VVV_0, // TILE_TYPE_800 + VVV_0, // TILE_TYPE_801 + VVV_0, // TILE_TYPE_802 + VVV_13, // TILE_TYPE_803 + VVV_13, // TILE_TYPE_804 + VVV_13, // TILE_TYPE_805 + VVV_13, // TILE_TYPE_806 + VVV_13, // TILE_TYPE_807 + VVV_13, // TILE_TYPE_808 + VVV_13, // TILE_TYPE_809 + VVV_13, // TILE_TYPE_810 + VVV_13, // TILE_TYPE_811 + VVV_13, // TILE_TYPE_812 + VVV_13, // TILE_TYPE_813 + VVV_13, // TILE_TYPE_814 + VVV_13, // TILE_TYPE_815 + VVV_13, // TILE_TYPE_816 + VVV_13, // TILE_TYPE_817 + VVV_13, // TILE_TYPE_818 + VVV_13, // TILE_TYPE_819 + VVV_13, // TILE_TYPE_820 + VVV_13, // TILE_TYPE_821 + VVV_13, // TILE_TYPE_822 + VVV_13, // TILE_TYPE_823 + VVV_13, // TILE_TYPE_824 + VVV_13, // TILE_TYPE_825 + VVV_13, // TILE_TYPE_826 + VVV_13, // TILE_TYPE_827 + VVV_13, // TILE_TYPE_828 + VVV_13, // TILE_TYPE_829 + VVV_13, // TILE_TYPE_830 + VVV_13, // TILE_TYPE_831 + VVV_13, // TILE_TYPE_832 + VVV_12, // TILE_TYPE_833 + VVV_12, // TILE_TYPE_834 + VVV_12, // TILE_TYPE_835 + VVV_12, // TILE_TYPE_836 + VVV_12, // TILE_TYPE_837 + VVV_12, // TILE_TYPE_838 + VVV_97, // TILE_TYPE_839 + VVV_97, // TILE_TYPE_840 + VVV_97, // TILE_TYPE_841 + VVV_97, // TILE_TYPE_842 + VVV_98, // TILE_TYPE_843 + VVV_98, // TILE_TYPE_844 + VVV_0, // TILE_TYPE_845 + VVV_0, // TILE_TYPE_846 + VVV_99, // TILE_TYPE_847 + VVV_99, // TILE_TYPE_848 + VVV_99, // TILE_TYPE_849 + VVV_99, // TILE_TYPE_850 + VVV_100, // TILE_TYPE_851 + VVV_0, // TILE_TYPE_852 + VVV_101, // TILE_TYPE_853 + VVV_102, // TILE_TYPE_854 + VVV_103, // TILE_TYPE_855 + VVV_104, // TILE_TYPE_856 + VVV_105, // TILE_TYPE_857 + VVV_106, // TILE_TYPE_858 + VVV_107, // TILE_TYPE_859 + VVV_108, // TILE_TYPE_860 + VVV_109, // TILE_TYPE_861 + VVV_110, // TILE_TYPE_862 + VVV_111, // TILE_TYPE_863 + VVV_112, // TILE_TYPE_864 + VVV_112, // TILE_TYPE_865 + VVV_112, // TILE_TYPE_866 + VVV_112, // TILE_TYPE_867 + VVV_112, // TILE_TYPE_868 + VVV_0, // TILE_TYPE_869 + VVV_113, // TILE_TYPE_870 + VVV_46, // TILE_TYPE_871 + VVV_46, // TILE_TYPE_872 + VVV_114, // TILE_TYPE_873 + VVV_114, // TILE_TYPE_874 + VVV_114, // TILE_TYPE_875 + VVV_114, // TILE_TYPE_876 + VVV_114, // TILE_TYPE_877 + VVV_114, // TILE_TYPE_878 + VVV_114, // TILE_TYPE_879 + VVV_114, // TILE_TYPE_880 + VVV_114, // TILE_TYPE_881 + VVV_114, // TILE_TYPE_882 + VVV_114, // TILE_TYPE_883 + VVV_114, // TILE_TYPE_884 + VVV_114, // TILE_TYPE_885 + VVV_114, // TILE_TYPE_886 + VVV_115, // TILE_TYPE_887 + VVV_115, // TILE_TYPE_888 + VVV_0, // TILE_TYPE_889 + VVV_0, // TILE_TYPE_890 + VVV_0, // TILE_TYPE_891 + VVV_0, // TILE_TYPE_892 + VVV_0, // TILE_TYPE_893 + VVV_0, // TILE_TYPE_894 + VVV_0, // TILE_TYPE_895 + VVV_0, // TILE_TYPE_896 + VVV_0, // TILE_TYPE_897 + VVV_0, // TILE_TYPE_898 + VVV_0, // TILE_TYPE_899 + VVV_0, // TILE_TYPE_900 + VVV_0, // TILE_TYPE_901 + VVV_0, // TILE_TYPE_902 + VVV_0, // TILE_TYPE_903 + VVV_0, // TILE_TYPE_904 + VVV_0, // TILE_TYPE_905 + VVV_0, // TILE_TYPE_906 + VVV_0, // TILE_TYPE_907 + VVV_0, // TILE_TYPE_908 + VVV_0, // TILE_TYPE_909 + VVV_0, // TILE_TYPE_910 + VVV_0, // TILE_TYPE_911 + VVV_0, // TILE_TYPE_912 + VVV_0, // TILE_TYPE_913 + VVV_0, // TILE_TYPE_914 + VVV_0, // TILE_TYPE_915 + VVV_42, // TILE_TYPE_916 + VVV_43, // TILE_TYPE_917 + VVV_44, // TILE_TYPE_918 + VVV_45, // TILE_TYPE_919 + VVV_0, // TILE_TYPE_920 + VVV_0, // TILE_TYPE_921 + VVV_0, // TILE_TYPE_922 + VVV_0, // TILE_TYPE_923 + VVV_0, // TILE_TYPE_924 + VVV_0, // TILE_TYPE_925 + VVV_0, // TILE_TYPE_926 + VVV_0, // TILE_TYPE_927 + VVV_0, // TILE_TYPE_928 + VVV_116, // TILE_TYPE_929 + VVV_116, // TILE_TYPE_930 + VVV_116, // TILE_TYPE_931 + VVV_0, // TILE_TYPE_932 + VVV_0, // TILE_TYPE_933 + VVV_0, // TILE_TYPE_934 + VVV_0, // TILE_TYPE_935 + VVV_43, // TILE_TYPE_936 + VVV_42, // TILE_TYPE_937 + VVV_45, // TILE_TYPE_938 + VVV_44, // TILE_TYPE_939 + VVV_117, // TILE_TYPE_940 + VVV_0, // TILE_TYPE_941 + VVV_82, // TILE_TYPE_942 + VVV_0, // TILE_TYPE_943 + VVV_0, // TILE_TYPE_944 + VVV_0, // TILE_TYPE_945 + VVV_0, // TILE_TYPE_946 + VVV_0, // TILE_TYPE_947 + VVV_0, // TILE_TYPE_948 + VVV_43, // TILE_TYPE_949 + VVV_42, // TILE_TYPE_950 + VVV_0, // TILE_TYPE_951 + VVV_0, // TILE_TYPE_952 + VVV_44, // TILE_TYPE_953 + VVV_0, // TILE_TYPE_954 + VVV_0, // TILE_TYPE_955 + VVV_45, // TILE_TYPE_956 + VVV_0, // TILE_TYPE_957 + VVV_0, // TILE_TYPE_958 + VVV_0, // TILE_TYPE_959 + VVV_0, // TILE_TYPE_960 + VVV_41, // TILE_TYPE_961 + VVV_40, // TILE_TYPE_962 + VVV_38, // TILE_TYPE_963 + VVV_38, // TILE_TYPE_964 + VVV_116, // TILE_TYPE_965 + VVV_116, // TILE_TYPE_966 + VVV_116, // TILE_TYPE_967 + VVV_116, // TILE_TYPE_968 + VVV_116, // TILE_TYPE_969 + VVV_116, // TILE_TYPE_970 + VVV_116, // TILE_TYPE_971 + VVV_116, // TILE_TYPE_972 + VVV_116, // TILE_TYPE_973 + VVV_116, // TILE_TYPE_974 + VVV_116, // TILE_TYPE_975 + VVV_116, // TILE_TYPE_976 + VVV_116, // TILE_TYPE_977 + VVV_90, // TILE_TYPE_978 + VVV_41, // TILE_TYPE_979 + VVV_41, // TILE_TYPE_980 + VVV_41, // TILE_TYPE_981 + VVV_12, // TILE_TYPE_982 + VVV_0, // TILE_TYPE_983 + VVV_12, // TILE_TYPE_984 + VVV_12, // TILE_TYPE_985 + VVV_41, // TILE_TYPE_986 + VVV_41, // TILE_TYPE_987 + VVV_116, // TILE_TYPE_988 + VVV_0, // TILE_TYPE_989 + VVV_0, // TILE_TYPE_990 + VVV_10, // TILE_TYPE_991 + VVV_0, // TILE_TYPE_992 + VVV_0, // TILE_TYPE_993 + VVV_0, // TILE_TYPE_994 + VVV_0, // TILE_TYPE_995 + VVV_0, // TILE_TYPE_996 + VVV_0, // TILE_TYPE_997 + VVV_40, // TILE_TYPE_998 + VVV_0, // TILE_TYPE_999 + VVV_0, // TILE_TYPE_1000 + VVV_0, // TILE_TYPE_1001 + VVV_40, // TILE_TYPE_1002 + VVV_0, // TILE_TYPE_1003 + VVV_10, // TILE_TYPE_1004 + VVV_10, // TILE_TYPE_1005 + VVV_10, // TILE_TYPE_1006 + VVV_10, // TILE_TYPE_1007 + VVV_10, // TILE_TYPE_1008 + VVV_10, // TILE_TYPE_1009 + VVV_10, // TILE_TYPE_1010 + VVV_40, // TILE_TYPE_1011 + VVV_40, // TILE_TYPE_1012 + VVV_84, // TILE_TYPE_1013 + VVV_84, // TILE_TYPE_1014 + VVV_84, // TILE_TYPE_1015 + VVV_84, // TILE_TYPE_1016 + VVV_0, // TILE_TYPE_1017 + VVV_61, // TILE_TYPE_1018 + VVV_61, // TILE_TYPE_1019 + VVV_61, // TILE_TYPE_1020 + VVV_61, // TILE_TYPE_1021 + VVV_61, // TILE_TYPE_1022 + VVV_61, // TILE_TYPE_1023 + VVV_61, // TILE_TYPE_1024 + VVV_61, // TILE_TYPE_1025 + VVV_62, // TILE_TYPE_1026 + VVV_62, // TILE_TYPE_1027 + VVV_62, // TILE_TYPE_1028 + VVV_62, // TILE_TYPE_1029 + VVV_62, // TILE_TYPE_1030 + VVV_62, // TILE_TYPE_1031 + VVV_62, // TILE_TYPE_1032 + VVV_62, // TILE_TYPE_1033 + VVV_9, // TILE_TYPE_1034 + VVV_9, // TILE_TYPE_1035 + VVV_9, // TILE_TYPE_1036 + VVV_9, // TILE_TYPE_1037 + VVV_9, // TILE_TYPE_1038 + VVV_9, // TILE_TYPE_1039 + VVV_9, // TILE_TYPE_1040 + VVV_9, // TILE_TYPE_1041 + VVV_9, // TILE_TYPE_1042 + VVV_9, // TILE_TYPE_1043 + VVV_9, // TILE_TYPE_1044 + VVV_9, // TILE_TYPE_1045 + VVV_9, // TILE_TYPE_1046 + VVV_9, // TILE_TYPE_1047 + VVV_9, // TILE_TYPE_1048 + VVV_9, // TILE_TYPE_1049 + VVV_9, // TILE_TYPE_1050 + VVV_42, // TILE_TYPE_1051 + VVV_10, // TILE_TYPE_1052 + VVV_10, // TILE_TYPE_1053 + VVV_10, // TILE_TYPE_1054 + VVV_10, // TILE_TYPE_1055 + VVV_10, // TILE_TYPE_1056 + VVV_10, // TILE_TYPE_1057 + VVV_15, // TILE_TYPE_1058 + VVV_10, // TILE_TYPE_1059 + VVV_42, // TILE_TYPE_1060 + VVV_13, // TILE_TYPE_1061 + VVV_0, // TILE_TYPE_1062 + VVV_42, // TILE_TYPE_1063 + VVV_0, // TILE_TYPE_1064 + VVV_0, // TILE_TYPE_1065 + VVV_0, // TILE_TYPE_1066 + VVV_0, // TILE_TYPE_1067 + VVV_16, // TILE_TYPE_1068 + VVV_16, // TILE_TYPE_1069 + VVV_16, // TILE_TYPE_1070 + VVV_16, // TILE_TYPE_1071 + VVV_16, // TILE_TYPE_1072 + VVV_16, // TILE_TYPE_1073 + VVV_16, // TILE_TYPE_1074 + VVV_16, // TILE_TYPE_1075 + VVV_16, // TILE_TYPE_1076 + VVV_9, // TILE_TYPE_1077 + VVV_9, // TILE_TYPE_1078 + VVV_9, // TILE_TYPE_1079 + VVV_56, // TILE_TYPE_1080 + VVV_10, // TILE_TYPE_1081 + VVV_42, // TILE_TYPE_1082 + VVV_0, // TILE_TYPE_1083 + VVV_10, // TILE_TYPE_1084 + VVV_79, // TILE_TYPE_1085 + VVV_77, // TILE_TYPE_1086 + VVV_0, // TILE_TYPE_1087 + VVV_0, // TILE_TYPE_1088 + VVV_0, // TILE_TYPE_1089 + VVV_0, // TILE_TYPE_1090 + VVV_10, // TILE_TYPE_1091 + VVV_0, // TILE_TYPE_1092 + VVV_0, // TILE_TYPE_1093 + VVV_0, // TILE_TYPE_1094 + VVV_78, // TILE_TYPE_1095 + VVV_78, // TILE_TYPE_1096 + VVV_12, // TILE_TYPE_1097 + VVV_12, // TILE_TYPE_1098 + VVV_12, // TILE_TYPE_1099 + VVV_12, // TILE_TYPE_1100 + VVV_61, // TILE_TYPE_1101 + VVV_61, // TILE_TYPE_1102 + VVV_61, // TILE_TYPE_1103 + VVV_40, // TILE_TYPE_1104 + VVV_12, // TILE_TYPE_1105 + VVV_40, // TILE_TYPE_1106 + VVV_10, // TILE_TYPE_1107 + VVV_10, // TILE_TYPE_1108 + VVV_10, // TILE_TYPE_1109 + VVV_0, // TILE_TYPE_1110 + VVV_0, // TILE_TYPE_1111 + VVV_39, // TILE_TYPE_1112 + VVV_39, // TILE_TYPE_1113 + VVV_39, // TILE_TYPE_1114 + VVV_39, // TILE_TYPE_1115 + VVV_39, // TILE_TYPE_1116 + VVV_39, // TILE_TYPE_1117 + VVV_38, // TILE_TYPE_1118 + VVV_38, // TILE_TYPE_1119 + VVV_52, // TILE_TYPE_1120 + VVV_52, // TILE_TYPE_1121 + VVV_12, // TILE_TYPE_1122 + VVV_55, // TILE_TYPE_1123 + VVV_0, // TILE_TYPE_1124 + VVV_0, // TILE_TYPE_1125 + VVV_0, // TILE_TYPE_1126 + VVV_0, // TILE_TYPE_1127 + VVV_0, // TILE_TYPE_1128 + VVV_54, // TILE_TYPE_1129 + VVV_0, // TILE_TYPE_1130 + VVV_0, // TILE_TYPE_1131 + VVV_0, // TILE_TYPE_1132 + VVV_0, // TILE_TYPE_1133 + VVV_40, // TILE_TYPE_1134 + VVV_53, // TILE_TYPE_1135 + VVV_53, // TILE_TYPE_1136 + VVV_40, // TILE_TYPE_1137 + VVV_55, // TILE_TYPE_1138 + VVV_12, // TILE_TYPE_1139 + VVV_0, // TILE_TYPE_1140 + VVV_12, // TILE_TYPE_1141 + VVV_12, // TILE_TYPE_1142 + VVV_12, // TILE_TYPE_1143 + VVV_12, // TILE_TYPE_1144 + VVV_12, // TILE_TYPE_1145 + VVV_54, // TILE_TYPE_1146 + VVV_13, // TILE_TYPE_1147 + VVV_40, // TILE_TYPE_1148 + VVV_0, // TILE_TYPE_1149 + VVV_0, // TILE_TYPE_1150 + VVV_0, // TILE_TYPE_1151 + VVV_52, // TILE_TYPE_1152 + VVV_52, // TILE_TYPE_1153 + VVV_52, // TILE_TYPE_1154 + VVV_10, // TILE_TYPE_1155 + VVV_10, // TILE_TYPE_1156 + VVV_0, // TILE_TYPE_1157 + VVV_0, // TILE_TYPE_1158 + VVV_0, // TILE_TYPE_1159 + VVV_0, // TILE_TYPE_1160 + VVV_40, // TILE_TYPE_1161 + VVV_15, // TILE_TYPE_1162 + VVV_15, // TILE_TYPE_1163 + VVV_51, // TILE_TYPE_1164 + VVV_16, // TILE_TYPE_1165 + VVV_10, // TILE_TYPE_1166 + VVV_10, // TILE_TYPE_1167 + VVV_16, // TILE_TYPE_1168 + VVV_16, // TILE_TYPE_1169 + VVV_10, // TILE_TYPE_1170 + VVV_10, // TILE_TYPE_1171 + VVV_10, // TILE_TYPE_1172 + VVV_10, // TILE_TYPE_1173 + VVV_0, // TILE_TYPE_1174 + VVV_0, // TILE_TYPE_1175 + VVV_15, // TILE_TYPE_1176 + VVV_9, // TILE_TYPE_1177 + VVV_14, // TILE_TYPE_1178 + VVV_15, // TILE_TYPE_1179 + VVV_14, // TILE_TYPE_1180 + VVV_15, // TILE_TYPE_1181 + VVV_15, // TILE_TYPE_1182 + VVV_15, // TILE_TYPE_1183 + VVV_0, // TILE_TYPE_1184 + VVV_0, // TILE_TYPE_1185 + VVV_0, // TILE_TYPE_1186 + VVV_0, // TILE_TYPE_1187 + VVV_0, // TILE_TYPE_1188 + VVV_0, // TILE_TYPE_1189 + VVV_0, // TILE_TYPE_1190 + VVV_0, // TILE_TYPE_1191 + VVV_0, // TILE_TYPE_1192 + VVV_0, // TILE_TYPE_1193 + VVV_116, // TILE_TYPE_1194 + VVV_116, // TILE_TYPE_1195 + VVV_116, // TILE_TYPE_1196 + VVV_116, // TILE_TYPE_1197 + VVV_116, // TILE_TYPE_1198 + VVV_116, // TILE_TYPE_1199 + VVV_116, // TILE_TYPE_1200 + VVV_116, // TILE_TYPE_1201 + VVV_116, // TILE_TYPE_1202 + VVV_116, // TILE_TYPE_1203 + VVV_116, // TILE_TYPE_1204 + VVV_116, // TILE_TYPE_1205 + VVV_116, // TILE_TYPE_1206 + VVV_15, // TILE_TYPE_1207 + VVV_40, // TILE_TYPE_1208 + VVV_15, // TILE_TYPE_1209 + VVV_40, // TILE_TYPE_1210 + VVV_40, // TILE_TYPE_1211 + VVV_15, // TILE_TYPE_1212 + VVV_12, // TILE_TYPE_1213 + VVV_12, // TILE_TYPE_1214 + VVV_12, // TILE_TYPE_1215 + VVV_12, // TILE_TYPE_1216 + VVV_12, // TILE_TYPE_1217 + VVV_25, // TILE_TYPE_1218 + VVV_40, // TILE_TYPE_1219 + VVV_40, // TILE_TYPE_1220 + VVV_40, // TILE_TYPE_1221 + VVV_0, // TILE_TYPE_1222 + VVV_16, // TILE_TYPE_1223 + VVV_16, // TILE_TYPE_1224 + VVV_116, // TILE_TYPE_1225 + VVV_0, // TILE_TYPE_1226 + VVV_0, // TILE_TYPE_1227 + VVV_12, // TILE_TYPE_1228 + VVV_45, // TILE_TYPE_1229 + VVV_0, // TILE_TYPE_1230 + VVV_40, // TILE_TYPE_1231 + VVV_40, // TILE_TYPE_1232 + VVV_43, // TILE_TYPE_1233 + VVV_25, // TILE_TYPE_1234 + VVV_0, // TILE_TYPE_1235 + VVV_10, // TILE_TYPE_1236 + VVV_0, // TILE_TYPE_1237 + VVV_40, // TILE_TYPE_1238 + VVV_0, // TILE_TYPE_1239 + VVV_43, // TILE_TYPE_1240 + VVV_43, // TILE_TYPE_1241 + VVV_43, // TILE_TYPE_1242 + VVV_0, // TILE_TYPE_1243 + VVV_42, // TILE_TYPE_1244 + VVV_42, // TILE_TYPE_1245 + VVV_42, // TILE_TYPE_1246 + VVV_42, // TILE_TYPE_1247 + VVV_0, // TILE_TYPE_1248 + VVV_116, // TILE_TYPE_1249 + VVV_116, // TILE_TYPE_1250 + VVV_116, // TILE_TYPE_1251 + VVV_116, // TILE_TYPE_1252 + VVV_116, // TILE_TYPE_1253 + VVV_116, // TILE_TYPE_1254 + VVV_116, // TILE_TYPE_1255 + VVV_116, // TILE_TYPE_1256 + VVV_116, // TILE_TYPE_1257 + VVV_116, // TILE_TYPE_1258 + VVV_116, // TILE_TYPE_1259 + VVV_44, // TILE_TYPE_1260 + VVV_42, // TILE_TYPE_1261 + VVV_42, // TILE_TYPE_1262 + VVV_0, // TILE_TYPE_1263 + VVV_38, // TILE_TYPE_1264 + VVV_38, // TILE_TYPE_1265 + VVV_0, // TILE_TYPE_1266 + VVV_0, // TILE_TYPE_1267 + VVV_0, // TILE_TYPE_1268 + VVV_0, // TILE_TYPE_1269 + VVV_0, // TILE_TYPE_1270 + VVV_0, // TILE_TYPE_1271 + VVV_0, // TILE_TYPE_1272 + VVV_0, // TILE_TYPE_1273 + VVV_0, // TILE_TYPE_1274 + VVV_63, // TILE_TYPE_1275 + VVV_83, // TILE_TYPE_1276 + VVV_0, // TILE_TYPE_1277 + VVV_0, // TILE_TYPE_1278 + VVV_0, // TILE_TYPE_1279 + VVV_0, // TILE_TYPE_1280 + VVV_38, // TILE_TYPE_1281 + VVV_38, // TILE_TYPE_1282 + VVV_40, // TILE_TYPE_1283 + VVV_12, // TILE_TYPE_1284 + VVV_12, // TILE_TYPE_1285 + VVV_12, // TILE_TYPE_1286 + VVV_12, // TILE_TYPE_1287 + VVV_12, // TILE_TYPE_1288 + VVV_12, // TILE_TYPE_1289 + VVV_12, // TILE_TYPE_1290 + VVV_12, // TILE_TYPE_1291 + VVV_12, // TILE_TYPE_1292 + VVV_12, // TILE_TYPE_1293 + VVV_12, // TILE_TYPE_1294 + VVV_41, // TILE_TYPE_1295 + VVV_41, // TILE_TYPE_1296 + VVV_38, // TILE_TYPE_1297 + VVV_38, // TILE_TYPE_1298 + VVV_12, // TILE_TYPE_1299 + VVV_12, // TILE_TYPE_1300 + VVV_41, // TILE_TYPE_1301 + VVV_41, // TILE_TYPE_1302 + VVV_12, // TILE_TYPE_1303 + VVV_12, // TILE_TYPE_1304 + VVV_116, // TILE_TYPE_1305 + VVV_116, // TILE_TYPE_1306 + VVV_116, // TILE_TYPE_1307 + VVV_116, // TILE_TYPE_1308 + VVV_116, // TILE_TYPE_1309 + VVV_0, // TILE_TYPE_1310 + VVV_0, // TILE_TYPE_1311 + VVV_40, // TILE_TYPE_1312 + VVV_0, // TILE_TYPE_1313 + VVV_0, // TILE_TYPE_1314 + VVV_43, // TILE_TYPE_1315 + VVV_42, // TILE_TYPE_1316 + VVV_0, // TILE_TYPE_1317 + VVV_0, // TILE_TYPE_1318 + VVV_44, // TILE_TYPE_1319 + VVV_13, // TILE_TYPE_1320 + VVV_40, // TILE_TYPE_1321 + VVV_40, // TILE_TYPE_1322 + VVV_42, // TILE_TYPE_1323 + VVV_44, // TILE_TYPE_1324 + VVV_45, // TILE_TYPE_1325 + VVV_44, // TILE_TYPE_1326 + VVV_45, // TILE_TYPE_1327 + VVV_44, // TILE_TYPE_1328 + VVV_45, // TILE_TYPE_1329 + VVV_42, // TILE_TYPE_1330 + VVV_42, // TILE_TYPE_1331 + VVV_42, // TILE_TYPE_1332 + VVV_43, // TILE_TYPE_1333 + VVV_43, // TILE_TYPE_1334 + VVV_43, // TILE_TYPE_1335 + VVV_100, // TILE_TYPE_1336 + VVV_101, // TILE_TYPE_1337 + VVV_104, // TILE_TYPE_1338 + VVV_106, // TILE_TYPE_1339 + VVV_102, // TILE_TYPE_1340 + VVV_107, // TILE_TYPE_1341 + VVV_105, // TILE_TYPE_1342 + VVV_103, // TILE_TYPE_1343 + VVV_0, // TILE_TYPE_1344 + VVV_14, // TILE_TYPE_1345 + VVV_14, // TILE_TYPE_1346 + VVV_41, // TILE_TYPE_1347 + VVV_40, // TILE_TYPE_1348 #ifdef EU - VVV_0, // META_TILE_TYPE_1349 - VVV_0, // META_TILE_TYPE_1350 + VVV_0, // TILE_TYPE_1349 + VVV_0, // TILE_TYPE_1350 #else - VVV_41, // META_TILE_TYPE_1349 - VVV_41, // META_TILE_TYPE_1350 + VVV_41, // TILE_TYPE_1349 + VVV_41, // TILE_TYPE_1350 #endif - VVV_40, // META_TILE_TYPE_1351 + VVV_40, // TILE_TYPE_1351 #ifdef EU - VVV_0, // META_TILE_TYPE_1352 + VVV_0, // TILE_TYPE_1352 #else - VVV_41, // META_TILE_TYPE_1352 + VVV_41, // TILE_TYPE_1352 #endif - VVV_40, // META_TILE_TYPE_1353 + VVV_40, // TILE_TYPE_1353 #ifdef EU - VVV_0, // META_TILE_TYPE_1354 + VVV_0, // TILE_TYPE_1354 #else - VVV_41, // META_TILE_TYPE_1354 + VVV_41, // TILE_TYPE_1354 #endif - VVV_17, // META_TILE_TYPE_1355 - VVV_15, // META_TILE_TYPE_1356 - VVV_0, // META_TILE_TYPE_1357 - VVV_116, // META_TILE_TYPE_1358 - VVV_43, // META_TILE_TYPE_1359 - VVV_63, // META_TILE_TYPE_1360 - VVV_35, // META_TILE_TYPE_1361 - VVV_35, // META_TILE_TYPE_1362 - VVV_35, // META_TILE_TYPE_1363 - VVV_35, // META_TILE_TYPE_1364 - VVV_116, // META_TILE_TYPE_1365 - VVV_116, // META_TILE_TYPE_1366 - VVV_0, // META_TILE_TYPE_1367 - VVV_42, // META_TILE_TYPE_1368 - VVV_42, // META_TILE_TYPE_1369 - VVV_0, // META_TILE_TYPE_1370 - VVV_0, // META_TILE_TYPE_1371 - VVV_0, // META_TILE_TYPE_1372 - VVV_10, // META_TILE_TYPE_1373 - VVV_40, // META_TILE_TYPE_1374 - VVV_40, // META_TILE_TYPE_1375 - VVV_40, // META_TILE_TYPE_1376 - VVV_40, // META_TILE_TYPE_1377 - VVV_40, // META_TILE_TYPE_1378 - VVV_40, // META_TILE_TYPE_1379 - VVV_40, // META_TILE_TYPE_1380 - VVV_40, // META_TILE_TYPE_1381 - VVV_40, // META_TILE_TYPE_1382 - VVV_40, // META_TILE_TYPE_1383 - VVV_40, // META_TILE_TYPE_1384 - VVV_40, // META_TILE_TYPE_1385 - VVV_0, // META_TILE_TYPE_1386 - VVV_0, // META_TILE_TYPE_1387 - VVV_44, // META_TILE_TYPE_1388 - VVV_43, // META_TILE_TYPE_1389 - VVV_40, // META_TILE_TYPE_1390 - VVV_40, // META_TILE_TYPE_1391 - VVV_40, // META_TILE_TYPE_1392 - VVV_116, // META_TILE_TYPE_1393 - VVV_0, // META_TILE_TYPE_1394 - VVV_0, // META_TILE_TYPE_1395 + VVV_17, // TILE_TYPE_1355 + VVV_15, // TILE_TYPE_1356 + VVV_0, // TILE_TYPE_1357 + VVV_116, // TILE_TYPE_1358 + VVV_43, // TILE_TYPE_1359 + VVV_63, // TILE_TYPE_1360 + VVV_35, // TILE_TYPE_1361 + VVV_35, // TILE_TYPE_1362 + VVV_35, // TILE_TYPE_1363 + VVV_35, // TILE_TYPE_1364 + VVV_116, // TILE_TYPE_1365 + VVV_116, // TILE_TYPE_1366 + VVV_0, // TILE_TYPE_1367 + VVV_42, // TILE_TYPE_1368 + VVV_42, // TILE_TYPE_1369 + VVV_0, // TILE_TYPE_1370 + VVV_0, // TILE_TYPE_1371 + VVV_0, // TILE_TYPE_1372 + VVV_10, // TILE_TYPE_1373 + VVV_40, // TILE_TYPE_1374 + VVV_40, // TILE_TYPE_1375 + VVV_40, // TILE_TYPE_1376 + VVV_40, // TILE_TYPE_1377 + VVV_40, // TILE_TYPE_1378 + VVV_40, // TILE_TYPE_1379 + VVV_40, // TILE_TYPE_1380 + VVV_40, // TILE_TYPE_1381 + VVV_40, // TILE_TYPE_1382 + VVV_40, // TILE_TYPE_1383 + VVV_40, // TILE_TYPE_1384 + VVV_40, // TILE_TYPE_1385 + VVV_0, // TILE_TYPE_1386 + VVV_0, // TILE_TYPE_1387 + VVV_44, // TILE_TYPE_1388 + VVV_43, // TILE_TYPE_1389 + VVV_40, // TILE_TYPE_1390 + VVV_40, // TILE_TYPE_1391 + VVV_40, // TILE_TYPE_1392 + VVV_116, // TILE_TYPE_1393 + VVV_0, // TILE_TYPE_1394 + VVV_0, // TILE_TYPE_1395 }; diff --git a/src/common.c b/src/common.c index 4647c6b3..8c863d85 100644 --- a/src/common.c +++ b/src/common.c @@ -503,13 +503,13 @@ void ClearOAM(void) { void ResetScreenRegs(void) { MemClear(&gScreen, sizeof(gScreen)); - gScreen.bg0.tilemap = &gBG0Buffer; + gScreen.bg0.subTileMap = &gBG0Buffer; gScreen.bg0.control = 0x1F0C; - gScreen.bg1.tilemap = &gBG1Buffer; + gScreen.bg1.subTileMap = &gBG1Buffer; gScreen.bg1.control = 0x1C01; - gScreen.bg2.tilemap = &gBG2Buffer; + gScreen.bg2.subTileMap = &gBG2Buffer; gScreen.bg2.control = 0x1D02; - gScreen.bg3.tilemap = &gBG3Buffer; + gScreen.bg3.subTileMap = &gBG3Buffer; gScreen.bg3.control = 0x1E03; gScreen.lcd.displayControl = 0x140; gScreen.lcd.displayControlMask = 0xffff; diff --git a/src/cutscene.c b/src/cutscene.c index 380710a8..ef5a0ef6 100644 --- a/src/cutscene.c +++ b/src/cutscene.c @@ -596,10 +596,10 @@ void sub_08053D34(void) { if (gMenu.field_0xa != 0) { gMenu.field_0xa = 0; if (CheckLocalFlagByBank(FLAG_BANK_7, 0x3d)) { - SetMetaTileType(META_TILE_TYPE_116, TILE_POS(4, 3), LAYER_BOTTOM); + SetTileType(TILE_TYPE_116, TILE_POS(4, 3), LAYER_BOTTOM); } if (CheckLocalFlagByBank(FLAG_BANK_7, 0x3e)) { - SetMetaTileType(META_TILE_TYPE_116, TILE_POS(12, 3), LAYER_BOTTOM); + SetTileType(TILE_TYPE_116, TILE_POS(12, 3), LAYER_BOTTOM); } } if (gFadeControl.active == 0) { diff --git a/src/data/caveBorderMapData.c b/src/data/caveBorderMapData.c index de31603b..692b542d 100644 --- a/src/data/caveBorderMapData.c +++ b/src/data/caveBorderMapData.c @@ -3,9 +3,9 @@ /* Tiles for the borders of the cave that are loaded during the transition. -When the player goes inside a cave during the start of the enter transition the border metatilemap is loaded and at the -end the metatilemap for the cave is loaded. When the player goes out of a cave during the start of the leave transition -the border metatilemap is loaded and at the end the metatilemap for the outside is loaded. +When the player goes inside a cave during the start of the enter transition the border tilemap is loaded and at the +end the tilemap for the cave is loaded. When the player goes out of a cave during the start of the leave transition +the border tilemap is loaded and at the end the tilemap for the outside is loaded. */ const MapDataDefinition gCaveBorder_LakeWoods_enter_start[] = { diff --git a/src/enemy/armos.c b/src/enemy/armos.c index e3145454..5fdcf627 100644 --- a/src/enemy/armos.c +++ b/src/enemy/armos.c @@ -403,18 +403,18 @@ void sub_080307D4(ArmosEntity* this) { } void sub_080307EC(ArmosEntity* this) { - u32 metaTilePos = COORD_TO_TILE(super); - this->unk_78 = GetMetaTileIndex(metaTilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, (u32)super->collisionLayer); + u32 tilePos = COORD_TO_TILE(super); + this->unk_78 = GetTileIndex(tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, (u32)super->collisionLayer); } void sub_08030834(ArmosEntity* this) { - SetMetaTile(this->unk_78, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->unk_78, COORD_TO_TILE(super), super->collisionLayer); } bool32 sub_0803086C(ArmosEntity* this) { u32 uVar2; - u32 metaTilePos; + u32 tilePos; u16 centerY; u16 centerX; FORCE_REGISTER(u32 r2, r2); @@ -424,10 +424,10 @@ bool32 sub_0803086C(ArmosEntity* this) { centerX = super->x.HALF_U.HI - gRoomControls.origin_x; centerY = super->y.HALF_U.HI - gRoomControls.origin_y; // TODO for some reason the 0x3f of COORD_TO_TILE(super) needs to be forced to r2 here. - metaTilePos = ((((((super)->x.HALF.HI) - gRoomControls.origin_x) >> 4) & (r2 = 0x3f)) | + tilePos = ((((((super)->x.HALF.HI) - gRoomControls.origin_x) >> 4) & (r2 = 0x3f)) | (((((super)->y.HALF.HI) - gRoomControls.origin_y) >> 4) & r2) << 6); - if (GetMetaTileType(metaTilePos, super->collisionLayer) == SPECIAL_META_TILE_73) { + if (GetTileType(tilePos, super->collisionLayer) == SPECIAL_TILE_73) { if (CheckPlayerInRegion(centerX, centerY, 2, 0xc) != 0) { if (CheckPlayerInRegion(centerX, centerY - 4, 2, 4) != 0) { gPlayerEntity.base.spritePriority.b0 = 3; @@ -436,11 +436,11 @@ bool32 sub_0803086C(ArmosEntity* this) { return TRUE; } } else { - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); } } else { if (CheckPlayerInRegion(centerX, centerY + 6, 2, 5) != 0) { - SetMetaTile(SPECIAL_META_TILE_73, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_73, COORD_TO_TILE(super), super->collisionLayer); } } } diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c index 71ccd7e2..0178bec3 100644 --- a/src/enemy/bombPeahat.c +++ b/src/enemy/bombPeahat.c @@ -212,7 +212,7 @@ void sub_0802AAC0(BombPeahatEntity* this) { super->child = NULL; #ifdef EU } else if (entity->timer == 0) { - if (GetCollisionDataAtMetaTilePos(COORD_TO_TILE(super), 1) == 0) { + if (GetCollisionDataAtTilePos(COORD_TO_TILE(super), 1) == 0) { if (EntityInRectRadius(super, &gPlayerEntity.base, 0x10, 0x10) && entity->subtimer <= 0x50) { this->unk_81 = 0; } @@ -685,7 +685,7 @@ void sub_0802B204(BombPeahatEntity* this) { bool32 sub_0802B234(BombPeahatEntity* this) { bool32 ret = FALSE; - if (GetMetaTileTypeByEntity(super) - 0x1c4 > 1) + if (GetTileTypeByEntity(super) - 0x1c4 > 1) ret = TRUE; return ret; } diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index f1cd770e..d386672f 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -105,7 +105,7 @@ void BusinessScrub_Action0(BusinessScrubEntity* this) { } else { super->timer = 0; this->unk_76 = COORD_TO_TILE(super); - this->unk_74 = GetMetaTileIndex(this->unk_76, super->collisionLayer); + this->unk_74 = GetTileIndex(this->unk_76, super->collisionLayer); super->hurtType = 0x41; sub_08028FFC(this); } @@ -444,7 +444,7 @@ void sub_08028FFC(BusinessScrubEntity* this) { super->x.HALF.HI = this->unk_78; super->y.HALF.HI = this->unk_7a; InitializeAnimation(super, 0); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_76, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_76, super->collisionLayer); } void sub_08029078(BusinessScrubEntity* this) { @@ -458,7 +458,7 @@ void sub_08029078(BusinessScrubEntity* this) { super->spriteIndex = 0xd0; sub_08028FDC(this); sub_080290E0(this, 1); - SetMetaTile(this->unk_74, this->unk_76, super->collisionLayer); + SetTile(this->unk_74, this->unk_76, super->collisionLayer); } } diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c index 20973723..a558134a 100644 --- a/src/enemy/chuchuBoss.c +++ b/src/enemy/chuchuBoss.c @@ -562,7 +562,7 @@ void sub_080262A8(ChuchuBossEntity* this) { gPlayerEntity.base.animationState = 0; gRoomControls.camera_target = super; gRoomControls.scrollSpeed = 1; - SetMetaTile(SPECIAL_META_TILE_34, TILE_POS(8, 11), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, TILE_POS(8, 11), LAYER_BOTTOM); } } diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c index ca05564e..389237c4 100644 --- a/src/enemy/cloudPiranha.c +++ b/src/enemy/cloudPiranha.c @@ -243,7 +243,7 @@ void sub_080387F0(CloudPiranhaEntity* this) { const s8* ptr; if ((super->action != 4) && (this->unk_82 == 0)) { - collisionData = GetCollisionDataAtMetaTilePos(COORD_TO_TILE(super), super->collisionLayer); + collisionData = GetCollisionDataAtTilePos(COORD_TO_TILE(super), super->collisionLayer); if ((collisionData == COLLISION_DATA_15) || (collisionData == COLLISION_DATA_42)) { this->unk_82 = 0x20; } diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c index b599372f..46972dc8 100644 --- a/src/enemy/doorMimic.c +++ b/src/enemy/doorMimic.c @@ -49,7 +49,7 @@ void DoorMimic_OnCollision(DoorMimicEntity* this) { } void DoorMimic_OnDeath(DoorMimicEntity* this) { - SetMetaTile(this->unk_7c, this->unk_7e, super->collisionLayer); + SetTile(this->unk_7c, this->unk_7e, super->collisionLayer); CreateFx(super, FX_POT_SHATTER, 0); EnemyDisableRespawn(super); DeleteThisEntity(); @@ -125,8 +125,8 @@ void sub_08022198(DoorMimicEntity* this) { void sub_080221C0(DoorMimicEntity* this) { u32 tilePos = COORD_TO_TILE(super) + gUnk_080B4488[super->type2]; this->unk_7e = tilePos; - this->unk_7c = GetMetaTileIndex(tilePos, super->collisionLayer); - SetMetaTile(gUnk_080CB79C[super->type2], tilePos, super->collisionLayer); + this->unk_7c = GetTileIndex(tilePos, super->collisionLayer); + SetTile(gUnk_080CB79C[super->type2], tilePos, super->collisionLayer); } // clang-format off @@ -191,10 +191,10 @@ const PosOffset gUnk_080CB76C[][6] = { }; const u16 gUnk_080CB79C[] = { - SPECIAL_META_TILE_35, - SPECIAL_META_TILE_37, - SPECIAL_META_TILE_38, - SPECIAL_META_TILE_36, + SPECIAL_TILE_35, + SPECIAL_TILE_37, + SPECIAL_TILE_38, + SPECIAL_TILE_36, }; diff --git a/src/enemy/enemy64.c b/src/enemy/enemy64.c index ab8f9ab3..c7e561cd 100644 --- a/src/enemy/enemy64.c +++ b/src/enemy/enemy64.c @@ -86,10 +86,10 @@ void Enemy64_Init(Enemy64Entity* this) { Entity* tail; if (CheckFlags(0x7c)) { - SetMetaTile(SPECIAL_META_TILE_129, TILE_POS(10, 0), LAYER_TOP); - SetMetaTile(SPECIAL_META_TILE_129, TILE_POS(10, 1), LAYER_TOP); - SetMetaTile(SPECIAL_META_TILE_129, TILE_POS(10, 2), LAYER_TOP); - SetMetaTile(SPECIAL_META_TILE_129, TILE_POS(10, 3), LAYER_TOP); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 0), LAYER_TOP); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 1), LAYER_TOP); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 2), LAYER_TOP); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 3), LAYER_TOP); DeleteThisEntity(); } else { sub_0807B7D8(0x323, TILE_POS(10, 0), LAYER_BOTTOM); @@ -441,19 +441,19 @@ void Enemy64_Action4_SubAction7(Enemy64Entity* this) { DeleteThisEntity(); } else if (super->timer == 16) { sub_0807B7D8(0x36, TILE_POS(10, 3), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_129, TILE_POS(10, 3), LAYER_TOP); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 3), LAYER_TOP); SoundReq(SFX_HEART_GET); } else if (super->timer == 24) { sub_0807B7D8(0x36, TILE_POS(10, 2), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_129, TILE_POS(10, 2), LAYER_TOP); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 2), LAYER_TOP); SoundReq(SFX_HEART_GET); } else if (super->timer == 32) { sub_0807B7D8(0x36, TILE_POS(10, 1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_129, TILE_POS(10, 1), LAYER_TOP); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 1), LAYER_TOP); SoundReq(SFX_HEART_GET); } else if (super->timer == 40) { sub_0807B7D8(0x36, TILE_POS(10, 0), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_129, TILE_POS(10, 0), LAYER_TOP); + SetTile(SPECIAL_TILE_129, TILE_POS(10, 0), LAYER_TOP); SoundReq(SFX_HEART_GET); } } diff --git a/src/enemy/eyegore.c b/src/enemy/eyegore.c index c8f03231..cf901307 100644 --- a/src/enemy/eyegore.c +++ b/src/enemy/eyegore.c @@ -34,7 +34,7 @@ typedef struct { extern Entity* sub_08017A90(Entity*, Entity*); extern Entity* gUnk_020000B0; -extern const u8 gMapMetaTileTypeToCollisionData[]; +extern const u8 gMapTileTypeToCollisionData[]; void sub_08031344(EyegoreEntity*); void sub_08031344(EyegoreEntity*); @@ -327,27 +327,27 @@ void sub_08030E80(EyegoreEntity* this) { } void sub_08030F00(EyegoreEntity* this) { - u32 metaTilePos = COORD_TO_TILE_OFFSET(super, 8, 20); - u16 tileIndex = GetMetaTileIndex(metaTilePos + TILE_POS(0, 0), super->collisionLayer); + u32 tilePos = COORD_TO_TILE_OFFSET(super, 8, 20); + u16 tileIndex = GetTileIndex(tilePos + TILE_POS(0, 0), super->collisionLayer); this->tileIndex1 = tileIndex; - tileIndex = GetMetaTileIndex(metaTilePos + TILE_POS(1, 0), super->collisionLayer); + tileIndex = GetTileIndex(tilePos + TILE_POS(1, 0), super->collisionLayer); this->tileIndex2 = tileIndex; - tileIndex = GetMetaTileIndex(metaTilePos + TILE_POS(0, 1), super->collisionLayer); + tileIndex = GetTileIndex(tilePos + TILE_POS(0, 1), super->collisionLayer); this->tileIndex3 = tileIndex; - tileIndex = GetMetaTileIndex(metaTilePos + TILE_POS(1, 1), super->collisionLayer); + tileIndex = GetTileIndex(tilePos + TILE_POS(1, 1), super->collisionLayer); this->tileIndex4 = tileIndex; - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos + 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos + TILE_POS(0, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos + TILE_POS(1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos + TILE_POS(1, 1), super->collisionLayer); } void sub_08030FB4(EyegoreEntity* this) { - u32 metaTilePos = COORD_TO_TILE_OFFSET(super, 8, 20); - SetMetaTile(this->tileIndex1, metaTilePos + TILE_POS(0, 0), super->collisionLayer); - SetMetaTile(this->tileIndex2, metaTilePos + TILE_POS(1, 0), super->collisionLayer); - SetMetaTile(this->tileIndex3, metaTilePos + TILE_POS(0, 1), super->collisionLayer); - SetMetaTile(this->tileIndex4, metaTilePos + TILE_POS(1, 1), super->collisionLayer); + u32 tilePos = COORD_TO_TILE_OFFSET(super, 8, 20); + SetTile(this->tileIndex1, tilePos + TILE_POS(0, 0), super->collisionLayer); + SetTile(this->tileIndex2, tilePos + TILE_POS(1, 0), super->collisionLayer); + SetTile(this->tileIndex3, tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(this->tileIndex4, tilePos + TILE_POS(1, 1), super->collisionLayer); } void sub_08031024(EyegoreEntity* this) { @@ -400,12 +400,12 @@ void sub_08031024(EyegoreEntity* this) { } } else { tmp2 = this->unk_7b >> 1; - uVar5 = GetMetaTileTypeByPos(super->x.HALF.HI + gUnk_080CE2C0[tmp2], + uVar5 = GetTileTypeByPos(super->x.HALF.HI + gUnk_080CE2C0[tmp2], super->y.HALF.HI + gUnk_080CE2C0[tmp2 + 1], super->collisionLayer); - uVar8 = GetMetaTileTypeByPos(super->x.HALF.HI + gUnk_080CE2C0[tmp2 + 2], + uVar8 = GetTileTypeByPos(super->x.HALF.HI + gUnk_080CE2C0[tmp2 + 2], super->y.HALF.HI + gUnk_080CE2C0[tmp2 + 3], super->collisionLayer); - if (!(((gMapMetaTileTypeToCollisionData[uVar5] == 0) && - (gMapMetaTileTypeToCollisionData[uVar8] == 0)) || + if (!(((gMapTileTypeToCollisionData[uVar5] == 0) && + (gMapTileTypeToCollisionData[uVar8] == 0)) || ((this->unk_7b | 1) & 1) == 0)) { if (super->direction >> 3 == super->animationState) { this->unk_78 |= 0x20; diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c index 834a6e95..13421100 100644 --- a/src/enemy/fallingBoulder.c +++ b/src/enemy/fallingBoulder.c @@ -151,7 +151,7 @@ void sub_0802C4B0(FallingBoulderEntity* this) { u32 index; u32 rand; - switch (GetMetaTileIndex(this->unk_7e, super->collisionLayer)) { + switch (GetTileIndex(this->unk_7e, super->collisionLayer)) { case 0x1ab ... 0x1af: offset = 8; break; diff --git a/src/enemy/flyingPot.c b/src/enemy/flyingPot.c index 7eb5e879..16e18980 100644 --- a/src/enemy/flyingPot.c +++ b/src/enemy/flyingPot.c @@ -100,7 +100,7 @@ void FlyingPot_OnCollision(FlyingPotEntity* this) { super->zVelocity = Q_16_16(2.625); super->spritePriority.b1 = 1; - SetMetaTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } else if (super->z.HALF.HI != 0) { sub_08037408(this); } @@ -146,7 +146,7 @@ void FlyingPot_SubAction2(FlyingPotEntity* this) { COLLISION_OFF(super); super->spriteOffsetX = 0; - SetMetaTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } if (sub_0806F520(super)) { @@ -170,23 +170,23 @@ void FlyingPot_SubAction5(FlyingPotEntity* this) { } void FlyingPot_Init(FlyingPotEntity* this) { - u32 tile; + u32 tilePos; super->action = FLYING_POT_ACTION_1; super->gustJarFlags = 2; super->y.HALF.HI += 3; - tile = TILE(super->x.HALF.HI, super->y.HALF.HI); - this->tileIndex = GetMetaTileIndex(tile, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_0, tile, super->collisionLayer); + tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); + this->tileIndex = GetTileIndex(tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_0, tilePos, super->collisionLayer); InitializeAnimation(super, 5); } void FlyingPot_Action1(FlyingPotEntity* this) { sub_08037418(this); - if (GetMetaTileTypeByEntity(super) != SPECIAL_META_TILE_0) { - SetMetaTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + if (GetTileTypeByEntity(super) != SPECIAL_TILE_0) { + SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); sub_08037408(this); } @@ -211,7 +211,7 @@ void FlyingPot_Action2(FlyingPotEntity* this) { super->collisionMask = 0xF; super->hitbox = &gUnk_080FD34C; - SetMetaTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } } @@ -257,8 +257,8 @@ void sub_08037408(FlyingPotEntity* this) { void sub_08037418(FlyingPotEntity* this) { u32 tilePos = COORD_TO_TILE(super); - if (GetMetaTileIndex(tilePos, super->collisionLayer) == SPECIAL_META_TILE_103) { - SetMetaTile(this->tileIndex, tilePos, super->collisionLayer); + if (GetTileIndex(tilePos, super->collisionLayer) == SPECIAL_TILE_103) { + SetTile(this->tileIndex, tilePos, super->collisionLayer); DeleteThisEntity(); } } diff --git a/src/enemy/flyingSkull.c b/src/enemy/flyingSkull.c index 9846c640..efec6a40 100644 --- a/src/enemy/flyingSkull.c +++ b/src/enemy/flyingSkull.c @@ -14,7 +14,7 @@ typedef struct { Entity base; u8 filler[0xc]; - u16 metaTileIndex; + u16 tileIndex; u8 unk_0x76; } FlyingSkullEntity; @@ -51,7 +51,7 @@ void FlyingSkull_OnCollision(FlyingSkullEntity* this) { COLLISION_OFF(super); super->zVelocity = Q_16_16(2.625); super->spritePriority.b1 = 1; - SetMetaTile(this->metaTileIndex, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); } else if (super->z.HALF.HI) { sub_0803A0E0(this); } @@ -90,7 +90,7 @@ void sub_08039CE0(FlyingSkullEntity* this) { super->timer = 1; super->z.HALF.HI = -1; super->spriteOffsetX = 0; - SetMetaTile(this->metaTileIndex, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); } if (sub_0806F520(super)) { @@ -121,8 +121,8 @@ void sub_08039D74(FlyingSkullEntity* this) { super->y.HALF.HI += 3; tilePos = COORD_TO_TILE(super); - this->metaTileIndex = GetMetaTileIndex(tilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_96, tilePos, super->collisionLayer); + this->tileIndex = GetTileIndex(tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_96, tilePos, super->collisionLayer); InitializeAnimation(super, 0); } @@ -130,8 +130,8 @@ void sub_08039DD8(FlyingSkullEntity* this) { sub_0803A100(this); if (super->type == 0) { - if (GetMetaTileTypeByEntity(super) == SPECIAL_META_TILE_115) { - SetMetaTile(this->metaTileIndex, COORD_TO_TILE(super), super->collisionLayer); + if (GetTileTypeByEntity(super) == SPECIAL_TILE_115) { + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); sub_0803A0E0(this); } @@ -148,7 +148,7 @@ void sub_08039DD8(FlyingSkullEntity* this) { if (player != NULL) { player->type2 = 1; CopyPosition(super, player); - SetMetaTile(this->metaTileIndex, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); DeleteEntity(super); } } @@ -168,7 +168,7 @@ void sub_08039EE4(FlyingSkullEntity* this) { super->hitbox = (Hitbox*)&gUnk_080FD340; gPlayerEntity.base.animationState; this->unk_0x76 = gPlayerEntity.base.animationState; - SetMetaTile(this->metaTileIndex, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); } void sub_08039F4C(FlyingSkullEntity* this) { @@ -201,7 +201,7 @@ void sub_08039FAC(FlyingSkullEntity* this) { super->hitType = 0xa0; super->collisionMask = 0xf; super->hitbox = (Hitbox*)&gUnk_080FD34C; - SetMetaTile(this->metaTileIndex, COORD_TO_TILE(super), super->collisionLayer); + SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); } } @@ -249,8 +249,8 @@ void sub_0803A0E0(FlyingSkullEntity* this) { void sub_0803A100(FlyingSkullEntity* this) { u32 tilePos = COORD_TO_TILE(super); - if (GetMetaTileIndex(tilePos, super->collisionLayer) == SPECIAL_META_TILE_103) { - SetMetaTile(this->metaTileIndex, tilePos, super->collisionLayer); + if (GetTileIndex(tilePos, super->collisionLayer) == SPECIAL_TILE_103) { + SetTile(this->tileIndex, tilePos, super->collisionLayer); DeleteThisEntity(); } } diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c index f69178c0..a4b9ddf9 100644 --- a/src/enemy/gyorgFemale.c +++ b/src/enemy/gyorgFemale.c @@ -33,7 +33,7 @@ void sub_08046518(void); void sub_080467DC(GyorgFemaleEntity*); extern u8 gUpdateVisibleTiles; -extern u8 gMapMetaTileTypeToCollisionData[]; +extern u8 gMapTileTypeToCollisionData[]; extern const MapDataDefinition gGyorgMapping0[]; extern const MapDataDefinition gGyorgMapping1[]; @@ -248,7 +248,7 @@ void sub_080464C0(GyorgFemaleEntity* this) { #define sub_08046518_offset 0x658 void sub_08046518(void) { - u16* ptr = gMapTop.metatileTypes; + u16* ptr = gMapTop.tileTypes; u16* sl = &gMapTop.mapData[sub_08046518_offset]; u16* stack1 = &gMapTop.mapDataOriginal[sub_08046518_offset]; u8* stack2 = &gMapTop.vvv[sub_08046518_offset]; @@ -260,8 +260,8 @@ void sub_08046518(void) { u16 new_var; stack1[j] = sl[j]; new_var = ptr[sl[j]]; - stack2[j] = gMapMetaTileTypeToVvv[new_var]; - r6[j] = gMapMetaTileTypeToCollisionData[new_var]; + stack2[j] = gMapTileTypeToVvv[new_var]; + r6[j] = gMapTileTypeToCollisionData[new_var]; } sl += 0x40; stack1 += 0x40; diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c index 34925a76..7df20a7d 100644 --- a/src/enemy/madderpillar.c +++ b/src/enemy/madderpillar.c @@ -345,7 +345,7 @@ void sub_08029DE4(MadderpillarEntity* this) { } void sub_08029E0C(MadderpillarEntity* this) { - u32 tile; + u32 tilePos; s32 uVar4; s32 iVar3; u32 i; @@ -358,10 +358,10 @@ void sub_08029E0C(MadderpillarEntity* this) { ptr = &gUnk_080CCDC8[uVar2]; uVar4 = (Random() & 1) * 2 - 1; iVar3 = ((s32)Random() & 0xf) % 3; - tile = COORD_TO_TILE(super); + tilePos = COORD_TO_TILE(super); for (i = 0; i < 3; i++) { dir = ptr[iVar3]; - if (GetCollisionDataAtMetaTilePos(gUnk_080B4488[dir >> 3] + tile, super->collisionLayer) == 0) { + if (GetCollisionDataAtTilePos(gUnk_080B4488[dir >> 3] + tilePos, super->collisionLayer) == 0) { local_24 = dir; if (super->direction - this->unk_74 != dir - super->direction) break; diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c index 5511ce64..2f6f330f 100644 --- a/src/enemy/mazaalMacro.c +++ b/src/enemy/mazaalMacro.c @@ -97,7 +97,7 @@ void sub_08034CC4(MazaalMacroEntity* this) { this->unk_78 = 0x4b0; sub_08034F70(this); InitializeAnimation(super, super->type); - SetMetaTile(SPECIAL_META_TILE_34, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(super), super->collisionLayer); entity = CreateEnemy(MAZAAL_MACRO, 2); if (entity != NULL) { super->child = entity; @@ -285,11 +285,11 @@ u32 sub_08035084(MazaalMacroEntity* this) { } void sub_08035120(MazaalMacroEntity* this) { - s32 tile; + s32 tilePos; u32 i; - tile = COORD_TO_TILE(super); + tilePos = COORD_TO_TILE(super); for (i = 0; i < 0x18; i++) { - sub_0807B600(tile + gUnk_080CEED8[i]); + sub_0807B600(tilePos + gUnk_080CEED8[i]); } } diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c index 20714560..606b0cb3 100644 --- a/src/enemy/moldworm.c +++ b/src/enemy/moldworm.c @@ -37,7 +37,7 @@ typedef struct { } MoldwormEntity; extern void SoundReqClipped(Entity*, u32); -extern bool32 sub_08023A38(u32 metaTileType); +extern bool32 sub_08023A38(u32 tileType); void sub_08023990(MoldwormEntity*, u32, u32); void sub_08023A88(MoldwormEntity*, u32); @@ -186,7 +186,7 @@ void sub_08023288(MoldwormEntity* this) { for (i = 0; i < 0x10; i++) { u32 x = gPlayerEntity.base.x.HALF.HI + gUnk_080CBC70[idx + 0]; u32 y = gPlayerEntity.base.y.HALF.HI + gUnk_080CBC70[idx + 1]; - if (sub_08023A38(GetMetaTileTypeByPos(x, y, gPlayerEntity.base.collisionLayer))) { + if (sub_08023A38(GetTileTypeByPos(x, y, gPlayerEntity.base.collisionLayer))) { sub_08023990(this, x, y); return; } @@ -221,7 +221,7 @@ void sub_08023398(MoldwormEntity* this) { } if (--this->unk_78.HWORD == 0) { - if (sub_08023A38(GetMetaTileTypeByEntity(super))) { + if (sub_08023A38(GetTileTypeByEntity(super))) { super->action = 5; this->unk_7f = 0; COLLISION_OFF(super); @@ -513,12 +513,12 @@ void sub_080239F0(MoldwormEntity* this) { this->unk_87 = 0x88; } -bool32 sub_08023A38(u32 metaTileType) { - if (metaTileType == META_TILE_TYPE_26 || metaTileType == META_TILE_TYPE_41) { +bool32 sub_08023A38(u32 tileType) { + if (tileType == TILE_TYPE_26 || tileType == TILE_TYPE_41) { return TRUE; } else { - metaTileType = gMapMetaTileTypeToVvv[metaTileType]; - if (metaTileType == VVV_9 || metaTileType == VVV_11 || metaTileType == VVV_10 || metaTileType == VVV_12) { + tileType = gMapTileTypeToVvv[tileType]; + if (tileType == VVV_9 || tileType == VVV_11 || tileType == VVV_10 || tileType == VVV_12) { return TRUE; } else { return FALSE; diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index f0bd9233..37bc230a 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -352,7 +352,7 @@ void sub_080244E8(PestoEntity* this) { switch (this->unk_80) { case 0: if (--super->timer == 0) { - if (GetCollisionDataAtMetaTilePos(COORD_TO_TILE(super), 1) == 0) { + if (GetCollisionDataAtTilePos(COORD_TO_TILE(super), 1) == 0) { this->unk_80++; this->unk_82++; super->subtimer = 0; @@ -446,7 +446,7 @@ void sub_080244E8(PestoEntity* this) { super->timer = 12; this->unk_83 &= ~0x80; entity = super->child; - SetMetaTile(((PestoEntity*)entity)->unk_70, COORD_TO_TILE(entity), entity->collisionLayer); + SetTile(((PestoEntity*)entity)->unk_70, COORD_TO_TILE(entity), entity->collisionLayer); DeleteEntity(entity); super->z.HALF.HI -= 0xe; this->unk_78 -= 0xe; diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c index 06a754ea..907de061 100644 --- a/src/enemy/puffstool.c +++ b/src/enemy/puffstool.c @@ -22,10 +22,10 @@ typedef struct { /*0x82*/ u8 unk_82; /*0x83*/ u8 unused2[1]; /*0x84*/ u16 unk_84; - /*0x86*/ u16 unk_86; + /*0x86*/ u16 tilePos; } PuffstoolEntity; -extern u8 gMapMetaTileTypeToCollisionData[]; +extern u8 gMapTileTypeToCollisionData[]; bool32 sub_080258C4(PuffstoolEntity*); void sub_08025B18(PuffstoolEntity*); @@ -183,7 +183,7 @@ void sub_08025230(PuffstoolEntity* this) { if (sub_0802571C(this)) { super->action = 2; super->timer = 240; - this->unk_86 = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); } } else { this->unk_78--; @@ -191,20 +191,20 @@ void sub_08025230(PuffstoolEntity* this) { } void sub_080252E0(PuffstoolEntity* this) { - u32 tile; + u32 tilePos; super->direction = CalculateDirectionTo(super->x.HALF.HI, super->y.HALF.HI, this->unk_7c, this->unk_7e); sub_08025C44(this); GetNextFrame(super); - tile = COORD_TO_TILE(super); - if (tile == this->unk_86) { + tilePos = COORD_TO_TILE(super); + if (tilePos == this->tilePos) { if (--super->timer == 0) { sub_080256B4(this); } } else { - this->unk_86 = tile; + this->tilePos = tilePos; super->timer = 240; } @@ -428,27 +428,27 @@ bool32 sub_0802571C(PuffstoolEntity* this) { } bool32 sub_080257EC(PuffstoolEntity* this, u32 x, u32 y) { - u16 metaTileType = sub_080B1A48(x - 0x00, y - 0x00, super->collisionLayer); - if (metaTileType != 0x312 && gMapMetaTileTypeToVvv[metaTileType] != VVV_22 && - gMapMetaTileTypeToCollisionData[metaTileType] == 0) { + u16 tileType = sub_080B1A48(x - 0x00, y - 0x00, super->collisionLayer); + if (tileType != 0x312 && gMapTileTypeToVvv[tileType] != VVV_22 && + gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } - metaTileType = sub_080B1A48(x - 0x10, y - 0x00, super->collisionLayer); - if (metaTileType != 0x312 && gMapMetaTileTypeToVvv[metaTileType] != VVV_22 && - gMapMetaTileTypeToCollisionData[metaTileType] == 0) { + tileType = sub_080B1A48(x - 0x10, y - 0x00, super->collisionLayer); + if (tileType != 0x312 && gMapTileTypeToVvv[tileType] != VVV_22 && + gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } - metaTileType = sub_080B1A48(x - 0x00, y - 0x10, super->collisionLayer); - if (metaTileType != 0x312 && gMapMetaTileTypeToVvv[metaTileType] != VVV_22 && - gMapMetaTileTypeToCollisionData[metaTileType] == 0) { + tileType = sub_080B1A48(x - 0x00, y - 0x10, super->collisionLayer); + if (tileType != 0x312 && gMapTileTypeToVvv[tileType] != VVV_22 && + gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } - metaTileType = sub_080B1A48(x - 0x10, y - 0x10, super->collisionLayer); - if (metaTileType != 0x312 && gMapMetaTileTypeToVvv[metaTileType] != VVV_22 && - gMapMetaTileTypeToCollisionData[metaTileType] == 0) { + tileType = sub_080B1A48(x - 0x10, y - 0x10, super->collisionLayer); + if (tileType != 0x312 && gMapTileTypeToVvv[tileType] != VVV_22 && + gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } @@ -528,12 +528,12 @@ void sub_08025A54(PuffstoolEntity* this) { } } -bool32 sub_08025AB8(u32 metaTilePos, u32 layer) { - if (GetCollisionDataAtMetaTilePos(metaTilePos, layer)) +bool32 sub_08025AB8(u32 tilePos, u32 layer) { + if (GetCollisionDataAtTilePos(tilePos, layer)) return FALSE; - if (GetVvvAtMetaTilePos(metaTilePos, layer) == VVV_10) { - sub_0807B7D8(0x61, metaTilePos, layer); + if (GetVvvAtTilePos(tilePos, layer) == VVV_10) { + sub_0807B7D8(0x61, tilePos, layer); return TRUE; } diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c index 9630acd0..ee9075a3 100644 --- a/src/enemy/rollobite.c +++ b/src/enemy/rollobite.c @@ -267,7 +267,7 @@ void sub_08020A7C(RollobiteEntity* this) { bool32 Rollobite_TryToHoleUp(RollobiteEntity* this) { if (Rollobite_IsRolledUp(this) && super->z.HALF.HI == 0) { u32 tilePos = COORD_TO_TILE(super); - u32 tileType = GetMetaTileType(tilePos, super->collisionLayer); + u32 tileType = GetTileType(tilePos, super->collisionLayer); if ((tileType * 0x10000 - 0x710000U) >> 0x10 < 2) { super->action = 6; COLLISION_OFF(super); @@ -277,7 +277,7 @@ bool32 Rollobite_TryToHoleUp(RollobiteEntity* this) { super->y.HALF.HI += 13; super->zVelocity = Q_16_16(2.0); InitializeAnimation(super, super->animationState + 0x14); - SetMetaTile(SPECIAL_META_TILE_52, tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_52, tilePos, super->collisionLayer); return TRUE; } } diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c index 34ad027e..82f51ac9 100644 --- a/src/enemy/spinyBeetle.c +++ b/src/enemy/spinyBeetle.c @@ -13,7 +13,7 @@ typedef struct { Entity base; u8 filler[0xc]; - u16 tile; + u16 tilePos; u16 tileIndex; u8 unk_78; u8 unk_79; @@ -93,9 +93,9 @@ void SpinyBeetle_Init(SpinyBeetleEntity* this) { this->unk_7a = 0; this->unk_78 = 0; this->unk_7b = 0; - this->tile = COORD_TO_TILE(super); - this->tileIndex = GetMetaTileIndex(this->tile, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tile, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos, super->collisionLayer); obj = CreateObject(OBJECT_ON_BEETLE, super->type, 0); if (obj == NULL) { @@ -117,7 +117,7 @@ void sub_08033958(SpinyBeetleEntity* this) { u32 direction; if (sub_08033DF0(this)) { sub_08033E1C(this); - SetMetaTileByIndex(this->tileIndex, this->tile, super->collisionLayer); + SetTileByIndex(this->tileIndex, this->tilePos, super->collisionLayer); return; } @@ -166,7 +166,7 @@ void sub_08033958(SpinyBeetleEntity* this) { COLLISION_ON(super); super->y.WORD = (super->y.WORD & 0xfff00000) | 0xC0000; - SetMetaTileByIndex(this->tileIndex, this->tile, super->collisionLayer); + SetTileByIndex(this->tileIndex, this->tilePos, super->collisionLayer); InitializeAnimation(super, 2); } @@ -237,10 +237,10 @@ void sub_08033B44(SpinyBeetleEntity* this) { this->unk_80 = super->y.WORD; super->spritePriority.b1 = 0; this->unk_7b = 0x78; - this->tile = COORD_TO_TILE(super); - this->tileIndex = GetMetaTileIndex(this->tile, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); - if (this->tileIndex != SPECIAL_META_TILE_34) { + if (this->tileIndex != SPECIAL_TILE_34) { stop++; } else { switch (DirectionRound(super->direction) >> 2) { @@ -260,7 +260,7 @@ void sub_08033B44(SpinyBeetleEntity* this) { } } - SetMetaTile(SPECIAL_META_TILE_34, this->tile, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos, super->collisionLayer); InitializeAnimation(super, 0); } @@ -319,17 +319,17 @@ void sub_08033C94(SpinyBeetleEntity* this) { void sub_08033D78(SpinyBeetleEntity* this) { u32 dir = DirectionRound(super->direction) >> 2; const s8* ptr = gUnk_080CEC1C + dir; - s32 tile; + s32 tilePos; u32 type; - tile = COORD_TO_TILE_OFFSET(super, -ptr[0], -ptr[1]); - type = GetMetaTileType(tile, super->collisionLayer); + tilePos = COORD_TO_TILE_OFFSET(super, -ptr[0], -ptr[1]); + type = GetTileType(tilePos, super->collisionLayer); switch (type) { case 0x1c4: case 0x1c5: break; default: - if (GetCollisionDataAtMetaTilePos(tile, super->collisionLayer) - 1 > 0x3e) + if (GetCollisionDataAtTilePos(tilePos, super->collisionLayer) - 1 > 0x3e) ProcessMovement0(super); break; } diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c index 8af47b4f..9b1d1247 100644 --- a/src/enemy/stalfos.c +++ b/src/enemy/stalfos.c @@ -438,7 +438,7 @@ void sub_08039AD4(StalfosEntity* this) { super->action = 0xb; super->child = projectile; InitAnimationForceUpdate(super, super->animationState + 0x18); - SetMetaTile(SPECIAL_META_TILE_103, position, super->collisionLayer); + SetTile(SPECIAL_TILE_103, position, super->collisionLayer); return; } } @@ -456,7 +456,7 @@ u32 sub_08039B28(StalfosEntity* this) { } ptr2 = &gUnk_080CF930[super->animationState * 2]; pos = COORD_TO_TILE_OFFSET(super, -ptr2[0], -ptr2[1]); - tileType = GetMetaTileType(pos, (u32)super->collisionLayer); + tileType = GetTileType(pos, (u32)super->collisionLayer); ptr = gUnk_080CF938; do { diff --git a/src/enemy/torchTrap.c b/src/enemy/torchTrap.c index bf066844..799cb4ae 100644 --- a/src/enemy/torchTrap.c +++ b/src/enemy/torchTrap.c @@ -14,7 +14,7 @@ typedef struct { Entity base; u8 filler[0xc]; - u16 metaTilePos; + u16 tilePos; u16 filler2; u16 unk_78; u16 projectileTimer; @@ -46,7 +46,7 @@ void TorchTrap_Init(TorchTrapEntity* this) { this->unk_84 &= 0xfff; sub_0804A720(super); super->action = 1; - this->metaTilePos = this->unk_82 & 0xfff; + this->tilePos = this->unk_82 & 0xfff; super->x.HALF.HI = ((this->unk_82 & 0x3f) << 4) + 8 + gRoomControls.origin_x; super->y.HALF.HI = ((this->unk_82 & 0xfc0) >> 2) + (gRoomControls.origin_y + 8); super->direction = ((s16)this->unk_82 & 0xf000) >> 10; @@ -76,7 +76,7 @@ void sub_0803CF38(TorchTrapEntity* this) { } void sub_0803CF94(TorchTrapEntity* this) { - if (GetMetaTileType(this->metaTilePos, super->collisionLayer) == META_TILE_TYPE_118) { + if (GetTileType(this->tilePos, super->collisionLayer) == TILE_TYPE_118) { this->unk_80 = 0; TorchTrap_Reset(this); } else if (this->unk_7c && sub_0803CFD8(this)) { @@ -141,7 +141,7 @@ void TorchTrap_CreateProjectile(TorchTrapEntity* this) { void sub_0803D0B0(TorchTrapEntity* this) { super->action = 3; - sub_0807B7D8(META_TILE_TYPE_117, this->metaTilePos, super->collisionLayer); + sub_0807B7D8(TILE_TYPE_117, this->tilePos, super->collisionLayer); } void (*const gTorchTrapActions[])(TorchTrapEntity*) = { diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c index d5624de0..e1c11638 100644 --- a/src/enemy/vaatiEyesMacro.c +++ b/src/enemy/vaatiEyesMacro.c @@ -241,7 +241,7 @@ void sub_0802EFB8(VaatiEyesMacroEntity* this) { uVar1 = (uVar3 + 4) & 0x18; } collisionData = - GetCollisionDataAtMetaTilePos(TILE(super->x.HALF.HI, super->y.HALF.HI) + gUnk_080B4488[((uVar1) >> 3)], 1); + GetCollisionDataAtTilePos(TILE(super->x.HALF.HI, super->y.HALF.HI) + gUnk_080B4488[((uVar1) >> 3)], 1); if (collisionData != 0) { super->direction = DIR_NONE; } else { diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c index 5a43f66f..71c84c44 100644 --- a/src/enemy/vaatiProjectile.c +++ b/src/enemy/vaatiProjectile.c @@ -282,8 +282,8 @@ bool32 sub_0803E4A0(VaatiProjectileEntity* this) { } void sub_0803E4D8(VaatiProjectileEntity* this) { - u32 metaTilePos = TILE(super->x.HALF.HI, super->y.HALF.HI + 8); - if (GetCollisionDataAtMetaTilePos(metaTilePos, gPlayerEntity.base.collisionLayer) != COLLISION_DATA_255) { - SetMetaTile(SPECIAL_META_TILE_116, metaTilePos, gPlayerEntity.base.collisionLayer); + u32 tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI + 8); + if (GetCollisionDataAtTilePos(tilePos, gPlayerEntity.base.collisionLayer) != COLLISION_DATA_255) { + SetTile(SPECIAL_TILE_116, tilePos, gPlayerEntity.base.collisionLayer); } } diff --git a/src/enemy/wizzrobeFire.c b/src/enemy/wizzrobeFire.c index d032ecb9..638b16cf 100644 --- a/src/enemy/wizzrobeFire.c +++ b/src/enemy/wizzrobeFire.c @@ -26,7 +26,7 @@ void WizzrobeFire_OnCollision(WizzrobeEntity* this) { } EnemyFunctionHandlerAfterCollision(super, WizzrobeFire_Functions); if (super->health == 0) { - SetMetaTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); } } @@ -111,7 +111,7 @@ void WizzrobeFire_Action2(WizzrobeEntity* this) { super->timer = 40; super->subtimer = 0; super->flags &= ~0x80; - SetMetaTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); EnqueueSFX(SFX_156); InitializeAnimation(super, super->direction >> 3); } diff --git a/src/enemy/wizzrobeIce.c b/src/enemy/wizzrobeIce.c index c8185345..d9af54c3 100644 --- a/src/enemy/wizzrobeIce.c +++ b/src/enemy/wizzrobeIce.c @@ -35,7 +35,7 @@ void WizzrobeIce_OnCollision(WizzrobeEntity* this) { } } if (super->health == 0) { - SetMetaTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); } } @@ -118,7 +118,7 @@ void WizzrobeIce_Action2(WizzrobeEntity* this) { super->timer = 40; super->subtimer = 0; super->flags &= ~0x80; - SetMetaTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); EnqueueSFX(SFX_156); InitializeAnimation(super, super->direction >> 3); } diff --git a/src/enemy/wizzrobeWind.c b/src/enemy/wizzrobeWind.c index e1b62c85..91687000 100644 --- a/src/enemy/wizzrobeWind.c +++ b/src/enemy/wizzrobeWind.c @@ -44,7 +44,7 @@ void WizzrobeWind_OnCollision(WizzrobeEntity* this) { } } if (super->health == 0) { - SetMetaTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); } } @@ -137,7 +137,7 @@ void WizzrobeWind_Action2(WizzrobeEntity* this) { super->subtimer = 0; super->flags &= ~0x80; EnqueueSFX(SFX_156); - SetMetaTile(this->tileIndex, this->tilePosition, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); InitializeAnimation(super, super->direction >> 3); } break; @@ -208,15 +208,15 @@ void WizzrobeWind_Action3(WizzrobeEntity* this) { void sub_0802F888(WizzrobeEntity* this) { super->direction = (sub_08049F84(super, 3) + 4) & 0x18; - this->tilePosition = COORD_TO_TILE(super); - this->tileIndex = GetMetaTileIndex(this->tilePosition, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_113, this->tilePosition, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_113, this->tilePos, super->collisionLayer); } void sub_0802F8E4(WizzrobeEntity* this) { u16 uVar1; s32 iVar4; - u32 metaTilePos; + u32 tilePos; u32 uVar7; u32 uVar8; @@ -234,9 +234,9 @@ void sub_0802F8E4(WizzrobeEntity* this) { uVar1 = this->unk_72; iVar4 = ((s32)(rand)&0x7ff0) % (this->unk_6f << 3); uVar7 = (uVar1 + iVar4) | 8; - metaTilePos = TILE(uVar8, uVar7); - if ((GetCollisionDataAtMetaTilePos(metaTilePos, super->collisionLayer) == 0) && - (GetMetaTileIndex(metaTilePos, super->collisionLayer) != SPECIAL_META_TILE_113)) { + tilePos = TILE(uVar8, uVar7); + if ((GetCollisionDataAtTilePos(tilePos, super->collisionLayer) == 0) && + (GetTileIndex(tilePos, super->collisionLayer) != SPECIAL_TILE_113)) { super->x.HALF.HI = (s16)uVar8; super->y.HALF.HI = (s16)uVar7; if (sub_08049FA0(super) != 0) { diff --git a/src/entity.c b/src/entity.c index 1c46b94d..343be2f2 100644 --- a/src/entity.c +++ b/src/entity.c @@ -47,29 +47,29 @@ const u8 gEntityListLUT[] = { // TODO: wrong file, maybe an "enter.c" according to lexicographical order void sub_0805E248(void) { - s32 metaTilePos; + s32 tilePos; - metaTilePos = gDiggingCaveEntranceTransition.entrance->targetTilePosition; + tilePos = gDiggingCaveEntranceTransition.entrance->targetTilePosition; if (gRoomControls.area == AREA_VEIL_FALLS || gRoomControls.area == AREA_VEIL_FALLS_DIG_CAVE) { - SetMetaTileType(META_TILE_TYPE_636, metaTilePos + TILE_POS(-1, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_643, metaTilePos + TILE_POS(-1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_637, metaTilePos + TILE_POS(0, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_644, metaTilePos + TILE_POS(0, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_638, metaTilePos + TILE_POS(1, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_645, metaTilePos + TILE_POS(1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_639, metaTilePos + TILE_POS(-1, 0), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_640, metaTilePos + TILE_POS(0, 0), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_642, metaTilePos + TILE_POS(1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_636, tilePos + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_643, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_637, tilePos + TILE_POS(0, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_644, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_638, tilePos + TILE_POS(1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_645, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_639, tilePos + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_640, tilePos + TILE_POS(0, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_642, tilePos + TILE_POS(1, 0), LAYER_BOTTOM); } else { - SetMetaTileType(META_TILE_TYPE_620, metaTilePos + TILE_POS(-1, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_627, metaTilePos + TILE_POS(-1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_621, metaTilePos + TILE_POS(0, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_628, metaTilePos + TILE_POS(0, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_622, metaTilePos + TILE_POS(1, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_629, metaTilePos + TILE_POS(1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_623, metaTilePos + TILE_POS(-1, 0), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_624, metaTilePos + TILE_POS(0, 0), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_626, metaTilePos + TILE_POS(1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_620, tilePos + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_627, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_621, tilePos + TILE_POS(0, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_628, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_622, tilePos + TILE_POS(1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_629, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_623, tilePos + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_624, tilePos + TILE_POS(0, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_626, tilePos + TILE_POS(1, 0), LAYER_BOTTOM); } gUpdateVisibleTiles = 0; } diff --git a/src/flags.c b/src/flags.c index 17395102..e2111de1 100644 --- a/src/flags.c +++ b/src/flags.c @@ -40,20 +40,20 @@ u32 CheckRoomFlag(u32 flag) { return ReadBit(&gRoomVars.flags, flag); } -u32 CheckLocalFlagsByBank(u32 offset, u32 flag, u32 length) { - return CheckBits(gSave.flags, offset + flag, length); +u32 CheckLocalFlagsByBank(u32 offset, u32 flag, u32 count) { + return CheckBits(gSave.flags, offset + flag, count); } -u32 CheckLocalFlags(u32 flag, u32 length) { - return CheckLocalFlagsByBank(gArea.localFlagOffset, flag, length); +u32 CheckLocalFlags(u32 flag, u32 count) { + return CheckLocalFlagsByBank(gArea.localFlagOffset, flag, count); } -u32 CheckGlobalFlags(u32 flag, u32 length) { - return CheckLocalFlagsByBank(FLAG_BANK_0, flag, length); +u32 CheckGlobalFlags(u32 flag, u32 count) { + return CheckLocalFlagsByBank(FLAG_BANK_0, flag, count); } -u32 CheckRoomFlags(u32 flag, u32 length) { - return CheckBits(&gRoomVars.flags, flag, length); +u32 CheckRoomFlags(u32 flag, u32 count) { + return CheckBits(&gRoomVars.flags, flag, count); } void SetLocalFlagByBank(u32 offset, u32 flag) { diff --git a/src/gameUtils.c b/src/gameUtils.c index 95c8104b..f02b686b 100644 --- a/src/gameUtils.c +++ b/src/gameUtils.c @@ -35,7 +35,7 @@ void ResetTimerFlags(void); extern void** gAreaTilesets[]; extern void** gAreaRoomMaps[]; -extern void* gAreaMetatiles[]; +extern void* gAreaTiles[]; extern void** gAreaTable[]; typedef struct { @@ -558,7 +558,7 @@ void InitRoomResInfo(RoomResInfo* info, RoomHeader* r_hdr, u32 area, u32 room) { info->pixel_height = r_hdr->pixel_height; info->tileset = *(gAreaTilesets[area] + r_hdr->tileset_id); info->map = *(gAreaRoomMaps[area] + room); - info->metatiles = gAreaMetatiles[area]; + info->tiles = gAreaTiles[area]; info->bg_anim = (void*)gUnk_080B755C[area]; info->exits = gExitLists[area][room]; if (gAreaTable[area] != NULL) { @@ -662,7 +662,7 @@ void sub_08052FF4(u32 area, u32 room) { gArea.currentRoomInfo.pixel_height = r_hdr->pixel_height; gArea.currentRoomInfo.tileset = *(gAreaTilesets[area] + r_hdr->tileset_id); gArea.currentRoomInfo.map = *(gAreaRoomMaps[area] + room); - gArea.currentRoomInfo.metatiles = gAreaMetatiles[area]; + gArea.currentRoomInfo.tiles = gAreaTiles[area]; gArea.currentRoomInfo.bg_anim = (void*)gUnk_080B755C[area]; } diff --git a/src/interrupts.c b/src/interrupts.c index f25a3150..a9aad690 100644 --- a/src/interrupts.c +++ b/src/interrupts.c @@ -87,11 +87,11 @@ void UpdateDisplayControls(void) { } void sub_08016CA8(BgSettings* bg) { - if (bg->updated && bg->tilemap != NULL) { + if (bg->updated && bg->subTileMap != NULL) { u32 dest; bg->updated = 0; dest = bg->control; - DmaCopy32(3, bg->tilemap, ((dest << 3) & 0xF800) + VRAM, gUnk_080B2CD8[dest >> 14]); + DmaCopy32(3, bg->subTileMap, ((dest << 3) & 0xF800) + VRAM, gUnk_080B2CD8[dest >> 14]); } } 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; diff --git a/src/kinstone.c b/src/kinstone.c index a544dfbd..4d203fc4 100644 --- a/src/kinstone.c +++ b/src/kinstone.c @@ -335,7 +335,7 @@ void sub_0801876C(u32 worldEventId, bool32 isKinstoneFused) { if (isKinstoneFused == 0) { return; } - SetMetaTileType(META_TILE_TYPE_360, (ptr->x >> 4 & 0x3f) | (ptr->y >> 4 & 0x3f) << 6, LAYER_BOTTOM); + SetTileType(TILE_TYPE_360, (ptr->x >> 4 & 0x3f) | (ptr->y >> 4 & 0x3f) << 6, LAYER_BOTTOM); break; case WORLD_EVENT_TYPE_11: if (isKinstoneFused != 0) { @@ -354,12 +354,12 @@ void sub_0801876C(u32 worldEventId, bool32 isKinstoneFused) { *(u16*)&ent->gustJarState = ptr->y + gRoomControls.origin_y; } if (ptr->entity_idx == 0) { - SetMetaTileType(META_TILE_TYPE_141, (ptr->x >> 4 & 0x3f) | (ptr->y >> 4 & 0x3f) << 6, LAYER_BOTTOM); + SetTileType(TILE_TYPE_141, (ptr->x >> 4 & 0x3f) | (ptr->y >> 4 & 0x3f) << 6, LAYER_BOTTOM); } else { uVar5 = (ptr->x >> 4 & 0x3f) | (ptr->y >> 4 & 0x3f) << 6; - SetMetaTileType(META_TILE_TYPE_140, uVar5 - 1, LAYER_BOTTOM); - uVar3 = META_TILE_TYPE_142; - SetMetaTileType(uVar3, uVar5, LAYER_BOTTOM); + SetTileType(TILE_TYPE_140, uVar5 - 1, LAYER_BOTTOM); + uVar3 = TILE_TYPE_142; + SetTileType(uVar3, uVar5, LAYER_BOTTOM); } break; case WORLD_EVENT_TYPE_24: @@ -390,67 +390,67 @@ void sub_0801876C(u32 worldEventId, bool32 isKinstoneFused) { void sub_080189EC(u32 worldEventId) { u32 i; int iVar1; - int metaTilePos; + int tilePos; const WorldEvent* ptr; ptr = &gWorldEvents[worldEventId]; - metaTilePos = (ptr->x >> 4) & 0x3f; - metaTilePos |= ((ptr->y >> 4) & 0x3f) << 6; - metaTilePos -= TILE_POS(2, 1); + tilePos = (ptr->x >> 4) & 0x3f; + tilePos |= ((ptr->y >> 4) & 0x3f) << 6; + tilePos -= TILE_POS(2, 1); for (i = 0; i < 4; i++) { - SetMetaTileType(i + META_TILE_TYPE_479, metaTilePos + i, LAYER_TOP); + SetTileType(i + TILE_TYPE_479, tilePos + i, LAYER_TOP); } - metaTilePos += TILE_POS(0, 1); + tilePos += TILE_POS(0, 1); for (i = 0; i < 4; i++) { - SetMetaTileType(i + META_TILE_TYPE_483, metaTilePos + i, LAYER_TOP); - SetMetaTileType(i + META_TILE_TYPE_475, metaTilePos + i, LAYER_BOTTOM); + SetTileType(i + TILE_TYPE_483, tilePos + i, LAYER_TOP); + SetTileType(i + TILE_TYPE_475, tilePos + i, LAYER_BOTTOM); } } void sub_08018A58(u32 worldEventId) { u32 i; - int metaTileType; + int tileType; u32 j; - int metaTilePos; + int tilePos; const WorldEvent* ptr; ptr = &gWorldEvents[worldEventId]; - metaTilePos = (ptr->x >> 4) & 0x3f; - metaTilePos |= ((ptr->y >> 4) & 0x3f) << 6; - metaTilePos -= TILE_POS(3, 1); - metaTileType = META_TILE_TYPE_562; + tilePos = (ptr->x >> 4) & 0x3f; + tilePos |= ((ptr->y >> 4) & 0x3f) << 6; + tilePos -= TILE_POS(3, 1); + tileType = TILE_TYPE_562; - for (i = 0; i < 4; metaTilePos += TILE_POS(0, 1), i++) { + for (i = 0; i < 4; tilePos += TILE_POS(0, 1), i++) { for (j = 0; j < 7; j++) { - SetMetaTileType(metaTileType++, metaTilePos + j, LAYER_BOTTOM); + SetTileType(tileType++, tilePos + j, LAYER_BOTTOM); } } } -void sub_08018AB4(int metaTilePos) { +void sub_08018AB4(int tilePos) { u32 i; int iVar2; u32 j; int iVar6; - iVar2 = META_TILE_TYPE_488; - iVar6 = META_TILE_TYPE_500; + iVar2 = TILE_TYPE_488; + iVar6 = TILE_TYPE_500; for (i = 0; i < 3; i++) { j = 0; for (; j < 4; j++) { - SetMetaTileType(iVar2++, metaTilePos + j, LAYER_BOTTOM); - SetMetaTileType(iVar6++, metaTilePos + TILE_POS(0, -1) + j, LAYER_TOP); + SetTileType(iVar2++, tilePos + j, LAYER_BOTTOM); + SetTileType(iVar6++, tilePos + TILE_POS(0, -1) + j, LAYER_TOP); } - metaTilePos += TILE_POS(0, 1); + tilePos += TILE_POS(0, 1); } } -void sub_08018B10(int metaTilePos) { +void sub_08018B10(int tilePos) { int iVar1; u32 index; int iVar3; @@ -459,34 +459,34 @@ void sub_08018B10(int metaTilePos) { iVar4 = 0x1f0; iVar3 = 0x1fc; index = 0; - iVar1 = metaTilePos - TILE_POS(0, 1); + iVar1 = tilePos - TILE_POS(0, 1); for (; index < 4; iVar1++, index++) { - SetMetaTileType(iVar4++, metaTilePos + index, LAYER_BOTTOM); - SetMetaTileType(iVar3++, iVar1, LAYER_TOP); + SetTileType(iVar4++, tilePos + index, LAYER_BOTTOM); + SetTileType(iVar3++, iVar1, LAYER_TOP); } } void sub_08018B50(u32 worldEventId) { u32 i; - int metaTileType; + int tileType; u32 j; - int metaTilePos; + int tilePos; const WorldEvent* ptr; ptr = &gWorldEvents[worldEventId]; if ((ptr->entity_idx & 0x80) == 0) { - metaTileType = META_TILE_TYPE_512; + tileType = TILE_TYPE_512; } else { - metaTileType = META_TILE_TYPE_537; + tileType = TILE_TYPE_537; } - metaTilePos = (ptr->x >> 4) & 0x3f; - metaTilePos |= ((ptr->y >> 4) & 0x3f) << 6; - metaTilePos -= TILE_POS(2, 2); + tilePos = (ptr->x >> 4) & 0x3f; + tilePos |= ((ptr->y >> 4) & 0x3f) << 6; + tilePos -= TILE_POS(2, 2); - for (i = 0; i < 5; metaTilePos += 0x40, i++) { + for (i = 0; i < 5; tilePos += 0x40, i++) { for (j = 0; j < 5; j++) { - SetMetaTileType(metaTileType++, metaTilePos + j, LAYER_BOTTOM); + SetTileType(tileType++, tilePos + j, LAYER_BOTTOM); } } } @@ -494,22 +494,22 @@ void sub_08018B50(u32 worldEventId) { // TODO world event that loads tile entity void sub_08018BB4(u32 worldEventId) { u32 layer; - TileEntity tile; + TileEntity tileEntity; const WorldEvent* ptr; u32 position; - MemCopy(gUnk_080FEAC8 + worldEventId, &tile, sizeof(TileEntity)); + MemCopy(gUnk_080FEAC8 + worldEventId, &tileEntity, sizeof(TileEntity)); ptr = &gWorldEvents[worldEventId]; - tile.tilePos = (ptr->x >> 4 & 0x3f) | (((ptr->y) >> 4 & 0x3f) << 6); - LoadSmallChestTile2(&tile); - if (CheckLocalFlag(tile.localFlag) == 0) { - position = tile.tilePos; - if ((tile._6 & 1) == 0) { + tileEntity.tilePos = (ptr->x >> 4 & 0x3f) | (((ptr->y) >> 4 & 0x3f) << 6); + LoadSmallChestTile2(&tileEntity); + if (CheckLocalFlag(tileEntity.localFlag) == 0) { + position = tileEntity.tilePos; + if ((tileEntity._6 & 1) == 0) { layer = 1; } else { layer = 2; } - SetMetaTileType(META_TILE_TYPE_115, position, layer); + SetTileType(TILE_TYPE_115, position, layer); } } @@ -519,7 +519,7 @@ void CreateMinishEntrance(u32 tilePos) { for (y = 0; y <= 3; y++) { for (x = 0; x <= 4; x++) { - SetMetaTileType(tileID++, tilePos + x, LAYER_BOTTOM); + SetTileType(tileID++, tilePos + x, LAYER_BOTTOM); } tilePos += 0x40; } @@ -529,7 +529,7 @@ void sub_08018C58(u32 tilePos) { u32 i; for (i = 0; i < 6; i += 2, tilePos += 0x40) { - SetMetaTileType(META_TILE_TYPE_608 + i, tilePos, LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_609 + i, tilePos + 1, LAYER_BOTTOM); + SetTileType(TILE_TYPE_608 + i, tilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_609 + i, tilePos + 1, LAYER_BOTTOM); } } diff --git a/src/manager/bombableWallManager.c b/src/manager/bombableWallManager.c index 0dd5379d..9ba2d688 100644 --- a/src/manager/bombableWallManager.c +++ b/src/manager/bombableWallManager.c @@ -13,7 +13,7 @@ #include "sound.h" #include "tiles.h" -u32 BombableWallManager_GetBombableType(u32 metaTilePos, u32 layer); +u32 BombableWallManager_GetBombableType(u32 tilePos, u32 layer); void BombableWallManager_DestroyWall(BombableWallManager*); u32 getArchwayType(void); @@ -37,8 +37,8 @@ void BombableWallManager_Main(BombableWallManager* this) { void BombableWallManager_Init(BombableWallManager* this) { super->action = 1; - this->metaTilePos = (this->x >> 4 & 0x3fU) | (((this->y << 0x10) >> 0x14 & 0x3fU) << 6); - super->type = BombableWallManager_GetBombableType(this->metaTilePos, this->layer); + this->tilePos = (this->x >> 4 & 0x3fU) | (((this->y << 0x10) >> 0x14 & 0x3fU) << 6); + super->type = BombableWallManager_GetBombableType(this->tilePos, this->layer); if (CheckLocalFlag(this->flag) != 0) { BombableWallManager_DestroyWall(this); DeleteManager(super); @@ -46,7 +46,7 @@ void BombableWallManager_Init(BombableWallManager* this) { } void BombableWallManager_Action1(BombableWallManager* this) { - if (GetVvvAtMetaTilePos(this->metaTilePos, this->layer) != VVV_46) { + if (GetVvvAtTilePos(this->tilePos, this->layer) != VVV_46) { super->action = 2; super->timer = 90; BombableWallManager_DestroyWall(this); @@ -61,29 +61,29 @@ void BombableWallManager_Action2(BombableWallManager* this) { } } -u32 BombableWallManager_GetBombableType(u32 metaTilePos, u32 layer) { - u32 metaTileType = GetMetaTileType(metaTilePos, layer); +u32 BombableWallManager_GetBombableType(u32 tilePos, u32 layer) { + u32 tileType = GetTileType(tilePos, layer); - switch (metaTileType) { - case META_TILE_TYPE_236: + switch (tileType) { + case TILE_TYPE_236: return 1; - case META_TILE_TYPE_191: + case TILE_TYPE_191: return 4; - case META_TILE_TYPE_175: + case TILE_TYPE_175: return 0; - case META_TILE_TYPE_204: + case TILE_TYPE_204: return 2; - case META_TILE_TYPE_223: + case TILE_TYPE_223: return 3; - case META_TILE_TYPE_255: + case TILE_TYPE_255: return 0; - case META_TILE_TYPE_277: + case TILE_TYPE_277: return 1; - case META_TILE_TYPE_264: + case TILE_TYPE_264: return 2; - case META_TILE_TYPE_272: + case TILE_TYPE_272: return 3; - case META_TILE_TYPE_261: + case TILE_TYPE_261: return 4; } return 0xff; @@ -95,38 +95,38 @@ void BombableWallManager_DestroyWall(BombableWallManager* this) { BombableWallManager_DestroyWall3, BombableWallManager_DestroyWall4, }; if (super->type != 0xff) { - gUnk_08108CE8[super->type](this->metaTilePos, this->layer); + gUnk_08108CE8[super->type](this->tilePos, this->layer); } } -void BombableWallManager_DestroyWall0(u32 metaTilePos, u32 layer) { - SetMetaTileType(META_TILE_TYPE_177, metaTilePos + TILE_POS(-1, -1), layer); - SetMetaTileType(META_TILE_TYPE_178, metaTilePos + TILE_POS(0, -1), layer); - SetMetaTileType(META_TILE_TYPE_179, metaTilePos + TILE_POS(1, -1), layer); - SetMetaTileType(META_TILE_TYPE_180, metaTilePos + TILE_POS(-1, 0), layer); - SetMetaTileType(META_TILE_TYPE_183, metaTilePos + TILE_POS(1, 0), layer); +void BombableWallManager_DestroyWall0(u32 tilePos, u32 layer) { + SetTileType(TILE_TYPE_177, tilePos + TILE_POS(-1, -1), layer); + SetTileType(TILE_TYPE_178, tilePos + TILE_POS(0, -1), layer); + SetTileType(TILE_TYPE_179, tilePos + TILE_POS(1, -1), layer); + SetTileType(TILE_TYPE_180, tilePos + TILE_POS(-1, 0), layer); + SetTileType(TILE_TYPE_183, tilePos + TILE_POS(1, 0), layer); if (layer == LAYER_BOTTOM) { if (AreaHasEnemies()) { Entity* object = CreateObject(ARCHWAY, 0xe, 0); if (object != NULL) { - object->x.HALF.HI = ((metaTilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((metaTilePos & 0xfc0) >> 2) - 8 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) - 8 + gRoomControls.origin_y; } - SetMetaTileType(META_TILE_TYPE_181, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_181, tilePos, LAYER_BOTTOM); } else { if (AreaIsDungeon()) { - SetMetaTileType(META_TILE_TYPE_181, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_181, tilePos, LAYER_BOTTOM); } else { - SetMetaTileType(META_TILE_TYPE_182, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_182, tilePos, LAYER_BOTTOM); } } - SetMetaTileType(META_TILE_TYPE_184, metaTilePos + TILE_POS(-1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_185, metaTilePos + TILE_POS(0, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_186, metaTilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_184, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_185, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_186, tilePos + TILE_POS(1, -1), LAYER_TOP); } else { Entity* object; - SetMetaTileType(META_TILE_TYPE_181, metaTilePos, LAYER_TOP); + SetTileType(TILE_TYPE_181, tilePos, LAYER_TOP); if (!AreaIsDungeon()) { return; } @@ -134,41 +134,41 @@ void BombableWallManager_DestroyWall0(u32 metaTilePos, u32 layer) { if (object == NULL) { return; } - object->x.HALF.HI = ((metaTilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((metaTilePos & 0xfc0) >> 2) - 0x10 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) - 0x10 + gRoomControls.origin_y; object->collisionLayer = LAYER_TOP; } } -void BombableWallManager_DestroyWall1(u32 metaTilePos, u32 layer) { +void BombableWallManager_DestroyWall1(u32 tilePos, u32 layer) { Entity* object; - SetMetaTileType(META_TILE_TYPE_241, metaTilePos + TILE_POS(0, -1), layer); - SetMetaTileType(META_TILE_TYPE_245, metaTilePos + TILE_POS(1, -1), layer); - SetMetaTileType(META_TILE_TYPE_246, metaTilePos + TILE_POS(1, 0), layer); - SetMetaTileType(META_TILE_TYPE_244, metaTilePos + TILE_POS(0, 1), layer); - SetMetaTileType(META_TILE_TYPE_247, metaTilePos + TILE_POS(1, 1), layer); + SetTileType(TILE_TYPE_241, tilePos + TILE_POS(0, -1), layer); + SetTileType(TILE_TYPE_245, tilePos + TILE_POS(1, -1), layer); + SetTileType(TILE_TYPE_246, tilePos + TILE_POS(1, 0), layer); + SetTileType(TILE_TYPE_244, tilePos + TILE_POS(0, 1), layer); + SetTileType(TILE_TYPE_247, tilePos + TILE_POS(1, 1), layer); if (layer == LAYER_BOTTOM) { if (AreaHasEnemies()) { object = CreateObject(ARCHWAY, 0xe, 1); if (object != NULL) { - object->x.HALF.HI = ((metaTilePos & 0x3f) << 4) + 0x18 + gRoomControls.origin_x; - object->y.HALF.HI = ((metaTilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 0x18 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; } - SetMetaTileType(META_TILE_TYPE_242, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_242, tilePos, LAYER_BOTTOM); } else { if (AreaIsDungeon()) { - SetMetaTileType(META_TILE_TYPE_242, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_242, tilePos, LAYER_BOTTOM); } else { - SetMetaTileType(META_TILE_TYPE_243, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_243, tilePos, LAYER_BOTTOM); } } - SetMetaTileType(META_TILE_TYPE_248, metaTilePos + TILE_POS(1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_249, metaTilePos + 1, LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_250, metaTilePos + TILE_POS(1, 1), LAYER_TOP); + SetTileType(TILE_TYPE_248, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_249, tilePos + 1, LAYER_TOP); + SetTileType(TILE_TYPE_250, tilePos + TILE_POS(1, 1), LAYER_TOP); } else { - SetMetaTileType(META_TILE_TYPE_242, metaTilePos, LAYER_TOP); + SetTileType(TILE_TYPE_242, tilePos, LAYER_TOP); if (!AreaIsDungeon()) { return; } @@ -176,40 +176,40 @@ void BombableWallManager_DestroyWall1(u32 metaTilePos, u32 layer) { if (object == NULL) { return; } - object->x.HALF.HI = ((metaTilePos & 0x3f) << 4) + 0x20 + gRoomControls.origin_x; - object->y.HALF.HI = ((metaTilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 0x20 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; object->collisionLayer = LAYER_TOP; } } -void BombableWallManager_DestroyWall2(u32 metaTilePos, u32 layer) { +void BombableWallManager_DestroyWall2(u32 tilePos, u32 layer) { Entity* object; - SetMetaTileType(META_TILE_TYPE_209, metaTilePos + TILE_POS(-1, 0), layer); - SetMetaTileType(META_TILE_TYPE_212, metaTilePos + TILE_POS(1, 0), layer); - SetMetaTileType(META_TILE_TYPE_213, metaTilePos + TILE_POS(-1, 1), layer); - SetMetaTileType(META_TILE_TYPE_214, metaTilePos + TILE_POS(0, 1), layer); - SetMetaTileType(META_TILE_TYPE_215, metaTilePos + TILE_POS(1, 1), layer); + SetTileType(TILE_TYPE_209, tilePos + TILE_POS(-1, 0), layer); + SetTileType(TILE_TYPE_212, tilePos + TILE_POS(1, 0), layer); + SetTileType(TILE_TYPE_213, tilePos + TILE_POS(-1, 1), layer); + SetTileType(TILE_TYPE_214, tilePos + TILE_POS(0, 1), layer); + SetTileType(TILE_TYPE_215, tilePos + TILE_POS(1, 1), layer); if (layer == LAYER_BOTTOM) { if (AreaHasEnemies()) { object = CreateObject(ARCHWAY, 0xe, 2); if (object != NULL) { - object->x.HALF.HI = ((metaTilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((metaTilePos & 0xfc0) >> 2) + 0x20 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 0x20 + gRoomControls.origin_y; } - SetMetaTileType(META_TILE_TYPE_210, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_210, tilePos, LAYER_BOTTOM); } else { if (AreaIsDungeon()) { - SetMetaTileType(META_TILE_TYPE_210, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_210, tilePos, LAYER_BOTTOM); } else { - SetMetaTileType(META_TILE_TYPE_211, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_211, tilePos, LAYER_BOTTOM); } } - SetMetaTileType(META_TILE_TYPE_216, metaTilePos + TILE_POS(-1, 1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_217, metaTilePos + TILE_POS(0, 1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_218, metaTilePos + TILE_POS(1, 1), LAYER_TOP); + SetTileType(TILE_TYPE_216, tilePos + TILE_POS(-1, 1), LAYER_TOP); + SetTileType(TILE_TYPE_217, tilePos + TILE_POS(0, 1), LAYER_TOP); + SetTileType(TILE_TYPE_218, tilePos + TILE_POS(1, 1), LAYER_TOP); } else { - SetMetaTileType(META_TILE_TYPE_210, metaTilePos, LAYER_TOP); + SetTileType(TILE_TYPE_210, tilePos, LAYER_TOP); if (AreaIsDungeon() == 0) { return; } @@ -217,40 +217,40 @@ void BombableWallManager_DestroyWall2(u32 metaTilePos, u32 layer) { if (object == NULL) { return; } - object->x.HALF.HI = ((metaTilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((metaTilePos & 0xfc0) >> 2) + 0x20 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 0x20 + gRoomControls.origin_y; object->collisionLayer = LAYER_TOP; } } -void BombableWallManager_DestroyWall3(u32 metaTilePos, u32 layer) { +void BombableWallManager_DestroyWall3(u32 tilePos, u32 layer) { Entity* object; - SetMetaTileType(META_TILE_TYPE_225, metaTilePos + TILE_POS(-1, -1), layer); - SetMetaTileType(META_TILE_TYPE_228, metaTilePos + TILE_POS(0, -1), layer); - SetMetaTileType(META_TILE_TYPE_226, metaTilePos + TILE_POS(-1, 0), layer); - SetMetaTileType(META_TILE_TYPE_227, metaTilePos + TILE_POS(-1, 1), layer); - SetMetaTileType(META_TILE_TYPE_231, metaTilePos + TILE_POS(0, 1), layer); + SetTileType(TILE_TYPE_225, tilePos + TILE_POS(-1, -1), layer); + SetTileType(TILE_TYPE_228, tilePos + TILE_POS(0, -1), layer); + SetTileType(TILE_TYPE_226, tilePos + TILE_POS(-1, 0), layer); + SetTileType(TILE_TYPE_227, tilePos + TILE_POS(-1, 1), layer); + SetTileType(TILE_TYPE_231, tilePos + TILE_POS(0, 1), layer); if (layer == LAYER_BOTTOM) { if (AreaHasEnemies()) { object = CreateObject(ARCHWAY, 0xe, 3); if (object != NULL) { - object->x.HALF.HI = ((metaTilePos & 0x3f) << 4) + -0x10 + gRoomControls.origin_x; - object->y.HALF.HI = ((metaTilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + -0x10 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; } - SetMetaTileType(META_TILE_TYPE_229, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_229, tilePos, LAYER_BOTTOM); } else { if (AreaIsDungeon()) { - SetMetaTileType(META_TILE_TYPE_229, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_229, tilePos, LAYER_BOTTOM); } else { - SetMetaTileType(META_TILE_TYPE_230, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_230, tilePos, LAYER_BOTTOM); } } - SetMetaTileType(META_TILE_TYPE_232, metaTilePos + TILE_POS(-1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_233, metaTilePos + TILE_POS(-1, 0), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_234, metaTilePos + TILE_POS(-1, 1), LAYER_TOP); + SetTileType(TILE_TYPE_232, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_233, tilePos + TILE_POS(-1, 0), LAYER_TOP); + SetTileType(TILE_TYPE_234, tilePos + TILE_POS(-1, 1), LAYER_TOP); } else { - SetMetaTileType(META_TILE_TYPE_229, metaTilePos, LAYER_TOP); + SetTileType(TILE_TYPE_229, tilePos, LAYER_TOP); if (!AreaIsDungeon()) { return; } @@ -259,40 +259,40 @@ void BombableWallManager_DestroyWall3(u32 metaTilePos, u32 layer) { if (object == NULL) { return; } - object->x.HALF.HI = ((metaTilePos & 0x3f) << 4) + -0x10 + gRoomControls.origin_x; - object->y.HALF.HI = ((metaTilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + -0x10 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + 8 + gRoomControls.origin_y; object->collisionLayer = LAYER_TOP; } } -void BombableWallManager_DestroyWall4(u32 metaTilePos, u32 layer) { +void BombableWallManager_DestroyWall4(u32 tilePos, u32 layer) { Entity* object; - SetMetaTileType(META_TILE_TYPE_193, metaTilePos + TILE_POS(-1, -1), layer); - SetMetaTileType(META_TILE_TYPE_194, metaTilePos + TILE_POS(0, -1), layer); - SetMetaTileType(META_TILE_TYPE_195, metaTilePos + TILE_POS(1, -1), layer); - SetMetaTileType(META_TILE_TYPE_196, metaTilePos + TILE_POS(-1, 0), layer); - SetMetaTileType(META_TILE_TYPE_199, metaTilePos + TILE_POS(1, 0), layer); + SetTileType(TILE_TYPE_193, tilePos + TILE_POS(-1, -1), layer); + SetTileType(TILE_TYPE_194, tilePos + TILE_POS(0, -1), layer); + SetTileType(TILE_TYPE_195, tilePos + TILE_POS(1, -1), layer); + SetTileType(TILE_TYPE_196, tilePos + TILE_POS(-1, 0), layer); + SetTileType(TILE_TYPE_199, tilePos + TILE_POS(1, 0), layer); if (layer == LAYER_BOTTOM) { if (AreaHasEnemies()) { object = CreateObject(ARCHWAY, 0xe, 0); if (object != NULL) { - object->x.HALF.HI = ((metaTilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((metaTilePos & 0xfc0) >> 2) + -0x10 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + -0x10 + gRoomControls.origin_y; } - SetMetaTileType(META_TILE_TYPE_197, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_197, tilePos, LAYER_BOTTOM); } else { if (AreaIsDungeon()) { - SetMetaTileType(META_TILE_TYPE_197, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_197, tilePos, LAYER_BOTTOM); } else { - SetMetaTileType(META_TILE_TYPE_198, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_198, tilePos, LAYER_BOTTOM); } } - SetMetaTileType(META_TILE_TYPE_200, metaTilePos + TILE_POS(-1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_201, metaTilePos + TILE_POS(0, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_202, metaTilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_200, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_201, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_202, tilePos + TILE_POS(1, -1), LAYER_TOP); } else { - SetMetaTileType(META_TILE_TYPE_197, metaTilePos, LAYER_TOP); + SetTileType(TILE_TYPE_197, tilePos, LAYER_TOP); if (!AreaIsDungeon()) { return; } @@ -301,8 +301,8 @@ void BombableWallManager_DestroyWall4(u32 metaTilePos, u32 layer) { if (object == NULL) { return; } - object->x.HALF.HI = ((metaTilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; - object->y.HALF.HI = ((metaTilePos & 0xfc0) >> 2) + -0x10 + gRoomControls.origin_y; + object->x.HALF.HI = ((tilePos & 0x3f) << 4) + 8 + gRoomControls.origin_x; + object->y.HALF.HI = ((tilePos & 0xfc0) >> 2) + -0x10 + gRoomControls.origin_y; object->collisionLayer = LAYER_TOP; } } diff --git a/src/manager/destructibleTileObserveManager.c b/src/manager/destructibleTileObserveManager.c index 076d7b04..81a8ef05 100644 --- a/src/manager/destructibleTileObserveManager.c +++ b/src/manager/destructibleTileObserveManager.c @@ -29,7 +29,7 @@ void DestructibleTileObserveManager_Main(DestructibleTileObserveManager* this) { void sub_0805CFF0(DestructibleTileObserveManager_unk* param_1) { if (!CheckLocalFlag(param_1->flag)) { - u32 tileType = GetMetaTileType(param_1->tilePos, param_1->tileLayer); + u32 tileType = GetTileType(param_1->tilePos, param_1->tileLayer); if (param_1->tileType == tileType) { SetLocalFlag(param_1->flag); } diff --git a/src/manager/diggingCaveEntranceManager.c b/src/manager/diggingCaveEntranceManager.c index a98257c3..28e76062 100644 --- a/src/manager/diggingCaveEntranceManager.c +++ b/src/manager/diggingCaveEntranceManager.c @@ -32,7 +32,7 @@ void DiggingCaveEntranceManager_Init(DiggingCaveEntranceManager* this) { const DiggingCaveEntrance* entrance; u8 room; u8 area; - u16 tile = SPECIAL_META_TILE_128; + u16 tileIndex = SPECIAL_TILE_128; UpdateIsDiggingCave(); if (gDiggingCaveEntranceTransition.isDiggingCave) { if (gDiggingCaveEntranceTransition.entrance == NULL) { @@ -51,12 +51,12 @@ void DiggingCaveEntranceManager_Init(DiggingCaveEntranceManager* this) { } room = gRoomControls.room; entrance = diggingCaveEntrances[gRoomControls.area]; - tile = SPECIAL_META_TILE_128; + tileIndex = SPECIAL_TILE_128; for (entrance = GetDiggingCaveEntranceForRoom(entrance, room); entrance != 0; entrance = GetDiggingCaveEntranceForRoom(entrance, room)) { - SetMetaTile(tile, entrance->sourceTilePosition + TILE_POS(-1, 1), LAYER_BOTTOM); - SetMetaTile(tile, entrance->sourceTilePosition + TILE_POS(0, 1), LAYER_BOTTOM); - SetMetaTile(tile, entrance->sourceTilePosition + TILE_POS(1, 1), LAYER_BOTTOM); + SetTile(tileIndex, entrance->sourceTilePosition + TILE_POS(-1, 1), LAYER_BOTTOM); + SetTile(tileIndex, entrance->sourceTilePosition + TILE_POS(0, 1), LAYER_BOTTOM); + SetTile(tileIndex, entrance->sourceTilePosition + TILE_POS(1, 1), LAYER_BOTTOM); entrance++; } } diff --git a/src/manager/flameManager.c b/src/manager/flameManager.c index faa40e89..c8174afd 100644 --- a/src/manager/flameManager.c +++ b/src/manager/flameManager.c @@ -14,20 +14,20 @@ void FlameManager_Main(FlameManager* this) { if (super->action == 0) { - this->metaTilePos = TILE(this->metaTilePos, this->field_0x3a); - if (GetMetaTileType(this->metaTilePos, LAYER_TOP) == META_TILE_TYPE_117) { + this->tilePos = TILE(this->tilePos, this->field_0x3a); + if (GetTileType(this->tilePos, LAYER_TOP) == TILE_TYPE_117) { super->action = 1; - SetMetaTile(SPECIAL_META_TILE_106, this->metaTilePos, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_106, this->tilePos, LAYER_BOTTOM); } else { DeleteThisEntity(); } } - if (GetMetaTileType(this->metaTilePos, LAYER_BOTTOM) == SPECIAL_META_TILE_107) { - sub_0807B7D8(META_TILE_TYPE_118, this->metaTilePos, LAYER_TOP); + if (GetTileType(this->tilePos, LAYER_BOTTOM) == SPECIAL_TILE_107) { + sub_0807B7D8(TILE_TYPE_118, this->tilePos, LAYER_TOP); DeleteThisEntity(); } - if (GetMetaTileType(this->metaTilePos, LAYER_TOP) == META_TILE_TYPE_118) { - SetMetaTile(SPECIAL_META_TILE_107, this->metaTilePos, LAYER_BOTTOM); + if (GetTileType(this->tilePos, LAYER_TOP) == TILE_TYPE_118) { + SetTile(SPECIAL_TILE_107, this->tilePos, LAYER_BOTTOM); DeleteThisEntity(); } } diff --git a/src/manager/horizontalMinishPathBackgroundManager.c b/src/manager/horizontalMinishPathBackgroundManager.c index a407e50e..5d5d1ae7 100644 --- a/src/manager/horizontalMinishPathBackgroundManager.c +++ b/src/manager/horizontalMinishPathBackgroundManager.c @@ -42,7 +42,7 @@ void sub_08057F20(HorizontalMinishPathBackgroundManager* this) { tmp = tmp + (tmp >> 3) + ((0x400 - gRoomControls.width) / 2); gScreen.bg3.xOffset = tmp & 0xF; gScreen.bg3.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 2); - gScreen.bg3.tilemap = gBG3Buffer; + gScreen.bg3.subTileMap = gBG3Buffer; sub_08058004(tmp, gUnk_02006F00, gBG3Buffer); tmp = ((tmp >> 4) << 1); if (this->unk_38 != tmp) { @@ -53,7 +53,7 @@ void sub_08057F20(HorizontalMinishPathBackgroundManager* this) { tmp = tmp + (tmp >> 2) + ((0x400 - gRoomControls.width) / 2); gScreen.bg1.xOffset = tmp & 0xF; gScreen.bg1.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 1); - gScreen.bg1.tilemap = gBG3Buffer + 0x400; + gScreen.bg1.subTileMap = gBG3Buffer + 0x400; sub_08058004(tmp, gUnk_02006F00 + 0x2000, gBG3Buffer + 0x400); tmp = ((tmp >> 4) << 1); if (this->unk_3c != tmp) { @@ -111,7 +111,7 @@ void sub_080580B0(u32 unk1) { gScreen.bg3.xOffset = tmp & 0xF; gScreen.bg3.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 1); //? gScreen.bg3.control = 0x1D09; - gScreen.bg3.tilemap = gBG3Buffer; + gScreen.bg3.subTileMap = gBG3Buffer; gScreen.bg3.updated = 1; tmp = gRoomControls.scroll_x - gRoomControls.origin_x; tmp = tmp + (tmp >> 2) + (0x400 - gRoomControls.width) / 2; @@ -119,7 +119,7 @@ void sub_080580B0(u32 unk1) { gScreen.bg1.xOffset = tmp & 0xF; gScreen.bg1.yOffset = 0x30 - ((0x30 - (gRoomControls.scroll_y - gRoomControls.origin_y)) >> 1); //? gScreen.bg1.control = 0x1E09; - gScreen.bg1.tilemap = gBG3Buffer + 0x400; + gScreen.bg1.subTileMap = gBG3Buffer + 0x400; gScreen.bg1.updated = 1; gScreen.controls.layerFXControl = 0x3C48; gScreen.controls.alphaBlend = 0x609; diff --git a/src/manager/hyruleTownTilesetManager.c b/src/manager/hyruleTownTilesetManager.c index 3a9752cc..1941a167 100644 --- a/src/manager/hyruleTownTilesetManager.c +++ b/src/manager/hyruleTownTilesetManager.c @@ -114,32 +114,32 @@ void sub_08059B18(void) { if (CheckGlobalFlag(TATEKAKE_HOUSE) != 0) { for (loopVar = 0; loopVar < 4; ++loopVar) { for (innerLoopVar = 0; innerLoopVar < 4; ++innerLoopVar) { - SetMetaTileByIndex(loopVar * 0x10 + META_TILE_TYPE_1195 + innerLoopVar, + SetTileByIndex(loopVar * 0x10 + TILE_TYPE_1195 + innerLoopVar, COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), 1); } } for (loopVar = 0; loopVar < 3; ++loopVar) { for (innerLoopVar = 0; innerLoopVar < 4; ++innerLoopVar) { - SetMetaTileByIndex(loopVar * 0x10 + META_TILE_TYPE_1088 + innerLoopVar, + SetTileByIndex(loopVar * 0x10 + TILE_TYPE_1088 + innerLoopVar, COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), 2); } } - SetMetaTileByIndex(META_TILE_TYPE_214, TILE_POS(2, 23), LAYER_TOP); - SetMetaTileByIndex(META_TILE_TYPE_215, TILE_POS(3, 23), LAYER_TOP); + SetTileByIndex(TILE_TYPE_214, TILE_POS(2, 23), LAYER_TOP); + SetTileByIndex(TILE_TYPE_215, TILE_POS(3, 23), LAYER_TOP); LoadResourceAsync(&gUnk_086E8460, 0x6001800, 0x800); } else { if (CheckGlobalFlag(TATEKAKE_TOCHU) != 0) { for (loopVar = 0; loopVar < 5; ++loopVar) { for (innerLoopVar = 0; innerLoopVar < 4; ++innerLoopVar) { - SetMetaTileByIndex(loopVar * 0x10 + META_TILE_TYPE_1190 + innerLoopVar, + SetTileByIndex(loopVar * 0x10 + TILE_TYPE_1190 + innerLoopVar, COMMON(0x28 + 0x10 * innerLoopVar, loopVar * 0x10), 1); } } - SetMetaTileByIndex(META_TILE_TYPE_1092, TILE_POS(2, 24), LAYER_TOP); - SetMetaTileByIndex(META_TILE_TYPE_1093, TILE_POS(5, 24), LAYER_TOP); - SetMetaTileByIndex(META_TILE_TYPE_1108, TILE_POS(2, 25), LAYER_TOP); - SetMetaTileByIndex(META_TILE_TYPE_1109, TILE_POS(5, 25), LAYER_TOP); + SetTileByIndex(TILE_TYPE_1092, TILE_POS(2, 24), LAYER_TOP); + SetTileByIndex(TILE_TYPE_1093, TILE_POS(5, 24), LAYER_TOP); + SetTileByIndex(TILE_TYPE_1108, TILE_POS(2, 25), LAYER_TOP); + SetTileByIndex(TILE_TYPE_1109, TILE_POS(5, 25), LAYER_TOP); } } } diff --git a/src/manager/lightLevelSetManager.c b/src/manager/lightLevelSetManager.c index f53c17e5..3027a449 100644 --- a/src/manager/lightLevelSetManager.c +++ b/src/manager/lightLevelSetManager.c @@ -18,7 +18,7 @@ void LightLevelSetManager_Type0(LightLevelSetManager*); void LightLevelSetManager_Type1(LightLevelSetManager*); void LightLevelSetManager_Type2(LightLevelSetManager*); void LightLevelSetManager_Type3(LightLevelSetManager*); -void sub_0805BE70(LightLevelSetManager* this, u32 metaTileType); +void sub_0805BE70(LightLevelSetManager* this, u32 tileType); void LightLevelSetManager_Main(Manager* this) { static void (*const LightLevelSetManager_Types[])(LightLevelSetManager*) = { @@ -50,7 +50,7 @@ void LightLevelSetManager_Type1(LightLevelSetManager* this) { super->action = 1; super->subtimer = 30; if (CheckFlags(this->field_0x3e) != 0) { - sub_0805BE70(this, META_TILE_TYPE_117); + sub_0805BE70(this, TILE_TYPE_117); super->action = 2; } break; @@ -58,13 +58,13 @@ void LightLevelSetManager_Type1(LightLevelSetManager* this) { if (CheckFlags(this->field_0x3e) != 0 && --super->subtimer == 0) { super->subtimer = 30; sub_0805BEC4(this); - sub_0805BE70(this, META_TILE_TYPE_118); + sub_0805BE70(this, TILE_TYPE_118); } break; case 2: if (CheckFlags(this->field_0x3e) == 0 && --super->subtimer == 0) { super->subtimer = 30; - sub_0805BE70(this, META_TILE_TYPE_117); + sub_0805BE70(this, TILE_TYPE_117); } break; } @@ -79,7 +79,7 @@ void LightLevelSetManager_Type2(LightLevelSetManager* this) { ((s16)this->field_0x38 >> 4 & 0x3fU) | ((s32)((this->field_0x3a << 0x10) >> 0x14 & 0x3fU) << 6); super->action = 1; } else { - if (GetMetaTileType(this->field_0x20, super->type2) == META_TILE_TYPE_118) { + if (GetTileType(this->field_0x20, super->type2) == TILE_TYPE_118) { SetFlag(this->field_0x3e); ChangeLightLevel(super->timer); DeleteThisEntity(); @@ -103,7 +103,7 @@ void LightLevelSetManager_Type3(LightLevelSetManager* this) { break; case 1: - if (GetMetaTileType(this->field_0x20, super->type2) != META_TILE_TYPE_118) { + if (GetTileType(this->field_0x20, super->type2) != TILE_TYPE_118) { return; } SetFlag(this->field_0x3e); @@ -131,14 +131,14 @@ void LightLevelSetManager_Type3(LightLevelSetManager* this) { } } -void sub_0805BE70(LightLevelSetManager* this, u32 metaTileType) { - SetMetaTileType(metaTileType, +void sub_0805BE70(LightLevelSetManager* this, u32 tileType) { + SetTileType(tileType, ((this->field_0x38 << 0x10) >> 0x14 & 0x3fU) | ((this->field_0x3a << 0x10) >> 0x14 & 0x3fU) << 6, super->type2); } void sub_0805BE94(LightLevelSetManager* this) { - SetMetaTileType(META_TILE_TYPE_118, + SetTileType(TILE_TYPE_118, ((this->field_0x38 << 0x10) >> 0x14 & 0x3fU) | ((this->field_0x3a << 0x10) >> 0x14 & 0x3fU) << 6, super->type2); ChangeLightLevel(super->timer); diff --git a/src/manager/lightRayManager.c b/src/manager/lightRayManager.c index 8a6a75b9..4a6c4227 100644 --- a/src/manager/lightRayManager.c +++ b/src/manager/lightRayManager.c @@ -215,9 +215,9 @@ void sub_08057450(LightRayManager* this) { y >>= 2; gScreen.bg3.yOffset = y & 0x3f; - gScreen.bg3.tilemap = &gBG3Buffer[(y / 0x40) << 8]; - if (this->unk_34 != gScreen.bg3.tilemap) { - this->unk_34 = gScreen.bg3.tilemap; + gScreen.bg3.subTileMap = &gBG3Buffer[(y / 0x40) << 8]; + if (this->unk_34 != gScreen.bg3.subTileMap) { + this->unk_34 = gScreen.bg3.subTileMap; gScreen.bg3.updated = 1; } diff --git a/src/manager/manager29.c b/src/manager/manager29.c index f1dcce72..e8e60896 100644 --- a/src/manager/manager29.c +++ b/src/manager/manager29.c @@ -32,9 +32,9 @@ void sub_0805CBD0(Manager29* this) { super->action = 1; 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 = GetMetaTileType(this->unk_38, this->layer); + this->unk_3c = GetTileType(this->unk_38, this->layer); mapLayer = GetLayerByIndex(this->layer); - this->unk_28 = (u16*)mapLayer->metatileTypes; + this->unk_28 = (u16*)mapLayer->tileTypes; this->unk_2c = &mapLayer->mapData[(s16)this->unk_3a]; } diff --git a/src/manager/minishRaftersBackgroundManager.c b/src/manager/minishRaftersBackgroundManager.c index 8bc52447..f92470d6 100644 --- a/src/manager/minishRaftersBackgroundManager.c +++ b/src/manager/minishRaftersBackgroundManager.c @@ -87,7 +87,7 @@ void sub_08058324(u32 unk) { sub_080582D0(); sub_080582A0(sub_08058244(unk), gUnk_02006F00, gBG3Buffer); gScreen.bg1.control = 0x1D47; - gScreen.bg1.tilemap = gBG3Buffer; + gScreen.bg1.subTileMap = gBG3Buffer; gScreen.bg1.updated = 1; gScreen.lcd.displayControl |= 0x200; } diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c index d8e28e97..d5432970 100644 --- a/src/manager/miscManager.c +++ b/src/manager/miscManager.c @@ -121,9 +121,9 @@ void MiscManager_Type0(MiscManager* this) { void sub_08058F44(u32 x, u32 y, u32 flag) { if (CheckRoomFlag(flag)) return; - if (sub_080B1A48(x, y, LAYER_BOTTOM) != META_TILE_TYPE_97) + if (sub_080B1A48(x, y, LAYER_BOTTOM) != TILE_TYPE_97) return; - SetMetaTileType(META_TILE_TYPE_38, ((x >> 4) & 0x3F) | (((y >> 4) & 0x3F) << 6), LAYER_BOTTOM); + SetTileType(TILE_TYPE_38, ((x >> 4) & 0x3F) | (((y >> 4) & 0x3F) << 6), LAYER_BOTTOM); sub_08058F84(x, y); } @@ -240,7 +240,7 @@ void MiscManager_Type5(MiscManager* this) { DeleteThisEntity(); } super->action = 1; - SetMetaTileType(META_TILE_TYPE_869, TILE_LOCAL(this->x, this->y), super->type2); + SetTileType(TILE_TYPE_869, TILE_LOCAL(this->x, this->y), super->type2); break; case 1: if (CheckFlags(this->flags)) { @@ -338,10 +338,10 @@ void sub_0805930C(MiscManager* this) { tmp->collisionLayer = 1; } -void SetDirtTile(u32 metaTilePos) { - SetMetaTileType(META_TILE_TYPE_29, metaTilePos, LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_0, metaTilePos, LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_0, metaTilePos + TILE_POS(0, -1), LAYER_TOP); +void SetDirtTile(u32 tilePos) { + SetTileType(TILE_TYPE_29, tilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_0, tilePos, LAYER_TOP); + SetTileType(TILE_TYPE_0, tilePos + TILE_POS(0, -1), LAYER_TOP); } void MiscManager_TypeA(MiscManager* this) { diff --git a/src/manager/railIntersectionManager.c b/src/manager/railIntersectionManager.c index 88ab4f5a..b06aab83 100644 --- a/src/manager/railIntersectionManager.c +++ b/src/manager/railIntersectionManager.c @@ -26,7 +26,7 @@ void RailIntersectionManager_Init(RailIntersectionManager* this) { super->type2 = 1; } super->action = 1; - this->metaTilePos = (this->metaTilePos >> 4 & 0x3fU) | (((this->field_0x3a << 0x10) >> 0x14 & 0x3fU) << 6); + this->tilePos = (this->tilePos >> 4 & 0x3fU) | (((this->field_0x3a << 0x10) >> 0x14 & 0x3fU) << 6); sub_0805B778(this); } @@ -45,7 +45,7 @@ void RailIntersectionManager_Action1(RailIntersectionManager* this) { } void sub_0805B778(RailIntersectionManager* this) { - static const u16 gUnk_08108C9C[] = { META_TILE_TYPE_856, META_TILE_TYPE_857, META_TILE_TYPE_854, - META_TILE_TYPE_858, META_TILE_TYPE_858, META_TILE_TYPE_855 }; - SetMetaTileType(gUnk_08108C9C[super->type * 2 + super->type2], this->metaTilePos, this->layer); + static const u16 gUnk_08108C9C[] = { TILE_TYPE_856, TILE_TYPE_857, TILE_TYPE_854, + TILE_TYPE_858, TILE_TYPE_858, TILE_TYPE_855 }; + SetTileType(gUnk_08108C9C[super->type * 2 + super->type2], this->tilePos, this->layer); } diff --git a/src/manager/templeOfDropletsManager.c b/src/manager/templeOfDropletsManager.c index 8e0660d3..2e0b716c 100644 --- a/src/manager/templeOfDropletsManager.c +++ b/src/manager/templeOfDropletsManager.c @@ -480,7 +480,7 @@ void sub_0805A9CC(TempleOfDropletsManager* this) { tmp1 = gRoomControls.scroll_y - this->unk_26 + this->unk_36; gScreen.bg3.yOffset = tmp1 & 0x3F; tmp3 = (&gBG3Buffer[((tmp1 / 0x40) << 8)]); - gScreen.bg3.tilemap = (u32*)tmp3; + gScreen.bg3.subTileMap = (u32*)tmp3; gScreen.controls.window1VerticalDimensions = DISPLAY_HEIGHT; if (this->unk_28 == tmp3) return; @@ -524,7 +524,7 @@ void sub_0805AAF0(u32 unk0) { gScreen.controls.layerFXControl = 0x3E48; gScreen.controls.alphaBlend = BLDALPHA_BLEND(8, 16); gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(1); - gScreen.bg3.tilemap = &gBG3Buffer; + gScreen.bg3.subTileMap = &gBG3Buffer; gScreen.bg3.xOffset = 0; gScreen.bg3.yOffset = 0; gScreen.bg3.updated = 1; diff --git a/src/manager/tileChangeObserveManager.c b/src/manager/tileChangeObserveManager.c index f2ada610..7a05a853 100644 --- a/src/manager/tileChangeObserveManager.c +++ b/src/manager/tileChangeObserveManager.c @@ -26,14 +26,14 @@ void TileChangeObserveManager_Main(TileChangeObserveManager* this) { } void TileChangeObserveManager_Init(TileChangeObserveManager* this) { - u16* tile; + u16* tileIndex; if (CheckFlags(this->flag) != 0) { DeleteThisEntity(); } else { super->action = 1; - tile = &GetLayerByIndex(this->field_0x3a)->mapData[this->tilePosition]; - this->observedTile = tile; - this->initialTile = tile[0]; + tileIndex = &GetLayerByIndex(this->field_0x3a)->mapData[this->tilePos]; + this->observedTile = tileIndex; + this->initialTile = tileIndex[0]; } } diff --git a/src/manager/tilePuzzleManager.c b/src/manager/tilePuzzleManager.c index 241cba49..b845aff0 100644 --- a/src/manager/tilePuzzleManager.c +++ b/src/manager/tilePuzzleManager.c @@ -31,16 +31,16 @@ void TilePuzzleManager_Main(TilePuzzleManager* this) { this->player_current_tile = COORD_TO_TILE((&gPlayerEntity.base)); if (this->player_current_tile != this->player_previous_tile) { this->player_previous_tile = this->player_current_tile; - switch (GetMetaTileType(this->player_current_tile, super->type2)) { - case META_TILE_TYPE_791: + switch (GetTileType(this->player_current_tile, super->type2)) { + case TILE_TYPE_791: // stepped on a red tile again super->action = FAILED; SoundReq(SFX_MENU_ERROR); break; - case META_TILE_TYPE_792: + case TILE_TYPE_792: // stepped on a blue tile // turn the tile into a red tile - sub_0807B7D8(META_TILE_TYPE_791, this->player_current_tile, super->type2); + sub_0807B7D8(TILE_TYPE_791, this->player_current_tile, super->type2); SoundReq(SFX_6B); // decrease the number of remaining tiles and check if we're done if (--super->timer == 0) { diff --git a/src/manager/verticalMinishPathBackgroundManager.c b/src/manager/verticalMinishPathBackgroundManager.c index e67cde8d..645118fc 100644 --- a/src/manager/verticalMinishPathBackgroundManager.c +++ b/src/manager/verticalMinishPathBackgroundManager.c @@ -30,17 +30,17 @@ void sub_0805754C(VerticalMinishPathBackgroundManager* this) { bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y); bgOffset += bgOffset >> 3; gScreen.bg3.yOffset = bgOffset & 0x3f; - gScreen.bg3.tilemap = gMapDataTopSpecial + (bgOffset / 0x40) * 0x200; - if (this->field_0x38 != gScreen.bg3.tilemap) { - this->field_0x38 = gScreen.bg3.tilemap; + gScreen.bg3.subTileMap = gMapDataTopSpecial + (bgOffset / 0x40) * 0x200; + if (this->field_0x38 != gScreen.bg3.subTileMap) { + this->field_0x38 = gScreen.bg3.subTileMap; gScreen.bg3.updated = 1; } bgOffset = (gRoomControls.scroll_y - gRoomControls.origin_y); bgOffset += bgOffset >> 2; gScreen.bg1.yOffset = bgOffset & 0x3f; - gScreen.bg1.tilemap = gMapDataTopSpecial + 0x2000 + (bgOffset / 0x40) * 0x200; - if (this->field_0x3c != gScreen.bg1.tilemap) { - this->field_0x3c = gScreen.bg1.tilemap; + gScreen.bg1.subTileMap = gMapDataTopSpecial + 0x2000 + (bgOffset / 0x40) * 0x200; + if (this->field_0x3c != gScreen.bg1.subTileMap) { + this->field_0x3c = gScreen.bg1.subTileMap; gScreen.bg1.updated = 1; } } @@ -57,7 +57,7 @@ void sub_080575C8(u32 param) { bgOffset += bgOffset >> 3; gScreen.bg3.yOffset = bgOffset & 0x3f; gScreen.bg3.xOffset = 0; - gScreen.bg3.tilemap = &gMapDataTopSpecial[(bgOffset / 0x40) * 0x200]; + gScreen.bg3.subTileMap = &gMapDataTopSpecial[(bgOffset / 0x40) * 0x200]; gScreen.bg3.control = BGCNT_SCREENBASE(29) | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(2) | BGCNT_MOSAIC; gScreen.bg3.updated = 1; @@ -65,7 +65,7 @@ void sub_080575C8(u32 param) { bgOffset += bgOffset >> 2; gScreen.bg1.yOffset = bgOffset & 0x3f; gScreen.bg1.xOffset = 0; - gScreen.bg1.tilemap = &gMapDataTopSpecial[0x2000 + (bgOffset / 0x40) * 0x200]; + gScreen.bg1.subTileMap = &gMapDataTopSpecial[0x2000 + (bgOffset / 0x40) * 0x200]; gScreen.bg1.control = BGCNT_SCREENBASE(30) | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(2) | BGCNT_MOSAIC; gScreen.bg1.updated = 1; gScreen.controls.layerFXControl = diff --git a/src/manager/waterfallBottomManager.c b/src/manager/waterfallBottomManager.c index c6bedd2f..a9e7196e 100644 --- a/src/manager/waterfallBottomManager.c +++ b/src/manager/waterfallBottomManager.c @@ -11,7 +11,7 @@ #include "tiles.h" void WaterfallBottomManager_Main(WaterfallBottomManager* this) { - SetMetaTile(SPECIAL_META_TILE_20, TILE_POS(3, 23), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_20, TILE_POS(3, 23), LAYER_BOTTOM); 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; diff --git a/src/movement.c b/src/movement.c index 74882cd9..6cb7a939 100644 --- a/src/movement.c +++ b/src/movement.c @@ -2162,7 +2162,7 @@ bool32 ProcessMovement3(Entity* this) { } bool32 sub_080AF0C8(Entity* this) { - u32 tileType = GetMetaTileTypeByEntity(this); + u32 tileType = GetTileTypeByEntity(this); switch (tileType) { case 0x87: if (((this->direction + 7) & (0x3 | DIR_DIAGONAL | DirectionNorth | DirectionEast | DirectionSouth | diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c index 23fb4d1d..9a134cfe 100644 --- a/src/npc/bigGoron.c +++ b/src/npc/bigGoron.c @@ -153,7 +153,7 @@ void sub_0806D0B0(Entity* this) { sub_0806D164(this); } gScreen.bg1.control = 0x1d47; - gScreen.bg1.tilemap = &gMapDataTopSpecial; + gScreen.bg1.subTileMap = &gMapDataTopSpecial; gScreen.bg1.updated = 1; } diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c index 448476bb..5043c0f0 100644 --- a/src/npc/castorWildsStatue.c +++ b/src/npc/castorWildsStatue.c @@ -80,20 +80,20 @@ void sub_08067418(CastorWildsStatueEntity* this) { this->tilePos = COORD_TO_TILE(super); if (super->type == 0) { super->hitbox = (Hitbox*)&gUnk_08110E94; - SetMetaTile(SPECIAL_META_TILE_34, this->tilePos - 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePos + 0x3f, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePos + 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + 0x3f, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + 0x40, super->collisionLayer); } else { super->collisionLayer = 3; super->spriteOrientation.flipY = 1; super->spriteRendering.b3 = 1; super->spritePriority.b0 = 2; if (CheckLocalFlag(HIKYOU_00_SEKIZOU) == 0) { - SetMetaTile(SPECIAL_META_TILE_34, TILE_POS(1, 58), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, TILE_POS(2, 58), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, TILE_POS(3, 58), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, TILE_POS(3, 59), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, TILE_POS(1, 58), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, TILE_POS(2, 58), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, TILE_POS(3, 58), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, TILE_POS(3, 59), LAYER_BOTTOM); } } InitScriptForNPC(super); diff --git a/src/npc/clothesRack.c b/src/npc/clothesRack.c index cea8bcdd..ddf8903d 100644 --- a/src/npc/clothesRack.c +++ b/src/npc/clothesRack.c @@ -37,12 +37,12 @@ void sub_0806DD90(Entity* this) { InitializeAnimation(this, animIndex); x = this->x.HALF.HI; y = this->y.HALF.HI; - SetMetaTile(SPECIAL_META_TILE_114, TILE(x - 24, y - 16), this->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_114, TILE(x - 24, y), this->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_114, TILE(x - 24, y + 16), this->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_114, TILE(x + 24, y - 16), this->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_114, TILE(x + 24, y), this->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_114, TILE(x + 24, y + 16), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x - 24, y - 16), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x - 24, y), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x - 24, y + 16), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x + 24, y - 16), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x + 24, y), this->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(x + 24, y + 16), this->collisionLayer); } void sub_0806DEC8(Entity* this) { diff --git a/src/npc/dampe.c b/src/npc/dampe.c index 8fad6649..62a39909 100644 --- a/src/npc/dampe.c +++ b/src/npc/dampe.c @@ -106,10 +106,10 @@ void sub_0806BEC8(Entity* this, ScriptExecutionContext* context) { } void sub_0806BEFC(void) { - SetMetaTileType(META_TILE_TYPE_382, TILE_POS(14, 22), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_383, TILE_POS(15, 22), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_384, TILE_POS(14, 23), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_385, TILE_POS(15, 23), LAYER_BOTTOM); + SetTileType(TILE_TYPE_382, TILE_POS(14, 22), LAYER_BOTTOM); + SetTileType(TILE_TYPE_383, TILE_POS(15, 22), LAYER_BOTTOM); + SetTileType(TILE_TYPE_384, TILE_POS(14, 23), LAYER_BOTTOM); + SetTileType(TILE_TYPE_385, TILE_POS(15, 23), LAYER_BOTTOM); } void sub_0806BF44(Entity* this, ScriptExecutionContext* context) { diff --git a/src/npc/dog.c b/src/npc/dog.c index 3156eec1..628e56d8 100644 --- a/src/npc/dog.c +++ b/src/npc/dog.c @@ -236,7 +236,7 @@ void sub_08069B44(DogEntity* this) { super->action = 4; } if ((super->type == 2) && (CheckLocalFlag(MACHI_02_DOG) == 0)) { - SetMetaTile(SPECIAL_META_TILE_114, TILE(super->x.HALF.HI, super->y.HALF.HI - 8), super->collisionLayer); + SetTile(SPECIAL_TILE_114, TILE(super->x.HALF.HI, super->y.HALF.HI - 8), super->collisionLayer); } } } diff --git a/src/npc/kid.c b/src/npc/kid.c index 6b1e5947..678ff84b 100644 --- a/src/npc/kid.c +++ b/src/npc/kid.c @@ -541,12 +541,12 @@ void sub_080626E0(Entity* this, ScriptExecutionContext* context) { } void sub_08062788(Entity* this, ScriptExecutionContext* context) { - SetMetaTile(SPECIAL_META_TILE_114, TILE_POS(11, 24), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_114, TILE_POS(12, 24), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_114, TILE_POS(13, 24), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_114, TILE_POS(11, 25), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_114, TILE_POS(12, 25), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_114, TILE_POS(13, 25), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(11, 24), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(12, 24), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(13, 24), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(11, 25), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(12, 25), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(13, 25), LAYER_BOTTOM); } void sub_080627E8(Entity* this, ScriptExecutionContext* context) { diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c index dcaabee6..2fae4b91 100644 --- a/src/npc/npc4E.c +++ b/src/npc/npc4E.c @@ -198,18 +198,18 @@ void NPC4E_RestoreEquippedItems(NPC4EEntity* this) { void sub_0806DC7C(void) { const u16* tiles = gUnk_081141F4; while (*tiles != 0) { - u32 metaTilePos = *tiles; + u32 tilePos = *tiles; tiles = tiles + 1; - SetMetaTileType(SPECIAL_META_TILE_114, metaTilePos, LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, tilePos, LAYER_BOTTOM); } } void sub_0806DCA0(void) { const u16* tiles = gUnk_081141F4; while (*tiles != 0) { - u32 metaTilePos = *tiles; + u32 tilePos = *tiles; tiles = tiles + 1; - RestorePrevTileEntity(metaTilePos, LAYER_BOTTOM); + RestorePrevTileEntity(tilePos, LAYER_BOTTOM); } } diff --git a/src/npc/simon.c b/src/npc/simon.c index 24812a94..480897ee 100644 --- a/src/npc/simon.c +++ b/src/npc/simon.c @@ -36,7 +36,7 @@ void sub_0806C224(void) { void Simon_CreateChest(Entity* this) { CreateObjectWithParent(this, SPECIAL_FX, FX_BIG_EXPLOSION2, 0); - SetMetaTileType(META_TILE_TYPE_115, COORD_TO_TILE(this), this->collisionLayer); + SetTileType(TILE_TYPE_115, COORD_TO_TILE(this), this->collisionLayer); SoundReq(SFX_SECRET_BIG); } diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index d2ea2da9..118b2587 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -810,7 +810,7 @@ void sub_0806B0E0(Entity* this, ScriptExecutionContext* context) { static const u16 gUnk_08112C5C[2] = { TEXT_INDEX(TEXT_TOWN_MINISH2, 0x25), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x26) }; int idx = 0; - // Checks if the dust is gone at these four meta tiles. + // Checks if the dust is gone at these four tiles. if (GetVvvAtRoomCoords(56, 184, 1) == VVV_87 && GetVvvAtRoomCoords(72, 184, 1) == VVV_87 && GetVvvAtRoomCoords(56, 200, 1) == VVV_87 && GetVvvAtRoomCoords(72, 200, 1) == VVV_87) { idx = 1; diff --git a/src/npc/zelda.c b/src/npc/zelda.c index 3ac84635..e740296f 100644 --- a/src/npc/zelda.c +++ b/src/npc/zelda.c @@ -172,14 +172,14 @@ static const u16 gUnk_08110BE0[] = { }; void sub_08066F94(void) { - u16 metaTilePos; + u16 tilePos; const u16* puVar2; puVar2 = gUnk_08110BE0; while (*puVar2 != 0) { - metaTilePos = *puVar2; + tilePos = *puVar2; puVar2++; - SetMetaTileType(SPECIAL_META_TILE_114, metaTilePos, LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, tilePos, LAYER_BOTTOM); } } diff --git a/src/object/angryStatue.c b/src/object/angryStatue.c index bc9d357c..be83f7dd 100644 --- a/src/object/angryStatue.c +++ b/src/object/angryStatue.c @@ -30,7 +30,7 @@ void AngryStatue(Entity* this) { void AngryStatue_Init(Entity* this) { this->action = 1; this->hitbox = (Hitbox*)&gUnk_080FD178; - SetMetaTile(SPECIAL_META_TILE_34, COORD_TO_TILE(this), this->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(this), this->collisionLayer); InitializeAnimation(this, this->type); } diff --git a/src/object/bakerOven.c b/src/object/bakerOven.c index 219cefc3..1add5b41 100644 --- a/src/object/bakerOven.c +++ b/src/object/bakerOven.c @@ -102,18 +102,18 @@ void BakerOven_Action2(BakerOvenEntity* this) { } void sub_0809CDF0(BakerOvenEntity* this) { - u32 metaTilePos; + u32 tilePos; this->unk_80 = (((super->x.HALF.HI - gRoomControls.origin_x) >> 4) & 0x3f) | (((super->y.HALF.HI - gRoomControls.origin_y) >> 4 & 0x3f) << 6); - metaTilePos = this->unk_80; - SetMetaTile(SPECIAL_META_TILE_46, metaTilePos + TILE_POS(-1, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos + TILE_POS(0, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos + TILE_POS(1, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, metaTilePos + TILE_POS(-1, -1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, metaTilePos + TILE_POS(0, -1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_36, metaTilePos + TILE_POS(1, -1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, metaTilePos + TILE_POS(-1, -2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, metaTilePos + TILE_POS(0, -2), super->collisionLayer); + tilePos = this->unk_80; + SetTile(SPECIAL_TILE_46, tilePos + TILE_POS(-1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos + TILE_POS(0, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos + TILE_POS(1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_38, tilePos + TILE_POS(-1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_38, tilePos + TILE_POS(0, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_36, tilePos + TILE_POS(1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_38, tilePos + TILE_POS(-1, -2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, tilePos + TILE_POS(0, -2), super->collisionLayer); } diff --git a/src/object/beanstalk.c b/src/object/beanstalk.c index 54745987..8fcbd27e 100644 --- a/src/object/beanstalk.c +++ b/src/object/beanstalk.c @@ -258,8 +258,8 @@ void Beanstalk_Action1Type7(BeanstalkEntity* this) { this->tilePos = TILE(super->x.HALF.HI, this->unk_6c); while (TRUE) { this->tilePos = TILE(super->x.HALF.HI, this->unk_6c); - SetMetaTile(SPECIAL_META_TILE_23, this->tilePos, LAYER_TOP); - SetMetaTile(SPECIAL_META_TILE_23, this->tilePos, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_23, this->tilePos, LAYER_TOP); + SetTile(SPECIAL_TILE_23, this->tilePos, LAYER_BOTTOM); this->unk_6c += 0x10; if (this->unk_6c >= gRoomControls.origin_y + gRoomControls.height) break; @@ -308,7 +308,7 @@ void Beanstalk_Action1Type8SubAction0(BeanstalkEntity* this) { super->spriteOrientation.flipY = 2; this->tilePos = COORD_TO_TILE(super); - SetMetaTile(SPECIAL_META_TILE_23, this->tilePos, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_23, this->tilePos, LAYER_BOTTOM); super->subAction = 1; obj = CreateObjectWithParent(super, CHUCHU_BOSS_PARTICLE, 0, 0); if (obj != NULL) { @@ -339,13 +339,13 @@ void Beanstalk_Action1Type9(BeanstalkEntity* this) { super->spriteRendering.b3 = gPlayerEntity.base.spriteRendering.b3; if (gPlayerState.floor_type == SURFACE_LADDER) { super->spritePriority.b0 = 0; - if (sub_080B1A0C(super, 0, -24) != SPECIAL_META_TILE_20) { - SetMetaTile(SPECIAL_META_TILE_20, COORD_TO_TILE_OFFSET(super, 0, 24), LAYER_BOTTOM); + if (sub_080B1A0C(super, 0, -24) != SPECIAL_TILE_20) { + SetTile(SPECIAL_TILE_20, COORD_TO_TILE_OFFSET(super, 0, 24), LAYER_BOTTOM); } } else { super->spritePriority.b0 = 5; if (this->unk_72 != sub_080B1A0C(super, 0, -24)) { - SetMetaTile(this->unk_72, COORD_TO_TILE_OFFSET(super, 0, 24), LAYER_BOTTOM); + SetTile(this->unk_72, COORD_TO_TILE_OFFSET(super, 0, 24), LAYER_BOTTOM); } } } diff --git a/src/object/bigBarrel.c b/src/object/bigBarrel.c index b3c3a6d2..74f13c50 100644 --- a/src/object/bigBarrel.c +++ b/src/object/bigBarrel.c @@ -294,7 +294,7 @@ void BigBarrel_Type4(BigBarrelEntity* this) { flame->collisionLayer = 2; flame->spritePriority.b0 = 2; } - SetMetaTileType(META_TILE_TYPE_118, COORD_TO_TILE(super), LAYER_TOP); + SetTileType(TILE_TYPE_118, COORD_TO_TILE(super), LAYER_TOP); break; case 2: if (--super->timer) { diff --git a/src/object/bigIceBlock.c b/src/object/bigIceBlock.c index c53150ff..a4398c99 100644 --- a/src/object/bigIceBlock.c +++ b/src/object/bigIceBlock.c @@ -129,127 +129,127 @@ void sub_08099910(BigIceBlockEntity* this) { u32 uVar2; s32 vvv; u32 tileIndex; - u32 metaTilePos; + u32 tilePos; - metaTilePos = COORD_TO_TILE(super); - this->unk_6e = metaTilePos; + tilePos = COORD_TO_TILE(super); + this->unk_6e = tilePos; uVar2 = (((super->x.HALF.HI & 8)) >> 0x3) + ((super->y.HALF.HI & 8) >> 2); this->unk_6c = uVar2; switch (uVar2) { default: - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos - 0x41, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos - 0x40, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos - 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 0x41, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); break; case 1: - vvv = GetVvvAtMetaTilePos(metaTilePos - 0x41, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_36; + vvv = GetVvvAtTilePos(tilePos - 0x41, super->collisionLayer); + tileIndex = SPECIAL_TILE_36; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_121; + tileIndex = SPECIAL_TILE_121; } - SetMetaTile(tileIndex, metaTilePos - 0x41, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos - 0x40, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos - 0x3f, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_37; + SetTile(tileIndex, tilePos - 0x41, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 0x40, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos - 0x3f, super->collisionLayer); + tileIndex = SPECIAL_TILE_37; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_123; + tileIndex = SPECIAL_TILE_123; } - SetMetaTile(tileIndex, metaTilePos - 0x3f, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos - 1, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_36; + SetTile(tileIndex, tilePos - 0x3f, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos - 1, super->collisionLayer); + tileIndex = SPECIAL_TILE_36; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_121; + tileIndex = SPECIAL_TILE_121; } - SetMetaTile(tileIndex, metaTilePos - 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos + 1, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_37; + SetTile(tileIndex, tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos + 1, super->collisionLayer); + tileIndex = SPECIAL_TILE_37; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_123; + tileIndex = SPECIAL_TILE_123; } - SetMetaTile(tileIndex, metaTilePos + 1, super->collisionLayer); + SetTile(tileIndex, tilePos + 1, super->collisionLayer); return; break; case 2: - vvv = GetVvvAtMetaTilePos(metaTilePos - 0x41, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_35; + vvv = GetVvvAtTilePos(tilePos - 0x41, super->collisionLayer); + tileIndex = SPECIAL_TILE_35; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_119; + tileIndex = SPECIAL_TILE_119; } - SetMetaTile(tileIndex, metaTilePos - 0x41, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos - 0x40, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_35; + SetTile(tileIndex, tilePos - 0x41, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos - 0x40, super->collisionLayer); + tileIndex = SPECIAL_TILE_35; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_119; + tileIndex = SPECIAL_TILE_119; } - SetMetaTile(tileIndex, metaTilePos - 0x40, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos - 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos + 0x3f, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_38; + SetTile(tileIndex, tilePos - 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos + 0x3f, super->collisionLayer); + tileIndex = SPECIAL_TILE_38; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_124; + tileIndex = SPECIAL_TILE_124; } - SetMetaTile(tileIndex, metaTilePos + 0x3f, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos + 0x40, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_38; + SetTile(tileIndex, tilePos + 0x3f, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos + 0x40, super->collisionLayer); + tileIndex = SPECIAL_TILE_38; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_124; + tileIndex = SPECIAL_TILE_124; } - SetMetaTile(tileIndex, metaTilePos + 0x40, super->collisionLayer); + SetTile(tileIndex, tilePos + 0x40, super->collisionLayer); break; case 3: - vvv = GetVvvAtMetaTilePos(metaTilePos - 0x41, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_39; + vvv = GetVvvAtTilePos(tilePos - 0x41, super->collisionLayer); + tileIndex = SPECIAL_TILE_39; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_117; + tileIndex = SPECIAL_TILE_117; } - SetMetaTile(tileIndex, metaTilePos - 0x41, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos - 0x40, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_35; + SetTile(tileIndex, tilePos - 0x41, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos - 0x40, super->collisionLayer); + tileIndex = SPECIAL_TILE_35; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_119; + tileIndex = SPECIAL_TILE_119; } - SetMetaTile(tileIndex, metaTilePos - 0x40, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos - 0x3f, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_40; + SetTile(tileIndex, tilePos - 0x40, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos - 0x3f, super->collisionLayer); + tileIndex = SPECIAL_TILE_40; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_118; + tileIndex = SPECIAL_TILE_118; } - SetMetaTile(tileIndex, metaTilePos - 0x3f, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos - 1, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_36; + SetTile(tileIndex, tilePos - 0x3f, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos - 1, super->collisionLayer); + tileIndex = SPECIAL_TILE_36; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_121; + tileIndex = SPECIAL_TILE_121; } - SetMetaTile(tileIndex, metaTilePos - 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos + 1, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_37; + SetTile(tileIndex, tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos + 1, super->collisionLayer); + tileIndex = SPECIAL_TILE_37; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_123; + tileIndex = SPECIAL_TILE_123; } - SetMetaTile(tileIndex, metaTilePos + 1, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos + 0x3f, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_41; + SetTile(tileIndex, tilePos + 1, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos + 0x3f, super->collisionLayer); + tileIndex = SPECIAL_TILE_41; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_120; + tileIndex = SPECIAL_TILE_120; } - SetMetaTile(tileIndex, metaTilePos + 0x3f, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos + 0x40, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_38; + SetTile(tileIndex, tilePos + 0x3f, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos + 0x40, super->collisionLayer); + tileIndex = SPECIAL_TILE_38; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_124; + tileIndex = SPECIAL_TILE_124; } - SetMetaTile(tileIndex, metaTilePos + 0x40, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(metaTilePos + 0x41, super->collisionLayer); - tileIndex = SPECIAL_META_TILE_42; + SetTile(tileIndex, tilePos + 0x40, super->collisionLayer); + vvv = GetVvvAtTilePos(tilePos + 0x41, super->collisionLayer); + tileIndex = SPECIAL_TILE_42; if (vvv == VVV_18) { - tileIndex = SPECIAL_META_TILE_122; + tileIndex = SPECIAL_TILE_122; } - SetMetaTile(tileIndex, metaTilePos + 0x41, super->collisionLayer); + SetTile(tileIndex, tilePos + 0x41, super->collisionLayer); break; } } diff --git a/src/object/bigPushableLever.c b/src/object/bigPushableLever.c index 97866857..5847ca65 100644 --- a/src/object/bigPushableLever.c +++ b/src/object/bigPushableLever.c @@ -33,7 +33,7 @@ extern const u8 BigPushableLever_PushedOffsets[]; void BigPushableLever_SetIdle(BigPushableLeverEntity*); bool32 BigPushableLever_ShouldStartPushing(BigPushableLeverEntity*); -void BigPushableLever_SetMetaTiles(BigPushableLeverEntity*); +void BigPushableLever_SetTiles(BigPushableLeverEntity*); void BigPushableLever_CalculateSpriteOffsets(BigPushableLeverEntity*); void BigPushableLever(BigPushableLeverEntity* this) { @@ -48,8 +48,8 @@ void BigPushableLever_Init(BigPushableLeverEntity* this) { void BigPushableLever_Idle(BigPushableLeverEntity* this) { if (BigPushableLever_ShouldStartPushing(this)) { super->action = PUSHING; - SetMetaTile(this->tileIndexUpper, this->tilePositionUpper, super->collisionLayer); - SetMetaTile(this->tileIndexLower, this->tilePositionLower, super->collisionLayer); + SetTile(this->tileIndexUpper, this->tilePositionUpper, super->collisionLayer); + SetTile(this->tileIndexLower, this->tilePositionLower, super->collisionLayer); EnqueueSFX(SFX_132); RequestPriorityDuration(super, 30); if (PlayerCanBeMoved()) { @@ -78,38 +78,38 @@ void BigPushableLever_Pushing(BigPushableLeverEntity* this) { void BigPushableLever_SetIdle(BigPushableLeverEntity* this) { super->action = IDLE; this->timer = 60; - BigPushableLever_SetMetaTiles(this); + BigPushableLever_SetTiles(this); } -void BigPushableLever_SetMetaTiles(BigPushableLeverEntity* this) { +void BigPushableLever_SetTiles(BigPushableLeverEntity* this) { if (!CheckFlags(this->pushedFlag)) { super->type2 = 0; this->tilePositionUpper = COORD_TO_TILE_OFFSET(super, 0, 0x10); this->tilePositionLower = this->tilePositionUpper - 0x40; - this->tileIndexUpper = GetMetaTileIndex(this->tilePositionUpper, super->collisionLayer); - this->tileIndexLower = GetMetaTileIndex(this->tilePositionLower, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_87, this->tilePositionUpper, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_88, this->tilePositionLower, super->collisionLayer); + this->tileIndexUpper = GetTileIndex(this->tilePositionUpper, super->collisionLayer); + this->tileIndexLower = GetTileIndex(this->tilePositionLower, super->collisionLayer); + SetTile(SPECIAL_TILE_87, this->tilePositionUpper, super->collisionLayer); + SetTile(SPECIAL_TILE_88, this->tilePositionLower, super->collisionLayer); InitializeAnimation(super, 1); } else { super->type2 = 1; this->tilePositionUpper = COORD_TO_TILE_OFFSET(super, 0x10, 0); this->tilePositionLower = this->tilePositionUpper - 1; - this->tileIndexUpper = GetMetaTileIndex(this->tilePositionUpper, super->collisionLayer); - this->tileIndexLower = GetMetaTileIndex(this->tilePositionLower, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_85, this->tilePositionUpper, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_86, this->tilePositionLower, super->collisionLayer); + this->tileIndexUpper = GetTileIndex(this->tilePositionUpper, super->collisionLayer); + this->tileIndexLower = GetTileIndex(this->tilePositionLower, super->collisionLayer); + SetTile(SPECIAL_TILE_85, this->tilePositionUpper, super->collisionLayer); + SetTile(SPECIAL_TILE_86, this->tilePositionLower, super->collisionLayer); InitializeAnimation(super, 0); } } bool32 BigPushableLever_ShouldStartPushing(BigPushableLeverEntity* this) { - if (GetMetaTileIndex(this->tilePositionLower, super->collisionLayer) == SPECIAL_META_TILE_89) { + if (GetTileIndex(this->tilePositionLower, super->collisionLayer) == SPECIAL_TILE_89) { if (--this->timer == 0) { return TRUE; } BigPushableLever_CalculateSpriteOffsets(this); - SetMetaTile(gUnk_081236E8[super->type2], this->tilePositionLower, super->collisionLayer); + SetTile(gUnk_081236E8[super->type2], this->tilePositionLower, super->collisionLayer); } else { this->timer = 60; super->spriteOffsetX = 0; @@ -139,8 +139,8 @@ void (*const BigPushableLever_Actions[])(BigPushableLeverEntity*) = { BigPushableLever_Pushing, }; const u16 gUnk_081236E8[] = { - SPECIAL_META_TILE_88, - SPECIAL_META_TILE_86, + SPECIAL_TILE_88, + SPECIAL_TILE_86, }; const u8 BigPushableLever_InitialOffsets[] = { 0, 0, 0, 0, 255, 0, 0, 0, diff --git a/src/object/blockPushed.c b/src/object/blockPushed.c index 44de24d1..b6933775 100644 --- a/src/object/blockPushed.c +++ b/src/object/blockPushed.c @@ -26,7 +26,7 @@ void BlockPushed(BlockPushedEntity* this) { void BlockPushed_Init(BlockPushedEntity* this) { u16 tmp; - u32 metaTilePos; + u32 tilePos; if (gRoomControls.area == AREA_MINISH_PATHS) { UnloadGFXSlots(super); @@ -40,50 +40,50 @@ void BlockPushed_Init(BlockPushedEntity* this) { super->timer = 32; super->speed = 0x80; super->spritePriority.b0 = 6; - metaTilePos = COORD_TO_TILE(super); + tilePos = COORD_TO_TILE(super); tmp = super->type * 8; super->x.HALF.HI += tmp; super->y.HALF.HI += tmp; super->hitbox = (Hitbox*)gUnk_0811F64C[super->type]; - this->unk_68 = GetMetaTileType(metaTilePos, super->collisionLayer); + this->unk_68 = GetTileType(tilePos, super->collisionLayer); switch (super->type) { case 0: - sub_080832D8(metaTilePos, this); + sub_080832D8(tilePos, this); break; case 1: - sub_080832D8(metaTilePos, this); - sub_080832D8(metaTilePos + 1, this); - sub_080832D8(metaTilePos + 0x40, this); - sub_080832D8(metaTilePos + 0x41, this); + sub_080832D8(tilePos, this); + sub_080832D8(tilePos + 1, this); + sub_080832D8(tilePos + 0x40, this); + sub_080832D8(tilePos + 0x41, this); break; case 2: - sub_080832D8(metaTilePos, this); - sub_080832D8(metaTilePos + 1, this); - sub_080832D8(metaTilePos + 2, this); - sub_080832D8(metaTilePos + 0x40, this); - sub_080832D8(metaTilePos + 0x41, this); - sub_080832D8(metaTilePos + 0x42, this); - sub_080832D8(metaTilePos + 0x80, this); - sub_080832D8(metaTilePos + 0x81, this); - sub_080832D8(metaTilePos + 0x82, this); + sub_080832D8(tilePos, this); + sub_080832D8(tilePos + 1, this); + sub_080832D8(tilePos + 2, this); + sub_080832D8(tilePos + 0x40, this); + sub_080832D8(tilePos + 0x41, this); + sub_080832D8(tilePos + 0x42, this); + sub_080832D8(tilePos + 0x80, this); + sub_080832D8(tilePos + 0x81, this); + sub_080832D8(tilePos + 0x82, this); break; default: - sub_080832D8(metaTilePos, this); - sub_080832D8(metaTilePos + 1, this); - sub_080832D8(metaTilePos + 2, this); - sub_080832D8(metaTilePos + 3, this); - sub_080832D8(metaTilePos + 0x40, this); - sub_080832D8(metaTilePos + 0x41, this); - sub_080832D8(metaTilePos + 0x42, this); - sub_080832D8(metaTilePos + 0x43, this); - sub_080832D8(metaTilePos + 0x80, this); - sub_080832D8(metaTilePos + 0x81, this); - sub_080832D8(metaTilePos + 0x82, this); - sub_080832D8(metaTilePos + 0x83, this); - sub_080832D8(metaTilePos + 0xc0, this); - sub_080832D8(metaTilePos + 0xc1, this); - sub_080832D8(metaTilePos + 0xc2, this); - sub_080832D8(metaTilePos + 0xc3, this); + sub_080832D8(tilePos, this); + sub_080832D8(tilePos + 1, this); + sub_080832D8(tilePos + 2, this); + sub_080832D8(tilePos + 3, this); + sub_080832D8(tilePos + 0x40, this); + sub_080832D8(tilePos + 0x41, this); + sub_080832D8(tilePos + 0x42, this); + sub_080832D8(tilePos + 0x43, this); + sub_080832D8(tilePos + 0x80, this); + sub_080832D8(tilePos + 0x81, this); + sub_080832D8(tilePos + 0x82, this); + sub_080832D8(tilePos + 0x83, this); + sub_080832D8(tilePos + 0xc0, this); + sub_080832D8(tilePos + 0xc1, this); + sub_080832D8(tilePos + 0xc2, this); + sub_080832D8(tilePos + 0xc3, this); break; } EnqueueSFX(SFX_10F); @@ -147,18 +147,18 @@ void sub_080830B8(BlockPushedEntity* this) { DeleteEntity(super); } -void sub_080832D8(u32 metaTilePos, BlockPushedEntity* this) { +void sub_080832D8(u32 tilePos, BlockPushedEntity* this) { if (super->collisionLayer != 2) { if ((super->direction & 8) != 0) { - sub_0807B7D8(META_TILE_TYPE_33, metaTilePos, super->collisionLayer); + sub_0807B7D8(TILE_TYPE_33, tilePos, super->collisionLayer); } else { - sub_0807B7D8(META_TILE_TYPE_32, metaTilePos, super->collisionLayer); + sub_0807B7D8(TILE_TYPE_32, tilePos, super->collisionLayer); } } else { if ((super->direction & 8) != 0) { - sub_0807B7D8(META_TILE_TYPE_47, metaTilePos, super->collisionLayer); + sub_0807B7D8(TILE_TYPE_47, tilePos, super->collisionLayer); } else { - sub_0807B7D8(META_TILE_TYPE_46, metaTilePos, super->collisionLayer); + sub_0807B7D8(TILE_TYPE_46, tilePos, super->collisionLayer); } } } diff --git a/src/object/board.c b/src/object/board.c index ab06c063..a05b42e4 100644 --- a/src/object/board.c +++ b/src/object/board.c @@ -18,7 +18,7 @@ typedef struct { u16 y; u16 unk7c; u16 unk7e; - u16 tile; + u16 tilePos; u8 width; u8 height; } BoardEntity; @@ -49,12 +49,12 @@ void Board_Init(BoardEntity* this) { this->height = size[1]; this->x = super->x.HALF.HI - (this->width >> 1); this->y = super->y.HALF.HI - (this->height >> 1); - this->tile = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); super->collisionLayer = 1; UpdateSpriteForCollisionLayer(super); super->spritePriority.b0 = 6; if (super->type == 0) { - SetMetaTile(SPECIAL_META_TILE_116, this->tile + TILE_POS(0, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_116, this->tilePos + TILE_POS(0, -1), super->collisionLayer); } sub_08098BE8(this); } @@ -67,7 +67,7 @@ void sub_08098BE8(BoardEntity* this) { if ((gPlayerState.flags & PL_MINISH) && sub_08098C30(this, &gPlayerEntity.base) && PlayerCanBeMoved() && gPlayerEntity.base.z.HALF.HI == 0) { gPlayerState.field_0x14 = 1; - sub_0807AAF8(&gPlayerEntity.base, this->tile); + sub_0807AAF8(&gPlayerEntity.base, this->tilePos); } } diff --git a/src/object/bollard.c b/src/object/bollard.c index 18891082..43286546 100644 --- a/src/object/bollard.c +++ b/src/object/bollard.c @@ -15,8 +15,8 @@ typedef struct { Entity base; u8 filler[0x8]; - u16 metaTilePos; - u16 metaTileIndex; + u16 tilePos; + u16 tileIndex; u8 collisionData; u8 unk75; u8 filler2[0x10]; @@ -59,7 +59,7 @@ void Bollard_Action1(BollardEntity* this) { } super->action = 2; InitializeAnimation(super, 3); - SetMetaTile(this->metaTileIndex, this->metaTilePos, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); EnqueueSFX(SFX_1A5); } @@ -93,10 +93,10 @@ void Bollard_Action4(BollardEntity* this) { void sub_0808B3AC(BollardEntity* this) { super->spritePriority.b0 = 4; - this->metaTilePos = COORD_TO_TILE(super); - this->metaTileIndex = GetMetaTileIndex(this->metaTilePos, super->collisionLayer); - this->collisionData = GetCollisionDataAtMetaTilePos(this->metaTilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_11, this->metaTilePos, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + this->collisionData = GetCollisionDataAtTilePos(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_11, this->tilePos, super->collisionLayer); } void sub_0808B41C(BollardEntity* this) { diff --git a/src/object/bossDoor.c b/src/object/bossDoor.c index f40de13f..fab846b9 100644 --- a/src/object/bossDoor.c +++ b/src/object/bossDoor.c @@ -175,31 +175,31 @@ void sub_0808C4BC(BossDoorEntity* this) { void sub_0808C500(BossDoorEntity* this) { if ((this->unk_76 == 0) || (this->unk_76 == 2)) { - this->unk_78 = GetMetaTileIndex(this->unk_74 - 1, super->collisionLayer); - this->unk_7a = GetMetaTileIndex(this->unk_74, super->collisionLayer); - this->unk_7c = GetMetaTileIndex(this->unk_74 + 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_74 - 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_74, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_74 + 1, super->collisionLayer); + this->unk_78 = GetTileIndex(this->unk_74 - 1, super->collisionLayer); + this->unk_7a = GetTileIndex(this->unk_74, super->collisionLayer); + this->unk_7c = GetTileIndex(this->unk_74 + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 + 1, super->collisionLayer); } else { - this->unk_78 = GetMetaTileIndex(this->unk_74 - 0x40, super->collisionLayer); - this->unk_7a = GetMetaTileIndex(this->unk_74, super->collisionLayer); - this->unk_7c = GetMetaTileIndex(this->unk_74 + 0x40, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_74 - 0x40, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_74, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_74 + 0x40, super->collisionLayer); + this->unk_78 = GetTileIndex(this->unk_74 - 0x40, super->collisionLayer); + this->unk_7a = GetTileIndex(this->unk_74, super->collisionLayer); + this->unk_7c = GetTileIndex(this->unk_74 + 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 - 0x40, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 + 0x40, super->collisionLayer); } } void sub_0808C5D0(BossDoorEntity* this) { if ((this->unk_76 == 0) || (this->unk_76 == 2)) { - SetMetaTile(this->unk_78, this->unk_74 - 1, super->collisionLayer); - SetMetaTile(this->unk_7a, this->unk_74, super->collisionLayer); - SetMetaTile(this->unk_7c, this->unk_74 + 1, super->collisionLayer); + SetTile(this->unk_78, this->unk_74 - 1, super->collisionLayer); + SetTile(this->unk_7a, this->unk_74, super->collisionLayer); + SetTile(this->unk_7c, this->unk_74 + 1, super->collisionLayer); } else { - SetMetaTile(this->unk_78, this->unk_74 - 0x40, super->collisionLayer); - SetMetaTile(this->unk_7a, this->unk_74, super->collisionLayer); - SetMetaTile(this->unk_7c, this->unk_74 + 0x40, super->collisionLayer); + SetTile(this->unk_78, this->unk_74 - 0x40, super->collisionLayer); + SetTile(this->unk_7a, this->unk_74, super->collisionLayer); + SetTile(this->unk_7c, this->unk_74 + 0x40, super->collisionLayer); } } diff --git a/src/object/bush.c b/src/object/bush.c index 251c3cd2..a83a2aec 100644 --- a/src/object/bush.c +++ b/src/object/bush.c @@ -68,8 +68,8 @@ void Bush_Init(BushEntity* this) { super->collisionMask = 4; super->hitbox = (Hitbox*)&gUnk_081205B4; this->unk_72 = 0; - this->unk_70 = GetMetaTileIndex(COORD_TO_TILE(super), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, COORD_TO_TILE(super), super->collisionLayer); + this->unk_70 = GetTileIndex(COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(super), super->collisionLayer); InitializeAnimation(super, gUnk_08120588[super->type].unk_0); } @@ -107,7 +107,7 @@ void Bush_Action2SubAction2(BushEntity* this) { if (this->unk_72 == 0) { this->unk_72 = 1; super->spriteOffsetX = 0; - SetMetaTileByIndex(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTileByIndex(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); } if (((gPlayerState.gustJarState & 0xf) != 1) || ((super->contactFlags & 0x7f) != 0x13)) { Bush_Action2SubAction5(this); diff --git a/src/object/button.c b/src/object/button.c index 6c88ace8..7c238e5b 100644 --- a/src/object/button.c +++ b/src/object/button.c @@ -13,7 +13,7 @@ typedef struct { /*0x68*/ u8 unused1[8]; /*0x70*/ u16 unk_70; /*0x72*/ u16 unk_72; - /*0x74*/ u16 metaTilePos; + /*0x74*/ u16 tilePos; /*0x76*/ u8 unused2[14]; /*0x84*/ u16 unk_84; /*0x86*/ u16 unk_86; @@ -42,12 +42,12 @@ void Button_Init(ButtonEntity* this) { if (this->unk_84 != 0) { super->collisionLayer = this->unk_84; } - this->metaTilePos = (((super->x.HALF.HI - gRoomControls.origin_x) >> 4) & 0x3F) | + this->tilePos = (((super->x.HALF.HI - gRoomControls.origin_x) >> 4) & 0x3F) | ((((super->y.HALF.HI - gRoomControls.origin_y) >> 4) & 0x3F) << 6); - this->unk_72 = GetMetaTileType(this->metaTilePos, super->collisionLayer); + this->unk_72 = GetTileType(this->tilePos, super->collisionLayer); if (super->type == 0 && CheckFlags(this->unk_86)) { super->action = 5; - SetMetaTileType(META_TILE_TYPE_122, this->metaTilePos, super->collisionLayer); + SetTileType(TILE_TYPE_122, this->tilePos, super->collisionLayer); } else { if (sub_08081E3C(this)) { super->action = 2; @@ -60,7 +60,7 @@ void Button_Init(ButtonEntity* this) { void Button_Action1(ButtonEntity* this) { if (sub_08081E3C(this)) { super->action = 2; - this->unk_72 = GetMetaTileType(this->metaTilePos, super->collisionLayer); + this->unk_72 = GetTileType(this->tilePos, super->collisionLayer); } } @@ -81,12 +81,12 @@ void Button_Action2(ButtonEntity* this) { } } -u32 sub_08081F7C(ButtonEntity*, u32 metaTileType); +u32 sub_08081F7C(ButtonEntity*, u32 tileType); u32 sub_08081D28(ButtonEntity*); void sub_08081E6C(ButtonEntity*); void Button_Action3(ButtonEntity* this) { - if (!sub_08081F7C(this, META_TILE_TYPE_120)) + if (!sub_08081F7C(this, TILE_TYPE_120)) return; if (!sub_08081D28(this)) { super->action = 4; @@ -106,7 +106,7 @@ void Button_Action4(ButtonEntity* this) { super->timer--; if (super->subtimer != 0) { super->subtimer = 0; - SetMetaTile(SPECIAL_META_TILE_53, this->metaTilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_53, this->tilePos, super->collisionLayer); } if (sub_08081CB0(this)) { super->action = 3; @@ -115,13 +115,13 @@ void Button_Action4(ButtonEntity* this) { } else { super->action = 2; ClearFlag(this->unk_86); - SetMetaTileType(META_TILE_TYPE_119, this->metaTilePos, super->collisionLayer); + SetTileType(TILE_TYPE_119, this->tilePos, super->collisionLayer); SoundReq(SFX_BUTTON_PRESS); } } void Button_Action5(ButtonEntity* this) { - if (sub_08081F7C(this, META_TILE_TYPE_122)) { + if (sub_08081F7C(this, TILE_TYPE_122)) { sub_08081E6C(this); } } @@ -132,14 +132,14 @@ bool32 sub_08081CB0(ButtonEntity* this) { u16 tileType; if (sub_08081D74(this)) { this->unk_70 = -1; - if (GetMetaTileType(this->metaTilePos, super->collisionLayer) == SPECIAL_META_TILE_53) { - sub_0807B7D8(0x78, this->metaTilePos, super->collisionLayer); + if (GetTileType(this->tilePos, super->collisionLayer) == SPECIAL_TILE_53) { + sub_0807B7D8(0x78, this->tilePos, super->collisionLayer); } return TRUE; } else { - tileType = GetMetaTileType(this->metaTilePos, super->collisionLayer); - if (tileType != 0x77 && tileType != 0x79 && tileType != SPECIAL_META_TILE_53) { - this->unk_70 = GetMetaTileIndex(this->metaTilePos, super->collisionLayer); + tileType = GetTileType(this->tilePos, super->collisionLayer); + if (tileType != 0x77 && tileType != 0x79 && tileType != SPECIAL_TILE_53) { + this->unk_70 = GetTileIndex(this->tilePos, super->collisionLayer); return TRUE; } } @@ -154,7 +154,7 @@ bool32 sub_08081D28(ButtonEntity* this) { if (this->unk_70 == 0xFFFF) { return FALSE; } - if (GetMetaTileIndex(this->metaTilePos, super->collisionLayer) != this->unk_70) { + if (GetTileIndex(this->tilePos, super->collisionLayer) != this->unk_70) { return FALSE; } } @@ -166,7 +166,7 @@ u32 sub_08081E0C(Entity*); Entity* sub_08081D74(ButtonEntity* this) { Entity* ent; - if (GetCollisionDataAtMetaTilePos(this->metaTilePos, super->collisionLayer) == COLLISION_DATA_15) { + if (GetCollisionDataAtTilePos(this->tilePos, super->collisionLayer) == COLLISION_DATA_15) { return NULL; } ent = 0; @@ -204,7 +204,7 @@ u32 sub_08081E3C(ButtonEntity* this) { }; const u16* tmp1; s32 tmp2; - tmp2 = GetMetaTileType(this->metaTilePos, super->collisionLayer); + tmp2 = GetTileType(this->tilePos, super->collisionLayer); tmp1 = gUnk_0811EE50; do { if (*tmp1 == tmp2) @@ -220,34 +220,34 @@ extern u16 gMapDataTopSpecial[0x2000]; extern u16 gMapDataBottomSpecial[]; void sub_08081E6C(ButtonEntity* this) { - u32 metaTileType; + u32 tileType; MapLayer* mapLayer; u16* tmp2; u16* tmp; u16* tmp3; - u32 metaTilePos = this->metaTilePos; + u32 tilePos = this->tilePos; u32 layer = super->collisionLayer; - u32 specialMetaTile = GetMetaTileType(metaTilePos, layer); + u32 specialTile = GetTileType(tilePos, layer); - if (specialMetaTile < 0x4000) + if (specialTile < 0x4000) return; mapLayer = GetLayerByIndex(layer); - metaTileType = (super->type == 0 ? META_TILE_TYPE_122 : META_TILE_TYPE_120); - tmp = mapLayer->metatiles; - tmp = tmp + (mapLayer->unkData2[metaTileType] << 2); + tileType = (super->type == 0 ? TILE_TYPE_122 : TILE_TYPE_120); + tmp = mapLayer->tiles; + tmp = tmp + (mapLayer->unkData2[tileType] << 2); tmp2 = (layer == 2 ? gMapDataTopSpecial : gMapDataBottomSpecial); - tmp2 += (((0x3f & metaTilePos) << 1) + ((0xfc0 & metaTilePos) << 2)); + tmp2 += (((0x3f & tilePos) << 1) + ((0xfc0 & tilePos) << 2)); if (sub_08081F00((u32*)tmp2, (u32*)tmp)) return; - SetMetaTileType(metaTileType, metaTilePos, layer); - SetMetaTile(specialMetaTile, metaTilePos, layer); + SetTileType(tileType, tilePos, layer); + SetTile(specialTile, tilePos, layer); } // Are the two tiles already set to the correct one -bool32 sub_08081F00(u32* screenblock, u32* metatileList) { - if (screenblock[0] != metatileList[0]) +bool32 sub_08081F00(u32* screenblock, u32* tileList) { + if (screenblock[0] != tileList[0]) return FALSE; - if (screenblock[0x40] != metatileList[1]) + if (screenblock[0x40] != tileList[1]) return FALSE; return TRUE; } @@ -267,7 +267,7 @@ void sub_08081F24(Entity* this) { } } -bool32 sub_08081F7C(ButtonEntity* this, u32 metaTileType) { +bool32 sub_08081F7C(ButtonEntity* this, u32 tileType) { u16 tmp; if (super->timer == 0) return TRUE; @@ -277,11 +277,11 @@ bool32 sub_08081F7C(ButtonEntity* this, u32 metaTileType) { } else { if (super->timer == 6) { SetFlag(this->unk_86); - SetMetaTileType(metaTileType, this->metaTilePos, super->collisionLayer); + SetTileType(tileType, this->tilePos, super->collisionLayer); sub_08081F24(super); SoundReq(SFX_BUTTON_PRESS); if (this->unk_70 != 0xFFFF) - SetMetaTile(this->unk_70, this->metaTilePos, super->collisionLayer); + SetTile(this->unk_70, this->tilePos, super->collisionLayer); return FALSE; } } diff --git a/src/object/cabinFurniture.c b/src/object/cabinFurniture.c index 0aa744a2..0c37cb14 100644 --- a/src/object/cabinFurniture.c +++ b/src/object/cabinFurniture.c @@ -13,7 +13,7 @@ typedef struct { Entity base; u8 filler[0x18]; - u16 tile; + u16 tilePos; } CabinFurnitureEntity; void CabinFurniture_Init(CabinFurnitureEntity* this); @@ -35,47 +35,47 @@ void CabinFurniture_Init(CabinFurnitureEntity* this) { u32 uVar6; u32 uVar7; - this->tile = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); layer = super->collisionLayer; UpdateSpriteForCollisionLayer(super); switch (super->type) { case 0: super->action = 2; super->spritePriority.b0 = 6; - uVar7 = this->tile; + uVar7 = this->tilePos; uVar6 = uVar7 - 1; - SetMetaTile(SPECIAL_META_TILE_34, uVar6, layer); - SetMetaTile(SPECIAL_META_TILE_34, uVar7, layer); - SetMetaTile(SPECIAL_META_TILE_34, uVar7 + 1, layer); - SetMetaTile(SPECIAL_META_TILE_34, uVar7 + 0x3f, layer); - SetMetaTile(SPECIAL_META_TILE_34, uVar7 + 0x40, layer); - SetMetaTile(SPECIAL_META_TILE_34, uVar7 + 0x41, layer); - SetMetaTile(SPECIAL_META_TILE_61, uVar7 - 0x41, layer); - SetMetaTile(SPECIAL_META_TILE_61, uVar7 - 0x40, layer); - SetMetaTile(SPECIAL_META_TILE_38, uVar7 - 0x3f, layer); - SetMetaTile(SPECIAL_META_TILE_38, uVar7 - 0x81, layer); - SetMetaTile(SPECIAL_META_TILE_38, uVar7 - 0x80, layer); + SetTile(SPECIAL_TILE_34, uVar6, layer); + SetTile(SPECIAL_TILE_34, uVar7, layer); + SetTile(SPECIAL_TILE_34, uVar7 + 1, layer); + SetTile(SPECIAL_TILE_34, uVar7 + 0x3f, layer); + SetTile(SPECIAL_TILE_34, uVar7 + 0x40, layer); + SetTile(SPECIAL_TILE_34, uVar7 + 0x41, layer); + SetTile(SPECIAL_TILE_61, uVar7 - 0x41, layer); + SetTile(SPECIAL_TILE_61, uVar7 - 0x40, layer); + SetTile(SPECIAL_TILE_38, uVar7 - 0x3f, layer); + SetTile(SPECIAL_TILE_38, uVar7 - 0x81, layer); + SetTile(SPECIAL_TILE_38, uVar7 - 0x80, layer); break; case 1: super->action = 1; - uVar6 = this->tile; - SetMetaTile(SPECIAL_META_TILE_34, uVar6, layer); - SetMetaTile(SPECIAL_META_TILE_34, uVar6 + 0x40, layer); - SetMetaTile(SPECIAL_META_TILE_37, uVar6 + 0x41, layer); + uVar6 = this->tilePos; + SetTile(SPECIAL_TILE_34, uVar6, layer); + SetTile(SPECIAL_TILE_34, uVar6 + 0x40, layer); + SetTile(SPECIAL_TILE_37, uVar6 + 0x41, layer); if (CheckLocalFlag(0x4f) == 0) { - SetMetaTile(SPECIAL_META_TILE_47, uVar6 + 1, layer); + SetTile(SPECIAL_TILE_47, uVar6 + 1, layer); } else { - SetMetaTile(SPECIAL_META_TILE_45, uVar6 + 1, layer); + SetTile(SPECIAL_TILE_45, uVar6 + 1, layer); } break; case 2: super->action = 1; - uVar7 = this->tile; + uVar7 = this->tilePos; uVar6 = uVar7 - 0x41; - SetMetaTile(SPECIAL_META_TILE_34, uVar6, layer); - SetMetaTile(SPECIAL_META_TILE_34, uVar7 - 0x40, layer); - SetMetaTile(SPECIAL_META_TILE_34, uVar7 - 1, layer); - SetMetaTile(SPECIAL_META_TILE_34, uVar7, layer); + SetTile(SPECIAL_TILE_34, uVar6, layer); + SetTile(SPECIAL_TILE_34, uVar7 - 0x40, layer); + SetTile(SPECIAL_TILE_34, uVar7 - 1, layer); + SetTile(SPECIAL_TILE_34, uVar7, layer); break; } } diff --git a/src/object/carlovObject.c b/src/object/carlovObject.c index b5cce22d..23873a92 100644 --- a/src/object/carlovObject.c +++ b/src/object/carlovObject.c @@ -94,11 +94,11 @@ void CarlovObject_Type1Init(CarlovObjectEntity* this) { this->unk_72 = super->y.HALF.HI; super->spritePriority.b0 = 5; this->unk_76 = COORD_TO_TILE(super); - this->unk_74 = GetMetaTileIndex(this->unk_76, super->collisionLayer); + this->unk_74 = GetTileIndex(this->unk_76, super->collisionLayer); if (super->timer == 0) { super->action = 1; super->subtimer = 120; - SetMetaTile(SPECIAL_META_TILE_34, this->unk_76, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_76, super->collisionLayer); } else { super->action = 3; super->spriteSettings.draw = 0; @@ -112,7 +112,7 @@ void CarlovObject_Type1Action1(CarlovObjectEntity* this) { super->action = 2; super->timer = 7; super->direction = 0; - SetMetaTile(this->unk_74, this->unk_76, super->collisionLayer); + SetTile(this->unk_74, this->unk_76, super->collisionLayer); EnqueueSFX(SFX_10B); } } @@ -141,7 +141,7 @@ void CarlovObject_Type1Action4(CarlovObjectEntity* this) { super->action = 5; sub_08083814(super, 2); EnqueueSFX(SFX_10B); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_76, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_76, super->collisionLayer); } } diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c index 18fc3a52..8fea49c9 100644 --- a/src/object/chestSpawner.c +++ b/src/object/chestSpawner.c @@ -14,7 +14,7 @@ typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[8]; - /*0x70*/ u16 tilePosition; + /*0x70*/ u16 tilePos; /*0x72*/ u16 unk_72; /*0x74*/ u8 unk_74[0x12]; /*0x86*/ u16 unk_86; @@ -230,14 +230,14 @@ void ChestSpawner_Type2Action7(ChestSpawnerEntity* this) { void ChestSpawner_Type0Init(ChestSpawnerEntity* this) { super->action++; - this->tilePosition = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); super->hitbox = (Hitbox*)&gUnk_0811F8A8; - if (GetMetaTileTypeByEntity(super) == META_TILE_TYPE_116) { + if (GetTileTypeByEntity(super) == TILE_TYPE_116) { DeleteThisEntity(); } if (CheckFlags(this->unk_86)) { super->action = 3; - sub_0807B7D8(0x73, this->tilePosition, super->collisionLayer); + sub_0807B7D8(0x73, this->tilePos, super->collisionLayer); if ((super->type & 1) == 0) { DeleteThisEntity(); } @@ -251,7 +251,7 @@ void ChestSpawner_Type0Action1(ChestSpawnerEntity* this) { } void ChestSpawner_Type0Action2(ChestSpawnerEntity* this) { - sub_0807B7D8(0x73, this->tilePosition, super->collisionLayer); + sub_0807B7D8(0x73, this->tilePos, super->collisionLayer); switch (super->type) { case 6: case 7: @@ -271,7 +271,7 @@ void ChestSpawner_Type0Action2(ChestSpawnerEntity* this) { void ChestSpawner_Type0Action3(ChestSpawnerEntity* this) { if ((super->type == 1) || (super->type == 7)) { - if (GetMetaTileTypeByEntity(super) == META_TILE_TYPE_116) { + if (GetTileTypeByEntity(super) == TILE_TYPE_116) { DeleteEntity(super); } else { if (!CheckFlags(this->unk_86)) { @@ -279,7 +279,7 @@ void ChestSpawner_Type0Action3(ChestSpawnerEntity* this) { this->unk_72--; } else { super->action = 1; - RestorePrevTileEntity(this->tilePosition, super->collisionLayer); + RestorePrevTileEntity(this->tilePos, super->collisionLayer); CreateDust(super); } } diff --git a/src/object/crenelBeanSprout.c b/src/object/crenelBeanSprout.c index 377de794..578e3ef6 100644 --- a/src/object/crenelBeanSprout.c +++ b/src/object/crenelBeanSprout.c @@ -54,13 +54,13 @@ void CrenelBeanSprout_Init(CrenelBeanSproutEntity* this) { if (CheckGlobalFlag(WATERBEAN_OUT)) { if (CheckGlobalFlag(WATERBEAN_PUT) == 0) { PositionRelative(&gPlayerEntity.base, super, 0, 0x10000); - SetMetaTile(SPECIAL_META_TILE_34, 0xdc, super->collisionLayer); + SetTile(SPECIAL_TILE_34, 0xdc, super->collisionLayer); } else { if (CheckLocalFlag(super->type2) == 0) { InitializeAnimation(super, 10); super->y.HALF.HI += 4; super->action = 4; - SetMetaTile(SPECIAL_META_TILE_59, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_59, COORD_TO_TILE(super), super->collisionLayer); return; } super->type2 = 0; @@ -107,7 +107,7 @@ void CrenelBeanSprout_Init(CrenelBeanSproutEntity* this) { InitializeAnimation(super, 0xb); super->y.HALF.HI += 4; super->action = 4; - SetMetaTile(SPECIAL_META_TILE_50, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_50, COORD_TO_TILE(super), super->collisionLayer); return; } else { super->type2 = 0; @@ -232,8 +232,8 @@ void CrenelBeanSprout_Action3(CrenelBeanSproutEntity* this) { } void CrenelBeanSprout_Action4(CrenelBeanSproutEntity* this) { - static const u16 gUnk_0812319C[] = { SPECIAL_META_TILE_60, SPECIAL_META_TILE_51 }; - if (gUnk_0812319C[super->type >> 1] == GetMetaTileTypeByEntity(super)) { + static const u16 gUnk_0812319C[] = { SPECIAL_TILE_60, SPECIAL_TILE_51 }; + if (gUnk_0812319C[super->type >> 1] == GetTileTypeByEntity(super)) { GetNextFrame(super); gPlayerState.keepFacing |= 0x80; gPlayerState.field_0xa |= 0x80; @@ -329,5 +329,5 @@ void sub_08096A78(CrenelBeanSproutEntity* this) { SnapToTile(super); super->y.HALF.HI += 4; super->action = 3; - SetMetaTile(SPECIAL_META_TILE_59, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_59, COORD_TO_TILE(super), super->collisionLayer); } diff --git a/src/object/cuccoMinigame.c b/src/object/cuccoMinigame.c index 0aaa8a4c..ae866925 100644 --- a/src/object/cuccoMinigame.c +++ b/src/object/cuccoMinigame.c @@ -367,11 +367,11 @@ void CuccoMinigame_TellObjective(void) { } void sub_080A1648(void) { - SetMetaTileType(SPECIAL_META_TILE_127, TILE_POS(54, 52), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_127, TILE_POS(55, 52), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_127, TILE_POS(56, 52), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_126, TILE_POS(53, 53), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_126, TILE_POS(53, 57), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_127, TILE_POS(54, 52), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_127, TILE_POS(55, 52), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_127, TILE_POS(56, 52), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_126, TILE_POS(53, 53), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_126, TILE_POS(53, 57), LAYER_BOTTOM); } void sub_080A169C(void) { diff --git a/src/object/doubleBookshelf.c b/src/object/doubleBookshelf.c index b2eac828..0438f353 100644 --- a/src/object/doubleBookshelf.c +++ b/src/object/doubleBookshelf.c @@ -11,7 +11,7 @@ typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[0x18]; - /*0x80*/ u16 metaTilePos; + /*0x80*/ u16 tilePos; /*0x82*/ u16 unk_82; /*0x84*/ u8 unk_84; /*0x85*/ u8 unk_85; @@ -42,7 +42,7 @@ void DoubleBookshelf(DoubleBookshelfEntity* this) { void DoubleBookshelf_Init(DoubleBookshelfEntity* this) { DoubleBookshelfEntity* child; super->frameIndex = super->type; - this->metaTilePos = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); if (super->type != 0) { super->action = 1; if (this->unk_84 == 0) { @@ -73,7 +73,7 @@ void DoubleBookshelf_Init(DoubleBookshelfEntity* this) { } void DoubleBookshelf_Action1(DoubleBookshelfEntity* this) { - GetMetaTileType(this->unk_82, super->collisionLayer); + GetTileType(this->unk_82, super->collisionLayer); sub_0809B234(this); } @@ -81,7 +81,7 @@ void DoubleBookshelf_Action2(DoubleBookshelfEntity* this) { LinearMoveUpdate(super); if (--super->timer == 0) { super->action = 1; - this->metaTilePos = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); SetPlayerControl(CONTROL_ENABLED); sub_0809B0B0(this); EnqueueSFX(SFX_BUTTON_PRESS); @@ -93,45 +93,45 @@ void DoubleBookshelf_Action3(DoubleBookshelfEntity* this) { } void sub_0809B0B0(DoubleBookshelfEntity* this) { - u32 tilePos = this->metaTilePos - 1; + u32 tilePos = this->tilePos - 1; u32 layer = super->collisionLayer; switch (super->subAction) { case 0: this->unk_84 = 0; this->unk_82 = tilePos + 2; - SetMetaTile(SPECIAL_META_TILE_130, tilePos - 1, layer); - SetMetaTile(SPECIAL_META_TILE_34, tilePos, layer); - SetMetaTile(SPECIAL_META_TILE_34, tilePos + 1, layer); - SetMetaTile(SPECIAL_META_TILE_34, tilePos + 2, layer); + SetTile(SPECIAL_TILE_130, tilePos - 1, layer); + SetTile(SPECIAL_TILE_34, tilePos, layer); + SetTile(SPECIAL_TILE_34, tilePos + 1, layer); + SetTile(SPECIAL_TILE_34, tilePos + 2, layer); break; case 1: this->unk_84 = 1; this->unk_82 = tilePos; - SetMetaTile(SPECIAL_META_TILE_95, tilePos, layer); - SetMetaTile(SPECIAL_META_TILE_34, tilePos + 1, layer); - SetMetaTile(SPECIAL_META_TILE_34, tilePos + 2, layer); - SetMetaTile(SPECIAL_META_TILE_130, tilePos + 3, layer); + SetTile(SPECIAL_TILE_95, tilePos, layer); + SetTile(SPECIAL_TILE_34, tilePos + 1, layer); + SetTile(SPECIAL_TILE_34, tilePos + 2, layer); + SetTile(SPECIAL_TILE_130, tilePos + 3, layer); break; case 2: this->unk_84 = 1; this->unk_82 = tilePos; - SetMetaTile(SPECIAL_META_TILE_130, tilePos + 3, layer); - SetMetaTile(SPECIAL_META_TILE_34, tilePos + 2, layer); - SetMetaTile(SPECIAL_META_TILE_95, tilePos, layer); + SetTile(SPECIAL_TILE_130, tilePos + 3, layer); + SetTile(SPECIAL_TILE_34, tilePos + 2, layer); + SetTile(SPECIAL_TILE_95, tilePos, layer); SetFlag(((DoubleBookshelfEntity*)super->parent)->unk_86); break; case 3: this->unk_84 = 0; this->unk_82 = tilePos + 2; - SetMetaTile(SPECIAL_META_TILE_130, tilePos - 1, layer); - SetMetaTile(SPECIAL_META_TILE_34, tilePos, layer); - SetMetaTile(SPECIAL_META_TILE_95, tilePos + 2, layer); + SetTile(SPECIAL_TILE_130, tilePos - 1, layer); + SetTile(SPECIAL_TILE_34, tilePos, layer); + SetTile(SPECIAL_TILE_95, tilePos + 2, layer); ClearFlag(((DoubleBookshelfEntity*)super->parent)->unk_86); break; case 4: - SetMetaTile(SPECIAL_META_TILE_34, tilePos, layer); - SetMetaTile(SPECIAL_META_TILE_34, tilePos + 1, layer); - SetMetaTile(SPECIAL_META_TILE_34, tilePos + 2, layer); + SetTile(SPECIAL_TILE_34, tilePos, layer); + SetTile(SPECIAL_TILE_34, tilePos + 1, layer); + SetTile(SPECIAL_TILE_34, tilePos + 2, layer); break; } } @@ -158,7 +158,7 @@ void sub_0809B274(DoubleBookshelfEntity* this) { case 1: if (player->x.HALF.HI + 0x1c > super->x.HALF.HI) { this->unk_84 = 2; - SetMetaTile(SPECIAL_META_TILE_34, this->metaTilePos + 2, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, this->tilePos + 2, LAYER_BOTTOM); sub_0809B358((DoubleBookshelfEntity*)super->child); return; } @@ -173,7 +173,7 @@ void sub_0809B274(DoubleBookshelfEntity* this) { return; } this->unk_84 = 1; - RestorePrevTileEntity(this->metaTilePos + 2, 1); + RestorePrevTileEntity(this->tilePos + 2, 1); sub_0809B38C((DoubleBookshelfEntity*)super->child); return; } @@ -181,34 +181,34 @@ void sub_0809B274(DoubleBookshelfEntity* this) { void sub_0809B334(DoubleBookshelfEntity* this) { s32 index; - u32 tilePos = this->metaTilePos - 0x81; + u32 tilePos = this->tilePos - 0x81; for (index = 2; index >= 0; index--, tilePos++) { - SetMetaTile(SPECIAL_META_TILE_38, tilePos, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_38, tilePos, LAYER_BOTTOM); } } void sub_0809B358(DoubleBookshelfEntity* this) { - static const u16 gUnk_08123D68[] = { SPECIAL_META_TILE_34, SPECIAL_META_TILE_34, SPECIAL_META_TILE_116, - SPECIAL_META_TILE_38, SPECIAL_META_TILE_116, SPECIAL_META_TILE_116, - SPECIAL_META_TILE_38, SPECIAL_META_TILE_116, SPECIAL_META_TILE_34, - SPECIAL_META_TILE_34 }; + static const u16 gUnk_08123D68[] = { SPECIAL_TILE_34, SPECIAL_TILE_34, SPECIAL_TILE_116, + SPECIAL_TILE_38, SPECIAL_TILE_116, SPECIAL_TILE_116, + SPECIAL_TILE_38, SPECIAL_TILE_116, SPECIAL_TILE_34, + SPECIAL_TILE_34 }; s32 index; const u16* array = &gUnk_08123D68[this->unk_84]; - u32 metaTilePos = this->metaTilePos + TILE_POS(-2, -2); + u32 tilePos = this->tilePos + TILE_POS(-2, -2); for (index = 4; index >= 0;) { - SetMetaTile(*array, metaTilePos, LAYER_BOTTOM); + SetTile(*array, tilePos, LAYER_BOTTOM); index--; - metaTilePos++; + tilePos++; array += 2; } } void sub_0809B38C(DoubleBookshelfEntity* this) { s32 index; - u32 metaTilePos = this->metaTilePos + TILE_POS(-2, -2); + u32 tilePos = this->tilePos + TILE_POS(-2, -2); for (index = 4; index >= 0;) { - RestorePrevTileEntity(metaTilePos, 1); + RestorePrevTileEntity(tilePos, 1); index--; - metaTilePos++; + tilePos++; } } diff --git a/src/object/figurineDevice.c b/src/object/figurineDevice.c index 93429ea9..6c553dc0 100644 --- a/src/object/figurineDevice.c +++ b/src/object/figurineDevice.c @@ -306,9 +306,9 @@ void sub_08087F58(FigurineDeviceEntity* this) { switch (super->type) { case 0: case 1: - SetMetaTile(SPECIAL_META_TILE_34, this->unk_78 - 1, LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_78, LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_78 + 1, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, this->unk_78 - 1, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, this->unk_78, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, this->unk_78 + 1, LAYER_BOTTOM); break; } } diff --git a/src/object/fireplace.c b/src/object/fireplace.c index 95f29eee..8adfe936 100644 --- a/src/object/fireplace.c +++ b/src/object/fireplace.c @@ -36,7 +36,7 @@ void Fireplace_Init(FireplaceEntity* this) { DeleteThisEntity(); } else { sub_0807B7D8(0x30b, TILE(super->x.HALF.HI, super->y.HALF.HI), 2); - SetMetaTile(SPECIAL_META_TILE_97, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(SPECIAL_TILE_97, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } Fireplace_Action1(this); } @@ -50,14 +50,14 @@ void Fireplace_Action1(FireplaceEntity* this) { } void sub_0809B7C0(FireplaceEntity* this) { - u32 tileType = GetMetaTileTypeByEntity(super); - if (tileType != SPECIAL_META_TILE_97 && tileType != SPECIAL_META_TILE_98) { + u32 tileType = GetTileTypeByEntity(super); + if (tileType != SPECIAL_TILE_97 && tileType != SPECIAL_TILE_98) { sub_0809B7DC(this); } } void sub_0809B7DC(FireplaceEntity* this) { sub_0807B7D8(0xc3 << 2, TILE(super->x.HALF.HI, super->y.HALF.HI), 2); - SetMetaTile(SPECIAL_META_TILE_98, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(SPECIAL_TILE_98, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); super->timer = 1; } diff --git a/src/object/frozenWaterElement.c b/src/object/frozenWaterElement.c index a9bfed05..848964b3 100644 --- a/src/object/frozenWaterElement.c +++ b/src/object/frozenWaterElement.c @@ -114,33 +114,33 @@ void FrozenWaterElement_Action2(FrozenWaterElementEntity* this) { void sub_0809C0A8(FrozenWaterElementEntity* this) { u32 position = COORD_TO_TILE(super); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, -1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(0, -1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(1, -1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-2, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(0, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(1, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(2, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-2, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(0, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(1, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(2, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(0, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(1, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, 5), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(0, 5), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(1, 5), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, 6), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(1, 6), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-3, 7), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-2, 7), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, 7), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(1, 7), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(2, 7), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(3, 7), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(2, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(2, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 5), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 5), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 5), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 6), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 6), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-3, 7), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, 7), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 7), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 7), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(2, 7), super->collisionLayer); + SetTile(SPECIAL_TILE_34, position + TILE_POS(3, 7), super->collisionLayer); } void sub_0809C23C(FrozenWaterElementEntity* this) { diff --git a/src/object/furniture.c b/src/object/furniture.c index 77599943..d54eea37 100644 --- a/src/object/furniture.c +++ b/src/object/furniture.c @@ -216,14 +216,14 @@ static void FurnitureInit(FurnitureEntity* this) { break; case 0x40: super->y.HALF.HI = (super->y.HALF.HI & ~0xF) | 4; - SetMetaTile(SPECIAL_META_TILE_23, this->tilePos - 128, LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_23, this->tilePos - 64, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_23, this->tilePos - 128, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_23, this->tilePos - 64, LAYER_BOTTOM); break; case 0x80: super->frameIndex = 0; super->y.HALF.HI = (super->y.HALF.HI & ~0xF) | 6; this->tilePos = COORD_TO_TILE(super); - SetMetaTile(SPECIAL_META_TILE_38, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos, super->collisionLayer); break; case 0x200: break; @@ -259,9 +259,9 @@ static void FurnitureInit(FurnitureEntity* this) { tilePos = this->tilePos - 129; cnt = super->type != 26 ? 3 : 2; for (i = 0; i < cnt; ++i, ++tilePos) { - SetMetaTile(SPECIAL_META_TILE_38, tilePos, LAYER_TOP); - SetMetaTile(SPECIAL_META_TILE_38, tilePos, LAYER_BOTTOM); - SetVvvAtMetaTilePos(VVV_0, tilePos + TILE_POS(0, 1), 1); + SetTile(SPECIAL_TILE_38, tilePos, LAYER_TOP); + SetTile(SPECIAL_TILE_38, tilePos, LAYER_BOTTOM); + SetVvvAtTilePos(VVV_0, tilePos + TILE_POS(0, 1), 1); } break; } @@ -286,22 +286,22 @@ static void FurnitureInit(FurnitureEntity* this) { case STAIRCASE: super->collisionLayer = 1; super->spriteOrientation.flipY = 2; - SetMetaTile(SPECIAL_META_TILE_116, this->tilePos - 64, super->collisionLayer); - SetVvvAtMetaTilePos(VVV_63, this->tilePos - 64, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_23, this->tilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_23, this->tilePos + 64, super->collisionLayer); + SetTile(SPECIAL_TILE_116, this->tilePos - 64, super->collisionLayer); + SetVvvAtTilePos(VVV_63, this->tilePos - 64, super->collisionLayer); + SetTile(SPECIAL_TILE_23, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_23, this->tilePos + 64, super->collisionLayer); break; case MINISH_CHEESE: if (super->type2 != 0) super->spriteOffsetX = -4; break; case WOODEN_TABLE: - SetMetaTile(SPECIAL_META_TILE_35, this->tilePos - 65, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_35, this->tilePos - 64, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_35, this->tilePos - 63, super->collisionLayer); + SetTile(SPECIAL_TILE_35, this->tilePos - 65, super->collisionLayer); + SetTile(SPECIAL_TILE_35, this->tilePos - 64, super->collisionLayer); + SetTile(SPECIAL_TILE_35, this->tilePos - 63, super->collisionLayer); break; case LOW_BOOKSHELF: - SetMetaTile(SPECIAL_META_TILE_34, this->tilePos + 65, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + 65, super->collisionLayer); } } @@ -339,20 +339,20 @@ static void FurnitureUpdate(FurnitureEntity* this) { case 0x80: if (gPlayerEntity.base.y.HALF.HI < super->y.HALF.HI + 8) { if (gPlayerState.floor_type != SURFACE_LADDER && - GetMetaTileTypeByEntity(super) == SPECIAL_META_TILE_23) { - SetMetaTile(SPECIAL_META_TILE_38, this->tilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_61, this->tilePos + TILE_POS(0, -1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_61, this->tilePos + TILE_POS(0, -2), super->collisionLayer); + GetTileTypeByEntity(super) == SPECIAL_TILE_23) { + SetTile(SPECIAL_TILE_38, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, -2), super->collisionLayer); } } else { if (gPlayerEntity.base.collisionLayer & 2) { gPlayerEntity.base.collisionLayer = 1; UpdateSpriteForCollisionLayer(&gPlayerEntity.base); } - if (GetMetaTileTypeByEntity(super) != SPECIAL_META_TILE_23) { - SetMetaTile(SPECIAL_META_TILE_23, this->tilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_23, this->tilePos + TILE_POS(0, -1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_20, this->tilePos + TILE_POS(0, -2), super->collisionLayer); + if (GetTileTypeByEntity(super) != SPECIAL_TILE_23) { + SetTile(SPECIAL_TILE_23, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_23, this->tilePos + TILE_POS(0, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_20, this->tilePos + TILE_POS(0, -2), super->collisionLayer); } } break; @@ -377,103 +377,103 @@ static void sub_08090B6C(FurnitureEntity* this) { num = 2; } for (i = -num; i <= num; ++i) { - SetMetaTile(SPECIAL_META_TILE_34, tilePos + i, layer); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } if (px & 8) { - sub_08090CDC(SPECIAL_META_TILE_36, tilePos - i, layer); - sub_08090CDC(SPECIAL_META_TILE_37, tilePos + i, layer); + sub_08090CDC(SPECIAL_TILE_36, tilePos - i, layer); + sub_08090CDC(SPECIAL_TILE_37, tilePos + i, layer); } else { - SetMetaTile(SPECIAL_META_TILE_34, tilePos - i, layer); + SetTile(SPECIAL_TILE_34, tilePos - i, layer); } break; case 1: num = w2 / 8; for (i = -num; i <= num; i++) { - SetMetaTile(SPECIAL_META_TILE_34, tilePos + i, layer); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } if (px & 8) { - sub_08090CDC(SPECIAL_META_TILE_36, tilePos - i, layer); + sub_08090CDC(SPECIAL_TILE_36, tilePos - i, layer); if (i != 0) { - SetMetaTile(SPECIAL_META_TILE_34, tilePos + i, layer); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } } else { if (i != 0) { - SetMetaTile(SPECIAL_META_TILE_34, tilePos - i, layer); + SetTile(SPECIAL_TILE_34, tilePos - i, layer); } - sub_08090CDC(SPECIAL_META_TILE_37, tilePos + i, layer); + sub_08090CDC(SPECIAL_TILE_37, tilePos + i, layer); } break; case 2: num = w2 / 4; for (i = -num; i < num; ++i) { - SetMetaTile(SPECIAL_META_TILE_34, tilePos + i, layer); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } if (px & 8) { - SetMetaTile(SPECIAL_META_TILE_34, tilePos + i, layer); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } else { - sub_08090CDC(SPECIAL_META_TILE_36, tilePos - i - 1, layer); - sub_08090CDC(SPECIAL_META_TILE_37, tilePos + i, layer); + sub_08090CDC(SPECIAL_TILE_36, tilePos - i - 1, layer); + sub_08090CDC(SPECIAL_TILE_37, tilePos + i, layer); } break; case 3: num = w2 / 4; for (i = -num; i <= num; ++i) { - SetMetaTile(SPECIAL_META_TILE_34, tilePos + i, layer); + SetTile(SPECIAL_TILE_34, tilePos + i, layer); } if (px & 8) { - sub_08090CDC(SPECIAL_META_TILE_37, tilePos + i, layer); + sub_08090CDC(SPECIAL_TILE_37, tilePos + i, layer); } else { - sub_08090CDC(SPECIAL_META_TILE_36, tilePos - i, layer); + sub_08090CDC(SPECIAL_TILE_36, tilePos - i, layer); } break; } } } -static void sub_08090CDC(u32 metaTileIndex, u32 metaTilePos, u32 layer) { - u16 cur = GetMetaTileIndex(metaTilePos, layer); +static void sub_08090CDC(u32 tileIndex, u32 tilePos, u32 layer) { + u16 cur = GetTileIndex(tilePos, layer); u32 next = cur; if ((cur & 0x4000) == 0) { - SetMetaTile(metaTileIndex, metaTilePos, layer); + SetTile(tileIndex, tilePos, layer); } else { switch (cur) { - case SPECIAL_META_TILE_37: - if (metaTileIndex == SPECIAL_META_TILE_36) - next = SPECIAL_META_TILE_34; - if (metaTileIndex == SPECIAL_META_TILE_44) - next = SPECIAL_META_TILE_34; + case SPECIAL_TILE_37: + if (tileIndex == SPECIAL_TILE_36) + next = SPECIAL_TILE_34; + if (tileIndex == SPECIAL_TILE_44) + next = SPECIAL_TILE_34; break; - case SPECIAL_META_TILE_45: - if (metaTileIndex == SPECIAL_META_TILE_44) - next = SPECIAL_META_TILE_43; - if (metaTileIndex == SPECIAL_META_TILE_36) - next = SPECIAL_META_TILE_34; + case SPECIAL_TILE_45: + if (tileIndex == SPECIAL_TILE_44) + next = SPECIAL_TILE_43; + if (tileIndex == SPECIAL_TILE_36) + next = SPECIAL_TILE_34; break; - case SPECIAL_META_TILE_36: - if (metaTileIndex == SPECIAL_META_TILE_37) - next = SPECIAL_META_TILE_34; - if (metaTileIndex == SPECIAL_META_TILE_45) - next = SPECIAL_META_TILE_34; + case SPECIAL_TILE_36: + if (tileIndex == SPECIAL_TILE_37) + next = SPECIAL_TILE_34; + if (tileIndex == SPECIAL_TILE_45) + next = SPECIAL_TILE_34; break; - case SPECIAL_META_TILE_44: - if (metaTileIndex == SPECIAL_META_TILE_45) - next = SPECIAL_META_TILE_43; - if (metaTileIndex == SPECIAL_META_TILE_37) - next = SPECIAL_META_TILE_34; + case SPECIAL_TILE_44: + if (tileIndex == SPECIAL_TILE_45) + next = SPECIAL_TILE_43; + if (tileIndex == SPECIAL_TILE_37) + next = SPECIAL_TILE_34; break; - case SPECIAL_META_TILE_34: - case SPECIAL_META_TILE_35: - case SPECIAL_META_TILE_38: - case SPECIAL_META_TILE_39: - case SPECIAL_META_TILE_40: - case SPECIAL_META_TILE_41: - case SPECIAL_META_TILE_42: - case SPECIAL_META_TILE_43: + case SPECIAL_TILE_34: + case SPECIAL_TILE_35: + case SPECIAL_TILE_38: + case SPECIAL_TILE_39: + case SPECIAL_TILE_40: + case SPECIAL_TILE_41: + case SPECIAL_TILE_42: + case SPECIAL_TILE_43: default: return; } - SetMetaTile(next, metaTilePos, layer); + SetTile(next, tilePos, layer); } } diff --git a/src/object/gentariCurtain.c b/src/object/gentariCurtain.c index f6f86b8c..97c3aad0 100644 --- a/src/object/gentariCurtain.c +++ b/src/object/gentariCurtain.c @@ -15,8 +15,8 @@ typedef struct { Entity base; u8 filler[0x8]; - u16 tile; - u16 tile2; + u16 tilePos; + u16 tilePos2; u16 tileIndex; u16 tileIndex2; u8 filler2[0xe]; @@ -56,12 +56,12 @@ void GentariCurtain_Init(GentariCurtainEntity* this) { super->spritePriority.b0 = 6; super->x.HALF.HI += 2; UpdateSpriteForCollisionLayer(super); - this->tile = COORD_TO_TILE_OFFSET(super, 0, 8); - this->tile2 = COORD_TO_TILE_OFFSET(super, 0, -8); - this->tileIndex = GetMetaTileIndex(this->tile, LAYER_BOTTOM); - this->tileIndex2 = GetMetaTileIndex(this->tile2, LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, this->tile, LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, this->tile2, LAYER_BOTTOM); + this->tilePos = COORD_TO_TILE_OFFSET(super, 0, 8); + this->tilePos2 = COORD_TO_TILE_OFFSET(super, 0, -8); + this->tileIndex = GetTileIndex(this->tilePos, LAYER_BOTTOM); + this->tileIndex2 = GetTileIndex(this->tilePos2, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, this->tilePos, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, this->tilePos2, LAYER_BOTTOM); InitAnimationForceUpdate(super, 0); } else { super->action = 1; @@ -81,8 +81,8 @@ void GentariCurtain_Action2(GentariCurtainEntity* this) { UpdateAnimationSingleFrame(super); if ((super->frame & ANIM_DONE) != 0) { super->action = 3; - SetMetaTile(this->tileIndex, this->tile, LAYER_BOTTOM); - SetMetaTile(this->tileIndex2, this->tile2, LAYER_BOTTOM); + SetTile(this->tileIndex, this->tilePos, LAYER_BOTTOM); + SetTile(this->tileIndex2, this->tilePos2, LAYER_BOTTOM); sub_08092214(this); sub_0809223C(this); InitAnimationForceUpdate(super, 1); diff --git a/src/object/giantBookLadder.c b/src/object/giantBookLadder.c index 1cf7d455..1be5f63c 100644 --- a/src/object/giantBookLadder.c +++ b/src/object/giantBookLadder.c @@ -52,36 +52,36 @@ void sub_0808E55C(GiantBookLadderEntity* this) { case 2: tilePos = this->unk74; unaff_r9 = tilePos + TILE_POS(-1, -4); - SetMetaTile(SPECIAL_META_TILE_143, unaff_r9, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_143, tilePos + TILE_POS(0, -4), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_108, tilePos + TILE_POS(-2, -4), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_109, tilePos + TILE_POS(1, -4), super->collisionLayer); + SetTile(SPECIAL_TILE_143, unaff_r9, super->collisionLayer); + SetTile(SPECIAL_TILE_143, tilePos + TILE_POS(0, -4), super->collisionLayer); + SetTile(SPECIAL_TILE_108, tilePos + TILE_POS(-2, -4), super->collisionLayer); + SetTile(SPECIAL_TILE_109, tilePos + TILE_POS(1, -4), super->collisionLayer); type = super->type; uVar5 = 6; if (type != 0) { uVar5 = 4; - SetMetaTile(SPECIAL_META_TILE_114, tilePos + TILE_POS(-1, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_114, tilePos + TILE_POS(0, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_114, tilePos + TILE_POS(-1, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_114, tilePos + TILE_POS(0, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_114, tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_114, tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_114, tilePos + TILE_POS(-1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_114, tilePos + TILE_POS(0, 2), super->collisionLayer); } break; case 1: tilePos = this->unk74; unaff_r9 = tilePos - 1; - SetMetaTile(SPECIAL_META_TILE_142, unaff_r9, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_142, tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_142, unaff_r9, super->collisionLayer); + SetTile(SPECIAL_TILE_142, tilePos, super->collisionLayer); uVar5 = 2; break; } for (uVar4 = 0; uVar4 < uVar5; uVar4++) { unaff_r9 += 0x40; - SetMetaTile(SPECIAL_META_TILE_142, unaff_r9, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_142, unaff_r9 + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_142, unaff_r9, super->collisionLayer); + SetTile(SPECIAL_TILE_142, unaff_r9 + 1, super->collisionLayer); } } u32 sub_0808E670(GiantBookLadderEntity* this) { - return GetMetaTileType(this->unk74 - 0x101, LAYER_BOTTOM); + return GetTileType(this->unk74 - 0x101, LAYER_BOTTOM); } diff --git a/src/object/giantLeaf.c b/src/object/giantLeaf.c index 338678e0..6293a9d0 100644 --- a/src/object/giantLeaf.c +++ b/src/object/giantLeaf.c @@ -36,6 +36,6 @@ void sub_0808D618(Entity* this) { ((((this->y.HALF.HI - gRoomControls.origin_y) >> 4) & 0x3F) * 64); for (i = 0; i < 13; i++) { - SetMetaTile(16500, tilePos + arr[i], LAYER_BOTTOM); + SetTile(16500, tilePos + arr[i], LAYER_BOTTOM); } } diff --git a/src/object/giantRock2.c b/src/object/giantRock2.c index 6cd33a02..ea4a9efd 100644 --- a/src/object/giantRock2.c +++ b/src/object/giantRock2.c @@ -12,7 +12,7 @@ typedef struct { Entity base; u8 filler[0xC]; - u16 metaTilePos; + u16 tilePos; } GiantRock2Entity; void GiantRock2_Init(GiantRock2Entity* this); @@ -28,22 +28,22 @@ void GiantRock2(Entity* this) { void GiantRock2_Init(GiantRock2Entity* this) { u32 collisionLayer; - u16 metaTilePos; + u16 tilePos; int index; u32 tileIndex; super->action = 1; - this->metaTilePos = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); collisionLayer = super->collisionLayer; super->spritePriority.b0 = 7; - metaTilePos = (this->metaTilePos - TILE_POS(0, 2)); - tileIndex = SPECIAL_META_TILE_34; + tilePos = (this->tilePos - TILE_POS(0, 2)); + tileIndex = SPECIAL_TILE_34; for (index = 4; index > -1; index--) { - SetMetaTile(tileIndex, metaTilePos - 2, collisionLayer); - SetMetaTile(tileIndex, metaTilePos - 1, collisionLayer); - SetMetaTile(tileIndex, metaTilePos, collisionLayer); - SetMetaTile(tileIndex, metaTilePos + 1, collisionLayer); - metaTilePos += TILE_POS(0, 1); + SetTile(tileIndex, tilePos - 2, collisionLayer); + SetTile(tileIndex, tilePos - 1, collisionLayer); + SetTile(tileIndex, tilePos, collisionLayer); + SetTile(tileIndex, tilePos + 1, collisionLayer); + tilePos += TILE_POS(0, 1); } } diff --git a/src/object/giantTwig.c b/src/object/giantTwig.c index 29e74d1a..00beda17 100644 --- a/src/object/giantTwig.c +++ b/src/object/giantTwig.c @@ -11,7 +11,7 @@ typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[0xe]; - /*0x76*/ u16 tilePosition; + /*0x76*/ u16 tilePos; /*0x78*/ u16 unk_78; /*0x7a*/ u16 unk_7a; } GiantTwigEntity; @@ -70,7 +70,7 @@ void GiantTwig(GiantTwigEntity* this) { void GiantTwig_Type0Init(GiantTwigEntity* this) { Entity* obj; super->action = 1; - this->tilePosition = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); switch (super->type) { case 0: super->frameIndex = 1; @@ -116,7 +116,7 @@ void GiantTwig_Type1Init(GiantTwigEntity* this) { super->action = 1; super->frameIndex = (super->type2 & 1) + 3; super->spritePriority.b0 = 7; - this->tilePosition = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); sub_08093A1C(this); } @@ -128,7 +128,7 @@ void GiantTwig_Type2Init(GiantTwigEntity* this) { super->frameIndex = (super->type2 & 1) + 5; super->spriteRendering.b3 = 3; super->spritePriority.b0 = 7; - this->tilePosition = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); if ((super->type2 & 1) != 0) { super->spriteOffsetX = 8; } @@ -141,7 +141,7 @@ void GiantTwig_Type2Idle(GiantTwigEntity* this) { void sub_08093984(GiantTwigEntity* this) { u32 index; - const s16* metaTileOffsets; + const s16* tileOffsets; if (super->type2 != 0) { static const s16 gUnk_081228F8[] = { @@ -150,7 +150,7 @@ void sub_08093984(GiantTwigEntity* this) { TILE_POS(-1, 0), TILE_POS(0, 0), TILE_POS(1, 0), TILE_POS(2, 0), TILE_POS(-1, 1), TILE_POS(0, 1), TILE_POS(1, 1), TILE_POS(2, 1), TILE_POS(3, 1), }; - metaTileOffsets = gUnk_081228F8; + tileOffsets = gUnk_081228F8; } else { static const s16 gUnk_0812291E[] = { TILE_POS(-1, -2), TILE_POS(0, -2), TILE_POS(1, -2), TILE_POS(2, -2), TILE_POS(-2, -1), @@ -158,11 +158,11 @@ void sub_08093984(GiantTwigEntity* this) { TILE_POS(-1, 0), TILE_POS(0, 0), TILE_POS(1, 0), TILE_POS(2, 0), TILE_POS(-3, 1), TILE_POS(-2, 1), TILE_POS(-1, 1), TILE_POS(0, 1), TILE_POS(1, 1), }; - metaTileOffsets = gUnk_0812291E; + tileOffsets = gUnk_0812291E; } for (index = 0; index < 0x13; index++) { - SetMetaTile(SPECIAL_META_TILE_116, metaTileOffsets[index] + this->tilePosition, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_116, tileOffsets[index] + this->tilePos, LAYER_BOTTOM); } } @@ -170,7 +170,7 @@ void GiantTwig_Type3Init(GiantTwigEntity* this) { super->action = 1; super->frameIndex = (super->type2 & 3) + 7; super->spritePriority.b0 = 7; - this->tilePosition = COORD_TO_TILE(super); + this->tilePos = COORD_TO_TILE(super); sub_08093A1C(this); ChangeObjPalette(super, 0x7a); } @@ -181,47 +181,47 @@ void GiantTwig_Type3Idle(GiantTwigEntity* this) { void sub_08093A1C(GiantTwigEntity* this) { switch (super->type) { case 0: - SetMetaTile(SPECIAL_META_TILE_36, this->tilePosition + TILE_POS(-4, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition + TILE_POS(-3, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition + TILE_POS(-2, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_41, this->tilePosition + TILE_POS(-4, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, this->tilePosition + TILE_POS(-3, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, this->tilePosition + TILE_POS(-2, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_61, this->tilePosition + TILE_POS(0, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_61, this->tilePosition + TILE_POS(0, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_39, this->tilePosition + TILE_POS(1, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_35, this->tilePosition + TILE_POS(2, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_109, this->tilePosition + TILE_POS(3, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_41, this->tilePosition + TILE_POS(1, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, this->tilePosition + TILE_POS(2, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, this->tilePosition + TILE_POS(3, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_36, this->tilePos + TILE_POS(-4, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(-3, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(-2, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_41, this->tilePos + TILE_POS(-4, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(-3, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(-2, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_39, this->tilePos + TILE_POS(1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_35, this->tilePos + TILE_POS(2, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_109, this->tilePos + TILE_POS(3, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_41, this->tilePos + TILE_POS(1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(2, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(3, 2), super->collisionLayer); break; case 1: if ((super->type2 & 1) != 0) { - SetMetaTile(SPECIAL_META_TILE_109, this->tilePosition + TILE_POS(-1, -2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition + TILE_POS(-1, -1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_41, this->tilePosition + TILE_POS(-2, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, this->tilePosition + TILE_POS(-1, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition + TILE_POS(0, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_109, this->tilePosition + TILE_POS(1, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_110, this->tilePosition + TILE_POS(0, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition + TILE_POS(1, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_109, this->tilePosition + TILE_POS(2, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_109, this->tilePos + TILE_POS(-1, -2), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(-1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_41, this->tilePos + TILE_POS(-2, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(-1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(0, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_109, this->tilePos + TILE_POS(1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_110, this->tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_109, this->tilePos + TILE_POS(2, 1), super->collisionLayer); } else { - SetMetaTile(SPECIAL_META_TILE_108, this->tilePosition + TILE_POS(1, -2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition + TILE_POS(1, -1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_108, this->tilePosition + TILE_POS(-1, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition + TILE_POS(0, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, this->tilePosition + TILE_POS(1, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_42, this->tilePosition + TILE_POS(2, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_108, this->tilePosition + TILE_POS(-2, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition + TILE_POS(-1, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_111, this->tilePosition + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_108, this->tilePos + TILE_POS(1, -2), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(1, -1), super->collisionLayer); + SetTile(SPECIAL_TILE_108, this->tilePos + TILE_POS(-1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(0, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_42, this->tilePos + TILE_POS(2, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_108, this->tilePos + TILE_POS(-2, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_111, this->tilePos + TILE_POS(0, 1), super->collisionLayer); return; } break; case 3: - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos, super->collisionLayer); break; } } @@ -230,12 +230,12 @@ void sub_08093C70(GiantTwigEntity* this) { if (this->unk_78 != 0) { if (gPlayerState.heldObject != 0) { this->unk_78 = 0; - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition + TILE_POS(-1, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition + TILE_POS(0, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->tilePosition + TILE_POS(1, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, this->tilePosition + TILE_POS(-1, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, this->tilePosition + TILE_POS(0, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_38, this->tilePosition + TILE_POS(1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos + TILE_POS(1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(-1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(0, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_38, this->tilePos + TILE_POS(1, 2), super->collisionLayer); } } else { @@ -243,12 +243,12 @@ void sub_08093C70(GiantTwigEntity* this) { if (--this->unk_7a == 0) { this->unk_78++; this->unk_7a = 0x3c; - SetMetaTile(SPECIAL_META_TILE_61, this->tilePosition + TILE_POS(-1, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_61, this->tilePosition + TILE_POS(0, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_39, this->tilePosition + TILE_POS(1, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_61, this->tilePosition + TILE_POS(-1, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_61, this->tilePosition + TILE_POS(0, 2), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_41, this->tilePosition + TILE_POS(1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_39, this->tilePos + TILE_POS(1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(-1, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + TILE_POS(0, 2), super->collisionLayer); + SetTile(SPECIAL_TILE_41, this->tilePos + TILE_POS(1, 2), super->collisionLayer); } } } diff --git a/src/object/hiddenLadderDown.c b/src/object/hiddenLadderDown.c index 5013d7d0..d02a22f4 100644 --- a/src/object/hiddenLadderDown.c +++ b/src/object/hiddenLadderDown.c @@ -42,20 +42,20 @@ void HiddenLadderDown_Init(HiddenLadderDownEntity* this) { if (CheckFlags(this->unk_86) != 0) { super->action = 2; super->spriteSettings.draw = TRUE; - SetMetaTileType(META_TILE_TYPE_418, *puVar3 + TILE_POS(-1, -1), super->collisionLayer); - SetMetaTileType(META_TILE_TYPE_419, *puVar3 + TILE_POS(0, -1), super->collisionLayer); - SetMetaTileType(META_TILE_TYPE_420, *puVar3 + TILE_POS(1, -1), super->collisionLayer); - SetMetaTileType(META_TILE_TYPE_421, *puVar3 + TILE_POS(-1, 0), super->collisionLayer); - SetMetaTileType(META_TILE_TYPE_422, *puVar3 + TILE_POS(0, 0), super->collisionLayer); - SetMetaTileType(META_TILE_TYPE_423, *puVar3 + TILE_POS(1, 0), super->collisionLayer); - SetMetaTileType(META_TILE_TYPE_424, *puVar3 + TILE_POS(-1, 1), super->collisionLayer); - SetMetaTileType(META_TILE_TYPE_425, *puVar3 + TILE_POS(0, 1), super->collisionLayer); - SetMetaTileType(META_TILE_TYPE_426, *puVar3 + TILE_POS(1, 1), super->collisionLayer); + SetTileType(TILE_TYPE_418, *puVar3 + TILE_POS(-1, -1), super->collisionLayer); + SetTileType(TILE_TYPE_419, *puVar3 + TILE_POS(0, -1), super->collisionLayer); + SetTileType(TILE_TYPE_420, *puVar3 + TILE_POS(1, -1), super->collisionLayer); + SetTileType(TILE_TYPE_421, *puVar3 + TILE_POS(-1, 0), super->collisionLayer); + SetTileType(TILE_TYPE_422, *puVar3 + TILE_POS(0, 0), super->collisionLayer); + SetTileType(TILE_TYPE_423, *puVar3 + TILE_POS(1, 0), super->collisionLayer); + SetTileType(TILE_TYPE_424, *puVar3 + TILE_POS(-1, 1), super->collisionLayer); + SetTileType(TILE_TYPE_425, *puVar3 + TILE_POS(0, 1), super->collisionLayer); + SetTileType(TILE_TYPE_426, *puVar3 + TILE_POS(1, 1), super->collisionLayer); } } void HiddenLadderDown_Action1(HiddenLadderDownEntity* this) { - if (GetMetaTileType(this->unk_70, super->collisionLayer) == 0x1a6) { + if (GetTileType(this->unk_70, super->collisionLayer) == 0x1a6) { super->action = 2; super->spriteSettings.draw = TRUE; SetFlag(this->unk_86); diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index ba50cc47..7f27236a 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -218,7 +218,7 @@ void sub_08081188(ItemOnGroundEntity* this) { void sub_080811AC(ItemOnGroundEntity* this) { super->action = 2; super->spriteSettings.draw = 0; - this->unk_6e = GetMetaTileTypeByEntity(super); + this->unk_6e = GetTileTypeByEntity(super); } void sub_080811C8(ItemOnGroundEntity* this) { @@ -285,7 +285,7 @@ void sub_080812A0(ItemOnGroundEntity* this) { void sub_080812A8(ItemOnGroundEntity* this) { if (GetCollisionDataAtEntity(super) != COLLISION_DATA_15 && - this->unk_6e != GetMetaTileTypeByEntity(super)) { + this->unk_6e != GetTileTypeByEntity(super)) { super->direction = 0; super->speed = 0; super->spriteSettings.draw = 1; diff --git a/src/object/jailBars.c b/src/object/jailBars.c index 69e380fa..b244af4e 100644 --- a/src/object/jailBars.c +++ b/src/object/jailBars.c @@ -68,32 +68,32 @@ void JailBars_Action3(JailBarsEntity* this) { static void SetJailBarTiles(JailBarsEntity* this, u32 arg1) { static const s16 gUnk_08124960[] = { - SPECIAL_META_TILE_35, + SPECIAL_TILE_35, -0x3, - SPECIAL_META_TILE_35, + SPECIAL_TILE_35, -0x2, - SPECIAL_META_TILE_35, + SPECIAL_TILE_35, -0x1, - SPECIAL_META_TILE_35, + SPECIAL_TILE_35, 0x0, - SPECIAL_META_TILE_35, + SPECIAL_TILE_35, 0x1, - SPECIAL_META_TILE_35, + SPECIAL_TILE_35, 0x2, -0x1, }; static const s16 gUnk_0812497A[] = { - SPECIAL_META_TILE_35, + SPECIAL_TILE_35, -0x3, - SPECIAL_META_TILE_35, + SPECIAL_TILE_35, -0x2, - SPECIAL_META_TILE_136, + SPECIAL_TILE_136, -0x1, - SPECIAL_META_TILE_135, + SPECIAL_TILE_135, 0x0, - SPECIAL_META_TILE_35, + SPECIAL_TILE_35, 0x1, - SPECIAL_META_TILE_35, + SPECIAL_TILE_35, 0x2, -0x1, }; diff --git a/src/object/jarPortal.c b/src/object/jarPortal.c index 90fa9cb6..99341c30 100644 --- a/src/object/jarPortal.c +++ b/src/object/jarPortal.c @@ -182,10 +182,10 @@ void sub_0808C13C(JarPortalEntity* this) { void sub_0808C148(JarPortalEntity* this, bool32 setTiles) { u32 tilePos = COORD_TO_TILE(super); if (!setTiles) { - SetMetaTile(SPECIAL_META_TILE_146, tilePos + TILE_POS(-1, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_147, tilePos + TILE_POS(0, 0), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_148, tilePos + TILE_POS(-1, 1), super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_149, tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_146, tilePos + TILE_POS(-1, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_147, tilePos + TILE_POS(0, 0), super->collisionLayer); + SetTile(SPECIAL_TILE_148, tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTile(SPECIAL_TILE_149, tilePos + TILE_POS(0, 1), super->collisionLayer); } else { RestorePrevTileEntity(tilePos + TILE_POS(-1, 0), super->collisionLayer); RestorePrevTileEntity(tilePos + 0, super->collisionLayer); diff --git a/src/object/ladderUp.c b/src/object/ladderUp.c index 4956d11d..002146d7 100644 --- a/src/object/ladderUp.c +++ b/src/object/ladderUp.c @@ -38,7 +38,7 @@ void LadderUp(Entity* this) { return; } this->y.HALF.HI = (this->y.HALF.HI & 0xfff0) + 0xc; - SetMetaTile(SPECIAL_META_TILE_35, COORD_TO_TILE(this), this->collisionLayer); + SetTile(SPECIAL_TILE_35, COORD_TO_TILE(this), this->collisionLayer); break; case 1: if (GravityUpdate(this, Q_8_8(16.0)) == 0) { @@ -67,17 +67,17 @@ void LadderUp(Entity* this) { if (this->type2 == 0) { if (gPlayerEntity.base.y.HALF.HI < this->y.HALF.HI) { if (gPlayerState.floor_type != SURFACE_LADDER && - (GetMetaTileTypeByEntity(this) == SPECIAL_META_TILE_23)) { - SetMetaTile(SPECIAL_META_TILE_35, COORD_TO_TILE(this), this->collisionLayer); + (GetTileTypeByEntity(this) == SPECIAL_TILE_23)) { + SetTile(SPECIAL_TILE_35, COORD_TO_TILE(this), this->collisionLayer); RestorePrevTileEntity(COORD_TO_TILE_OFFSET(this, 0, 16), this->collisionLayer); } } else { - if (GetMetaTileTypeByEntity(this) != SPECIAL_META_TILE_23) { - SetMetaTile(SPECIAL_META_TILE_23, COORD_TO_TILE(this), this->collisionLayer); + if (GetTileTypeByEntity(this) != SPECIAL_TILE_23) { + SetTile(SPECIAL_TILE_23, COORD_TO_TILE(this), this->collisionLayer); if (this->type == 0) { - SetMetaTile(SPECIAL_META_TILE_23, COORD_TO_TILE_OFFSET(this, 0, 16), this->collisionLayer); + SetTile(SPECIAL_TILE_23, COORD_TO_TILE_OFFSET(this, 0, 16), this->collisionLayer); } else { - SetMetaTile(SPECIAL_META_TILE_20, COORD_TO_TILE_OFFSET(this, 0, 16), this->collisionLayer); + SetTile(SPECIAL_TILE_20, COORD_TO_TILE_OFFSET(this, 0, 16), this->collisionLayer); } } } diff --git a/src/object/lightDoor.c b/src/object/lightDoor.c index 4c334e79..3bb41e19 100644 --- a/src/object/lightDoor.c +++ b/src/object/lightDoor.c @@ -88,13 +88,13 @@ void LightDoor_Action4(LightDoorEntity* this) { void sub_080850FC(LightDoorEntity* this) { u32 tilePos = COORD_TO_TILE(super); u32 layer = super->collisionLayer; - SetMetaTile(SPECIAL_META_TILE_61, tilePos + TILE_POS(-1, -1), layer); - SetMetaTile(SPECIAL_META_TILE_61, tilePos + TILE_POS(0, -1), layer); - SetMetaTile(SPECIAL_META_TILE_61, tilePos + TILE_POS(1, -1), layer); - SetMetaTile(SPECIAL_META_TILE_61, tilePos + TILE_POS(-1, 0), layer); - SetMetaTile(SPECIAL_META_TILE_61, tilePos + TILE_POS(0, 0), layer); - SetMetaTile(SPECIAL_META_TILE_61, tilePos + TILE_POS(1, 0), layer); - SetMetaTile(SPECIAL_META_TILE_61, tilePos + TILE_POS(-1, 1), layer); - SetMetaTile(SPECIAL_META_TILE_61, tilePos + TILE_POS(0, 1), layer); - SetMetaTile(SPECIAL_META_TILE_61, tilePos + TILE_POS(1, 1), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(-1, -1), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(0, -1), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(1, -1), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(-1, 0), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(0, 0), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(1, 0), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(-1, 1), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(0, 1), layer); + SetTile(SPECIAL_TILE_61, tilePos + TILE_POS(1, 1), layer); } diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c index afc32e09..e8f22525 100644 --- a/src/object/lightableSwitch.c +++ b/src/object/lightableSwitch.c @@ -100,7 +100,7 @@ static void sub_0809EAD8(LightableSwitchEntity* this) { UpdateRailMovement(super, (u16**)&super->child, &this->unk_74); } else { - SetMetaTile(SPECIAL_META_TILE_80, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_80, COORD_TO_TILE(super), super->collisionLayer); } } diff --git a/src/object/linkEmptyingBottle.c b/src/object/linkEmptyingBottle.c index 028854ce..84d1da82 100644 --- a/src/object/linkEmptyingBottle.c +++ b/src/object/linkEmptyingBottle.c @@ -45,8 +45,8 @@ void LinkEmptyingBottle_Init(LinkEmptyingBottleEntity* this) { gUnk_08122A18[gPlayerEntity.base.animationState | 1] << 0x10); } CopyPosition(super->child, super); - sub_08094980(this, SPECIAL_META_TILE_50, SPECIAL_META_TILE_51); - sub_08094980(this, SPECIAL_META_TILE_97, SPECIAL_META_TILE_34); + sub_08094980(this, SPECIAL_TILE_50, SPECIAL_TILE_51); + sub_08094980(this, SPECIAL_TILE_97, SPECIAL_TILE_34); break; case 1: effect = CreateFx(super, FX_GREEN_SPLASH2, 0); @@ -61,8 +61,8 @@ void LinkEmptyingBottle_Init(LinkEmptyingBottleEntity* this) { super->timer = 0; super->spritePriority.b0 = 0; super->spriteRendering.b3 = 0; - sub_08094980(this, SPECIAL_META_TILE_59, SPECIAL_META_TILE_60); - sub_08094980(this, SPECIAL_META_TILE_97, SPECIAL_META_TILE_34); + sub_08094980(this, SPECIAL_TILE_59, SPECIAL_TILE_60); + sub_08094980(this, SPECIAL_TILE_97, SPECIAL_TILE_34); return; } break; @@ -119,7 +119,7 @@ void sub_08094980(LinkEmptyingBottleEntity* this, u32 searchTileIndex, u32 repla xOffset = gUnk_08122A28[index]; yOffset = gUnk_08122A28[index + 1]; if (searchTileIndex == sub_080B1A0C(super, xOffset, yOffset)) { - SetMetaTile(replaceTileIndex, TILE(super->x.HALF.HI + xOffset, super->y.HALF.HI + yOffset), + SetTile(replaceTileIndex, TILE(super->x.HALF.HI + xOffset, super->y.HALF.HI + yOffset), super->collisionLayer); } index += 2; diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c index ae79ebf6..eda3c651 100644 --- a/src/object/lockedDoor.c +++ b/src/object/lockedDoor.c @@ -118,7 +118,7 @@ void LockedDoor_Init(LockedDoorEntity* this) { super->spritePriority.b0 = 5; super->frame = super->type & 0xF; this->unk_76 = TILE(super->x.HALF.HI, super->y.HALF.HI); - this->unk_74 = GetMetaTileIndex(this->unk_76, super->collisionLayer); + this->unk_74 = GetTileIndex(this->unk_76, super->collisionLayer); switch (super->type2) { case 0: if (!CheckFlags(this->unk_86)) { @@ -164,7 +164,7 @@ void LockedDoor_Action1(LockedDoorEntity* this) { if (--super->timer == 0) { super->action = 2; super->timer = 7; - SetMetaTile(this->unk_74, this->unk_76, super->collisionLayer); + SetTile(this->unk_74, this->unk_76, super->collisionLayer); EnqueueSFX(SFX_10B); } } @@ -264,12 +264,12 @@ void sub_080836A0(LockedDoorEntity* this) { super->spriteSettings.draw = 1; super->x.HALF.HI = this->unk_70; super->y.HALF.HI = this->unk_72; - SetMetaTile(SPECIAL_META_TILE_34, this->unk_76, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_76, super->collisionLayer); } void sub_080836DC(Entity* this, u32 unk_0, u32 unk_1) { const struct_0811F680* tmp; - SetMetaTile(SPECIAL_META_TILE_34, unk_1, this->collisionLayer); + SetTile(SPECIAL_TILE_34, unk_1, this->collisionLayer); this->timer = 7; this->spriteSettings.draw = 1; this->direction = (unk_0 << 3) ^ DirectionSouth; diff --git a/src/object/macroAcorn.c b/src/object/macroAcorn.c index 9a65ce44..76773942 100644 --- a/src/object/macroAcorn.c +++ b/src/object/macroAcorn.c @@ -76,38 +76,38 @@ void sub_0809E5F0(MacroAcornEntity* this) { this->unk_80 = position; switch (super->type) { case 2: - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(3, -1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_109, position + TILE_POS(4, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(3, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_109, position + TILE_POS(4, -1), LAYER_BOTTOM); case 0: - SetMetaTile(SPECIAL_META_TILE_108, position + TILE_POS(-2, -1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, -1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(0, -1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(1, -1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-2, 0), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, 0), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(0, 0), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(1, 0), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_110, position + TILE_POS(-2, 1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, 1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(0, 1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_111, position + TILE_POS(1, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_108, position + TILE_POS(-2, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_110, position + TILE_POS(-2, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_111, position + TILE_POS(1, 1), LAYER_BOTTOM); break; case 3: - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-4, -1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_108, position + TILE_POS(-5, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-4, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_108, position + TILE_POS(-5, -1), LAYER_BOTTOM); case 1: - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-2, -1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, -1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(0, -1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_109, position + TILE_POS(1, -1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-2, 0), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, 0), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(0, 0), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(1, 0), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_110, position + TILE_POS(-2, 1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(-1, 1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, position + TILE_POS(0, 1), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_111, position + TILE_POS(1, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_109, position + TILE_POS(1, -1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-2, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(1, 0), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_110, position + TILE_POS(-2, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(-1, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, position + TILE_POS(0, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_111, position + TILE_POS(1, 1), LAYER_BOTTOM); break; } } diff --git a/src/object/macroBook.c b/src/object/macroBook.c index 69c46ebc..2b43af8b 100644 --- a/src/object/macroBook.c +++ b/src/object/macroBook.c @@ -136,26 +136,26 @@ void MacroBook_Action3(MacroBookEntity* this) { void sub_0809A958(MacroBookEntity* this) { static const u16 tileIndices[] = { - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, - SPECIAL_META_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, + SPECIAL_TILE_116, 0, 0, - SPECIAL_META_TILE_34, - SPECIAL_META_TILE_34, + SPECIAL_TILE_34, + SPECIAL_TILE_34, }; int index; int index2; @@ -169,7 +169,7 @@ void sub_0809A958(MacroBookEntity* this) { for (index = 0; index < 5; index++, tilePos += 0x40) { for (index2 = 0; index2 < 4; index2++, tileIndexPtr++) { if ((*tileIndexPtr & 0x4000) != 0) { - SetMetaTile(*tileIndexPtr, tilePos + index2, LAYER_BOTTOM); + SetTile(*tileIndexPtr, tilePos + index2, LAYER_BOTTOM); } } } diff --git a/src/object/macroDecorations.c b/src/object/macroDecorations.c index 05c0955c..95fcad17 100644 --- a/src/object/macroDecorations.c +++ b/src/object/macroDecorations.c @@ -82,21 +82,21 @@ void MacroDecoration_Action1(MacroDecorationEntity* this) { void sub_08097EB8(MacroDecorationEntity* this) { static const s16 tilePosArray[] = { - 0xff7e, SPECIAL_META_TILE_137, 0xff7f, SPECIAL_META_TILE_34, - 0xff80, SPECIAL_META_TILE_34, 0xff81, SPECIAL_META_TILE_138, - 0xffbe, SPECIAL_META_TILE_34, 0xffbf, SPECIAL_META_TILE_34, - 0xffc0, SPECIAL_META_TILE_34, 0xffc1, SPECIAL_META_TILE_34, - 0xfffe, SPECIAL_META_TILE_34, 0xffff, SPECIAL_META_TILE_34, - 0, SPECIAL_META_TILE_34, 1, SPECIAL_META_TILE_34, - 2, SPECIAL_META_TILE_139, 0x3e, SPECIAL_META_TILE_34, - 0x3f, SPECIAL_META_TILE_34, 0x40, SPECIAL_META_TILE_38, - 0x41, SPECIAL_META_TILE_34, 0x7e, SPECIAL_META_TILE_140, - 0x7f, SPECIAL_META_TILE_140, 0x7fff, 0xffff, + 0xff7e, SPECIAL_TILE_137, 0xff7f, SPECIAL_TILE_34, + 0xff80, SPECIAL_TILE_34, 0xff81, SPECIAL_TILE_138, + 0xffbe, SPECIAL_TILE_34, 0xffbf, SPECIAL_TILE_34, + 0xffc0, SPECIAL_TILE_34, 0xffc1, SPECIAL_TILE_34, + 0xfffe, SPECIAL_TILE_34, 0xffff, SPECIAL_TILE_34, + 0, SPECIAL_TILE_34, 1, SPECIAL_TILE_34, + 2, SPECIAL_TILE_139, 0x3e, SPECIAL_TILE_34, + 0x3f, SPECIAL_TILE_34, 0x40, SPECIAL_TILE_38, + 0x41, SPECIAL_TILE_34, 0x7e, SPECIAL_TILE_140, + 0x7f, SPECIAL_TILE_140, 0x7fff, 0xffff, }; const s16* tilePosPtr; - u16 tile = COORD_TO_TILE(super); + u16 tilePos = COORD_TO_TILE(super); for (tilePosPtr = tilePosArray; *tilePosPtr != 0x7fff; tilePosPtr += 2) { - SetMetaTile((u16)tilePosPtr[1], tile + tilePosPtr[0], LAYER_BOTTOM); + SetTile((u16)tilePosPtr[1], tilePos + tilePosPtr[0], LAYER_BOTTOM); } } diff --git a/src/object/macroShoe.c b/src/object/macroShoe.c index fd321b19..77c02cf9 100644 --- a/src/object/macroShoe.c +++ b/src/object/macroShoe.c @@ -41,9 +41,9 @@ void MacroShoe_Init(Entity* this) { this->action = 1; this->hitbox = (Hitbox*)MacroShoe_TypeHitboxes[this->type]; if (this->type2 == 1) { - SetMetaTile(SPECIAL_META_TILE_36, TILE_POS(16, 16), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_38, TILE_POS(17, 16), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_37, TILE_POS(18, 16), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_36, TILE_POS(16, 16), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_38, TILE_POS(17, 16), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_37, TILE_POS(18, 16), LAYER_BOTTOM); } } diff --git a/src/object/mask.c b/src/object/mask.c index bef4e563..9246fda1 100644 --- a/src/object/mask.c +++ b/src/object/mask.c @@ -71,11 +71,11 @@ void Mask_Init(MaskEntity* this) { super->frameIndex = super->type2 & 0x3f; this->unk_7e = COORD_TO_TILE(super); - this->unk_7c = GetMetaTileIndex(this->unk_7e, LAYER_BOTTOM); + this->unk_7c = GetTileIndex(this->unk_7e, LAYER_BOTTOM); - this->unk_7a = GetCollisionDataAtMetaTilePos(this->unk_7e, LAYER_BOTTOM); + this->unk_7a = GetCollisionDataAtTilePos(this->unk_7e, LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_7e, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_34, this->unk_7e, LAYER_BOTTOM); } // Probably related to knocking it down @@ -100,7 +100,7 @@ void Mask_Action1(MaskEntity* this) { } // Presumably, make the mask fall - SetMetaTile(this->unk_7c, this->unk_7e, LAYER_BOTTOM); + SetTile(this->unk_7c, this->unk_7e, LAYER_BOTTOM); SetCollisionData(this->unk_7a, this->unk_7e, 1); diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c index 8343c5b5..95f7f9a1 100644 --- a/src/object/metalDoor.c +++ b/src/object/metalDoor.c @@ -117,16 +117,16 @@ void MetalDoor_Action4(MetalDoorEntity* this) { } void sub_080A080C(MetalDoorEntity* this) { - this->unk_76 = GetMetaTileIndex(this->unk_74 - 1, super->collisionLayer); - this->unk_78 = GetMetaTileIndex(this->unk_74, super->collisionLayer); - this->unk_7a = GetMetaTileIndex(this->unk_74 + 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_74 - 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_74, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_34, this->unk_74 + 1, super->collisionLayer); + this->unk_76 = GetTileIndex(this->unk_74 - 1, super->collisionLayer); + this->unk_78 = GetTileIndex(this->unk_74, super->collisionLayer); + this->unk_7a = GetTileIndex(this->unk_74 + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->unk_74 + 1, super->collisionLayer); } void sub_080A0870(MetalDoorEntity* this) { - SetMetaTile(this->unk_76, this->unk_74 - 1, super->collisionLayer); - SetMetaTile(this->unk_78, this->unk_74, super->collisionLayer); - SetMetaTile(this->unk_7a, this->unk_74 + 1, super->collisionLayer); + SetTile(this->unk_76, this->unk_74 - 1, super->collisionLayer); + SetTile(this->unk_78, this->unk_74, super->collisionLayer); + SetTile(this->unk_7a, this->unk_74 + 1, super->collisionLayer); } diff --git a/src/object/minecart.c b/src/object/minecart.c index 09efc022..f8ed1789 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -60,7 +60,7 @@ void Minecart_Init(MinecartEntity* this) { super->speed = 0x700; super->spritePriority.b1 = 3; InitAnimationForceUpdate(super, super->type2 + 4 + super->animationState); - SetMetaTile(SPECIAL_META_TILE_34, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(super), super->collisionLayer); } void Minecart_Action1(MinecartEntity* this) { @@ -289,7 +289,7 @@ void Minecart_Action6(MinecartEntity* this) { minecartData->room = gRoomControls.room; minecartData->animationState = super->animationState; InitAnimationForceUpdate(super, super->animationState + 0x10); - SetMetaTile(SPECIAL_META_TILE_34, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(super), super->collisionLayer); } else { UpdateAnimationSingleFrame(super); gPlayerEntity.base.spritePriority.b0 = super->spritePriority.b0 - 1; diff --git a/src/object/minecartDoor.c b/src/object/minecartDoor.c index c1ca45b0..37667af6 100644 --- a/src/object/minecartDoor.c +++ b/src/object/minecartDoor.c @@ -13,8 +13,8 @@ typedef struct { /*0x68*/ u8 unk_68[8]; /*0x70*/ u16 unk_70; /*0x72*/ u16 unk_72; - /*0x74*/ u16 metaTileIndex; - /*0x76*/ u16 metaTilePos; + /*0x74*/ u16 tileIndex; + /*0x76*/ u16 tilePos; /*0x78*/ u8 unk_78[0x6]; /*0x7e*/ u8 unk_7e; /*0x7f*/ u8 unk_7f[0x7]; @@ -52,8 +52,8 @@ void MinecartDoor_Init(MinecartDoorEntity* this) { this->unk_70 = super->x.HALF.HI; this->unk_72 = super->y.HALF.HI; super->spritePriority.b0 = 5; - this->metaTilePos = COORD_TO_TILE(super); - this->metaTileIndex = GetMetaTileIndex(this->metaTilePos, super->collisionLayer); + this->tilePos = COORD_TO_TILE(super); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); super->frameIndex = super->type; if (sub_08096CEC(this)) { if (this->unk_7e != 0) { @@ -64,7 +64,7 @@ void MinecartDoor_Init(MinecartDoorEntity* this) { } else { super->action = 1; super->spriteSettings.draw = 1; - SetMetaTile(SPECIAL_META_TILE_34, this->metaTilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_34, this->tilePos, super->collisionLayer); } } } @@ -74,7 +74,7 @@ void MinecartDoor_Action1(MinecartDoorEntity* this) { super->action = 2; super->timer = 7; super->direction = super->type << 3; - SetMetaTile(this->metaTileIndex, this->metaTilePos, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); EnqueueSFX(SFX_10B); } } @@ -112,7 +112,7 @@ void MinecartDoor_Action3(MinecartDoorEntity* this) { } if (bVar3 == FALSE) { super->action = 4; - sub_080836DC(super, super->type, this->metaTilePos); + sub_080836DC(super, super->type, this->tilePos); } } diff --git a/src/object/minishVillageObject.c b/src/object/minishVillageObject.c index 191589cd..b7d09356 100644 --- a/src/object/minishVillageObject.c +++ b/src/object/minishVillageObject.c @@ -88,7 +88,7 @@ void MinishVillageObject_Type1(MinishVillageObjectEntity* this) { super->subtimer = 0; super->frameIndex = 0; super->spritePriority.b0 = 7; - SetMetaTile(SPECIAL_META_TILE_105, COORD_TO_TILE(super) - TILE_POS(0, 1), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_105, COORD_TO_TILE(super) - TILE_POS(0, 1), LAYER_BOTTOM); break; case 2: if ((gRoomTransition.frameCount & 3U) == 0) { @@ -205,7 +205,7 @@ void MinishVillageObject_Type8(MinishVillageObjectEntity* this) { } void MinishVillageObject_Type8_Init(MinishVillageObjectEntity* this) { - u32 tilePosition; + u32 tilePos; super->spritePriority.b0 = 7; super->frameIndex = super->type2; super->action = 2; @@ -218,11 +218,11 @@ void MinishVillageObject_Type8_Init(MinishVillageObjectEntity* this) { SoundReq(SFX_179); } else { super->timer = 8; - tilePosition = COORD_TO_TILE(super); + tilePos = COORD_TO_TILE(super); if (super->type2 != 0) { - tilePosition -= 0x40; + tilePos -= 0x40; } - SetMetaTile(SPECIAL_META_TILE_105, tilePosition, super->collisionLayer); + SetTile(SPECIAL_TILE_105, tilePos, super->collisionLayer); } } @@ -235,7 +235,7 @@ void MinishVillageObject_Type8_Action1(MinishVillageObjectEntity* this) { super->timer = 8; super->spriteRendering.alphaBlend = 0; gScreen.controls.layerFXControl = 0; - SetMetaTile(SPECIAL_META_TILE_105, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_105, COORD_TO_TILE(super), super->collisionLayer); } } } diff --git a/src/object/objectA.c b/src/object/objectA.c index c9d94b74..ac45f99f 100644 --- a/src/object/objectA.c +++ b/src/object/objectA.c @@ -30,13 +30,13 @@ void ObjectA(ObjectAEntity* this) { super->action = 1; super->hitbox = (Hitbox*)&gHitbox_2; if (super->collisionLayer == LAYER_BOTTOM) { - uVar2 = META_TILE_TYPE_38; + uVar2 = TILE_TYPE_38; } else { - uVar2 = META_TILE_TYPE_52; + uVar2 = TILE_TYPE_52; } this->unk_70 = uVar2; if (CheckFlags(this->unk_86) != 0) { - SetMetaTileType(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTileType(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); if ((gRoomControls.reload_flags & 1) != 0) { gUpdateVisibleTiles = 0; } @@ -45,7 +45,7 @@ void ObjectA(ObjectAEntity* this) { AddInteractableSmallKeyLock(super); } } else if (super->interactType != INTERACTION_NONE) { - SetMetaTileType(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTileType(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); SetFlag(this->unk_86); CreateDust(super); ModDungeonKeys(-1); diff --git a/src/object/objectBlockingStairs.c b/src/object/objectBlockingStairs.c index 204ba0e1..2e00c122 100644 --- a/src/object/objectBlockingStairs.c +++ b/src/object/objectBlockingStairs.c @@ -108,14 +108,14 @@ void ObjectBlockingStairs_Action1(ObjectBlockingStairsEntity* this) { } if (this->unk7b & 0x40) { - tileType = (u32)GetMetaTileType(this->tilePos - 1, super->collisionLayer); + tileType = (u32)GetTileType(this->tilePos - 1, super->collisionLayer); } else { - tileType = (u32)GetMetaTileType(this->tilePos + 1, super->collisionLayer); + tileType = (u32)GetTileType(this->tilePos + 1, super->collisionLayer); } switch (tileType) { - case SPECIAL_META_TILE_48: - case SPECIAL_META_TILE_49: + case SPECIAL_TILE_48: + case SPECIAL_TILE_49: super->action = 3; super->direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); super->speed = 0x80; @@ -134,23 +134,23 @@ void ObjectBlockingStairs_Action1(ObjectBlockingStairsEntity* this) { if (this->unk7b & 0x80) { this->unk7b &= ~0x80; if ((this->unk7b & 0x40) != 0) { - SetMetaTile(SPECIAL_META_TILE_44, this->tilePos - 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_61, this->tilePos + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_44, this->tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + 1, super->collisionLayer); } else { - SetMetaTile(SPECIAL_META_TILE_61, this->tilePos - 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_45, this->tilePos + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_45, this->tilePos + 1, super->collisionLayer); } } else if (this->unk7b & 0x40) { if (xDist >= 5) { this->unk7b &= ~(0x40 | 0x80); - SetMetaTile(SPECIAL_META_TILE_61, this->tilePos - 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_45, this->tilePos + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_45, this->tilePos + 1, super->collisionLayer); } } else { if (-xDist > 4) { this->unk7b |= 0x40; - SetMetaTile(SPECIAL_META_TILE_44, this->tilePos - 1, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_61, this->tilePos + 1, super->collisionLayer); + SetTile(SPECIAL_TILE_44, this->tilePos - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_61, this->tilePos + 1, super->collisionLayer); } } } @@ -191,18 +191,18 @@ void ObjectBlockingStairs_Action4(ObjectBlockingStairsEntity* this) { } void sub_080931A4(ObjectBlockingStairsEntity* this, u32 param_2) { - static const u16 gUnk_08122850[] = { SPECIAL_META_TILE_39, SPECIAL_META_TILE_35, SPECIAL_META_TILE_40, - SPECIAL_META_TILE_44, SPECIAL_META_TILE_43, SPECIAL_META_TILE_45, - SPECIAL_META_TILE_41, SPECIAL_META_TILE_38, SPECIAL_META_TILE_42 }; - static const u16 gUnk_08122862[] = { SPECIAL_META_TILE_39, SPECIAL_META_TILE_35, SPECIAL_META_TILE_40, - SPECIAL_META_TILE_36, SPECIAL_META_TILE_34, SPECIAL_META_TILE_37, - SPECIAL_META_TILE_41, SPECIAL_META_TILE_38, SPECIAL_META_TILE_42 }; - static const u16 gUnk_08122874[] = { SPECIAL_META_TILE_39, SPECIAL_META_TILE_35, SPECIAL_META_TILE_35, - SPECIAL_META_TILE_36, SPECIAL_META_TILE_34, SPECIAL_META_TILE_34, - SPECIAL_META_TILE_41, SPECIAL_META_TILE_38, SPECIAL_META_TILE_38 }; - static const u16 gUnk_08122886[] = { SPECIAL_META_TILE_35, SPECIAL_META_TILE_35, SPECIAL_META_TILE_40, - SPECIAL_META_TILE_34, SPECIAL_META_TILE_34, SPECIAL_META_TILE_37, - SPECIAL_META_TILE_38, SPECIAL_META_TILE_38, SPECIAL_META_TILE_42 }; + static const u16 gUnk_08122850[] = { SPECIAL_TILE_39, SPECIAL_TILE_35, SPECIAL_TILE_40, + SPECIAL_TILE_44, SPECIAL_TILE_43, SPECIAL_TILE_45, + SPECIAL_TILE_41, SPECIAL_TILE_38, SPECIAL_TILE_42 }; + static const u16 gUnk_08122862[] = { SPECIAL_TILE_39, SPECIAL_TILE_35, SPECIAL_TILE_40, + SPECIAL_TILE_36, SPECIAL_TILE_34, SPECIAL_TILE_37, + SPECIAL_TILE_41, SPECIAL_TILE_38, SPECIAL_TILE_42 }; + static const u16 gUnk_08122874[] = { SPECIAL_TILE_39, SPECIAL_TILE_35, SPECIAL_TILE_35, + SPECIAL_TILE_36, SPECIAL_TILE_34, SPECIAL_TILE_34, + SPECIAL_TILE_41, SPECIAL_TILE_38, SPECIAL_TILE_38 }; + static const u16 gUnk_08122886[] = { SPECIAL_TILE_35, SPECIAL_TILE_35, SPECIAL_TILE_40, + SPECIAL_TILE_34, SPECIAL_TILE_34, SPECIAL_TILE_37, + SPECIAL_TILE_38, SPECIAL_TILE_38, SPECIAL_TILE_42 }; u32 collisionLayer; const u16* pTileTypes; @@ -232,7 +232,7 @@ void sub_080931A4(ObjectBlockingStairsEntity* this, u32 param_2) { for (index = 0, iVar5 = 0; index < 9; index++) { u32 pos = tilePos + iVar5 + index - 1; - SetMetaTile(pTileTypes[index], pos, collisionLayer); + SetTile(pTileTypes[index], pos, collisionLayer); switch (index) { case 2: iVar5 = 0x3d; diff --git a/src/object/objectOnPillar.c b/src/object/objectOnPillar.c index 8a9c7913..76ad4984 100644 --- a/src/object/objectOnPillar.c +++ b/src/object/objectOnPillar.c @@ -148,8 +148,8 @@ void ObjectOnPillar_Action4(ObjectOnPillarEntity* this) { bool32 sub_08097008(ObjectOnPillarEntity* this) { Entity* effect; - u32 tileType = GetMetaTileType(this->tilePos, super->collisionLayer); - if (tileType != SPECIAL_META_TILE_54) { + u32 tileType = GetTileType(this->tilePos, super->collisionLayer); + if (tileType != SPECIAL_TILE_54) { switch (sub_08097074(tileType)) { case 1: super->direction = (((tileType - 0x37) & 3) << 3); @@ -173,8 +173,8 @@ bool32 sub_08097008(ObjectOnPillarEntity* this) { u32 sub_08097074(u32 tileType) { static const KeyValuePair gUnk_0812327C[] = { - { SPECIAL_META_TILE_55, 1 }, { SPECIAL_META_TILE_56, 1 }, { SPECIAL_META_TILE_57, 1 }, - { SPECIAL_META_TILE_58, 1 }, { META_TILE_TYPE_122, 2 }, { META_TILE_TYPE_120, 2 }, + { SPECIAL_TILE_55, 1 }, { SPECIAL_TILE_56, 1 }, { SPECIAL_TILE_57, 1 }, + { SPECIAL_TILE_58, 1 }, { TILE_TYPE_122, 2 }, { TILE_TYPE_120, 2 }, }; static const u16 gUnk_0812327CEnd = 0; const KeyValuePair* entry = gUnk_0812327C; @@ -190,8 +190,8 @@ void sub_08097098(ObjectOnPillarEntity* this) { u16 tileType; this->unk_76 = 0x20; EnqueueSFX(SFX_10F); - SetMetaTile(this->tileIndex, this->tilePos, super->collisionLayer); - tileType = GetMetaTileType(gUnk_080B4488[super->direction >> 3] + this->tilePos, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); + tileType = GetTileType(gUnk_080B4488[super->direction >> 3] + this->tilePos, super->collisionLayer); if ((tileType == 0x79) || tileType == 0x77) { super->spriteOffsetY = 2; } @@ -199,8 +199,8 @@ void sub_08097098(ObjectOnPillarEntity* this) { void sub_080970F4(ObjectOnPillarEntity* this) { this->tilePos = COORD_TO_TILE(super); - this->tileIndex = GetMetaTileIndex(this->tilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_54, this->tilePos, super->collisionLayer); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_54, this->tilePos, super->collisionLayer); } bool32 sub_08097144(ObjectOnPillarEntity* this) { @@ -222,8 +222,8 @@ bool32 sub_08097194(ObjectOnPillarEntity* this) { if (sub_0800442E(super)) { return TRUE; } else { - u32 tileType = GetMetaTileTypeByEntity(super); - if (tileType == META_TILE_TYPE_113 || tileType == META_TILE_TYPE_114 || tileType == SPECIAL_META_TILE_32) { + u32 tileType = GetTileTypeByEntity(super); + if (tileType == TILE_TYPE_113 || tileType == TILE_TYPE_114 || tileType == SPECIAL_TILE_32) { SetFlag(this->flag); EnqueueSFX(SFX_10B); sub_080971E0(this); @@ -253,13 +253,13 @@ void sub_080971E0(ObjectOnPillarEntity* this) { super->action = 4; super->frameIndex = 1; super->spritePriority.b0 = 7; - SetMetaTile(0, COORD_TO_TILE(super), super->collisionLayer); + SetTile(0, COORD_TO_TILE(super), super->collisionLayer); DeleteThisEntity(); break; case 1: tilePos = COORD_TO_TILE(super); if (sub_08097348(tilePos) == 0) { - SetMetaTileType(META_TILE_TYPE_115, tilePos, super->collisionLayer); + SetTileType(TILE_TYPE_115, tilePos, super->collisionLayer); } DeleteThisEntity(); break; diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c index 7b1d574b..828a87d5 100644 --- a/src/object/octorokBossObject.c +++ b/src/object/octorokBossObject.c @@ -351,7 +351,7 @@ bool32 sub_0809A6F8(u32 param_1, u32 param_2, u32 param_3, u32 param_4) { if (sub_0809A758(param_1, param_2) != 0) { if (gUnk_081238A0[param_3] != 0) { if ((param_4 & 1) != 0) { - SetMetaTileByIndex(gUnk_081238A0[param_3], (param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, + SetTileByIndex(gUnk_081238A0[param_3], (param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, LAYER_BOTTOM); } else { RestorePrevTileEntity((param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, 1); diff --git a/src/object/palaceArchway.c b/src/object/palaceArchway.c index 9a6f83dc..bcf23fb2 100644 --- a/src/object/palaceArchway.c +++ b/src/object/palaceArchway.c @@ -23,7 +23,7 @@ void PalaceArchway_Init(Entity* this) { this->frameIndex = this->type2; this->spriteRendering.b3 = 3; this->spritePriority.b0 = 7; - SetMetaTile(SPECIAL_META_TILE_105, COORD_TO_TILE(this), this->collisionLayer); + SetTile(SPECIAL_TILE_105, COORD_TO_TILE(this), this->collisionLayer); } void PalaceArchway_Action1(Entity* this) { diff --git a/src/object/paper.c b/src/object/paper.c index 68890eb6..eb2af45d 100644 --- a/src/object/paper.c +++ b/src/object/paper.c @@ -42,7 +42,7 @@ void Paper_Type0(Entity* this) { } this->spriteSettings.draw = 0; } - SetMetaTile(SPECIAL_META_TILE_81, COORD_TO_TILE(this), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_81, COORD_TO_TILE(this), LAYER_BOTTOM); } void Paper_Type1(Entity* this) { @@ -62,8 +62,8 @@ void Paper_Type2(Entity* this) { this->action = 1; this->y.HALF.HI++; this->spriteOffsetY = -1; - SetMetaTile(SPECIAL_META_TILE_81, COORD_TO_TILE(this) - 1, LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_81, COORD_TO_TILE(this), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_81, COORD_TO_TILE(this) - 1, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_81, COORD_TO_TILE(this), LAYER_BOTTOM); } void Paper_Action1(Entity* this) { diff --git a/src/object/playerClone.c b/src/object/playerClone.c index bd5c8a0c..4eafeb31 100644 --- a/src/object/playerClone.c +++ b/src/object/playerClone.c @@ -52,7 +52,7 @@ void PlayerClone_Init(PlayerCloneEntity* this) { super->y.HALF.HI = (super->y.HALF.HI & 0xfff0) | 8; this->tilePos = COORD_TO_TILE(super); InitializeAnimation(super, 8); - SetMetaTile(SPECIAL_META_TILE_22, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_22, this->tilePos, super->collisionLayer); SoundReq(SFX_112); } @@ -78,7 +78,7 @@ void PlayerClone_Action1(PlayerCloneEntity* this) { if ((this->unk78 != 0) && (this->unk7a != 0)) { ((PlayerCloneEntity*)gPlayerClones[super->type])->unk70 = 1; } - CloneTile(META_TILE_TYPE_789, this->tilePos, super->collisionLayer); + CloneTile(TILE_TYPE_789, 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; @@ -87,7 +87,7 @@ void PlayerClone_Action1(PlayerCloneEntity* this) { sub_0806FDA0(super); PlayerClone_Action2(this); } else if (gPlayerState.chargeState.action != 4) { - CloneTile(META_TILE_TYPE_789, this->tilePos, super->collisionLayer); + CloneTile(TILE_TYPE_789, this->tilePos, super->collisionLayer); gPlayerClones[super->type] = NULL; DeleteThisEntity(); } else { @@ -191,8 +191,8 @@ void sub_08084CAC(PlayerCloneEntity* this) { if (((PlayerCloneEntity*)gPlayerClones[super->type])->unk70 == 0) { ptr = &gUnk_080B4468[super->animationState & 6]; - if (GetVvvForMetaTileType( - GetMetaTileType(COORD_TO_TILE_OFFSET(super, -ptr[0], -ptr[1]), super->collisionLayer)) == VVV_114) { + if (GetVvvForTileType( + GetTileType(COORD_TO_TILE_OFFSET(super, -ptr[0], -ptr[1]), super->collisionLayer)) == VVV_114) { ((PlayerCloneEntity*)gPlayerClones[0])->unk6c |= (1 << super->type); } else { ((PlayerCloneEntity*)gPlayerClones[0])->unk6c &= ~(1 << super->type); diff --git a/src/object/pot.c b/src/object/pot.c index e8e0c570..ed8504a7 100644 --- a/src/object/pot.c +++ b/src/object/pot.c @@ -79,12 +79,12 @@ void Pot_Init(PotEntity* this) { ResolveCollisionLayer(super); } - this->unk_70 = GetMetaTileIndex(COORD_TO_TILE(super), super->collisionLayer); - if (this->unk_70 == SPECIAL_META_TILE_0) { + this->unk_70 = GetTileIndex(COORD_TO_TILE(super), super->collisionLayer); + if (this->unk_70 == SPECIAL_TILE_0) { DeleteThisEntity(); } - SetMetaTile(SPECIAL_META_TILE_0, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_0, COORD_TO_TILE(super), super->collisionLayer); InitializeAnimation(super, 5); } @@ -97,7 +97,7 @@ void Pot_Action1(PotEntity* this) { super->subAction = 0; break; case 0x1D: - SetMetaTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); super->action = 5; super->zVelocity = Q_16_16(2.625); super->spriteOffsetY = 0; @@ -107,33 +107,33 @@ void Pot_Action1(PotEntity* this) { Pot_Action5(this); break; default: - tileType = GetMetaTileTypeByEntity(super); + tileType = GetTileTypeByEntity(super); if (tileType != 0x4000) { switch (tileType) { - case SPECIAL_META_TILE_4: - case SPECIAL_META_TILE_3: - case SPECIAL_META_TILE_2: - case SPECIAL_META_TILE_1: - super->direction = (tileType - SPECIAL_META_TILE_1) * 8; + case SPECIAL_TILE_4: + case SPECIAL_TILE_3: + case SPECIAL_TILE_2: + case SPECIAL_TILE_1: + super->direction = (tileType - SPECIAL_TILE_1) * 8; super->timer = 32; super->action = 4; if (gPlayerState.flags & PL_MINISH) { super->speed >>= 1; super->timer = 64; } - SetMetaTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); EnqueueSFX(SFX_10F); break; - case SPECIAL_META_TILE_103: - SetMetaTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + case SPECIAL_TILE_103: + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); DeleteThisEntity(); break; default: if (GetVvvAtEntity(super) == VVV_13) { CreateFx(super, FX_FALL_DOWN, 0); - } else if (tileType == SPECIAL_META_TILE_5) { + } else if (tileType == SPECIAL_TILE_5) { gPlayerState.lastSwordMove = SWORD_MOVE_BREAK_POT; - SetMetaTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); } BreakPot(this, NULL); break; @@ -159,7 +159,7 @@ void sub_08082510(PotEntity* this) { super->hitType = 1; super->collisionMask = gPlayerEntity.base.collisionMask; super->spriteOffsetY = 0; - SetMetaTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); super->subAction++; } @@ -223,15 +223,15 @@ void Pot_Action4(PotEntity* this) { super->speed <<= 1; } - this->unk_70 = GetMetaTileIndex(COORD_TO_TILE(super), super->collisionLayer); - tileType = GetMetaTileTypeByEntity(super); + this->unk_70 = GetTileIndex(COORD_TO_TILE(super), super->collisionLayer); + tileType = GetTileTypeByEntity(super); switch (tileType) { case 0x71: case 0x72: BreakPot(this, NULL); break; default: - SetMetaTile(SPECIAL_META_TILE_0, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_0, COORD_TO_TILE(super), super->collisionLayer); RegisterCarryEntity(super); break; } @@ -254,7 +254,7 @@ void sub_0808270C(PotEntity* this) { if ((gPlayerState.gustJarState & 0xF) != 0x1 || (super->contactFlags & 0x7F) != 0x13) { super->spriteOffsetX = 0; super->action = 1; - SetMetaTile(SPECIAL_META_TILE_0, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_0, COORD_TO_TILE(super), super->collisionLayer); } else { sub_0806F4E8(super); } @@ -265,7 +265,7 @@ void sub_08082778(PotEntity* this) { super->timer = 1; super->spriteOffsetX = 0; super->spriteOffsetY = -2; - SetMetaTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); + SetTile((u16)this->unk_70, COORD_TO_TILE(super), super->collisionLayer); } if ((gPlayerState.gustJarState & 0xF) != 0x1 || (super->contactFlags & 0x7F) != 0x13) { diff --git a/src/object/pullableMushroom.c b/src/object/pullableMushroom.c index da711c66..44d17deb 100644 --- a/src/object/pullableMushroom.c +++ b/src/object/pullableMushroom.c @@ -60,7 +60,7 @@ void PullableMushroom_Init(PullableMushroomEntity* this) { super->spritePriority.b0 = 4; super->hitbox = (Hitbox*)&gUnk_080FD224; super->carryFlags = 1; - SetMetaTile(SPECIAL_META_TILE_34, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_34, COORD_TO_TILE(super), super->collisionLayer); super->health = 1; super->collisionFlags = 7; super->hitType = 0x6e; diff --git a/src/object/pushableFurniture.c b/src/object/pushableFurniture.c index 914a4501..04682181 100644 --- a/src/object/pushableFurniture.c +++ b/src/object/pushableFurniture.c @@ -149,20 +149,20 @@ void PushableFurniture_Action1(PushableFurnitureEntity* this) { } void sub_0808FB68(PushableFurnitureEntity* this) { - u32 tileIndex = GetMetaTileIndex(this->unk_70, super->collisionLayer); + u32 tileIndex = GetTileIndex(this->unk_70, super->collisionLayer); switch (tileIndex) { - case SPECIAL_META_TILE_48: - case SPECIAL_META_TILE_49: + case SPECIAL_TILE_48: + case SPECIAL_TILE_49: super->action = 2; super->direction = (((tileIndex - 0x30) & 1) << 4) | 8; SetPlayerControl(CONTROL_1); sub_0808FD44(this, 0); break; default: - tileIndex = GetMetaTileIndex(this->unk_72, super->collisionLayer); + tileIndex = GetTileIndex(this->unk_72, super->collisionLayer); switch (tileIndex) { - case SPECIAL_META_TILE_48: - case SPECIAL_META_TILE_49: + case SPECIAL_TILE_48: + case SPECIAL_TILE_49: super->action = 2; super->direction = (((tileIndex - 0x30) & 1) << 4) | 8; SetPlayerControl(CONTROL_1); @@ -175,8 +175,8 @@ void sub_0808FB68(PushableFurnitureEntity* this) { } void sub_0808FBFC(PushableFurnitureEntity* this) { - u32 tileIndex = GetMetaTileIndex(this->unk_7c, super->collisionLayer); - if (tileIndex != SPECIAL_META_TILE_74) { + u32 tileIndex = GetTileIndex(this->unk_7c, super->collisionLayer); + if (tileIndex != SPECIAL_TILE_74) { super->action = 2; super->direction = ((tileIndex - 0x4bU) & 3) << 3; SetPlayerControl(CONTROL_1); @@ -283,38 +283,38 @@ void sub_0808FD44(PushableFurnitureEntity* this, u32 param_2) { } EnqueueSFX(SFX_10F); sub_08090254(this); - GetMetaTileIndex(tmp + gUnk_080B4488[super->direction >> 3], super->collisionLayer); + GetTileIndex(tmp + gUnk_080B4488[super->direction >> 3], super->collisionLayer); } void sub_0808FDE8(PushableFurnitureEntity* this) { u32 uVar1; s32 iVar2; - u32 metaTilePos; + u32 tilePos; - metaTilePos = (u32)this->unk_70; - uVar1 = GetCollisionDataAtMetaTilePos(metaTilePos - 1, LAYER_BOTTOM); - iVar2 = GetMetaTileIndex(metaTilePos, LAYER_BOTTOM); - if (iVar2 == SPECIAL_META_TILE_46) { + tilePos = (u32)this->unk_70; + uVar1 = GetCollisionDataAtTilePos(tilePos - 1, LAYER_BOTTOM); + iVar2 = GetTileIndex(tilePos, LAYER_BOTTOM); + if (iVar2 == SPECIAL_TILE_46) { if ((((uVar1 & 0xf0) != 0) && ((uVar1 & 0xf0) != 0x50)) || ((uVar1 & 5) == 0)) { - SetMetaTile(SPECIAL_META_TILE_44, metaTilePos, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_44, tilePos, LAYER_BOTTOM); } } else { - iVar2 = GetCollisionDataAtMetaTilePos(metaTilePos, LAYER_BOTTOM); + iVar2 = GetCollisionDataAtTilePos(tilePos, LAYER_BOTTOM); if ((iVar2 == 5) && ((((uVar1 & 0xf0) == 0 || ((uVar1 & 0xf0) == 0x50)) && ((uVar1 & 5) != 0)))) { - SetMetaTile(SPECIAL_META_TILE_46, metaTilePos, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_46, tilePos, LAYER_BOTTOM); } } - metaTilePos = (u32)this->unk_72; - uVar1 = GetCollisionDataAtMetaTilePos(metaTilePos + 1, LAYER_BOTTOM); - iVar2 = GetMetaTileIndex(metaTilePos, LAYER_BOTTOM); - if (iVar2 == SPECIAL_META_TILE_47) { + tilePos = (u32)this->unk_72; + uVar1 = GetCollisionDataAtTilePos(tilePos + 1, LAYER_BOTTOM); + iVar2 = GetTileIndex(tilePos, LAYER_BOTTOM); + if (iVar2 == SPECIAL_TILE_47) { if ((((uVar1 & 0xf0) != 0) && ((uVar1 & 0xf0) != 0x50)) || ((uVar1 & 10) == 0)) { - SetMetaTile(SPECIAL_META_TILE_45, metaTilePos, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_45, tilePos, LAYER_BOTTOM); } } else { - iVar2 = GetCollisionDataAtMetaTilePos(metaTilePos, LAYER_BOTTOM); + iVar2 = GetCollisionDataAtTilePos(tilePos, LAYER_BOTTOM); if (((iVar2 == 10) && (((uVar1 & 0xf0) == 0 || ((uVar1 & 0xf0) == 0x50)))) && ((uVar1 & 10) != 0)) { - SetMetaTile(SPECIAL_META_TILE_47, metaTilePos, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_47, tilePos, LAYER_BOTTOM); } } } @@ -361,24 +361,24 @@ void sub_0808FF50(PushableFurnitureEntity* this) { switch (this->unk_80) { case 0: this->unk_70 = tmp; - this->unk_74 = GetMetaTileIndex(this->unk_70, LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_74, tmp, LAYER_BOTTOM); + this->unk_74 = GetTileIndex(this->unk_70, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_74, tmp, LAYER_BOTTOM); break; case 1: if ((tmp2 & 8) != 0) { this->unk_70 = this->unk_7c; - this->unk_74 = GetMetaTileIndex(this->unk_70, LAYER_BOTTOM); - SetMetaTile(gUnk_08121EE4[this->unk_81], position, LAYER_BOTTOM); + this->unk_74 = GetTileIndex(this->unk_70, LAYER_BOTTOM); + SetTile(gUnk_08121EE4[this->unk_81], position, LAYER_BOTTOM); this->unk_72 = tmp + 1; - this->unk_76 = GetMetaTileIndex(this->unk_72, LAYER_BOTTOM); + this->unk_76 = GetTileIndex(this->unk_72, LAYER_BOTTOM); sub_08090094(this, gUnk_08121EE4[this->unk_81 + 4], this->unk_72); sub_0809028C(this, 1); } else { this->unk_72 = this->unk_7c; - this->unk_76 = GetMetaTileIndex(this->unk_72, LAYER_BOTTOM); - SetMetaTile(gUnk_08121EE4[this->unk_81], position, LAYER_BOTTOM); + this->unk_76 = GetTileIndex(this->unk_72, LAYER_BOTTOM); + SetTile(gUnk_08121EE4[this->unk_81], position, LAYER_BOTTOM); this->unk_70 = tmp - 1; - this->unk_74 = GetMetaTileIndex(this->unk_70, LAYER_BOTTOM); + this->unk_74 = GetTileIndex(this->unk_70, LAYER_BOTTOM); sub_08090094(this, gUnk_08121EE4[this->unk_81 + 2], this->unk_70); sub_0809028C(this, 0); } @@ -392,92 +392,92 @@ void sub_08090094(PushableFurnitureEntity* this, u32 tileIndex, u32 tilePos) { u32 newTileIndex; u32 tmp2; - tmp1 = GetCollisionDataAtMetaTilePos(tilePos, 1); - newTileIndex = GetMetaTileIndex(tilePos, LAYER_BOTTOM); + tmp1 = GetCollisionDataAtTilePos(tilePos, 1); + newTileIndex = GetTileIndex(tilePos, LAYER_BOTTOM); if ((newTileIndex & 0x4000) == 0) { newTileIndex = tileIndex; switch (newTileIndex) { - case SPECIAL_META_TILE_37: + case SPECIAL_TILE_37: if (tmp1 == 5) { - newTileIndex = SPECIAL_META_TILE_34; + newTileIndex = SPECIAL_TILE_34; } - SetMetaTile(newTileIndex, tilePos, LAYER_BOTTOM); + SetTile(newTileIndex, tilePos, LAYER_BOTTOM); return; - case SPECIAL_META_TILE_45: - case SPECIAL_META_TILE_47: + case SPECIAL_TILE_45: + case SPECIAL_TILE_47: if (tmp1 == 5) { - newTileIndex = SPECIAL_META_TILE_34; + newTileIndex = SPECIAL_TILE_34; } - SetMetaTile(newTileIndex, tilePos, LAYER_BOTTOM); + SetTile(newTileIndex, tilePos, LAYER_BOTTOM); return; - case SPECIAL_META_TILE_36: - case SPECIAL_META_TILE_44: - case SPECIAL_META_TILE_46: + case SPECIAL_TILE_36: + case SPECIAL_TILE_44: + case SPECIAL_TILE_46: if (tmp1 == 10) { - newTileIndex = SPECIAL_META_TILE_34; + newTileIndex = SPECIAL_TILE_34; } - SetMetaTile(newTileIndex, tilePos, LAYER_BOTTOM); + SetTile(newTileIndex, tilePos, LAYER_BOTTOM); return; default: - SetMetaTile(newTileIndex, tilePos, LAYER_BOTTOM); + SetTile(newTileIndex, tilePos, LAYER_BOTTOM); return; } } switch (newTileIndex) { - case SPECIAL_META_TILE_34: + case SPECIAL_TILE_34: default: return; - case SPECIAL_META_TILE_37: - if (tileIndex == SPECIAL_META_TILE_36) { - newTileIndex = SPECIAL_META_TILE_34; + case SPECIAL_TILE_37: + if (tileIndex == SPECIAL_TILE_36) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x10; } - if (tileIndex == SPECIAL_META_TILE_44) { - newTileIndex = SPECIAL_META_TILE_34; + if (tileIndex == SPECIAL_TILE_44) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x10; } break; - case SPECIAL_META_TILE_45: - case SPECIAL_META_TILE_47: - if (tileIndex == SPECIAL_META_TILE_44) { - newTileIndex = SPECIAL_META_TILE_43; + case SPECIAL_TILE_45: + case SPECIAL_TILE_47: + if (tileIndex == SPECIAL_TILE_44) { + newTileIndex = SPECIAL_TILE_43; this->unk_83 |= 0x10; } - if (tileIndex == SPECIAL_META_TILE_36) { - newTileIndex = SPECIAL_META_TILE_34; + if (tileIndex == SPECIAL_TILE_36) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x10; } break; - case SPECIAL_META_TILE_36: - if (tileIndex == SPECIAL_META_TILE_37) { - newTileIndex = SPECIAL_META_TILE_34; + case SPECIAL_TILE_36: + if (tileIndex == SPECIAL_TILE_37) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x20; } - if (tileIndex == SPECIAL_META_TILE_45) { - newTileIndex = SPECIAL_META_TILE_34; + if (tileIndex == SPECIAL_TILE_45) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x20; } break; - case SPECIAL_META_TILE_44: - case SPECIAL_META_TILE_46: - if (tileIndex == SPECIAL_META_TILE_45) { - newTileIndex = SPECIAL_META_TILE_43; + case SPECIAL_TILE_44: + case SPECIAL_TILE_46: + if (tileIndex == SPECIAL_TILE_45) { + newTileIndex = SPECIAL_TILE_43; this->unk_83 |= 0x20; } - if (tileIndex == SPECIAL_META_TILE_37) { - newTileIndex = SPECIAL_META_TILE_34; + if (tileIndex == SPECIAL_TILE_37) { + newTileIndex = SPECIAL_TILE_34; this->unk_83 |= 0x20; } break; } - SetMetaTile(newTileIndex, tilePos, LAYER_BOTTOM); + SetTile(newTileIndex, tilePos, LAYER_BOTTOM); } void sub_08090254(PushableFurnitureEntity* this) { - SetMetaTileByIndex(this->unk_74, this->unk_70, super->collisionLayer); + SetTileByIndex(this->unk_74, this->unk_70, super->collisionLayer); if (this->unk_80 == 1) { - SetMetaTileByIndex(this->unk_76, this->unk_72, super->collisionLayer); + SetTileByIndex(this->unk_76, this->unk_72, super->collisionLayer); } } @@ -492,7 +492,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { if ((this->unk_83 & 0x20) != 0) { sub_08090480(0, uVar2 + 1); } else { - switch (GetMetaTileType(uVar2, 2)) { + switch (GetTileType(uVar2, 2)) { case 0x301: this->unk_83 |= 8; break; @@ -506,7 +506,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { sub_08090480(0, uVar2); } if ((this->unk_83 & 0x10) != 0) { - switch (GetMetaTileType(pos - 1, 1)) { + switch (GetTileType(pos - 1, 1)) { case 0x300: break; default: @@ -516,7 +516,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { } return; } - switch (GetMetaTileType(pos - 1, 2)) { + switch (GetTileType(pos - 1, 2)) { case 0x300: this->unk_83 |= 4; break; @@ -533,7 +533,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { if ((this->unk_83 & 0x10) != 0) { sub_08090480(0, pos - 1); } else { - switch (GetMetaTileType(pos, 2)) { + switch (GetTileType(pos, 2)) { case 0x302: this->unk_83 |= 4; break; @@ -547,7 +547,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { sub_08090480(0, uVar2); } if ((this->unk_83 & 0x20) != 0) { - switch (GetMetaTileType(uVar2 + 1, 1)) { + switch (GetTileType(uVar2 + 1, 1)) { case 0x300: break; default: @@ -557,7 +557,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { } return; } - switch (GetMetaTileType(uVar2 + 1, 2)) { + switch (GetTileType(uVar2 + 1, 2)) { case 0x300: this->unk_83 |= 8; break; @@ -573,18 +573,18 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { } void sub_08090480(u32 param_1, u32 tilePos) { - SetMetaTile(gUnk_08121EF0[param_1], tilePos, LAYER_BOTTOM); + SetTile(gUnk_08121EF0[param_1], tilePos, LAYER_BOTTOM); } void sub_08090498(PushableFurnitureEntity* this) { u32 tmp = this->unk_70 - 0x80; RestorePrevTileEntity(tmp, 1); - if (((this->unk_83 & 1) != 0) && (GetMetaTileType(tmp, 2) == 0x306)) { + if (((this->unk_83 & 1) != 0) && (GetTileType(tmp, 2) == 0x306)) { SetCollisionData(0x62, tmp, 1); } tmp = this->unk_72 - 0x80; RestorePrevTileEntity(tmp, 1); - if (((this->unk_83 & 2) != 0) && (GetMetaTileType(tmp, 2) == 0x308)) { + if (((this->unk_83 & 2) != 0) && (GetTileType(tmp, 2) == 0x308)) { SetCollisionData(99, tmp, 1); } } @@ -618,12 +618,12 @@ void (*const PushableFurniture_Actions[])(PushableFurnitureEntity*) = { PushableFurniture_Action2, }; const u16 gUnk_08121EE4[] = { - SPECIAL_META_TILE_43, SPECIAL_META_TILE_34, SPECIAL_META_TILE_44, - SPECIAL_META_TILE_36, SPECIAL_META_TILE_45, SPECIAL_META_TILE_37, + SPECIAL_TILE_43, SPECIAL_TILE_34, SPECIAL_TILE_44, + SPECIAL_TILE_36, SPECIAL_TILE_45, SPECIAL_TILE_37, }; const u16 gUnk_08121EF0[] = { - SPECIAL_META_TILE_38, - SPECIAL_META_TILE_101, - SPECIAL_META_TILE_102, + SPECIAL_TILE_38, + SPECIAL_TILE_101, + SPECIAL_TILE_102, 0, }; diff --git a/src/object/pushableGrave.c b/src/object/pushableGrave.c index b285f93f..1c21581d 100644 --- a/src/object/pushableGrave.c +++ b/src/object/pushableGrave.c @@ -38,22 +38,22 @@ void PushableGrave(PushableGraveEntity* this) { } void PushableGrave_Init(PushableGraveEntity* this) { - u32 tilePosition; + u32 tilePos; u32 tileIndex; super->spriteSettings.draw = 1; super->frameIndex = super->type; super->updatePriority = 3; - tilePosition = COORD_TO_TILE(super); - this->unk_6a = GetMetaTileIndex(tilePosition - 0x41, super->collisionLayer); - this->unk_6c = GetMetaTileIndex(tilePosition - 0x40, super->collisionLayer); - this->unk_6e = GetMetaTileIndex(tilePosition - 0x3f, super->collisionLayer); - this->unk_70 = GetMetaTileIndex(tilePosition - 1, super->collisionLayer); - this->unk_72 = GetMetaTileIndex(tilePosition, super->collisionLayer); - this->unk_74 = GetMetaTileIndex(tilePosition + 1, super->collisionLayer); - this->unk_76 = GetMetaTileIndex(tilePosition + 0x3f, super->collisionLayer); - this->unk_78 = GetMetaTileIndex(tilePosition + 0x40, super->collisionLayer); - this->unk_7a = GetMetaTileIndex(tilePosition + 0x41, super->collisionLayer); + tilePos = COORD_TO_TILE(super); + this->unk_6a = GetTileIndex(tilePos - 0x41, super->collisionLayer); + this->unk_6c = GetTileIndex(tilePos - 0x40, super->collisionLayer); + this->unk_6e = GetTileIndex(tilePos - 0x3f, super->collisionLayer); + this->unk_70 = GetTileIndex(tilePos - 1, super->collisionLayer); + this->unk_72 = GetTileIndex(tilePos, super->collisionLayer); + this->unk_74 = GetTileIndex(tilePos + 1, super->collisionLayer); + this->unk_76 = GetTileIndex(tilePos + 0x3f, super->collisionLayer); + this->unk_78 = GetTileIndex(tilePos + 0x40, super->collisionLayer); + this->unk_7a = GetTileIndex(tilePos + 0x41, super->collisionLayer); if (sub_0809798C(this)) { if (super->type == 0) { super->y.HALF.HI -= 0x16; @@ -64,19 +64,19 @@ void PushableGrave_Init(PushableGraveEntity* this) { } else { super->action = 1; - tilePosition = COORD_TO_TILE(super); - this->unk_68 = tilePosition; + tilePos = COORD_TO_TILE(super); + this->unk_68 = tilePos; tileIndex = PushableGrave_Tiles[super->type2]; if (super->type == 0) { super->hitbox = (Hitbox*)&gUnk_080FD578; - SetMetaTile(tileIndex, tilePosition - 1, super->collisionLayer); - SetMetaTile(tileIndex, tilePosition, super->collisionLayer); + SetTile(tileIndex, tilePos - 1, super->collisionLayer); + SetTile(tileIndex, tilePos, super->collisionLayer); super->y.HALF.HI += 2; } else { super->hitbox = (Hitbox*)&gUnk_080FD570; - SetMetaTile(tileIndex, tilePosition, super->collisionLayer); + SetTile(tileIndex, tilePos, super->collisionLayer); if (super->type2 == 2) { - SetMultipleTiles((TileData*)gUnk_081232C0, tilePosition, super->collisionLayer); + SetMultipleTiles((TileData*)gUnk_081232C0, tilePos, super->collisionLayer); } } } @@ -130,13 +130,13 @@ void PushableGrave_Action4(PushableGraveEntity* this) { } void sub_080977F4(PushableGraveEntity* this) { - u32 tilePosition; + u32 tilePos; super->action = 4; super->spriteOffsetY = 0; - tilePosition = COORD_TO_TILE(super); - SetMetaTile(SPECIAL_META_TILE_34, tilePosition, super->collisionLayer); + tilePos = COORD_TO_TILE(super); + SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); if (super->type == 0) { - SetMetaTile(SPECIAL_META_TILE_34, tilePosition - 1, super->collisionLayer); + SetTile(SPECIAL_TILE_34, tilePos - 1, super->collisionLayer); } if (this->pushedFlag != 0) { SetFlag(this->pushedFlag); @@ -144,28 +144,28 @@ void sub_080977F4(PushableGraveEntity* this) { } bool32 sub_0809785C(PushableGraveEntity* this) { - u32 tilePosition; + u32 tilePos; if (super->type != 0) { if (super->type2 != 0) { if ((CheckFlags(this->pushedFlag) != 0) || - GetMetaTileType(this->unk_68, super->collisionLayer) == SPECIAL_META_TILE_63) { + GetTileType(this->unk_68, super->collisionLayer) == SPECIAL_TILE_63) { super->action = 3; super->timer = 64; super->subtimer = 0; super->direction = 0; super->speed = 0x40; - tilePosition = this->unk_68; - SetMetaTileByIndex(this->unk_72, tilePosition, super->collisionLayer); + tilePos = this->unk_68; + SetTileByIndex(this->unk_72, tilePos, super->collisionLayer); if (super->type2 == 2) { - SetMetaTileByIndex(this->unk_6a, tilePosition + TILE_POS(-1, -1), super->collisionLayer); - SetMetaTileByIndex(this->unk_6c, tilePosition + TILE_POS(0, -1), super->collisionLayer); - SetMetaTileByIndex(this->unk_6e, tilePosition + TILE_POS(1, -1), super->collisionLayer); - SetMetaTileByIndex(this->unk_70, tilePosition + TILE_POS(-1, 0), super->collisionLayer); - SetMetaTileByIndex(this->unk_74, tilePosition + TILE_POS(1, 0), super->collisionLayer); - SetMetaTileByIndex(this->unk_76, tilePosition + TILE_POS(-1, 1), super->collisionLayer); - SetMetaTileByIndex(this->unk_78, tilePosition + TILE_POS(0, 1), super->collisionLayer); - SetMetaTileByIndex(this->unk_7a, tilePosition + TILE_POS(1, 1), super->collisionLayer); + SetTileByIndex(this->unk_6a, tilePos + TILE_POS(-1, -1), super->collisionLayer); + SetTileByIndex(this->unk_6c, tilePos + TILE_POS(0, -1), super->collisionLayer); + SetTileByIndex(this->unk_6e, tilePos + TILE_POS(1, -1), super->collisionLayer); + SetTileByIndex(this->unk_70, tilePos + TILE_POS(-1, 0), super->collisionLayer); + SetTileByIndex(this->unk_74, tilePos + TILE_POS(1, 0), super->collisionLayer); + SetTileByIndex(this->unk_76, tilePos + TILE_POS(-1, 1), super->collisionLayer); + SetTileByIndex(this->unk_78, tilePos + TILE_POS(0, 1), super->collisionLayer); + SetTileByIndex(this->unk_7a, tilePos + TILE_POS(1, 1), super->collisionLayer); } SoundReq(SFX_10F); return TRUE; @@ -206,7 +206,7 @@ const u8 gUnk_081232C0[] = { 255, 61, 64, 1, 0, 61, 64, 63, 0, 61, 64, 65, 0, 255, 255, }; const u16 PushableGrave_Tiles[] = { - SPECIAL_META_TILE_34, - SPECIAL_META_TILE_62, - SPECIAL_META_TILE_62, + SPECIAL_TILE_34, + SPECIAL_TILE_62, + SPECIAL_TILE_62, }; diff --git a/src/object/pushableLever.c b/src/object/pushableLever.c index 4d633d69..592a51e2 100644 --- a/src/object/pushableLever.c +++ b/src/object/pushableLever.c @@ -31,7 +31,7 @@ extern const u8 PushableLever_PushedOffsets[]; void PushableLever_SetIdle(PushableLeverEntity*); bool32 PushableLever_ShouldStartPushing(PushableLeverEntity* this); -void PushableLever_SetMetaTiles(PushableLeverEntity*); +void PushableLever_SetTiles(PushableLeverEntity*); void PushableLever_CalculateSpriteOffsets(PushableLeverEntity*); void PushableLever(PushableLeverEntity* this) { @@ -48,7 +48,7 @@ void PushableLever_Idle(PushableLeverEntity* this) { super->action = PUSHING; super->spriteOffsetX = 0; super->spriteOffsetY = 0; - SetMetaTile(this->tileIndex, this->tilePos, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); EnqueueSFX(SFX_16A); RequestPriorityDuration(super, 30); if (PlayerCanBeMoved()) { @@ -77,32 +77,32 @@ void PushableLever_Pushing(PushableLeverEntity* this) { void PushableLever_SetIdle(PushableLeverEntity* this) { super->action = IDLE; this->timer = 60; - PushableLever_SetMetaTiles(this); + PushableLever_SetTiles(this); } -void PushableLever_SetMetaTiles(PushableLeverEntity* this) { +void PushableLever_SetTiles(PushableLeverEntity* this) { if (CheckFlags(this->pushedFlag) == FALSE) { super->type2 = 0; this->tilePos = COORD_TO_TILE_OFFSET(super, 0, 0x10); - this->tileIndex = GetMetaTileIndex(this->tilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_83, this->tilePos, super->collisionLayer); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_83, this->tilePos, super->collisionLayer); InitializeAnimation(super, 1); } else { super->type2 = 1; this->tilePos = COORD_TO_TILE_OFFSET(super, 0x10, 0); - this->tileIndex = GetMetaTileIndex(this->tilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_82, this->tilePos, super->collisionLayer); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_82, this->tilePos, super->collisionLayer); InitializeAnimation(super, 0); } } bool32 PushableLever_ShouldStartPushing(PushableLeverEntity* this) { - if (GetMetaTileIndex(this->tilePos, super->collisionLayer) == SPECIAL_META_TILE_84) { + if (GetTileIndex(this->tilePos, super->collisionLayer) == SPECIAL_TILE_84) { if (--this->timer == 0) { return TRUE; } PushableLever_CalculateSpriteOffsets(this); - SetMetaTile(PushableLever_Tiles[super->type2], this->tilePos, super->collisionLayer); + SetTile(PushableLever_Tiles[super->type2], this->tilePos, super->collisionLayer); } else { this->timer = 60; super->spriteOffsetX = 0; @@ -132,8 +132,8 @@ void (*const PushableLever_Actions[])(PushableLeverEntity*) = { PushableLever_Pushing, }; const u16 PushableLever_Tiles[] = { - SPECIAL_META_TILE_83, - SPECIAL_META_TILE_82, + SPECIAL_TILE_83, + SPECIAL_TILE_82, }; const u8 PushableLever_InitialOffsets[] = { 0, 0, 0, 0, 255, 0, 0, 0, diff --git a/src/object/pushableRock.c b/src/object/pushableRock.c index 71e5a642..b8c98047 100644 --- a/src/object/pushableRock.c +++ b/src/object/pushableRock.c @@ -41,12 +41,12 @@ void PushableRock_Action1(PushableRockEntity* this) { u32 tileType; u32 tmp; - tileType = GetMetaTileType(this->tilePos, super->collisionLayer); + tileType = GetTileType(this->tilePos, super->collisionLayer); switch (tileType) { - case SPECIAL_META_TILE_28: - case SPECIAL_META_TILE_29: - case SPECIAL_META_TILE_30: - case SPECIAL_META_TILE_31: + case SPECIAL_TILE_28: + case SPECIAL_TILE_29: + case SPECIAL_TILE_30: + case SPECIAL_TILE_31: tmp = (tileType - 0x1c); super->animationState = tmp * 2; super->direction = tmp * 8; @@ -55,7 +55,7 @@ void PushableRock_Action1(PushableRockEntity* this) { } else { super->spriteSettings.flipX = 0; } - SetMetaTile(this->tileIndex, this->tilePos, super->collisionLayer); + SetTile(this->tileIndex, this->tilePos, super->collisionLayer); super->action = 2; InitializeAnimation(super, (super->animationState >> 1) + 1); EnqueueSFX(SFX_10F); @@ -89,11 +89,11 @@ void PushableRock_Action3(PushableRockEntity* this) { void sub_0808A644(PushableRockEntity* this) { u32 vvv; this->tilePos = COORD_TO_TILE(super); - this->tileIndex = GetMetaTileIndex(this->tilePos, super->collisionLayer); - this->collisionData = GetCollisionDataAtMetaTilePos(this->tilePos, super->collisionLayer); - vvv = GetVvvAtMetaTilePos(this->tilePos, super->collisionLayer); + this->tileIndex = GetTileIndex(this->tilePos, super->collisionLayer); + this->collisionData = GetCollisionDataAtTilePos(this->tilePos, super->collisionLayer); + vvv = GetVvvAtTilePos(this->tilePos, super->collisionLayer); if ((vvv == VVV_25) || (vvv == VVV_240)) { - SetMetaTile(SPECIAL_META_TILE_21, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_21, this->tilePos, super->collisionLayer); super->action = 3; if (!CheckFlags(this->pushedFlag)) { SetFlag(this->pushedFlag); @@ -103,7 +103,7 @@ void sub_0808A644(PushableRockEntity* this) { InitializeAnimation(super, 6); } } else { - SetMetaTile(SPECIAL_META_TILE_27, this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_27, this->tilePos, super->collisionLayer); } } diff --git a/src/object/pushableStatue.c b/src/object/pushableStatue.c index 95671883..1649bcef 100644 --- a/src/object/pushableStatue.c +++ b/src/object/pushableStatue.c @@ -30,7 +30,7 @@ extern const u16 gUnk_08120CBC[]; extern const u16 gUnk_08120CCC[]; extern const u16 gUnk_08120D6C[]; -u32 sub_0808968C(u32 metaTileType); +u32 sub_0808968C(u32 tileType); bool32 sub_0808965C(PushableStatueEntity*); void sub_08089454(PushableStatueEntity*); void sub_080894C8(PushableStatueEntity*); @@ -58,16 +58,16 @@ void PushableStatue_Init(PushableStatueEntity* this) { } void PushableStatue_Action1(PushableStatueEntity* this) { - u16 metaTileType; + u16 tileType; Entity* obj; if (sub_0800442E(super) == 0) { - metaTileType = GetMetaTileType(this->unk_84, super->collisionLayer); - if (metaTileType != SPECIAL_META_TILE_11) { - switch (sub_0808968C(metaTileType)) { + tileType = GetTileType(this->unk_84, super->collisionLayer); + if (tileType != SPECIAL_TILE_11) { + switch (sub_0808968C(tileType)) { case 1: super->action = 3; - super->direction = ((metaTileType - 0xc) & 3) << 3; + super->direction = ((tileType - 0xc) & 3) << 3; sub_08089538(this); break; case 0: @@ -78,7 +78,7 @@ void PushableStatue_Action1(PushableStatueEntity* this) { sub_080894FC(this); break; case 2: - this->unk_80 = metaTileType; + this->unk_80 = tileType; break; } } else { @@ -99,7 +99,7 @@ void PushableStatue_Action2(PushableStatueEntity* this) { } void PushableStatue_SubAction0(PushableStatueEntity* this) { - u16 metaTileType; + u16 tileType; Entity* obj; u32 index; const s8* ptr; @@ -110,11 +110,11 @@ void PushableStatue_SubAction0(PushableStatueEntity* this) { ptr = &gUnk_08120CB4[index]; PositionRelative(super, &gPlayerEntity.base, Q_16_16(ptr[0]), Q_16_16(ptr[1])); } - metaTileType = GetMetaTileType(this->unk_84, super->collisionLayer); - if (metaTileType != SPECIAL_META_TILE_11) { - switch (sub_0808968C(metaTileType)) { + tileType = GetTileType(this->unk_84, super->collisionLayer); + if (tileType != SPECIAL_TILE_11) { + switch (sub_0808968C(tileType)) { case 1: - super->direction = DirectionFromAnimationState((metaTileType - 0xc) & 3); + super->direction = DirectionFromAnimationState((tileType - 0xc) & 3); sub_08089538(this); break; case 0: @@ -125,7 +125,7 @@ void PushableStatue_SubAction0(PushableStatueEntity* this) { sub_080894FC(this); return; case 2: - this->unk_80 = metaTileType; + this->unk_80 = tileType; break; } } @@ -157,17 +157,17 @@ void PushableStatue_Action4(PushableStatueEntity* this) { } else { super->spriteSettings.draw = 1; super->action = 1; - SetMetaTile(SPECIAL_META_TILE_11, this->unk_84, super->collisionLayer); + SetTile(SPECIAL_TILE_11, this->unk_84, super->collisionLayer); sub_080894C8(this); } } void sub_08089454(PushableStatueEntity* this) { this->unk_84 = COORD_TO_TILE(super); - this->unk_80 = GetMetaTileIndex(this->unk_84, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_11, this->unk_84, super->collisionLayer); - if (super->collisionLayer == 2 && GetMetaTileType(this->unk_84, 1) == 0x310) { - SetMetaTile(SPECIAL_META_TILE_11, this->unk_84, LAYER_BOTTOM); + this->unk_80 = GetTileIndex(this->unk_84, super->collisionLayer); + SetTile(SPECIAL_TILE_11, this->unk_84, super->collisionLayer); + if (super->collisionLayer == 2 && GetTileType(this->unk_84, 1) == 0x310) { + SetTile(SPECIAL_TILE_11, this->unk_84, LAYER_BOTTOM); } } @@ -193,15 +193,15 @@ void sub_080894FC(PushableStatueEntity* this) { } void sub_08089538(PushableStatueEntity* this) { - u16 metaTileType; + u16 tileType; this->unk_86 = 0x20; EnqueueSFX(SFX_10F); - SetMetaTile(this->unk_80, this->unk_84, super->collisionLayer); - if ((super->collisionLayer == 2) && (GetMetaTileType(this->unk_84, LAYER_BOTTOM) == SPECIAL_META_TILE_11)) { - CloneTile(META_TILE_TYPE_784, this->unk_84, 1); + SetTile(this->unk_80, this->unk_84, super->collisionLayer); + if ((super->collisionLayer == 2) && (GetTileType(this->unk_84, LAYER_BOTTOM) == SPECIAL_TILE_11)) { + CloneTile(TILE_TYPE_784, this->unk_84, 1); } - metaTileType = GetMetaTileType(this->unk_84 + gUnk_080B4488[super->direction >> 3], super->collisionLayer); - if ((metaTileType == META_TILE_TYPE_121) || (metaTileType == META_TILE_TYPE_119)) { + tileType = GetTileType(this->unk_84 + gUnk_080B4488[super->direction >> 3], super->collisionLayer); + if ((tileType == TILE_TYPE_121) || (tileType == TILE_TYPE_119)) { super->spriteOffsetY = -2; } } @@ -239,11 +239,11 @@ bool32 sub_0808965C(PushableStatueEntity* this) { } } -u32 sub_0808968C(u32 metaTileType) { +u32 sub_0808968C(u32 tileType) { const u16* it; for (it = gUnk_08120D6C; *it != 0; it += 2) { - if (*it == metaTileType) { + if (*it == tileType) { return it[1]; } } @@ -264,7 +264,7 @@ bool32 sub_080896B0(void) { ptr = &gUnk_080B4468[gPlayerEntity.base.animationState & 6]; uVar1 = gUnk_080B4488[gPlayerEntity.base.animationState >> 1]; uVar4 = COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]) - uVar1; - vvv = GetVvvAtMetaTilePos(uVar4, gPlayerEntity.base.collisionLayer); + vvv = GetVvvAtTilePos(uVar4, gPlayerEntity.base.collisionLayer); if ((vvv - 0x26 > 1) && (vvv != VVV_41)) { mapLayer = GetLayerByIndex(gPlayerEntity.base.collisionLayer); iVar2 = (uVar4 * 0x10000) >> 0x10; @@ -297,17 +297,17 @@ const u16 gUnk_08120CCC[] = { 78, 78, 79, 79, 79, 79, 79, 79, 79, 79, 80, 80, 80, 80, 80, 80, 80, 80, 81, 81, 81, 81, 81, 81, 81, 81, }; const u16 gUnk_08120D6C[] = { - SPECIAL_META_TILE_12, + SPECIAL_TILE_12, 1, - SPECIAL_META_TILE_13, + SPECIAL_TILE_13, 1, - SPECIAL_META_TILE_14, + SPECIAL_TILE_14, 1, - SPECIAL_META_TILE_15, + SPECIAL_TILE_15, 1, - META_TILE_TYPE_122, + TILE_TYPE_122, 2, - META_TILE_TYPE_120, + TILE_TYPE_120, 2, 0, }; diff --git a/src/object/railtrack.c b/src/object/railtrack.c index 687448ed..f5ceab8d 100644 --- a/src/object/railtrack.c +++ b/src/object/railtrack.c @@ -127,7 +127,7 @@ void Railtrack_Action3(RailtrackEntity* this) { } } -static const u16 gUnk_081205E0[] = { SPECIAL_META_TILE_24, SPECIAL_META_TILE_25 }; +static const u16 gUnk_081205E0[] = { SPECIAL_TILE_24, SPECIAL_TILE_25 }; void sub_08085394(RailtrackEntity* this) { u32 specialTile; @@ -141,25 +141,25 @@ void sub_08085394(RailtrackEntity* this) { tilePos = COORD_TO_TILE(super); this->unk_74 = *(layerData - offsetset); - SetMetaTile(specialTile, tilePos - offsetset, super->collisionLayer); + SetTile(specialTile, tilePos - offsetset, super->collisionLayer); this->unk_76 = layerData[0x0]; - SetMetaTile(specialTile, tilePos, super->collisionLayer); + SetTile(specialTile, tilePos, super->collisionLayer); this->unk_78 = layerData[offsetset]; - SetMetaTile(specialTile, tilePos + offsetset, super->collisionLayer); + SetTile(specialTile, tilePos + offsetset, super->collisionLayer); } void sub_0808543C(RailtrackEntity* this) { s8* cVar1; - u32 metaTilePos; + u32 tilePos; s8 offset; offset = gUnk_080B4488[super->animationState / 2][0]; - metaTilePos = COORD_TO_TILE(super); - SetMetaTile(this->unk_74, metaTilePos - offset, super->collisionLayer); - SetMetaTile(this->unk_76, metaTilePos, super->collisionLayer); - SetMetaTile(this->unk_78, metaTilePos + offset, super->collisionLayer); + tilePos = COORD_TO_TILE(super); + SetTile(this->unk_74, tilePos - offset, super->collisionLayer); + SetTile(this->unk_76, tilePos, super->collisionLayer); + SetTile(this->unk_78, tilePos + offset, super->collisionLayer); } u32 sub_080854A8(RailtrackEntity* this) { diff --git a/src/object/rotatingTrapdoor.c b/src/object/rotatingTrapdoor.c index d9232a74..f8e05f49 100644 --- a/src/object/rotatingTrapdoor.c +++ b/src/object/rotatingTrapdoor.c @@ -31,7 +31,7 @@ void RotatingTrapdoor_Init(Entity* this) { this->action = 1; x = 0; y = 0; - switch (GetMetaTileTypeByEntity(this)) { + switch (GetTileTypeByEntity(this)) { case 0x343: x = 0x10; case 0x344: diff --git a/src/object/smallIceBlock.c b/src/object/smallIceBlock.c index 77862770..ebd83cbe 100644 --- a/src/object/smallIceBlock.c +++ b/src/object/smallIceBlock.c @@ -85,8 +85,8 @@ void SmallIceBlock_Action1(SmallIceBlockEntity* this) { } } else { if (!sub_0800442E(super)) { - tileType = GetMetaTileType(this->tilePos, super->collisionLayer); - if (tileType != SPECIAL_META_TILE_90) { + tileType = GetTileType(this->tilePos, super->collisionLayer); + if (tileType != SPECIAL_TILE_90) { switch (sub_08099618(tileType)) { case 1: super->action = 2; @@ -100,7 +100,7 @@ void SmallIceBlock_Action1(SmallIceBlockEntity* this) { if (obj != NULL) { CopyPosition(super, obj); } - SetMetaTile(this->unk_6c, this->tilePos, super->collisionLayer); + SetTile(this->unk_6c, this->tilePos, super->collisionLayer); DeleteEntity(super); break; @@ -159,7 +159,7 @@ void SmallIceBlock_Action4(SmallIceBlockEntity* this) { DeleteThisEntity(); } else { if (super->timer == 0x30) { - SetMetaTile(this->unk_6c, this->tilePos, super->collisionLayer); + SetTile(this->unk_6c, this->tilePos, super->collisionLayer); } SetAffineInfo(super, 0x100, (0x3c - super->timer) * 0x20 + 0x100, 0); if ((super->timer & 1) != 0) { @@ -177,19 +177,19 @@ void SmallIceBlock_Action4(SmallIceBlockEntity* this) { void sub_08099468(SmallIceBlockEntity* this) { this->tilePos = COORD_TO_TILE(super); - this->unk_6c = GetMetaTileIndex(this->tilePos, super->collisionLayer); - SetMetaTile(SPECIAL_META_TILE_90, this->tilePos, super->collisionLayer); + this->unk_6c = GetTileIndex(this->tilePos, super->collisionLayer); + SetTile(SPECIAL_TILE_90, this->tilePos, super->collisionLayer); } void sub_080994B8(SmallIceBlockEntity* this) { u16 tileType; EnqueueSFX(SFX_ICE_BLOCK_SLIDE); - SetMetaTile(this->unk_6c, this->tilePos, super->collisionLayer); - if ((super->collisionLayer == 2) && (GetMetaTileType(this->tilePos, 1) == SPECIAL_META_TILE_90)) { - CloneTile(META_TILE_TYPE_784, this->tilePos, 1); + SetTile(this->unk_6c, this->tilePos, super->collisionLayer); + if ((super->collisionLayer == 2) && (GetTileType(this->tilePos, 1) == SPECIAL_TILE_90)) { + CloneTile(TILE_TYPE_784, this->tilePos, 1); } - tileType = GetMetaTileType(this->tilePos + gUnk_080B4488[super->direction >> 3], super->collisionLayer); + tileType = GetTileType(this->tilePos + gUnk_080B4488[super->direction >> 3], super->collisionLayer); if (tileType == 0x79 || tileType == 0x77) { super->spriteOffsetY = -2; } @@ -326,17 +326,17 @@ const u16 gUnk_08123748[] = { 277, }; const u16 gUnk_08123750[] = { - SPECIAL_META_TILE_91, + SPECIAL_TILE_91, 1, - SPECIAL_META_TILE_92, + SPECIAL_TILE_92, 1, - SPECIAL_META_TILE_93, + SPECIAL_TILE_93, 1, - SPECIAL_META_TILE_94, + SPECIAL_TILE_94, 1, - META_TILE_TYPE_122, + TILE_TYPE_122, 2, - META_TILE_TYPE_120, + TILE_TYPE_120, 2, 0, }; diff --git a/src/object/smokeParticle.c b/src/object/smokeParticle.c index ea454822..91145f3d 100644 --- a/src/object/smokeParticle.c +++ b/src/object/smokeParticle.c @@ -63,22 +63,22 @@ void sub_080878CC(Entity* this) { s32 itX; s32 itY; u32 layer; - u32 metaTilePos; + u32 tilePos; x = this->x.HALF.HI; y = this->y.HALF.HI; layer = this->collisionLayer; for (itX = -0x10; itX < 0x11; itX += 0x10) { for (itY = -0x10; itY < 0x11; itY += 0x10) { - metaTilePos = TILE((u32)x + itX, (u32)y + itY); - if (GetVvvAtMetaTilePos(metaTilePos, (u8)layer) == VVV_46) { - switch (GetMetaTileType(metaTilePos, layer)) { + tilePos = TILE((u32)x + itX, (u32)y + itY); + if (GetVvvAtTilePos(tilePos, (u8)layer) == VVV_46) { + switch (GetTileType(tilePos, layer)) { case 0x368: case 0x367: DoTileInteraction(this, 3, x + itX, y + itY); break; default: - SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, layer); + SetTile(SPECIAL_TILE_34, tilePos, layer); break; } } else { diff --git a/src/object/stoneTablet.c b/src/object/stoneTablet.c index 1c9edf93..e99d48be 100644 --- a/src/object/stoneTablet.c +++ b/src/object/stoneTablet.c @@ -24,20 +24,20 @@ void StoneTablet(Entity* this) { void StoneTablet_Init(Entity* this) { // TODO recreate as TileData[] static const u16 gUnk_081232EC[] = { - SPECIAL_META_TILE_34, -2, SPECIAL_META_TILE_34, -1, SPECIAL_META_TILE_34, 0, SPECIAL_META_TILE_34, 1, 0xffff, + SPECIAL_TILE_34, -2, SPECIAL_TILE_34, -1, SPECIAL_TILE_34, 0, SPECIAL_TILE_34, 1, 0xffff, }; static const u16 gUnk_081232FE[] = { - SPECIAL_META_TILE_101, + SPECIAL_TILE_101, -65, - SPECIAL_META_TILE_34, + SPECIAL_TILE_34, -64, - SPECIAL_META_TILE_102, + SPECIAL_TILE_102, -63, - SPECIAL_META_TILE_41, + SPECIAL_TILE_41, -1, - SPECIAL_META_TILE_38, + SPECIAL_TILE_38, 0, - SPECIAL_META_TILE_42, + SPECIAL_TILE_42, 1, 0xffff, }; diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c index 1952ea8d..67542aa8 100644 --- a/src/object/treeHidingPortal.c +++ b/src/object/treeHidingPortal.c @@ -117,7 +117,7 @@ static u32 sub_0809E9A0(void) { vvv = VVV_0; } else { ptr = &gUnk_080B4468[gPlayerEntity.base.animationState & 6]; - vvv = GetVvvAtMetaTilePos(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), 1); + vvv = GetVvvAtTilePos(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), 1); } return vvv; diff --git a/src/object/treeThorns.c b/src/object/treeThorns.c index a327ccc6..3fe27355 100644 --- a/src/object/treeThorns.c +++ b/src/object/treeThorns.c @@ -30,8 +30,8 @@ void TreeThorns(Entity* this) { this->collisionMask = 1; this->hitbox = (Hitbox*)&gHitbox_1; tilePos = COORD_TO_TILE(this); - SetMetaTile(SPECIAL_META_TILE_102, tilePos - 1, *layer); - SetMetaTile(SPECIAL_META_TILE_101, tilePos, *layer); + SetTile(SPECIAL_TILE_102, tilePos - 1, *layer); + SetTile(SPECIAL_TILE_101, tilePos, *layer); UpdateSpriteForCollisionLayer(this); ent = CreateObject(TREE_THORNS, 1, 0); if (ent != NULL) { diff --git a/src/object/unusedSkull.c b/src/object/unusedSkull.c index 058d8df9..6bfb48a5 100644 --- a/src/object/unusedSkull.c +++ b/src/object/unusedSkull.c @@ -39,7 +39,7 @@ void UnusedSkull_Init(UnusedSkullEntity* this) { super->hurtType = 0x47; super->collisionMask = 2; super->hitbox = (Hitbox*)&gHitbox_4; - SetMetaTile(SPECIAL_META_TILE_80, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_80, COORD_TO_TILE(super), super->collisionLayer); if (super->type == 1 || CheckFlags(this->unk_86)) { super->action = 3; SetFlag(this->unk_86); diff --git a/src/object/waterfallOpening.c b/src/object/waterfallOpening.c index f9302d35..c63c937a 100644 --- a/src/object/waterfallOpening.c +++ b/src/object/waterfallOpening.c @@ -77,7 +77,7 @@ void WaterfallOpening(Entity* this) { case 2: if ((this->subAction == 0)) { this->subAction = 1; - SetMetaTileType(META_TILE_TYPE_57, COORD_TO_TILE(this), LAYER_BOTTOM); + SetTileType(TILE_TYPE_57, COORD_TO_TILE(this), LAYER_BOTTOM); } } diff --git a/src/object/well.c b/src/object/well.c index 95bcf8c9..b4b9b962 100644 --- a/src/object/well.c +++ b/src/object/well.c @@ -34,12 +34,12 @@ void Well_Init(WellEntity* this) { super->action = 1; tilePos = COORD_TO_TILE(super); this->unk_80 = tilePos; - SetMetaTile(SPECIAL_META_TILE_125, this->unk_80, LAYER_BOTTOM); + SetTile(SPECIAL_TILE_125, this->unk_80, LAYER_BOTTOM); } void Well_Action1(WellEntity* this) { - u32 tileIndex = GetMetaTileType(this->unk_80, LAYER_BOTTOM); - if (tileIndex != SPECIAL_META_TILE_125) { + u32 tileIndex = GetTileType(this->unk_80, LAYER_BOTTOM); + if (tileIndex != SPECIAL_TILE_125) { PausePlayer(); gPlayerEntity.base.x.WORD = super->x.WORD; gPlayerEntity.base.y.HALF.HI = super->y.HALF.HI + 4; diff --git a/src/physics.c b/src/physics.c index d4c1e9ab..80401e6a 100644 --- a/src/physics.c +++ b/src/physics.c @@ -233,8 +233,8 @@ bool32 sub_0806F854(Entity* ent, s32 x, s32 y) { bool32 sub_0806F8DC(Entity* ent) { if (ent->collisionLayer & 2) return FALSE; - if (!GetMetaTileTypeByPos(ent->x.HALF.HI, ent->y.HALF.HI - 4, 2)) { - GetMetaTileTypeByPos(ent->x.HALF.HI, ent->y.HALF.HI - 4, ent->collisionLayer); + if (!GetTileTypeByPos(ent->x.HALF.HI, ent->y.HALF.HI - 4, 2)) { + GetTileTypeByPos(ent->x.HALF.HI, ent->y.HALF.HI - 4, ent->collisionLayer); ent->spriteRendering.b3 = 1; ent->spriteOrientation.flipY = 1; return FALSE; diff --git a/src/player.c b/src/player.c index 29342e49..eab7b575 100644 --- a/src/player.c +++ b/src/player.c @@ -2191,11 +2191,11 @@ static void PlayerInHoleInit(PlayerEntity* this) { gPlayerState.animation = ANIM_FALL_IN_HOLE_NOCAP; } else { gPlayerState.animation = ANIM_FALL_IN_HOLE; - if (GetMetaTileIndex(COORD_TO_TILE(super), super->collisionLayer) == SPECIAL_META_TILE_32) { + if (GetTileIndex(COORD_TO_TILE(super), super->collisionLayer) == SPECIAL_TILE_32) { super->timer = 1; } } - SetMetaTile(SPECIAL_META_TILE_112, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_112, COORD_TO_TILE(super), super->collisionLayer); ResetActiveItems(); PlayerInHoleUpdate(this); SoundReq(SFX_81); @@ -2252,7 +2252,7 @@ static void sub_08072B5C(PlayerEntity* this) { return; } - SetMetaTile(SPECIAL_META_TILE_33, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_33, COORD_TO_TILE(super), super->collisionLayer); super->direction = Direction8FromAnimationState(super->animationState); temp = sub_0807A2F8(1); if (!temp) { @@ -2367,7 +2367,7 @@ static void sub_08072D54(PlayerEntity* this) { LinearMoveUpdate(super); super->timer--; } else { - uVar2 = GetMetaTileType(sub_0806F730(super), super->collisionLayer); + uVar2 = GetTileType(sub_0806F730(super), super->collisionLayer); switch (super->subtimer) { case 0: if (FindValueForKey(uVar2, sTileTable[gPlayerEntity.base.animationState >> 1])) { @@ -3718,7 +3718,7 @@ void SurfaceAction_20(PlayerEntity* this) { if (e != NULL) { e->timer = 1; UpdateSpriteForCollisionLayer(e); - CloneTile(META_TILE_TYPE_57, gPlayerState.tilePosition, super->collisionLayer); + CloneTile(TILE_TYPE_57, gPlayerState.tilePos, super->collisionLayer); } } SurfaceAction_Water(this); diff --git a/src/playerItem/playerItemBow.c b/src/playerItem/playerItemBow.c index 684234ce..fec8aea4 100644 --- a/src/playerItem/playerItemBow.c +++ b/src/playerItem/playerItemBow.c @@ -270,1402 +270,1402 @@ void sub_08019468(PlayerItemBowEntity* this) { // Probably belongs to collision.c, but needs to be placed at the end of playerItemBow.c or start of // playerItemSwordBeam.c -// maps metaTileType to collisionData -const u8 gMapMetaTileTypeToCollisionData[] = { - COLLISION_DATA_0, // META_TILE_TYPE_0 - COLLISION_DATA_0, // META_TILE_TYPE_1 - COLLISION_DATA_0, // META_TILE_TYPE_2 - COLLISION_DATA_0, // META_TILE_TYPE_3 - COLLISION_DATA_0, // META_TILE_TYPE_4 - COLLISION_DATA_0, // META_TILE_TYPE_5 - COLLISION_DATA_0, // META_TILE_TYPE_6 - COLLISION_DATA_0, // META_TILE_TYPE_7 - COLLISION_DATA_0, // META_TILE_TYPE_8 - COLLISION_DATA_0, // META_TILE_TYPE_9 - COLLISION_DATA_0, // META_TILE_TYPE_10 - COLLISION_DATA_0, // META_TILE_TYPE_11 - COLLISION_DATA_255, // META_TILE_TYPE_12 - COLLISION_DATA_255, // META_TILE_TYPE_13 - COLLISION_DATA_255, // META_TILE_TYPE_14 - COLLISION_DATA_255, // META_TILE_TYPE_15 - COLLISION_DATA_255, // META_TILE_TYPE_16 - COLLISION_DATA_255, // META_TILE_TYPE_17 - COLLISION_DATA_255, // META_TILE_TYPE_18 - COLLISION_DATA_0, // META_TILE_TYPE_19 - COLLISION_DATA_255, // META_TILE_TYPE_20 - COLLISION_DATA_255, // META_TILE_TYPE_21 - COLLISION_DATA_255, // META_TILE_TYPE_22 - COLLISION_DATA_255, // META_TILE_TYPE_23 - COLLISION_DATA_255, // META_TILE_TYPE_24 - COLLISION_DATA_255, // META_TILE_TYPE_25 - COLLISION_DATA_0, // META_TILE_TYPE_26 - COLLISION_DATA_0, // META_TILE_TYPE_27 - COLLISION_DATA_0, // META_TILE_TYPE_28 - COLLISION_DATA_0, // META_TILE_TYPE_29 - COLLISION_DATA_0, // META_TILE_TYPE_30 - COLLISION_DATA_0, // META_TILE_TYPE_31 - COLLISION_DATA_0, // META_TILE_TYPE_32 - COLLISION_DATA_0, // META_TILE_TYPE_33 - COLLISION_DATA_0, // META_TILE_TYPE_34 - COLLISION_DATA_0, // META_TILE_TYPE_35 - COLLISION_DATA_0, // META_TILE_TYPE_36 - COLLISION_DATA_0, // META_TILE_TYPE_37 - COLLISION_DATA_0, // META_TILE_TYPE_38 - COLLISION_DATA_0, // META_TILE_TYPE_39 - COLLISION_DATA_0, // META_TILE_TYPE_40 - COLLISION_DATA_0, // META_TILE_TYPE_41 - COLLISION_DATA_255, // META_TILE_TYPE_42 - COLLISION_DATA_0, // META_TILE_TYPE_43 - COLLISION_DATA_0, // META_TILE_TYPE_44 - COLLISION_DATA_255, // META_TILE_TYPE_45 - COLLISION_DATA_0, // META_TILE_TYPE_46 - COLLISION_DATA_0, // META_TILE_TYPE_47 - COLLISION_DATA_0, // META_TILE_TYPE_48 - COLLISION_DATA_0, // META_TILE_TYPE_49 - COLLISION_DATA_0, // META_TILE_TYPE_50 - COLLISION_DATA_0, // META_TILE_TYPE_51 - COLLISION_DATA_0, // META_TILE_TYPE_52 - COLLISION_DATA_33, // META_TILE_TYPE_53 - COLLISION_DATA_0, // META_TILE_TYPE_54 - COLLISION_DATA_0, // META_TILE_TYPE_55 - COLLISION_DATA_0, // META_TILE_TYPE_56 - COLLISION_DATA_48, // META_TILE_TYPE_57 - COLLISION_DATA_34, // META_TILE_TYPE_58 - COLLISION_DATA_34, // META_TILE_TYPE_59 - COLLISION_DATA_36, // META_TILE_TYPE_60 - COLLISION_DATA_0, // META_TILE_TYPE_61 - COLLISION_DATA_0, // META_TILE_TYPE_62 - COLLISION_DATA_29, // META_TILE_TYPE_63 - COLLISION_DATA_29, // META_TILE_TYPE_64 - COLLISION_DATA_29, // META_TILE_TYPE_65 - COLLISION_DATA_255, // META_TILE_TYPE_66 - COLLISION_DATA_255, // META_TILE_TYPE_67 - COLLISION_DATA_29, // META_TILE_TYPE_68 - COLLISION_DATA_29, // META_TILE_TYPE_69 - COLLISION_DATA_29, // META_TILE_TYPE_70 - COLLISION_DATA_29, // META_TILE_TYPE_71 - COLLISION_DATA_29, // META_TILE_TYPE_72 - COLLISION_DATA_29, // META_TILE_TYPE_73 - COLLISION_DATA_29, // META_TILE_TYPE_74 - COLLISION_DATA_29, // META_TILE_TYPE_75 - COLLISION_DATA_29, // META_TILE_TYPE_76 - COLLISION_DATA_29, // META_TILE_TYPE_77 - COLLISION_DATA_29, // META_TILE_TYPE_78 - COLLISION_DATA_29, // META_TILE_TYPE_79 - COLLISION_DATA_255, // META_TILE_TYPE_80 - COLLISION_DATA_255, // META_TILE_TYPE_81 - COLLISION_DATA_255, // META_TILE_TYPE_82 - COLLISION_DATA_255, // META_TILE_TYPE_83 - COLLISION_DATA_255, // META_TILE_TYPE_84 - COLLISION_DATA_29, // META_TILE_TYPE_85 - COLLISION_DATA_29, // META_TILE_TYPE_86 - COLLISION_DATA_29, // META_TILE_TYPE_87 - COLLISION_DATA_255, // META_TILE_TYPE_88 - COLLISION_DATA_255, // META_TILE_TYPE_89 - COLLISION_DATA_29, // META_TILE_TYPE_90 - COLLISION_DATA_29, // META_TILE_TYPE_91 - COLLISION_DATA_255, // META_TILE_TYPE_92 - COLLISION_DATA_255, // META_TILE_TYPE_93 - COLLISION_DATA_255, // META_TILE_TYPE_94 - COLLISION_DATA_255, // META_TILE_TYPE_95 - COLLISION_DATA_255, // META_TILE_TYPE_96 - COLLISION_DATA_0, // META_TILE_TYPE_97 - COLLISION_DATA_0, // META_TILE_TYPE_98 - COLLISION_DATA_0, // META_TILE_TYPE_99 - COLLISION_DATA_0, // META_TILE_TYPE_100 - COLLISION_DATA_0, // META_TILE_TYPE_101 - COLLISION_DATA_0, // META_TILE_TYPE_102 - COLLISION_DATA_0, // META_TILE_TYPE_103 - COLLISION_DATA_0, // META_TILE_TYPE_104 - COLLISION_DATA_0, // META_TILE_TYPE_105 - COLLISION_DATA_0, // META_TILE_TYPE_106 - COLLISION_DATA_0, // META_TILE_TYPE_107 - COLLISION_DATA_0, // META_TILE_TYPE_108 - COLLISION_DATA_0, // META_TILE_TYPE_109 - COLLISION_DATA_0, // META_TILE_TYPE_110 - COLLISION_DATA_15, // META_TILE_TYPE_111 - COLLISION_DATA_15, // META_TILE_TYPE_112 - COLLISION_DATA_32, // META_TILE_TYPE_113 - COLLISION_DATA_32, // META_TILE_TYPE_114 - COLLISION_DATA_15, // META_TILE_TYPE_115 - COLLISION_DATA_15, // META_TILE_TYPE_116 - COLLISION_DATA_15, // META_TILE_TYPE_117 - COLLISION_DATA_15, // META_TILE_TYPE_118 - COLLISION_DATA_0, // META_TILE_TYPE_119 - COLLISION_DATA_0, // META_TILE_TYPE_120 - COLLISION_DATA_0, // META_TILE_TYPE_121 - COLLISION_DATA_0, // META_TILE_TYPE_122 - COLLISION_DATA_21, // META_TILE_TYPE_123 - COLLISION_DATA_21, // META_TILE_TYPE_124 - COLLISION_DATA_20, // META_TILE_TYPE_125 - COLLISION_DATA_20, // META_TILE_TYPE_126 - COLLISION_DATA_95, // META_TILE_TYPE_127 - COLLISION_DATA_255, // META_TILE_TYPE_128 - COLLISION_DATA_255, // META_TILE_TYPE_129 - COLLISION_DATA_255, // META_TILE_TYPE_130 - COLLISION_DATA_255, // META_TILE_TYPE_131 - COLLISION_DATA_255, // META_TILE_TYPE_132 - COLLISION_DATA_255, // META_TILE_TYPE_133 - COLLISION_DATA_15, // META_TILE_TYPE_134 - COLLISION_DATA_41, // META_TILE_TYPE_135 - COLLISION_DATA_41, // META_TILE_TYPE_136 - COLLISION_DATA_41, // META_TILE_TYPE_137 - COLLISION_DATA_41, // META_TILE_TYPE_138 - COLLISION_DATA_0, // META_TILE_TYPE_139 - COLLISION_DATA_36, // META_TILE_TYPE_140 - COLLISION_DATA_36, // META_TILE_TYPE_141 - COLLISION_DATA_36, // META_TILE_TYPE_142 - COLLISION_DATA_15, // META_TILE_TYPE_143 - COLLISION_DATA_15, // META_TILE_TYPE_144 - COLLISION_DATA_15, // META_TILE_TYPE_145 - COLLISION_DATA_15, // META_TILE_TYPE_146 - COLLISION_DATA_255, // META_TILE_TYPE_147 - COLLISION_DATA_255, // META_TILE_TYPE_148 - COLLISION_DATA_255, // META_TILE_TYPE_149 - COLLISION_DATA_255, // META_TILE_TYPE_150 - COLLISION_DATA_255, // META_TILE_TYPE_151 - COLLISION_DATA_255, // META_TILE_TYPE_152 - COLLISION_DATA_15, // META_TILE_TYPE_153 - COLLISION_DATA_15, // META_TILE_TYPE_154 - COLLISION_DATA_15, // META_TILE_TYPE_155 - COLLISION_DATA_15, // META_TILE_TYPE_156 - COLLISION_DATA_39, // META_TILE_TYPE_157 - COLLISION_DATA_39, // META_TILE_TYPE_158 - COLLISION_DATA_15, // META_TILE_TYPE_159 - COLLISION_DATA_15, // META_TILE_TYPE_160 - COLLISION_DATA_15, // META_TILE_TYPE_161 - COLLISION_DATA_39, // META_TILE_TYPE_162 - COLLISION_DATA_15, // META_TILE_TYPE_163 - COLLISION_DATA_15, // META_TILE_TYPE_164 - COLLISION_DATA_35, // META_TILE_TYPE_165 - COLLISION_DATA_15, // META_TILE_TYPE_166 - COLLISION_DATA_15, // META_TILE_TYPE_167 - COLLISION_DATA_35, // META_TILE_TYPE_168 - COLLISION_DATA_15, // META_TILE_TYPE_169 - COLLISION_DATA_15, // META_TILE_TYPE_170 - COLLISION_DATA_15, // META_TILE_TYPE_171 - COLLISION_DATA_15, // META_TILE_TYPE_172 - COLLISION_DATA_15, // META_TILE_TYPE_173 - COLLISION_DATA_15, // META_TILE_TYPE_174 - COLLISION_DATA_15, // META_TILE_TYPE_175 - COLLISION_DATA_15, // META_TILE_TYPE_176 - COLLISION_DATA_15, // META_TILE_TYPE_177 - COLLISION_DATA_39, // META_TILE_TYPE_178 - COLLISION_DATA_15, // META_TILE_TYPE_179 - COLLISION_DATA_15, // META_TILE_TYPE_180 - COLLISION_DATA_39, // META_TILE_TYPE_181 - COLLISION_DATA_39, // META_TILE_TYPE_182 - COLLISION_DATA_15, // META_TILE_TYPE_183 - COLLISION_DATA_15, // META_TILE_TYPE_184 - COLLISION_DATA_15, // META_TILE_TYPE_185 - COLLISION_DATA_15, // META_TILE_TYPE_186 - COLLISION_DATA_15, // META_TILE_TYPE_187 - COLLISION_DATA_15, // META_TILE_TYPE_188 - COLLISION_DATA_15, // META_TILE_TYPE_189 - COLLISION_DATA_15, // META_TILE_TYPE_190 - COLLISION_DATA_15, // META_TILE_TYPE_191 - COLLISION_DATA_15, // META_TILE_TYPE_192 - COLLISION_DATA_15, // META_TILE_TYPE_193 - COLLISION_DATA_39, // META_TILE_TYPE_194 - COLLISION_DATA_15, // META_TILE_TYPE_195 - COLLISION_DATA_15, // META_TILE_TYPE_196 - COLLISION_DATA_255, // META_TILE_TYPE_197 - COLLISION_DATA_39, // META_TILE_TYPE_198 - COLLISION_DATA_15, // META_TILE_TYPE_199 - COLLISION_DATA_15, // META_TILE_TYPE_200 - COLLISION_DATA_15, // META_TILE_TYPE_201 - COLLISION_DATA_15, // META_TILE_TYPE_202 - COLLISION_DATA_15, // META_TILE_TYPE_203 - COLLISION_DATA_15, // META_TILE_TYPE_204 - COLLISION_DATA_15, // META_TILE_TYPE_205 - COLLISION_DATA_15, // META_TILE_TYPE_206 - COLLISION_DATA_15, // META_TILE_TYPE_207 - COLLISION_DATA_15, // META_TILE_TYPE_208 - COLLISION_DATA_15, // META_TILE_TYPE_209 - COLLISION_DATA_39, // META_TILE_TYPE_210 - COLLISION_DATA_39, // META_TILE_TYPE_211 - COLLISION_DATA_15, // META_TILE_TYPE_212 - COLLISION_DATA_15, // META_TILE_TYPE_213 - COLLISION_DATA_39, // META_TILE_TYPE_214 - COLLISION_DATA_15, // META_TILE_TYPE_215 - COLLISION_DATA_15, // META_TILE_TYPE_216 - COLLISION_DATA_15, // META_TILE_TYPE_217 - COLLISION_DATA_15, // META_TILE_TYPE_218 - COLLISION_DATA_15, // META_TILE_TYPE_219 - COLLISION_DATA_15, // META_TILE_TYPE_220 - COLLISION_DATA_15, // META_TILE_TYPE_221 - COLLISION_DATA_15, // META_TILE_TYPE_222 - COLLISION_DATA_15, // META_TILE_TYPE_223 - COLLISION_DATA_15, // META_TILE_TYPE_224 - COLLISION_DATA_15, // META_TILE_TYPE_225 - COLLISION_DATA_35, // META_TILE_TYPE_226 - COLLISION_DATA_15, // META_TILE_TYPE_227 - COLLISION_DATA_15, // META_TILE_TYPE_228 - COLLISION_DATA_35, // META_TILE_TYPE_229 - COLLISION_DATA_35, // META_TILE_TYPE_230 - COLLISION_DATA_15, // META_TILE_TYPE_231 - COLLISION_DATA_15, // META_TILE_TYPE_232 - COLLISION_DATA_15, // META_TILE_TYPE_233 - COLLISION_DATA_15, // META_TILE_TYPE_234 - COLLISION_DATA_15, // META_TILE_TYPE_235 - COLLISION_DATA_15, // META_TILE_TYPE_236 - COLLISION_DATA_15, // META_TILE_TYPE_237 - COLLISION_DATA_15, // META_TILE_TYPE_238 - COLLISION_DATA_15, // META_TILE_TYPE_239 - COLLISION_DATA_15, // META_TILE_TYPE_240 - COLLISION_DATA_15, // META_TILE_TYPE_241 - COLLISION_DATA_35, // META_TILE_TYPE_242 - COLLISION_DATA_35, // META_TILE_TYPE_243 - COLLISION_DATA_15, // META_TILE_TYPE_244 - COLLISION_DATA_15, // META_TILE_TYPE_245 - COLLISION_DATA_35, // META_TILE_TYPE_246 - COLLISION_DATA_15, // META_TILE_TYPE_247 - COLLISION_DATA_15, // META_TILE_TYPE_248 - COLLISION_DATA_15, // META_TILE_TYPE_249 - COLLISION_DATA_15, // META_TILE_TYPE_250 - COLLISION_DATA_15, // META_TILE_TYPE_251 - COLLISION_DATA_15, // META_TILE_TYPE_252 - COLLISION_DATA_15, // META_TILE_TYPE_253 - COLLISION_DATA_15, // META_TILE_TYPE_254 - COLLISION_DATA_15, // META_TILE_TYPE_255 - COLLISION_DATA_15, // META_TILE_TYPE_256 - COLLISION_DATA_15, // META_TILE_TYPE_257 - COLLISION_DATA_15, // META_TILE_TYPE_258 - COLLISION_DATA_15, // META_TILE_TYPE_259 - COLLISION_DATA_15, // META_TILE_TYPE_260 - COLLISION_DATA_15, // META_TILE_TYPE_261 - COLLISION_DATA_15, // META_TILE_TYPE_262 - COLLISION_DATA_15, // META_TILE_TYPE_263 - COLLISION_DATA_15, // META_TILE_TYPE_264 - COLLISION_DATA_15, // META_TILE_TYPE_265 - COLLISION_DATA_15, // META_TILE_TYPE_266 - COLLISION_DATA_15, // META_TILE_TYPE_267 - COLLISION_DATA_15, // META_TILE_TYPE_268 - COLLISION_DATA_15, // META_TILE_TYPE_269 - COLLISION_DATA_15, // META_TILE_TYPE_270 - COLLISION_DATA_15, // META_TILE_TYPE_271 - COLLISION_DATA_15, // META_TILE_TYPE_272 - COLLISION_DATA_15, // META_TILE_TYPE_273 - COLLISION_DATA_15, // META_TILE_TYPE_274 - COLLISION_DATA_15, // META_TILE_TYPE_275 - COLLISION_DATA_15, // META_TILE_TYPE_276 - COLLISION_DATA_15, // META_TILE_TYPE_277 - COLLISION_DATA_15, // META_TILE_TYPE_278 - COLLISION_DATA_15, // META_TILE_TYPE_279 - COLLISION_DATA_15, // META_TILE_TYPE_280 - COLLISION_DATA_15, // META_TILE_TYPE_281 - COLLISION_DATA_15, // META_TILE_TYPE_282 - COLLISION_DATA_15, // META_TILE_TYPE_283 - COLLISION_DATA_15, // META_TILE_TYPE_284 - COLLISION_DATA_15, // META_TILE_TYPE_285 - COLLISION_DATA_15, // META_TILE_TYPE_286 - COLLISION_DATA_15, // META_TILE_TYPE_287 - COLLISION_DATA_15, // META_TILE_TYPE_288 - COLLISION_DATA_15, // META_TILE_TYPE_289 - COLLISION_DATA_15, // META_TILE_TYPE_290 - COLLISION_DATA_15, // META_TILE_TYPE_291 - COLLISION_DATA_15, // META_TILE_TYPE_292 - COLLISION_DATA_15, // META_TILE_TYPE_293 - COLLISION_DATA_15, // META_TILE_TYPE_294 - COLLISION_DATA_15, // META_TILE_TYPE_295 - COLLISION_DATA_15, // META_TILE_TYPE_296 - COLLISION_DATA_15, // META_TILE_TYPE_297 - COLLISION_DATA_15, // META_TILE_TYPE_298 - COLLISION_DATA_15, // META_TILE_TYPE_299 - COLLISION_DATA_15, // META_TILE_TYPE_300 - COLLISION_DATA_15, // META_TILE_TYPE_301 - COLLISION_DATA_15, // META_TILE_TYPE_302 - COLLISION_DATA_15, // META_TILE_TYPE_303 - COLLISION_DATA_15, // META_TILE_TYPE_304 - COLLISION_DATA_15, // META_TILE_TYPE_305 - COLLISION_DATA_15, // META_TILE_TYPE_306 - COLLISION_DATA_15, // META_TILE_TYPE_307 - COLLISION_DATA_15, // META_TILE_TYPE_308 - COLLISION_DATA_15, // META_TILE_TYPE_309 - COLLISION_DATA_15, // META_TILE_TYPE_310 - COLLISION_DATA_15, // META_TILE_TYPE_311 - COLLISION_DATA_15, // META_TILE_TYPE_312 - COLLISION_DATA_15, // META_TILE_TYPE_313 - COLLISION_DATA_15, // META_TILE_TYPE_314 - COLLISION_DATA_15, // META_TILE_TYPE_315 - COLLISION_DATA_15, // META_TILE_TYPE_316 - COLLISION_DATA_15, // META_TILE_TYPE_317 - COLLISION_DATA_15, // META_TILE_TYPE_318 - COLLISION_DATA_15, // META_TILE_TYPE_319 - COLLISION_DATA_15, // META_TILE_TYPE_320 - COLLISION_DATA_15, // META_TILE_TYPE_321 - COLLISION_DATA_15, // META_TILE_TYPE_322 - COLLISION_DATA_15, // META_TILE_TYPE_323 - COLLISION_DATA_15, // META_TILE_TYPE_324 - COLLISION_DATA_15, // META_TILE_TYPE_325 - COLLISION_DATA_15, // META_TILE_TYPE_326 - COLLISION_DATA_15, // META_TILE_TYPE_327 - COLLISION_DATA_15, // META_TILE_TYPE_328 - COLLISION_DATA_0, // META_TILE_TYPE_329 - COLLISION_DATA_0, // META_TILE_TYPE_330 - COLLISION_DATA_0, // META_TILE_TYPE_331 - COLLISION_DATA_0, // META_TILE_TYPE_332 - COLLISION_DATA_0, // META_TILE_TYPE_333 - COLLISION_DATA_0, // META_TILE_TYPE_334 - COLLISION_DATA_0, // META_TILE_TYPE_335 - COLLISION_DATA_0, // META_TILE_TYPE_336 - COLLISION_DATA_0, // META_TILE_TYPE_337 - COLLISION_DATA_0, // META_TILE_TYPE_338 - COLLISION_DATA_0, // META_TILE_TYPE_339 - COLLISION_DATA_0, // META_TILE_TYPE_340 - COLLISION_DATA_0, // META_TILE_TYPE_341 - COLLISION_DATA_0, // META_TILE_TYPE_342 - COLLISION_DATA_0, // META_TILE_TYPE_343 - COLLISION_DATA_0, // META_TILE_TYPE_344 - COLLISION_DATA_0, // META_TILE_TYPE_345 - COLLISION_DATA_0, // META_TILE_TYPE_346 - COLLISION_DATA_15, // META_TILE_TYPE_347 - COLLISION_DATA_15, // META_TILE_TYPE_348 - COLLISION_DATA_15, // META_TILE_TYPE_349 - COLLISION_DATA_15, // META_TILE_TYPE_350 - COLLISION_DATA_15, // META_TILE_TYPE_351 - COLLISION_DATA_15, // META_TILE_TYPE_352 - COLLISION_DATA_95, // META_TILE_TYPE_353 - COLLISION_DATA_255, // META_TILE_TYPE_354 - COLLISION_DATA_255, // META_TILE_TYPE_355 - COLLISION_DATA_15, // META_TILE_TYPE_356 - COLLISION_DATA_15, // META_TILE_TYPE_357 - COLLISION_DATA_21, // META_TILE_TYPE_358 - COLLISION_DATA_15, // META_TILE_TYPE_359 - COLLISION_DATA_0, // META_TILE_TYPE_360 - COLLISION_DATA_0, // META_TILE_TYPE_361 - COLLISION_DATA_0, // META_TILE_TYPE_362 - COLLISION_DATA_255, // META_TILE_TYPE_363 - COLLISION_DATA_12, // META_TILE_TYPE_364 - COLLISION_DATA_0, // META_TILE_TYPE_365 - COLLISION_DATA_0, // META_TILE_TYPE_366 - COLLISION_DATA_12, // META_TILE_TYPE_367 - COLLISION_DATA_12, // META_TILE_TYPE_368 - COLLISION_DATA_66, // META_TILE_TYPE_369 - COLLISION_DATA_96, // META_TILE_TYPE_370 - COLLISION_DATA_15, // META_TILE_TYPE_371 - COLLISION_DATA_29, // META_TILE_TYPE_372 - COLLISION_DATA_255, // META_TILE_TYPE_373 - COLLISION_DATA_15, // META_TILE_TYPE_374 - COLLISION_DATA_15, // META_TILE_TYPE_375 - COLLISION_DATA_15, // META_TILE_TYPE_376 - COLLISION_DATA_0, // META_TILE_TYPE_377 - COLLISION_DATA_15, // META_TILE_TYPE_378 - COLLISION_DATA_15, // META_TILE_TYPE_379 - COLLISION_DATA_15, // META_TILE_TYPE_380 - COLLISION_DATA_15, // META_TILE_TYPE_381 - COLLISION_DATA_10, // META_TILE_TYPE_382 - COLLISION_DATA_5, // META_TILE_TYPE_383 - COLLISION_DATA_10, // META_TILE_TYPE_384 - COLLISION_DATA_5, // META_TILE_TYPE_385 - COLLISION_DATA_1, // META_TILE_TYPE_386 - COLLISION_DATA_1, // META_TILE_TYPE_387 - COLLISION_DATA_1, // META_TILE_TYPE_388 - COLLISION_DATA_0, // META_TILE_TYPE_389 - COLLISION_DATA_0, // META_TILE_TYPE_390 - COLLISION_DATA_0, // META_TILE_TYPE_391 - COLLISION_DATA_0, // META_TILE_TYPE_392 - COLLISION_DATA_0, // META_TILE_TYPE_393 - COLLISION_DATA_0, // META_TILE_TYPE_394 - COLLISION_DATA_5, // META_TILE_TYPE_395 - COLLISION_DATA_15, // META_TILE_TYPE_396 - COLLISION_DATA_10, // META_TILE_TYPE_397 - COLLISION_DATA_0, // META_TILE_TYPE_398 - COLLISION_DATA_0, // META_TILE_TYPE_399 - COLLISION_DATA_5, // META_TILE_TYPE_400 - COLLISION_DATA_15, // META_TILE_TYPE_401 - COLLISION_DATA_10, // META_TILE_TYPE_402 - COLLISION_DATA_0, // META_TILE_TYPE_403 - COLLISION_DATA_0, // META_TILE_TYPE_404 - COLLISION_DATA_0, // META_TILE_TYPE_405 - COLLISION_DATA_0, // META_TILE_TYPE_406 - COLLISION_DATA_0, // META_TILE_TYPE_407 - COLLISION_DATA_0, // META_TILE_TYPE_408 - COLLISION_DATA_0, // META_TILE_TYPE_409 - COLLISION_DATA_0, // META_TILE_TYPE_410 - COLLISION_DATA_0, // META_TILE_TYPE_411 - COLLISION_DATA_5, // META_TILE_TYPE_412 - COLLISION_DATA_0, // META_TILE_TYPE_413 - COLLISION_DATA_10, // META_TILE_TYPE_414 - COLLISION_DATA_4, // META_TILE_TYPE_415 - COLLISION_DATA_12, // META_TILE_TYPE_416 - COLLISION_DATA_8, // META_TILE_TYPE_417 - COLLISION_DATA_0, // META_TILE_TYPE_418 - COLLISION_DATA_0, // META_TILE_TYPE_419 - COLLISION_DATA_0, // META_TILE_TYPE_420 - COLLISION_DATA_5, // META_TILE_TYPE_421 - COLLISION_DATA_0, // META_TILE_TYPE_422 - COLLISION_DATA_10, // META_TILE_TYPE_423 - COLLISION_DATA_4, // META_TILE_TYPE_424 - COLLISION_DATA_12, // META_TILE_TYPE_425 - COLLISION_DATA_8, // META_TILE_TYPE_426 - COLLISION_DATA_15, // META_TILE_TYPE_427 - COLLISION_DATA_15, // META_TILE_TYPE_428 - COLLISION_DATA_15, // META_TILE_TYPE_429 - COLLISION_DATA_15, // META_TILE_TYPE_430 - COLLISION_DATA_15, // META_TILE_TYPE_431 - COLLISION_DATA_16, // META_TILE_TYPE_432 - COLLISION_DATA_17, // META_TILE_TYPE_433 - COLLISION_DATA_17, // META_TILE_TYPE_434 - COLLISION_DATA_16, // META_TILE_TYPE_435 - COLLISION_DATA_42, // META_TILE_TYPE_436 - COLLISION_DATA_42, // META_TILE_TYPE_437 - COLLISION_DATA_42, // META_TILE_TYPE_438 - COLLISION_DATA_42, // META_TILE_TYPE_439 - COLLISION_DATA_42, // META_TILE_TYPE_440 - COLLISION_DATA_42, // META_TILE_TYPE_441 - COLLISION_DATA_42, // META_TILE_TYPE_442 - COLLISION_DATA_42, // META_TILE_TYPE_443 - COLLISION_DATA_42, // META_TILE_TYPE_444 - COLLISION_DATA_42, // META_TILE_TYPE_445 - COLLISION_DATA_42, // META_TILE_TYPE_446 - COLLISION_DATA_42, // META_TILE_TYPE_447 - COLLISION_DATA_27, // META_TILE_TYPE_448 - COLLISION_DATA_25, // META_TILE_TYPE_449 - COLLISION_DATA_28, // META_TILE_TYPE_450 - COLLISION_DATA_26, // META_TILE_TYPE_451 - COLLISION_DATA_43, // META_TILE_TYPE_452 - COLLISION_DATA_43, // META_TILE_TYPE_453 - COLLISION_DATA_97, // META_TILE_TYPE_454 - COLLISION_DATA_23, // META_TILE_TYPE_455 - COLLISION_DATA_23, // META_TILE_TYPE_456 - COLLISION_DATA_84, // META_TILE_TYPE_457 - COLLISION_DATA_23, // META_TILE_TYPE_458 - COLLISION_DATA_23, // META_TILE_TYPE_459 - COLLISION_DATA_23, // META_TILE_TYPE_460 - COLLISION_DATA_0, // META_TILE_TYPE_461 - COLLISION_DATA_0, // META_TILE_TYPE_462 - COLLISION_DATA_84, // META_TILE_TYPE_463 - COLLISION_DATA_15, // META_TILE_TYPE_464 - COLLISION_DATA_15, // META_TILE_TYPE_465 - COLLISION_DATA_15, // META_TILE_TYPE_466 - COLLISION_DATA_15, // META_TILE_TYPE_467 - COLLISION_DATA_15, // META_TILE_TYPE_468 - COLLISION_DATA_15, // META_TILE_TYPE_469 - COLLISION_DATA_15, // META_TILE_TYPE_470 - COLLISION_DATA_0, // META_TILE_TYPE_471 - COLLISION_DATA_0, // META_TILE_TYPE_472 - COLLISION_DATA_0, // META_TILE_TYPE_473 - COLLISION_DATA_0, // META_TILE_TYPE_474 - COLLISION_DATA_18, // META_TILE_TYPE_475 - COLLISION_DATA_15, // META_TILE_TYPE_476 - COLLISION_DATA_15, // META_TILE_TYPE_477 - COLLISION_DATA_19, // META_TILE_TYPE_478 - COLLISION_DATA_15, // META_TILE_TYPE_479 - COLLISION_DATA_15, // META_TILE_TYPE_480 - COLLISION_DATA_15, // META_TILE_TYPE_481 - COLLISION_DATA_15, // META_TILE_TYPE_482 - COLLISION_DATA_15, // META_TILE_TYPE_483 - COLLISION_DATA_15, // META_TILE_TYPE_484 - COLLISION_DATA_15, // META_TILE_TYPE_485 - COLLISION_DATA_15, // META_TILE_TYPE_486 - COLLISION_DATA_5, // META_TILE_TYPE_487 - COLLISION_DATA_0, // META_TILE_TYPE_488 - COLLISION_DATA_0, // META_TILE_TYPE_489 - COLLISION_DATA_0, // META_TILE_TYPE_490 - COLLISION_DATA_0, // META_TILE_TYPE_491 - COLLISION_DATA_15, // META_TILE_TYPE_492 - COLLISION_DATA_15, // META_TILE_TYPE_493 - COLLISION_DATA_15, // META_TILE_TYPE_494 - COLLISION_DATA_15, // META_TILE_TYPE_495 - COLLISION_DATA_15, // META_TILE_TYPE_496 - COLLISION_DATA_15, // META_TILE_TYPE_497 - COLLISION_DATA_15, // META_TILE_TYPE_498 - COLLISION_DATA_15, // META_TILE_TYPE_499 - COLLISION_DATA_15, // META_TILE_TYPE_500 - COLLISION_DATA_15, // META_TILE_TYPE_501 - COLLISION_DATA_15, // META_TILE_TYPE_502 - COLLISION_DATA_15, // META_TILE_TYPE_503 - COLLISION_DATA_15, // META_TILE_TYPE_504 - COLLISION_DATA_15, // META_TILE_TYPE_505 - COLLISION_DATA_15, // META_TILE_TYPE_506 - COLLISION_DATA_15, // META_TILE_TYPE_507 - COLLISION_DATA_15, // META_TILE_TYPE_508 - COLLISION_DATA_15, // META_TILE_TYPE_509 - COLLISION_DATA_15, // META_TILE_TYPE_510 - COLLISION_DATA_15, // META_TILE_TYPE_511 - COLLISION_DATA_0, // META_TILE_TYPE_512 - COLLISION_DATA_0, // META_TILE_TYPE_513 - COLLISION_DATA_0, // META_TILE_TYPE_514 - COLLISION_DATA_0, // META_TILE_TYPE_515 - COLLISION_DATA_0, // META_TILE_TYPE_516 - COLLISION_DATA_0, // META_TILE_TYPE_517 - COLLISION_DATA_1, // META_TILE_TYPE_518 - COLLISION_DATA_3, // META_TILE_TYPE_519 - COLLISION_DATA_2, // META_TILE_TYPE_520 - COLLISION_DATA_0, // META_TILE_TYPE_521 - COLLISION_DATA_0, // META_TILE_TYPE_522 - COLLISION_DATA_5, // META_TILE_TYPE_523 - COLLISION_DATA_15, // META_TILE_TYPE_524 - COLLISION_DATA_10, // META_TILE_TYPE_525 - COLLISION_DATA_0, // META_TILE_TYPE_526 - COLLISION_DATA_0, // META_TILE_TYPE_527 - COLLISION_DATA_0, // META_TILE_TYPE_528 - COLLISION_DATA_0, // META_TILE_TYPE_529 - COLLISION_DATA_0, // META_TILE_TYPE_530 - COLLISION_DATA_0, // META_TILE_TYPE_531 - COLLISION_DATA_0, // META_TILE_TYPE_532 - COLLISION_DATA_0, // META_TILE_TYPE_533 - COLLISION_DATA_0, // META_TILE_TYPE_534 - COLLISION_DATA_0, // META_TILE_TYPE_535 - COLLISION_DATA_0, // META_TILE_TYPE_536 - COLLISION_DATA_15, // META_TILE_TYPE_537 - COLLISION_DATA_15, // META_TILE_TYPE_538 - COLLISION_DATA_71, // META_TILE_TYPE_539 - COLLISION_DATA_15, // META_TILE_TYPE_540 - COLLISION_DATA_15, // META_TILE_TYPE_541 - COLLISION_DATA_15, // META_TILE_TYPE_542 - COLLISION_DATA_1, // META_TILE_TYPE_543 - COLLISION_DATA_3, // META_TILE_TYPE_544 - COLLISION_DATA_2, // META_TILE_TYPE_545 - COLLISION_DATA_15, // META_TILE_TYPE_546 - COLLISION_DATA_15, // META_TILE_TYPE_547 - COLLISION_DATA_5, // META_TILE_TYPE_548 - COLLISION_DATA_15, // META_TILE_TYPE_549 - COLLISION_DATA_10, // META_TILE_TYPE_550 - COLLISION_DATA_15, // META_TILE_TYPE_551 - COLLISION_DATA_15, // META_TILE_TYPE_552 - COLLISION_DATA_4, // META_TILE_TYPE_553 - COLLISION_DATA_0, // META_TILE_TYPE_554 - COLLISION_DATA_8, // META_TILE_TYPE_555 - COLLISION_DATA_15, // META_TILE_TYPE_556 - COLLISION_DATA_12, // META_TILE_TYPE_557 - COLLISION_DATA_12, // META_TILE_TYPE_558 - COLLISION_DATA_0, // META_TILE_TYPE_559 - COLLISION_DATA_12, // META_TILE_TYPE_560 - COLLISION_DATA_12, // META_TILE_TYPE_561 - COLLISION_DATA_48, // META_TILE_TYPE_562 - COLLISION_DATA_48, // META_TILE_TYPE_563 - COLLISION_DATA_48, // META_TILE_TYPE_564 - COLLISION_DATA_48, // META_TILE_TYPE_565 - COLLISION_DATA_48, // META_TILE_TYPE_566 - COLLISION_DATA_48, // META_TILE_TYPE_567 - COLLISION_DATA_48, // META_TILE_TYPE_568 - COLLISION_DATA_48, // META_TILE_TYPE_569 - COLLISION_DATA_48, // META_TILE_TYPE_570 - COLLISION_DATA_48, // META_TILE_TYPE_571 - COLLISION_DATA_48, // META_TILE_TYPE_572 - COLLISION_DATA_48, // META_TILE_TYPE_573 - COLLISION_DATA_48, // META_TILE_TYPE_574 - COLLISION_DATA_48, // META_TILE_TYPE_575 - COLLISION_DATA_48, // META_TILE_TYPE_576 - COLLISION_DATA_48, // META_TILE_TYPE_577 - COLLISION_DATA_48, // META_TILE_TYPE_578 - COLLISION_DATA_48, // META_TILE_TYPE_579 - COLLISION_DATA_48, // META_TILE_TYPE_580 - COLLISION_DATA_48, // META_TILE_TYPE_581 - COLLISION_DATA_48, // META_TILE_TYPE_582 - COLLISION_DATA_48, // META_TILE_TYPE_583 - COLLISION_DATA_48, // META_TILE_TYPE_584 - COLLISION_DATA_48, // META_TILE_TYPE_585 - COLLISION_DATA_48, // META_TILE_TYPE_586 - COLLISION_DATA_48, // META_TILE_TYPE_587 - COLLISION_DATA_48, // META_TILE_TYPE_588 - COLLISION_DATA_48, // META_TILE_TYPE_589 - COLLISION_DATA_16, // META_TILE_TYPE_590 - COLLISION_DATA_15, // META_TILE_TYPE_591 - COLLISION_DATA_17, // META_TILE_TYPE_592 - COLLISION_DATA_15, // META_TILE_TYPE_593 - COLLISION_DATA_15, // META_TILE_TYPE_594 - COLLISION_DATA_15, // META_TILE_TYPE_595 - COLLISION_DATA_15, // META_TILE_TYPE_596 - COLLISION_DATA_15, // META_TILE_TYPE_597 - COLLISION_DATA_15, // META_TILE_TYPE_598 - COLLISION_DATA_0, // META_TILE_TYPE_599 - COLLISION_DATA_0, // META_TILE_TYPE_600 - COLLISION_DATA_0, // META_TILE_TYPE_601 - COLLISION_DATA_0, // META_TILE_TYPE_602 - COLLISION_DATA_0, // META_TILE_TYPE_603 - COLLISION_DATA_0, // META_TILE_TYPE_604 - COLLISION_DATA_0, // META_TILE_TYPE_605 - COLLISION_DATA_0, // META_TILE_TYPE_606 - COLLISION_DATA_0, // META_TILE_TYPE_607 - COLLISION_DATA_5, // META_TILE_TYPE_608 - COLLISION_DATA_15, // META_TILE_TYPE_609 - COLLISION_DATA_0, // META_TILE_TYPE_610 - COLLISION_DATA_0, // META_TILE_TYPE_611 - COLLISION_DATA_5, // META_TILE_TYPE_612 - COLLISION_DATA_15, // META_TILE_TYPE_613 - COLLISION_DATA_15, // META_TILE_TYPE_614 - COLLISION_DATA_15, // META_TILE_TYPE_615 - COLLISION_DATA_15, // META_TILE_TYPE_616 - COLLISION_DATA_15, // META_TILE_TYPE_617 - COLLISION_DATA_15, // META_TILE_TYPE_618 - COLLISION_DATA_15, // META_TILE_TYPE_619 - COLLISION_DATA_15, // META_TILE_TYPE_620 - COLLISION_DATA_39, // META_TILE_TYPE_621 - COLLISION_DATA_15, // META_TILE_TYPE_622 - COLLISION_DATA_15, // META_TILE_TYPE_623 - COLLISION_DATA_39, // META_TILE_TYPE_624 - COLLISION_DATA_255, // META_TILE_TYPE_625 - COLLISION_DATA_15, // META_TILE_TYPE_626 - COLLISION_DATA_15, // META_TILE_TYPE_627 - COLLISION_DATA_15, // META_TILE_TYPE_628 - COLLISION_DATA_15, // META_TILE_TYPE_629 - COLLISION_DATA_15, // META_TILE_TYPE_630 - COLLISION_DATA_15, // META_TILE_TYPE_631 - COLLISION_DATA_15, // META_TILE_TYPE_632 - COLLISION_DATA_15, // META_TILE_TYPE_633 - COLLISION_DATA_15, // META_TILE_TYPE_634 - COLLISION_DATA_15, // META_TILE_TYPE_635 - COLLISION_DATA_15, // META_TILE_TYPE_636 - COLLISION_DATA_39, // META_TILE_TYPE_637 - COLLISION_DATA_15, // META_TILE_TYPE_638 - COLLISION_DATA_15, // META_TILE_TYPE_639 - COLLISION_DATA_39, // META_TILE_TYPE_640 - COLLISION_DATA_255, // META_TILE_TYPE_641 - COLLISION_DATA_15, // META_TILE_TYPE_642 - COLLISION_DATA_15, // META_TILE_TYPE_643 - COLLISION_DATA_15, // META_TILE_TYPE_644 - COLLISION_DATA_15, // META_TILE_TYPE_645 - COLLISION_DATA_255, // META_TILE_TYPE_646 - COLLISION_DATA_255, // META_TILE_TYPE_647 - COLLISION_DATA_255, // META_TILE_TYPE_648 - COLLISION_DATA_255, // META_TILE_TYPE_649 - COLLISION_DATA_255, // META_TILE_TYPE_650 - COLLISION_DATA_255, // META_TILE_TYPE_651 - COLLISION_DATA_15, // META_TILE_TYPE_652 - COLLISION_DATA_39, // META_TILE_TYPE_653 - COLLISION_DATA_15, // META_TILE_TYPE_654 - COLLISION_DATA_15, // META_TILE_TYPE_655 - COLLISION_DATA_255, // META_TILE_TYPE_656 - COLLISION_DATA_39, // META_TILE_TYPE_657 - COLLISION_DATA_15, // META_TILE_TYPE_658 - COLLISION_DATA_15, // META_TILE_TYPE_659 - COLLISION_DATA_15, // META_TILE_TYPE_660 - COLLISION_DATA_15, // META_TILE_TYPE_661 - COLLISION_DATA_15, // META_TILE_TYPE_662 - COLLISION_DATA_15, // META_TILE_TYPE_663 - COLLISION_DATA_15, // META_TILE_TYPE_664 - COLLISION_DATA_15, // META_TILE_TYPE_665 - COLLISION_DATA_15, // META_TILE_TYPE_666 - COLLISION_DATA_15, // META_TILE_TYPE_667 - COLLISION_DATA_15, // META_TILE_TYPE_668 - COLLISION_DATA_15, // META_TILE_TYPE_669 - COLLISION_DATA_15, // META_TILE_TYPE_670 - COLLISION_DATA_15, // META_TILE_TYPE_671 - COLLISION_DATA_15, // META_TILE_TYPE_672 - COLLISION_DATA_15, // META_TILE_TYPE_673 - COLLISION_DATA_15, // META_TILE_TYPE_674 - COLLISION_DATA_15, // META_TILE_TYPE_675 - COLLISION_DATA_15, // META_TILE_TYPE_676 - COLLISION_DATA_15, // META_TILE_TYPE_677 - COLLISION_DATA_15, // META_TILE_TYPE_678 - COLLISION_DATA_15, // META_TILE_TYPE_679 - COLLISION_DATA_15, // META_TILE_TYPE_680 - COLLISION_DATA_15, // META_TILE_TYPE_681 - COLLISION_DATA_15, // META_TILE_TYPE_682 - COLLISION_DATA_15, // META_TILE_TYPE_683 - COLLISION_DATA_15, // META_TILE_TYPE_684 - COLLISION_DATA_15, // META_TILE_TYPE_685 - COLLISION_DATA_15, // META_TILE_TYPE_686 - COLLISION_DATA_15, // META_TILE_TYPE_687 - COLLISION_DATA_15, // META_TILE_TYPE_688 - COLLISION_DATA_15, // META_TILE_TYPE_689 - COLLISION_DATA_15, // META_TILE_TYPE_690 - COLLISION_DATA_15, // META_TILE_TYPE_691 - COLLISION_DATA_15, // META_TILE_TYPE_692 - COLLISION_DATA_15, // META_TILE_TYPE_693 - COLLISION_DATA_0, // META_TILE_TYPE_694 - COLLISION_DATA_0, // META_TILE_TYPE_695 - COLLISION_DATA_0, // META_TILE_TYPE_696 - COLLISION_DATA_0, // META_TILE_TYPE_697 - COLLISION_DATA_0, // META_TILE_TYPE_698 - COLLISION_DATA_0, // META_TILE_TYPE_699 - COLLISION_DATA_0, // META_TILE_TYPE_700 - COLLISION_DATA_0, // META_TILE_TYPE_701 - COLLISION_DATA_0, // META_TILE_TYPE_702 - COLLISION_DATA_0, // META_TILE_TYPE_703 - COLLISION_DATA_0, // META_TILE_TYPE_704 - COLLISION_DATA_0, // META_TILE_TYPE_705 - COLLISION_DATA_0, // META_TILE_TYPE_706 - COLLISION_DATA_0, // META_TILE_TYPE_707 - COLLISION_DATA_0, // META_TILE_TYPE_708 - COLLISION_DATA_0, // META_TILE_TYPE_709 - COLLISION_DATA_0, // META_TILE_TYPE_710 - COLLISION_DATA_0, // META_TILE_TYPE_711 - COLLISION_DATA_0, // META_TILE_TYPE_712 - COLLISION_DATA_0, // META_TILE_TYPE_713 - COLLISION_DATA_0, // META_TILE_TYPE_714 - COLLISION_DATA_0, // META_TILE_TYPE_715 - COLLISION_DATA_0, // META_TILE_TYPE_716 - COLLISION_DATA_0, // META_TILE_TYPE_717 - COLLISION_DATA_0, // META_TILE_TYPE_718 - COLLISION_DATA_0, // META_TILE_TYPE_719 - COLLISION_DATA_0, // META_TILE_TYPE_720 - COLLISION_DATA_0, // META_TILE_TYPE_721 - COLLISION_DATA_0, // META_TILE_TYPE_722 - COLLISION_DATA_0, // META_TILE_TYPE_723 - COLLISION_DATA_0, // META_TILE_TYPE_724 - COLLISION_DATA_0, // META_TILE_TYPE_725 - COLLISION_DATA_0, // META_TILE_TYPE_726 - COLLISION_DATA_0, // META_TILE_TYPE_727 - COLLISION_DATA_0, // META_TILE_TYPE_728 - COLLISION_DATA_0, // META_TILE_TYPE_729 - COLLISION_DATA_0, // META_TILE_TYPE_730 - COLLISION_DATA_0, // META_TILE_TYPE_731 - COLLISION_DATA_0, // META_TILE_TYPE_732 - COLLISION_DATA_0, // META_TILE_TYPE_733 - COLLISION_DATA_0, // META_TILE_TYPE_734 - COLLISION_DATA_0, // META_TILE_TYPE_735 - COLLISION_DATA_0, // META_TILE_TYPE_736 - COLLISION_DATA_0, // META_TILE_TYPE_737 - COLLISION_DATA_0, // META_TILE_TYPE_738 - COLLISION_DATA_0, // META_TILE_TYPE_739 - COLLISION_DATA_0, // META_TILE_TYPE_740 - COLLISION_DATA_0, // META_TILE_TYPE_741 - COLLISION_DATA_0, // META_TILE_TYPE_742 - COLLISION_DATA_0, // META_TILE_TYPE_743 - COLLISION_DATA_0, // META_TILE_TYPE_744 - COLLISION_DATA_0, // META_TILE_TYPE_745 - COLLISION_DATA_0, // META_TILE_TYPE_746 - COLLISION_DATA_0, // META_TILE_TYPE_747 - COLLISION_DATA_0, // META_TILE_TYPE_748 - COLLISION_DATA_0, // META_TILE_TYPE_749 - COLLISION_DATA_0, // META_TILE_TYPE_750 - COLLISION_DATA_0, // META_TILE_TYPE_751 - COLLISION_DATA_0, // META_TILE_TYPE_752 - COLLISION_DATA_0, // META_TILE_TYPE_753 - COLLISION_DATA_3, // META_TILE_TYPE_754 - COLLISION_DATA_0, // META_TILE_TYPE_755 - COLLISION_DATA_0, // META_TILE_TYPE_756 - COLLISION_DATA_0, // META_TILE_TYPE_757 - COLLISION_DATA_0, // META_TILE_TYPE_758 - COLLISION_DATA_0, // META_TILE_TYPE_759 - COLLISION_DATA_0, // META_TILE_TYPE_760 - COLLISION_DATA_0, // META_TILE_TYPE_761 - COLLISION_DATA_5, // META_TILE_TYPE_762 - COLLISION_DATA_0, // META_TILE_TYPE_763 - COLLISION_DATA_10, // META_TILE_TYPE_764 - COLLISION_DATA_4, // META_TILE_TYPE_765 - COLLISION_DATA_12, // META_TILE_TYPE_766 - COLLISION_DATA_8, // META_TILE_TYPE_767 - COLLISION_DATA_70, // META_TILE_TYPE_768 - COLLISION_DATA_75, // META_TILE_TYPE_769 - COLLISION_DATA_74, // META_TILE_TYPE_770 - COLLISION_DATA_72, // META_TILE_TYPE_771 - COLLISION_DATA_71, // META_TILE_TYPE_772 - COLLISION_DATA_96, // META_TILE_TYPE_773 - COLLISION_DATA_98, // META_TILE_TYPE_774 - COLLISION_DATA_97, // META_TILE_TYPE_775 - COLLISION_DATA_99, // META_TILE_TYPE_776 - COLLISION_DATA_100, // META_TILE_TYPE_777 - COLLISION_DATA_102, // META_TILE_TYPE_778 - COLLISION_DATA_15, // META_TILE_TYPE_779 - COLLISION_DATA_80, // META_TILE_TYPE_780 - COLLISION_DATA_48, // META_TILE_TYPE_781 - COLLISION_DATA_48, // META_TILE_TYPE_782 - COLLISION_DATA_255, // META_TILE_TYPE_783 - COLLISION_DATA_0, // META_TILE_TYPE_784 - COLLISION_DATA_255, // META_TILE_TYPE_785 - COLLISION_DATA_0, // META_TILE_TYPE_786 - COLLISION_DATA_0, // META_TILE_TYPE_787 - COLLISION_DATA_0, // META_TILE_TYPE_788 - COLLISION_DATA_0, // META_TILE_TYPE_789 - COLLISION_DATA_255, // META_TILE_TYPE_790 - COLLISION_DATA_0, // META_TILE_TYPE_791 - COLLISION_DATA_0, // META_TILE_TYPE_792 - COLLISION_DATA_37, // META_TILE_TYPE_793 - COLLISION_DATA_15, // META_TILE_TYPE_794 - COLLISION_DATA_255, // META_TILE_TYPE_795 - COLLISION_DATA_255, // META_TILE_TYPE_796 - COLLISION_DATA_255, // META_TILE_TYPE_797 - COLLISION_DATA_255, // META_TILE_TYPE_798 - COLLISION_DATA_255, // META_TILE_TYPE_799 - COLLISION_DATA_255, // META_TILE_TYPE_800 - COLLISION_DATA_0, // META_TILE_TYPE_801 - COLLISION_DATA_0, // META_TILE_TYPE_802 - COLLISION_DATA_33, // META_TILE_TYPE_803 - COLLISION_DATA_33, // META_TILE_TYPE_804 - COLLISION_DATA_33, // META_TILE_TYPE_805 - COLLISION_DATA_33, // META_TILE_TYPE_806 - COLLISION_DATA_33, // META_TILE_TYPE_807 - COLLISION_DATA_33, // META_TILE_TYPE_808 - COLLISION_DATA_33, // META_TILE_TYPE_809 - COLLISION_DATA_33, // META_TILE_TYPE_810 - COLLISION_DATA_33, // META_TILE_TYPE_811 - COLLISION_DATA_33, // META_TILE_TYPE_812 - COLLISION_DATA_33, // META_TILE_TYPE_813 - COLLISION_DATA_33, // META_TILE_TYPE_814 - COLLISION_DATA_33, // META_TILE_TYPE_815 - COLLISION_DATA_33, // META_TILE_TYPE_816 - COLLISION_DATA_33, // META_TILE_TYPE_817 - COLLISION_DATA_33, // META_TILE_TYPE_818 - COLLISION_DATA_33, // META_TILE_TYPE_819 - COLLISION_DATA_33, // META_TILE_TYPE_820 - COLLISION_DATA_33, // META_TILE_TYPE_821 - COLLISION_DATA_33, // META_TILE_TYPE_822 - COLLISION_DATA_33, // META_TILE_TYPE_823 - COLLISION_DATA_33, // META_TILE_TYPE_824 - COLLISION_DATA_33, // META_TILE_TYPE_825 - COLLISION_DATA_33, // META_TILE_TYPE_826 - COLLISION_DATA_33, // META_TILE_TYPE_827 - COLLISION_DATA_33, // META_TILE_TYPE_828 - COLLISION_DATA_33, // META_TILE_TYPE_829 - COLLISION_DATA_33, // META_TILE_TYPE_830 - COLLISION_DATA_33, // META_TILE_TYPE_831 - COLLISION_DATA_33, // META_TILE_TYPE_832 - COLLISION_DATA_0, // META_TILE_TYPE_833 - COLLISION_DATA_12, // META_TILE_TYPE_834 - COLLISION_DATA_0, // META_TILE_TYPE_835 - COLLISION_DATA_0, // META_TILE_TYPE_836 - COLLISION_DATA_0, // META_TILE_TYPE_837 - COLLISION_DATA_0, // META_TILE_TYPE_838 - COLLISION_DATA_0, // META_TILE_TYPE_839 - COLLISION_DATA_0, // META_TILE_TYPE_840 - COLLISION_DATA_0, // META_TILE_TYPE_841 - COLLISION_DATA_0, // META_TILE_TYPE_842 - COLLISION_DATA_0, // META_TILE_TYPE_843 - COLLISION_DATA_0, // META_TILE_TYPE_844 - COLLISION_DATA_15, // META_TILE_TYPE_845 - COLLISION_DATA_255, // META_TILE_TYPE_846 - COLLISION_DATA_255, // META_TILE_TYPE_847 - COLLISION_DATA_255, // META_TILE_TYPE_848 - COLLISION_DATA_255, // META_TILE_TYPE_849 - COLLISION_DATA_255, // META_TILE_TYPE_850 - COLLISION_DATA_40, // META_TILE_TYPE_851 - COLLISION_DATA_255, // META_TILE_TYPE_852 - COLLISION_DATA_40, // META_TILE_TYPE_853 - COLLISION_DATA_40, // META_TILE_TYPE_854 - COLLISION_DATA_40, // META_TILE_TYPE_855 - COLLISION_DATA_40, // META_TILE_TYPE_856 - COLLISION_DATA_40, // META_TILE_TYPE_857 - COLLISION_DATA_40, // META_TILE_TYPE_858 - COLLISION_DATA_40, // META_TILE_TYPE_859 - COLLISION_DATA_40, // META_TILE_TYPE_860 - COLLISION_DATA_40, // META_TILE_TYPE_861 - COLLISION_DATA_40, // META_TILE_TYPE_862 - COLLISION_DATA_40, // META_TILE_TYPE_863 - COLLISION_DATA_15, // META_TILE_TYPE_864 - COLLISION_DATA_15, // META_TILE_TYPE_865 - COLLISION_DATA_15, // META_TILE_TYPE_866 - COLLISION_DATA_15, // META_TILE_TYPE_867 - COLLISION_DATA_15, // META_TILE_TYPE_868 - COLLISION_DATA_15, // META_TILE_TYPE_869 - COLLISION_DATA_15, // META_TILE_TYPE_870 - COLLISION_DATA_15, // META_TILE_TYPE_871 - COLLISION_DATA_15, // META_TILE_TYPE_872 - COLLISION_DATA_15, // META_TILE_TYPE_873 - COLLISION_DATA_15, // META_TILE_TYPE_874 - COLLISION_DATA_15, // META_TILE_TYPE_875 - COLLISION_DATA_15, // META_TILE_TYPE_876 - COLLISION_DATA_15, // META_TILE_TYPE_877 - COLLISION_DATA_15, // META_TILE_TYPE_878 - COLLISION_DATA_15, // META_TILE_TYPE_879 - COLLISION_DATA_15, // META_TILE_TYPE_880 - COLLISION_DATA_15, // META_TILE_TYPE_881 - COLLISION_DATA_15, // META_TILE_TYPE_882 - COLLISION_DATA_15, // META_TILE_TYPE_883 - COLLISION_DATA_15, // META_TILE_TYPE_884 - COLLISION_DATA_15, // META_TILE_TYPE_885 - COLLISION_DATA_15, // META_TILE_TYPE_886 - COLLISION_DATA_15, // META_TILE_TYPE_887 - COLLISION_DATA_15, // META_TILE_TYPE_888 - COLLISION_DATA_15, // META_TILE_TYPE_889 - COLLISION_DATA_15, // META_TILE_TYPE_890 - COLLISION_DATA_15, // META_TILE_TYPE_891 - COLLISION_DATA_15, // META_TILE_TYPE_892 - COLLISION_DATA_15, // META_TILE_TYPE_893 - COLLISION_DATA_15, // META_TILE_TYPE_894 - COLLISION_DATA_15, // META_TILE_TYPE_895 - COLLISION_DATA_15, // META_TILE_TYPE_896 - COLLISION_DATA_15, // META_TILE_TYPE_897 - COLLISION_DATA_15, // META_TILE_TYPE_898 - COLLISION_DATA_15, // META_TILE_TYPE_899 - COLLISION_DATA_15, // META_TILE_TYPE_900 - COLLISION_DATA_15, // META_TILE_TYPE_901 - COLLISION_DATA_15, // META_TILE_TYPE_902 - COLLISION_DATA_15, // META_TILE_TYPE_903 - COLLISION_DATA_15, // META_TILE_TYPE_904 - COLLISION_DATA_15, // META_TILE_TYPE_905 - COLLISION_DATA_15, // META_TILE_TYPE_906 - COLLISION_DATA_15, // META_TILE_TYPE_907 - COLLISION_DATA_15, // META_TILE_TYPE_908 - COLLISION_DATA_15, // META_TILE_TYPE_909 - COLLISION_DATA_15, // META_TILE_TYPE_910 - COLLISION_DATA_15, // META_TILE_TYPE_911 - COLLISION_DATA_15, // META_TILE_TYPE_912 - COLLISION_DATA_15, // META_TILE_TYPE_913 - COLLISION_DATA_15, // META_TILE_TYPE_914 - COLLISION_DATA_15, // META_TILE_TYPE_915 - COLLISION_DATA_15, // META_TILE_TYPE_916 - COLLISION_DATA_21, // META_TILE_TYPE_917 - COLLISION_DATA_20, // META_TILE_TYPE_918 - COLLISION_DATA_20, // META_TILE_TYPE_919 - COLLISION_DATA_15, // META_TILE_TYPE_920 - COLLISION_DATA_15, // META_TILE_TYPE_921 - COLLISION_DATA_15, // META_TILE_TYPE_922 - COLLISION_DATA_15, // META_TILE_TYPE_923 - COLLISION_DATA_15, // META_TILE_TYPE_924 - COLLISION_DATA_15, // META_TILE_TYPE_925 - COLLISION_DATA_15, // META_TILE_TYPE_926 - COLLISION_DATA_15, // META_TILE_TYPE_927 - COLLISION_DATA_255, // META_TILE_TYPE_928 - COLLISION_DATA_1, // META_TILE_TYPE_929 - COLLISION_DATA_1, // META_TILE_TYPE_930 - COLLISION_DATA_1, // META_TILE_TYPE_931 - COLLISION_DATA_255, // META_TILE_TYPE_932 - COLLISION_DATA_255, // META_TILE_TYPE_933 - COLLISION_DATA_255, // META_TILE_TYPE_934 - COLLISION_DATA_255, // META_TILE_TYPE_935 - COLLISION_DATA_24, // META_TILE_TYPE_936 - COLLISION_DATA_24, // META_TILE_TYPE_937 - COLLISION_DATA_24, // META_TILE_TYPE_938 - COLLISION_DATA_24, // META_TILE_TYPE_939 - COLLISION_DATA_38, // META_TILE_TYPE_940 - COLLISION_DATA_15, // META_TILE_TYPE_941 - COLLISION_DATA_0, // META_TILE_TYPE_942 - COLLISION_DATA_28, // META_TILE_TYPE_943 - COLLISION_DATA_26, // META_TILE_TYPE_944 - COLLISION_DATA_27, // META_TILE_TYPE_945 - COLLISION_DATA_25, // META_TILE_TYPE_946 - COLLISION_DATA_255, // META_TILE_TYPE_947 - COLLISION_DATA_0, // META_TILE_TYPE_948 - COLLISION_DATA_15, // META_TILE_TYPE_949 - COLLISION_DATA_21, // META_TILE_TYPE_950 - COLLISION_DATA_15, // META_TILE_TYPE_951 - COLLISION_DATA_15, // META_TILE_TYPE_952 - COLLISION_DATA_15, // META_TILE_TYPE_953 - COLLISION_DATA_19, // META_TILE_TYPE_954 - COLLISION_DATA_18, // META_TILE_TYPE_955 - COLLISION_DATA_15, // META_TILE_TYPE_956 - COLLISION_DATA_15, // META_TILE_TYPE_957 - COLLISION_DATA_15, // META_TILE_TYPE_958 - COLLISION_DATA_18, // META_TILE_TYPE_959 - COLLISION_DATA_19, // META_TILE_TYPE_960 - COLLISION_DATA_35, // META_TILE_TYPE_961 - COLLISION_DATA_39, // META_TILE_TYPE_962 - COLLISION_DATA_0, // META_TILE_TYPE_963 - COLLISION_DATA_0, // META_TILE_TYPE_964 - COLLISION_DATA_2, // META_TILE_TYPE_965 - COLLISION_DATA_14, // META_TILE_TYPE_966 - COLLISION_DATA_13, // META_TILE_TYPE_967 - COLLISION_DATA_12, // META_TILE_TYPE_968 - COLLISION_DATA_3, // META_TILE_TYPE_969 - COLLISION_DATA_9, // META_TILE_TYPE_970 - COLLISION_DATA_6, // META_TILE_TYPE_971 - COLLISION_DATA_4, // META_TILE_TYPE_972 - COLLISION_DATA_8, // META_TILE_TYPE_973 - COLLISION_DATA_11, // META_TILE_TYPE_974 - COLLISION_DATA_7, // META_TILE_TYPE_975 - COLLISION_DATA_10, // META_TILE_TYPE_976 - COLLISION_DATA_5, // META_TILE_TYPE_977 - COLLISION_DATA_3, // META_TILE_TYPE_978 - COLLISION_DATA_107, // META_TILE_TYPE_979 - COLLISION_DATA_103, // META_TILE_TYPE_980 - COLLISION_DATA_106, // META_TILE_TYPE_981 - COLLISION_DATA_15, // META_TILE_TYPE_982 - COLLISION_DATA_12, // META_TILE_TYPE_983 - COLLISION_DATA_20, // META_TILE_TYPE_984 - COLLISION_DATA_21, // META_TILE_TYPE_985 - COLLISION_DATA_15, // META_TILE_TYPE_986 - COLLISION_DATA_0, // META_TILE_TYPE_987 - COLLISION_DATA_15, // META_TILE_TYPE_988 - COLLISION_DATA_40, // META_TILE_TYPE_989 - COLLISION_DATA_95, // META_TILE_TYPE_990 - COLLISION_DATA_15, // META_TILE_TYPE_991 - COLLISION_DATA_5, // META_TILE_TYPE_992 - COLLISION_DATA_10, // META_TILE_TYPE_993 - COLLISION_DATA_16, // META_TILE_TYPE_994 - COLLISION_DATA_17, // META_TILE_TYPE_995 - COLLISION_DATA_18, // META_TILE_TYPE_996 - COLLISION_DATA_19, // META_TILE_TYPE_997 - COLLISION_DATA_71, // META_TILE_TYPE_998 - COLLISION_DATA_12, // META_TILE_TYPE_999 - COLLISION_DATA_13, // META_TILE_TYPE_1000 - COLLISION_DATA_14, // META_TILE_TYPE_1001 - COLLISION_DATA_71, // META_TILE_TYPE_1002 - COLLISION_DATA_20, // META_TILE_TYPE_1003 - COLLISION_DATA_92, // META_TILE_TYPE_1004 - COLLISION_DATA_13, // META_TILE_TYPE_1005 - COLLISION_DATA_5, // META_TILE_TYPE_1006 - COLLISION_DATA_4, // META_TILE_TYPE_1007 - COLLISION_DATA_8, // META_TILE_TYPE_1008 - COLLISION_DATA_1, // META_TILE_TYPE_1009 - COLLISION_DATA_2, // META_TILE_TYPE_1010 - COLLISION_DATA_10, // META_TILE_TYPE_1011 - COLLISION_DATA_5, // META_TILE_TYPE_1012 - COLLISION_DATA_10, // META_TILE_TYPE_1013 - COLLISION_DATA_15, // META_TILE_TYPE_1014 - COLLISION_DATA_4, // META_TILE_TYPE_1015 - COLLISION_DATA_8, // META_TILE_TYPE_1016 - COLLISION_DATA_15, // META_TILE_TYPE_1017 - COLLISION_DATA_3, // META_TILE_TYPE_1018 - COLLISION_DATA_2, // META_TILE_TYPE_1019 - COLLISION_DATA_5, // META_TILE_TYPE_1020 - COLLISION_DATA_15, // META_TILE_TYPE_1021 - COLLISION_DATA_10, // META_TILE_TYPE_1022 - COLLISION_DATA_4, // META_TILE_TYPE_1023 - COLLISION_DATA_12, // META_TILE_TYPE_1024 - COLLISION_DATA_8, // META_TILE_TYPE_1025 - COLLISION_DATA_3, // META_TILE_TYPE_1026 - COLLISION_DATA_2, // META_TILE_TYPE_1027 - COLLISION_DATA_5, // META_TILE_TYPE_1028 - COLLISION_DATA_15, // META_TILE_TYPE_1029 - COLLISION_DATA_10, // META_TILE_TYPE_1030 - COLLISION_DATA_4, // META_TILE_TYPE_1031 - COLLISION_DATA_12, // META_TILE_TYPE_1032 - COLLISION_DATA_8, // META_TILE_TYPE_1033 - COLLISION_DATA_92, // META_TILE_TYPE_1034 - COLLISION_DATA_84, // META_TILE_TYPE_1035 - COLLISION_DATA_81, // META_TILE_TYPE_1036 - COLLISION_DATA_83, // META_TILE_TYPE_1037 - COLLISION_DATA_81, // META_TILE_TYPE_1038 - COLLISION_DATA_82, // META_TILE_TYPE_1039 - COLLISION_DATA_83, // META_TILE_TYPE_1040 - COLLISION_DATA_90, // META_TILE_TYPE_1041 - COLLISION_DATA_87, // META_TILE_TYPE_1042 - COLLISION_DATA_91, // META_TILE_TYPE_1043 - COLLISION_DATA_95, // META_TILE_TYPE_1044 - COLLISION_DATA_84, // META_TILE_TYPE_1045 - COLLISION_DATA_88, // META_TILE_TYPE_1046 - COLLISION_DATA_92, // META_TILE_TYPE_1047 - COLLISION_DATA_85, // META_TILE_TYPE_1048 - COLLISION_DATA_93, // META_TILE_TYPE_1049 - COLLISION_DATA_94, // META_TILE_TYPE_1050 - COLLISION_DATA_39, // META_TILE_TYPE_1051 - COLLISION_DATA_88, // META_TILE_TYPE_1052 - COLLISION_DATA_85, // META_TILE_TYPE_1053 - COLLISION_DATA_10, // META_TILE_TYPE_1054 - COLLISION_DATA_83, // META_TILE_TYPE_1055 - COLLISION_DATA_90, // META_TILE_TYPE_1056 - COLLISION_DATA_81, // META_TILE_TYPE_1057 - COLLISION_DATA_15, // META_TILE_TYPE_1058 - COLLISION_DATA_89, // META_TILE_TYPE_1059 - COLLISION_DATA_0, // META_TILE_TYPE_1060 - COLLISION_DATA_0, // META_TILE_TYPE_1061 - COLLISION_DATA_69, // META_TILE_TYPE_1062 - COLLISION_DATA_71, // META_TILE_TYPE_1063 - COLLISION_DATA_67, // META_TILE_TYPE_1064 - COLLISION_DATA_70, // META_TILE_TYPE_1065 - COLLISION_DATA_0, // META_TILE_TYPE_1066 - COLLISION_DATA_3, // META_TILE_TYPE_1067 - COLLISION_DATA_15, // META_TILE_TYPE_1068 - COLLISION_DATA_1, // META_TILE_TYPE_1069 - COLLISION_DATA_2, // META_TILE_TYPE_1070 - COLLISION_DATA_3, // META_TILE_TYPE_1071 - COLLISION_DATA_10, // META_TILE_TYPE_1072 - COLLISION_DATA_12, // META_TILE_TYPE_1073 - COLLISION_DATA_5, // META_TILE_TYPE_1074 - COLLISION_DATA_4, // META_TILE_TYPE_1075 - COLLISION_DATA_8, // META_TILE_TYPE_1076 - COLLISION_DATA_4, // META_TILE_TYPE_1077 - COLLISION_DATA_1, // META_TILE_TYPE_1078 - COLLISION_DATA_3, // META_TILE_TYPE_1079 - COLLISION_DATA_15, // META_TILE_TYPE_1080 - COLLISION_DATA_95, // META_TILE_TYPE_1081 - COLLISION_DATA_97, // META_TILE_TYPE_1082 - COLLISION_DATA_0, // META_TILE_TYPE_1083 - COLLISION_DATA_3, // META_TILE_TYPE_1084 - COLLISION_DATA_28, // META_TILE_TYPE_1085 - COLLISION_DATA_27, // META_TILE_TYPE_1086 - COLLISION_DATA_21, // META_TILE_TYPE_1087 - COLLISION_DATA_69, // META_TILE_TYPE_1088 - COLLISION_DATA_3, // META_TILE_TYPE_1089 - COLLISION_DATA_96, // META_TILE_TYPE_1090 - COLLISION_DATA_12, // META_TILE_TYPE_1091 - COLLISION_DATA_102, // META_TILE_TYPE_1092 - COLLISION_DATA_100, // META_TILE_TYPE_1093 - COLLISION_DATA_101, // META_TILE_TYPE_1094 - COLLISION_DATA_26, // META_TILE_TYPE_1095 - COLLISION_DATA_25, // META_TILE_TYPE_1096 - COLLISION_DATA_18, // META_TILE_TYPE_1097 - COLLISION_DATA_17, // META_TILE_TYPE_1098 - COLLISION_DATA_19, // META_TILE_TYPE_1099 - COLLISION_DATA_16, // META_TILE_TYPE_1100 - COLLISION_DATA_2, // META_TILE_TYPE_1101 - COLLISION_DATA_4, // META_TILE_TYPE_1102 - COLLISION_DATA_8, // META_TILE_TYPE_1103 - COLLISION_DATA_14, // META_TILE_TYPE_1104 - COLLISION_DATA_15, // META_TILE_TYPE_1105 - COLLISION_DATA_11, // META_TILE_TYPE_1106 - COLLISION_DATA_84, // META_TILE_TYPE_1107 - COLLISION_DATA_69, // META_TILE_TYPE_1108 - COLLISION_DATA_68, // META_TILE_TYPE_1109 - COLLISION_DATA_4, // META_TILE_TYPE_1110 - COLLISION_DATA_13, // META_TILE_TYPE_1111 - COLLISION_DATA_0, // META_TILE_TYPE_1112 - COLLISION_DATA_0, // META_TILE_TYPE_1113 - COLLISION_DATA_12, // META_TILE_TYPE_1114 - COLLISION_DATA_12, // META_TILE_TYPE_1115 - COLLISION_DATA_15, // META_TILE_TYPE_1116 - COLLISION_DATA_15, // META_TILE_TYPE_1117 - COLLISION_DATA_10, // META_TILE_TYPE_1118 - COLLISION_DATA_5, // META_TILE_TYPE_1119 - COLLISION_DATA_10, // META_TILE_TYPE_1120 - COLLISION_DATA_5, // META_TILE_TYPE_1121 - COLLISION_DATA_12, // META_TILE_TYPE_1122 - COLLISION_DATA_97, // META_TILE_TYPE_1123 - COLLISION_DATA_10, // META_TILE_TYPE_1124 - COLLISION_DATA_5, // META_TILE_TYPE_1125 - COLLISION_DATA_11, // META_TILE_TYPE_1126 - COLLISION_DATA_7, // META_TILE_TYPE_1127 - COLLISION_DATA_67, // META_TILE_TYPE_1128 - COLLISION_DATA_69, // META_TILE_TYPE_1129 - COLLISION_DATA_1, // META_TILE_TYPE_1130 - COLLISION_DATA_2, // META_TILE_TYPE_1131 - COLLISION_DATA_4, // META_TILE_TYPE_1132 - COLLISION_DATA_8, // META_TILE_TYPE_1133 - COLLISION_DATA_13, // META_TILE_TYPE_1134 - COLLISION_DATA_3, // META_TILE_TYPE_1135 - COLLISION_DATA_3, // META_TILE_TYPE_1136 - COLLISION_DATA_7, // META_TILE_TYPE_1137 - COLLISION_DATA_15, // META_TILE_TYPE_1138 - COLLISION_DATA_3, // META_TILE_TYPE_1139 - COLLISION_DATA_0, // META_TILE_TYPE_1140 - COLLISION_DATA_2, // META_TILE_TYPE_1141 - COLLISION_DATA_84, // META_TILE_TYPE_1142 - COLLISION_DATA_92, // META_TILE_TYPE_1143 - COLLISION_DATA_88, // META_TILE_TYPE_1144 - COLLISION_DATA_12, // META_TILE_TYPE_1145 - COLLISION_DATA_67, // META_TILE_TYPE_1146 - COLLISION_DATA_0, // META_TILE_TYPE_1147 - COLLISION_DATA_0, // META_TILE_TYPE_1148 - COLLISION_DATA_8, // META_TILE_TYPE_1149 - COLLISION_DATA_1, // META_TILE_TYPE_1150 - COLLISION_DATA_2, // META_TILE_TYPE_1151 - COLLISION_DATA_87, // META_TILE_TYPE_1152 - COLLISION_DATA_95, // META_TILE_TYPE_1153 - COLLISION_DATA_91, // META_TILE_TYPE_1154 - COLLISION_DATA_82, // META_TILE_TYPE_1155 - COLLISION_DATA_14, // META_TILE_TYPE_1156 - COLLISION_DATA_18, // META_TILE_TYPE_1157 - COLLISION_DATA_19, // META_TILE_TYPE_1158 - COLLISION_DATA_10, // META_TILE_TYPE_1159 - COLLISION_DATA_5, // META_TILE_TYPE_1160 - COLLISION_DATA_0, // META_TILE_TYPE_1161 - COLLISION_DATA_10, // META_TILE_TYPE_1162 - COLLISION_DATA_5, // META_TILE_TYPE_1163 - COLLISION_DATA_3, // META_TILE_TYPE_1164 - COLLISION_DATA_63, // META_TILE_TYPE_1165 - COLLISION_DATA_19, // META_TILE_TYPE_1166 - COLLISION_DATA_18, // META_TILE_TYPE_1167 - COLLISION_DATA_47, // META_TILE_TYPE_1168 - COLLISION_DATA_46, // META_TILE_TYPE_1169 - COLLISION_DATA_17, // META_TILE_TYPE_1170 - COLLISION_DATA_16, // META_TILE_TYPE_1171 - COLLISION_DATA_11, // META_TILE_TYPE_1172 - COLLISION_DATA_7, // META_TILE_TYPE_1173 - COLLISION_DATA_15, // META_TILE_TYPE_1174 - COLLISION_DATA_0, // META_TILE_TYPE_1175 - COLLISION_DATA_3, // META_TILE_TYPE_1176 - COLLISION_DATA_15, // META_TILE_TYPE_1177 - COLLISION_DATA_15, // META_TILE_TYPE_1178 - COLLISION_DATA_1, // META_TILE_TYPE_1179 - COLLISION_DATA_8, // META_TILE_TYPE_1180 - COLLISION_DATA_12, // META_TILE_TYPE_1181 - COLLISION_DATA_12, // META_TILE_TYPE_1182 - COLLISION_DATA_15, // META_TILE_TYPE_1183 - COLLISION_DATA_1, // META_TILE_TYPE_1184 - COLLISION_DATA_3, // META_TILE_TYPE_1185 - COLLISION_DATA_2, // META_TILE_TYPE_1186 - COLLISION_DATA_5, // META_TILE_TYPE_1187 - COLLISION_DATA_10, // META_TILE_TYPE_1188 - COLLISION_DATA_4, // META_TILE_TYPE_1189 - COLLISION_DATA_12, // META_TILE_TYPE_1190 - COLLISION_DATA_8, // META_TILE_TYPE_1191 - COLLISION_DATA_9, // META_TILE_TYPE_1192 - COLLISION_DATA_39, // META_TILE_TYPE_1193 - COLLISION_DATA_2, // META_TILE_TYPE_1194 - COLLISION_DATA_14, // META_TILE_TYPE_1195 - COLLISION_DATA_13, // META_TILE_TYPE_1196 - COLLISION_DATA_12, // META_TILE_TYPE_1197 - COLLISION_DATA_3, // META_TILE_TYPE_1198 - COLLISION_DATA_6, // META_TILE_TYPE_1199 - COLLISION_DATA_9, // META_TILE_TYPE_1200 - COLLISION_DATA_4, // META_TILE_TYPE_1201 - COLLISION_DATA_8, // META_TILE_TYPE_1202 - COLLISION_DATA_11, // META_TILE_TYPE_1203 - COLLISION_DATA_7, // META_TILE_TYPE_1204 - COLLISION_DATA_10, // META_TILE_TYPE_1205 - COLLISION_DATA_5, // META_TILE_TYPE_1206 - COLLISION_DATA_34, // META_TILE_TYPE_1207 - COLLISION_DATA_35, // META_TILE_TYPE_1208 - COLLISION_DATA_4, // META_TILE_TYPE_1209 - COLLISION_DATA_12, // META_TILE_TYPE_1210 - COLLISION_DATA_3, // META_TILE_TYPE_1211 - COLLISION_DATA_3, // META_TILE_TYPE_1212 - COLLISION_DATA_1, // META_TILE_TYPE_1213 - COLLISION_DATA_5, // META_TILE_TYPE_1214 - COLLISION_DATA_10, // META_TILE_TYPE_1215 - COLLISION_DATA_4, // META_TILE_TYPE_1216 - COLLISION_DATA_8, // META_TILE_TYPE_1217 - COLLISION_DATA_0, // META_TILE_TYPE_1218 - COLLISION_DATA_107, // META_TILE_TYPE_1219 - COLLISION_DATA_103, // META_TILE_TYPE_1220 - COLLISION_DATA_106, // META_TILE_TYPE_1221 - COLLISION_DATA_18, // META_TILE_TYPE_1222 - COLLISION_DATA_45, // META_TILE_TYPE_1223 - COLLISION_DATA_44, // META_TILE_TYPE_1224 - COLLISION_DATA_0, // META_TILE_TYPE_1225 - COLLISION_DATA_15, // META_TILE_TYPE_1226 - COLLISION_DATA_41, // META_TILE_TYPE_1227 - COLLISION_DATA_40, // META_TILE_TYPE_1228 - COLLISION_DATA_0, // META_TILE_TYPE_1229 - COLLISION_DATA_0, // META_TILE_TYPE_1230 - COLLISION_DATA_0, // META_TILE_TYPE_1231 - COLLISION_DATA_0, // META_TILE_TYPE_1232 - COLLISION_DATA_0, // META_TILE_TYPE_1233 - COLLISION_DATA_0, // META_TILE_TYPE_1234 - COLLISION_DATA_0, // META_TILE_TYPE_1235 - COLLISION_DATA_20, // META_TILE_TYPE_1236 - COLLISION_DATA_33, // META_TILE_TYPE_1237 - COLLISION_DATA_39, // META_TILE_TYPE_1238 - COLLISION_DATA_67, // META_TILE_TYPE_1239 - COLLISION_DATA_4, // META_TILE_TYPE_1240 - COLLISION_DATA_8, // META_TILE_TYPE_1241 - COLLISION_DATA_12, // META_TILE_TYPE_1242 - COLLISION_DATA_3, // META_TILE_TYPE_1243 - COLLISION_DATA_3, // META_TILE_TYPE_1244 - COLLISION_DATA_1, // META_TILE_TYPE_1245 - COLLISION_DATA_2, // META_TILE_TYPE_1246 - COLLISION_DATA_0, // META_TILE_TYPE_1247 - COLLISION_DATA_12, // META_TILE_TYPE_1248 - COLLISION_DATA_3, // META_TILE_TYPE_1249 - COLLISION_DATA_2, // META_TILE_TYPE_1250 - COLLISION_DATA_5, // META_TILE_TYPE_1251 - COLLISION_DATA_10, // META_TILE_TYPE_1252 - COLLISION_DATA_14, // META_TILE_TYPE_1253 - COLLISION_DATA_13, // META_TILE_TYPE_1254 - COLLISION_DATA_4, // META_TILE_TYPE_1255 - COLLISION_DATA_8, // META_TILE_TYPE_1256 - COLLISION_DATA_11, // META_TILE_TYPE_1257 - COLLISION_DATA_7, // META_TILE_TYPE_1258 - COLLISION_DATA_12, // META_TILE_TYPE_1259 - COLLISION_DATA_0, // META_TILE_TYPE_1260 - COLLISION_DATA_0, // META_TILE_TYPE_1261 - COLLISION_DATA_39, // META_TILE_TYPE_1262 - COLLISION_DATA_1, // META_TILE_TYPE_1263 - COLLISION_DATA_2, // META_TILE_TYPE_1264 - COLLISION_DATA_1, // META_TILE_TYPE_1265 - COLLISION_DATA_2, // META_TILE_TYPE_1266 - COLLISION_DATA_4, // META_TILE_TYPE_1267 - COLLISION_DATA_12, // META_TILE_TYPE_1268 - COLLISION_DATA_7, // META_TILE_TYPE_1269 - COLLISION_DATA_11, // META_TILE_TYPE_1270 - COLLISION_DATA_4, // META_TILE_TYPE_1271 - COLLISION_DATA_8, // META_TILE_TYPE_1272 - COLLISION_DATA_16, // META_TILE_TYPE_1273 - COLLISION_DATA_17, // META_TILE_TYPE_1274 - COLLISION_DATA_43, // META_TILE_TYPE_1275 - COLLISION_DATA_43, // META_TILE_TYPE_1276 - COLLISION_DATA_18, // META_TILE_TYPE_1277 - COLLISION_DATA_19, // META_TILE_TYPE_1278 - COLLISION_DATA_10, // META_TILE_TYPE_1279 - COLLISION_DATA_5, // META_TILE_TYPE_1280 - COLLISION_DATA_2, // META_TILE_TYPE_1281 - COLLISION_DATA_1, // META_TILE_TYPE_1282 - COLLISION_DATA_35, // META_TILE_TYPE_1283 - COLLISION_DATA_1, // META_TILE_TYPE_1284 - COLLISION_DATA_3, // META_TILE_TYPE_1285 - COLLISION_DATA_2, // META_TILE_TYPE_1286 - COLLISION_DATA_5, // META_TILE_TYPE_1287 - COLLISION_DATA_10, // META_TILE_TYPE_1288 - COLLISION_DATA_14, // META_TILE_TYPE_1289 - COLLISION_DATA_13, // META_TILE_TYPE_1290 - COLLISION_DATA_11, // META_TILE_TYPE_1291 - COLLISION_DATA_7, // META_TILE_TYPE_1292 - COLLISION_DATA_4, // META_TILE_TYPE_1293 - COLLISION_DATA_8, // META_TILE_TYPE_1294 - COLLISION_DATA_10, // META_TILE_TYPE_1295 - COLLISION_DATA_5, // META_TILE_TYPE_1296 - COLLISION_DATA_10, // META_TILE_TYPE_1297 - COLLISION_DATA_5, // META_TILE_TYPE_1298 - COLLISION_DATA_13, // META_TILE_TYPE_1299 - COLLISION_DATA_14, // META_TILE_TYPE_1300 - COLLISION_DATA_8, // META_TILE_TYPE_1301 - COLLISION_DATA_4, // META_TILE_TYPE_1302 - COLLISION_DATA_7, // META_TILE_TYPE_1303 - COLLISION_DATA_11, // META_TILE_TYPE_1304 - COLLISION_DATA_0, // META_TILE_TYPE_1305 - COLLISION_DATA_9, // META_TILE_TYPE_1306 - COLLISION_DATA_6, // META_TILE_TYPE_1307 - COLLISION_DATA_0, // META_TILE_TYPE_1308 - COLLISION_DATA_15, // META_TILE_TYPE_1309 - COLLISION_DATA_7, // META_TILE_TYPE_1310 - COLLISION_DATA_11, // META_TILE_TYPE_1311 - COLLISION_DATA_3, // META_TILE_TYPE_1312 - COLLISION_DATA_33, // META_TILE_TYPE_1313 - COLLISION_DATA_33, // META_TILE_TYPE_1314 - COLLISION_DATA_33, // META_TILE_TYPE_1315 - COLLISION_DATA_33, // META_TILE_TYPE_1316 - COLLISION_DATA_33, // META_TILE_TYPE_1317 - COLLISION_DATA_33, // META_TILE_TYPE_1318 - COLLISION_DATA_33, // META_TILE_TYPE_1319 - COLLISION_DATA_15, // META_TILE_TYPE_1320 - COLLISION_DATA_5, // META_TILE_TYPE_1321 - COLLISION_DATA_10, // META_TILE_TYPE_1322 - COLLISION_DATA_96, // META_TILE_TYPE_1323 - COLLISION_DATA_0, // META_TILE_TYPE_1324 - COLLISION_DATA_0, // META_TILE_TYPE_1325 - COLLISION_DATA_0, // META_TILE_TYPE_1326 - COLLISION_DATA_0, // META_TILE_TYPE_1327 - COLLISION_DATA_0, // META_TILE_TYPE_1328 - COLLISION_DATA_0, // META_TILE_TYPE_1329 - COLLISION_DATA_0, // META_TILE_TYPE_1330 - COLLISION_DATA_0, // META_TILE_TYPE_1331 - COLLISION_DATA_0, // META_TILE_TYPE_1332 - COLLISION_DATA_0, // META_TILE_TYPE_1333 - COLLISION_DATA_0, // META_TILE_TYPE_1334 - COLLISION_DATA_0, // META_TILE_TYPE_1335 - COLLISION_DATA_0, // META_TILE_TYPE_1336 - COLLISION_DATA_0, // META_TILE_TYPE_1337 - COLLISION_DATA_0, // META_TILE_TYPE_1338 - COLLISION_DATA_0, // META_TILE_TYPE_1339 - COLLISION_DATA_0, // META_TILE_TYPE_1340 - COLLISION_DATA_0, // META_TILE_TYPE_1341 - COLLISION_DATA_0, // META_TILE_TYPE_1342 - COLLISION_DATA_0, // META_TILE_TYPE_1343 - COLLISION_DATA_48, // META_TILE_TYPE_1344 - COLLISION_DATA_0, // META_TILE_TYPE_1345 - COLLISION_DATA_3, // META_TILE_TYPE_1346 - COLLISION_DATA_48, // META_TILE_TYPE_1347 - COLLISION_DATA_48, // META_TILE_TYPE_1348 - COLLISION_DATA_0, // META_TILE_TYPE_1349 - COLLISION_DATA_0, // META_TILE_TYPE_1350 - COLLISION_DATA_0, // META_TILE_TYPE_1351 - COLLISION_DATA_0, // META_TILE_TYPE_1352 - COLLISION_DATA_0, // META_TILE_TYPE_1353 - COLLISION_DATA_0, // META_TILE_TYPE_1354 - COLLISION_DATA_48, // META_TILE_TYPE_1355 - COLLISION_DATA_48, // META_TILE_TYPE_1356 - COLLISION_DATA_33, // META_TILE_TYPE_1357 - COLLISION_DATA_33, // META_TILE_TYPE_1358 - COLLISION_DATA_0, // META_TILE_TYPE_1359 - COLLISION_DATA_15, // META_TILE_TYPE_1360 - COLLISION_DATA_83, // META_TILE_TYPE_1361 - COLLISION_DATA_92, // META_TILE_TYPE_1362 - COLLISION_DATA_85, // META_TILE_TYPE_1363 - COLLISION_DATA_90, // META_TILE_TYPE_1364 - COLLISION_DATA_96, // META_TILE_TYPE_1365 - COLLISION_DATA_97, // META_TILE_TYPE_1366 - COLLISION_DATA_95, // META_TILE_TYPE_1367 - COLLISION_DATA_18, // META_TILE_TYPE_1368 - COLLISION_DATA_19, // META_TILE_TYPE_1369 - COLLISION_DATA_16, // META_TILE_TYPE_1370 - COLLISION_DATA_10, // META_TILE_TYPE_1371 - COLLISION_DATA_10, // META_TILE_TYPE_1372 - COLLISION_DATA_35, // META_TILE_TYPE_1373 - COLLISION_DATA_10, // META_TILE_TYPE_1374 - COLLISION_DATA_5, // META_TILE_TYPE_1375 - COLLISION_DATA_14, // META_TILE_TYPE_1376 - COLLISION_DATA_13, // META_TILE_TYPE_1377 - COLLISION_DATA_11, // META_TILE_TYPE_1378 - COLLISION_DATA_7, // META_TILE_TYPE_1379 - COLLISION_DATA_10, // META_TILE_TYPE_1380 - COLLISION_DATA_5, // META_TILE_TYPE_1381 - COLLISION_DATA_14, // META_TILE_TYPE_1382 - COLLISION_DATA_13, // META_TILE_TYPE_1383 - COLLISION_DATA_11, // META_TILE_TYPE_1384 - COLLISION_DATA_7, // META_TILE_TYPE_1385 - COLLISION_DATA_0, // META_TILE_TYPE_1386 - COLLISION_DATA_0, // META_TILE_TYPE_1387 - COLLISION_DATA_3, // META_TILE_TYPE_1388 - COLLISION_DATA_0, // META_TILE_TYPE_1389 - COLLISION_DATA_39, // META_TILE_TYPE_1390 - COLLISION_DATA_12, // META_TILE_TYPE_1391 - COLLISION_DATA_12, // META_TILE_TYPE_1392 - COLLISION_DATA_33, // META_TILE_TYPE_1393 - COLLISION_DATA_0, // META_TILE_TYPE_1394 - COLLISION_DATA_0, // META_TILE_TYPE_1395 +// maps tileType to collisionData +const u8 gMapTileTypeToCollisionData[] = { + COLLISION_DATA_0, // TILE_TYPE_0 + COLLISION_DATA_0, // TILE_TYPE_1 + COLLISION_DATA_0, // TILE_TYPE_2 + COLLISION_DATA_0, // TILE_TYPE_3 + COLLISION_DATA_0, // TILE_TYPE_4 + COLLISION_DATA_0, // TILE_TYPE_5 + COLLISION_DATA_0, // TILE_TYPE_6 + COLLISION_DATA_0, // TILE_TYPE_7 + COLLISION_DATA_0, // TILE_TYPE_8 + COLLISION_DATA_0, // TILE_TYPE_9 + COLLISION_DATA_0, // TILE_TYPE_10 + COLLISION_DATA_0, // TILE_TYPE_11 + COLLISION_DATA_255, // TILE_TYPE_12 + COLLISION_DATA_255, // TILE_TYPE_13 + COLLISION_DATA_255, // TILE_TYPE_14 + COLLISION_DATA_255, // TILE_TYPE_15 + COLLISION_DATA_255, // TILE_TYPE_16 + COLLISION_DATA_255, // TILE_TYPE_17 + COLLISION_DATA_255, // TILE_TYPE_18 + COLLISION_DATA_0, // TILE_TYPE_19 + COLLISION_DATA_255, // TILE_TYPE_20 + COLLISION_DATA_255, // TILE_TYPE_21 + COLLISION_DATA_255, // TILE_TYPE_22 + COLLISION_DATA_255, // TILE_TYPE_23 + COLLISION_DATA_255, // TILE_TYPE_24 + COLLISION_DATA_255, // TILE_TYPE_25 + COLLISION_DATA_0, // TILE_TYPE_26 + COLLISION_DATA_0, // TILE_TYPE_27 + COLLISION_DATA_0, // TILE_TYPE_28 + COLLISION_DATA_0, // TILE_TYPE_29 + COLLISION_DATA_0, // TILE_TYPE_30 + COLLISION_DATA_0, // TILE_TYPE_31 + COLLISION_DATA_0, // TILE_TYPE_32 + COLLISION_DATA_0, // TILE_TYPE_33 + COLLISION_DATA_0, // TILE_TYPE_34 + COLLISION_DATA_0, // TILE_TYPE_35 + COLLISION_DATA_0, // TILE_TYPE_36 + COLLISION_DATA_0, // TILE_TYPE_37 + COLLISION_DATA_0, // TILE_TYPE_38 + COLLISION_DATA_0, // TILE_TYPE_39 + COLLISION_DATA_0, // TILE_TYPE_40 + COLLISION_DATA_0, // TILE_TYPE_41 + COLLISION_DATA_255, // TILE_TYPE_42 + COLLISION_DATA_0, // TILE_TYPE_43 + COLLISION_DATA_0, // TILE_TYPE_44 + COLLISION_DATA_255, // TILE_TYPE_45 + COLLISION_DATA_0, // TILE_TYPE_46 + COLLISION_DATA_0, // TILE_TYPE_47 + COLLISION_DATA_0, // TILE_TYPE_48 + COLLISION_DATA_0, // TILE_TYPE_49 + COLLISION_DATA_0, // TILE_TYPE_50 + COLLISION_DATA_0, // TILE_TYPE_51 + COLLISION_DATA_0, // TILE_TYPE_52 + COLLISION_DATA_33, // TILE_TYPE_53 + COLLISION_DATA_0, // TILE_TYPE_54 + COLLISION_DATA_0, // TILE_TYPE_55 + COLLISION_DATA_0, // TILE_TYPE_56 + COLLISION_DATA_48, // TILE_TYPE_57 + COLLISION_DATA_34, // TILE_TYPE_58 + COLLISION_DATA_34, // TILE_TYPE_59 + COLLISION_DATA_36, // TILE_TYPE_60 + COLLISION_DATA_0, // TILE_TYPE_61 + COLLISION_DATA_0, // TILE_TYPE_62 + COLLISION_DATA_29, // TILE_TYPE_63 + COLLISION_DATA_29, // TILE_TYPE_64 + COLLISION_DATA_29, // TILE_TYPE_65 + COLLISION_DATA_255, // TILE_TYPE_66 + COLLISION_DATA_255, // TILE_TYPE_67 + COLLISION_DATA_29, // TILE_TYPE_68 + COLLISION_DATA_29, // TILE_TYPE_69 + COLLISION_DATA_29, // TILE_TYPE_70 + COLLISION_DATA_29, // TILE_TYPE_71 + COLLISION_DATA_29, // TILE_TYPE_72 + COLLISION_DATA_29, // TILE_TYPE_73 + COLLISION_DATA_29, // TILE_TYPE_74 + COLLISION_DATA_29, // TILE_TYPE_75 + COLLISION_DATA_29, // TILE_TYPE_76 + COLLISION_DATA_29, // TILE_TYPE_77 + COLLISION_DATA_29, // TILE_TYPE_78 + COLLISION_DATA_29, // TILE_TYPE_79 + COLLISION_DATA_255, // TILE_TYPE_80 + COLLISION_DATA_255, // TILE_TYPE_81 + COLLISION_DATA_255, // TILE_TYPE_82 + COLLISION_DATA_255, // TILE_TYPE_83 + COLLISION_DATA_255, // TILE_TYPE_84 + COLLISION_DATA_29, // TILE_TYPE_85 + COLLISION_DATA_29, // TILE_TYPE_86 + COLLISION_DATA_29, // TILE_TYPE_87 + COLLISION_DATA_255, // TILE_TYPE_88 + COLLISION_DATA_255, // TILE_TYPE_89 + COLLISION_DATA_29, // TILE_TYPE_90 + COLLISION_DATA_29, // TILE_TYPE_91 + COLLISION_DATA_255, // TILE_TYPE_92 + COLLISION_DATA_255, // TILE_TYPE_93 + COLLISION_DATA_255, // TILE_TYPE_94 + COLLISION_DATA_255, // TILE_TYPE_95 + COLLISION_DATA_255, // TILE_TYPE_96 + COLLISION_DATA_0, // TILE_TYPE_97 + COLLISION_DATA_0, // TILE_TYPE_98 + COLLISION_DATA_0, // TILE_TYPE_99 + COLLISION_DATA_0, // TILE_TYPE_100 + COLLISION_DATA_0, // TILE_TYPE_101 + COLLISION_DATA_0, // TILE_TYPE_102 + COLLISION_DATA_0, // TILE_TYPE_103 + COLLISION_DATA_0, // TILE_TYPE_104 + COLLISION_DATA_0, // TILE_TYPE_105 + COLLISION_DATA_0, // TILE_TYPE_106 + COLLISION_DATA_0, // TILE_TYPE_107 + COLLISION_DATA_0, // TILE_TYPE_108 + COLLISION_DATA_0, // TILE_TYPE_109 + COLLISION_DATA_0, // TILE_TYPE_110 + COLLISION_DATA_15, // TILE_TYPE_111 + COLLISION_DATA_15, // TILE_TYPE_112 + COLLISION_DATA_32, // TILE_TYPE_113 + COLLISION_DATA_32, // TILE_TYPE_114 + COLLISION_DATA_15, // TILE_TYPE_115 + COLLISION_DATA_15, // TILE_TYPE_116 + COLLISION_DATA_15, // TILE_TYPE_117 + COLLISION_DATA_15, // TILE_TYPE_118 + COLLISION_DATA_0, // TILE_TYPE_119 + COLLISION_DATA_0, // TILE_TYPE_120 + COLLISION_DATA_0, // TILE_TYPE_121 + COLLISION_DATA_0, // TILE_TYPE_122 + COLLISION_DATA_21, // TILE_TYPE_123 + COLLISION_DATA_21, // TILE_TYPE_124 + COLLISION_DATA_20, // TILE_TYPE_125 + COLLISION_DATA_20, // TILE_TYPE_126 + COLLISION_DATA_95, // TILE_TYPE_127 + COLLISION_DATA_255, // TILE_TYPE_128 + COLLISION_DATA_255, // TILE_TYPE_129 + COLLISION_DATA_255, // TILE_TYPE_130 + COLLISION_DATA_255, // TILE_TYPE_131 + COLLISION_DATA_255, // TILE_TYPE_132 + COLLISION_DATA_255, // TILE_TYPE_133 + COLLISION_DATA_15, // TILE_TYPE_134 + COLLISION_DATA_41, // TILE_TYPE_135 + COLLISION_DATA_41, // TILE_TYPE_136 + COLLISION_DATA_41, // TILE_TYPE_137 + COLLISION_DATA_41, // TILE_TYPE_138 + COLLISION_DATA_0, // TILE_TYPE_139 + COLLISION_DATA_36, // TILE_TYPE_140 + COLLISION_DATA_36, // TILE_TYPE_141 + COLLISION_DATA_36, // TILE_TYPE_142 + COLLISION_DATA_15, // TILE_TYPE_143 + COLLISION_DATA_15, // TILE_TYPE_144 + COLLISION_DATA_15, // TILE_TYPE_145 + COLLISION_DATA_15, // TILE_TYPE_146 + COLLISION_DATA_255, // TILE_TYPE_147 + COLLISION_DATA_255, // TILE_TYPE_148 + COLLISION_DATA_255, // TILE_TYPE_149 + COLLISION_DATA_255, // TILE_TYPE_150 + COLLISION_DATA_255, // TILE_TYPE_151 + COLLISION_DATA_255, // TILE_TYPE_152 + COLLISION_DATA_15, // TILE_TYPE_153 + COLLISION_DATA_15, // TILE_TYPE_154 + COLLISION_DATA_15, // TILE_TYPE_155 + COLLISION_DATA_15, // TILE_TYPE_156 + COLLISION_DATA_39, // TILE_TYPE_157 + COLLISION_DATA_39, // TILE_TYPE_158 + COLLISION_DATA_15, // TILE_TYPE_159 + COLLISION_DATA_15, // TILE_TYPE_160 + COLLISION_DATA_15, // TILE_TYPE_161 + COLLISION_DATA_39, // TILE_TYPE_162 + COLLISION_DATA_15, // TILE_TYPE_163 + COLLISION_DATA_15, // TILE_TYPE_164 + COLLISION_DATA_35, // TILE_TYPE_165 + COLLISION_DATA_15, // TILE_TYPE_166 + COLLISION_DATA_15, // TILE_TYPE_167 + COLLISION_DATA_35, // TILE_TYPE_168 + COLLISION_DATA_15, // TILE_TYPE_169 + COLLISION_DATA_15, // TILE_TYPE_170 + COLLISION_DATA_15, // TILE_TYPE_171 + COLLISION_DATA_15, // TILE_TYPE_172 + COLLISION_DATA_15, // TILE_TYPE_173 + COLLISION_DATA_15, // TILE_TYPE_174 + COLLISION_DATA_15, // TILE_TYPE_175 + COLLISION_DATA_15, // TILE_TYPE_176 + COLLISION_DATA_15, // TILE_TYPE_177 + COLLISION_DATA_39, // TILE_TYPE_178 + COLLISION_DATA_15, // TILE_TYPE_179 + COLLISION_DATA_15, // TILE_TYPE_180 + COLLISION_DATA_39, // TILE_TYPE_181 + COLLISION_DATA_39, // TILE_TYPE_182 + COLLISION_DATA_15, // TILE_TYPE_183 + COLLISION_DATA_15, // TILE_TYPE_184 + COLLISION_DATA_15, // TILE_TYPE_185 + COLLISION_DATA_15, // TILE_TYPE_186 + COLLISION_DATA_15, // TILE_TYPE_187 + COLLISION_DATA_15, // TILE_TYPE_188 + COLLISION_DATA_15, // TILE_TYPE_189 + COLLISION_DATA_15, // TILE_TYPE_190 + COLLISION_DATA_15, // TILE_TYPE_191 + COLLISION_DATA_15, // TILE_TYPE_192 + COLLISION_DATA_15, // TILE_TYPE_193 + COLLISION_DATA_39, // TILE_TYPE_194 + COLLISION_DATA_15, // TILE_TYPE_195 + COLLISION_DATA_15, // TILE_TYPE_196 + COLLISION_DATA_255, // TILE_TYPE_197 + COLLISION_DATA_39, // TILE_TYPE_198 + COLLISION_DATA_15, // TILE_TYPE_199 + COLLISION_DATA_15, // TILE_TYPE_200 + COLLISION_DATA_15, // TILE_TYPE_201 + COLLISION_DATA_15, // TILE_TYPE_202 + COLLISION_DATA_15, // TILE_TYPE_203 + COLLISION_DATA_15, // TILE_TYPE_204 + COLLISION_DATA_15, // TILE_TYPE_205 + COLLISION_DATA_15, // TILE_TYPE_206 + COLLISION_DATA_15, // TILE_TYPE_207 + COLLISION_DATA_15, // TILE_TYPE_208 + COLLISION_DATA_15, // TILE_TYPE_209 + COLLISION_DATA_39, // TILE_TYPE_210 + COLLISION_DATA_39, // TILE_TYPE_211 + COLLISION_DATA_15, // TILE_TYPE_212 + COLLISION_DATA_15, // TILE_TYPE_213 + COLLISION_DATA_39, // TILE_TYPE_214 + COLLISION_DATA_15, // TILE_TYPE_215 + COLLISION_DATA_15, // TILE_TYPE_216 + COLLISION_DATA_15, // TILE_TYPE_217 + COLLISION_DATA_15, // TILE_TYPE_218 + COLLISION_DATA_15, // TILE_TYPE_219 + COLLISION_DATA_15, // TILE_TYPE_220 + COLLISION_DATA_15, // TILE_TYPE_221 + COLLISION_DATA_15, // TILE_TYPE_222 + COLLISION_DATA_15, // TILE_TYPE_223 + COLLISION_DATA_15, // TILE_TYPE_224 + COLLISION_DATA_15, // TILE_TYPE_225 + COLLISION_DATA_35, // TILE_TYPE_226 + COLLISION_DATA_15, // TILE_TYPE_227 + COLLISION_DATA_15, // TILE_TYPE_228 + COLLISION_DATA_35, // TILE_TYPE_229 + COLLISION_DATA_35, // TILE_TYPE_230 + COLLISION_DATA_15, // TILE_TYPE_231 + COLLISION_DATA_15, // TILE_TYPE_232 + COLLISION_DATA_15, // TILE_TYPE_233 + COLLISION_DATA_15, // TILE_TYPE_234 + COLLISION_DATA_15, // TILE_TYPE_235 + COLLISION_DATA_15, // TILE_TYPE_236 + COLLISION_DATA_15, // TILE_TYPE_237 + COLLISION_DATA_15, // TILE_TYPE_238 + COLLISION_DATA_15, // TILE_TYPE_239 + COLLISION_DATA_15, // TILE_TYPE_240 + COLLISION_DATA_15, // TILE_TYPE_241 + COLLISION_DATA_35, // TILE_TYPE_242 + COLLISION_DATA_35, // TILE_TYPE_243 + COLLISION_DATA_15, // TILE_TYPE_244 + COLLISION_DATA_15, // TILE_TYPE_245 + COLLISION_DATA_35, // TILE_TYPE_246 + COLLISION_DATA_15, // TILE_TYPE_247 + COLLISION_DATA_15, // TILE_TYPE_248 + COLLISION_DATA_15, // TILE_TYPE_249 + COLLISION_DATA_15, // TILE_TYPE_250 + COLLISION_DATA_15, // TILE_TYPE_251 + COLLISION_DATA_15, // TILE_TYPE_252 + COLLISION_DATA_15, // TILE_TYPE_253 + COLLISION_DATA_15, // TILE_TYPE_254 + COLLISION_DATA_15, // TILE_TYPE_255 + COLLISION_DATA_15, // TILE_TYPE_256 + COLLISION_DATA_15, // TILE_TYPE_257 + COLLISION_DATA_15, // TILE_TYPE_258 + COLLISION_DATA_15, // TILE_TYPE_259 + COLLISION_DATA_15, // TILE_TYPE_260 + COLLISION_DATA_15, // TILE_TYPE_261 + COLLISION_DATA_15, // TILE_TYPE_262 + COLLISION_DATA_15, // TILE_TYPE_263 + COLLISION_DATA_15, // TILE_TYPE_264 + COLLISION_DATA_15, // TILE_TYPE_265 + COLLISION_DATA_15, // TILE_TYPE_266 + COLLISION_DATA_15, // TILE_TYPE_267 + COLLISION_DATA_15, // TILE_TYPE_268 + COLLISION_DATA_15, // TILE_TYPE_269 + COLLISION_DATA_15, // TILE_TYPE_270 + COLLISION_DATA_15, // TILE_TYPE_271 + COLLISION_DATA_15, // TILE_TYPE_272 + COLLISION_DATA_15, // TILE_TYPE_273 + COLLISION_DATA_15, // TILE_TYPE_274 + COLLISION_DATA_15, // TILE_TYPE_275 + COLLISION_DATA_15, // TILE_TYPE_276 + COLLISION_DATA_15, // TILE_TYPE_277 + COLLISION_DATA_15, // TILE_TYPE_278 + COLLISION_DATA_15, // TILE_TYPE_279 + COLLISION_DATA_15, // TILE_TYPE_280 + COLLISION_DATA_15, // TILE_TYPE_281 + COLLISION_DATA_15, // TILE_TYPE_282 + COLLISION_DATA_15, // TILE_TYPE_283 + COLLISION_DATA_15, // TILE_TYPE_284 + COLLISION_DATA_15, // TILE_TYPE_285 + COLLISION_DATA_15, // TILE_TYPE_286 + COLLISION_DATA_15, // TILE_TYPE_287 + COLLISION_DATA_15, // TILE_TYPE_288 + COLLISION_DATA_15, // TILE_TYPE_289 + COLLISION_DATA_15, // TILE_TYPE_290 + COLLISION_DATA_15, // TILE_TYPE_291 + COLLISION_DATA_15, // TILE_TYPE_292 + COLLISION_DATA_15, // TILE_TYPE_293 + COLLISION_DATA_15, // TILE_TYPE_294 + COLLISION_DATA_15, // TILE_TYPE_295 + COLLISION_DATA_15, // TILE_TYPE_296 + COLLISION_DATA_15, // TILE_TYPE_297 + COLLISION_DATA_15, // TILE_TYPE_298 + COLLISION_DATA_15, // TILE_TYPE_299 + COLLISION_DATA_15, // TILE_TYPE_300 + COLLISION_DATA_15, // TILE_TYPE_301 + COLLISION_DATA_15, // TILE_TYPE_302 + COLLISION_DATA_15, // TILE_TYPE_303 + COLLISION_DATA_15, // TILE_TYPE_304 + COLLISION_DATA_15, // TILE_TYPE_305 + COLLISION_DATA_15, // TILE_TYPE_306 + COLLISION_DATA_15, // TILE_TYPE_307 + COLLISION_DATA_15, // TILE_TYPE_308 + COLLISION_DATA_15, // TILE_TYPE_309 + COLLISION_DATA_15, // TILE_TYPE_310 + COLLISION_DATA_15, // TILE_TYPE_311 + COLLISION_DATA_15, // TILE_TYPE_312 + COLLISION_DATA_15, // TILE_TYPE_313 + COLLISION_DATA_15, // TILE_TYPE_314 + COLLISION_DATA_15, // TILE_TYPE_315 + COLLISION_DATA_15, // TILE_TYPE_316 + COLLISION_DATA_15, // TILE_TYPE_317 + COLLISION_DATA_15, // TILE_TYPE_318 + COLLISION_DATA_15, // TILE_TYPE_319 + COLLISION_DATA_15, // TILE_TYPE_320 + COLLISION_DATA_15, // TILE_TYPE_321 + COLLISION_DATA_15, // TILE_TYPE_322 + COLLISION_DATA_15, // TILE_TYPE_323 + COLLISION_DATA_15, // TILE_TYPE_324 + COLLISION_DATA_15, // TILE_TYPE_325 + COLLISION_DATA_15, // TILE_TYPE_326 + COLLISION_DATA_15, // TILE_TYPE_327 + COLLISION_DATA_15, // TILE_TYPE_328 + COLLISION_DATA_0, // TILE_TYPE_329 + COLLISION_DATA_0, // TILE_TYPE_330 + COLLISION_DATA_0, // TILE_TYPE_331 + COLLISION_DATA_0, // TILE_TYPE_332 + COLLISION_DATA_0, // TILE_TYPE_333 + COLLISION_DATA_0, // TILE_TYPE_334 + COLLISION_DATA_0, // TILE_TYPE_335 + COLLISION_DATA_0, // TILE_TYPE_336 + COLLISION_DATA_0, // TILE_TYPE_337 + COLLISION_DATA_0, // TILE_TYPE_338 + COLLISION_DATA_0, // TILE_TYPE_339 + COLLISION_DATA_0, // TILE_TYPE_340 + COLLISION_DATA_0, // TILE_TYPE_341 + COLLISION_DATA_0, // TILE_TYPE_342 + COLLISION_DATA_0, // TILE_TYPE_343 + COLLISION_DATA_0, // TILE_TYPE_344 + COLLISION_DATA_0, // TILE_TYPE_345 + COLLISION_DATA_0, // TILE_TYPE_346 + COLLISION_DATA_15, // TILE_TYPE_347 + COLLISION_DATA_15, // TILE_TYPE_348 + COLLISION_DATA_15, // TILE_TYPE_349 + COLLISION_DATA_15, // TILE_TYPE_350 + COLLISION_DATA_15, // TILE_TYPE_351 + COLLISION_DATA_15, // TILE_TYPE_352 + COLLISION_DATA_95, // TILE_TYPE_353 + COLLISION_DATA_255, // TILE_TYPE_354 + COLLISION_DATA_255, // TILE_TYPE_355 + COLLISION_DATA_15, // TILE_TYPE_356 + COLLISION_DATA_15, // TILE_TYPE_357 + COLLISION_DATA_21, // TILE_TYPE_358 + COLLISION_DATA_15, // TILE_TYPE_359 + COLLISION_DATA_0, // TILE_TYPE_360 + COLLISION_DATA_0, // TILE_TYPE_361 + COLLISION_DATA_0, // TILE_TYPE_362 + COLLISION_DATA_255, // TILE_TYPE_363 + COLLISION_DATA_12, // TILE_TYPE_364 + COLLISION_DATA_0, // TILE_TYPE_365 + COLLISION_DATA_0, // TILE_TYPE_366 + COLLISION_DATA_12, // TILE_TYPE_367 + COLLISION_DATA_12, // TILE_TYPE_368 + COLLISION_DATA_66, // TILE_TYPE_369 + COLLISION_DATA_96, // TILE_TYPE_370 + COLLISION_DATA_15, // TILE_TYPE_371 + COLLISION_DATA_29, // TILE_TYPE_372 + COLLISION_DATA_255, // TILE_TYPE_373 + COLLISION_DATA_15, // TILE_TYPE_374 + COLLISION_DATA_15, // TILE_TYPE_375 + COLLISION_DATA_15, // TILE_TYPE_376 + COLLISION_DATA_0, // TILE_TYPE_377 + COLLISION_DATA_15, // TILE_TYPE_378 + COLLISION_DATA_15, // TILE_TYPE_379 + COLLISION_DATA_15, // TILE_TYPE_380 + COLLISION_DATA_15, // TILE_TYPE_381 + COLLISION_DATA_10, // TILE_TYPE_382 + COLLISION_DATA_5, // TILE_TYPE_383 + COLLISION_DATA_10, // TILE_TYPE_384 + COLLISION_DATA_5, // TILE_TYPE_385 + COLLISION_DATA_1, // TILE_TYPE_386 + COLLISION_DATA_1, // TILE_TYPE_387 + COLLISION_DATA_1, // TILE_TYPE_388 + COLLISION_DATA_0, // TILE_TYPE_389 + COLLISION_DATA_0, // TILE_TYPE_390 + COLLISION_DATA_0, // TILE_TYPE_391 + COLLISION_DATA_0, // TILE_TYPE_392 + COLLISION_DATA_0, // TILE_TYPE_393 + COLLISION_DATA_0, // TILE_TYPE_394 + COLLISION_DATA_5, // TILE_TYPE_395 + COLLISION_DATA_15, // TILE_TYPE_396 + COLLISION_DATA_10, // TILE_TYPE_397 + COLLISION_DATA_0, // TILE_TYPE_398 + COLLISION_DATA_0, // TILE_TYPE_399 + COLLISION_DATA_5, // TILE_TYPE_400 + COLLISION_DATA_15, // TILE_TYPE_401 + COLLISION_DATA_10, // TILE_TYPE_402 + COLLISION_DATA_0, // TILE_TYPE_403 + COLLISION_DATA_0, // TILE_TYPE_404 + COLLISION_DATA_0, // TILE_TYPE_405 + COLLISION_DATA_0, // TILE_TYPE_406 + COLLISION_DATA_0, // TILE_TYPE_407 + COLLISION_DATA_0, // TILE_TYPE_408 + COLLISION_DATA_0, // TILE_TYPE_409 + COLLISION_DATA_0, // TILE_TYPE_410 + COLLISION_DATA_0, // TILE_TYPE_411 + COLLISION_DATA_5, // TILE_TYPE_412 + COLLISION_DATA_0, // TILE_TYPE_413 + COLLISION_DATA_10, // TILE_TYPE_414 + COLLISION_DATA_4, // TILE_TYPE_415 + COLLISION_DATA_12, // TILE_TYPE_416 + COLLISION_DATA_8, // TILE_TYPE_417 + COLLISION_DATA_0, // TILE_TYPE_418 + COLLISION_DATA_0, // TILE_TYPE_419 + COLLISION_DATA_0, // TILE_TYPE_420 + COLLISION_DATA_5, // TILE_TYPE_421 + COLLISION_DATA_0, // TILE_TYPE_422 + COLLISION_DATA_10, // TILE_TYPE_423 + COLLISION_DATA_4, // TILE_TYPE_424 + COLLISION_DATA_12, // TILE_TYPE_425 + COLLISION_DATA_8, // TILE_TYPE_426 + COLLISION_DATA_15, // TILE_TYPE_427 + COLLISION_DATA_15, // TILE_TYPE_428 + COLLISION_DATA_15, // TILE_TYPE_429 + COLLISION_DATA_15, // TILE_TYPE_430 + COLLISION_DATA_15, // TILE_TYPE_431 + COLLISION_DATA_16, // TILE_TYPE_432 + COLLISION_DATA_17, // TILE_TYPE_433 + COLLISION_DATA_17, // TILE_TYPE_434 + COLLISION_DATA_16, // TILE_TYPE_435 + COLLISION_DATA_42, // TILE_TYPE_436 + COLLISION_DATA_42, // TILE_TYPE_437 + COLLISION_DATA_42, // TILE_TYPE_438 + COLLISION_DATA_42, // TILE_TYPE_439 + COLLISION_DATA_42, // TILE_TYPE_440 + COLLISION_DATA_42, // TILE_TYPE_441 + COLLISION_DATA_42, // TILE_TYPE_442 + COLLISION_DATA_42, // TILE_TYPE_443 + COLLISION_DATA_42, // TILE_TYPE_444 + COLLISION_DATA_42, // TILE_TYPE_445 + COLLISION_DATA_42, // TILE_TYPE_446 + COLLISION_DATA_42, // TILE_TYPE_447 + COLLISION_DATA_27, // TILE_TYPE_448 + COLLISION_DATA_25, // TILE_TYPE_449 + COLLISION_DATA_28, // TILE_TYPE_450 + COLLISION_DATA_26, // TILE_TYPE_451 + COLLISION_DATA_43, // TILE_TYPE_452 + COLLISION_DATA_43, // TILE_TYPE_453 + COLLISION_DATA_97, // TILE_TYPE_454 + COLLISION_DATA_23, // TILE_TYPE_455 + COLLISION_DATA_23, // TILE_TYPE_456 + COLLISION_DATA_84, // TILE_TYPE_457 + COLLISION_DATA_23, // TILE_TYPE_458 + COLLISION_DATA_23, // TILE_TYPE_459 + COLLISION_DATA_23, // TILE_TYPE_460 + COLLISION_DATA_0, // TILE_TYPE_461 + COLLISION_DATA_0, // TILE_TYPE_462 + COLLISION_DATA_84, // TILE_TYPE_463 + COLLISION_DATA_15, // TILE_TYPE_464 + COLLISION_DATA_15, // TILE_TYPE_465 + COLLISION_DATA_15, // TILE_TYPE_466 + COLLISION_DATA_15, // TILE_TYPE_467 + COLLISION_DATA_15, // TILE_TYPE_468 + COLLISION_DATA_15, // TILE_TYPE_469 + COLLISION_DATA_15, // TILE_TYPE_470 + COLLISION_DATA_0, // TILE_TYPE_471 + COLLISION_DATA_0, // TILE_TYPE_472 + COLLISION_DATA_0, // TILE_TYPE_473 + COLLISION_DATA_0, // TILE_TYPE_474 + COLLISION_DATA_18, // TILE_TYPE_475 + COLLISION_DATA_15, // TILE_TYPE_476 + COLLISION_DATA_15, // TILE_TYPE_477 + COLLISION_DATA_19, // TILE_TYPE_478 + COLLISION_DATA_15, // TILE_TYPE_479 + COLLISION_DATA_15, // TILE_TYPE_480 + COLLISION_DATA_15, // TILE_TYPE_481 + COLLISION_DATA_15, // TILE_TYPE_482 + COLLISION_DATA_15, // TILE_TYPE_483 + COLLISION_DATA_15, // TILE_TYPE_484 + COLLISION_DATA_15, // TILE_TYPE_485 + COLLISION_DATA_15, // TILE_TYPE_486 + COLLISION_DATA_5, // TILE_TYPE_487 + COLLISION_DATA_0, // TILE_TYPE_488 + COLLISION_DATA_0, // TILE_TYPE_489 + COLLISION_DATA_0, // TILE_TYPE_490 + COLLISION_DATA_0, // TILE_TYPE_491 + COLLISION_DATA_15, // TILE_TYPE_492 + COLLISION_DATA_15, // TILE_TYPE_493 + COLLISION_DATA_15, // TILE_TYPE_494 + COLLISION_DATA_15, // TILE_TYPE_495 + COLLISION_DATA_15, // TILE_TYPE_496 + COLLISION_DATA_15, // TILE_TYPE_497 + COLLISION_DATA_15, // TILE_TYPE_498 + COLLISION_DATA_15, // TILE_TYPE_499 + COLLISION_DATA_15, // TILE_TYPE_500 + COLLISION_DATA_15, // TILE_TYPE_501 + COLLISION_DATA_15, // TILE_TYPE_502 + COLLISION_DATA_15, // TILE_TYPE_503 + COLLISION_DATA_15, // TILE_TYPE_504 + COLLISION_DATA_15, // TILE_TYPE_505 + COLLISION_DATA_15, // TILE_TYPE_506 + COLLISION_DATA_15, // TILE_TYPE_507 + COLLISION_DATA_15, // TILE_TYPE_508 + COLLISION_DATA_15, // TILE_TYPE_509 + COLLISION_DATA_15, // TILE_TYPE_510 + COLLISION_DATA_15, // TILE_TYPE_511 + COLLISION_DATA_0, // TILE_TYPE_512 + COLLISION_DATA_0, // TILE_TYPE_513 + COLLISION_DATA_0, // TILE_TYPE_514 + COLLISION_DATA_0, // TILE_TYPE_515 + COLLISION_DATA_0, // TILE_TYPE_516 + COLLISION_DATA_0, // TILE_TYPE_517 + COLLISION_DATA_1, // TILE_TYPE_518 + COLLISION_DATA_3, // TILE_TYPE_519 + COLLISION_DATA_2, // TILE_TYPE_520 + COLLISION_DATA_0, // TILE_TYPE_521 + COLLISION_DATA_0, // TILE_TYPE_522 + COLLISION_DATA_5, // TILE_TYPE_523 + COLLISION_DATA_15, // TILE_TYPE_524 + COLLISION_DATA_10, // TILE_TYPE_525 + COLLISION_DATA_0, // TILE_TYPE_526 + COLLISION_DATA_0, // TILE_TYPE_527 + COLLISION_DATA_0, // TILE_TYPE_528 + COLLISION_DATA_0, // TILE_TYPE_529 + COLLISION_DATA_0, // TILE_TYPE_530 + COLLISION_DATA_0, // TILE_TYPE_531 + COLLISION_DATA_0, // TILE_TYPE_532 + COLLISION_DATA_0, // TILE_TYPE_533 + COLLISION_DATA_0, // TILE_TYPE_534 + COLLISION_DATA_0, // TILE_TYPE_535 + COLLISION_DATA_0, // TILE_TYPE_536 + COLLISION_DATA_15, // TILE_TYPE_537 + COLLISION_DATA_15, // TILE_TYPE_538 + COLLISION_DATA_71, // TILE_TYPE_539 + COLLISION_DATA_15, // TILE_TYPE_540 + COLLISION_DATA_15, // TILE_TYPE_541 + COLLISION_DATA_15, // TILE_TYPE_542 + COLLISION_DATA_1, // TILE_TYPE_543 + COLLISION_DATA_3, // TILE_TYPE_544 + COLLISION_DATA_2, // TILE_TYPE_545 + COLLISION_DATA_15, // TILE_TYPE_546 + COLLISION_DATA_15, // TILE_TYPE_547 + COLLISION_DATA_5, // TILE_TYPE_548 + COLLISION_DATA_15, // TILE_TYPE_549 + COLLISION_DATA_10, // TILE_TYPE_550 + COLLISION_DATA_15, // TILE_TYPE_551 + COLLISION_DATA_15, // TILE_TYPE_552 + COLLISION_DATA_4, // TILE_TYPE_553 + COLLISION_DATA_0, // TILE_TYPE_554 + COLLISION_DATA_8, // TILE_TYPE_555 + COLLISION_DATA_15, // TILE_TYPE_556 + COLLISION_DATA_12, // TILE_TYPE_557 + COLLISION_DATA_12, // TILE_TYPE_558 + COLLISION_DATA_0, // TILE_TYPE_559 + COLLISION_DATA_12, // TILE_TYPE_560 + COLLISION_DATA_12, // TILE_TYPE_561 + COLLISION_DATA_48, // TILE_TYPE_562 + COLLISION_DATA_48, // TILE_TYPE_563 + COLLISION_DATA_48, // TILE_TYPE_564 + COLLISION_DATA_48, // TILE_TYPE_565 + COLLISION_DATA_48, // TILE_TYPE_566 + COLLISION_DATA_48, // TILE_TYPE_567 + COLLISION_DATA_48, // TILE_TYPE_568 + COLLISION_DATA_48, // TILE_TYPE_569 + COLLISION_DATA_48, // TILE_TYPE_570 + COLLISION_DATA_48, // TILE_TYPE_571 + COLLISION_DATA_48, // TILE_TYPE_572 + COLLISION_DATA_48, // TILE_TYPE_573 + COLLISION_DATA_48, // TILE_TYPE_574 + COLLISION_DATA_48, // TILE_TYPE_575 + COLLISION_DATA_48, // TILE_TYPE_576 + COLLISION_DATA_48, // TILE_TYPE_577 + COLLISION_DATA_48, // TILE_TYPE_578 + COLLISION_DATA_48, // TILE_TYPE_579 + COLLISION_DATA_48, // TILE_TYPE_580 + COLLISION_DATA_48, // TILE_TYPE_581 + COLLISION_DATA_48, // TILE_TYPE_582 + COLLISION_DATA_48, // TILE_TYPE_583 + COLLISION_DATA_48, // TILE_TYPE_584 + COLLISION_DATA_48, // TILE_TYPE_585 + COLLISION_DATA_48, // TILE_TYPE_586 + COLLISION_DATA_48, // TILE_TYPE_587 + COLLISION_DATA_48, // TILE_TYPE_588 + COLLISION_DATA_48, // TILE_TYPE_589 + COLLISION_DATA_16, // TILE_TYPE_590 + COLLISION_DATA_15, // TILE_TYPE_591 + COLLISION_DATA_17, // TILE_TYPE_592 + COLLISION_DATA_15, // TILE_TYPE_593 + COLLISION_DATA_15, // TILE_TYPE_594 + COLLISION_DATA_15, // TILE_TYPE_595 + COLLISION_DATA_15, // TILE_TYPE_596 + COLLISION_DATA_15, // TILE_TYPE_597 + COLLISION_DATA_15, // TILE_TYPE_598 + COLLISION_DATA_0, // TILE_TYPE_599 + COLLISION_DATA_0, // TILE_TYPE_600 + COLLISION_DATA_0, // TILE_TYPE_601 + COLLISION_DATA_0, // TILE_TYPE_602 + COLLISION_DATA_0, // TILE_TYPE_603 + COLLISION_DATA_0, // TILE_TYPE_604 + COLLISION_DATA_0, // TILE_TYPE_605 + COLLISION_DATA_0, // TILE_TYPE_606 + COLLISION_DATA_0, // TILE_TYPE_607 + COLLISION_DATA_5, // TILE_TYPE_608 + COLLISION_DATA_15, // TILE_TYPE_609 + COLLISION_DATA_0, // TILE_TYPE_610 + COLLISION_DATA_0, // TILE_TYPE_611 + COLLISION_DATA_5, // TILE_TYPE_612 + COLLISION_DATA_15, // TILE_TYPE_613 + COLLISION_DATA_15, // TILE_TYPE_614 + COLLISION_DATA_15, // TILE_TYPE_615 + COLLISION_DATA_15, // TILE_TYPE_616 + COLLISION_DATA_15, // TILE_TYPE_617 + COLLISION_DATA_15, // TILE_TYPE_618 + COLLISION_DATA_15, // TILE_TYPE_619 + COLLISION_DATA_15, // TILE_TYPE_620 + COLLISION_DATA_39, // TILE_TYPE_621 + COLLISION_DATA_15, // TILE_TYPE_622 + COLLISION_DATA_15, // TILE_TYPE_623 + COLLISION_DATA_39, // TILE_TYPE_624 + COLLISION_DATA_255, // TILE_TYPE_625 + COLLISION_DATA_15, // TILE_TYPE_626 + COLLISION_DATA_15, // TILE_TYPE_627 + COLLISION_DATA_15, // TILE_TYPE_628 + COLLISION_DATA_15, // TILE_TYPE_629 + COLLISION_DATA_15, // TILE_TYPE_630 + COLLISION_DATA_15, // TILE_TYPE_631 + COLLISION_DATA_15, // TILE_TYPE_632 + COLLISION_DATA_15, // TILE_TYPE_633 + COLLISION_DATA_15, // TILE_TYPE_634 + COLLISION_DATA_15, // TILE_TYPE_635 + COLLISION_DATA_15, // TILE_TYPE_636 + COLLISION_DATA_39, // TILE_TYPE_637 + COLLISION_DATA_15, // TILE_TYPE_638 + COLLISION_DATA_15, // TILE_TYPE_639 + COLLISION_DATA_39, // TILE_TYPE_640 + COLLISION_DATA_255, // TILE_TYPE_641 + COLLISION_DATA_15, // TILE_TYPE_642 + COLLISION_DATA_15, // TILE_TYPE_643 + COLLISION_DATA_15, // TILE_TYPE_644 + COLLISION_DATA_15, // TILE_TYPE_645 + COLLISION_DATA_255, // TILE_TYPE_646 + COLLISION_DATA_255, // TILE_TYPE_647 + COLLISION_DATA_255, // TILE_TYPE_648 + COLLISION_DATA_255, // TILE_TYPE_649 + COLLISION_DATA_255, // TILE_TYPE_650 + COLLISION_DATA_255, // TILE_TYPE_651 + COLLISION_DATA_15, // TILE_TYPE_652 + COLLISION_DATA_39, // TILE_TYPE_653 + COLLISION_DATA_15, // TILE_TYPE_654 + COLLISION_DATA_15, // TILE_TYPE_655 + COLLISION_DATA_255, // TILE_TYPE_656 + COLLISION_DATA_39, // TILE_TYPE_657 + COLLISION_DATA_15, // TILE_TYPE_658 + COLLISION_DATA_15, // TILE_TYPE_659 + COLLISION_DATA_15, // TILE_TYPE_660 + COLLISION_DATA_15, // TILE_TYPE_661 + COLLISION_DATA_15, // TILE_TYPE_662 + COLLISION_DATA_15, // TILE_TYPE_663 + COLLISION_DATA_15, // TILE_TYPE_664 + COLLISION_DATA_15, // TILE_TYPE_665 + COLLISION_DATA_15, // TILE_TYPE_666 + COLLISION_DATA_15, // TILE_TYPE_667 + COLLISION_DATA_15, // TILE_TYPE_668 + COLLISION_DATA_15, // TILE_TYPE_669 + COLLISION_DATA_15, // TILE_TYPE_670 + COLLISION_DATA_15, // TILE_TYPE_671 + COLLISION_DATA_15, // TILE_TYPE_672 + COLLISION_DATA_15, // TILE_TYPE_673 + COLLISION_DATA_15, // TILE_TYPE_674 + COLLISION_DATA_15, // TILE_TYPE_675 + COLLISION_DATA_15, // TILE_TYPE_676 + COLLISION_DATA_15, // TILE_TYPE_677 + COLLISION_DATA_15, // TILE_TYPE_678 + COLLISION_DATA_15, // TILE_TYPE_679 + COLLISION_DATA_15, // TILE_TYPE_680 + COLLISION_DATA_15, // TILE_TYPE_681 + COLLISION_DATA_15, // TILE_TYPE_682 + COLLISION_DATA_15, // TILE_TYPE_683 + COLLISION_DATA_15, // TILE_TYPE_684 + COLLISION_DATA_15, // TILE_TYPE_685 + COLLISION_DATA_15, // TILE_TYPE_686 + COLLISION_DATA_15, // TILE_TYPE_687 + COLLISION_DATA_15, // TILE_TYPE_688 + COLLISION_DATA_15, // TILE_TYPE_689 + COLLISION_DATA_15, // TILE_TYPE_690 + COLLISION_DATA_15, // TILE_TYPE_691 + COLLISION_DATA_15, // TILE_TYPE_692 + COLLISION_DATA_15, // TILE_TYPE_693 + COLLISION_DATA_0, // TILE_TYPE_694 + COLLISION_DATA_0, // TILE_TYPE_695 + COLLISION_DATA_0, // TILE_TYPE_696 + COLLISION_DATA_0, // TILE_TYPE_697 + COLLISION_DATA_0, // TILE_TYPE_698 + COLLISION_DATA_0, // TILE_TYPE_699 + COLLISION_DATA_0, // TILE_TYPE_700 + COLLISION_DATA_0, // TILE_TYPE_701 + COLLISION_DATA_0, // TILE_TYPE_702 + COLLISION_DATA_0, // TILE_TYPE_703 + COLLISION_DATA_0, // TILE_TYPE_704 + COLLISION_DATA_0, // TILE_TYPE_705 + COLLISION_DATA_0, // TILE_TYPE_706 + COLLISION_DATA_0, // TILE_TYPE_707 + COLLISION_DATA_0, // TILE_TYPE_708 + COLLISION_DATA_0, // TILE_TYPE_709 + COLLISION_DATA_0, // TILE_TYPE_710 + COLLISION_DATA_0, // TILE_TYPE_711 + COLLISION_DATA_0, // TILE_TYPE_712 + COLLISION_DATA_0, // TILE_TYPE_713 + COLLISION_DATA_0, // TILE_TYPE_714 + COLLISION_DATA_0, // TILE_TYPE_715 + COLLISION_DATA_0, // TILE_TYPE_716 + COLLISION_DATA_0, // TILE_TYPE_717 + COLLISION_DATA_0, // TILE_TYPE_718 + COLLISION_DATA_0, // TILE_TYPE_719 + COLLISION_DATA_0, // TILE_TYPE_720 + COLLISION_DATA_0, // TILE_TYPE_721 + COLLISION_DATA_0, // TILE_TYPE_722 + COLLISION_DATA_0, // TILE_TYPE_723 + COLLISION_DATA_0, // TILE_TYPE_724 + COLLISION_DATA_0, // TILE_TYPE_725 + COLLISION_DATA_0, // TILE_TYPE_726 + COLLISION_DATA_0, // TILE_TYPE_727 + COLLISION_DATA_0, // TILE_TYPE_728 + COLLISION_DATA_0, // TILE_TYPE_729 + COLLISION_DATA_0, // TILE_TYPE_730 + COLLISION_DATA_0, // TILE_TYPE_731 + COLLISION_DATA_0, // TILE_TYPE_732 + COLLISION_DATA_0, // TILE_TYPE_733 + COLLISION_DATA_0, // TILE_TYPE_734 + COLLISION_DATA_0, // TILE_TYPE_735 + COLLISION_DATA_0, // TILE_TYPE_736 + COLLISION_DATA_0, // TILE_TYPE_737 + COLLISION_DATA_0, // TILE_TYPE_738 + COLLISION_DATA_0, // TILE_TYPE_739 + COLLISION_DATA_0, // TILE_TYPE_740 + COLLISION_DATA_0, // TILE_TYPE_741 + COLLISION_DATA_0, // TILE_TYPE_742 + COLLISION_DATA_0, // TILE_TYPE_743 + COLLISION_DATA_0, // TILE_TYPE_744 + COLLISION_DATA_0, // TILE_TYPE_745 + COLLISION_DATA_0, // TILE_TYPE_746 + COLLISION_DATA_0, // TILE_TYPE_747 + COLLISION_DATA_0, // TILE_TYPE_748 + COLLISION_DATA_0, // TILE_TYPE_749 + COLLISION_DATA_0, // TILE_TYPE_750 + COLLISION_DATA_0, // TILE_TYPE_751 + COLLISION_DATA_0, // TILE_TYPE_752 + COLLISION_DATA_0, // TILE_TYPE_753 + COLLISION_DATA_3, // TILE_TYPE_754 + COLLISION_DATA_0, // TILE_TYPE_755 + COLLISION_DATA_0, // TILE_TYPE_756 + COLLISION_DATA_0, // TILE_TYPE_757 + COLLISION_DATA_0, // TILE_TYPE_758 + COLLISION_DATA_0, // TILE_TYPE_759 + COLLISION_DATA_0, // TILE_TYPE_760 + COLLISION_DATA_0, // TILE_TYPE_761 + COLLISION_DATA_5, // TILE_TYPE_762 + COLLISION_DATA_0, // TILE_TYPE_763 + COLLISION_DATA_10, // TILE_TYPE_764 + COLLISION_DATA_4, // TILE_TYPE_765 + COLLISION_DATA_12, // TILE_TYPE_766 + COLLISION_DATA_8, // TILE_TYPE_767 + COLLISION_DATA_70, // TILE_TYPE_768 + COLLISION_DATA_75, // TILE_TYPE_769 + COLLISION_DATA_74, // TILE_TYPE_770 + COLLISION_DATA_72, // TILE_TYPE_771 + COLLISION_DATA_71, // TILE_TYPE_772 + COLLISION_DATA_96, // TILE_TYPE_773 + COLLISION_DATA_98, // TILE_TYPE_774 + COLLISION_DATA_97, // TILE_TYPE_775 + COLLISION_DATA_99, // TILE_TYPE_776 + COLLISION_DATA_100, // TILE_TYPE_777 + COLLISION_DATA_102, // TILE_TYPE_778 + COLLISION_DATA_15, // TILE_TYPE_779 + COLLISION_DATA_80, // TILE_TYPE_780 + COLLISION_DATA_48, // TILE_TYPE_781 + COLLISION_DATA_48, // TILE_TYPE_782 + COLLISION_DATA_255, // TILE_TYPE_783 + COLLISION_DATA_0, // TILE_TYPE_784 + COLLISION_DATA_255, // TILE_TYPE_785 + COLLISION_DATA_0, // TILE_TYPE_786 + COLLISION_DATA_0, // TILE_TYPE_787 + COLLISION_DATA_0, // TILE_TYPE_788 + COLLISION_DATA_0, // TILE_TYPE_789 + COLLISION_DATA_255, // TILE_TYPE_790 + COLLISION_DATA_0, // TILE_TYPE_791 + COLLISION_DATA_0, // TILE_TYPE_792 + COLLISION_DATA_37, // TILE_TYPE_793 + COLLISION_DATA_15, // TILE_TYPE_794 + COLLISION_DATA_255, // TILE_TYPE_795 + COLLISION_DATA_255, // TILE_TYPE_796 + COLLISION_DATA_255, // TILE_TYPE_797 + COLLISION_DATA_255, // TILE_TYPE_798 + COLLISION_DATA_255, // TILE_TYPE_799 + COLLISION_DATA_255, // TILE_TYPE_800 + COLLISION_DATA_0, // TILE_TYPE_801 + COLLISION_DATA_0, // TILE_TYPE_802 + COLLISION_DATA_33, // TILE_TYPE_803 + COLLISION_DATA_33, // TILE_TYPE_804 + COLLISION_DATA_33, // TILE_TYPE_805 + COLLISION_DATA_33, // TILE_TYPE_806 + COLLISION_DATA_33, // TILE_TYPE_807 + COLLISION_DATA_33, // TILE_TYPE_808 + COLLISION_DATA_33, // TILE_TYPE_809 + COLLISION_DATA_33, // TILE_TYPE_810 + COLLISION_DATA_33, // TILE_TYPE_811 + COLLISION_DATA_33, // TILE_TYPE_812 + COLLISION_DATA_33, // TILE_TYPE_813 + COLLISION_DATA_33, // TILE_TYPE_814 + COLLISION_DATA_33, // TILE_TYPE_815 + COLLISION_DATA_33, // TILE_TYPE_816 + COLLISION_DATA_33, // TILE_TYPE_817 + COLLISION_DATA_33, // TILE_TYPE_818 + COLLISION_DATA_33, // TILE_TYPE_819 + COLLISION_DATA_33, // TILE_TYPE_820 + COLLISION_DATA_33, // TILE_TYPE_821 + COLLISION_DATA_33, // TILE_TYPE_822 + COLLISION_DATA_33, // TILE_TYPE_823 + COLLISION_DATA_33, // TILE_TYPE_824 + COLLISION_DATA_33, // TILE_TYPE_825 + COLLISION_DATA_33, // TILE_TYPE_826 + COLLISION_DATA_33, // TILE_TYPE_827 + COLLISION_DATA_33, // TILE_TYPE_828 + COLLISION_DATA_33, // TILE_TYPE_829 + COLLISION_DATA_33, // TILE_TYPE_830 + COLLISION_DATA_33, // TILE_TYPE_831 + COLLISION_DATA_33, // TILE_TYPE_832 + COLLISION_DATA_0, // TILE_TYPE_833 + COLLISION_DATA_12, // TILE_TYPE_834 + COLLISION_DATA_0, // TILE_TYPE_835 + COLLISION_DATA_0, // TILE_TYPE_836 + COLLISION_DATA_0, // TILE_TYPE_837 + COLLISION_DATA_0, // TILE_TYPE_838 + COLLISION_DATA_0, // TILE_TYPE_839 + COLLISION_DATA_0, // TILE_TYPE_840 + COLLISION_DATA_0, // TILE_TYPE_841 + COLLISION_DATA_0, // TILE_TYPE_842 + COLLISION_DATA_0, // TILE_TYPE_843 + COLLISION_DATA_0, // TILE_TYPE_844 + COLLISION_DATA_15, // TILE_TYPE_845 + COLLISION_DATA_255, // TILE_TYPE_846 + COLLISION_DATA_255, // TILE_TYPE_847 + COLLISION_DATA_255, // TILE_TYPE_848 + COLLISION_DATA_255, // TILE_TYPE_849 + COLLISION_DATA_255, // TILE_TYPE_850 + COLLISION_DATA_40, // TILE_TYPE_851 + COLLISION_DATA_255, // TILE_TYPE_852 + COLLISION_DATA_40, // TILE_TYPE_853 + COLLISION_DATA_40, // TILE_TYPE_854 + COLLISION_DATA_40, // TILE_TYPE_855 + COLLISION_DATA_40, // TILE_TYPE_856 + COLLISION_DATA_40, // TILE_TYPE_857 + COLLISION_DATA_40, // TILE_TYPE_858 + COLLISION_DATA_40, // TILE_TYPE_859 + COLLISION_DATA_40, // TILE_TYPE_860 + COLLISION_DATA_40, // TILE_TYPE_861 + COLLISION_DATA_40, // TILE_TYPE_862 + COLLISION_DATA_40, // TILE_TYPE_863 + COLLISION_DATA_15, // TILE_TYPE_864 + COLLISION_DATA_15, // TILE_TYPE_865 + COLLISION_DATA_15, // TILE_TYPE_866 + COLLISION_DATA_15, // TILE_TYPE_867 + COLLISION_DATA_15, // TILE_TYPE_868 + COLLISION_DATA_15, // TILE_TYPE_869 + COLLISION_DATA_15, // TILE_TYPE_870 + COLLISION_DATA_15, // TILE_TYPE_871 + COLLISION_DATA_15, // TILE_TYPE_872 + COLLISION_DATA_15, // TILE_TYPE_873 + COLLISION_DATA_15, // TILE_TYPE_874 + COLLISION_DATA_15, // TILE_TYPE_875 + COLLISION_DATA_15, // TILE_TYPE_876 + COLLISION_DATA_15, // TILE_TYPE_877 + COLLISION_DATA_15, // TILE_TYPE_878 + COLLISION_DATA_15, // TILE_TYPE_879 + COLLISION_DATA_15, // TILE_TYPE_880 + COLLISION_DATA_15, // TILE_TYPE_881 + COLLISION_DATA_15, // TILE_TYPE_882 + COLLISION_DATA_15, // TILE_TYPE_883 + COLLISION_DATA_15, // TILE_TYPE_884 + COLLISION_DATA_15, // TILE_TYPE_885 + COLLISION_DATA_15, // TILE_TYPE_886 + COLLISION_DATA_15, // TILE_TYPE_887 + COLLISION_DATA_15, // TILE_TYPE_888 + COLLISION_DATA_15, // TILE_TYPE_889 + COLLISION_DATA_15, // TILE_TYPE_890 + COLLISION_DATA_15, // TILE_TYPE_891 + COLLISION_DATA_15, // TILE_TYPE_892 + COLLISION_DATA_15, // TILE_TYPE_893 + COLLISION_DATA_15, // TILE_TYPE_894 + COLLISION_DATA_15, // TILE_TYPE_895 + COLLISION_DATA_15, // TILE_TYPE_896 + COLLISION_DATA_15, // TILE_TYPE_897 + COLLISION_DATA_15, // TILE_TYPE_898 + COLLISION_DATA_15, // TILE_TYPE_899 + COLLISION_DATA_15, // TILE_TYPE_900 + COLLISION_DATA_15, // TILE_TYPE_901 + COLLISION_DATA_15, // TILE_TYPE_902 + COLLISION_DATA_15, // TILE_TYPE_903 + COLLISION_DATA_15, // TILE_TYPE_904 + COLLISION_DATA_15, // TILE_TYPE_905 + COLLISION_DATA_15, // TILE_TYPE_906 + COLLISION_DATA_15, // TILE_TYPE_907 + COLLISION_DATA_15, // TILE_TYPE_908 + COLLISION_DATA_15, // TILE_TYPE_909 + COLLISION_DATA_15, // TILE_TYPE_910 + COLLISION_DATA_15, // TILE_TYPE_911 + COLLISION_DATA_15, // TILE_TYPE_912 + COLLISION_DATA_15, // TILE_TYPE_913 + COLLISION_DATA_15, // TILE_TYPE_914 + COLLISION_DATA_15, // TILE_TYPE_915 + COLLISION_DATA_15, // TILE_TYPE_916 + COLLISION_DATA_21, // TILE_TYPE_917 + COLLISION_DATA_20, // TILE_TYPE_918 + COLLISION_DATA_20, // TILE_TYPE_919 + COLLISION_DATA_15, // TILE_TYPE_920 + COLLISION_DATA_15, // TILE_TYPE_921 + COLLISION_DATA_15, // TILE_TYPE_922 + COLLISION_DATA_15, // TILE_TYPE_923 + COLLISION_DATA_15, // TILE_TYPE_924 + COLLISION_DATA_15, // TILE_TYPE_925 + COLLISION_DATA_15, // TILE_TYPE_926 + COLLISION_DATA_15, // TILE_TYPE_927 + COLLISION_DATA_255, // TILE_TYPE_928 + COLLISION_DATA_1, // TILE_TYPE_929 + COLLISION_DATA_1, // TILE_TYPE_930 + COLLISION_DATA_1, // TILE_TYPE_931 + COLLISION_DATA_255, // TILE_TYPE_932 + COLLISION_DATA_255, // TILE_TYPE_933 + COLLISION_DATA_255, // TILE_TYPE_934 + COLLISION_DATA_255, // TILE_TYPE_935 + COLLISION_DATA_24, // TILE_TYPE_936 + COLLISION_DATA_24, // TILE_TYPE_937 + COLLISION_DATA_24, // TILE_TYPE_938 + COLLISION_DATA_24, // TILE_TYPE_939 + COLLISION_DATA_38, // TILE_TYPE_940 + COLLISION_DATA_15, // TILE_TYPE_941 + COLLISION_DATA_0, // TILE_TYPE_942 + COLLISION_DATA_28, // TILE_TYPE_943 + COLLISION_DATA_26, // TILE_TYPE_944 + COLLISION_DATA_27, // TILE_TYPE_945 + COLLISION_DATA_25, // TILE_TYPE_946 + COLLISION_DATA_255, // TILE_TYPE_947 + COLLISION_DATA_0, // TILE_TYPE_948 + COLLISION_DATA_15, // TILE_TYPE_949 + COLLISION_DATA_21, // TILE_TYPE_950 + COLLISION_DATA_15, // TILE_TYPE_951 + COLLISION_DATA_15, // TILE_TYPE_952 + COLLISION_DATA_15, // TILE_TYPE_953 + COLLISION_DATA_19, // TILE_TYPE_954 + COLLISION_DATA_18, // TILE_TYPE_955 + COLLISION_DATA_15, // TILE_TYPE_956 + COLLISION_DATA_15, // TILE_TYPE_957 + COLLISION_DATA_15, // TILE_TYPE_958 + COLLISION_DATA_18, // TILE_TYPE_959 + COLLISION_DATA_19, // TILE_TYPE_960 + COLLISION_DATA_35, // TILE_TYPE_961 + COLLISION_DATA_39, // TILE_TYPE_962 + COLLISION_DATA_0, // TILE_TYPE_963 + COLLISION_DATA_0, // TILE_TYPE_964 + COLLISION_DATA_2, // TILE_TYPE_965 + COLLISION_DATA_14, // TILE_TYPE_966 + COLLISION_DATA_13, // TILE_TYPE_967 + COLLISION_DATA_12, // TILE_TYPE_968 + COLLISION_DATA_3, // TILE_TYPE_969 + COLLISION_DATA_9, // TILE_TYPE_970 + COLLISION_DATA_6, // TILE_TYPE_971 + COLLISION_DATA_4, // TILE_TYPE_972 + COLLISION_DATA_8, // TILE_TYPE_973 + COLLISION_DATA_11, // TILE_TYPE_974 + COLLISION_DATA_7, // TILE_TYPE_975 + COLLISION_DATA_10, // TILE_TYPE_976 + COLLISION_DATA_5, // TILE_TYPE_977 + COLLISION_DATA_3, // TILE_TYPE_978 + COLLISION_DATA_107, // TILE_TYPE_979 + COLLISION_DATA_103, // TILE_TYPE_980 + COLLISION_DATA_106, // TILE_TYPE_981 + COLLISION_DATA_15, // TILE_TYPE_982 + COLLISION_DATA_12, // TILE_TYPE_983 + COLLISION_DATA_20, // TILE_TYPE_984 + COLLISION_DATA_21, // TILE_TYPE_985 + COLLISION_DATA_15, // TILE_TYPE_986 + COLLISION_DATA_0, // TILE_TYPE_987 + COLLISION_DATA_15, // TILE_TYPE_988 + COLLISION_DATA_40, // TILE_TYPE_989 + COLLISION_DATA_95, // TILE_TYPE_990 + COLLISION_DATA_15, // TILE_TYPE_991 + COLLISION_DATA_5, // TILE_TYPE_992 + COLLISION_DATA_10, // TILE_TYPE_993 + COLLISION_DATA_16, // TILE_TYPE_994 + COLLISION_DATA_17, // TILE_TYPE_995 + COLLISION_DATA_18, // TILE_TYPE_996 + COLLISION_DATA_19, // TILE_TYPE_997 + COLLISION_DATA_71, // TILE_TYPE_998 + COLLISION_DATA_12, // TILE_TYPE_999 + COLLISION_DATA_13, // TILE_TYPE_1000 + COLLISION_DATA_14, // TILE_TYPE_1001 + COLLISION_DATA_71, // TILE_TYPE_1002 + COLLISION_DATA_20, // TILE_TYPE_1003 + COLLISION_DATA_92, // TILE_TYPE_1004 + COLLISION_DATA_13, // TILE_TYPE_1005 + COLLISION_DATA_5, // TILE_TYPE_1006 + COLLISION_DATA_4, // TILE_TYPE_1007 + COLLISION_DATA_8, // TILE_TYPE_1008 + COLLISION_DATA_1, // TILE_TYPE_1009 + COLLISION_DATA_2, // TILE_TYPE_1010 + COLLISION_DATA_10, // TILE_TYPE_1011 + COLLISION_DATA_5, // TILE_TYPE_1012 + COLLISION_DATA_10, // TILE_TYPE_1013 + COLLISION_DATA_15, // TILE_TYPE_1014 + COLLISION_DATA_4, // TILE_TYPE_1015 + COLLISION_DATA_8, // TILE_TYPE_1016 + COLLISION_DATA_15, // TILE_TYPE_1017 + COLLISION_DATA_3, // TILE_TYPE_1018 + COLLISION_DATA_2, // TILE_TYPE_1019 + COLLISION_DATA_5, // TILE_TYPE_1020 + COLLISION_DATA_15, // TILE_TYPE_1021 + COLLISION_DATA_10, // TILE_TYPE_1022 + COLLISION_DATA_4, // TILE_TYPE_1023 + COLLISION_DATA_12, // TILE_TYPE_1024 + COLLISION_DATA_8, // TILE_TYPE_1025 + COLLISION_DATA_3, // TILE_TYPE_1026 + COLLISION_DATA_2, // TILE_TYPE_1027 + COLLISION_DATA_5, // TILE_TYPE_1028 + COLLISION_DATA_15, // TILE_TYPE_1029 + COLLISION_DATA_10, // TILE_TYPE_1030 + COLLISION_DATA_4, // TILE_TYPE_1031 + COLLISION_DATA_12, // TILE_TYPE_1032 + COLLISION_DATA_8, // TILE_TYPE_1033 + COLLISION_DATA_92, // TILE_TYPE_1034 + COLLISION_DATA_84, // TILE_TYPE_1035 + COLLISION_DATA_81, // TILE_TYPE_1036 + COLLISION_DATA_83, // TILE_TYPE_1037 + COLLISION_DATA_81, // TILE_TYPE_1038 + COLLISION_DATA_82, // TILE_TYPE_1039 + COLLISION_DATA_83, // TILE_TYPE_1040 + COLLISION_DATA_90, // TILE_TYPE_1041 + COLLISION_DATA_87, // TILE_TYPE_1042 + COLLISION_DATA_91, // TILE_TYPE_1043 + COLLISION_DATA_95, // TILE_TYPE_1044 + COLLISION_DATA_84, // TILE_TYPE_1045 + COLLISION_DATA_88, // TILE_TYPE_1046 + COLLISION_DATA_92, // TILE_TYPE_1047 + COLLISION_DATA_85, // TILE_TYPE_1048 + COLLISION_DATA_93, // TILE_TYPE_1049 + COLLISION_DATA_94, // TILE_TYPE_1050 + COLLISION_DATA_39, // TILE_TYPE_1051 + COLLISION_DATA_88, // TILE_TYPE_1052 + COLLISION_DATA_85, // TILE_TYPE_1053 + COLLISION_DATA_10, // TILE_TYPE_1054 + COLLISION_DATA_83, // TILE_TYPE_1055 + COLLISION_DATA_90, // TILE_TYPE_1056 + COLLISION_DATA_81, // TILE_TYPE_1057 + COLLISION_DATA_15, // TILE_TYPE_1058 + COLLISION_DATA_89, // TILE_TYPE_1059 + COLLISION_DATA_0, // TILE_TYPE_1060 + COLLISION_DATA_0, // TILE_TYPE_1061 + COLLISION_DATA_69, // TILE_TYPE_1062 + COLLISION_DATA_71, // TILE_TYPE_1063 + COLLISION_DATA_67, // TILE_TYPE_1064 + COLLISION_DATA_70, // TILE_TYPE_1065 + COLLISION_DATA_0, // TILE_TYPE_1066 + COLLISION_DATA_3, // TILE_TYPE_1067 + COLLISION_DATA_15, // TILE_TYPE_1068 + COLLISION_DATA_1, // TILE_TYPE_1069 + COLLISION_DATA_2, // TILE_TYPE_1070 + COLLISION_DATA_3, // TILE_TYPE_1071 + COLLISION_DATA_10, // TILE_TYPE_1072 + COLLISION_DATA_12, // TILE_TYPE_1073 + COLLISION_DATA_5, // TILE_TYPE_1074 + COLLISION_DATA_4, // TILE_TYPE_1075 + COLLISION_DATA_8, // TILE_TYPE_1076 + COLLISION_DATA_4, // TILE_TYPE_1077 + COLLISION_DATA_1, // TILE_TYPE_1078 + COLLISION_DATA_3, // TILE_TYPE_1079 + COLLISION_DATA_15, // TILE_TYPE_1080 + COLLISION_DATA_95, // TILE_TYPE_1081 + COLLISION_DATA_97, // TILE_TYPE_1082 + COLLISION_DATA_0, // TILE_TYPE_1083 + COLLISION_DATA_3, // TILE_TYPE_1084 + COLLISION_DATA_28, // TILE_TYPE_1085 + COLLISION_DATA_27, // TILE_TYPE_1086 + COLLISION_DATA_21, // TILE_TYPE_1087 + COLLISION_DATA_69, // TILE_TYPE_1088 + COLLISION_DATA_3, // TILE_TYPE_1089 + COLLISION_DATA_96, // TILE_TYPE_1090 + COLLISION_DATA_12, // TILE_TYPE_1091 + COLLISION_DATA_102, // TILE_TYPE_1092 + COLLISION_DATA_100, // TILE_TYPE_1093 + COLLISION_DATA_101, // TILE_TYPE_1094 + COLLISION_DATA_26, // TILE_TYPE_1095 + COLLISION_DATA_25, // TILE_TYPE_1096 + COLLISION_DATA_18, // TILE_TYPE_1097 + COLLISION_DATA_17, // TILE_TYPE_1098 + COLLISION_DATA_19, // TILE_TYPE_1099 + COLLISION_DATA_16, // TILE_TYPE_1100 + COLLISION_DATA_2, // TILE_TYPE_1101 + COLLISION_DATA_4, // TILE_TYPE_1102 + COLLISION_DATA_8, // TILE_TYPE_1103 + COLLISION_DATA_14, // TILE_TYPE_1104 + COLLISION_DATA_15, // TILE_TYPE_1105 + COLLISION_DATA_11, // TILE_TYPE_1106 + COLLISION_DATA_84, // TILE_TYPE_1107 + COLLISION_DATA_69, // TILE_TYPE_1108 + COLLISION_DATA_68, // TILE_TYPE_1109 + COLLISION_DATA_4, // TILE_TYPE_1110 + COLLISION_DATA_13, // TILE_TYPE_1111 + COLLISION_DATA_0, // TILE_TYPE_1112 + COLLISION_DATA_0, // TILE_TYPE_1113 + COLLISION_DATA_12, // TILE_TYPE_1114 + COLLISION_DATA_12, // TILE_TYPE_1115 + COLLISION_DATA_15, // TILE_TYPE_1116 + COLLISION_DATA_15, // TILE_TYPE_1117 + COLLISION_DATA_10, // TILE_TYPE_1118 + COLLISION_DATA_5, // TILE_TYPE_1119 + COLLISION_DATA_10, // TILE_TYPE_1120 + COLLISION_DATA_5, // TILE_TYPE_1121 + COLLISION_DATA_12, // TILE_TYPE_1122 + COLLISION_DATA_97, // TILE_TYPE_1123 + COLLISION_DATA_10, // TILE_TYPE_1124 + COLLISION_DATA_5, // TILE_TYPE_1125 + COLLISION_DATA_11, // TILE_TYPE_1126 + COLLISION_DATA_7, // TILE_TYPE_1127 + COLLISION_DATA_67, // TILE_TYPE_1128 + COLLISION_DATA_69, // TILE_TYPE_1129 + COLLISION_DATA_1, // TILE_TYPE_1130 + COLLISION_DATA_2, // TILE_TYPE_1131 + COLLISION_DATA_4, // TILE_TYPE_1132 + COLLISION_DATA_8, // TILE_TYPE_1133 + COLLISION_DATA_13, // TILE_TYPE_1134 + COLLISION_DATA_3, // TILE_TYPE_1135 + COLLISION_DATA_3, // TILE_TYPE_1136 + COLLISION_DATA_7, // TILE_TYPE_1137 + COLLISION_DATA_15, // TILE_TYPE_1138 + COLLISION_DATA_3, // TILE_TYPE_1139 + COLLISION_DATA_0, // TILE_TYPE_1140 + COLLISION_DATA_2, // TILE_TYPE_1141 + COLLISION_DATA_84, // TILE_TYPE_1142 + COLLISION_DATA_92, // TILE_TYPE_1143 + COLLISION_DATA_88, // TILE_TYPE_1144 + COLLISION_DATA_12, // TILE_TYPE_1145 + COLLISION_DATA_67, // TILE_TYPE_1146 + COLLISION_DATA_0, // TILE_TYPE_1147 + COLLISION_DATA_0, // TILE_TYPE_1148 + COLLISION_DATA_8, // TILE_TYPE_1149 + COLLISION_DATA_1, // TILE_TYPE_1150 + COLLISION_DATA_2, // TILE_TYPE_1151 + COLLISION_DATA_87, // TILE_TYPE_1152 + COLLISION_DATA_95, // TILE_TYPE_1153 + COLLISION_DATA_91, // TILE_TYPE_1154 + COLLISION_DATA_82, // TILE_TYPE_1155 + COLLISION_DATA_14, // TILE_TYPE_1156 + COLLISION_DATA_18, // TILE_TYPE_1157 + COLLISION_DATA_19, // TILE_TYPE_1158 + COLLISION_DATA_10, // TILE_TYPE_1159 + COLLISION_DATA_5, // TILE_TYPE_1160 + COLLISION_DATA_0, // TILE_TYPE_1161 + COLLISION_DATA_10, // TILE_TYPE_1162 + COLLISION_DATA_5, // TILE_TYPE_1163 + COLLISION_DATA_3, // TILE_TYPE_1164 + COLLISION_DATA_63, // TILE_TYPE_1165 + COLLISION_DATA_19, // TILE_TYPE_1166 + COLLISION_DATA_18, // TILE_TYPE_1167 + COLLISION_DATA_47, // TILE_TYPE_1168 + COLLISION_DATA_46, // TILE_TYPE_1169 + COLLISION_DATA_17, // TILE_TYPE_1170 + COLLISION_DATA_16, // TILE_TYPE_1171 + COLLISION_DATA_11, // TILE_TYPE_1172 + COLLISION_DATA_7, // TILE_TYPE_1173 + COLLISION_DATA_15, // TILE_TYPE_1174 + COLLISION_DATA_0, // TILE_TYPE_1175 + COLLISION_DATA_3, // TILE_TYPE_1176 + COLLISION_DATA_15, // TILE_TYPE_1177 + COLLISION_DATA_15, // TILE_TYPE_1178 + COLLISION_DATA_1, // TILE_TYPE_1179 + COLLISION_DATA_8, // TILE_TYPE_1180 + COLLISION_DATA_12, // TILE_TYPE_1181 + COLLISION_DATA_12, // TILE_TYPE_1182 + COLLISION_DATA_15, // TILE_TYPE_1183 + COLLISION_DATA_1, // TILE_TYPE_1184 + COLLISION_DATA_3, // TILE_TYPE_1185 + COLLISION_DATA_2, // TILE_TYPE_1186 + COLLISION_DATA_5, // TILE_TYPE_1187 + COLLISION_DATA_10, // TILE_TYPE_1188 + COLLISION_DATA_4, // TILE_TYPE_1189 + COLLISION_DATA_12, // TILE_TYPE_1190 + COLLISION_DATA_8, // TILE_TYPE_1191 + COLLISION_DATA_9, // TILE_TYPE_1192 + COLLISION_DATA_39, // TILE_TYPE_1193 + COLLISION_DATA_2, // TILE_TYPE_1194 + COLLISION_DATA_14, // TILE_TYPE_1195 + COLLISION_DATA_13, // TILE_TYPE_1196 + COLLISION_DATA_12, // TILE_TYPE_1197 + COLLISION_DATA_3, // TILE_TYPE_1198 + COLLISION_DATA_6, // TILE_TYPE_1199 + COLLISION_DATA_9, // TILE_TYPE_1200 + COLLISION_DATA_4, // TILE_TYPE_1201 + COLLISION_DATA_8, // TILE_TYPE_1202 + COLLISION_DATA_11, // TILE_TYPE_1203 + COLLISION_DATA_7, // TILE_TYPE_1204 + COLLISION_DATA_10, // TILE_TYPE_1205 + COLLISION_DATA_5, // TILE_TYPE_1206 + COLLISION_DATA_34, // TILE_TYPE_1207 + COLLISION_DATA_35, // TILE_TYPE_1208 + COLLISION_DATA_4, // TILE_TYPE_1209 + COLLISION_DATA_12, // TILE_TYPE_1210 + COLLISION_DATA_3, // TILE_TYPE_1211 + COLLISION_DATA_3, // TILE_TYPE_1212 + COLLISION_DATA_1, // TILE_TYPE_1213 + COLLISION_DATA_5, // TILE_TYPE_1214 + COLLISION_DATA_10, // TILE_TYPE_1215 + COLLISION_DATA_4, // TILE_TYPE_1216 + COLLISION_DATA_8, // TILE_TYPE_1217 + COLLISION_DATA_0, // TILE_TYPE_1218 + COLLISION_DATA_107, // TILE_TYPE_1219 + COLLISION_DATA_103, // TILE_TYPE_1220 + COLLISION_DATA_106, // TILE_TYPE_1221 + COLLISION_DATA_18, // TILE_TYPE_1222 + COLLISION_DATA_45, // TILE_TYPE_1223 + COLLISION_DATA_44, // TILE_TYPE_1224 + COLLISION_DATA_0, // TILE_TYPE_1225 + COLLISION_DATA_15, // TILE_TYPE_1226 + COLLISION_DATA_41, // TILE_TYPE_1227 + COLLISION_DATA_40, // TILE_TYPE_1228 + COLLISION_DATA_0, // TILE_TYPE_1229 + COLLISION_DATA_0, // TILE_TYPE_1230 + COLLISION_DATA_0, // TILE_TYPE_1231 + COLLISION_DATA_0, // TILE_TYPE_1232 + COLLISION_DATA_0, // TILE_TYPE_1233 + COLLISION_DATA_0, // TILE_TYPE_1234 + COLLISION_DATA_0, // TILE_TYPE_1235 + COLLISION_DATA_20, // TILE_TYPE_1236 + COLLISION_DATA_33, // TILE_TYPE_1237 + COLLISION_DATA_39, // TILE_TYPE_1238 + COLLISION_DATA_67, // TILE_TYPE_1239 + COLLISION_DATA_4, // TILE_TYPE_1240 + COLLISION_DATA_8, // TILE_TYPE_1241 + COLLISION_DATA_12, // TILE_TYPE_1242 + COLLISION_DATA_3, // TILE_TYPE_1243 + COLLISION_DATA_3, // TILE_TYPE_1244 + COLLISION_DATA_1, // TILE_TYPE_1245 + COLLISION_DATA_2, // TILE_TYPE_1246 + COLLISION_DATA_0, // TILE_TYPE_1247 + COLLISION_DATA_12, // TILE_TYPE_1248 + COLLISION_DATA_3, // TILE_TYPE_1249 + COLLISION_DATA_2, // TILE_TYPE_1250 + COLLISION_DATA_5, // TILE_TYPE_1251 + COLLISION_DATA_10, // TILE_TYPE_1252 + COLLISION_DATA_14, // TILE_TYPE_1253 + COLLISION_DATA_13, // TILE_TYPE_1254 + COLLISION_DATA_4, // TILE_TYPE_1255 + COLLISION_DATA_8, // TILE_TYPE_1256 + COLLISION_DATA_11, // TILE_TYPE_1257 + COLLISION_DATA_7, // TILE_TYPE_1258 + COLLISION_DATA_12, // TILE_TYPE_1259 + COLLISION_DATA_0, // TILE_TYPE_1260 + COLLISION_DATA_0, // TILE_TYPE_1261 + COLLISION_DATA_39, // TILE_TYPE_1262 + COLLISION_DATA_1, // TILE_TYPE_1263 + COLLISION_DATA_2, // TILE_TYPE_1264 + COLLISION_DATA_1, // TILE_TYPE_1265 + COLLISION_DATA_2, // TILE_TYPE_1266 + COLLISION_DATA_4, // TILE_TYPE_1267 + COLLISION_DATA_12, // TILE_TYPE_1268 + COLLISION_DATA_7, // TILE_TYPE_1269 + COLLISION_DATA_11, // TILE_TYPE_1270 + COLLISION_DATA_4, // TILE_TYPE_1271 + COLLISION_DATA_8, // TILE_TYPE_1272 + COLLISION_DATA_16, // TILE_TYPE_1273 + COLLISION_DATA_17, // TILE_TYPE_1274 + COLLISION_DATA_43, // TILE_TYPE_1275 + COLLISION_DATA_43, // TILE_TYPE_1276 + COLLISION_DATA_18, // TILE_TYPE_1277 + COLLISION_DATA_19, // TILE_TYPE_1278 + COLLISION_DATA_10, // TILE_TYPE_1279 + COLLISION_DATA_5, // TILE_TYPE_1280 + COLLISION_DATA_2, // TILE_TYPE_1281 + COLLISION_DATA_1, // TILE_TYPE_1282 + COLLISION_DATA_35, // TILE_TYPE_1283 + COLLISION_DATA_1, // TILE_TYPE_1284 + COLLISION_DATA_3, // TILE_TYPE_1285 + COLLISION_DATA_2, // TILE_TYPE_1286 + COLLISION_DATA_5, // TILE_TYPE_1287 + COLLISION_DATA_10, // TILE_TYPE_1288 + COLLISION_DATA_14, // TILE_TYPE_1289 + COLLISION_DATA_13, // TILE_TYPE_1290 + COLLISION_DATA_11, // TILE_TYPE_1291 + COLLISION_DATA_7, // TILE_TYPE_1292 + COLLISION_DATA_4, // TILE_TYPE_1293 + COLLISION_DATA_8, // TILE_TYPE_1294 + COLLISION_DATA_10, // TILE_TYPE_1295 + COLLISION_DATA_5, // TILE_TYPE_1296 + COLLISION_DATA_10, // TILE_TYPE_1297 + COLLISION_DATA_5, // TILE_TYPE_1298 + COLLISION_DATA_13, // TILE_TYPE_1299 + COLLISION_DATA_14, // TILE_TYPE_1300 + COLLISION_DATA_8, // TILE_TYPE_1301 + COLLISION_DATA_4, // TILE_TYPE_1302 + COLLISION_DATA_7, // TILE_TYPE_1303 + COLLISION_DATA_11, // TILE_TYPE_1304 + COLLISION_DATA_0, // TILE_TYPE_1305 + COLLISION_DATA_9, // TILE_TYPE_1306 + COLLISION_DATA_6, // TILE_TYPE_1307 + COLLISION_DATA_0, // TILE_TYPE_1308 + COLLISION_DATA_15, // TILE_TYPE_1309 + COLLISION_DATA_7, // TILE_TYPE_1310 + COLLISION_DATA_11, // TILE_TYPE_1311 + COLLISION_DATA_3, // TILE_TYPE_1312 + COLLISION_DATA_33, // TILE_TYPE_1313 + COLLISION_DATA_33, // TILE_TYPE_1314 + COLLISION_DATA_33, // TILE_TYPE_1315 + COLLISION_DATA_33, // TILE_TYPE_1316 + COLLISION_DATA_33, // TILE_TYPE_1317 + COLLISION_DATA_33, // TILE_TYPE_1318 + COLLISION_DATA_33, // TILE_TYPE_1319 + COLLISION_DATA_15, // TILE_TYPE_1320 + COLLISION_DATA_5, // TILE_TYPE_1321 + COLLISION_DATA_10, // TILE_TYPE_1322 + COLLISION_DATA_96, // TILE_TYPE_1323 + COLLISION_DATA_0, // TILE_TYPE_1324 + COLLISION_DATA_0, // TILE_TYPE_1325 + COLLISION_DATA_0, // TILE_TYPE_1326 + COLLISION_DATA_0, // TILE_TYPE_1327 + COLLISION_DATA_0, // TILE_TYPE_1328 + COLLISION_DATA_0, // TILE_TYPE_1329 + COLLISION_DATA_0, // TILE_TYPE_1330 + COLLISION_DATA_0, // TILE_TYPE_1331 + COLLISION_DATA_0, // TILE_TYPE_1332 + COLLISION_DATA_0, // TILE_TYPE_1333 + COLLISION_DATA_0, // TILE_TYPE_1334 + COLLISION_DATA_0, // TILE_TYPE_1335 + COLLISION_DATA_0, // TILE_TYPE_1336 + COLLISION_DATA_0, // TILE_TYPE_1337 + COLLISION_DATA_0, // TILE_TYPE_1338 + COLLISION_DATA_0, // TILE_TYPE_1339 + COLLISION_DATA_0, // TILE_TYPE_1340 + COLLISION_DATA_0, // TILE_TYPE_1341 + COLLISION_DATA_0, // TILE_TYPE_1342 + COLLISION_DATA_0, // TILE_TYPE_1343 + COLLISION_DATA_48, // TILE_TYPE_1344 + COLLISION_DATA_0, // TILE_TYPE_1345 + COLLISION_DATA_3, // TILE_TYPE_1346 + COLLISION_DATA_48, // TILE_TYPE_1347 + COLLISION_DATA_48, // TILE_TYPE_1348 + COLLISION_DATA_0, // TILE_TYPE_1349 + COLLISION_DATA_0, // TILE_TYPE_1350 + COLLISION_DATA_0, // TILE_TYPE_1351 + COLLISION_DATA_0, // TILE_TYPE_1352 + COLLISION_DATA_0, // TILE_TYPE_1353 + COLLISION_DATA_0, // TILE_TYPE_1354 + COLLISION_DATA_48, // TILE_TYPE_1355 + COLLISION_DATA_48, // TILE_TYPE_1356 + COLLISION_DATA_33, // TILE_TYPE_1357 + COLLISION_DATA_33, // TILE_TYPE_1358 + COLLISION_DATA_0, // TILE_TYPE_1359 + COLLISION_DATA_15, // TILE_TYPE_1360 + COLLISION_DATA_83, // TILE_TYPE_1361 + COLLISION_DATA_92, // TILE_TYPE_1362 + COLLISION_DATA_85, // TILE_TYPE_1363 + COLLISION_DATA_90, // TILE_TYPE_1364 + COLLISION_DATA_96, // TILE_TYPE_1365 + COLLISION_DATA_97, // TILE_TYPE_1366 + COLLISION_DATA_95, // TILE_TYPE_1367 + COLLISION_DATA_18, // TILE_TYPE_1368 + COLLISION_DATA_19, // TILE_TYPE_1369 + COLLISION_DATA_16, // TILE_TYPE_1370 + COLLISION_DATA_10, // TILE_TYPE_1371 + COLLISION_DATA_10, // TILE_TYPE_1372 + COLLISION_DATA_35, // TILE_TYPE_1373 + COLLISION_DATA_10, // TILE_TYPE_1374 + COLLISION_DATA_5, // TILE_TYPE_1375 + COLLISION_DATA_14, // TILE_TYPE_1376 + COLLISION_DATA_13, // TILE_TYPE_1377 + COLLISION_DATA_11, // TILE_TYPE_1378 + COLLISION_DATA_7, // TILE_TYPE_1379 + COLLISION_DATA_10, // TILE_TYPE_1380 + COLLISION_DATA_5, // TILE_TYPE_1381 + COLLISION_DATA_14, // TILE_TYPE_1382 + COLLISION_DATA_13, // TILE_TYPE_1383 + COLLISION_DATA_11, // TILE_TYPE_1384 + COLLISION_DATA_7, // TILE_TYPE_1385 + COLLISION_DATA_0, // TILE_TYPE_1386 + COLLISION_DATA_0, // TILE_TYPE_1387 + COLLISION_DATA_3, // TILE_TYPE_1388 + COLLISION_DATA_0, // TILE_TYPE_1389 + COLLISION_DATA_39, // TILE_TYPE_1390 + COLLISION_DATA_12, // TILE_TYPE_1391 + COLLISION_DATA_12, // TILE_TYPE_1392 + COLLISION_DATA_33, // TILE_TYPE_1393 + COLLISION_DATA_0, // TILE_TYPE_1394 + COLLISION_DATA_0, // TILE_TYPE_1395 }; diff --git a/src/playerItem/playerItemCellOverwriteSet.c b/src/playerItem/playerItemCellOverwriteSet.c index 13929af4..21c005b7 100644 --- a/src/playerItem/playerItemCellOverwriteSet.c +++ b/src/playerItem/playerItemCellOverwriteSet.c @@ -17,314 +17,314 @@ typedef struct { /*0x6c*/ u16 tileType; } PlayerItemCellOverwriteSetEntity; -// vvv for specialMetaTile -const u8 gMapSpecialMetaTileToVvv[] = { - 0, // SPECIAL_META_TILE_0 - 0, // SPECIAL_META_TILE_1 - 0, // SPECIAL_META_TILE_2 - 0, // SPECIAL_META_TILE_3 - 0, // SPECIAL_META_TILE_4 - 0, // SPECIAL_META_TILE_5 - 0, // SPECIAL_META_TILE_6 - 0, // SPECIAL_META_TILE_7 - 0, // SPECIAL_META_TILE_8 - 0, // SPECIAL_META_TILE_9 - 0, // SPECIAL_META_TILE_10 - 0, // SPECIAL_META_TILE_11 - 0, // SPECIAL_META_TILE_12 - 0, // SPECIAL_META_TILE_13 - 0, // SPECIAL_META_TILE_14 - 0, // SPECIAL_META_TILE_15 - 0, // SPECIAL_META_TILE_16 - 0, // SPECIAL_META_TILE_17 - 0, // SPECIAL_META_TILE_18 - 0, // SPECIAL_META_TILE_19 - VVV_241, // SPECIAL_META_TILE_20 - 0, // SPECIAL_META_TILE_21 - 0, // SPECIAL_META_TILE_22 - VVV_83, // SPECIAL_META_TILE_23 - VVV_242, // SPECIAL_META_TILE_24 - VVV_243, // SPECIAL_META_TILE_25 - 0, // SPECIAL_META_TILE_26 - 0, // SPECIAL_META_TILE_27 - 0, // SPECIAL_META_TILE_28 - 0, // SPECIAL_META_TILE_29 - 0, // SPECIAL_META_TILE_30 - 0, // SPECIAL_META_TILE_31 - VVV_240, // SPECIAL_META_TILE_32 - 0, // SPECIAL_META_TILE_33 - 0, // SPECIAL_META_TILE_34 - 0, // SPECIAL_META_TILE_35 - 0, // SPECIAL_META_TILE_36 - 0, // SPECIAL_META_TILE_37 - 0, // SPECIAL_META_TILE_38 - 0, // SPECIAL_META_TILE_39 - 0, // SPECIAL_META_TILE_40 - 0, // SPECIAL_META_TILE_41 - 0, // SPECIAL_META_TILE_42 - 0, // SPECIAL_META_TILE_43 - 0, // SPECIAL_META_TILE_44 - 0, // SPECIAL_META_TILE_45 - 0, // SPECIAL_META_TILE_46 - 0, // SPECIAL_META_TILE_47 - 0, // SPECIAL_META_TILE_48 - 0, // SPECIAL_META_TILE_49 - 0, // SPECIAL_META_TILE_50 - 0, // SPECIAL_META_TILE_51 - 0, // SPECIAL_META_TILE_52 - 0, // SPECIAL_META_TILE_53 - 0, // SPECIAL_META_TILE_54 - 0, // SPECIAL_META_TILE_55 - 0, // SPECIAL_META_TILE_56 - 0, // SPECIAL_META_TILE_57 - 0, // SPECIAL_META_TILE_58 - 0, // SPECIAL_META_TILE_59 - 0, // SPECIAL_META_TILE_60 - 0, // SPECIAL_META_TILE_61 - 0, // SPECIAL_META_TILE_62 - 0, // SPECIAL_META_TILE_63 - VVV_61, // SPECIAL_META_TILE_64 - VVV_61, // SPECIAL_META_TILE_65 - VVV_61, // SPECIAL_META_TILE_66 - VVV_61, // SPECIAL_META_TILE_67 - VVV_61, // SPECIAL_META_TILE_68 - VVV_61, // SPECIAL_META_TILE_69 - VVV_61, // SPECIAL_META_TILE_70 - VVV_61, // SPECIAL_META_TILE_71 - VVV_61, // SPECIAL_META_TILE_72 - 0, // SPECIAL_META_TILE_73 - 0, // SPECIAL_META_TILE_74 - 0, // SPECIAL_META_TILE_75 - 0, // SPECIAL_META_TILE_76 - 0, // SPECIAL_META_TILE_77 - 0, // SPECIAL_META_TILE_78 - 0, // SPECIAL_META_TILE_79 - 0, // SPECIAL_META_TILE_80 - VVV_58, // SPECIAL_META_TILE_81 - 0, // SPECIAL_META_TILE_82 - 0, // SPECIAL_META_TILE_83 - 0, // SPECIAL_META_TILE_84 - 0, // SPECIAL_META_TILE_85 - 0, // SPECIAL_META_TILE_86 - 0, // SPECIAL_META_TILE_87 - 0, // SPECIAL_META_TILE_88 - 0, // SPECIAL_META_TILE_89 - 0, // SPECIAL_META_TILE_90 - 0, // SPECIAL_META_TILE_91 - 0, // SPECIAL_META_TILE_92 - 0, // SPECIAL_META_TILE_93 - 0, // SPECIAL_META_TILE_94 - 0, // SPECIAL_META_TILE_95 - 0, // SPECIAL_META_TILE_96 - 0, // SPECIAL_META_TILE_97 - 0, // SPECIAL_META_TILE_98 - 0, // SPECIAL_META_TILE_99 - 0, // SPECIAL_META_TILE_100 - 0, // SPECIAL_META_TILE_101 - 0, // SPECIAL_META_TILE_102 - 0, // SPECIAL_META_TILE_103 - 0, // SPECIAL_META_TILE_104 - VVV_40, // SPECIAL_META_TILE_105 - 0, // SPECIAL_META_TILE_106 - 0, // SPECIAL_META_TILE_107 - 0, // SPECIAL_META_TILE_108 - 0, // SPECIAL_META_TILE_109 - 0, // SPECIAL_META_TILE_110 - 0, // SPECIAL_META_TILE_111 - 0, // SPECIAL_META_TILE_112 - 0, // SPECIAL_META_TILE_113 - 0, // SPECIAL_META_TILE_114 - 0, // SPECIAL_META_TILE_115 - 0, // SPECIAL_META_TILE_116 - VVV_18, // SPECIAL_META_TILE_117 - VVV_18, // SPECIAL_META_TILE_118 - VVV_18, // SPECIAL_META_TILE_119 - VVV_18, // SPECIAL_META_TILE_120 - VVV_18, // SPECIAL_META_TILE_121 - VVV_18, // SPECIAL_META_TILE_122 - VVV_18, // SPECIAL_META_TILE_123 - VVV_18, // SPECIAL_META_TILE_124 - 0, // SPECIAL_META_TILE_125 - VVV_116, // SPECIAL_META_TILE_126 - VVV_116, // SPECIAL_META_TILE_127 - VVV_41, // SPECIAL_META_TILE_128 - 0, // SPECIAL_META_TILE_129 - VVV_35, // SPECIAL_META_TILE_130 - VVV_41, // SPECIAL_META_TILE_131 - VVV_41, // SPECIAL_META_TILE_132 - VVV_41, // SPECIAL_META_TILE_133 - VVV_41, // SPECIAL_META_TILE_134 - VVV_41, // SPECIAL_META_TILE_135 - VVV_41, // SPECIAL_META_TILE_136 - VVV_16, // SPECIAL_META_TILE_137 - VVV_16, // SPECIAL_META_TILE_138 - VVV_16, // SPECIAL_META_TILE_139 - VVV_16, // SPECIAL_META_TILE_140 - VVV_41, // SPECIAL_META_TILE_141 - VVV_80, // SPECIAL_META_TILE_142 - VVV_81, // SPECIAL_META_TILE_143 - 0, // SPECIAL_META_TILE_144 - VVV_15, // SPECIAL_META_TILE_145 - 0, // SPECIAL_META_TILE_146 - 0, // SPECIAL_META_TILE_147 - 0, // SPECIAL_META_TILE_148 - 0, // SPECIAL_META_TILE_149 - 0, // SPECIAL_META_TILE_150 +// vvv for specialTile +const u8 gMapSpecialTileToVvv[] = { + 0, // SPECIAL_TILE_0 + 0, // SPECIAL_TILE_1 + 0, // SPECIAL_TILE_2 + 0, // SPECIAL_TILE_3 + 0, // SPECIAL_TILE_4 + 0, // SPECIAL_TILE_5 + 0, // SPECIAL_TILE_6 + 0, // SPECIAL_TILE_7 + 0, // SPECIAL_TILE_8 + 0, // SPECIAL_TILE_9 + 0, // SPECIAL_TILE_10 + 0, // SPECIAL_TILE_11 + 0, // SPECIAL_TILE_12 + 0, // SPECIAL_TILE_13 + 0, // SPECIAL_TILE_14 + 0, // SPECIAL_TILE_15 + 0, // SPECIAL_TILE_16 + 0, // SPECIAL_TILE_17 + 0, // SPECIAL_TILE_18 + 0, // SPECIAL_TILE_19 + VVV_241, // SPECIAL_TILE_20 + 0, // SPECIAL_TILE_21 + 0, // SPECIAL_TILE_22 + VVV_83, // SPECIAL_TILE_23 + VVV_242, // SPECIAL_TILE_24 + VVV_243, // SPECIAL_TILE_25 + 0, // SPECIAL_TILE_26 + 0, // SPECIAL_TILE_27 + 0, // SPECIAL_TILE_28 + 0, // SPECIAL_TILE_29 + 0, // SPECIAL_TILE_30 + 0, // SPECIAL_TILE_31 + VVV_240, // SPECIAL_TILE_32 + 0, // SPECIAL_TILE_33 + 0, // SPECIAL_TILE_34 + 0, // SPECIAL_TILE_35 + 0, // SPECIAL_TILE_36 + 0, // SPECIAL_TILE_37 + 0, // SPECIAL_TILE_38 + 0, // SPECIAL_TILE_39 + 0, // SPECIAL_TILE_40 + 0, // SPECIAL_TILE_41 + 0, // SPECIAL_TILE_42 + 0, // SPECIAL_TILE_43 + 0, // SPECIAL_TILE_44 + 0, // SPECIAL_TILE_45 + 0, // SPECIAL_TILE_46 + 0, // SPECIAL_TILE_47 + 0, // SPECIAL_TILE_48 + 0, // SPECIAL_TILE_49 + 0, // SPECIAL_TILE_50 + 0, // SPECIAL_TILE_51 + 0, // SPECIAL_TILE_52 + 0, // SPECIAL_TILE_53 + 0, // SPECIAL_TILE_54 + 0, // SPECIAL_TILE_55 + 0, // SPECIAL_TILE_56 + 0, // SPECIAL_TILE_57 + 0, // SPECIAL_TILE_58 + 0, // SPECIAL_TILE_59 + 0, // SPECIAL_TILE_60 + 0, // SPECIAL_TILE_61 + 0, // SPECIAL_TILE_62 + 0, // SPECIAL_TILE_63 + VVV_61, // SPECIAL_TILE_64 + VVV_61, // SPECIAL_TILE_65 + VVV_61, // SPECIAL_TILE_66 + VVV_61, // SPECIAL_TILE_67 + VVV_61, // SPECIAL_TILE_68 + VVV_61, // SPECIAL_TILE_69 + VVV_61, // SPECIAL_TILE_70 + VVV_61, // SPECIAL_TILE_71 + VVV_61, // SPECIAL_TILE_72 + 0, // SPECIAL_TILE_73 + 0, // SPECIAL_TILE_74 + 0, // SPECIAL_TILE_75 + 0, // SPECIAL_TILE_76 + 0, // SPECIAL_TILE_77 + 0, // SPECIAL_TILE_78 + 0, // SPECIAL_TILE_79 + 0, // SPECIAL_TILE_80 + VVV_58, // SPECIAL_TILE_81 + 0, // SPECIAL_TILE_82 + 0, // SPECIAL_TILE_83 + 0, // SPECIAL_TILE_84 + 0, // SPECIAL_TILE_85 + 0, // SPECIAL_TILE_86 + 0, // SPECIAL_TILE_87 + 0, // SPECIAL_TILE_88 + 0, // SPECIAL_TILE_89 + 0, // SPECIAL_TILE_90 + 0, // SPECIAL_TILE_91 + 0, // SPECIAL_TILE_92 + 0, // SPECIAL_TILE_93 + 0, // SPECIAL_TILE_94 + 0, // SPECIAL_TILE_95 + 0, // SPECIAL_TILE_96 + 0, // SPECIAL_TILE_97 + 0, // SPECIAL_TILE_98 + 0, // SPECIAL_TILE_99 + 0, // SPECIAL_TILE_100 + 0, // SPECIAL_TILE_101 + 0, // SPECIAL_TILE_102 + 0, // SPECIAL_TILE_103 + 0, // SPECIAL_TILE_104 + VVV_40, // SPECIAL_TILE_105 + 0, // SPECIAL_TILE_106 + 0, // SPECIAL_TILE_107 + 0, // SPECIAL_TILE_108 + 0, // SPECIAL_TILE_109 + 0, // SPECIAL_TILE_110 + 0, // SPECIAL_TILE_111 + 0, // SPECIAL_TILE_112 + 0, // SPECIAL_TILE_113 + 0, // SPECIAL_TILE_114 + 0, // SPECIAL_TILE_115 + 0, // SPECIAL_TILE_116 + VVV_18, // SPECIAL_TILE_117 + VVV_18, // SPECIAL_TILE_118 + VVV_18, // SPECIAL_TILE_119 + VVV_18, // SPECIAL_TILE_120 + VVV_18, // SPECIAL_TILE_121 + VVV_18, // SPECIAL_TILE_122 + VVV_18, // SPECIAL_TILE_123 + VVV_18, // SPECIAL_TILE_124 + 0, // SPECIAL_TILE_125 + VVV_116, // SPECIAL_TILE_126 + VVV_116, // SPECIAL_TILE_127 + VVV_41, // SPECIAL_TILE_128 + 0, // SPECIAL_TILE_129 + VVV_35, // SPECIAL_TILE_130 + VVV_41, // SPECIAL_TILE_131 + VVV_41, // SPECIAL_TILE_132 + VVV_41, // SPECIAL_TILE_133 + VVV_41, // SPECIAL_TILE_134 + VVV_41, // SPECIAL_TILE_135 + VVV_41, // SPECIAL_TILE_136 + VVV_16, // SPECIAL_TILE_137 + VVV_16, // SPECIAL_TILE_138 + VVV_16, // SPECIAL_TILE_139 + VVV_16, // SPECIAL_TILE_140 + VVV_41, // SPECIAL_TILE_141 + VVV_80, // SPECIAL_TILE_142 + VVV_81, // SPECIAL_TILE_143 + 0, // SPECIAL_TILE_144 + VVV_15, // SPECIAL_TILE_145 + 0, // SPECIAL_TILE_146 + 0, // SPECIAL_TILE_147 + 0, // SPECIAL_TILE_148 + 0, // SPECIAL_TILE_149 + 0, // SPECIAL_TILE_150 }; -// collisionData for specialMetaTile -const u8 gMapSpecialMetaTileToCollisionData[] = { - COLLISION_DATA_29, // SPECIAL_META_TILE_0 - 0, // SPECIAL_META_TILE_1 - 0, // SPECIAL_META_TILE_2 - 0, // SPECIAL_META_TILE_3 - 0, // SPECIAL_META_TILE_4 - 0, // SPECIAL_META_TILE_5 - COLLISION_DATA_15, // SPECIAL_META_TILE_6 - 0, // SPECIAL_META_TILE_7 - 0, // SPECIAL_META_TILE_8 - 0, // SPECIAL_META_TILE_9 - 0, // SPECIAL_META_TILE_10 - COLLISION_DATA_15, // SPECIAL_META_TILE_11 - 0, // SPECIAL_META_TILE_12 - 0, // SPECIAL_META_TILE_13 - 0, // SPECIAL_META_TILE_14 - 0, // SPECIAL_META_TILE_15 - 0, // SPECIAL_META_TILE_16 - 0, // SPECIAL_META_TILE_17 - 0, // SPECIAL_META_TILE_18 - 0, // SPECIAL_META_TILE_19 - 0, // SPECIAL_META_TILE_20 - 0, // SPECIAL_META_TILE_21 - 0, // SPECIAL_META_TILE_22 - COLLISION_DATA_23, // SPECIAL_META_TILE_23 - COLLISION_DATA_40, // SPECIAL_META_TILE_24 - COLLISION_DATA_40, // SPECIAL_META_TILE_25 - COLLISION_DATA_40, // SPECIAL_META_TILE_26 - COLLISION_DATA_15, // SPECIAL_META_TILE_27 - 0, // SPECIAL_META_TILE_28 - 0, // SPECIAL_META_TILE_29 - 0, // SPECIAL_META_TILE_30 - 0, // SPECIAL_META_TILE_31 - COLLISION_DATA_32, // SPECIAL_META_TILE_32 - 0, // SPECIAL_META_TILE_33 - COLLISION_DATA_15, // SPECIAL_META_TILE_34 - COLLISION_DATA_3, // SPECIAL_META_TILE_35 - COLLISION_DATA_5, // SPECIAL_META_TILE_36 - COLLISION_DATA_10, // SPECIAL_META_TILE_37 - COLLISION_DATA_12, // SPECIAL_META_TILE_38 - COLLISION_DATA_1, // SPECIAL_META_TILE_39 - COLLISION_DATA_2, // SPECIAL_META_TILE_40 - COLLISION_DATA_4, // SPECIAL_META_TILE_41 - COLLISION_DATA_8, // SPECIAL_META_TILE_42 - COLLISION_DATA_15, // SPECIAL_META_TILE_43 - COLLISION_DATA_5, // SPECIAL_META_TILE_44 - COLLISION_DATA_10, // SPECIAL_META_TILE_45 - COLLISION_DATA_69, // SPECIAL_META_TILE_46 - COLLISION_DATA_68, // SPECIAL_META_TILE_47 - 0, // SPECIAL_META_TILE_48 - 0, // SPECIAL_META_TILE_49 - COLLISION_DATA_15, // SPECIAL_META_TILE_50 - 0, // SPECIAL_META_TILE_51 - 0, // SPECIAL_META_TILE_52 - 0, // SPECIAL_META_TILE_53 - COLLISION_DATA_15, // SPECIAL_META_TILE_54 - 0, // SPECIAL_META_TILE_55 - 0, // SPECIAL_META_TILE_56 - 0, // SPECIAL_META_TILE_57 - 0, // SPECIAL_META_TILE_58 - COLLISION_DATA_15, // SPECIAL_META_TILE_59 - 0, // SPECIAL_META_TILE_60 - 0, // SPECIAL_META_TILE_61 - COLLISION_DATA_15, // SPECIAL_META_TILE_62 - 0, // SPECIAL_META_TILE_63 - COLLISION_DATA_1, // SPECIAL_META_TILE_64 - COLLISION_DATA_3, // SPECIAL_META_TILE_65 - COLLISION_DATA_2, // SPECIAL_META_TILE_66 - COLLISION_DATA_5, // SPECIAL_META_TILE_67 - COLLISION_DATA_15, // SPECIAL_META_TILE_68 - COLLISION_DATA_10, // SPECIAL_META_TILE_69 - COLLISION_DATA_4, // SPECIAL_META_TILE_70 - COLLISION_DATA_12, // SPECIAL_META_TILE_71 - COLLISION_DATA_8, // SPECIAL_META_TILE_72 - COLLISION_DATA_71, // SPECIAL_META_TILE_73 - COLLISION_DATA_15, // SPECIAL_META_TILE_74 - 0, // SPECIAL_META_TILE_75 - 0, // SPECIAL_META_TILE_76 - 0, // SPECIAL_META_TILE_77 - 0, // SPECIAL_META_TILE_78 - 0, // SPECIAL_META_TILE_79 - COLLISION_DATA_15, // SPECIAL_META_TILE_80 - COLLISION_DATA_15, // SPECIAL_META_TILE_81 - COLLISION_DATA_3, // SPECIAL_META_TILE_82 - COLLISION_DATA_5, // SPECIAL_META_TILE_83 - 0, // SPECIAL_META_TILE_84 - COLLISION_DATA_13, // SPECIAL_META_TILE_85 - COLLISION_DATA_12, // SPECIAL_META_TILE_86 - COLLISION_DATA_11, // SPECIAL_META_TILE_87 - COLLISION_DATA_10, // SPECIAL_META_TILE_88 - 0, // SPECIAL_META_TILE_89 - COLLISION_DATA_15, // SPECIAL_META_TILE_90 - COLLISION_DATA_15, // SPECIAL_META_TILE_91 - COLLISION_DATA_15, // SPECIAL_META_TILE_92 - COLLISION_DATA_15, // SPECIAL_META_TILE_93 - COLLISION_DATA_15, // SPECIAL_META_TILE_94 - COLLISION_DATA_15, // SPECIAL_META_TILE_95 - COLLISION_DATA_15, // SPECIAL_META_TILE_96 - COLLISION_DATA_15, // SPECIAL_META_TILE_97 - COLLISION_DATA_80, // SPECIAL_META_TILE_98 - COLLISION_DATA_7, // SPECIAL_META_TILE_99 - COLLISION_DATA_11, // SPECIAL_META_TILE_100 - COLLISION_DATA_13, // SPECIAL_META_TILE_101 - COLLISION_DATA_14, // SPECIAL_META_TILE_102 - COLLISION_DATA_15, // SPECIAL_META_TILE_103 - COLLISION_DATA_15, // SPECIAL_META_TILE_104 - COLLISION_DATA_39, // SPECIAL_META_TILE_105 - COLLISION_DATA_15, // SPECIAL_META_TILE_106 - COLLISION_DATA_15, // SPECIAL_META_TILE_107 - COLLISION_DATA_16, // SPECIAL_META_TILE_108 - COLLISION_DATA_17, // SPECIAL_META_TILE_109 - COLLISION_DATA_18, // SPECIAL_META_TILE_110 - COLLISION_DATA_19, // SPECIAL_META_TILE_111 - 0, // SPECIAL_META_TILE_112 - 0, // SPECIAL_META_TILE_113 - COLLISION_DATA_15, // SPECIAL_META_TILE_114 - COLLISION_DATA_15, // SPECIAL_META_TILE_115 - 0, // SPECIAL_META_TILE_116 - COLLISION_DATA_1, // SPECIAL_META_TILE_117 - COLLISION_DATA_2, // SPECIAL_META_TILE_118 - COLLISION_DATA_3, // SPECIAL_META_TILE_119 - COLLISION_DATA_4, // SPECIAL_META_TILE_120 - COLLISION_DATA_5, // SPECIAL_META_TILE_121 - COLLISION_DATA_8, // SPECIAL_META_TILE_122 - COLLISION_DATA_10, // SPECIAL_META_TILE_123 - COLLISION_DATA_12, // SPECIAL_META_TILE_124 - COLLISION_DATA_15, // SPECIAL_META_TILE_125 - COLLISION_DATA_5, // SPECIAL_META_TILE_126 - COLLISION_DATA_12, // SPECIAL_META_TILE_127 - 0, // SPECIAL_META_TILE_128 - 0, // SPECIAL_META_TILE_129 - COLLISION_DATA_95, // SPECIAL_META_TILE_130 - COLLISION_DATA_39, // SPECIAL_META_TILE_131 - COLLISION_DATA_103, // SPECIAL_META_TILE_132 - COLLISION_DATA_104, // SPECIAL_META_TILE_133 - COLLISION_DATA_105, // SPECIAL_META_TILE_134 - COLLISION_DATA_106, // SPECIAL_META_TILE_135 - COLLISION_DATA_107, // SPECIAL_META_TILE_136 - COLLISION_DATA_49, // SPECIAL_META_TILE_137 - COLLISION_DATA_50, // SPECIAL_META_TILE_138 - COLLISION_DATA_58, // SPECIAL_META_TILE_139 - COLLISION_DATA_60, // SPECIAL_META_TILE_140 - COLLISION_DATA_35, // SPECIAL_META_TILE_141 - COLLISION_DATA_43, // SPECIAL_META_TILE_142 - COLLISION_DATA_43, // SPECIAL_META_TILE_143 - COLLISION_DATA_5, // SPECIAL_META_TILE_144 - COLLISION_DATA_34, // SPECIAL_META_TILE_145 - COLLISION_DATA_1, // SPECIAL_META_TILE_146 - COLLISION_DATA_2, // SPECIAL_META_TILE_147 - COLLISION_DATA_4, // SPECIAL_META_TILE_148 - COLLISION_DATA_8, // SPECIAL_META_TILE_149 - COLLISION_DATA_12, // SPECIAL_META_TILE_150 +// collisionData for specialTile +const u8 gMapSpecialTileToCollisionData[] = { + COLLISION_DATA_29, // SPECIAL_TILE_0 + 0, // SPECIAL_TILE_1 + 0, // SPECIAL_TILE_2 + 0, // SPECIAL_TILE_3 + 0, // SPECIAL_TILE_4 + 0, // SPECIAL_TILE_5 + COLLISION_DATA_15, // SPECIAL_TILE_6 + 0, // SPECIAL_TILE_7 + 0, // SPECIAL_TILE_8 + 0, // SPECIAL_TILE_9 + 0, // SPECIAL_TILE_10 + COLLISION_DATA_15, // SPECIAL_TILE_11 + 0, // SPECIAL_TILE_12 + 0, // SPECIAL_TILE_13 + 0, // SPECIAL_TILE_14 + 0, // SPECIAL_TILE_15 + 0, // SPECIAL_TILE_16 + 0, // SPECIAL_TILE_17 + 0, // SPECIAL_TILE_18 + 0, // SPECIAL_TILE_19 + 0, // SPECIAL_TILE_20 + 0, // SPECIAL_TILE_21 + 0, // SPECIAL_TILE_22 + COLLISION_DATA_23, // SPECIAL_TILE_23 + COLLISION_DATA_40, // SPECIAL_TILE_24 + COLLISION_DATA_40, // SPECIAL_TILE_25 + COLLISION_DATA_40, // SPECIAL_TILE_26 + COLLISION_DATA_15, // SPECIAL_TILE_27 + 0, // SPECIAL_TILE_28 + 0, // SPECIAL_TILE_29 + 0, // SPECIAL_TILE_30 + 0, // SPECIAL_TILE_31 + COLLISION_DATA_32, // SPECIAL_TILE_32 + 0, // SPECIAL_TILE_33 + COLLISION_DATA_15, // SPECIAL_TILE_34 + COLLISION_DATA_3, // SPECIAL_TILE_35 + COLLISION_DATA_5, // SPECIAL_TILE_36 + COLLISION_DATA_10, // SPECIAL_TILE_37 + COLLISION_DATA_12, // SPECIAL_TILE_38 + COLLISION_DATA_1, // SPECIAL_TILE_39 + COLLISION_DATA_2, // SPECIAL_TILE_40 + COLLISION_DATA_4, // SPECIAL_TILE_41 + COLLISION_DATA_8, // SPECIAL_TILE_42 + COLLISION_DATA_15, // SPECIAL_TILE_43 + COLLISION_DATA_5, // SPECIAL_TILE_44 + COLLISION_DATA_10, // SPECIAL_TILE_45 + COLLISION_DATA_69, // SPECIAL_TILE_46 + COLLISION_DATA_68, // SPECIAL_TILE_47 + 0, // SPECIAL_TILE_48 + 0, // SPECIAL_TILE_49 + COLLISION_DATA_15, // SPECIAL_TILE_50 + 0, // SPECIAL_TILE_51 + 0, // SPECIAL_TILE_52 + 0, // SPECIAL_TILE_53 + COLLISION_DATA_15, // SPECIAL_TILE_54 + 0, // SPECIAL_TILE_55 + 0, // SPECIAL_TILE_56 + 0, // SPECIAL_TILE_57 + 0, // SPECIAL_TILE_58 + COLLISION_DATA_15, // SPECIAL_TILE_59 + 0, // SPECIAL_TILE_60 + 0, // SPECIAL_TILE_61 + COLLISION_DATA_15, // SPECIAL_TILE_62 + 0, // SPECIAL_TILE_63 + COLLISION_DATA_1, // SPECIAL_TILE_64 + COLLISION_DATA_3, // SPECIAL_TILE_65 + COLLISION_DATA_2, // SPECIAL_TILE_66 + COLLISION_DATA_5, // SPECIAL_TILE_67 + COLLISION_DATA_15, // SPECIAL_TILE_68 + COLLISION_DATA_10, // SPECIAL_TILE_69 + COLLISION_DATA_4, // SPECIAL_TILE_70 + COLLISION_DATA_12, // SPECIAL_TILE_71 + COLLISION_DATA_8, // SPECIAL_TILE_72 + COLLISION_DATA_71, // SPECIAL_TILE_73 + COLLISION_DATA_15, // SPECIAL_TILE_74 + 0, // SPECIAL_TILE_75 + 0, // SPECIAL_TILE_76 + 0, // SPECIAL_TILE_77 + 0, // SPECIAL_TILE_78 + 0, // SPECIAL_TILE_79 + COLLISION_DATA_15, // SPECIAL_TILE_80 + COLLISION_DATA_15, // SPECIAL_TILE_81 + COLLISION_DATA_3, // SPECIAL_TILE_82 + COLLISION_DATA_5, // SPECIAL_TILE_83 + 0, // SPECIAL_TILE_84 + COLLISION_DATA_13, // SPECIAL_TILE_85 + COLLISION_DATA_12, // SPECIAL_TILE_86 + COLLISION_DATA_11, // SPECIAL_TILE_87 + COLLISION_DATA_10, // SPECIAL_TILE_88 + 0, // SPECIAL_TILE_89 + COLLISION_DATA_15, // SPECIAL_TILE_90 + COLLISION_DATA_15, // SPECIAL_TILE_91 + COLLISION_DATA_15, // SPECIAL_TILE_92 + COLLISION_DATA_15, // SPECIAL_TILE_93 + COLLISION_DATA_15, // SPECIAL_TILE_94 + COLLISION_DATA_15, // SPECIAL_TILE_95 + COLLISION_DATA_15, // SPECIAL_TILE_96 + COLLISION_DATA_15, // SPECIAL_TILE_97 + COLLISION_DATA_80, // SPECIAL_TILE_98 + COLLISION_DATA_7, // SPECIAL_TILE_99 + COLLISION_DATA_11, // SPECIAL_TILE_100 + COLLISION_DATA_13, // SPECIAL_TILE_101 + COLLISION_DATA_14, // SPECIAL_TILE_102 + COLLISION_DATA_15, // SPECIAL_TILE_103 + COLLISION_DATA_15, // SPECIAL_TILE_104 + COLLISION_DATA_39, // SPECIAL_TILE_105 + COLLISION_DATA_15, // SPECIAL_TILE_106 + COLLISION_DATA_15, // SPECIAL_TILE_107 + COLLISION_DATA_16, // SPECIAL_TILE_108 + COLLISION_DATA_17, // SPECIAL_TILE_109 + COLLISION_DATA_18, // SPECIAL_TILE_110 + COLLISION_DATA_19, // SPECIAL_TILE_111 + 0, // SPECIAL_TILE_112 + 0, // SPECIAL_TILE_113 + COLLISION_DATA_15, // SPECIAL_TILE_114 + COLLISION_DATA_15, // SPECIAL_TILE_115 + 0, // SPECIAL_TILE_116 + COLLISION_DATA_1, // SPECIAL_TILE_117 + COLLISION_DATA_2, // SPECIAL_TILE_118 + COLLISION_DATA_3, // SPECIAL_TILE_119 + COLLISION_DATA_4, // SPECIAL_TILE_120 + COLLISION_DATA_5, // SPECIAL_TILE_121 + COLLISION_DATA_8, // SPECIAL_TILE_122 + COLLISION_DATA_10, // SPECIAL_TILE_123 + COLLISION_DATA_12, // SPECIAL_TILE_124 + COLLISION_DATA_15, // SPECIAL_TILE_125 + COLLISION_DATA_5, // SPECIAL_TILE_126 + COLLISION_DATA_12, // SPECIAL_TILE_127 + 0, // SPECIAL_TILE_128 + 0, // SPECIAL_TILE_129 + COLLISION_DATA_95, // SPECIAL_TILE_130 + COLLISION_DATA_39, // SPECIAL_TILE_131 + COLLISION_DATA_103, // SPECIAL_TILE_132 + COLLISION_DATA_104, // SPECIAL_TILE_133 + COLLISION_DATA_105, // SPECIAL_TILE_134 + COLLISION_DATA_106, // SPECIAL_TILE_135 + COLLISION_DATA_107, // SPECIAL_TILE_136 + COLLISION_DATA_49, // SPECIAL_TILE_137 + COLLISION_DATA_50, // SPECIAL_TILE_138 + COLLISION_DATA_58, // SPECIAL_TILE_139 + COLLISION_DATA_60, // SPECIAL_TILE_140 + COLLISION_DATA_35, // SPECIAL_TILE_141 + COLLISION_DATA_43, // SPECIAL_TILE_142 + COLLISION_DATA_43, // SPECIAL_TILE_143 + COLLISION_DATA_5, // SPECIAL_TILE_144 + COLLISION_DATA_34, // SPECIAL_TILE_145 + COLLISION_DATA_1, // SPECIAL_TILE_146 + COLLISION_DATA_2, // SPECIAL_TILE_147 + COLLISION_DATA_4, // SPECIAL_TILE_148 + COLLISION_DATA_8, // SPECIAL_TILE_149 + COLLISION_DATA_12, // SPECIAL_TILE_150 }; const u16 gUnk_080B7A3E[] = { @@ -334,7 +334,7 @@ const u16 gUnk_080B7A3E[] = { 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 16, 0, 64, 0, 3, 3, 3, 3, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, }; // TODO no need to store this in an u16? -// TODO figure out type from arm_sub_080B1B84 and arm_sub_080B1BA4, also related to specialMetaTiles +// TODO figure out type from arm_sub_080B1B84 and arm_sub_080B1BA4, also related to specialTiles void PlayerItemCellOverwriteSet(PlayerItemCellOverwriteSetEntity* this) { static const s8 offsetByDirection[] = { 0, -16, 16, 0, 0, 16, -16, 0 }; @@ -342,7 +342,7 @@ void PlayerItemCellOverwriteSet(PlayerItemCellOverwriteSetEntity* this) { Entity* player = &gPlayerEntity.base; if (super->action == 0) { - this->tileType = GetMetaTileType(TILE(player->x.HALF.HI + offsetByDirection[player->animationState & 0xe], + this->tileType = GetTileType(TILE(player->x.HALF.HI + offsetByDirection[player->animationState & 0xe], player->y.HALF.HI + offsetByDirection[(player->animationState & 0xe) + 1]), super->collisionLayer); super->action++; @@ -351,7 +351,7 @@ void PlayerItemCellOverwriteSet(PlayerItemCellOverwriteSetEntity* this) { tmp = gInput.heldKeys & R_BUTTON; if ((gInput.heldKeys & A_BUTTON) != 0) { if ((gInput.newKeys & R_BUTTON) != 0) { - this->tileType = GetMetaTileType(TILE(player->x.HALF.HI + offsetByDirection[player->animationState & 0xe], + this->tileType = GetTileType(TILE(player->x.HALF.HI + offsetByDirection[player->animationState & 0xe], player->y.HALF.HI + offsetByDirection[(player->animationState & 0xe) + 1]), super->collisionLayer); } diff --git a/src/playerItem/playerItemGustBig.c b/src/playerItem/playerItemGustBig.c index 1303e142..a27b8101 100644 --- a/src/playerItem/playerItemGustBig.c +++ b/src/playerItem/playerItemGustBig.c @@ -53,8 +53,8 @@ static const Hitbox* const gUnk_080B3DE8[] = { &gUnk_080B3E28, }; static const KeyValuePair gUnk_080B3DF4[] = { - { META_TILE_TYPE_117, 1 }, { META_TILE_TYPE_118, 1 }, { META_TILE_TYPE_940, 1 }, { SPECIAL_META_TILE_80, 1 }, - { META_TILE_TYPE_887, 1 }, { META_TILE_TYPE_888, 1 }, { META_TILE_TYPE_113, 1 }, { META_TILE_TYPE_114, 1 }, + { TILE_TYPE_117, 1 }, { TILE_TYPE_118, 1 }, { TILE_TYPE_940, 1 }, { SPECIAL_TILE_80, 1 }, + { TILE_TYPE_887, 1 }, { TILE_TYPE_888, 1 }, { TILE_TYPE_113, 1 }, { TILE_TYPE_114, 1 }, }; static const u16 gUnk_080B3DF4End = 0; diff --git a/src/playerItem/playerItemHeldObject.c b/src/playerItem/playerItemHeldObject.c index 99b9a322..31fa9be5 100644 --- a/src/playerItem/playerItemHeldObject.c +++ b/src/playerItem/playerItemHeldObject.c @@ -106,7 +106,7 @@ void PlayerItemHeldObject_SubAction2(PlayerItemHeldObjectEntity* this) { 0, -6, 6, 0, 0, 6, -6, 0, }; PlayerItemHeldObjectEntity* child; - u32 tile; + u32 data; u32 tmp; child = (PlayerItemHeldObjectEntity*)super->child; @@ -126,8 +126,8 @@ void PlayerItemHeldObject_SubAction2(PlayerItemHeldObjectEntity* this) { gUnk_081320C4[(super->direction >> 2) + 1]) == VVV_116) { LinearMoveUpdate(super); } else { - tile = GetCollisionDataAtEntity(super); - if ((tile != COLLISION_DATA_36) && (tile != COLLISION_DATA_38)) { + data = GetCollisionDataAtEntity(super); + if ((data != COLLISION_DATA_36) && (data != COLLISION_DATA_38)) { ProcessMovement10(super); } } @@ -136,8 +136,8 @@ void PlayerItemHeldObject_SubAction2(PlayerItemHeldObjectEntity* this) { (child->base).x = super->x; (child->base).y = super->y; (child->base).z = super->z; - tile = GetVvvAtEntity(super); - switch (tile) { + data = GetVvvAtEntity(super); + switch (data) { case VVV_13: case VVV_16: case VVV_17: @@ -145,7 +145,7 @@ void PlayerItemHeldObject_SubAction2(PlayerItemHeldObjectEntity* this) { case VVV_90: if (child == this) { - switch (tile) { + switch (data) { case VVV_13: CreateFx(super, FX_FALL_DOWN, 0); break; diff --git a/src/playerItem/playerItemPacciCaneProjectile.c b/src/playerItem/playerItemPacciCaneProjectile.c index fc627a03..d7138a0f 100644 --- a/src/playerItem/playerItemPacciCaneProjectile.c +++ b/src/playerItem/playerItemPacciCaneProjectile.c @@ -134,9 +134,9 @@ void PlayerItemPacciCaneProjectile_Action1(PlayerItemPacciCaneProjectileEntity* super->x.HALF.HI = (super->x.HALF.HI & 0xfff0) | 8; super->y.HALF.HI = (super->y.HALF.HI & 0xfff0) | 8; super->spritePriority.b0 = 7; - this->unk_7c = GetMetaTileIndex(COORD_TO_TILE(super), super->collisionLayer); + this->unk_7c = GetTileIndex(COORD_TO_TILE(super), super->collisionLayer); InitializeAnimation(super, 0x14); - SetMetaTile(SPECIAL_META_TILE_32, COORD_TO_TILE(super), super->collisionLayer); + SetTile(SPECIAL_TILE_32, COORD_TO_TILE(super), super->collisionLayer); return; } } else { @@ -166,17 +166,17 @@ void PlayerItemPacciCaneProjectile_Action3(PlayerItemPacciCaneProjectileEntity* void PlayerItemPacciCaneProjectile_Action4(PlayerItemPacciCaneProjectileEntity* this) { GetNextFrame(super); - switch (GetMetaTileIndex(COORD_TO_TILE(super), super->collisionLayer)) { + switch (GetTileIndex(COORD_TO_TILE(super), super->collisionLayer)) { default: this->unk_7c = 0; sub_08070458(this); break; - case SPECIAL_META_TILE_33: + case SPECIAL_TILE_33: sub_08070458(this); break; - case SPECIAL_META_TILE_112: + case SPECIAL_TILE_112: this->unk_78 = 0xff; - case SPECIAL_META_TILE_32: + case SPECIAL_TILE_32: if (--(this->unk_78) == -1) { sub_08070458(this); } else { @@ -198,7 +198,7 @@ void sub_08070458(PlayerItemPacciCaneProjectileEntity* this) { COLLISION_OFF(super); super->speed = 0; if (this->unk_7c != 0) { - SetMetaTile(this->unk_7c, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(this->unk_7c, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } InitializeAnimation(super, 0x13); sub_08017744(super); diff --git a/src/playerUtils.c b/src/playerUtils.c index 99471d2d..111ccfda 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -63,7 +63,7 @@ extern ItemBehavior* (*const gCreateItemsFuncs[])(Item); extern void UnregisterInteractTile(u32, u32); -extern const u8 gMapMetaTileTypeToCollisionData[]; // collisionData for tileType? +extern const u8 gMapTileTypeToCollisionData[]; // collisionData for tileType? extern u8 gUpdateVisibleTiles; @@ -106,7 +106,6 @@ extern const u16* sub_0806FC50(u32 param_1, u32 param_2); bool32 sub_08079F48(u32 param_1, u32 param_2); extern void FillVvvForLayer(MapLayer* mapLayer); -extern void RenderMapLayerToTileMap(u16* tileMap, MapLayer* mapLayer); extern u16 gUnk_080B77C0[]; @@ -119,10 +118,10 @@ void CreateCollisionDataBorderAroundRoom(void); void sub_0807C5F4(u16*, u16*); void sub_0807C5B0(void); -// collisions for metatiles < 0x4000 -extern const u8 gMapMetaTileTypeToCollisionData[]; +// collisions for tiles < 0x4000 +extern const u8 gMapTileTypeToCollisionData[]; // collisions for tiles > 0x4000 -extern const u8 gMapSpecialMetaTileToCollisionData[]; +extern const u8 gMapSpecialTileToCollisionData[]; extern u16 gUnk_080B77C0[]; @@ -876,30 +875,30 @@ const u16 gUnk_0811C2EC[] = { 748, 10, 1, 749, 6, 1, 750, 12, 1, 751, 2, 1, 752, 8, 1, 753, 4, 1, 0, }; const s16 gUnk_0811C456[] = { 0, -13, 13, 0, 0, 16, -13, 0 }; -const u16 gUnk_0811C466[] = { META_TILE_TYPE_803, - META_TILE_TYPE_819, - META_TILE_TYPE_822, - META_TILE_TYPE_825, - META_TILE_TYPE_820, - META_TILE_TYPE_828, - META_TILE_TYPE_826, - META_TILE_TYPE_829, - META_TILE_TYPE_821, - META_TILE_TYPE_823, - META_TILE_TYPE_831, - META_TILE_TYPE_830, - META_TILE_TYPE_824, - META_TILE_TYPE_827, - META_TILE_TYPE_832, - META_TILE_TYPE_53, +const u16 gUnk_0811C466[] = { TILE_TYPE_803, + TILE_TYPE_819, + TILE_TYPE_822, + TILE_TYPE_825, + TILE_TYPE_820, + TILE_TYPE_828, + TILE_TYPE_826, + TILE_TYPE_829, + TILE_TYPE_821, + TILE_TYPE_823, + TILE_TYPE_831, + TILE_TYPE_830, + TILE_TYPE_824, + TILE_TYPE_827, + TILE_TYPE_832, + TILE_TYPE_53, 0 }; void sub_08077F84(void) { Entity* obj; if ((gPlayerEntity.base.collisionLayer & 2) == 0) { - u32 tile = GetMetaTileTypeByPos(gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI - 12, LAYER_TOP); - if (tile == 0x343 || tile == 0x344 || tile == 0x345 || tile == 0x346) { + u32 tileType = GetTileTypeByPos(gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI - 12, LAYER_TOP); + if (tileType == TILE_TYPE_835 || tileType == TILE_TYPE_836 || tileType == TILE_TYPE_837 || tileType == TILE_TYPE_838) { sub_0807AA80(&gPlayerEntity.base); gPlayerState.jump_status |= 8; obj = CreateObject(ROTATING_TRAPDOOR, 0, 0); @@ -1574,7 +1573,7 @@ void ClearPlayerState(void) { gPlayerState.field_0x1f[0] = 0; gPlayerState.field_0x1f[1] = 0; gPlayerState.bow_state = 0; - gPlayerState.tilePosition = 0; + gPlayerState.tilePos = 0; gPlayerState.tileType = 0; gPlayerState.swim_state = 0; gPlayerState.item = NULL; @@ -1969,7 +1968,7 @@ void RespawnPlayer(void) { } else { u32 i; for (i = 0; i <= 0xf && gPlayerState.path_memory[i] != -1; i++) { - if (GetCollisionDataAtMetaTilePos((u16)gPlayerState.path_memory[i], gPlayerState.path_memory[i] >> 0x1e) != COLLISION_DATA_15) { + if (GetCollisionDataAtTilePos((u16)gPlayerState.path_memory[i], gPlayerState.path_memory[i] >> 0x1e) != COLLISION_DATA_15) { gPlayerEntity.base.collisionLayer = gPlayerState.path_memory[i] >> 0x1e; gPlayerEntity.base.x.HALF.HI = gRoomControls.origin_x + (gPlayerState.path_memory[i] & 0x3f) * 16 + 8; @@ -2023,10 +2022,10 @@ bool32 sub_08079550(void) { tilePos2 = COORD_TO_TILE_OFFSET(&gPlayerEntity.base, (gPlayerEntity.base.hitbox)->unk2[2], -ptr[1]); } - uVar3 = GetVvvAtMetaTilePos(tilePos1, gPlayerEntity.base.collisionLayer); + uVar3 = GetVvvAtTilePos(tilePos1, gPlayerEntity.base.collisionLayer); uVar3 = FindValueForKey(uVar3, gUnk_0811C1E8[gPlayerEntity.base.animationState >> 1]); if (uVar3 != 0) { - uVar3 = GetVvvAtMetaTilePos(tilePos2, gPlayerEntity.base.collisionLayer); + uVar3 = GetVvvAtTilePos(tilePos2, gPlayerEntity.base.collisionLayer); uVar3 = FindValueForKey(uVar3, gUnk_0811C1E8[gPlayerEntity.base.animationState >> 1]); if (uVar3 != 0) { gPlayerState.pushedObject |= 0x80; @@ -2119,7 +2118,7 @@ void sub_080797EC(void) { } else { animation = ANIM_SWORD_CHARGE_WALK; if (sub_080793E4(0)) { - if (GetCollisionDataAtMetaTilePos(GetPlayerTilePos(), gPlayerEntity.base.collisionLayer) != + if (GetCollisionDataAtTilePos(GetPlayerTilePos(), gPlayerEntity.base.collisionLayer) != COLLISION_DATA_255) { gPlayerState.sword_state &= ~8; animation = ANIM_SWORD_CHARGE_BUMP; @@ -2154,7 +2153,7 @@ void sub_080797EC(void) { } else if (gPlayerState.sword_state) { animation = ANIM_SWORD_CHARGE_WALK; if (sub_080793E4(0)) { - if (GetCollisionDataAtMetaTilePos(GetPlayerTilePos(), (u32)gPlayerEntity.base.collisionLayer) != + if (GetCollisionDataAtTilePos(GetPlayerTilePos(), (u32)gPlayerEntity.base.collisionLayer) != COLLISION_DATA_255) { gPlayerState.sword_state &= ~8; animation = ANIM_SWORD_CHARGE_BUMP; @@ -2486,13 +2485,13 @@ u32 sub_08079FC4(u32 param_1) { } u32 sub_08079FD4(Entity* this, u32 param_2) { - u32 tilePosition; + u32 tilePos; u8* collisionData; u32 collision; u32 index; u8 auStack20[4]; - tilePosition = COORD_TO_TILE(this) * 2; + tilePos = COORD_TO_TILE(this) * 2; collisionData = gMapBottom.collisionData; if (param_2 == 2) { collisionData = gMapTop.collisionData; @@ -2501,8 +2500,8 @@ u32 sub_08079FD4(Entity* this, u32 param_2) { while (TRUE) { do { index++; - tilePosition = sub_08004202(this, auStack20, tilePosition); - collision = collisionData[tilePosition / 2]; + tilePos = sub_08004202(this, auStack20, tilePos); + collision = collisionData[tilePos / 2]; if (collision < 0xf) { return index; } @@ -2594,12 +2593,12 @@ void UpdateFloorType(void) { SurfaceType GetSurfaceCalcType(Entity* param_1, s32 x, s32 y) { u32 position = TILE(param_1->x.HALF.HI + (u32)x, param_1->y.HALF.HI + y); - u32 tileType = GetMetaTileTypeByPos(param_1->x.HALF.HI + x, param_1->y.HALF.HI + y, gPlayerEntity.base.collisionLayer); + u32 tileType = GetTileTypeByPos(param_1->x.HALF.HI + x, param_1->y.HALF.HI + y, gPlayerEntity.base.collisionLayer); if (tileType != gPlayerState.tileType) { gPlayerState.surfaceTimer = 0; } - if ((tileType != gPlayerState.tileType) || (position != gPlayerState.tilePosition)) { - gPlayerState.tilePosition = position; + if ((tileType != gPlayerState.tileType) || (position != gPlayerState.tilePos)) { + gPlayerState.tilePos = position; gPlayerState.tileType = tileType; gPlayerState.surfacePositionSameTimer = 0; } @@ -2655,8 +2654,8 @@ u32 sub_0807A2F8(u32 param_1) { for (uVar5 = 0; uVar5 < 2; uVar5++) { iVar4 = 0; uVar2 = sub_08004202(&gPlayerEntity.base, auStack36, uVar2); - if (GetCollisionDataAtMetaTilePos(uVar2 >> 1, LAYER_BOTTOM)) { - if (!FindValueForKey((u16)GetVvvAtMetaTilePos((u16)(uVar2 >> 1), gPlayerEntity.base.collisionLayer), + if (GetCollisionDataAtTilePos(uVar2 >> 1, LAYER_BOTTOM)) { + if (!FindValueForKey((u16)GetVvvAtTilePos((u16)(uVar2 >> 1), gPlayerEntity.base.collisionLayer), gUnk_0811C1D8[gPlayerEntity.base.animationState >> 1])) { break; } @@ -2665,8 +2664,8 @@ u32 sub_0807A2F8(u32 param_1) { } uVar1 = sub_08004202(&gPlayerEntity.base, auStack36, uVar1); - if (GetCollisionDataAtMetaTilePos(uVar1 >> 1, LAYER_BOTTOM)) { - if (!FindValueForKey((u16)GetVvvAtMetaTilePos((uVar1 >> 1), gPlayerEntity.base.collisionLayer), + if (GetCollisionDataAtTilePos(uVar1 >> 1, LAYER_BOTTOM)) { + if (!FindValueForKey((u16)GetVvvAtTilePos((uVar1 >> 1), gPlayerEntity.base.collisionLayer), gUnk_0811C1D8[gPlayerEntity.base.animationState >> 1])) { break; } @@ -2684,9 +2683,9 @@ u32 sub_0807A2F8(u32 param_1) { if (uVar5 != 0) { if (AreaIsDungeon()) { uVar2 = sub_08004202(&gPlayerEntity.base, auStack36, uVar2); - if (!GetCollisionDataAtMetaTilePos(uVar2 >> 1, LAYER_TOP)) { + if (!GetCollisionDataAtTilePos(uVar2 >> 1, LAYER_TOP)) { uVar1 = sub_08004202(&gPlayerEntity.base, auStack36, uVar1); - if (GetCollisionDataAtMetaTilePos(uVar1 >> 1, LAYER_TOP)) { + if (GetCollisionDataAtTilePos(uVar1 >> 1, LAYER_TOP)) { return 0; } } else { @@ -2696,11 +2695,11 @@ u32 sub_0807A2F8(u32 param_1) { if (uVar5 == 2) { uVar2 = sub_08004202(&gPlayerEntity.base, auStack36, uVar2); } - if (GetCollisionDataAtMetaTilePos(uVar2 >> 1, LAYER_BOTTOM) == 0) { + if (GetCollisionDataAtTilePos(uVar2 >> 1, LAYER_BOTTOM) == 0) { if (uVar5 == 2) { uVar1 = sub_08004202(&gPlayerEntity.base, auStack36, uVar1); } - if (GetCollisionDataAtMetaTilePos(uVar1 >> 1, LAYER_BOTTOM)) { + if (GetCollisionDataAtTilePos(uVar1 >> 1, LAYER_BOTTOM)) { return 0; } } else { @@ -2798,7 +2797,7 @@ void sub_0807A750(u32 param_1, u32 param_2, const u8* param_3, u32 param_4) { index = param_1 % 16; } if ((index != 0) && (index != 0xf)) { - uVar2 = GetCollisionDataAtMetaTilePos((param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, + uVar2 = GetCollisionDataAtTilePos((param_1 >> 4 & 0x3f) | (param_2 >> 4 & 0x3f) << 6, gPlayerEntity.base.collisionLayer); if (uVar2 > 0xf) { if (uVar2 != 0xff) { @@ -2952,7 +2951,7 @@ void sub_0807AAF8(Entity* this, u32 tilePos) { void sub_0807AB44(Entity* this, s32 xOffset, s32 yOffset) { Entity* object; const u16* ptr = - sub_0806FC50(GetMetaTileType(COORD_TO_TILE_OFFSET(this, -xOffset, -yOffset), this->collisionLayer), 0xb); + sub_0806FC50(GetTileType(COORD_TO_TILE_OFFSET(this, -xOffset, -yOffset), this->collisionLayer), 0xb); if (ptr != NULL) { if (ptr[3] == 0x76) { object = CreateObject(FLAME, 1, 0); @@ -2966,7 +2965,7 @@ void sub_0807AB44(Entity* this, s32 xOffset, s32 yOffset) { if (object != NULL) { PositionRelative(this, object, xOffset << 0x10, yOffset << 0x10); object->child = (Entity*)ptr; - SetMetaTile(SPECIAL_META_TILE_79, COORD_TO_TILE(object), object->collisionLayer); + SetTile(SPECIAL_TILE_79, COORD_TO_TILE(object), object->collisionLayer); } } } @@ -3281,35 +3280,35 @@ void sub_0807B2F8(PlayerEntity* this) { } } -// tileType < 0x800 : set the MetaTileType -// tileType >= 0x4000 : call SetMetaTile directly +// tileType < 0x800 : set the TileType +// tileType >= 0x4000 : call SetTile directly // else : restore the previous tile entity -void SetMetaTileType(u32 tileType, u32 position, u32 layer) { +void SetTileType(u32 tileType, u32 tilePos, u32 layer) { u8 collisionData; - u16 metatile; + u16 tileIndex; MapLayer* mapLayer; u16* src; u16* dest; if (tileType < 0x800) { - UnregisterInteractTile(position, layer); + UnregisterInteractTile(tilePos, layer); mapLayer = GetLayerByIndex(layer); - metatile = mapLayer->unkData2[tileType]; - mapLayer->mapData[position] = metatile; - collisionData = gMapMetaTileTypeToCollisionData[tileType]; - mapLayer->collisionData[position] = collisionData; + tileIndex = mapLayer->unkData2[tileType]; + mapLayer->mapData[tilePos] = tileIndex; + collisionData = gMapTileTypeToCollisionData[tileType]; + mapLayer->collisionData[tilePos] = collisionData; if ((gRoomControls.scroll_flags & 2) != 0) { - gMapBottom.collisionData[position] = collisionData; + gMapBottom.collisionData[tilePos] = collisionData; } - mapLayer->vvv[position] = gMapMetaTileTypeToVvv[tileType]; + mapLayer->vvv[tilePos] = gMapTileTypeToVvv[tileType]; if ((gRoomControls.scroll_flags & 1) == 0) { - u32 offset = (position & 0x3f) * 2 + (position & 0xfc0) * 4; + u32 offset = (tilePos & 0x3f) * 2 + (tilePos & 0xfc0) * 4; if (layer != 2) { dest = gMapDataBottomSpecial + offset; } else { dest = gMapDataTopSpecial + offset; } - src = mapLayer->metatiles + metatile * 4; + src = mapLayer->tiles + tileIndex * 4; // Copy over the tilemap entries (tile_attrs) to the special map data but in a different order. dest[0] = src[0]; dest[1] = src[1]; @@ -3320,45 +3319,45 @@ void SetMetaTileType(u32 tileType, u32 position, u32 layer) { } } } else if (tileType >= 0x4000) { // The tile type actually directly is a tileIndex - SetMetaTile(tileType, position, layer); + SetTile(tileType, tilePos, layer); } else { - RestorePrevTileEntity(position, layer); + RestorePrevTileEntity(tilePos, layer); } } -bool32 sub_0807B434(u32 metaTilePos, u32 layer) { - switch (GetMetaTileType(metaTilePos, layer)) { - case META_TILE_TYPE_54: - case META_TILE_TYPE_55: +bool32 sub_0807B434(u32 tilePos, u32 layer) { + switch (GetTileType(tilePos, layer)) { + case TILE_TYPE_54: + case TILE_TYPE_55: return FALSE; default: - return GetVvvAtMetaTilePos(metaTilePos, layer) != VVV_13; + return GetVvvAtTilePos(tilePos, layer) != VVV_13; } } -bool32 sub_0807B464(u32 metaTilePos, u32 layer) { - return GetVvvAtMetaTilePos(metaTilePos, layer) == VVV_86; +bool32 sub_0807B464(u32 tilePos, u32 layer) { + return GetVvvAtTilePos(tilePos, layer) == VVV_86; } -void sub_0807B480(u32 metaTilePos, u32 param_2) { +void sub_0807B480(u32 tilePos, u32 param_2) { u32 tmp1; u16 tmp2; u16 tmp3; u16 tileType; const u16* ptr; - if (sub_0807B464(metaTilePos, LAYER_TOP)) { - tmp1 = sub_0807B464(metaTilePos - 0x40, LAYER_TOP); - tmp1 |= sub_0807B464(metaTilePos + 1, LAYER_TOP) << 1; - tmp1 |= sub_0807B464(metaTilePos + 0x40, LAYER_TOP) << 2; - tmp1 |= sub_0807B464(metaTilePos - 1, LAYER_TOP) << 3; - tmp1 |= sub_0807B464(metaTilePos + 0x41, LAYER_BOTTOM) << 1; - tmp1 |= sub_0807B464(metaTilePos + 0x3f, LAYER_BOTTOM) << 3; - if (GetMetaTileType(metaTilePos + 0x40, LAYER_TOP) != 0) { - tmp1 |= sub_0807B464(metaTilePos + 0x80, LAYER_BOTTOM) << 2; + if (sub_0807B464(tilePos, LAYER_TOP)) { + tmp1 = sub_0807B464(tilePos - 0x40, LAYER_TOP); + tmp1 |= sub_0807B464(tilePos + 1, LAYER_TOP) << 1; + tmp1 |= sub_0807B464(tilePos + 0x40, LAYER_TOP) << 2; + tmp1 |= sub_0807B464(tilePos - 1, LAYER_TOP) << 3; + tmp1 |= sub_0807B464(tilePos + 0x41, LAYER_BOTTOM) << 1; + tmp1 |= sub_0807B464(tilePos + 0x3f, LAYER_BOTTOM) << 3; + if (GetTileType(tilePos + 0x40, LAYER_TOP) != 0) { + tmp1 |= sub_0807B464(tilePos + 0x80, LAYER_BOTTOM) << 2; } tmp2 = gUnk_0811C2CC[tmp1]; - tileType = GetMetaTileType(metaTilePos, LAYER_TOP); + tileType = GetTileType(tilePos, LAYER_TOP); ptr = gUnk_0811C2EC; tmp3 = 0; for (; *ptr != 0; ptr = ptr + 3) { @@ -3374,7 +3373,7 @@ void sub_0807B480(u32 metaTilePos, u32 param_2) { break; } } - SetMetaTileType(tmp2, metaTilePos, LAYER_TOP); + SetTileType(tmp2, tilePos, LAYER_TOP); } } @@ -3385,7 +3384,7 @@ void sub_0807B55C(u32 param_1, u32 param_2, u16* param_3) { tmp |= sub_0807B464(param_1 + 1, param_2) << 1; tmp |= sub_0807B464(param_1 + 0x40, param_2) << 2; tmp |= sub_0807B464(param_1 - 1, param_2) << 3; - SetMetaTileType(param_3[tmp], param_1, param_2); + SetTileType(param_3[tmp], param_1, param_2); } } @@ -3394,118 +3393,118 @@ bool32 sub_0807B5B0(Entity* this) { -gUnk_0811C456[(this->animationState & 6) + 1])); } -u32 sub_0807B600(u32 metaTilePos) { +u32 sub_0807B600(u32 tilePos) { u32 tileType; - u32 metaTilePos2; + u32 tilePos2; - metaTilePos2 = metaTilePos - 0x40; - if (GetVvvAtMetaTilePos(metaTilePos, LAYER_BOTTOM) != VVV_86) { + tilePos2 = tilePos - 0x40; + if (GetVvvAtTilePos(tilePos, LAYER_BOTTOM) != VVV_86) { return FALSE; } else { - tileType = GetMetaTileType(metaTilePos, LAYER_BOTTOM); - if (tileType == META_TILE_TYPE_618) { - sub_0807B820(metaTilePos); - } else if (tileType == META_TILE_TYPE_615) { - sub_0807B820(metaTilePos + 0x40); - } else if (tileType == META_TILE_TYPE_634) { - sub_0807B8A8(metaTilePos); - } else if (tileType == META_TILE_TYPE_631) { - sub_0807B8A8(metaTilePos + 0x40); - } else if (tileType == META_TILE_TYPE_650) { - sub_0807B930(metaTilePos); - } else if (tileType == META_TILE_TYPE_647) { - sub_0807B930(metaTilePos + 0x40); + tileType = GetTileType(tilePos, LAYER_BOTTOM); + if (tileType == TILE_TYPE_618) { + sub_0807B820(tilePos); + } else if (tileType == TILE_TYPE_615) { + sub_0807B820(tilePos + 0x40); + } else if (tileType == TILE_TYPE_634) { + sub_0807B8A8(tilePos); + } else if (tileType == TILE_TYPE_631) { + sub_0807B8A8(tilePos + 0x40); + } else if (tileType == TILE_TYPE_650) { + sub_0807B930(tilePos); + } else if (tileType == TILE_TYPE_647) { + sub_0807B930(tilePos + 0x40); } else { - if (GetMetaTileType(metaTilePos, LAYER_TOP) != 0) { - SetMetaTileType(META_TILE_TYPE_754, metaTilePos, LAYER_BOTTOM); - if (GetCollisionDataAtMetaTilePos(metaTilePos2, LAYER_BOTTOM) == COLLISION_DATA_3) { - SetMetaTileType(META_TILE_TYPE_756, metaTilePos2, LAYER_BOTTOM); + if (GetTileType(tilePos, LAYER_TOP) != 0) { + SetTileType(TILE_TYPE_754, tilePos, LAYER_BOTTOM); + if (GetCollisionDataAtTilePos(tilePos2, LAYER_BOTTOM) == COLLISION_DATA_3) { + SetTileType(TILE_TYPE_756, tilePos2, LAYER_BOTTOM); } - if (GetCollisionDataAtMetaTilePos(metaTilePos + 0x40, LAYER_BOTTOM) == COLLISION_DATA_3) { - SetMetaTileType(META_TILE_TYPE_756, metaTilePos, LAYER_BOTTOM); + if (GetCollisionDataAtTilePos(tilePos + 0x40, LAYER_BOTTOM) == COLLISION_DATA_3) { + SetTileType(TILE_TYPE_756, tilePos, LAYER_BOTTOM); } } else { - SetMetaTileType(META_TILE_TYPE_756, metaTilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_756, tilePos, LAYER_BOTTOM); } - if (sub_0807B464(metaTilePos2, LAYER_TOP)) { - SetMetaTileType(0, metaTilePos2, LAYER_TOP); - if (GetMetaTileType(metaTilePos2, LAYER_BOTTOM) == META_TILE_TYPE_754) { - SetMetaTileType(META_TILE_TYPE_756, metaTilePos2, LAYER_BOTTOM); + if (sub_0807B464(tilePos2, LAYER_TOP)) { + SetTileType(0, tilePos2, LAYER_TOP); + if (GetTileType(tilePos2, LAYER_BOTTOM) == TILE_TYPE_754) { + SetTileType(TILE_TYPE_756, tilePos2, LAYER_BOTTOM); } - sub_0807B55C(metaTilePos + 1, 1, (u16*)&gUnk_0811C2AC); - sub_0807B55C(metaTilePos - 1, 1, (u16*)&gUnk_0811C2AC); - sub_0807B55C(metaTilePos2, 1, (u16*)&gUnk_0811C2AC); + sub_0807B55C(tilePos + 1, 1, (u16*)&gUnk_0811C2AC); + sub_0807B55C(tilePos - 1, 1, (u16*)&gUnk_0811C2AC); + sub_0807B55C(tilePos2, 1, (u16*)&gUnk_0811C2AC); } - sub_0807B480(metaTilePos2 + 1, 3); - sub_0807B480(metaTilePos2 - 1, 1); - sub_0807B480(metaTilePos2 + 0x40, 0); - sub_0807B480(metaTilePos2 - 0x40, 2); + sub_0807B480(tilePos2 + 1, 3); + sub_0807B480(tilePos2 - 1, 1); + sub_0807B480(tilePos2 + 0x40, 0); + sub_0807B480(tilePos2 - 0x40, 2); } return TRUE; } } -void sub_0807B778(u32 metaTilePos, u32 layer) { +void sub_0807B778(u32 tilePos, u32 layer) { u32 tmp; - if (GetVvvAtMetaTilePos(metaTilePos, layer) == VVV_13) { - tmp = sub_0807B434(metaTilePos + TILE_POS(0, -1), layer); - tmp |= sub_0807B434(metaTilePos + TILE_POS(1, 0), layer) << 1; - tmp |= sub_0807B434(metaTilePos + TILE_POS(0, 1), layer) << 2; - tmp |= sub_0807B434(metaTilePos + TILE_POS(-1, 0), layer) << 3; - SetMetaTileType(gUnk_0811C466[tmp], metaTilePos, layer); - } -} - -void sub_0807B7D8(u32 metaTileType, u32 metaTilePos, u32 layer) { - if (metaTileType == META_TILE_TYPE_53) { - CloneTile(META_TILE_TYPE_53, metaTilePos, layer); - sub_0807B778(metaTilePos, layer); - sub_0807B778(metaTilePos + TILE_POS(1, 0), layer); - sub_0807B778(metaTilePos + TILE_POS(-1, 0), layer); - sub_0807B778(metaTilePos + TILE_POS(0, 1), layer); - sub_0807B778(metaTilePos + TILE_POS(0, -1), layer); + if (GetVvvAtTilePos(tilePos, layer) == VVV_13) { + tmp = sub_0807B434(tilePos + TILE_POS(0, -1), layer); + tmp |= sub_0807B434(tilePos + TILE_POS(1, 0), layer) << 1; + tmp |= sub_0807B434(tilePos + TILE_POS(0, 1), layer) << 2; + tmp |= sub_0807B434(tilePos + TILE_POS(-1, 0), layer) << 3; + SetTileType(gUnk_0811C466[tmp], tilePos, layer); + } +} + +void sub_0807B7D8(u32 tileType, u32 tilePos, u32 layer) { + if (tileType == TILE_TYPE_53) { + CloneTile(TILE_TYPE_53, tilePos, layer); + sub_0807B778(tilePos, layer); + sub_0807B778(tilePos + TILE_POS(1, 0), layer); + sub_0807B778(tilePos + TILE_POS(-1, 0), layer); + sub_0807B778(tilePos + TILE_POS(0, 1), layer); + sub_0807B778(tilePos + TILE_POS(0, -1), layer); } else { - SetMetaTileType(metaTileType, metaTilePos, layer); - } -} - -void sub_0807B820(u32 metaTilePos) { - SetMetaTileType(META_TILE_TYPE_620, metaTilePos + TILE_POS(-1, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_627, metaTilePos + TILE_POS(-1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_621, metaTilePos + TILE_POS(0, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_628, metaTilePos + TILE_POS(0, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_622, metaTilePos + TILE_POS(1, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_629, metaTilePos + TILE_POS(1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_623, metaTilePos + TILE_POS(-1, 0), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_624, metaTilePos, LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_626, metaTilePos + TILE_POS(1, 0), LAYER_BOTTOM); -} - -void sub_0807B8A8(u32 metaTilePos) { - SetMetaTileType(META_TILE_TYPE_636, metaTilePos + TILE_POS(-1, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_643, metaTilePos + TILE_POS(-1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_637, metaTilePos + TILE_POS(0, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_644, metaTilePos + TILE_POS(0, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_638, metaTilePos + TILE_POS(1, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_645, metaTilePos + TILE_POS(1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_639, metaTilePos + TILE_POS(-1, 0), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_640, metaTilePos, LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_642, metaTilePos + TILE_POS(1, 0), LAYER_BOTTOM); -} - -void sub_0807B930(u32 metaTilePos) { - SetMetaTileType(META_TILE_TYPE_652, metaTilePos + TILE_POS(-1, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_659, metaTilePos + TILE_POS(-1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_653, metaTilePos + TILE_POS(0, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_660, metaTilePos + TILE_POS(0, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_654, metaTilePos + TILE_POS(1, -1), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_661, metaTilePos + TILE_POS(1, -1), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_655, metaTilePos + TILE_POS(-1, 0), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_656, metaTilePos, LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_658, metaTilePos + TILE_POS(1, 0), LAYER_BOTTOM); -} - -void SetMetaTileByIndex(u32 tileIndex, u32 position, u32 layer) { + SetTileType(tileType, tilePos, layer); + } +} + +void sub_0807B820(u32 tilePos) { + SetTileType(TILE_TYPE_620, tilePos + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_627, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_621, tilePos + TILE_POS(0, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_628, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_622, tilePos + TILE_POS(1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_629, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_623, tilePos + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_624, tilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_626, tilePos + TILE_POS(1, 0), LAYER_BOTTOM); +} + +void sub_0807B8A8(u32 tilePos) { + SetTileType(TILE_TYPE_636, tilePos + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_643, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_637, tilePos + TILE_POS(0, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_644, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_638, tilePos + TILE_POS(1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_645, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_639, tilePos + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_640, tilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_642, tilePos + TILE_POS(1, 0), LAYER_BOTTOM); +} + +void sub_0807B930(u32 tilePos) { + SetTileType(TILE_TYPE_652, tilePos + TILE_POS(-1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_659, tilePos + TILE_POS(-1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_653, tilePos + TILE_POS(0, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_660, tilePos + TILE_POS(0, -1), LAYER_TOP); + SetTileType(TILE_TYPE_654, tilePos + TILE_POS(1, -1), LAYER_BOTTOM); + SetTileType(TILE_TYPE_661, tilePos + TILE_POS(1, -1), LAYER_TOP); + SetTileType(TILE_TYPE_655, tilePos + TILE_POS(-1, 0), LAYER_BOTTOM); + SetTileType(TILE_TYPE_656, tilePos, LAYER_BOTTOM); + SetTileType(TILE_TYPE_658, tilePos + TILE_POS(1, 0), LAYER_BOTTOM); +} + +void SetTileByIndex(u32 tileIndex, u32 position, u32 layer) { MapLayer* mapLayer; u16* src; u16* dest; @@ -3514,9 +3513,9 @@ void SetMetaTileByIndex(u32 tileIndex, u32 position, u32 layer) { UnregisterInteractTile(position, layer); mapLayer = GetLayerByIndex(layer); mapLayer->mapData[position] = tileIndex; - tileType = mapLayer->metatileTypes[tileIndex]; - mapLayer->collisionData[position] = gMapMetaTileTypeToCollisionData[tileType]; - mapLayer->vvv[position] = gMapMetaTileTypeToVvv[tileType]; + tileType = mapLayer->tileTypes[tileIndex]; + mapLayer->collisionData[position] = gMapTileTypeToCollisionData[tileType]; + mapLayer->vvv[position] = gMapTileTypeToVvv[tileType]; if ((gRoomControls.scroll_flags & 1) == 0) { u32 offset = (position & 0x3f) * 2 + (position & 0xfc0) * 4; if (layer != 2) { @@ -3524,7 +3523,7 @@ void SetMetaTileByIndex(u32 tileIndex, u32 position, u32 layer) { } else { dest = gMapDataTopSpecial + offset; } - src = mapLayer->metatiles + tileIndex * 4; + src = mapLayer->tiles + tileIndex * 4; *dest = *src; dest[1] = src[1]; dest[0x80] = src[2]; @@ -3535,27 +3534,27 @@ void SetMetaTileByIndex(u32 tileIndex, u32 position, u32 layer) { } } -void RestorePrevTileEntity(u32 metaTilePos, u32 layer) { +void RestorePrevTileEntity(u32 tilePos, u32 layer) { u32 tileIndex; u32 tileType; MapLayer* mapLayer; u16* dest; u16* src; - UnregisterInteractTile(metaTilePos, layer); + UnregisterInteractTile(tilePos, layer); mapLayer = GetLayerByIndex(layer); - mapLayer->mapData[metaTilePos] = tileIndex = mapLayer->mapDataOriginal[metaTilePos]; - tileType = mapLayer->metatileTypes[tileIndex]; - mapLayer->collisionData[metaTilePos] = gMapMetaTileTypeToCollisionData[tileType]; - mapLayer->vvv[metaTilePos] = gMapMetaTileTypeToVvv[tileType]; + mapLayer->mapData[tilePos] = tileIndex = mapLayer->mapDataOriginal[tilePos]; + tileType = mapLayer->tileTypes[tileIndex]; + mapLayer->collisionData[tilePos] = gMapTileTypeToCollisionData[tileType]; + mapLayer->vvv[tilePos] = gMapTileTypeToVvv[tileType]; if ((gRoomControls.scroll_flags & 1) == 0) { - u32 offset = (metaTilePos & 0x3f) * 2 + (metaTilePos & 0xfc0) * 4; + u32 offset = (tilePos & 0x3f) * 2 + (tilePos & 0xfc0) * 4; if (layer != 2) { dest = gMapDataBottomSpecial + offset; } else { dest = gMapDataTopSpecial + offset; } - src = &mapLayer->metatiles[tileIndex * 4]; + src = &mapLayer->tiles[tileIndex * 4]; dest[0] = src[0]; dest[1] = src[1]; dest[0x80] = src[2]; @@ -3568,7 +3567,7 @@ void RestorePrevTileEntity(u32 metaTilePos, u32 layer) { void sub_0807BB68(const s16* param_1, u32 basePosition, u32 layer) { while (param_1[0] != -1) { - SetMetaTileType((u16)param_1[0], basePosition + param_1[1], layer); + SetTileType((u16)param_1[0], basePosition + param_1[1], layer); param_1 += 2; } } @@ -3578,24 +3577,24 @@ void sub_0807BB98(s32 basePosition, u32 layer, u32 width, u32 height) { u32 x; for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - SetMetaTile(SPECIAL_META_TILE_114, basePosition + x, layer); + SetTile(SPECIAL_TILE_114, basePosition + x, layer); } basePosition += 0x40; } } void sub_0807BBE4(void) { - u32 tile; + u32 tileIndex; u8* topCollision; u8* bottomCollision; u32 index; u16* topMap; u16* bottomMap; - u16* bottomMetatiles; - u16* topMetatiles; + u16* bottomTiles; + u16* topTiles; - bottomMetatiles = gMapBottom.metatileTypes; - topMetatiles = gMapTop.metatileTypes; + bottomTiles = gMapBottom.tileTypes; + topTiles = gMapTop.tileTypes; bottomMap = gMapBottom.mapData; topMap = gMapTop.mapData; @@ -3603,20 +3602,20 @@ void sub_0807BBE4(void) { topCollision = gMapTop.collisionData; index = 0; for (index = 0; index < 0x40 * 0x40; index++) { - tile = *bottomMap; + tileIndex = *bottomMap; bottomMap++; - if (tile < 0x4000) { - *bottomCollision = gMapMetaTileTypeToCollisionData[bottomMetatiles[tile]]; + if (tileIndex < 0x4000) { + *bottomCollision = gMapTileTypeToCollisionData[bottomTiles[tileIndex]]; } else { - *bottomCollision = gMapSpecialMetaTileToCollisionData[tile - 0x4000]; + *bottomCollision = gMapSpecialTileToCollisionData[tileIndex - 0x4000]; } bottomCollision++; - tile = (u32)*topMap; + tileIndex = (u32)*topMap; topMap++; - if (tile < 0x4000) { - *topCollision = gMapMetaTileTypeToCollisionData[topMetatiles[tile]]; + if (tileIndex < 0x4000) { + *topCollision = gMapTileTypeToCollisionData[topTiles[tileIndex]]; } else { - *topCollision = gMapSpecialMetaTileToCollisionData[tile - 0x4000]; + *topCollision = gMapSpecialTileToCollisionData[tileIndex - 0x4000]; } topCollision++; } @@ -3823,17 +3822,17 @@ void sub_0807BFD0(void) { ClearBgAnimations(); sub_0807BFA8(); - MemFill16(0xffff, gMapBottom.metatileTypes, 0x1000); - gMapBottom.metatileTypes[0] = 0; - MemFill16(0xffff, gMapTop.metatileTypes, 0x1000); - gMapTop.metatileTypes[0] = 0; + MemFill16(0xffff, gMapBottom.tileTypes, 0x1000); + gMapBottom.tileTypes[0] = 0; + MemFill16(0xffff, gMapTop.tileTypes, 0x1000); + gMapTop.tileTypes[0] = 0; if ((void*)gRoomControls.unk_34 != (gArea.pCurrentRoomInfo)->tileset) { gRoomControls.unk_34 = (u32)(gArea.pCurrentRoomInfo)->tileset; LoadMapData((gArea.pCurrentRoomInfo)->tileset); } - LoadMapData((gArea.pCurrentRoomInfo)->metatiles); + LoadMapData((gArea.pCurrentRoomInfo)->tiles); ptr = gPaletteBuffer; MemCopy(&ptr[0x30], &ptr[0x150], 0x20); gUsedPalettes |= 0x200000; @@ -3842,7 +3841,7 @@ void sub_0807BFD0(void) { LoadBgAnimations((gArea.pCurrentRoomInfo)->bg_anim); } - puVar2 = gMapBottom.metatileTypes; + puVar2 = gMapBottom.tileTypes; puVar3 = gMapBottom.unkData2; MemFill16(0xffff, puVar3, 0x1000); @@ -3852,7 +3851,7 @@ void sub_0807BFD0(void) { } } - puVar2 = gMapTop.metatileTypes; + puVar2 = gMapTop.tileTypes; puVar3 = gMapTop.unkData2; MemFill16(0xffff, puVar3, 0x1000); @@ -3914,9 +3913,9 @@ void LoadRoomGfx(void) { FillVvvForLayer(&gMapBottom); FillVvvForLayer(&gMapTop); if (!clearBottomMap) { - // Render the complete bottom and top metatilemaps into the tilemaps. - RenderMapLayerToTileMap(gMapDataBottomSpecial, &gMapBottom); - RenderMapLayerToTileMap(gMapDataTopSpecial, &gMapTop); + // Render the complete bottom and top tilemaps into the tilemaps. + RenderMapLayerToSubTileMap(gMapDataBottomSpecial, &gMapBottom); + RenderMapLayerToSubTileMap(gMapDataTopSpecial, &gMapTop); } else { // Copy first half to second half. // Then copy the room back to the first half? @@ -3984,10 +3983,10 @@ void sub_0807C460(void) { for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { if (*mapBottom > 0x3fff) { - SetMetaTile(*mapBottom, position, LAYER_BOTTOM); + SetTile(*mapBottom, position, LAYER_BOTTOM); } if (*mapTop > 0x3fff) { - SetMetaTile(*mapTop, position, LAYER_TOP); + SetTile(*mapTop, position, LAYER_TOP); } mapBottom++; mapTop++; @@ -4293,10 +4292,10 @@ void LoadCompressedMapData(void* dest, u32 offset) { } void sub_0807C998(u32* a1) { - LoadCompressedMapData(&gMapBottom.metatiles, a1[0]); - LoadCompressedMapData(&gMapBottom.metatileTypes, a1[1]); - LoadCompressedMapData(&gMapTop.metatiles, a1[2]); - LoadCompressedMapData(&gMapTop.metatileTypes, a1[3]); + LoadCompressedMapData(&gMapBottom.tiles, a1[0]); + LoadCompressedMapData(&gMapBottom.tileTypes, a1[1]); + LoadCompressedMapData(&gMapTop.tiles, a1[2]); + LoadCompressedMapData(&gMapTop.tileTypes, a1[3]); } void sub_0807C9D8(u32* a1) { diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c index 3987fb57..2b01180f 100644 --- a/src/projectile/gleerokProjectile.c +++ b/src/projectile/gleerokProjectile.c @@ -151,7 +151,7 @@ void sub_080A90D8(GleerokProjectileEntity* this) { if (this->unk_74 != TILE(super->x.HALF.HI, super->y.HALF.HI)) { this->unk_74 = TILE(super->x.HALF.HI, super->y.HALF.HI); - tmp = GetMetaTileTypeByEntity(super); + tmp = GetTileTypeByEntity(super); if ((tmp == 0x13) || (tmp == 0x34)) { sub_0807B7D8(0x34c, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c index 856e3bee..200457e6 100644 --- a/src/projectile/mandiblesProjectile.c +++ b/src/projectile/mandiblesProjectile.c @@ -118,8 +118,8 @@ void MandiblesProjectile_Action2(MandiblesProjectileEntity* this) { EnqueueSFX(SFX_15D); } this->unk_78 = TILE(super->x.HALF.HI, super->y.HALF.HI); - if (GetMetaTileType(this->unk_78, super->collisionLayer) == SPECIAL_META_TILE_0) { - SetMetaTile(SPECIAL_META_TILE_5, this->unk_78, super->collisionLayer); + if (GetTileType(this->unk_78, super->collisionLayer) == SPECIAL_TILE_0) { + SetTile(SPECIAL_TILE_5, this->unk_78, super->collisionLayer); } } diff --git a/src/projectile/projectile5.c b/src/projectile/projectile5.c index 94be3551..00c44540 100644 --- a/src/projectile/projectile5.c +++ b/src/projectile/projectile5.c @@ -39,7 +39,7 @@ void Projectile5_OnCollision(Entity* this) { pbVar2 = &((Projectile5Entity*)this->parent)->unk_83; if ((((Projectile5Entity*)this->parent)->unk_83 & 0x3f) == 3) { if (gPlayerState.hurtBlinkSpeed != 0) { - if (GetCollisionDataAtMetaTilePos(TILE(this->x.HALF.HI, this->y.HALF.HI), + if (GetCollisionDataAtTilePos(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.base.collisionLayer) == 0) { if (this->contactFlags == CONTACT_NOW) { *pbVar2 = *pbVar2 & 0x7f; diff --git a/src/projectile/removableDust.c b/src/projectile/removableDust.c index 3ccc2263..34aad80f 100644 --- a/src/projectile/removableDust.c +++ b/src/projectile/removableDust.c @@ -74,7 +74,7 @@ void sub_080AA494(RemovableDustEntity* this) { u32 index; index = 0; - tileType = GetMetaTileTypeByEntity(super); + tileType = GetTileTypeByEntity(super); iterator = gUnk_08129FD0; while (*iterator != 0) { if (*(iterator++) == tileType) { @@ -90,7 +90,7 @@ void sub_080AA494(RemovableDustEntity* this) { } super->type2 = index; super->spritePriority.b0 = 7; - SetMetaTile(SPECIAL_META_TILE_104, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); + SetTile(SPECIAL_TILE_104, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); } void sub_080AA534(Entity* this) { @@ -104,16 +104,16 @@ void sub_080AA544(RemovableDustEntity* this) { u32 uVar3; s32 iVar4; const u16* puVar5; - u32 param; + u32 tilePos; const s8* tmp; if (super->type2 < 9) { tmp = gUnk_08129FF8; - param = TILE(super->x.HALF.HI, super->y.HALF.HI) + tmp[super->type2]; + tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI) + tmp[super->type2]; uVar3 = 0; iVar4 = 0; do { - vvv = GetVvvAtMetaTilePos((param - tmp[uVar3]) & 0xffff, super->collisionLayer); + vvv = GetVvvAtTilePos((tilePos - tmp[uVar3]) & 0xffff, super->collisionLayer); if (vvv == VVV_62) { iVar4++; } @@ -124,14 +124,14 @@ void sub_080AA544(RemovableDustEntity* this) { uVar3 = 0; puVar5 = gUnk_08129FD0; do { - sub_0807B7D8((u32)*puVar5, param - tmp[uVar3], super->collisionLayer); + sub_0807B7D8((u32)*puVar5, tilePos - tmp[uVar3], super->collisionLayer); puVar5++; uVar3++; } while (uVar3 < 9); - sub_080AA654(this, param); + sub_080AA654(this, tilePos); SetFlag((u16)super->speed); } else { - sub_0807B7D8(gUnk_08129FE4[super->type2], param - tmp[super->type2], super->collisionLayer); + sub_0807B7D8(gUnk_08129FE4[super->type2], tilePos - tmp[super->type2], super->collisionLayer); } } else { RestorePrevTileEntity(TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); diff --git a/src/projectile/spiderWeb.c b/src/projectile/spiderWeb.c index 3c7eff36..34960c2e 100644 --- a/src/projectile/spiderWeb.c +++ b/src/projectile/spiderWeb.c @@ -246,9 +246,9 @@ void sub_080AA9E0(Entity* this) { } void sub_080AAA68(Entity* this) { - static const u16 typeTiles[] = { SPECIAL_META_TILE_35, SPECIAL_META_TILE_37, SPECIAL_META_TILE_38, - SPECIAL_META_TILE_36 }; - SetMetaTile(typeTiles[this->type], TILE(this->x.HALF.HI, this->y.HALF.HI), this->collisionLayer); + static const u16 typeTiles[] = { SPECIAL_TILE_35, SPECIAL_TILE_37, SPECIAL_TILE_38, + SPECIAL_TILE_36 }; + SetTile(typeTiles[this->type], TILE(this->x.HALF.HI, this->y.HALF.HI), this->collisionLayer); } void sub_080AAAA8(SpiderWebEntity* this) { diff --git a/src/projectile/v1FireProjectile.c b/src/projectile/v1FireProjectile.c index 2cb79742..f0bbabfa 100644 --- a/src/projectile/v1FireProjectile.c +++ b/src/projectile/v1FireProjectile.c @@ -12,7 +12,7 @@ typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unused1[14]; - /*0x76*/ u16 unk_76; + /*0x76*/ u16 tilePos; } V1FireProjectileEntity; extern void (*const V1FireProjectile_Functions[])(V1FireProjectileEntity*); @@ -50,7 +50,7 @@ void V1FireProjectile_Init(V1FireProjectileEntity* this) { super->action = 1; super->zVelocity = Q_16_16(-1.0); - this->unk_76 = TILE(super->x.HALF.HI, super->y.HALF.HI); + this->tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); CopyPosition(super->parent, super); LinearMoveDirection(super, 0x1000, super->direction); super->spritePriority.b0 = 1; @@ -112,17 +112,17 @@ void V1FireProjectile_Action3(V1FireProjectileEntity* this) { } void sub_080AB4A4(V1FireProjectileEntity* this) { - u32 tmp; - u16 tile; - - tmp = this->unk_76; - tile = TILE(super->x.HALF.HI, super->y.HALF.HI); - if (tmp != tile) { - this->unk_76 = tile; - switch (GetMetaTileTypeByEntity(super)) { + u32 oldTilePos; + u32 tilePos; + + oldTilePos = this->tilePos; + tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); + if (oldTilePos != tilePos) { + this->tilePos = tilePos; + switch (GetTileTypeByEntity(super)) { case 0x13: case 0x34: - sub_0807B7D8(0x34c, this->unk_76, super->collisionLayer); + sub_0807B7D8(0x34c, this->tilePos, super->collisionLayer); break; } } diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c index d927313d..b7557eb7 100644 --- a/src/projectile/v2Projectile.c +++ b/src/projectile/v2Projectile.c @@ -13,8 +13,8 @@ typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unused1[12]; - /*0x74*/ u16 unk_74; - /*0x76*/ u16 unk_76; + /*0x74*/ u16 tilePos; + /*0x76*/ u16 tileType; } V2ProjectileEntity; extern void (*const V2Projectile_Functions[])(V2ProjectileEntity*); @@ -104,8 +104,8 @@ void sub_080ABCC4(V2ProjectileEntity* this) { super->timer = (Random() & 0x3f) + 48; super->subtimer = 0; super->direction = Random() & 0x1f; - this->unk_74 = TILE(super->x.HALF.HI, super->y.HALF.HI); - this->unk_76 = GetMetaTileType(this->unk_74, LAYER_TOP); + this->tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); + this->tileType = GetTileType(this->tilePos, LAYER_TOP); super->spritePriority.b0 = 2; InitializeAnimation(super, 0); SoundReq(SFX_14B); @@ -126,15 +126,15 @@ void sub_080ABD70(V2ProjectileEntity* this) { if ((super->frame & 0x10) != 0) { super->frame &= 0xef; super->speed = 0; - this->unk_74 = TILE(super->x.HALF.HI, super->y.HALF.HI); - this->unk_76 = GetMetaTileType(this->unk_74, LAYER_TOP); - tmp = this->unk_76; + this->tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); + this->tileType = GetTileType(this->tilePos, LAYER_TOP); + tmp = this->tileType; if (tmp != 0x13) { if (tmp == 0x315) { - SetMetaTileType(META_TILE_TYPE_110, this->unk_74, LAYER_TOP); + SetTileType(TILE_TYPE_110, this->tilePos, LAYER_TOP); } } else { - SetMetaTileType(META_TILE_TYPE_109, this->unk_74, LAYER_TOP); + SetTileType(TILE_TYPE_109, this->tilePos, LAYER_TOP); } } if ((super->frame & ANIM_DONE) != 0) { diff --git a/src/projectile/winder.c b/src/projectile/winder.c index 2395cb75..d8b5c5d8 100644 --- a/src/projectile/winder.c +++ b/src/projectile/winder.c @@ -117,14 +117,14 @@ void Winder_SetPositions(WinderEntity* this) { } bool32 Winder_CheckForRailings(WinderEntity* this, u32 dir) { - u32 tile; + u32 tilePos; u32 val; MapLayer* mapLayer = GetLayerByIndex(super->collisionLayer); u32 collisionData; - tile = TILE(super->x.HALF.HI, super->y.HALF.HI); - tile += gUnk_080B4488[dir >> 3]; - collisionData = mapLayer->collisionData[tile]; + tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); + tilePos += gUnk_080B4488[dir >> 3]; + collisionData = mapLayer->collisionData[tilePos]; if (collisionData <= 0x1F) { return FALSE; @@ -262,12 +262,12 @@ void* GetCurrentRoomProperty(u32 idx) { } void sub_0804B16C(void) { - TileEntity* tile = gSmallChests; + TileEntity* tileEntity = gSmallChests; do { - if (tile->tilePos != 0 && CheckLocalFlag(tile->localFlag)) { - SetMetaTileType(META_TILE_TYPE_116, tile->tilePos, tile->_6 & 1 ? LAYER_TOP : LAYER_BOTTOM); + if (tileEntity->tilePos != 0 && CheckLocalFlag(tileEntity->localFlag)) { + SetTileType(TILE_TYPE_116, tileEntity->tilePos, tileEntity->_6 & 1 ? LAYER_TOP : LAYER_BOTTOM); } - } while (++tile < gSmallChests + 8); + } while (++tileEntity < gSmallChests + 8); } void LoadRoomTileEntities(TileEntity* list) { @@ -309,25 +309,25 @@ void LoadRoomTileEntities(TileEntity* list) { } } -static void LoadGrassDropTile(TileEntity* tile) { - MemCopy(&gAreaDroptables[tile->localFlag], &gRoomVars.currentAreaDroptable, 0x20); +static void LoadGrassDropTile(TileEntity* tileEntity) { + MemCopy(&gAreaDroptables[tileEntity->localFlag], &gRoomVars.currentAreaDroptable, 0x20); } -static void LoadLocationTile(TileEntity* tile) { - gArea.locationIndex = tile->localFlag; +static void LoadLocationTile(TileEntity* tileEntity) { + gArea.locationIndex = tileEntity->localFlag; sub_08054524(); } -static void LoadRoomVisitTile(TileEntity* tile) { - SetLocalFlag(tile->localFlag); +static void LoadRoomVisitTile(TileEntity* tileEntity) { + SetLocalFlag(tileEntity->localFlag); } -static void LoadSmallChestTile(TileEntity* tile) { +static void LoadSmallChestTile(TileEntity* tileEntity) { TileEntity* t = gSmallChests; u32 i = 0; for (i = 0; i < 8; ++i, ++t) { if (!t->tilePos) { - MemCopy(tile, t, sizeof(TileEntity)); + MemCopy(tileEntity, t, sizeof(TileEntity)); if ((t->_6 & 1) && (gRoomControls.scroll_flags & 2) && !CheckLocalFlag(t->localFlag)) { Entity* e = CreateObject(SPECIAL_CHEST, t->localFlag, 0); if (e != NULL) { @@ -339,26 +339,26 @@ static void LoadSmallChestTile(TileEntity* tile) { } } -static void LoadBombableWallTile(TileEntity* tile) { +static void LoadBombableWallTile(TileEntity* tileEntity) { BombableWallManager* mgr = (BombableWallManager*)GetEmptyManager(); if (mgr != NULL) { mgr->base.kind = MANAGER; mgr->base.id = BOMBABLE_WALL_MANAGER; - mgr->x = tile->tilePos; - mgr->y = *(u16*)&tile->_6; - mgr->layer = tile->_2; - mgr->flag = tile->localFlag; + mgr->x = tileEntity->tilePos; + mgr->y = *(u16*)&tileEntity->_6; + mgr->layer = tileEntity->_2; + mgr->flag = tileEntity->localFlag; AppendEntityToList((Entity*)mgr, 6); } } -static void LoadDarknessTile(TileEntity* tile) { - sub_0805BB00(tile->_3, 1); +static void LoadDarknessTile(TileEntity* tileEntity) { + sub_0805BB00(tileEntity->_3, 1); } -static void LoadDestructibleTile(TileEntity* tile) { - if (CheckLocalFlag(*(u16*)&tile->_2)) { - SetMetaTileType(*(u16*)&tile->_6, tile->tilePos, tile->localFlag); +static void LoadDestructibleTile(TileEntity* tileEntity) { + if (CheckLocalFlag(*(u16*)&tileEntity->_2)) { + SetTileType(*(u16*)&tileEntity->_6, tileEntity->tilePos, tileEntity->localFlag); } else if (!gRoomVars.destructableManagerLoaded) { Manager* mgr; gRoomVars.destructableManagerLoaded = TRUE; @@ -373,7 +373,7 @@ static void LoadDestructibleTile(TileEntity* tile) { void sub_0804B388(u32 a1, u32 a2) { Entity* e; - SetMetaTileType(a2 == 1 ? 38 : 52, a1, a2); + SetTileType(a2 == 1 ? 38 : 52, a1, a2); e = CreateObject(SPECIAL_FX, FX_DEATH, 0); if (e != NULL) { e->collisionLayer = a2; @@ -382,6 +382,6 @@ void sub_0804B388(u32 a1, u32 a2) { ModDungeonKeys(-1); } -void LoadSmallChestTile2(TileEntity* tile) { - LoadSmallChestTile(tile); +void LoadSmallChestTile2(TileEntity* tileEntity) { + LoadSmallChestTile(tileEntity); } diff --git a/src/roomInit.c b/src/roomInit.c index 5b974d07..4c5dbfa7 100644 --- a/src/roomInit.c +++ b/src/roomInit.c @@ -808,10 +808,10 @@ extern EntityData gUnk_080D7D34; void sub_StateChange_GreatFairies_Exit(void) { if (GetInventoryValue(ITEM_FOURSWORD)) { - SetMetaTile(SPECIAL_META_TILE_114, TILE_POS(13, 5), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_114, TILE_POS(12, 4), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_144, TILE_POS(12, 5), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_144, TILE_POS(12, 6), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(13, 5), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(12, 4), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_144, TILE_POS(12, 5), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_144, TILE_POS(12, 6), LAYER_BOTTOM); LoadRoomEntityList(&gUnk_080D7D34); } } @@ -862,8 +862,8 @@ void sub_StateChange_Dojos_Grimblade(void) { LoadRoomEntityList(&gUnk_080D827C); } else { sub_0805BC4C(); - SetMetaTileType(META_TILE_TYPE_118, TILE_POS(2, 2), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_118, TILE_POS(12, 2), LAYER_TOP); + SetTileType(TILE_TYPE_118, TILE_POS(2, 2), LAYER_TOP); + SetTileType(TILE_TYPE_118, TILE_POS(12, 2), LAYER_TOP); } } @@ -1044,16 +1044,16 @@ void sub_StateChange_RoyalValley_Main(void) { if (GetInventoryValue(ITEM_QST_GRAVEYARD_KEY) != 2) { LoadRoomEntityList(&gUnk_080D9098); - SetMetaTileType(META_TILE_TYPE_378, TILE_POS(14, 22), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_379, TILE_POS(15, 22), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_380, TILE_POS(14, 23), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_381, TILE_POS(15, 23), LAYER_BOTTOM); + SetTileType(TILE_TYPE_378, TILE_POS(14, 22), LAYER_BOTTOM); + SetTileType(TILE_TYPE_379, TILE_POS(15, 22), LAYER_BOTTOM); + SetTileType(TILE_TYPE_380, TILE_POS(14, 23), LAYER_BOTTOM); + SetTileType(TILE_TYPE_381, TILE_POS(15, 23), LAYER_BOTTOM); } EnableRandomDrops(); sub_08059278(); - SetMetaTile(SPECIAL_META_TILE_114, TILE_POS(7, 41), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_114, TILE_POS(7, 49), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(7, 41), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(7, 49), LAYER_BOTTOM); if (CheckGlobalFlag(MAZE_CLEAR)) if (gRoomTransition.player_status.start_pos_x == 0x78 && gRoomTransition.player_status.start_pos_y == 0x278) @@ -1111,7 +1111,7 @@ static void sub_0804C128(void) { if (gArea.unk_0c_4 == 6) { sub_080AF250(1); if (CheckLocalFlag(HAKA_01_T0) == 0) { - SetMetaTileType(META_TILE_TYPE_115, TILE_POS(7, 4), LAYER_BOTTOM); + SetTileType(TILE_TYPE_115, TILE_POS(7, 4), LAYER_BOTTOM); } LoadRoomTileEntities(gUnk_080D9328); SetGlobalFlag(MAZE_CLEAR); @@ -1146,7 +1146,7 @@ void sub_0804C290(void) { if (gArea.unk_0c_1) { iVar1 = gArea.unk_0c_1; - SetMetaTileType((gUnk_080D9348 + iVar1)->unk0, (gUnk_080D9348 + iVar1)->unk2, LAYER_BOTTOM); + SetTileType((gUnk_080D9348 + iVar1)->unk0, (gUnk_080D9348 + iVar1)->unk2, LAYER_BOTTOM); } } @@ -1690,7 +1690,7 @@ void sub_StateChange_TownMinishHoles_RemShoeShop(void) { if (!CheckLocalFlag(KOBITO_DOUKUTU_05_T0)) { tilePos = TILE_POS(0, 5); for (i = 0; i < 19; i++, tilePos++) { - SetMetaTileType(SPECIAL_META_TILE_114, tilePos, LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, tilePos, LAYER_BOTTOM); } } LoadRoomEntityList(&gUnk_080DBB90); @@ -2153,11 +2153,11 @@ void sub_StateChange_DeepwoodShrine_StairsToB1(void) { } else { if (!CheckLocalFlag(0x4c)) { LoadRoomEntityList(&gUnk_additional_8_DeepwoodShrine_StairsToB1); - SetMetaTileType(META_TILE_TYPE_121, TILE_POS(5, 10), LAYER_BOTTOM); + SetTileType(TILE_TYPE_121, TILE_POS(5, 10), LAYER_BOTTOM); } else { - SetMetaTileType(META_TILE_TYPE_122, TILE_POS(5, 10), LAYER_BOTTOM); + SetTileType(TILE_TYPE_122, TILE_POS(5, 10), LAYER_BOTTOM); if (!CheckLocalFlag(0x24)) { - SetMetaTileType(META_TILE_TYPE_115, TILE_POS(5, 8), LAYER_BOTTOM); + SetTileType(TILE_TYPE_115, TILE_POS(5, 8), LAYER_BOTTOM); } } } @@ -2192,21 +2192,21 @@ void sub_StateChange_DeepwoodShrine_Barrel(void) { switch (gSave.dws_barrel_state) { case 0: default: - SetMetaTileType(META_TILE_TYPE_144, TILE_POS(11, 8), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_144, TILE_POS(17, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_144, TILE_POS(11, 8), LAYER_BOTTOM); + SetTileType(TILE_TYPE_144, TILE_POS(17, 16), LAYER_BOTTOM); break; case 2: - SetMetaTileType(META_TILE_TYPE_144, TILE_POS(17, 8), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_144, TILE_POS(11, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_144, TILE_POS(17, 8), LAYER_BOTTOM); + SetTileType(TILE_TYPE_144, TILE_POS(11, 16), LAYER_BOTTOM); break; } if (CheckLocalFlag(0x15)) { - SetMetaTileType(META_TILE_TYPE_118, TILE_POS(4, 12), LAYER_TOP); + SetTileType(TILE_TYPE_118, TILE_POS(4, 12), LAYER_TOP); } if (CheckLocalFlag(0x16)) { - SetMetaTileType(META_TILE_TYPE_118, TILE_POS(24, 12), LAYER_TOP); + SetTileType(TILE_TYPE_118, TILE_POS(24, 12), LAYER_TOP); } } @@ -2250,9 +2250,9 @@ void sub_StateChange_DeepwoodShrine_Entrance(void) { if (GetInventoryValue(ITEM_EARTH_ELEMENT) == 0) { #endif #endif - SetMetaTileType(META_TILE_TYPE_869, TILE_POS(9, 13), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_869, TILE_POS(10, 13), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_869, TILE_POS(11, 13), LAYER_BOTTOM); + SetTileType(TILE_TYPE_869, TILE_POS(9, 13), LAYER_BOTTOM); + SetTileType(TILE_TYPE_869, TILE_POS(10, 13), LAYER_BOTTOM); + SetTileType(TILE_TYPE_869, TILE_POS(11, 13), LAYER_BOTTOM); } } #else @@ -2387,9 +2387,9 @@ u32 sub_unk3_CaveOfFlames_Entrance(void) { #ifdef DEMO_USA void sub_StateChange_CaveOfFlames_Entrance(void) { if (GetInventoryValue(ITEM_FIRE_ELEMENT) == 0) { - SetMetaTileType(META_TILE_TYPE_869, TILE_POS(7, 10), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_869, TILE_POS(8, 10), LAYER_TOP); - SetMetaTileType(META_TILE_TYPE_869, TILE_POS(9, 10), LAYER_TOP); + SetTileType(TILE_TYPE_869, TILE_POS(7, 10), LAYER_TOP); + SetTileType(TILE_TYPE_869, TILE_POS(8, 10), LAYER_TOP); + SetTileType(TILE_TYPE_869, TILE_POS(9, 10), LAYER_TOP); } } #else @@ -3142,7 +3142,7 @@ extern EntityData gUnk_080E718C; extern EntityData gUnk_080E71AC; void sub_StateChange_RoyalCrypt_Entrance(void) { - SetMetaTileType(META_TILE_TYPE_786, TILE_POS(8, 4), LAYER_BOTTOM); + SetTileType(TILE_TYPE_786, TILE_POS(8, 4), LAYER_BOTTOM); EnableRandomDrops(); if (!CheckLocalFlag(0xc4)) { LoadRoomEntityList(&gUnk_080E718C); @@ -3642,8 +3642,8 @@ void sub_StateChange_DarkHyruleCastleOutside_ZeldaStatuePlatform(void) { LoadRoomEntityList(&gUnk_080EAD68); } else if (!CheckLocalFlag(0x79)) { LoadRoomEntityList(&gUnk_080EADB8); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(5, 5), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(9, 5), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(5, 5), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(9, 5), LAYER_BOTTOM); gArea.queued_bgm = SFX_NONE; } } @@ -3658,7 +3658,7 @@ void sub_0804D7EC(void) { while (*tilePos != 0) { temp = *tilePos; tilePos++; - SetMetaTileType(SPECIAL_META_TILE_114, temp, LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, temp, LAYER_BOTTOM); } } @@ -4354,7 +4354,7 @@ void sub_StateChange_HyruleTown_0(void) { EnableRandomDrops(); TryLoadPrologueHyruleTown(); #if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) - SetMetaTileType(META_TILE_TYPE_374, TILE_POS(43, 25), LAYER_BOTTOM); + SetTileType(TILE_TYPE_374, TILE_POS(43, 25), LAYER_BOTTOM); #endif if (gSave.global_progress == 1) { sub_0801D000(0); @@ -4447,7 +4447,7 @@ void sub_0804E150(void) { uVar3 = 1 << gSave.global_progress; for (; pTileData[1] != 0; pTileData += 3) { if ((pTileData[0] & uVar3) != 0) { - SetMetaTile(pTileData[2], pTileData[1], LAYER_BOTTOM); + SetTile(pTileData[2], pTileData[1], LAYER_BOTTOM); } } if (CheckLocalFlag(SHOP05_OPEN) == 0) { @@ -4455,7 +4455,7 @@ void sub_0804E150(void) { uVar3 = 1 << gSave.global_progress; for (; pTileData[0] != 0; pTileData += 3) { if ((pTileData[0] & uVar3) != 0) { - SetMetaTile(pTileData[2], pTileData[1], LAYER_BOTTOM); + SetTile(pTileData[2], pTileData[1], LAYER_BOTTOM); } } } @@ -4464,7 +4464,7 @@ void sub_0804E150(void) { uVar3 = 1 << gSave.global_progress; for (; pTileData[0] != 0; pTileData += 3) { if ((pTileData[0] & uVar3) != 0) { - SetMetaTile(pTileData[2], pTileData[1], LAYER_BOTTOM); + SetTile(pTileData[2], pTileData[1], LAYER_BOTTOM); } } } @@ -4598,16 +4598,16 @@ void sub_StateChange_CastleGarden_Main(void) { } if (!CheckLocalFlag(SOUGEN_08_TORITSUKI)) { LoadRoomEntityList(&gUnk_080F0800); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(24, 9), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(24, 10), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(38, 9), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(38, 10), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(24, 9), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(24, 10), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(38, 9), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(38, 10), LAYER_BOTTOM); } else { if (!GetInventoryValue(ITEM_FOURSWORD)) { LoadRoomEntityList(&gUnk_080F08F0); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(30, 2), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(31, 2), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(32, 2), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(30, 2), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(31, 2), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(32, 2), LAYER_BOTTOM); } LoadRoomEntityList(&gUnk_080F0850); if (!GetInventoryValue(ITEM_WATER_ELEMENT)) { @@ -4615,8 +4615,8 @@ void sub_StateChange_CastleGarden_Main(void) { } else { LoadRoomEntityList(&gUnk_080F0890); } - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(24, 9), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(24, 10), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(24, 9), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(24, 10), LAYER_BOTTOM); if (CheckLocalFlag(MAENIWA_00_WARP)) { LoadRoomEntityList(&gUnk_080F0920); ClearLocalFlag(MAENIWA_00_WARP); @@ -4955,10 +4955,10 @@ extern EntityData gUnk_080F3260; void sub_StateChange_HouseInteriors4_Carpenter(void) { if (GetInventoryValue(ITEM_PACCI_CANE)) { LoadRoomEntityList(&gUnk_080F3260); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(2, 8), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(2, 9), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(4, 8), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(4, 9), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(2, 8), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(2, 9), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(4, 8), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(4, 9), LAYER_BOTTOM); } } @@ -5044,22 +5044,22 @@ void sub_StateChange_LakeHylia_Main(void) { if ((gSave.global_progress > 3) && CheckGlobalFlag(TINGLE_TALK1ST)) { LoadRoomEntityList(&gUnk_080F3C44); } - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(16, 22), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(17, 22), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(18, 22), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(19, 22), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(20, 22), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(16, 23), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(16, 24), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(16, 25), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(20, 23), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(20, 24), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(20, 25), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(16, 26), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(17, 26), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(18, 26), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(19, 26), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_145, TILE_POS(20, 26), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(16, 22), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(17, 22), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(18, 22), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(19, 22), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(20, 22), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(16, 23), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(16, 24), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(16, 25), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(20, 23), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(20, 24), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(20, 25), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(16, 26), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(17, 26), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(18, 26), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(19, 26), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_145, TILE_POS(20, 26), LAYER_BOTTOM); } u32 sub_unk3_LakeHylia_Beanstalk(void) { @@ -5213,8 +5213,8 @@ void sub_StateChange_MinishWoods_Main(void) { LoadRoomEntityList(&gUnk_080F4E10); } #ifdef DEMO_USA - SetMetaTileType(META_TILE_TYPE_375, TILE_POS(52, 22), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_375, TILE_POS(52, 23), LAYER_BOTTOM); + SetTileType(TILE_TYPE_375, TILE_POS(52, 22), LAYER_BOTTOM); + SetTileType(TILE_TYPE_375, TILE_POS(52, 23), LAYER_BOTTOM); #endif } @@ -5493,8 +5493,8 @@ void sub_StateChange_WindTribeTower_Entrance(void) { LoadRoomEntityList(&gUnk_080F61BC); } if (!CheckGlobalFlag(WARP_EVENT_END)) { - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(7, 19), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(7, 20), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(7, 19), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(7, 20), LAYER_BOTTOM); } SetWorldMapPos(8, 0, 0x1e8, 0x158); } @@ -5703,10 +5703,10 @@ void sub_StateChange_HyruleField_EasternHillsNorth(void) { } if (GetInventoryValue(ITEM_GUST_JAR) && !GetInventoryValue(ITEM_PACCI_CANE)) { LoadRoomEntityList(&gUnk_080F7550); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(17, 12), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(17, 13), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(25, 15), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(25, 16), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(17, 12), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(17, 13), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(25, 15), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(25, 16), LAYER_BOTTOM); } } @@ -5734,8 +5734,8 @@ void sub_StateChange_HyruleField_LonLonRanch(void) { } if (!CheckKinstoneFused(KINSTONE_29)) { LoadRoomEntityList(&gUnk_080F7860); - SetMetaTile(SPECIAL_META_TILE_114, TILE_POS(8, 54), LAYER_BOTTOM); - SetMetaTile(SPECIAL_META_TILE_150, TILE_POS(8, 55), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_114, TILE_POS(8, 54), LAYER_BOTTOM); + SetTile(SPECIAL_TILE_150, TILE_POS(8, 55), LAYER_BOTTOM); } if ((gSave.global_progress > 3) && CheckGlobalFlag(TINGLE_TALK1ST)) { LoadRoomEntityList(&gUnk_080F78A0); @@ -5776,11 +5776,11 @@ void sub_StateChange_HyruleField_OutsideCastle(void) { sub_0804F4E4(); if (!CheckLocalFlag(SOUGEN_06_AKINDO)) { LoadRoomEntityList(&gUnk_080F7D70); - SetMetaTileType(META_TILE_TYPE_372, TILE_POS(34, 30), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_372, TILE_POS(35, 30), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_372, TILE_POS(37, 30), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_372, TILE_POS(38, 30), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_372, TILE_POS(39, 30), LAYER_BOTTOM); + SetTileType(TILE_TYPE_372, TILE_POS(34, 30), LAYER_BOTTOM); + SetTileType(TILE_TYPE_372, TILE_POS(35, 30), LAYER_BOTTOM); + SetTileType(TILE_TYPE_372, TILE_POS(37, 30), LAYER_BOTTOM); + SetTileType(TILE_TYPE_372, TILE_POS(38, 30), LAYER_BOTTOM); + SetTileType(TILE_TYPE_372, TILE_POS(39, 30), LAYER_BOTTOM); } if (!CheckGlobalFlag(TABIDACHI)) { #ifdef EU @@ -5797,26 +5797,26 @@ static void sub_0804F578(void) { if (!CheckLocalFlag(SOUGEN_06_SLIDE)) { LoadRoomEntityList(&gUnk_080F7DC0); } else { - SetMetaTileType(META_TILE_TYPE_55, TILE_POS(10, 37), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_55, TILE_POS(11, 37), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_55, TILE_POS(12, 37), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_55, TILE_POS(10, 38), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_55, TILE_POS(11, 38), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_55, TILE_POS(12, 38), LAYER_BOTTOM); + SetTileType(TILE_TYPE_55, TILE_POS(10, 37), LAYER_BOTTOM); + SetTileType(TILE_TYPE_55, TILE_POS(11, 37), LAYER_BOTTOM); + SetTileType(TILE_TYPE_55, TILE_POS(12, 37), LAYER_BOTTOM); + SetTileType(TILE_TYPE_55, TILE_POS(10, 38), LAYER_BOTTOM); + SetTileType(TILE_TYPE_55, TILE_POS(11, 38), LAYER_BOTTOM); + SetTileType(TILE_TYPE_55, TILE_POS(12, 38), LAYER_BOTTOM); } } void sub_0804F5E8(void) { sub_0804F4E4(); - SetMetaTileType(META_TILE_TYPE_467, TILE_POS(30, 47), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_470, TILE_POS(34, 47), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_468, TILE_POS(31, 48), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_469, TILE_POS(32, 48), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_470, TILE_POS(30, 49), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(27, 46), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(27, 47), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(36, 42), LAYER_BOTTOM); - SetMetaTileType(SPECIAL_META_TILE_114, TILE_POS(36, 43), LAYER_BOTTOM); + SetTileType(TILE_TYPE_467, TILE_POS(30, 47), LAYER_BOTTOM); + SetTileType(TILE_TYPE_470, TILE_POS(34, 47), LAYER_BOTTOM); + SetTileType(TILE_TYPE_468, TILE_POS(31, 48), LAYER_BOTTOM); + SetTileType(TILE_TYPE_469, TILE_POS(32, 48), LAYER_BOTTOM); + SetTileType(TILE_TYPE_470, TILE_POS(30, 49), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(27, 46), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(27, 47), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(36, 42), LAYER_BOTTOM); + SetTileType(SPECIAL_TILE_114, TILE_POS(36, 43), LAYER_BOTTOM); } void sub_0804F680(Entity* parent, s32 x, s32 y) { @@ -5879,34 +5879,34 @@ void sub_0804F79C(Entity* parent) { // Stones being spawned by vaati outside the castle. void sub_0804F808(void) { - SetMetaTileType(META_TILE_TYPE_467, TILE_POS(29, 16), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_467, TILE_POS(33, 24), LAYER_BOTTOM); + SetTileType(TILE_TYPE_467, TILE_POS(29, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_467, TILE_POS(33, 24), LAYER_BOTTOM); } void sub_0804F830(void) { - SetMetaTileType(META_TILE_TYPE_468, TILE_POS(30, 16), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_468, TILE_POS(32, 24), LAYER_BOTTOM); + SetTileType(TILE_TYPE_468, TILE_POS(30, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_468, TILE_POS(32, 24), LAYER_BOTTOM); } void sub_0804F854(void) { - SetMetaTileType(META_TILE_TYPE_469, TILE_POS(31, 16), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_468, TILE_POS(37, 19), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_469, TILE_POS(31, 24), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_468, TILE_POS(25, 21), LAYER_BOTTOM); + SetTileType(TILE_TYPE_469, TILE_POS(31, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_468, TILE_POS(37, 19), LAYER_BOTTOM); + SetTileType(TILE_TYPE_469, TILE_POS(31, 24), LAYER_BOTTOM); + SetTileType(TILE_TYPE_468, TILE_POS(25, 21), LAYER_BOTTOM); } void sub_0804F89C(void) { - SetMetaTileType(META_TILE_TYPE_470, TILE_POS(32, 16), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_469, TILE_POS(37, 20), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_470, TILE_POS(30, 24), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_469, TILE_POS(25, 20), LAYER_BOTTOM); + SetTileType(TILE_TYPE_470, TILE_POS(32, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_469, TILE_POS(37, 20), LAYER_BOTTOM); + SetTileType(TILE_TYPE_470, TILE_POS(30, 24), LAYER_BOTTOM); + SetTileType(TILE_TYPE_469, TILE_POS(25, 20), LAYER_BOTTOM); } void sub_0804F8E0(void) { - SetMetaTileType(META_TILE_TYPE_467, TILE_POS(33, 16), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_470, TILE_POS(37, 21), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_467, TILE_POS(29, 24), LAYER_BOTTOM); - SetMetaTileType(META_TILE_TYPE_470, TILE_POS(25, 19), LAYER_BOTTOM); + SetTileType(TILE_TYPE_467, TILE_POS(33, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_470, TILE_POS(37, 21), LAYER_BOTTOM); + SetTileType(TILE_TYPE_467, TILE_POS(29, 24), LAYER_BOTTOM); + SetTileType(TILE_TYPE_470, TILE_POS(25, 19), LAYER_BOTTOM); } void sub_0804F928(void) { @@ -6091,7 +6091,7 @@ void sub_StateChange_Caves_LonLonRanchSecret(void) { SetRoomFlag(1); ChangeLightLevel(0x100); if (!CheckLocalFlag(0x12)) { - SetMetaTileType(META_TILE_TYPE_115, TILE_POS(11, 3), LAYER_BOTTOM); + SetTileType(TILE_TYPE_115, TILE_POS(11, 3), LAYER_BOTTOM); } } } @@ -6611,7 +6611,7 @@ u32 sub_unk3_MtCrenel_Entrance(void) { void sub_StateChange_MtCrenel_Entrance(void) { #if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) - SetMetaTileType(META_TILE_TYPE_374, TILE_POS(47, 25), LAYER_BOTTOM); + SetTileType(TILE_TYPE_374, TILE_POS(47, 25), LAYER_BOTTOM); #endif } diff --git a/src/scroll.c b/src/scroll.c index 2031d858..a4bd3f76 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -30,7 +30,7 @@ extern u16 gUnk_0200B640; extern MapDataDefinition** gCaveBorderMapData[]; extern u16 gUnk_02022830[0xc00]; extern u16 gUnk_020246B0[0xc00]; -extern u8 gMapSpecialMetaTileToVvv[]; +extern u8 gMapSpecialTileToVvv[]; void Scroll0(RoomControls*); void Scroll1(RoomControls*); @@ -303,7 +303,7 @@ void Scroll5Sub1(RoomControls* controls) { gUnk_0200B640 = sub_08080278(); LoadMapData(gCaveBorderMapData[gDiggingCaveEntranceTransition.entrance->type][0]); sub_0807C8B0(gMapTop.mapData, controls->width >> 4, controls->height >> 4); - RenderMapLayerToTileMap(gMapDataTopSpecial, &gMapTop); + RenderMapLayerToSubTileMap(gMapDataTopSpecial, &gMapTop); } void Scroll5Sub2(RoomControls* controls) { @@ -360,8 +360,8 @@ void Scroll5Sub3(RoomControls* controls) { sub_0807BBE4(); CreateCollisionDataBorderAroundRoom(); sub_0805E248(); - RenderMapLayerToTileMap(gMapDataBottomSpecial, &gMapBottom); - RenderMapLayerToTileMap(gMapDataTopSpecial, &gMapTop); + RenderMapLayerToSubTileMap(gMapDataBottomSpecial, &gMapBottom); + RenderMapLayerToSubTileMap(gMapDataTopSpecial, &gMapTop); } void Scroll5Sub4(RoomControls* controls) { @@ -473,7 +473,7 @@ void sub_08080368(void) { tmp = gUnk_02034480.unk_00 << 1; index = 0; while (index < tmp) { - SetMetaTileByIndex(ptr[1], ptr[0] & 0xfff, (ptr[0] >> 0xe)); + SetTileByIndex(ptr[1], ptr[0] & 0xfff, (ptr[0] >> 0xe)); ptr += 2; index += 2; } @@ -864,7 +864,7 @@ void UpdateDoorTransition() { case 0x1d: y = controls->camera_target->y.HALF.HI - controls->origin_y; x = controls->camera_target->x.HALF.HI - controls->origin_x; - vvv = GetVvvAtMetaTilePos( + vvv = GetVvvAtTilePos( (((controls->camera_target->x.HALF.HI - controls->origin_x) >> 4) & 0x3F) | ((((controls->camera_target->y.HALF.HI - controls->origin_y) >> 4) & 0x3F) << 6), controls->camera_target->collisionLayer); @@ -882,17 +882,17 @@ void UpdateDoorTransition() { // fill the vvv for the whole layer void FillVvvForLayer(MapLayer* mapLayer) { - u32 metaTilePos; - u16* metatileTypes = mapLayer->metatileTypes; - const u8* ptr = gMapMetaTileTypeToVvv; + u32 tilePos; + u16* tileTypes = mapLayer->tileTypes; + const u8* ptr = gMapTileTypeToVvv; u8* ptr3 = mapLayer->vvv; u16* mapData = mapLayer->mapData; - for (metaTilePos = 0; metaTilePos < 0x40 * 0x40; metaTilePos++) { - u16 metaTileIndex = mapData[metaTilePos]; - if (metaTileIndex < 0x4000) { - mapLayer->vvv[metaTilePos] = ptr[metatileTypes[metaTileIndex]]; + for (tilePos = 0; tilePos < 0x40 * 0x40; tilePos++) { + u16 tileIndex = mapData[tilePos]; + if (tileIndex < 0x4000) { + mapLayer->vvv[tilePos] = ptr[tileTypes[tileIndex]]; } else { - mapLayer->vvv[metaTilePos] = gMapSpecialMetaTileToVvv[metaTileIndex - 0x4000]; + mapLayer->vvv[tilePos] = gMapSpecialTileToVvv[tileIndex - 0x4000]; } } } @@ -155,7 +155,7 @@ void InitUI(bool32 keepHealthAndRupees) { LoadPaletteGroup(0xc); LoadGfxGroup(0x10); MemClear(&gBG0Buffer, sizeof(gBG0Buffer)); - gScreen.bg0.tilemap = &gBG0Buffer; + gScreen.bg0.subTileMap = &gBG0Buffer; gScreen.bg0.control = 0x1f0c; gScreen.lcd.displayControl |= 0x100; gOAMControls.unk[0].unk7 = 1; diff --git a/src/worldEvent/worldEvent17.c b/src/worldEvent/worldEvent17.c index fe081906..0be153e6 100644 --- a/src/worldEvent/worldEvent17.c +++ b/src/worldEvent/worldEvent17.c @@ -34,8 +34,8 @@ void sub_08054EB8(Entity* this, ScriptExecutionContext* context) { void sub_08054EFC(Entity* this, ScriptExecutionContext* context) { Entity* effect; - u32 metaTilePos = COORD_TO_TILE(this) - 0x40; - SetMetaTile(SPECIAL_META_TILE_116, metaTilePos, LAYER_BOTTOM); + u32 tilePos = COORD_TO_TILE(this) - 0x40; + SetTile(SPECIAL_TILE_116, tilePos, LAYER_BOTTOM); this->collisionLayer = LAYER_TOP; UpdateSpriteForCollisionLayer(this); effect = CreateFx(this, FX_BIG_EXPLOSION, 0); @@ -157,6 +157,6 @@ void WorldEvent_17_0(void) { void WorldEvent_17_1(void) { if (gMenu.field_0xa != 0) { gMenu.field_0xa = 0; - SetMetaTileType(META_TILE_TYPE_116, TILE_POS(7, 16), LAYER_BOTTOM); + SetTileType(TILE_TYPE_116, TILE_POS(7, 16), LAYER_BOTTOM); } } diff --git a/src/worldEvent/worldEvent2.c b/src/worldEvent/worldEvent2.c index e2ed339a..0c8a02d5 100644 --- a/src/worldEvent/worldEvent2.c +++ b/src/worldEvent/worldEvent2.c @@ -60,7 +60,7 @@ void sub_08055994(void) { } else { layer = LAYER_BOTTOM; } - SetMetaTileType(META_TILE_TYPE_115, + SetTileType(TILE_TYPE_115, (*(u16*)(gMenu.field_0xc + 8) >> 4 & 0x3f) | (*(u16*)(gMenu.field_0xc + 10) >> 4 & 0x3f) << 6, layer); sub_080553E0((u32)gMenu.field_0x4); |