diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-11-24 15:59:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-24 15:59:14 -0500 |
| commit | 8d29f65c6c7f34aa53ae2e7ae3e4f34a95025602 (patch) | |
| tree | 5b62a9457d2ddc4145763f94eb1e03257dc38665 /src/contest_util.c | |
| parent | c0e3c71673b12ce8380f0c0f189398c7c535493c (diff) | |
| parent | 9d056e865655af52c16be7c04df42be378259439 (diff) | |
Merge pull request #1255 from GriffinRichards/doc-paltags
Name object event palettes and tags
Diffstat (limited to 'src/contest_util.c')
| -rw-r--r-- | src/contest_util.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/contest_util.c b/src/contest_util.c index 21408c673..9ddfdad1d 100644 --- a/src/contest_util.c +++ b/src/contest_util.c @@ -166,11 +166,6 @@ static void SpriteCB_Confetti(struct Sprite *sprite); static void Task_ShowContestEntryMonPic(u8 taskId); static void Task_LinkContestWaitForConnection(u8 taskId); -extern const u16 gObjectEventPalette8[]; -extern const u16 gObjectEventPalette17[]; -extern const u16 gObjectEventPalette33[]; -extern const u16 gObjectEventPalette34[]; - static const u16 sUnknown_0858D6B0[] = INCBIN_U16("graphics/unknown/unknown_58D6B0.gbapal"); static const u8 sUnknown_0858D6D0[] = INCBIN_U8("graphics/unknown/unknown_58D6D0.4bpp"); static const u16 sMiscBlank_Pal[] = INCBIN_U16("graphics/interface/blank.gbapal"); @@ -2488,16 +2483,16 @@ void LoadLinkContestPlayerPalettes(void) if (version == VERSION_RUBY || version == VERSION_SAPPHIRE) { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gObjectEventPalette33, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPal_RubySapphireBrendan, 0x160 + i * 0x10, 0x20); else - LoadPalette(gObjectEventPalette34, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPal_RubySapphireMay, 0x160 + i * 0x10, 0x20); } else { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gObjectEventPalette8, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPal_Brendan, 0x160 + i * 0x10, 0x20); else - LoadPalette(gObjectEventPalette17, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPal_May, 0x160 + i * 0x10, 0x20); } } } |