diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 10:03:07 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 10:03:07 +0200 |
| commit | a83d07e1b3134ff7c23a3ac39552f8285a0c09b4 (patch) | |
| tree | 0feb901cc447f2b76c006e54affa906977be8ab9 /asm/field_control_avatar.s | |
| parent | 625b1b69493313224277dcfd957269cc9945eb84 (diff) | |
| parent | 0918cadae3c2ab22993099bd474d40f93a893d5d (diff) | |
Merge branch 'master' into decomp_berry
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index e0345e188..f3321f27a 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -689,7 +689,7 @@ _0809C442: adds r1, r0, 0 ldr r0, =gScriptLastTalked ldrb r0, [r0] - bl sub_8099188 + bl GetRamScript adds r1, r0, 0 _0809C44E: pop {r4-r7} |