summaryrefslogtreecommitdiff
path: root/src/frontier_pass.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-15 00:06:57 -0400
committerGitHub <noreply@github.com>2020-08-15 00:06:57 -0400
commit25f45ffa8441b0f0a999355c9755782ccb4809dc (patch)
tree203d2ba0f2261d76f683ab4b869627b633808dd4 /src/frontier_pass.c
parent98e68a81120433348296e6947af5a539ec20ae3c (diff)
parent82e322bb96e4f7ecd59d536bdb8315edab61f9b6 (diff)
Merge pull request #1125 from GriffinRichards/doc-namingscr
Document naming screen
Diffstat (limited to 'src/frontier_pass.c')
-rw-r--r--src/frontier_pass.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frontier_pass.c b/src/frontier_pass.c
index 757205656..024a954d1 100644
--- a/src/frontier_pass.c
+++ b/src/frontier_pass.c
@@ -735,7 +735,7 @@ static bool32 InitFrontierPass(void)
case 8:
LoadPalette(gUnknown_08DE07C8[0], 0, 0x1A0);
LoadPalette(gUnknown_08DE07C8[1 + sPassData->trainerStars], 0x10, 0x20);
- LoadPalette(stdpal_get(0), 0xF0, 0x20);
+ LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20);
sub_80C629C();
sub_80C6104(sPassData->cursorArea, sPassData->previousCursorArea);
if (sPassData->unkE == 1 || sPassData->unkE == 2)
@@ -1378,7 +1378,7 @@ static bool32 InitFrontierMap(void)
if (FreeTempTileDataBuffersIfPossible())
return FALSE;
LoadPalette(gUnknown_08DE07C8[0], 0, 0x1A0);
- LoadPalette(stdpal_get(0), 0xF0, 0x20);
+ LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20);
CopyToBgTilemapBuffer(2, gUnknown_08570E00, 0, 0);
CopyBgTilemapBufferToVram(2);
break;