Move more contest constants into C

1 files changed, 0 insertions, 138 deletions

diff --git a/data/contest.s b/data/contest.s
index 48bfa1080..a0aaa62f2 100644
--- a/data/contest.s
+++ b/data/contest.s
@@ -6,144 +6,6 @@
     .section .rodata
     .align 2, 0
 
-gUnknown_08587A6C:: @ 8587A6C
-	.byte 0x24, 0x4c, 0x74, 0x9c
-
-gUnknown_08587A70:: @ 8587A70
-	.byte 0x24, 0x4c, 0x74, 0x9c
-
-	.align 2
-gUnknown_08587A74:: @ 8587A74
-	obj_tiles gTiles_8C19450, 0x0020, 0x4e20
-
-	.align 2
-gOamData_8587A7C:: @ 8587A7C
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAffineAnim_8587A84:: @ 8587A84
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8587A94:: @ 8587A94
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, -20, 20
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8587AAC:: @ 8587AAC
-	obj_rot_scal_anim_frame 0x38, 0x38, 0, 0
-	obj_rot_scal_anim_frame 0xA, 0xA, 20, 20
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_8587AC4:: @ 8587AC4
-	.4byte gSpriteAffineAnim_8587A84
-	.4byte gSpriteAffineAnim_8587A94
-	.4byte gSpriteAffineAnim_8587AAC
-
-	.align 2
-gSpriteTemplate_8587AD0:: @ 8587AD0
-	spr_template 0x4e20, 0xabe0, gOamData_8587A7C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8587AC4, SpriteCallbackDummy
-
-	.align 2
-gUnknown_08587AE8:: @ 8587AE8
-	obj_tiles gContestNextTurnGfx, 0x0100, 0x4e22
-	obj_tiles gContestNextTurnGfx, 0x0100, 0x4e23
-	obj_tiles gContestNextTurnGfx, 0x0100, 0x4e24
-	obj_tiles gContestNextTurnGfx, 0x0100, 0x4e25
-
-	.align 2
-gUnknown_08587B08:: @ 8587B08
-	obj_pal gContestPal, 0x4e22
-
-	.align 2
-gOamData_8587B10:: @ 8587B10
-	.2byte 0x4000
-	.2byte 0x4000
-	.2byte 0x0000
-
-	.align 2
-gSpriteTemplate_8587B18:: @ 8587B18
-	spr_template 0x4e22, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 0x4e23, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 0x4e24, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 0x4e25, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSubspriteTable_8587B78:: @ 8587B78
-	subsprite -28,  -4, 0,   0, 32x8
-	subsprite   4,  -4, 0,   4, 32x8
-
-	.align 2
-gSubspriteTables_8587B80:: @ 8587B80
-	.4byte 2, gSubspriteTable_8587B78
-
-	.align 2
-gUnknown_08587B88:: @ 8587B88
-	obj_tiles gUnknown_08C19168, 0x0180, 0xabe1
-
-	.align 2
-gOamData_8587B90:: @ 8587B90
-	.2byte 0x0000
-	.2byte 0x4000
-	.2byte 0x0000
-
-	.align 2
-gSpriteTemplate_8587B98:: @ 8587B98
-	spr_template 0xabe1, 0xabe0, gOamData_8587B90, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_08587BB0:: @ 8587BB0
-	obj_tiles gContestApplauseGfx, 0x0400, 0xabe2
-
-	.align 2
-gUnknown_08587BB8:: @ 8587BB8
-	obj_pal gContestPal, 0xabe2
-
-	.align 2
-gOamData_8587BC0:: @ 8587BC0
-	.2byte 0x4000
-	.2byte 0xC000
-	.2byte 0x0000
-
-	.align 2
-gSpriteTemplate_8587BC8:: @ 8587BC8
-	spr_template 0xabe2, 0xabe2, gOamData_8587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gOamData_8587BE0:: @ 8587BE0
-	.2byte 0x0000
-	.2byte 0xC000
-	.2byte 0x2C00
-
-	.align 2
-gSpriteTemplate_8587BE8:: @ 8587BE8
-	spr_template 0x4e21, 0x4e21, gOamData_8587BE0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_08587C00:: @ 8587C00
-	obj_tiles gContestJudgeGfx, 0x0800, 0x4e21
-
-	.align 2
-gUnknown_08587C08:: @ 8587C08
-	obj_tiles gContestJudgeSymbolsGfx, 0x0380, 0xabe0
-
-	.align 2
-gUnknown_08587C10:: @ 8587C10
-	obj_pal gContest3Pal, 0xabe0
-
-	.align 2
-gSpriteTemplate_8587C18:: @ 8587C18
-	spr_template 0xabe0, 0xabe0, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_08587C30:: @ 8587C30
-	.incbin "graphics/unknown/unknown_587C30.gbapal"
-
 @ 8587C50
 	.include "data/text/contest_text_pointers.inc"