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/worldEvent | |
| parent | c3b771a20923b335bbea2ab97a68ac29d04fcc43 (diff) | |
Rename metaTiles
Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles.
Diffstat (limited to 'src/worldEvent')
| -rw-r--r-- | src/worldEvent/worldEvent17.c | 6 | ||||
| -rw-r--r-- | src/worldEvent/worldEvent2.c | 2 |
2 files changed, 4 insertions, 4 deletions
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); |