diff options
Diffstat (limited to 'asm/battle_frontier_2.s')
| -rw-r--r-- | asm/battle_frontier_2.s | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index 7f2dbcc73..b2b454278 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -12444,7 +12444,7 @@ _081A0C8E: sub_81A0C9C: @ 81A0C9C push {lr} bl ScriptContext2_Enable - bl FreezeMapObjects + bl FreezeEventObjects bl sub_808B864 bl sub_808BCF4 movs r0, 0 @@ -27213,16 +27213,16 @@ _081A896E: 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 EventObjectClearHeldMovementIfFinished bl sub_80D338C pop {r4} pop {r0} @@ -27355,7 +27355,7 @@ _081A8A74: ldr r2, [r6] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 @@ -27511,14 +27511,14 @@ _081A8BB4: ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] - bl GetFieldObjectIdByLocalIdAndMap + bl GetEventObjectIdByLocalIdAndMap lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x10 bne _081A8BDC b _081A8D32 _081A8BDC: - ldr r0, =gMapObjects + ldr r0, =gEventObjects lsls r1, r2, 3 adds r1, r2 lsls r1, 2 @@ -28521,8 +28521,8 @@ sub_81A9424: @ 81A9424 lsls r1, 4 adds r1, r0 mov r8, r1 - ldr r2, =gMapObjects - ldr r0, =gSelectedMapObject + ldr r2, =gEventObjects + ldr r0, =gSelectedEventObject ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -28569,8 +28569,8 @@ _081A9488: mov r9, r0 _081A94AE: ldr r3, =gUnknown_08613ED8 - ldr r2, =gMapObjects - ldr r0, =gSelectedMapObject + ldr r2, =gEventObjects + ldr r0, =gSelectedEventObject ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -29181,7 +29181,7 @@ sub_81A9998: @ 81A9998 mov r8, r0 ldr r1, =0x0000028e mov r12, r1 - ldr r0, =gMapObjects + ldr r0, =gEventObjects mov r9, r0 _081A99CC: movs r2, 0 @@ -29194,7 +29194,7 @@ _081A99CE: cmp r0, r12 bne _081A9A8A adds r2, 0x7 - ldr r0, =gSelectedMapObject + ldr r0, =gSelectedEventObject ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -29322,7 +29322,7 @@ GetBattlePyramidTrainerFlag: @ 81A9AC4 ldr r1, =0x00000e2a adds r2, r1 ldr r4, =gBitTable - ldr r3, =gMapObjects + ldr r3, =gEventObjects lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -29354,8 +29354,8 @@ sub_81A9B04: @ 81A9B04 cmp r0, 0 beq _081A9B2E movs r0, 0x1 - bl GetChosenApproachingTrainerMapObjectId - ldr r1, =gSelectedMapObject + bl GetChosenApproachingTrainerEventObjectId + ldr r1, =gSelectedEventObject strb r0, [r1] ldr r0, =gTrainerBattleOpponent_B ldrh r0, [r0] @@ -29376,9 +29376,9 @@ sub_81A9B44: @ 81A9B44 lsls r0, 16 lsrs r5, r0, 16 movs r3, 0 - ldr r0, =gMapObjects + ldr r0, =gEventObjects mov r12, r0 - ldr r6, =gSelectedMapObject + ldr r6, =gSelectedEventObject ldr r1, =gSaveBlock1Ptr mov r10, r1 ldr r7, =gSaveBlock2Ptr |