Convert spinda spot graphics to c objects

5 files changed, 113 insertions, 117 deletions

diff --git a/data/pokemon.s b/data/pokemon.s
index 45de7afce..00da88bfd 100644
--- a/data/pokemon.s
+++ b/data/pokemon.s
@@ -3,9 +3,6 @@
 
 	.section .rodata
 
-@ 81FCB84
-	.include "data/spinda_spot_graphics.inc"
-
 @ 81FCC14
 	.include "data/item_effects.inc"
 
diff --git a/data/spinda_spot_graphics.inc b/data/spinda_spot_graphics.inc
deleted file mode 100644
index 3316a5639..000000000
--- a/data/spinda_spot_graphics.inc
+++ /dev/null
@@ -1,81 +0,0 @@
-	.align 2
-gSpindaSpotGraphics:: @ 81FCB84
-	.byte 16 @ X
-	.byte 14 @ Y
-	.2byte 0b0000000001110000
-	.2byte 0b0000000111111100
-	.2byte 0b0000001111111110
-	.2byte 0b0000011111111110
-	.2byte 0b0000011111111111
-	.2byte 0b0000111111111111
-	.2byte 0b0000111111111111
-	.2byte 0b0000111111111111
-	.2byte 0b0000011111111110
-	.2byte 0b0000011111111110
-	.2byte 0b0000001111111100
-	.2byte 0b0000000111100000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-
-	.byte 40 @ X
-	.byte 15 @ Y
-	.2byte 0b0000000111100000
-	.2byte 0b0000001111111000
-	.2byte 0b0000011111111100
-	.2byte 0b0000111111111110
-	.2byte 0b0000111111111110
-	.2byte 0b0001111111111111
-	.2byte 0b0001111111111111
-	.2byte 0b0001111111111111
-	.2byte 0b0000111111111110
-	.2byte 0b0000111111111110
-	.2byte 0b0000011111111100
-	.2byte 0b0000011111111000
-	.2byte 0b0000000011100000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-
-	.byte 22 @ X
-	.byte 32 @ Y
-	.2byte 0b0000000000011100
-	.2byte 0b0000000000111110
-	.2byte 0b0000000001111111
-	.2byte 0b0000000001111111
-	.2byte 0b0000000001111111
-	.2byte 0b0000000001111111
-	.2byte 0b0000000001111111
-	.2byte 0b0000000000111110
-	.2byte 0b0000000000011100
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-
-	.byte 34 @ X
-	.byte 33 @ Y
-	.2byte 0b0000000000111100
-	.2byte 0b0000000001111110
-	.2byte 0b0000000011111111
-	.2byte 0b0000000011111111
-	.2byte 0b0000000011111111
-	.2byte 0b0000000011111111
-	.2byte 0b0000000011111111
-	.2byte 0b0000000001111110
-	.2byte 0b0000000000111100
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
-	.2byte 0b0000000000000000
diff --git a/include/pokemon.h b/include/pokemon.h
index 248bc480a..28f9cbc1c 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -401,6 +401,41 @@ struct PokemonStorage
     u8 unkArray[14];
 };
 
+struct SpindaSpot
+{
+    u8 x, y;
+    u16 image[16];
+};
+
+#define EVO_FRIENDSHIP       0x0001 // Pokémon levels up with friendship ≥ 220
+#define EVO_FRIENDSHIP_DAY   0x0002 // Pokémon levels up during the day with friendship ≥ 220
+#define EVO_FRIENDSHIP_NIGHT 0x0003 // Pokémon levels up at night with friendship ≥ 220
+#define EVO_LEVEL            0x0004 // Pokémon reaches the specified level
+#define EVO_TRADE            0x0005 // Pokémon is traded
+#define EVO_TRADE_ITEM       0x0006 // Pokémon is traded while it's holding the specified item
+#define EVO_ITEM             0x0007 // specified item is used on Pokémon
+#define EVO_LEVEL_ATK_GT_DEF 0x0008 // Pokémon reaches the specified level with attack > defense
+#define EVO_LEVEL_ATK_EQ_DEF 0x0009 // Pokémon reaches the specified level with attack = defense
+#define EVO_LEVEL_ATK_LT_DEF 0x000a // Pokémon reaches the specified level with attack < defense
+#define EVO_LEVEL_SILCOON    0x000b // Pokémon reaches the specified level with a Silcoon personality value
+#define EVO_LEVEL_CASCOON    0x000c // Pokémon reaches the specified level with a Cascoon personality value
+#define EVO_LEVEL_NINJASK    0x000d // Pokémon reaches the specified level (special value for Ninjask)
+#define EVO_LEVEL_SHEDINJA   0x000e // Pokémon reaches the specified level (special value for Shedinja)
+#define EVO_BEAUTY           0x000f // Pokémon levels up with beauty ≥ specified value
+
+struct Evolution
+{
+    u16 method;
+    u16 param;
+    u16 targetSpecies;
+};
+
+struct EvolutionData
+{
+    struct Evolution evolutions[5];
+};
+
+
 extern struct Pokemon gPlayerParty[PARTY_SIZE];
 extern struct Pokemon gEnemyParty[PARTY_SIZE];
 
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index f4eac79a7..105893f70 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -20,39 +20,6 @@
 #include "string_util.h"
 #include "text.h"
 
-#define EVO_FRIENDSHIP       0x0001 // Pokémon levels up with friendship ≥ 220
-#define EVO_FRIENDSHIP_DAY   0x0002 // Pokémon levels up during the day with friendship ≥ 220
-#define EVO_FRIENDSHIP_NIGHT 0x0003 // Pokémon levels up at night with friendship ≥ 220
-#define EVO_LEVEL            0x0004 // Pokémon reaches the specified level
-#define EVO_TRADE            0x0005 // Pokémon is traded
-#define EVO_TRADE_ITEM       0x0006 // Pokémon is traded while it's holding the specified item
-#define EVO_ITEM             0x0007 // specified item is used on Pokémon
-#define EVO_LEVEL_ATK_GT_DEF 0x0008 // Pokémon reaches the specified level with attack > defense
-#define EVO_LEVEL_ATK_EQ_DEF 0x0009 // Pokémon reaches the specified level with attack = defense
-#define EVO_LEVEL_ATK_LT_DEF 0x000a // Pokémon reaches the specified level with attack < defense
-#define EVO_LEVEL_SILCOON    0x000b // Pokémon reaches the specified level with a Silcoon personality value
-#define EVO_LEVEL_CASCOON    0x000c // Pokémon reaches the specified level with a Cascoon personality value
-#define EVO_LEVEL_NINJASK    0x000d // Pokémon reaches the specified level (special value for Ninjask)
-#define EVO_LEVEL_SHEDINJA   0x000e // Pokémon reaches the specified level (special value for Shedinja)
-#define EVO_BEAUTY           0x000f // Pokémon levels up with beauty ≥ specified value
-
-struct Evolution
-{
-    u16 method;
-    u16 param;
-    u16 targetSpecies;
-};
-
-struct EvolutionData
-{
-    struct Evolution evolutions[5];
-};
-
-struct SpindaSpot
-{
-    u8 x, y;
-    u16 image[16];
-};
 
 extern u8 gPlayerPartyCount;
 extern struct Pokemon gPlayerParty[6];
diff --git a/src/pokemon_data.c b/src/pokemon_data.c
index b09298ca7..c75294ceb 100644
--- a/src/pokemon_data.c
+++ b/src/pokemon_data.c
@@ -8,3 +8,81 @@ const u16 gSpeciesToHoennPokedexNum[] = {203, 204, 205, 206, 207, 208, 209, 210,
 const u16 gSpeciesToNationalPokedexNum[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 290, 291, 292, 276, 277, 285, 286, 327, 278, 279, 283, 284, 320, 321, 300, 301, 352, 343, 344, 299, 324, 302, 339, 340, 370, 341, 342, 349, 350, 318, 319, 328, 329, 330, 296, 297, 309, 310, 322, 323, 363, 364, 365, 331, 332, 361, 362, 337, 338, 298, 325, 326, 311, 312, 303, 307, 308, 333, 334, 360, 355, 356, 315, 287, 288, 289, 316, 317, 357, 293, 294, 295, 366, 367, 368, 359, 353, 354, 336, 335, 369, 304, 305, 306, 351, 313, 314, 345, 346, 347, 348, 280, 281, 282, 371, 372, 373, 374, 375, 376, 377, 378, 379, 382, 383, 384, 380, 381, 385, 386, 358};
 
 const u16 gHoennToNationalOrder[] = {252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 63, 64, 65, 290, 291, 292, 293, 294, 295, 296, 297, 118, 119, 129, 130, 298, 183, 184, 74, 75, 76, 299, 300, 301, 41, 42, 169, 72, 73, 302, 303, 304, 305, 306, 66, 67, 68, 307, 308, 309, 310, 311, 312, 81, 82, 100, 101, 313, 314, 43, 44, 45, 182, 84, 85, 315, 316, 317, 318, 319, 320, 321, 322, 323, 218, 219, 324, 88, 89, 109, 110, 325, 326, 27, 28, 327, 227, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 174, 39, 40, 349, 350, 351, 120, 121, 352, 353, 354, 355, 356, 357, 358, 359, 37, 38, 172, 25, 26, 54, 55, 360, 202, 177, 178, 203, 231, 232, 127, 214, 111, 112, 361, 362, 363, 364, 365, 366, 367, 368, 369, 222, 170, 171, 370, 116, 117, 230, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 46, 47, 48, 49, 50, 51, 52, 53, 56, 57, 58, 59, 60, 61, 62, 69, 70, 71, 77, 78, 79, 80, 83, 86, 87, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 102, 103, 104, 105, 106, 107, 108, 113, 114, 115, 122, 123, 124, 125, 126, 128, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 173, 175, 176, 179, 180, 181, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 215, 216, 217, 220, 221, 223, 224, 225, 226, 228, 229, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411};
+
+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
+    }}
+};