diff options
Diffstat (limited to 'asm/rom_8011DC0.s')
| -rw-r--r-- | asm/rom_8011DC0.s | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 163984108..6a0b9cc97 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -5090,7 +5090,7 @@ _080181BC: sub_80181CC: @ 80181CC push {lr} bl ScriptContext2_Enable - bl ScriptFreezeMapObjects + bl ScriptFreezeEventObjects pop {r0} bx r0 thumb_func_end sub_80181CC @@ -5511,11 +5511,11 @@ _08018574: movs r0, 0 movs r1, 0xA movs r2, 0xE0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0 movs r1, 0x1 movs r2, 0xF0 - bl box_border_load_tiles_and_pal + bl LoadUserWindowBorderGfx_ movs r4, 0x20 str r4, [sp] str r4, [sp, 0x4] @@ -8117,7 +8117,7 @@ sub_8019AB8: @ 8019AB8 ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] - bl RemoveFieldObjectByLocalIdAndMap + bl RemoveEventObjectByLocalIdAndMap pop {r0} bx r0 .pool @@ -8136,7 +8136,7 @@ sub_8019AD8: @ 8019AD8 ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _08019B30 @@ -8145,16 +8145,16 @@ sub_8019AD8: @ 8019AD8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive + bl EventObjectIsMovementOverridden lsls r0, 24 cmp r0, 0 bne _08019B30 ldrb r1, [r5] adds r0, r4, 0 - bl FieldObjectSetSpecialAnim + bl EventObjectSetHeldMovement lsls r0, 24 cmp r0, 0 bne _08019B30 @@ -8182,7 +8182,7 @@ sub_8019B3C: @ 8019B3C ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap + bl TryGetEventObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 bne _08019B9C @@ -8191,10 +8191,10 @@ sub_8019B3C: @ 8019B3C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, =gMapObjects + ldr r1, =gEventObjects adds r4, r0, r1 adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished + bl EventObjectClearHeldMovementIfFinished lsls r0, 24 cmp r0, 0 bne _08019B84 @@ -8207,11 +8207,11 @@ _08019B84: cmp r0, 0 bne _08019B96 adds r0, r4, 0 - bl npc_sync_anim_pause_bits + bl UnfreezeEventObject b _08019B9C _08019B96: adds r0, r4, 0 - bl FreezeMapObject + bl FreezeEventObject _08019B9C: movs r0, 0x1 _08019B9E: @@ -9158,7 +9158,7 @@ sub_801A2A8: @ 801A2A8 b _0801A396 _0801A2C4: ldr r4, =gUnknown_082F076A - bl player_get_direction_lower_nybble + bl GetPlayerFacingDirection lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -10446,11 +10446,11 @@ _0801AD8C: movs r0, 0 movs r1, 0x1 movs r2, 0xD0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0 movs r1, 0x1 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadUserWindowBorderGfx_ bl sub_819789C ldr r0, =sub_801AC40 bl SetVBlankCallback @@ -21620,11 +21620,11 @@ sub_8020740: @ 8020740 movs r0, 0x3 movs r1, 0x1 movs r2, 0xD0 - bl sub_809882C + bl LoadUserWindowBorderGfx movs r0, 0x3 movs r1, 0xA movs r2, 0x20 - bl box_border_load_tiles_and_pal + bl LoadUserWindowBorderGfx_ ldr r0, =gUnknown_0860F074 movs r1, 0xE0 movs r2, 0x20 @@ -24710,7 +24710,7 @@ _0802210C: ldr r4, =0x0000021d adds r1, r4, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadUserWindowBorderGfx_ ldrb r0, [r5] movs r1, 0 adds r2, r4, 0 @@ -24909,7 +24909,7 @@ _08022296: ldr r4, =0x0000021d adds r1, r4, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadUserWindowBorderGfx_ ldrb r0, [r6, 0x2] movs r1, 0 adds r2, r4, 0 @@ -29760,7 +29760,7 @@ sub_80248B0: @ 80248B0 ldr r5, =0x0000021d adds r1, r5, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadUserWindowBorderGfx_ ldrb r4, [r4] bl sub_80247BC adds r3, r0, 0 @@ -36184,7 +36184,7 @@ sub_8027BEC: @ 8027BEC adds r0, r7, 0 adds r1, r4, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadUserWindowBorderGfx_ adds r0, r7, 0 adds r1, r4, 0 movs r2, 0xD @@ -38753,7 +38753,7 @@ sub_802902C: @ 802902C movs r0, 0 movs r1, 0xA movs r2, 0xB0 - bl box_border_load_tiles_and_pal + bl LoadUserWindowBorderGfx_ pop {r0} bx r0 thumb_func_end sub_802902C @@ -49177,7 +49177,7 @@ sub_802E500: @ 802E500 adds r0, r4, 0 adds r1, r5, 0 movs r2, 0xD0 - bl box_border_load_tiles_and_pal + bl LoadUserWindowBorderGfx_ adds r0, r4, 0 adds r1, r5, 0 movs r2, 0xD |