Finish decompiling field_map_obj.s

4 files changed, 119 insertions, 507 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
deleted file mode 100644
index a16c355e5..000000000
--- a/asm/field_map_obj.s
+++ /dev/null
@@ -1,495 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_805F4F0
-sub_805F4F0: @ 805F4F0
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r7, r1, 0
-	mov r8, r3
-	lsls r2, 24
-	lsrs r6, r2, 24
-	ldr r1, _0805F5A4 @ =gUnknown_0836DC09
-	ldrb r0, [r4, 0x6]
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r1, r4, 0
-	adds r1, 0x21
-	ldrb r1, [r1]
-	adds r2, r6, 0
-	bl state_to_direction
-	adds r6, r0, 0
-	mov r5, sp
-	adds r5, 0x2
-	adds r0, r4, 0
-	adds r1, r6, 0
-	mov r2, sp
-	adds r3, r5, 0
-	bl FieldObjectMoveDestCoords
-	adds r0, r6, 0
-	bl sub_8060744
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl FieldObjectSetRegularAnim
-	mov r0, sp
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r0, 0
-	ldrsh r2, [r5, r0]
-	adds r0, r4, 0
-	adds r3, r6, 0
-	bl npc_block_way
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805F576
-	mov r1, r8
-	cmp r1, 0
-	beq _0805F58A
-	mov r0, sp
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl _call_via_r8
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805F58A
-_0805F576:
-	adds r0, r6, 0
-	bl GetFaceDirectionAnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl FieldObjectSetRegularAnim
-_0805F58A:
-	ldrb r0, [r4]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4]
-	movs r0, 0x2
-	strh r0, [r7, 0x30]
-	movs r0, 0x1
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805F5A4: .4byte gUnknown_0836DC09
-	thumb_func_end sub_805F4F0
-
-	thumb_func_start sub_805F5A8
-sub_805F5A8: @ 805F5A8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r7, r1, 0
-	mov r8, r3
-	lsls r2, 24
-	lsrs r6, r2, 24
-	ldr r1, _0805F65C @ =gUnknown_0836DC09
-	ldrb r0, [r4, 0x6]
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r1, r4, 0
-	adds r1, 0x21
-	ldrb r1, [r1]
-	adds r2, r6, 0
-	bl state_to_direction
-	adds r6, r0, 0
-	mov r5, sp
-	adds r5, 0x2
-	adds r0, r4, 0
-	adds r1, r6, 0
-	mov r2, sp
-	adds r3, r5, 0
-	bl FieldObjectMoveDestCoords
-	adds r0, r6, 0
-	bl sub_806079C
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl FieldObjectSetRegularAnim
-	mov r0, sp
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r0, 0
-	ldrsh r2, [r5, r0]
-	adds r0, r4, 0
-	adds r3, r6, 0
-	bl npc_block_way
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805F62E
-	mov r1, r8
-	cmp r1, 0
-	beq _0805F642
-	mov r0, sp
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl _call_via_r8
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805F642
-_0805F62E:
-	adds r0, r6, 0
-	bl GetFaceDirectionAnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl FieldObjectSetRegularAnim
-_0805F642:
-	ldrb r0, [r4]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4]
-	movs r0, 0x2
-	strh r0, [r7, 0x30]
-	movs r0, 0x1
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805F65C: .4byte gUnknown_0836DC09
-	thumb_func_end sub_805F5A8
-
-	thumb_func_start sub_805F660
-sub_805F660: @ 805F660
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r7, r1, 0
-	mov r8, r3
-	lsls r2, 24
-	lsrs r6, r2, 24
-	ldr r1, _0805F714 @ =gUnknown_0836DC09
-	ldrb r0, [r4, 0x6]
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r1, r4, 0
-	adds r1, 0x21
-	ldrb r1, [r1]
-	adds r2, r6, 0
-	bl state_to_direction
-	adds r6, r0, 0
-	mov r5, sp
-	adds r5, 0x2
-	adds r0, r4, 0
-	adds r1, r6, 0
-	mov r2, sp
-	adds r3, r5, 0
-	bl FieldObjectMoveDestCoords
-	adds r0, r6, 0
-	bl sub_80607C8
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl FieldObjectSetRegularAnim
-	mov r0, sp
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r0, 0
-	ldrsh r2, [r5, r0]
-	adds r0, r4, 0
-	adds r3, r6, 0
-	bl npc_block_way
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805F6E6
-	mov r1, r8
-	cmp r1, 0
-	beq _0805F6FA
-	mov r0, sp
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl _call_via_r8
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805F6FA
-_0805F6E6:
-	adds r0, r6, 0
-	bl GetFaceDirectionAnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl FieldObjectSetRegularAnim
-_0805F6FA:
-	ldrb r0, [r4]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4]
-	movs r0, 0x2
-	strh r0, [r7, 0x30]
-	movs r0, 0x1
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805F714: .4byte gUnknown_0836DC09
-	thumb_func_end sub_805F660
-
-	thumb_func_start cph_IM_DIFFERENT
-cph_IM_DIFFERENT: @ 805F718
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r1, _0805F75C @ =gUnknown_0836DC09
-	ldrb r0, [r4, 0x6]
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r1, r4, 0
-	adds r1, 0x21
-	ldrb r1, [r1]
-	bl state_to_direction
-	bl sub_806084C
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	ldrb r0, [r4]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4]
-	movs r0, 0x2
-	strh r0, [r5, 0x30]
-	movs r0, 0x1
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805F75C: .4byte gUnknown_0836DC09
-	thumb_func_end cph_IM_DIFFERENT
-
-	thumb_func_start sub_805F760
-sub_805F760: @ 805F760
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r7, r1, 0
-	mov r8, r3
-	lsls r2, 24
-	lsrs r6, r2, 24
-	ldr r1, _0805F814 @ =gUnknown_0836DC09
-	ldrb r0, [r4, 0x6]
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r1, r4, 0
-	adds r1, 0x21
-	ldrb r1, [r1]
-	adds r2, r6, 0
-	bl state_to_direction
-	adds r6, r0, 0
-	mov r5, sp
-	adds r5, 0x2
-	adds r0, r4, 0
-	adds r1, r6, 0
-	mov r2, sp
-	adds r3, r5, 0
-	bl FieldObjectMoveDestCoords
-	adds r0, r6, 0
-	bl sub_80608A4
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl FieldObjectSetRegularAnim
-	mov r0, sp
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r0, 0
-	ldrsh r2, [r5, r0]
-	adds r0, r4, 0
-	adds r3, r6, 0
-	bl npc_block_way
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805F7E6
-	mov r1, r8
-	cmp r1, 0
-	beq _0805F7FA
-	mov r0, sp
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl _call_via_r8
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805F7FA
-_0805F7E6:
-	adds r0, r6, 0
-	bl GetFaceDirectionAnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl FieldObjectSetRegularAnim
-_0805F7FA:
-	ldrb r0, [r4]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4]
-	movs r0, 0x2
-	strh r0, [r7, 0x30]
-	movs r0, 0x1
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805F814: .4byte gUnknown_0836DC09
-	thumb_func_end sub_805F760
-
-	thumb_func_start oac_hopping
-oac_hopping: @ 805F818
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r7, r1, 0
-	mov r8, r3
-	lsls r2, 24
-	lsrs r6, r2, 24
-	ldr r1, _0805F8DC @ =gUnknown_0836DC09
-	ldrb r0, [r4, 0x6]
-	adds r0, r1
-	ldrb r0, [r0]
-	adds r1, r4, 0
-	adds r1, 0x21
-	ldrb r1, [r1]
-	adds r2, r6, 0
-	bl state_to_direction
-	adds r6, r0, 0
-	ldrh r1, [r4, 0x10]
-	add r0, sp, 0x4
-	strh r1, [r0]
-	ldrh r0, [r4, 0x12]
-	mov r5, sp
-	adds r5, 0x6
-	strh r0, [r5]
-	movs r0, 0x2
-	str r0, [sp]
-	adds r0, r6, 0
-	add r1, sp, 0x4
-	adds r2, r5, 0
-	movs r3, 0x2
-	bl sub_8060320
-	adds r0, r6, 0
-	bl GetJumpLedgeAnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl FieldObjectSetRegularAnim
-	add r0, sp, 0x4
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r0, 0
-	ldrsh r2, [r5, r0]
-	adds r0, r4, 0
-	adds r3, r6, 0
-	bl npc_block_way
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805F8AC
-	mov r1, r8
-	cmp r1, 0
-	beq _0805F8C0
-	add r0, sp, 0x4
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl _call_via_r8
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805F8C0
-_0805F8AC:
-	adds r0, r6, 0
-	bl GetFaceDirectionAnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl FieldObjectSetRegularAnim
-_0805F8C0:
-	ldrb r0, [r4]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4]
-	movs r0, 0x2
-	strh r0, [r7, 0x30]
-	movs r0, 0x1
-	add sp, 0x8
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805F8DC: .4byte gUnknown_0836DC09
-	thumb_func_end oac_hopping
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 170b746a6..d5a6b8b5a 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -400,10 +400,12 @@ u8 GetGoSpeed0AnimId(u32);
 u8 sub_8060744(u32);
 u8 d2s_08064034(u32);
 u8 sub_806079C(u32);
+u8 sub_80607C8(u32);
 u8 sub_80607F4(u32);
 u8 GetJumpLedgeAnimId(u32);
 u8 sub_806084C(u32);
 u8 sub_8060878(u32);
+u8 sub_80608A4(u32);
 u8 sub_80608D0(u32);
 u8 GetStepInPlaceDelay32AnimId(u32);
 u8 GetStepInPlaceDelay16AnimId(u32);
@@ -425,5 +427,6 @@ void sub_80634D0(struct MapObject *, struct Sprite *);
 u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
 void CameraObjectSetFollowedObjectId(u8);
 u8 sub_805ADDC(u8);
+void sub_8060320(u32, s16 *, s16 *, s16, s16);
 
 #endif // GUARD_FIELD_MAP_OBJ_H
diff --git a/ld_script.txt b/ld_script.txt
index 7648f98c7..69f30ab0a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -92,8 +92,6 @@ SECTIONS {
         src/field_door.o(.text);
         src/field_player_avatar.o(.text);
         src/field_map_obj.o(.text);
-        asm/field_map_obj.o(.text);
-        src/field_map_obj.o(.text_fmocb2_c);
         src/field_ground_effect.o(.text);
         src/field_map_obj_helpers.o(.text);
         src/field_message_box.o(.text);
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index f3e1d76e9..cf4c519eb 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -5030,8 +5030,6 @@ u8 sub_805F3C4(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-//#ifdef NONMATCHING
-
 bool8 sub_805F3EC(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, bool8 a3(u8))
 {
     return 0;
@@ -5063,9 +5061,115 @@ bool8 sub_805F438(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, boo
     sprite->data1 = 2;
     return 1;
 }
-//#endif
 
-asm(".section .text_fmocb2_c\n");
+bool8 sub_805F4F0(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+{
+    u32 direction;
+    s16 x;
+    s16 y;
+
+    direction = playerDirection;
+    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
+    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
+    FieldObjectSetRegularAnim(mapObject, sprite, sub_8060744(direction));
+    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
+    {
+        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+    }
+    mapObject->mapobj_bit_1 = TRUE;
+    sprite->data1 = 2;
+    return TRUE;
+}
+
+bool8 sub_805F5A8(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+{
+    u32 direction;
+    s16 x;
+    s16 y;
+
+    direction = playerDirection;
+    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
+    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
+    FieldObjectSetRegularAnim(mapObject, sprite, sub_806079C(direction));
+    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
+    {
+        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+    }
+    mapObject->mapobj_bit_1 = TRUE;
+    sprite->data1 = 2;
+    return TRUE;
+}
+
+bool8 sub_805F660(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+{
+    u32 direction;
+    s16 x;
+    s16 y;
+
+    direction = playerDirection;
+    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
+    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
+    FieldObjectSetRegularAnim(mapObject, sprite, sub_80607C8(direction));
+    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
+    {
+        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+    }
+    mapObject->mapobj_bit_1 = TRUE;
+    sprite->data1 = 2;
+    return TRUE;
+}
+
+bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+{
+    u32 direction;
+
+    direction = playerDirection;
+    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
+    FieldObjectSetRegularAnim(mapObject, sprite, sub_806084C(direction));
+    mapObject->mapobj_bit_1 = TRUE;
+    sprite->data1 = 2;
+    return TRUE;
+}
+
+bool8 sub_805F760(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+{
+    u32 direction;
+    s16 x;
+    s16 y;
+
+    direction = playerDirection;
+    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
+    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
+    FieldObjectSetRegularAnim(mapObject, sprite, sub_80608A4(direction));
+    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
+    {
+        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+    }
+    mapObject->mapobj_bit_1 = TRUE;
+    sprite->data1 = 2;
+    return TRUE;
+}
+
+bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+{
+    u32 direction;
+    s16 x;
+    s16 y;
+
+    direction = playerDirection;
+    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
+    x = mapObject->coords2.x;
+    y = mapObject->coords2.y;
+    sub_8060320(direction, &x, &y, 2, 2);
+    FieldObjectSetRegularAnim(mapObject, sprite, GetJumpLedgeAnimId(direction));
+    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
+    {
+        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+    }
+    mapObject->mapobj_bit_1 = TRUE;
+    sprite->data1 = 2;
+    return TRUE;
+}
 
 fieldmap_object_cb(sub_805F8E0, sub_805F904, gUnknown_083755C0);
 
@@ -5482,23 +5586,26 @@ void unref_sub_80602F8(u8 direction, s16 *x, s16 *y)
     *y += gDirectionToVector[direction].y << 4;
 }
 
-void sub_8060320(u8 direction, s16 *x, s16 *y, s16 deltaX, s16 deltaY)
+void sub_8060320(u32 dirn, s16 *x, s16 *y, s16 deltaX, s16 deltaY)
 {
+    u8 direction = dirn;
+    s16 dx2 = deltaX;
+    s16 dy2 = deltaY;
     if (gDirectionToVector[direction].x > 0)
     {
-        *x += deltaX;
+        *x += dx2;
     }
     if (gDirectionToVector[direction].x < 0)
     {
-        *x -= deltaX;
+        *x -= dx2;
     }
     if (gDirectionToVector[direction].y > 0)
     {
-        *y += deltaY;
+        *y += dy2;
     }
     if (gDirectionToVector[direction].y < 0)
     {
-        *y -= deltaY;
+        *y -= dy2;
     }
 }
 
@@ -5849,7 +5956,6 @@ u32 state_to_direction(u8 a0, u32 a1, u32 a2)
     u32 zffuOffset;
     u8 a1_2 = a1;
     u8 a2_2 = a2;
-    // For some reason, r2 is being backed up to r3 and restored ahead of the zffu call.
     if (a1_2 == 0 || a2_2 == 0 || a1_2 > DIR_EAST || a2_2 > DIR_EAST)
     {
         return 0;