Move more contest constants into C

src/contest.c

@@ -218,7 +218,6 @@ EWRAM_DATA u8 gUnknown_02039F5D = 0;
 // IWRAM common vars.
 u32 gContestRngValue;
 
-extern const u16 gUnknown_08587C30[];
 extern const struct BgTemplate gUnknown_08587F34[4];
 extern const struct WindowTemplate gUnknown_08587F44[];
 extern const u8 *const gUnknown_08587D90[];
@@ -250,25 +249,11 @@ extern const u8 gText_CDot[];
 extern const u8 *const gUnknown_08587E10[];
 extern const struct ContestPokemon gContestOpponents[96];
 extern const u8 gUnknown_085898A4[96];
-extern const struct CompressedSpriteSheet gUnknown_08587C00;
-extern const struct SpriteTemplate gSpriteTemplate_8587BE8;
-extern const struct CompressedSpriteSheet gUnknown_08587C08;
-extern const struct CompressedSpritePalette gUnknown_08587C10;
-extern const struct SpriteTemplate gSpriteTemplate_8587C18;
 extern const union AffineAnimCmd *const gUnknown_082FF6C0[];
 extern const union AffineAnimCmd *const gUnknown_082FF694[];
 extern const u8 *const gContestEffectDescriptionPointers[];
-extern const struct SpriteSheet gUnknown_08587A74;
-extern const u8 gUnknown_08587A6C[];
 extern const struct SpriteTemplate gSpriteTemplate_8587AD0;
-extern const struct SpritePalette gUnknown_08587B08;
-extern const struct CompressedSpriteSheet gUnknown_08587AE8[];
 extern const struct SpriteTemplate gSpriteTemplate_8587B18[];
-extern const u8 gUnknown_08587A70[];
-extern const struct SubspriteTable gSubspriteTables_8587B80[];
-extern const struct CompressedSpriteSheet gUnknown_08587BB0;
-extern const struct SpritePalette gUnknown_08587BB8;
-extern const struct SpriteTemplate gSpriteTemplate_8587BC8;
 extern void (*const gContestEffectFuncs[])(void);
 extern const s8 gContestExcitementTable[][5];
 extern const struct ContestWinner gUnknown_08587FA4[];
@@ -276,6 +261,328 @@ extern const struct CompressedSpriteSheet gUnknown_08589904[];
 extern const struct SpritePalette gUnknown_08589924[];
 extern const struct SpriteTemplate gSpriteTemplate_858998C[];
 
+static const u8 gUnknown_08587A6C[] =
+{
+    0x24, 0x4C, 0x74, 0x9C
+};
+
+static const u8 gUnknown_08587A70[] =
+{
+    0x24, 0x4C, 0x74, 0x9C
+};
+
+static const struct SpriteSheet gUnknown_08587A74 =
+{
+    .data = gTiles_8C19450,
+    .size = 0x20,
+    .tag = 0x4E20
+};
+
+static const struct OamData gOamData_8587A7C =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const union AffineAnimCmd gSpriteAffineAnim_8587A84[] =
+{
+    AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_END,
+};
+
+static const union AffineAnimCmd gSpriteAffineAnim_8587A94[] =
+{
+    AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_FRAME(0xFFF6, 0xFFF6, -20, 20),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd gSpriteAffineAnim_8587AAC[] =
+{
+    AFFINEANIMCMD_FRAME(0x38, 0x38, 0, 0),
+    AFFINEANIMCMD_FRAME(10, 10, 20, 20),
+    AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd* const gSpriteAffineAnimTable_8587AC4[] =
+{
+    gSpriteAffineAnim_8587A84,
+    gSpriteAffineAnim_8587A94,
+    gSpriteAffineAnim_8587AAC
+};
+
+static const struct SpriteTemplate gSpriteTemplate_8587AD0 =
+{
+    .tileTag = 0x4E20,
+    .paletteTag = 0xABE0,
+    .oam = &gOamData_8587A7C,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gSpriteAffineAnimTable_8587AC4,
+    .callback = SpriteCallbackDummy
+};
+
+static const struct CompressedSpriteSheet gUnknown_08587AE8[] =
+{
+    {
+        .data = gContestNextTurnGfx,
+        .size = 0x100,
+        .tag = 0x4E22
+    },
+    {
+        .data = gContestNextTurnGfx,
+        .size = 0x100,
+        .tag = 0x4E23
+    },
+    {
+        .data = gContestNextTurnGfx,
+        .size = 0x100,
+        .tag = 0x4E24
+    },
+    {
+        .data = gContestNextTurnGfx,
+        .size = 0x100,
+        .tag = 0x4E25
+    }
+};
+
+static const struct SpritePalette gUnknown_08587B08 =
+{
+    .data = gContestPal,
+    .tag = 0x4E22
+};
+
+static const struct OamData gOamData_8587B10 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+static const struct SpriteTemplate gSpriteTemplate_8587B18[] =
+{
+    {
+        .tileTag = 0x4E22,
+        .paletteTag = 0x4E22,
+        .oam = &gOamData_8587B10,
+        .anims = gDummySpriteAnimTable,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = SpriteCallbackDummy,
+    },
+    {
+        .tileTag = 0x4E23,
+        .paletteTag = 0x4E22,
+        .oam = &gOamData_8587B10,
+        .anims = gDummySpriteAnimTable,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = SpriteCallbackDummy,
+    },
+    {
+        .tileTag = 0x4E24,
+        .paletteTag = 0x4E22,
+        .oam = &gOamData_8587B10,
+        .anims = gDummySpriteAnimTable,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = SpriteCallbackDummy,
+    },
+    {
+        .tileTag = 0x4E25,
+        .paletteTag = 0x4E22,
+        .oam = &gOamData_8587B10,
+        .anims = gDummySpriteAnimTable,
+        .images = NULL,
+        .affineAnims = gDummySpriteAffineAnimTable,
+        .callback = SpriteCallbackDummy,
+    }
+};
+
+const struct Subsprite gSubspriteTable_8587B78[] =
+{
+    {
+        .x = -28,
+        .y = -4,
+        SPRITE_SIZE_32x8,
+        .tileOffset = 0,
+        .priority = 0
+    },
+    {
+        .x = 4,
+        .y = -4,
+        SPRITE_SIZE_32x8,
+        .tileOffset = 4,
+        .priority = 0
+    }
+};
+
+const struct SubspriteTable gSubspriteTables_8587B80[] =
+{
+    {
+        .subspriteCount = 2,
+        .subsprites = gSubspriteTable_8587B78
+    }
+};
+
+const struct CompressedSpriteSheet gUnknown_08587B88 =
+{
+    .data = gUnknown_08C19168,
+    .size = 0x180,
+    .tag = 0xABE1
+};
+
+const struct OamData gOamData_8587B90 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 1,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+const struct SpriteTemplate gSpriteTemplate_8587B98 =
+{
+    .tileTag = 0xABE1,
+    .paletteTag = 0xABE0,
+    .oam = &gOamData_8587B90,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+const struct CompressedSpriteSheet gUnknown_08587BB0 =
+{
+    .data = gContestApplauseGfx,
+    .size = 0x400,
+    .tag = 0xABE2
+};
+
+const struct SpritePalette gUnknown_08587BB8 =
+{
+    .data = gContestPal,
+    .tag = 0xABE2
+};
+
+const struct OamData gOamData_8587BC0 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 1,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 0,
+    .paletteNum = 0,
+    .affineParam = 0
+};
+
+const struct SpriteTemplate gSpriteTemplate_8587BC8 =
+{
+    .tileTag = 0xABE2,
+    .paletteTag = 0xABE2,
+    .oam = &gOamData_8587BC0,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+const struct OamData gOamData_8587BE0 =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 3,
+    .tileNum = 0,
+    .priority = 3,
+    .paletteNum = 2,
+    .affineParam = 0
+};
+
+const struct SpriteTemplate gSpriteTemplate_8587BE8 =
+{
+    .tileTag = 0x4E21,
+    .paletteTag = 0x4E21,
+    .oam = &gOamData_8587BE0,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+const struct CompressedSpriteSheet gUnknown_08587C00 =
+{
+    .data = gContestJudgeGfx,
+    .size = 0x800,
+    .tag = 0x4E21
+};
+
+const struct CompressedSpriteSheet gUnknown_08587C08 =
+{
+    .data = gContestJudgeSymbolsGfx,
+    .size = 0x380,
+    .tag = 0xABE0
+};
+
+const struct CompressedSpritePalette gUnknown_08587C10 =
+{
+    .data = gContest3Pal,
+    .tag = 0xABE0
+};
+
+const struct SpriteTemplate gSpriteTemplate_8587C18 =
+{
+    .tileTag = 0xABE0,
+    .paletteTag = 0xABE0,
+    .oam = &gUnknown_0852490C,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+const u16 gUnknown_08587C30[] = INCBIN_U16("graphics/unknown/unknown_587C30.gbapal");
+
 static void TaskDummy1(u8 taskId)
 {
 }