diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-07 18:47:05 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-07 18:47:05 -0600 |
| commit | 75f9c1650420a5d6a0e8130f471481ab19e27a77 (patch) | |
| tree | 77a75a4277cd12d19c7f72977e105fcefe271a23 /src/wallclock.c | |
| parent | a11c65ff1ac380cd213b26d0bb7a2787936b33f9 (diff) | |
| parent | 75c359e3001badee4eaaf496255d3a51bdcb124e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/wallclock.c')
| -rw-r--r-- | src/wallclock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wallclock.c b/src/wallclock.c index 897576719..ea6137c5d 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -92,8 +92,8 @@ static const struct CompressedSpriteSheet gUnknown_085B2208 = { }; static const u32 filler_85B2210[2] = {}; static const struct SpritePalette gUnknown_085B2218[] = { - { gUnknown_08DCC01C, TAG_PAL_WALL_CLOCK_HAND }, - { gUnknown_08DCC03C, 0x1001 }, + { gWallclockMale_Pal, TAG_PAL_WALL_CLOCK_HAND }, + { gWallclockFemale_Pal, 0x1001 }, {} }; static const struct OamData Unknown_085B2230 = { @@ -561,14 +561,14 @@ static void LoadWallClockGraphics(void) DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); DmaClear32(3, (void *)OAM, OAM_SIZE); DmaClear16(3, (void *)PLTT, PLTT_SIZE); - LZ77UnCompVram(gUnknown_08DCC05C, (void *)VRAM); + LZ77UnCompVram(gWallclock_Gfx, (void *)VRAM); if (gSpecialVar_0x8004 == 0) { - LoadPalette(gUnknown_08DCC01C, 0x00, 0x20); + LoadPalette(gWallclockMale_Pal, 0x00, 0x20); } else { - LoadPalette(gUnknown_08DCC03C, 0x00, 0x20); + LoadPalette(gWallclockFemale_Pal, 0x00, 0x20); } LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 0x20); LoadPalette(sUnknown_085B21D4, 0xc0, 0x08); |