From b6d48e054ae2bca2a3d849692cb0c7f90783da6a Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@student.pxl.be>
Date: Mon, 30 Oct 2023 19:40:20 +0100
Subject: [PATCH] Fine Tuning

---
 bin/DMGTRIS.GBC        | Bin 131072 -> 131072 bytes
 bin/DMGTRIS.pocket     | Bin 131072 -> 131072 bytes
 src/gbc.asm            |   4 ++--
 src/include/rgb555.asm |   6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC
index 7d56137b93640f52c2016ab0d7177cf5cf56deca..371de59597fc2b28d7767d9d7787b34227d19dd1 100644
GIT binary patch
delta 115
zcmZo@;Am*z*x<*=)b??60HYNn<L=4bOqNV`%#-J`iEqBk)WFDO#WXpd#e!+B*yI8Z
z@y#1pPJ<NHuvs$NZQjN<11ulF0hX_45#PL!Lr;uDL&5A9>w<qGldsFUv1z<wSzss9
NtSrA>S)TFk0{|^ZB)I?p

delta 115
zcmZo@;Am*z*x<*=)Zw@}fYFMPv3_zllO@xB=E-x}#5dn%YG7pg$2d8j#ezv*d~yMY
z_~s2Pr$LHp*en_MZ{Ef>11ulF0hX_45#PL!Lr;uDQNipN>w<q4ldsFUu_?Y{Szu?;
NtSrA>S)TFk0{}NzC0hUh

diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket
index 4e9c03cf74d1deb4415dae2952e00f1ccf73522a..be54f53cf16627f9089e9c32d51ac17d434fbf9f 100644
GIT binary patch
delta 115
zcmZo@;Am*z*x<*=)RMV5fYFMParfkICQBwe=E-x}#5dn%YG7otVwxP!V!<?5Y;pmI
z_~s2Pr$LHp*en_CHg98_0hSNo0L$02h;LrVp(n<np<wolb-_QO$=BuF*fd_TEU*)5
NR+itcEYEoN0RZ&rBr5;_

delta 115
zcmZo@;Am*z*x<*=)VgzX0HYNnWBufACQGLM%#-J`iEqBk)WFE}k8yH5iv^Rs_~Zf(
z@y#1pPJ<NHuvs$h-@J`&23S6T11w+9BEESchn^URqJr5k)&>8}CSR9xV^e&^vcS%)
NSy_I&vOMG62LNWDCCmT-

diff --git a/src/gbc.asm b/src/gbc.asm
index bc3e1ee..e184450 100644
--- a/src/gbc.asm
+++ b/src/gbc.asm
@@ -53,13 +53,13 @@ INCLUDE "globals.asm"
 
     ; L piece
     DEF_RGB555_FROM24 ORANGE_0, $BB, $5F, $00
-    DEF_RGB555_FROM24 ORANGE_1, $F7, $7D, $00
+    DEF_RGB555_FROM24 ORANGE_1, $D7, $8D, $00
     DEF_RGB555_FROM24 ORANGE_2, $F7, $9B, $3B
     DEF_RGB555_FROM24 ORANGE_3, $FF, $FF, $FF
 
     ; O piece
     DEF_RGB555_FROM24 YELLOW_0, $C0, $94, $23
-    DEF_RGB555_FROM24 YELLOW_1, $FB, $C0, $2D
+    DEF_RGB555_FROM24 YELLOW_1, $EB, $A0, $2D
     DEF_RGB555_FROM24 YELLOW_2, $FC, $CE, $5E
     DEF_RGB555_FROM24 YELLOW_3, $FF, $FF, $FF
 
diff --git a/src/include/rgb555.asm b/src/include/rgb555.asm
index f019619..cb7f181 100644
--- a/src/include/rgb555.asm
+++ b/src/include/rgb555.asm
@@ -146,9 +146,9 @@ MACRO DEF_RGB555_FROM24
     DEF R_C1 EQU (MUL(R_C0, +1.15039q25, 25) + MUL(G_C0, -0.22976q25, 25) + MUL(B_C0, +0.07949q25, 25))
     DEF G_C1 EQU (MUL(R_C0, +0.02568q25, 25) + MUL(G_C0, +1.48972q25, 25) + MUL(B_C0, -0.51540q25, 25))
     DEF B_C1 EQU (MUL(R_C0, -0.17271q25, 25) + MUL(G_C0, -0.18713q25, 25) + MUL(B_C0, +1.35983q25, 25))
-    ; DEF R_C1 EQU (MUL(R_C0, +1.0q25, 25) + MUL(G_C0, +0.0q25, 25) + MUL(B_C0, +0.0q25, 25))
-    ; DEF G_C1 EQU (MUL(R_C0, +0.0q25, 25) + MUL(G_C0, +1.0q25, 25) + MUL(B_C0, +0.0q25, 25))
-    ; DEF B_C1 EQU (MUL(R_C0, +0.0q25, 25) + MUL(G_C0, +0.0q25, 25) + MUL(B_C0, +1.0q25, 25))
+    ; DEF R_C1 EQU (MUL(R_C0, +0.86629q25, 25) + MUL(G_C0, +0.13361q25, 25) + MUL(B_C0, +0.00000q25, 25))
+    ; DEF G_C1 EQU (MUL(R_C0, +0.02429q25, 25) + MUL(G_C0, +0.70857q25, 25) + MUL(B_C0, +0.25714q25, 25))
+    ; DEF B_C1 EQU (MUL(R_C0, +0.11337q25, 25) + MUL(G_C0, +0.11448q25, 25) + MUL(B_C0, +0.77215q25, 25))
 
 
     ; To display gamma.