summaryrefslogtreecommitdiff
path: root/asm/mon_markings.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/mon_markings.s
parent24a1e3e544eecbb10905f41c257fce8df7e3a5ce (diff)
sprite.c: move ewram, iwram, rom data
Diffstat (limited to 'asm/mon_markings.s')
-rw-r--r--asm/mon_markings.s8
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/mon_markings.s b/asm/mon_markings.s
index 0d3883c05..115b8883a 100644
--- a/asm/mon_markings.s
+++ b/asm/mon_markings.s
@@ -523,14 +523,14 @@ sub_811FC80: @ 811FC80
ldr r0, =gUnknown_0859EF14
str r0, [r4, 0x8]
str r7, [r4, 0xC]
- ldr r0, =gDummyObjectRotScalAnimTable
+ ldr r0, =gDummySpriteAffineAnimTable
str r0, [r4, 0x10]
ldr r0, =TaskDummy7
str r0, [r4, 0x14]
mov r0, sp
bl LoadSpriteSheets
mov r0, r10
- bl LoadTaggedObjectPalettes
+ bl LoadSpritePalettes
movs r5, 0
mov r3, r8
lsls r3, 16
@@ -885,7 +885,7 @@ sub_811FFD4: @ 811FFD4
ldr r0, =gUnknown_0859EFA4
str r0, [sp, 0x8]
str r2, [sp, 0xC]
- ldr r0, =gDummyObjectRotScalAnimTable
+ ldr r0, =gDummySpriteAffineAnimTable
str r0, [sp, 0x10]
ldr r0, =TaskDummy7
str r0, [sp, 0x14]
@@ -899,7 +899,7 @@ sub_811FFD4: @ 811FFD4
adds r0, r5, 0
bl LoadSpriteSheet
adds r0, r4, 0
- bl LoadTaggedObjectPalette
+ bl LoadSpritePalette
mov r0, sp
movs r1, 0
movs r2, 0