diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-06 21:48:30 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-06 21:48:30 +0200 |
| commit | cdd36116f221d62566c771fec2df15a2f33f507e (patch) | |
| tree | 46db7efd4893745acfbef7f54b53b18a8c81477c /asm/field_control_avatar.s | |
| parent | 33ee3115ab77d326ffeca49ce9a124c31af587bb (diff) | |
label pokemon3.s
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 5791d9fcf..cecbaff84 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1366,7 +1366,7 @@ per_step_scripts: @ 809C9F4 b _0809CB24 _0809CA04: bl sub_80B215C - bl happiness_algorithm_step + bl AdjustFriendship_step bl sub_81D4998 ldr r0, =gUnknown_02037590 ldrb r1, [r0] @@ -1500,8 +1500,8 @@ sub_809CB30: @ 809CB30 .pool thumb_func_end sub_809CB30 - thumb_func_start happiness_algorithm_step -happiness_algorithm_step: @ 809CB44 + thumb_func_start AdjustFriendship_step +AdjustFriendship_step: @ 809CB44 push {r4,r5,lr} ldr r0, =0x0000402a bl GetVarPointer @@ -1519,7 +1519,7 @@ happiness_algorithm_step: @ 809CB44 _0809CB62: adds r0, r5, 0 movs r1, 0x5 - bl happiness_algorithm + bl AdjustFriendship adds r5, 0x64 subs r4, 0x1 cmp r4, 0 @@ -1529,7 +1529,7 @@ _0809CB72: pop {r0} bx r0 .pool - thumb_func_end happiness_algorithm_step + thumb_func_end AdjustFriendship_step thumb_func_start overworld_poison_timer_set overworld_poison_timer_set: @ 809CB80 |