sub_812882C nonmatching

3 files changed, 151 insertions, 115 deletions

diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
deleted file mode 100644
index c2582df74..000000000
--- a/asm/field_effect_helpers.s
+++ /dev/null
@@ -1,113 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_812882C
-sub_812882C: @ 812882C
-	push {r4-r7,lr}
-	adds r6, r0, 0
-	adds r0, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, 24
-	lsrs r2, 24
-	adds r1, r6, 0
-	bl SetObjectSubpriorityByZCoord
-	movs r7, 0
-_08128842:
-	lsls r0, r7, 3
-	adds r0, r7
-	lsls r0, 2
-	ldr r1, _081288DC @ =gMapObjects
-	adds r4, r0, r1
-	ldrb r0, [r4]
-	lsls r0, 31
-	cmp r0, 0
-	beq _081288E4
-	ldrb r0, [r4, 0x5]
-	bl GetFieldObjectGraphicsInfo
-	ldrb r1, [r4, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _081288E0 @ =gSprites
-	adds r5, r0, r1
-	adds r0, r6, 0
-	adds r0, 0x28
-	movs r2, 0
-	ldrsb r2, [r0, r2]
-	ldrh r0, [r6, 0x20]
-	adds r1, r0, r2
-	subs r0, r2
-	lsls r0, 16
-	lsrs r4, r0, 16
-	lsls r1, 16
-	asrs r1, 16
-	movs r0, 0x20
-	ldrsh r2, [r5, r0]
-	cmp r1, r2
-	bge _081288E4
-	lsls r0, r4, 16
-	asrs r0, 16
-	cmp r0, r2
-	ble _081288E4
-	adds r0, r5, 0
-	adds r0, 0x29
-	movs r3, 0
-	ldrsb r3, [r0, r3]
-	ldrh r2, [r5, 0x22]
-	adds r2, r3
-	ldrh r4, [r5, 0x22]
-	adds r0, r6, 0
-	adds r0, 0x29
-	movs r1, 0
-	ldrsb r1, [r0, r1]
-	ldrh r0, [r6, 0x22]
-	subs r0, r1
-	lsls r0, 16
-	asrs r0, 16
-	adds r3, r0, r3
-	lsls r2, 16
-	asrs r2, 16
-	lsls r3, 16
-	asrs r3, 16
-	cmp r2, r3
-	blt _081288BC
-	cmp r2, r0
-	bge _081288E4
-_081288BC:
-	lsls r0, r4, 16
-	asrs r0, 16
-	cmp r0, r3
-	ble _081288E4
-	adds r2, r6, 0
-	adds r2, 0x43
-	adds r0, r5, 0
-	adds r0, 0x43
-	ldrb r1, [r0]
-	ldrb r0, [r2]
-	cmp r0, r1
-	bhi _081288E4
-	adds r0, r1, 0x2
-	strb r0, [r2]
-	b _081288EE
-	.align 2, 0
-_081288DC: .4byte gMapObjects
-_081288E0: .4byte gSprites
-_081288E4:
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	cmp r7, 0xF
-	bls _08128842
-_081288EE:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_812882C
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index 9576947b2..ab720cdcb 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -232,7 +232,6 @@ SECTIONS {
         src/save.o(.text);
         src/mystery_event_script.o(.text);
         src/field_effect_helpers.o(.text);
-        asm/field_effect_helpers.o(.text);
         asm/contest_ai.o(.text);
         asm/battle_anim_81258BC.o(.text);
         src/battle_controller_safari.o(.text);
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 9914defe4..3ff5b31db 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -32,7 +32,7 @@ static void sub_81275C4(struct Sprite *);
 static void sub_8127DA0(struct Sprite *);
 static void sub_8127DD0(struct Sprite *);
 static void sub_8127E30(struct Sprite *);
-/*static*/ void sub_812882C(struct Sprite *, u8, u8);
+static void sub_812882C(struct Sprite *, u8, u8);
 static void sub_81278D8(struct Sprite *);
 static void sub_8127FD4(struct MapObject *, struct Sprite *);
 static void sub_812800C(struct MapObject *, struct Sprite *);
@@ -1495,3 +1495,153 @@ void sub_8128800(struct Sprite *sprite)
         sub_806487C(sprite, FALSE);
     }
 }
+
+#ifdef NONMATCHING
+static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
+{
+    u8 i;
+    s16 xlo;
+    s16 xhi;
+    s16 lx;
+    s16 lyhi;
+    s16 ly;
+    s16 ylo;
+    s16 yhi;
+    struct MapObject *mapObject; // r4
+    const struct MapObjectGraphicsInfo *graphicsInfo; // destroyed
+    struct Sprite *linkedSprite; // r5
+
+    SetObjectSubpriorityByZCoord(z, sprite, offset);
+    for (i = 0; i < 16; i ++)
+    {
+        mapObject = &gMapObjects[i];
+        if (mapObject->active)
+        {
+            graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+            linkedSprite = &gSprites[mapObject->spriteId];
+            xhi = sprite->pos1.x + sprite->centerToCornerVecX;
+            xlo = sprite->pos1.x - sprite->centerToCornerVecX;
+            lx = linkedSprite->pos1.x;
+            if (xhi < lx && xlo > lx)
+            {
+                lyhi = linkedSprite->pos1.y + linkedSprite->centerToCornerVecY;
+                ly = linkedSprite->pos1.y;
+                ylo = sprite->pos1.y - sprite->centerToCornerVecY;
+                yhi = ylo + linkedSprite->centerToCornerVecY;
+                if ((lyhi < yhi || lyhi < ylo) && ly > yhi)
+                {
+                    if (sprite->subpriority <= linkedSprite->subpriority)
+                    {
+                        sprite->subpriority = linkedSprite->subpriority + 2;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
+#else
+__attribute__((naked)) static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tadds r6, r0, 0\n"
+                    "\tadds r0, r1, 0\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tlsls r2, 24\n"
+                    "\tlsrs r2, 24\n"
+                    "\tadds r1, r6, 0\n"
+                    "\tbl SetObjectSubpriorityByZCoord\n"
+                    "\tmovs r7, 0\n"
+                    "_08128842:\n"
+                    "\tlsls r0, r7, 3\n"
+                    "\tadds r0, r7\n"
+                    "\tlsls r0, 2\n"
+                    "\tldr r1, _081288DC @ =gMapObjects\n"
+                    "\tadds r4, r0, r1\n"
+                    "\tldrb r0, [r4]\n"
+                    "\tlsls r0, 31\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _081288E4\n"
+                    "\tldrb r0, [r4, 0x5]\n"
+                    "\tbl GetFieldObjectGraphicsInfo\n"
+                    "\tldrb r1, [r4, 0x4]\n"
+                    "\tlsls r0, r1, 4\n"
+                    "\tadds r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tldr r1, _081288E0 @ =gSprites\n"
+                    "\tadds r5, r0, r1\n"
+                    "\tadds r0, r6, 0\n"
+                    "\tadds r0, 0x28\n"
+                    "\tmovs r2, 0\n"
+                    "\tldrsb r2, [r0, r2]\n"
+                    "\tldrh r0, [r6, 0x20]\n"
+                    "\tadds r1, r0, r2\n"
+                    "\tsubs r0, r2\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r4, r0, 16\n"
+                    "\tlsls r1, 16\n"
+                    "\tasrs r1, 16\n"
+                    "\tmovs r0, 0x20\n"
+                    "\tldrsh r2, [r5, r0]\n"
+                    "\tcmp r1, r2\n"
+                    "\tbge _081288E4\n"
+                    "\tlsls r0, r4, 16\n"
+                    "\tasrs r0, 16\n"
+                    "\tcmp r0, r2\n"
+                    "\tble _081288E4\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tadds r0, 0x29\n"
+                    "\tmovs r3, 0\n"
+                    "\tldrsb r3, [r0, r3]\n"
+                    "\tldrh r2, [r5, 0x22]\n"
+                    "\tadds r2, r3\n"
+                    "\tldrh r4, [r5, 0x22]\n"
+                    "\tadds r0, r6, 0\n"
+                    "\tadds r0, 0x29\n"
+                    "\tmovs r1, 0\n"
+                    "\tldrsb r1, [r0, r1]\n"
+                    "\tldrh r0, [r6, 0x22]\n"
+                    "\tsubs r0, r1\n"
+                    "\tlsls r0, 16\n"
+                    "\tasrs r0, 16\n"
+                    "\tadds r3, r0, r3\n"
+                    "\tlsls r2, 16\n"
+                    "\tasrs r2, 16\n"
+                    "\tlsls r3, 16\n"
+                    "\tasrs r3, 16\n"
+                    "\tcmp r2, r3\n"
+                    "\tblt _081288BC\n"
+                    "\tcmp r2, r0\n"
+                    "\tbge _081288E4\n"
+                    "_081288BC:\n"
+                    "\tlsls r0, r4, 16\n"
+                    "\tasrs r0, 16\n"
+                    "\tcmp r0, r3\n"
+                    "\tble _081288E4\n"
+                    "\tadds r2, r6, 0\n"
+                    "\tadds r2, 0x43\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tadds r0, 0x43\n"
+                    "\tldrb r1, [r0]\n"
+                    "\tldrb r0, [r2]\n"
+                    "\tcmp r0, r1\n"
+                    "\tbhi _081288E4\n"
+                    "\tadds r0, r1, 0x2\n"
+                    "\tstrb r0, [r2]\n"
+                    "\tb _081288EE\n"
+                    "\t.align 2, 0\n"
+                    "_081288DC: .4byte gMapObjects\n"
+                    "_081288E0: .4byte gSprites\n"
+                    "_081288E4:\n"
+                    "\tadds r0, r7, 0x1\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r7, r0, 24\n"
+                    "\tcmp r7, 0xF\n"
+                    "\tbls _08128842\n"
+                    "_081288EE:\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0");
+}
+#endif