sub_80C5E38

2 files changed, 76 insertions, 201 deletions

diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s
index 9d36df66c..858607424 100644
--- a/asm/pc_screen_effect.s
+++ b/asm/pc_screen_effect.s
@@ -5,178 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80C5E38
-sub_80C5E38: @ 80C5E38
-	push {r4-r7,lr}
-	sub sp, 0x28
-	adds r7, r0, 0
-	ldr r0, _080C5EC8 @ =gUnknown_083D1898
-	ldr r1, [r0, 0x4]
-	ldr r0, [r0]
-	str r0, [sp, 0x18]
-	str r1, [sp, 0x1C]
-	ldr r0, _080C5ECC @ =gUnknown_083D18A0
-	ldr r1, [r0, 0x4]
-	ldr r0, [r0]
-	str r0, [sp, 0x20]
-	str r1, [sp, 0x24]
-	mov r1, sp
-	ldr r0, _080C5ED0 @ =gSpriteTemplate_83D18C0
-	ldm r0!, {r2-r4}
-	stm r1!, {r2-r4}
-	ldm r0!, {r2-r4}
-	stm r1!, {r2-r4}
-	ldrh r3, [r7]
-	lsls r2, r3, 16
-	add r0, sp, 0x18
-	ldrh r1, [r0, 0x4]
-	orrs r1, r2
-	str r1, [r0, 0x4]
-	mov r1, sp
-	movs r6, 0
-	strh r3, [r1]
-	ldrh r2, [r7, 0x2]
-	ldr r5, _080C5ED4 @ =0xffff0000
-	add r4, sp, 0x20
-	ldr r1, [r4, 0x4]
-	ands r1, r5
-	orrs r1, r2
-	str r1, [r4, 0x4]
-	mov r1, sp
-	strh r2, [r1, 0x2]
-	bl LoadSpriteSheet
-	adds r0, r4, 0
-	bl LoadSpritePalette
-	movs r0, 0x50
-	strh r0, [r7, 0xC]
-	strh r6, [r7, 0x8]
-	strh r6, [r7, 0xA]
-	ldrh r0, [r7, 0x2]
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x80
-	lsls r1, 9
-	lsls r1, r0
-	bics r5, r1
-	str r5, [r7, 0x10]
-	ldrh r0, [r7, 0x4]
-	cmp r0, 0
-	bne _080C5EB2
-	movs r0, 0x10
-	strh r0, [r7, 0x4]
-_080C5EB2:
-	ldrh r0, [r7, 0x6]
-	cmp r0, 0
-	bne _080C5EBC
-	movs r0, 0x14
-	strh r0, [r7, 0x6]
-_080C5EBC:
-	ldr r0, _080C5ED8 @ =gUnknown_020387EC
-	str r7, [r0]
-	movs r5, 0
-	ldr r6, _080C5EDC @ =gSprites
-	b _080C5F4A
-	.align 2, 0
-_080C5EC8: .4byte gUnknown_083D1898
-_080C5ECC: .4byte gUnknown_083D18A0
-_080C5ED0: .4byte gSpriteTemplate_83D18C0
-_080C5ED4: .4byte 0xffff0000
-_080C5ED8: .4byte gUnknown_020387EC
-_080C5EDC: .4byte gSprites
-_080C5EE0:
-	lsls r2, r3, 4
-	adds r1, r2, r3
-	lsls r1, 2
-	adds r1, r6
-	ldrh r0, [r7, 0x4]
-	strh r0, [r1, 0x2E]
-	movs r0, 0x1
-	strh r0, [r1, 0x30]
-	ldr r1, _080C5EF4 @ =gSprites
-	b _080C5F2A
-	.align 2, 0
-_080C5EF4: .4byte gSprites
-_080C5EF8:
-	lsls r1, r5, 21
-	movs r0, 0x80
-	lsls r0, 16
-	adds r1, r0
-	asrs r1, 16
-	mov r0, sp
-	movs r2, 0x50
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x40
-	beq _080C5F6E
-	lsls r2, r3, 4
-	adds r1, r2, r3
-	lsls r1, 2
-	adds r1, r6
-	ldrh r0, [r7, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x2E]
-	ldr r0, _080C5F88 @ =0x0000ffff
-	strh r0, [r1, 0x30]
-	ldr r1, _080C5F8C @ =gSprites
-	lsls r4, r5, 5
-_080C5F2A:
-	adds r0, r2, r3
-	lsls r0, 2
-	adds r0, r1
-	adds r1, r4, 0
-	adds r1, 0x8
-	movs r2, 0
-	strh r1, [r0, 0x32]
-	strh r2, [r0, 0x36]
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-_080C5F4A:
-	cmp r5, 0x7
-	bhi _080C5F6E
-	cmp r5, 0x3
-	bhi _080C5EF8
-	lsls r4, r5, 5
-	adds r1, r4, 0
-	subs r1, 0x70
-	lsls r1, 16
-	asrs r1, 16
-	mov r0, sp
-	movs r2, 0x50
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x40
-	bne _080C5EE0
-_080C5F6E:
-	ldr r1, _080C5F90 @ =REG_BLDCNT
-	movs r0, 0xFF
-	strh r0, [r1]
-	adds r1, 0x4
-	movs r0, 0x10
-	strh r0, [r1]
-	ldr r0, _080C5F94 @ =sub_80C6078
-	bl sub_80C61B0
-	add sp, 0x28
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080C5F88: .4byte 0x0000ffff
-_080C5F8C: .4byte gSprites
-_080C5F90: .4byte REG_BLDCNT
-_080C5F94: .4byte sub_80C6078
-	thumb_func_end sub_80C5E38
-
 	thumb_func_start sub_80C5F98
 sub_80C5F98: @ 80C5F98
 	push {r4,lr}
diff --git a/src/pc_screen_effect.c b/src/pc_screen_effect.c
index cbc050445..4714cdb62 100644
--- a/src/pc_screen_effect.c
+++ b/src/pc_screen_effect.c
@@ -30,39 +30,22 @@ u8 gUnknownGfx_083D190C[] = INCBIN_U8("graphics/unknown/unknown_3D190C.4bpp");
 
 EWRAM_DATA struct PCScreenEffectStruct *gUnknown_020387EC = NULL;
 
-const struct SpriteSheet gUnknown_083D1898 = { gUnknownGfx_083D190C, sizeof(gUnknownGfx_083D190C), 0 };
-
-const struct SpritePalette gUnknown_083D18A0 = { gUnknownPal_083D18EC, 0 };
-
-const struct SpriteTemplate gSpriteTemplate_83D18A8 =
-{
-    0,
-    0,
-    &gOamData_83D18D8,
-    gSpriteAnimTable_83D18E8,
-    NULL,
-    gDummySpriteAffineAnimTable,
-    sub_80C60CC,
-};
-
-const struct SpriteTemplate gSpriteTemplate_83D18C0 =
-{
-    0,
-    0,
-    &gOamData_83D18D8,
-    gSpriteAnimTable_83D18E8,
-    NULL,
-    gDummySpriteAffineAnimTable,
-    sub_80C6130,
-};
-
 void sub_80C5CD4(struct PCScreenEffectStruct *unkStruct)
 {
     u16 i;
 
-    struct SpriteSheet sprSheet = gUnknown_083D1898;
-    struct SpritePalette sprPalette = gUnknown_083D18A0;
-    struct SpriteTemplate sprTemplate = gSpriteTemplate_83D18A8;
+    struct SpriteSheet sprSheet = { gUnknownGfx_083D190C, sizeof(gUnknownGfx_083D190C), 0 };
+    struct SpritePalette sprPalette = { gUnknownPal_083D18EC, 0 };
+    struct SpriteTemplate sprTemplate =
+        {
+            0,
+            0,
+            &gOamData_83D18D8,
+            gSpriteAnimTable_83D18E8,
+            NULL,
+            gDummySpriteAffineAnimTable,
+            sub_80C60CC,
+        };
 
     sprSheet.tag = unkStruct->tileTag;
     sprTemplate.tileTag =  unkStruct->tileTag;
@@ -124,3 +107,67 @@ bool8 sub_80C5DCC(void)
         return FALSE;
     }
 }
+
+void sub_80C5E38(struct PCScreenEffectStruct * a0)
+{
+    u16 i;
+    u8 spriteId;
+
+    struct SpriteSheet spriteSheet = { gUnknownGfx_083D190C, sizeof(gUnknownGfx_083D190C), 0 };
+    struct SpritePalette spritePalette = { gUnknownPal_083D18EC, 0 };
+    struct SpriteTemplate spriteTemplate =
+        {
+            0,
+            0,
+            &gOamData_83D18D8,
+            gSpriteAnimTable_83D18E8,
+            NULL,
+            gDummySpriteAffineAnimTable,
+            sub_80C6130,
+        };
+
+    spriteSheet.tag = a0->tileTag;
+    spriteTemplate.tileTag = a0->tileTag;
+    spritePalette.tag = a0->paletteTag;
+    spriteTemplate.paletteTag = a0->paletteTag;
+
+    LoadSpriteSheet(&spriteSheet);
+    LoadSpritePalette(&spritePalette);
+
+    a0->unk0C = 0x50;
+    a0->unk08 = 0;
+    a0->unk0A = 0;
+    a0->selectedPalettes = 0xffff0000 & ~(0x10000 << IndexOfSpritePaletteTag(a0->paletteTag));
+    if (a0->unk04 == 0)
+        a0->unk04 = 16;
+    if (a0->unk06 == 0)
+        a0->unk06 = 20;
+    gUnknown_020387EC = a0;
+
+    for (i = 0; i < 8; i++)
+    {
+        if (i < 4)
+        {
+            spriteId = CreateSprite(&spriteTemplate, i * 32 - 0x70, 0x50, 0);
+            if (spriteId == MAX_SPRITES)
+                break;
+            gSprites[spriteId].data[0] = a0->unk04;
+            gSprites[spriteId].data[1] = 1;
+        }
+        else
+        {
+            // Fakematching
+            spriteId = CreateSprite(&spriteTemplate, ((i << 21) + (0x80 << 16)) >> 16, 0x50, 0);
+            if (spriteId == MAX_SPRITES)
+                break;
+            gSprites[spriteId].data[0] = -a0->unk04;
+            gSprites[spriteId].data[1] = -1;
+        }
+        gSprites[spriteId].data[2] = i * 32 + 8;
+        gSprites[spriteId].data[4] = 0;
+        gSprites[spriteId].invisible = TRUE;
+    }
+    REG_BLDCNT = BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN;
+    REG_BLDY = 16;
+    sub_80C61B0(sub_80C6078);
+}