summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/contest.s4
-rw-r--r--asm/contest_link_80F57C4.s4
-rw-r--r--asm/pokemon_summary_screen.s4
-rw-r--r--asm/script_pokemon_util_80F87D8.s4
-rw-r--r--asm/trade.s4
5 files changed, 10 insertions, 10 deletions
diff --git a/asm/contest.s b/asm/contest.s
index 327a80d75..453ecb04c 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -6770,8 +6770,8 @@ _080DB1CC:
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0
- bl sub_806A068
- ldr r4, =gUnknown_0202499C
+ bl SetMultiuseSpriteTemplateToPokemon
+ ldr r4, =gMultiuseSpriteTemplate
movs r0, 0x2
adds r1, r5, 0
movs r2, 0
diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s
index 450a235d5..ba1fa1c29 100644
--- a/asm/contest_link_80F57C4.s
+++ b/asm/contest_link_80F57C4.s
@@ -1420,8 +1420,8 @@ _080F64F2:
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
- bl sub_806A068
- ldr r0, =gUnknown_0202499C
+ bl SetMultiuseSpriteTemplateToPokemon
+ ldr r0, =gMultiuseSpriteTemplate
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
movs r1, 0x88
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index e52874f57..ff848df08 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -1092,7 +1092,7 @@ _081C4750:
bl LoadCompressedObjectPalette
ldrh r0, [r4, 0x4]
movs r1, 0x1
- bl sub_806A068
+ bl SetMultiuseSpriteTemplateToPokemon
_081C4768:
ldrh r0, [r6]
adds r0, 0x1
@@ -1144,7 +1144,7 @@ sub_81C47B4: @ 81C47B4
ldr r0, =gUnknown_0203CF1C
ldr r6, [r0]
adds r6, 0x70
- ldr r0, =gUnknown_0202499C
+ ldr r0, =gMultiuseSpriteTemplate
movs r1, 0x28
movs r2, 0x40
movs r3, 0x5
diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s
index 18a0cec88..1d4173c4c 100644
--- a/asm/script_pokemon_util_80F87D8.s
+++ b/asm/script_pokemon_util_80F87D8.s
@@ -737,8 +737,8 @@ _080F8DD8:
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
- bl sub_806A068
- ldr r0, =gUnknown_0202499C
+ bl SetMultiuseSpriteTemplateToPokemon
+ ldr r0, =gMultiuseSpriteTemplate
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
mov r1, r9
diff --git a/asm/trade.s b/asm/trade.s
index 0d7353938..061e338cd 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -7174,8 +7174,8 @@ _0807ADE0:
bl GetMonSpritePalStruct
ldrh r0, [r0, 0x4]
adds r1, r4, 0
- bl sub_806A068
- ldr r0, =gUnknown_0202499C
+ bl SetMultiuseSpriteTemplateToPokemon
+ ldr r0, =gMultiuseSpriteTemplate
movs r1, 0x78
movs r2, 0x3C
movs r3, 0x6