diff options
| author | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
| commit | e03220c21de7c33e1ddeb3fd0585378da37d8b51 (patch) | |
| tree | 57da1db9027de960c4b066bdcf6ab17c03753791 /src/evolution_scene.c | |
| parent | 00b44d588618c9a0feff1285183c183f1c97f1bb (diff) | |
| parent | d442be12102ed3493c04b3688f37a4ffad6606f7 (diff) | |
Merge branch 'master' into filenames_1
Diffstat (limited to 'src/evolution_scene.c')
| -rw-r--r-- | src/evolution_scene.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c index a855efb1b..a51c08a0c 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -223,7 +223,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, DecompressPicFromTable_2(&gMonFrontPicTable[currSpecies], gMonFrontPicCoords[currSpecies].coords, gMonFrontPicCoords[currSpecies].y_offset, - (void*)(0x2000000), + (void*)EWRAM, gUnknown_081FAF4C[1], currSpecies); pokePal = (void*) GetMonSpritePalStructFromOtIdPersonality(currSpecies, TiD, PiD); LoadCompressedPalette(*pokePal, 0x110, 0x20); @@ -240,7 +240,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve], gMonFrontPicCoords[speciesToEvolve].coords, gMonFrontPicCoords[speciesToEvolve].y_offset, - (void*)(0x2000000), + (void*)EWRAM, gUnknown_081FAF4C[3], speciesToEvolve); pokePal = (void*) GetMonSpritePalStructFromOtIdPersonality(speciesToEvolve, TiD, PiD); LoadCompressedPalette(*pokePal, 0x120, 0x20); @@ -320,7 +320,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) DecompressPicFromTable_2(&gMonFrontPicTable[postEvoSpecies], gMonFrontPicCoords[postEvoSpecies].coords, gMonFrontPicCoords[postEvoSpecies].y_offset, - (void*)(0x2000000), + (void*)EWRAM, gUnknown_081FAF4C[3], postEvoSpecies); pokePal = (void*) GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, TiD, PiD); LoadCompressedPalette(*pokePal, 0x120, 0x20); @@ -390,7 +390,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) DecompressPicFromTable_2(&gMonFrontPicTable[postEvoSpecies], gMonFrontPicCoords[postEvoSpecies].coords, gMonFrontPicCoords[postEvoSpecies].y_offset, - (void*)(0x2000000), + (void*)EWRAM, gUnknown_081FAF4C[3], postEvoSpecies); pokePal = (void*) GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, TiD, PiD); LoadCompressedPalette(*pokePal, 0x120, 0x20); @@ -440,7 +440,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve], gMonFrontPicCoords[speciesToEvolve].coords, gMonFrontPicCoords[speciesToEvolve].y_offset, - (void*)(0x2000000), + (void*)EWRAM, gUnknown_081FAF4C[1], speciesToEvolve); pokePal = (void*) GetMonSpritePalStructFromOtIdPersonality(speciesToEvolve, TiD, PiD); LoadCompressedPalette(*pokePal, 0x120, 0x20); |