diff --git a/emgba.dcp b/emgba.dcp index e2a0bc3..837a491 100644 --- a/emgba.dcp +++ b/emgba.dcp @@ -20,7 +20,7 @@ Name={--filter, Filter} Values={none, Sharp}, {blend, Soft}, {deflicker, Normal}, {scale2xex, Scale2×Ex}, {scale2xplus, Scale2×Plus}, {scale2x, Scale2×}, {eagle2x, Eagle2×}, {scan2x, Scan2×} Name={--matrix, Color Matrix} -Values={identity, Identity}, {gba, GBA}, {gbc, GBC}, {gbi, GBI}, {nds, NDS}, {palm, Palm}, {psp, PSP}, {vba, VBA} +Values={identity, Identity}, {gba, GBA}, {gbi, GBI}, {nds, NDS}, {palm, Palm}, {psp, PSP}, {vba, VBA} Name={--input-gamma, Decoding Gamma} Values={1.0, 1.0}, {1.2, 1.2}, {1.4, 1.4}, {1.6, 1.6}, {1.8, 1.8}, {2.0, 2.0}, {2.2, 2.2}, {2.4, 2.4} diff --git a/source/gx_preview.c b/source/gx_preview.c index b474ee0..8444dae 100644 --- a/source/gx_preview.c +++ b/source/gx_preview.c @@ -51,21 +51,17 @@ static GXColorS10 color[][3] = { { + 0, + 0, + 0 }, { + 0, + 0, + 0 } }, [MATRIX_GBA] = { - { -13, + 0, + 0 }, + { -15, + 0, + 0 }, { + 0, + 0, + 0 }, - { +13, + 0, + 0 } - }, [MATRIX_GBC] = { - { -13, + 0, + 0 }, - { + 0, + 0, + 0 }, - { +13, + 0, + 0 } + { +15, + 0, + 0 } }, [MATRIX_GBI] = { { -27, + 0, + 0 }, { + 0, + 0, + 0 }, { +27, + 0, + 0 } }, [MATRIX_NDS] = { - { -13, + 0, + 0 }, + { -32, + 0, + 0 }, { + 0, + 0, + 0 }, - { +13, + 0, + 0 } + { +32, + 0, + 0 } }, [MATRIX_PALM] = { { -23, + 0, + 0 }, { + 0, + 0, + 0 }, @@ -88,25 +84,20 @@ static GXColor kcolor[][4] = { { 0, 0, 255 }, { 54, 182, 18 } }, [MATRIX_GBA] = { - { 219, 28, 34 }, - { 48, 168, 15 }, - { 0, 59, 207 }, - { 69, 132, 54 } - }, [MATRIX_GBC] = { - { 222, 29, 36 }, - { 46, 168, 18 }, - { 0, 57, 201 }, - { 71, 131, 53 } + { 209, 32, 50 }, + { 61, 170, 19 }, + { 0, 54, 186 }, + { 71, 136, 48 } }, [MATRIX_GBI] = { { 238, 12, 7 }, { 45, 195, 9 }, { 0, 48, 239 }, { 60, 149, 46 } }, [MATRIX_NDS] = { - { 217, 24, 15 }, - { 51, 167, 19 }, - { 0, 64, 221 }, - { 65, 132, 59 } + { 222, 26, 26 }, + { 65, 164, 43 }, + { 0, 65, 186 }, + { 67, 135, 53 } }, [MATRIX_PALM] = { { 212, 19, 22 }, { 66, 173, 31 }, diff --git a/source/main.c b/source/main.c index 2d4e338..c72d3f8 100644 --- a/source/main.c +++ b/source/main.c @@ -1567,8 +1567,6 @@ static void preinit(int argc, char **argv) state.matrix = MATRIX_IDENTITY; else if (strcmp(optarg, "gba") == 0) state.matrix = MATRIX_GBA; - else if (strcmp(optarg, "gbc") == 0) - state.matrix = MATRIX_GBC; else if (strcmp(optarg, "gbi") == 0) state.matrix = MATRIX_GBI; else if (strcmp(optarg, "nds") == 0) diff --git a/source/state.h b/source/state.h index d2ba7c6..2c7277c 100644 --- a/source/state.h +++ b/source/state.h @@ -73,7 +73,6 @@ typedef struct { enum { MATRIX_IDENTITY = 0, MATRIX_GBA, - MATRIX_GBC, MATRIX_GBI, MATRIX_NDS, MATRIX_PALM,