Merge pull request #90 from jiangzhengwenjz/nonmatching

'real' match CopyTileMapEntry

1 files changed, 50 insertions, 345 deletions

diff --git a/src/bg.c b/src/bg.c
index 18cb4ec05..33a462707 100644
--- a/src/bg.c
+++ b/src/bg.c
@@ -1024,295 +1024,49 @@ void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u
 {
     CopyRectToBgTilemapBufferRect(bg, src, 0, 0, rectWidth, rectHeight, destX, destY, rectWidth, rectHeight, palette, 0, 0);
 }
-// Skipping for now, it probably uses structs passed by value
-/*
-void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
-{
-    u16 attribute;
-    u16 mode;
-    u16 mode2;
 
-    void* srcCopy;
-    u16 destX16;
-    u16 destY16;
+void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 unused, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, s16 palette1, s16 tileOffset)
+{
+    u16 screenWidth, screenHeight, screenSize;
+    u16 var;
+    const void *srcPtr;
+    u16 i, j;
 
-    if (IsInvalidBg32(bg) == FALSE && IsTileMapOutsideWram(bg) == FALSE)
+    if (!IsInvalidBg32(bg) && !IsTileMapOutsideWram(bg))
     {
-        attribute = GetBgControlAttribute(bg, BG_CTRL_ATTR_SCREENSIZE);
-        mode = GetBgMetricTextMode(bg, 0x1) * 0x20;
-        mode2 = GetBgMetricTextMode(bg, 0x2) * 0x20;
+        screenSize = GetBgControlAttribute(bg, BG_CTRL_ATTR_SCREENSIZE);
+        screenWidth = GetBgMetricTextMode(bg, 0x1) * 0x20;
+        screenHeight = GetBgMetricTextMode(bg, 0x2) * 0x20;
         switch (GetBgType(bg))
         {
-            case 0:
-                srcCopy = src;
-                for (destY16 = destY; destY16 < (destY + rectHeight); destY16++)
+        case 0:
+            srcPtr = src + ((srcY * srcWidth) + srcX) * 2;
+            for (i = destX; i < (destX + rectWidth); i++)
+            {
+                for (j = srcHeight; j < (srcHeight + destY); j++)
                 {
-                    for (destX16 = destX; destX16 < (destX + rectWidth); destX16++)
-                    {
-                        CopyTileMapEntry(&((u16*)srcCopy)[(srcY * rectWidth) + srcX], &((u16*)sGpuBgConfigs2[bg].tilemap)[GetTileMapIndexFromCoords(destX16, destY16, attribute, mode, mode2)], palette1, tileOffset, palette2);
-                    }
+                    u16 index = GetTileMapIndexFromCoords(j, i, screenSize, screenWidth, screenHeight);
+                    CopyTileMapEntry(srcPtr, sGpuBgConfigs2[bg].tilemap + (index * 2), rectHeight, palette1, tileOffset);
+                    srcPtr += 2;
                 }
-                break;
-            case 1:
-                srcCopy = src;
-                mode = GetBgMetricAffineMode(bg, 0x1);
-                for (destY16 = destY; destY16 < (destY + rectHeight); destY16++)
+                srcPtr += (srcWidth - destY) * 2;
+            }
+            break;
+        case 1:
+            srcPtr = src + ((srcY * srcWidth) + srcX);
+            var = GetBgMetricAffineMode(bg, 0x1);
+            for (i = destX; i < (destX + rectWidth); i++)
+            {
+                for (j = srcHeight; j < (srcHeight + destY); j++)
                 {
-                    for (destX16 = destX; destX16 < (destX + rectWidth); destX16++)
-                    {
-                        CopyTileMapEntry(&((u16*)srcCopy)[(srcY * rectWidth) + srcX], &((u16*)sGpuBgConfigs2[bg].tilemap)[GetTileMapIndexFromCoords(destX16, destY16, attribute, mode, mode2)], palette1, tileOffset, palette2);
-                    }
+                    *(u8*)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8*)(srcPtr) + palette1;
+                    srcPtr++;
                 }
-                break;
+                srcPtr += (srcWidth - destY);
+            }
+            break;
         }
     }
-}*/
-NAKED
-void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2)
-{
-    asm("push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, #0x40\n\
-    str r1, [sp, #0x8]\n\
-    ldr r1, [sp, #0x60]\n\
-    ldr r4, [sp, #0x68]\n\
-    ldr r5, [sp, #0x6C]\n\
-    ldr r6, [sp, #0x70]\n\
-    ldr r7, [sp, #0x74]\n\
-    mov r8, r7\n\
-    ldr r7, [sp, #0x78]\n\
-    mov r9, r7\n\
-    ldr r7, [sp, #0x7C]\n\
-    mov r10, r7\n\
-    ldr r7, [sp, #0x80]\n\
-    mov r12, r7\n\
-    lsl r0, #24\n\
-    lsr r0, #24\n\
-    str r0, [sp, #0x4]\n\
-    lsl r2, #24\n\
-    lsr r2, #24\n\
-    str r2, [sp, #0xC]\n\
-    lsl r3, #24\n\
-    lsr r3, #24\n\
-    str r3, [sp, #0x10]\n\
-    lsl r1, #24\n\
-    lsr r7, r1, #24\n\
-    lsl r4, #24\n\
-    lsr r4, #24\n\
-    str r4, [sp, #0x14]\n\
-    lsl r5, #24\n\
-    lsr r5, #24\n\
-    lsl r6, #24\n\
-    lsr r6, #24\n\
-    str r6, [sp, #0x18]\n\
-    mov r0, r8\n\
-    lsl r0, #24\n\
-    lsr r4, r0, #24\n\
-    mov r1, r9\n\
-    lsl r1, #24\n\
-    lsr r1, #24\n\
-    str r1, [sp, #0x1C]\n\
-    mov r2, r10\n\
-    lsl r2, #16\n\
-    lsr r2, #16\n\
-    str r2, [sp, #0x20]\n\
-    mov r0, r12\n\
-    lsl r0, #16\n\
-    lsr r0, #16\n\
-    str r0, [sp, #0x24]\n\
-    ldr r0, [sp, #0x4]\n\
-    bl IsInvalidBg32\n\
-    cmp r0, #0\n\
-    beq _08002592\n\
-    b _080026EE\n\
-_08002592:\n\
-    ldr r0, [sp, #0x4]\n\
-    bl IsTileMapOutsideWram\n\
-    cmp r0, #0\n\
-    beq _0800259E\n\
-    b _080026EE\n\
-_0800259E:\n\
-    ldr r0, [sp, #0x4]\n\
-    mov r1, #0x4\n\
-    bl GetBgControlAttribute\n\
-    lsl r0, #16\n\
-    lsr r0, #16\n\
-    str r0, [sp, #0x30]\n\
-    ldr r0, [sp, #0x4]\n\
-    mov r1, #0x1\n\
-    bl GetBgMetricTextMode\n\
-    lsl r0, #21\n\
-    lsr r0, #16\n\
-    str r0, [sp, #0x28]\n\
-    ldr r0, [sp, #0x4]\n\
-    mov r1, #0x2\n\
-    bl GetBgMetricTextMode\n\
-    lsl r0, #21\n\
-    lsr r0, #16\n\
-    str r0, [sp, #0x2C]\n\
-    ldr r0, [sp, #0x4]\n\
-    bl GetBgType\n\
-    cmp r0, #0\n\
-    beq _080025D8\n\
-    cmp r0, #0x1\n\
-    beq _08002674\n\
-    b _080026EE\n\
-_080025D8:\n\
-    ldr r1, [sp, #0x10]\n\
-    add r0, r1, #0\n\
-    mul r0, r7\n\
-    ldr r2, [sp, #0xC]\n\
-    add r0, r2\n\
-    lsl r0, #1\n\
-    ldr r1, [sp, #0x8]\n\
-    add r6, r1, r0\n\
-    add r0, r5, r4\n\
-    cmp r5, r0\n\
-    blt _080025F0\n\
-    b _080026EE\n\
-_080025F0:\n\
-    ldr r2, [sp, #0x18]\n\
-    sub r2, r7, r2\n\
-    str r2, [sp, #0x34]\n\
-    str r0, [sp, #0x38]\n\
-_080025F8:\n\
-    ldr r4, [sp, #0x14]\n\
-    ldr r7, [sp, #0x18]\n\
-    add r0, r4, r7\n\
-    add r1, r5, #0x1\n\
-    str r1, [sp, #0x3C]\n\
-    cmp r4, r0\n\
-    bge _0800265A\n\
-    ldr r2, [sp, #0x4]\n\
-    lsl r0, r2, #4\n\
-    ldr r1, =sGpuBgConfigs2+4\n\
-    add r0, r1\n\
-    mov r10, r0\n\
-    ldr r7, [sp, #0x20]\n\
-    lsl r7, #16\n\
-    mov r9, r7\n\
-    ldr r1, [sp, #0x24]\n\
-    lsl r0, r1, #16\n\
-    asr r0, #16\n\
-    mov r8, r0\n\
-_0800261E:\n\
-    ldr r2, [sp, #0x2C]\n\
-    str r2, [sp]\n\
-    add r0, r4, #0\n\
-    add r1, r5, #0\n\
-    ldr r2, [sp, #0x30]\n\
-    ldr r3, [sp, #0x28]\n\
-    bl GetTileMapIndexFromCoords\n\
-    lsl r0, #16\n\
-    lsr r0, #15\n\
-    mov r7, r10\n\
-    ldr r1, [r7]\n\
-    add r1, r0\n\
-    mov r0, r8\n\
-    str r0, [sp]\n\
-    add r0, r6, #0\n\
-    ldr r2, [sp, #0x1C]\n\
-    mov r7, r9\n\
-    asr r3, r7, #16\n\
-    bl CopyTileMapEntry\n\
-    add r6, #0x2\n\
-    add r0, r4, #0x1\n\
-    lsl r0, #16\n\
-    lsr r4, r0, #16\n\
-    ldr r1, [sp, #0x14]\n\
-    ldr r2, [sp, #0x18]\n\
-    add r0, r1, r2\n\
-    cmp r4, r0\n\
-    blt _0800261E\n\
-_0800265A:\n\
-    ldr r5, [sp, #0x34]\n\
-    lsl r0, r5, #1\n\
-    add r6, r0\n\
-    ldr r7, [sp, #0x3C]\n\
-    lsl r0, r7, #16\n\
-    lsr r5, r0, #16\n\
-    ldr r0, [sp, #0x38]\n\
-    cmp r5, r0\n\
-    blt _080025F8\n\
-    b _080026EE\n\
-    .pool\n\
-_08002674:\n\
-    ldr r1, [sp, #0x10]\n\
-    add r0, r1, #0\n\
-    mul r0, r7\n\
-    ldr r2, [sp, #0xC]\n\
-    add r0, r2\n\
-    ldr r1, [sp, #0x8]\n\
-    add r6, r1, r0\n\
-    ldr r0, [sp, #0x4]\n\
-    mov r1, #0x1\n\
-    bl GetBgMetricAffineMode\n\
-    lsl r0, #16\n\
-    lsr r0, #16\n\
-    mov r9, r0\n\
-    add r0, r5, r4\n\
-    cmp r5, r0\n\
-    bge _080026EE\n\
-    ldr r2, [sp, #0x18]\n\
-    sub r2, r7, r2\n\
-    str r2, [sp, #0x34]\n\
-    str r0, [sp, #0x38]\n\
-    ldr r7, =sGpuBgConfigs2+4\n\
-    mov r10, r7\n\
-    ldr r0, [sp, #0x4]\n\
-    lsl r0, #4\n\
-    mov r8, r0\n\
-_080026A8:\n\
-    ldr r4, [sp, #0x14]\n\
-    ldr r1, [sp, #0x18]\n\
-    add r0, r4, r1\n\
-    add r2, r5, #0x1\n\
-    str r2, [sp, #0x3C]\n\
-    cmp r4, r0\n\
-    bge _080026DE\n\
-    mov r3, r8\n\
-    add r3, r10\n\
-    mov r7, r9\n\
-    mul r7, r5\n\
-    mov r12, r7\n\
-    add r2, r0, #0\n\
-_080026C2:\n\
-    ldr r1, [r3]\n\
-    mov r5, r12\n\
-    add r0, r5, r4\n\
-    add r1, r0\n\
-    ldrb r0, [r6]\n\
-    ldr r7, [sp, #0x20]\n\
-    add r0, r7\n\
-    strb r0, [r1]\n\
-    add r6, #0x1\n\
-    add r0, r4, #0x1\n\
-    lsl r0, #16\n\
-    lsr r4, r0, #16\n\
-    cmp r4, r2\n\
-    blt _080026C2\n\
-_080026DE:\n\
-    ldr r0, [sp, #0x34]\n\
-    add r6, r0\n\
-    ldr r1, [sp, #0x3C]\n\
-    lsl r0, r1, #16\n\
-    lsr r5, r0, #16\n\
-    ldr r2, [sp, #0x38]\n\
-    cmp r5, r2\n\
-    blt _080026A8\n\
-_080026EE:\n\
-    add sp, #0x40\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\
-    .pool\n");
 }
 
 void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height)
@@ -1494,78 +1248,29 @@ u32 GetTileMapIndexFromCoords(s32 x, s32 y, s32 screenSize, u32 screenWidth, u32
     return (y * 0x20) + x;
 }
 
-#ifdef NONMATCHING // This one has some weird switch statement cases that refuse to cooperate
-void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 palette2)
+void CopyTileMapEntry(const u16 *src, u16 *dest, s32 palette1, s32 tileOffset, s32 palette2)
 {
-    u16 test;
+    u16 var;
+
+    if (palette1 == 16)
+        goto CASE_16;
     switch (palette1)
     {
-        default:
-            if (palette1 > 0x10 || palette1 < 0)
-                test = *src + tileOffset + (palette2 << 12);
-            else
-                test = ((*src + tileOffset) & 0xFFF) + ((palette1 + palette2) << 12);
-            break;
-        case 0x10:
-            test = ((*dest & 0xFC00) + (palette2 << 12)) | ((*src + tileOffset) & 0x3FF);
-            break;
+    case 0 ... 16:
+        var = ((*src + tileOffset) & 0xFFF) + ((palette1 + palette2) << 12);
+        break;
+    CASE_16:
+        var = *dest;
+        var &= 0xFC00;
+        var += palette2 << 12;
+        var |= (*src + tileOffset) & 0x3FF;
+        break;
+    default:
+        var = *src + tileOffset + (palette2 << 12);
+        break;
     }
-
-    *dest = test;
+    *dest = var;
 }
-#else
-NAKED
-void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 palette2)
-{
-    asm("push {r4-r6,lr}\n\
-    add r4, r0, #0\n\
-    add r6, r1, #0\n\
-    ldr r5, [sp, #0x10]\n\
-    cmp r2, #0x10\n\
-    beq _08002B14\n\
-    cmp r2, #0x10\n\
-    bgt _08002B34\n\
-    cmp r2, #0\n\
-    blt _08002B34\n\
-    ldrh r0, [r4]\n\
-    add r0, r3\n\
-    ldr r3, =0x00000fff\n\
-    add r1, r3, #0\n\
-    and r0, r1\n\
-    add r1, r2, r5\n\
-    lsl r1, #12\n\
-    b _08002B3A\n\
-    .pool\n\
-_08002B14:\n\
-    ldrh r1, [r6]\n\
-    mov r0, #0xFC\n\
-    lsl r0, #8\n\
-    and r1, r0\n\
-    lsl r2, r5, #12\n\
-    add r2, r1, r2\n\
-    ldrh r0, [r4]\n\
-    add r0, r3\n\
-    ldr r3, =0x000003ff\n\
-    add r1, r3, #0\n\
-    and r0, r1\n\
-    orr r0, r2\n\
-    b _08002B3C\n\
-    .pool\n\
-_08002B34:\n\
-    ldrh r0, [r4]\n\
-    add r0, r3\n\
-    lsl r1, r5, #12\n\
-_08002B3A:\n\
-    add r0, r1\n\
-_08002B3C:\n\
-    lsl r0, #16\n\
-    lsr r1, r0, #16\n\
-    strh r1, [r6]\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n");
-}
-#endif // NONMATCHING
 
 u32 GetBgType(u8 bg)
 {