diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-13 20:29:11 -0500 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-13 20:29:11 -0500 |
commit | 924c0c6b5a9ceeb27fdc9e41e69d283c2b8d36d8 (patch) | |
tree | 2c22380365ddf70f1432cac5f9cbede0bdef2abc /asm/mauville_old_man.s | |
parent | 2852f4f1b86f1a5fbfdceb296d184158068b5ad5 (diff) | |
parent | f6af9e7013107154df62d2eff53e3accb7a24b3d (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd
Diffstat (limited to 'asm/mauville_old_man.s')
-rw-r--r-- | asm/mauville_old_man.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index eb1fb781c..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 |