Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-25 07:29:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace FADE_TO_* constants with COLOR_* constants

Browse Source
This commit is contained in:
Fexty12573 2025-07-12 23:51:38 +02:00
parent 811264d1d7
commit 7a629b9bbe
135 changed files with 456 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/graphics.h
View File

@ -55,5 +55,6 @@ enum DSScreen {
#define COLOR_DARK_GRAY GX_RGB(4, 4, 4)
#define COLOR_WHITE GX_RGB(31, 31, 31)
#define COLOR_TRANSPARENT GX_RGB(31, 31, 16)
#define COLOR_SAVED 0xFFFF
#endif // POKEPLATINUM_CONSTANTS_GRAPHICS_H

4
include/screen_fade.h
View File

@ -7,10 +7,6 @@
#include "hardware_window.h"
#include "system.h"
#define FADE_TO_WHITE 0x7FFF
#define FADE_TO_BLACK 0x0000
#define FADE_TO_SAVED_COLOR 0xFFFF
enum FadeMode {
FADE_BOTH_SCREENS = 0,
FADE_MAIN_THEN_SUB,

4
src/applications/options_menu.c
View File

@ -225,7 +225,7 @@ BOOL OptionsMenu_Main(ApplicationManager *appMan, int *state)
return FALSE;
}
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, menuData->heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, menuData->heapID);
break;
case STATE_WAIT_FOR_FADE_IN:
@ -286,7 +286,7 @@ BOOL OptionsMenu_Main(ApplicationManager *appMan, int *state)
Text_RemovePrinter(menuData->textPrinter);
}
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, menuData->heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, menuData->heapID);
break;
case STATE_WAIT_FOR_FADE_OUT:

4
src/applications/pokedex/pokedex_main.c
View File

@ -188,12 +188,12 @@ static void VBlankCallBack(void *data)
static void EntranceTransition(PokedexApp **appPtr)
{
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_POKEDEX);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_POKEDEX);
}
static void ExitTransition(PokedexApp **appPtr)
{
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_POKEDEX);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_POKEDEX);
}
static BOOL TransitionComplete(PokedexApp **appPtr)

20
src/applications/title_screen.c
View File

@ -394,7 +394,7 @@ static BOOL TitleScreen_Main(ApplicationManager *appMan, int *state)
if (JOY_HELD_ONLY(PAD_BUTTON_B | PAD_KEY_UP | PAD_BUTTON_SELECT)) {
appData->nextApp = NEXT_APP_CLEAR_SAVE_FILE;
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, appData->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, appData->heapID);
*state = TITLE_SCREEN_APP_STATE_CLEANUP;
break;
}
@ -414,7 +414,7 @@ static BOOL TitleScreen_Main(ApplicationManager *appMan, int *state)
TitleScreen_RenderMain(&appData->titleScreen, appData->bgConfig, appData->heapID);
if ((++appData->exitFadeTimer) == TITLE_SCREEN_EXIT_FADE_DELAY_FRAMES) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 6, 1, appData->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, appData->heapID);
}
if (Sound_IsPokemonCryPlaying() == FALSE && IsScreenFadeDone() == TRUE && appData->exitFadeTimer >= TITLE_SCREEN_EXIT_FADE_DELAY_FRAMES) {
@ -422,7 +422,7 @@ static BOOL TitleScreen_Main(ApplicationManager *appMan, int *state)
DisableAllLayers();
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 6, 1, appData->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, appData->heapID);
*state = TITLE_SCREEN_APP_STATE_CLEANUP;
}
break;
@ -432,7 +432,7 @@ static BOOL TitleScreen_Main(ApplicationManager *appMan, int *state)
if (Sound_IsFadeActive() == FALSE) {
Sound_StopBGM(SEQ_TITLE01, 0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 6, 1, appData->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, appData->heapID);
*state = TITLE_SCREEN_APP_STATE_CLEANUP;
}
break;
@ -1091,7 +1091,7 @@ static BOOL TitleScreen_ShowIntro(TitleScreen *titleScreen, BgConfig *bgConfig,
// Roughly a 9s delay. During this time the portal animation plays.
titleScreen->delay = 267;
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 15, 3, heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 15, 3, heapID);
titleScreen->state = INTRO_STATE_WAIT_FOR_FADE;
break;
case INTRO_STATE_WAIT_FOR_FADE:
@ -1161,7 +1161,7 @@ static BOOL TitleScreen_ShowIntro(TitleScreen *titleScreen, BgConfig *bgConfig,
case INTRO_STATE_WAIT_AND_FADE_TO_WHITE_2:
if (IsScreenFadeDone() == TRUE) {
if (titleScreen->fadeCount) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 5, 2, heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 5, 2, heapID);
titleScreen->light1State = LIGHT1_STATE_BRIGHTEN;
titleScreen->fadeCount--;
titleScreen->state = INTRO_STATE_WAIT_AND_FADE_MAIN_FROM_WHITE;
@ -1169,7 +1169,7 @@ static BOOL TitleScreen_ShowIntro(TitleScreen *titleScreen, BgConfig *bgConfig,
titleScreen->delay = 10;
titleScreen->state = INTRO_STATE_WAIT_FOR_DELAY;
titleScreen->giratinaShown = TRUE;
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
}
}
break;
@ -1178,7 +1178,7 @@ static BOOL TitleScreen_ShowIntro(TitleScreen *titleScreen, BgConfig *bgConfig,
titleScreen->introShown = FALSE;
ToggleLogoBg2Layer(TRUE);
titleScreen->graphics.giratinaAnimState = GIRATINA_ANIM_STATE_PLAY;
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 16, 3, heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 16, 3, heapID);
titleScreen->state = INTRO_STATE_WAIT_AND_FADE_TO_WHITE_2;
}
break;
@ -1191,7 +1191,7 @@ static BOOL TitleScreen_ShowIntro(TitleScreen *titleScreen, BgConfig *bgConfig,
break;
case INTRO_STATE_FADE_MAIN_FROM_BLACK:
// Slowly fade in the Giratina model
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 48, 1, heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 48, 1, heapID);
ToggleGiratinaBgLayer(TRUE);
titleScreen->state = INTRO_STATE_MOVE_IN_TITLE_CAMERA;
titleScreen->titleCamMoveInCounter = 0;
@ -1206,7 +1206,7 @@ static BOOL TitleScreen_ShowIntro(TitleScreen *titleScreen, BgConfig *bgConfig,
if (titleScreen->titleCamMoveInCounter >= TITLE_CAM_MOVE_IN_FRAMES) {
ToggleLogoLayer(TRUE);
TitleScreen_LoadTopScreenBg(bgConfig, heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 16, 3, heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 16, 3, heapID);
ToggleCopyrightLayer(TRUE);
ToggleLogoBgLayer(TRUE);

4
src/battle/battle_script.c
View File

@ -10856,8 +10856,8 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1)
{
UnkStruct_0208737C *v16;
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
v3 = BattleSystem_PartyPokemon(v2->battleSys, v1, v2->battleCtx->selectedPartySlot[v1]);
v16 = sub_0208712C(HEAP_ID_BATTLE, 1, Pokemon_GetValue(v3, MON_DATA_SPECIES, NULL), 10, BattleSystem_GetOptions(v2->battleSys));

6
src/battle/ov16_0223B140.c
View File

@ -712,8 +712,8 @@ static void ov16_0223BCB4(ApplicationManager *appMan)
BattleSystem_LoadFightOverlay(battleSystem, 0);
}
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
BattleSystem_SetBurmyForm(battleSystem);
if (battleSystem->resultMask != 0x4) {
@ -1983,7 +1983,7 @@ static void ov16_0223D7B4(ApplicationManager *appMan)
UnkStruct_0207A778 *v0 = ApplicationManager_Data(appMan);
SetVBlankCallback(NULL, NULL);
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
PaletteData_FreeBuffer(v0->unk_0C, 0);
PaletteData_Free(v0->unk_0C);
Windows_Delete(v0->unk_08, 1);

2
src/battle/ov16_0223DF00.c
View File

@ -1560,7 +1560,7 @@ void BattleSystem_SetStopRecording(BattleSystem *battleSys, int flag)
ov16_0226CEB0(battleSys->unk_198, flag);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 16, 2, HEAP_ID_BATTLE);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 16, 2, HEAP_ID_BATTLE);
Sound_StopWaveOutAndSequences();
Sound_SetMasterVolume(0);

4
src/choose_starter/choose_starter_app.c
View File

@ -474,12 +474,12 @@ static void ChooseStarterAppMainCallback(void *data)
static void StartFadeIn(ChooseStarterApp *param0)
{
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_CHOOSE_STARTER_APP);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_CHOOSE_STARTER_APP);
}
static void StartFadeOut(ChooseStarterApp *param0)
{
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_CHOOSE_STARTER_APP);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_CHOOSE_STARTER_APP);
}
static BOOL IsFadeDone(ChooseStarterApp *param0)

4
src/dw_warp/dw_warp.c
View File

@ -85,7 +85,7 @@ BOOL DWWarp_Init(ApplicationManager *appMan, int *state)
DWWarp_InitModel(dww);
DWWarp_InitCamera(dww);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 16, 1, HEAP_ID_DISTORTION_WORLD_WARP);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 16, 1, HEAP_ID_DISTORTION_WORLD_WARP);
gSystem.whichScreenIs3D = DS_SCREEN_MAIN;
@ -131,7 +131,7 @@ BOOL DWWarp_Main(ApplicationManager *appMan, int *state)
}
break;
case DWARP_SEQ_CLEAR_SCREEN:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 20, 1, HEAP_ID_DISTORTION_WORLD_WARP);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 20, 1, HEAP_ID_DISTORTION_WORLD_WARP);
(*state)++;
break;
case DWARP_SEQ_WAIT:

8
src/error_message_reset.c
View File

@ -102,8 +102,8 @@ void ErrorMessageReset_PrintErrorAndReset(void)
v4 = 3;
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
OS_DisableIrqMask(OS_IE_V_BLANK);
OS_SetIrqFunction(OS_IE_V_BLANK, VBlankIntr);
@ -178,8 +178,8 @@ void ErrorMessageReset_PrintErrorAndReset(void)
OS_WaitIrq(1, OS_IE_V_BLANK);
}
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_WHITE);
Window_Remove(&window);
MessageLoader_Free(errorMsgData);

8
src/field_comm_manager.c
View File

@ -153,8 +153,8 @@ void FieldCommMan_ReconnectBattleClient(void)
void FieldCommMan_EnterBattleRoom(FieldSystem *fieldSystem)
{
SetupScreenFadeRegisters(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetupScreenFadeRegisters(DS_SCREEN_SUB, FADE_TO_BLACK);
SetupScreenFadeRegisters(DS_SCREEN_MAIN, COLOR_BLACK);
SetupScreenFadeRegisters(DS_SCREEN_SUB, COLOR_BLACK);
CommMan_SetErrorHandling(1, 1);
if (!CommMan_IsInitialized()) {
@ -310,7 +310,7 @@ static void sub_020599E4(void)
}
if (CommTiming_IsSyncState(92)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
ResetVisibleHardwareWindows(DS_SCREEN_SUB);
CommPlayerMan_Restart();
@ -386,7 +386,7 @@ static void sub_02059B10(void)
u8 v0 = 1;
CommSys_SendDataFixedSize(94, &v0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
ResetVisibleHardwareWindows(DS_SCREEN_SUB);
FieldCommMan_SetTask(sub_02059CD8, 0);

4
src/field_map_change.c
View File

@ -553,8 +553,8 @@ static BOOL FieldTask_LoadMapFromError(FieldTask *task)
switch (*state) {
case 0:
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
SaveData_LoadAndUpdateUnderground(fieldSystem->saveData);
fieldSystem->journalEntry = Journal_GetSavedPage(SaveData_GetJournal(fieldSystem->saveData), CheckJournalAcquired(varsFlags));
(*state)++;

4
src/field_transition.c
View File

@ -118,7 +118,7 @@ void FieldTransition_FadeOut(FieldTask *task)
return;
}
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
FieldTask_InitCall(task, FieldTask_WaitUntilScreenTransitionDone, NULL);
}
@ -130,7 +130,7 @@ void FieldTransition_FadeIn(FieldTask *task)
return;
}
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
FieldTask_InitCall(task, FieldTask_WaitUntilScreenTransitionDone, NULL);
}

8
src/library_tv/library_tv.c
View File

@ -69,8 +69,8 @@ BOOL LibraryTV_Main(ApplicationManager *appMan, int *state)
switch (*state) {
case STATE_INIT:
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
SetVBlankCallback(NULL, NULL);
SetHBlankCallback(NULL, NULL);
@ -107,7 +107,7 @@ BOOL LibraryTV_Main(ApplicationManager *appMan, int *state)
ltv->waitTiming--;
} else {
ltv->waitTiming = 0;
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, ltv->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, ltv->heapID);
*state = STATE_FADE_WAIT;
}
break;
@ -126,7 +126,7 @@ BOOL LibraryTV_Main(ApplicationManager *appMan, int *state)
ltv->waitTiming--;
} else {
ltv->waitTiming = 0;
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, ltv->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, ltv->heapID);
*state = STATE_EXIT;
}
break;

8
src/main.c
View File

@ -102,8 +102,8 @@ void NitroMain(void)
break;
case RESET_ERROR:
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
sApplication.args.error = TRUE;
EnqueueApplication(FS_OVERLAY_ID(game_start), &gGameStartLoadSaveAppTemplate);
break;
@ -250,8 +250,8 @@ static void CheckHeapCanary(void)
static void SoftReset(enum OSResetParameter resetParam)
{
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_WHITE);
if (sub_02037DB0()) {
SaveData_SaveStateCancel(SaveData_Ptr());

70
src/overlay005/encounter_effect_core.c
View File

@ -179,7 +179,7 @@ void EncounterEffect_Grass_HigherLevel(SysTask *task, void *param)
}
break;
case 5:
SetColorBrightness(FADE_TO_BLACK);
SetColorBrightness(COLOR_BLACK);
G2_SetBG0Offset(0, 0);
G2_SetBG1Offset(0, 0);
@ -272,7 +272,7 @@ void EncounterEffect_Grass_LowerLevel(SysTask *task, void *param)
}
break;
case 5:
SetColorBrightness(FADE_TO_BLACK);
SetColorBrightness(COLOR_BLACK);
G2_SetBG0Offset(0, 0);
G2_SetBG1Offset(0, 0);
@ -327,7 +327,7 @@ void EncounterEffect_Water_LowerLevel(SysTask *task, void *param)
}
break;
case 4:
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_30, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 8, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_30, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD);
encEffect->state++;
break;
case 5:
@ -344,7 +344,7 @@ void EncounterEffect_Water_LowerLevel(SysTask *task, void *param)
}
EncounterEffect_Finish(encEffect, task);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
break;
}
}
@ -385,7 +385,7 @@ void EncounterEffect_Water_HigherLevel(SysTask *task, void *param)
}
break;
case 4:
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_30, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 8, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_30, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD);
encEffect->state++;
break;
case 5:
@ -402,7 +402,7 @@ void EncounterEffect_Water_HigherLevel(SysTask *task, void *param)
}
EncounterEffect_Finish(encEffect, task);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
break;
}
}
@ -483,7 +483,7 @@ void EncounterEffect_Cave_LowerLevel(SysTask *task, void *param)
break;
case 3:
HBlankSystem_Stop(encEffect->fieldSystem->unk_04->hBlankSystem);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, FADE_TO_BLACK, 12, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 12, 1, HEAP_ID_FIELD);
caveEffect->camera = encEffect->fieldSystem->camera;
distance = Camera_GetDistance(caveEffect->camera);
@ -512,7 +512,7 @@ void EncounterEffect_Cave_LowerLevel(SysTask *task, void *param)
}
EncounterEffect_Finish(encEffect, task);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
break;
}
}
@ -541,7 +541,7 @@ void EncounterEffect_Cave_HigherLevel(SysTask *task, void *param)
break;
case 3:
HBlankSystem_Stop(encEffect->fieldSystem->unk_04->hBlankSystem);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, FADE_TO_BLACK, 12, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 12, 1, HEAP_ID_FIELD);
caveEffect->camera = encEffect->fieldSystem->camera;
distance = Camera_GetDistance(caveEffect->camera);
@ -570,7 +570,7 @@ void EncounterEffect_Cave_HigherLevel(SysTask *task, void *param)
}
EncounterEffect_Finish(encEffect, task);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
break;
}
}
@ -796,7 +796,7 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
break;
case 7:
SetColorBrightness(FADE_TO_BLACK);
SetColorBrightness(COLOR_BLACK);
if (encEffect->done != NULL) {
*(encEffect->done) = 1;
@ -940,7 +940,7 @@ void EncounterEffect_Trainer_Grass_HigherLevel(SysTask *param0, void *param1)
break;
case 7:
SetColorBrightness(FADE_TO_BLACK);
SetColorBrightness(COLOR_BLACK);
if (encEffect->done != NULL) {
*(encEffect->done) = 1;
@ -1084,7 +1084,7 @@ void EncounterEffect_Trainer_Water_LowerLevel(SysTask *param0, void *param1)
v4 = Camera_GetDistance(v1->camera);
QuadraticInterpolationTaskFX32_Init(&v1->unk_230, v4, v4 + (-FX32_CONST(500)), (-FX32_CONST(10)), 8);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_24, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 8, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_24, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD);
v0->state++;
break;
@ -1109,7 +1109,7 @@ void EncounterEffect_Trainer_Water_LowerLevel(SysTask *param0, void *param1)
break;
case 7:
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
if (v0->done != NULL) {
*(v0->done) = 1;
@ -1288,7 +1288,7 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1)
break;
case 7:
SetColorBrightness(FADE_TO_BLACK);
SetColorBrightness(COLOR_BLACK);
if (v0->done != NULL) {
*(v0->done) = 1;
@ -1439,7 +1439,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel(SysTask *param0, void *param1)
v3 = Camera_GetDistance(v1->camera);
QuadraticInterpolationTaskFX32_Init(&v1->unk_238, v3, v3 + (-FX32_CONST(1000)), (FX32_CONST(10)), 8);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_18, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 8, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_18, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD);
v0->state++;
break;
@ -1455,7 +1455,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel(SysTask *param0, void *param1)
break;
case 7:
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
HBlankSystem_Start(v0->fieldSystem->unk_04->hBlankSystem);
@ -1637,7 +1637,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1)
break;
case 9:
SetColorBrightness(FADE_TO_BLACK);
SetColorBrightness(COLOR_BLACK);
if (v0->done != NULL) {
*(v0->done) = 1;
@ -1777,7 +1777,7 @@ void EncounterEffect_Frontier(SysTask *param0, void *param1)
}
HBlankSystem_Stop(v0->fieldSystem->unk_04->hBlankSystem);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
v0->state++;
break;
@ -1797,7 +1797,7 @@ void EncounterEffect_Frontier(SysTask *param0, void *param1)
break;
case 7:
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
HBlankSystem_Start(v0->fieldSystem->unk_04->hBlankSystem);
@ -1901,7 +1901,7 @@ void EncounterEffect_Double(SysTask *param0, void *param1)
case 5:
HBlankSystem_Stop(v0->fieldSystem->unk_04->hBlankSystem);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_34, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 8, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_34, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_FIELD);
v0->state++;
break;
@ -1913,7 +1913,7 @@ void EncounterEffect_Double(SysTask *param0, void *param1)
break;
case 7:
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
HBlankSystem_Start(v0->fieldSystem->unk_04->hBlankSystem);
@ -2061,7 +2061,7 @@ void EncounterEffect_GalacticGrunt(SysTask *param0, void *param1)
HBlankSystem_Stop(v0->fieldSystem->unk_04->hBlankSystem);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_34, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 12, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_34, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 12, 1, HEAP_ID_FIELD);
v0->state++;
break;
@ -2073,7 +2073,7 @@ void EncounterEffect_GalacticGrunt(SysTask *param0, void *param1)
break;
case 7:
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
HBlankSystem_Start(v0->fieldSystem->unk_04->hBlankSystem);
@ -2217,7 +2217,7 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
break;
case 7:
SetColorBrightness(FADE_TO_BLACK);
SetColorBrightness(COLOR_BLACK);
ov5_021DEC18(v1->unk_04);
@ -2451,7 +2451,7 @@ void EncounterEffect_Mythical(SysTask *task, void *param)
break;
case 5:
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 10, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 10, 1, HEAP_ID_FIELD);
encEffect->state++;
break;
@ -2464,7 +2464,7 @@ void EncounterEffect_Mythical(SysTask *task, void *param)
break;
case 7:
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_WHITE);
FieldMotionBlur_Stop(&mythicalEffect->motionBlur);
@ -2475,7 +2475,7 @@ void EncounterEffect_Mythical(SysTask *task, void *param)
}
EncounterEffect_Finish(encEffect, task);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_WHITE);
break;
}
}
@ -2554,7 +2554,7 @@ void EncounterEffect_Legendary(SysTask *task, void *param)
break;
case 7:
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 60, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 60, 1, HEAP_ID_FIELD);
encEffect->state++;
break;
@ -2567,7 +2567,7 @@ void EncounterEffect_Legendary(SysTask *task, void *param)
break;
case 9:
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_WHITE);
FieldMotionBlur_Stop(&legendaryEffect->motionBlur);
@ -2578,7 +2578,7 @@ void EncounterEffect_Legendary(SysTask *task, void *param)
}
EncounterEffect_Finish(encEffect, task);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_WHITE);
break;
}
}
@ -3063,7 +3063,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
case 13:
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 15, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 15, 1, HEAP_ID_FIELD);
encEffect->state++;
break;
@ -3076,7 +3076,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
break;
case 15:
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_WHITE);
if (encEffect->done != NULL) {
*(encEffect->done) = 1;
@ -3506,7 +3506,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
QuadraticInterpolationTaskFX32_Init(&v0->unk_00, 0, (FX32_CONST(192.0f)), (FX32_CONST(24.0f)), 16);
QuadraticInterpolationTaskFX32_Init(&v0->unk_18, 0, (FX32_CONST(192.0f)), (FX32_CONST(24.0f)), 16);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 8, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 8, 1, HEAP_ID_FIELD);
}
break;
@ -3536,7 +3536,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
break;
case 14:
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_WHITE);
if (encEffect->done != NULL) {
*(encEffect->done) = 1;

4
src/overlay005/fieldmap.c
View File

@ -765,9 +765,9 @@ static void ov5_021D173C(FieldSystem *fieldSystem)
void ov5_021D1744(const u8 param0)
{
if (param0 == 1) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
} else if (param0 == 0) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
} else {
GF_ASSERT(FALSE);
}

4
src/overlay005/ov5_021D431C.c
View File

@ -897,7 +897,7 @@ BOOL ov5_021D4E10(FieldTask *param0)
Camera_AdjustFOV(-96, fieldSystem->camera);
}
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 6, 1, HEAP_ID_FIELDMAP);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_FIELDMAP);
v2->unk_08 = 1;
break;
case 1:
@ -946,7 +946,7 @@ BOOL ov5_021D4F14(FieldTask *param0)
v1->unk_04 = 0;
Sound_PlayEffect(SEQ_SE_DP_KAIDAN2);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 6, 1, HEAP_ID_FIELDMAP);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_FIELDMAP);
v1->unk_08 = 1;
(v1->unk_00)++;

4
src/overlay005/ov5_021E135C.c
View File

@ -67,7 +67,7 @@ static void ov5_021E139C(SysTask *param0, void *param1)
v0->unk_0C++;
if (v0->unk_0C == 20) {
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
} else if ((v0->unk_0C > 20) && IsScreenFadeDone()) {
*v0->unk_04 = 1;
Heap_Free(v0);
@ -109,7 +109,7 @@ static void ov5_021E1470(SysTask *param0, void *param1)
v0->unk_0C++;
if (v0->unk_0C == 2) {
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
}
if (v0->unk_0C > 20) {

4
src/overlay006/ov6_02243258.c
View File

@ -1009,12 +1009,12 @@ static NARC *ov6_02243F20(void)
static void ov6_02243F2C(void)
{
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_FIELD);
}
static void ov6_02243F50(void)
{
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_FIELD);
}
static void ov6_02243F74(FieldSystem *fieldSystem, int param1)

8
src/overlay006/ov6_02247100.c
View File

@ -116,9 +116,9 @@ static int ov6_022471C0(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6
}
if (param2->unk_08 == 2) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
} else {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_FIELD);
}
param2->unk_00++;
@ -216,9 +216,9 @@ static void ov6_0224732C(FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param
static int ov6_02247354(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2)
{
if (param2->unk_08 == 2) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
} else {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_FIELD);
}
param2->unk_14 = ov5_021F0EB0(fieldSystem, HEAP_ID_FIELD);

2
src/overlay010/ov10_0221F800.c
View File

@ -813,7 +813,7 @@ static u8 ov10_02220014(UnkStruct_ov10_0221FB28 *param0)
static u8 ov10_02220228(UnkStruct_ov10_0221FB28 *param0)
{
if (param0->unk_B76 == 8) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 6, 1, param0->unk_00->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, param0->unk_00->heapID);
}
if ((param0->unk_B76 >= 8) && (IsScreenFadeDone() == TRUE)) {

6
src/overlay017/ov17_0223B140.c
View File

@ -244,7 +244,7 @@ int ov17_0223B140(ApplicationManager *appMan, int *param1)
ov17_022415E4(&v0->unk_0C);
sub_02039734();
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_31, FADE_TYPE_UNK_31, FADE_TO_BLACK, 6, 1, HEAP_ID_21);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_31, FADE_TYPE_UNK_31, COLOR_BLACK, 6, 1, HEAP_ID_21);
v0->unk_04 = SysTask_Start(ov17_0223B6F0, v0, 60000);
v0->unk_7EC = 1;
@ -287,7 +287,7 @@ int ov17_0223B444(ApplicationManager *appMan, int *param1)
} else if ((v1 == 3) && (v0->unk_1614 == 1)) {
*param1 = 2;
MI_CpuClear8(&v0->unk_160C, sizeof(UnkStruct_ov17_0223BCE8));
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_32, FADE_TYPE_UNK_32, FADE_TO_BLACK, 6, 1, HEAP_ID_21);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_32, FADE_TYPE_UNK_32, COLOR_BLACK, 6, 1, HEAP_ID_21);
break;
}
}
@ -298,7 +298,7 @@ int ov17_0223B444(ApplicationManager *appMan, int *param1)
if ((v0->unk_1614 == 1) && (ov17_0224F3D0(&v0->unk_BF8) == 0) && (sub_02094EDC(v0->unk_00) == 0)) {
*param1 = 2;
MI_CpuClear8(&v0->unk_160C, sizeof(UnkStruct_ov17_0223BCE8));
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_32, FADE_TYPE_UNK_32, FADE_TO_BLACK, 6, 1, HEAP_ID_21);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_32, FADE_TYPE_UNK_32, COLOR_BLACK, 6, 1, HEAP_ID_21);
}
break;
case 2:

6
src/overlay017/ov17_0223CB1C.c
View File

@ -205,7 +205,7 @@ int ov17_0223CB1C(ApplicationManager *appMan, int *param1)
PaletteData_FillBufferRange(v0->unk_0C.unk_44, 2, 0, 0x7fff, 0, ((16 - 2) * 16));
PaletteData_FillBufferRange(v0->unk_0C.unk_44, 3, 0, 0x7fff, 0, 16 * 16);
sub_02039734();
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_27, FADE_TYPE_UNK_27, FADE_TO_BLACK, 6, 1, HEAP_ID_22);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_27, FADE_TYPE_UNK_27, COLOR_BLACK, 6, 1, HEAP_ID_22);
v0->unk_04 = SysTask_Start(ov17_0223D164, v0, 60000);
v0->unk_4F6 = 1;
@ -255,7 +255,7 @@ int ov17_0223CDDC(ApplicationManager *appMan, int *param1)
} else if ((v1 == 3) && (v0->unk_F14 == 1)) {
*param1 = 2;
MI_CpuClear8(&v0->unk_F0C, sizeof(UnkStruct_ov17_0223D60C));
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_36, FADE_TO_BLACK, 6, 1, HEAP_ID_22);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_36, COLOR_BLACK, 6, 1, HEAP_ID_22);
break;
}
}
@ -266,7 +266,7 @@ int ov17_0223CDDC(ApplicationManager *appMan, int *param1)
if ((v0->unk_F14 == 1) && (ov17_0224F3D0(&v0->unk_4F8) == 0) && (sub_02094EDC(v0->unk_00) == 0)) {
*param1 = 2;
MI_CpuClear8(&v0->unk_F0C, sizeof(UnkStruct_ov17_0223D60C));
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_36, FADE_TO_BLACK, 6, 1, HEAP_ID_22);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_36, COLOR_BLACK, 6, 1, HEAP_ID_22);
}
break;
case 2:

6
src/overlay017/ov17_0223DAD0.c
View File

@ -311,7 +311,7 @@ int ov17_0223DAD0(ApplicationManager *appMan, int *param1)
ov17_0224B59C(v0);
sub_02039734();
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_37, FADE_TO_BLACK, 6, 1, HEAP_ID_23);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_37, COLOR_BLACK, 6, 1, HEAP_ID_23);
v0->unk_04 = SysTask_Start(ov17_0223E1FC, v0, 80000);
v0->unk_1098 = 1;
@ -358,7 +358,7 @@ int ov17_0223DDD4(ApplicationManager *appMan, int *param1)
} else if ((v1 == 3) && (v0->unk_1B24 == 1)) {
*param1 = 2;
MI_CpuClear8(&v0->unk_1B1C, sizeof(UnkStruct_ov17_0223E838));
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_30, FADE_TYPE_UNK_30, FADE_TO_BLACK, 6, 1, HEAP_ID_23);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_30, FADE_TYPE_UNK_30, COLOR_BLACK, 6, 1, HEAP_ID_23);
break;
}
}
@ -369,7 +369,7 @@ int ov17_0223DDD4(ApplicationManager *appMan, int *param1)
if ((v0->unk_1B24 == 1) && (ov17_0224F3D0(&v0->unk_109C) == 0) && (sub_02094EDC(v0->unk_00) == 0)) {
*param1 = 2;
MI_CpuClear8(&v0->unk_1B1C, sizeof(UnkStruct_ov17_0223E838));
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_30, FADE_TYPE_UNK_30, FADE_TO_BLACK, 6, 1, HEAP_ID_23);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_30, FADE_TYPE_UNK_30, COLOR_BLACK, 6, 1, HEAP_ID_23);
}
break;
case 2:

2
src/overlay017/ov17_0224F4D4.c
View File

@ -202,7 +202,7 @@ int ov17_0224F4D4(ApplicationManager *appMan, int *param1)
ov17_02250744(v0);
sub_02039734();
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_33, FADE_TYPE_UNK_33, FADE_TO_BLACK, 6, 1, HEAP_ID_24);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_33, FADE_TYPE_UNK_33, COLOR_BLACK, 6, 1, HEAP_ID_24);
v0->unk_04 = SysTask_Start(ov17_0224FAFC, v0, 80000);
v0->unk_850 = 1;

4
src/overlay017/ov17_02251D6C.c
View File

@ -480,7 +480,7 @@ static void ov17_022523AC(SysTask *param0, void *param1)
}
break;
case 2:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_24);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_24);
Sound_StopBGM(SEQ_CONTEST_DRESSING_ROOM, 30);
v0->unk_10++;
break;
@ -516,7 +516,7 @@ static void ov17_022523AC(SysTask *param0, void *param1)
break;
case 5:
if (Sound_IsFadeActive() == FALSE) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_24);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_24);
v0->unk_10++;
}
break;

8
src/overlay019/ov19_021D61B0.c
View File

@ -443,7 +443,7 @@ static void BoxGraphics_ScreenFadeBothToBlackLogIn(SysTask *task, void *param1)
case 0:
Sound_PlayEffect(SEQ_SE_DP_PC_LOGIN);
G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_ALL, 0x6, 0xa);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 8, 1, HEAP_ID_BOX_GRAPHICS);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 8, 1, HEAP_ID_BOX_GRAPHICS);
v2->state++;
break;
case 1:
@ -465,7 +465,7 @@ static void BoxGraphics_ScreenFadeBothToBlack1(SysTask *task, void *param1)
switch (v2->state) {
case 0:
G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_ALL, 0x6, 0xa);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_BOX_GRAPHICS);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_BOX_GRAPHICS);
v2->state++;
break;
case 1:
@ -486,7 +486,7 @@ static void BoxGraphics_ScreenFadeBothToBlack2(SysTask *task, void *param1)
switch (v2->state) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_BOX_GRAPHICS);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_BOX_GRAPHICS);
v2->state++;
break;
case 1:
@ -1517,7 +1517,7 @@ static void BoxGraphics_ScreenFadeBothToBlackLogOff(SysTask *task, void *param1)
switch (params->state) {
case 0:
Sound_PlayEffect(SEQ_SE_DP_PC_LOGOFF);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_BOX_GRAPHICS);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_BOX_GRAPHICS);
params->state++;
break;
case 1:

4
src/overlay020/ov20_021D2098.c
View File

@ -335,7 +335,7 @@ static void ov20_021D2414(SysTask *param0, void *param1)
switch (v0->unk_14) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 5, 1, HEAP_ID_35);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 5, 1, HEAP_ID_35);
v0->unk_14++;
break;
case 1:
@ -488,7 +488,7 @@ static void ov20_021D2570(SysTask *param0, void *param1)
switch (v0->unk_14) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 5, 1, HEAP_ID_35);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 5, 1, HEAP_ID_35);
v0->unk_14++;
break;
case 1:

10
src/overlay022/ov22_02255D44.c
View File

@ -243,7 +243,7 @@ int ov22_02255E50(ApplicationManager *appMan, int *param1)
switch (*param1) {
case 0:
case 1:
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_5, FADE_TYPE_UNK_5, FADE_TO_BLACK, 6, 1, HEAP_ID_13);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_5, FADE_TYPE_UNK_5, COLOR_BLACK, 6, 1, HEAP_ID_13);
(*param1) = 2;
break;
case 2:
@ -338,7 +338,7 @@ int ov22_02255E50(ApplicationManager *appMan, int *param1)
}
break;
case 11:
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_13);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_13);
(*param1)++;
break;
case 12:
@ -549,7 +549,7 @@ int ov22_022562EC(ApplicationManager *appMan, int *param1)
(*param1)++;
break;
case 11:
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_19, FADE_TO_BLACK, 6, 1, HEAP_ID_13);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_19, COLOR_BLACK, 6, 1, HEAP_ID_13);
(*param1)++;
break;
case 12:
@ -606,7 +606,7 @@ int ov22_022562EC(ApplicationManager *appMan, int *param1)
break;
}
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_26, FADE_TYPE_UNK_26, FADE_TO_BLACK, 6, 1, HEAP_ID_13);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_26, FADE_TYPE_UNK_26, COLOR_BLACK, 6, 1, HEAP_ID_13);
Sound_PlayEffect(SEQ_SE_DP_CON_017);
(*param1)++;
break;
@ -1260,7 +1260,7 @@ static void ov22_0225718C(UnkStruct_ov22_02255D44 *param0)
ov22_022568DC(param0);
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SpriteList_SetActive(param0->unk_00.unk_44, 1);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);

4
src/overlay022/ov22_0225B660.c
View File

@ -127,7 +127,7 @@ int ov22_0225B738(ApplicationManager *appMan, int *param1)
(*param1)++;
break;
case 1:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_5, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_13);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_5, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_13);
(*param1)++;
break;
case 2:
@ -141,7 +141,7 @@ int ov22_0225B738(ApplicationManager *appMan, int *param1)
}
break;
case 4:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_2, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_13);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_2, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_13);
(*param1)++;
break;
case 5:

10
src/overlay023/ov23_0223E140.c
View File

@ -1393,7 +1393,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
break;
case 1:
ov23_0224942C(fieldSystem->unk_6C);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_18, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_18, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
(v0->state)++;
break;
case 2:
@ -1420,7 +1420,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
break;
case 6:
sub_02039734();
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, FADE_TO_BLACK, 6, 1, HEAP_ID_MINING);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, COLOR_BLACK, 6, 1, HEAP_ID_MINING);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
@ -1535,7 +1535,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
case 18:
SpriteList_Update(Unk_ov23_02257740->spriteList);
ov23_02254044(ov23_0224219C());
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, FADE_TO_BLACK, 6, 1, HEAP_ID_MINING);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 6, 1, HEAP_ID_MINING);
(v0->state)++;
break;
case 19:
@ -1554,7 +1554,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
sub_02039734();
sub_020594FC();
HBlankSystem_Stop(v0->fieldSystem->unk_04->hBlankSystem);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_19, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_19, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
(v0->state)++;
break;
}
@ -1598,7 +1598,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
break;
case 23:
SpriteList_Update(Unk_ov23_02257740->spriteList);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_2, FADE_TYPE_UNK_2, FADE_TO_BLACK, 15, 1, HEAP_ID_MINING);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_2, FADE_TYPE_UNK_2, COLOR_BLACK, 15, 1, HEAP_ID_MINING);
Sound_PlayEffect(SEQ_SE_DP_UG_001);
v0->state = 24;
break;

2
src/overlay023/ov23_02248F1C.c
View File

@ -341,7 +341,7 @@ static void ov23_02249438(BgConfig *param0)
static void ov23_0224944C(BgConfig *param0, Window *param1)
{
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
ov23_02249438(param0);
{

6
src/overlay023/ov23_0224B05C.c
View File

@ -1580,7 +1580,7 @@ static BOOL ov23_0224C790(FieldTask *param0)
break;
case 1:
FinishScreenFade();
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_18, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_18, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
ov23_0224942C(fieldSystem->unk_6C);
Sound_PlayEffect(SEQ_SE_DP_KAIDAN2);
v1->unk_0C++;
@ -1614,7 +1614,7 @@ static BOOL ov23_0224C790(FieldTask *param0)
case 6:
fieldSystem->unk_6C = ov23_02249404(fieldSystem);
FinishScreenFade();
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_19, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_19, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
(v1->unk_0C)++;
break;
case 7:
@ -2377,7 +2377,7 @@ static void ov23_0224D5BC(SysTask *param0, void *param1)
}
break;
case 3:
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
break;
case 4:
Heap_Free(param1);

4
src/overlay023/ov23_0225128C.c
View File

@ -613,7 +613,7 @@ static BOOL ov23_02251ACC(FieldTask *param0)
switch (v1->unk_00) {
case 0:
Sound_PlayEffect(SEQ_SE_DP_PC_LOGIN);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
v1->unk_00 = 1;
break;
case 1:
@ -634,7 +634,7 @@ static BOOL ov23_02251ACC(FieldTask *param0)
case 4:
PlayerAvatar_SetHidden(fieldSystem->playerAvatar, 1);
ov23_02251A84(0, fieldSystem);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
v1->unk_00 = 5;
break;
case 5:

4
src/overlay023/ov23_02254A14.c
View File

@ -221,7 +221,7 @@ static BOOL ov23_02254AD4(FieldTask *param0)
ov23_02255EBC(1, v1);
break;
case 1:
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_41, FADE_TYPE_UNK_41, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_41, FADE_TYPE_UNK_41, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
ov23_02255EBC(2, v1);
break;
case 2:
@ -254,7 +254,7 @@ static BOOL ov23_02254AD4(FieldTask *param0)
break;
case 9:
Sound_PlayEffect(SEQ_SE_DP_PC_LOGOFF);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_40, FADE_TYPE_UNK_40, FADE_TO_BLACK, 6, 1, HEAP_ID_FIELD);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_40, FADE_TYPE_UNK_40, COLOR_BLACK, 6, 1, HEAP_ID_FIELD);
ov23_02255EBC(10, v1);
break;
case 10:

10
src/overlay058/ov58_021D0D80.c
View File

@ -179,9 +179,9 @@ int ov58_021D0D80(ApplicationManager *appMan, int *param1)
ov58_021D1184();
ov58_021D11A4(v0->unk_00);
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, FADE_TO_BLACK, 16, 1, HEAP_ID_39);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, COLOR_BLACK, 16, 1, HEAP_ID_39);
{
UnkStruct_0203DDFC *v2 = (UnkStruct_0203DDFC *)ApplicationManager_Args(appMan);
@ -1150,7 +1150,7 @@ static int ov58_021D20C8(UnkStruct_02095EAC *param0, int param1)
static int ov58_021D20F4(UnkStruct_02095EAC *param0, int param1)
{
if (++param0->unk_374 > 60) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, FADE_TO_BLACK, 16, 1, HEAP_ID_39);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 16, 1, HEAP_ID_39);
param1 = 3;
}
@ -1240,7 +1240,7 @@ static int ov58_021D2270(UnkStruct_02095EAC *param0, int param1)
static int ov58_021D2298(UnkStruct_02095EAC *param0, int param1)
{
if (CommTiming_IsSyncState(200) || (CommSys_ConnectedCount() == 1)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, FADE_TO_BLACK, 16, 1, HEAP_ID_39);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 16, 1, HEAP_ID_39);
param1 = 3;
}

6
src/overlay059/ov59_021D0D80.c
View File

@ -193,7 +193,7 @@ int ov59_021D0D80(ApplicationManager *appMan, int *param1)
ResetScreenMasterBrightness(DS_SCREEN_MAIN);
ResetScreenMasterBrightness(DS_SCREEN_SUB);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, FADE_TO_BLACK, 16, 1, HEAP_ID_51);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, COLOR_BLACK, 16, 1, HEAP_ID_51);
ov59_021D1388(v0, v1);
SetVBlankCallback(ov59_021D1100, v0);
@ -1135,7 +1135,7 @@ static int ov59_021D1E98(UnkStruct_020961E8 *param0, int param1)
static int ov59_021D1EB8(UnkStruct_020961E8 *param0, int param1)
{
if (++param0->unk_3B4 > 60) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, FADE_TO_BLACK, 16, 1, HEAP_ID_51);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 16, 1, HEAP_ID_51);
param1 = 3;
}
@ -1231,7 +1231,7 @@ static int ov59_021D2064(UnkStruct_020961E8 *param0, int param1)
{
if (CommTiming_IsSyncState(201)) {
CommMan_SetErrorHandling(0, 0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, FADE_TO_BLACK, 16, 1, HEAP_ID_51);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 16, 1, HEAP_ID_51);
param1 = 3;
}

4
src/overlay061/ov61_0222BF44.c
View File

@ -177,7 +177,7 @@ int ov61_0222BF44(ApplicationManager *appMan, int *param1)
ov61_0222C3B0(v0);
ov61_0222C664(v0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_117);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_117);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
@ -847,7 +847,7 @@ static int ov61_0222CCAC(UnkStruct_ov61_0222C664 *param0)
sub_02039794();
ov61_0222C86C(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_117);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_117);
param0->unk_08 = 0;
return 1;

2
src/overlay062/ov62_02234A10.c
View File

@ -70,7 +70,7 @@ static BOOL ov62_02234AB4(UnkStruct_0208C06C *param0)
break;
}
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_102);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_102);
PaletteData_BlendMulti(param0->unk_14.unk_14, 2, 0xFFFE, 16, ov62_022316D0(param0));
PaletteData_BlendMulti(param0->unk_14.unk_14, 0, 0xBFFF, 16, ov62_022316D0(param0));
PaletteData_BlendMulti(param0->unk_14.unk_14, 3, 0x3FFE, 16, ov62_022316D0(param0));

2
src/overlay062/ov62_02235278.c
View File

@ -122,7 +122,7 @@ static BOOL ov62_02235324(UnkStruct_0208C06C *param0)
if (param0->unk_0C != 0) {
param0->unk_0C -= 4;
} else {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_102);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_102);
param0->unk_08++;
}
break;

6
src/overlay062/ov62_02235E64.c
View File

@ -437,7 +437,7 @@ static BOOL ov62_02236624(UnkStruct_0208C06C *param0)
switch (param0->unk_08) {
case 0:
ov62_02231AAC(param0, 299);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_102);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_102);
param0->unk_08++;
break;
case 1:
@ -478,7 +478,7 @@ static BOOL ov62_022366D4(UnkStruct_0208C06C *param0)
switch (param0->unk_08) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_102);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_102);
param0->unk_08++;
break;
case 1:
@ -629,7 +629,7 @@ static BOOL ov62_02236920(UnkStruct_0208C06C *param0)
PaletteData_BlendMulti(param0->unk_14.unk_14, 3, 0xC, v0->unk_08, param0->unk_14.unk_44);
break;
case 4:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_102);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_102);
param0->unk_08++;
break;
case 5:

4
src/overlay062/ov62_0223DFA8.c
View File

@ -1623,7 +1623,7 @@ static BOOL ov62_0223FF90 (UnkStruct_0208C06C * param0)
switch (param0->unk_08) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_102);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_102);
param0->unk_08++;
break;
case 1:
@ -1733,7 +1733,7 @@ static BOOL ov62_02240084 (UnkStruct_0208C06C * param0)
PaletteData_BlendMulti(param0->unk_14.unk_14, 3, 0xC, v0->unk_08, param0->unk_14.unk_44);
break;
case 4:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_102);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_102);
param0->unk_08++;
break;
case 5:

6
src/overlay062/ov62_02241204.c
View File

@ -2512,7 +2512,7 @@ static BOOL ov62_02243B1C (UnkStruct_0208C06C * param0)
PaletteData_BlendMulti(param0->unk_14.unk_14, 3, 0xC, v0->unk_08, param0->unk_14.unk_44);
break;
case 4:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_102);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_102);
param0->unk_08++;
break;
case 5:
@ -3540,7 +3540,7 @@ static BOOL ov62_02245018 (UnkStruct_0208C06C * param0)
PaletteData_BlendMulti(param0->unk_14.unk_14, 3, 0xC, v0->unk_08, param0->unk_14.unk_44);
break;
case 4:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_102);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_102);
param0->unk_08++;
break;
case 5:
@ -4603,7 +4603,7 @@ static BOOL ov62_02246850 (UnkStruct_0208C06C * param0)
switch (param0->unk_08) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_102);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_102);
param0->unk_08++;
break;
case 1:

10
src/overlay064/ov64_0222DCE0.c
View File

@ -1224,7 +1224,7 @@ static int ov64_0222EA70(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E06
switch (param1->unk_04) {
case 0:
ov64_0222EE20(param0, param1, param2);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, FADE_TO_BLACK, 6, 1, heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, COLOR_BLACK, 6, 1, heapID);
param1->unk_04 = 1;
break;
case 1:
@ -1258,7 +1258,7 @@ static int ov64_0222EA70(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E06
}
break;
case 4:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, FADE_TO_BLACK, 6, 1, heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 6, 1, heapID);
param1->unk_04++;
break;
case 5:
@ -1268,7 +1268,7 @@ static int ov64_0222EA70(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E06
break;
case 6:
ov64_0222EE20(param0, param1, param2);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, FADE_TO_BLACK, 6, 1, heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, COLOR_BLACK, 6, 1, heapID);
param1->unk_04 = 7;
break;
case 7:
@ -1776,7 +1776,7 @@ static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E06
param1->unk_04 = 1;
break;
case 10:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, FADE_TO_BLACK, 6, 1, heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 6, 1, heapID);
v2 = ov64_0222FF38(param0);
v1 = SaveData_GetWiFiList(param1->saveData);
@ -1797,7 +1797,7 @@ static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E06
sub_0202AF0C(v1, param1->unk_08.unk_04[v2], param1->unk_2C.unk_00);
case 13:
ov64_0222F668(param0, param1, param2, heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, FADE_TO_BLACK, 6, 1, heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, COLOR_BLACK, 6, 1, heapID);
param1->unk_04 = 14;
break;
case 14:

18
src/overlay065/ov65_0222DCE0.c
View File

@ -773,7 +773,7 @@ int ov65_0222E2A8(ApplicationManager *appMan, int *param1)
ov65_0222EBE0(v0);
ov65_0222E01C(v0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_54);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_54);
if (sub_020389B8()) {
sub_02039734();
@ -1396,7 +1396,7 @@ static int ov65_0222EBAC(u32 param0)
static int ov65_0222EBB8(void)
{
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_54);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_54);
ov65_02231A0C();
return 18;
@ -2031,8 +2031,8 @@ static int ov65_0222F90C(UnkStruct_ov65_0222EBE0 *param0, int param1)
if (!sub_020334A4()) {
if (ov65_02235194(&param0->unk_3EC) == 1) {
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
ov65_02235130(&param0->unk_3EC);
for (v0 = 0; v0 < (32 + 1); v0++) {
@ -2437,7 +2437,7 @@ static int ov65_0222FFAC(UnkStruct_ov65_0222EBE0 *param0, int param1)
param0->unk_3D0 = -1;
NARC_dtor(v3);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_54);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_54);
param0->unk_3A8 = 19;
CommMan_SetErrorHandling(0, 0);
@ -3411,7 +3411,7 @@ static int ov65_02231200(UnkStruct_ov65_0222EBE0 *param0, int param1)
CommMan_SetErrorHandling(0, 1);
sub_0203632C(0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_54);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_54);
param0->unk_3E4 = 0;
@ -4075,7 +4075,7 @@ static int ov65_02231E64(UnkStruct_ov65_0222EBE0 *param0, int param1)
param0->unk_3AC = ov65_0222DD94(v0);
sub_0203632C(0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_54);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_54);
param0->unk_3E4 = 0;
param1 = 2;
@ -4373,7 +4373,7 @@ static int ov65_022323C0(UnkStruct_ov65_0222EBE0 *param0, int param1)
ov65_02231A74(param0, ov4_021D2388());
ov65_02232E58(param0, v0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_54);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_54);
param1 = 2;
}
@ -4704,7 +4704,7 @@ static int ov65_0223294C(UnkStruct_ov65_0222EBE0 *param0, int param1)
static int ov65_02232B28(UnkStruct_ov65_0222EBE0 *param0, int param1)
{
if (!CommMan_IsInitialized()) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_54);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_54);
param1 = 2;
}

8
src/overlay065/ov65_0223648C.c
View File

@ -433,7 +433,7 @@ int ov65_02236548(ApplicationManager *appMan, int *param1)
switch (*param1) {
case 0:
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_96);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_96);
(*param1)++;
break;
case 1:
@ -475,7 +475,7 @@ int ov65_02236548(ApplicationManager *appMan, int *param1)
}
break;
case 3:
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_96);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_96);
(*param1)++;
break;
case 4:
@ -2687,7 +2687,7 @@ static BOOL ov65_022387E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
if ((sub_020380E4() == 1) && (CommSys_IsPlayerConnected(0) == 1)) {
sub_0203632C(0);
ov65_022378C4(param0, param1, heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, heapID);
param0->unk_00.unk_05 = 27;
}
@ -2728,7 +2728,7 @@ static BOOL ov65_02238838(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p
memset(param0->unk_00.unk_28, 0, sizeof(u8) * 4);
}
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, heapID);
param0->unk_00.unk_05 = 28;
}

4
src/overlay067/ov67_0225C700.c
View File

@ -357,7 +357,7 @@ int ov67_0225C820(ApplicationManager *appMan, int *param1)
}
break;
case 7:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_112);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_112);
(*param1)++;
break;
case 8:
@ -491,7 +491,7 @@ int ov67_0225CC6C(ApplicationManager *appMan, int *param1)
}
break;
case 9:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_112);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_112);
(*param1)++;
break;
case 10:

8
src/overlay068/ov68_0225C700.c
View File

@ -350,7 +350,7 @@ int ov68_0225C798(ApplicationManager *appMan, int *param1)
switch (*param1) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_122);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_122);
ov66_0222E31C(v1->unk_04, 1);
(*param1)++;
break;
@ -382,7 +382,7 @@ int ov68_0225C798(ApplicationManager *appMan, int *param1)
}
break;
case 3:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_122);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_122);
(*param1)++;
break;
case 4:
@ -1140,7 +1140,7 @@ static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB
}
} break;
case 9:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, heapID);
param0->unk_60 = 10;
break;
case 10:
@ -1150,7 +1150,7 @@ static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB
}
break;
case 11:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, heapID);
param0->unk_60 = 12;
break;
case 12:

4
src/overlay069/ov69_0225C700.c
View File

@ -717,7 +717,7 @@ int ov69_0225C820(ApplicationManager *appMan, int *param1)
switch (*param1) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_105);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_105);
ov66_0222E31C(v1->unk_0C, 1);
(*param1)++;
break;
@ -746,7 +746,7 @@ int ov69_0225C820(ApplicationManager *appMan, int *param1)
}
break;
case 5:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_105);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_105);
(*param1)++;
break;
case 6:

14
src/overlay070/ov70_0225D9A4.c
View File

@ -661,7 +661,7 @@ int ov70_0225DB90(ApplicationManager *appMan, int *param1)
switch (*param1) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_112);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_112);
v0->unk_03 = 1;
(*param1)++;
break;
@ -741,14 +741,14 @@ int ov70_0225DB90(ApplicationManager *appMan, int *param1)
v3 = ov70_0225F798(&v0->unk_1E8);
if (v3 == 5) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_112);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_112);
v0->unk_03 = 1;
(*param1)++;
break;
}
if (v3 == 0) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_112);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_112);
v0->unk_03 = 1;
(*param1)++;
break;
@ -2081,7 +2081,7 @@ static void ov70_0225F418(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225DE
}
break;
case 1:
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 4, 1, heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 4, 1, heapID);
param0->unk_00++;
break;
case 2:
@ -2102,7 +2102,7 @@ static void ov70_0225F418(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225DE
}
break;
case 3:
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 6, 1, heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, heapID);
param0->unk_00++;
break;
case 4:
@ -2163,7 +2163,7 @@ static void ov70_0225F418(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225DE
}
break;
case 6:
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 3, 1, heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 3, 1, heapID);
param0->unk_00++;
break;
case 7:
@ -2246,7 +2246,7 @@ static void ov70_0225F418(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225DE
param0->unk_00++;
} break;
case 9:
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 3, 1, heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 3, 1, heapID);
if (param0->unk_01 == 2) {
ov70_0225FACC(&param0->unk_08, &param1->unk_37C);

4
src/overlay071/ov71_0223B140.c
View File

@ -249,7 +249,7 @@ int ov71_0223B140(ApplicationManager *appMan, int *param1)
SetVBlankCallback(ov71_0223C18C, NULL);
DrawWifiConnectionIcon();
Sound_SetPlayerVolume(1, (127 / 3));
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_3, FADE_TYPE_UNK_3, FADE_TO_BLACK, 6, 1, HEAP_ID_TRAINER_CARD_SCREEN);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_3, FADE_TYPE_UNK_3, COLOR_BLACK, 6, 1, HEAP_ID_TRAINER_CARD_SCREEN);
NARC_dtor(v1);
return 1;
@ -319,7 +319,7 @@ int ov71_0223B388(ApplicationManager *appMan, int *param1)
} else if (v1 == 4) {
Sound_PlayEffect(SEQ_SE_CONFIRM);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_4, FADE_TYPE_UNK_4, FADE_TO_BLACK, 6, 1, HEAP_ID_TRAINER_CARD_SCREEN);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_4, FADE_TYPE_UNK_4, COLOR_BLACK, 6, 1, HEAP_ID_TRAINER_CARD_SCREEN);
*param1 = 2;
}
}

8
src/overlay072/ov72_0223D7A0.c
View File

@ -110,8 +110,8 @@ int ov72_0223D7A0(ApplicationManager *appMan, int *param1)
switch (*param1) {
case 0:
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
SetVBlankCallback(NULL, NULL);
DisableHBlank();
GXLayers_DisableEngineALayers();
@ -132,7 +132,7 @@ int ov72_0223D7A0(ApplicationManager *appMan, int *param1)
SetAutorepeat(4, 8);
ov72_0223DA70();
ov72_0223DA90(v0->unk_00);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 16, 1, HEAP_ID_39);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 16, 1, HEAP_ID_39);
{
SaveData *saveData = (SaveData *)ApplicationManager_Args(appMan);
@ -763,7 +763,7 @@ static int ov72_0223E488(UnkStruct_ov72_0223DB98 *param0, int param1)
GameRecords_IncrementRecordValue(param0->records, RECORD_UNK_114);
Window_EraseMessageBox(&param0->unk_338, 1);
sub_02015A54(param0->unk_5D00);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 16, 1, HEAP_ID_39);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 16, 1, HEAP_ID_39);
return 2;
break;
case 2:

32
src/overlay073/ov73_021D0D80.c
View File

@ -160,8 +160,8 @@ int ov73_021D0E20(ApplicationManager *appMan, int *param1)
switch (*param1) {
case 0:
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
SetVBlankCallback(NULL, NULL);
SetHBlankCallback(NULL, NULL);
@ -184,12 +184,12 @@ int ov73_021D0E20(ApplicationManager *appMan, int *param1)
break;
case 1:
if (ov73_021D2318(v0) == 1) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, v0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, v0->heapID);
*param1 = 2;
}
if (v0->appMan != NULL) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, v0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, v0->heapID);
*param1 = 3;
}
break;
@ -1420,7 +1420,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
Sound_StopBGM(SEQ_OPENING, 0);
Bg_ToggleLayer(BG_LAYER_MAIN_0, 1);
Bg_ToggleLayer(BG_LAYER_SUB_3, 1);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, param0->heapID);
param0->unk_0C = 1;
break;
case 1:
@ -1445,7 +1445,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
ov73_021D1A20(param0);
Bg_ToggleLayer(BG_LAYER_MAIN_3, 1);
Bg_ToggleLayer(BG_LAYER_MAIN_1, 1);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 16, 4, param0->heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 16, 4, param0->heapID);
param0->unk_0C = 4;
break;
case 4:
@ -1484,7 +1484,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
}
break;
case 8:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, param0->heapID);
param0->unk_0C = 9;
break;
case 9:
@ -1503,7 +1503,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
ov73_021D19DC(param0);
param0->unk_8B = 1;
ov73_021D1B14(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, param0->heapID);
param0->unk_0C = 11;
break;
case 11:
@ -1596,7 +1596,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
case 24:
if (ov73_021D1334(param0, 6, 1) == 1) {
sub_02015A54(param0->unk_68);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, param0->heapID);
param0->unk_0C = 25;
}
break;
@ -1633,7 +1633,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
ov73_021D1B14(param0);
Bg_ToggleLayer(BG_LAYER_MAIN_1, 1);
Bg_SetOffset(param0->unk_18, BG_LAYER_MAIN_1, 0, 0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, param0->heapID);
param0->unk_0C = 29;
break;
case 29:
@ -1651,7 +1651,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
ov73_021D19DC(param0);
param0->unk_8B = 2;
ov73_021D1B14(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, param0->heapID);
param0->unk_0C = 32;
break;
case 32:
@ -1690,7 +1690,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
}
break;
case 39:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, param0->heapID);
param0->unk_0C = 40;
break;
case 40:
@ -1713,7 +1713,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
}
break;
case 43:
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, param0->heapID);
param0->unk_0C = 44;
break;
case 44:
@ -1722,7 +1722,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
param0->unk_8B = 4;
ov73_021D1B14(param0);
Bg_ToggleLayer(BG_LAYER_SUB_2, 1);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, param0->heapID);
param0->unk_0C = 45;
}
break;
@ -1990,7 +1990,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
Bg_SetOffset(param0->unk_18, BG_LAYER_MAIN_2, 0, 0);
}
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, param0->heapID);
param0->unk_0C = 78;
break;
case 78:
@ -2134,7 +2134,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0)
Bg_ToggleLayer(BG_LAYER_SUB_3, 1);
Bg_ToggleLayer(BG_LAYER_MAIN_1, 1);
Bg_SetOffset(param0->unk_18, BG_LAYER_MAIN_1, 0, 0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, param0->heapID);
param0->unk_0C = 94;
break;
case 94:

8
src/overlay073/ov73_021D3250.c
View File

@ -63,8 +63,8 @@ int ov73_021D3280(ApplicationManager *appMan, int *param1)
switch (*param1) {
case 0:
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
SetVBlankCallback(NULL, NULL);
SetHBlankCallback(NULL, NULL);
@ -107,7 +107,7 @@ int ov73_021D3280(ApplicationManager *appMan, int *param1)
v0->unk_24--;
} else {
v0->unk_24 = 0;
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, v0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, v0->heapID);
*param1 = 3;
}
break;
@ -122,7 +122,7 @@ int ov73_021D3280(ApplicationManager *appMan, int *param1)
ov73_021D37AC(v0);
if (ov73_021D3698(v0, 0, 5 * 8, 6 * 8) == 1) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, v0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, v0->heapID);
*param1 = 5;
}
break;

8
src/overlay075/ov75_021D0D80.c
View File

@ -371,8 +371,8 @@ static int ov75_021D1184(UnkStruct_ov75_021D1184 *param0)
GX_SetVisiblePlane(0);
GXS_SetVisiblePlane(0);
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
ResetVisibleHardwareWindows(DS_SCREEN_SUB);
break;
@ -425,8 +425,8 @@ static int ov75_021D1184(UnkStruct_ov75_021D1184 *param0)
return 0;
}
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
SetVBlankCallback(NULL, NULL);
GXLayers_DisableEngineALayers();
GXLayers_DisableEngineBLayers();

4
src/overlay076/ov76_0223B870.c
View File

@ -1066,12 +1066,12 @@ void ov76_0223CE2C(void)
void ov76_0223CE44(void)
{
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_53);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_53);
}
void ov76_0223CE64(void)
{
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_53);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_53);
}
void ov76_0223CE84(UnkStruct_ov76_0223DE00 *param0, NARC *param1)

62
src/overlay077/ov77_021D25B0.c
View File

@ -930,8 +930,8 @@ static int ov77_021D2D08(ApplicationManager *appMan, int *param1)
int heapID = HEAP_ID_76;
BrightnessController_ResetAllControllers();
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_WHITE);
SetVBlankCallback(NULL, NULL);
SetHBlankCallback(NULL, NULL);
GXLayers_DisableEngineALayers();
@ -962,8 +962,8 @@ static int ov77_021D2D94(ApplicationManager *appMan, int *param1)
if ((v0->unk_2A8) && ((gSystem.pressedKeys & PAD_BUTTON_A) || (gSystem.pressedKeys & PAD_BUTTON_START))) {
v0->unk_08 = 1;
gSystem.unk_6C = 0;
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
}
switch (*param1) {
@ -1151,7 +1151,7 @@ static BOOL ov77_021D30D0(UnkStruct_ov77_021D2F38 *param0, const int param1)
break;
case 4:
if ((param0->unk_08) && (param1 >= 490)) {
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 18, 1, HEAP_ID_76);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 18, 1, HEAP_ID_76);
(*v0)++;
}
break;
@ -1867,14 +1867,14 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
break;
case 2:
if (param2 == 785) {
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 4, 1, HEAP_ID_76);
}
if (param2 == (785 + 5)) {
GF_ASSERT(IsScreenFadeDone() == TRUE);
param1->unk_247 = (1 << 2);
param1->unk_248 = (1 << 3);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 4, 1, HEAP_ID_76);
}
if (param2 == 945 - 1) {
@ -1891,7 +1891,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
if (param2 >= 975) {
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 18, 1, HEAP_ID_76);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 18, 1, HEAP_ID_76);
param1->unk_08 = 16;
(*v0)++;
}
@ -1914,7 +1914,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
ov77_021D61B8(param1->unk_14, param2);
if (param2 >= 1576) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 18, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 18, 1, HEAP_ID_76);
(*v0)++;
}
}
@ -1968,7 +1968,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
G2_BlendNone();
G2S_BlendNone();
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 18, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 18, 1, HEAP_ID_76);
(*v0)++;
}
break;
@ -2001,7 +2001,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
ov77_021D4C04(param1, param2);
if (param2 == (64 * 30 - 15 - 15 - 45)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 4, 1, HEAP_ID_76);
(*v0)++;
}
break;
@ -2016,7 +2016,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
Bg_ScheduleScroll(param1->unk_10, 1, 3, 0);
Bg_ScheduleScroll(param1->unk_10, 5, 0, 0);
Bg_ScheduleScroll(param1->unk_10, 5, 3, 0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 4, 1, HEAP_ID_76);
(*v0)++;
}
break;
@ -2034,7 +2034,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
ov77_021D603C(param1->unk_14, 11, 1);
ov77_021D603C(param1->unk_14, 12, 1);
} else if (param2 >= (1935 - 15)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 4, 1, HEAP_ID_76);
(*v0)++;
}
}
@ -2043,7 +2043,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
ov77_021D6470(param1->unk_14, param2);
if (IsScreenFadeDone()) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 64, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 64, 1, HEAP_ID_76);
ov77_021D603C(param1->unk_14, 11, 0);
ov77_021D603C(param1->unk_14, 12, 0);
ov77_021D603C(param1->unk_14, 13, 1);
@ -2068,7 +2068,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
if (IsScreenFadeDone()) {
if (param2 >= (1995 + 15)) {
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 4, 1, HEAP_ID_76);
(*v0)++;
}
}
@ -2079,7 +2079,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
if (IsScreenFadeDone()) {
G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD, 0, 0);
MI_CpuClear16((void *)HW_BG_PLTT, 0x200);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 4, 1, HEAP_ID_76);
(*v0)++;
}
break;
@ -2088,7 +2088,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
if (IsScreenFadeDone()) {
if (ov77_021D6E78(param1->unk_1C, 0, param2)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 4, 1, HEAP_ID_76);
(*v0)++;
}
}
@ -2102,7 +2102,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
GXLayers_SwapDisplay();
ov77_021D3DC4(param1);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 4, 1, HEAP_ID_76);
(*v0)++;
}
}
@ -2113,7 +2113,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
if (IsScreenFadeDone()) {
if (param2 >= (2085 + 15 + 30)) {
if (ov77_021D6E78(param1->unk_1C, 1, param2)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 4, 1, HEAP_ID_76);
param1->unk_0C = 0;
(*v0)++;
}
@ -2139,7 +2139,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
Bg_ScheduleScroll(param1->unk_10, 5, 0, 60);
Bg_ScheduleScroll(param1->unk_10, 6, 0, 60);
Bg_ScheduleScroll(param1->unk_10, 7, 0, 60);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 16, 1, HEAP_ID_76);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 16, 1, HEAP_ID_76);
(*v0)++;
}
break;
@ -2147,7 +2147,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
ov77_021D6290(param1->unk_14, (16 << FX32_SHIFT));
if (IsScreenFadeDone()) {
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 16, 1, HEAP_ID_76);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 16, 1, HEAP_ID_76);
(*v0)++;
}
break;
@ -2162,7 +2162,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
if (param2 >= ((2200 + 15) + 1)) {
param1->unk_247 |= (1 << 0) | (1 << 4);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 6, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 6, 1, HEAP_ID_76);
(*v0)++;
}
}
@ -2448,7 +2448,7 @@ static void ov77_021D513C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
switch (param2) {
case (40 * 30 - 15):
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 4, 1, HEAP_ID_76);
break;
case ((40 * 30 - 15) + 6):
GF_ASSERT(IsScreenFadeDone() == TRUE);
@ -2464,16 +2464,16 @@ static void ov77_021D513C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37
case (((40 * 30 - 15) + 6) + 3):
v0 = ov77_021D40DC(param1, 1);
GF_ASSERT(v0 == 1);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 4, 1, HEAP_ID_76);
break;
case (47 * 30 - 15):
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 4, 1, HEAP_ID_76);
break;
case ((47 * 30 - 15) + 6):
GF_ASSERT(IsScreenFadeDone() == TRUE);
ov77_021D35B8(param0);
ov77_021D40B8(param1, 2);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 4, 1, HEAP_ID_76);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 4, 1, HEAP_ID_76);
break;
}
}
@ -2518,8 +2518,8 @@ static void ov77_021D52C8(UnkStruct_ov77_021D2E9C *param0)
param0->unk_298.unk_08 = param0->unk_0C;
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_WHITE);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_WHITE);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_WHITE);
G2_BlendNone();
@ -2551,14 +2551,14 @@ static BOOL ov77_021D5390(UnkStruct_ov77_021D5308 *param0, const int param1)
switch (*v0) {
case 0:
if (param1 >= (2285 - 15 - 65)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 30, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 30, 1, HEAP_ID_76);
(*v0)++;
}
break;
case 1:
if (IsScreenFadeDone()) {
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 90, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 90, 1, HEAP_ID_76);
(*v0)++;
}
break;
@ -2569,7 +2569,7 @@ static BOOL ov77_021D5390(UnkStruct_ov77_021D5308 *param0, const int param1)
break;
case 3:
if (param1 >= (2500 - 15 - 65)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 8, 1, HEAP_ID_76);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_76);
(*v0)++;
}

12
src/overlay079/ov79_021D0D80.c
View File

@ -129,8 +129,8 @@ static int ov79_021D0E1C(UnkStruct_ov79_021D0E1C *param0)
GX_SetVisiblePlane(0);
GXS_SetVisiblePlane(0);
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
ResetVisibleHardwareWindows(DS_SCREEN_SUB);
EnableTouchPad();
@ -142,7 +142,7 @@ static int ov79_021D0E1C(UnkStruct_ov79_021D0E1C *param0)
}
param0->unk_0C = 0;
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, param0->heapID);
break;
case 2:
ov79_021D21F8(param0);
@ -159,7 +159,7 @@ static int ov79_021D0E1C(UnkStruct_ov79_021D0E1C *param0)
}
param0->unk_0C = 0;
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, param0->heapID);
break;
case 4:
ov79_021D21F8(param0);
@ -175,8 +175,8 @@ static int ov79_021D0E1C(UnkStruct_ov79_021D0E1C *param0)
break;
case 6:
DisableTouchPad();
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
SetVBlankCallback(NULL, NULL);
GXLayers_DisableEngineALayers();
GXLayers_DisableEngineBLayers();

12
src/overlay079/ov79_021D2268.c
View File

@ -198,8 +198,8 @@ int ov79_021D22E4(ApplicationManager *appMan, int *param1)
GX_SetVisiblePlane(0);
GXS_SetVisiblePlane(0);
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
ResetVisibleHardwareWindows(DS_SCREEN_SUB);
break;
@ -216,7 +216,7 @@ int ov79_021D22E4(ApplicationManager *appMan, int *param1)
}
v0->unk_04 = 0;
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, v0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, v0->heapID);
break;
case 3:
if (!IsScreenFadeDone()) {
@ -229,7 +229,7 @@ int ov79_021D22E4(ApplicationManager *appMan, int *param1)
return 0;
}
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, v0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, v0->heapID);
break;
case 5:
if (!IsScreenFadeDone()) {
@ -244,8 +244,8 @@ int ov79_021D22E4(ApplicationManager *appMan, int *param1)
break;
case 7:
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
SetVBlankCallback(NULL, NULL);
GXLayers_DisableEngineALayers();
GXLayers_DisableEngineBLayers();

4
src/overlay080/ov80_021D0D80.c
View File

@ -518,8 +518,8 @@ static int ov80_021D13DC(UnkStruct_ov80_021D2A08 *param0)
{
if (IsScreenFadeDone()) {
G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_NONE, 31, 0);
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
ResetVisibleHardwareWindows(DS_SCREEN_MAIN);
ResetVisibleHardwareWindows(DS_SCREEN_SUB);
return 8;

16
src/overlay080/ov80_021D1458.c
View File

@ -194,7 +194,7 @@ int ov80_021D1550(UnkStruct_ov80_021D2A08 *param0)
{
param0->unk_14 = 0;
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_37, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_17, FADE_TYPE_UNK_37, COLOR_BLACK, 6, 1, param0->heapID);
Sound_PlayEffect(SEQ_SE_DP_MEKURU);
ResetScreenMasterBrightness(DS_SCREEN_MAIN);
ResetScreenMasterBrightness(DS_SCREEN_SUB);
@ -206,7 +206,7 @@ int ov80_021D1550(UnkStruct_ov80_021D2A08 *param0)
int ov80_021D159C(UnkStruct_ov80_021D2A08 *param0)
{
param0->unk_14 = 0;
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_36, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_UNK_16, FADE_TYPE_UNK_36, COLOR_BLACK, 6, 1, param0->heapID);
Sound_PlayEffect(SEQ_SE_DP_MEKURU2);
return 0;
}
@ -215,7 +215,7 @@ int ov80_021D15C8(UnkStruct_ov80_021D2A08 *param0)
{
param0->unk_14 = 0;
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_17, FADE_TYPE_UNK_17, COLOR_BLACK, 6, 1, param0->heapID);
Sound_PlayEffect(SEQ_SE_DP_MEKURU);
ResetScreenMasterBrightness(DS_SCREEN_MAIN);
@ -227,7 +227,7 @@ int ov80_021D1610(UnkStruct_ov80_021D2A08 *param0)
{
param0->unk_14 = 0;
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, FADE_TO_BLACK, 6, 1, param0->heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_UNK_16, FADE_TYPE_UNK_16, COLOR_BLACK, 6, 1, param0->heapID);
Sound_PlayEffect(SEQ_SE_DP_MEKURU2);
return 0;
@ -1107,7 +1107,7 @@ static void ov80_021D2774(SysTask *param0, void *param1)
Sprite_SetAnimateFlag(v1->unk_100, 0);
v0->unk_14 = 0;
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_UNK_13, FADE_TYPE_UNK_2, FADE_TO_BLACK, 8, 1, v0->heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_UNK_13, FADE_TYPE_UNK_2, COLOR_BLACK, 8, 1, v0->heapID);
v1->unk_04++;
break;
case 3:
@ -1125,7 +1125,7 @@ static void ov80_021D2774(SysTask *param0, void *param1)
ov80_021D19E4(v0);
v0->unk_14 = 0;
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_UNK_13, FADE_TYPE_UNK_5, FADE_TO_BLACK, 8, 1, v0->heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_UNK_13, FADE_TYPE_UNK_5, COLOR_BLACK, 8, 1, v0->heapID);
v1->unk_04++;
break;
case 4:
@ -1152,7 +1152,7 @@ static void ov80_021D28EC(SysTask *param0, void *param1)
switch (v1->unk_04) {
case 0:
v0->unk_14 = 0;
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_UNK_13, FADE_TYPE_UNK_2, FADE_TO_BLACK, 8, 1, v0->heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_UNK_13, FADE_TYPE_UNK_2, COLOR_BLACK, 8, 1, v0->heapID);
Sound_PlayEffect(SEQ_SE_DP_MEKURU3);
v1->unk_04++;
break;
@ -1166,7 +1166,7 @@ static void ov80_021D28EC(SysTask *param0, void *param1)
Bg_ScheduleTilemapTransfer(v0->unk_28, 4);
Bg_ScheduleTilemapTransfer(v0->unk_28, 5);
v0->unk_14 = 0;
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_UNK_13, FADE_TYPE_UNK_5, FADE_TO_BLACK, 8, 1, v0->heapID);
StartScreenFade(FADE_SUB_ONLY, FADE_TYPE_UNK_13, FADE_TYPE_UNK_5, COLOR_BLACK, 8, 1, v0->heapID);
v1->unk_04++;
break;
case 2:

6
src/overlay083/ov83_0223B5A0.c
View File

@ -547,7 +547,7 @@ static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
break;
}
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, param1->heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, param1->heapID);
(*param2)++;
break;
case 2:
@ -647,7 +647,7 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
param1->unk_31C = 0;
ov83_0223F730(&param1->unk_1478, 128, 144, param1->unk_1494.unk_58.unk_0C, param1->heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, param1->heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, param1->heapID);
(*param2)++;
break;
case 1:
@ -813,7 +813,7 @@ static int ov83_0223C258(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
}
break;
case 2:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, param1->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, param1->heapID);
(*param2)++;
break;
case 3:

2
src/overlay084/ov84_0223B5A0.c
View File

@ -408,7 +408,7 @@ int ov84_0223B5A0(ApplicationManager *appMan, int *param1)
v0->unk_00 = BgConfig_New(HEAP_ID_6);
v0->unk_425 = TrainerInfo_Gender(v0->unk_CC);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_3, FADE_TYPE_UNK_3, FADE_TO_BLACK, 6, 1, HEAP_ID_6);
StartScreenFade(FADE_MAIN_THEN_SUB, FADE_TYPE_UNK_3, FADE_TYPE_UNK_3, COLOR_BLACK, 6, 1, HEAP_ID_6);
SetAutorepeat(3, 8);
ov84_0223BEAC(v0);

4
src/overlay086/ov86_0223B140.c
View File

@ -400,7 +400,7 @@ static BOOL ov86_0223B3C8(UnkStruct_ov86_0223B3C8 *param0)
{
switch (param0->unk_00) {
case 0:
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 16, 1, HEAP_ID_63);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 16, 1, HEAP_ID_63);
param0->unk_00++;
break;
case 1:
@ -416,7 +416,7 @@ static BOOL ov86_0223B40C(UnkStruct_ov86_0223B3C8 *param0)
{
switch (param0->unk_00) {
case 0:
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 2, 1, HEAP_ID_63);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 2, 1, HEAP_ID_63);
Sound_FadeOutBGM(0, 30);
param0->unk_00++;
break;

4
src/overlay087/ov87_021D106C.c
View File

@ -154,7 +154,7 @@ static BOOL ov87_021D1210(UnkStruct_ov87_021D106C *param0, int *param1)
case 0:
ov87_021D139C(param0);
ov87_021D1818(param0);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_61);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_61);
(*param1)++;
break;
case 1:
@ -173,7 +173,7 @@ static BOOL ov87_021D1260(UnkStruct_ov87_021D106C *param0, int *param1)
switch (*param1) {
case 0:
Sound_PlayEffect(SEQ_SE_DP_PC_LOGOFF);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_61);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_61);
(*param1)++;
break;
case 1:

8
src/overlay088/ov88_0223B140.c
View File

@ -299,7 +299,7 @@ int ov88_0223B140(ApplicationManager *appMan, int *param1)
SetAutorepeat(4, 8);
ov88_0223C15C();
ov88_0223C17C(v0->unk_174);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 16, 1, HEAP_ID_26);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 16, 1, HEAP_ID_26);
ov88_0223C504(v0, v1);
SetVBlankCallback(ov88_0223C0E0, v0);
ov88_0223C63C();
@ -428,11 +428,11 @@ int ov88_0223B57C(ApplicationManager *appMan, int *param1)
ov88_0223CE74(v0);
break;
case 2:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 8, 1, HEAP_ID_26);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_26);
*param1 = 2;
break;
case 3:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 8, 1, HEAP_ID_26);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_26);
v0->unk_48 = 4;
break;
case 4:
@ -463,7 +463,7 @@ int ov88_0223B57C(ApplicationManager *appMan, int *param1)
}
break;
case 6:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 8, 1, HEAP_ID_26);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 8, 1, HEAP_ID_26);
v0->unk_48 = 7;
break;
case 7:

4
src/overlay090/ov90_021D0D80.c
View File

@ -158,7 +158,7 @@ int ov90_021D0E04(ApplicationManager *appMan, int *param1)
break;
}
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, v1->heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, v1->heapID);
(*param1)++;
break;
case 1:
@ -179,7 +179,7 @@ int ov90_021D0E04(ApplicationManager *appMan, int *param1)
break;
}
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, v1->heapID);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, v1->heapID);
(*param1)++;
break;
case 3:

4
src/overlay092/ov92_021D0D80.c
View File

@ -373,7 +373,7 @@ int ov92_021D0EB8(ApplicationManager *appMan, int *param1)
v0->unk_BAEC = 0;
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, v0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, v0->heapID);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
@ -642,7 +642,7 @@ int ov92_021D0EB8(ApplicationManager *appMan, int *param1)
} break;
case 17:
v0->unk_BAEC = 0;
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, v0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, v0->heapID);
*param1 = 18;
break;
case 18:

12
src/overlay094/ov94_0223C610.c
View File

@ -87,7 +87,7 @@ int ov94_0223C610(UnkStruct_ov94_0223FD4C *param0, int param1)
if (param0->unk_34 == 0) {
ov94_0223C85C(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
param0->unk_2C = 0;
param0->unk_34 = 1;
@ -95,9 +95,9 @@ int ov94_0223C610(UnkStruct_ov94_0223FD4C *param0, int param1)
ov94_02243FA8(param0, TrainerInfo_Gender(param0->unk_00->unk_1C));
} else {
if (param0->unk_1110 == 1) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
} else {
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
}
param0->unk_2C = 5;
@ -384,7 +384,7 @@ static int ov94_0223CB90(UnkStruct_ov94_0223FD4C *param0)
static int ov94_0223CBA0(UnkStruct_ov94_0223FD4C *param0)
{
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
param0->unk_2C = 3;
return 3;
@ -498,9 +498,9 @@ static int ov94_0223CE00(UnkStruct_ov94_0223FD4C *param0)
static int ov94_0223CE14(UnkStruct_ov94_0223FD4C *param0)
{
if (param0->unk_18 == 0) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
} else {
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
}
param0->unk_2C = 0;

4
src/overlay094/ov94_0223D0C4.c
View File

@ -86,7 +86,7 @@ int ov94_0223D0C4(UnkStruct_ov94_0223FD4C *param0, int param1)
ov94_02242368(param0->unk_B90, param0->unk_B94, param0->unk_B8C, &param0->unk_FCC[7], param0->unk_12C.unk_F0.species, param0->unk_12C.unk_F0.gender, ov94_02242970(param0->unk_12C.unk_F0.level, param0->unk_12C.unk_F0.level2, 0));
ov94_0223DB2C((Pokemon *)param0->unk_12C.unk_00.unk_00);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
param0->unk_2C = 0;
@ -361,7 +361,7 @@ static int ov94_0223D5B8(UnkStruct_ov94_0223FD4C *param0)
static int ov94_0223D618(UnkStruct_ov94_0223FD4C *param0)
{
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
param0->unk_2C = 0;
return 4;

4
src/overlay094/ov94_0223DC04.c
View File

@ -81,7 +81,7 @@ int ov94_0223DC04(UnkStruct_ov94_0223FD4C *param0, int param1)
ov94_0223E358(param0->unk_B90, &param0->unk_FCC[7]);
ov94_0223E240(param0);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
param0->unk_2C = 0;
return 2;
@ -361,7 +361,7 @@ static int ov94_0223E0A4(UnkStruct_ov94_0223FD4C *param0)
static int ov94_0223E188(UnkStruct_ov94_0223FD4C *param0)
{
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
param0->unk_2C = 0;
return 4;

4
src/overlay094/ov94_0223E46C.c
View File

@ -143,7 +143,7 @@ int ov94_0223E46C(UnkStruct_ov94_0223FD4C *param0, int param1)
ov94_022422B8(&param0->unk_FCC[5], param0->unk_B90, ov94_02242970(param0->unk_B7A.level, param0->unk_B7A.level2, 1), 0, 0, TEXT_COLOR(1, 2, 0), 1);
ov94_0224218C(&param0->unk_10AC[1], param0->unk_BA0, param0->unk_B90, param0->unk_11B0, 0, 0, TEXT_COLOR(1, 2, 0));
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
param0->unk_2C = 0;
return 2;
@ -731,7 +731,7 @@ static void ov94_0223EFAC(UnkStruct_ov94_0223FD4C *param0)
static int ov94_0223F0A8(UnkStruct_ov94_0223FD4C *param0)
{
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
param0->unk_2C = 0;

8
src/overlay094/ov94_0223FB48.c
View File

@ -123,9 +123,9 @@ int ov94_0223FB48(UnkStruct_ov94_0223FD4C *param0, int param1)
ov94_0223FE24(param0);
if (param0->unk_20 == 8) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
} else {
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
}
ov94_02240FA0(param0, param0->unk_110);
@ -857,10 +857,10 @@ static int ov94_022408E8(UnkStruct_ov94_0223FD4C *param0)
static int ov94_02240A6C(UnkStruct_ov94_0223FD4C *param0)
{
if ((param0->unk_18 == 0) || (param0->unk_18 == 8)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
param0->unk_1110 = 1;
} else {
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
}
param0->unk_2C = 0;

6
src/overlay094/ov94_022414B8.c
View File

@ -285,7 +285,7 @@ int ov94_022414B8(UnkStruct_ov94_0223FD4C *param0, int param1)
ov94_0224170C(param0);
ov94_022417A0(param0);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
ov94_02245934(param0);
ov94_022422D4(param0->unk_B90, param0->unk_B94, param0->unk_B8C, &param0->unk_FCC[0], 0, 3, -1);
@ -802,10 +802,10 @@ static int ov94_0224208C(UnkStruct_ov94_0223FD4C *param0)
static int ov94_022420E4(UnkStruct_ov94_0223FD4C *param0)
{
if (param0->unk_18 == 0) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
param0->unk_1110 = 1;
} else {
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
}
param0->unk_2C = 0;

6
src/overlay094/ov94_02242AD0.c
View File

@ -161,7 +161,7 @@ int ov94_02242AD0(UnkStruct_ov94_0223FD4C *param0, int param1)
ov94_02242CAC(param0);
ov94_02242D38(param0);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
ov94_02245934(param0);
param0->unk_2C = 0;
@ -1216,9 +1216,9 @@ static int ov94_02243A90(UnkStruct_ov94_0223FD4C *param0)
sub_02039794();
if (param0->unk_1110 == 1) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
} else {
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
}
param0->unk_2C = 0;

4
src/overlay094/ov94_02244950.c
View File

@ -97,7 +97,7 @@ static int (*Unk_ov94_02246A40[])(UnkStruct_ov94_0223FD4C *) = {
int ov94_02244950(UnkStruct_ov94_0223FD4C *param0, int param1)
{
ov94_02244F2C(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_62);
ov94_02244A7C(param0->unk_04);
ov94_02244B8C(param0);
@ -753,7 +753,7 @@ static int ov94_02245594(UnkStruct_ov94_0223FD4C *param0)
{
sub_02039794();
ov94_0223C5F4(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_62);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_62);
param0->unk_2C = 0;
param0->unk_1110 = 1;

4
src/overlay095/ov95_02247B6C.c
View File

@ -285,7 +285,7 @@ static int ov95_02247CB4(UnkStruct_ov95_02247C6C *param0, int *param1)
sub_02039734();
sub_020397C8(1, HEAP_ID_57);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 16, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 16, 1, HEAP_ID_58);
return 1;
}
@ -405,7 +405,7 @@ static int ov95_02248090(UnkStruct_ov95_02247C6C *param0, int *param1)
break;
case 3:
if ((ov95_0224847C(param0) >= 2) || (ov95_0224846C(param0) == 1)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 24, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 24, 1, HEAP_ID_58);
(*param1)++;
}
break;

4
src/overlay095/ov95_02248590.c
View File

@ -300,7 +300,7 @@ static int ov95_022486AC(UnkStruct_ov95_02248688 *param0, int *param1)
ov95_022488A4(param0);
ov95_02248B84(param0);
ov95_02248CA8(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 8, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 8, 1, HEAP_ID_58);
return 1;
}
@ -394,7 +394,7 @@ static int ov95_022487D4(UnkStruct_ov95_02248688 *param0, int *param1)
}
if (ov95_022494F4(param0->unk_160)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 4, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 4, 1, HEAP_ID_58);
(*param1)++;
}
break;

4
src/overlay095/ov95_02249740.c
View File

@ -193,7 +193,7 @@ static int ov95_022497F8(UnkStruct_ov95_022497D8 *param0, int *param1)
param0->unk_0C = 0;
SysTask_ExecuteAfterVBlank(ov95_02249F38, param0, 0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 3, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 3, 1, HEAP_ID_58);
return 1;
}
@ -223,7 +223,7 @@ static int ov95_02249840(UnkStruct_ov95_022497D8 *param0, int *param1)
break;
case 3:
if (Sprite_IsAnimated(param0->unk_20[0]) == 0) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 16, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 16, 1, HEAP_ID_58);
(*param1)++;
}
break;

4
src/overlay095/ov95_02249F90.c
View File

@ -96,7 +96,7 @@ BOOL ov95_02249FC8(void *param0, int *param1)
static int ov95_02249FF8(UnkStruct_ov95_02249FF8 *param0, int *param1)
{
ov95_0224A10C(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 8, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 8, 1, HEAP_ID_58);
return 1;
}
@ -119,7 +119,7 @@ static int ov95_0224A020(UnkStruct_ov95_02249FF8 *param0, int *param1)
case 1:
if (param0->unk_20) {
Sound_PlayEffect(SEQ_SE_DP_KOUKAN03);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 16, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 16, 1, HEAP_ID_58);
(*param1)++;
}
break;

4
src/overlay095/ov95_0224A390.c
View File

@ -177,7 +177,7 @@ static int ov95_0224A42C(UnkStruct_ov95_0224A42C *param0, int *param1)
ov95_0224A690(param0);
ov95_0224A7B0(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 8, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 8, 1, HEAP_ID_58);
return 1;
}
@ -202,7 +202,7 @@ static int ov95_0224A464(UnkStruct_ov95_0224A42C *param0, int *param1)
break;
case 2:
if (ov95_0224A924(&(param0->unk_34))) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 16, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 16, 1, HEAP_ID_58);
(*param1)++;
}
break;

4
src/overlay095/ov95_0224ABC0.c
View File

@ -208,7 +208,7 @@ static int ov95_0224AC98(UnkStruct_ov95_0224AC64 *param0, int *param1)
{
ov95_0224AE1C(param0);
ov95_0224B084(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 8, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 8, 1, HEAP_ID_58);
return 1;
}
@ -271,7 +271,7 @@ static int ov95_0224AD98(UnkStruct_ov95_0224AC64 *param0, int *param1)
break;
case 1:
if (++(param0->unk_08) > 13) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 8, 1, HEAP_ID_58);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_58);
(*param1)++;
}
break;

4
src/overlay095/ov95_0224B3D8.c
View File

@ -312,7 +312,7 @@ static int ov95_0224B520(UnkStruct_ov95_0224B4D4 *param0, int *param1)
GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1);
G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_PLANEMASK_BG2, 16, 0);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 16, 1, HEAP_ID_58);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 16, 1, HEAP_ID_58);
return 1;
}
@ -436,7 +436,7 @@ static int ov95_0224B81C(UnkStruct_ov95_0224B4D4 *param0, int *param1)
break;
case 4:
if (++(param0->unk_08) > 10) {
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 16, 1, HEAP_ID_58);
StartScreenFade(FADE_MAIN_ONLY, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 16, 1, HEAP_ID_58);
(*param1)++;
}
break;

4
src/overlay096/ov96_0223BCE0.c
View File

@ -177,7 +177,7 @@ static int (*Unk_ov96_0223DCE0[])(UnkStruct_ov96_0223BF40 *) = {
int ov96_0223BCE0(UnkStruct_ov96_0223BF40 *param0, int param1)
{
ov96_0223C358(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 8, 1, HEAP_ID_68);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 8, 1, HEAP_ID_68);
ov96_0223BE38(param0->unk_04);
ov96_0223BF40(param0);
ov96_0223C1FC(param0);
@ -1429,7 +1429,7 @@ static int ov96_0223D528(UnkStruct_ov96_0223BF40 *param0)
{
sub_02039794();
sub_0203848C();
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 8, 1, HEAP_ID_68);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_68);
param0->unk_1C = 0;

4
src/overlay097/gba_migrator.c
View File

@ -1829,8 +1829,8 @@ static int GBAMigrator_Init(ApplicationManager *appMan, int *state)
migrator->bgConfig = BgConfig_New(HEAP_ID_MIGRATE_FROM_GBA);
migrator->unk_E8EC = sub_02015920(HEAP_ID_MIGRATE_FROM_GBA);
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
migrator->saveData = ((ApplicationArgs *)ApplicationManager_Args(appMan))->saveData;
migrator->unk_14 = SaveData_GetTrainerInfo(migrator->saveData);

4
src/overlay097/main_menu.c
View File

@ -1123,8 +1123,8 @@ static int MainMenu_Init(ApplicationManager *appMan, int *unused)
memset(appData, 0, sizeof(MainMenuAppData));
appData->bgConfig = BgConfig_New(HEAP_ID_MAIN_MENU);
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
appData->saveData = ((ApplicationArgs *)ApplicationManager_Args(appMan))->saveData;
appData->mysteryGift = SaveData_GetMysteryGift(appData->saveData);

4
src/overlay097/main_menu_util.c
View File

@ -93,8 +93,8 @@ void *MainMenuUtil_InitAppAndFadeToBlack(ApplicationManager *appMan, enum HeapId
memset(newAppData, 0, appDataSize);
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
return newAppData;
}

4
src/overlay097/mystery_gift_app.c
View File

@ -1175,8 +1175,8 @@ static int MysteryGiftApp_Init(ApplicationManager *appMan, int *unused)
ov97_02232054();
SetupGraphics(appData->bgConfig);
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
Sound_SetSceneAndPlayBGM(SOUND_SCENE_10, SEQ_PRESENT, 1);
DistributionCartridge_UseHeap(HEAP_ID_MYSTERY_GIFT_APP);

4
src/overlay097/wonder_cards_app.c
View File

@ -1202,8 +1202,8 @@ static BOOL WonderCardsApp_Init(ApplicationManager *appMan, int *unused)
appData->bgConfig = BgConfig_New(HEAP_ID_WONDER_CARDS_APP);
appData->heapID = HEAP_ID_WONDER_CARDS_APP;
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
appData->selectedWondercardSlot = NUM_WONDERCARD_SLOTS - 1;
appData->numPlayerConnections = 1;

4
src/overlay098/ov98_022471C8.c
View File

@ -344,7 +344,7 @@ int ov98_022471C8(ApplicationManager *appMan, int *param1)
ov98_02246E9C(v0->unk_00, 0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_109);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_109);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1);
@ -1911,7 +1911,7 @@ static int ov98_02249464(UnkStruct_ov98_02247704 *param0)
sub_02039794();
ov98_02247B0C(param0);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_109);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_109);
param0->unk_08 = 0;

2
src/overlay099/ov99_021D0D80.c
View File

@ -189,7 +189,7 @@ int ov99_021D1028(ApplicationManager *appMan, int *param1)
if (v0->unk_00->unk_04 && (gSystem.pressedKeys & PAD_BUTTON_START)) {
if ((v0->unk_1100 == 0) && (v0->unk_1101 < 6)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_75);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_75);
v0->unk_1100 = 1;
}
}

4
src/overlay099/ov99_021D3DE0.c
View File

@ -16,13 +16,13 @@ BOOL ov99_021D3DE0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *par
switch (param1->unk_00) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 30, 1, HEAP_ID_75);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 30, 1, HEAP_ID_75);
param1->unk_00++;
break;
case 1:
if (IsScreenFadeDone() == TRUE) {
if ((param0->unk_10FC > 10080) || (gSystem.pressedKeys & PAD_BUTTON_A) || (gSystem.pressedKeys & PAD_BUTTON_START)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 45, 1, HEAP_ID_75);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 45, 1, HEAP_ID_75);
param1->unk_00++;
}
}

2
src/overlay100/ov100_021D0D80.c
View File

@ -54,7 +54,7 @@ int ov100_021D0D80(ApplicationManager *appMan, int *param1)
v0->unk_D0 = ApplicationManager_Args(appMan);
ov100_021D1034(&v0->unk_0C);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6 * 2, 1, HEAP_ID_111);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6 * 2, 1, HEAP_ID_111);
SetVBlankCallback(ov100_021D13B4, v0);
v0->unk_0C.unk_50.unk_00 = 31;

4
src/overlay100/ov100_021D13E4.c
View File

@ -102,7 +102,7 @@ BOOL ov100_021D14A8(void *param0)
switch (v0->unk_00) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, HEAP_ID_111);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, HEAP_ID_111);
v0->unk_00++;
case 1:
if (IsScreenFadeDone() == FALSE) {
@ -166,7 +166,7 @@ BOOL ov100_021D14A8(void *param0)
if ((++v0->unk_7C4->unk_50.unk_03) != (+16)) {
G2S_SetBlendBrightness((GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), v0->unk_7C4->unk_50.unk_03);
} else {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_WHITE, 1, 1, HEAP_ID_111);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_WHITE, 1, 1, HEAP_ID_111);
v0->unk_00 = 0;
return 0;
}

4
src/overlay100/ov100_021D1C44.c
View File

@ -303,7 +303,7 @@ BOOL ov100_021D2428(void *param0)
switch (v0->unk_00) {
case 0:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_WHITE, 6, 1, HEAP_ID_111);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_WHITE, 6, 1, HEAP_ID_111);
v0->unk_1EBC->unk_50.unk_03 = 0;
G2_SetBlendBrightness((GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), v0->unk_1EBC->unk_50.unk_03);
G2S_SetBlendBrightness((GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), v0->unk_1EBC->unk_50.unk_03);
@ -642,7 +642,7 @@ BOOL ov100_021D2428(void *param0)
}
break;
case 20:
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 1, 1, HEAP_ID_111);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 1, 1, HEAP_ID_111);
v0->unk_00++;
case 21:
if (IsScreenFadeDone() == FALSE) {

2
src/overlay100/ov100_021D2F0C.c
View File

@ -640,7 +640,7 @@ BOOL ov100_021D39E4(void *param0)
Easy3DObject_SetScale(&v0->unk_0C.unk_934[0].unk_00, v0->unk_0C.unk_934[0].unk_150, FX32_CONST(1.0), v0->unk_0C.unk_934[0].unk_150);
Easy3DObject_SetScale(&v0->unk_0C.unk_934[1].unk_00, v0->unk_0C.unk_934[1].unk_150, FX32_CONST(1.0), v0->unk_0C.unk_934[1].unk_150);
} else {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, HEAP_ID_111);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, HEAP_ID_111);
v0->unk_00++;
}
break;

4
src/overlay101/ov101_021D0D80.c
View File

@ -105,7 +105,7 @@ int ov101_021D0D80(ApplicationManager *appMan, int *param1)
ov101_021D5C28(v1);
Sound_SetSceneAndPlayBGM(SOUND_SCENE_SUB_66, SEQ_NONE, 0);
ov101_021D18C0(v1);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 8, 1, HEAP_ID_79);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 8, 1, HEAP_ID_79);
return 1;
}
@ -124,7 +124,7 @@ int ov101_021D0E40(ApplicationManager *appMan, int *param1)
case 1:
if (ov101_021D1AAC(v1) == 1) {
(*param1)++;
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 8, 1, HEAP_ID_79);
StartScreenFade(FADE_SUB_THEN_MAIN, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 8, 1, HEAP_ID_79);
ov101_021D1894(v1, UnkEnum_ov101_021D1894_00);
}
break;

8
src/overlay102/ov102_021D0D80.c
View File

@ -69,8 +69,8 @@ int ov102_021D0D80(ApplicationManager *appMan, int *param1)
v0->unk_0C = SaveData_GetTrainerInfo(v0->saveData);
}
SetScreenColorBrightness(DS_SCREEN_MAIN, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, FADE_TO_BLACK);
SetScreenColorBrightness(DS_SCREEN_MAIN, COLOR_BLACK);
SetScreenColorBrightness(DS_SCREEN_SUB, COLOR_BLACK);
SetVBlankCallback(NULL, NULL);
SetHBlankCallback(NULL, NULL);
GXLayers_DisableEngineALayers();
@ -113,7 +113,7 @@ int ov102_021D0E2C(ApplicationManager *appMan, int *param1)
;
Bg_ToggleLayer(BG_LAYER_SUB_3, 1);
;
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, FADE_TO_BLACK, 6, 1, v0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_IN, FADE_TYPE_BRIGHTNESS_IN, COLOR_BLACK, 6, 1, v0->heapID);
*param1 = 1;
break;
case 1:
@ -141,7 +141,7 @@ int ov102_021D0E2C(ApplicationManager *appMan, int *param1)
break;
case 4:
if (((gSystem.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) || ((gSystem.pressedKeys & PAD_BUTTON_B) == PAD_BUTTON_B) || (gSystem.touchPressed)) {
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, FADE_TO_BLACK, 6, 1, v0->heapID);
StartScreenFade(FADE_BOTH_SCREENS, FADE_TYPE_BRIGHTNESS_OUT, FADE_TYPE_BRIGHTNESS_OUT, COLOR_BLACK, 6, 1, v0->heapID);
*param1 = 5;
}
break;

Some files were not shown because too many files have changed in this diff Show More