summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/event_object_80688E4.s6
-rw-r--r--asm/event_object_movement.s14
-rw-r--r--asm/field_effect.s40
-rw-r--r--asm/field_player_avatar.s14
-rw-r--r--asm/item_menu.s2
-rw-r--r--asm/naming_screen.s2
-rw-r--r--asm/overworld.s2
-rw-r--r--asm/shop.s2
8 files changed, 41 insertions, 41 deletions
diff --git a/asm/event_object_80688E4.s b/asm/event_object_80688E4.s
index 910e528ab..1482529fe 100644
--- a/asm/event_object_80688E4.s
+++ b/asm/event_object_80688E4.s
@@ -82,8 +82,8 @@ _0806896E:
bx r1
thumb_func_end FreezeObjectEvent
- thumb_func_start FreezeEventObjects
-FreezeEventObjects: @ 8068974
+ thumb_func_start FreezeObjectEvents
+FreezeObjectEvents: @ 8068974
push {r4,r5,lr}
movs r4, 0
ldr r5, _080689A8 @ =gObjectEvents
@@ -114,7 +114,7 @@ _08068998:
.align 2, 0
_080689A8: .4byte gObjectEvents
_080689AC: .4byte gPlayerAvatar
- thumb_func_end FreezeEventObjects
+ thumb_func_end FreezeObjectEvents
thumb_func_start FreezeObjectEventsExceptOne
FreezeObjectEventsExceptOne: @ 80689B0
diff --git a/asm/event_object_movement.s b/asm/event_object_movement.s
index 25c35b1a0..66207007c 100644
--- a/asm/event_object_movement.s
+++ b/asm/event_object_movement.s
@@ -1550,8 +1550,8 @@ MakeObjectTemplateFromObjectEventTemplate: @ 805E960
bx r0
thumb_func_end MakeObjectTemplateFromObjectEventTemplate
- thumb_func_start AddPseudoEventObject
-AddPseudoEventObject: @ 805E978
+ thumb_func_start AddPseudoObjectEvent
+AddPseudoObjectEvent: @ 805E978
push {r4-r6,lr}
sub sp, 0x1C
ldr r4, [sp, 0x2C]
@@ -1612,7 +1612,7 @@ _0805E9E4:
.align 2, 0
_0805E9F0: .4byte 0x0000ffff
_0805E9F4: .4byte gSprites
- thumb_func_end AddPseudoEventObject
+ thumb_func_end AddPseudoObjectEvent
thumb_func_start sprite_new
sprite_new: @ 805E9F8
@@ -2440,8 +2440,8 @@ _0805F058: .4byte gPlayerAvatar
_0805F05C: .4byte gObjectEvents
thumb_func_end SetPlayerAvatarObjectEventIdAndObjectId
- thumb_func_start EventObjectSetGraphicsId
-EventObjectSetGraphicsId: @ 805F060
+ thumb_func_start ObjectEventSetGraphicsId
+ObjectEventSetGraphicsId: @ 805F060
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2625,7 +2625,7 @@ _0805F1BA:
_0805F1CC: .4byte gSprites
_0805F1D0: .4byte 0x000003ff
_0805F1D4: .4byte 0xfffffc00
- thumb_func_end EventObjectSetGraphicsId
+ thumb_func_end ObjectEventSetGraphicsId
thumb_func_start ObjectEventSetGraphicsIdByLocalIdAndMap
ObjectEventSetGraphicsIdByLocalIdAndMap: @ 805F1D8
@@ -2652,7 +2652,7 @@ ObjectEventSetGraphicsIdByLocalIdAndMap: @ 805F1D8
ldr r1, _0805F214 @ =gObjectEvents
adds r0, r1
adds r1, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
_0805F20C:
add sp, 0x4
pop {r4}
diff --git a/asm/field_effect.s b/asm/field_effect.s
index 757f612b8..bc2a2fceb 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -1989,7 +1989,7 @@ mapldr_080842E8: @ 80842E8
movs r1, 0
bl CreateTask
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _0808430C @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -2092,7 +2092,7 @@ mapldr_08084390: @ 8084390
bl ObjectEventTurn
_080843D2:
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _080843F4 @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -2158,7 +2158,7 @@ sub_8084454: @ 8084454
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r0, _0808447C @ =sub_8084484
movs r1, 0
bl CreateTask
@@ -2626,7 +2626,7 @@ _080847F4: .4byte gUnknown_83CC050
sub_80847F8: @ 80847F8
push {r4,lr}
adds r4, r0, 0
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
ldrb r0, [r4, 0xA]
bl sub_809C448
@@ -2889,7 +2889,7 @@ sub_80849F4: @ 80849F4
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r0, _08084A1C @ =sub_8084A24
movs r1, 0
bl CreateTask
@@ -3630,7 +3630,7 @@ sub_8084FA0: @ 8084FA0
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
movs r0, 0
bl SetCameraPanningCallback
@@ -3977,7 +3977,7 @@ sub_8085244: @ 8085244
adds r5, r0, 0
adds r4, r1, 0
bl CameraObjectReset2
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08085270 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -4239,7 +4239,7 @@ sub_8085440: @ 8085440
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
ldr r1, _0808546C @ =gPlayerAvatar
movs r0, 0x1
@@ -4482,7 +4482,7 @@ _0808561C:
sub_8085620: @ 8085620
push {lr}
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r0, _08085638 @ =sub_808563C
movs r1, 0x50
bl CreateTask
@@ -4969,7 +4969,7 @@ sub_80859D4: @ 80859D4
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08085A14 @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -5198,7 +5198,7 @@ sub_8085BA8: @ 8085BA8
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl CameraObjectReset2
bl GetPlayerFacingDirection
lsls r0, 24
@@ -5435,7 +5435,7 @@ mapldr_08085D88: @ 8085D88
bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08085DCC @ =gFieldCallback
movs r0, 0
str r0, [r1]
@@ -7000,7 +7000,7 @@ sub_80869C0: @ 80869C0
push {r6}
adds r4, r0, 0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r5, _08086A18 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r5, 0x6]
@@ -7135,7 +7135,7 @@ sub_8086AB4: @ 8086AB4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
adds r0, r4, 0
bl ObjectEventClearHeldMovementIfFinished
ldrb r0, [r4, 0x18]
@@ -7276,7 +7276,7 @@ sub_8086C00: @ 8086C00
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r1, _08086C20 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -7366,7 +7366,7 @@ _08086CAE:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
b _08086CD2
_08086CC0:
movs r0, 0
@@ -7375,7 +7375,7 @@ _08086CC0:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
_08086CD2:
ldrb r0, [r4, 0x18]
lsls r0, 28
@@ -7809,7 +7809,7 @@ sub_8086FFC: @ 8086FFC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -8468,7 +8468,7 @@ _0808751A:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
bl CameraObjectReset2
adds r0, r5, 0
movs r1, 0x3
@@ -8795,7 +8795,7 @@ _080877B4:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
adds r0, r4, 0
movs r1, 0x1
bl ObjectEventTurn
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index faab73bf6..e4b28d6c6 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -3257,7 +3257,7 @@ sub_805CB70: @ 805CB70
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3318,7 +3318,7 @@ sub_805CBE8: @ 805CBE8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -3964,7 +3964,7 @@ sub_805D0F8: @ 805D0F8
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl sav1_reset_battle_music_maybe
bl Overworld_ChangeMusicToDefault
ldr r2, _0805D148 @ =gPlayerAvatar
@@ -4005,7 +4005,7 @@ sub_805D154: @ 805D154
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
ldr r2, _0805D19C @ =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0xF7
@@ -4134,7 +4134,7 @@ sub_805D240: @ 805D240
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -4734,7 +4734,7 @@ _0805D6EA:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
@@ -4978,7 +4978,7 @@ sub_805D8D8: @ 805D8D8
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl EventObjectSetGraphicsId
+ bl ObjectEventSetGraphicsId
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 06ac697bc..704d8d5d8 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -5845,7 +5845,7 @@ _0810AD1E:
cmp r6, 0x1
bne _0810AD90
bl ScriptContext2_Enable
- bl FreezeEventObjects
+ bl FreezeObjectEvents
bl sub_805C270
bl sub_805C780
ldr r2, _0810AD88 @ =gSpecialVar_ItemId
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index 49ab9164f..527c715d7 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -2789,7 +2789,7 @@ sub_809EF54: @ 809EF54
str r2, [sp]
movs r2, 0x38
movs r3, 0x25
- bl AddPseudoEventObject
+ bl AddPseudoObjectEvent
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
diff --git a/asm/overworld.s b/asm/overworld.s
index d2ae0b792..21fce8cac 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -7888,7 +7888,7 @@ _080588C6:
movs r2, 0
str r2, [sp]
movs r3, 0
- bl AddPseudoEventObject
+ bl AddPseudoObjectEvent
strb r0, [r4, 0x4]
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
diff --git a/asm/shop.s b/asm/shop.s
index 7ed68952c..5d1b723af 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -2017,7 +2017,7 @@ _0809BA56:
str r0, [sp]
adds r0, r4, 0
ldr r1, _0809BAF4 @ =SpriteCallbackDummy
- bl AddPseudoEventObject
+ bl AddPseudoObjectEvent
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 16:18:43 +0000