diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-04 17:55:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 17:55:20 -0500 |
| commit | f044c8215b9d44f19ad90a43e9e0f4263a828254 (patch) | |
| tree | e2fa5828e97a76d109276ed1d144e14cbce88f56 /asm/field_control_avatar.s | |
| parent | 4880b33ff2cff769a7c9bc73c9d792b40c10fbf7 (diff) | |
| parent | 621cfbebee08dfd856a4e5a6164b9f27bcdbbadd (diff) | |
Merge pull request #9 from ProjectRevoTPP/battle_ai
decompile battle_ai_script_commands.c
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 8c4e2fe98..f20b43995 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1882,7 +1882,7 @@ AdjustFriendship_step: @ 806D74C strh r1, [r0] cmp r1, 0 bne _0806D77A - ldr r5, _0806D784 @ =gUnknown_2024284 + ldr r5, _0806D784 @ =gPlayerParty movs r4, 0x5 _0806D76A: adds r0, r5, 0 @@ -1898,7 +1898,7 @@ _0806D77A: bx r0 .align 2, 0 _0806D780: .4byte 0x00004021 -_0806D784: .4byte gUnknown_2024284 +_0806D784: .4byte gPlayerParty thumb_func_end AdjustFriendship_step thumb_func_start overworld_poison_timer_set |