Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn OW_FRLG_WHITEOUT into OW_WHITEOUT_CUTSCENE and make it generational (#6962)

Browse Source
This commit is contained in:
kittenchilly 2025-07-14 06:08:14 -05:00 committed by GitHub
parent 5c2980b906
commit b62e4924a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/config/overworld.h
View File

@ -9,7 +9,7 @@
#define OW_POISON_DAMAGE GEN_LATEST // In Gen4, Pokémon no longer faint from Poison in the overworld. In Gen5+, they no longer take damage at all.
#define OW_DOUBLE_APPROACH_WITH_ONE_MON FALSE // If enabled, you can be spotted by two trainers at the same time even if you only have one eligible Pokémon in your party.
#define OW_HIDE_REPEAT_MAP_POPUP FALSE // If enabled, map popups will not appear if entering a map with the same Map Section Id as the last.
#define OW_FRLG_WHITEOUT FALSE // If enabled, shows an additional whiteout message and post whiteout event script with healing NPC.
#define OW_WHITEOUT_CUTSCENE GEN_LATEST // In Gen4+, whiting out shows an additional message and post whiteout event script cutscene with a healing NPC. (While this change was also in FRLG, for the sake of simplicity, setting this to GEN_3 will result in RSE behavior.)
#define OW_DEFOG_FIELD_MOVE FALSE // If enabled, Defog can be used as a Field Move as seen in DPPt.
// Item Obtain Description Box

24
src/field_screen_effect.c
View File

@ -1384,10 +1384,10 @@ static bool32 PrintWhiteOutRecoveryMessage(u8 taskId, const u8 *text, u32 x, u32
}
enum {
FRLG_WHITEOUT_ENTER_MSG_SCREEN,
FRLG_WHITEOUT_PRINT_MSG,
FRLG_WHITEOUT_LEAVE_MSG_SCREEN,
FRLG_WHITEOUT_HEAL_SCRIPT,
WHITEOUT_CUTSCENE_ENTER_MSG_SCREEN,
WHITEOUT_CUTSCENE_PRINT_MSG,
WHITEOUT_CUTSCENE_LEAVE_MSG_SCREEN,
WHITEOUT_CUTSCENE_HEAL_SCRIPT,
};
static const u8 *GenerateRecoveryMessage(u8 taskId)
@ -1411,7 +1411,7 @@ static void Task_RushInjuredPokemonToCenter(u8 taskId)
switch (gTasks[taskId].tState)
{
case FRLG_WHITEOUT_ENTER_MSG_SCREEN:
case WHITEOUT_CUTSCENE_ENTER_MSG_SCREEN:
windowId = AddWindow(&sWindowTemplate_WhiteoutText);
gTasks[taskId].tWindowId = windowId;
Menu_LoadStdPalAt(BG_PLTT_ID(15));
@ -1420,28 +1420,28 @@ static void Task_RushInjuredPokemonToCenter(u8 taskId)
CopyWindowToVram(windowId, COPYWIN_FULL);
gTasks[taskId].tIsPlayerHouse = IsLastHealLocationPlayerHouse();
gTasks[taskId].tState = FRLG_WHITEOUT_PRINT_MSG;
gTasks[taskId].tState = WHITEOUT_CUTSCENE_PRINT_MSG;
break;
case FRLG_WHITEOUT_PRINT_MSG:
case WHITEOUT_CUTSCENE_PRINT_MSG:
{
const u8 *recoveryMessage = GenerateRecoveryMessage(taskId);
if (PrintWhiteOutRecoveryMessage(taskId, recoveryMessage, 2, 8))
{
ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_NORTH);
gTasks[taskId].tState = FRLG_WHITEOUT_LEAVE_MSG_SCREEN;
gTasks[taskId].tState = WHITEOUT_CUTSCENE_LEAVE_MSG_SCREEN;
}
break;
}
case FRLG_WHITEOUT_LEAVE_MSG_SCREEN:
case WHITEOUT_CUTSCENE_LEAVE_MSG_SCREEN:
windowId = gTasks[taskId].tWindowId;
ClearWindowTilemap(windowId);
CopyWindowToVram(windowId, COPYWIN_MAP);
RemoveWindow(windowId);
FadeInFromBlack();
gTasks[taskId].tState = FRLG_WHITEOUT_HEAL_SCRIPT;
gTasks[taskId].tState = WHITEOUT_CUTSCENE_HEAL_SCRIPT;
break;
case FRLG_WHITEOUT_HEAL_SCRIPT:
case WHITEOUT_CUTSCENE_HEAL_SCRIPT:
if (WaitForWeatherFadeIn() == TRUE)
{
DestroyTask(taskId);
@ -1461,7 +1461,7 @@ void FieldCB_RushInjuredPokemonToCenter(void)
LockPlayerFieldControls();
FillPalBufferBlack();
taskId = CreateTask(Task_RushInjuredPokemonToCenter, 10);
gTasks[taskId].tState = FRLG_WHITEOUT_ENTER_MSG_SCREEN;
gTasks[taskId].tState = WHITEOUT_CUTSCENE_ENTER_MSG_SCREEN;
}
static void GetStairsMovementDirection(u32 metatileBehavior, s16 *speedX, s16 *speedY)

8
src/overworld.c
View File

@ -707,16 +707,16 @@ void SetWarpDestinationToHealLocation(u8 healLocationId)
SetWarpDestination(healLocation->mapGroup, healLocation->mapNum, WARP_ID_NONE, healLocation->x, healLocation->y);
}
static bool32 IsFRLGWhiteout(void)
static bool32 IsWhiteoutCutscene(void)
{
if (!OW_FRLG_WHITEOUT)
if (OW_WHITEOUT_CUTSCENE < GEN_4)
return FALSE;
return GetHealNpcLocalId(GetHealLocationIndexByWarpData(&gSaveBlock1Ptr->lastHealLocation)) > 0;
}
void SetWarpDestinationToLastHealLocation(void)
{
if (IsFRLGWhiteout())
if (IsWhiteoutCutscene())
SetWhiteoutRespawnWarpAndHealerNPC(&sWarpDestination);
else
sWarpDestination = gSaveBlock1Ptr->lastHealLocation;
@ -1810,7 +1810,7 @@ void CB2_WhiteOut(void)
ResetInitialPlayerAvatarState();
ScriptContext_Init();
UnlockPlayerFieldControls();
if (IsFRLGWhiteout())
if (IsWhiteoutCutscene())
gFieldCallback = FieldCB_RushInjuredPokemonToCenter;
else
gFieldCallback = FieldCB_WarpExitFadeFromBlack;

4
src/strings.c
View File

@ -809,8 +809,8 @@ const u8 gText_ThankYou[] = _("THANK YOU");
const u8 gText_ByeBye[] = _("BYE-BYE!");
const u8 gText_PlayerScurriedToCenter[] = _("{PLAYER} scurried to a POKéMON CENTER,\nprotecting the exhausted and fainted\nPOKéMON from further harm…\p");
const u8 gText_PlayerScurriedBackHome[] = _("{PLAYER} scurried back home, protecting\nthe exhausted and fainted POKéMON from\nfurther harm…\p");
const u8 gText_PlayerRegroupCenter[] = _("{PLAYER} went running back to a POKéMON CENTER\nto regroup and reconsider their battle\lstrategy…\p");
const u8 gText_PlayerRegroupHome[] = _("{PLAYER} went running back home to regroup\nand reconsider their battle strategy…\p");
const u8 gText_PlayerRegroupCenter[] = _("{PLAYER} scurried to a POKéMON CENTER,\nto regroup and reconsider the battle\nstrategy…\p");
const u8 gText_PlayerRegroupHome[] = _("{PLAYER} scurried back home, to regroup\nand reconsider the battle strategy…\p");
const u8 gText_HatchedFromEgg[] = _("{STR_VAR_1} hatched from the EGG!");
const u8 gText_NicknameHatchPrompt[] = _("Would you like to nickname the newly\nhatched {STR_VAR_1}?");
ALIGNED(4) const u8 gText_ReadyPickBerry[] = _("Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p");