diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-30 21:48:18 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-30 21:48:18 +0100 |
| commit | 90ef2694266a13ae9642c4cea4e4125df1e3fae8 (patch) | |
| tree | b3abdb68f7b78ee91f54dbbee8772349287ae606 /src/intro.c | |
| parent | 0da7d7e6ae7cb50ca0b52d1ea27d98e3f02e50d2 (diff) | |
| parent | 9adbb5d8719db5e60f0051b5a854deec09ae5860 (diff) | |
Merge branch 'master' into battle_frontier_2
Diffstat (limited to 'src/intro.c')
| -rw-r--r-- | src/intro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intro.c b/src/intro.c index b79834c58..5a0e13869 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1542,8 +1542,8 @@ static void Task_IntroLoadPart1Graphics3(u8 taskId) LZDecompressVram(gIntro3GroudonTilemap, (void *)(VRAM + 0xC000)); LZDecompressVram(gIntro3LegendBgGfx, (void *)(VRAM + 0x4000)); LZDecompressVram(gIntro3GroudonBgTilemap, (void *)(VRAM + 0xE000)); - LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_058)]); - LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_058)]); + LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]); + LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_ROCKS)]); CpuCopy16(gIntro3BgPal, gPlttBufferUnfaded, sizeof(gIntro3BgPal)); gTasks[taskId].func = Task_IntroLoadPart1Graphics4; } |