From 0f992c8f5c2440db63273b195157a3b6a6d624b6 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 27 Oct 2017 14:59:55 +0200
Subject: [PATCH] begin working on evolution graphics

---
 asm/evolution_graphics.s  | 44 +++++----------------------------------
 data/evolution_graphics.s |  3 ---
 ld_script.txt             |  2 ++
 src/evolution_graphics.c  | 31 +++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 42 deletions(-)
 create mode 100644 src/evolution_graphics.c

diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s
index df64857c7..8938ec224 100644
--- a/asm/evolution_graphics.s
+++ b/asm/evolution_graphics.s
@@ -5,40 +5,6 @@
 
 	.text
 
-	thumb_func_start nullsub_67
-nullsub_67: @ 817BA40
-	bx lr
-	thumb_func_end nullsub_67
-
-	thumb_func_start sub_817BA44
-sub_817BA44: @ 817BA44
-	push {r4,r5,lr}
-	sub sp, 0x4
-	movs r4, 0
-	ldr r5, =gUnknown_085F5458
-_0817BA4C:
-	adds r0, r4, 0
-	adds r0, 0x14
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r4, 1
-	adds r1, r5
-	ldrh r1, [r1]
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0
-	bl SetOamMatrix
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0xB
-	bls _0817BA4C
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_817BA44
 
 	thumb_func_start sub_817BA7C
 sub_817BA7C: @ 817BA7C
@@ -603,7 +569,7 @@ sub_817BEC4: @ 817BEC4
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_817BA44
+	bl SetEvoSparklesMatrices
 	ldr r0, =gTasks
 	lsls r5, r4, 2
 	adds r5, r4
@@ -738,7 +704,7 @@ sub_817BFCC: @ 817BFCC
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_817BA44
+	bl SetEvoSparklesMatrices
 	ldr r1, =gTasks
 	lsls r0, r4, 2
 	adds r0, r4
@@ -832,7 +798,7 @@ sub_817C080: @ 817C080
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_817BA44
+	bl SetEvoSparklesMatrices
 	ldr r1, =gTasks
 	lsls r0, r4, 2
 	adds r0, r4
@@ -958,7 +924,7 @@ sub_817C174: @ 817C174
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_817BA44
+	bl SetEvoSparklesMatrices
 	ldr r0, =gTasks
 	lsls r5, r4, 2
 	adds r5, r4
@@ -1105,7 +1071,7 @@ sub_817C2B0: @ 817C2B0
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_817BA44
+	bl SetEvoSparklesMatrices
 	ldr r0, =gTasks
 	lsls r5, r4, 2
 	adds r5, r4
diff --git a/data/evolution_graphics.s b/data/evolution_graphics.s
index d6ad2e578..6eee4f186 100644
--- a/data/evolution_graphics.s
+++ b/data/evolution_graphics.s
@@ -13,6 +13,3 @@ gUnknown_085F541C:: @ 85F541C
 
 gUnknown_085F5440:: @ 85F5440
 	.incbin "baserom.gba", 0x5f5440, 0x18
-
-gUnknown_085F5458:: @ 85F5458
-	.incbin "baserom.gba", 0x5f5458, 0x38
diff --git a/ld_script.txt b/ld_script.txt
index f655711dd..b7db38528 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -225,6 +225,7 @@ SECTIONS {
         asm/pokeblock_feed.o(.text);
         src/clear_save_data_screen.o(.text);
         asm/intro_credits_graphics.o(.text);
+        src/evolution_graphics.o(.text);
         asm/evolution_graphics.o(.text);
         asm/bard_music.o(.text);
         asm/fldeff_teleport.o(.text);
@@ -448,6 +449,7 @@ SECTIONS {
         src/clear_save_data_screen.o(.rodata);
         data/intro_credits_graphics.o(.rodata);
         data/evolution_graphics.o(.rodata);
+        src/evolution_graphics.o(.rodata);
         data/bard_music.o(.rodata);
         data/data_860A4AC.o(.rodata);
         data/battle_controller_recorded_opponent.o(.rodata);
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
new file mode 100644
index 000000000..7f24827a2
--- /dev/null
+++ b/src/evolution_graphics.c
@@ -0,0 +1,31 @@
+#include "global.h"
+//#include "evolution_graphics.h"
+#include "sprite.h"
+#include "trig.h"
+#include "rng.h"
+#include "decompress.h"
+#include "task.h"
+#include "sound.h"
+#include "songs.h"
+#include "palette.h"
+
+static const s16 sEvoSparkleMatricies[] =
+{
+    0x3C0, 0x380, 0x340, 0x300, 0x2C0, 0x280, 0x240, 0x200, 0x1C0,
+    0x180, 0x140, 0x100, -4, 0x10, -3, 0x30, -2, 0x50,
+    -1, 0x70, 0x1, 0x70, 0x2, 0x50, 0x3, 0x30, 0x4, 0x10
+};
+
+void EvoSparkle_DummySpriteCb(struct Sprite *sprite)
+{
+
+}
+
+void SetEvoSparklesMatrices(void)
+{
+    u16 i;
+    for (i = 0; i < 12; i++)
+    {
+        SetOamMatrix(20 + i, sEvoSparkleMatricies[i], 0, 0, sEvoSparkleMatricies[i]);
+    }
+}