decompile field_player_avatar.s

asm/field_player_avatar.s

@@ -5,86 +5,6 @@
 
 	.text
 
-	thumb_func_start MovementType_Player
-@ void MovementType_Player(struct obj *object)
-MovementType_Player: @ 808A998
-	push {lr}
-	adds r1, r0, 0
-	movs r0, 0x2E
-	ldrsh r2, [r1, r0]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	ldr r2, =gEventObjects
-	adds r0, r2
-	ldr r2, =EventObjectCB2_NoMovement2
-	bl UpdateEventObjectCurrentMovement
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end MovementType_Player
-
-	thumb_func_start EventObjectCB2_NoMovement2
-EventObjectCB2_NoMovement2: @ 808A9BC
-	movs r0, 0
-	bx lr
-	thumb_func_end EventObjectCB2_NoMovement2
-
-	thumb_func_start player_step
-@ void player_step(int dpad_direction, int buttons_new, int buttons_held)
-player_step: @ 808A9C0
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	lsls r1, 16
-	lsrs r7, r1, 16
-	lsls r2, 16
-	lsrs r6, r2, 16
-	ldr r4, =gPlayerAvatar
-	ldrb r1, [r4, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gEventObjects
-	adds r5, r0, r1
-	adds r0, r5, 0
-	bl sub_808C280
-	ldrb r0, [r4, 0x6]
-	cmp r0, 0
-	bne _0808AA26
-	adds r0, r7, 0
-	adds r1, r6, 0
-	bl Bike_TryAcroBikeHistoryUpdate
-	adds r0, r5, 0
-	mov r1, r8
-	bl TryInterruptEventObjectSpecialAnim
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808AA26
-	adds r0, r5, 0
-	bl npc_clear_strange_bits
-	bl DoPlayerAvatarTransition
-	bl TryDoMetatileBehaviorForcedMovement
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808AA26
-	mov r0, r8
-	adds r1, r7, 0
-	adds r2, r6, 0
-	bl MovePlayerAvatarUsingKeypadInput
-	bl PlayerAllowForcedMovementIfMovingSameDirection
-_0808AA26:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end player_step
-
 	thumb_func_start TryInterruptEventObjectSpecialAnim
 @ bool8 TryInterruptEventObjectSpecialAnim(struct npc_state *eventObject, u8 direction)
 TryInterruptEventObjectSpecialAnim: @ 808AA38