summaryrefslogtreecommitdiff
path: root/asm/field_control_avatar.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/field_control_avatar.s')
-rw-r--r--asm/field_control_avatar.s100
1 files changed, 50 insertions, 50 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 29164ed7b..c2b13e2bf 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_809BEDC
-sub_809BEDC: @ 809BEDC
+ thumb_func_start FieldClearPlayerInput
+FieldClearPlayerInput: @ 809BEDC
push {r4,r5,lr}
movs r1, 0x2
negs r1, r1
@@ -29,11 +29,11 @@ sub_809BEDC: @ 809BEDC
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_809BEDC
+ thumb_func_end FieldClearPlayerInput
- thumb_func_start process_overworld_input
-@ void process_overworld_input(overworld_input_data *input_data, char buttons_new, char buttons_held)
-process_overworld_input: @ 809BF08
+ thumb_func_start FieldGetPlayerInput
+@ void FieldGetPlayerInput(overworld_input_data *input_data, char buttons_new, char buttons_held)
+FieldGetPlayerInput: @ 809BF08
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -62,7 +62,7 @@ _0809BF3C:
cmp r6, 0
bne _0809BFA2
_0809BF40:
- bl sub_811A138
+ bl GetPlayerSpeed
lsls r0, 16
asrs r0, 16
cmp r0, 0x4
@@ -176,7 +176,7 @@ _0809C006:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end process_overworld_input
+ thumb_func_end FieldGetPlayerInput
thumb_func_start sub_809C014
@ int sub_809C014(overworld_input_data *input_data)
@@ -187,9 +187,9 @@ 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
+ bl GetPlayerFacingDirection
lsls r0, 24
lsrs r6, r0, 24
mov r4, sp
@@ -326,7 +326,7 @@ _0809C13A:
beq _0809C15C
movs r0, 0x6
bl PlaySE
- bl sub_809FA9C
+ bl ShowStartMenu
_0809C14E:
movs r0, 0x1
b _0809C172
@@ -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,13 +715,13 @@ 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]
cmp r2, 0
bne _0809C490
- ldr r0, =EventScript_2C8436
+ ldr r0, =EventScript_TestSignpostMsg
b _0809C532
.pool
_0809C490:
@@ -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
@@ -1365,7 +1365,7 @@ per_step_scripts: @ 809C9F4
bne _0809CA04
b _0809CB24
_0809CA04:
- bl sub_80B215C
+ bl IncrementRematchStepCounter
bl AdjustFriendship_step
bl sub_81D4998
ldr r0, =gPlayerAvatar
@@ -1531,8 +1531,8 @@ _0809CB72:
.pool
thumb_func_end AdjustFriendship_step
- thumb_func_start overworld_poison_timer_set
-overworld_poison_timer_set: @ 809CB80
+ thumb_func_start ResetPoisonStepCounter
+ResetPoisonStepCounter: @ 809CB80
push {lr}
ldr r0, =0x0000402b
movs r1, 0
@@ -1540,7 +1540,7 @@ overworld_poison_timer_set: @ 809CB80
pop {r0}
bx r0
.pool
- thumb_func_end overworld_poison_timer_set
+ thumb_func_end ResetPoisonStepCounter
thumb_func_start overworld_poison_step
overworld_poison_step: @ 809CB94
@@ -2006,7 +2006,7 @@ _0809CF20:
bl sub_8084D5C
ldrb r0, [r5, 0x7]
ldrb r1, [r5, 0x6]
- bl get_mapheader_by_bank_and_number
+ bl Overworld_GetMapHeaderByGroupAndId
ldr r1, [r0, 0x4]
ldrb r0, [r5, 0x5]
ldr r1, [r1, 0x8]
@@ -2155,7 +2155,7 @@ trigger_activate: @ 809D04C
cmp r1, 0
bne _0809D062
ldrb r0, [r4, 0x6]
- bl trigger_activate_weather
+ bl DoCoordEventWeather
b _0809D082
_0809D062:
ldrh r0, [r4, 0x6]
@@ -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,12 +2447,12 @@ _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
+ bl GetPlayerMovementDirection
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -2470,18 +2470,18 @@ 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
push {r4,lr}
sub sp, 0x8
- bl player_get_direction_upper_nybble
+ bl GetPlayerMovementDirection
mov r4, sp
mov r0, sp
bl player_get_pos_to_and_height
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 08:36:12 +0000