contest_link_80C2020 data

4 files changed, 67 insertions, 80 deletions

diff --git a/data/contest_link_80C2020.s b/data/contest_link_80C2020.s
deleted file mode 100644
index fe5398935..000000000
--- a/data/contest_link_80C2020.s
+++ /dev/null
@@ -1,75 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_083D1624:: @ 83D1624
-	.incbin "graphics/unknown/unknown_3D1624/0.4bpp"
-
-gUnknown_083D1644:: @ 83D1644
-	.incbin "graphics/unknown/unknown_3D1624/1.4bpp"
-	.incbin "graphics/unknown/unknown_3D1624/2.4bpp"
-	.incbin "graphics/unknown/unknown_3D1624/3.4bpp"
-	.incbin "graphics/unknown/unknown_3D1624/4.4bpp"
-	.incbin "graphics/unknown/unknown_3D1624/5.4bpp"
-
-gUnknown_083D16E4:: @ 83D16E4
-	.incbin "graphics/unknown/unknown_3D1624/6.4bpp"
-	.incbin "graphics/unknown/unknown_3D1624/7.4bpp"
-
-	.align 2
-gMiscBlank_Pal::
-	.incbin "graphics/interface/blank.gbapal"
-
-	.align 2
-gOamData_83D1744:: @ 83D1744
-	.2byte 0x4000
-	.2byte 0xC000
-	.2byte 0x2C00
-
-	.align 2
-gSpriteTemplate_83D174C:: @ 83D174C
-	spr_template 3009, 3009, gOamData_83D1744, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_083D1764:: @ 83D1764
-	obj_tiles gMiscBlank_Gfx, 1024, 0x0bc1
-	obj_tiles gMiscBlank_Gfx, 1024, 0x0bc2
-	obj_tiles gMiscBlank_Gfx, 1024, 0x0bc3
-	obj_tiles gMiscBlank_Gfx, 1024, 0x0bc4
-	obj_tiles gMiscBlank_Gfx, 1024, 0x0bc5
-	obj_tiles gMiscBlank_Gfx, 1024, 0x0bc6
-	obj_tiles gMiscBlank_Gfx, 1024, 0x0bc7
-	obj_tiles gMiscBlank_Gfx, 1024, 0x0bc8
-
-	.align 2
-gUnknown_083D17A4:: @ 83D17A4
-	obj_pal gMiscBlank_Pal, 0x0BC1
-
-	.align 2
-gOamData_83D17AC:: @ 83D17AC
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gSpriteTemplate_83D17B4:: @ 83D17B4
-	spr_template 3017, 3017, gOamData_83D17AC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80C3DF0
-
-	.align 2
-gUnknown_083D17CC:: @ 83D17CC
-	obj_tiles gContestConfetti_Gfx, 544, 0x0bc9
-
-	.align 2
-gUnknown_083D17D4:: @ 83D17D4
-	obj_pal gContestConfetti_Pal, 0x0bc9
-
-gUnknown_083D17DC:: @ 83D17DC
-	.string "{COLOR RED}$"
-
-gUnknown_083D17E0:: @ 83D17E0
-	.string "/$"
-
-gUnknown_083D17E2:: @ 83D17E2
-	.string "{SIZE 3}{COLOR_HIGHLIGHT_SHADOW WHITE2 DARK_GREY LIGHT_BLUE}$"
diff --git a/include/graphics.h b/include/graphics.h
index 76a45f6f6..243d40fb9 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3337,4 +3337,7 @@ extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17;
 extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20;
 extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21;
 
+extern const u8 gContestConfetti_Gfx[];
+extern const u8 gContestConfetti_Pal[];
+
 #endif  // GUARD_GRAPHICS_H
diff --git a/ld_script.txt b/ld_script.txt
index 56e3e4aaa..95b334711 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -578,7 +578,7 @@ SECTIONS {
         src/debug/sound_check_menu.o(.rodata);
         src/field/secret_base.o(.rodata);
         src/field/tv.o(.rodata);
-        data/contest_link_80C2020.o(.rodata);
+        src/battle/contest_link_80C2020.o(.rodata);
         src/pokemon/pokemon_size_record.o(.rodata);
         src/field/pc_screen_effect.o(.rodata);
         data/pc_screen_effect.o(.rodata);
diff --git a/src/battle/contest_link_80C2020.c b/src/battle/contest_link_80C2020.c
index cf8c32405..4e9209554 100644
--- a/src/battle/contest_link_80C2020.c
+++ b/src/battle/contest_link_80C2020.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "data2.h"
+#include "util.h"
 #include "constants/songs.h"
 #include "ewram.h"
 #include "main.h"
@@ -84,14 +85,72 @@ void sub_80C3B30(u8 taskId);
 void sub_80C3C44(struct Sprite *sprite);
 void sub_80C3CB8(struct Sprite *sprite);
 void sub_80C3D04(u8 taskId);
+void sub_80C3DF0(struct Sprite *sprite);
 void sub_80C3E60(u8 a0, u8 a1);
 void sub_80C3F00(void);
 void sub_80C40D4(u8 a0, u8 a1);
 
-extern const struct CompressedSpriteSheet gUnknown_083D17CC;
-extern const struct CompressedSpritePalette gUnknown_083D17D4;
-extern const u8 gUnknown_083D17DC[];
-extern const u8 gUnknown_083D17E0[];
+const u16 gUnknown_083D1624[] = INCBIN_U16("graphics/unknown/unknown_3D1624/0.4bpp");
+const u16 gUnknown_083D1644[] = INCBIN_U16("graphics/unknown/unknown_3D1624/1.4bpp");
+const u16 gUnknown_083D1664[] = INCBIN_U16("graphics/unknown/unknown_3D1624/2.4bpp");
+const u16 gUnknown_083D1684[] = INCBIN_U16("graphics/unknown/unknown_3D1624/3.4bpp");
+const u16 gUnknown_083D16A4[] = INCBIN_U16("graphics/unknown/unknown_3D1624/4.4bpp");
+const u16 gUnknown_083D16C4[] = INCBIN_U16("graphics/unknown/unknown_3D1624/5.4bpp");
+const u16 gUnknown_083D16E4[] = INCBIN_U16("graphics/unknown/unknown_3D1624/6.4bpp");
+const u16 gUnknown_083D1704[] = INCBIN_U16("graphics/unknown/unknown_3D1624/7.4bpp");
+const u16 gMiscBlank_Pal[] = INCBIN_U16("graphics/interface/blank.gbapal");
+
+const struct OamData gOamData_83D1744 = {
+    .shape = ST_OAM_H_RECTANGLE,
+    .size = 3,
+    .priority = 3,
+    .paletteNum = 2
+};
+
+const struct SpriteTemplate gSpriteTemplate_83D174C = {
+    0xbc1,
+    0xbc1,
+    &gOamData_83D1744,
+    gDummySpriteAnimTable,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    SpriteCallbackDummy
+};
+
+const struct SpriteSheet gUnknown_083D1764[] = {
+    {gMiscBlank_Gfx, 0x400, 0xbc1},
+    {gMiscBlank_Gfx, 0x400, 0xbc2},
+    {gMiscBlank_Gfx, 0x400, 0xbc3},
+    {gMiscBlank_Gfx, 0x400, 0xbc4},
+    {gMiscBlank_Gfx, 0x400, 0xbc5},
+    {gMiscBlank_Gfx, 0x400, 0xbc6},
+    {gMiscBlank_Gfx, 0x400, 0xbc7},
+    {gMiscBlank_Gfx, 0x400, 0xbc8},
+};
+
+const struct SpritePalette gUnknown_083D17A4 = {
+    gMiscBlank_Pal, 0xbc1
+};
+
+const struct OamData gOamData_83D17AC = {};
+
+const struct SpriteTemplate gSpriteTemplate_83D17B4 = {
+    0xbc9,
+    0xbc9,
+    &gOamData_83D17AC,
+    gDummySpriteAnimTable,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    sub_80C3DF0
+};
+
+const struct CompressedSpriteSheet gUnknown_083D17CC = {gContestConfetti_Gfx, 0x220, 0xbc9};
+
+const struct CompressedSpritePalette gUnknown_083D17D4 = {gContestConfetti_Pal, 0xbc9};
+
+const u8 gUnknown_083D17DC[] = _("{COLOR RED}");
+const u8 gUnknown_083D17E0[] = _("/");
+const u8 gUnknown_083D17E2[] = _("{SIZE 3}{COLOR_HIGHLIGHT_SHADOW WHITE2 DARK_GREY LIGHT_BLUE}");
 
 void sub_80C2020(void)
 {