diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-26 06:45:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 06:45:00 -0400 |
| commit | eafb77fbb912d22294f168c1e6e89575b35f0d6c (patch) | |
| tree | 286f735ca16bd576926197f4f6a80ab6f0c24dc4 /asm/trainer_see.s | |
| parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) | |
| parent | 0ae4d58e985dcc3d265ea30505f439c34eab21ab (diff) | |
Merge pull request #125 from jiangzhengwenjz/battle
battle (3rd take)
Diffstat (limited to 'asm/trainer_see.s')
| -rw-r--r-- | asm/trainer_see.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/trainer_see.s b/asm/trainer_see.s index c52229215..659e96c32 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -87,7 +87,7 @@ sub_8081B84: @ 8081B84 _08081BC0: adds r0, r5, 0 adds r1, r6, 0 - bl TrainerWantsBattle + bl ConfigureAndSetUpOneTrainerBattle adds r0, r4, r5 lsls r0, 2 ldr r1, _08081BE0 @ =gMapObjects @@ -718,16 +718,16 @@ _0808204A: ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 - bl npc_running_behaviour_by_direction + bl GetTrainerFacingDirectionMovementType adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl npc_set_running_behaviour_etc + bl SetTrainerMovementType ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 - bl npc_running_behaviour_by_direction + bl GetTrainerFacingDirectionMovementType adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1277,17 +1277,17 @@ _0808246E: ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 - bl npc_running_behaviour_by_direction + bl GetTrainerFacingDirectionMovementType adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl npc_set_running_behaviour_etc + bl SetTrainerMovementType ldr r4, [sp] ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 - bl npc_running_behaviour_by_direction + bl GetTrainerFacingDirectionMovementType adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 |