diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
| commit | e92e2cb0aa31adf9872b147a1b6deb9d9844b7e8 (patch) | |
| tree | b3e357be8cec0c64a84773a7b63f54f97825cbaf /asm/contest.s | |
| parent | 156fb472e10c10751268d2339b2526c8bd07e34f (diff) | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 4 |
1 files changed, 2 insertions, 2 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 |