mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-01 09:52:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename metaTiles

Browse Source 
Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles.
This commit is contained in:
octorock
2024-01-06 14:59:48 +01:00
parent c3b771a209
commit aced0bef69
195 changed files with 9739 additions and 9736 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/bigGoron.c
+1 -1
View File
@@ -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;
}
src/npc/castorWildsStatue.c
+8 -8
View File
@@ -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);
src/npc/clothesRack.c
+6 -6
View File
@@ -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) {
src/npc/dampe.c
+4 -4
View File
@@ -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) {
src/npc/dog.c
+1 -1
View File
@@ -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);
}
}
}
src/npc/kid.c
+6 -6
View File
@@ -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) {
src/npc/npc4E.c
+4 -4
View File
@@ -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);
}
}
src/npc/simon.c
+1 -1
View File
@@ -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);
}
src/npc/townMinish.c
+1 -1
View File
@@ -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;
src/npc/zelda.c
+3 -3
View File
@@ -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);
}
}