diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-11-23 14:45:16 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-11-23 14:45:16 -0500 |
| commit | 9d056e865655af52c16be7c04df42be378259439 (patch) | |
| tree | 5b62a9457d2ddc4145763f94eb1e03257dc38665 /src | |
| parent | 513c7c5f45b3c79e710ea1e48298d8a7bf9bb591 (diff) | |
Move object event pal declarations to graphics
Diffstat (limited to 'src')
| -rw-r--r-- | src/contest_util.c | 5 | ||||
| -rw-r--r-- | src/field_specials.c | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/contest_util.c b/src/contest_util.c index 9f9582292..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 gObjectEventPal_Brendan[]; -extern const u16 gObjectEventPal_May[]; -extern const u16 gObjectEventPal_RubySapphireBrendan[]; -extern const u16 gObjectEventPal_RubySapphireMay[]; - 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"); diff --git a/src/field_specials.c b/src/field_specials.c index 5ff697182..51030a387 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -16,6 +16,7 @@ #include "field_screen_effect.h" #include "field_specials.h" #include "field_weather.h" +#include "graphics.h" #include "international_string_util.h" #include "item_icon.h" #include "link.h" @@ -86,11 +87,6 @@ static EWRAM_DATA u32 sBattleTowerMultiBattleTypeFlags = 0; struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate; -extern const u16 gObjectEventPal_Brendan[]; -extern const u16 gObjectEventPal_May[]; -extern const u16 gObjectEventPal_RubySapphireBrendan[]; -extern const u16 gObjectEventPal_RubySapphireMay[]; - void TryLoseFansFromPlayTime(void); void SetPlayerGotFirstFans(void); u16 GetNumFansOfPlayerInTrainerFanClub(void); |