diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
| commit | 50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch) | |
| tree | f100b156dfa1eb6fe773d90004d79bb246e9dcbf /asm/battle_util2.s | |
| parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/battle_util2.s')
| -rw-r--r-- | asm/battle_util2.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/battle_util2.s b/asm/battle_util2.s index d83b79202..8cfbe3120 100644 --- a/asm/battle_util2.s +++ b/asm/battle_util2.s @@ -229,11 +229,11 @@ sub_802E228: @ 802E228 cmp r0, 0 beq _0802E274 movs r0, 0x1 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x3 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r3, r0, 24 ldr r2, _0802E270 @ =gBattleMons @@ -256,7 +256,7 @@ _0802E26C: .4byte gBattleTypeFlags _0802E270: .4byte gBattleMons _0802E274: movs r0, 0x1 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r4, r0, 24 _0802E27E: @@ -289,7 +289,7 @@ _0802E27E: ldr r1, _0802E2C8 @ =gPlayerParty adds r0, r1 movs r1, 0x9 - bl sub_80436F8 + bl AdjustFriendship b _0802E302 .align 2, 0 _0802E2C0: .4byte gBattleMons @@ -305,7 +305,7 @@ _0802E2CC: ldr r1, _0802E2E8 @ =gPlayerParty adds r0, r1 movs r1, 0x7 - bl sub_80436F8 + bl AdjustFriendship b _0802E302 .align 2, 0 _0802E2E4: .4byte gBattlerPartyIndexes @@ -320,7 +320,7 @@ _0802E2EC: ldr r1, _0802E30C @ =gPlayerParty adds r0, r1 movs r1, 0x7 - bl sub_80436F8 + bl AdjustFriendship _0802E302: pop {r4,r5} pop {r0} |