diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index 7d56137..371de59 100644 Binary files a/bin/DMGTRIS.GBC and b/bin/DMGTRIS.GBC differ diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket index 4e9c03c..be54f53 100644 Binary files a/bin/DMGTRIS.pocket and b/bin/DMGTRIS.pocket differ 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.