diff options
Diffstat (limited to 'src/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 0c115ddfe..24c2340ac 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -362,7 +362,7 @@ static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID) case 1: GetMonSpriteTemplate_803C56C(GetMonSpritePalStruct(mon)->tag, r5); spriteID = CreateSprite(&gUnknown_02024E8C, 120, 70, 6); - gSprites[spriteID].invisible = 1; + gSprites[spriteID].invisible = TRUE; gSprites[spriteID].callback = SpriteCallbackDummy; break; } @@ -595,7 +595,7 @@ static void SpriteCB_Egg_0(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 1); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 1); CreateRandomEggShardSprite(); } @@ -618,7 +618,7 @@ static void SpriteCB_Egg_1(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 2); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 2); } } @@ -645,13 +645,13 @@ static void SpriteCB_Egg_2(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 2); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 2); CreateRandomEggShardSprite(); CreateRandomEggShardSprite(); } if (sprite->data[0] == 30) - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } } @@ -678,8 +678,8 @@ static void SpriteCB_Egg_4(struct Sprite* sprite) sprite->data[0]++; if (!gPaletteFade.active) { - PlaySE(SE_TAMAGO); - sprite->invisible = 1; + PlaySE(SE_EGG_HATCH); + sprite->invisible = TRUE; sprite->callback = SpriteCB_Egg_5; sprite->data[0] = 0; } @@ -689,7 +689,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite) { if (sprite->data[0] == 0) { - gSprites[gEggHatchData->pokeSpriteID].invisible = 0; + gSprites[gEggHatchData->pokeSpriteID].invisible = FALSE; StartSpriteAffineAnim(&gSprites[gEggHatchData->pokeSpriteID], 1); } if (sprite->data[0] == 8) |