Skip to content

Commit

Permalink
update changes from convimg
Browse files Browse the repository at this point in the history
  • Loading branch information
@mateoconlechuga @jacobly0
mateoconlechuga authored and jacobly0 committed Aug 10, 2020
1 parent a4ea13a commit 6071773
Show file tree
Hide file tree
Showing 57 changed files with 1,578 additions and 2,109 deletions.
2 changes: 1 addition & 1 deletion examples/graphx/sprites/autotest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"description": "Test sprite display",
"start": "vram_start",
"size": "vram_8_size",
"expected_CRCs": [ "B9FFC80D" ]
"expected_CRCs": [ "CE9E3C83" ]
},
"2":
{
Expand Down
6 changes: 3 additions & 3 deletions examples/graphx/sprites/src/gfx/convimg.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
palettes:
- name: global_palette
fixed-colors:
- color: {index:0, r:255, g:0, b:128}
- color: {index:1, r:255, g:255, b:255}
fixed-entries:
- color: {index: 0, r: 255, g: 0, b: 128}
- color: {index: 1, r: 255, g: 255, b: 255}
images: automatic

converts:
Expand Down
16 changes: 9 additions & 7 deletions examples/graphx/sprites/src/gfx/global_palette.c
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
unsigned char global_palette[26] =
unsigned char global_palette[30] =
{
0x10, 0x7c, /* 0: rgb(255, 0, 132) [exact original: rgb(255, 0, 128)] */
0xff, 0xff, /* 1: rgb(255, 255, 255) [exact original: rgb(255, 255, 255)] */
0x08, 0x6c, /* 2: rgb(222, 0, 66) */
0x90, 0x21, /* 3: rgb( 66, 97, 132) */
0x08, 0x21, /* 4: rgb( 66, 65, 66) */
0x90, 0x6e, /* 5: rgb(222, 162, 132) */
0x10, 0x7c, /* 0: rgb(255, 0, 132) */
0xff, 0xff, /* 1: rgb(255, 255, 255) */
0x90, 0x6e, /* 2: rgb(222, 162, 132) */
0x08, 0x6c, /* 3: rgb(222, 0, 66) */
0x80, 0x5c, /* 4: rgb(189, 32, 0) */
0x90, 0x21, /* 5: rgb( 66, 97, 132) */
0x17, 0x32, /* 6: rgb( 99, 130, 189) */
0xf0, 0xee, /* 7: rgb(222, 190, 132) */
0x08, 0x6d, /* 8: rgb(222, 65, 66) */
0x97, 0x32, /* 9: rgb( 99, 162, 189) */
0x80, 0x5d, /* 10: rgb(189, 97, 0) */
0x88, 0x6e, /* 11: rgb(222, 162, 66) */
0x68, 0xef, /* 12: rgb(222, 223, 66) */
0x10, 0x6e, /* 13: rgb(222, 130, 132) */
0x08, 0x21, /* 14: rgb( 66, 65, 66) */
};
4 changes: 2 additions & 2 deletions examples/graphx/sprites/src/gfx/global_palette.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
extern "C" {
#endif

#define sizeof_global_palette 26
extern unsigned char global_palette[26];
#define sizeof_global_palette 30
extern unsigned char global_palette[30];

#ifdef __cplusplus
}
Expand Down
28 changes: 14 additions & 14 deletions examples/graphx/sprites/src/gfx/oiram.c
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
unsigned char oiram_data[434] =
{
0x10,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x02,0x02,0x08,0x08,0x04,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x02,0x02,0x02,0x02,0x02,0x08,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x02,0x0a,0x0a,0x04,0x04,0x04,0x04,0x04,0x04,
0x00,0x00,0x00,0x00,0x04,0x0a,0x0a,0x0a,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x00,0x00,0x00,0x04,0x0a,0x0a,0x04,0x04,0x05,0x05,0x05,0x05,0x04,0x04,0x04,
0x00,0x00,0x00,0x04,0x04,0x04,0x04,0x04,0x05,0x05,0x05,0x04,0x05,0x04,0x00,0x00,0x00,0x00,0x00,0x04,0x05,0x05,0x04,0x04,0x05,0x05,0x05,0x04,0x05,0x04,0x04,0x04,
0x00,0x00,0x00,0x04,0x05,0x05,0x04,0x04,0x04,0x05,0x05,0x05,0x05,0x07,0x07,0x07,0x04,0x00,0x00,0x04,0x05,0x05,0x05,0x04,0x05,0x05,0x04,0x05,0x05,0x05,0x05,0x05,
0x04,0x00,0x00,0x00,0x04,0x05,0x05,0x05,0x05,0x04,0x04,0x04,0x05,0x05,0x05,0x04,0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x05,0x05,0x05,0x05,0x04,0x04,0x04,0x04,0x00,
0x00,0x00,0x00,0x00,0x04,0x04,0x04,0x04,0x05,0x05,0x05,0x05,0x05,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x02,0x04,0x04,0x04,0x04,0x04,0x04,0x00,0x00,0x00,
0x00,0x00,0x00,0x04,0x0a,0x02,0x08,0x02,0x04,0x04,0x01,0x01,0x01,0x04,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x02,0x08,0x02,0x04,0x07,0x01,0x01,0x01,0x01,0x04,0x00,
0x00,0x00,0x00,0x04,0x0a,0x02,0x02,0x08,0x04,0x07,0x07,0x01,0x01,0x01,0x04,0x00,0x00,0x00,0x00,0x04,0x04,0x0a,0x02,0x02,0x02,0x04,0x07,0x07,0x07,0x04,0x04,0x04,
0x00,0x00,0x00,0x04,0x04,0x04,0x0a,0x0a,0x0a,0x04,0x04,0x04,0x04,0x09,0x01,0x04,0x00,0x00,0x00,0x00,0x04,0x03,0x04,0x04,0x04,0x06,0x01,0x01,0x09,0x09,0x01,0x04,
0x00,0x00,0x00,0x00,0x04,0x03,0x03,0x03,0x06,0x06,0x06,0x09,0x09,0x06,0x06,0x04,0x00,0x00,0x00,0x00,0x04,0x03,0x03,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x04,0x00,
0x00,0x00,0x00,0x00,0x04,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x0a,0x0b,0x0b,0x0c,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x0a,0x0a,0x0a,0x0b,0x0b,0x0c,0x04,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x00,0x00,0x00,0x00,0x00
0x10,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x0e,0x0e,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x0e,0x03,0x03,0x08,0x08,0x0e,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x03,0x03,0x03,0x03,0x03,0x08,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x04,0x03,0x04,0x04,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,
0x00,0x00,0x00,0x00,0x0e,0x04,0x04,0x04,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x00,0x00,0x00,0x0e,0x04,0x04,0x0e,0x0e,0x0d,0x0d,0x0d,0x0d,0x0e,0x0e,0x0e,
0x00,0x00,0x00,0x0e,0x0e,0x0e,0x0e,0x0e,0x0d,0x02,0x02,0x0e,0x02,0x0e,0x00,0x00,0x00,0x00,0x00,0x0e,0x02,0x02,0x0e,0x0e,0x0d,0x02,0x02,0x0e,0x02,0x0e,0x0e,0x0e,
0x00,0x00,0x00,0x0e,0x02,0x02,0x0e,0x0e,0x0e,0x0d,0x02,0x02,0x02,0x07,0x07,0x07,0x0e,0x00,0x00,0x0e,0x0d,0x02,0x0d,0x0e,0x0d,0x02,0x0e,0x0d,0x02,0x02,0x02,0x02,
0x0e,0x00,0x00,0x00,0x0e,0x0d,0x0d,0x0d,0x02,0x0e,0x0e,0x0e,0x0d,0x0d,0x0d,0x0e,0x00,0x00,0x00,0x00,0x00,0x0e,0x0e,0x0d,0x0d,0x02,0x02,0x0e,0x0e,0x0e,0x0e,0x00,
0x00,0x00,0x00,0x00,0x0e,0x0e,0x0e,0x0e,0x0d,0x0d,0x0d,0x0d,0x0d,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x04,0x03,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x00,0x00,0x00,
0x00,0x00,0x00,0x0e,0x04,0x03,0x08,0x03,0x0e,0x0e,0x01,0x01,0x01,0x0e,0x00,0x00,0x00,0x00,0x00,0x0e,0x04,0x03,0x08,0x03,0x0e,0x07,0x01,0x01,0x01,0x01,0x0e,0x00,
0x00,0x00,0x00,0x0e,0x04,0x03,0x03,0x08,0x0e,0x07,0x07,0x01,0x01,0x01,0x0e,0x00,0x00,0x00,0x00,0x0e,0x0e,0x04,0x03,0x03,0x03,0x0e,0x07,0x07,0x07,0x0e,0x0e,0x0e,
0x00,0x00,0x00,0x0e,0x0e,0x0e,0x04,0x04,0x04,0x0e,0x0e,0x0e,0x0e,0x09,0x01,0x0e,0x00,0x00,0x00,0x00,0x0e,0x05,0x0e,0x0e,0x0e,0x06,0x01,0x01,0x09,0x09,0x01,0x0e,
0x00,0x00,0x00,0x00,0x0e,0x05,0x05,0x05,0x06,0x06,0x06,0x09,0x09,0x06,0x06,0x0e,0x00,0x00,0x00,0x00,0x0e,0x05,0x05,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x0e,0x00,
0x00,0x00,0x00,0x00,0x0e,0x05,0x05,0x05,0x05,0x05,0x05,0x05,0x05,0x05,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x0e,0x0a,0x0a,0x0b,0x0b,0x0c,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x0a,0x0a,0x0a,0x0b,0x0b,0x0c,0x0e,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x0e,0x00,0x00,0x00,0x00,0x00
};
2 changes: 1 addition & 1 deletion examples/graphx/sprites_appvar/autotest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"description": "Test sprite appvar display",
"start": "vram_start",
"size": "vram_8_size",
"expected_CRCs": [ "85118B74" ]
"expected_CRCs": [ "9F0F94EA" ]
},
"2":
{
Expand Down
4 changes: 2 additions & 2 deletions examples/graphx/sprites_appvar/src/gfx/convimg.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
palettes:
- name: global_palette
fixed-colors:
- color: {index:0, r:255, g:255, b:255}
fixed-entries:
- color: {index: 0, r: 255, g: 255, b: 255}
images: automatic

converts:
Expand Down
Binary file modified examples/graphx/sprites_appvar/src/gfx/vargfx.8xv
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion examples/graphx/sprites_compress/autotest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"description": "Test sprite compression display",
"start": "vram_start",
"size": "vram_8_size",
"expected_CRCs": [ "8F62FBF7" ]
"expected_CRCs": [ "2481E42F" ]
},
"2":
{
Expand Down
Loading

0 comments on commit 6071773

Please sign in to comment.