diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-29 13:34:24 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-29 13:34:24 -0600 |
| commit | f0df833f37a20745ded2b13240c692fe20d2dc1c (patch) | |
| tree | bc9776e88996188485aeabd34fae9778d6442bed /asm | |
| parent | 2d04eb22abd3f60902ee1f9bc87bd510518709e3 (diff) | |
Extract easy chat and pokemon animation
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/easy_chat.s | 2 | ||||
| -rw-r--r-- | asm/pokemon_animation.s | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 3a359c9fa..f65c379c2 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -6075,7 +6075,7 @@ _0811D19C: b _0811D1BC .pool _0811D1A8: - ldr r0, =gText_CombineTwoWordsOrPhrases + ldr r0, =gText_CombineTwoWordsOrPhrases3 str r0, [sp, 0xC] b _0811D1BC .pool diff --git a/asm/pokemon_animation.s b/asm/pokemon_animation.s index 870e658f7..a625f8511 100644 --- a/asm/pokemon_animation.s +++ b/asm/pokemon_animation.s @@ -333,7 +333,7 @@ sub_817F670: @ 817F670 movs r1, 0x3 orrs r0, r1 strb r0, [r4, 0x1] - ldr r0, =gUnknown_0860AD68 + ldr r0, =gSpriteAffineAnimTable_860AD68 str r0, [r4, 0x10] ldr r0, =gUnknown_03001274 ldr r0, [r0] |