summaryrefslogtreecommitdiff
path: root/asm/roulette.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-09-02 13:11:19 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-09-02 13:11:19 +0200
commit84240b1a5a445ff4efe21580c22051323a954fba (patch)
tree2ad5e5cb65cf0e06532a4500ef1b76e9a3e519f7 /asm/roulette.s
parent24a1e3e544eecbb10905f41c257fce8df7e3a5ce (diff)
sprite.c: move ewram, iwram, rom data
Diffstat (limited to 'asm/roulette.s')
-rw-r--r--asm/roulette.s8
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/roulette.s b/asm/roulette.s
index d4b43e435..27d6af416 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -3269,7 +3269,7 @@ sub_8141E7C: @ 8141E7C
movs r0, 0x54
movs r1, 0
bl SetGpuReg
- bl ResetObjectPaletteAllocator
+ bl FreeAllSpritePalettes
bl ResetPaletteFade
bl ResetSpriteData
bl sub_8140418
@@ -4861,9 +4861,9 @@ sub_8142C0C: @ 8142C0C
lsls r0, 24
cmp r0, 0
bne _08142C44
- bl ResetObjectPaletteAllocator
+ bl FreeAllSpritePalettes
ldr r0, =gUnknown_085B7384
- bl LoadTaggedObjectPalettes
+ bl LoadSpritePalettes
ldr r0, =gUnknown_085B7864
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085B7978
@@ -4879,7 +4879,7 @@ _08142C44:
bl FreeSpriteTilesByTag
movs r0, 0xC
bl FreeSpriteTilesByTag
- bl ResetObjectPaletteAllocator
+ bl FreeAllSpritePalettes
_08142C5A:
pop {r0}
bx r0