diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 19:11:48 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 19:11:48 -0500 |
| commit | aa9a45c16fbaee2fffc94e4741e0a1f203b244bc (patch) | |
| tree | 9bdd507453e9b51ff52216d9f04bda62ac799cfb /asm/battle_frontier_1.s | |
| parent | ed245b677addbb7f5c748193301507de7fed6ec4 (diff) | |
Rebrand 'map object' and 'field object' to 'event object'
Diffstat (limited to 'asm/battle_frontier_1.s')
| -rw-r--r-- | asm/battle_frontier_1.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 729140801..535bbbbbe 100644 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -13887,7 +13887,7 @@ task_prev_quest: @ 81960A8 cmp r0, 0 bne _081960C2 bl ScriptContext2_Enable - bl FreezeMapObjects + bl FreezeEventObjects bl sub_808B864 bl sub_808BCF4 _081960C2: @@ -14285,18 +14285,18 @@ sub_81963F0: @ 81963F0 movs r0, 0xFF movs r1, 0 movs r2, 0 - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r0, r1 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearAnimIfSpecialAnimFinished bl sub_80D338C - bl UnfreezeMapObjects + bl UnfreezeEventObjects bl ScriptContext2_Disable _08196446: movs r0, 0x1 |