summaryrefslogtreecommitdiff
path: root/src/union_room_battle.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/union_room_battle.c')
-rw-r--r--src/union_room_battle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/union_room_battle.c b/src/union_room_battle.c
index b9ddd74a7..2d1274f6e 100644
--- a/src/union_room_battle.c
+++ b/src/union_room_battle.c
@@ -49,7 +49,7 @@ static const struct WindowTemplate sWindowTemplates[] = {
DUMMY_WIN_TEMPLATE
};
-static const u8 sTextColors[] = { TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY };
+static const u8 sTextColors[] = { TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY };
static void CB2_SetUpPartiesAndStartBattle(void)
{
@@ -143,7 +143,7 @@ void CB2_UnionRoomBattle(void)
}
break;
case 2:
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
ShowBg(0);
gMain.state++;
break;
@@ -169,7 +169,7 @@ void CB2_UnionRoomBattle(void)
if (gBlockRecvBuffer[0][0] == (ACTIVITY_ACCEPT | IN_UNION_ROOM)
&& gBlockRecvBuffer[1][0] == (ACTIVITY_ACCEPT | IN_UNION_ROOM))
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gMain.state = 50;
}
else