mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-10 15:13:59 -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/object/blockPushed.c
+38 -38
View File
@@ -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);
}
}
}