Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-08-02 17:57:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use FADE_TO_BLACK define in other files

Browse Source
This commit is contained in:
PikalaxALT 2020-03-09 09:43:37 -04:00
parent 884c000028
commit 6676e5bcb8
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/credits.c
View File

@ -15,6 +15,7 @@
#include "sound.h"
#include "constants/species.h"
#include "constants/maps.h"
#include "constants/field_weather.h"
#if defined(FIRERED)
#define TITLE_TEXT gString_PokemonFireRed_Staff
@ -918,7 +919,7 @@ static s32 RollCredits(void)
case CREDITSSCRCMD_MON:
sCreditsMgr->mainseqno = CREDITSSCENE_MON_DESTROY_ASSETS;
sCreditsMgr->whichMon = sCreditsScript[sCreditsMgr->scrcmdidx].param;
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
break;
case CREDITSSCRCMD_THEENDGFX:
sCreditsMgr->mainseqno = CREDITSSCENE_THEEND_DESTROY_ASSETS;

11
src/item_use.c
View File

@ -41,6 +41,7 @@
#include "constants/maps.h"
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/field_weather.h"
static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL;
@ -456,7 +457,7 @@ void FieldUseFunc_TmCase(u8 taskId)
else
{
StopPokemonLeagueLightingEffectTask();
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = Task_InitTMCaseFromField;
}
}
@ -487,7 +488,7 @@ void FieldUseFunc_BerryPouch(u8 taskId)
else
{
StopPokemonLeagueLightingEffectTask();
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = Task_InitBerryPouchFromField;
}
}
@ -530,7 +531,7 @@ void FieldUseFunc_TeachyTv(u8 taskId)
else
{
StopPokemonLeagueLightingEffectTask();
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = Task_InitTeachyTvFromField;
}
}
@ -660,7 +661,7 @@ void FieldUseFunc_TownMap(u8 taskId)
else
{
StopPokemonLeagueLightingEffectTask();
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = sub_80A1CC0;
}
}
@ -692,7 +693,7 @@ void FieldUseFunc_FameChecker(u8 taskId)
else
{
StopPokemonLeagueLightingEffectTask();
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = sub_80A1D68;
}
}

9
src/player_pc.c
View File

@ -23,6 +23,7 @@
#include "party_menu.h"
#include "constants/items.h"
#include "constants/songs.h"
#include "constants/field_weather.h"
#define PC_ITEM_ID 0
#define PC_QUANTITY 1
@ -331,7 +332,7 @@ static void Task_DepositItem_WaitFadeAndGoToBag(u8 taskId)
static void Task_PlayerPcDepositItem(u8 taskId)
{
gTasks[taskId].func = Task_DepositItem_WaitFadeAndGoToBag;
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
}
static void Task_ReturnToItemStorageSubmenu(u8 taskId)
@ -394,7 +395,7 @@ static void Task_WithdrawItemBeginFade(u8 taskId)
{
gTasks[taskId].func = Task_WithdrawItem_WaitFadeAndGoToItemStorage;
ItemPc_SetInitializedFlag(0);
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
}
static void Task_PlayerPcCancel(u8 taskId)
@ -556,7 +557,7 @@ static void Task_MailSubmenuHandleInput(u8 taskId)
static void Task_PlayerPcReadMail(u8 taskId)
{
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = Task_WaitFadeAndReadSelectedMail;
}
@ -663,7 +664,7 @@ static void Task_PlayerPcGiveMailToMon(u8 taskId)
}
else
{
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = Task_WaitFadeAndGoToPartyMenu;
}
}

9
src/quest_log.c
View File

@ -42,6 +42,7 @@
#include "constants/trainer_classes.h"
#include "constants/species.h"
#include "constants/items.h"
#include "constants/field_weather.h"
u8 gUnknown_3005E88;
@ -152,7 +153,7 @@ static u8 sub_8111BD4(void);
static void DrawQuestLogSceneDescription(void);
static void sub_8111D90(u8);
static void QuestLog_CloseTextWindow(void);
static void QuestLog_SkipToEndOfPlayback(s8);
static void QuestLog_SkipToEndOfPlayback(s8 delay);
static void QuestLog_WaitFadeAndCancelPlayback(void);
static bool8 sub_8111F60(void);
static void sub_8111F8C(u8);
@ -920,7 +921,7 @@ static void sub_811175C(u8 sceneNum, struct UnkStruct_203AE98 * a1)
static void sub_81118F4(s8 a0)
{
FadeScreen(1, a0);
FadeScreen(FADE_TO_BLACK, a0);
sQuestLogCB = QuestLog_AdvancePlayhead;
}
@ -1178,9 +1179,9 @@ static void QuestLog_CloseTextWindow(void)
CopyWindowToVram(gUnknown_203ADFE[1], 1);
}
static void QuestLog_SkipToEndOfPlayback(s8 a0)
static void QuestLog_SkipToEndOfPlayback(s8 delay)
{
FadeScreen(1, a0);
FadeScreen(FADE_TO_BLACK, delay);
sQuestLogCB = QuestLog_WaitFadeAndCancelPlayback;
}

5
src/shop.c
View File

@ -36,6 +36,7 @@
#include "constants/songs.h"
#include "constants/items.h"
#include "constants/game_stat.h"
#include "constants/field_weather.h"
#define tItemCount data[1]
#define tItemId data[5]
@ -292,14 +293,14 @@ static void Task_ShopMenu(u8 taskId)
static void Task_HandleShopMenuBuy(u8 taskId)
{
SetWordTaskArg(taskId, 0xE, (u32)CB2_InitBuyMenu);
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = Task_GoToBuyOrSellMenu;
}
static void Task_HandleShopMenuSell(u8 taskId)
{
SetWordTaskArg(taskId, 0xE, (u32)CB2_GoToSellMenu);
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
gTasks[taskId].func = Task_GoToBuyOrSellMenu;
}

3
src/start_menu.c
View File

@ -39,6 +39,7 @@
#include "help_system.h"
#include "constants/songs.h"
#include "constants/flags.h"
#include "constants/field_weather.h"
enum StartMenuOption
{
@ -446,7 +447,7 @@ static void StartMenu_FadeScreenIfLeavingOverworld(void)
&& sStartMenuCallback != StartMenuSafariZoneRetireCallback)
{
StopPokemonLeagueLightingEffectTask();
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
}
}