Merge pull request #788 from kazblox/master

Fix NONMATCHINGs and actual English Debug support

1 files changed, 137 insertions, 906 deletions

diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c
index 98e50f17f..135ed43cb 100644
--- a/src/battle/anim/water.c
+++ b/src/battle/anim/water.c
@@ -1,5 +1,7 @@
 #include "global.h"
 #include "battle.h"
+#include "decompress.h"
+#include "graphics.h"
 #include "battle_anim.h"
 #include "random.h"
 #include "rom_8077ABC.h"
@@ -25,6 +27,7 @@ void sub_8078F40(u8);
 void sub_8079A64(u8);
 void sub_80D37FC(struct Sprite *sprite);
 void sub_80D3838(struct Sprite *sprite);
+void sub_80D3B60(u8 taskId);
 void sub_80D3D68(u8 taskId);
 void sub_80D4044(struct Sprite *sprite);
 void sub_80D40A8(struct Sprite *);
@@ -44,7 +47,7 @@ void sub_80D4BF0(struct Sprite *sprite);
 void sub_80D4C18(struct Sprite *);
 void sub_80D4CEC(struct Sprite *);
 void sub_80D4C64(struct Sprite *sprite);
-void sub_80D4D64(struct Sprite*, int, int);
+void sub_80D4D64(struct Sprite*, s32, s32);
 void sub_80E1864(u8);
 static void sub_80D3874(struct Sprite *sprite);
 
@@ -260,329 +263,104 @@ static void sub_80D3874(struct Sprite *sprite)
     }
 }
 
-NAKED
 void AnimTask_CreateSurfWave(u8 taskId)
 {
-    asm(".syntax unified\n\
-    .equ REG_BLDCNT, 0x4000050\n\
-    .equ REG_BG1CNT, 0x400000A\n\
-    .equ REG_BG1HOFS, 0x4000014\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0x14\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    mov r10, r0\n\
-    ldr r1, _080D398C @ =REG_BLDCNT\n\
-    ldr r2, _080D3990 @ =0x00003f42\n\
-    adds r0, r2, 0\n\
-    strh r0, [r1]\n\
-    adds r1, 0x2\n\
-    movs r3, 0x80\n\
-    lsls r3, 5\n\
-    adds r0, r3, 0\n\
-    strh r0, [r1]\n\
-    ldr r2, _080D3994 @ =REG_BG1CNT\n\
-    ldrb r1, [r2]\n\
-    movs r0, 0x4\n\
-    negs r0, r0\n\
-    ands r0, r1\n\
-    movs r1, 0x1\n\
-    orrs r0, r1\n\
-    strb r0, [r2]\n\
-    ldrb r1, [r2, 0x1]\n\
-    movs r0, 0x3F\n\
-    ands r0, r1\n\
-    movs r1, 0x40\n\
-    orrs r0, r1\n\
-    strb r0, [r2, 0x1]\n\
-    mov r0, sp\n\
-    bl sub_8078914\n\
-    ldr r2, [sp]\n\
-    movs r3, 0x80\n\
-    lsls r3, 6\n\
-    add r6, sp, 0x10\n\
-    add r0, sp, 0xC\n\
-    mov r12, r0\n\
-    movs r5, 0\n\
-    ldr r1, _080D3998 @ =0x040000d4\n\
-    movs r4, 0x80\n\
-    lsls r4, 5\n\
-    mov r8, r6\n\
-    ldr r7, _080D399C @ =0x85000400\n\
-    movs r0, 0x85\n\
-    lsls r0, 24\n\
-    mov r9, r0\n\
-_080D3920:\n\
-    str r5, [sp, 0x10]\n\
-    mov r0, r8\n\
-    str r0, [r1]\n\
-    str r2, [r1, 0x4]\n\
-    str r7, [r1, 0x8]\n\
-    ldr r0, [r1, 0x8]\n\
-    adds r2, r4\n\
-    subs r3, r4\n\
-    cmp r3, r4\n\
-    bhi _080D3920\n\
-    str r5, [sp, 0x10]\n\
-    str r6, [r1]\n\
-    str r2, [r1, 0x4]\n\
-    lsrs r0, r3, 2\n\
-    mov r2, r9\n\
-    orrs r0, r2\n\
-    str r0, [r1, 0x8]\n\
-    ldr r0, [r1, 0x8]\n\
-    movs r0, 0\n\
-    mov r3, r12\n\
-    strb r0, [r3]\n\
-    strb r0, [r3]\n\
-    ldr r1, [sp, 0x4]\n\
-    movs r0, 0\n\
-    str r0, [sp, 0x10]\n\
-    ldr r0, _080D3998 @ =0x040000d4\n\
-    str r6, [r0]\n\
-    str r1, [r0, 0x4]\n\
-    ldr r1, _080D399C @ =0x85000400\n\
-    str r1, [r0, 0x8]\n\
-    ldr r0, [r0, 0x8]\n\
-    bl IsContest\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    bne _080D39B8\n\
-    ldr r2, _080D3994 @ =REG_BG1CNT\n\
-    ldrb r1, [r2]\n\
-    movs r0, 0xD\n\
-    negs r0, r0\n\
-    ands r0, r1\n\
-    movs r1, 0x4\n\
-    orrs r0, r1\n\
-    strb r0, [r2]\n\
-    ldr r0, _080D39A0 @ =gBattleAnimAttacker\n\
-    ldrb r0, [r0]\n\
-    bl GetBattlerSide\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    cmp r0, 0x1\n\
-    bne _080D39A8\n\
-    ldr r0, _080D39A4 @ =gUnknown_08E70968\n\
-    b _080D39AA\n\
-    .align 2, 0\n\
-_080D398C: .4byte REG_BLDCNT\n\
-_080D3990: .4byte 0x00003f42\n\
-_080D3994: .4byte REG_BG1CNT\n\
-_080D3998: .4byte 0x040000d4\n\
-_080D399C: .4byte 0x85000400\n\
-_080D39A0: .4byte gBattleAnimAttacker\n\
-_080D39A4: .4byte gUnknown_08E70968\n\
-_080D39A8:\n\
-    ldr r0, _080D39B4 @ =gUnknown_08E70C38\n\
-_080D39AA:\n\
-    ldr r1, [sp, 0x4]\n\
-    bl LZDecompressVram\n\
-    b _080D39CE\n\
-    .align 2, 0\n\
-_080D39B4: .4byte gUnknown_08E70C38\n\
-_080D39B8:\n\
-    ldr r0, _080D39F0 @ =gUnknown_08E70F0C\n\
-    ldr r1, [sp, 0x4]\n\
-    bl LZDecompressVram\n\
-    mov r0, sp\n\
-    ldrb r0, [r0, 0x8]\n\
-    ldr r1, [sp, 0x4]\n\
-    movs r2, 0\n\
-    movs r3, 0x1\n\
-    bl sub_80763FC\n\
-_080D39CE:\n\
-    ldr r0, _080D39F4 @ =gBattleAnimBackgroundImage_Surf\n\
-    ldr r1, [sp]\n\
-    bl LZDecompressVram\n\
-    ldr r0, _080D39F8 @ =gBattleAnimArgs\n\
-    movs r1, 0\n\
-    ldrsh r0, [r0, r1]\n\
-    cmp r0, 0\n\
-    bne _080D3A00\n\
-    ldr r0, _080D39FC @ =gBattleAnimBackgroundPalette_Surf\n\
-    mov r1, sp\n\
-    ldrb r1, [r1, 0x8]\n\
-    lsls r1, 4\n\
-    movs r2, 0x20\n\
-    bl LoadCompressedPalette\n\
-    b _080D3A0E\n\
-    .align 2, 0\n\
-_080D39F0: .4byte gUnknown_08E70F0C\n\
-_080D39F4: .4byte gBattleAnimBackgroundImage_Surf\n\
-_080D39F8: .4byte gBattleAnimArgs\n\
-_080D39FC: .4byte gBattleAnimBackgroundPalette_Surf\n\
-_080D3A00:\n\
-    ldr r0, _080D3A78 @ =gBattleAnimBackgroundImageMuddyWater_Pal\n\
-    mov r1, sp\n\
-    ldrb r1, [r1, 0x8]\n\
-    lsls r1, 4\n\
-    movs r2, 0x20\n\
-    bl LoadCompressedPalette\n\
-_080D3A0E:\n\
-    ldr r0, _080D3A7C @ =sub_80D3D68\n\
-    ldr r4, _080D3A80 @ =gTasks\n\
-    mov r2, r10\n\
-    lsls r5, r2, 2\n\
-    adds r1, r5, r2\n\
-    lsls r1, 3\n\
-    adds r6, r1, r4\n\
-    ldrb r1, [r6, 0x7]\n\
-    adds r1, 0x1\n\
-    lsls r1, 24\n\
-    lsrs r1, 24\n\
-    bl CreateTask\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    mov r8, r0\n\
-    movs r3, 0\n\
-    mov r9, r3\n\
-    mov r0, r8\n\
-    strh r0, [r6, 0x26]\n\
-    mov r1, r8\n\
-    lsls r0, r1, 2\n\
-    add r0, r8\n\
-    lsls r0, 3\n\
-    adds r7, r0, r4\n\
-    mov r2, r9\n\
-    strh r2, [r7, 0x8]\n\
-    movs r0, 0x80\n\
-    lsls r0, 5\n\
-    strh r0, [r7, 0xA]\n\
-    strh r0, [r7, 0xC]\n\
-    bl IsContest\n\
-    lsls r0, 24\n\
-    lsrs r4, r0, 24\n\
-    cmp r4, 0\n\
-    beq _080D3A94\n\
-    ldr r3, _080D3A84 @ =0x0000ffb0\n\
-    adds r0, r3, 0\n\
-    ldr r1, _080D3A88 @ =gBattle_BG1_X\n\
-    strh r0, [r1]\n\
-    ldr r2, _080D3A8C @ =0x0000ffd0\n\
-    adds r0, r2, 0\n\
-    ldr r3, _080D3A90 @ =gBattle_BG1_Y\n\
-    strh r0, [r3]\n\
-    movs r0, 0x2\n\
-    strh r0, [r6, 0x8]\n\
-    movs r0, 0x1\n\
-    strh r0, [r6, 0xA]\n\
-    mov r0, r9\n\
-    strh r0, [r7, 0xE]\n\
-    b _080D3AEE\n\
-    .align 2, 0\n\
-_080D3A78: .4byte gBattleAnimBackgroundImageMuddyWater_Pal\n\
-_080D3A7C: .4byte sub_80D3D68\n\
-_080D3A80: .4byte gTasks\n\
-_080D3A84: .4byte 0x0000ffb0\n\
-_080D3A88: .4byte gBattle_BG1_X\n\
-_080D3A8C: .4byte 0x0000ffd0\n\
-_080D3A90: .4byte gBattle_BG1_Y\n\
-_080D3A94:\n\
-    ldr r0, _080D3AC4 @ =gBattleAnimAttacker\n\
-    ldrb r0, [r0]\n\
-    bl GetBattlerSide\n\
-    lsls r0, 24\n\
-    lsrs r1, r0, 24\n\
-    cmp r1, 0x1\n\
-    bne _080D3AD8\n\
-    ldr r2, _080D3AC8 @ =0x0000ff20\n\
-    adds r0, r2, 0\n\
-    ldr r3, _080D3ACC @ =gBattle_BG1_X\n\
-    strh r0, [r3]\n\
-    movs r2, 0x80\n\
-    lsls r2, 1\n\
-    adds r0, r2, 0\n\
-    ldr r3, _080D3AD0 @ =gBattle_BG1_Y\n\
-    strh r0, [r3]\n\
-    movs r0, 0x2\n\
-    strh r0, [r6, 0x8]\n\
-    ldr r0, _080D3AD4 @ =0x0000ffff\n\
-    strh r0, [r6, 0xA]\n\
-    strh r1, [r7, 0xE]\n\
-    b _080D3AEE\n\
-    .align 2, 0\n\
-_080D3AC4: .4byte gBattleAnimAttacker\n\
-_080D3AC8: .4byte 0x0000ff20\n\
-_080D3ACC: .4byte gBattle_BG1_X\n\
-_080D3AD0: .4byte gBattle_BG1_Y\n\
-_080D3AD4: .4byte 0x0000ffff\n\
-_080D3AD8:\n\
-    ldr r0, _080D3B1C @ =gBattle_BG1_X\n\
-    strh r4, [r0]\n\
-    ldr r1, _080D3B20 @ =0x0000ffd0\n\
-    adds r0, r1, 0\n\
-    ldr r2, _080D3B24 @ =gBattle_BG1_Y\n\
-    strh r0, [r2]\n\
-    ldr r0, _080D3B28 @ =0x0000fffe\n\
-    strh r0, [r6, 0x8]\n\
-    movs r0, 0x1\n\
-    strh r0, [r6, 0xA]\n\
-    strh r4, [r7, 0xE]\n\
-_080D3AEE:\n\
-    ldr r1, _080D3B2C @ =REG_BG1HOFS\n\
-    ldr r3, _080D3B1C @ =gBattle_BG1_X\n\
-    ldrh r0, [r3]\n\
-    strh r0, [r1]\n\
-    adds r1, 0x2\n\
-    ldr r2, _080D3B24 @ =gBattle_BG1_Y\n\
-    ldrh r0, [r2]\n\
-    strh r0, [r1]\n\
-    ldr r1, _080D3B30 @ =gTasks\n\
-    mov r3, r8\n\
-    lsls r0, r3, 2\n\
-    add r0, r8\n\
-    lsls r0, 3\n\
-    adds r2, r0, r1\n\
-    movs r3, 0xE\n\
-    ldrsh r0, [r2, r3]\n\
-    cmp r0, 0\n\
-    bne _080D3B34\n\
-    movs r0, 0x30\n\
-    strh r0, [r2, 0x10]\n\
-    movs r0, 0x70\n\
-    b _080D3B38\n\
-    .align 2, 0\n\
-_080D3B1C: .4byte gBattle_BG1_X\n\
-_080D3B20: .4byte 0x0000ffd0\n\
-_080D3B24: .4byte gBattle_BG1_Y\n\
-_080D3B28: .4byte 0x0000fffe\n\
-_080D3B2C: .4byte REG_BG1HOFS\n\
-_080D3B30: .4byte gTasks\n\
-_080D3B34:\n\
-    movs r0, 0\n\
-    strh r0, [r2, 0x10]\n\
-_080D3B38:\n\
-    strh r0, [r2, 0x12]\n\
-    mov r2, r10\n\
-    adds r0, r5, r2\n\
-    lsls r0, 3\n\
-    adds r0, r1\n\
-    movs r1, 0x1\n\
-    strh r1, [r0, 0x14]\n\
-    ldr r1, _080D3B5C @ =sub_80D3B60\n\
-    str r1, [r0]\n\
-    add sp, 0x14\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_080D3B5C: .4byte sub_80D3B60\n\
-    .syntax divided\n");
+    struct Struct_sub_8078914 subStruct;
+    u8 taskId2;
+    u16 *BGptrX = &gBattle_BG1_X;
+    u16 *BGptrY = &gBattle_BG1_Y;
+    vu8 cpuDelay; // explanation below
+
+    REG_BLDCNT = BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL;
+    REG_BLDALPHA = 0x1000;
+    REG_BG1CNT_BITFIELD.priority = 1;
+    REG_BG1CNT_BITFIELD.screenSize = 1;
+    sub_8078914(&subStruct);
+
+    // This is gone in FireRed and Emerald.
+    Dma3FillLarge32_(0, subStruct.field_0, 0x2000); // !
+    /*
+        Many games use wasteful NOPs; some of which are
+        even moreso than regular ones. This is so that
+        hardware operations can finish.
+
+        This is just an example. Also, this is apparently
+        not a macro, as making it a macro results in a
+        NONMATCHING.
+    */
+    cpuDelay = 0; // stall the CPU
+    cpuDelay = 0; // stall the CPU
+    Dma3FillLarge32_(0, subStruct.field_4, 0x1000); // !
+
+    if (!IsContest())
+    {
+        REG_BG1CNT_BITFIELD.charBaseBlock = 1;
+        if (GetBattlerSide(gBattleAnimAttacker) == 1)
+            LZDecompressVram(&gUnknown_08E70968, subStruct.field_4);
+        else
+            LZDecompressVram(&gUnknown_08E70C38, subStruct.field_4);
+    }
+    else
+    {
+        LZDecompressVram(&gUnknown_08E70F0C, subStruct.field_4);
+        sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 1);
+    }
+    LZDecompressVram(&gBattleAnimBackgroundImage_Surf, subStruct.field_0);
+    if (gBattleAnimArgs[0] == 0)
+        LoadCompressedPalette(&gBattleAnimBackgroundPalette_Surf, 16 * subStruct.field_8, 32);
+    else
+        LoadCompressedPalette(&gBattleAnimBackgroundImageMuddyWater_Pal, 16 * subStruct.field_8, 32);
+    taskId2 = CreateTask(sub_80D3D68, gTasks[taskId].priority + 1);
+    gTasks[taskId].data[15] = taskId2;
+    gTasks[taskId2].data[0] = 0;
+    gTasks[taskId2].data[1] = 0x1000;
+    gTasks[taskId2].data[2] = 0x1000;
+    if (IsContest())
+    {
+        *BGptrX = -80;
+        *BGptrY = -48;
+        gTasks[taskId].data[0] = 2;
+        gTasks[taskId].data[1] = 1;
+        gTasks[taskId2].data[3] = 0;
+    }
+    else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
+    {
+        *BGptrX = -224;
+        *BGptrY = 256;
+        gTasks[taskId].data[0] = 2;
+        gTasks[taskId].data[1] = -1;
+        gTasks[taskId2].data[3] = 1;
+    }
+    else
+    {
+        *BGptrX = 0;
+        *BGptrY = -48;
+        gTasks[taskId].data[0] = -2;
+        gTasks[taskId].data[1] = 1;
+        gTasks[taskId2].data[3] = 0;
+    }
+    REG_BG1HOFS = *BGptrX;
+    REG_BG1VOFS = *BGptrY;
+    if(gTasks[taskId2].data[3] == 0)
+    {
+        gTasks[taskId2].data[4] = 48;
+        gTasks[taskId2].data[5] = 112;
+    }
+    else
+    {
+        gTasks[taskId2].data[4] = 0;
+        gTasks[taskId2].data[5] = 0;
+    }
+    gTasks[taskId].data[6] = 1;
+    gTasks[taskId].func = sub_80D3B60;
 }
 
 #ifdef NONMATCHING
 void sub_80D3B60(u8 taskId)
 {
     struct Struct_sub_8078914 unk;
+
+    vu8 cpuDelay; // yet again
     u8 i;
     u16 rgbBuffer;
     u16 *BGptrX = &gBattle_BG1_X;
@@ -609,6 +387,7 @@ void sub_80D3B60(u8 taskId)
     }
     if (++gTasks[taskId].data[6] > 1)
     {
+        // there is some weird math going on here
         gTasks[taskId].data[6] = 0;
         unkUse = ++gTasks[taskId].data[3];
         if (unkUse <= 13)
@@ -624,8 +403,20 @@ void sub_80D3B60(u8 taskId)
     }
     if (!(gTasks[gTasks[taskId].data[15]].data[1] & 0x1F))
     {
-        gTasks[taskId].data[0] = gTasks[gTasks[taskId].data[15]].data[1] & 0x1F;
-        gTasks[taskId].func = sub_80D3D68;
+        Dma3FillLarge32_(0, unk.field_0, 0x2000); // !
+        cpuDelay = 0; // stall the CPU
+        cpuDelay = 0; // stall the CPU
+        Dma3FillLarge32_(0, unk.field_4, 0x1000); // !
+        if (!IsContest)
+            REG_BG1CNT_BITFIELD.charBaseBlock = 1;
+        *BGptrX = 0;
+        *BGptrY = 0;
+
+        REG_BLDCNT = 0;
+        REG_BLDALPHA = 0;
+
+        gTasks[gTasks[taskId].data[15]].data[15] = 0xffff;
+        DestroyAnimVisualTask(taskId);
     }
 }
 #else
@@ -882,44 +673,35 @@ _080D3D32:\n\
 }
 #endif
 
-#ifdef NONMATCHING
 void sub_80D3D68(u8 taskId)
 {
     s16 i;
     struct ScanlineEffectParams params;
     struct Task *task = &gTasks[taskId];
-    // u16 *scanlineBuffer;
 
     switch (task->data[0])
     {
         case 0:
             for (i = 0; i < task->data[4]; i++)
             {
-                /* scanlineBuffer = &gScanlineEffectRegBuffers[0][i];
-                *(u16 *)(&gScanlineEffect) = task->data[2];
-                *scanlineBuffer = task->data[2] & -1; */
-                gScanlineEffectRegBuffers[1][i] = task->data[2];
-                gScanlineEffectRegBuffers[0][i] = (u16)((int)(task->data[2] & 0xFFFF));
+                /* variable initialization isn't literal to ASM */
+                gScanlineEffectRegBuffers[0][i] = gScanlineEffectRegBuffers[1][i] = task->data[2];
             }
             for (i = task->data[4]; i < task->data[5]; i++)
             {
-                gScanlineEffectRegBuffers[1][i] = task->data[1];
-                gScanlineEffectRegBuffers[0][i] = (u16)((int)(task->data[1] & 0xFFFF));
+                gScanlineEffectRegBuffers[0][i] = gScanlineEffectRegBuffers[1][i] = task->data[1];
             }
             for (i = task->data[5]; i < 160; i++)
             {
-                gScanlineEffectRegBuffers[1][i] = task->data[2];
-                gScanlineEffectRegBuffers[0][i] = (u16)((int)(task->data[2] & 0xFFFF));
+                gScanlineEffectRegBuffers[0][i] = gScanlineEffectRegBuffers[1][i] = task->data[2];
             }
             if (task->data[4] == 0)
             {
-                gScanlineEffectRegBuffers[1][i] = task->data[1];
-                gScanlineEffectRegBuffers[0][i] = task->data[1];
+                gScanlineEffectRegBuffers[0][i] = gScanlineEffectRegBuffers[1][i] = task->data[1];
             }
             else
             {
-                gScanlineEffectRegBuffers[1][i] = task->data[2];
-                gScanlineEffectRegBuffers[0][i] = task->data[2];
+                gScanlineEffectRegBuffers[0][i] = gScanlineEffectRegBuffers[1][i] = task->data[2];
             }
             params.dmaDest = (vu16 *)REG_ADDR_BLDALPHA;
             params.dmaControl = SCANLINE_EFFECT_DMACNT_16BIT;
@@ -975,391 +757,6 @@ void sub_80D3D68(u8 taskId)
             break;
     }
 }
-#else
-NAKED
-void sub_80D3D68(u8 taskId)
-{
-    asm_unified("push {r4-r7,lr}\n\
-	sub sp, 0xC\n\
-	lsls r0, 24\n\
-	lsrs r7, r0, 24\n\
-	lsls r0, r7, 2\n\
-	adds r0, r7\n\
-	lsls r0, 3\n\
-	ldr r1, =gTasks\n\
-	adds r4, r0, r1\n\
-	movs r1, 0x8\n\
-	ldrsh r0, [r4, r1]\n\
-	cmp r0, 0x1\n\
-	bne _080D3D84\n\
-	b _080D3EBC\n\
-_080D3D84:\n\
-	cmp r0, 0x1\n\
-	bgt _080D3D94\n\
-	cmp r0, 0\n\
-	beq _080D3D9C\n\
-	b _080D4032\n\
-	.align 2, 0\n\
-	.pool\n\
-_080D3D94:\n\
-	cmp r0, 0x2\n\
-	bne _080D3D9A\n\
-	b _080D3F88\n\
-_080D3D9A:\n\
-	b _080D4032\n\
-_080D3D9C:\n\
-	movs r3, 0\n\
-	movs r2, 0x10\n\
-	ldrsh r0, [r4, r2]\n\
-	ldr r1, =gScanlineEffectRegBuffers\n\
-	mov r12, r1\n\
-	cmp r3, r0\n\
-	bge _080D3DDA\n\
-	mov r7, r12\n\
-	movs r5, 0xF0\n\
-	lsls r5, 3\n\
-	add r5, r12\n\
-	ldr r6, =0x0000ffff\n\
-_080D3DB4:\n\
-	lsls r2, r3, 16\n\
-	asrs r2, 16\n\
-	lsls r1, r2, 1\n\
-	adds r3, r1, r7\n\
-	adds r1, r5\n\
-	ldrh r0, [r4, 0xC]\n\
-	strh r0, [r1]\n\
-	ldrh r1, [r4, 0xC]\n\
-	adds r0, r6, 0\n\
-	ands r0, r1\n\
-	strh r0, [r3]\n\
-	adds r2, 0x1\n\
-	lsls r2, 16\n\
-	lsrs r3, r2, 16\n\
-	asrs r2, 16\n\
-	movs r1, 0x10\n\
-	ldrsh r0, [r4, r1]\n\
-	cmp r2, r0\n\
-	blt _080D3DB4\n\
-_080D3DDA:\n\
-	ldrh r3, [r4, 0x10]\n\
-	lsls r2, r3, 16\n\
-	asrs r1, r2, 16\n\
-	movs r3, 0x12\n\
-	ldrsh r0, [r4, r3]\n\
-	cmp r1, r0\n\
-	bge _080D3E14\n\
-	ldr r5, =gScanlineEffectRegBuffers\n\
-	movs r0, 0xF0\n\
-	lsls r0, 3\n\
-	adds r6, r5, r0\n\
-	ldr r7, =0x0000ffff\n\
-_080D3DF2:\n\
-	asrs r2, 16\n\
-	lsls r1, r2, 1\n\
-	adds r3, r1, r5\n\
-	adds r1, r6\n\
-	ldrh r0, [r4, 0xA]\n\
-	strh r0, [r1]\n\
-	ldrh r1, [r4, 0xA]\n\
-	adds r0, r7, 0\n\
-	ands r0, r1\n\
-	strh r0, [r3]\n\
-	adds r2, 0x1\n\
-	lsls r2, 16\n\
-	asrs r1, r2, 16\n\
-	movs r3, 0x12\n\
-	ldrsh r0, [r4, r3]\n\
-	cmp r1, r0\n\
-	blt _080D3DF2\n\
-_080D3E14:\n\
-	ldrh r3, [r4, 0x12]\n\
-	lsls r2, r3, 16\n\
-	asrs r0, r2, 16\n\
-	cmp r0, 0x9F\n\
-	bgt _080D3E4A\n\
-	ldr r5, =gScanlineEffectRegBuffers\n\
-	movs r0, 0xF0\n\
-	lsls r0, 3\n\
-	adds r6, r5, r0\n\
-	ldr r7, =0x0000ffff\n\
-_080D3E28:\n\
-	asrs r2, 16\n\
-	lsls r1, r2, 1\n\
-	adds r3, r1, r5\n\
-	adds r1, r6\n\
-	ldrh r0, [r4, 0xC]\n\
-	strh r0, [r1]\n\
-	ldrh r1, [r4, 0xC]\n\
-	adds r0, r7, 0\n\
-	ands r0, r1\n\
-	strh r0, [r3]\n\
-	adds r2, 0x1\n\
-	lsls r2, 16\n\
-	lsrs r3, r2, 16\n\
-	lsls r2, r3, 16\n\
-	asrs r0, r2, 16\n\
-	cmp r0, 0x9F\n\
-	ble _080D3E28\n\
-_080D3E4A:\n\
-	movs r1, 0x10\n\
-	ldrsh r0, [r4, r1]\n\
-	cmp r0, 0\n\
-	bne _080D3E74\n\
-	lsls r0, r3, 16\n\
-	asrs r0, 15\n\
-	mov r3, r12\n\
-	adds r2, r0, r3\n\
-	movs r1, 0xF0\n\
-	lsls r1, 3\n\
-	add r1, r12\n\
-	adds r0, r1\n\
-	ldrh r1, [r4, 0xA]\n\
-	strh r1, [r0]\n\
-	ldrh r0, [r4, 0xA]\n\
-	b _080D3E8A\n\
-	.align 2, 0\n\
-	.pool\n\
-_080D3E74:\n\
-	lsls r0, r3, 16\n\
-	asrs r0, 15\n\
-	mov r1, r12\n\
-	adds r2, r0, r1\n\
-	movs r1, 0xF0\n\
-	lsls r1, 3\n\
-	add r1, r12\n\
-	adds r0, r1\n\
-	ldrh r1, [r4, 0xC]\n\
-	strh r1, [r0]\n\
-	ldrh r0, [r4, 0xC]\n\
-_080D3E8A:\n\
-	strh r0, [r2]\n\
-	ldr r0, =0x04000052\n\
-	str r0, [sp]\n\
-	ldr r0, =0xa2600001\n\
-	str r0, [sp, 0x4]\n\
-	mov r1, sp\n\
-	movs r2, 0\n\
-	movs r0, 0x1\n\
-	strb r0, [r1, 0x8]\n\
-	mov r0, sp\n\
-	strb r2, [r0, 0x9]\n\
-	ldr r0, [sp]\n\
-	ldr r1, [sp, 0x4]\n\
-	ldr r2, [sp, 0x8]\n\
-	bl ScanlineEffect_SetParams\n\
-	ldrh r0, [r4, 0x8]\n\
-	adds r0, 0x1\n\
-	strh r0, [r4, 0x8]\n\
-	b _080D4032\n\
-	.align 2, 0\n\
-	.pool\n\
-_080D3EBC:\n\
-	movs r2, 0xE\n\
-	ldrsh r1, [r4, r2]\n\
-	cmp r1, 0\n\
-	bne _080D3ED4\n\
-	ldrh r0, [r4, 0x10]\n\
-	subs r0, 0x1\n\
-	strh r0, [r4, 0x10]\n\
-	lsls r0, 16\n\
-	cmp r0, 0\n\
-	bgt _080D3EE8\n\
-	strh r1, [r4, 0x10]\n\
-	b _080D3EE2\n\
-_080D3ED4:\n\
-	ldrh r0, [r4, 0x12]\n\
-	adds r0, 0x1\n\
-	strh r0, [r4, 0x12]\n\
-	lsls r0, 16\n\
-	asrs r0, 16\n\
-	cmp r0, 0x6F\n\
-	ble _080D3EE8\n\
-_080D3EE2:\n\
-	ldrh r0, [r4, 0x8]\n\
-	adds r0, 0x1\n\
-	strh r0, [r4, 0x8]\n\
-_080D3EE8:\n\
-	movs r3, 0\n\
-	movs r1, 0x10\n\
-	ldrsh r0, [r4, r1]\n\
-	cmp r3, r0\n\
-	bge _080D3F1C\n\
-	ldr r6, =gScanlineEffectRegBuffers\n\
-	ldr r5, =gScanlineEffect\n\
-_080D3EF6:\n\
-	lsls r1, r3, 16\n\
-	asrs r1, 16\n\
-	lsls r3, r1, 1\n\
-	ldrb r2, [r5, 0x14]\n\
-	lsls r0, r2, 4\n\
-	subs r0, r2\n\
-	lsls r0, 7\n\
-	adds r3, r0\n\
-	adds r3, r6\n\
-	ldrh r0, [r4, 0xC]\n\
-	strh r0, [r3]\n\
-	adds r1, 0x1\n\
-	lsls r1, 16\n\
-	lsrs r3, r1, 16\n\
-	asrs r1, 16\n\
-	movs r2, 0x10\n\
-	ldrsh r0, [r4, r2]\n\
-	cmp r1, r0\n\
-	blt _080D3EF6\n\
-_080D3F1C:\n\
-	ldrh r3, [r4, 0x10]\n\
-	lsls r2, r3, 16\n\
-	asrs r1, r2, 16\n\
-	movs r3, 0x12\n\
-	ldrsh r0, [r4, r3]\n\
-	cmp r1, r0\n\
-	bge _080D3F50\n\
-	ldr r6, =gScanlineEffectRegBuffers\n\
-	ldr r5, =gScanlineEffect\n\
-_080D3F2E:\n\
-	asrs r3, r2, 16\n\
-	lsls r2, r3, 1\n\
-	ldrb r1, [r5, 0x14]\n\
-	lsls r0, r1, 4\n\
-	subs r0, r1\n\
-	lsls r0, 7\n\
-	adds r2, r0\n\
-	adds r2, r6\n\
-	ldrh r0, [r4, 0xA]\n\
-	strh r0, [r2]\n\
-	adds r3, 0x1\n\
-	lsls r2, r3, 16\n\
-	asrs r1, r2, 16\n\
-	movs r3, 0x12\n\
-	ldrsh r0, [r4, r3]\n\
-	cmp r1, r0\n\
-	blt _080D3F2E\n\
-_080D3F50:\n\
-	ldrh r3, [r4, 0x12]\n\
-	lsls r1, r3, 16\n\
-	asrs r0, r1, 16\n\
-	cmp r0, 0x9F\n\
-	bgt _080D4032\n\
-	ldr r6, =gScanlineEffectRegBuffers\n\
-	ldr r5, =gScanlineEffect\n\
-_080D3F5E:\n\
-	asrs r3, r1, 16\n\
-	lsls r2, r3, 1\n\
-	ldrb r1, [r5, 0x14]\n\
-	lsls r0, r1, 4\n\
-	subs r0, r1\n\
-	lsls r0, 7\n\
-	adds r2, r0\n\
-	adds r2, r6\n\
-	ldrh r0, [r4, 0xC]\n\
-	strh r0, [r2]\n\
-	adds r3, 0x1\n\
-	lsls r1, r3, 16\n\
-	asrs r0, r1, 16\n\
-	cmp r0, 0x9F\n\
-	ble _080D3F5E\n\
-	b _080D4032\n\
-	.align 2, 0\n\
-	.pool\n\
-_080D3F88:\n\
-	movs r3, 0\n\
-	movs r1, 0x10\n\
-	ldrsh r0, [r4, r1]\n\
-	cmp r3, r0\n\
-	bge _080D3FBC\n\
-	ldr r6, =gScanlineEffectRegBuffers\n\
-	ldr r5, =gScanlineEffect\n\
-_080D3F96:\n\
-	lsls r1, r3, 16\n\
-	asrs r1, 16\n\
-	lsls r3, r1, 1\n\
-	ldrb r2, [r5, 0x14]\n\
-	lsls r0, r2, 4\n\
-	subs r0, r2\n\
-	lsls r0, 7\n\
-	adds r3, r0\n\
-	adds r3, r6\n\
-	ldrh r0, [r4, 0xC]\n\
-	strh r0, [r3]\n\
-	adds r1, 0x1\n\
-	lsls r1, 16\n\
-	lsrs r3, r1, 16\n\
-	asrs r1, 16\n\
-	movs r2, 0x10\n\
-	ldrsh r0, [r4, r2]\n\
-	cmp r1, r0\n\
-	blt _080D3F96\n\
-_080D3FBC:\n\
-	ldrh r3, [r4, 0x10]\n\
-	lsls r2, r3, 16\n\
-	asrs r1, r2, 16\n\
-	movs r3, 0x12\n\
-	ldrsh r0, [r4, r3]\n\
-	cmp r1, r0\n\
-	bge _080D3FF0\n\
-	ldr r6, =gScanlineEffectRegBuffers\n\
-	ldr r5, =gScanlineEffect\n\
-_080D3FCE:\n\
-	asrs r3, r2, 16\n\
-	lsls r2, r3, 1\n\
-	ldrb r1, [r5, 0x14]\n\
-	lsls r0, r1, 4\n\
-	subs r0, r1\n\
-	lsls r0, 7\n\
-	adds r2, r0\n\
-	adds r2, r6\n\
-	ldrh r0, [r4, 0xA]\n\
-	strh r0, [r2]\n\
-	adds r3, 0x1\n\
-	lsls r2, r3, 16\n\
-	asrs r1, r2, 16\n\
-	movs r3, 0x12\n\
-	ldrsh r0, [r4, r3]\n\
-	cmp r1, r0\n\
-	blt _080D3FCE\n\
-_080D3FF0:\n\
-	ldrh r3, [r4, 0x12]\n\
-	lsls r1, r3, 16\n\
-	asrs r0, r1, 16\n\
-	cmp r0, 0x9F\n\
-	bgt _080D401C\n\
-	ldr r6, =gScanlineEffectRegBuffers\n\
-	ldr r5, =gScanlineEffect\n\
-_080D3FFE:\n\
-	asrs r3, r1, 16\n\
-	lsls r2, r3, 1\n\
-	ldrb r1, [r5, 0x14]\n\
-	lsls r0, r1, 4\n\
-	subs r0, r1\n\
-	lsls r0, 7\n\
-	adds r2, r0\n\
-	adds r2, r6\n\
-	ldrh r0, [r4, 0xC]\n\
-	strh r0, [r2]\n\
-	adds r3, 0x1\n\
-	lsls r1, r3, 16\n\
-	asrs r0, r1, 16\n\
-	cmp r0, 0x9F\n\
-	ble _080D3FFE\n\
-_080D401C:\n\
-	movs r0, 0x26\n\
-	ldrsh r1, [r4, r0]\n\
-	movs r0, 0x1\n\
-	negs r0, r0\n\
-	cmp r1, r0\n\
-	bne _080D4032\n\
-	bl ScanlineEffect_Stop\n\
-	adds r0, r7, 0\n\
-	bl DestroyTask\n\
-_080D4032:\n\
-	add sp, 0xC\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.align 2, 0\n\
-	.pool\n");
-}
-#endif
 
 void sub_80D4044(struct Sprite *sprite)
 {
@@ -1892,17 +1289,32 @@ void sub_80D4CEC(struct Sprite *sprite)
     sprite->data[0]++;
 }
 
-#ifdef NONMATCHING
-void sub_80D4D64(struct Sprite *sprite, int xDiff, int yDiff)
+void sub_80D4D64(struct Sprite *sprite, s32 xDiff, s32 yDiff)
 {
-    s16 something = sprite->data[0] / 2;
-    s16 combinedX = sprite->pos1.x + sprite->pos2.x;
-    s16 combinedY = sprite->pos1.y + sprite->pos2.y;
-    s16 randomSomethingY = yDiff + (Random() % 10) - 5;
-    s16 randomSomethingX = -xDiff + (Random() % 10) - 5;
     s16 i;
     u8 spriteId;
 
+    s16 combinedX;
+    s16 combinedY;
+    s16 something;
+    s16 randomSomethingX;
+    s16 randomSomethingY;
+
+    something = sprite->data[0] / 2;
+    // regalloc acts strange here...
+    combinedX = sprite->pos1.x + sprite->pos2.x;
+    combinedY = sprite->pos1.y + sprite->pos2.y;
+
+    // ...then goes back to normal right here.
+    // Nothing but this appears to reproduce the behavior.
+    if (xDiff) // yDiff works too, but not sprite.
+    {
+        u8 unk = -unk; // this can be any sort of negation
+    }
+
+    randomSomethingY = yDiff + (Random() % 10) - 5;
+    randomSomethingX = -xDiff + (Random() % 10) - 5;
+
     for (i = 0; i <= 0; i++)
     {
         spriteId = CreateSprite(&gSpriteTemplate_83D9420, combinedX, combinedY + something, 130);
@@ -1926,184 +1338,3 @@ void sub_80D4D64(struct Sprite *sprite, int xDiff, int yDiff)
             gSprites[spriteId].data[2] = randomSomethingX;
     }
 }
-#else
-NAKED
-void sub_80D4D64(struct Sprite *sprite, int xDiff, int yDiff)
-{
-    asm_unified("push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0x18\n\
-	adds r4, r1, 0\n\
-	adds r5, r2, 0\n\
-	movs r2, 0x2E\n\
-	ldrsh r1, [r0, r2]\n\
-	lsrs r2, r1, 31\n\
-	adds r1, r2\n\
-	lsls r1, 15\n\
-	lsrs r1, 16\n\
-	str r1, [sp]\n\
-	ldrh r1, [r0, 0x24]\n\
-	ldrh r3, [r0, 0x20]\n\
-	adds r1, r3\n\
-	lsls r1, 16\n\
-	lsrs r1, 16\n\
-	mov r8, r1\n\
-	ldrh r1, [r0, 0x26]\n\
-	ldrh r0, [r0, 0x22]\n\
-	adds r1, r0\n\
-	lsls r1, 16\n\
-	lsrs r1, 16\n\
-	mov r10, r1\n\
-	bl Random\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	movs r1, 0xA\n\
-	bl __umodsi3\n\
-	adds r0, r5, r0\n\
-	subs r0, 0x5\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	mov r9, r0\n\
-	bl Random\n\
-	negs r4, r4\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	movs r1, 0xA\n\
-	bl __umodsi3\n\
-	adds r4, r0\n\
-	subs r4, 0x5\n\
-	lsls r4, 16\n\
-	lsrs r7, r4, 16\n\
-	movs r6, 0\n\
-	mov r0, r8\n\
-	lsls r0, 16\n\
-	mov r8, r0\n\
-	mov r1, r10\n\
-	lsls r1, 16\n\
-	str r1, [sp, 0xC]\n\
-	ldr r2, [sp]\n\
-	lsls r2, 16\n\
-	str r2, [sp, 0x10]\n\
-	asrs r1, 16\n\
-	lsls r0, r7, 16\n\
-	asrs r5, r0, 16\n\
-	str r0, [sp, 0x14]\n\
-	negs r3, r5\n\
-	str r3, [sp, 0x4]\n\
-	asrs r0, r2, 16\n\
-	adds r1, r0\n\
-	lsls r1, 16\n\
-	mov r10, r1\n\
-_080D4DF2:\n\
-	ldr r0, =gSpriteTemplate_83D9420\n\
-	mov r2, r8\n\
-	asrs r1, r2, 16\n\
-	mov r3, r10\n\
-	asrs r2, r3, 16\n\
-	movs r3, 0x82\n\
-	bl CreateSprite\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
-	ldr r1, =gSprites\n\
-	lsls r0, r2, 4\n\
-	adds r0, r2\n\
-	lsls r0, 2\n\
-	adds r4, r0, r1\n\
-	movs r0, 0x14\n\
-	strh r0, [r4, 0x2E]\n\
-	mov r0, r9\n\
-	strh r0, [r4, 0x30]\n\
-	ldr r0, =gBattleAnimAttacker\n\
-	ldrb r0, [r0]\n\
-	bl GetBattlerSubpriority\n\
-	subs r0, 0x1\n\
-	adds r1, r4, 0\n\
-	adds r1, 0x43\n\
-	strb r0, [r1]\n\
-	cmp r5, 0\n\
-	bge _080D4E40\n\
-	mov r1, sp\n\
-	ldrh r1, [r1, 0x4]\n\
-	strh r1, [r4, 0x32]\n\
-	b _080D4E42\n\
-	.align 2, 0\n\
-	.pool\n\
-_080D4E40:\n\
-	strh r7, [r4, 0x32]\n\
-_080D4E42:\n\
-	lsls r0, r6, 16\n\
-	movs r2, 0x80\n\
-	lsls r2, 9\n\
-	adds r0, r2\n\
-	lsrs r6, r0, 16\n\
-	cmp r0, 0\n\
-	ble _080D4DF2\n\
-	movs r6, 0\n\
-	ldr r3, [sp, 0xC]\n\
-	asrs r1, r3, 16\n\
-	ldr r0, [sp, 0x14]\n\
-	asrs r5, r0, 16\n\
-	negs r2, r5\n\
-	str r2, [sp, 0x8]\n\
-	ldr r3, [sp, 0x10]\n\
-	asrs r0, r3, 16\n\
-	subs r1, r0\n\
-	lsls r1, 16\n\
-	mov r10, r1\n\
-_080D4E68:\n\
-	ldr r0, =gSpriteTemplate_83D9420\n\
-	mov r2, r8\n\
-	asrs r1, r2, 16\n\
-	mov r3, r10\n\
-	asrs r2, r3, 16\n\
-	movs r3, 0x82\n\
-	bl CreateSprite\n\
-	lsls r0, 24\n\
-	lsrs r2, r0, 24\n\
-	ldr r1, =gSprites\n\
-	lsls r0, r2, 4\n\
-	adds r0, r2\n\
-	lsls r0, 2\n\
-	adds r4, r0, r1\n\
-	movs r0, 0x14\n\
-	strh r0, [r4, 0x2E]\n\
-	mov r0, r9\n\
-	strh r0, [r4, 0x30]\n\
-	ldr r0, =gBattleAnimAttacker\n\
-	ldrb r0, [r0]\n\
-	bl GetBattlerSubpriority\n\
-	subs r0, 0x1\n\
-	adds r1, r4, 0\n\
-	adds r1, 0x43\n\
-	strb r0, [r1]\n\
-	cmp r5, 0\n\
-	ble _080D4EB8\n\
-	mov r1, sp\n\
-	ldrh r1, [r1, 0x8]\n\
-	strh r1, [r4, 0x32]\n\
-	b _080D4EBA\n\
-	.align 2, 0\n\
-	.pool\n\
-_080D4EB8:\n\
-	strh r7, [r4, 0x32]\n\
-_080D4EBA:\n\
-	lsls r0, r6, 16\n\
-	movs r2, 0x80\n\
-	lsls r2, 9\n\
-	adds r0, r2\n\
-	lsrs r6, r0, 16\n\
-	cmp r0, 0\n\
-	ble _080D4E68\n\
-	add sp, 0x18\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n");
-}
-#endif