diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-09-01 13:54:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 13:54:16 -0400 |
| commit | 4412f9f6979fd9fbdcab58b1a96799f2f557b02c (patch) | |
| tree | 32883aaf23c727f3d27a8960b8a1498d5fb7d1a6 /src/evolution_scene.c | |
| parent | 69ce45f71f49c859ca7adc07902842503c07d405 (diff) | |
| parent | 403b8546684d4a8074220d27aa32471ec546abf0 (diff) | |
Merge pull request #800 from PokeCodec/matchRubyTime
Match more functions
Diffstat (limited to 'src/evolution_scene.c')
| -rw-r--r-- | src/evolution_scene.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 60568ee87..ea7fde015 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -238,7 +238,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gSprites[ID].callback = nullsub_37; gSprites[ID].oam.paletteNum = 1; - gSprites[ID].invisible = 1; + gSprites[ID].invisible = TRUE; // postEvo sprite DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve], @@ -254,7 +254,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, sEvoInfo.postEvoSpriteID = ID = CreateSprite(&gUnknown_02024E8C, 120, 64, 30); gSprites[ID].callback = nullsub_37; gSprites[ID].oam.paletteNum = 2; - gSprites[ID].invisible = 1; + gSprites[ID].invisible = TRUE; LoadEvoSparkleSpriteAndPal(); @@ -455,7 +455,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri gSprites[ID].callback = nullsub_37; gSprites[ID].oam.paletteNum = 2; - gSprites[ID].invisible = 1; + gSprites[ID].invisible = TRUE; LoadEvoSparkleSpriteAndPal(); @@ -542,7 +542,7 @@ static void Task_EvolutionScene(u8 taskID) { case 0: BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); - gSprites[sEvoInfo.preEvoSpriteID].invisible = 0; + gSprites[sEvoInfo.preEvoSpriteID].invisible = FALSE; gTasks[taskID].tState++; break; case 1: // print 'whoa, poke is evolving!!!' msg |