Finish field map object callbacks (except functions known or predicted not to match)

4 files changed, 58 insertions, 294 deletions

diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index d5d41a5e2..61eb3c7fe 100644..100755
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -626,293 +626,6 @@ _0805F8C0:
 	.align 2, 0
 _0805F8DC: .4byte gUnknown_0836DC09
 	thumb_func_end oac_hopping
-
-.section .text_fmocb2_asm
-
-	thumb_func_start sub_805FB20
-sub_805FB20: @ 805FB20
-	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, _0805FB3C @ =gMapObjects
-	adds r0, r2
-	ldr r2, _0805FB40 @ =sub_805FB44
-	bl meta_step
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805FB3C: .4byte gMapObjects
-_0805FB40: .4byte sub_805FB44
-	thumb_func_end sub_805FB20
-
-	thumb_func_start sub_805FB44
-sub_805FB44: @ 805FB44
-	push {r4,lr}
-	ldr r3, _0805FB60 @ =gUnknown_083755D0
-	movs r4, 0x30
-	ldrsh r2, [r1, r4]
-	lsls r2, 2
-	adds r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805FB60: .4byte gUnknown_083755D0
-	thumb_func_end sub_805FB44
-
-	thumb_func_start sub_805FB64
-sub_805FB64: @ 805FB64
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl npc_reset
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetStepInPlaceDelay16AnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805FB64
-
-	thumb_func_start sub_805FB90
-sub_805FB90: @ 805FB90
-	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, _0805FBAC @ =gMapObjects
-	adds r0, r2
-	ldr r2, _0805FBB0 @ =sub_805FBB4
-	bl meta_step
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805FBAC: .4byte gMapObjects
-_0805FBB0: .4byte sub_805FBB4
-	thumb_func_end sub_805FB90
-
-	thumb_func_start sub_805FBB4
-sub_805FBB4: @ 805FBB4
-	push {r4,lr}
-	ldr r3, _0805FBD0 @ =gUnknown_083755D8
-	movs r4, 0x30
-	ldrsh r2, [r1, r4]
-	lsls r2, 2
-	adds r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805FBD0: .4byte gUnknown_083755D8
-	thumb_func_end sub_805FBB4
-
-	thumb_func_start sub_805FBD4
-sub_805FBD4: @ 805FBD4
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl npc_reset
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetStepInPlaceDelay8AnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805FBD4
-
-	thumb_func_start sub_805FC00
-sub_805FC00: @ 805FC00
-	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, _0805FC1C @ =gMapObjects
-	adds r0, r2
-	ldr r2, _0805FC20 @ =sub_805FC24
-	bl meta_step
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805FC1C: .4byte gMapObjects
-_0805FC20: .4byte sub_805FC24
-	thumb_func_end sub_805FC00
-
-	thumb_func_start sub_805FC24
-sub_805FC24: @ 805FC24
-	push {r4,lr}
-	ldr r3, _0805FC40 @ =gUnknown_083755E0
-	movs r4, 0x30
-	ldrsh r2, [r1, r4]
-	lsls r2, 2
-	adds r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805FC40: .4byte gUnknown_083755E0
-	thumb_func_end sub_805FC24
-
-	thumb_func_start sub_805FC44
-sub_805FC44: @ 805FC44
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl npc_reset
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetStepInPlaceDelay4AnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805FC44
-
-	thumb_func_start sub_805FC70
-sub_805FC70: @ 805FC70
-	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, _0805FC8C @ =gMapObjects
-	adds r0, r2
-	ldr r2, _0805FC90 @ =sub_805FC94
-	bl meta_step
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805FC8C: .4byte gMapObjects
-_0805FC90: .4byte sub_805FC94
-	thumb_func_end sub_805FC70
-
-	thumb_func_start sub_805FC94
-sub_805FC94: @ 805FC94
-	push {r4,lr}
-	ldr r3, _0805FCB0 @ =gUnknown_083755E8
-	movs r4, 0x30
-	ldrsh r2, [r1, r4]
-	lsls r2, 2
-	adds r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805FCB0: .4byte gUnknown_083755E8
-	thumb_func_end sub_805FC94
-
-	thumb_func_start sub_805FCB4
-sub_805FCB4: @ 805FCB4
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl npc_reset
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetFaceDirectionAnimId
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl FieldObjectSetRegularAnim
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	movs r0, 0x1
-	strh r0, [r5, 0x30]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805FCB4
-
-	thumb_func_start sub_805FCE8
-sub_805FCE8: @ 805FCE8
-	push {r4,lr}
-	adds r4, r1, 0
-	bl FieldObjectExecRegularAnim
-	lsls r0, 24
-	cmp r0, 0
-	bne _0805FCFA
-	movs r0, 0
-	b _0805FD00
-_0805FCFA:
-	movs r0, 0x2
-	strh r0, [r4, 0x30]
-	movs r0, 0x1
-_0805FD00:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805FCE8
-
-	thumb_func_start sub_805FD08
-sub_805FD08: @ 805FD08
-	ldrb r2, [r0]
-	movs r1, 0x3
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-	movs r0, 0
-	bx lr
-	.align 2, 0
-	thumb_func_end sub_805FD08
-
 	.section .text_805fd18
 
 	thumb_func_start sub_80615CC
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 9bd8324ad..dbd3f0820 100644..100755
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -128,6 +128,7 @@ u8 sub_80608D0(u8);
 u8 GetStepInPlaceDelay32AnimId(u8 a);
 u8 GetStepInPlaceDelay16AnimId(u8);
 u8 GetStepInPlaceDelay8AnimId(u8 a);
+u8 GetStepInPlaceDelay4AnimId(u8 a);
 u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
 u8 sub_80609D8(u8);
 u8 sub_8060A04(u8);
diff --git a/ld_script.txt b/ld_script.txt
index bef62c619..8557d521c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -93,8 +93,6 @@ SECTIONS {
         src/field_map_obj.o(.text);
         asm/field_map_obj.o(.text);
         src/field_map_obj.o(.text_fmocb2_c);
-        asm/field_map_obj.o(.text_fmocb2_asm);
-		src/field_map_obj.o(.text_b);
 		asm/field_map_obj.o(.text_805fd18);
         src/field_ground_effect.o(.text);
         asm/field_ground_effect.o(.text);
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 1982affac..4fdec1919 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -3336,12 +3336,64 @@ u8 sub_805FB04(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-void sub_805FB20(struct Sprite *sprite);
-void sub_805FB90(struct Sprite *sprite);
-void sub_805FC00(struct Sprite *sprite);
-void sub_805FC70(struct Sprite *sprite);
+fieldmap_object_cb(sub_805FB20, sub_805FB44, gUnknown_083755D0);
+
+u8 sub_805FB64(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    npc_reset(mapObject, sprite);
+    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18));
+    sprite->data1 = 1;
+    return 1;
+}
+
+fieldmap_object_cb(sub_805FB90, sub_805FBB4, gUnknown_083755D8);
 
-asm(".section .text_b\n");
+u8 sub_805FBD4(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    npc_reset(mapObject, sprite);
+    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->mapobj_unk_18));
+    sprite->data1 = 1;
+    return 1;
+}
+
+fieldmap_object_cb(sub_805FC00, sub_805FC24, gUnknown_083755E0);
+
+u8 sub_805FC44(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    npc_reset(mapObject, sprite);
+    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18));
+    sprite->data1 = 1;
+    return 1;
+}
+
+fieldmap_object_cb(sub_805FC70, sub_805FC94, gUnknown_083755E8);
+
+u8 sub_805FCB4(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    npc_reset(mapObject, sprite);
+    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
+    mapObject->mapobj_bit_13 = 1;
+    sprite->data1 = 1;
+    return 1;
+}
+
+u8 sub_805FCE8(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    {
+        sprite->data1 = 2;
+        return 1;
+    }
+    return 0;
+}
+
+u8 sub_805FD08(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    mapObject->mapobj_bit_1 = 0;
+    return 0;
+}
+
+void sub_805FC70(struct Sprite *sprite);
 
 void npc_reset(struct MapObject *mapObject, struct Sprite *sprite)
 {