diff options
Diffstat (limited to 'src/manager/lightLevelSetManager.c')
| -rw-r--r-- | src/manager/lightLevelSetManager.c | 18 |
1 files changed, 9 insertions, 9 deletions
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); |