diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-13 11:16:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-13 11:16:34 -0400 |
| commit | e24f3808f47d292776f4e7506217f93756dd19bf (patch) | |
| tree | d910619ff23e466bfd4b673381c1642656e3dc5c /asm/scrcmd.s | |
| parent | 74c59af856216332b6c73cbc382edff3518a0eab (diff) | |
| parent | 52db3ad5aa83ae70e06eae87f502b09fff55aecc (diff) | |
Merge branch 'master' into mail
Diffstat (limited to 'asm/scrcmd.s')
| -rw-r--r-- | asm/scrcmd.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/scrcmd.s b/asm/scrcmd.s index f2e61a946..e8a838010 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -3267,7 +3267,7 @@ s67_execute_box: @ 809ABD4 bne _0809ABE2 ldr r0, [r4, 0x64] _0809ABE2: - bl box_related_two__2 + bl ShowFieldMessage movs r0, 0 pop {r4} pop {r1} @@ -3793,7 +3793,7 @@ sBD_virtual_message: @ 809AFA0 ldr r1, =gUnknown_020375C4 ldr r1, [r1] subs r0, r1 - bl box_related_two__2 + bl ShowFieldMessage movs r0, 0 pop {r1} bx r1 @@ -3841,7 +3841,7 @@ s7E_load_first_pokenames: @ 809AFFC lsls r2, 2 adds r2, r0 ldr r4, [r2] - bl sub_8139688 + bl GetIdxOfFirstPartyMemberThatIsNotAnEgg lsls r0, 24 lsrs r0, 24 movs r1, 0x64 |