summaryrefslogtreecommitdiff
path: root/src/option_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/option_menu.c')
-rw-r--r--src/option_menu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/option_menu.c b/src/option_menu.c
index a2d32ffb6..2a5b0e534 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -116,7 +116,7 @@ void CB2_InitOptionMenu(void)
gMain.state++;
break;
case 6:
- BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
gMain.state++;
break;
case 7:
@@ -262,7 +262,7 @@ static void Task_OptionMenuSave(u8 taskId)
gSaveBlock2.optionsButtonMode = gTasks[taskId].tOptButtonMode;
gSaveBlock2.optionsWindowFrameType = gTasks[taskId].tOptFrameType;
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = Task_OptionMenuFadeOut;
}
@@ -463,7 +463,7 @@ static void FrameType_DrawChoices(u8 selection)
Menu_PrintText(text, 18, 15);
}
#elif GERMAN
-__attribute__((naked))
+NAKED
static void FrameType_DrawChoices(u8 selection)
{
asm(".syntax unified\n\