summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_frontier_1.s10
-rw-r--r--asm/battle_frontier_2.s36
-rw-r--r--asm/cable_car.s6
-rw-r--r--asm/easy_chat.s4
-rw-r--r--asm/field_control_avatar.s62
-rw-r--r--asm/field_effect_helpers.s96
-rw-r--r--asm/field_player_avatar.s286
-rw-r--r--asm/field_screen.s60
-rw-r--r--asm/field_specials.s42
-rw-r--r--asm/fldeff_80F9BCC.s16
-rw-r--r--asm/pokenav.s38
-rw-r--r--asm/rom_8011DC0.s20
-rw-r--r--asm/script_pokemon_util_80F87D8.s12
-rw-r--r--asm/shop.s38
14 files changed, 363 insertions, 363 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
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index 7f2dbcc73..c42d96640 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 EventObjectClearAnimIfSpecialAnimFinished
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
diff --git a/asm/cable_car.s b/asm/cable_car.s
index bfb96cb9b..59245a1b2 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -1956,7 +1956,7 @@ _08150D86:
str r2, [sp]
movs r2, 0xC8
movs r3, 0x49
- bl AddPseudoFieldObject
+ bl AddPseudoEventObject
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -2062,7 +2062,7 @@ _08150E68:
str r2, [sp]
movs r2, 0x80
movs r3, 0x27
- bl AddPseudoFieldObject
+ bl AddPseudoEventObject
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -2195,7 +2195,7 @@ _08150F3E:
ldrsh r3, [r3, r4]
movs r4, 0x6A
str r4, [sp]
- bl AddPseudoFieldObject
+ bl AddPseudoEventObject
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 7f2a7ca88..eb423cf4c 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -8988,7 +8988,7 @@ _0811E852:
adds r1, r5, 0
movs r2, 0x4C
movs r3, 0x28
- bl AddPseudoFieldObject
+ bl AddPseudoEventObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -9019,7 +9019,7 @@ _0811E8A0:
adds r1, r5, 0
movs r2, 0x34
movs r3, 0x28
- bl AddPseudoFieldObject
+ bl AddPseudoEventObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 7e25c45da..ff10928cb 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -187,7 +187,7 @@ sub_809C014: @ 809C014
ldr r0, =gSpecialVar_LastTalked
movs r1, 0
strh r1, [r0]
- ldr r0, =gSelectedMapObject
+ ldr r0, =gSelectedEventObject
strb r1, [r0]
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -479,13 +479,13 @@ TryGetScriptOnPressingA: @ 809C270
adds r7, r4, 0
adds r1, r5, 0
adds r2, r4, 0
- bl TryGetMapObjectScript
+ bl TryGetEventObjectScript
cmp r0, 0
bne _0809C2BC
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl TryGetInvisibleMapObjectScript
+ bl TryGetInvisibleEventObjectScript
cmp r0, 0
bne _0809C2BC
adds r0, r6, 0
@@ -547,12 +547,12 @@ _0809C2F0:
lsrs r1, 16
_0809C30E:
ldrb r2, [r4, 0x4]
- bl GetFieldObjectIdByXYZ
+ bl GetEventObjectIdByXYZ
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x10
beq _0809C32E
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
lsls r2, r3, 3
adds r0, r2, r3
lsls r0, 2
@@ -567,7 +567,7 @@ _0809C32E:
.pool
_0809C33C:
movs r4, 0
- ldr r1, =gLinkPlayerMapObjects
+ ldr r1, =gLinkPlayerEventObjects
_0809C340:
ldrb r0, [r1]
cmp r0, 0x1
@@ -580,7 +580,7 @@ _0809C34C:
adds r4, 0x1
cmp r4, 0x3
ble _0809C340
- ldr r0, =gSelectedMapObject
+ ldr r0, =gSelectedEventObject
strb r3, [r0]
ldr r1, =gSpecialVar_LastTalked
adds r0, r2, r3
@@ -591,7 +591,7 @@ _0809C34C:
ldr r0, =gSpecialVar_Facing
strh r6, [r0]
adds r0, r3, 0
- bl GetFieldObjectScriptPointerByFieldObjectId
+ bl GetEventObjectScriptPointerByEventObjectId
_0809C36E:
pop {r4-r6}
pop {r1}
@@ -599,8 +599,8 @@ _0809C36E:
.pool
thumb_func_end sub_809C2C8
- thumb_func_start TryGetMapObjectScript
-TryGetMapObjectScript: @ 809C384
+ thumb_func_start TryGetEventObjectScript
+TryGetEventObjectScript: @ 809C384
push {r4-r7,lr}
adds r5, r0, 0
lsls r1, 24
@@ -610,12 +610,12 @@ TryGetMapObjectScript: @ 809C384
ldrh r0, [r5]
ldrh r1, [r5, 0x2]
ldrb r2, [r5, 0x4]
- bl GetFieldObjectIdByXYZ
+ bl GetEventObjectIdByXYZ
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x10
beq _0809C3B4
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
lsls r2, r4, 3
adds r0, r2, r4
lsls r0, 2
@@ -647,12 +647,12 @@ _0809C3B4:
lsls r1, 16
lsrs r1, 16
ldrb r2, [r5, 0x4]
- bl GetFieldObjectIdByXYZ
+ bl GetEventObjectIdByXYZ
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x10
beq _0809C400
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
lsls r2, r4, 3
adds r0, r2, r4
lsls r0, 2
@@ -666,7 +666,7 @@ _0809C400:
b _0809C44E
.pool
_0809C40C:
- ldr r0, =gSelectedMapObject
+ ldr r0, =gSelectedEventObject
strb r4, [r0]
ldr r1, =gSpecialVar_LastTalked
adds r0, r2, r4
@@ -684,7 +684,7 @@ _0809C40C:
.pool
_0809C43C:
adds r0, r4, 0
- bl GetFieldObjectScriptPointerByFieldObjectId
+ bl GetEventObjectScriptPointerByEventObjectId
_0809C442:
adds r1, r0, 0
ldr r0, =gSpecialVar_LastTalked
@@ -696,11 +696,11 @@ _0809C44E:
pop {r1}
bx r1
.pool
- thumb_func_end TryGetMapObjectScript
+ thumb_func_end TryGetEventObjectScript
- thumb_func_start TryGetInvisibleMapObjectScript
-@ signed int TryGetInvisibleMapObjectScript(int a1, int a2, u8 playerFacingDirection)
-TryGetInvisibleMapObjectScript: @ 809C458
+ thumb_func_start TryGetInvisibleEventObjectScript
+@ signed int TryGetInvisibleEventObjectScript(int a1, int a2, u8 playerFacingDirection)
+TryGetInvisibleEventObjectScript: @ 809C458
push {r4,r5,lr}
lsls r2, 24
lsrs r5, r2, 24
@@ -715,7 +715,7 @@ TryGetInvisibleMapObjectScript: @ 809C458
lsrs r2, 16
ldrb r3, [r0, 0x4]
adds r0, r4, 0
- bl FindInvisibleMapObjectByPosition
+ bl FindInvisibleEventObjectByPosition
cmp r0, 0
beq _0809C4CC
ldr r2, [r0, 0x8]
@@ -799,7 +799,7 @@ _0809C532:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end TryGetInvisibleMapObjectScript
+ thumb_func_end TryGetInvisibleEventObjectScript
thumb_func_start TryGetMetatileBehaviorScript
TryGetMetatileBehaviorScript: @ 809C538
@@ -2261,9 +2261,9 @@ sub_809D0F4: @ 809D0F4
.pool
thumb_func_end sub_809D0F4
- thumb_func_start FindInvisibleMapObjectByPosition
-@ int FindInvisibleMapObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
-FindInvisibleMapObjectByPosition: @ 809D11C
+ thumb_func_start FindInvisibleEventObjectByPosition
+@ int FindInvisibleEventObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
+FindInvisibleEventObjectByPosition: @ 809D11C
push {r4-r7,lr}
lsls r1, 16
lsrs r7, r1, 16
@@ -2308,7 +2308,7 @@ _0809D164:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end FindInvisibleMapObjectByPosition
+ thumb_func_end FindInvisibleEventObjectByPosition
thumb_func_start dive_warp
dive_warp: @ 809D16C
@@ -2447,9 +2447,9 @@ _0809D276:
bx r1
thumb_func_end sub_809D1E8
- thumb_func_start GetFieldObjectScriptPointerForComparison
-@ u8 *GetFieldObjectScriptPointerForComparison()
-GetFieldObjectScriptPointerForComparison: @ 809D280
+ thumb_func_start GetEventObjectScriptPointerForComparison
+@ u8 *GetEventObjectScriptPointerForComparison()
+GetEventObjectScriptPointerForComparison: @ 809D280
push {r4,r5,lr}
sub sp, 0x8
bl player_get_direction_upper_nybble
@@ -2470,12 +2470,12 @@ GetFieldObjectScriptPointerForComparison: @ 809D280
lsrs r1, 24
mov r0, sp
adds r2, r4, 0
- bl TryGetMapObjectScript
+ bl TryGetEventObjectScript
add sp, 0x8
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end GetFieldObjectScriptPointerForComparison
+ thumb_func_end GetEventObjectScriptPointerForComparison
thumb_func_start sub_809D2BC
sub_809D2BC: @ 809D2BC
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 77f8213b3..08df3215c 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -100,7 +100,7 @@ _08153F7A:
sub_8153F98: @ 8153F98
push {lr}
ldrb r0, [r0, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
ldrh r0, [r0, 0xA]
subs r0, 0x2
lsls r0, 16
@@ -123,7 +123,7 @@ npc_pal_op: @ 8153FAC
movs r0, 0
strh r0, [r4, 0x32]
ldrb r0, [r5, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
ldrb r1, [r0, 0xC]
movs r0, 0x80
ands r0, r1
@@ -172,7 +172,7 @@ npc_pal_op_B: @ 815401C
lsls r1, 24
lsrs r4, r1, 24
ldrb r0, [r0, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
adds r2, r0, 0
ldrh r1, [r2, 0x4]
ldr r0, =0x000011ff
@@ -217,7 +217,7 @@ npc_pal_op_A: @ 8154078
lsls r1, 24
lsrs r4, r1, 24
ldrb r0, [r0, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
adds r2, r0, 0
ldrh r1, [r2, 0x4]
ldr r0, =0x000011ff
@@ -248,7 +248,7 @@ objc_reflection_maybe: @ 81540A8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r7, r0, r1
ldrb r1, [r7, 0x4]
lsls r0, r1, 4
@@ -578,16 +578,16 @@ oei_shadow: @ 8154340
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r0, [r1, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
adds r4, r0, 0
ldr r2, =gFieldEffectObjectTemplatePointers
ldr r1, =gUnknown_085CDC3E
@@ -659,7 +659,7 @@ oamc_shadow: @ 81543E4
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08154412
@@ -673,7 +673,7 @@ _08154412:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r4, r0, r1
ldrb r0, [r4, 0x4]
lsls r1, r0, 4
@@ -877,7 +877,7 @@ _0815459C:
adds r1, r4, 0
adds r2, r7, 0
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _081545F0
@@ -909,7 +909,7 @@ _08154604:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -1216,7 +1216,7 @@ _0815484C:
adds r1, r7, 0
adds r2, r6, 0
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _081548A0
@@ -1248,7 +1248,7 @@ _081548B4:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -1340,13 +1340,13 @@ sub_815496C: @ 815496C
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x78]
@@ -1428,11 +1428,11 @@ sub_8154A10: @ 8154A10
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08154A4E
- ldr r5, =gMapObjects
+ ldr r5, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1451,7 +1451,7 @@ _08154A4E:
.pool
_08154A5C:
ldrb r0, [r1, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
mov r8, r0
mov r0, sp
ldrb r1, [r0]
@@ -1781,13 +1781,13 @@ sub_8154CEC: @ 8154CEC
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
@@ -1800,7 +1800,7 @@ sub_8154CEC: @ 8154CEC
cmp r4, 0x40
beq _08154D76
ldrb r0, [r5, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
lsls r3, r4, 4
adds r3, r4
lsls r3, 2
@@ -1870,7 +1870,7 @@ sub_8154D90: @ 8154D90
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08154DCA
@@ -1881,7 +1881,7 @@ _08154DC0:
b _08154E0A
_08154DCA:
ldr r3, =gSprites
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2034,13 +2034,13 @@ sub_8154EFC: @ 8154EFC
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r6, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
@@ -2053,7 +2053,7 @@ sub_8154EFC: @ 8154EFC
cmp r5, 0x40
beq _08154F92
ldrb r0, [r6, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
adds r4, r0, 0
lsls r0, r5, 4
adds r0, r5
@@ -2123,11 +2123,11 @@ sub_8154FB4: @ 8154FB4
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08154FEE
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2242,13 +2242,13 @@ sub_81550B4: @ 81550B4
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x7C]
@@ -2328,11 +2328,11 @@ sub_8155158: @ 8155158
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08155192
- ldr r5, =gMapObjects
+ ldr r5, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2351,7 +2351,7 @@ _08155192:
.pool
_081551A0:
ldrb r0, [r1, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
mov r1, sp
ldrb r2, [r1]
lsls r1, r2, 3
@@ -2765,7 +2765,7 @@ sub_81554AC: @ 81554AC
movs r2, 0x32
ldrsh r1, [r4, r2]
bl CurrentMapDrawMetatileAt
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2972,7 +2972,7 @@ sub_8155658: @ 8155658
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r0
ldrb r0, [r4, 0x4]
lsls r5, r0, 4
@@ -3319,13 +3319,13 @@ sub_8155900: @ 8155900
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r6, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x74]
@@ -3338,7 +3338,7 @@ sub_8155900: @ 8155900
cmp r4, 0x40
beq _081559A4
ldrb r0, [r6, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
adds r5, r0, 0
lsls r0, r4, 4
adds r0, r4
@@ -3415,11 +3415,11 @@ sub_81559BC: @ 81559BC
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _081559F6
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3474,7 +3474,7 @@ _08155A46:
strh r6, [r4, 0x20]
strh r5, [r4, 0x22]
ldr r3, =gSprites
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3694,7 +3694,7 @@ ShowDisguiseFieldEffect: @ 8155BD0
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08155C08
@@ -3783,7 +3783,7 @@ sub_8155C88: @ 8155C88
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08155CB8
@@ -3793,7 +3793,7 @@ sub_8155C88: @ 8155C88
adds r0, r5, 0
bl FieldEffectStop
_08155CB8:
- ldr r4, =gMapObjects
+ ldr r4, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3801,7 +3801,7 @@ _08155CB8:
lsls r0, 2
adds r0, r4
ldrb r0, [r0, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
mov r1, sp
ldrb r2, [r1]
lsls r1, r2, 3
@@ -4514,14 +4514,14 @@ _08156212:
lsls r0, r7, 3
adds r0, r7
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r4, r0, r1
ldrb r0, [r4]
lsls r0, 31
cmp r0, 0
beq _081562B4
ldrb r0, [r4, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index f5acc1e3e..375177337 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -5,9 +5,9 @@
.text
- thumb_func_start FieldObjectCB_NoMovement2
-@ void FieldObjectCB_NoMovement2(struct obj *object)
-FieldObjectCB_NoMovement2: @ 808A998
+ thumb_func_start EventObjectCB_NoMovement2
+@ void EventObjectCB_NoMovement2(struct obj *object)
+EventObjectCB_NoMovement2: @ 808A998
push {lr}
adds r1, r0, 0
movs r0, 0x2E
@@ -15,20 +15,20 @@ FieldObjectCB_NoMovement2: @ 808A998
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
adds r0, r2
- ldr r2, =FieldObjectCB2_NoMovement2
- bl FieldObjectStep
+ ldr r2, =EventObjectCB2_NoMovement2
+ bl EventObjectStep
pop {r0}
bx r0
.pool
- thumb_func_end FieldObjectCB_NoMovement2
+ thumb_func_end EventObjectCB_NoMovement2
- thumb_func_start FieldObjectCB2_NoMovement2
-FieldObjectCB2_NoMovement2: @ 808A9BC
+ thumb_func_start EventObjectCB2_NoMovement2
+EventObjectCB2_NoMovement2: @ 808A9BC
movs r0, 0
bx lr
- thumb_func_end FieldObjectCB2_NoMovement2
+ thumb_func_end EventObjectCB2_NoMovement2
thumb_func_start player_step
@ void player_step(int dpad_direction, int buttons_new, int buttons_held)
@@ -48,7 +48,7 @@ player_step: @ 808A9C0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r5, r0, r1
adds r0, r5, 0
bl sub_808C280
@@ -60,7 +60,7 @@ player_step: @ 808A9C0
bl Bike_TryAcroBikeHistoryUpdate
adds r0, r5, 0
mov r1, r8
- bl TryInterruptFieldObjectSpecialAnim
+ bl TryInterruptEventObjectSpecialAnim
lsls r0, 24
cmp r0, 0
bne _0808AA26
@@ -85,25 +85,25 @@ _0808AA26:
.pool
thumb_func_end player_step
- thumb_func_start TryInterruptFieldObjectSpecialAnim
-@ bool8 TryInterruptFieldObjectSpecialAnim(struct npc_state *fieldObject, u8 direction)
-TryInterruptFieldObjectSpecialAnim: @ 808AA38
+ thumb_func_start TryInterruptEventObjectSpecialAnim
+@ bool8 TryInterruptEventObjectSpecialAnim(struct npc_state *eventObject, u8 direction)
+TryInterruptEventObjectSpecialAnim: @ 808AA38
push {r4-r6,lr}
adds r4, r0, 0
lsls r1, 24
lsrs r5, r1, 24
adds r6, r5, 0
- bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+ bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _0808AA92
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
bne _0808AA92
adds r0, r4, 0
- bl FieldObjectGetSpecialAnim
+ bl EventObjectGetSpecialAnim
lsls r0, 24
movs r1, 0xE7
lsls r1, 24
@@ -123,7 +123,7 @@ _0808AA74:
beq _0808AA84
_0808AA7C:
adds r0, r4, 0
- bl FieldObjectClearAnim
+ bl EventObjectClearAnim
b _0808AA92
_0808AA84:
adds r0, r6, 0
@@ -138,10 +138,10 @@ _0808AA94:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end TryInterruptFieldObjectSpecialAnim
+ thumb_func_end TryInterruptEventObjectSpecialAnim
thumb_func_start npc_clear_strange_bits
-@ void npc_clear_strange_bits(struct npc_state *fieldObject)
+@ void npc_clear_strange_bits(struct npc_state *eventObject)
npc_clear_strange_bits: @ 808AA9C
ldrb r2, [r0, 0x1]
movs r1, 0x11
@@ -240,7 +240,7 @@ GetForcedMovementByMetatileBehavior: @ 808AB38
ands r0, r1
cmp r0, 0
bne _0808AB8A
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -290,7 +290,7 @@ ForcedMovement_None: @ 808AB94
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r0, r1
ldrb r2, [r0, 0x1]
movs r1, 0x3
@@ -302,7 +302,7 @@ ForcedMovement_None: @ 808AB94
ldrb r1, [r0, 0x18]
lsls r1, 28
lsrs r1, 28
- bl FieldObjectSetDirection
+ bl EventObjectSetDirection
ldrb r1, [r4]
movs r0, 0xBF
ands r0, r1
@@ -386,7 +386,7 @@ DoForcedMovementInCurrentDirection: @ 808AC58
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
adds r0, r2
ldrb r2, [r0, 0x1]
movs r3, 0x4
@@ -528,7 +528,7 @@ ForcedMovement_Slide: @ 808AD60
lsls r2, r3, 3
adds r2, r3
lsls r2, 2
- ldr r3, =gMapObjects
+ ldr r3, =gEventObjects
adds r2, r3
ldrb r3, [r2, 0x1]
movs r4, 0x4
@@ -623,7 +623,7 @@ ForcedMovement_MuddySlope: @ 808AE10
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r4, r0, r1
ldrb r1, [r4, 0x18]
movs r0, 0xF0
@@ -809,7 +809,7 @@ _0808AF68:
lsls r0, 24
cmp r0, 0
beq _0808AFB0
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -848,7 +848,7 @@ CheckForPlayerAvatarCollision: @ 808AFBC
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r0
ldrh r1, [r4, 0x10]
add r0, sp, 0x4
@@ -877,7 +877,7 @@ CheckForPlayerAvatarCollision: @ 808AFBC
str r0, [sp]
adds r0, r4, 0
adds r3, r6, 0
- bl CheckForFieldObjectCollision
+ bl CheckForEventObjectCollision
lsls r0, 24
lsrs r0, 24
add sp, 0x8
@@ -899,7 +899,7 @@ sub_808B028: @ 808B028
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r0
ldrh r1, [r4, 0x10]
add r0, sp, 0x4
@@ -938,9 +938,9 @@ sub_808B028: @ 808B028
.pool
thumb_func_end sub_808B028
- thumb_func_start CheckForFieldObjectCollision
-@ u8 CheckForFieldObjectCollision(struct npc_state *fieldObject, u16 x, u16 y, u8 direction, u8 metatileBehavior)
-CheckForFieldObjectCollision: @ 808B094
+ thumb_func_start CheckForEventObjectCollision
+@ u8 CheckForEventObjectCollision(struct npc_state *eventObject, u16 x, u16 y, u8 direction, u8 metatileBehavior)
+CheckForEventObjectCollision: @ 808B094
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1043,7 +1043,7 @@ _0808B152:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end CheckForFieldObjectCollision
+ thumb_func_end CheckForEventObjectCollision
thumb_func_start sub_808B164
sub_808B164: @ 808B164
@@ -1120,7 +1120,7 @@ sub_808B1BC: @ 808B1BC
lsrs r0, r5, 16
lsrs r1, r4, 16
movs r2, 0x3
- bl GetFieldObjectIdByXYZ
+ bl GetEventObjectIdByXYZ
lsls r0, 24
lsrs r0, 24
cmp r0, 0x10
@@ -1182,12 +1182,12 @@ sub_808B238: @ 808B238
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r5, r2]
- bl GetFieldObjectIdByXY
+ bl GetEventObjectIdByXY
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x10
beq _0808B2D8
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
lsls r1, r6, 3
adds r1, r6
lsls r1, 2
@@ -1290,7 +1290,7 @@ IsPlayerCollidingWithFarawayIslandMew: @ 808B324
lsls r1, r2, 3
adds r1, r2
lsls r1, 2
- ldr r5, =gMapObjects
+ ldr r5, =gEventObjects
adds r3, r1, r5
ldrh r2, [r3, 0x10]
mov r1, sp
@@ -1305,7 +1305,7 @@ IsPlayerCollidingWithFarawayIslandMew: @ 808B324
movs r0, 0x1
movs r1, 0x39
movs r2, 0x1A
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r1, r0, 24
adds r6, r4, 0
@@ -1401,7 +1401,7 @@ _0808B3F4:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r0, r1
ldr r1, [r2]
bl _call_via_r1
@@ -1423,13 +1423,13 @@ _0808B428:
thumb_func_end DoPlayerAvatarTransition
thumb_func_start PlayerAvatarTransition_Dummy
-@ void PlayerAvatarTransition_Dummy(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_Dummy(struct npc_state *eventObject)
PlayerAvatarTransition_Dummy: @ 808B43C
bx lr
thumb_func_end PlayerAvatarTransition_Dummy
thumb_func_start PlayerAvatarTransition_Normal
-@ void PlayerAvatarTransition_Normal(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_Normal(struct npc_state *eventObject)
PlayerAvatarTransition_Normal: @ 808B440
push {r4,lr}
adds r4, r0, 0
@@ -1439,11 +1439,11 @@ PlayerAvatarTransition_Normal: @ 808B440
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl FieldObjectTurn
+ bl EventObjectTurn
movs r0, 0x1
bl SetPlayerAvatarStateMask
pop {r4}
@@ -1452,7 +1452,7 @@ PlayerAvatarTransition_Normal: @ 808B440
thumb_func_end PlayerAvatarTransition_Normal
thumb_func_start PlayerAvatarTransition_MachBike
-@ void PlayerAvatarTransition_MachBike(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_MachBike(struct npc_state *eventObject)
PlayerAvatarTransition_MachBike: @ 808B46C
push {r4,lr}
adds r4, r0, 0
@@ -1462,11 +1462,11 @@ PlayerAvatarTransition_MachBike: @ 808B46C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl FieldObjectTurn
+ bl EventObjectTurn
movs r0, 0x2
bl SetPlayerAvatarStateMask
movs r0, 0
@@ -1478,7 +1478,7 @@ PlayerAvatarTransition_MachBike: @ 808B46C
thumb_func_end PlayerAvatarTransition_MachBike
thumb_func_start PlayerAvatarTransition_AcroBike
-@ void PlayerAvatarTransition_AcroBike(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_AcroBike(struct npc_state *eventObject)
PlayerAvatarTransition_AcroBike: @ 808B4A0
push {r4,lr}
adds r4, r0, 0
@@ -1488,11 +1488,11 @@ PlayerAvatarTransition_AcroBike: @ 808B4A0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl FieldObjectTurn
+ bl EventObjectTurn
movs r0, 0x4
bl SetPlayerAvatarStateMask
movs r0, 0
@@ -1505,7 +1505,7 @@ PlayerAvatarTransition_AcroBike: @ 808B4A0
thumb_func_end PlayerAvatarTransition_AcroBike
thumb_func_start PlayerAvatarTransition_Surfing
-@ void PlayerAvatarTransition_Surfing(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_Surfing(struct npc_state *eventObject)
PlayerAvatarTransition_Surfing: @ 808B4D8
push {r4,lr}
adds r4, r0, 0
@@ -1515,11 +1515,11 @@ PlayerAvatarTransition_Surfing: @ 808B4D8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl FieldObjectTurn
+ bl EventObjectTurn
movs r0, 0x8
bl SetPlayerAvatarStateMask
ldr r1, =gFieldEffectArguments
@@ -1546,7 +1546,7 @@ PlayerAvatarTransition_Surfing: @ 808B4D8
thumb_func_end PlayerAvatarTransition_Surfing
thumb_func_start PlayerAvatarTransition_Underwater
-@ void PlayerAvatarTransition_Underwater(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_Underwater(struct npc_state *eventObject)
PlayerAvatarTransition_Underwater: @ 808B534
push {r4,lr}
adds r4, r0, 0
@@ -1556,11 +1556,11 @@ PlayerAvatarTransition_Underwater: @ 808B534
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl FieldObjectTurn
+ bl EventObjectTurn
movs r0, 0x10
bl SetPlayerAvatarStateMask
ldrb r0, [r4, 0x4]
@@ -1572,7 +1572,7 @@ PlayerAvatarTransition_Underwater: @ 808B534
thumb_func_end PlayerAvatarTransition_Underwater
thumb_func_start PlayerAvatarTransition_ReturnToField
-@ void PlayerAvatarTransition_ReturnToField(struct npc_state *fieldObject)
+@ void PlayerAvatarTransition_ReturnToField(struct npc_state *eventObject)
PlayerAvatarTransition_ReturnToField: @ 808B568
ldr r2, =gPlayerAvatar
ldrb r1, [r2]
@@ -1621,7 +1621,7 @@ _0808B5B6:
thumb_func_start player_is_anim_in_certain_ranges
player_is_anim_in_certain_ranges: @ 808B5BC
push {lr}
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -1696,9 +1696,9 @@ PlayerIsAnimActive: @ 808B63C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r0, r1
- bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+ bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1715,9 +1715,9 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r0, r1
- bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+ bl EventObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1727,7 +1727,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 808B660
thumb_func_start player_set_x22
player_set_x22: @ 808B684
- ldr r3, =gMapObjects
+ ldr r3, =gEventObjects
ldr r1, =gPlayerAvatar
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
@@ -1742,7 +1742,7 @@ player_set_x22: @ 808B684
thumb_func_start player_get_x22
player_get_x22: @ 808B6A0
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -1766,9 +1766,9 @@ sub_808B6BC: @ 808B6BC
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
adds r0, r2
- bl FieldObjectForceSetSpecialAnim
+ bl EventObjectForceSetSpecialAnim
pop {r0}
bx r0
.pool
@@ -1793,10 +1793,10 @@ PlayerSetAnimId: @ 808B6E4
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r0, r1
adds r1, r5, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
_0808B712:
pop {r4,r5}
pop {r0}
@@ -2013,7 +2013,7 @@ _0808B872:
lsls r0, 24
cmp r0, 0
beq _0808B89A
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldrb r1, [r4, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2219,7 +2219,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2275,7 +2275,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- ldr r3, =gMapObjects
+ ldr r3, =gEventObjects
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@@ -2307,7 +2307,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 808BA68
@ void PlayerGetDestCoords(u16 *x, u16 *y)
PlayerGetDestCoords: @ 808BAAC
push {r4,r5,lr}
- ldr r5, =gMapObjects
+ ldr r5, =gEventObjects
ldr r4, =gPlayerAvatar
ldrb r3, [r4, 0x5]
lsls r2, r3, 3
@@ -2339,7 +2339,7 @@ plaer_get_pos_including_state_based_drift: @ 808BADC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r3, r0, r1
ldrb r1, [r3]
movs r0, 0xC0
@@ -2465,7 +2465,7 @@ _0808BC30:
thumb_func_start player_get_direction_lower_nybble
@ u8 player_get_direction_lower_nybble()
player_get_direction_lower_nybble: @ 808BC38
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2482,7 +2482,7 @@ player_get_direction_lower_nybble: @ 808BC38
thumb_func_start player_get_direction_upper_nybble
@ u8 player_get_direction_upper_nybble()
player_get_direction_upper_nybble: @ 808BC58
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2498,7 +2498,7 @@ player_get_direction_upper_nybble: @ 808BC58
thumb_func_start PlayerGetZCoord
@ u8 PlayerGetZCoord()
PlayerGetZCoord: @ 808BC74
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2521,7 +2521,7 @@ sub_808BC90: @ 808BC90
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r0, r1
lsls r3, 16
asrs r3, 16
@@ -2578,7 +2578,7 @@ sub_808BCF4: @ 808BCF4
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r0
adds r0, r4, 0
bl npc_clear_strange_bits
@@ -2586,7 +2586,7 @@ sub_808BCF4: @ 808BCF4
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl FieldObjectSetDirection
+ bl EventObjectSetDirection
movs r0, 0x6
bl TestPlayerAvatarFlags
lsls r0, 24
@@ -2809,7 +2809,7 @@ IsPlayerFacingSurfableFishableWater: @ 808BE74
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r0
ldrh r1, [r4, 0x10]
mov r0, sp
@@ -3053,14 +3053,14 @@ InitPlayerAvatar: @ 808BFE0
strh r3, [r0, 0xE]
str r3, [sp, 0x10]
strh r3, [r0, 0x14]
- bl SpawnSpecialFieldObject
+ bl SpawnSpecialEventObject
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
lsls r4, r5, 3
adds r4, r5
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r0
ldrb r0, [r4, 0x2]
movs r1, 0x1
@@ -3070,7 +3070,7 @@ InitPlayerAvatar: @ 808BFE0
strb r0, [r4, 0x1B]
adds r0, r4, 0
mov r1, r9
- bl FieldObjectTurn
+ bl EventObjectTurn
bl ClearPlayerAvatarInfo
ldr r0, =gPlayerAvatar
strb r6, [r0, 0x2]
@@ -3097,7 +3097,7 @@ sub_808C0A8: @ 808C0A8
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r6, =gMapObjects
+ ldr r6, =gEventObjects
ldr r5, =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r1, r0, 3
@@ -3152,7 +3152,7 @@ sub_808C114: @ 808C114
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r0
movs r0, 0x5
bl GetPlayerAvatarGraphicsIdByStateId
@@ -3160,7 +3160,7 @@ sub_808C114: @ 808C114
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3186,7 +3186,7 @@ sub_808C15C: @ 808C15C
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r0
movs r0, 0x6
bl GetPlayerAvatarGraphicsIdByStateId
@@ -3194,7 +3194,7 @@ sub_808C15C: @ 808C15C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r0, [r6, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -3227,7 +3227,7 @@ sub_808C1B4: @ 808C1B4
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r0
movs r0, 0x2
bl GetPlayerAvatarGraphicsIdByStateId
@@ -3235,7 +3235,7 @@ sub_808C1B4: @ 808C1B4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r0, [r6, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -3276,7 +3276,7 @@ sub_808C228: @ 808C228
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r0
movs r0, 0x7
bl GetPlayerAvatarGraphicsIdByStateId
@@ -3284,7 +3284,7 @@ sub_808C228: @ 808C228
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r0, [r6, 0x4]
lsls r4, r0, 4
adds r4, r0
@@ -3292,7 +3292,7 @@ sub_808C228: @ 808C228
ldr r0, =gSprites
adds r4, r0
adds r0, r5, 0
- bl FieldObjectDirectionToImageAnimId
+ bl EventObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3414,7 +3414,7 @@ taskFF_bump_boulder: @ 808C34C
lsrs r0, 24
ldr r6, =gUnknown_08497530
ldr r2, =gTasks
- ldr r5, =gMapObjects
+ ldr r5, =gEventObjects
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -3474,49 +3474,49 @@ do_boulder_dust: @ 808C3C4
adds r5, r1, 0
adds r4, r2, 0
adds r0, r5, 0
- bl FieldObjectIsSpecialAnimActive
+ bl EventObjectIsSpecialAnimActive
lsls r0, 24
cmp r0, 0
beq _0808C3DE
adds r0, r5, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
_0808C3DE:
adds r0, r4, 0
- bl FieldObjectIsSpecialAnimActive
+ bl EventObjectIsSpecialAnimActive
lsls r0, 24
cmp r0, 0
beq _0808C3F0
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
_0808C3F0:
adds r0, r5, 0
- bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+ bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
bne _0808C472
adds r0, r4, 0
- bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+ bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
bne _0808C472
adds r0, r5, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
ldrb r0, [r6, 0xC]
bl GetStepInPlaceDelay16AnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
ldrb r0, [r6, 0xC]
bl GetSimpleGoAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
ldr r2, =gFieldEffectArguments
movs r1, 0x10
ldrsh r0, [r4, r1]
@@ -3558,19 +3558,19 @@ sub_808C484: @ 808C484
adds r4, r1, 0
adds r5, r2, 0
adds r0, r4, 0
- bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+ bl EventObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
cmp r0, 0
beq _0808C4C6
adds r0, r5, 0
- bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+ bl EventObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
cmp r0, 0
beq _0808C4C6
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
adds r0, r5, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
ldr r1, =gPlayerAvatar
movs r0, 0
strb r0, [r1, 0x6]
@@ -3625,7 +3625,7 @@ _0808C50A:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@@ -3648,7 +3648,7 @@ sub_808C544: @ 808C544
movs r0, 0x1
strb r0, [r5, 0x6]
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808C5A0
@@ -3662,7 +3662,7 @@ sub_808C544: @ 808C544
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
ldrh r0, [r6, 0xA]
adds r0, 0x1
strh r0, [r6, 0xA]
@@ -3726,7 +3726,7 @@ _0808C5E2:
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r1, r0
ldr r2, [r2]
adds r0, r4, 0
@@ -3772,7 +3772,7 @@ sub_808C644: @ 808C644
movs r2, 0x4
bl memcpy
adds r0, r5, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808C6AC
@@ -3787,7 +3787,7 @@ sub_808C644: @ 808C644
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
ldrb r0, [r4, 0xA]
cmp r6, r0
bne _0808C68A
@@ -3831,7 +3831,7 @@ sub_808C6BC: @ 808C6BC
movs r2, 0x5
bl memcpy
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808C6EC
@@ -3840,7 +3840,7 @@ sub_808C6BC: @ 808C6BC
add r0, sp
ldrb r1, [r0]
adds r0, r4, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
movs r0, 0x1
strh r0, [r5, 0x8]
_0808C6EC:
@@ -3858,7 +3858,7 @@ sub_808C6FC: @ 808C6FC
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808C740
@@ -3871,7 +3871,7 @@ sub_808C6FC: @ 808C6FC
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
bl ScriptContext2_Disable
ldr r1, =gPlayerAvatar
movs r0, 0
@@ -3936,15 +3936,15 @@ taskFF_0805D1D4: @ 808C7A8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r5, r0, r1
adds r0, r5, 0
- bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+ bl EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _0808C7D4
adds r0, r5, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808C7FC
@@ -3963,7 +3963,7 @@ _0808C7D4:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
ldr r0, =sub_808C814
str r0, [r4]
_0808C7FC:
@@ -3983,10 +3983,10 @@ sub_808C814: @ 808C814
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 EventObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808C87A
@@ -3996,7 +3996,7 @@ sub_808C814: @ 808C814
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -4005,7 +4005,7 @@ sub_808C814: @ 808C814
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
movs r0, 0
strb r0, [r6, 0x6]
bl ScriptContext2_Disable
@@ -4127,7 +4127,7 @@ fish1: @ 808C918
ldrh r1, [r6]
adds r1, r0
strh r1, [r5, 0x22]
- ldr r3, =gMapObjects
+ ldr r3, =gEventObjects
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@@ -4142,7 +4142,7 @@ fish1: @ 808C918
lsls r4, 2
adds r4, r3
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimActive
+ bl EventObjectClearAnimIfSpecialAnimActive
ldrb r0, [r4, 0x1]
movs r1, 0x8
orrs r0, r1
@@ -4579,18 +4579,18 @@ _0808CCBC:
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
mov r8, r0
add r4, r8
ldrh r1, [r5, 0x24]
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl FieldObjectTurn
+ bl EventObjectTurn
ldrb r1, [r7]
movs r0, 0x8
ands r0, r1
@@ -4792,18 +4792,18 @@ fishE: @ 808CE8C
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
mov r8, r0
add r4, r8
ldrh r1, [r6, 0x24]
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetGraphicsId
+ bl EventObjectSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl FieldObjectTurn
+ bl EventObjectTurn
ldrb r1, [r5]
movs r0, 0x8
ands r0, r1
@@ -4858,7 +4858,7 @@ fishF: @ 808CF2C
ldr r0, =gPlayerAvatar
strb r1, [r0, 0x6]
bl ScriptContext2_Disable
- bl UnfreezeMapObjects
+ bl UnfreezeEventObjects
movs r0, 0
movs r1, 0x1
bl sub_8197434
@@ -4984,7 +4984,7 @@ _0808D03A:
ands r0, r1
cmp r0, 0
beq _0808D05E
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldrb r1, [r3, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -5037,7 +5037,7 @@ sub_808D094: @ 808D094
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
@@ -5066,7 +5066,7 @@ _0808D0E8:
b _0808D18A
_0808D0EE:
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808D18A
@@ -5217,7 +5217,7 @@ sub_808D1FC: @ 808D1FC
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
@@ -5262,7 +5262,7 @@ _0808D25E:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectForceSetSpecialAnim
+ bl EventObjectForceSetSpecialAnim
movs r0, 0
mov r9, r0
strh r6, [r5, 0x2]
@@ -5414,7 +5414,7 @@ sub_808D38C: @ 808D38C
ble _0808D3E4
_0808D3A8:
adds r0, r5, 0
- bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+ bl EventObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
cmp r0, 0
beq _0808D3E4
@@ -5429,7 +5429,7 @@ _0808D3A8:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl FieldObjectForceSetSpecialAnim
+ bl EventObjectForceSetSpecialAnim
movs r0, 0
strh r0, [r6]
ldrb r0, [r5, 0x18]
diff --git a/asm/field_screen.s b/asm/field_screen.s
index e35c768dd..5d5602b7f 100644
--- a/asm/field_screen.s
+++ b/asm/field_screen.s
@@ -8382,7 +8382,7 @@ _080AF46C:
_080AF480:
movs r0, 0
bl sub_80AF0F4
- bl FreezeMapObjects
+ bl FreezeEventObjects
adds r0, r6, 0
adds r1, r7, 0
bl PlayerGetDestCoords
@@ -8403,17 +8403,17 @@ _080AF4A4:
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
movs r1, 0x8
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
movs r0, 0x2
strh r0, [r5, 0x8]
b _080AF54A
@@ -8434,16 +8434,16 @@ _080AF4DC:
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
movs r0, 0x3
strh r0, [r5, 0x8]
b _080AF54A
@@ -8461,7 +8461,7 @@ _080AF520:
cmp r0, 0x1
beq _080AF54A
_080AF536:
- bl UnfreezeMapObjects
+ bl UnfreezeEventObjects
movs r0, 0x4
strh r0, [r5, 0x8]
b _080AF54A
@@ -8508,7 +8508,7 @@ _080AF580:
_080AF58A:
movs r0, 0
bl sub_80AF0F4
- bl FreezeMapObjects
+ bl FreezeEventObjects
adds r0, r6, 0
adds r1, r7, 0
bl PlayerGetDestCoords
@@ -8524,13 +8524,13 @@ _080AF5A2:
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r0
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -8540,7 +8540,7 @@ _080AF5A2:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
movs r0, 0x2
strh r0, [r5, 0x8]
b _080AF60A
@@ -8550,7 +8550,7 @@ _080AF5EC:
lsls r0, 24
cmp r0, 0
beq _080AF60A
- bl UnfreezeMapObjects
+ bl UnfreezeEventObjects
movs r0, 0x3
strh r0, [r5, 0x8]
b _080AF60A
@@ -8583,7 +8583,7 @@ task_map_chg_seq_0807E2CC: @ 80AF610
b _080AF65A
.pool
_080AF634:
- bl FreezeMapObjects
+ bl FreezeEventObjects
bl ScriptContext2_Enable
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -8593,7 +8593,7 @@ _080AF644:
bl sub_80AF71C
cmp r0, 0
beq _080AF65A
- bl UnfreezeMapObjects
+ bl UnfreezeEventObjects
bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
@@ -8861,7 +8861,7 @@ sub_80AF87C: @ 80AF87C
movs r0, 0x1
bl sub_8085540
bl ScriptContext2_Enable
- bl SaveMapObjects
+ bl SaveEventObjects
bl music_something
bl sub_80AF0B4
movs r0, 0x2D
@@ -9062,7 +9062,7 @@ _080AFA34:
beq _080AFA6C
b _080AFA7C
_080AFA3A:
- bl FreezeMapObjects
+ bl FreezeEventObjects
bl ScriptContext2_Enable
b _080AFA64
_080AFA44:
@@ -9133,7 +9133,7 @@ _080AFAC0:
.4byte _080AFBB8
.4byte _080AFBD4
_080AFAD4:
- bl FreezeMapObjects
+ bl FreezeEventObjects
adds r0, r4, 0
adds r1, r6, 0
bl PlayerGetDestCoords
@@ -9174,20 +9174,20 @@ _080AFB26:
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 r4, =gMapObjects
+ ldr r4, =gEventObjects
adds r0, r4
- bl FieldObjectClearAnimIfSpecialAnimActive
+ bl EventObjectClearAnimIfSpecialAnimActive
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -9196,7 +9196,7 @@ _080AFB26:
lsls r0, 2
adds r0, r4
movs r1, 0x9
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
movs r0, 0x2
strh r0, [r5, 0x8]
b _080AFBE8
@@ -9218,16 +9218,16 @@ _080AFB6C:
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
movs r0, 0
bl sub_80AF0F4
movs r0, 0x3
@@ -9290,7 +9290,7 @@ _080AFC1C:
beq _080AFC46
b _080AFC56
_080AFC22:
- bl FreezeMapObjects
+ bl FreezeEventObjects
bl ScriptContext2_Enable
b _080AFC3E
_080AFC2C:
@@ -9982,7 +9982,7 @@ task0A_mpl_807E31C: @ 80B0160
b _080B01B6
.pool
_080B0184:
- bl FreezeMapObjects
+ bl FreezeEventObjects
bl ScriptContext2_Enable
bl sub_808D194
ldrh r0, [r4, 0x8]
@@ -9996,7 +9996,7 @@ _080B0198:
bl sub_808D1B4
cmp r0, 0x1
beq _080B01B6
- bl UnfreezeMapObjects
+ bl UnfreezeEventObjects
bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
@@ -10033,7 +10033,7 @@ _080B01E4:
beq _080B022A
b _080B023A
_080B01EE:
- bl FreezeMapObjects
+ bl FreezeEventObjects
bl ScriptContext2_Enable
movs r0, 0x2D
bl PlaySE
diff --git a/asm/field_specials.s b/asm/field_specials.s
index 852d5ce7c..6916fc6ea 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -741,8 +741,8 @@ _0813828A:
.pool
thumb_func_end GetLinkPartnerNames
- thumb_func_start SpawnLinkPartnerFieldObject
-SpawnLinkPartnerFieldObject: @ 81382A0
+ thumb_func_start SpawnLinkPartnerEventObject
+SpawnLinkPartnerEventObject: @ 81382A0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -912,7 +912,7 @@ _0813839C:
adds r0, r5, 0
adds r2, r4, 0
mov r3, r12
- bl SpawnSpecialFieldObjectParametrized
+ bl SpawnSpecialEventObjectParametrized
adds r0, r5, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -941,7 +941,7 @@ _08138410:
pop {r0}
bx r0
.pool
- thumb_func_end SpawnLinkPartnerFieldObject
+ thumb_func_end SpawnLinkPartnerEventObject
thumb_func_start sub_813842C
sub_813842C: @ 813842C
@@ -971,12 +971,12 @@ _08138454:
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
adds r0, r3, 0
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x10
beq _081384E6
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
@@ -1008,15 +1008,15 @@ _081384A8:
beq _081384BC
b _081384E6
_081384B2:
- ldr r0, =gFieldObjectPalette33
+ ldr r0, =gEventObjectPalette33
b _081384C6
.pool
_081384BC:
- ldr r0, =gFieldObjectPalette34
+ ldr r0, =gEventObjectPalette34
b _081384C6
.pool
_081384C4:
- ldr r0, =gFieldObjectPalette8
+ ldr r0, =gEventObjectPalette8
_081384C6:
movs r2, 0x80
lsls r2, 1
@@ -1026,7 +1026,7 @@ _081384C6:
b _081384E6
.pool
_081384D8:
- ldr r0, =gFieldObjectPalette17
+ ldr r0, =gEventObjectPalette17
movs r2, 0x80
lsls r2, 1
adds r1, r3, r2
@@ -2537,8 +2537,8 @@ _0813914A:
.pool
thumb_func_end IsGrassTypeInParty
- thumb_func_start SpawnScriptFieldObject
-SpawnScriptFieldObject: @ 8139158
+ thumb_func_start SpawnScriptEventObject
+SpawnScriptEventObject: @ 8139158
push {lr}
sub sp, 0x8
ldr r0, =gSaveBlock1Ptr
@@ -2557,10 +2557,10 @@ SpawnScriptFieldObject: @ 8139158
movs r0, 0x7
movs r1, 0x8
movs r2, 0x7F
- bl SpawnSpecialFieldObjectParametrized
+ bl SpawnSpecialEventObjectParametrized
lsls r0, 24
lsrs r0, 24
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -2575,10 +2575,10 @@ SpawnScriptFieldObject: @ 8139158
pop {r0}
bx r0
.pool
- thumb_func_end SpawnScriptFieldObject
+ thumb_func_end SpawnScriptEventObject
- thumb_func_start RemoveScriptFieldObject
-RemoveScriptFieldObject: @ 81391AC
+ thumb_func_start RemoveScriptEventObject
+RemoveScriptEventObject: @ 81391AC
push {lr}
bl GetPlayerAvatarObjectId
lsls r0, 24
@@ -2589,11 +2589,11 @@ RemoveScriptFieldObject: @ 81391AC
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0x7F
- bl RemoveFieldObjectByLocalIdAndMap
+ bl RemoveEventObjectByLocalIdAndMap
pop {r0}
bx r0
.pool
- thumb_func_end RemoveScriptFieldObject
+ thumb_func_end RemoveScriptEventObject
thumb_func_start GetPokeblockNameByMonNature
GetPokeblockNameByMonNature: @ 81391D0
@@ -6327,7 +6327,7 @@ sub_813B0B4: @ 813B0B4
ldrb r2, [r0, 0x4]
movs r0, 0x1
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
cmp r4, 0
bne _0813B0F0
movs r0, 0xC4
@@ -6377,7 +6377,7 @@ _0813B13A:
adds r0, r5, r0
ldrb r2, [r0]
movs r0, 0x1
- bl Overworld_SetMapObjTemplateCoords
+ bl Overworld_SetEventObjTemplateCoords
add sp, 0x4
pop {r4,r5}
pop {r0}
diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s
index 8f1e198b8..702852445 100644
--- a/asm/fldeff_80F9BCC.s
+++ b/asm/fldeff_80F9BCC.s
@@ -1722,7 +1722,7 @@ _080FA9CA:
sub_80FA9D0: @ 80FA9D0
push {r4,lr}
sub sp, 0x4
- ldr r3, =gMapObjects
+ ldr r3, =gEventObjects
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@@ -2312,15 +2312,15 @@ sub_80FAEF0: @ 80FAEF0
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 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _080FAF1C
adds r0, r4, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _080FAF4E
@@ -2337,7 +2337,7 @@ _080FAF1C:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -2362,10 +2362,10 @@ sub_80FAF64: @ 80FAF64
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
adds r5, r0, r1
adds r0, r5, 0
- bl FieldObjectClearAnimIfSpecialAnimFinished
+ bl EventObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _080FAFC8
@@ -2389,7 +2389,7 @@ sub_80FAF64: @ 80FAF64
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
b _080FAFC8
.pool
_080FAFC4:
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 2cc643547..00c8c8448 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -25584,7 +25584,7 @@ sub_81D4258: @ 81D4258
ldrb r2, [r0, 0x4]
movs r0, 0x1
mov r3, sp
- bl TryGetFieldObjectIdByLocalIdAndMap
+ bl TryGetEventObjectIdByLocalIdAndMap
mov r0, sp
ldrb r0, [r0]
add sp, 0x4
@@ -25606,7 +25606,7 @@ sub_81D427C: @ 81D427C
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
adds r5, r1, r2
ldr r4, =gUnknown_030012F8
ldr r3, =gPlayerAvatar
@@ -25644,7 +25644,7 @@ _081D42CA:
mov r8, r0
cmp r0, 0x3
bls _081D42CA
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -25700,7 +25700,7 @@ _081D4356:
_081D4360:
movs r4, 0
mov r8, r4
- ldr r6, =gMapObjects
+ ldr r6, =gEventObjects
mov r10, r6
_081D4368:
ldr r3, =gPlayerAvatar
@@ -25718,7 +25718,7 @@ _081D4368:
ldrsh r2, [r4, r6]
movs r6, 0
ldrsh r0, [r0, r6]
- ldr r6, =gMapObjects
+ ldr r6, =gEventObjects
mov r9, r6
mov r12, r3
adds r7, r1, 0
@@ -25866,7 +25866,7 @@ _081D449E:
ldrsh r1, [r4, r3]
movs r3, 0
ldrsh r0, [r0, r3]
- ldr r3, =gMapObjects
+ ldr r3, =gEventObjects
mov r9, r3
mov r12, r2
cmp r1, r0
@@ -26124,7 +26124,7 @@ _081D46D0:
ldrsh r0, [r0, r3]
cmp r0, 0
bne _081D476E
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26149,7 +26149,7 @@ _081D46D0:
beq _081D470C
b _081D447C
_081D470C:
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26203,7 +26203,7 @@ _081D476E:
ldrsh r0, [r0, r2]
cmp r0, 0
bne _081D480C
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26228,7 +26228,7 @@ _081D476E:
beq _081D47AA
b _081D45AA
_081D47AA:
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26299,7 +26299,7 @@ sub_81D4834: @ 81D4834
lsls r0, 16
lsls r1, 16
lsrs r4, r1, 16
- ldr r3, =gMapObjects
+ ldr r3, =gEventObjects
ldr r1, =gPlayerAvatar
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
@@ -26350,7 +26350,7 @@ sub_81D4890: @ 81D4890
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r4, r1, r0
movs r1, 0
ldr r3, =gUnknown_030012FC
@@ -26503,9 +26503,9 @@ _081D49E0:
bx r0
thumb_func_end sub_81D4998
- thumb_func_start FieldObjectIsFarawayIslandMew
-@ bool8 FieldObjectIsFarawayIslandMew(struct npc_state *fieldObject)
-FieldObjectIsFarawayIslandMew: @ 81D49E8
+ thumb_func_start EventObjectIsFarawayIslandMew
+@ bool8 EventObjectIsFarawayIslandMew(struct npc_state *eventObject)
+EventObjectIsFarawayIslandMew: @ 81D49E8
push {lr}
adds r2, r0, 0
ldr r0, =gSaveBlock1Ptr
@@ -26525,7 +26525,7 @@ _081D4A0C:
_081D4A0E:
pop {r1}
bx r1
- thumb_func_end FieldObjectIsFarawayIslandMew
+ thumb_func_end EventObjectIsFarawayIslandMew
thumb_func_start unown_chamber_related
unown_chamber_related: @ 81D4A14
@@ -26598,7 +26598,7 @@ sub_81D4A90: @ 81D4A90
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
- ldr r0, =gMapObjects
+ ldr r0, =gEventObjects
adds r5, r1, r0
ldrb r1, [r5, 0x1]
movs r0, 0x21
@@ -29331,7 +29331,7 @@ sub_81D6180: @ 81D6180
thumb_func_end sub_81D6180
thumb_func_start GetTrainerHillTrainerFlag
-@ u8 GetTrainerHillTrainerFlag(u8 fieldObjectId)
+@ u8 GetTrainerHillTrainerFlag(u8 eventObjectId)
GetTrainerHillTrainerFlag: @ 81D619C
push {r4,lr}
adds r4, r0, 0
@@ -29340,7 +29340,7 @@ GetTrainerHillTrainerFlag: @ 81D619C
bl sub_81D5520
lsls r0, 24
lsrs r0, 23
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
lsls r1, r4, 3
adds r1, r4
lsls r1, 2
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s
index b7f03739a..14e418f1c 100644
--- a/asm/rom_8011DC0.s
+++ b/asm/rom_8011DC0.s
@@ -10551,7 +10551,7 @@ _080181BC:
sub_80181CC: @ 80181CC
push {lr}
bl ScriptContext2_Enable
- bl ScriptFreezeMapObjects
+ bl ScriptFreezeEventObjects
pop {r0}
bx r0
thumb_func_end sub_80181CC
@@ -13578,7 +13578,7 @@ sub_8019AB8: @ 8019AB8
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl RemoveFieldObjectByLocalIdAndMap
+ bl RemoveEventObjectByLocalIdAndMap
pop {r0}
bx r0
.pool
@@ -13597,7 +13597,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
@@ -13606,16 +13606,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 EventObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
bne _08019B30
ldrb r1, [r5]
adds r0, r4, 0
- bl FieldObjectSetSpecialAnim
+ bl EventObjectSetSpecialAnim
lsls r0, 24
cmp r0, 0
bne _08019B30
@@ -13643,7 +13643,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
@@ -13652,10 +13652,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 EventObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
bne _08019B84
@@ -13672,7 +13672,7 @@ _08019B84:
b _08019B9C
_08019B96:
adds r0, r4, 0
- bl FreezeMapObject
+ bl FreezeEventObject
_08019B9C:
movs r0, 0x1
_08019B9E:
diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s
index b241e3778..18a0cec88 100644
--- a/asm/script_pokemon_util_80F87D8.s
+++ b/asm/script_pokemon_util_80F87D8.s
@@ -505,10 +505,10 @@ _080F8BBA:
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl GetFieldObjectIdByLocalIdAndMap
+ bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
- ldr r2, =gMapObjects
+ ldr r2, =gEventObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -534,12 +534,12 @@ _080F8BBA:
cmp r0, 0
bne _080F8C2C
lsrs r1, r4, 16
- ldr r0, =gFieldObjectPalette33
+ ldr r0, =gEventObjectPalette33
b _080F8C42
.pool
_080F8C2C:
lsrs r1, r4, 16
- ldr r0, =gFieldObjectPalette34
+ ldr r0, =gEventObjectPalette34
b _080F8C42
.pool
_080F8C38:
@@ -547,7 +547,7 @@ _080F8C38:
cmp r0, 0
bne _080F8C50
lsrs r1, r4, 16
- ldr r0, =gFieldObjectPalette8
+ ldr r0, =gEventObjectPalette8
_080F8C42:
movs r2, 0x20
bl LoadPalette
@@ -555,7 +555,7 @@ _080F8C42:
.pool
_080F8C50:
lsrs r1, r4, 16
- ldr r0, =gFieldObjectPalette17
+ ldr r0, =gEventObjectPalette17
movs r2, 0x20
bl LoadPalette
_080F8C5A:
diff --git a/asm/shop.s b/asm/shop.s
index a09d05323..b498da70d 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -1277,8 +1277,8 @@ BuyMenuDrawGraphics: @ 80E0524
@ void BuyMenuDrawMapGraphics()
BuyMenuDrawMapGraphics: @ 80E0570
push {lr}
- bl BuyMenuCollectFieldObjectData
- bl BuyMenuDrawFieldObjects
+ bl BuyMenuCollectEventObjectData
+ bl BuyMenuDrawEventObjects
bl BuyMenuDrawMapBg
pop {r0}
bx r0
@@ -1525,9 +1525,9 @@ BuyMenuDrawMapMetatileLayer: @ 80E0734
bx lr
thumb_func_end BuyMenuDrawMapMetatileLayer
- thumb_func_start BuyMenuCollectFieldObjectData
-@ void BuyMenuCollectFieldObjectData()
-BuyMenuCollectFieldObjectData: @ 80E075C
+ thumb_func_start BuyMenuCollectEventObjectData
+@ void BuyMenuCollectEventObjectData()
+BuyMenuCollectEventObjectData: @ 80E075C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1584,7 +1584,7 @@ _080E07AA:
lsls r1, 16
asrs r1, 16
str r3, [sp, 0x10]
- bl GetFieldObjectIdByXY
+ bl GetEventObjectIdByXY
lsls r0, 24
lsrs r6, r0, 24
ldr r3, [sp, 0x10]
@@ -1633,7 +1633,7 @@ _080E07AA:
lsrs r0, 24
mov r1, r12
strh r0, [r1]
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
lsls r0, r6, 3
adds r0, r6
lsls r0, 2
@@ -1716,11 +1716,11 @@ _080E08DA:
pop {r0}
bx r0
.pool
- thumb_func_end BuyMenuCollectFieldObjectData
+ thumb_func_end BuyMenuCollectEventObjectData
- thumb_func_start BuyMenuDrawFieldObjects
-@ void BuyMenuDrawFieldObjects()
-BuyMenuDrawFieldObjects: @ 80E08F0
+ thumb_func_start BuyMenuDrawEventObjects
+@ void BuyMenuDrawEventObjects()
+BuyMenuDrawEventObjects: @ 80E08F0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1730,7 +1730,7 @@ BuyMenuDrawFieldObjects: @ 80E08F0
movs r7, 0
ldr r0, =gUnknown_02039F70
mov r8, r0
- ldr r1, =gMapObjects
+ ldr r1, =gEventObjects
mov r10, r1
ldr r2, =gSprites
mov r9, r2
@@ -1753,7 +1753,7 @@ _080E090A:
lsls r0, 2
add r0, r10
ldrb r0, [r0, 0x5]
- bl GetFieldObjectGraphicsInfo
+ bl GetEventObjectGraphicsInfo
mov r4, r8
ldr r3, [r4]
ldr r2, =0x00002010
@@ -1792,7 +1792,7 @@ _080E090A:
str r0, [sp]
adds r0, r4, 0
ldr r1, =SpriteCallbackDummy
- bl AddPseudoFieldObject
+ bl AddPseudoEventObject
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
@@ -1801,7 +1801,7 @@ _080E090A:
mov r3, r8
ldr r0, [r3]
adds r0, r1
- bl BuyMenuCheckIfFieldObjectOverlapsMenuBg
+ bl BuyMenuCheckIfEventObjectOverlapsMenuBg
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1850,10 +1850,10 @@ _080E09D8:
pop {r0}
bx r0
.pool
- thumb_func_end BuyMenuDrawFieldObjects
+ thumb_func_end BuyMenuDrawEventObjects
- thumb_func_start BuyMenuCheckIfFieldObjectOverlapsMenuBg
-BuyMenuCheckIfFieldObjectOverlapsMenuBg: @ 80E0A14
+ thumb_func_start BuyMenuCheckIfEventObjectOverlapsMenuBg
+BuyMenuCheckIfEventObjectOverlapsMenuBg: @ 80E0A14
push {r4,lr}
adds r4, r0, 0
movs r1, 0x2
@@ -1877,7 +1877,7 @@ _080E0A3A:
pop {r4}
pop {r1}
bx r1
- thumb_func_end BuyMenuCheckIfFieldObjectOverlapsMenuBg
+ thumb_func_end BuyMenuCheckIfEventObjectOverlapsMenuBg
thumb_func_start BuyMenuCopyMenuBgToBg1TilemapBuffer
@ void BuyMenuCopyMenuBgToBg1TilemapBuffer()
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 11:58:45 +0000