diff options
Diffstat (limited to 'src')
74 files changed, 356 insertions, 356 deletions
diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c index e7387a52a..c60618a49 100644 --- a/src/battle/anim/evasion.c +++ b/src/battle/anim/evasion.c @@ -32,7 +32,7 @@ void sub_80CE7E0(u8 taskId) gPlttBufferUnfaded[r3 + i] = gPlttBufferUnfaded[r4 + i]; } - BlendPalette(r3, 16, 11, 0); + BlendPalette(r3, 16, 11, RGB(0, 0, 0)); task->data[3] = 0; i = 0; while (i <= 1 && (obj = duplicate_obj_of_side_rel2move_in_transparent_mode(0)) >= 0) diff --git a/src/battle/anim/flash.c b/src/battle/anim/flash.c index eaa38e5b7..2799046c8 100644 --- a/src/battle/anim/flash.c +++ b/src/battle/anim/flash.c @@ -39,7 +39,7 @@ void sub_80CE3EC(u8 taskId) sub_8079BF4(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void*)c); b = b | (0x10000 << IndexOfSpritePaletteTag(0x27D2)); d = IndexOfSpritePaletteTag(0x27D3); - BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 0x10, 32699); + BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 16, RGB(27, 29, 31)); gTasks[taskId].func = sub_80CE4D4; sub_80CE4D4(taskId); } diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index 05859d31c..9f427a9c4 100644 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -159,7 +159,7 @@ static void sub_80CD5A8(struct Sprite* sprite) sprite->data[1] = 0; } - BlendPalettes(sub_80791A8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], 0x7FFF); + BlendPalettes(sub_80791A8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB(31, 31, 31)); if (sprite->data[1] == 16) { int pal; diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index da566628d..728a1bdf7 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1346,7 +1346,7 @@ void c2_081284E0(void) gBattleCommunication[1]--; if (gBattleCommunication[1] == 0) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleCommunication[0]++; } break; @@ -3280,7 +3280,7 @@ void oac_poke_opponent(struct Sprite *sprite) { sprite->callback = sub_8010278; StartSpriteAnimIfDifferent(sprite, 0); - BeginNormalPaletteFade(0x00020000, 0, 10, 10, 0x3DEF); + BeginNormalPaletteFade(0x00020000, 0, 10, 10, RGB(15, 15, 15)); } void sub_8010278(struct Sprite *sprite) @@ -3304,7 +3304,7 @@ void sub_80102AC(struct Sprite *sprite) sub_8043DFC(gHealthboxIDs[sprite->data[0]]); sprite->callback = nullsub_37; StartSpriteAnimIfDifferent(sprite, 0); - BeginNormalPaletteFade(0x00020000, 0, 10, 0, 0x3DEF); + BeginNormalPaletteFade(0x00020000, 0, 10, 0, RGB(15, 15, 15)); } } diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 9dc9d62ec..bb36c3520 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -9766,7 +9766,7 @@ static void atk5A_yesnoboxlearnmove(void) if (gBattleCommunication[1] == 0) { sub_8023AD8(); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleStruct->atk5A_StateTracker++; return; } @@ -15845,7 +15845,7 @@ static void atkF2_displaydexinfo(void) switch (gBattleCommunication[0]) { case 0: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleCommunication[0]++; break; case 1: @@ -15863,7 +15863,7 @@ static void atkF2_displaydexinfo(void) LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60); REG_BG3CNT = 0x5a0b; gBattle_BG3_X = 0x100; - BeginNormalPaletteFade(0xfffc, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFC, 0, 16, 0, RGB(0, 0, 0)); gBattleCommunication[0]++; } break; diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index dc5df71f2..75afc2739 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -334,7 +334,7 @@ void BattleLoadOpponentMonSprite(struct Pokemon *pkmn, u8 b) } if (ewram17800[b].transformedSpecies != 0) { - BlendPalette(paletteOffset, 16, 6, 0x7FFF); + BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31)); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); } } @@ -386,7 +386,7 @@ void BattleLoadPlayerMonSprite(struct Pokemon *pkmn, u8 b) } if (ewram17800[b].transformedSpecies != 0) { - BlendPalette(paletteOffset, 16, 6, 0x7FFF); + BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31)); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); } } @@ -646,7 +646,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) gBattleMonForms[a] = ewram17840.unk0; if (ewram17800[a].transformedSpecies != 0) { - BlendPalette(paletteOffset, 16, 6, 0x7FFF); + BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31)); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); } gSprites[gBankSpriteIds[a]].pos1.y = sub_8077F68(a); @@ -714,7 +714,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) LZDecompressWram(lzPaletteData, paletteSrc); LoadPalette(paletteSrc + gBattleMonForms[b] * 16, paletteOffset, 32); } - BlendPalette(paletteOffset, 16, 6, 0x7FFF); + BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31)); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); if (!IsContest()) { diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 004963b70..d1dcf8bf4 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -2655,7 +2655,7 @@ void PlayerHandlecmd10(void) void PlayerHandlecmd11(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB(0, 0, 0)); PlayerBufferExecCompleted(); } @@ -2835,7 +2835,7 @@ void PlayerHandleOpenBag(void) { s32 i; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleBankFunc[gActiveBattler] = sub_802E004; gBankInMenu = gActiveBattler; for (i = 0; i < 3; i++) @@ -2853,7 +2853,7 @@ void PlayerHandlecmd22(void) ewram160C0 = gBattleBufferA[gActiveBattler][3]; for (i = 0; i < 3; i++) gUnknown_02038470[i] = gBattleBufferA[gActiveBattler][4 + i]; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleBankFunc[gActiveBattler] = sub_802DF30; gBankInMenu = gActiveBattler; } @@ -2861,7 +2861,7 @@ void PlayerHandlecmd22(void) void PlayerHandlecmd23(void) { BattleStopLowHpSound(); - BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB(0, 0, 0)); PlayerBufferExecCompleted(); } diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index 53c4d71d7..6bc56c19b 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -514,7 +514,7 @@ void SafariHandlecmd20(void) void SafariHandleOpenBag(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleBankFunc[gActiveBattler] = sub_812B724; gBankInMenu = gActiveBattler; } diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index 451e02b40..3f88d4c72 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -1312,7 +1312,7 @@ void WallyHandlecmd20(void) void WallyHandleOpenBag(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleBankFunc[gActiveBattler] = sub_81374C4; gBankInMenu = gActiveBattler; } diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c index 923cf05a4..e758b7957 100644 --- a/src/battle/battle_party_menu.c +++ b/src/battle/battle_party_menu.c @@ -515,7 +515,7 @@ void HandleBattlePartyMenu(u8 taskId) static void Task_809527C(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_80952B4; } @@ -535,7 +535,7 @@ static void Task_80952E4(u8 taskId) Task_809527C(taskId); else { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_8095330; } } @@ -633,7 +633,7 @@ static void Task_BattlePartyMenuSummary(u8 taskId) { sub_806CA38(taskId); //an unused variable was probably set with this. gTasks[taskId].func = Task_ShowSummaryScreen; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } static void Task_BattlePartyMenuShift(u8 taskId) diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c index d5035a862..a0c94f713 100644 --- a/src/battle/battle_transition.c +++ b/src/battle/battle_transition.c @@ -643,7 +643,7 @@ static bool8 Phase2_Transition_Blur_Func2(struct Task* task) { task->data[1] = 4; if (++task->data[2] == 10) - BeginNormalPaletteFade(-1, -1, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB(0, 0, 0)); REG_MOSAIC = (task->data[2] & 15) * 17; if (task->data[2] > 14) task->tState++; @@ -672,7 +672,7 @@ static bool8 Phase2_Transition_Swirl_Func1(struct Task* task) sub_811D658(); ScanlineEffect_Clear(); - BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, RGB(0, 0, 0)); sub_811D6E8(gScanlineEffectRegBuffers[1], TRANSITION_STRUCT.field_14, 0, 2, 0, 160); SetVBlankCallback(VBlankCB_Phase2_Transition_Swirl); @@ -733,7 +733,7 @@ static bool8 Phase2_Transition_Shuffle_Func1(struct Task* task) sub_811D658(); ScanlineEffect_Clear(); - BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, RGB(0, 0, 0)); memset(gScanlineEffectRegBuffers[1], TRANSITION_STRUCT.field_16, 0x140); SetVBlankCallback(VBlankCB_Phase2_Transition_Shuffle); @@ -1314,7 +1314,7 @@ static bool8 Phase2_Transition_Ripple_Func2(struct Task* task) if (++task->data[3] == 81) { task->data[4]++; - BeginNormalPaletteFade(-1, -2, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB(0, 0, 0)); } if (task->data[4] != 0 && !gPaletteFade.active) @@ -1664,7 +1664,7 @@ static bool8 Phase2_Mugshot_Func7(struct Task* task) static bool8 Phase2_Mugshot_Func8(struct Task* task) { TRANSITION_STRUCT.VBlank_DMA = 0; - BlendPalettes(-1, 0x10, 0x7FFF); + BlendPalettes(0xFFFFFFFF, 16, RGB(31, 31, 31)); TRANSITION_STRUCT.BLDCNT = 0xFF; task->data[3] = 0; @@ -1993,7 +1993,7 @@ static bool8 Phase2_Transition_WhiteFade_Func3(struct Task* task) TRANSITION_STRUCT.VBlank_DMA = 0; if (TRANSITION_STRUCT.field_20 > 7) { - BlendPalettes(-1, 0x10, 0x7FFF); + BlendPalettes(0xFFFFFFFF, 16, RGB(31, 31, 31)); task->tState++; } return FALSE; @@ -2302,7 +2302,7 @@ static bool8 Phase1_TransitionAll_Func1(struct Task* task) task->data[7] += task->data[4]; if (task->data[7] > 16) task->data[7] = 16; - BlendPalettes(-1, task->data[7], 0x2D6B); + BlendPalettes(0xFFFFFFFF, task->data[7], RGB(11, 11, 11)); } if (task->data[7] > 15) { @@ -2320,7 +2320,7 @@ static bool8 Phase1_TransitionAll_Func2(struct Task* task) task->data[7] -= task->data[5]; if (task->data[7] < 0) task->data[7] = 0; - BlendPalettes(-1, task->data[7], 0x2D6B); + BlendPalettes(0xFFFFFFFF, task->data[7], RGB(11, 11, 11)); } if (task->data[7] == 0) { @@ -2379,7 +2379,7 @@ static void sub_811D6A8(u16** a0, u16** a1) static void sub_811D6D4(void) { - BlendPalettes(-1, 0x10, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); } static void sub_811D6E8(s16* array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize) diff --git a/src/berry_blender.c b/src/berry_blender.c index cde189738..b8df29ec6 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -945,7 +945,7 @@ static void sub_804E56C(void) } break; case 2: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sub_8051474(); gBerryBlenderData->field_0++; break; @@ -965,7 +965,7 @@ static void sub_804E56C(void) if (Menu_UpdateWindowText()) { gBerryBlenderData->field_0++; - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } break; case 6: @@ -1137,7 +1137,7 @@ static void sub_804E9F8(void) gBerryBlenderData->field_0++; break; case 3: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gBerryBlenderData->field_0++; break; case 4: @@ -1432,7 +1432,7 @@ static void sub_804F378(void) gBerryBlenderData->field_0++; break; case 3: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gBerryBlenderData->field_0++; gBerryBlenderData->framesToWait = 0; break; @@ -2479,7 +2479,7 @@ static void sub_8050E30(void) case 9: if (IsLinkTaskFinished()) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBerryBlenderData->field_6F++; } break; diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 9fbfd0681..77f80d728 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -157,7 +157,7 @@ static bool8 sub_8146058(void) gMain.state += 1; break; case 12: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = 0; SetMainCallback2(sub_8146014); return TRUE; @@ -246,7 +246,7 @@ static void sub_814640C(u8 taskId) static void sub_8146440(u8 taskId) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_814640C; } diff --git a/src/cable_car.c b/src/cable_car.c index 8c3f9885d..38ea86096 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -275,7 +275,7 @@ void CableCar(void) { ScriptContext2_Enable(); CreateTask(CableCarTask1, 1); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } #if DEBUG @@ -385,7 +385,7 @@ static void CableCarMainCallback_Setup(void) gMain.state++; break; case 7: - BeginNormalPaletteFade(-1, 3, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0)); FadeInNewBGM(BGM_ROPEWAY, 1); sub_8123FBC(1); gMain.state++; @@ -497,7 +497,7 @@ static void sub_8123878(u8 taskId) if (sCableCarPtr->unk_0006 == 570) { sCableCarPtr->unk_0001 = 3; - BeginNormalPaletteFade(-1, 3, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 3, 0, 16, RGB(0, 0, 0)); FadeOutBGM(4); } break; diff --git a/src/choose_party.c b/src/choose_party.c index 698460547..5aed5b22e 100644 --- a/src/choose_party.c +++ b/src/choose_party.c @@ -305,7 +305,7 @@ void HandleBattleTowerPartyMenu(u8 taskId) case B_BUTTON: PlaySE(SE_SELECT); ClearPartySelection(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_8122450; break; } @@ -386,7 +386,7 @@ static void sub_81224A8(u8 taskId) { if (gSelectedOrderFromParty[0] != 0) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_8122450; } else @@ -441,7 +441,7 @@ static void sub_81225D4(u8 taskId) // Summary callback? static void BattleTowerEntryMenuCallback_Summary(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_81225D4; } @@ -700,7 +700,7 @@ static void sub_8122C18(u8 taskId) gTasks[taskId].data[0]++; if (gTasks[taskId].data[0] == 256) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_8122450; } } @@ -919,7 +919,7 @@ static void sub_8123034(u8 taskId) static void DaycareStorageMenuCallback_Summary(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_8123034; } @@ -934,7 +934,7 @@ static void DaycareStorageMenuCallback_Exit(u8 taskId) void sub_8123138(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_8123170; } diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c index b6053715a..b7f648887 100644 --- a/src/clear_save_data_menu.c +++ b/src/clear_save_data_menu.c @@ -135,7 +135,7 @@ static u8 InitClearSaveDataScreen(void) Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xffff); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, FADE_COLOR_WHITE); ime = REG_IME; REG_IME = 0; @@ -164,7 +164,7 @@ static void CB2_SoftReset(void) { case 0: default: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xffff); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); gMain.state = 1; break; case 1: diff --git a/src/contest.c b/src/contest.c index f7436c51c..d9c19f773 100644 --- a/src/contest.c +++ b/src/contest.c @@ -2042,7 +2042,7 @@ void sub_80ADEEC(u8 taskId) } else { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_80ADFD8; } } @@ -2061,7 +2061,7 @@ void sub_80ADF4C(u8 taskId) void sub_80ADF98(u8 taskId) { DestroyTask(taskId); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[sContest.mainTaskId].func = sub_80ADFD8; } @@ -3638,7 +3638,7 @@ void sub_80B03D8(u8 taskId) { gTasks[sContest.unk19211].data[r4 * 4 + 0] = 0xFF; gTasks[sContest.unk19211].data[r4 * 4 + 1] = 0; - BlendPalette((sContest.unk19218[r4] + 5) * 16 + 6, 2, 0, 0x4BFF); + BlendPalette((sContest.unk19218[r4] + 5) * 16 + 6, 2, 0, RGB(31, 31, 18)); DestroyTask(taskId); } } @@ -3666,7 +3666,7 @@ void sub_80B0458(u8 taskId) (sContest.unk19218[i] + 5) * 16 + 6, 2, gTasks[taskId].data[r3 + 0], - 0x4BFF); + RGB(31, 31, 18)); } } } @@ -3746,8 +3746,8 @@ void sub_80B05FC(u8 taskId) || gTasks[taskId].data[r3 + 0] == 0) gTasks[taskId].data[r3 + 1] ^= 1; - BlendPalette((i + 5) * 16 + 10, 1, gTasks[taskId].data[r3 + 0], 0x4BFF); - BlendPalette((i + 5) * 16 + 12 + i, 1, gTasks[taskId].data[r3 + 0], 0x4BFF); + BlendPalette((i + 5) * 16 + 10, 1, gTasks[taskId].data[r3 + 0], RGB(31, 31, 18)); + BlendPalette((i + 5) * 16 + 12 + i, 1, gTasks[taskId].data[r3 + 0], RGB(31, 31, 18)); } } } @@ -3798,7 +3798,7 @@ void sub_80B0748(u8 taskId) { //_080B07D2 r6 = 0; - BlendPalette((r4 + 5) * 16 + 1, 3, r5, 0x7FFF); + BlendPalette((r4 + 5) * 16 + 1, 3, r5, RGB(31, 31, 31)); if (r5 == 0 && r8 == 4) { gTasks[taskId].data[r1 + 0] = 0; @@ -3839,8 +3839,8 @@ void sub_80B0748(u8 taskId) r8++; if (r7 == 4 && r8 == 1) { - BlendPalette((r4 + 9) * 16 + 2, 1, 4, 0); - BlendPalette((r4 + 9) * 16 + 5, 1, 4, 0); + BlendPalette((r4 + 9) * 16 + 2, 1, 4, RGB(0, 0, 0)); + BlendPalette((r4 + 9) * 16 + 5, 1, 4, RGB(0, 0, 0)); } } } @@ -3854,7 +3854,7 @@ void sub_80B0748(u8 taskId) if (r6 == 12) { r6 = 0; - BlendPalette((r4 + 5) * 16 + 1, 3, r5, 0); + BlendPalette((r4 + 5) * 16 + 1, 3, r5, RGB(0, 0, 0)); r5 += 1; if (r5 == 5) { @@ -4834,13 +4834,13 @@ void c3_08130B10(u8 taskId) gTasks[taskId].data[4]++; else gTasks[taskId].data[4]--; - BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, gTasks[taskId].data[4], 0x7FFF); + BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, gTasks[taskId].data[4], RGB(31, 31, 31)); if (gTasks[taskId].data[4] == 0 || gTasks[taskId].data[4] == 16) { gTasks[taskId].data[3] ^= 1; if (sContest.applauseLevel < 5) { - BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, 0, 31); + BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, 0, RGB(31, 0, 0)); DestroyTask(taskId); } } diff --git a/src/contest_painting.c b/src/contest_painting.c index 28dd3def7..03840215b 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -212,7 +212,7 @@ static void HoldContestPainting(void) u8 two = 2; //needed to make the asm match gUnknown_03000750 = two; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } if (gUnknown_03000756 != 0) gUnknown_03000754 = 0; diff --git a/src/credits.c b/src/credits.c index 9a85265e4..b99bc56bd 100644 --- a/src/credits.c +++ b/src/credits.c @@ -487,7 +487,7 @@ void sub_81439D0(void) gTasks[taskIdB].data[TDB_TASK_A_ID] = taskIdA; gTasks[taskIdA].data[TDA_TASK_B_ID] = taskIdB; - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); savedIme = REG_IME; REG_IME = 0; @@ -541,14 +541,14 @@ static void task_a_8143B68(u8 taskIdA) { gTasks[taskIdA].data[TDA_13] = data1; gTasks[taskIdA].data[TDA_11] = 0; - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskIdA].func = task_a_8143BFC; } else if (gTasks[taskIdA].data[TDA_11] == 2) { gTasks[taskIdA].data[TDA_13] = data1; gTasks[taskIdA].data[TDA_11] = 0; - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskIdA].func = task_a_8143CC0; } } @@ -571,7 +571,7 @@ static void task_a_80C9BFC(u8 taskIdA) if (sub_8144ECC(gTasks[taskIdA].data[TDA_7], taskIdA)) { - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); backup = REG_IME; REG_IME = 0; @@ -634,7 +634,7 @@ void task_a_8143D04(u8 taskIdA) gTasks[gTasks[taskIdA].data[TDA_TASK_D_ID]].data[TDD_TASK_A_ID] = taskIdA; gTasks[gTasks[taskIdA].data[TDA_TASK_D_ID]].data[TDD_2] = gTasks[taskIdA].data[TDA_7]; - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_BG3HOFS = 0; REG_BG3VOFS = 32; REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256; @@ -655,7 +655,7 @@ static void task_a_8143EBC(u8 taskIdA) return; } - BeginNormalPaletteFade(-1, 12, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 12, 0, 16, RGB(0, 0, 0)); gTasks[taskIdA].func = task_a_8143F04; } @@ -677,7 +677,7 @@ static void task_a_8143F3C(u8 taskIdA) sub_8145128(0, 0x3800, 0); ResetSpriteData(); FreeAllSpritePalettes(); - BeginNormalPaletteFade(-1, 8, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 8, 16, 0, RGB(0, 0, 0)); REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256; backup = REG_IME; @@ -699,7 +699,7 @@ static void task_a_8143FDC(u8 taskIdA) return; } - BeginNormalPaletteFade(-1, 6, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 6, 0, 16, RGB(0, 0, 0)); gTasks[taskIdA].func = task_a_8144024; } @@ -709,7 +709,7 @@ static void task_a_8144024(u8 taskIdA) { sub_81452D0(0x3800, 0); - BeginNormalPaletteFade(-1, 0, 0, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0, RGB(0, 0, 0)); gTasks[taskIdA].data[TDA_0] = 7200; gTasks[taskIdA].func = task_a_8144080; } @@ -722,7 +722,7 @@ static void task_a_8144080(u8 taskIdA) if (gTasks[taskIdA].data[TDA_0] == 0) { FadeOutBGM(4); - BeginNormalPaletteFade(-1, 8, 0, 16, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 8, 0, 16, FADE_COLOR_WHITE); gTasks[taskIdA].func = task_a_8144114; return; } @@ -730,7 +730,7 @@ static void task_a_8144080(u8 taskIdA) if (gMain.newKeys) { FadeOutBGM(4); - BeginNormalPaletteFade(-1, 8, 0, 16, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 8, 0, 16, FADE_COLOR_WHITE); gTasks[taskIdA].func = task_a_8144114; return; } 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; } diff --git a/src/diploma.c b/src/diploma.c index b31fc7dec..a6026d423 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -71,7 +71,7 @@ void CB2_ShowDiploma(void) Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); DisplayDiplomaText(); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); savedIme = REG_IME; REG_IME = 0; @@ -109,7 +109,7 @@ static void Task_DiplomaWaitForKeyPress(u8 taskId) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_DiplomaFadeOut; } } diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index 4b64846f9..4f5c71518 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -328,7 +328,7 @@ void sub_80E62F8(void) SetVBlankCallback(sub_80E6A6C); break; case 7: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); break; case 8: REG_DISPCNT = 0x1F40; @@ -1227,7 +1227,7 @@ void sub_80E752C(void) switch (gEasyChatStruct->unk24) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gEasyChatStruct->unk24++; break; case 1: diff --git a/src/egg_hatch.c b/src/egg_hatch.c index eb66f299d..580ec6886 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -441,7 +441,7 @@ void EggHatch(void) { ScriptContext2_Enable(); CreateTask(Task_EggHatch, 10); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } static void Task_EggHatch(u8 taskID) @@ -554,7 +554,7 @@ static void CB2_EggHatch_1(void) switch (gEggHatchData->CB2_state) { case 0: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_DISPCNT = 0x1740; gEggHatchData->CB2_state++; CreateTask(Task_EggHatchPlayBGM, 5); @@ -629,7 +629,7 @@ static void CB2_EggHatch_1(void) } break; case 10: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gEggHatchData->CB2_state++; break; case 11: @@ -730,7 +730,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite) { s16 i; if (sprite->data[0] == 0) - BeginNormalPaletteFade(-1, -1, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, FADE_COLOR_WHITE); if (sprite->data[0] < 4u) { for (i = 0; i <= 3; i++) @@ -754,7 +754,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite) StartSpriteAffineAnim(&gSprites[gEggHatchData->pokeSpriteID], 1); } if (sprite->data[0] == 8) - BeginNormalPaletteFade(-1, -1, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, FADE_COLOR_WHITE); if (sprite->data[0] <= 9) gSprites[gEggHatchData->pokeSpriteID].pos1.y -= 1; if (sprite->data[0] > 40) diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index b9ef5b402..f585b2bee 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -271,7 +271,7 @@ static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID) { SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; - BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 0xA, 0, 0x10, 0x7FFF); + BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 10, 0, 16, RGB(31, 31, 31)); gTasks[taskID].func = EvoTask_CreatePreEvoSparkleSet1; PlaySE(SE_W025); } @@ -389,7 +389,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash(u8 taskID) SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); - BeginNormalPaletteFade(0xFFF9001C, 0, 0, 0x10, 0x7FFF); + BeginNormalPaletteFade(0xFFF9001C, 0, 0, 16, RGB(31, 31, 31)); gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash; PlaySE(SE_W080); } @@ -410,7 +410,7 @@ static void EvoTask_CreatePostEvoSparklesSet2_AndFlash(u8 taskID) CreatePostEvoSparkleSet2(i); break; case 32: - BeginNormalPaletteFade(0xFFFF001C, 0x10, 0x10, 0, 0x7FFF); + BeginNormalPaletteFade(0xFFFF001C, 16, 16, 0, RGB(31, 31, 31)); break; } gTasks[taskID].tFrameCounter++; @@ -437,7 +437,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID) SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); - BeginNormalPaletteFade(0xFFF90001, 0, 0, 0x10, 0x7FFF); + BeginNormalPaletteFade(0xFFF90001, 0, 0, 16, RGB(31, 31, 31)); gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade; PlaySE(SE_W080); } @@ -458,7 +458,7 @@ static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID) CreatePostEvoSparkleSet2(i); break; case 32: - BeginNormalPaletteFade(0xFFFF0001, 0x10, 0x10, 0, 0x7FFF); + BeginNormalPaletteFade(0xFFFF0001, 16, 16, 0, RGB(31, 31, 31)); break; } gTasks[taskID].tFrameCounter++; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 4fdbeb60f..48d5dd82c 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -143,7 +143,7 @@ static void Task_BeginEvolutionScene(u8 taskID) switch (gTasks[taskID].tState) { case 0: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].tState++; break; case 1: @@ -344,7 +344,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) SetHBlankCallback(EvoDummyFunc); SetVBlankCallback(VBlankCB_EvolutionScene); SetMainCallback2(CB2_EvolutionSceneUpdate); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); } static void CB2_TradeEvolutionSceneLoadGraphics(void) @@ -419,7 +419,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) } break; case 6: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetMainCallback2(CB2_TradeEvolutionSceneUpdate); REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP; break; @@ -545,7 +545,7 @@ static void Task_EvolutionScene(u8 taskID) switch (gTasks[taskID].tState) { case 0: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gSprites[sEvoInfo.preEvoSpriteID].invisible = 0; gTasks[taskID].tState++; break; @@ -576,7 +576,7 @@ static void Task_EvolutionScene(u8 taskID) { PlayNewMapMusic(BGM_SHINKA); gTasks[taskID].tState++; - BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0); + BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0)); } break; case 5: // after screen fade, preapre evo sparkles @@ -633,7 +633,7 @@ static void Task_EvolutionScene(u8 taskID) m4aMPlayAllStop(); PlayCry1(gTasks[taskID].tPostEvoSpecies, 0); memcpy(&gPlttBufferUnfaded[0x20], ewram9000_hack, 0x60); - BeginNormalPaletteFade(0x1C, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0x1C, 0, 16, 0, RGB(0, 0, 0)); gTasks[taskID].tState++; } break; @@ -675,7 +675,7 @@ static void Task_EvolutionScene(u8 taskID) } else // no move to learn { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].tState++; } } @@ -695,7 +695,7 @@ static void Task_EvolutionScene(u8 taskID) if (!gTasks[sEvoGraphicsTaskID].isActive) { m4aMPlayAllStop(); - BeginNormalPaletteFade(0x6001C, 0, 0x10, 0, 0x7FFF); + BeginNormalPaletteFade(0x6001C, 0, 16, 0, RGB(31, 31, 31)); gTasks[taskID].tState++; } break; @@ -797,7 +797,7 @@ static void Task_EvolutionScene(u8 taskID) { gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9; if (gTasks[taskID].tLearnMoveState == 5) - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } } if (gMain.newKeys & B_BUTTON) @@ -918,7 +918,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { PlayBGM(BGM_SHINKA); gTasks[taskID].tState++; - BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0); + BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0)); } break; case 4: @@ -975,7 +975,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { PlayCry1(gTasks[taskID].tPostEvoSpecies, 0); memcpy(&gPlttBufferUnfaded[0x20], ewram9000_hack, 0x60); - BeginNormalPaletteFade(1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0x1, 0, 16, 0, RGB(0, 0, 0)); gTasks[taskID].tState++; } break; @@ -1116,7 +1116,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9; if (gTasks[taskID].tLearnMoveState == 5) - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } } if (gMain.newKeys & B_BUTTON) diff --git a/src/field_region_map.c b/src/field_region_map.c index 54091459f..a90b8ed6a 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -60,7 +60,7 @@ void CB2_FieldInitRegionMap(void) sub_813F0C8(); SetMainCallback2(CB2_FieldRegionMap); SetVBlankCallback(VBlankCB_FieldRegionMap); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); } void VBlankCB_FieldRegionMap(void) @@ -102,7 +102,7 @@ void sub_813EFDC(void) } break; case 3: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); ewram0_5.unk888++; break; case 4: diff --git a/src/field_weather.c b/src/field_weather.c index 5857145ef..9a5a83737 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -782,7 +782,7 @@ void ApplyFogBlend(u8 blendCoeff, u16 blendColor) u8 bBlend; u16 curPalIndex; - BlendPalette(0, 0x100, blendCoeff, blendColor); + BlendPalette(0, 256, blendCoeff, blendColor); color = *(struct RGBColor *)&blendColor; rBlend = color.r; gBlend = color.g; @@ -970,7 +970,7 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) else { paletteIndex *= 16; - BlendPalette(paletteIndex, 16, 12, 0x73FC); + BlendPalette(paletteIndex, 16, 12, RGB(28, 31, 28)); } break; } diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index c6e3211b8..88069f6e9 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -50,7 +50,7 @@ static void StartSweetScentFieldEffect(void) u8 taskId; PlaySE(SE_W230); - BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, 0x1F); + BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB(31, 0, 0)); taskId = CreateTask(TrySweetScentEncounter, 0); gTasks[taskId].data[0] = 0; FieldEffectActiveListRemove(FLDEFF_SWEET_SCENT); @@ -70,7 +70,7 @@ static void TrySweetScentEncounter(u8 taskId) else { gTasks[taskId].func = FailSweetScentEncounter; - BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 8, 0, 0x1F); + BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 8, 0, RGB(31, 0, 0)); } } else diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 2b790e97d..5bd0d229b 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -429,7 +429,7 @@ static bool8 sub_8141E64(void) { u16 saved_IME; - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(VBlankCB_HallOfFame); saved_IME = REG_IME; REG_IME = 0; @@ -645,7 +645,7 @@ static void sub_8142484(u8 taskID) if (gTasks[taskID].tDisplayedPoke <= 4 && currMon[1].species != 0) // there is another pokemon to display { gTasks[taskID].tDisplayedPoke++; - BeginNormalPaletteFade(sUnknown_0203931C, 0, 12, 12, 0x735F); + BeginNormalPaletteFade(sUnknown_0203931C, 0, 12, 12, RGB(31, 26, 28)); gSprites[gTasks[taskID].tMonSpriteID(currPokeID)].oam.priority = 1; gTasks[taskID].func = sub_8142320; } @@ -658,7 +658,7 @@ static void sub_8142570(u8 taskID) { u16 i; - BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, 0); + BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, RGB(0, 0, 0)); for (i = 0; i < 6; i++) { if (gTasks[taskID].tMonSpriteID(i) != 0xFF) @@ -687,7 +687,7 @@ static void sub_8142618(u8 taskID) if (gTasks[taskID].tMonSpriteID(i) != 0xFF) gSprites[gTasks[taskID].tMonSpriteID(i)].oam.priority = 1; } - BeginNormalPaletteFade(sUnknown_0203931C, 0, 12, 12, 0x735F); + BeginNormalPaletteFade(sUnknown_0203931C, 0, 12, 12, RGB(31, 26, 28)); Menu_EraseWindowRect(0, 14, 29, 19); gTasks[taskID].tFrameCount = 7; gTasks[taskID].func = sub_81426F8; @@ -747,7 +747,7 @@ static void sub_8142818(u8 taskID) static void sub_8142850(u8 taskID) { CpuSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x200); - BeginNormalPaletteFade(-1, 8, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 8, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_81428A0; } @@ -906,7 +906,7 @@ static void sub_8142B04(u8 taskID) gTasks[taskID].tMonSpriteID(i) = 0xFF; } - BlendPalettes(0xFFFF0000, 0xC, 0x735F); + BlendPalettes(0xFFFF0000, 12, RGB(31, 26, 28)); stringPtr = gStringVar1; stringPtr = StringCopy(stringPtr, gMenuText_HOFNumber); @@ -944,7 +944,7 @@ static void sub_8142CC8(u8 taskID) currMonID = gTasks[taskID].tMonSpriteID(gTasks[taskID].tCurrPokeID); gSprites[currMonID].oam.priority = 0; sUnknown_0203931C = (0x10000 << gSprites[currMonID].oam.paletteNum) ^ 0xFFFF0000; - BlendPalettesUnfaded(sUnknown_0203931C, 0xC, 0x735F); + BlendPalettesUnfaded(sUnknown_0203931C, 12, RGB(31, 26, 28)); currMon = &savedTeams->mons[gTasks[taskID].tCurrPokeID]; if (currMon->species != SPECIES_EGG) diff --git a/src/hof_pc.c b/src/hof_pc.c index 267ed4274..3ff9eaaea 100644 --- a/src/hof_pc.c +++ b/src/hof_pc.c @@ -29,7 +29,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void) { ScriptContext2_Enable(); Overworld_PlaySpecialMapMusic(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); ScrSpecial_CreatePCMenu(); ScriptMenu_DisplayPCStartupPrompt(); CreateTask(Task_WaitForPaletteFade, 10); diff --git a/src/intro.c b/src/intro.c index 5c0e7a67d..b444c518e 100644 --- a/src/intro.c +++ b/src/intro.c @@ -877,7 +877,7 @@ static u8 SetUpCopyrightScreen(void) ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, FADE_COLOR_WHITE); REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) @@ -901,7 +901,7 @@ static u8 SetUpCopyrightScreen(void) GameCubeMultiBoot_Main(&gMultibootProgramStruct); if (gMultibootProgramStruct.gcmb_field_2 != 1) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMain.state++; } break; @@ -982,7 +982,7 @@ void Task_IntroLoadPart1Graphics(u8 taskId) static void Task_IntroFadeIn(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(VBlankCB_Intro); REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON; gTasks[taskId].func = Task_IntroWaterDrops; @@ -1054,7 +1054,7 @@ static void Task_IntroScrollDownAndShowEon(u8 taskId) //fade to white if (gIntroFrameCounter > 1007) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); gTasks[taskId].func = Task_IntroWaitToSetupPart2; } } @@ -1111,7 +1111,7 @@ static void Task_IntroStartBikeRide(u8 taskId) #endif gSprites[spriteId].callback = sub_813D880; gTasks[taskId].data[2] = spriteId; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, FADE_COLOR_WHITE); SetVBlankCallback(VBlankCB_Intro); #ifdef SAPPHIRE gTasks[taskId].data[0] = sub_8148EC0(0, 0x4000, 0x40, 0x10); @@ -1130,7 +1130,7 @@ static void Task_IntroHandleBikeAndEonMovement(u8 taskId) if (gIntroFrameCounter > 1823) { - BeginNormalPaletteFade(0xFFFFFFFF, 16, 0, 16, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 16, 0, 16, FADE_COLOR_WHITE); gTasks[taskId].func = Task_IntroWaitToSetupPart3; } if (gIntroFrameCounter == 1109) @@ -1181,7 +1181,7 @@ static void Task_IntroLoadPart3Graphics(u8 taskId) sub_813CE30(0x78, 0x50, 0, 0); ResetSpriteData(); FreeAllSpritePalettes(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, FADE_COLOR_WHITE); REG_BG2CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(8) | BGCNT_256COLOR | BGCNT_AFF256x256; REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON; gTasks[taskId].func = Task_IntroSpinAndZoomPokeball; @@ -1203,7 +1203,7 @@ static void Task_IntroSpinAndZoomPokeball(u8 taskId) } sub_813CE30(0x78, 0x50, 0x10000 / gTasks[taskId].data[1], gTasks[taskId].data[0]); if (gIntroFrameCounter == 44) - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); } static void Task_IntroWaitToSetupPart3DoubleFight(u8 taskId) @@ -1341,7 +1341,7 @@ static void Task_IntroPokemonBattle(u8 taskId) } if (gIntroFrameCounter == 400) { - BeginNormalPaletteFade(0xFF0000, 0, 0x10, 0, 0x7EFF); + BeginNormalPaletteFade(0xFF0000, 0, 16, 0, RGB(31, 23, 31)); } if (gIntroFrameCounter == 432) { @@ -1408,7 +1408,7 @@ static void Task_IntroPokemonBattle(u8 taskId) if (gIntroFrameCounter == 800) PlaySE(SE_OP_BASYU); if (gIntroFrameCounter == 850) - BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, FADE_COLOR_WHITE); if (gIntroFrameCounter == 946) gTasks[taskId].func = task_intro_19; } @@ -1433,7 +1433,7 @@ static void task_intro_20(u8 taskId) gTasks[taskId].data[0] = 0xFF; break; case 2: - BeginNormalPaletteFade(1, 0, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0x1, 0, 16, 0, FADE_COLOR_WHITE); REG_BG2CNT = BG2_FLAGS; REG_DISPCNT = DISPCNT_FLAGS; gTasks[taskId].data[1] = 0; @@ -1447,7 +1447,7 @@ static void task_intro_20(u8 taskId) gTasks[taskId].data[2] -= 8; break; case 3: - BeginNormalPaletteFade(1, 0, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0x1, 0, 16, 0, FADE_COLOR_WHITE); REG_BG2CNT = BG2_FLAGS; REG_DISPCNT = DISPCNT_FLAGS; gTasks[taskId].data[1] = 0; @@ -1461,7 +1461,7 @@ static void task_intro_20(u8 taskId) gTasks[taskId].data[2] += 8; break; case 4: - BeginNormalPaletteFade(1, 5, 0, 0x10, 0x37F7); + BeginNormalPaletteFade(0x1, 5, 0, 16, RGB(23, 31, 13)); REG_BG2CNT = BG2_FLAGS; REG_DISPCNT = DISPCNT_FLAGS; gTasks[taskId].data[1] = 0; diff --git a/src/item_menu.c b/src/item_menu.c index e31801384..fa2ac3a5d 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -478,7 +478,7 @@ static bool8 SetupBagMultistep(void) REG_IE |= INTR_FLAG_VBLANK; REG_IME = savedIme; REG_DISPSTAT |= DISPSTAT_VBLANK_INTR; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = FALSE; gMain.state++; break; @@ -2647,7 +2647,7 @@ static void OnItemSelect_Field05(u8 taskId) static void sub_80A5AAC(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = HandleItemMenuPaletteFade; } @@ -2926,7 +2926,7 @@ static void HandlePopupMenuAction_Give(u8 taskId) gTasks[taskId].data[9] = (u32)sub_808B020; gTasks[taskId].func = HandleItemMenuPaletteFade; gUnknown_02038561 = 1; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } } else @@ -3477,7 +3477,7 @@ void sub_80A7094(u8 taskId) gTasks[taskId].data[8] = (u32)sub_802E424 >> 16; gTasks[taskId].data[9] = (u32)sub_802E424; gTasks[taskId].func = HandleItemMenuPaletteFade; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } static void OnBagClose_Battle(u8 taskId) @@ -3578,7 +3578,7 @@ static void sub_80A7230(u8 taskId) taskData[8] = (u32)sub_802E424 >> 16; taskData[9] = (u32)sub_802E424; gTasks[taskId].func = HandleItemMenuPaletteFade; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); return; } taskData[15]++; diff --git a/src/item_use.c b/src/item_use.c index 19c298850..97ef83ddc 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -93,7 +93,7 @@ void ExecuteSwitchToOverworldFromItemUse(u8 taskId) void ItemMenu_ConfirmNormalFade(u8 var) { ExecuteSwitchToOverworldFromItemUse(var); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void ItemMenu_ConfirmComplexFade(u8 var) @@ -165,7 +165,7 @@ void ItemMenu_ReadMail(u8 taskId) void ItemUseOutOfBattle_Mail(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = ItemMenu_ReadMail; } @@ -787,7 +787,7 @@ void sub_80C9C7C(u8 taskId) gTasks[taskId].data[8] = (u32)c2_exit_to_overworld_2_switch >> 16; gTasks[taskId].data[9] = (u32)c2_exit_to_overworld_2_switch; gTasks[taskId].func = HandleItemMenuPaletteFade; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB(0, 0, 0)); } else { @@ -1072,7 +1072,7 @@ void sub_80CA394(u8 taskId) void sub_80CA3C0(u8 taskId) { gTasks[taskId].func = sub_80CA394; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void ItemUseInBattle_Medicine(u8 var) diff --git a/src/learn_move.c b/src/learn_move.c index 356a31b00..17cdbf54e 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -243,7 +243,7 @@ void TeachMoveTutorMove(void) { ScriptContext2_Enable(); CreateTask(sub_813269C, 10); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void sub_813269C(u8 taskId) @@ -368,7 +368,7 @@ void LearnMoveMain(void) sub_8133800(); gSprites[1].pos1.x = 0x48; sLearnMoveStruct->unk2C3 = TRUE; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_DISPCNT = 0x1340; break; case 1: @@ -536,7 +536,7 @@ void LearnMoveMain(void) if (Menu_UpdateWindowText()) { sLearnMoveStruct->state = 20; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } break; case 20: @@ -551,10 +551,10 @@ void LearnMoveMain(void) sLearnMoveStruct->state = 14; break; case 22: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); break; case 14: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); sLearnMoveStruct->state++; break; case 15: @@ -562,7 +562,7 @@ void LearnMoveMain(void) SetMainCallback2(c2_exit_to_overworld_2_switch); break; case 28: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sLearnMoveStruct->state++; DrawLearnMoveMenuWindow(); sub_8133800(); diff --git a/src/link.c b/src/link.c index 45807830a..8b168c0a2 100644 --- a/src/link.c +++ b/src/link.c @@ -408,7 +408,7 @@ static void LinkTestProcessKeyInput(void) if (gMain.heldKeys & B_BUTTON) InitBlockSend(ewram4000, 0x2004); if (gMain.newKeys & L_BUTTON) - BeginNormalPaletteFade(-1, 0, 0x10, 0, 2); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(2, 0, 0)); if (gMain.newKeys & START_BUTTON) SetSuppressLinkErrorMessage(TRUE); if (gMain.newKeys & R_BUTTON) diff --git a/src/mail.c b/src/mail.c index 4497c98fb..ca698e23c 100644 --- a/src/mail.c +++ b/src/mail.c @@ -514,7 +514,7 @@ static u8 sub_80F8A28(void) REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(9) | BGCNT_16COLOR | BGCNT_TXT256x256; REG_BLDCNT = 0; REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON; - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = 0; ewram0_4.varF0 = sub_80F8F58; return TRUE; @@ -639,7 +639,7 @@ static void sub_80F8F78(void) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); ewram0_4.varF0 = sub_80F8FB4; } } @@ -701,7 +701,7 @@ void debug_sub_810C990(u8 taskId) } else if (gMain.newKeys & A_BUTTON) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = debug_sub_810C910; } else if (gMain.newKeys & B_BUTTON) @@ -1100,7 +1100,7 @@ void debug_sub_810D388(void) ScanlineEffect_Stop(); ResetPaletteFade(); SetVBlankCallback(sub_80F8F18); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } break; case 1: @@ -1139,7 +1139,7 @@ void debug_sub_810D388(void) REG_BLDCNT = 0; REG_DISPCNT = 0x0340; debug_sub_810D340(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(sub_80F8F18); break; case 7: diff --git a/src/main_menu.c b/src/main_menu.c index 5a3f55b29..e574b7b0e 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -236,9 +236,9 @@ u32 InitMainMenu(u8 a1) InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); if (a1) - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0x0000); // fade to black + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); else - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xFFFF); // fade to white + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, FADE_COLOR_WHITE); REG_WIN0H = 0; REG_WIN0V = 0; @@ -452,13 +452,13 @@ bool8 MainMenuProcessKeyInput(u8 taskId) if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0x0000); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_MainMenuPressedA; } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); REG_WIN0H = WIN_RANGE(0, 240); REG_WIN0V = WIN_RANGE(0, 160); gTasks[taskId].func = Task_MainMenuPressedB; @@ -765,7 +765,7 @@ static void Task_NewGameSpeech1(u8 taskId) ResetSpriteData(); FreeAllSpritePalettes(); AddBirchSpeechObjects(taskId); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_BG1CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256; REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP; gTasks[taskId].tBGhofs = 0; @@ -1094,7 +1094,7 @@ static void Task_NewGameSpeech21(u8 taskId) break; case 0: //NEW NAME PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_NewGameSpeech22; break; case -1: //B button @@ -1291,7 +1291,7 @@ static void Task_NewGameSpeech30(u8 taskId) InitSpriteAffineAnim(&gSprites[spriteId]); StartSpriteAffineAnim(&gSprites[spriteId], 0); gSprites[spriteId].callback = ShrinkPlayerSprite; - BeginNormalPaletteFade(0x0000FFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0x0000FFFF, 0, 0, 16, RGB(0, 0, 0)); FadeOutBGM(4); gTasks[taskId].func = Task_NewGameSpeech31; } @@ -1313,7 +1313,7 @@ static void Task_NewGameSpeech32(u8 taskId) u8 spriteId = gTasks[taskId].tTrainerSpriteId; gSprites[spriteId].callback = nullsub_34; REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON; - BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFF0000, 0, 0, 16, FADE_COLOR_WHITE); gTasks[taskId].func = Task_NewGameSpeech33; } } @@ -1393,7 +1393,7 @@ void CB_ContinueNewGameSpeechPart2() REG_BG1HOFS = -60; - BeginNormalPaletteFade(0xFFFFFFFFu, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_WIN0H = 0; REG_WIN0V = 0; diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 1ea177f2e..53659bdb4 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -89,7 +89,7 @@ static void CB2_MysteryEventMenu(void) { case 0: Menu_DrawStdWindowFrame(0, 14, 29, 19); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state++; break; case 1: @@ -314,7 +314,7 @@ static void CB2_MysteryEventMenu(void) } break; case 15: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMain.state++; break; case 16: @@ -416,7 +416,7 @@ void debug_sub_815D1D8(void) { case 0: Menu_DrawStdWindowFrame(3, 14, 27, 19); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state++; break; case 1: @@ -475,7 +475,7 @@ void debug_sub_815D1D8(void) case 10: if (gMain.newKeys & A_BUTTON) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMain.state++; } break; diff --git a/src/naming_screen.c b/src/naming_screen.c index 59b9b4d84..710bdefba 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -394,7 +394,7 @@ static void Task_NamingScreenMain(u8 taskId) static bool8 MainState_BeginFadeIn(struct Task *task) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); namingScreenDataPtr->state++; return 0; } @@ -495,7 +495,7 @@ static bool8 MainState_UpdateSentToPCMessage(struct Task *task) static bool8 MainState_BeginFadeInOut(struct Task *task) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); namingScreenDataPtr->state++; return FALSE; } diff --git a/src/option_menu.c b/src/option_menu.c index 8a46e48d9..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; } diff --git a/src/overworld.c b/src/overworld.c index e98e5a6a1..721932a7e 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1127,7 +1127,7 @@ void CB2_InitTestMenu(void) Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow(&gWindowTemplate_81E6CE4); debug_sub_8076B68(); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_IE |= 1; REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP; m4aSoundVSyncOn(); diff --git a/src/palette.c b/src/palette.c index 2a6602503..6bbcea73c 100644 --- a/src/palette.c +++ b/src/palette.c @@ -192,10 +192,10 @@ bool8 BeginNormalPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targe } } -bool8 unref_sub_8073D3C(u32 a1, u8 a2, u8 a3, u8 a4, u16 a5) +bool8 unref_sub_8073D3C(u32 selectedPalettes, s8 delay, u8 startY, u8 targetY, u16 blendColor) { ReadPlttIntoBuffers(); - return BeginNormalPaletteFade(a1, a2, a3, a4, a5); + return BeginNormalPaletteFade(selectedPalettes, delay, startY, targetY, blendColor); } void unref_sub_8073D84(u8 a1, u32 *a2) diff --git a/src/party_menu.c b/src/party_menu.c index 0fc362791..8887bb554 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -718,7 +718,7 @@ bool8 InitPartyMenu(void) gMain.state++; break; case 16: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -4059,7 +4059,7 @@ void sub_806F44C(u8 taskId) { if (gUnknown_0202E8F6 == 0) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_806F3FC; } } diff --git a/src/pc_screen_effect.c b/src/pc_screen_effect.c index 0e417b5f4..1bd87ea24 100644 --- a/src/pc_screen_effect.c +++ b/src/pc_screen_effect.c @@ -84,7 +84,7 @@ bool8 sub_80C5DCC(void) { if (gUnknown_020387EC->unk08 == 0) { - BlendPalettes(gUnknown_020387EC->selectedPalettes, 0x10, 0xFFFF); + BlendPalettes(gUnknown_020387EC->selectedPalettes, 16, FADE_COLOR_WHITE); HBlankIntrOn(sub_80C603C); gUnknown_020387EC->unk08++; } @@ -180,7 +180,7 @@ bool8 sub_80C5F98(void) gUnknown_020387EC->unk0C -= gUnknown_020387EC->unk06; if (gUnknown_020387EC->unk0C < 2) { - BlendPalettes(gUnknown_020387EC->selectedPalettes, 0x10, 0xFFFF); + BlendPalettes(gUnknown_020387EC->selectedPalettes, 16, FADE_COLOR_WHITE); SetHBlankCallback(sub_80C603C); gUnknown_020387EC->unk0C = 1; gUnknown_020387EC->unk08++; @@ -189,7 +189,7 @@ bool8 sub_80C5F98(void) case 1: if (gUnknown_020387EC->unk0A == 8) { - BlendPalettes(0xFFFFFFFF, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); gUnknown_020387EC->unk08++; } break; @@ -236,7 +236,7 @@ static void sub_80C60CC(struct Sprite *sprite) { FreeSpriteTilesByTag(gUnknown_020387EC->tileTag); FreeSpritePaletteByTag(gUnknown_020387EC->paletteTag); - BlendPalettes(gUnknown_020387EC->selectedPalettes, 0, 0xffff); + BlendPalettes(gUnknown_020387EC->selectedPalettes, 0, FADE_COLOR_WHITE); SetHBlankCallback(sub_80C6078); } } diff --git a/src/pokeblock.c b/src/pokeblock.c index 228d563cf..4087cbbb0 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -365,7 +365,7 @@ static bool8 sub_810B6C0(void) } break; case 18: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = FALSE; SetMainCallback2(sub_810B674); return TRUE; @@ -813,7 +813,7 @@ static void sub_810C2C8(u8 taskId) static void sub_810C31C(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); if (gUnknown_02039244 > 1) { gSpecialVar_ItemId = ITEM_NONE; @@ -878,7 +878,7 @@ static void sub_810C4C4(u8 taskId) static void sub_810C508(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_810C4C4; } @@ -971,7 +971,7 @@ static void sub_810C788(u8 taskId) { gSpecialVar_ItemId += 3; } - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_810C2C8; } @@ -981,7 +981,7 @@ static void sub_810C854(u8 taskId) StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gSpecialVar_ItemId].color]); gSpecialVar_Result = gSpecialVar_ItemId; PokeblockClearIfExists(gSpecialVar_ItemId); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_810C2C8; } diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 2f2ce2f8f..588bc85c0 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -579,7 +579,7 @@ static bool8 TransitionToPokeblockFeedScene(void) gMain.state++; } case 13: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = 0; SetMainCallback2(CB2_PokeblockFeed); return TRUE; @@ -751,7 +751,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskID) static void Task_PaletteFadeToReturn(u8 taskID) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = Task_ReturnAfterPaletteFade; } diff --git a/src/pokedex.c b/src/pokedex.c index 30b4d414c..729f72a7c 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1510,7 +1510,7 @@ void Task_PokedexMainScreen(u8 taskId) sub_808E6BC(); BeginNormalPaletteFade( ~(1 << (gSprites[gPokedexView->selectedMonSpriteId].oam.paletteNum + 16)), - 0, 0, 0x10, 0); + 0, 0, 16, RGB(0, 0, 0)); gSprites[gPokedexView->selectedMonSpriteId].callback = sub_808EDB8; gTasks[taskId].func = sub_808CA64; PlaySE(SE_PIN); @@ -1527,7 +1527,7 @@ void Task_PokedexMainScreen(u8 taskId) else if (gMain.newKeys & SELECT_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; gPokedexView->unk62A = gPokedexView->unk62C; @@ -1539,7 +1539,7 @@ void Task_PokedexMainScreen(u8 taskId) } else if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_ClosePokedex; PlaySE(SE_PC_OFF); } @@ -1592,7 +1592,7 @@ static void Task_PokedexMainScreenMenu(u8 taskId) gMain.newKeys |= START_BUTTON; //Exit menu break; case 3: //CLOSE POKEDEX - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_ClosePokedex; PlaySE(SE_PC_OFF); break; @@ -1703,12 +1703,12 @@ static void Task_PokedexResultsScreen(u8 taskId) { if ((gMain.newKeys & A_BUTTON) && gPokedexView->unk0[gPokedexView->selectedPokemon].seen) { - u32 a; + u32 excludedPalettes; sub_808E6BC(); - a = (1 << (gSprites[gPokedexView->selectedMonSpriteId].oam.paletteNum + 16)); + excludedPalettes = (1 << (gSprites[gPokedexView->selectedMonSpriteId].oam.paletteNum + 16)); gSprites[gPokedexView->selectedMonSpriteId].callback = sub_808EDB8; - BeginNormalPaletteFade(~a, 0, 0, 0x10, 0); + BeginNormalPaletteFade(~excludedPalettes, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_808D118; PlaySE(SE_PIN); } @@ -1722,7 +1722,7 @@ static void Task_PokedexResultsScreen(u8 taskId) } else if (gMain.newKeys & SELECT_BUTTON) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; gTasks[taskId].func = sub_808CB8C; @@ -1730,7 +1730,7 @@ static void Task_PokedexResultsScreen(u8 taskId) } else if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; PlaySE(SE_PC_OFF); } @@ -1783,12 +1783,12 @@ static void Task_PokedexResultsScreenMenu(u8 taskId) gMain.newKeys |= START_BUTTON; break; case 3: //BACK TO POKEDEX - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; PlaySE(SE_TRACK_DOOR); break; case 4: //CLOSE POKEDEX - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_PokedexResultsScreenExitPokedex; PlaySE(SE_PC_OFF); break; @@ -1919,7 +1919,7 @@ static bool8 sub_808D344(u8 a) gMain.state++; break; case 4: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(sub_808C0B8); gMain.state++; break; @@ -2957,13 +2957,13 @@ static void Task_InitPageScreenMultistep(u8 taskId) break; case 6: { - u32 r3 = 0; + u32 excludedPalettes = 0; if (gTasks[taskId].data[2] != 0) - r3 = 0x14; + excludedPalettes = 0x14; if (gTasks[taskId].data[1] != 0) - r3 |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 16)); - BeginNormalPaletteFade(~r3, 0, 16, 0, 0); + excludedPalettes |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 16)); + BeginNormalPaletteFade(~excludedPalettes, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(gUnknown_03005CEC); gMain.state++; } @@ -3011,14 +3011,14 @@ static void Task_PageScreenProcessInput(u8 taskId) { if (gTasks[taskId].data[0] != 0) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_808F888; PlaySE(SE_Z_SCROLL); return; } if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_ClosePageScreen; PlaySE(SE_PC_OFF); return; @@ -3031,12 +3031,12 @@ static void Task_PageScreenProcessInput(u8 taskId) sub_8090C68(); break; case AREA_SCREEN: - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_InitAreaScreenMultistep; PlaySE(SE_PIN); break; case CRY_SCREEN: - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_InitCryScreenMultistep; PlaySE(SE_PIN); break; @@ -3047,7 +3047,7 @@ static void Task_PageScreenProcessInput(u8 taskId) } else { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_InitSizeScreenMultistep; PlaySE(SE_PIN); } @@ -3219,7 +3219,7 @@ static void Task_InitCryScreenMultistep(u8 taskId) } break; case 8: - BeginNormalPaletteFade(-0x15, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(gUnknown_03005CEC); gMain.state++; break; @@ -3260,7 +3260,7 @@ static void Task_CryScreenProcessInput(u8 taskId) { if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 1; gTasks[taskId].func = sub_808FFBC; @@ -3270,7 +3270,7 @@ static void Task_CryScreenProcessInput(u8 taskId) if ((gMain.newKeys & DPAD_LEFT) || ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_808FFBC; @@ -3286,7 +3286,7 @@ static void Task_CryScreenProcessInput(u8 taskId) } else { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 3; gTasks[taskId].func = sub_808FFBC; @@ -3396,7 +3396,7 @@ static void Task_InitSizeScreenMultistep(u8 taskId) gMain.state++; break; case 7: - BeginNormalPaletteFade(-0x15, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(gUnknown_03005CEC); gMain.state++; break; @@ -3423,7 +3423,7 @@ static void Task_SizeScreenProcessInput(u8 taskId) { if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gPokedexView->unk64F = 1; gTasks[taskId].func = sub_8090498; PlaySE(SE_PC_OFF); @@ -3431,7 +3431,7 @@ static void Task_SizeScreenProcessInput(u8 taskId) else if ((gMain.newKeys & DPAD_LEFT) || ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_8090498; PlaySE(SE_Z_PAGE); @@ -3834,7 +3834,7 @@ static void sub_8090750(u8 taskId) case 4: spriteId = sub_80918EC(dexNum, 0x30, 0x38, 0); gSprites[spriteId].oam.priority = 0; - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(gUnknown_03005CEC); gTasks[taskId].data[3] = spriteId; gTasks[taskId].data[0]++; @@ -3863,7 +3863,7 @@ static void sub_8090A3C(u8 taskId) { if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(0x0000FFFC, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFC, 0, 0, 16, RGB(0, 0, 0)); gSprites[gTasks[taskId].data[3]].callback = sub_8090C28; gTasks[taskId].func = sub_8090B8C; return; @@ -3883,7 +3883,7 @@ static void sub_8090A3C(u8 taskId) } else { - BeginNormalPaletteFade(0x0000FFFC, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFC, 0, 0, 16, RGB(0, 0, 0)); gSprites[gTasks[taskId].data[3]].callback = sub_8090C28; gTasks[taskId].func = sub_8090B8C; return; @@ -4760,7 +4760,7 @@ static void sub_8091E54(u8 taskId) gMain.state++; break; case 2: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state++; break; case 3: @@ -5080,7 +5080,7 @@ static void sub_8092644(u8 taskId) static void sub_80927B8(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_80927F0; } diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index fd60581b9..76efdf08d 100644 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -149,7 +149,7 @@ static void CB2_UnusedPokedexAreaScreen(void) SetVBlankCallback(VBlankCB_AreaScren); break; case 5: - BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0)); break; case 6: REG_BLDCNT = BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD; @@ -1159,7 +1159,7 @@ static void DebugCB_GoBack(void) switch (gPokedexAreaScreenPtr->state) { case 0: - BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gPokedexAreaScreenPtr->state++; break; case 1: @@ -1177,7 +1177,7 @@ static void DebugCB_GoNext(void) switch (gPokedexAreaScreenPtr->state) { case 0: - BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gPokedexAreaScreenPtr->state++; break; case 1: @@ -1250,7 +1250,7 @@ static void Task_PokedexAreaScreen_0(u8 taskId) CreateAreaUnknownSprites(); break; case 9: - BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0)); break; case 10: REG_BLDCNT = BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD; @@ -1291,7 +1291,7 @@ static void Task_PokedexAreaScreen_1(u8 taskId) return; break; case 2: - BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); break; case 3: if (gPaletteFade.active) diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c index 46909435a..441dc0842 100644 --- a/src/pokemon_menu.c +++ b/src/pokemon_menu.c @@ -268,7 +268,7 @@ void HandleDefaultPartyMenu(u8 taskID) break; case B_BUTTON: PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_8089E4C; break; } @@ -359,7 +359,7 @@ static void sub_8089F44(u8 taskID) static void PokemonMenu_Summary(u8 taskID) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_8089F44; } @@ -440,7 +440,7 @@ static void sub_808A228(u8 taskID) { if (ItemIsMail(gSpecialVar_ItemId) && gUnknown_0202E8F4 != 0) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808A180; } else @@ -592,7 +592,7 @@ static void sub_808A604(u8 taskID) static void PokemonMenu_GiveItem(u8 taskID) { gUnknown_0202E8F5 = sub_806CA38(taskID); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808A604; } @@ -658,7 +658,7 @@ static void sub_808A73C(u8 taskID) static void PokemonMenu_ReadMail(u8 taskID) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808A848; } @@ -741,7 +741,7 @@ static void PokemonMenu_FieldMove(u8 taskID) if (!IS_SOFTBOILED_MILKDRINK(tFieldMoveId)) { gTasks[taskID].func = sub_808AB34; - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } else sub_8133D28(taskID); @@ -1051,7 +1051,7 @@ void sub_808B0C0(u8 taskID) case B_BUTTON: gLastFieldPokeMenuOpened = sub_806CA38(taskID); PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); if (gUnknown_02038561 == 0 || gUnknown_02038561 == 1) gTasks[taskID].func = sub_808B25C; if (gUnknown_02038561 == 3) @@ -1069,7 +1069,7 @@ static void sub_808B1EC(u8 taskID) static void sub_808B224(u8 taskID) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808B25C; } @@ -1093,7 +1093,7 @@ static void sub_808B288(u8 taskID) static void sub_808B2B4(u8 taskID) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808B288; } @@ -1101,7 +1101,7 @@ static void sub_808B2EC(u8 taskID) { if (gUnknown_0202E8F4 == 2) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808B338; } else diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index 762850e06..2cd1a59c6 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -310,7 +310,7 @@ void sub_80969A0(void) gMain.state++; break; case 9: - BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(sub_8096AFC); gMain.state++; break; @@ -352,7 +352,7 @@ void debug_sub_80A435C(void) { case 0: debug_sub_809CB94(unk_2038798); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; case 1: @@ -408,7 +408,7 @@ void sub_8096BF0(void) switch (gPokemonStorageSystemPtr->unk_0004) { case 0: - BlendPalettes(0xffffffff, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; case 1: @@ -418,7 +418,7 @@ void sub_8096BF0(void) gPokemonStorageSystemPtr->unk_000c.unk04 = 0; gPokemonStorageSystemPtr->unk_000c.unk06 = 0; sub_80C5CD4(&gPokemonStorageSystemPtr->unk_000c); - BlendPalettes(0xffffffff, 0, 0); + BlendPalettes(0xFFFFFFFF, 0, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; case 2: @@ -1083,7 +1083,7 @@ void sub_8097788(void) { case 0: sub_809BC18(); - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; case 1: @@ -1284,7 +1284,7 @@ void sub_8097B44(void) { case 0: sub_809BB90(); - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; case 1: diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 2383ac46c..00e7c10d2 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -400,7 +400,7 @@ bool8 sub_8099E08(void) switch (gPokemonStorageSystemPtr->unk_1032) { case 0: - BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0, 0x10, 0xffff); + BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0, 16, FADE_COLOR_WHITE); gPokemonStorageSystemPtr->unk_1032++; break; case 1: @@ -409,7 +409,7 @@ bool8 sub_8099E08(void) u8 curBox = get_preferred_box(); sub_8099EB0(curBox, 0); sub_809A654(); - BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0x10, 0, 0xffff); + BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 16, 0, FADE_COLOR_WHITE); gPokemonStorageSystemPtr->unk_1032++; } break; diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 6ad5c507c..d369347fc 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -936,7 +936,7 @@ static void sub_809E044(void) static void SummaryScreenExit(u8 taskId) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_809E13C; } diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 8684f2155..61baea929 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -524,7 +524,7 @@ void sub_80EBDD8() ewram0_10.var304++; break; case 11: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); ewram0_10.var304++; break; case 12: @@ -597,7 +597,7 @@ void sub_80EC00C() ewram0_10.var304++; break; case 6: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -784,7 +784,7 @@ void sub_80EC4A0() case 2: if (!sub_80EEF34()) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } break; @@ -830,7 +830,7 @@ void sub_80EC4A0() ewram0_10.var304++; break; case 0xC: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); ewram0_10.var304++; break; case 0xD: @@ -905,7 +905,7 @@ void sub_80EC67C() } break; case 4: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 5: @@ -1051,7 +1051,7 @@ void sub_80ECA10() ewram0_10.var304++; break; case 6: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -1152,7 +1152,7 @@ void sub_80ECD80() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -1206,7 +1206,7 @@ void sub_80ECD80() ewram0_10.var304++; break; case 12: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -1278,7 +1278,7 @@ void sub_80ED01C() case 2: if (!sub_80EEF34()) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } break; @@ -1330,7 +1330,7 @@ void sub_80ED01C() ewram0_10.var304++; break; case 13: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -1454,7 +1454,7 @@ void sub_80ED3D0() break; case 6: sub_80F3008(0); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -1478,7 +1478,7 @@ void sub_80ED4D8() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -1509,7 +1509,7 @@ void sub_80ED4D8() case 6: sub_80F35B4(); sub_80EEFBC(0x2); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(sub_80EBD4C); ewram0_10.var304++; break; @@ -1547,7 +1547,7 @@ void sub_80ED620() case 2: if (!sub_80EEF34()) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } break; @@ -1588,7 +1588,7 @@ void sub_80ED620() break; case 10: sub_80F33A8(); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD4C); ewram0_10.var304++; break; @@ -2610,7 +2610,7 @@ void sub_80EDB88() case 2: if (!sub_80EEF34()) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } break; @@ -2667,7 +2667,7 @@ void sub_80EDB88() ewram0_10.var304++; break; case 15: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -2741,7 +2741,7 @@ void sub_80EDE70() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -2764,7 +2764,7 @@ void sub_80EDEE4() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -2798,7 +2798,7 @@ void sub_80EDEE4() ewram0_10.var304++; break; case 7: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -2916,7 +2916,7 @@ void sub_80EE294() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -2948,7 +2948,7 @@ void sub_80EE294() ewram0_10.var304++; break; case 6: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); ewram0_10.var304++; break; case 7: @@ -2985,7 +2985,7 @@ void sub_80EE3D8() case 2: if (!sub_80EEF34()) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } break; @@ -3027,7 +3027,7 @@ void sub_80EE3D8() break; case 11: sub_80F6F10(); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD68); ewram0_10.var304++; break; @@ -3208,7 +3208,7 @@ void sub_80EE8F4() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -3231,7 +3231,7 @@ void sub_80EE96C() if (!ewram0_10.var304) { PlaySE(0x6F); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } else diff --git a/src/region_map.c b/src/region_map.c index 190cc6576..81ecd7c1b 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1475,7 +1475,7 @@ void CB2_InitFlyRegionMap(void) CreateFlyTargetGraphics(); break; case 8: - BlendPalettes(0xFFFFFFFF, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); SetVBlankCallback(VBlankCB_FlyRegionMap); break; case 9: @@ -1659,7 +1659,7 @@ static void sub_80FC5B4(void) switch (sFlyDataPtr->unk4) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sFlyDataPtr->unk4++; break; case 1: @@ -1705,7 +1705,7 @@ void sub_80FC69C(void) switch (sFlyDataPtr->unk4) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); sFlyDataPtr->unk4++; break; case 1: @@ -1783,7 +1783,7 @@ void debug_sub_8110D84(void) switch (sFlyDataPtr->unk4) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sFlyDataPtr->unk4++; break; case 1: @@ -1808,7 +1808,7 @@ void debug_sub_8110D84(void) break; case 5: m4aSongNumStart(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); sFlyDataPtr->unk4++; break; } diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 8c2c23569..d8c07f2bb 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -504,7 +504,7 @@ void Task_ResetRtcScreen(u8 taskId) switch (data[0]) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 1, 16, 0, FADE_COLOR_WHITE); data[0] = 1; break; case 1: @@ -574,7 +574,7 @@ void Task_ResetRtcScreen(u8 taskId) case 5: if (gMain.newKeys & A_BUTTON) { - BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 16, FADE_COLOR_WHITE); data[0] = 6; } else diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index a10fd45b8..9c4cc2217 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -2252,7 +2252,7 @@ void sub_807A69C(u8 taskId) else task->data[6] = 3; CpuCopy32(&gPlttBufferUnfaded[src], &gPlttBufferFaded[dest], 0x20); - BlendPalette(dest, 0x10, gBattleAnimArgs[1], gBattleAnimArgs[0]); + BlendPalette(dest, 16, gBattleAnimArgs[1], gBattleAnimArgs[0]); task->func = sub_807A784; } diff --git a/src/roulette.c b/src/roulette.c index b278521b1..49627dade 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1547,7 +1547,7 @@ void sub_811755C(u8 taskid) { Menu_EraseWindowRect(0x14, 0x8, 0x1A, 0xD); Menu_EraseScreen(); - BeginNormalPaletteFade(-0x1, 0x0, 0x0, 0x10, 0x0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gPaletteFade.delayCounter = gPaletteFade.multipurpose2; UpdatePaletteFade(); gTasks[taskid].func = &sub_8117528; diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index f57315d09..d73c90fb3 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -126,7 +126,7 @@ static void CB2_SaveFailedScreen(void) Menu_DrawStdWindowFrame(13, CLOCK_WIN_TOP, 16, CLOCK_WIN_TOP + 3); // clock window Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); // message window Menu_PrintText(gSystemText_SaveFailedBackupCheck, 2, MSG_WIN_TOP + 1); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); ime = REG_IME; REG_IME = 0; REG_IE |= INTR_FLAG_VBLANK; @@ -224,7 +224,7 @@ static void CB2_FadeAndReturnToTitleScreen(void) if (gMain.newKeys & A_BUTTON) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetVBlankCallback(VBlankCB); SetMainCallback2(CB2_ReturnToTitleScreen); } diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index df83d3e2d..7612c44e1 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -36,7 +36,7 @@ void sub_80F99CC(void) ScriptContext2_Enable(); taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA); gTasks[taskId].data[0] = PARTY_MENU_TYPE_CONTEST; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void SelectMonForNPCTrade(void) @@ -46,7 +46,7 @@ void SelectMonForNPCTrade(void) ScriptContext2_Enable(); taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA); gTasks[taskId].data[0] = PARTY_MENU_TYPE_IN_GAME_TRADE; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void SelectMoveTutorMon(void) @@ -56,7 +56,7 @@ void SelectMoveTutorMon(void) ScriptContext2_Enable(); taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA); gTasks[taskId].data[0] = PARTY_MENU_TYPE_MOVE_TUTOR; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void OpenPartyMenuFromScriptContext(u8 taskId) diff --git a/src/shop.c b/src/shop.c index 96b417b68..14878c0a0 100644 --- a/src/shop.c +++ b/src/shop.c @@ -299,7 +299,7 @@ static void BuyMenuDrawGraphics(void) DrawFirstMartScrollIndicators(); CreateTask(Shop_DoCursorAction, 0x8); sub_80B3240(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = 0; SetVBlankCallback(VBlankCB); SetMainCallback2(MainCB2); @@ -1168,7 +1168,7 @@ static void Task_ReturnToBuyMenu(u8 taskId) static void Task_ExitBuyMenu(u8 taskId) { gFieldCallback = Shop_FadeReturnToMartMenu; - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_ExitBuyMenuDoFade; } diff --git a/src/slot_machine.c b/src/slot_machine.c index 8075f24e4..ccd7e4353 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -611,7 +611,7 @@ static void sub_8101D24(u8 taskId) static bool8 sub_8101D5C(struct Task *task) { - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sub_810423C(eSlotMachine->pikaPower); eSlotMachine->state++; return FALSE; @@ -1119,7 +1119,7 @@ static bool8 sub_8102424(struct Task *task) #else gSaveBlock1.coins = eSlotMachine->coins; #endif - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); eSlotMachine->state++; return FALSE; } @@ -3011,7 +3011,7 @@ static void sub_8104B0C(u8 taskId) static void sub_8104B3C(struct Task *task) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); task->data[0]++; } @@ -3027,7 +3027,7 @@ static void sub_8104B80(struct Task *task) sub_81065DC(); BasicInitMenuWindow(&gWindowTemplate_81E7144); Menu_PrintTextPixelCoords(gOtherText_ReelTime, 10, 32, 1); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); task->data[0]++; } @@ -3035,7 +3035,7 @@ static void sub_8104BC8(struct Task *task) { if (gMain.newKeys & (B_BUTTON | SELECT_BUTTON)) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); task->data[0]++; } } @@ -3047,7 +3047,7 @@ static void sub_8104BFC(struct Task *task) sub_81064B8(); sub_8104CAC(task->data[1]); sub_810423C(eSlotMachine->pikaPower); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); task->data[0]++; } diff --git a/src/start_menu.c b/src/start_menu.c index f63408689..4a9a0f0dd 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -873,7 +873,7 @@ static bool32 sub_80719FC(u8 *step) { u32 savedIme; - BlendPalettes(-1, 0x10, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); SetVBlankCallback(sub_80719F0); savedIme = REG_IME; REG_IME = 0; @@ -914,7 +914,7 @@ static void Task_8071B64(u8 taskId) case 0: Menu_DisplayDialogueFrame(); Menu_PrintText(gSystemText_Saving, 2, 15); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); (*step)++; break; case 1: @@ -929,7 +929,7 @@ static void Task_8071B64(u8 taskId) (*step)++; break; case 3: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); (*step)++; break; case 4: diff --git a/src/starter_choose.c b/src/starter_choose.c index ff8c706b8..836925e77 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -296,7 +296,7 @@ void CB2_ChooseStarter(void) LoadSpritePalettes(gUnknown_083F77B4); Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); savedIme = REG_IME; REG_IME = 0; diff --git a/src/title_screen.c b/src/title_screen.c index 30ba7191e..df737fd06 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -673,7 +673,7 @@ void CB2_InitTitleScreen(void) break; } case 3: - BeginNormalPaletteFade(-1, 1, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 1, 16, 0, FADE_COLOR_WHITE); SetVBlankCallback(VBlankCB); gMain.state = 4; break; @@ -819,7 +819,7 @@ static void Task_TitleScreenPhase3(u8 taskId) if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & START_BUTTON)) { FadeOutBGM(4); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); SetMainCallback2(CB2_GoToMainMenu); } else @@ -830,13 +830,13 @@ static void Task_TitleScreenPhase3(u8 taskId) && CanResetRTC() == 1) { FadeOutBGM(4); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(CB2_GoToResetRtcScreen); } #if DEBUG else if (gMain.heldKeys == SELECT_BUTTON) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(CB2_GoToTestMenu); } #endif @@ -853,7 +853,7 @@ static void Task_TitleScreenPhase3(u8 taskId) UpdateLegendaryMarkingColor(gTasks[taskId].tCounter); if ((gMPlay_BGM.status & 0xFFFF) == 0) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); SetMainCallback2(CB2_GoToCopyrightScreen); } } diff --git a/src/trade.c b/src/trade.c index 50c69bc6d..4bed5d92b 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1224,7 +1224,7 @@ static void sub_8047EC0(void) gMain.state ++; break; case 17: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state ++; break; case 18: @@ -1369,7 +1369,7 @@ static void sub_80484F4(void) gMain.state ++; break; case 17: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state ++; break; case 18: @@ -1409,7 +1409,7 @@ static void sub_80489F4(void) { if (++gUnknown_03004824->unk_00b4 >= 16) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004824->unk_007b = 10; } } @@ -1889,7 +1889,7 @@ static void sub_80491E4(u8 mpId, u8 status) switch (gBlockRecvBuffer[0][0]) { case 0xeebb: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); sub_804AA0C(4); gUnknown_03004824->unk_007b = 11; break; @@ -1904,7 +1904,7 @@ static void sub_80491E4(u8 mpId, u8 status) gUnknown_03004824->unk_007b = 7; break; case 0xccdd: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004824->unk_007b = 10; break; case 0xddee: @@ -1957,7 +1957,7 @@ static void sub_80492D8(void) gUnknown_03004824->linkData[0] = 0xeebb; gUnknown_03004824->linkData[1] = 0; sub_804AADC(5, 0); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004824->unk_0084 = gUnknown_03004824->unk_0085 = 0; gUnknown_03004824->unk_007b = 11; } @@ -2086,7 +2086,7 @@ static void sub_8049680(void) } else if (gUnknown_03004824->tradeMenuCursorPosition < 2 * PARTY_SIZE) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004824->unk_007b = 2; } else if (gUnknown_03004824->tradeMenuCursorPosition == 2 * PARTY_SIZE) @@ -2133,7 +2133,7 @@ static void sub_8049860(void) PlaySE(SE_SELECT); if (Menu_GetCursorPos() == 0) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004824->unk_007b = 2; } else if (sub_80499F0(gUnknown_03004824->unk_0051[0], gUnknown_03004824->partyCounts[0], gUnknown_03004824->tradeMenuCursorPosition) == 0) @@ -4097,7 +4097,7 @@ static void sub_804B41C(void) sub_804BBE8(5); sub_804BBE8(0); SetTradeSceneStrings(); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state ++; break; case 12: @@ -4564,7 +4564,7 @@ void sub_804B790(void) sub_804BBE8(5); sub_804BBE8(0); SetTradeSceneStrings(); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state ++; break; case 12: @@ -4857,7 +4857,7 @@ static bool8 sub_804C29C(void) // The game waits here for the sprite to finish its animation sequence. break; case 14: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 = 20; break; @@ -4869,7 +4869,7 @@ static bool8 sub_804C29C(void) } break; case 21: - BeginNormalPaletteFade(-1, -1, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 ++; break; case 22: @@ -4944,7 +4944,7 @@ static bool8 sub_804C29C(void) } break; case 29: - BeginNormalPaletteFade(-1, -1, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 = 30; break; case 30: @@ -4957,7 +4957,7 @@ static bool8 sub_804C29C(void) } break; case 31: - BeginNormalPaletteFade(-1, -1, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB(0, 0, 0)); gUnknown_03004828->unk_00ba = CreateSprite(&gSpriteTemplate_82159FC, 0x6f, 0xaa, 0); gUnknown_03004828->unk_00bb = CreateSprite(&gSpriteTemplate_82159FC, 0x81, -0xa, 0); gUnknown_03004828->unk_00c4 ++; @@ -4982,15 +4982,15 @@ static bool8 sub_804C29C(void) } break; case 34: - BlendPalettes(1, 16, 0xffff); + BlendPalettes(0x1, 16, FADE_COLOR_WHITE); gUnknown_03004828->unk_00c4 ++; break; case 35: - BlendPalettes(1, 0, 0xffff); + BlendPalettes(0x1, 0, FADE_COLOR_WHITE); gUnknown_03004828->unk_00c4 ++; break; case 36: - BlendPalettes(1, 16, 0xffff); + BlendPalettes(0x1, 16, FADE_COLOR_WHITE); gUnknown_03004828->unk_00c4 ++; break; case 37: @@ -5028,7 +5028,7 @@ static bool8 sub_804C29C(void) gUnknown_03004828->unk_00c4 ++; gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].invisible = TRUE; gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].invisible = TRUE; - BlendPalettes(1, 0, 0xffff); + BlendPalettes(0x1, 0, FADE_COLOR_WHITE); } break; case 39: @@ -5036,7 +5036,7 @@ static bool8 sub_804C29C(void) gSprites[gUnknown_03004828->unk_00bb].pos2.y += 3; if (gSprites[gUnknown_03004828->unk_00ba].pos2.y <= -0xde) { - BeginNormalPaletteFade(-1, -1, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 ++; DestroySprite(&gSprites[gUnknown_03004828->unk_00ba]); DestroySprite(&gSprites[gUnknown_03004828->unk_00bb]); @@ -5054,7 +5054,7 @@ static bool8 sub_804C29C(void) } break; case 41: - BeginNormalPaletteFade(-1, -1, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 ++; break; case 42: @@ -5131,7 +5131,7 @@ static bool8 sub_804C29C(void) gUnknown_03004828->unk_0118 = 0x8000 / gUnknown_03004828->unk_011a; break; case 52: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 = 60; break; @@ -5144,7 +5144,7 @@ static bool8 sub_804C29C(void) } break; case 61: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 ++; break; case 62: @@ -5160,12 +5160,12 @@ static bool8 sub_804C29C(void) gSprites[gUnknown_03004828->unk_0103].callback = sub_804D80C; StartSpriteAnim(&gSprites[gUnknown_03004828->unk_0103], 1); StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_0103], 2); - BlendPalettes(1 << (16 + gSprites[gUnknown_03004828->unk_0103].oam.paletteNum), 16, 0xffff); + BlendPalettes(1 << (16 + gSprites[gUnknown_03004828->unk_0103].oam.paletteNum), 16, FADE_COLOR_WHITE); gUnknown_03004828->unk_00c4 ++; gUnknown_03004828->unk_00c0 = 0; break; case 64: - BeginNormalPaletteFade(1 << (16 + gSprites[gUnknown_03004828->unk_0103].oam.paletteNum), 1, 16, 0, 0xffff); + BeginNormalPaletteFade(1 << (16 + gSprites[gUnknown_03004828->unk_0103].oam.paletteNum), 1, 16, 0, FADE_COLOR_WHITE); gUnknown_03004828->unk_00c4 ++; break; case 65: @@ -5235,7 +5235,7 @@ static bool8 sub_804C29C(void) gUnknown_03004828->unk_00c4 ++; break; case 73: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 ++; break; case 74: @@ -5334,7 +5334,7 @@ static void sub_804D738(struct Sprite *sprite) PlaySE(SE_W025); sprite->callback = sub_804D7AC; sprite->data[0] = 0; - BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, -1); + BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, FADE_COLOR_WHITE); } } @@ -5613,7 +5613,7 @@ static void sub_804DC88(void) case 6: if (IsLinkTaskFinished()) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMain.state ++; } break; @@ -5661,7 +5661,7 @@ void DoInGameTradeScene(void) { ScriptContext2_Enable(); CreateTask(sub_804E1A0, 10); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } static void sub_804E1A0(u8 taskId) diff --git a/src/trainer_card.c b/src/trainer_card.c index 599479f16..7c7eb23e2 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -673,7 +673,7 @@ bool8 TrainerCard_Init(struct Task *task) ewram0_2.showColon = gSaveBlock2.playTimeSeconds & 1; ewram0_2.frameCounter = gSaveBlock2.playTimeVBlanks; TrainerCard_CreatePrintPlayTimeTask(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); ewram0_2.current_state++; /* Advance state machine */ return FALSE; } @@ -740,7 +740,7 @@ bool8 TrainerCard_WaitForFlipToFinish(struct Task *task) bool8 TrainerCard_FadeOut(struct Task *task) { TrainerCard_DestoryPlayTimeTask(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); ewram0_2.current_state++; /* Advance state machine */ return FALSE; } diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 8205f4f70..bdf6f4a44 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -354,7 +354,7 @@ static void sub_81365C8(void) switch (gUnknown_02039304->unk50) { case 0: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(sub_8136264); gUnknown_02039304->unk50++; break; @@ -467,7 +467,7 @@ static void sub_8136808(void) gPokeblockMonID = sub_81370A4(gUnknown_083DFEC4->unk87DC); gUnknown_02039308 = gUnknown_02039304->callback; gUnknown_0203930C = gUnknown_02039304->pokeblock; - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_02039304->unk50++; break; case 1: @@ -509,7 +509,7 @@ static void sub_81368A4(void) } break; case 3: - BlendPalettes(-1, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); gUnknown_02039304->unk50++; break; case 4: @@ -518,7 +518,7 @@ static void sub_81368A4(void) break; case 5: SetVBlankCallback(sub_8136264); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gUnknown_02039304->unk50++; break; case 6: @@ -585,7 +585,7 @@ static void sub_8136B44(void) switch (gUnknown_02039304->unk50) { case 0: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_02039304->unk50++; break; case 1: diff --git a/src/wallclock.c b/src/wallclock.c index 1f743a61a..e500a3777 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -229,7 +229,7 @@ static void WallClockInit(void) { u16 ime; - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); ime = REG_IME; REG_IME = 0; REG_IE |= INTR_FLAG_VBLANK; @@ -430,7 +430,7 @@ static void Task_SetClock4(u8 taskId) static void Task_SetClock5(u8 taskId) { RtcInitLocalTimeOffset(gTasks[taskId].tHours, gTasks[taskId].tMinutes); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_SetClock6; } @@ -456,7 +456,7 @@ static void Task_ViewClock2(u8 taskId) static void Task_ViewClock3(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_ViewClock4; } |