diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
| commit | a1368c545df5d49c2cde32c09c14aba8d4bdc967 (patch) | |
| tree | 0dd69e9a676d0d4872e51552d465cbc0364e2a55 /asm/field_effect.s | |
| parent | f29fc55796cc5500f954b396264edc863f96f486 (diff) | |
| parent | eb280768a48eba5332468b463aab962e1eafb18e (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'asm/field_effect.s')
| -rw-r--r-- | asm/field_effect.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_effect.s b/asm/field_effect.s index 08efc480b..b19e7a509 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -897,7 +897,7 @@ sub_80B6128: @ 80B6128 thumb_func_start sub_80B61A0 sub_80B61A0: @ 80B61A0 push {r4,lr} - bl calc_player_party_count + bl CalculatePlayerPartyCount adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -1071,7 +1071,7 @@ _080B62E6: thumb_func_start sub_80B62F4 sub_80B62F4: @ 80B62F4 push {r4,lr} - bl calc_player_party_count + bl CalculatePlayerPartyCount adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 |