diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-11-08 03:07:50 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-08 03:07:50 -0500 |
commit | 9140594b233b08d05d0832b62d3e64d50528a460 (patch) | |
tree | 1175aa70b24f9c07b8089e23b2e8e7fdcba1b524 /src/battle_dome.c | |
parent | e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e (diff) | |
parent | 030784dece994daf90ac1cb06a44912245b519ea (diff) |
Merge branch 'master' into doc-littleroot
Diffstat (limited to 'src/battle_dome.c')
-rw-r--r-- | src/battle_dome.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_dome.c b/src/battle_dome.c index a7d7a92f1..9c63bba42 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -3414,7 +3414,7 @@ static void Task_ShowOpponentInfo(u8 taskId) LoadCompressedSpriteSheet(sDomeOptionsSpriteSheet); LoadCompressedPalette(gUnknown_08D85358, 0, 0x200); LoadCompressedPalette(gUnknown_08D85444, 0x100, 0x200); - LoadCompressedPalette(gUnknown_08D85600, 0xF0, 0x20); + LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20); if (r9 == 2) LoadCompressedPalette(gUnknown_08D854C8, 0x50, 0x20); CpuFill32(0, gPlttBufferFaded, 0x400); @@ -5574,7 +5574,7 @@ static void Task_ShowTourneyTree(u8 taskId) DecompressAndLoadBgGfxUsingHeap(3, gUnknown_08D83C3C, 0x2000, 0, 1); LoadCompressedPalette(gUnknown_08D85358, 0, 0x200); LoadCompressedPalette(gUnknown_08D85444, 0x100, 0x200); - LoadCompressedPalette(gUnknown_08D85600, 0xF0, 0x20); + LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20); CpuFill32(0, gPlttBufferFaded, 0x400); ShowBg(0); ShowBg(1); |