summaryrefslogtreecommitdiff
path: root/asm/map_obj_lock.s
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-18 12:55:48 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-18 12:55:48 -0500
commit75a32c9dc54e32dd8c87af98dd0d3def658f7b02 (patch)
treee14c28dfd6de59cef7771ccb9d6ef239f8093023 /asm/map_obj_lock.s
parentcfb0e233eebd172ce9131f4e4b940b18db6eb1d0 (diff)
parentc6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (diff)
Merge branch 'link' of github.com:pikalaxalt/pokeemerald into link
Diffstat (limited to 'asm/map_obj_lock.s')
-rw-r--r--asm/map_obj_lock.s8
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s
index 2270051c2..3cf009175 100644
--- a/asm/map_obj_lock.s
+++ b/asm/map_obj_lock.s
@@ -62,7 +62,7 @@ _080983E2:
thumb_func_start ScriptFreezeMapObjects
ScriptFreezeMapObjects: @ 80983E8
push {lr}
- bl player_bitmagic
+ bl FreezeMapObjects
ldr r0, =sub_80983A4
movs r1, 0x50
bl CreateTask
@@ -345,15 +345,15 @@ sub_8098630: @ 8098630
mov r6, r8
push {r6,r7}
movs r0, 0
- bl sub_80B47E0
+ bl GetChosenApproachingTrainerMapObjectId
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, =gUnknown_030060A8
+ ldr r0, =gNoOfApproachingTrainers
ldrb r0, [r0]
cmp r0, 0x2
bne _080986E0
movs r0, 0x1
- bl sub_80B47E0
+ bl GetChosenApproachingTrainerMapObjectId
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0