diff options
Diffstat (limited to 'src/debug')
-rw-r--r-- | src/debug/kagaya_debug_menu.c | 8 | ||||
-rw-r--r-- | src/debug/matsuda_debug_menu.c | 4 | ||||
-rw-r--r-- | src/debug/nakamura_debug_menu.c | 2 | ||||
-rw-r--r-- | src/debug/sound_check_menu.c | 6 | ||||
-rw-r--r-- | src/debug/taya_debug_window.c | 4 | ||||
-rw-r--r-- | src/debug/tomomichi_debug_menu.c | 6 | ||||
-rw-r--r-- | src/debug/watanabe_debug_menu.c | 18 |
7 files changed, 24 insertions, 24 deletions
diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c index 83736ba4d..7bb5cc1d6 100644 --- a/src/debug/kagaya_debug_menu.c +++ b/src/debug/kagaya_debug_menu.c @@ -74,7 +74,7 @@ u8 debug_sub_80B061C(void) u8 KagayaDebugMenu_TrainerCard(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_80B068C; return 0; } @@ -93,7 +93,7 @@ u8 debug_sub_80B068C(void) u8 KagayaDebugMenu_CardToExchange(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_80B06E0; return 0; } @@ -112,7 +112,7 @@ u8 debug_sub_80B06E0(void) u8 KagayaDebugMenu_SlotMachine(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = Kagaya_80B0734; return 0; } @@ -149,7 +149,7 @@ u8 debug_sub_80B0770(void) u8 debug_sub_80B07B0(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_80B07DC; return 0; } diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index c936af864..f914163b2 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -105,7 +105,7 @@ static bool8 sub_80A9B78(void) u8 MatsudaDebugMenu_ContestResults(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); CreateTask(sub_80A9BE4, 0xFF); return 1; } @@ -878,7 +878,7 @@ void sub_80AAD08(struct Sprite *sprite, s8 var2) { eMatsudaDebugVar = sprite->data[3]; SetMainCallback2(sub_80AACC4); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } } diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index f40d5556a..760b10d01 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -133,7 +133,7 @@ static bool8 SwitchToPkmnListMenu(void) Menu_EraseScreen(); gMain.savedCallback = c2_exit_to_overworld_1_sub_8080DEC; CreateTask(Task_SwitchToPkmnListMenu, 0); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); return TRUE; } diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index 05cbfc8f7..935f5cd67 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -134,7 +134,7 @@ void CB2_StartSoundCheckMenu(void) ResetSpriteData(); Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_WIN0H = WIN_RANGE(0, 0); REG_WIN0V = WIN_RANGE(0, 0); REG_WIN1H = WIN_RANGE(0, 0); @@ -267,7 +267,7 @@ bool8 Task_ProcessSoundCheckMenuInput(u8 taskId) else if (gMain.newKeys & B_BUTTON) { m4aSongNumStart(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_80BA68C; } else if (gMain.newAndRepeatedKeys & DPAD_UP) @@ -1249,7 +1249,7 @@ void Task_InitCryTest(u8 taskId) Menu_DrawStdWindowFrame(0, 16, 5, 19); PrintCryNumber(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_BG2HOFS = 0; REG_BG2VOFS = 0; REG_BG2CNT = 0xF01; diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index 55212315c..c5f6fc0ec 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -424,7 +424,7 @@ bool8 TayaDebugMenu_TownFlags(void) bool8 TayaDebugMenu_AwardARibbon(void) { - BlendPalettes(0xFFFFFFFF, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); SetMainCallback2(debug_sub_80915BC); CloseMenu(); return TRUE; @@ -979,7 +979,7 @@ void debug_sub_8091334(void) } else if (gMain.newKeys & B_BUTTON) { - BlendPalettes(0xFFFFFFFF, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); SetMainCallback2(sub_80546F0); } break; diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index 40df600fa..daaca570c 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -2365,7 +2365,7 @@ static bool8 CallScript_GiveShroomishEgg(void) static bool8 ContestGraphics_Show(void) { - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_808C280; return FALSE; } @@ -2385,7 +2385,7 @@ static bool8 debug_sub_808C280(void) static bool8 MuseumGraphics_Show(void) { - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_808C2E4; return FALSE; } @@ -3927,7 +3927,7 @@ static bool8 debug_sub_808EC5C(void) static bool8 PreviewGraphics_Show(void) { - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_808ECD0; return FALSE; } diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index 1b13b2d4e..86b8f6b0b 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -392,7 +392,7 @@ void InitSizeComparison(void) REG_IME = 0; REG_IE |= INTR_FLAG_VBLANK; REG_IME = imeBak; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(debug_80C3758); SetMainCallback2(debug_80C370C); REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_OBJ_ON; @@ -812,7 +812,7 @@ void debug_80C3D2C(u8 taskId) if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(debug_80C370C); gTasks[taskId].func = debug_80C373C; } @@ -1292,7 +1292,7 @@ void debug_80C4900(u8 taskId) if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(debug_80C370C); LoadPlayerParty(); gSaveBlock2.playerGender = gUnknown_Debug_2038A0C[13]; @@ -1835,7 +1835,7 @@ void InitCreatePokemon(void) u8 sp04[] = _("Create POKひMON LR:Shift START:Add"); debug_80C35DC(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_BLDCNT = 0x0000; REG_BLDALPHA = 0x0000; REG_BLDY = 0x0000; @@ -1884,7 +1884,7 @@ void debug_80C53F0(u8 taskId) } else if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(debug_80C370C); gTasks[taskId].func = debug_80C373C; } @@ -2523,7 +2523,7 @@ void InitSeePokemonGraphics(void) LoadPalette(word_83F888C, 0x80, sizeof(word_83F888C)); pal = RGB(31, 31, 31); LoadPalette(&pal, 0, sizeof(pal)); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_WIN0H = 0; REG_WIN0V = 0; REG_WIN1H = 0; @@ -2707,7 +2707,7 @@ void debug_80C6FA8(u8 taskId) if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(debug_80C370C); gTasks[taskId].func = debug_80C373C; } @@ -3195,7 +3195,7 @@ void InitSeeTrainers(void) debug_80C35DC(); DmaCopy16Defvars(3, byte_83F88EC, VRAM + 0xe000, 0x800); LoadPalette(word_83F888C, 0x80, 0x60); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_WIN0H = 0; REG_WIN0V = 0; REG_WIN1H = 0; @@ -3315,7 +3315,7 @@ void debug_80C7B14(u8 taskId) if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(debug_80C370C); gTasks[taskId].func = debug_80C373C; } |