diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
| commit | ab3b8cd51a88f02dbdb72c276a1c35591e8331f4 (patch) | |
| tree | 29d5e0c8c1aa2ddd211b65c0160af98044d76678 /asm/mauville_old_man.s | |
| parent | 6543d7f2d6e7e12e159588f494895ba02b7d5090 (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge branch 'master' into heal_location
Diffstat (limited to 'asm/mauville_old_man.s')
| -rw-r--r-- | asm/mauville_old_man.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index 4972d4096..bfcf8742a 100644 --- a/asm/mauville_old_man.s +++ b/asm/mauville_old_man.s @@ -883,7 +883,7 @@ _081207BC: adds r0, r1 ldrh r4, [r0] adds r0, r4, 0 - bl sub_817C7F4 + bl GetWordSounds str r0, [r6, 0x30] movs r1, 0x3 ands r1, r4 @@ -892,7 +892,7 @@ _081207BC: ands r4, r0 adds r1, r4 adds r0, r6, 0 - bl sub_817C858 + bl GetWordPhonemes ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] |