diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-08-12 12:04:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-12 12:04:53 -0700 |
| commit | 26e18f2292a17bb75bc20d924bebafb88077cb54 (patch) | |
| tree | b9b697df0d2309fbbac8d8d5b2c609a655c5e68c /data | |
| parent | 21060091d109a6ebc4d1d76b8487878bb91cd5e1 (diff) | |
| parent | 957dcd01b382fb74e9b1967851ef3cfb6ca983eb (diff) | |
Merge pull request #289 from DizzyEggg/contests
Pikalax's contests
Diffstat (limited to 'data')
| -rw-r--r-- | data/contest.s | 2 | ||||
| -rw-r--r-- | data/graphics.s | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/contest.s b/data/contest.s index 357a95d1d..eaf3f8c95 100644 --- 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 diff --git a/data/graphics.s b/data/graphics.s index fdfa76343..01e8c3b2c 100644 --- 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 |