diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-30 11:26:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 11:26:44 -0500 |
| commit | c8ef69a00d303bf0fd57d3a3069b51d58d8c5def (patch) | |
| tree | 889ac67966e1ed2b86922546486bfb207c1cb501 /src/intro.c | |
| parent | f3af20d3cf4c5a51b991e7f605f7cbea217a3cad (diff) | |
| parent | 6cf39e8a6ed3b0cb882e2d71d2ecd6c10152a489 (diff) | |
Merge pull request #372 from garakmon/sprite-tags
Synchronize sprite tags
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; } |