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/title_screen.s | |
| parent | 24a1e3e544eecbb10905f41c257fce8df7e3a5ce (diff) | |
sprite.c: move ewram, iwram, rom data
Diffstat (limited to 'asm/title_screen.s')
| -rw-r--r-- | asm/title_screen.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/title_screen.s b/asm/title_screen.s index a76b7f25e..d3f2c507c 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -617,8 +617,8 @@ _080AA8C4: bl remove_some_task bl ResetTasks bl ResetSpriteData - bl ResetObjectPaletteAllocator - ldr r1, =gUnknown_0300301C + bl FreeAllSpritePalettes + ldr r1, =gReservedSpritePaletteCount movs r0, 0x9 strb r0, [r1] ldr r0, =gUnknown_08540048 @@ -633,7 +633,7 @@ _080AA8C4: movs r2, 0x20 bl LoadPalette ldr r0, =gUnknown_08540100 - bl LoadTaggedObjectPalette + bl LoadSpritePalette ldr r0, =gMain movs r2, 0x87 lsls r2, 3 |