Merge contests with master

2018-08-11 19:04:28 +02:00
parent 85ebd76cd0 6ae395a636
commit 537ebd36ac
26 changed files with 3407 additions and 7856 deletions
--- a/data/contest.s
+++ b/data/contest.s
@@ -352,7 +352,7 @@ gUnknown_08587FA4:: @ 8587FA4
 	

 	.align 2
-gUnknown_085880A4:: @ 85880A4
+gContestOpponents:: @ 85880A4
 	.include "data/contest_opponents.inc"

 gUnknown_085898A4:: @ 85898A4
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1241,11 +1241,11 @@ gUnknown_08C17980:: @ 8C17980
 	.incbin "graphics/unknown/unknown_C17980.bin.lz"

 	.align 2
-gUnknown_08C17AB0:: @ 8C17AB0
+gContestMiscGfx:: @ 8C17AB0
 	.incbin "graphics/contest/misc.4bpp.lz"

 	.align 2
-gUnknown_08C1850C:: @ 8C1850C
+gContestAudienceGfx:: @ 8C1850C
 	.incbin "graphics/contest/audience.4bpp.lz"

 	.align 2