diff options
Diffstat (limited to 'src')
82 files changed, 1971 insertions, 1972 deletions
diff --git a/src/beanstalkSubtask.c b/src/beanstalkSubtask.c index 1f30686e..1eff587d 100644 --- a/src/beanstalkSubtask.c +++ b/src/beanstalkSubtask.c @@ -20,7 +20,7 @@ extern void sub_0807C898(void); extern void sub_0805BB74(s32); extern void LoadRoomGfx(void); -extern void sub_0807BFD0(void); +extern void SetupTileSet(void); extern void sub_0807C4F8(void); extern void gMapData; @@ -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 = GetTileType(position, gPlayerEntity.base.collisionLayer); + tileType = GetTileTypeAtTilePos(position, gPlayerEntity.base.collisionLayer); if (tileType < 0x4000) { - direction = GetVvvForTileType(tileType); + direction = GetActTileForTileType(tileType); } else { direction = tileType; } @@ -246,7 +246,7 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case VVV_40: + case ACT_TILE_40: if ((gPlayerState.flags & PL_MINISH) != 0) { return 0; } @@ -295,7 +295,7 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); gPlayerEntity.base.type = 1; return 1; - case VVV_112: + case ACT_TILE_112: if ((gPlayerState.field_0x35 & 0x80) == 0) { if ((gPlayerEntity.base.frame & 1) != 0) { if (sub_0801A9F0(gPlayerState.field_0x35 << 2, tileType, position) != 0) { @@ -304,8 +304,8 @@ u32 UpdatePlayerCollision(void) { } } return 0; - case VVV_58: - case VVV_91: + case ACT_TILE_58: + case ACT_TILE_91: case SPECIAL_TILE_81: if (gPlayerState.flags & PL_MINISH) { return 0; @@ -320,7 +320,7 @@ u32 UpdatePlayerCollision(void) { gPlayerState.mobility = 1; sub_080A7CFC(position, gPlayerEntity.base.collisionLayer); return 1; - case VVV_26: + case ACT_TILE_26: if ((animationState1 & 0xff) != 0) { return 0; } @@ -334,7 +334,7 @@ u32 UpdatePlayerCollision(void) { gPlayerState.mobility = 1; OpenSmallChest(position, gPlayerEntity.base.collisionLayer); return 2; - case VVV_113: + case ACT_TILE_113: if (HasDungeonSmallKey() == 0) { return 0; } @@ -345,7 +345,7 @@ u32 UpdatePlayerCollision(void) { gPlayerState.mobility = 1; sub_0804B388(position, gPlayerEntity.base.collisionLayer); return 2; - case VVV_61: + case ACT_TILE_61: case SPECIAL_TILE_64 ... SPECIAL_TILE_72: if ((gPlayerState.flags & PL_DRUGGED) != 0) { return 0; @@ -433,7 +433,7 @@ u32 UpdatePlayerCollision(void) { gPlayerEntity.base.y.HALF.LO = 0; gPlayerEntity.base.direction = Direction8FromAnimationState(gPlayerEntity.base.animationState); return 1; - case VVV_114: + case ACT_TILE_114: if ((gPlayerState.field_0x35 & 0x80) != 0) { return 0; } @@ -585,7 +585,7 @@ u32 UpdatePlayerCollision(void) { return 0; } SetTile(SPECIAL_TILE_116, position, gPlayerEntity.base.collisionLayer); - SetVvvAtTilePos(VVV_13, position, gPlayerEntity.base.collisionLayer); + SetActTileAtTilePos(ACT_TILE_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 = GetVvvForTileType(GetTileType(position, gPlayerEntity.base.collisionLayer)); + temp4 = GetActTileForTileType(GetTileTypeAtTilePos(position, gPlayerEntity.base.collisionLayer)); switch (temp4) { case 0x52: break; @@ -643,7 +643,7 @@ bool32 sub_0801A370(MapLayer* mapLayer, u32 position) { topLayer = GetLayerByIndex(LAYER_TOP); offset = gUnk_080B4488[gPlayerEntity.base.animationState >> 1]; pos = position + offset; - tileType = GetTileType(pos, gPlayerEntity.base.collisionLayer); + tileType = GetTileTypeAtTilePos(pos, gPlayerEntity.base.collisionLayer); switch (tileType) { case SPECIAL_TILE_43: pos += offset; @@ -654,7 +654,7 @@ bool32 sub_0801A370(MapLayer* mapLayer, u32 position) { if (topLayer->collisionData[pos - 0x80] == 0x46) { return FALSE; } - switch ((u16)GetVvvForTileType(GetTileType(pos, gPlayerEntity.base.collisionLayer))) { + switch ((u16)GetActTileForTileType(GetTileTypeAtTilePos(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 = GetTileType(pos, gPlayerEntity.base.collisionLayer); - switch (GetVvvForTileType(tileType)) { + tileType = GetTileTypeAtTilePos(pos, gPlayerEntity.base.collisionLayer); + switch (GetActTileForTileType(tileType)) { case 0x52: case 0x26: case 0x27: @@ -777,7 +777,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetTileType(position, this->collisionLayer); + index1 = GetTileTypeAtTilePos(position, this->collisionLayer); if ((index1 - 0x369) > 1) { position = 0xffff; } else { @@ -811,7 +811,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetTileType(position, this->collisionLayer); + index1 = GetTileTypeAtTilePos(position, this->collisionLayer); if (!(index1 == 0x369) && !(index1 == 0x36d)) position = 0xffff; else { @@ -845,7 +845,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetTileType(position, this->collisionLayer); + index1 = GetTileTypeAtTilePos(position, this->collisionLayer); if (!(index1 == 0x369) && !(index1 == 0x36b)) position = 0xffff; else { @@ -879,7 +879,7 @@ u32 sub_0801A570(Entity* this, u32 param_2) { return position; } - index1 = GetTileType(position, this->collisionLayer); + index1 = GetTileTypeAtTilePos(position, this->collisionLayer); if (!(index1 == 0x369) && !(index1 == 0x36c)) position = 0xffff; else { @@ -935,9 +935,9 @@ bool32 sub_0801A980(void) { GetLayerByIndex(gPlayerEntity.base.collisionLayer); // TODO result unused? ptr = &gUnk_080B44A8[gPlayerEntity.base.animationState & 6]; tileType = - GetTileType(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), gPlayerEntity.base.collisionLayer); + GetTileTypeAtTilePos(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), gPlayerEntity.base.collisionLayer); if (tileType < 0x4000) { - GetVvvForTileType(tileType); + GetActTileForTileType(tileType); } return FALSE; } @@ -1007,7 +1007,7 @@ bool32 sub_0801AA58(Entity* this, u32 param_2, u32 param_3) { } void RenderMapLayerToSubTileMap(u16* subTileMap, MapLayer* mapLayer) { - u16* tiles; + u16* subTiles; u16* mapData; u16* mapDataOriginal; u16 tileY; @@ -1035,11 +1035,11 @@ void RenderMapLayerToSubTileMap(u16* subTileMap, MapLayer* mapLayer) { } else { tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer, mapDataOriginal[0]); } - tiles = mapLayer->tiles + tileSetIndex; - subTileMap[0] = tiles[0]; - subTileMap[1] = tiles[1]; - subTileMap[0x80 + 0] = tiles[2]; - subTileMap[0x80 + 1] = tiles[3]; + subTiles = mapLayer->subTiles + tileSetIndex; + subTileMap[0] = subTiles[0]; + subTileMap[1] = subTiles[1]; + subTileMap[0x80 + 0] = subTiles[2]; + subTileMap[0x80 + 1] = subTiles[3]; subTileMap += 2; if (mapData[1] < 0x4000) { @@ -1047,11 +1047,11 @@ void RenderMapLayerToSubTileMap(u16* subTileMap, MapLayer* mapLayer) { } else { tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer + 1, mapDataOriginal[1]); } - tiles = mapLayer->tiles + tileSetIndex; - subTileMap[0] = tiles[0]; - subTileMap[1] = tiles[1]; - subTileMap[0x80 + 0] = tiles[2]; - subTileMap[0x80 + 1] = tiles[3]; + subTiles = mapLayer->subTiles + tileSetIndex; + subTileMap[0] = subTiles[0]; + subTileMap[1] = subTiles[1]; + subTileMap[0x80 + 0] = subTiles[2]; + subTileMap[0x80 + 1] = subTiles[3]; subTileMap += 2; if (mapData[2] < 0x4000) { @@ -1059,11 +1059,11 @@ void RenderMapLayerToSubTileMap(u16* subTileMap, MapLayer* mapLayer) { } else { tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer + 2, mapDataOriginal[2]); } - tiles = mapLayer->tiles + tileSetIndex; - subTileMap[0] = tiles[0]; - subTileMap[1] = tiles[1]; - subTileMap[0x80 + 0] = tiles[2]; - subTileMap[0x80 + 1] = tiles[3]; + subTiles = mapLayer->subTiles + tileSetIndex; + subTileMap[0] = subTiles[0]; + subTileMap[1] = subTiles[1]; + subTileMap[0x80 + 0] = subTiles[2]; + subTileMap[0x80 + 1] = subTiles[3]; subTileMap += 2; if (mapData[3] < 0x4000) { @@ -1071,11 +1071,11 @@ void RenderMapLayerToSubTileMap(u16* subTileMap, MapLayer* mapLayer) { } else { tileSetIndex = GetTileSetIndexForSpecialTile(tilePosAndLayer + 3, mapDataOriginal[3]); } - tiles = mapLayer->tiles + tileSetIndex; - subTileMap[0] = tiles[0]; - subTileMap[1] = tiles[1]; - subTileMap[0x80 + 0] = tiles[2]; - subTileMap[0x80 + 1] = tiles[3]; + subTiles = mapLayer->subTiles + tileSetIndex; + subTileMap[0] = subTiles[0]; + subTileMap[1] = subTiles[1]; + subTileMap[0x80 + 0] = subTiles[2]; + subTileMap[0x80 + 1] = subTiles[3]; subTileMap += 2; mapData += 4; @@ -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 == GetTileType(position, 1)) { + if (ptr->tileType == GetTileTypeAtTilePos(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 == GetTileType(position, 2)) { + if (ptr->tileType == GetTileTypeAtTilePos(position, 2)) { if (gUnk_080B44B8[ptr->unk_a] != 0) { sub_0801AD6C(ptr, position); break; @@ -1187,8 +1187,8 @@ u32 sub_0801AE34(void) { void sub_0801AE44(bool32 loadGfx) { void (*func)(void); - gRoomControls.unk_34 = 0; - sub_0807BFD0(); + gRoomControls.tileset = (u32)NULL; + SetupTileSet(); if (loadGfx != 0) { LoadRoomGfx(); } diff --git a/src/collision.c b/src/collision.c index 60bf067a..a13d28cf 100644 --- a/src/collision.c +++ b/src/collision.c @@ -789,1464 +789,1464 @@ CollisionResult CollisionDefault(Entity* org, Entity* tgt, u32 direction, ColSet return RESULT_COLLISION; } -// vvv for tileType? -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 +// actTile for tileType? +const u8 gMapTileTypeToActTile[] = { + ACT_TILE_0, // TILE_TYPE_0 + ACT_TILE_1, // TILE_TYPE_1 + ACT_TILE_2, // TILE_TYPE_2 + ACT_TILE_3, // TILE_TYPE_3 + ACT_TILE_4, // TILE_TYPE_4 + ACT_TILE_5, // TILE_TYPE_5 + ACT_TILE_6, // TILE_TYPE_6 + ACT_TILE_7, // TILE_TYPE_7 + ACT_TILE_8, // TILE_TYPE_8 + ACT_TILE_9, // TILE_TYPE_9 + ACT_TILE_9, // TILE_TYPE_10 + ACT_TILE_10, // TILE_TYPE_11 + ACT_TILE_9, // TILE_TYPE_12 + ACT_TILE_9, // TILE_TYPE_13 + ACT_TILE_9, // TILE_TYPE_14 + ACT_TILE_9, // TILE_TYPE_15 + ACT_TILE_9, // TILE_TYPE_16 + ACT_TILE_9, // TILE_TYPE_17 + ACT_TILE_11, // TILE_TYPE_18 + ACT_TILE_12, // TILE_TYPE_19 + ACT_TILE_11, // TILE_TYPE_20 + ACT_TILE_11, // TILE_TYPE_21 + ACT_TILE_11, // TILE_TYPE_22 + ACT_TILE_11, // TILE_TYPE_23 + ACT_TILE_11, // TILE_TYPE_24 + ACT_TILE_11, // TILE_TYPE_25 + ACT_TILE_10, // TILE_TYPE_26 + ACT_TILE_10, // TILE_TYPE_27 + ACT_TILE_10, // TILE_TYPE_28 + ACT_TILE_10, // TILE_TYPE_29 + ACT_TILE_10, // TILE_TYPE_30 + ACT_TILE_10, // TILE_TYPE_31 + ACT_TILE_10, // TILE_TYPE_32 + ACT_TILE_10, // TILE_TYPE_33 + ACT_TILE_10, // TILE_TYPE_34 + ACT_TILE_10, // TILE_TYPE_35 + ACT_TILE_10, // TILE_TYPE_36 + ACT_TILE_10, // TILE_TYPE_37 + ACT_TILE_10, // TILE_TYPE_38 + ACT_TILE_10, // TILE_TYPE_39 + ACT_TILE_10, // TILE_TYPE_40 + ACT_TILE_12, // TILE_TYPE_41 + ACT_TILE_12, // TILE_TYPE_42 + ACT_TILE_12, // TILE_TYPE_43 + ACT_TILE_12, // TILE_TYPE_44 + ACT_TILE_12, // TILE_TYPE_45 + ACT_TILE_12, // TILE_TYPE_46 + ACT_TILE_12, // TILE_TYPE_47 + ACT_TILE_12, // TILE_TYPE_48 + ACT_TILE_12, // TILE_TYPE_49 + ACT_TILE_12, // TILE_TYPE_50 + ACT_TILE_12, // TILE_TYPE_51 + ACT_TILE_12, // TILE_TYPE_52 + ACT_TILE_13, // TILE_TYPE_53 + ACT_TILE_14, // TILE_TYPE_54 + ACT_TILE_14, // TILE_TYPE_55 + ACT_TILE_15, // TILE_TYPE_56 + ACT_TILE_16, // TILE_TYPE_57 + ACT_TILE_15, // TILE_TYPE_58 + ACT_TILE_14, // TILE_TYPE_59 + ACT_TILE_17, // TILE_TYPE_60 + ACT_TILE_18, // TILE_TYPE_61 + ACT_TILE_19, // TILE_TYPE_62 + ACT_TILE_20, // TILE_TYPE_63 + ACT_TILE_20, // TILE_TYPE_64 + ACT_TILE_20, // TILE_TYPE_65 + ACT_TILE_20, // TILE_TYPE_66 + ACT_TILE_20, // TILE_TYPE_67 + ACT_TILE_20, // TILE_TYPE_68 + ACT_TILE_20, // TILE_TYPE_69 + ACT_TILE_20, // TILE_TYPE_70 + ACT_TILE_20, // TILE_TYPE_71 + ACT_TILE_20, // TILE_TYPE_72 + ACT_TILE_20, // TILE_TYPE_73 + ACT_TILE_20, // TILE_TYPE_74 + ACT_TILE_20, // TILE_TYPE_75 + ACT_TILE_20, // TILE_TYPE_76 + ACT_TILE_20, // TILE_TYPE_77 + ACT_TILE_20, // TILE_TYPE_78 + ACT_TILE_20, // TILE_TYPE_79 + ACT_TILE_20, // TILE_TYPE_80 + ACT_TILE_20, // TILE_TYPE_81 + ACT_TILE_20, // TILE_TYPE_82 + ACT_TILE_20, // TILE_TYPE_83 + ACT_TILE_20, // TILE_TYPE_84 + ACT_TILE_21, // TILE_TYPE_85 + ACT_TILE_21, // TILE_TYPE_86 + ACT_TILE_21, // TILE_TYPE_87 + ACT_TILE_21, // TILE_TYPE_88 + ACT_TILE_21, // TILE_TYPE_89 + ACT_TILE_21, // TILE_TYPE_90 + ACT_TILE_21, // TILE_TYPE_91 + ACT_TILE_21, // TILE_TYPE_92 + ACT_TILE_21, // TILE_TYPE_93 + ACT_TILE_21, // TILE_TYPE_94 + ACT_TILE_21, // TILE_TYPE_95 + ACT_TILE_21, // TILE_TYPE_96 + ACT_TILE_22, // TILE_TYPE_97 + ACT_TILE_22, // TILE_TYPE_98 + ACT_TILE_22, // TILE_TYPE_99 + ACT_TILE_22, // TILE_TYPE_100 + ACT_TILE_22, // TILE_TYPE_101 + ACT_TILE_22, // TILE_TYPE_102 + ACT_TILE_22, // TILE_TYPE_103 + ACT_TILE_22, // TILE_TYPE_104 + ACT_TILE_23, // TILE_TYPE_105 + ACT_TILE_23, // TILE_TYPE_106 + ACT_TILE_24, // TILE_TYPE_107 + ACT_TILE_24, // TILE_TYPE_108 + ACT_TILE_24, // TILE_TYPE_109 + ACT_TILE_24, // TILE_TYPE_110 + ACT_TILE_0, // TILE_TYPE_111 + ACT_TILE_0, // TILE_TYPE_112 + ACT_TILE_25, // TILE_TYPE_113 + ACT_TILE_25, // TILE_TYPE_114 + ACT_TILE_26, // TILE_TYPE_115 + ACT_TILE_0, // TILE_TYPE_116 + ACT_TILE_0, // TILE_TYPE_117 + ACT_TILE_0, // TILE_TYPE_118 + ACT_TILE_27, // TILE_TYPE_119 + ACT_TILE_28, // TILE_TYPE_120 + ACT_TILE_29, // TILE_TYPE_121 + ACT_TILE_30, // TILE_TYPE_122 + ACT_TILE_31, // TILE_TYPE_123 + ACT_TILE_32, // TILE_TYPE_124 + ACT_TILE_33, // TILE_TYPE_125 + ACT_TILE_34, // TILE_TYPE_126 + ACT_TILE_35, // TILE_TYPE_127 + ACT_TILE_36, // TILE_TYPE_128 + ACT_TILE_0, // TILE_TYPE_129 + ACT_TILE_36, // TILE_TYPE_130 + ACT_TILE_36, // TILE_TYPE_131 + ACT_TILE_36, // TILE_TYPE_132 + ACT_TILE_36, // TILE_TYPE_133 + ACT_TILE_37, // TILE_TYPE_134 + ACT_TILE_38, // TILE_TYPE_135 + ACT_TILE_38, // TILE_TYPE_136 + ACT_TILE_39, // TILE_TYPE_137 + ACT_TILE_39, // TILE_TYPE_138 + ACT_TILE_40, // TILE_TYPE_139 + ACT_TILE_40, // TILE_TYPE_140 + ACT_TILE_40, // TILE_TYPE_141 + ACT_TILE_40, // TILE_TYPE_142 + ACT_TILE_40, // TILE_TYPE_143 + ACT_TILE_40, // TILE_TYPE_144 + ACT_TILE_40, // TILE_TYPE_145 + ACT_TILE_40, // TILE_TYPE_146 + ACT_TILE_40, // TILE_TYPE_147 + ACT_TILE_40, // TILE_TYPE_148 + ACT_TILE_40, // TILE_TYPE_149 + ACT_TILE_40, // TILE_TYPE_150 + ACT_TILE_40, // TILE_TYPE_151 + ACT_TILE_40, // TILE_TYPE_152 + ACT_TILE_40, // TILE_TYPE_153 + ACT_TILE_40, // TILE_TYPE_154 + ACT_TILE_40, // TILE_TYPE_155 + ACT_TILE_40, // TILE_TYPE_156 + ACT_TILE_41, // TILE_TYPE_157 + ACT_TILE_41, // TILE_TYPE_158 + ACT_TILE_40, // TILE_TYPE_159 + ACT_TILE_40, // TILE_TYPE_160 + ACT_TILE_42, // TILE_TYPE_161 + ACT_TILE_41, // TILE_TYPE_162 + ACT_TILE_40, // TILE_TYPE_163 + ACT_TILE_43, // TILE_TYPE_164 + ACT_TILE_41, // TILE_TYPE_165 + ACT_TILE_40, // TILE_TYPE_166 + ACT_TILE_44, // TILE_TYPE_167 + ACT_TILE_41, // TILE_TYPE_168 + ACT_TILE_40, // TILE_TYPE_169 + ACT_TILE_45, // TILE_TYPE_170 + ACT_TILE_0, // TILE_TYPE_171 + ACT_TILE_0, // TILE_TYPE_172 + ACT_TILE_0, // TILE_TYPE_173 + ACT_TILE_0, // TILE_TYPE_174 + ACT_TILE_46, // TILE_TYPE_175 + ACT_TILE_0, // TILE_TYPE_176 + ACT_TILE_0, // TILE_TYPE_177 #ifdef EU - VVV_0, // TILE_TYPE_178 + ACT_TILE_0, // TILE_TYPE_178 #else - VVV_41, // TILE_TYPE_178 + ACT_TILE_41, // TILE_TYPE_178 #endif - VVV_0, // TILE_TYPE_179 - VVV_0, // TILE_TYPE_180 + ACT_TILE_0, // TILE_TYPE_179 + ACT_TILE_0, // TILE_TYPE_180 #ifdef EU - VVV_0, // TILE_TYPE_181 + ACT_TILE_0, // TILE_TYPE_181 #else - VVV_41, // TILE_TYPE_181 + ACT_TILE_41, // TILE_TYPE_181 #endif - 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 + ACT_TILE_40, // TILE_TYPE_182 + ACT_TILE_0, // TILE_TYPE_183 + ACT_TILE_42, // TILE_TYPE_184 + ACT_TILE_42, // TILE_TYPE_185 + ACT_TILE_42, // TILE_TYPE_186 + ACT_TILE_0, // TILE_TYPE_187 + ACT_TILE_0, // TILE_TYPE_188 + ACT_TILE_0, // TILE_TYPE_189 + ACT_TILE_0, // TILE_TYPE_190 + ACT_TILE_46, // TILE_TYPE_191 + ACT_TILE_0, // TILE_TYPE_192 + ACT_TILE_0, // TILE_TYPE_193 #ifdef EU - VVV_0, // TILE_TYPE_194 + ACT_TILE_0, // TILE_TYPE_194 #else - VVV_41, // TILE_TYPE_194 + ACT_TILE_41, // TILE_TYPE_194 #endif - VVV_0, // TILE_TYPE_195 - VVV_0, // TILE_TYPE_196 + ACT_TILE_0, // TILE_TYPE_195 + ACT_TILE_0, // TILE_TYPE_196 #ifdef EU - VVV_0, // TILE_TYPE_197 + ACT_TILE_0, // TILE_TYPE_197 #else - VVV_41, // TILE_TYPE_197 + ACT_TILE_41, // TILE_TYPE_197 #endif - 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 + ACT_TILE_40, // TILE_TYPE_198 + ACT_TILE_0, // TILE_TYPE_199 + ACT_TILE_42, // TILE_TYPE_200 + ACT_TILE_42, // TILE_TYPE_201 + ACT_TILE_42, // TILE_TYPE_202 + ACT_TILE_0, // TILE_TYPE_203 + ACT_TILE_46, // TILE_TYPE_204 + ACT_TILE_0, // TILE_TYPE_205 + ACT_TILE_0, // TILE_TYPE_206 + ACT_TILE_0, // TILE_TYPE_207 + ACT_TILE_0, // TILE_TYPE_208 + ACT_TILE_0, // TILE_TYPE_209 #ifdef EU - VVV_0, // TILE_TYPE_210 + ACT_TILE_0, // TILE_TYPE_210 #else - VVV_41, // TILE_TYPE_210 + ACT_TILE_41, // TILE_TYPE_210 #endif - VVV_40, // TILE_TYPE_211 - VVV_0, // TILE_TYPE_212 - VVV_0, // TILE_TYPE_213 + ACT_TILE_40, // TILE_TYPE_211 + ACT_TILE_0, // TILE_TYPE_212 + ACT_TILE_0, // TILE_TYPE_213 #ifdef EU - VVV_0, // TILE_TYPE_214 + ACT_TILE_0, // TILE_TYPE_214 #else - VVV_41, // TILE_TYPE_214 + ACT_TILE_41, // TILE_TYPE_214 #endif - 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 + ACT_TILE_0, // TILE_TYPE_215 + ACT_TILE_43, // TILE_TYPE_216 + ACT_TILE_43, // TILE_TYPE_217 + ACT_TILE_43, // TILE_TYPE_218 + ACT_TILE_0, // TILE_TYPE_219 + ACT_TILE_0, // TILE_TYPE_220 + ACT_TILE_0, // TILE_TYPE_221 + ACT_TILE_0, // TILE_TYPE_222 + ACT_TILE_46, // TILE_TYPE_223 + ACT_TILE_0, // TILE_TYPE_224 + ACT_TILE_0, // TILE_TYPE_225 #ifdef EU - VVV_0, // TILE_TYPE_226 + ACT_TILE_0, // TILE_TYPE_226 #else - VVV_41, // TILE_TYPE_226 + ACT_TILE_41, // TILE_TYPE_226 #endif - VVV_0, // TILE_TYPE_227 - VVV_0, // TILE_TYPE_228 + ACT_TILE_0, // TILE_TYPE_227 + ACT_TILE_0, // TILE_TYPE_228 #ifdef EU - VVV_0, // TILE_TYPE_229 + ACT_TILE_0, // TILE_TYPE_229 #else - VVV_41, // TILE_TYPE_229 + ACT_TILE_41, // TILE_TYPE_229 #endif - 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 + ACT_TILE_40, // TILE_TYPE_230 + ACT_TILE_0, // TILE_TYPE_231 + ACT_TILE_44, // TILE_TYPE_232 + ACT_TILE_44, // TILE_TYPE_233 + ACT_TILE_44, // TILE_TYPE_234 + ACT_TILE_0, // TILE_TYPE_235 + ACT_TILE_46, // TILE_TYPE_236 + ACT_TILE_0, // TILE_TYPE_237 + ACT_TILE_0, // TILE_TYPE_238 + ACT_TILE_0, // TILE_TYPE_239 + ACT_TILE_0, // TILE_TYPE_240 + ACT_TILE_0, // TILE_TYPE_241 #ifdef EU - VVV_0, // TILE_TYPE_242 + ACT_TILE_0, // TILE_TYPE_242 #else - VVV_41, // TILE_TYPE_242 + ACT_TILE_41, // TILE_TYPE_242 #endif - VVV_40, // TILE_TYPE_243 - VVV_0, // TILE_TYPE_244 - VVV_0, // TILE_TYPE_245 + ACT_TILE_40, // TILE_TYPE_243 + ACT_TILE_0, // TILE_TYPE_244 + ACT_TILE_0, // TILE_TYPE_245 #ifdef EU - VVV_0, // TILE_TYPE_246 + ACT_TILE_0, // TILE_TYPE_246 #else - VVV_41, // TILE_TYPE_246 + ACT_TILE_41, // TILE_TYPE_246 #endif - 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 + ACT_TILE_0, // TILE_TYPE_247 + ACT_TILE_45, // TILE_TYPE_248 + ACT_TILE_45, // TILE_TYPE_249 + ACT_TILE_45, // TILE_TYPE_250 + ACT_TILE_0, // TILE_TYPE_251 + ACT_TILE_0, // TILE_TYPE_252 + ACT_TILE_0, // TILE_TYPE_253 + ACT_TILE_0, // TILE_TYPE_254 + ACT_TILE_46, // TILE_TYPE_255 + ACT_TILE_0, // TILE_TYPE_256 + ACT_TILE_0, // TILE_TYPE_257 + ACT_TILE_0, // TILE_TYPE_258 + ACT_TILE_0, // TILE_TYPE_259 + ACT_TILE_0, // TILE_TYPE_260 + ACT_TILE_46, // TILE_TYPE_261 + ACT_TILE_0, // TILE_TYPE_262 + ACT_TILE_0, // TILE_TYPE_263 + ACT_TILE_46, // TILE_TYPE_264 + ACT_TILE_0, // TILE_TYPE_265 + ACT_TILE_0, // TILE_TYPE_266 + ACT_TILE_0, // TILE_TYPE_267 + ACT_TILE_0, // TILE_TYPE_268 + ACT_TILE_0, // TILE_TYPE_269 + ACT_TILE_0, // TILE_TYPE_270 + ACT_TILE_0, // TILE_TYPE_271 + ACT_TILE_46, // TILE_TYPE_272 + ACT_TILE_0, // TILE_TYPE_273 + ACT_TILE_0, // TILE_TYPE_274 + ACT_TILE_0, // TILE_TYPE_275 + ACT_TILE_0, // TILE_TYPE_276 + ACT_TILE_46, // TILE_TYPE_277 + ACT_TILE_0, // TILE_TYPE_278 + ACT_TILE_0, // TILE_TYPE_279 + ACT_TILE_0, // TILE_TYPE_280 + ACT_TILE_0, // TILE_TYPE_281 + ACT_TILE_0, // TILE_TYPE_282 + ACT_TILE_0, // TILE_TYPE_283 + ACT_TILE_0, // TILE_TYPE_284 + ACT_TILE_0, // TILE_TYPE_285 + ACT_TILE_0, // TILE_TYPE_286 + ACT_TILE_0, // TILE_TYPE_287 + ACT_TILE_0, // TILE_TYPE_288 + ACT_TILE_0, // TILE_TYPE_289 + ACT_TILE_0, // TILE_TYPE_290 + ACT_TILE_0, // TILE_TYPE_291 + ACT_TILE_0, // TILE_TYPE_292 + ACT_TILE_0, // TILE_TYPE_293 + ACT_TILE_0, // TILE_TYPE_294 + ACT_TILE_0, // TILE_TYPE_295 + ACT_TILE_0, // TILE_TYPE_296 + ACT_TILE_0, // TILE_TYPE_297 + ACT_TILE_0, // TILE_TYPE_298 + ACT_TILE_0, // TILE_TYPE_299 + ACT_TILE_0, // TILE_TYPE_300 + ACT_TILE_0, // TILE_TYPE_301 + ACT_TILE_0, // TILE_TYPE_302 + ACT_TILE_0, // TILE_TYPE_303 + ACT_TILE_0, // TILE_TYPE_304 + ACT_TILE_0, // TILE_TYPE_305 + ACT_TILE_0, // TILE_TYPE_306 + ACT_TILE_0, // TILE_TYPE_307 + ACT_TILE_0, // TILE_TYPE_308 + ACT_TILE_0, // TILE_TYPE_309 + ACT_TILE_0, // TILE_TYPE_310 + ACT_TILE_0, // TILE_TYPE_311 + ACT_TILE_0, // TILE_TYPE_312 + ACT_TILE_0, // TILE_TYPE_313 + ACT_TILE_0, // TILE_TYPE_314 + ACT_TILE_0, // TILE_TYPE_315 + ACT_TILE_0, // TILE_TYPE_316 + ACT_TILE_0, // TILE_TYPE_317 + ACT_TILE_0, // TILE_TYPE_318 + ACT_TILE_0, // TILE_TYPE_319 + ACT_TILE_0, // TILE_TYPE_320 + ACT_TILE_0, // TILE_TYPE_321 + ACT_TILE_0, // TILE_TYPE_322 + ACT_TILE_0, // TILE_TYPE_323 + ACT_TILE_0, // TILE_TYPE_324 + ACT_TILE_0, // TILE_TYPE_325 + ACT_TILE_0, // TILE_TYPE_326 + ACT_TILE_0, // TILE_TYPE_327 + ACT_TILE_0, // TILE_TYPE_328 + ACT_TILE_0, // TILE_TYPE_329 + ACT_TILE_0, // TILE_TYPE_330 + ACT_TILE_0, // TILE_TYPE_331 + ACT_TILE_0, // TILE_TYPE_332 + ACT_TILE_0, // TILE_TYPE_333 + ACT_TILE_0, // TILE_TYPE_334 + ACT_TILE_0, // TILE_TYPE_335 + ACT_TILE_0, // TILE_TYPE_336 + ACT_TILE_0, // TILE_TYPE_337 + ACT_TILE_0, // TILE_TYPE_338 + ACT_TILE_0, // TILE_TYPE_339 + ACT_TILE_0, // TILE_TYPE_340 + ACT_TILE_0, // TILE_TYPE_341 + ACT_TILE_0, // TILE_TYPE_342 + ACT_TILE_0, // TILE_TYPE_343 + ACT_TILE_0, // TILE_TYPE_344 + ACT_TILE_0, // TILE_TYPE_345 + ACT_TILE_0, // TILE_TYPE_346 + ACT_TILE_0, // TILE_TYPE_347 + ACT_TILE_0, // TILE_TYPE_348 + ACT_TILE_0, // TILE_TYPE_349 + ACT_TILE_0, // TILE_TYPE_350 + ACT_TILE_0, // TILE_TYPE_351 + ACT_TILE_0, // TILE_TYPE_352 + ACT_TILE_47, // TILE_TYPE_353 + ACT_TILE_47, // TILE_TYPE_354 + ACT_TILE_47, // TILE_TYPE_355 + ACT_TILE_0, // TILE_TYPE_356 + ACT_TILE_0, // TILE_TYPE_357 + ACT_TILE_40, // TILE_TYPE_358 + ACT_TILE_0, // TILE_TYPE_359 + ACT_TILE_40, // TILE_TYPE_360 + ACT_TILE_48, // TILE_TYPE_361 + ACT_TILE_49, // TILE_TYPE_362 + ACT_TILE_50, // TILE_TYPE_363 + ACT_TILE_51, // TILE_TYPE_364 + ACT_TILE_52, // TILE_TYPE_365 + ACT_TILE_52, // TILE_TYPE_366 + ACT_TILE_53, // TILE_TYPE_367 + ACT_TILE_53, // TILE_TYPE_368 + ACT_TILE_54, // TILE_TYPE_369 + ACT_TILE_55, // TILE_TYPE_370 + ACT_TILE_0, // TILE_TYPE_371 + ACT_TILE_56, // TILE_TYPE_372 + ACT_TILE_57, // TILE_TYPE_373 + ACT_TILE_58, // TILE_TYPE_374 + ACT_TILE_59, // TILE_TYPE_375 + ACT_TILE_0, // TILE_TYPE_376 + ACT_TILE_0, // TILE_TYPE_377 + ACT_TILE_60, // TILE_TYPE_378 + ACT_TILE_60, // TILE_TYPE_379 + ACT_TILE_60, // TILE_TYPE_380 + ACT_TILE_60, // TILE_TYPE_381 + ACT_TILE_0, // TILE_TYPE_382 + ACT_TILE_0, // TILE_TYPE_383 + ACT_TILE_0, // TILE_TYPE_384 + ACT_TILE_0, // TILE_TYPE_385 + ACT_TILE_61, // TILE_TYPE_386 + ACT_TILE_61, // TILE_TYPE_387 + ACT_TILE_62, // TILE_TYPE_388 + ACT_TILE_9, // TILE_TYPE_389 + ACT_TILE_9, // TILE_TYPE_390 + ACT_TILE_9, // TILE_TYPE_391 + ACT_TILE_9, // TILE_TYPE_392 + ACT_TILE_9, // TILE_TYPE_393 + ACT_TILE_9, // TILE_TYPE_394 + ACT_TILE_61, // TILE_TYPE_395 + ACT_TILE_61, // TILE_TYPE_396 + ACT_TILE_61, // TILE_TYPE_397 + ACT_TILE_9, // TILE_TYPE_398 + ACT_TILE_9, // TILE_TYPE_399 + ACT_TILE_61, // TILE_TYPE_400 + ACT_TILE_61, // TILE_TYPE_401 + ACT_TILE_61, // TILE_TYPE_402 + ACT_TILE_9, // TILE_TYPE_403 + ACT_TILE_9, // TILE_TYPE_404 + ACT_TILE_9, // TILE_TYPE_405 + ACT_TILE_9, // TILE_TYPE_406 + ACT_TILE_9, // TILE_TYPE_407 + ACT_TILE_9, // TILE_TYPE_408 + ACT_TILE_0, // TILE_TYPE_409 + ACT_TILE_0, // TILE_TYPE_410 + ACT_TILE_0, // TILE_TYPE_411 + ACT_TILE_0, // TILE_TYPE_412 + ACT_TILE_63, // TILE_TYPE_413 + ACT_TILE_0, // TILE_TYPE_414 + ACT_TILE_0, // TILE_TYPE_415 + ACT_TILE_0, // TILE_TYPE_416 + ACT_TILE_0, // TILE_TYPE_417 + ACT_TILE_0, // TILE_TYPE_418 + ACT_TILE_0, // TILE_TYPE_419 + ACT_TILE_0, // TILE_TYPE_420 + ACT_TILE_0, // TILE_TYPE_421 + ACT_TILE_63, // TILE_TYPE_422 + ACT_TILE_0, // TILE_TYPE_423 + ACT_TILE_0, // TILE_TYPE_424 + ACT_TILE_0, // TILE_TYPE_425 + ACT_TILE_0, // TILE_TYPE_426 + ACT_TILE_0, // TILE_TYPE_427 + ACT_TILE_42, // TILE_TYPE_428 + ACT_TILE_43, // TILE_TYPE_429 + ACT_TILE_44, // TILE_TYPE_430 + ACT_TILE_45, // TILE_TYPE_431 + ACT_TILE_0, // TILE_TYPE_432 + ACT_TILE_0, // TILE_TYPE_433 + ACT_TILE_0, // TILE_TYPE_434 + ACT_TILE_0, // TILE_TYPE_435 + ACT_TILE_64, // TILE_TYPE_436 + ACT_TILE_65, // TILE_TYPE_437 + ACT_TILE_66, // TILE_TYPE_438 + ACT_TILE_67, // TILE_TYPE_439 + ACT_TILE_68, // TILE_TYPE_440 + ACT_TILE_69, // TILE_TYPE_441 + ACT_TILE_70, // TILE_TYPE_442 + ACT_TILE_71, // TILE_TYPE_443 + ACT_TILE_72, // TILE_TYPE_444 + ACT_TILE_73, // TILE_TYPE_445 + ACT_TILE_74, // TILE_TYPE_446 + ACT_TILE_75, // TILE_TYPE_447 + ACT_TILE_76, // TILE_TYPE_448 + ACT_TILE_77, // TILE_TYPE_449 + ACT_TILE_78, // TILE_TYPE_450 + ACT_TILE_79, // TILE_TYPE_451 + ACT_TILE_80, // TILE_TYPE_452 + ACT_TILE_81, // TILE_TYPE_453 + ACT_TILE_82, // TILE_TYPE_454 + ACT_TILE_83, // TILE_TYPE_455 + ACT_TILE_63, // TILE_TYPE_456 + ACT_TILE_0, // TILE_TYPE_457 + ACT_TILE_63, // TILE_TYPE_458 + ACT_TILE_83, // TILE_TYPE_459 + ACT_TILE_83, // TILE_TYPE_460 + ACT_TILE_0, // TILE_TYPE_461 + ACT_TILE_0, // TILE_TYPE_462 + ACT_TILE_43, // TILE_TYPE_463 + ACT_TILE_43, // TILE_TYPE_464 + ACT_TILE_43, // TILE_TYPE_465 + ACT_TILE_0, // TILE_TYPE_466 + ACT_TILE_21, // TILE_TYPE_467 + ACT_TILE_21, // TILE_TYPE_468 + ACT_TILE_21, // TILE_TYPE_469 + ACT_TILE_21, // TILE_TYPE_470 + ACT_TILE_0, // TILE_TYPE_471 + ACT_TILE_0, // TILE_TYPE_472 + ACT_TILE_0, // TILE_TYPE_473 + ACT_TILE_0, // TILE_TYPE_474 + ACT_TILE_0, // TILE_TYPE_475 + ACT_TILE_0, // TILE_TYPE_476 + ACT_TILE_0, // TILE_TYPE_477 + ACT_TILE_0, // TILE_TYPE_478 + ACT_TILE_0, // TILE_TYPE_479 + ACT_TILE_0, // TILE_TYPE_480 + ACT_TILE_0, // TILE_TYPE_481 + ACT_TILE_0, // TILE_TYPE_482 + ACT_TILE_0, // TILE_TYPE_483 + ACT_TILE_0, // TILE_TYPE_484 + ACT_TILE_0, // TILE_TYPE_485 + ACT_TILE_0, // TILE_TYPE_486 + ACT_TILE_84, // TILE_TYPE_487 + ACT_TILE_0, // TILE_TYPE_488 + ACT_TILE_0, // TILE_TYPE_489 + ACT_TILE_0, // TILE_TYPE_490 + ACT_TILE_0, // TILE_TYPE_491 + ACT_TILE_0, // TILE_TYPE_492 + ACT_TILE_0, // TILE_TYPE_493 + ACT_TILE_0, // TILE_TYPE_494 + ACT_TILE_0, // TILE_TYPE_495 + ACT_TILE_0, // TILE_TYPE_496 + ACT_TILE_0, // TILE_TYPE_497 + ACT_TILE_0, // TILE_TYPE_498 + ACT_TILE_0, // TILE_TYPE_499 + ACT_TILE_0, // TILE_TYPE_500 + ACT_TILE_0, // TILE_TYPE_501 + ACT_TILE_0, // TILE_TYPE_502 + ACT_TILE_0, // TILE_TYPE_503 + ACT_TILE_0, // TILE_TYPE_504 + ACT_TILE_0, // TILE_TYPE_505 + ACT_TILE_0, // TILE_TYPE_506 + ACT_TILE_0, // TILE_TYPE_507 + ACT_TILE_0, // TILE_TYPE_508 + ACT_TILE_0, // TILE_TYPE_509 + ACT_TILE_0, // TILE_TYPE_510 + ACT_TILE_0, // TILE_TYPE_511 + ACT_TILE_0, // TILE_TYPE_512 + ACT_TILE_0, // TILE_TYPE_513 + ACT_TILE_0, // TILE_TYPE_514 + ACT_TILE_0, // TILE_TYPE_515 + ACT_TILE_0, // TILE_TYPE_516 + ACT_TILE_0, // TILE_TYPE_517 + ACT_TILE_0, // TILE_TYPE_518 + ACT_TILE_0, // TILE_TYPE_519 + ACT_TILE_0, // TILE_TYPE_520 + ACT_TILE_0, // TILE_TYPE_521 + ACT_TILE_0, // TILE_TYPE_522 + ACT_TILE_0, // TILE_TYPE_523 + ACT_TILE_40, // TILE_TYPE_524 + ACT_TILE_0, // TILE_TYPE_525 + ACT_TILE_0, // TILE_TYPE_526 + ACT_TILE_0, // TILE_TYPE_527 + ACT_TILE_0, // TILE_TYPE_528 + ACT_TILE_0, // TILE_TYPE_529 + ACT_TILE_0, // TILE_TYPE_530 + ACT_TILE_0, // TILE_TYPE_531 + ACT_TILE_0, // TILE_TYPE_532 + ACT_TILE_0, // TILE_TYPE_533 + ACT_TILE_0, // TILE_TYPE_534 + ACT_TILE_0, // TILE_TYPE_535 + ACT_TILE_0, // TILE_TYPE_536 + ACT_TILE_0, // TILE_TYPE_537 + ACT_TILE_0, // TILE_TYPE_538 + ACT_TILE_0, // TILE_TYPE_539 + ACT_TILE_0, // TILE_TYPE_540 + ACT_TILE_0, // TILE_TYPE_541 + ACT_TILE_0, // TILE_TYPE_542 + ACT_TILE_0, // TILE_TYPE_543 + ACT_TILE_0, // TILE_TYPE_544 + ACT_TILE_0, // TILE_TYPE_545 + ACT_TILE_0, // TILE_TYPE_546 + ACT_TILE_0, // TILE_TYPE_547 + ACT_TILE_0, // TILE_TYPE_548 + ACT_TILE_40, // TILE_TYPE_549 + ACT_TILE_0, // TILE_TYPE_550 + ACT_TILE_0, // TILE_TYPE_551 + ACT_TILE_0, // TILE_TYPE_552 + ACT_TILE_0, // TILE_TYPE_553 + ACT_TILE_0, // TILE_TYPE_554 + ACT_TILE_0, // TILE_TYPE_555 + ACT_TILE_0, // TILE_TYPE_556 + ACT_TILE_0, // TILE_TYPE_557 + ACT_TILE_0, // TILE_TYPE_558 + ACT_TILE_0, // TILE_TYPE_559 + ACT_TILE_0, // TILE_TYPE_560 + ACT_TILE_0, // TILE_TYPE_561 + ACT_TILE_16, // TILE_TYPE_562 + ACT_TILE_16, // TILE_TYPE_563 + ACT_TILE_16, // TILE_TYPE_564 + ACT_TILE_16, // TILE_TYPE_565 + ACT_TILE_16, // TILE_TYPE_566 + ACT_TILE_16, // TILE_TYPE_567 + ACT_TILE_16, // TILE_TYPE_568 + ACT_TILE_16, // TILE_TYPE_569 + ACT_TILE_16, // TILE_TYPE_570 + ACT_TILE_16, // TILE_TYPE_571 + ACT_TILE_16, // TILE_TYPE_572 + ACT_TILE_16, // TILE_TYPE_573 + ACT_TILE_16, // TILE_TYPE_574 + ACT_TILE_16, // TILE_TYPE_575 + ACT_TILE_16, // TILE_TYPE_576 + ACT_TILE_16, // TILE_TYPE_577 + ACT_TILE_16, // TILE_TYPE_578 + ACT_TILE_16, // TILE_TYPE_579 + ACT_TILE_16, // TILE_TYPE_580 + ACT_TILE_16, // TILE_TYPE_581 + ACT_TILE_16, // TILE_TYPE_582 + ACT_TILE_16, // TILE_TYPE_583 + ACT_TILE_16, // TILE_TYPE_584 + ACT_TILE_16, // TILE_TYPE_585 + ACT_TILE_16, // TILE_TYPE_586 + ACT_TILE_16, // TILE_TYPE_587 + ACT_TILE_16, // TILE_TYPE_588 + ACT_TILE_16, // TILE_TYPE_589 + ACT_TILE_85, // TILE_TYPE_590 + ACT_TILE_85, // TILE_TYPE_591 + ACT_TILE_85, // TILE_TYPE_592 + ACT_TILE_85, // TILE_TYPE_593 + ACT_TILE_85, // TILE_TYPE_594 + ACT_TILE_85, // TILE_TYPE_595 + ACT_TILE_85, // TILE_TYPE_596 + ACT_TILE_85, // TILE_TYPE_597 + ACT_TILE_85, // TILE_TYPE_598 + ACT_TILE_0, // TILE_TYPE_599 + ACT_TILE_0, // TILE_TYPE_600 + ACT_TILE_0, // TILE_TYPE_601 + ACT_TILE_0, // TILE_TYPE_602 + ACT_TILE_0, // TILE_TYPE_603 + ACT_TILE_0, // TILE_TYPE_604 + ACT_TILE_0, // TILE_TYPE_605 + ACT_TILE_0, // TILE_TYPE_606 + ACT_TILE_0, // TILE_TYPE_607 + ACT_TILE_0, // TILE_TYPE_608 + ACT_TILE_0, // TILE_TYPE_609 + ACT_TILE_9, // TILE_TYPE_610 + ACT_TILE_9, // TILE_TYPE_611 + ACT_TILE_0, // TILE_TYPE_612 + ACT_TILE_0, // TILE_TYPE_613 + ACT_TILE_0, // TILE_TYPE_614 + ACT_TILE_86, // TILE_TYPE_615 + ACT_TILE_0, // TILE_TYPE_616 + ACT_TILE_0, // TILE_TYPE_617 + ACT_TILE_86, // TILE_TYPE_618 + ACT_TILE_0, // TILE_TYPE_619 + ACT_TILE_0, // TILE_TYPE_620 + ACT_TILE_41, // TILE_TYPE_621 + ACT_TILE_0, // TILE_TYPE_622 + ACT_TILE_0, // TILE_TYPE_623 + ACT_TILE_41, // TILE_TYPE_624 + ACT_TILE_40, // TILE_TYPE_625 + ACT_TILE_0, // TILE_TYPE_626 + ACT_TILE_0, // TILE_TYPE_627 + ACT_TILE_0, // TILE_TYPE_628 + ACT_TILE_0, // TILE_TYPE_629 + ACT_TILE_0, // TILE_TYPE_630 + ACT_TILE_86, // TILE_TYPE_631 + ACT_TILE_0, // TILE_TYPE_632 + ACT_TILE_0, // TILE_TYPE_633 + ACT_TILE_86, // TILE_TYPE_634 + ACT_TILE_0, // TILE_TYPE_635 + ACT_TILE_0, // TILE_TYPE_636 + ACT_TILE_41, // TILE_TYPE_637 + ACT_TILE_0, // TILE_TYPE_638 + ACT_TILE_0, // TILE_TYPE_639 + ACT_TILE_41, // TILE_TYPE_640 + ACT_TILE_40, // TILE_TYPE_641 + ACT_TILE_0, // TILE_TYPE_642 + ACT_TILE_0, // TILE_TYPE_643 + ACT_TILE_0, // TILE_TYPE_644 + ACT_TILE_0, // TILE_TYPE_645 + ACT_TILE_0, // TILE_TYPE_646 + ACT_TILE_86, // TILE_TYPE_647 + ACT_TILE_0, // TILE_TYPE_648 + ACT_TILE_0, // TILE_TYPE_649 + ACT_TILE_86, // TILE_TYPE_650 + ACT_TILE_0, // TILE_TYPE_651 + ACT_TILE_0, // TILE_TYPE_652 #ifdef EU - VVV_0, // TILE_TYPE_653 + ACT_TILE_0, // TILE_TYPE_653 #else - VVV_41, // TILE_TYPE_653 + ACT_TILE_41, // TILE_TYPE_653 #endif - VVV_0, // TILE_TYPE_654 - VVV_0, // TILE_TYPE_655 + ACT_TILE_0, // TILE_TYPE_654 + ACT_TILE_0, // TILE_TYPE_655 #ifdef EU - VVV_0, // TILE_TYPE_656 + ACT_TILE_0, // TILE_TYPE_656 #else - VVV_41, // TILE_TYPE_656 + ACT_TILE_41, // TILE_TYPE_656 #endif - 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 + ACT_TILE_40, // TILE_TYPE_657 + ACT_TILE_0, // TILE_TYPE_658 + ACT_TILE_0, // TILE_TYPE_659 + ACT_TILE_0, // TILE_TYPE_660 + ACT_TILE_0, // TILE_TYPE_661 + ACT_TILE_86, // TILE_TYPE_662 + ACT_TILE_86, // TILE_TYPE_663 + ACT_TILE_86, // TILE_TYPE_664 + ACT_TILE_86, // TILE_TYPE_665 + ACT_TILE_86, // TILE_TYPE_666 + ACT_TILE_86, // TILE_TYPE_667 + ACT_TILE_86, // TILE_TYPE_668 + ACT_TILE_86, // TILE_TYPE_669 + ACT_TILE_86, // TILE_TYPE_670 + ACT_TILE_86, // TILE_TYPE_671 + ACT_TILE_86, // TILE_TYPE_672 + ACT_TILE_86, // TILE_TYPE_673 + ACT_TILE_86, // TILE_TYPE_674 + ACT_TILE_86, // TILE_TYPE_675 + ACT_TILE_86, // TILE_TYPE_676 + ACT_TILE_86, // TILE_TYPE_677 + ACT_TILE_86, // TILE_TYPE_678 + ACT_TILE_86, // TILE_TYPE_679 + ACT_TILE_86, // TILE_TYPE_680 + ACT_TILE_86, // TILE_TYPE_681 + ACT_TILE_86, // TILE_TYPE_682 + ACT_TILE_86, // TILE_TYPE_683 + ACT_TILE_86, // TILE_TYPE_684 + ACT_TILE_86, // TILE_TYPE_685 + ACT_TILE_86, // TILE_TYPE_686 + ACT_TILE_86, // TILE_TYPE_687 + ACT_TILE_86, // TILE_TYPE_688 + ACT_TILE_86, // TILE_TYPE_689 + ACT_TILE_86, // TILE_TYPE_690 + ACT_TILE_86, // TILE_TYPE_691 + ACT_TILE_86, // TILE_TYPE_692 + ACT_TILE_86, // TILE_TYPE_693 + ACT_TILE_86, // TILE_TYPE_694 + ACT_TILE_86, // TILE_TYPE_695 + ACT_TILE_86, // TILE_TYPE_696 + ACT_TILE_86, // TILE_TYPE_697 + ACT_TILE_86, // TILE_TYPE_698 + ACT_TILE_86, // TILE_TYPE_699 + ACT_TILE_86, // TILE_TYPE_700 + ACT_TILE_86, // TILE_TYPE_701 + ACT_TILE_86, // TILE_TYPE_702 + ACT_TILE_86, // TILE_TYPE_703 + ACT_TILE_86, // TILE_TYPE_704 + ACT_TILE_86, // TILE_TYPE_705 + ACT_TILE_86, // TILE_TYPE_706 + ACT_TILE_86, // TILE_TYPE_707 + ACT_TILE_86, // TILE_TYPE_708 + ACT_TILE_86, // TILE_TYPE_709 + ACT_TILE_86, // TILE_TYPE_710 + ACT_TILE_86, // TILE_TYPE_711 + ACT_TILE_86, // TILE_TYPE_712 + ACT_TILE_86, // TILE_TYPE_713 + ACT_TILE_86, // TILE_TYPE_714 + ACT_TILE_86, // TILE_TYPE_715 + ACT_TILE_86, // TILE_TYPE_716 + ACT_TILE_86, // TILE_TYPE_717 + ACT_TILE_86, // TILE_TYPE_718 + ACT_TILE_86, // TILE_TYPE_719 + ACT_TILE_86, // TILE_TYPE_720 + ACT_TILE_86, // TILE_TYPE_721 + ACT_TILE_86, // TILE_TYPE_722 + ACT_TILE_86, // TILE_TYPE_723 + ACT_TILE_86, // TILE_TYPE_724 + ACT_TILE_86, // TILE_TYPE_725 + ACT_TILE_86, // TILE_TYPE_726 + ACT_TILE_86, // TILE_TYPE_727 + ACT_TILE_86, // TILE_TYPE_728 + ACT_TILE_86, // TILE_TYPE_729 + ACT_TILE_86, // TILE_TYPE_730 + ACT_TILE_86, // TILE_TYPE_731 + ACT_TILE_86, // TILE_TYPE_732 + ACT_TILE_86, // TILE_TYPE_733 + ACT_TILE_86, // TILE_TYPE_734 + ACT_TILE_86, // TILE_TYPE_735 + ACT_TILE_86, // TILE_TYPE_736 + ACT_TILE_86, // TILE_TYPE_737 + ACT_TILE_86, // TILE_TYPE_738 + ACT_TILE_86, // TILE_TYPE_739 + ACT_TILE_86, // TILE_TYPE_740 + ACT_TILE_86, // TILE_TYPE_741 + ACT_TILE_86, // TILE_TYPE_742 + ACT_TILE_86, // TILE_TYPE_743 + ACT_TILE_86, // TILE_TYPE_744 + ACT_TILE_86, // TILE_TYPE_745 + ACT_TILE_86, // TILE_TYPE_746 + ACT_TILE_86, // TILE_TYPE_747 + ACT_TILE_86, // TILE_TYPE_748 + ACT_TILE_86, // TILE_TYPE_749 + ACT_TILE_86, // TILE_TYPE_750 + ACT_TILE_86, // TILE_TYPE_751 + ACT_TILE_86, // TILE_TYPE_752 + ACT_TILE_86, // TILE_TYPE_753 + ACT_TILE_10, // TILE_TYPE_754 + ACT_TILE_9, // TILE_TYPE_755 + ACT_TILE_10, // TILE_TYPE_756 + ACT_TILE_10, // TILE_TYPE_757 + ACT_TILE_13, // TILE_TYPE_758 + ACT_TILE_0, // TILE_TYPE_759 + ACT_TILE_0, // TILE_TYPE_760 + ACT_TILE_0, // TILE_TYPE_761 + ACT_TILE_0, // TILE_TYPE_762 + ACT_TILE_63, // TILE_TYPE_763 + ACT_TILE_0, // TILE_TYPE_764 + ACT_TILE_0, // TILE_TYPE_765 + ACT_TILE_0, // TILE_TYPE_766 + ACT_TILE_0, // TILE_TYPE_767 + ACT_TILE_0, // TILE_TYPE_768 + ACT_TILE_0, // TILE_TYPE_769 + ACT_TILE_0, // TILE_TYPE_770 + ACT_TILE_0, // TILE_TYPE_771 + ACT_TILE_0, // TILE_TYPE_772 + ACT_TILE_0, // TILE_TYPE_773 + ACT_TILE_0, // TILE_TYPE_774 + ACT_TILE_0, // TILE_TYPE_775 + ACT_TILE_0, // TILE_TYPE_776 + ACT_TILE_0, // TILE_TYPE_777 + ACT_TILE_0, // TILE_TYPE_778 + ACT_TILE_0, // TILE_TYPE_779 + ACT_TILE_0, // TILE_TYPE_780 + ACT_TILE_16, // TILE_TYPE_781 + ACT_TILE_16, // TILE_TYPE_782 + ACT_TILE_0, // TILE_TYPE_783 + ACT_TILE_12, // TILE_TYPE_784 + ACT_TILE_0, // TILE_TYPE_785 + ACT_TILE_0, // TILE_TYPE_786 + ACT_TILE_1, // TILE_TYPE_787 + ACT_TILE_24, // TILE_TYPE_788 + ACT_TILE_87, // TILE_TYPE_789 + ACT_TILE_88, // TILE_TYPE_790 + ACT_TILE_89, // TILE_TYPE_791 + ACT_TILE_89, // TILE_TYPE_792 + ACT_TILE_90, // TILE_TYPE_793 + ACT_TILE_91, // TILE_TYPE_794 + ACT_TILE_92, // TILE_TYPE_795 + ACT_TILE_93, // TILE_TYPE_796 + ACT_TILE_94, // TILE_TYPE_797 + ACT_TILE_95, // TILE_TYPE_798 + ACT_TILE_96, // TILE_TYPE_799 + ACT_TILE_0, // TILE_TYPE_800 + ACT_TILE_0, // TILE_TYPE_801 + ACT_TILE_0, // TILE_TYPE_802 + ACT_TILE_13, // TILE_TYPE_803 + ACT_TILE_13, // TILE_TYPE_804 + ACT_TILE_13, // TILE_TYPE_805 + ACT_TILE_13, // TILE_TYPE_806 + ACT_TILE_13, // TILE_TYPE_807 + ACT_TILE_13, // TILE_TYPE_808 + ACT_TILE_13, // TILE_TYPE_809 + ACT_TILE_13, // TILE_TYPE_810 + ACT_TILE_13, // TILE_TYPE_811 + ACT_TILE_13, // TILE_TYPE_812 + ACT_TILE_13, // TILE_TYPE_813 + ACT_TILE_13, // TILE_TYPE_814 + ACT_TILE_13, // TILE_TYPE_815 + ACT_TILE_13, // TILE_TYPE_816 + ACT_TILE_13, // TILE_TYPE_817 + ACT_TILE_13, // TILE_TYPE_818 + ACT_TILE_13, // TILE_TYPE_819 + ACT_TILE_13, // TILE_TYPE_820 + ACT_TILE_13, // TILE_TYPE_821 + ACT_TILE_13, // TILE_TYPE_822 + ACT_TILE_13, // TILE_TYPE_823 + ACT_TILE_13, // TILE_TYPE_824 + ACT_TILE_13, // TILE_TYPE_825 + ACT_TILE_13, // TILE_TYPE_826 + ACT_TILE_13, // TILE_TYPE_827 + ACT_TILE_13, // TILE_TYPE_828 + ACT_TILE_13, // TILE_TYPE_829 + ACT_TILE_13, // TILE_TYPE_830 + ACT_TILE_13, // TILE_TYPE_831 + ACT_TILE_13, // TILE_TYPE_832 + ACT_TILE_12, // TILE_TYPE_833 + ACT_TILE_12, // TILE_TYPE_834 + ACT_TILE_12, // TILE_TYPE_835 + ACT_TILE_12, // TILE_TYPE_836 + ACT_TILE_12, // TILE_TYPE_837 + ACT_TILE_12, // TILE_TYPE_838 + ACT_TILE_97, // TILE_TYPE_839 + ACT_TILE_97, // TILE_TYPE_840 + ACT_TILE_97, // TILE_TYPE_841 + ACT_TILE_97, // TILE_TYPE_842 + ACT_TILE_98, // TILE_TYPE_843 + ACT_TILE_98, // TILE_TYPE_844 + ACT_TILE_0, // TILE_TYPE_845 + ACT_TILE_0, // TILE_TYPE_846 + ACT_TILE_99, // TILE_TYPE_847 + ACT_TILE_99, // TILE_TYPE_848 + ACT_TILE_99, // TILE_TYPE_849 + ACT_TILE_99, // TILE_TYPE_850 + ACT_TILE_100, // TILE_TYPE_851 + ACT_TILE_0, // TILE_TYPE_852 + ACT_TILE_101, // TILE_TYPE_853 + ACT_TILE_102, // TILE_TYPE_854 + ACT_TILE_103, // TILE_TYPE_855 + ACT_TILE_104, // TILE_TYPE_856 + ACT_TILE_105, // TILE_TYPE_857 + ACT_TILE_106, // TILE_TYPE_858 + ACT_TILE_107, // TILE_TYPE_859 + ACT_TILE_108, // TILE_TYPE_860 + ACT_TILE_109, // TILE_TYPE_861 + ACT_TILE_110, // TILE_TYPE_862 + ACT_TILE_111, // TILE_TYPE_863 + ACT_TILE_112, // TILE_TYPE_864 + ACT_TILE_112, // TILE_TYPE_865 + ACT_TILE_112, // TILE_TYPE_866 + ACT_TILE_112, // TILE_TYPE_867 + ACT_TILE_112, // TILE_TYPE_868 + ACT_TILE_0, // TILE_TYPE_869 + ACT_TILE_113, // TILE_TYPE_870 + ACT_TILE_46, // TILE_TYPE_871 + ACT_TILE_46, // TILE_TYPE_872 + ACT_TILE_114, // TILE_TYPE_873 + ACT_TILE_114, // TILE_TYPE_874 + ACT_TILE_114, // TILE_TYPE_875 + ACT_TILE_114, // TILE_TYPE_876 + ACT_TILE_114, // TILE_TYPE_877 + ACT_TILE_114, // TILE_TYPE_878 + ACT_TILE_114, // TILE_TYPE_879 + ACT_TILE_114, // TILE_TYPE_880 + ACT_TILE_114, // TILE_TYPE_881 + ACT_TILE_114, // TILE_TYPE_882 + ACT_TILE_114, // TILE_TYPE_883 + ACT_TILE_114, // TILE_TYPE_884 + ACT_TILE_114, // TILE_TYPE_885 + ACT_TILE_114, // TILE_TYPE_886 + ACT_TILE_115, // TILE_TYPE_887 + ACT_TILE_115, // TILE_TYPE_888 + ACT_TILE_0, // TILE_TYPE_889 + ACT_TILE_0, // TILE_TYPE_890 + ACT_TILE_0, // TILE_TYPE_891 + ACT_TILE_0, // TILE_TYPE_892 + ACT_TILE_0, // TILE_TYPE_893 + ACT_TILE_0, // TILE_TYPE_894 + ACT_TILE_0, // TILE_TYPE_895 + ACT_TILE_0, // TILE_TYPE_896 + ACT_TILE_0, // TILE_TYPE_897 + ACT_TILE_0, // TILE_TYPE_898 + ACT_TILE_0, // TILE_TYPE_899 + ACT_TILE_0, // TILE_TYPE_900 + ACT_TILE_0, // TILE_TYPE_901 + ACT_TILE_0, // TILE_TYPE_902 + ACT_TILE_0, // TILE_TYPE_903 + ACT_TILE_0, // TILE_TYPE_904 + ACT_TILE_0, // TILE_TYPE_905 + ACT_TILE_0, // TILE_TYPE_906 + ACT_TILE_0, // TILE_TYPE_907 + ACT_TILE_0, // TILE_TYPE_908 + ACT_TILE_0, // TILE_TYPE_909 + ACT_TILE_0, // TILE_TYPE_910 + ACT_TILE_0, // TILE_TYPE_911 + ACT_TILE_0, // TILE_TYPE_912 + ACT_TILE_0, // TILE_TYPE_913 + ACT_TILE_0, // TILE_TYPE_914 + ACT_TILE_0, // TILE_TYPE_915 + ACT_TILE_42, // TILE_TYPE_916 + ACT_TILE_43, // TILE_TYPE_917 + ACT_TILE_44, // TILE_TYPE_918 + ACT_TILE_45, // TILE_TYPE_919 + ACT_TILE_0, // TILE_TYPE_920 + ACT_TILE_0, // TILE_TYPE_921 + ACT_TILE_0, // TILE_TYPE_922 + ACT_TILE_0, // TILE_TYPE_923 + ACT_TILE_0, // TILE_TYPE_924 + ACT_TILE_0, // TILE_TYPE_925 + ACT_TILE_0, // TILE_TYPE_926 + ACT_TILE_0, // TILE_TYPE_927 + ACT_TILE_0, // TILE_TYPE_928 + ACT_TILE_116, // TILE_TYPE_929 + ACT_TILE_116, // TILE_TYPE_930 + ACT_TILE_116, // TILE_TYPE_931 + ACT_TILE_0, // TILE_TYPE_932 + ACT_TILE_0, // TILE_TYPE_933 + ACT_TILE_0, // TILE_TYPE_934 + ACT_TILE_0, // TILE_TYPE_935 + ACT_TILE_43, // TILE_TYPE_936 + ACT_TILE_42, // TILE_TYPE_937 + ACT_TILE_45, // TILE_TYPE_938 + ACT_TILE_44, // TILE_TYPE_939 + ACT_TILE_117, // TILE_TYPE_940 + ACT_TILE_0, // TILE_TYPE_941 + ACT_TILE_82, // TILE_TYPE_942 + ACT_TILE_0, // TILE_TYPE_943 + ACT_TILE_0, // TILE_TYPE_944 + ACT_TILE_0, // TILE_TYPE_945 + ACT_TILE_0, // TILE_TYPE_946 + ACT_TILE_0, // TILE_TYPE_947 + ACT_TILE_0, // TILE_TYPE_948 + ACT_TILE_43, // TILE_TYPE_949 + ACT_TILE_42, // TILE_TYPE_950 + ACT_TILE_0, // TILE_TYPE_951 + ACT_TILE_0, // TILE_TYPE_952 + ACT_TILE_44, // TILE_TYPE_953 + ACT_TILE_0, // TILE_TYPE_954 + ACT_TILE_0, // TILE_TYPE_955 + ACT_TILE_45, // TILE_TYPE_956 + ACT_TILE_0, // TILE_TYPE_957 + ACT_TILE_0, // TILE_TYPE_958 + ACT_TILE_0, // TILE_TYPE_959 + ACT_TILE_0, // TILE_TYPE_960 + ACT_TILE_41, // TILE_TYPE_961 + ACT_TILE_40, // TILE_TYPE_962 + ACT_TILE_38, // TILE_TYPE_963 + ACT_TILE_38, // TILE_TYPE_964 + ACT_TILE_116, // TILE_TYPE_965 + ACT_TILE_116, // TILE_TYPE_966 + ACT_TILE_116, // TILE_TYPE_967 + ACT_TILE_116, // TILE_TYPE_968 + ACT_TILE_116, // TILE_TYPE_969 + ACT_TILE_116, // TILE_TYPE_970 + ACT_TILE_116, // TILE_TYPE_971 + ACT_TILE_116, // TILE_TYPE_972 + ACT_TILE_116, // TILE_TYPE_973 + ACT_TILE_116, // TILE_TYPE_974 + ACT_TILE_116, // TILE_TYPE_975 + ACT_TILE_116, // TILE_TYPE_976 + ACT_TILE_116, // TILE_TYPE_977 + ACT_TILE_90, // TILE_TYPE_978 + ACT_TILE_41, // TILE_TYPE_979 + ACT_TILE_41, // TILE_TYPE_980 + ACT_TILE_41, // TILE_TYPE_981 + ACT_TILE_12, // TILE_TYPE_982 + ACT_TILE_0, // TILE_TYPE_983 + ACT_TILE_12, // TILE_TYPE_984 + ACT_TILE_12, // TILE_TYPE_985 + ACT_TILE_41, // TILE_TYPE_986 + ACT_TILE_41, // TILE_TYPE_987 + ACT_TILE_116, // TILE_TYPE_988 + ACT_TILE_0, // TILE_TYPE_989 + ACT_TILE_0, // TILE_TYPE_990 + ACT_TILE_10, // TILE_TYPE_991 + ACT_TILE_0, // TILE_TYPE_992 + ACT_TILE_0, // TILE_TYPE_993 + ACT_TILE_0, // TILE_TYPE_994 + ACT_TILE_0, // TILE_TYPE_995 + ACT_TILE_0, // TILE_TYPE_996 + ACT_TILE_0, // TILE_TYPE_997 + ACT_TILE_40, // TILE_TYPE_998 + ACT_TILE_0, // TILE_TYPE_999 + ACT_TILE_0, // TILE_TYPE_1000 + ACT_TILE_0, // TILE_TYPE_1001 + ACT_TILE_40, // TILE_TYPE_1002 + ACT_TILE_0, // TILE_TYPE_1003 + ACT_TILE_10, // TILE_TYPE_1004 + ACT_TILE_10, // TILE_TYPE_1005 + ACT_TILE_10, // TILE_TYPE_1006 + ACT_TILE_10, // TILE_TYPE_1007 + ACT_TILE_10, // TILE_TYPE_1008 + ACT_TILE_10, // TILE_TYPE_1009 + ACT_TILE_10, // TILE_TYPE_1010 + ACT_TILE_40, // TILE_TYPE_1011 + ACT_TILE_40, // TILE_TYPE_1012 + ACT_TILE_84, // TILE_TYPE_1013 + ACT_TILE_84, // TILE_TYPE_1014 + ACT_TILE_84, // TILE_TYPE_1015 + ACT_TILE_84, // TILE_TYPE_1016 + ACT_TILE_0, // TILE_TYPE_1017 + ACT_TILE_61, // TILE_TYPE_1018 + ACT_TILE_61, // TILE_TYPE_1019 + ACT_TILE_61, // TILE_TYPE_1020 + ACT_TILE_61, // TILE_TYPE_1021 + ACT_TILE_61, // TILE_TYPE_1022 + ACT_TILE_61, // TILE_TYPE_1023 + ACT_TILE_61, // TILE_TYPE_1024 + ACT_TILE_61, // TILE_TYPE_1025 + ACT_TILE_62, // TILE_TYPE_1026 + ACT_TILE_62, // TILE_TYPE_1027 + ACT_TILE_62, // TILE_TYPE_1028 + ACT_TILE_62, // TILE_TYPE_1029 + ACT_TILE_62, // TILE_TYPE_1030 + ACT_TILE_62, // TILE_TYPE_1031 + ACT_TILE_62, // TILE_TYPE_1032 + ACT_TILE_62, // TILE_TYPE_1033 + ACT_TILE_9, // TILE_TYPE_1034 + ACT_TILE_9, // TILE_TYPE_1035 + ACT_TILE_9, // TILE_TYPE_1036 + ACT_TILE_9, // TILE_TYPE_1037 + ACT_TILE_9, // TILE_TYPE_1038 + ACT_TILE_9, // TILE_TYPE_1039 + ACT_TILE_9, // TILE_TYPE_1040 + ACT_TILE_9, // TILE_TYPE_1041 + ACT_TILE_9, // TILE_TYPE_1042 + ACT_TILE_9, // TILE_TYPE_1043 + ACT_TILE_9, // TILE_TYPE_1044 + ACT_TILE_9, // TILE_TYPE_1045 + ACT_TILE_9, // TILE_TYPE_1046 + ACT_TILE_9, // TILE_TYPE_1047 + ACT_TILE_9, // TILE_TYPE_1048 + ACT_TILE_9, // TILE_TYPE_1049 + ACT_TILE_9, // TILE_TYPE_1050 + ACT_TILE_42, // TILE_TYPE_1051 + ACT_TILE_10, // TILE_TYPE_1052 + ACT_TILE_10, // TILE_TYPE_1053 + ACT_TILE_10, // TILE_TYPE_1054 + ACT_TILE_10, // TILE_TYPE_1055 + ACT_TILE_10, // TILE_TYPE_1056 + ACT_TILE_10, // TILE_TYPE_1057 + ACT_TILE_15, // TILE_TYPE_1058 + ACT_TILE_10, // TILE_TYPE_1059 + ACT_TILE_42, // TILE_TYPE_1060 + ACT_TILE_13, // TILE_TYPE_1061 + ACT_TILE_0, // TILE_TYPE_1062 + ACT_TILE_42, // TILE_TYPE_1063 + ACT_TILE_0, // TILE_TYPE_1064 + ACT_TILE_0, // TILE_TYPE_1065 + ACT_TILE_0, // TILE_TYPE_1066 + ACT_TILE_0, // TILE_TYPE_1067 + ACT_TILE_16, // TILE_TYPE_1068 + ACT_TILE_16, // TILE_TYPE_1069 + ACT_TILE_16, // TILE_TYPE_1070 + ACT_TILE_16, // TILE_TYPE_1071 + ACT_TILE_16, // TILE_TYPE_1072 + ACT_TILE_16, // TILE_TYPE_1073 + ACT_TILE_16, // TILE_TYPE_1074 + ACT_TILE_16, // TILE_TYPE_1075 + ACT_TILE_16, // TILE_TYPE_1076 + ACT_TILE_9, // TILE_TYPE_1077 + ACT_TILE_9, // TILE_TYPE_1078 + ACT_TILE_9, // TILE_TYPE_1079 + ACT_TILE_56, // TILE_TYPE_1080 + ACT_TILE_10, // TILE_TYPE_1081 + ACT_TILE_42, // TILE_TYPE_1082 + ACT_TILE_0, // TILE_TYPE_1083 + ACT_TILE_10, // TILE_TYPE_1084 + ACT_TILE_79, // TILE_TYPE_1085 + ACT_TILE_77, // TILE_TYPE_1086 + ACT_TILE_0, // TILE_TYPE_1087 + ACT_TILE_0, // TILE_TYPE_1088 + ACT_TILE_0, // TILE_TYPE_1089 + ACT_TILE_0, // TILE_TYPE_1090 + ACT_TILE_10, // TILE_TYPE_1091 + ACT_TILE_0, // TILE_TYPE_1092 + ACT_TILE_0, // TILE_TYPE_1093 + ACT_TILE_0, // TILE_TYPE_1094 + ACT_TILE_78, // TILE_TYPE_1095 + ACT_TILE_78, // TILE_TYPE_1096 + ACT_TILE_12, // TILE_TYPE_1097 + ACT_TILE_12, // TILE_TYPE_1098 + ACT_TILE_12, // TILE_TYPE_1099 + ACT_TILE_12, // TILE_TYPE_1100 + ACT_TILE_61, // TILE_TYPE_1101 + ACT_TILE_61, // TILE_TYPE_1102 + ACT_TILE_61, // TILE_TYPE_1103 + ACT_TILE_40, // TILE_TYPE_1104 + ACT_TILE_12, // TILE_TYPE_1105 + ACT_TILE_40, // TILE_TYPE_1106 + ACT_TILE_10, // TILE_TYPE_1107 + ACT_TILE_10, // TILE_TYPE_1108 + ACT_TILE_10, // TILE_TYPE_1109 + ACT_TILE_0, // TILE_TYPE_1110 + ACT_TILE_0, // TILE_TYPE_1111 + ACT_TILE_39, // TILE_TYPE_1112 + ACT_TILE_39, // TILE_TYPE_1113 + ACT_TILE_39, // TILE_TYPE_1114 + ACT_TILE_39, // TILE_TYPE_1115 + ACT_TILE_39, // TILE_TYPE_1116 + ACT_TILE_39, // TILE_TYPE_1117 + ACT_TILE_38, // TILE_TYPE_1118 + ACT_TILE_38, // TILE_TYPE_1119 + ACT_TILE_52, // TILE_TYPE_1120 + ACT_TILE_52, // TILE_TYPE_1121 + ACT_TILE_12, // TILE_TYPE_1122 + ACT_TILE_55, // TILE_TYPE_1123 + ACT_TILE_0, // TILE_TYPE_1124 + ACT_TILE_0, // TILE_TYPE_1125 + ACT_TILE_0, // TILE_TYPE_1126 + ACT_TILE_0, // TILE_TYPE_1127 + ACT_TILE_0, // TILE_TYPE_1128 + ACT_TILE_54, // TILE_TYPE_1129 + ACT_TILE_0, // TILE_TYPE_1130 + ACT_TILE_0, // TILE_TYPE_1131 + ACT_TILE_0, // TILE_TYPE_1132 + ACT_TILE_0, // TILE_TYPE_1133 + ACT_TILE_40, // TILE_TYPE_1134 + ACT_TILE_53, // TILE_TYPE_1135 + ACT_TILE_53, // TILE_TYPE_1136 + ACT_TILE_40, // TILE_TYPE_1137 + ACT_TILE_55, // TILE_TYPE_1138 + ACT_TILE_12, // TILE_TYPE_1139 + ACT_TILE_0, // TILE_TYPE_1140 + ACT_TILE_12, // TILE_TYPE_1141 + ACT_TILE_12, // TILE_TYPE_1142 + ACT_TILE_12, // TILE_TYPE_1143 + ACT_TILE_12, // TILE_TYPE_1144 + ACT_TILE_12, // TILE_TYPE_1145 + ACT_TILE_54, // TILE_TYPE_1146 + ACT_TILE_13, // TILE_TYPE_1147 + ACT_TILE_40, // TILE_TYPE_1148 + ACT_TILE_0, // TILE_TYPE_1149 + ACT_TILE_0, // TILE_TYPE_1150 + ACT_TILE_0, // TILE_TYPE_1151 + ACT_TILE_52, // TILE_TYPE_1152 + ACT_TILE_52, // TILE_TYPE_1153 + ACT_TILE_52, // TILE_TYPE_1154 + ACT_TILE_10, // TILE_TYPE_1155 + ACT_TILE_10, // TILE_TYPE_1156 + ACT_TILE_0, // TILE_TYPE_1157 + ACT_TILE_0, // TILE_TYPE_1158 + ACT_TILE_0, // TILE_TYPE_1159 + ACT_TILE_0, // TILE_TYPE_1160 + ACT_TILE_40, // TILE_TYPE_1161 + ACT_TILE_15, // TILE_TYPE_1162 + ACT_TILE_15, // TILE_TYPE_1163 + ACT_TILE_51, // TILE_TYPE_1164 + ACT_TILE_16, // TILE_TYPE_1165 + ACT_TILE_10, // TILE_TYPE_1166 + ACT_TILE_10, // TILE_TYPE_1167 + ACT_TILE_16, // TILE_TYPE_1168 + ACT_TILE_16, // TILE_TYPE_1169 + ACT_TILE_10, // TILE_TYPE_1170 + ACT_TILE_10, // TILE_TYPE_1171 + ACT_TILE_10, // TILE_TYPE_1172 + ACT_TILE_10, // TILE_TYPE_1173 + ACT_TILE_0, // TILE_TYPE_1174 + ACT_TILE_0, // TILE_TYPE_1175 + ACT_TILE_15, // TILE_TYPE_1176 + ACT_TILE_9, // TILE_TYPE_1177 + ACT_TILE_14, // TILE_TYPE_1178 + ACT_TILE_15, // TILE_TYPE_1179 + ACT_TILE_14, // TILE_TYPE_1180 + ACT_TILE_15, // TILE_TYPE_1181 + ACT_TILE_15, // TILE_TYPE_1182 + ACT_TILE_15, // TILE_TYPE_1183 + ACT_TILE_0, // TILE_TYPE_1184 + ACT_TILE_0, // TILE_TYPE_1185 + ACT_TILE_0, // TILE_TYPE_1186 + ACT_TILE_0, // TILE_TYPE_1187 + ACT_TILE_0, // TILE_TYPE_1188 + ACT_TILE_0, // TILE_TYPE_1189 + ACT_TILE_0, // TILE_TYPE_1190 + ACT_TILE_0, // TILE_TYPE_1191 + ACT_TILE_0, // TILE_TYPE_1192 + ACT_TILE_0, // TILE_TYPE_1193 + ACT_TILE_116, // TILE_TYPE_1194 + ACT_TILE_116, // TILE_TYPE_1195 + ACT_TILE_116, // TILE_TYPE_1196 + ACT_TILE_116, // TILE_TYPE_1197 + ACT_TILE_116, // TILE_TYPE_1198 + ACT_TILE_116, // TILE_TYPE_1199 + ACT_TILE_116, // TILE_TYPE_1200 + ACT_TILE_116, // TILE_TYPE_1201 + ACT_TILE_116, // TILE_TYPE_1202 + ACT_TILE_116, // TILE_TYPE_1203 + ACT_TILE_116, // TILE_TYPE_1204 + ACT_TILE_116, // TILE_TYPE_1205 + ACT_TILE_116, // TILE_TYPE_1206 + ACT_TILE_15, // TILE_TYPE_1207 + ACT_TILE_40, // TILE_TYPE_1208 + ACT_TILE_15, // TILE_TYPE_1209 + ACT_TILE_40, // TILE_TYPE_1210 + ACT_TILE_40, // TILE_TYPE_1211 + ACT_TILE_15, // TILE_TYPE_1212 + ACT_TILE_12, // TILE_TYPE_1213 + ACT_TILE_12, // TILE_TYPE_1214 + ACT_TILE_12, // TILE_TYPE_1215 + ACT_TILE_12, // TILE_TYPE_1216 + ACT_TILE_12, // TILE_TYPE_1217 + ACT_TILE_25, // TILE_TYPE_1218 + ACT_TILE_40, // TILE_TYPE_1219 + ACT_TILE_40, // TILE_TYPE_1220 + ACT_TILE_40, // TILE_TYPE_1221 + ACT_TILE_0, // TILE_TYPE_1222 + ACT_TILE_16, // TILE_TYPE_1223 + ACT_TILE_16, // TILE_TYPE_1224 + ACT_TILE_116, // TILE_TYPE_1225 + ACT_TILE_0, // TILE_TYPE_1226 + ACT_TILE_0, // TILE_TYPE_1227 + ACT_TILE_12, // TILE_TYPE_1228 + ACT_TILE_45, // TILE_TYPE_1229 + ACT_TILE_0, // TILE_TYPE_1230 + ACT_TILE_40, // TILE_TYPE_1231 + ACT_TILE_40, // TILE_TYPE_1232 + ACT_TILE_43, // TILE_TYPE_1233 + ACT_TILE_25, // TILE_TYPE_1234 + ACT_TILE_0, // TILE_TYPE_1235 + ACT_TILE_10, // TILE_TYPE_1236 + ACT_TILE_0, // TILE_TYPE_1237 + ACT_TILE_40, // TILE_TYPE_1238 + ACT_TILE_0, // TILE_TYPE_1239 + ACT_TILE_43, // TILE_TYPE_1240 + ACT_TILE_43, // TILE_TYPE_1241 + ACT_TILE_43, // TILE_TYPE_1242 + ACT_TILE_0, // TILE_TYPE_1243 + ACT_TILE_42, // TILE_TYPE_1244 + ACT_TILE_42, // TILE_TYPE_1245 + ACT_TILE_42, // TILE_TYPE_1246 + ACT_TILE_42, // TILE_TYPE_1247 + ACT_TILE_0, // TILE_TYPE_1248 + ACT_TILE_116, // TILE_TYPE_1249 + ACT_TILE_116, // TILE_TYPE_1250 + ACT_TILE_116, // TILE_TYPE_1251 + ACT_TILE_116, // TILE_TYPE_1252 + ACT_TILE_116, // TILE_TYPE_1253 + ACT_TILE_116, // TILE_TYPE_1254 + ACT_TILE_116, // TILE_TYPE_1255 + ACT_TILE_116, // TILE_TYPE_1256 + ACT_TILE_116, // TILE_TYPE_1257 + ACT_TILE_116, // TILE_TYPE_1258 + ACT_TILE_116, // TILE_TYPE_1259 + ACT_TILE_44, // TILE_TYPE_1260 + ACT_TILE_42, // TILE_TYPE_1261 + ACT_TILE_42, // TILE_TYPE_1262 + ACT_TILE_0, // TILE_TYPE_1263 + ACT_TILE_38, // TILE_TYPE_1264 + ACT_TILE_38, // TILE_TYPE_1265 + ACT_TILE_0, // TILE_TYPE_1266 + ACT_TILE_0, // TILE_TYPE_1267 + ACT_TILE_0, // TILE_TYPE_1268 + ACT_TILE_0, // TILE_TYPE_1269 + ACT_TILE_0, // TILE_TYPE_1270 + ACT_TILE_0, // TILE_TYPE_1271 + ACT_TILE_0, // TILE_TYPE_1272 + ACT_TILE_0, // TILE_TYPE_1273 + ACT_TILE_0, // TILE_TYPE_1274 + ACT_TILE_63, // TILE_TYPE_1275 + ACT_TILE_83, // TILE_TYPE_1276 + ACT_TILE_0, // TILE_TYPE_1277 + ACT_TILE_0, // TILE_TYPE_1278 + ACT_TILE_0, // TILE_TYPE_1279 + ACT_TILE_0, // TILE_TYPE_1280 + ACT_TILE_38, // TILE_TYPE_1281 + ACT_TILE_38, // TILE_TYPE_1282 + ACT_TILE_40, // TILE_TYPE_1283 + ACT_TILE_12, // TILE_TYPE_1284 + ACT_TILE_12, // TILE_TYPE_1285 + ACT_TILE_12, // TILE_TYPE_1286 + ACT_TILE_12, // TILE_TYPE_1287 + ACT_TILE_12, // TILE_TYPE_1288 + ACT_TILE_12, // TILE_TYPE_1289 + ACT_TILE_12, // TILE_TYPE_1290 + ACT_TILE_12, // TILE_TYPE_1291 + ACT_TILE_12, // TILE_TYPE_1292 + ACT_TILE_12, // TILE_TYPE_1293 + ACT_TILE_12, // TILE_TYPE_1294 + ACT_TILE_41, // TILE_TYPE_1295 + ACT_TILE_41, // TILE_TYPE_1296 + ACT_TILE_38, // TILE_TYPE_1297 + ACT_TILE_38, // TILE_TYPE_1298 + ACT_TILE_12, // TILE_TYPE_1299 + ACT_TILE_12, // TILE_TYPE_1300 + ACT_TILE_41, // TILE_TYPE_1301 + ACT_TILE_41, // TILE_TYPE_1302 + ACT_TILE_12, // TILE_TYPE_1303 + ACT_TILE_12, // TILE_TYPE_1304 + ACT_TILE_116, // TILE_TYPE_1305 + ACT_TILE_116, // TILE_TYPE_1306 + ACT_TILE_116, // TILE_TYPE_1307 + ACT_TILE_116, // TILE_TYPE_1308 + ACT_TILE_116, // TILE_TYPE_1309 + ACT_TILE_0, // TILE_TYPE_1310 + ACT_TILE_0, // TILE_TYPE_1311 + ACT_TILE_40, // TILE_TYPE_1312 + ACT_TILE_0, // TILE_TYPE_1313 + ACT_TILE_0, // TILE_TYPE_1314 + ACT_TILE_43, // TILE_TYPE_1315 + ACT_TILE_42, // TILE_TYPE_1316 + ACT_TILE_0, // TILE_TYPE_1317 + ACT_TILE_0, // TILE_TYPE_1318 + ACT_TILE_44, // TILE_TYPE_1319 + ACT_TILE_13, // TILE_TYPE_1320 + ACT_TILE_40, // TILE_TYPE_1321 + ACT_TILE_40, // TILE_TYPE_1322 + ACT_TILE_42, // TILE_TYPE_1323 + ACT_TILE_44, // TILE_TYPE_1324 + ACT_TILE_45, // TILE_TYPE_1325 + ACT_TILE_44, // TILE_TYPE_1326 + ACT_TILE_45, // TILE_TYPE_1327 + ACT_TILE_44, // TILE_TYPE_1328 + ACT_TILE_45, // TILE_TYPE_1329 + ACT_TILE_42, // TILE_TYPE_1330 + ACT_TILE_42, // TILE_TYPE_1331 + ACT_TILE_42, // TILE_TYPE_1332 + ACT_TILE_43, // TILE_TYPE_1333 + ACT_TILE_43, // TILE_TYPE_1334 + ACT_TILE_43, // TILE_TYPE_1335 + ACT_TILE_100, // TILE_TYPE_1336 + ACT_TILE_101, // TILE_TYPE_1337 + ACT_TILE_104, // TILE_TYPE_1338 + ACT_TILE_106, // TILE_TYPE_1339 + ACT_TILE_102, // TILE_TYPE_1340 + ACT_TILE_107, // TILE_TYPE_1341 + ACT_TILE_105, // TILE_TYPE_1342 + ACT_TILE_103, // TILE_TYPE_1343 + ACT_TILE_0, // TILE_TYPE_1344 + ACT_TILE_14, // TILE_TYPE_1345 + ACT_TILE_14, // TILE_TYPE_1346 + ACT_TILE_41, // TILE_TYPE_1347 + ACT_TILE_40, // TILE_TYPE_1348 #ifdef EU - VVV_0, // TILE_TYPE_1349 - VVV_0, // TILE_TYPE_1350 + ACT_TILE_0, // TILE_TYPE_1349 + ACT_TILE_0, // TILE_TYPE_1350 #else - VVV_41, // TILE_TYPE_1349 - VVV_41, // TILE_TYPE_1350 + ACT_TILE_41, // TILE_TYPE_1349 + ACT_TILE_41, // TILE_TYPE_1350 #endif - VVV_40, // TILE_TYPE_1351 + ACT_TILE_40, // TILE_TYPE_1351 #ifdef EU - VVV_0, // TILE_TYPE_1352 + ACT_TILE_0, // TILE_TYPE_1352 #else - VVV_41, // TILE_TYPE_1352 + ACT_TILE_41, // TILE_TYPE_1352 #endif - VVV_40, // TILE_TYPE_1353 + ACT_TILE_40, // TILE_TYPE_1353 #ifdef EU - VVV_0, // TILE_TYPE_1354 + ACT_TILE_0, // TILE_TYPE_1354 #else - VVV_41, // TILE_TYPE_1354 + ACT_TILE_41, // TILE_TYPE_1354 #endif - 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 + ACT_TILE_17, // TILE_TYPE_1355 + ACT_TILE_15, // TILE_TYPE_1356 + ACT_TILE_0, // TILE_TYPE_1357 + ACT_TILE_116, // TILE_TYPE_1358 + ACT_TILE_43, // TILE_TYPE_1359 + ACT_TILE_63, // TILE_TYPE_1360 + ACT_TILE_35, // TILE_TYPE_1361 + ACT_TILE_35, // TILE_TYPE_1362 + ACT_TILE_35, // TILE_TYPE_1363 + ACT_TILE_35, // TILE_TYPE_1364 + ACT_TILE_116, // TILE_TYPE_1365 + ACT_TILE_116, // TILE_TYPE_1366 + ACT_TILE_0, // TILE_TYPE_1367 + ACT_TILE_42, // TILE_TYPE_1368 + ACT_TILE_42, // TILE_TYPE_1369 + ACT_TILE_0, // TILE_TYPE_1370 + ACT_TILE_0, // TILE_TYPE_1371 + ACT_TILE_0, // TILE_TYPE_1372 + ACT_TILE_10, // TILE_TYPE_1373 + ACT_TILE_40, // TILE_TYPE_1374 + ACT_TILE_40, // TILE_TYPE_1375 + ACT_TILE_40, // TILE_TYPE_1376 + ACT_TILE_40, // TILE_TYPE_1377 + ACT_TILE_40, // TILE_TYPE_1378 + ACT_TILE_40, // TILE_TYPE_1379 + ACT_TILE_40, // TILE_TYPE_1380 + ACT_TILE_40, // TILE_TYPE_1381 + ACT_TILE_40, // TILE_TYPE_1382 + ACT_TILE_40, // TILE_TYPE_1383 + ACT_TILE_40, // TILE_TYPE_1384 + ACT_TILE_40, // TILE_TYPE_1385 + ACT_TILE_0, // TILE_TYPE_1386 + ACT_TILE_0, // TILE_TYPE_1387 + ACT_TILE_44, // TILE_TYPE_1388 + ACT_TILE_43, // TILE_TYPE_1389 + ACT_TILE_40, // TILE_TYPE_1390 + ACT_TILE_40, // TILE_TYPE_1391 + ACT_TILE_40, // TILE_TYPE_1392 + ACT_TILE_116, // TILE_TYPE_1393 + ACT_TILE_0, // TILE_TYPE_1394 + ACT_TILE_0, // TILE_TYPE_1395 }; diff --git a/src/data/mapActTileToSurfaceType.c b/src/data/mapActTileToSurfaceType.c new file mode 100644 index 00000000..e821a766 --- /dev/null +++ b/src/data/mapActTileToSurfaceType.c @@ -0,0 +1,75 @@ +#include "asm.h" +#include "player.h" +#include "tiles.h" + +const KeyValuePair gMapActTileToSurfaceType[] = { + { ACT_TILE_13, SURFACE_PIT }, + { ACT_TILE_38, SURFACE_SLOPE_GNDGND_V }, + { ACT_TILE_39, SURFACE_SLOPE_GNDGND_H }, + { ACT_TILE_82, SURFACE_26 }, + { ACT_TILE_99, SURFACE_24 }, + { ACT_TILE_116, SURFACE_EDGE }, + { ACT_TILE_8, SURFACE_7 }, + { ACT_TILE_31, SURFACE_MINISH_DOOR_FRONT }, + { ACT_TILE_32, SURFACE_MINISH_DOOR_BACK }, + { ACT_TILE_33, SURFACE_A }, + { ACT_TILE_34, SURFACE_B }, + { ACT_TILE_24, SURFACE_16 }, + { ACT_TILE_18, SURFACE_ICE }, + { ACT_TILE_15, SURFACE_SHALLOW_WATER }, + { ACT_TILE_14, SURFACE_SLOPE_GNDWATER }, + { ACT_TILE_16, SURFACE_WATER }, + { ACT_TILE_27, SURFACE_BUTTON }, + { ACT_TILE_29, SURFACE_BUTTON }, + { ACT_TILE_97, SURFACE_1B }, + { ACT_TILE_90, SURFACE_1C }, + { ACT_TILE_17, SURFACE_14 }, + { ACT_TILE_98, SURFACE_21 }, + { ACT_TILE_101, SURFACE_6 }, + { ACT_TILE_102, SURFACE_6 }, + { ACT_TILE_103, SURFACE_6 }, + { ACT_TILE_104, SURFACE_6 }, + { ACT_TILE_105, SURFACE_6 }, + { ACT_TILE_106, SURFACE_6 }, + { ACT_TILE_108, SURFACE_6 }, + { ACT_TILE_109, SURFACE_6 }, + { ACT_TILE_110, SURFACE_6 }, + { ACT_TILE_111, SURFACE_6 }, + { ACT_TILE_107, SURFACE_6 }, + { ACT_TILE_48, SURFACE_22 }, + { ACT_TILE_49, SURFACE_22 }, + { ACT_TILE_50, SURFACE_22 }, + { ACT_TILE_51, SURFACE_22 }, + { ACT_TILE_22, SURFACE_DUST }, + { ACT_TILE_25, SURFACE_HOLE }, + { ACT_TILE_240, SURFACE_HOLE }, + { ACT_TILE_87, SURFACE_CLONE_TILE }, + { ACT_TILE_83, SURFACE_LADDER }, + { ACT_TILE_241, SURFACE_LADDER }, + { ACT_TILE_63, SURFACE_AUTO_LADDER }, + { ACT_TILE_80, SURFACE_CLIMB_WALL }, + { ACT_TILE_81, SURFACE_2C }, + { ACT_TILE_52, SURFACE_LIGHT_GRADE }, + { ACT_TILE_53, SURFACE_29 }, + { ACT_TILE_42, SURFACE_E }, + { ACT_TILE_43, SURFACE_D }, + { ACT_TILE_44, SURFACE_10 }, + { ACT_TILE_45, SURFACE_F }, + { ACT_TILE_64, SURFACE_E }, + { ACT_TILE_65, SURFACE_D }, + { ACT_TILE_66, SURFACE_10 }, + { ACT_TILE_67, SURFACE_F }, + { ACT_TILE_72, SURFACE_10 }, + { ACT_TILE_74, SURFACE_E }, + { ACT_TILE_69, SURFACE_E }, + { ACT_TILE_71, SURFACE_E }, + { ACT_TILE_70, SURFACE_D }, + { ACT_TILE_73, SURFACE_D }, + { ACT_TILE_68, SURFACE_D }, + { ACT_TILE_75, SURFACE_D }, + { ACT_TILE_19, SURFACE_SWAMP }, + { ACT_TILE_41, SURFACE_DOOR }, + { ACT_TILE_23, SURFACE_2D }, + { ACT_TILE_40, SURFACE_DOOR_13 }, +}; +// const u16 gMapActTileToSurfaceTypeEnd = 0; diff --git a/src/data/mapVvvToSurfaceType.c b/src/data/mapVvvToSurfaceType.c deleted file mode 100644 index b3a9a99e..00000000 --- a/src/data/mapVvvToSurfaceType.c +++ /dev/null @@ -1,75 +0,0 @@ -#include "asm.h" -#include "player.h" -#include "tiles.h" - -const KeyValuePair gMapVvvToSurfaceType[] = { - { VVV_13, SURFACE_PIT }, - { VVV_38, SURFACE_SLOPE_GNDGND_V }, - { VVV_39, SURFACE_SLOPE_GNDGND_H }, - { VVV_82, SURFACE_26 }, - { VVV_99, SURFACE_24 }, - { VVV_116, SURFACE_EDGE }, - { VVV_8, SURFACE_7 }, - { VVV_31, SURFACE_MINISH_DOOR_FRONT }, - { VVV_32, SURFACE_MINISH_DOOR_BACK }, - { VVV_33, SURFACE_A }, - { VVV_34, SURFACE_B }, - { VVV_24, SURFACE_16 }, - { VVV_18, SURFACE_ICE }, - { VVV_15, SURFACE_SHALLOW_WATER }, - { VVV_14, SURFACE_SLOPE_GNDWATER }, - { VVV_16, SURFACE_WATER }, - { VVV_27, SURFACE_BUTTON }, - { VVV_29, SURFACE_BUTTON }, - { VVV_97, SURFACE_1B }, - { VVV_90, SURFACE_1C }, - { VVV_17, SURFACE_14 }, - { VVV_98, SURFACE_21 }, - { VVV_101, SURFACE_6 }, - { VVV_102, SURFACE_6 }, - { VVV_103, SURFACE_6 }, - { VVV_104, SURFACE_6 }, - { VVV_105, SURFACE_6 }, - { VVV_106, SURFACE_6 }, - { VVV_108, SURFACE_6 }, - { VVV_109, SURFACE_6 }, - { VVV_110, SURFACE_6 }, - { VVV_111, SURFACE_6 }, - { VVV_107, SURFACE_6 }, - { VVV_48, SURFACE_22 }, - { VVV_49, SURFACE_22 }, - { VVV_50, SURFACE_22 }, - { VVV_51, SURFACE_22 }, - { VVV_22, SURFACE_DUST }, - { VVV_25, SURFACE_HOLE }, - { VVV_240, SURFACE_HOLE }, - { VVV_87, SURFACE_CLONE_TILE }, - { VVV_83, SURFACE_LADDER }, - { VVV_241, SURFACE_LADDER }, - { VVV_63, SURFACE_AUTO_LADDER }, - { VVV_80, SURFACE_CLIMB_WALL }, - { VVV_81, SURFACE_2C }, - { VVV_52, SURFACE_LIGHT_GRADE }, - { VVV_53, SURFACE_29 }, - { VVV_42, SURFACE_E }, - { VVV_43, SURFACE_D }, - { VVV_44, SURFACE_10 }, - { VVV_45, SURFACE_F }, - { VVV_64, SURFACE_E }, - { VVV_65, SURFACE_D }, - { VVV_66, SURFACE_10 }, - { VVV_67, SURFACE_F }, - { VVV_72, SURFACE_10 }, - { VVV_74, SURFACE_E }, - { VVV_69, SURFACE_E }, - { VVV_71, SURFACE_E }, - { VVV_70, SURFACE_D }, - { VVV_73, SURFACE_D }, - { VVV_68, SURFACE_D }, - { VVV_75, SURFACE_D }, - { VVV_19, SURFACE_SWAMP }, - { VVV_41, SURFACE_DOOR }, - { VVV_23, SURFACE_2D }, - { VVV_40, SURFACE_DOOR_13 }, -}; -// const u16 gMapVvvToSurfaceTypeEnd = 0; diff --git a/src/enemy/armos.c b/src/enemy/armos.c index 5fdcf627..9fdc9d3b 100644 --- a/src/enemy/armos.c +++ b/src/enemy/armos.c @@ -427,7 +427,7 @@ bool32 sub_0803086C(ArmosEntity* this) { tilePos = ((((((super)->x.HALF.HI) - gRoomControls.origin_x) >> 4) & (r2 = 0x3f)) | (((((super)->y.HALF.HI) - gRoomControls.origin_y) >> 4) & r2) << 6); - if (GetTileType(tilePos, super->collisionLayer) == SPECIAL_TILE_73) { + if (GetTileTypeAtTilePos(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; diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c index 0178bec3..5993dfb2 100644 --- a/src/enemy/bombPeahat.c +++ b/src/enemy/bombPeahat.c @@ -685,7 +685,7 @@ void sub_0802B204(BombPeahatEntity* this) { bool32 sub_0802B234(BombPeahatEntity* this) { bool32 ret = FALSE; - if (GetTileTypeByEntity(super) - 0x1c4 > 1) + if (GetTileTypeAtEntity(super) - 0x1c4 > 1) ret = TRUE; return ret; } diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c index d7c2f68d..7f3186bb 100644 --- a/src/enemy/chuchu.c +++ b/src/enemy/chuchu.c @@ -716,7 +716,7 @@ void sub_0801FB68(ChuchuEntity* this) { } bool32 CheckWaterTile(ChuchuEntity* this) { - if (GetVvvAtEntity(super) == VVV_16) { + if (GetActTileAtEntity(super) == ACT_TILE_16) { return TRUE; } else { return FALSE; diff --git a/src/enemy/eyegore.c b/src/enemy/eyegore.c index cf901307..590f081f 100644 --- a/src/enemy/eyegore.c +++ b/src/enemy/eyegore.c @@ -400,9 +400,9 @@ void sub_08031024(EyegoreEntity* this) { } } else { tmp2 = this->unk_7b >> 1; - uVar5 = GetTileTypeByPos(super->x.HALF.HI + gUnk_080CE2C0[tmp2], + uVar5 = GetTileTypeAtWorldCoords(super->x.HALF.HI + gUnk_080CE2C0[tmp2], super->y.HALF.HI + gUnk_080CE2C0[tmp2 + 1], super->collisionLayer); - uVar8 = GetTileTypeByPos(super->x.HALF.HI + gUnk_080CE2C0[tmp2 + 2], + uVar8 = GetTileTypeAtWorldCoords(super->x.HALF.HI + gUnk_080CE2C0[tmp2 + 2], super->y.HALF.HI + gUnk_080CE2C0[tmp2 + 3], super->collisionLayer); if (!(((gMapTileTypeToCollisionData[uVar5] == 0) && (gMapTileTypeToCollisionData[uVar8] == 0)) || diff --git a/src/enemy/flyingPot.c b/src/enemy/flyingPot.c index 16e18980..9c7a8348 100644 --- a/src/enemy/flyingPot.c +++ b/src/enemy/flyingPot.c @@ -185,7 +185,7 @@ void FlyingPot_Init(FlyingPotEntity* this) { void FlyingPot_Action1(FlyingPotEntity* this) { sub_08037418(this); - if (GetTileTypeByEntity(super) != SPECIAL_TILE_0) { + if (GetTileTypeAtEntity(super) != SPECIAL_TILE_0) { SetTile(this->tileIndex, TILE(super->x.HALF.HI, super->y.HALF.HI), super->collisionLayer); sub_08037408(this); } diff --git a/src/enemy/flyingSkull.c b/src/enemy/flyingSkull.c index efec6a40..2366f56d 100644 --- a/src/enemy/flyingSkull.c +++ b/src/enemy/flyingSkull.c @@ -130,7 +130,7 @@ void sub_08039DD8(FlyingSkullEntity* this) { sub_0803A100(this); if (super->type == 0) { - if (GetTileTypeByEntity(super) == SPECIAL_TILE_115) { + if (GetTileTypeAtEntity(super) == SPECIAL_TILE_115) { SetTile(this->tileIndex, COORD_TO_TILE(super), super->collisionLayer); sub_0803A0E0(this); } diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c index a4b9ddf9..034e8eb4 100644 --- a/src/enemy/gyorgFemale.c +++ b/src/enemy/gyorgFemale.c @@ -248,25 +248,25 @@ void sub_080464C0(GyorgFemaleEntity* this) { #define sub_08046518_offset 0x658 void sub_08046518(void) { - 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]; - u8* r6 = &gMapTop.collisionData[sub_08046518_offset]; + u16* tileTypes = gMapTop.tileTypes; + u16* mapData = &gMapTop.mapData[sub_08046518_offset]; + u16* mapDataOriginal = &gMapTop.mapDataOriginal[sub_08046518_offset]; + u8* actTiles = &gMapTop.actTiles[sub_08046518_offset]; + u8* collisionData = &gMapTop.collisionData[sub_08046518_offset]; u32 i; for (i = 0x10; i != 0; i--) { u32 j; for (j = 0x10; j != 0; j--) { - u16 new_var; - stack1[j] = sl[j]; - new_var = ptr[sl[j]]; - stack2[j] = gMapTileTypeToVvv[new_var]; - r6[j] = gMapTileTypeToCollisionData[new_var]; + u16 tileType; + mapDataOriginal[j] = mapData[j]; + tileType = tileTypes[mapData[j]]; + actTiles[j] = gMapTileTypeToActTile[tileType]; + collisionData[j] = gMapTileTypeToCollisionData[tileType]; } - sl += 0x40; - stack1 += 0x40; - stack2 += 0x40; - r6 += 0x40; + mapData += 0x40; + mapDataOriginal += 0x40; + actTiles += 0x40; + collisionData += 0x40; } } diff --git a/src/enemy/leever.c b/src/enemy/leever.c index 1d52eff8..6b12cf8e 100644 --- a/src/enemy/leever.c +++ b/src/enemy/leever.c @@ -126,15 +126,15 @@ void Leever_DigDown(LeeverEntity* this) { } bool32 sub_0801FDE4(Entity* entity, s32 x, s32 y) { - u32 vvv; + u32 actTile; const u16* puVar4; if (GetCollisionDataAtWorldCoords(x, y, gUnk_020000B0->collisionLayer) != 0) { return FALSE; } else { - vvv = GetVvvAtWorldCoords(x, y, gUnk_020000B0->collisionLayer); + actTile = GetActTileAtWorldCoords(x, y, gUnk_020000B0->collisionLayer); for (puVar4 = gUnk_080CA4CA; *puVar4 != (u16)-1;) { - if (*puVar4++ == vvv) { + if (*puVar4++ == actTile) { entity->x.HALF.HI = (x & 0xfff0) + 8; entity->y.HALF.HI = (y & 0xfff0) + 8; entity->collisionLayer = gUnk_020000B0->collisionLayer; @@ -211,10 +211,10 @@ const s8 gLeeverDrift[] = { }; const u16 gUnk_080CA4CA[] = { - VVV_10, - VVV_9, - VVV_12, - VVV_11, + ACT_TILE_10, + ACT_TILE_9, + ACT_TILE_12, + ACT_TILE_11, 0xFFFF, }; // clang-format on diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c index 606b0cb3..f5e2dc05 100644 --- a/src/enemy/moldworm.c +++ b/src/enemy/moldworm.c @@ -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(GetTileTypeByPos(x, y, gPlayerEntity.base.collisionLayer))) { + if (sub_08023A38(GetTileTypeAtWorldCoords(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(GetTileTypeByEntity(super))) { + if (sub_08023A38(GetTileTypeAtEntity(super))) { super->action = 5; this->unk_7f = 0; COLLISION_OFF(super); @@ -517,8 +517,8 @@ bool32 sub_08023A38(u32 tileType) { if (tileType == TILE_TYPE_26 || tileType == TILE_TYPE_41) { return TRUE; } else { - tileType = gMapTileTypeToVvv[tileType]; - if (tileType == VVV_9 || tileType == VVV_11 || tileType == VVV_10 || tileType == VVV_12) { + tileType = gMapTileTypeToActTile[tileType]; + if (tileType == ACT_TILE_9 || tileType == ACT_TILE_11 || tileType == ACT_TILE_10 || tileType == ACT_TILE_12) { return TRUE; } else { return FALSE; diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c index 907de061..fa94c291 100644 --- a/src/enemy/puffstool.c +++ b/src/enemy/puffstool.c @@ -428,26 +428,26 @@ bool32 sub_0802571C(PuffstoolEntity* this) { } bool32 sub_080257EC(PuffstoolEntity* this, u32 x, u32 y) { - u16 tileType = sub_080B1A48(x - 0x00, y - 0x00, super->collisionLayer); - if (tileType != 0x312 && gMapTileTypeToVvv[tileType] != VVV_22 && + u16 tileType = GetTileTypeAtRoomCoords(x - 0x00, y - 0x00, super->collisionLayer); + if (tileType != 0x312 && gMapTileTypeToActTile[tileType] != ACT_TILE_22 && gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } - tileType = sub_080B1A48(x - 0x10, y - 0x00, super->collisionLayer); - if (tileType != 0x312 && gMapTileTypeToVvv[tileType] != VVV_22 && + tileType = GetTileTypeAtRoomCoords(x - 0x10, y - 0x00, super->collisionLayer); + if (tileType != 0x312 && gMapTileTypeToActTile[tileType] != ACT_TILE_22 && gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } - tileType = sub_080B1A48(x - 0x00, y - 0x10, super->collisionLayer); - if (tileType != 0x312 && gMapTileTypeToVvv[tileType] != VVV_22 && + tileType = GetTileTypeAtRoomCoords(x - 0x00, y - 0x10, super->collisionLayer); + if (tileType != 0x312 && gMapTileTypeToActTile[tileType] != ACT_TILE_22 && gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } - tileType = sub_080B1A48(x - 0x10, y - 0x10, super->collisionLayer); - if (tileType != 0x312 && gMapTileTypeToVvv[tileType] != VVV_22 && + tileType = GetTileTypeAtRoomCoords(x - 0x10, y - 0x10, super->collisionLayer); + if (tileType != 0x312 && gMapTileTypeToActTile[tileType] != ACT_TILE_22 && gMapTileTypeToCollisionData[tileType] == 0) { return TRUE; } @@ -532,7 +532,7 @@ bool32 sub_08025AB8(u32 tilePos, u32 layer) { if (GetCollisionDataAtTilePos(tilePos, layer)) return FALSE; - if (GetVvvAtTilePos(tilePos, layer) == VVV_10) { + if (GetActTileAtTilePos(tilePos, layer) == ACT_TILE_10) { sub_0807B7D8(0x61, tilePos, layer); return TRUE; } diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c index ee9075a3..e2a372a8 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 = GetTileType(tilePos, super->collisionLayer); + u32 tileType = GetTileTypeAtTilePos(tilePos, super->collisionLayer); if ((tileType * 0x10000 - 0x710000U) >> 0x10 < 2) { super->action = 6; COLLISION_OFF(super); diff --git a/src/enemy/rope.c b/src/enemy/rope.c index 77fbafab..74c77066 100644 --- a/src/enemy/rope.c +++ b/src/enemy/rope.c @@ -209,7 +209,7 @@ void sub_08031600(RopeEntity* this) { u32 sub_0803163C(RopeEntity* this) { u32 h; - if (GetVvvAtEntity(super) == VVV_19) { + if (GetActTileAtEntity(super) == ACT_TILE_19) { h = this->unk_7a / 2; } else { h = this->unk_7a; diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c index 82f51ac9..ff5df9ae 100644 --- a/src/enemy/spinyBeetle.c +++ b/src/enemy/spinyBeetle.c @@ -322,7 +322,7 @@ void sub_08033D78(SpinyBeetleEntity* this) { s32 tilePos; u32 type; tilePos = COORD_TO_TILE_OFFSET(super, -ptr[0], -ptr[1]); - type = GetTileType(tilePos, super->collisionLayer); + type = GetTileTypeAtTilePos(tilePos, super->collisionLayer); switch (type) { case 0x1c4: diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c index 9b1d1247..3a54a8c2 100644 --- a/src/enemy/stalfos.c +++ b/src/enemy/stalfos.c @@ -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 = GetTileType(pos, (u32)super->collisionLayer); + tileType = GetTileTypeAtTilePos(pos, (u32)super->collisionLayer); ptr = gUnk_080CF938; do { diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c index 08de7ef8..e5989987 100644 --- a/src/enemy/tektite.c +++ b/src/enemy/tektite.c @@ -164,7 +164,7 @@ void sub_0802F300(TektiteEntity* this) { return; } else if (super->collisions != COL_NONE) { sub_0800417E(super, super->collisions); - } else if ((GetVvvAtEntity(super) & 0xf0) == 0x50) { // VVV_240 and VVV_241? + } else if ((GetActTileAtEntity(super) & 0xf0) == 0x50) { // ACT_TILE_240 and ACT_TILE_241? super->direction = (super->direction + 0x10) & (0x3 | DirectionNorthWest); } diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c index 290ae3f1..047b449f 100644 --- a/src/enemy/tektiteGolden.c +++ b/src/enemy/tektiteGolden.c @@ -137,7 +137,7 @@ void sub_08038048(TektiteGoldenEntity* this) { return; } else if (super->collisions != COL_NONE) { sub_0800417E(super, super->collisions); - } else if ((GetVvvAtEntity(super) & 0xf0) == 0x50) { // VVV_240 and VVV_241? + } else if ((GetActTileAtEntity(super) & 0xf0) == 0x50) { // ACT_TILE_240 and ACT_TILE_241? super->direction = (super->direction + 0x10) & (0x3 | DirectionNorthWest); } diff --git a/src/enemy/torchTrap.c b/src/enemy/torchTrap.c index 799cb4ae..e34e2caa 100644 --- a/src/enemy/torchTrap.c +++ b/src/enemy/torchTrap.c @@ -76,7 +76,7 @@ void sub_0803CF38(TorchTrapEntity* this) { } void sub_0803CF94(TorchTrapEntity* this) { - if (GetTileType(this->tilePos, super->collisionLayer) == TILE_TYPE_118) { + if (GetTileTypeAtTilePos(this->tilePos, super->collisionLayer) == TILE_TYPE_118) { this->unk_80 = 0; TorchTrap_Reset(this); } else if (this->unk_7c && sub_0803CFD8(this)) { diff --git a/src/entity.c b/src/entity.c index 343be2f2..a5b84baf 100644 --- a/src/entity.c +++ b/src/entity.c @@ -49,7 +49,7 @@ const u8 gEntityListLUT[] = { void sub_0805E248(void) { s32 tilePos; - tilePos = gDiggingCaveEntranceTransition.entrance->targetTilePosition; + tilePos = gDiggingCaveEntranceTransition.entrance->targetTilePos; if (gRoomControls.area == AREA_VEIL_FALLS || gRoomControls.area == AREA_VEIL_FALLS_DIG_CAVE) { SetTileType(TILE_TYPE_636, tilePos + TILE_POS(-1, -1), LAYER_BOTTOM); SetTileType(TILE_TYPE_643, tilePos + TILE_POS(-1, -1), LAYER_TOP); diff --git a/src/item/itemGustJar.c b/src/item/itemGustJar.c index 59c4de1f..40fdd034 100644 --- a/src/item/itemGustJar.c +++ b/src/item/itemGustJar.c @@ -12,7 +12,7 @@ void ItemGustJar(ItemBehavior* this, u32 index) { } void sub_08076DF4(ItemBehavior* this, u32 index) { - if (GetVvvInFront(&gPlayerEntity.base) != VVV_41 && gPlayerState.floor_type != SURFACE_DOOR && + if (GetActTileInFront(&gPlayerEntity.base) != ACT_TILE_41 && gPlayerState.floor_type != SURFACE_DOOR && gPlayerState.floor_type != SURFACE_DOOR_13 && gPlayerState.jump_status == 0) { sub_08077D38(this, index); this->timer = 0; diff --git a/src/item/itemMoleMitts.c b/src/item/itemMoleMitts.c index ae776075..dfd015c1 100644 --- a/src/item/itemMoleMitts.c +++ b/src/item/itemMoleMitts.c @@ -188,7 +188,7 @@ s32 sub_080774A0(void) { return 0; if (collisionData < 0xf) return 0; - if (GetVvvAtTilePos(tilePos, gPlayerEntity.base.collisionLayer) != VVV_86) { + if (GetActTileAtTilePos(tilePos, gPlayerEntity.base.collisionLayer) != ACT_TILE_86) { return 1; } else { return 0x56; diff --git a/src/manager/bombableWallManager.c b/src/manager/bombableWallManager.c index 9ba2d688..e0343063 100644 --- a/src/manager/bombableWallManager.c +++ b/src/manager/bombableWallManager.c @@ -46,7 +46,7 @@ void BombableWallManager_Init(BombableWallManager* this) { } void BombableWallManager_Action1(BombableWallManager* this) { - if (GetVvvAtTilePos(this->tilePos, this->layer) != VVV_46) { + if (GetActTileAtTilePos(this->tilePos, this->layer) != ACT_TILE_46) { super->action = 2; super->timer = 90; BombableWallManager_DestroyWall(this); @@ -62,7 +62,7 @@ void BombableWallManager_Action2(BombableWallManager* this) { } u32 BombableWallManager_GetBombableType(u32 tilePos, u32 layer) { - u32 tileType = GetTileType(tilePos, layer); + u32 tileType = GetTileTypeAtTilePos(tilePos, layer); switch (tileType) { case TILE_TYPE_236: diff --git a/src/manager/destructibleTileObserveManager.c b/src/manager/destructibleTileObserveManager.c index 81a8ef05..89a0ac36 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 = GetTileType(param_1->tilePos, param_1->tileLayer); + u32 tileType = GetTileTypeAtTilePos(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 28e76062..b83c36e3 100644 --- a/src/manager/diggingCaveEntranceManager.c +++ b/src/manager/diggingCaveEntranceManager.c @@ -54,9 +54,9 @@ void DiggingCaveEntranceManager_Init(DiggingCaveEntranceManager* this) { tileIndex = SPECIAL_TILE_128; for (entrance = GetDiggingCaveEntranceForRoom(entrance, room); entrance != 0; entrance = GetDiggingCaveEntranceForRoom(entrance, room)) { - 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); + SetTile(tileIndex, entrance->sourceTilePos + TILE_POS(-1, 1), LAYER_BOTTOM); + SetTile(tileIndex, entrance->sourceTilePos + TILE_POS(0, 1), LAYER_BOTTOM); + SetTile(tileIndex, entrance->sourceTilePos + TILE_POS(1, 1), LAYER_BOTTOM); entrance++; } } @@ -80,8 +80,8 @@ bool32 DiggingCaveEntranceManager_CheckEnterEntrance(DiggingCaveEntranceManager* if (gDiggingCaveEntranceTransition.isDiggingCave) { offsetX = gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x; offsetY = gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y; - offsetX2 = (entr->sourceTilePosition & TILE_POS_X_COMPONENT) * 16 + 8; - offsetY2 = ((entr->sourceTilePosition & TILE_POS_Y_COMPONENT) >> 6) * 16 + 0x18; + offsetX2 = (entr->sourceTilePos & TILE_POS_X_COMPONENT) * 16 + 8; + offsetY2 = ((entr->sourceTilePos & TILE_POS_Y_COMPONENT) >> 6) * 16 + 0x18; tmp = offsetX - offsetX2; if (tmp + 0x18 > 0x30 || offsetY - offsetY2 + 8 > 0x10U) return FALSE; @@ -90,9 +90,9 @@ bool32 DiggingCaveEntranceManager_CheckEnterEntrance(DiggingCaveEntranceManager* DiggingCaveEntranceManager_EnterEntrance(this, entr); return TRUE; } else { - if (COORD_TO_TILE(&gPlayerEntity.base) != entr->sourceTilePosition) + if (COORD_TO_TILE(&gPlayerEntity.base) != entr->sourceTilePos) return FALSE; - offsetY2 = gRoomControls.origin_y + ((entr->sourceTilePosition >> 6) << 4) + 6; + offsetY2 = gRoomControls.origin_y + ((entr->sourceTilePos >> 6) << 4) + 6; if (gPlayerEntity.base.y.HALF.HI >= offsetY2) return FALSE; DiggingCaveEntranceManager_EnterEntrance(this, entr); @@ -111,9 +111,9 @@ void DiggingCaveEntranceManager_EnterEntrance(DiggingCaveEntranceManager* this, gRoomControls.room = entr->targetRoom; gDiggingCaveEntranceTransition.entrance = entr; gDiggingCaveEntranceTransition.offsetX = gPlayerEntity.base.x.HALF.HI - gRoomControls.origin_x - - ((entr->sourceTilePosition & TILE_POS_X_COMPONENT) * 16); + ((entr->sourceTilePos & TILE_POS_X_COMPONENT) * 16); gDiggingCaveEntranceTransition.offsetY = gPlayerEntity.base.y.HALF.HI - gRoomControls.origin_y - - ((entr->sourceTilePosition & TILE_POS_Y_COMPONENT) >> 2); + ((entr->sourceTilePos & TILE_POS_Y_COMPONENT) >> 2); #ifndef EU isDiggingCave = gDiggingCaveEntranceTransition.isDiggingCave; @@ -130,7 +130,7 @@ void DiggingCaveEntranceManager_EnterEntrance(DiggingCaveEntranceManager* this, } const DiggingCaveEntrance* GetDiggingCaveEntranceForRoom(const DiggingCaveEntrance* entr, int room) { - for (; entr->sourceTilePosition != 0xffff; entr++) { + for (; entr->sourceTilePos != 0xffff; entr++) { if (entr->sourceRoom == room) return entr; } diff --git a/src/manager/flameManager.c b/src/manager/flameManager.c index c8174afd..6140730e 100644 --- a/src/manager/flameManager.c +++ b/src/manager/flameManager.c @@ -15,18 +15,18 @@ void FlameManager_Main(FlameManager* this) { if (super->action == 0) { this->tilePos = TILE(this->tilePos, this->field_0x3a); - if (GetTileType(this->tilePos, LAYER_TOP) == TILE_TYPE_117) { + if (GetTileTypeAtTilePos(this->tilePos, LAYER_TOP) == TILE_TYPE_117) { super->action = 1; SetTile(SPECIAL_TILE_106, this->tilePos, LAYER_BOTTOM); } else { DeleteThisEntity(); } } - if (GetTileType(this->tilePos, LAYER_BOTTOM) == SPECIAL_TILE_107) { + if (GetTileTypeAtTilePos(this->tilePos, LAYER_BOTTOM) == SPECIAL_TILE_107) { sub_0807B7D8(TILE_TYPE_118, this->tilePos, LAYER_TOP); DeleteThisEntity(); } - if (GetTileType(this->tilePos, LAYER_TOP) == TILE_TYPE_118) { + if (GetTileTypeAtTilePos(this->tilePos, LAYER_TOP) == TILE_TYPE_118) { SetTile(SPECIAL_TILE_107, this->tilePos, LAYER_BOTTOM); DeleteThisEntity(); } diff --git a/src/manager/lightLevelSetManager.c b/src/manager/lightLevelSetManager.c index 3027a449..a2218e63 100644 --- a/src/manager/lightLevelSetManager.c +++ b/src/manager/lightLevelSetManager.c @@ -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 (GetTileType(this->field_0x20, super->type2) == TILE_TYPE_118) { + if (GetTileTypeAtTilePos(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 (GetTileType(this->field_0x20, super->type2) != TILE_TYPE_118) { + if (GetTileTypeAtTilePos(this->field_0x20, super->type2) != TILE_TYPE_118) { return; } SetFlag(this->field_0x3e); diff --git a/src/manager/manager29.c b/src/manager/manager29.c index e8e60896..133d3944 100644 --- a/src/manager/manager29.c +++ b/src/manager/manager29.c @@ -32,7 +32,7 @@ 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 = GetTileType(this->unk_38, this->layer); + this->unk_3c = GetTileTypeAtTilePos(this->unk_38, this->layer); mapLayer = GetLayerByIndex(this->layer); this->unk_28 = (u16*)mapLayer->tileTypes; this->unk_2c = &mapLayer->mapData[(s16)this->unk_3a]; diff --git a/src/manager/minishPortalManager.c b/src/manager/minishPortalManager.c index aa7fc1a5..2d13eb1e 100644 --- a/src/manager/minishPortalManager.c +++ b/src/manager/minishPortalManager.c @@ -42,7 +42,7 @@ void MinishPortalManager_Main(MinishPortalManager* this) { gArea.portal_mode = 3; } } - if (GetVvvAtRoomCoords(this->unk_38, this->unk_3a, super->timer) == VVV_61) { + if (GetActTileAtRoomCoords(this->unk_38, this->unk_3a, super->timer) == ACT_TILE_61) { CreateMagicSparkles(this->unk_38 + gRoomControls.origin_x, this->unk_3a + gRoomControls.origin_y, super->timer); if (super->subtimer == 0) { diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c index d5432970..1adf595d 100644 --- a/src/manager/miscManager.c +++ b/src/manager/miscManager.c @@ -121,7 +121,7 @@ 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) != TILE_TYPE_97) + if (GetTileTypeAtRoomCoords(x, y, LAYER_BOTTOM) != TILE_TYPE_97) return; SetTileType(TILE_TYPE_38, ((x >> 4) & 0x3F) | (((y >> 4) & 0x3F) << 6), LAYER_BOTTOM); sub_08058F84(x, y); diff --git a/src/manager/tilePuzzleManager.c b/src/manager/tilePuzzleManager.c index b845aff0..766e2c6d 100644 --- a/src/manager/tilePuzzleManager.c +++ b/src/manager/tilePuzzleManager.c @@ -31,7 +31,7 @@ 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 (GetTileType(this->player_current_tile, super->type2)) { + switch (GetTileTypeAtTilePos(this->player_current_tile, super->type2)) { case TILE_TYPE_791: // stepped on a red tile again super->action = FAILED; diff --git a/src/movement.c b/src/movement.c index 6cb7a939..3bd0d134 100644 --- a/src/movement.c +++ b/src/movement.c @@ -2162,7 +2162,7 @@ bool32 ProcessMovement3(Entity* this) { } bool32 sub_080AF0C8(Entity* this) { - u32 tileType = GetTileTypeByEntity(this); + u32 tileType = GetTileTypeAtEntity(this); switch (tileType) { case 0x87: if (((this->direction + 7) & (0x3 | DIR_DIAGONAL | DirectionNorth | DirectionEast | DirectionSouth | diff --git a/src/npc/npc5.c b/src/npc/npc5.c index 3cc244e9..6e71501e 100644 --- a/src/npc/npc5.c +++ b/src/npc/npc5.c @@ -530,11 +530,11 @@ u32 CalcJumpDirection(Entity* this) { }; static const u8 sTable[] = { - // vvv, animationState - VVV_43, DirectionSouth, VVV_42, DirectionNorth, VVV_45, DirectionEast, VVV_44, DirectionWest, 0x0, + // actTile, animationState + ACT_TILE_43, DirectionSouth, ACT_TILE_42, DirectionNorth, ACT_TILE_45, DirectionEast, ACT_TILE_44, DirectionWest, 0x0, }; - u32 vvv; + u32 actTile; u32 x; s32 x_offset; s32 y_offset; @@ -544,11 +544,11 @@ u32 CalcJumpDirection(Entity* this) { ptr = (s8*)sOffsets; x_offset = ptr[x]; y_offset = ptr[x + 1]; - vvv = GetVvvRelativeToEntity(this, x_offset, y_offset); + actTile = GetActTileRelativeToEntity(this, x_offset, y_offset); ptr2 = sTable; do { - if (*ptr2 != vvv || this->animationState != (ptr2[1] >> 2)) { + if (*ptr2 != actTile || this->animationState != (ptr2[1] >> 2)) { continue; } diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index 118b2587..b0f3fc68 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -811,8 +811,8 @@ void sub_0806B0E0(Entity* this, ScriptExecutionContext* context) { int idx = 0; // 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) { + if (GetActTileAtRoomCoords(56, 184, 1) == ACT_TILE_87 && GetActTileAtRoomCoords(72, 184, 1) == ACT_TILE_87 && + GetActTileAtRoomCoords(56, 200, 1) == ACT_TILE_87 && GetActTileAtRoomCoords(72, 200, 1) == ACT_TILE_87) { idx = 1; } diff --git a/src/object/beanstalk.c b/src/object/beanstalk.c index 8fcbd27e..e445d415 100644 --- a/src/object/beanstalk.c +++ b/src/object/beanstalk.c @@ -333,18 +333,18 @@ void Beanstalk_Action1Type9(BeanstalkEntity* this) { if (super->subAction == 0) { super->subAction = 1; super->y.HALF.HI += 0x28; - this->unk_72 = sub_080B1A0C(super, 0, -24); + this->unk_72 = GetTileTypeRelativeToEntity(super, 0, -24); } super->spriteOrientation.flipY = gPlayerEntity.base.spriteOrientation.flipY; super->spriteRendering.b3 = gPlayerEntity.base.spriteRendering.b3; if (gPlayerState.floor_type == SURFACE_LADDER) { super->spritePriority.b0 = 0; - if (sub_080B1A0C(super, 0, -24) != SPECIAL_TILE_20) { + if (GetTileTypeRelativeToEntity(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)) { + if (this->unk_72 != GetTileTypeRelativeToEntity(super, 0, -24)) { SetTile(this->unk_72, COORD_TO_TILE_OFFSET(super, 0, 24), LAYER_BOTTOM); } } diff --git a/src/object/bigIceBlock.c b/src/object/bigIceBlock.c index a4398c99..dd204c78 100644 --- a/src/object/bigIceBlock.c +++ b/src/object/bigIceBlock.c @@ -127,7 +127,7 @@ void sub_08099880(BigIceBlockEntity* this) { void sub_08099910(BigIceBlockEntity* this) { u32 uVar2; - s32 vvv; + s32 actTile; u32 tileIndex; u32 tilePos; @@ -144,109 +144,109 @@ void sub_08099910(BigIceBlockEntity* this) { SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); break; case 1: - vvv = GetVvvAtTilePos(tilePos - 0x41, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 0x41, super->collisionLayer); tileIndex = SPECIAL_TILE_36; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_121; } SetTile(tileIndex, tilePos - 0x41, super->collisionLayer); SetTile(SPECIAL_TILE_34, tilePos - 0x40, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos - 0x3f, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 0x3f, super->collisionLayer); tileIndex = SPECIAL_TILE_37; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_123; } SetTile(tileIndex, tilePos - 0x3f, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos - 1, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 1, super->collisionLayer); tileIndex = SPECIAL_TILE_36; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_121; } SetTile(tileIndex, tilePos - 1, super->collisionLayer); SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos + 1, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 1, super->collisionLayer); tileIndex = SPECIAL_TILE_37; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_123; } SetTile(tileIndex, tilePos + 1, super->collisionLayer); return; break; case 2: - vvv = GetVvvAtTilePos(tilePos - 0x41, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 0x41, super->collisionLayer); tileIndex = SPECIAL_TILE_35; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_119; } SetTile(tileIndex, tilePos - 0x41, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos - 0x40, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 0x40, super->collisionLayer); tileIndex = SPECIAL_TILE_35; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_119; } 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); + actTile = GetActTileAtTilePos(tilePos + 0x3f, super->collisionLayer); tileIndex = SPECIAL_TILE_38; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_124; } SetTile(tileIndex, tilePos + 0x3f, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos + 0x40, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 0x40, super->collisionLayer); tileIndex = SPECIAL_TILE_38; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_124; } SetTile(tileIndex, tilePos + 0x40, super->collisionLayer); break; case 3: - vvv = GetVvvAtTilePos(tilePos - 0x41, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 0x41, super->collisionLayer); tileIndex = SPECIAL_TILE_39; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_117; } SetTile(tileIndex, tilePos - 0x41, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos - 0x40, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 0x40, super->collisionLayer); tileIndex = SPECIAL_TILE_35; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_119; } SetTile(tileIndex, tilePos - 0x40, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos - 0x3f, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 0x3f, super->collisionLayer); tileIndex = SPECIAL_TILE_40; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_118; } SetTile(tileIndex, tilePos - 0x3f, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos - 1, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos - 1, super->collisionLayer); tileIndex = SPECIAL_TILE_36; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_121; } SetTile(tileIndex, tilePos - 1, super->collisionLayer); SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos + 1, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 1, super->collisionLayer); tileIndex = SPECIAL_TILE_37; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_123; } SetTile(tileIndex, tilePos + 1, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos + 0x3f, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 0x3f, super->collisionLayer); tileIndex = SPECIAL_TILE_41; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_120; } SetTile(tileIndex, tilePos + 0x3f, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos + 0x40, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 0x40, super->collisionLayer); tileIndex = SPECIAL_TILE_38; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_124; } SetTile(tileIndex, tilePos + 0x40, super->collisionLayer); - vvv = GetVvvAtTilePos(tilePos + 0x41, super->collisionLayer); + actTile = GetActTileAtTilePos(tilePos + 0x41, super->collisionLayer); tileIndex = SPECIAL_TILE_42; - if (vvv == VVV_18) { + if (actTile == ACT_TILE_18) { tileIndex = SPECIAL_TILE_122; } SetTile(tileIndex, tilePos + 0x41, super->collisionLayer); diff --git a/src/object/bigPushableLever.c b/src/object/bigPushableLever.c index 5847ca65..e7efcd56 100644 --- a/src/object/bigPushableLever.c +++ b/src/object/bigPushableLever.c @@ -11,8 +11,8 @@ typedef struct { /*0x00*/ Entity base; /*0x68*/ u8 unk_68[8]; - /*0x70*/ u16 tilePositionUpper; - /*0x72*/ u16 tilePositionLower; + /*0x70*/ u16 tilePosUpper; + /*0x72*/ u16 tilePosLower; /*0x74*/ u16 tileIndexUpper; /*0x76*/ u16 tileIndexLower; /*0x78*/ u8 unk_78[12]; @@ -48,8 +48,8 @@ void BigPushableLever_Init(BigPushableLeverEntity* this) { void BigPushableLever_Idle(BigPushableLeverEntity* this) { if (BigPushableLever_ShouldStartPushing(this)) { super->action = PUSHING; - SetTile(this->tileIndexUpper, this->tilePositionUpper, super->collisionLayer); - SetTile(this->tileIndexLower, this->tilePositionLower, super->collisionLayer); + SetTile(this->tileIndexUpper, this->tilePosUpper, super->collisionLayer); + SetTile(this->tileIndexLower, this->tilePosLower, super->collisionLayer); EnqueueSFX(SFX_132); RequestPriorityDuration(super, 30); if (PlayerCanBeMoved()) { @@ -84,32 +84,32 @@ void BigPushableLever_SetIdle(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 = 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); + this->tilePosUpper = COORD_TO_TILE_OFFSET(super, 0, 0x10); + this->tilePosLower = this->tilePosUpper - 0x40; + this->tileIndexUpper = GetTileIndex(this->tilePosUpper, super->collisionLayer); + this->tileIndexLower = GetTileIndex(this->tilePosLower, super->collisionLayer); + SetTile(SPECIAL_TILE_87, this->tilePosUpper, super->collisionLayer); + SetTile(SPECIAL_TILE_88, this->tilePosLower, 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 = 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); + this->tilePosUpper = COORD_TO_TILE_OFFSET(super, 0x10, 0); + this->tilePosLower = this->tilePosUpper - 1; + this->tileIndexUpper = GetTileIndex(this->tilePosUpper, super->collisionLayer); + this->tileIndexLower = GetTileIndex(this->tilePosLower, super->collisionLayer); + SetTile(SPECIAL_TILE_85, this->tilePosUpper, super->collisionLayer); + SetTile(SPECIAL_TILE_86, this->tilePosLower, super->collisionLayer); InitializeAnimation(super, 0); } } bool32 BigPushableLever_ShouldStartPushing(BigPushableLeverEntity* this) { - if (GetTileIndex(this->tilePositionLower, super->collisionLayer) == SPECIAL_TILE_89) { + if (GetTileIndex(this->tilePosLower, super->collisionLayer) == SPECIAL_TILE_89) { if (--this->timer == 0) { return TRUE; } BigPushableLever_CalculateSpriteOffsets(this); - SetTile(gUnk_081236E8[super->type2], this->tilePositionLower, super->collisionLayer); + SetTile(gUnk_081236E8[super->type2], this->tilePosLower, super->collisionLayer); } else { this->timer = 60; super->spriteOffsetX = 0; diff --git a/src/object/blockPushed.c b/src/object/blockPushed.c index b6933775..85f45ce9 100644 --- a/src/object/blockPushed.c +++ b/src/object/blockPushed.c @@ -45,7 +45,7 @@ void BlockPushed_Init(BlockPushedEntity* this) { super->x.HALF.HI += tmp; super->y.HALF.HI += tmp; super->hitbox = (Hitbox*)gUnk_0811F64C[super->type]; - this->unk_68 = GetTileType(tilePos, super->collisionLayer); + this->unk_68 = GetTileTypeAtTilePos(tilePos, super->collisionLayer); switch (super->type) { case 0: sub_080832D8(tilePos, this); diff --git a/src/object/button.c b/src/object/button.c index 7c238e5b..ef014914 100644 --- a/src/object/button.c +++ b/src/object/button.c @@ -44,7 +44,7 @@ void Button_Init(ButtonEntity* this) { } this->tilePos = (((super->x.HALF.HI - gRoomControls.origin_x) >> 4) & 0x3F) | ((((super->y.HALF.HI - gRoomControls.origin_y) >> 4) & 0x3F) << 6); - this->unk_72 = GetTileType(this->tilePos, super->collisionLayer); + this->unk_72 = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); if (super->type == 0 && CheckFlags(this->unk_86)) { super->action = 5; SetTileType(TILE_TYPE_122, this->tilePos, super->collisionLayer); @@ -60,7 +60,7 @@ void Button_Init(ButtonEntity* this) { void Button_Action1(ButtonEntity* this) { if (sub_08081E3C(this)) { super->action = 2; - this->unk_72 = GetTileType(this->tilePos, super->collisionLayer); + this->unk_72 = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); } } @@ -132,12 +132,12 @@ bool32 sub_08081CB0(ButtonEntity* this) { u16 tileType; if (sub_08081D74(this)) { this->unk_70 = -1; - if (GetTileType(this->tilePos, super->collisionLayer) == SPECIAL_TILE_53) { + if (GetTileTypeAtTilePos(this->tilePos, super->collisionLayer) == SPECIAL_TILE_53) { sub_0807B7D8(0x78, this->tilePos, super->collisionLayer); } return TRUE; } else { - tileType = GetTileType(this->tilePos, super->collisionLayer); + tileType = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); if (tileType != 0x77 && tileType != 0x79 && tileType != SPECIAL_TILE_53) { this->unk_70 = GetTileIndex(this->tilePos, super->collisionLayer); return TRUE; @@ -204,7 +204,7 @@ u32 sub_08081E3C(ButtonEntity* this) { }; const u16* tmp1; s32 tmp2; - tmp2 = GetTileType(this->tilePos, super->collisionLayer); + tmp2 = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); tmp1 = gUnk_0811EE50; do { if (*tmp1 == tmp2) @@ -223,21 +223,21 @@ void sub_08081E6C(ButtonEntity* this) { u32 tileType; MapLayer* mapLayer; u16* tmp2; - u16* tmp; + u16* subTiles; u16* tmp3; u32 tilePos = this->tilePos; u32 layer = super->collisionLayer; - u32 specialTile = GetTileType(tilePos, layer); + u32 specialTile = GetTileTypeAtTilePos(tilePos, layer); if (specialTile < 0x4000) return; mapLayer = GetLayerByIndex(layer); tileType = (super->type == 0 ? TILE_TYPE_122 : TILE_TYPE_120); - tmp = mapLayer->tiles; - tmp = tmp + (mapLayer->unkData2[tileType] << 2); + subTiles = mapLayer->subTiles; + subTiles = subTiles + (mapLayer->tileIndices[tileType] << 2); tmp2 = (layer == 2 ? gMapDataTopSpecial : gMapDataBottomSpecial); tmp2 += (((0x3f & tilePos) << 1) + ((0xfc0 & tilePos) << 2)); - if (sub_08081F00((u32*)tmp2, (u32*)tmp)) + if (sub_08081F00((u32*)tmp2, (u32*)subTiles)) return; SetTileType(tileType, tilePos, layer); SetTile(specialTile, tilePos, layer); diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c index 8fea49c9..7ea08cda 100644 --- a/src/object/chestSpawner.c +++ b/src/object/chestSpawner.c @@ -232,7 +232,7 @@ void ChestSpawner_Type0Init(ChestSpawnerEntity* this) { super->action++; this->tilePos = COORD_TO_TILE(super); super->hitbox = (Hitbox*)&gUnk_0811F8A8; - if (GetTileTypeByEntity(super) == TILE_TYPE_116) { + if (GetTileTypeAtEntity(super) == TILE_TYPE_116) { DeleteThisEntity(); } if (CheckFlags(this->unk_86)) { @@ -271,7 +271,7 @@ void ChestSpawner_Type0Action2(ChestSpawnerEntity* this) { void ChestSpawner_Type0Action3(ChestSpawnerEntity* this) { if ((super->type == 1) || (super->type == 7)) { - if (GetTileTypeByEntity(super) == TILE_TYPE_116) { + if (GetTileTypeAtEntity(super) == TILE_TYPE_116) { DeleteEntity(super); } else { if (!CheckFlags(this->unk_86)) { diff --git a/src/object/crenelBeanSprout.c b/src/object/crenelBeanSprout.c index 578e3ef6..b57c4c8c 100644 --- a/src/object/crenelBeanSprout.c +++ b/src/object/crenelBeanSprout.c @@ -168,13 +168,13 @@ void CrenelBeanSprout_Action1(CrenelBeanSproutEntity* this) { tmp = gPlayerEntity.base.animationState & 6; this->unk_70 = ((super->x.HALF.HI + (s8)gUnk_08123184[tmp]) & -0x10) | 8; this->unk_72 = ((super->y.HALF.HI + (s8)gUnk_08123184[(tmp) + 1]) & -0x10) | 8; - if (GetVvvAtWorldCoords(this->unk_70, this->unk_72, super->collisionLayer) == VVV_25) { + if (GetActTileAtWorldCoords(this->unk_70, this->unk_72, super->collisionLayer) == ACT_TILE_25) { gHUD.rActionPlayerState = R_ACTION_THROW; } else { gHUD.rActionPlayerState = R_ACTION_NONE; } PositionRelative(&gPlayerEntity.base, super, 0, 0x10000); - if (GetVvvAtEntity(super) == VVV_25) { + if (GetActTileAtEntity(super) == ACT_TILE_25) { RestorePrevTileEntity(0xdc, super->collisionLayer); sub_08096A78(this); } @@ -233,7 +233,7 @@ void CrenelBeanSprout_Action3(CrenelBeanSproutEntity* this) { void CrenelBeanSprout_Action4(CrenelBeanSproutEntity* this) { static const u16 gUnk_0812319C[] = { SPECIAL_TILE_60, SPECIAL_TILE_51 }; - if (gUnk_0812319C[super->type >> 1] == GetTileTypeByEntity(super)) { + if (gUnk_0812319C[super->type >> 1] == GetTileTypeAtEntity(super)) { GetNextFrame(super); gPlayerState.keepFacing |= 0x80; gPlayerState.field_0xa |= 0x80; diff --git a/src/object/cutsceneMiscObject.c b/src/object/cutsceneMiscObject.c index 3c26788f..2427c370 100644 --- a/src/object/cutsceneMiscObject.c +++ b/src/object/cutsceneMiscObject.c @@ -332,7 +332,7 @@ void CutsceneMiscObject_Type5(CutsceneMiscObjectEntity* this) { super->zVelocity = 0; SetEntityPriority(super, PRIO_PLAYER_EVENT); InitializeAnimation(super, 0); - if (GetVvvAtEntity(super) == VVV_13) { + if (GetActTileAtEntity(super) == ACT_TILE_13) { super->action = 3; } break; diff --git a/src/object/doubleBookshelf.c b/src/object/doubleBookshelf.c index 0438f353..eb3c267e 100644 --- a/src/object/doubleBookshelf.c +++ b/src/object/doubleBookshelf.c @@ -73,7 +73,7 @@ void DoubleBookshelf_Init(DoubleBookshelfEntity* this) { } void DoubleBookshelf_Action1(DoubleBookshelfEntity* this) { - GetTileType(this->unk_82, super->collisionLayer); + GetTileTypeAtTilePos(this->unk_82, super->collisionLayer); sub_0809B234(this); } diff --git a/src/object/fireplace.c b/src/object/fireplace.c index 8adfe936..4fd32aec 100644 --- a/src/object/fireplace.c +++ b/src/object/fireplace.c @@ -50,7 +50,7 @@ void Fireplace_Action1(FireplaceEntity* this) { } void sub_0809B7C0(FireplaceEntity* this) { - u32 tileType = GetTileTypeByEntity(super); + u32 tileType = GetTileTypeAtEntity(super); if (tileType != SPECIAL_TILE_97 && tileType != SPECIAL_TILE_98) { sub_0809B7DC(this); } diff --git a/src/object/furniture.c b/src/object/furniture.c index d54eea37..44cb7449 100644 --- a/src/object/furniture.c +++ b/src/object/furniture.c @@ -261,7 +261,7 @@ static void FurnitureInit(FurnitureEntity* this) { for (i = 0; i < cnt; ++i, ++tilePos) { SetTile(SPECIAL_TILE_38, tilePos, LAYER_TOP); SetTile(SPECIAL_TILE_38, tilePos, LAYER_BOTTOM); - SetVvvAtTilePos(VVV_0, tilePos + TILE_POS(0, 1), 1); + SetActTileAtTilePos(ACT_TILE_0, tilePos + TILE_POS(0, 1), 1); } break; } @@ -287,7 +287,7 @@ static void FurnitureInit(FurnitureEntity* this) { super->collisionLayer = 1; super->spriteOrientation.flipY = 2; SetTile(SPECIAL_TILE_116, this->tilePos - 64, super->collisionLayer); - SetVvvAtTilePos(VVV_63, this->tilePos - 64, super->collisionLayer); + SetActTileAtTilePos(ACT_TILE_63, this->tilePos - 64, super->collisionLayer); SetTile(SPECIAL_TILE_23, this->tilePos, super->collisionLayer); SetTile(SPECIAL_TILE_23, this->tilePos + 64, super->collisionLayer); break; @@ -339,7 +339,7 @@ static void FurnitureUpdate(FurnitureEntity* this) { case 0x80: if (gPlayerEntity.base.y.HALF.HI < super->y.HALF.HI + 8) { if (gPlayerState.floor_type != SURFACE_LADDER && - GetTileTypeByEntity(super) == SPECIAL_TILE_23) { + GetTileTypeAtEntity(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); @@ -349,7 +349,7 @@ static void FurnitureUpdate(FurnitureEntity* this) { gPlayerEntity.base.collisionLayer = 1; UpdateSpriteForCollisionLayer(&gPlayerEntity.base); } - if (GetTileTypeByEntity(super) != SPECIAL_TILE_23) { + if (GetTileTypeAtEntity(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); diff --git a/src/object/giantBookLadder.c b/src/object/giantBookLadder.c index 1be5f63c..5f18d1b4 100644 --- a/src/object/giantBookLadder.c +++ b/src/object/giantBookLadder.c @@ -83,5 +83,5 @@ void sub_0808E55C(GiantBookLadderEntity* this) { } u32 sub_0808E670(GiantBookLadderEntity* this) { - return GetTileType(this->unk74 - 0x101, LAYER_BOTTOM); + return GetTileTypeAtTilePos(this->unk74 - 0x101, LAYER_BOTTOM); } diff --git a/src/object/hiddenLadderDown.c b/src/object/hiddenLadderDown.c index d02a22f4..dd7ed7d5 100644 --- a/src/object/hiddenLadderDown.c +++ b/src/object/hiddenLadderDown.c @@ -55,7 +55,7 @@ void HiddenLadderDown_Init(HiddenLadderDownEntity* this) { } void HiddenLadderDown_Action1(HiddenLadderDownEntity* this) { - if (GetTileType(this->unk_70, super->collisionLayer) == 0x1a6) { + if (GetTileTypeAtTilePos(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 7f27236a..7d7b8917 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 = GetTileTypeByEntity(super); + this->unk_6e = GetTileTypeAtEntity(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 != GetTileTypeByEntity(super)) { + this->unk_6e != GetTileTypeAtEntity(super)) { super->direction = 0; super->speed = 0; super->spriteSettings.draw = 1; diff --git a/src/object/ladderUp.c b/src/object/ladderUp.c index 002146d7..5e5727fa 100644 --- a/src/object/ladderUp.c +++ b/src/object/ladderUp.c @@ -67,12 +67,12 @@ void LadderUp(Entity* this) { if (this->type2 == 0) { if (gPlayerEntity.base.y.HALF.HI < this->y.HALF.HI) { if (gPlayerState.floor_type != SURFACE_LADDER && - (GetTileTypeByEntity(this) == SPECIAL_TILE_23)) { + (GetTileTypeAtEntity(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 (GetTileTypeByEntity(this) != SPECIAL_TILE_23) { + if (GetTileTypeAtEntity(this) != SPECIAL_TILE_23) { SetTile(SPECIAL_TILE_23, COORD_TO_TILE(this), this->collisionLayer); if (this->type == 0) { SetTile(SPECIAL_TILE_23, COORD_TO_TILE_OFFSET(this, 0, 16), this->collisionLayer); diff --git a/src/object/lilypadLarge.c b/src/object/lilypadLarge.c index 05111754..03cca48a 100644 --- a/src/object/lilypadLarge.c +++ b/src/object/lilypadLarge.c @@ -331,10 +331,10 @@ void LilypadLarge_Action2(LilypadLargeEntity* this) { void sub_08085A44(LilypadLargeEntity* this) { super->speed = 0x200; - if (GetVvvRelativeToEntity(super, 0x10, 0x18) != VVV_17) { + if (GetActTileRelativeToEntity(super, 0x10, 0x18) != ACT_TILE_17) { super->direction = 0x18; } else { - if (GetVvvRelativeToEntity(super, -0x10, 0x18) != VVV_17) { + if (GetActTileRelativeToEntity(super, -0x10, 0x18) != ACT_TILE_17) { super->direction = 8; } else { super->direction = 0x10; @@ -355,7 +355,7 @@ void sub_08085A98(LilypadLargeEntity* this) { this->unk_78.WORD -= 0x20000; SetAffineInfo(super, this->unk_78.HALF_U.HI, this->unk_78.HALF_U.HI, this->unk_7c.HALF_U.HI); } - if (GetVvvRelativeToEntity(super, 0, 0x18) != VVV_17) { + if (GetActTileRelativeToEntity(super, 0, 0x18) != ACT_TILE_17) { super->subAction = 2; if (gArea.locationIndex == 27) { // AREA_TEMPLE_OF_DROPLETS super->y.HALF.HI += 0xd0; @@ -388,7 +388,7 @@ void sub_08085B40(LilypadLargeEntity* this) { } } else { ResetCollisionLayer(super); - if (GetVvvAtEntity(super) == VVV_13) { + if (GetActTileAtEntity(super) == ACT_TILE_13) { ResetCollisionLayer(&gPlayerEntity.base); LilypadLarge_Action4(this); super->direction = GetFacingDirection(&gPlayerEntity.base, super); @@ -410,7 +410,7 @@ void sub_08085B40(LilypadLargeEntity* this) { super->timer |= 0x80; this->unk_70 = 0; this->unk_6c = 0; - if (GetVvvAtEntity(super) == VVV_13) { + if (GetActTileAtEntity(super) == ACT_TILE_13) { super->action = 4; } } @@ -458,7 +458,7 @@ void LilypadLarge_Action5(LilypadLargeEntity* this) { void sub_08085D28(LilypadLargeEntity* this) { if (((gPlayerState.framestate != PL_STATE_TALKEZLO) && ((gPlayerState.flags & PL_FLAGS2) != 0)) && - (GetVvvRelativeToEntity(super, 0, 0x18) == VVV_17)) { + (GetActTileRelativeToEntity(super, 0, 0x18) == ACT_TILE_17)) { super->action = 2; super->subAction = 0; PausePlayer(); diff --git a/src/object/linkEmptyingBottle.c b/src/object/linkEmptyingBottle.c index 84d1da82..fff00408 100644 --- a/src/object/linkEmptyingBottle.c +++ b/src/object/linkEmptyingBottle.c @@ -15,7 +15,7 @@ typedef struct { /*0x68*/ u8 unk_68; } LinkEmptyingBottleEntity; -extern u32 sub_080B1A0C(Entity*, s32, s32); +extern u32 GetTileTypeRelativeToEntity(Entity*, s32, s32); void LinkEmptyingBottle_Init(LinkEmptyingBottleEntity*); void LinkEmptyingBottle_Action1(LinkEmptyingBottleEntity*); @@ -118,7 +118,7 @@ void sub_08094980(LinkEmptyingBottleEntity* this, u32 searchTileIndex, u32 repla while (index < 10) { xOffset = gUnk_08122A28[index]; yOffset = gUnk_08122A28[index + 1]; - if (searchTileIndex == sub_080B1A0C(super, xOffset, yOffset)) { + if (searchTileIndex == GetTileTypeRelativeToEntity(super, xOffset, yOffset)) { SetTile(replaceTileIndex, TILE(super->x.HALF.HI + xOffset, super->y.HALF.HI + yOffset), super->collisionLayer); } diff --git a/src/object/minecart.c b/src/object/minecart.c index f8ed1789..075bb3e4 100644 --- a/src/object/minecart.c +++ b/src/object/minecart.c @@ -131,7 +131,7 @@ void Minecart_Action2(MinecartEntity* this) { void Minecart_Action3(MinecartEntity* this) { static const s8 offsetCoords[] = { 0, -7, 7, 0, 0, 7, -7, 0 }; - u32 vvv; + u32 actTile; gRoomControls.scrollSpeed = 7; if ((gPlayerState.flags & PL_IN_MINECART) == 0) { @@ -163,14 +163,14 @@ void Minecart_Action3(MinecartEntity* this) { super->subtimer = 60; } - vvv = GetVvvRelativeToEntity(super, offsetCoords[super->animationState * 2], + actTile = GetActTileRelativeToEntity(super, offsetCoords[super->animationState * 2], offsetCoords[super->animationState * 2 + 1]); - if (FindValueForKey(vvv, gUnk_081223D8[super->animationState]) == 0) { + if (FindValueForKey(actTile, gUnk_081223D8[super->animationState]) == 0) { super->direction = DirectionTurnAround(super->direction); super->animationState = AnimationStateFlip90(super->animationState); } else { - switch (vvv) { - case VVV_100: + switch (actTile) { + case ACT_TILE_100: super->flags &= ~ENT_PERSIST; super->hitType = 1; super->collisionFlags = 0x47; @@ -190,15 +190,15 @@ void Minecart_Action3(MinecartEntity* this) { SoundReq(SFX_PLY_VO4); SoundReq(SFX_139); return; - case VVV_103: - case VVV_104: - case VVV_105: - case VVV_106: - case VVV_108: - case VVV_109: - case VVV_110: - case VVV_111: - if (vvv == GetVvvAtEntity(super)) { + case ACT_TILE_103: + case ACT_TILE_104: + case ACT_TILE_105: + case ACT_TILE_106: + case ACT_TILE_108: + case ACT_TILE_109: + case ACT_TILE_110: + case ACT_TILE_111: + if (actTile == GetActTileAtEntity(super)) { Minecart_Action4(this); gPlayerEntity.base.animationState = super->animationState << 1; return; @@ -220,8 +220,8 @@ void Minecart_Action3(MinecartEntity* this) { void Minecart_Action4(MinecartEntity* this) { SnapToTile(super); CopyPosition(super, &gPlayerEntity.base); - switch (GetVvvAtEntity(super)) { - case VVV_103: + switch (GetActTileAtEntity(super)) { + case ACT_TILE_103: if (super->direction == DirectionWest) { super->direction = DirectionNorth; super->animationState = 0; @@ -230,7 +230,7 @@ void Minecart_Action4(MinecartEntity* this) { super->animationState = 1; } break; - case VVV_104: + case ACT_TILE_104: if (super->direction == DirectionEast) { super->direction = DirectionSouth; super->animationState = 2; @@ -239,7 +239,7 @@ void Minecart_Action4(MinecartEntity* this) { super->animationState = 3; } break; - case VVV_105: + case ACT_TILE_105: if (super->direction == DirectionEast) { super->direction = DirectionNorth; super->animationState = 0; @@ -248,7 +248,7 @@ void Minecart_Action4(MinecartEntity* this) { super->animationState = 3; } break; - case VVV_106: + case ACT_TILE_106: if (super->direction == DirectionWest) { super->direction = DirectionSouth; super->animationState = 2; @@ -343,18 +343,18 @@ const KeyValuePair* const gUnk_081223D8[] = { gUnk_08122436, }; const KeyValuePair gUnk_081223E8[] = { - { VVV_242, 1 }, { VVV_101, 1 }, { VVV_104, 1 }, { VVV_106, 1 }, { VVV_100, 1 }, { VVV_41, 1 }, + { ACT_TILE_242, 1 }, { ACT_TILE_101, 1 }, { ACT_TILE_104, 1 }, { ACT_TILE_106, 1 }, { ACT_TILE_100, 1 }, { ACT_TILE_41, 1 }, }; const u16 gUnk_081223E8End = 0; const KeyValuePair gUnk_08122402[] = { - { VVV_243, 1 }, { VVV_102, 1 }, { VVV_104, 1 }, { VVV_105, 1 }, { VVV_100, 1 }, { VVV_41, 1 }, + { ACT_TILE_243, 1 }, { ACT_TILE_102, 1 }, { ACT_TILE_104, 1 }, { ACT_TILE_105, 1 }, { ACT_TILE_100, 1 }, { ACT_TILE_41, 1 }, }; const u16 gUnk_08122402End = 0; const KeyValuePair gUnk_0812241C[] = { - { VVV_242, 1 }, { VVV_101, 1 }, { VVV_103, 1 }, { VVV_105, 1 }, { VVV_100, 1 }, { VVV_41, 1 }, + { ACT_TILE_242, 1 }, { ACT_TILE_101, 1 }, { ACT_TILE_103, 1 }, { ACT_TILE_105, 1 }, { ACT_TILE_100, 1 }, { ACT_TILE_41, 1 }, }; const u16 gUnk_0812241CEnd = 0; const KeyValuePair gUnk_08122436[] = { - { VVV_243, 1 }, { VVV_102, 1 }, { VVV_106, 1 }, { VVV_103, 1 }, { VVV_100, 1 }, { VVV_41, 1 }, + { ACT_TILE_243, 1 }, { ACT_TILE_102, 1 }, { ACT_TILE_106, 1 }, { ACT_TILE_103, 1 }, { ACT_TILE_100, 1 }, { ACT_TILE_41, 1 }, }; const u16 gUnk_08122436End = 0; diff --git a/src/object/objectBlockingStairs.c b/src/object/objectBlockingStairs.c index 2e00c122..76ff017f 100644 --- a/src/object/objectBlockingStairs.c +++ b/src/object/objectBlockingStairs.c @@ -108,9 +108,9 @@ void ObjectBlockingStairs_Action1(ObjectBlockingStairsEntity* this) { } if (this->unk7b & 0x40) { - tileType = (u32)GetTileType(this->tilePos - 1, super->collisionLayer); + tileType = (u32)GetTileTypeAtTilePos(this->tilePos - 1, super->collisionLayer); } else { - tileType = (u32)GetTileType(this->tilePos + 1, super->collisionLayer); + tileType = (u32)GetTileTypeAtTilePos(this->tilePos + 1, super->collisionLayer); } switch (tileType) { diff --git a/src/object/objectOnPillar.c b/src/object/objectOnPillar.c index 76ad4984..f48d7bcd 100644 --- a/src/object/objectOnPillar.c +++ b/src/object/objectOnPillar.c @@ -148,7 +148,7 @@ void ObjectOnPillar_Action4(ObjectOnPillarEntity* this) { bool32 sub_08097008(ObjectOnPillarEntity* this) { Entity* effect; - u32 tileType = GetTileType(this->tilePos, super->collisionLayer); + u32 tileType = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); if (tileType != SPECIAL_TILE_54) { switch (sub_08097074(tileType)) { case 1: @@ -191,7 +191,7 @@ void sub_08097098(ObjectOnPillarEntity* this) { this->unk_76 = 0x20; EnqueueSFX(SFX_10F); SetTile(this->tileIndex, this->tilePos, super->collisionLayer); - tileType = GetTileType(gUnk_080B4488[super->direction >> 3] + this->tilePos, super->collisionLayer); + tileType = GetTileTypeAtTilePos(gUnk_080B4488[super->direction >> 3] + this->tilePos, super->collisionLayer); if ((tileType == 0x79) || tileType == 0x77) { super->spriteOffsetY = 2; } @@ -206,7 +206,7 @@ void sub_080970F4(ObjectOnPillarEntity* this) { bool32 sub_08097144(ObjectOnPillarEntity* this) { LinearMoveUpdate(super); sub_0800445C(super); - if (GetVvvAtEntity(super) == VVV_25) { + if (GetActTileAtEntity(super) == ACT_TILE_25) { super->spriteOffsetY = 2; } if ((--this->unk_76 == 0) && sub_08097194(this) == FALSE) { @@ -222,7 +222,7 @@ bool32 sub_08097194(ObjectOnPillarEntity* this) { if (sub_0800442E(super)) { return TRUE; } else { - u32 tileType = GetTileTypeByEntity(super); + u32 tileType = GetTileTypeAtEntity(super); if (tileType == TILE_TYPE_113 || tileType == TILE_TYPE_114 || tileType == SPECIAL_TILE_32) { SetFlag(this->flag); EnqueueSFX(SFX_10B); diff --git a/src/object/playerClone.c b/src/object/playerClone.c index 4eafeb31..3a39e465 100644 --- a/src/object/playerClone.c +++ b/src/object/playerClone.c @@ -110,7 +110,7 @@ void PlayerClone_Action2(PlayerCloneEntity* this) { if (gPlayerEntity.base.iframes >= 1) { gPlayerState.chargeState.action = 1; } else { - GetVvvAtEntity(super); // TODO why is the return value not used? // leftover from debugging? + GetActTileAtEntity(super); // TODO why is the return value not used? // leftover from debugging? sub_08084B1C(this); super->x.HALF.HI = gPlayerEntity.base.x.HALF.HI + this->unk78; super->y.HALF.HI = gPlayerEntity.base.y.HALF.HI + this->unk7a; @@ -191,8 +191,8 @@ void sub_08084CAC(PlayerCloneEntity* this) { if (((PlayerCloneEntity*)gPlayerClones[super->type])->unk70 == 0) { ptr = &gUnk_080B4468[super->animationState & 6]; - if (GetVvvForTileType( - GetTileType(COORD_TO_TILE_OFFSET(super, -ptr[0], -ptr[1]), super->collisionLayer)) == VVV_114) { + if (GetActTileForTileType( + GetTileTypeAtTilePos(COORD_TO_TILE_OFFSET(super, -ptr[0], -ptr[1]), super->collisionLayer)) == ACT_TILE_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 ed8504a7..adfcb75d 100644 --- a/src/object/pot.c +++ b/src/object/pot.c @@ -107,7 +107,7 @@ void Pot_Action1(PotEntity* this) { Pot_Action5(this); break; default: - tileType = GetTileTypeByEntity(super); + tileType = GetTileTypeAtEntity(super); if (tileType != 0x4000) { switch (tileType) { case SPECIAL_TILE_4: @@ -129,7 +129,7 @@ void Pot_Action1(PotEntity* this) { DeleteThisEntity(); break; default: - if (GetVvvAtEntity(super) == VVV_13) { + if (GetActTileAtEntity(super) == ACT_TILE_13) { CreateFx(super, FX_FALL_DOWN, 0); } else if (tileType == SPECIAL_TILE_5) { gPlayerState.lastSwordMove = SWORD_MOVE_BREAK_POT; @@ -224,7 +224,7 @@ void Pot_Action4(PotEntity* this) { } this->unk_70 = GetTileIndex(COORD_TO_TILE(super), super->collisionLayer); - tileType = GetTileTypeByEntity(super); + tileType = GetTileTypeAtEntity(super); switch (tileType) { case 0x71: case 0x72: diff --git a/src/object/pushableFurniture.c b/src/object/pushableFurniture.c index 04682181..677ecd1b 100644 --- a/src/object/pushableFurniture.c +++ b/src/object/pushableFurniture.c @@ -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 (GetTileType(uVar2, 2)) { + switch (GetTileTypeAtTilePos(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 (GetTileType(pos - 1, 1)) { + switch (GetTileTypeAtTilePos(pos - 1, 1)) { case 0x300: break; default: @@ -516,7 +516,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { } return; } - switch (GetTileType(pos - 1, 2)) { + switch (GetTileTypeAtTilePos(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 (GetTileType(pos, 2)) { + switch (GetTileTypeAtTilePos(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 (GetTileType(uVar2 + 1, 1)) { + switch (GetTileTypeAtTilePos(uVar2 + 1, 1)) { case 0x300: break; default: @@ -557,7 +557,7 @@ void sub_0809028C(PushableFurnitureEntity* this, u32 param_2) { } return; } - switch (GetTileType(uVar2 + 1, 2)) { + switch (GetTileTypeAtTilePos(uVar2 + 1, 2)) { case 0x300: this->unk_83 |= 8; break; @@ -579,12 +579,12 @@ void sub_08090480(u32 param_1, u32 tilePos) { void sub_08090498(PushableFurnitureEntity* this) { u32 tmp = this->unk_70 - 0x80; RestorePrevTileEntity(tmp, 1); - if (((this->unk_83 & 1) != 0) && (GetTileType(tmp, 2) == 0x306)) { + if (((this->unk_83 & 1) != 0) && (GetTileTypeAtTilePos(tmp, 2) == 0x306)) { SetCollisionData(0x62, tmp, 1); } tmp = this->unk_72 - 0x80; RestorePrevTileEntity(tmp, 1); - if (((this->unk_83 & 2) != 0) && (GetTileType(tmp, 2) == 0x308)) { + if (((this->unk_83 & 2) != 0) && (GetTileTypeAtTilePos(tmp, 2) == 0x308)) { SetCollisionData(99, tmp, 1); } } diff --git a/src/object/pushableGrave.c b/src/object/pushableGrave.c index 1c21581d..4ba81982 100644 --- a/src/object/pushableGrave.c +++ b/src/object/pushableGrave.c @@ -149,7 +149,7 @@ bool32 sub_0809785C(PushableGraveEntity* this) { if (super->type != 0) { if (super->type2 != 0) { if ((CheckFlags(this->pushedFlag) != 0) || - GetTileType(this->unk_68, super->collisionLayer) == SPECIAL_TILE_63) { + GetTileTypeAtTilePos(this->unk_68, super->collisionLayer) == SPECIAL_TILE_63) { super->action = 3; super->timer = 64; super->subtimer = 0; diff --git a/src/object/pushableRock.c b/src/object/pushableRock.c index b8c98047..f58afa79 100644 --- a/src/object/pushableRock.c +++ b/src/object/pushableRock.c @@ -41,7 +41,7 @@ void PushableRock_Action1(PushableRockEntity* this) { u32 tileType; u32 tmp; - tileType = GetTileType(this->tilePos, super->collisionLayer); + tileType = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); switch (tileType) { case SPECIAL_TILE_28: case SPECIAL_TILE_29: @@ -87,12 +87,12 @@ void PushableRock_Action3(PushableRockEntity* this) { } void sub_0808A644(PushableRockEntity* this) { - u32 vvv; + u32 actTile; this->tilePos = COORD_TO_TILE(super); 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)) { + actTile = GetActTileAtTilePos(this->tilePos, super->collisionLayer); + if ((actTile == ACT_TILE_25) || (actTile == ACT_TILE_240)) { SetTile(SPECIAL_TILE_21, this->tilePos, super->collisionLayer); super->action = 3; if (!CheckFlags(this->pushedFlag)) { diff --git a/src/object/pushableStatue.c b/src/object/pushableStatue.c index 1649bcef..35fbb3bd 100644 --- a/src/object/pushableStatue.c +++ b/src/object/pushableStatue.c @@ -62,7 +62,7 @@ void PushableStatue_Action1(PushableStatueEntity* this) { Entity* obj; if (sub_0800442E(super) == 0) { - tileType = GetTileType(this->unk_84, super->collisionLayer); + tileType = GetTileTypeAtTilePos(this->unk_84, super->collisionLayer); if (tileType != SPECIAL_TILE_11) { switch (sub_0808968C(tileType)) { case 1: @@ -110,7 +110,7 @@ void PushableStatue_SubAction0(PushableStatueEntity* this) { ptr = &gUnk_08120CB4[index]; PositionRelative(super, &gPlayerEntity.base, Q_16_16(ptr[0]), Q_16_16(ptr[1])); } - tileType = GetTileType(this->unk_84, super->collisionLayer); + tileType = GetTileTypeAtTilePos(this->unk_84, super->collisionLayer); if (tileType != SPECIAL_TILE_11) { switch (sub_0808968C(tileType)) { case 1: @@ -166,7 +166,7 @@ void sub_08089454(PushableStatueEntity* this) { this->unk_84 = COORD_TO_TILE(super); 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) { + if (super->collisionLayer == 2 && GetTileTypeAtTilePos(this->unk_84, 1) == 0x310) { SetTile(SPECIAL_TILE_11, this->unk_84, LAYER_BOTTOM); } } @@ -197,10 +197,10 @@ void sub_08089538(PushableStatueEntity* this) { this->unk_86 = 0x20; EnqueueSFX(SFX_10F); SetTile(this->unk_80, this->unk_84, super->collisionLayer); - if ((super->collisionLayer == 2) && (GetTileType(this->unk_84, LAYER_BOTTOM) == SPECIAL_TILE_11)) { + if ((super->collisionLayer == 2) && (GetTileTypeAtTilePos(this->unk_84, LAYER_BOTTOM) == SPECIAL_TILE_11)) { CloneTile(TILE_TYPE_784, this->unk_84, 1); } - tileType = GetTileType(this->unk_84 + gUnk_080B4488[super->direction >> 3], super->collisionLayer); + tileType = GetTileTypeAtTilePos(this->unk_84 + gUnk_080B4488[super->direction >> 3], super->collisionLayer); if ((tileType == TILE_TYPE_121) || (tileType == TILE_TYPE_119)) { super->spriteOffsetY = -2; } @@ -258,14 +258,14 @@ bool32 sub_080896B0(void) { const s16* ptr; u32 tmp1; u32 tmp2; - u32 vvv; + u32 actTile; if (((gPlayerState.heldObject & 0x1f) == 0x12) && ((gPlayerEntity.base.frame & 1) != 0)) { 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 = GetVvvAtTilePos(uVar4, gPlayerEntity.base.collisionLayer); - if ((vvv - 0x26 > 1) && (vvv != VVV_41)) { + actTile = GetActTileAtTilePos(uVar4, gPlayerEntity.base.collisionLayer); + if ((actTile - 0x26 > 1) && (actTile != ACT_TILE_41)) { mapLayer = GetLayerByIndex(gPlayerEntity.base.collisionLayer); iVar2 = (uVar4 * 0x10000) >> 0x10; tmp1 = mapLayer->collisionData[iVar2]; diff --git a/src/object/rotatingTrapdoor.c b/src/object/rotatingTrapdoor.c index f8e05f49..3351b1d7 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 (GetTileTypeByEntity(this)) { + switch (GetTileTypeAtEntity(this)) { case 0x343: x = 0x10; case 0x344: diff --git a/src/object/smallIceBlock.c b/src/object/smallIceBlock.c index ebd83cbe..8aab1f91 100644 --- a/src/object/smallIceBlock.c +++ b/src/object/smallIceBlock.c @@ -85,7 +85,7 @@ void SmallIceBlock_Action1(SmallIceBlockEntity* this) { } } else { if (!sub_0800442E(super)) { - tileType = GetTileType(this->tilePos, super->collisionLayer); + tileType = GetTileTypeAtTilePos(this->tilePos, super->collisionLayer); if (tileType != SPECIAL_TILE_90) { switch (sub_08099618(tileType)) { case 1: @@ -186,10 +186,10 @@ void sub_080994B8(SmallIceBlockEntity* this) { EnqueueSFX(SFX_ICE_BLOCK_SLIDE); SetTile(this->unk_6c, this->tilePos, super->collisionLayer); - if ((super->collisionLayer == 2) && (GetTileType(this->tilePos, 1) == SPECIAL_TILE_90)) { + if ((super->collisionLayer == 2) && (GetTileTypeAtTilePos(this->tilePos, 1) == SPECIAL_TILE_90)) { CloneTile(TILE_TYPE_784, this->tilePos, 1); } - tileType = GetTileType(this->tilePos + gUnk_080B4488[super->direction >> 3], super->collisionLayer); + tileType = GetTileTypeAtTilePos(this->tilePos + gUnk_080B4488[super->direction >> 3], super->collisionLayer); if (tileType == 0x79 || tileType == 0x77) { super->spriteOffsetY = -2; } diff --git a/src/object/smokeParticle.c b/src/object/smokeParticle.c index 91145f3d..ac05de1f 100644 --- a/src/object/smokeParticle.c +++ b/src/object/smokeParticle.c @@ -71,8 +71,8 @@ void sub_080878CC(Entity* this) { for (itX = -0x10; itX < 0x11; itX += 0x10) { for (itY = -0x10; itY < 0x11; itY += 0x10) { tilePos = TILE((u32)x + itX, (u32)y + itY); - if (GetVvvAtTilePos(tilePos, (u8)layer) == VVV_46) { - switch (GetTileType(tilePos, layer)) { + if (GetActTileAtTilePos(tilePos, (u8)layer) == ACT_TILE_46) { + switch (GetTileTypeAtTilePos(tilePos, layer)) { case 0x368: case 0x367: DoTileInteraction(this, 3, x + itX, y + itY); diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c index 67542aa8..283d64be 100644 --- a/src/object/treeHidingPortal.c +++ b/src/object/treeHidingPortal.c @@ -60,7 +60,7 @@ void TreeHidingPortal_Action1(TreeHidingPortalEntity* this) { } } } - if (sub_0809E9A0() == VVV_84) { + if (sub_0809E9A0() == ACT_TILE_84) { super->action = 2; super->timer = 15; SetPlayerControl(1); @@ -110,15 +110,15 @@ static void sub_0809E96C(TreeHidingPortalEntity* this) { } static u32 sub_0809E9A0(void) { - u32 vvv; + u32 actTile; const s16* ptr; if (gPlayerEntity.base.action != PLAYER_BOUNCE) { - vvv = VVV_0; + actTile = ACT_TILE_0; } else { ptr = &gUnk_080B4468[gPlayerEntity.base.animationState & 6]; - vvv = GetVvvAtTilePos(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), 1); + actTile = GetActTileAtTilePos(COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]), 1); } - return vvv; + return actTile; } diff --git a/src/object/well.c b/src/object/well.c index b4b9b962..0e19e21a 100644 --- a/src/object/well.c +++ b/src/object/well.c @@ -38,7 +38,7 @@ void Well_Init(WellEntity* this) { } void Well_Action1(WellEntity* this) { - u32 tileIndex = GetTileType(this->unk_80, LAYER_BOTTOM); + u32 tileIndex = GetTileTypeAtTilePos(this->unk_80, LAYER_BOTTOM); if (tileIndex != SPECIAL_TILE_125) { PausePlayer(); gPlayerEntity.base.x.WORD = super->x.WORD; diff --git a/src/physics.c b/src/physics.c index 80401e6a..99bc50df 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 (!GetTileTypeByPos(ent->x.HALF.HI, ent->y.HALF.HI - 4, 2)) { - GetTileTypeByPos(ent->x.HALF.HI, ent->y.HALF.HI - 4, ent->collisionLayer); + if (!GetTileTypeAtWorldCoords(ent->x.HALF.HI, ent->y.HALF.HI - 4, 2)) { + GetTileTypeAtWorldCoords(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 eab7b575..c394ea0d 100644 --- a/src/player.c +++ b/src/player.c @@ -1976,7 +1976,7 @@ static void PlayerRoomTransition(PlayerEntity* this) { static void sub_080724DC(PlayerEntity* this) { super->knockbackDuration = 0; DeleteClones(); - if (GetVvvAtEntity(super) != VVV_41) { + if (GetActTileAtEntity(super) != ACT_TILE_41) { if ((gPlayerState.remainingDiveTime == 0) && (gPlayerState.swim_state != 0)) { PlayerUpdateSwimming(super); } @@ -2002,7 +2002,7 @@ static void sub_080724DC(PlayerEntity* this) { static void sub_0807258C(PlayerEntity* this) { if (gRoomControls.reload_flags == 0) { - if (GetVvvInFront(super) == VVV_41) { + if (GetActTileInFront(super) == ACT_TILE_41) { UpdatePlayerMovement(); if (sub_080797C4() != 0) { gPlayerState.startPosX = gPlayerEntity.base.x.HALF.HI; @@ -2367,7 +2367,7 @@ static void sub_08072D54(PlayerEntity* this) { LinearMoveUpdate(super); super->timer--; } else { - uVar2 = GetTileType(sub_0806F730(super), super->collisionLayer); + uVar2 = GetTileTypeAtTilePos(sub_0806F730(super), super->collisionLayer); switch (super->subtimer) { case 0: if (FindValueForKey(uVar2, sTileTable[gPlayerEntity.base.animationState >> 1])) { @@ -2627,7 +2627,7 @@ static void PlayerUseStairs(PlayerEntity* this) { static void sub_080732D0(PlayerEntity* this) { UpdateAnimationSingleFrame(super); - if (GetVvvAtEntity(super) != VVV_40) { + if (GetActTileAtEntity(super) != ACT_TILE_40) { super->direction = DirectionNorth; LinearMoveUpdate(super); } else { @@ -4114,7 +4114,7 @@ void sub_0807529C(PlayerEntity* this) { void sub_080752AC(PlayerEntity* this, ScriptExecutionContext* ctx) { LinearMoveUpdate(super); if (!ctx->unk_18) { - if (GetVvvAtEntity(super) != VVV_41) { + if (GetActTileAtEntity(super) != ACT_TILE_41) { ctx->unk_18 = 1; ctx->unk_19 = 6; } diff --git a/src/playerItem/playerItemBottle.c b/src/playerItem/playerItemBottle.c index 6ee9d0d1..47eeed56 100644 --- a/src/playerItem/playerItemBottle.c +++ b/src/playerItem/playerItemBottle.c @@ -280,7 +280,7 @@ void PlayerItemBottle_UseEmptyBottle(Entity* this) { if (this->spriteSettings.flipX != 0) { iVar2 = -iVar2; } - if (GetVvvRelativeToEntity(this, iVar2, (s8)ptr2[1]) == VVV_16) { + if (GetActTileRelativeToEntity(this, iVar2, (s8)ptr2[1]) == ACT_TILE_16) { this->type2 = ITEM_BOTTLE_WATER; } } diff --git a/src/playerItem/playerItemCellOverwriteSet.c b/src/playerItem/playerItemCellOverwriteSet.c index 21c005b7..5cacca03 100644 --- a/src/playerItem/playerItemCellOverwriteSet.c +++ b/src/playerItem/playerItemCellOverwriteSet.c @@ -17,8 +17,8 @@ typedef struct { /*0x6c*/ u16 tileType; } PlayerItemCellOverwriteSetEntity; -// vvv for specialTile -const u8 gMapSpecialTileToVvv[] = { +// actTile for specialTile +const u8 gMapSpecialTileToActTile[] = { 0, // SPECIAL_TILE_0 0, // SPECIAL_TILE_1 0, // SPECIAL_TILE_2 @@ -39,19 +39,19 @@ const u8 gMapSpecialTileToVvv[] = { 0, // SPECIAL_TILE_17 0, // SPECIAL_TILE_18 0, // SPECIAL_TILE_19 - VVV_241, // SPECIAL_TILE_20 + ACT_TILE_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 + ACT_TILE_83, // SPECIAL_TILE_23 + ACT_TILE_242, // SPECIAL_TILE_24 + ACT_TILE_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 + ACT_TILE_240, // SPECIAL_TILE_32 0, // SPECIAL_TILE_33 0, // SPECIAL_TILE_34 0, // SPECIAL_TILE_35 @@ -83,15 +83,15 @@ const u8 gMapSpecialTileToVvv[] = { 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 + ACT_TILE_61, // SPECIAL_TILE_64 + ACT_TILE_61, // SPECIAL_TILE_65 + ACT_TILE_61, // SPECIAL_TILE_66 + ACT_TILE_61, // SPECIAL_TILE_67 + ACT_TILE_61, // SPECIAL_TILE_68 + ACT_TILE_61, // SPECIAL_TILE_69 + ACT_TILE_61, // SPECIAL_TILE_70 + ACT_TILE_61, // SPECIAL_TILE_71 + ACT_TILE_61, // SPECIAL_TILE_72 0, // SPECIAL_TILE_73 0, // SPECIAL_TILE_74 0, // SPECIAL_TILE_75 @@ -100,7 +100,7 @@ const u8 gMapSpecialTileToVvv[] = { 0, // SPECIAL_TILE_78 0, // SPECIAL_TILE_79 0, // SPECIAL_TILE_80 - VVV_58, // SPECIAL_TILE_81 + ACT_TILE_58, // SPECIAL_TILE_81 0, // SPECIAL_TILE_82 0, // SPECIAL_TILE_83 0, // SPECIAL_TILE_84 @@ -124,7 +124,7 @@ const u8 gMapSpecialTileToVvv[] = { 0, // SPECIAL_TILE_102 0, // SPECIAL_TILE_103 0, // SPECIAL_TILE_104 - VVV_40, // SPECIAL_TILE_105 + ACT_TILE_40, // SPECIAL_TILE_105 0, // SPECIAL_TILE_106 0, // SPECIAL_TILE_107 0, // SPECIAL_TILE_108 @@ -136,35 +136,35 @@ const u8 gMapSpecialTileToVvv[] = { 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 + ACT_TILE_18, // SPECIAL_TILE_117 + ACT_TILE_18, // SPECIAL_TILE_118 + ACT_TILE_18, // SPECIAL_TILE_119 + ACT_TILE_18, // SPECIAL_TILE_120 + ACT_TILE_18, // SPECIAL_TILE_121 + ACT_TILE_18, // SPECIAL_TILE_122 + ACT_TILE_18, // SPECIAL_TILE_123 + ACT_TILE_18, // SPECIAL_TILE_124 0, // SPECIAL_TILE_125 - VVV_116, // SPECIAL_TILE_126 - VVV_116, // SPECIAL_TILE_127 - VVV_41, // SPECIAL_TILE_128 + ACT_TILE_116, // SPECIAL_TILE_126 + ACT_TILE_116, // SPECIAL_TILE_127 + ACT_TILE_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 + ACT_TILE_35, // SPECIAL_TILE_130 + ACT_TILE_41, // SPECIAL_TILE_131 + ACT_TILE_41, // SPECIAL_TILE_132 + ACT_TILE_41, // SPECIAL_TILE_133 + ACT_TILE_41, // SPECIAL_TILE_134 + ACT_TILE_41, // SPECIAL_TILE_135 + ACT_TILE_41, // SPECIAL_TILE_136 + ACT_TILE_16, // SPECIAL_TILE_137 + ACT_TILE_16, // SPECIAL_TILE_138 + ACT_TILE_16, // SPECIAL_TILE_139 + ACT_TILE_16, // SPECIAL_TILE_140 + ACT_TILE_41, // SPECIAL_TILE_141 + ACT_TILE_80, // SPECIAL_TILE_142 + ACT_TILE_81, // SPECIAL_TILE_143 0, // SPECIAL_TILE_144 - VVV_15, // SPECIAL_TILE_145 + ACT_TILE_15, // SPECIAL_TILE_145 0, // SPECIAL_TILE_146 0, // SPECIAL_TILE_147 0, // SPECIAL_TILE_148 @@ -342,7 +342,7 @@ void PlayerItemCellOverwriteSet(PlayerItemCellOverwriteSetEntity* this) { Entity* player = &gPlayerEntity.base; if (super->action == 0) { - this->tileType = GetTileType(TILE(player->x.HALF.HI + offsetByDirection[player->animationState & 0xe], + this->tileType = GetTileTypeAtTilePos(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 = GetTileType(TILE(player->x.HALF.HI + offsetByDirection[player->animationState & 0xe], + this->tileType = GetTileTypeAtTilePos(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 a27b8101..7281139d 100644 --- a/src/playerItem/playerItemGustBig.c +++ b/src/playerItem/playerItemGustBig.c @@ -172,10 +172,10 @@ void PlayerItemGustBig_Action2(PlayerItemGustBigEntity* this) { if (super->type2 == 0) { sub_0800451C(super); } - if (FindValueForKey(sub_080B1A0C(super, x, y), gUnk_080B3DF4)) { + if (FindValueForKey(GetTileTypeRelativeToEntity(super, x, y), gUnk_080B3DF4)) { return; } - if (GetVvvRelativeToEntity(super, x, y) == VVV_116) { + if (GetActTileRelativeToEntity(super, x, y) == ACT_TILE_116) { return; } if (sub_080040D8(super, (u8*)gUnk_08003E44, super->x.HALF.HI + x, super->y.HALF.HI + y) == 0) { diff --git a/src/playerItem/playerItemHeldObject.c b/src/playerItem/playerItemHeldObject.c index 31fa9be5..3bb07ec0 100644 --- a/src/playerItem/playerItemHeldObject.c +++ b/src/playerItem/playerItemHeldObject.c @@ -122,8 +122,8 @@ void PlayerItemHeldObject_SubAction2(PlayerItemHeldObjectEntity* this) { super->direction = super->knockbackDirection; super->knockbackDuration = 0; } - if (GetVvvRelativeToEntity(super, gUnk_081320C4[super->direction >> 2], - gUnk_081320C4[(super->direction >> 2) + 1]) == VVV_116) { + if (GetActTileRelativeToEntity(super, gUnk_081320C4[super->direction >> 2], + gUnk_081320C4[(super->direction >> 2) + 1]) == ACT_TILE_116) { LinearMoveUpdate(super); } else { data = GetCollisionDataAtEntity(super); @@ -136,27 +136,27 @@ void PlayerItemHeldObject_SubAction2(PlayerItemHeldObjectEntity* this) { (child->base).x = super->x; (child->base).y = super->y; (child->base).z = super->z; - data = GetVvvAtEntity(super); + data = GetActTileAtEntity(super); switch (data) { - case VVV_13: - case VVV_16: - case VVV_17: - case VVV_19: - case VVV_90: + case ACT_TILE_13: + case ACT_TILE_16: + case ACT_TILE_17: + case ACT_TILE_19: + case ACT_TILE_90: if (child == this) { switch (data) { - case VVV_13: + case ACT_TILE_13: CreateFx(super, FX_FALL_DOWN, 0); break; - case VVV_90: + case ACT_TILE_90: CreateFx(super, FX_LAVA_SPLASH, 0); break; - case VVV_16: - case VVV_17: + case ACT_TILE_16: + case ACT_TILE_17: CreateFx(super, FX_WATER_SPLASH, 0); break; - case VVV_19: + case ACT_TILE_19: CreateFx(super, FX_GREEN_SPLASH, 0); break; } diff --git a/src/playerItem/playerItemPacciCaneProjectile.c b/src/playerItem/playerItemPacciCaneProjectile.c index d7138a0f..251274c9 100644 --- a/src/playerItem/playerItemPacciCaneProjectile.c +++ b/src/playerItem/playerItemPacciCaneProjectile.c @@ -128,7 +128,7 @@ void PlayerItemPacciCaneProjectile_Action1(PlayerItemPacciCaneProjectileEntity* } if (sub_080B1BA4(COORD_TO_TILE(super), gPlayerEntity.base.collisionLayer, 0x80) == 0) { if (sub_080040D8(super, &gUnk_08003E44, super->x.HALF.HI, super->y.HALF.HI) == 0) { - if (GetVvvAtEntity(super) == VVV_25) { + if (GetActTileAtEntity(super) == ACT_TILE_25) { super->action = 4; COLLISION_OFF(super); super->x.HALF.HI = (super->x.HALF.HI & 0xfff0) | 8; diff --git a/src/playerItem/playerItemSword.c b/src/playerItem/playerItemSword.c index 63587abc..1bf1d9e7 100644 --- a/src/playerItem/playerItemSword.c +++ b/src/playerItem/playerItemSword.c @@ -374,7 +374,7 @@ void sub_080A7A84(PlayerItemSwordEntity* this) { (gPlayerState.sword_state != 0)) && ((gPlayerState.sword_state & 0xc0) == 0)) { entity = super; - if (GetVvvRelativeToEntity(entity, xOffset, yOffset) == VVV_46) { + if (GetActTileRelativeToEntity(entity, xOffset, yOffset) == ACT_TILE_46) { SoundReqClipped(&gPlayerEntity.base, SFX_ITEM_GLOVES_KNOCKBACK); } else { SoundReqClipped(&gPlayerEntity.base, SFX_METAL_CLINK); diff --git a/src/playerUtils.c b/src/playerUtils.c index 111ccfda..dc4c807b 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -69,7 +69,7 @@ extern u8 gUpdateVisibleTiles; bool32 sub_0807BF88(u32, u32, RoomResInfo*); -void sub_0807BFD0(void); +void SetupTileSet(void); void ForceSetPlayerState(u32 framestate); InteractableObject* sub_080784E4(void); @@ -77,7 +77,7 @@ InteractableObject* sub_080784E4(void); u32 sub_08079778(void); u32 GetPlayerTilePos(void); -extern const KeyValuePair gMapVvvToSurfaceType[]; +extern const KeyValuePair gMapActTileToSurfaceType[]; u32 sub_0807BEEC(u32 param_1, u32 param_2, u32 param_3); @@ -105,7 +105,7 @@ 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 FillActTileForLayer(MapLayer* mapLayer); extern u16 gUnk_080B77C0[]; @@ -836,7 +836,7 @@ const KeyValuePair gUnk_0811C254[] = { { 43, 1 }, { 38, 1 } }; const u16 gUnk_0811C254End = 0; const KeyValuePair gUnk_0811C25E[] = { { 44, 1 }, { 39, 1 } }; const u16 gUnk_0811C25EEnd = 0; -const KeyValuePair gUnk_0811C268[] = { { VVV_16, 1 }, { VVV_90, 1 }, { VVV_17, 1 }, { VVV_19, 1 } }; +const KeyValuePair gUnk_0811C268[] = { { ACT_TILE_16, 1 }, { ACT_TILE_90, 1 }, { ACT_TILE_17, 1 }, { ACT_TILE_19, 1 } }; const u16 gUnk_0811C268EEnd = 0; void sub_0807B114(PlayerEntity*); @@ -897,7 +897,7 @@ void sub_08077F84(void) { Entity* obj; if ((gPlayerEntity.base.collisionLayer & 2) == 0) { - u32 tileType = GetTileTypeByPos(gPlayerEntity.base.x.HALF.HI, gPlayerEntity.base.y.HALF.HI - 12, LAYER_TOP); + u32 tileType = GetTileTypeAtWorldCoords(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; @@ -1476,7 +1476,7 @@ u32 sub_080789A8(void) { } ptr = &gUnk_08007DF4[gPlayerEntity.base.animationState & 6]; - gCarriedEntity.unk_4 = uVar2 = sub_080B1A0C(&gPlayerEntity.base, (s8)ptr[0], (s8)ptr[1]); + gCarriedEntity.unk_4 = uVar2 = GetTileTypeRelativeToEntity(&gPlayerEntity.base, (s8)ptr[0], (s8)ptr[1]); if (!sub_0806FC24(uVar2, 6)) return 0; @@ -2022,10 +2022,10 @@ bool32 sub_08079550(void) { tilePos2 = COORD_TO_TILE_OFFSET(&gPlayerEntity.base, (gPlayerEntity.base.hitbox)->unk2[2], -ptr[1]); } - uVar3 = GetVvvAtTilePos(tilePos1, gPlayerEntity.base.collisionLayer); + uVar3 = GetActTileAtTilePos(tilePos1, gPlayerEntity.base.collisionLayer); uVar3 = FindValueForKey(uVar3, gUnk_0811C1E8[gPlayerEntity.base.animationState >> 1]); if (uVar3 != 0) { - uVar3 = GetVvvAtTilePos(tilePos2, gPlayerEntity.base.collisionLayer); + uVar3 = GetActTileAtTilePos(tilePos2, gPlayerEntity.base.collisionLayer); uVar3 = FindValueForKey(uVar3, gUnk_0811C1E8[gPlayerEntity.base.animationState >> 1]); if (uVar3 != 0) { gPlayerState.pushedObject |= 0x80; @@ -2354,13 +2354,13 @@ bool32 sub_08079C30(Entity* player) { return TRUE; } - if (gPlayerState.floor_type != FindValueForKey(GetVvvRelativeToEntity(player, 0, -1), gMapVvvToSurfaceType)) + if (gPlayerState.floor_type != FindValueForKey(GetActTileRelativeToEntity(player, 0, -1), gMapActTileToSurfaceType)) return FALSE; - if (gPlayerState.floor_type != FindValueForKey(GetVvvRelativeToEntity(player, 2, 0), gMapVvvToSurfaceType)) + if (gPlayerState.floor_type != FindValueForKey(GetActTileRelativeToEntity(player, 2, 0), gMapActTileToSurfaceType)) return FALSE; - if (gPlayerState.floor_type == FindValueForKey(GetVvvRelativeToEntity(player, -2, 0), gMapVvvToSurfaceType)) { + if (gPlayerState.floor_type == FindValueForKey(GetActTileRelativeToEntity(player, -2, 0), gMapActTileToSurfaceType)) { return TRUE; } } @@ -2372,7 +2372,7 @@ bool32 sub_08079D48(void) { return TRUE; } else { if (!PlayerCheckNEastTile()) { - if (!FindValueForKey((u16)GetVvvAtEntity(&gPlayerEntity.base), gUnk_0811C268)) { + if (!FindValueForKey((u16)GetActTileAtEntity(&gPlayerEntity.base), gUnk_0811C268)) { return TRUE; } } @@ -2593,7 +2593,7 @@ 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 = GetTileTypeByPos(param_1->x.HALF.HI + x, param_1->y.HALF.HI + y, gPlayerEntity.base.collisionLayer); + u32 tileType = GetTileTypeAtWorldCoords(param_1->x.HALF.HI + x, param_1->y.HALF.HI + y, gPlayerEntity.base.collisionLayer); if (tileType != gPlayerState.tileType) { gPlayerState.surfaceTimer = 0; } @@ -2610,8 +2610,8 @@ SurfaceType GetSurfaceCalcType(Entity* param_1, s32 x, s32 y) { gPlayerState.surfaceTimer++; } gPlayerState.floor_type_last = gPlayerState.floor_type; - tileType = GetVvvRelativeToEntity(param_1, x, y); // tileType is a vvv here - return FindValueForKey(tileType, gMapVvvToSurfaceType); + tileType = GetActTileRelativeToEntity(param_1, x, y); // tileType is a actTile here + return FindValueForKey(tileType, gMapActTileToSurfaceType); } void EnablePlayerDraw(Entity* this) { @@ -2655,7 +2655,7 @@ u32 sub_0807A2F8(u32 param_1) { iVar4 = 0; uVar2 = sub_08004202(&gPlayerEntity.base, auStack36, uVar2); if (GetCollisionDataAtTilePos(uVar2 >> 1, LAYER_BOTTOM)) { - if (!FindValueForKey((u16)GetVvvAtTilePos((u16)(uVar2 >> 1), gPlayerEntity.base.collisionLayer), + if (!FindValueForKey((u16)GetActTileAtTilePos((u16)(uVar2 >> 1), gPlayerEntity.base.collisionLayer), gUnk_0811C1D8[gPlayerEntity.base.animationState >> 1])) { break; } @@ -2665,7 +2665,7 @@ u32 sub_0807A2F8(u32 param_1) { uVar1 = sub_08004202(&gPlayerEntity.base, auStack36, uVar1); if (GetCollisionDataAtTilePos(uVar1 >> 1, LAYER_BOTTOM)) { - if (!FindValueForKey((u16)GetVvvAtTilePos((uVar1 >> 1), gPlayerEntity.base.collisionLayer), + if (!FindValueForKey((u16)GetActTileAtTilePos((uVar1 >> 1), gPlayerEntity.base.collisionLayer), gUnk_0811C1D8[gPlayerEntity.base.animationState >> 1])) { break; } @@ -2855,7 +2855,7 @@ void sub_0807A750(u32 param_1, u32 param_2, const u8* param_3, u32 param_4) { } } -u32 GetVvvInFront(Entity* this) { +u32 GetActTileInFront(Entity* this) { s32 x; s32 y; switch (this->direction) { @@ -2880,7 +2880,7 @@ u32 GetVvvInFront(Entity* this) { x = 0; break; } - return GetVvvRelativeToEntity(this, x, y); + return GetActTileRelativeToEntity(this, x, y); } void nullsub_505(void) { @@ -2951,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(GetTileType(COORD_TO_TILE_OFFSET(this, -xOffset, -yOffset), this->collisionLayer), 0xb); + sub_0806FC50(GetTileTypeAtTilePos(COORD_TO_TILE_OFFSET(this, -xOffset, -yOffset), this->collisionLayer), 0xb); if (ptr != NULL) { if (ptr[3] == 0x76) { object = CreateObject(FLAME, 1, 0); @@ -3287,20 +3287,20 @@ void SetTileType(u32 tileType, u32 tilePos, u32 layer) { u8 collisionData; u16 tileIndex; MapLayer* mapLayer; - u16* src; + u16* subTiles; u16* dest; if (tileType < 0x800) { UnregisterInteractTile(tilePos, layer); mapLayer = GetLayerByIndex(layer); - tileIndex = mapLayer->unkData2[tileType]; + tileIndex = mapLayer->tileIndices[tileType]; mapLayer->mapData[tilePos] = tileIndex; collisionData = gMapTileTypeToCollisionData[tileType]; mapLayer->collisionData[tilePos] = collisionData; if ((gRoomControls.scroll_flags & 2) != 0) { gMapBottom.collisionData[tilePos] = collisionData; } - mapLayer->vvv[tilePos] = gMapTileTypeToVvv[tileType]; + mapLayer->actTiles[tilePos] = gMapTileTypeToActTile[tileType]; if ((gRoomControls.scroll_flags & 1) == 0) { u32 offset = (tilePos & 0x3f) * 2 + (tilePos & 0xfc0) * 4; if (layer != 2) { @@ -3308,12 +3308,12 @@ void SetTileType(u32 tileType, u32 tilePos, u32 layer) { } else { dest = gMapDataTopSpecial + offset; } - src = mapLayer->tiles + tileIndex * 4; + subTiles = mapLayer->subTiles + 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]; - dest[0x80] = src[2]; - dest[0x81] = src[3]; + dest[0] = subTiles[0]; + dest[1] = subTiles[1]; + dest[0x80] = subTiles[2]; + dest[0x81] = subTiles[3]; if (gRoomControls.reload_flags != 1) { gUpdateVisibleTiles = 1; } @@ -3326,17 +3326,17 @@ void SetTileType(u32 tileType, u32 tilePos, u32 layer) { } bool32 sub_0807B434(u32 tilePos, u32 layer) { - switch (GetTileType(tilePos, layer)) { + switch (GetTileTypeAtTilePos(tilePos, layer)) { case TILE_TYPE_54: case TILE_TYPE_55: return FALSE; default: - return GetVvvAtTilePos(tilePos, layer) != VVV_13; + return GetActTileAtTilePos(tilePos, layer) != ACT_TILE_13; } } bool32 sub_0807B464(u32 tilePos, u32 layer) { - return GetVvvAtTilePos(tilePos, layer) == VVV_86; + return GetActTileAtTilePos(tilePos, layer) == ACT_TILE_86; } void sub_0807B480(u32 tilePos, u32 param_2) { @@ -3353,11 +3353,11 @@ void sub_0807B480(u32 tilePos, u32 param_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) { + if (GetTileTypeAtTilePos(tilePos + 0x40, LAYER_TOP) != 0) { tmp1 |= sub_0807B464(tilePos + 0x80, LAYER_BOTTOM) << 2; } tmp2 = gUnk_0811C2CC[tmp1]; - tileType = GetTileType(tilePos, LAYER_TOP); + tileType = GetTileTypeAtTilePos(tilePos, LAYER_TOP); ptr = gUnk_0811C2EC; tmp3 = 0; for (; *ptr != 0; ptr = ptr + 3) { @@ -3398,10 +3398,10 @@ u32 sub_0807B600(u32 tilePos) { u32 tilePos2; tilePos2 = tilePos - 0x40; - if (GetVvvAtTilePos(tilePos, LAYER_BOTTOM) != VVV_86) { + if (GetActTileAtTilePos(tilePos, LAYER_BOTTOM) != ACT_TILE_86) { return FALSE; } else { - tileType = GetTileType(tilePos, LAYER_BOTTOM); + tileType = GetTileTypeAtTilePos(tilePos, LAYER_BOTTOM); if (tileType == TILE_TYPE_618) { sub_0807B820(tilePos); } else if (tileType == TILE_TYPE_615) { @@ -3415,7 +3415,7 @@ u32 sub_0807B600(u32 tilePos) { } else if (tileType == TILE_TYPE_647) { sub_0807B930(tilePos + 0x40); } else { - if (GetTileType(tilePos, LAYER_TOP) != 0) { + if (GetTileTypeAtTilePos(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); @@ -3428,7 +3428,7 @@ u32 sub_0807B600(u32 tilePos) { } if (sub_0807B464(tilePos2, LAYER_TOP)) { SetTileType(0, tilePos2, LAYER_TOP); - if (GetTileType(tilePos2, LAYER_BOTTOM) == TILE_TYPE_754) { + if (GetTileTypeAtTilePos(tilePos2, LAYER_BOTTOM) == TILE_TYPE_754) { SetTileType(TILE_TYPE_756, tilePos2, LAYER_BOTTOM); } sub_0807B55C(tilePos + 1, 1, (u16*)&gUnk_0811C2AC); @@ -3446,7 +3446,7 @@ u32 sub_0807B600(u32 tilePos) { void sub_0807B778(u32 tilePos, u32 layer) { u32 tmp; - if (GetVvvAtTilePos(tilePos, layer) == VVV_13) { + if (GetActTileAtTilePos(tilePos, layer) == ACT_TILE_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; @@ -3504,30 +3504,30 @@ void sub_0807B930(u32 tilePos) { SetTileType(TILE_TYPE_658, tilePos + TILE_POS(1, 0), LAYER_BOTTOM); } -void SetTileByIndex(u32 tileIndex, u32 position, u32 layer) { +void SetTileByIndex(u32 tileIndex, u32 tilePos, u32 layer) { MapLayer* mapLayer; - u16* src; + u16* subTiles; u16* dest; u16 tileType; - UnregisterInteractTile(position, layer); + UnregisterInteractTile(tilePos, layer); mapLayer = GetLayerByIndex(layer); - mapLayer->mapData[position] = tileIndex; + mapLayer->mapData[tilePos] = tileIndex; tileType = mapLayer->tileTypes[tileIndex]; - mapLayer->collisionData[position] = gMapTileTypeToCollisionData[tileType]; - mapLayer->vvv[position] = gMapTileTypeToVvv[tileType]; + mapLayer->collisionData[tilePos] = gMapTileTypeToCollisionData[tileType]; + mapLayer->actTiles[tilePos] = gMapTileTypeToActTile[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->tiles + tileIndex * 4; - *dest = *src; - dest[1] = src[1]; - dest[0x80] = src[2]; - dest[0x81] = src[3]; + subTiles = mapLayer->subTiles + tileIndex * 4; + *dest = *subTiles; + dest[1] = subTiles[1]; + dest[0x80] = subTiles[2]; + dest[0x81] = subTiles[3]; if (gRoomControls.reload_flags != 1) { gUpdateVisibleTiles = 1; } @@ -3539,14 +3539,14 @@ void RestorePrevTileEntity(u32 tilePos, u32 layer) { u32 tileType; MapLayer* mapLayer; u16* dest; - u16* src; + u16* subTiles; UnregisterInteractTile(tilePos, layer); mapLayer = GetLayerByIndex(layer); mapLayer->mapData[tilePos] = tileIndex = mapLayer->mapDataOriginal[tilePos]; tileType = mapLayer->tileTypes[tileIndex]; mapLayer->collisionData[tilePos] = gMapTileTypeToCollisionData[tileType]; - mapLayer->vvv[tilePos] = gMapTileTypeToVvv[tileType]; + mapLayer->actTiles[tilePos] = gMapTileTypeToActTile[tileType]; if ((gRoomControls.scroll_flags & 1) == 0) { u32 offset = (tilePos & 0x3f) * 2 + (tilePos & 0xfc0) * 4; if (layer != 2) { @@ -3554,11 +3554,11 @@ void RestorePrevTileEntity(u32 tilePos, u32 layer) { } else { dest = gMapDataTopSpecial + offset; } - src = &mapLayer->tiles[tileIndex * 4]; - dest[0] = src[0]; - dest[1] = src[1]; - dest[0x80] = src[2]; - dest[0x81] = src[3]; + subTiles = &mapLayer->subTiles[tileIndex * 4]; + dest[0] = subTiles[0]; + dest[1] = subTiles[1]; + dest[0x80] = subTiles[2]; + dest[0x81] = subTiles[3]; if (gRoomControls.reload_flags != 1) { gUpdateVisibleTiles = 1; } @@ -3813,12 +3813,11 @@ void sub_0807BFA8(void) { gRoomControls.height = (gArea.pCurrentRoomInfo)->pixel_height; } -void sub_0807BFD0(void) { +void SetupTileSet(void) { s32 index; - u16* puVar2; - u16* puVar3; - u16* ptr; - typeof(gMapTop)* newptr; + u16* tileTypes; + u16* tileIndices; + u16* paletteBuffer; ClearBgAnimations(); sub_0807BFA8(); @@ -3827,37 +3826,37 @@ void sub_0807BFD0(void) { MemFill16(0xffff, gMapTop.tileTypes, 0x1000); gMapTop.tileTypes[0] = 0; - if ((void*)gRoomControls.unk_34 != (gArea.pCurrentRoomInfo)->tileset) { - gRoomControls.unk_34 = (u32)(gArea.pCurrentRoomInfo)->tileset; + if ((void*)gRoomControls.tileset != (gArea.pCurrentRoomInfo)->tileset) { + gRoomControls.tileset = (u32)(gArea.pCurrentRoomInfo)->tileset; LoadMapData((gArea.pCurrentRoomInfo)->tileset); } LoadMapData((gArea.pCurrentRoomInfo)->tiles); - ptr = gPaletteBuffer; - MemCopy(&ptr[0x30], &ptr[0x150], 0x20); + paletteBuffer = gPaletteBuffer; + MemCopy(&paletteBuffer[0x30], &paletteBuffer[0x150], 0x20); gUsedPalettes |= 0x200000; if ((gArea.pCurrentRoomInfo)->bg_anim != NULL) { LoadBgAnimations((gArea.pCurrentRoomInfo)->bg_anim); } - puVar2 = gMapBottom.tileTypes; - puVar3 = gMapBottom.unkData2; - MemFill16(0xffff, puVar3, 0x1000); + tileTypes = gMapBottom.tileTypes; + tileIndices = gMapBottom.tileIndices; + MemFill16(0xffff, tileIndices, 0x1000); - for (index = 0; index < 0x800; index++, puVar2++) { - if ((*puVar2 < 0x800) && (puVar3[*puVar2] == 0xffff)) { - puVar3[*puVar2] = index; + for (index = 0; index < 0x800; index++, tileTypes++) { + if ((*tileTypes < 0x800) && (tileIndices[*tileTypes] == 0xffff)) { + tileIndices[*tileTypes] = index; } } - puVar2 = gMapTop.tileTypes; - puVar3 = gMapTop.unkData2; - MemFill16(0xffff, puVar3, 0x1000); + tileTypes = gMapTop.tileTypes; + tileIndices = gMapTop.tileIndices; + MemFill16(0xffff, tileIndices, 0x1000); - for (index = 0; index < 0x800; index++, puVar2++) { - if ((*puVar2 < 0x800) && (puVar3[*puVar2] == 0xffff)) { - puVar3[*puVar2] = index; + for (index = 0; index < 0x800; index++, tileTypes++) { + if ((*tileTypes < 0x800) && (tileIndices[*tileTypes] == 0xffff)) { + tileIndices[*tileTypes] = index; } } } @@ -3889,18 +3888,18 @@ void LoadRoomGfx(void) { MemCopy(gMapBottom.mapData, gMapBottom.mapDataOriginal, sizeof(gMapBottom.mapData)); MemCopy(gMapTop.mapData, gMapTop.mapDataOriginal, sizeof(gMapBottom.mapData)); } else if (gRoomTransition.field2d == 2) { - MemCopy(gMapBottom.mapData, gMapBottom.vvv, 0x1000); + MemCopy(gMapBottom.mapData, gMapBottom.actTiles, 0x1000); MemCopy(gMapBottom.mapDataOriginal, gMapBottom.mapData, 0x1000); - MemCopy(gMapBottom.vvv, gMapBottom.mapDataOriginal, 0x1000); - MemCopy(gMapBottom.mapData + 0x800, gMapBottom.vvv, 0x1000); + MemCopy(gMapBottom.actTiles, gMapBottom.mapDataOriginal, 0x1000); + MemCopy(gMapBottom.mapData + 0x800, gMapBottom.actTiles, 0x1000); MemCopy(gMapBottom.mapDataOriginal + 0x800, gMapBottom.mapData + 0x800, 0x1000); - MemCopy(gMapBottom.vvv, gMapBottom.mapDataOriginal + 0x800, 0x1000); - MemCopy(gMapTop.mapData, gMapTop.vvv, 0x1000); + MemCopy(gMapBottom.actTiles, gMapBottom.mapDataOriginal + 0x800, 0x1000); + MemCopy(gMapTop.mapData, gMapTop.actTiles, 0x1000); MemCopy(gMapTop.mapDataOriginal, gMapTop.mapData, 0x1000); - MemCopy(gMapTop.vvv, gMapTop.mapDataOriginal, 0x1000); - MemCopy(gMapTop.mapData + 0x800, gMapTop.vvv, 0x1000); + MemCopy(gMapTop.actTiles, gMapTop.mapDataOriginal, 0x1000); + MemCopy(gMapTop.mapData + 0x800, gMapTop.actTiles, 0x1000); MemCopy(gMapTop.mapDataOriginal + 0x800, gMapTop.mapData + 0x800, 0x1000); - MemCopy(gMapTop.vvv, gMapTop.mapDataOriginal + 0x800, 0x1000); + MemCopy(gMapTop.actTiles, gMapTop.mapDataOriginal + 0x800, 0x1000); } if (!clearBottomMap) { sub_0807BBE4(); @@ -3910,8 +3909,8 @@ void LoadRoomGfx(void) { sub_0807C460(); } CreateCollisionDataBorderAroundRoom(); - FillVvvForLayer(&gMapBottom); - FillVvvForLayer(&gMapTop); + FillActTileForLayer(&gMapBottom); + FillActTileForLayer(&gMapTop); if (!clearBottomMap) { // Render the complete bottom and top tilemaps into the tilemaps. RenderMapLayerToSubTileMap(gMapDataBottomSpecial, &gMapBottom); @@ -4153,7 +4152,7 @@ void InitializeCamera() { u32 tmp1; u32 tmp2; - sub_0807BFD0(); + SetupTileSet(); LoadRoomGfx(); roomControls = &gRoomControls; target = gRoomControls.camera_target; @@ -4213,12 +4212,12 @@ void sub_0807C810(void) { DiggingCaveEntranceTransition* ptr; Entity* player; RoomControls* ctrls; - sub_0807BFD0(); + SetupTileSet(); ptr = &gDiggingCaveEntranceTransition; player = &gPlayerEntity.base; ctrls = &gRoomControls; - player->x.HALF.HI = ((ptr->entrance)->targetTilePosition & 0x3f) * 0x10 + ctrls->origin_x + ptr->offsetX; - player->y.HALF.HI = (((ptr->entrance)->targetTilePosition & 0xfc0) >> 2) + ctrls->origin_y + ptr->offsetY; + player->x.HALF.HI = ((ptr->entrance)->targetTilePos & 0x3f) * 0x10 + ctrls->origin_x + ptr->offsetX; + player->y.HALF.HI = (((ptr->entrance)->targetTilePos & 0xfc0) >> 2) + ctrls->origin_y + ptr->offsetY; sub_080809D4(); gUpdateVisibleTiles = 0; } @@ -4291,11 +4290,11 @@ void LoadCompressedMapData(void* dest, u32 offset) { } } -void sub_0807C998(u32* a1) { - LoadCompressedMapData(&gMapBottom.tiles, a1[0]); - LoadCompressedMapData(&gMapBottom.tileTypes, a1[1]); - LoadCompressedMapData(&gMapTop.tiles, a1[2]); - LoadCompressedMapData(&gMapTop.tileTypes, a1[3]); +void sub_0807C998(u32* dest) { + LoadCompressedMapData(&gMapBottom.subTiles, dest[0]); + LoadCompressedMapData(&gMapBottom.tileTypes, dest[1]); + LoadCompressedMapData(&gMapTop.subTiles, dest[2]); + LoadCompressedMapData(&gMapTop.tileTypes, dest[3]); } void sub_0807C9D8(u32* a1) { diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c index 2b01180f..3fd4bbf5 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 = GetTileTypeByEntity(super); + tmp = GetTileTypeAtEntity(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 200457e6..3bd4e97c 100644 --- a/src/projectile/mandiblesProjectile.c +++ b/src/projectile/mandiblesProjectile.c @@ -118,7 +118,7 @@ void MandiblesProjectile_Action2(MandiblesProjectileEntity* this) { EnqueueSFX(SFX_15D); } this->unk_78 = TILE(super->x.HALF.HI, super->y.HALF.HI); - if (GetTileType(this->unk_78, super->collisionLayer) == SPECIAL_TILE_0) { + if (GetTileTypeAtTilePos(this->unk_78, super->collisionLayer) == SPECIAL_TILE_0) { SetTile(SPECIAL_TILE_5, this->unk_78, super->collisionLayer); } } diff --git a/src/projectile/removableDust.c b/src/projectile/removableDust.c index 34aad80f..c6b7a5ff 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 = GetTileTypeByEntity(super); + tileType = GetTileTypeAtEntity(super); iterator = gUnk_08129FD0; while (*iterator != 0) { if (*(iterator++) == tileType) { @@ -100,7 +100,7 @@ void sub_080AA534(Entity* this) { void sub_080AA544(RemovableDustEntity* this) { u8* pbVar1; - s32 vvv; + s32 actTile; u32 uVar3; s32 iVar4; const u16* puVar5; @@ -113,8 +113,8 @@ void sub_080AA544(RemovableDustEntity* this) { uVar3 = 0; iVar4 = 0; do { - vvv = GetVvvAtTilePos((tilePos - tmp[uVar3]) & 0xffff, super->collisionLayer); - if (vvv == VVV_62) { + actTile = GetActTileAtTilePos((tilePos - tmp[uVar3]) & 0xffff, super->collisionLayer); + if (actTile == ACT_TILE_62) { iVar4++; } uVar3++; diff --git a/src/projectile/v1FireProjectile.c b/src/projectile/v1FireProjectile.c index f0bbabfa..bdf914bf 100644 --- a/src/projectile/v1FireProjectile.c +++ b/src/projectile/v1FireProjectile.c @@ -119,7 +119,7 @@ void sub_080AB4A4(V1FireProjectileEntity* this) { tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); if (oldTilePos != tilePos) { this->tilePos = tilePos; - switch (GetTileTypeByEntity(super)) { + switch (GetTileTypeAtEntity(super)) { case 0x13: case 0x34: sub_0807B7D8(0x34c, this->tilePos, super->collisionLayer); diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c index b7557eb7..b96a2be5 100644 --- a/src/projectile/v2Projectile.c +++ b/src/projectile/v2Projectile.c @@ -105,7 +105,7 @@ void sub_080ABCC4(V2ProjectileEntity* this) { super->subtimer = 0; super->direction = Random() & 0x1f; this->tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); - this->tileType = GetTileType(this->tilePos, LAYER_TOP); + this->tileType = GetTileTypeAtTilePos(this->tilePos, LAYER_TOP); super->spritePriority.b0 = 2; InitializeAnimation(super, 0); SoundReq(SFX_14B); @@ -127,7 +127,7 @@ void sub_080ABD70(V2ProjectileEntity* this) { super->frame &= 0xef; super->speed = 0; this->tilePos = TILE(super->x.HALF.HI, super->y.HALF.HI); - this->tileType = GetTileType(this->tilePos, LAYER_TOP); + this->tileType = GetTileTypeAtTilePos(this->tilePos, LAYER_TOP); tmp = this->tileType; if (tmp != 0x13) { if (tmp == 0x315) { diff --git a/src/scroll.c b/src/scroll.c index a4bd3f76..efd589c3 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 gMapSpecialTileToVvv[]; +extern u8 gMapSpecialTileToActTile[]; void Scroll0(RoomControls*); void Scroll1(RoomControls*); @@ -54,7 +54,7 @@ u32 sub_080803D0(); u32 sub_08080278(); void sub_08080C80(MapDataDefinition*); void sub_08080368(); -void FillVvvForLayer(MapLayer* mapLayer); +void FillActTileForLayer(MapLayer* mapLayer); bool32 sub_08080794(const Transition* transition, u32 param_2, u32 param_3, u32 param_4); bool32 sub_08080808(const Transition* transition, u32 param_2, u32 param_3, u32 param_4); void sub_080808D8(s32); @@ -355,8 +355,8 @@ void Scroll5Sub3(RoomControls* controls) { sub_08080368(); gUnk_02034480.unk_00 = gUnk_0200B640; MemCopy(gUnk_02022830, gUnk_020246B0, 0x1800); - FillVvvForLayer(&gMapBottom); - FillVvvForLayer(&gMapTop); + FillActTileForLayer(&gMapBottom); + FillActTileForLayer(&gMapTop); sub_0807BBE4(); CreateCollisionDataBorderAroundRoom(); sub_0805E248(); @@ -843,7 +843,7 @@ void sub_080809D4(void) { } void UpdateDoorTransition() { - u32 vvv; + u32 actTile; u32 x; u32 y; RoomControls* controls = &gRoomControls; @@ -864,35 +864,35 @@ 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 = GetVvvAtTilePos( + actTile = GetActTileAtTilePos( (((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); - gRoomTransition.stairs_idx = sub_080B1A48(x, y, controls->camera_target->collisionLayer); - switch (vvv) { - case VVV_63: - case VVV_241: - case VVV_40: - case VVV_41: + gRoomTransition.stairs_idx = GetTileTypeAtRoomCoords(x, y, controls->camera_target->collisionLayer); + switch (actTile) { + case ACT_TILE_63: + case ACT_TILE_241: + case ACT_TILE_40: + case ACT_TILE_41: sub_080806BC(x, y, 0xff, 10); break; } } } -// fill the vvv for the whole layer -void FillVvvForLayer(MapLayer* mapLayer) { +// fill the actTile for the whole layer +void FillActTileForLayer(MapLayer* mapLayer) { u32 tilePos; u16* tileTypes = mapLayer->tileTypes; - const u8* ptr = gMapTileTypeToVvv; - u8* ptr3 = mapLayer->vvv; + const u8* ptr = gMapTileTypeToActTile; + u8* actTiles = mapLayer->actTiles; u16* mapData = mapLayer->mapData; for (tilePos = 0; tilePos < 0x40 * 0x40; tilePos++) { u16 tileIndex = mapData[tilePos]; if (tileIndex < 0x4000) { - mapLayer->vvv[tilePos] = ptr[tileTypes[tileIndex]]; + mapLayer->actTiles[tilePos] = ptr[tileTypes[tileIndex]]; } else { - mapLayer->vvv[tilePos] = gMapSpecialTileToVvv[tileIndex - 0x4000]; + mapLayer->actTiles[tilePos] = gMapSpecialTileToActTile[tileIndex - 0x4000]; } } } |