diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-28 20:03:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-28 20:03:24 -0400 |
| commit | 975e28c01e70c63587c8633ffc3c50b7d1759dec (patch) | |
| tree | 361d94f24acc207803afb8bff6ed7887dbbf391e /asm/mauville_old_man.s | |
| parent | d160ca467920d97245c012b8dd0cb8be6d06620a (diff) | |
| parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) | |
Merge branch 'master' into easy_chat
Diffstat (limited to 'asm/mauville_old_man.s')
| -rw-r--r-- | asm/mauville_old_man.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index 7b21e19e7..4972d4096 100644 --- a/asm/mauville_old_man.s +++ b/asm/mauville_old_man.s @@ -1392,7 +1392,7 @@ _08120BB0: movs r0, 0xFF strb r0, [r7, 0x7] mov r0, sp - bl sub_8009228 + bl IsStringJapanese cmp r0, 0 beq _08120BF8 mov r0, sp @@ -1458,7 +1458,7 @@ _08120C48: muls r0, r5 adds r0, 0x5 adds r0, r6, r0 - bl sub_8009228 + bl IsStringJapanese cmp r0, 0 beq _08120C5E mov r0, r8 @@ -1480,7 +1480,7 @@ _08120C6A: movs r5, 0x3 _08120C74: adds r0, r6, 0 - bl sub_8009228 + bl IsStringJapanese cmp r0, 0 beq _08120C84 mov r1, r8 @@ -1569,7 +1569,7 @@ _08120CF2: mov r1, r8 strb r0, [r1, 0x7] mov r0, sp - bl sub_8009228 + bl IsStringJapanese cmp r0, 0 beq _08120D1A movs r0, 0x1 @@ -2205,7 +2205,7 @@ sub_8121178: @ 8121178 bl ConvertInternationalString mov r0, r8 bl sub_8120EC0 - bl box_related_two__2 + bl ShowFieldMessage pop {r3} mov r8, r3 pop {r4-r6} |