diff options
Diffstat (limited to 'src/mirage_tower.c')
| -rw-r--r-- | src/mirage_tower.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mirage_tower.c b/src/mirage_tower.c index 9f91dff50..65aae7255 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -20,7 +20,7 @@ #include "constants/songs.h" #include "constants/metatile_labels.h" -struct MirageTowerPulseBlend +struct MirageTowerPulseBlend { u8 taskId; struct PulseBlend pulseBlend; @@ -153,8 +153,8 @@ static const union AnimCmd *const sAnims_FallingFossil[] = static const struct SpriteTemplate sSpriteTemplate_FallingFossil = { - .tileTag = 0xFFFF, - .paletteTag = 0xFFFF, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &sOamData_FallingFossil, .anims = sAnims_FallingFossil, .images = NULL, @@ -204,7 +204,7 @@ static const struct OamData sOamData_CeilingCrumbleSmall = static const struct SpriteTemplate sSpriteTemplate_CeilingCrumbleSmall = { .tileTag = TAG_CEILING_CRUMBLE, - .paletteTag = 0xFFFF, + .paletteTag = TAG_NONE, .oam = &sOamData_CeilingCrumbleSmall, .anims = sAnims_CeilingCrumbleSmall, .images = NULL, @@ -242,7 +242,7 @@ static const struct OamData sOamData_CeilingCrumbleLarge = static const struct SpriteTemplate sSpriteTemplate_CeilingCrumbleLarge = { .tileTag = TAG_CEILING_CRUMBLE, - .paletteTag = 0xFFFF, + .paletteTag = TAG_NONE, .oam = &sOamData_CeilingCrumbleLarge, .anims = sAnims_CeilingCrumbleLarge, .images = NULL, @@ -356,10 +356,10 @@ static void PlayerDescendMirageTower(u8 taskId) TryGetObjectEventIdByLocalIdAndMap(LOCALID_ROUTE111_PLAYER_FALLING, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); fallingPlayer = &gObjectEvents[objectEventId]; - gSprites[fallingPlayer->spriteId].pos2.y += 4; + gSprites[fallingPlayer->spriteId].y2 += 4; player = &gObjectEvents[gPlayerAvatar.objectEventId]; - if ((gSprites[fallingPlayer->spriteId].pos1.y + gSprites[fallingPlayer->spriteId].pos2.y) >= - (gSprites[player->spriteId].pos1.y + gSprites[player->spriteId].pos2.y)) + if ((gSprites[fallingPlayer->spriteId].y + gSprites[fallingPlayer->spriteId].y2) >= + (gSprites[player->spriteId].y + gSprites[player->spriteId].y2)) { DestroyTask(taskId); EnableBothScriptContexts(); @@ -467,8 +467,8 @@ static void CreateCeilingCrumbleSprites(void) static void SpriteCB_CeilingCrumble(struct Sprite* sprite) { sprite->data[1] += 2; - sprite->pos2.y = sprite->data[1] / 2; - if(((sprite->pos1.y) + (sprite->pos2.y)) > sCeilingCrumblePositions[sprite->data[0]][2]) + sprite->y2 = sprite->data[1] / 2; + if(((sprite->y) + (sprite->y2)) > sCeilingCrumblePositions[sprite->data[0]][2]) { DestroySprite(sprite); IncrementCeilingCrumbleFinishedCount(); @@ -688,7 +688,7 @@ static void Task_FossilFallAndSink(u8 taskId) fossilTemplate.images = sFallingFossil->frameImage; sFallingFossil->spriteId = CreateSprite(&fossilTemplate, 128, -16, 1); gSprites[sFallingFossil->spriteId].centerToCornerVecX = 0; - gSprites[sFallingFossil->spriteId].data[0] = gSprites[sFallingFossil->spriteId].pos1.x; + gSprites[sFallingFossil->spriteId].data[0] = gSprites[sFallingFossil->spriteId].x; gSprites[sFallingFossil->spriteId].data[1] = 1; } case 5: @@ -731,7 +731,7 @@ static void SpriteCB_FallingFossil(struct Sprite *sprite) // End animation sprite->callback = SpriteCallbackDummy; } - else if (sprite->pos1.y >= 96) + else if (sprite->y >= 96) { // Fossil has reached the ground, update disintegration animation u8 i; @@ -743,7 +743,7 @@ static void SpriteCB_FallingFossil(struct Sprite *sprite) else { // Fossil is still falling - sprite->pos1.y++; + sprite->y++; } } @@ -764,7 +764,7 @@ static void UpdateDisintegrationEffect(u8* tiles, u16 randId, u8 c, u8 size, u8 col = width & 7; sDebug_DisintegrationData[2] = height & 7; sDebug_DisintegrationData[3] = width & 7; - + widthTiles = width / 8; heightTiles = height / 8; sDebug_DisintegrationData[4] = width / 8; @@ -772,11 +772,11 @@ static void UpdateDisintegrationEffect(u8* tiles, u16 randId, u8 c, u8 size, u8 var = (size / 8) * (heightTiles * 64) + (widthTiles * 64); sDebug_DisintegrationData[6] = var; - + baseOffset = var + ((row * 8) + col); baseOffset /= 2; sDebug_DisintegrationData[7] = var + ((row * 8) + col); - + flag = ((randId % 2) ^ 1); tileMask = (c << (flag << 2)) | 15 << (((flag ^ 1) << 2)); tiles[baseOffset + (offset * 32)] &= tileMask; |