summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2017-06-27 16:35:16 -0400
committerscnorton <scnorton@biociphers.org>2017-06-27 16:35:16 -0400
commit0e92e2f50eff05118f27a150c028b5a7ed72a88b (patch)
tree2e1d604c293a91e17de06c8b365098377ff0847a
parent1fd22171ace73d435834ab4468ea4df22df6a904 (diff)
Spinda spots to binary files pending utility to convert to/from png
-rw-r--r--.gitignore1
-rw-r--r--graphics/spinda_spots/spot_0.binbin0 -> 32 bytes
-rw-r--r--graphics/spinda_spots/spot_1.binbin0 -> 32 bytes
-rw-r--r--graphics/spinda_spots/spot_2.binbin0 -> 32 bytes
-rw-r--r--graphics/spinda_spots/spot_3.binbin0 -> 32 bytes
-rw-r--r--include/data/pokemon/spinda_spots.h79
6 files changed, 5 insertions, 75 deletions
diff --git a/.gitignore b/.gitignore
index f5c95dbc1..ae9ac207b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ types_*.taghl
Thumbs.db
build/
.idea/
+*.DS_Store
diff --git a/graphics/spinda_spots/spot_0.bin b/graphics/spinda_spots/spot_0.bin
new file mode 100644
index 000000000..938d1d592
--- /dev/null
+++ b/graphics/spinda_spots/spot_0.bin
Binary files differ
diff --git a/graphics/spinda_spots/spot_1.bin b/graphics/spinda_spots/spot_1.bin
new file mode 100644
index 000000000..db46b5de4
--- /dev/null
+++ b/graphics/spinda_spots/spot_1.bin
Binary files differ
diff --git a/graphics/spinda_spots/spot_2.bin b/graphics/spinda_spots/spot_2.bin
new file mode 100644
index 000000000..3b1bf7214
--- /dev/null
+++ b/graphics/spinda_spots/spot_2.bin
Binary files differ
diff --git a/graphics/spinda_spots/spot_3.bin b/graphics/spinda_spots/spot_3.bin
new file mode 100644
index 000000000..10c73f9ba
--- /dev/null
+++ b/graphics/spinda_spots/spot_3.bin
Binary files differ
diff --git a/include/data/pokemon/spinda_spots.h b/include/data/pokemon/spinda_spots.h
index 2c8ec036a..234cdf00e 100644
--- a/include/data/pokemon/spinda_spots.h
+++ b/include/data/pokemon/spinda_spots.h
@@ -6,81 +6,10 @@
#define POKERUBY_SPINDA_SPOTS_H
const struct SpindaSpot gSpindaSpotGraphics[] = {
- {16, 14, {
- 0x0070, // 0000000001110000
- 0x01fc, // 0000000111111100
- 0x03fe, // 0000001111111110
- 0x07fe, // 0000011111111110
- 0x07ff, // 0000011111111111
- 0x0fff, // 0000111111111111
- 0x0fff, // 0000111111111111
- 0x0fff, // 0000111111111111
- 0x07fe, // 0000011111111110
- 0x07fe, // 0000011111111110
- 0x03fc, // 0000001111111100
- 0x01e0, // 0000000111100000
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000 // 0000000000000000
- }},
-
- {40, 15, {
- 0x01e0, // 0000000111100000
- 0x03f8, // 0000001111111000
- 0x07fc, // 0000011111111100
- 0x0ffe, // 0000111111111110
- 0x0ffe, // 0000111111111110
- 0x1fff, // 0001111111111111
- 0x1fff, // 0001111111111111
- 0x1fff, // 0001111111111111
- 0x0ffe, // 0000111111111110
- 0x0ffe, // 0000111111111110
- 0x07fc, // 0000011111111100
- 0x07f8, // 0000011111111000
- 0x00e0, // 0000000011100000
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000 // 0000000000000000
- }},
-
- {22, 32, {
- 0x001c, // 0000000000011100
- 0x003e, // 0000000000111110
- 0x007f, // 0000000001111111
- 0x007f, // 0000000001111111
- 0x007f, // 0000000001111111
- 0x007f, // 0000000001111111
- 0x007f, // 0000000001111111
- 0x003e, // 0000000000111110
- 0x001c, // 0000000000011100
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000 // 0000000000000000
- }},
-
- {34, 33, {
- 0x003c, // 0000000000111100
- 0x007e, // 0000000001111110
- 0x00ff, // 0000000011111111
- 0x00ff, // 0000000011111111
- 0x00ff, // 0000000011111111
- 0x00ff, // 0000000011111111
- 0x00ff, // 0000000011111111
- 0x007e, // 0000000001111110
- 0x003c, // 0000000000111100
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000, // 0000000000000000
- 0x0000 // 0000000000000000
- }}
+ {16, 14, INCBIN_U16("graphics/spinda_spots/spot_0.bin")},
+ {40, 15, INCBIN_U16("graphics/spinda_spots/spot_1.bin")},
+ {22, 32, INCBIN_U16("graphics/spinda_spots/spot_2.bin")},
+ {34, 33, INCBIN_U16("graphics/spinda_spots/spot_3.bin")}
};
#endif //POKERUBY_SPINDA_SPOTS_H