finish decompiling field_map_obj_helpers.c

4 files changed, 320 insertions, 410 deletions

diff --git a/asm/map_obj_8097404.s b/asm/map_obj_8097404.s
deleted file mode 100644
index a58096701..000000000
--- a/asm/map_obj_8097404.s
+++ /dev/null
@@ -1,408 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8097E50
-sub_8097E50: @ 8097E50
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r4, r0, 0
-	mov r8, r1
-	movs r0, 0
-	mov r12, r0
-	ldr r0, =gUnknown_020375B8
-	ldr r1, [r0]
-	adds r6, r0, 0
-	cmp r1, 0
-	bne _08097E80
-	movs r0, 0x14
-	bl AllocZeroed
-	str r0, [r6]
-	ldrb r1, [r4, 0x8]
-	strb r1, [r0]
-	ldr r1, [r6]
-	movs r0, 0x1
-	strb r0, [r1, 0x10]
-	b _08097ECC
-	.pool
-_08097E80:
-	movs r2, 0x10
-	movs r5, 0
-	movs r1, 0
-	adds r3, r6, 0
-	b _08097E90
-_08097E8A:
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r1, r0, 24
-_08097E90:
-	cmp r1, 0xF
-	bhi _08097EB2
-	cmp r2, 0x10
-	bne _08097EA4
-	ldr r0, [r3]
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08097EA4
-	adds r2, r1, 0
-_08097EA4:
-	ldr r0, [r3]
-	adds r0, r1
-	ldrb r0, [r0]
-	ldrb r7, [r4, 0x8]
-	cmp r0, r7
-	bne _08097E8A
-	movs r5, 0x1
-_08097EB2:
-	cmp r5, 0
-	bne _08097ECE
-	cmp r2, 0x10
-	beq _08097ECE
-	ldr r0, [r6]
-	adds r0, r2
-	ldrb r1, [r4, 0x8]
-	strb r1, [r0]
-	ldr r1, [r6]
-	ldrb r0, [r1, 0x10]
-	adds r0, 0x1
-	strb r0, [r1, 0x10]
-	movs r0, 0x1
-_08097ECC:
-	mov r12, r0
-_08097ECE:
-	mov r1, r12
-	cmp r1, 0x1
-	bne _08097EE0
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x10
-	orrs r0, r1
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-_08097EE0:
-	movs r0, 0x1
-	mov r7, r8
-	strh r0, [r7, 0x32]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8097E50
-
-	thumb_func_start sub_8097EF0
-sub_8097EF0: @ 8097EF0
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	mov r8, r1
-	movs r0, 0x1
-	strh r0, [r1, 0x32]
-	ldr r5, =gUnknown_020375B8
-	ldr r0, [r5]
-	cmp r0, 0
-	beq _08097F68
-	movs r7, 0
-	adds r0, r6, 0
-	bl sub_8097F78
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x10
-	beq _08097F28
-	ldr r0, [r5]
-	adds r0, r1
-	movs r1, 0
-	strb r1, [r0]
-	ldr r1, [r5]
-	ldrb r0, [r1, 0x10]
-	subs r0, 0x1
-	strb r0, [r1, 0x10]
-	movs r7, 0x1
-_08097F28:
-	ldr r0, [r5]
-	ldrb r4, [r0, 0x10]
-	cmp r4, 0
-	bne _08097F36
-	bl Free
-	str r4, [r5]
-_08097F36:
-	cmp r7, 0x1
-	bne _08097F68
-	ldrb r0, [r6, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	ldrb r1, [r0, 0xC]
-	lsls r1, 25
-	lsrs r1, 31
-	lsls r1, 4
-	ldrb r2, [r6, 0x1]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	movs r1, 0x3
-	negs r1, r1
-	ands r0, r1
-	strb r0, [r6, 0x1]
-	mov r2, r8
-	adds r2, 0x2C
-	ldrb r1, [r2]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r2]
-_08097F68:
-	movs r0, 0x1
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8097EF0
-
-	thumb_func_start sub_8097F78
-@ signed int sub_8097F78(npc_state *a1)
-sub_8097F78: @ 8097F78
-	push {lr}
-	movs r2, 0
-	ldr r1, =gUnknown_020375B8
-	ldr r1, [r1]
-	ldrb r3, [r0, 0x8]
-_08097F82:
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, r3
-	bne _08097F94
-	adds r0, r2, 0
-	b _08097FA0
-	.pool
-_08097F94:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0xF
-	bls _08097F82
-	movs r0, 0x10
-_08097FA0:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8097F78
-
-	thumb_func_start sub_8097FA4
-sub_8097FA4: @ 8097FA4
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	ldr r0, =sub_8097FE4
-	movs r1, 0xFF
-	bl CreateTask
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r4, r5, 2
-	adds r4, r5
-	lsls r4, 3
-	ldr r0, =gTasks
-	adds r4, r0
-	adds r0, r4, 0
-	adds r0, 0x8
-	adds r1, r6, 0
-	bl StoreWordInTwoHalfwords
-	strb r5, [r6, 0x1B]
-	ldr r0, =0x0000ffff
-	strh r0, [r4, 0xE]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8097FA4
-
-	thumb_func_start sub_8097FE4
-sub_8097FE4: @ 8097FE4
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, =gTasks
-	adds r4, r1, r0
-	adds r0, r4, 0
-	adds r0, 0x8
-	mov r1, sp
-	bl LoadWordFromTwoHalfwords
-	ldr r0, [sp]
-	ldrb r1, [r0, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r2, r0, r1
-	ldrh r1, [r4, 0xC]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0
-	bne _08098020
-	ldrh r0, [r4, 0xE]
-	ldrh r1, [r2, 0x26]
-	adds r0, r1
-	strh r0, [r2, 0x26]
-_08098020:
-	ldrh r1, [r4, 0xC]
-	movs r0, 0xF
-	ands r0, r1
-	cmp r0, 0
-	bne _08098030
-	ldrh r0, [r4, 0xE]
-	negs r0, r0
-	strh r0, [r4, 0xE]
-_08098030:
-	adds r0, r1, 0x1
-	strh r0, [r4, 0xC]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8097FE4
-
-	thumb_func_start sub_8098044
-sub_8098044: @ 8098044
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, =gTasks
-	adds r0, r1
-	adds r0, 0x8
-	mov r1, sp
-	bl LoadWordFromTwoHalfwords
-	adds r0, r4, 0
-	bl DestroyTask
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098044
-
-	thumb_func_start sub_8098074
-sub_8098074: @ 8098074
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	movs r4, 0
-	ldr r7, =gMapObjects
-_08098082:
-	cmp r4, r6
-	beq _080980A8
-	cmp r4, r5
-	beq _080980A8
-	lsls r0, r4, 3
-	adds r0, r4
-	lsls r0, 2
-	adds r1, r0, r7
-	ldrb r0, [r1]
-	lsls r0, 31
-	cmp r0, 0
-	beq _080980A8
-	ldr r0, =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	cmp r4, r0
-	beq _080980A8
-	adds r0, r1, 0
-	bl FreezeMapObject
-_080980A8:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _08098082
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098074
-
-	thumb_func_start sub_80980C0
-sub_80980C0: @ 80980C0
-	movs r0, 0
-	strh r0, [r1, 0x26]
-	ldrh r0, [r1, 0x32]
-	adds r0, 0x1
-	strh r0, [r1, 0x32]
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_80980C0
-
-	thumb_func_start sub_80980D0
-sub_80980D0: @ 80980D0
-	push {lr}
-	adds r2, r1, 0
-	ldrh r0, [r2, 0x26]
-	subs r0, 0x8
-	strh r0, [r2, 0x26]
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0xA0
-	negs r1, r1
-	cmp r0, r1
-	bne _080980EC
-	ldrh r0, [r2, 0x32]
-	adds r0, 0x1
-	strh r0, [r2, 0x32]
-_080980EC:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80980D0
-
-	thumb_func_start sub_80980F4
-sub_80980F4: @ 80980F4
-	ldr r0, =0x0000ff60
-	strh r0, [r1, 0x26]
-	ldrh r0, [r1, 0x32]
-	adds r0, 0x1
-	strh r0, [r1, 0x32]
-	movs r0, 0
-	bx lr
-	.pool
-	thumb_func_end sub_80980F4
-
-	thumb_func_start sub_8098108
-sub_8098108: @ 8098108
-	push {lr}
-	ldrh r0, [r1, 0x26]
-	adds r0, 0x8
-	strh r0, [r1, 0x26]
-	lsls r0, 16
-	cmp r0, 0
-	bne _0809811C
-	ldrh r0, [r1, 0x32]
-	adds r0, 0x1
-	strh r0, [r1, 0x32]
-_0809811C:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8098108
-
-	thumb_func_start sub_8098124
-sub_8098124: @ 8098124
-	movs r0, 0x1
-	bx lr
-	thumb_func_end sub_8098124
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/map_obj_8097404.h b/include/map_obj_8097404.h
index 33694fe98..f0880a641 100644
--- a/include/map_obj_8097404.h
+++ b/include/map_obj_8097404.h
@@ -8,7 +8,7 @@
 // Exported type declarations
 
 // Exported RAM declarations
-extern void *gUnknown_020375B8;
+extern u8 *gUnknown_020375B8;
 
 // Exported ROM declarations
 void sub_8097AC8(struct Sprite *);
diff --git a/ld_script.txt b/ld_script.txt
index eb682c035..0659e638a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -98,7 +98,6 @@ SECTIONS {
         src/field_map_obj.o(.text);
         asm/field_ground_effect.o(.text);
         src/field_map_obj_helpers.o(.text);
-        asm/map_obj_8097404.o(.text);
         asm/field_message_box.o(.text);
         asm/map_obj_lock.o(.text);
         src/text_window.o(.text);
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index b0f7442f4..a9c6dcc5c 100755
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -2,8 +2,13 @@
 #include "field_ground_effect.h"
 #include "field_map_obj.h"
 #include "field_effect.h"
+#include "map_obj_8097404.h"
+#include "malloc.h"
+#include "task.h"
+#include "util.h"
 
 extern void sub_8097D68(struct Sprite *sprite);
+extern void sub_8097FE4(u8);
 
 typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
 
@@ -523,3 +528,317 @@ void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite)
     gFieldEffectArguments[3] = 3;
     FieldEffectStart(FLDEFF_RIPPLE);
 }
+
+#ifdef NONMATCHING
+bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    bool32 ableToStore = FALSE;
+    if (gUnknown_020375B8 == NULL)
+    {
+        gUnknown_020375B8 = AllocZeroed(0x14);
+        gUnknown_020375B8[0] = mapObject->localId;
+        gUnknown_020375B8[16] = 1;
+        ableToStore = TRUE;
+    }
+    else
+    {
+        u8 i;
+        u8 firstFreeSlot;
+        bool32 found;
+        for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++)
+        {
+            if (firstFreeSlot == 16 && gUnknown_020375B8[i] == 0)
+                firstFreeSlot = i;
+            
+            if (gUnknown_020375B8[i] == mapObject->localId)
+            {
+                found = TRUE;
+                break;
+            }
+        }
+        
+        if (!found && firstFreeSlot != 16)
+        {
+            gUnknown_020375B8[firstFreeSlot] = mapObject->localId;
+            gUnknown_020375B8[16]++;
+            ableToStore = TRUE; // the nonmatching problem is that ableToStore == TRUE isnt being merged with the above ableToStore = TRUE assignment.
+        }
+    }
+    
+    if (ableToStore == TRUE)
+    {
+        mapObject->mapobj_bit_12 = TRUE;
+        mapObject->mapobj_bit_9 = TRUE;
+    }
+    
+    sprite->data[2] = 1;
+    return TRUE;
+}
+#else
+__attribute__((naked))
+bool32 sub_8097E50(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r8\n\
+    push {r7}\n\
+    adds r4, r0, 0\n\
+    mov r8, r1\n\
+    movs r0, 0\n\
+    mov r12, r0\n\
+    ldr r0, =gUnknown_020375B8\n\
+    ldr r1, [r0]\n\
+    adds r6, r0, 0\n\
+    cmp r1, 0\n\
+    bne _08097E80\n\
+    movs r0, 0x14\n\
+    bl AllocZeroed\n\
+    str r0, [r6]\n\
+    ldrb r1, [r4, 0x8]\n\
+    strb r1, [r0]\n\
+    ldr r1, [r6]\n\
+    movs r0, 0x1\n\
+    strb r0, [r1, 0x10]\n\
+    b _08097ECC\n\
+    .pool\n\
+_08097E80:\n\
+    movs r2, 0x10\n\
+    movs r5, 0\n\
+    movs r1, 0\n\
+    adds r3, r6, 0\n\
+    b _08097E90\n\
+_08097E8A:\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+_08097E90:\n\
+    cmp r1, 0xF\n\
+    bhi _08097EB2\n\
+    cmp r2, 0x10\n\
+    bne _08097EA4\n\
+    ldr r0, [r3]\n\
+    adds r0, r1\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08097EA4\n\
+    adds r2, r1, 0\n\
+_08097EA4:\n\
+    ldr r0, [r3]\n\
+    adds r0, r1\n\
+    ldrb r0, [r0]\n\
+    ldrb r7, [r4, 0x8]\n\
+    cmp r0, r7\n\
+    bne _08097E8A\n\
+    movs r5, 0x1\n\
+_08097EB2:\n\
+    cmp r5, 0\n\
+    bne _08097ECE\n\
+    cmp r2, 0x10\n\
+    beq _08097ECE\n\
+    ldr r0, [r6]\n\
+    adds r0, r2\n\
+    ldrb r1, [r4, 0x8]\n\
+    strb r1, [r0]\n\
+    ldr r1, [r6]\n\
+    ldrb r0, [r1, 0x10]\n\
+    adds r0, 0x1\n\
+    strb r0, [r1, 0x10]\n\
+    movs r0, 0x1\n\
+_08097ECC:\n\
+    mov r12, r0\n\
+_08097ECE:\n\
+    mov r1, r12\n\
+    cmp r1, 0x1\n\
+    bne _08097EE0\n\
+    ldrb r0, [r4, 0x1]\n\
+    movs r1, 0x10\n\
+    orrs r0, r1\n\
+    movs r1, 0x2\n\
+    orrs r0, r1\n\
+    strb r0, [r4, 0x1]\n\
+_08097EE0:\n\
+    movs r0, 0x1\n\
+    mov r7, r8\n\
+    strh r0, [r7, 0x32]\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .syntax divided");
+}
+#endif
+
+// this function is very similar to the above one and I don't want to decompile this one until the above is matching.
+__attribute__((naked))
+bool32 sub_8097EF0(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r8\n\
+    push {r7}\n\
+    adds r6, r0, 0\n\
+    mov r8, r1\n\
+    movs r0, 0x1\n\
+    strh r0, [r1, 0x32]\n\
+    ldr r5, =gUnknown_020375B8\n\
+    ldr r0, [r5]\n\
+    cmp r0, 0\n\
+    beq _08097F68\n\
+    movs r7, 0\n\
+    adds r0, r6, 0\n\
+    bl sub_8097F78\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+    cmp r1, 0x10\n\
+    beq _08097F28\n\
+    ldr r0, [r5]\n\
+    adds r0, r1\n\
+    movs r1, 0\n\
+    strb r1, [r0]\n\
+    ldr r1, [r5]\n\
+    ldrb r0, [r1, 0x10]\n\
+    subs r0, 0x1\n\
+    strb r0, [r1, 0x10]\n\
+    movs r7, 0x1\n\
+_08097F28:\n\
+    ldr r0, [r5]\n\
+    ldrb r4, [r0, 0x10]\n\
+    cmp r4, 0\n\
+    bne _08097F36\n\
+    bl Free\n\
+    str r4, [r5]\n\
+_08097F36:\n\
+    cmp r7, 0x1\n\
+    bne _08097F68\n\
+    ldrb r0, [r6, 0x5]\n\
+    bl GetFieldObjectGraphicsInfo\n\
+    ldrb r1, [r0, 0xC]\n\
+    lsls r1, 25\n\
+    lsrs r1, 31\n\
+    lsls r1, 4\n\
+    ldrb r2, [r6, 0x1]\n\
+    movs r0, 0x11\n\
+    negs r0, r0\n\
+    ands r0, r2\n\
+    orrs r0, r1\n\
+    movs r1, 0x3\n\
+    negs r1, r1\n\
+    ands r0, r1\n\
+    strb r0, [r6, 0x1]\n\
+    mov r2, r8\n\
+    adds r2, 0x2C\n\
+    ldrb r1, [r2]\n\
+    movs r0, 0x41\n\
+    negs r0, r0\n\
+    ands r0, r1\n\
+    strb r0, [r2]\n\
+_08097F68:\n\
+    movs r0, 0x1\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .pool\n\
+    .syntax divided");
+}
+
+u8 sub_8097F78(struct MapObject *mapObject)
+{
+    u8 i;
+
+    for(i = 0; i < 0x10; i++)
+    {
+        if(gUnknown_020375B8[i] == mapObject->localId)
+            return i;
+    }
+    return 0x10;
+}
+
+void sub_8097FA4(struct MapObject *mapObject)
+{
+    u8 taskId = CreateTask(sub_8097FE4, 0xFF);
+    struct Task *task = &gTasks[taskId];
+
+    StoreWordInTwoHalfwords(&task->data[0], (u32)mapObject);
+    mapObject->mapobj_unk_1B = taskId;
+    task->data[3] = 0xFFFF;
+}
+
+void sub_8097FE4(u8 taskId)
+{
+    struct MapObject *mapObject;
+    struct Sprite *sprite;
+    struct Task *task = &gTasks[taskId];
+
+    LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&mapObject); // load the map object pointer.
+    sprite = &gSprites[mapObject->spriteId];
+
+    if(!(task->data[2] & 0x3))
+        sprite->pos2.y += task->data[3];
+
+    if(!(task->data[2] & 0xF))
+        task->data[3] = -task->data[3];
+
+    task->data[2]++;
+}
+
+void sub_8098044(u8 taskId)
+{
+    u32 word;
+    struct Task *task = &gTasks[taskId];
+
+    LoadWordFromTwoHalfwords(&task->data[0], &word); // huh??? why does it load a word that never gets used???
+    DestroyTask(taskId);
+}
+
+void sub_8098074(u8 var1, u8 var2)
+{
+    u8 i;
+
+    for(i = 0; i < 0x10; i++)
+    {
+        if(i != var1 && i != var2 &&
+            gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
+                FreezeMapObject(&gMapObjects[i]);
+    }
+}
+
+bool32 sub_80980C0(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    sprite->pos2.y = 0;
+    sprite->data[2]++;
+    return FALSE;
+}
+
+bool32 sub_80980D0(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    sprite->pos2.y -= 8;
+
+    if(sprite->pos2.y == -160)
+        sprite->data[2]++;
+    return FALSE;
+}
+
+bool32 sub_80980F4(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    sprite->pos2.y = -160;
+    sprite->data[2]++;
+    return FALSE;
+}
+
+bool32 sub_8098108(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    sprite->pos2.y += 8;
+
+    if(!sprite->pos2.y)
+        sprite->data[2]++;
+    return FALSE;
+}
+
+// though this function returns FALSE without doing anything, this header is required due to being in an array of functions which needs it.
+bool32 sub_8098124(struct MapObject *mapObject, struct Sprite *sprite)
+{
+    return TRUE;
+}