diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-02 13:11:19 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-02 13:11:19 +0200 |
| commit | 84240b1a5a445ff4efe21580c22051323a954fba (patch) | |
| tree | 2ad5e5cb65cf0e06532a4500ef1b76e9a3e519f7 /asm/credits.s | |
| parent | 24a1e3e544eecbb10905f41c257fce8df7e3a5ce (diff) | |
sprite.c: move ewram, iwram, rom data
Diffstat (limited to 'asm/credits.s')
| -rw-r--r-- | asm/credits.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/credits.s b/asm/credits.s index a42340737..479cdc125 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -487,8 +487,8 @@ sub_81758E4: @ 81758E4 _08175906: bl ResetSpriteData bl dp13_810BB8C - bl ResetObjectPaletteAllocator - ldr r1, =gUnknown_0300301C + bl FreeAllSpritePalettes + ldr r1, =gReservedSpritePaletteCount movs r0, 0x8 strb r0, [r1] ldr r0, =gUnknown_085B0E04 @@ -555,7 +555,7 @@ _0817596E: adds r0, r6, 0 bl LoadSpriteSheet ldr r0, =gUnknown_085E702C - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r1, =gMain movs r0, 0x87 lsls r0, 3 @@ -720,7 +720,7 @@ sub_8175B1C: @ 8175B1C movs r2, 0 bl sub_8176D1C bl ResetSpriteData - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -2643,7 +2643,7 @@ _08176AD6: movs r1, 0 bl SetGpuReg bl ResetSpriteData - bl ResetObjectPaletteAllocator + bl FreeAllSpritePalettes movs r0, 0x1 strb r0, [r6] b _08176C96 @@ -2675,7 +2675,7 @@ _08176B54: ldr r0, =gUnknown_085F5354 bl LoadCompressedObjectPic ldr r0, =gUnknown_085F5384 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes movs r0, 0x78 movs r1, 0x2E bl sub_817B834 @@ -2714,7 +2714,7 @@ _08176BD8: ldr r0, =gUnknown_085F5354 bl LoadCompressedObjectPic ldr r0, =gUnknown_085F5384 - bl LoadTaggedObjectPalettes + bl LoadSpritePalettes movs r0, 0x78 movs r1, 0x2E bl sub_817B88C |