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

Remove shadow and hide follower on stair warp (#7368)

Browse Source
This commit is contained in:
cornixsenex 2025-08-08 02:22:42 -07:00 committed by GitHub
parent 0b299b3ffd
commit 80a3a3b7ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/field_effect.h
View File

@ -37,6 +37,7 @@ bool8 FieldEffectCmd_loadgfx_callnative(u8 **script, u32 *val);
bool8 FieldEffectCmd_loadtiles_callnative(u8 **script, u32 *val);
bool8 FieldEffectCmd_loadfadedpal_callnative(u8 **script, u32 *val);
void FieldCB_FallWarpExit(void);
void HideFollowerForFieldEffect(void);
void StartEscalatorWarp(u8 metatileBehavior, u8 priority);
void StartLavaridgeGymB1FWarp(u8 priority);
void StartLavaridgeGym1FWarp(u8 priority);

2
src/field_effect.c
View File

@ -1650,7 +1650,7 @@ static bool8 FallWarpEffect_End(struct Task *task)
#define tState data[0]
#define tGoingUp data[1]
static void HideFollowerForFieldEffect(void)
void HideFollowerForFieldEffect(void)
{
struct ObjectEvent *followerObj = GetFollowerObject();
if (!followerObj || followerObj->invisible)

3
src/field_screen_effect.c
View File

@ -1571,12 +1571,14 @@ static void Task_ExitStairs(u8 taskId)
tState++;
break;
}
gObjectEvents[gPlayerAvatar.objectEventId].noShadow = FALSE;
}
static void ForceStairsMovement(u32 metatileBehavior, s16 *speedX, s16 *speedY)
{
ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
GetStairsMovementDirection(metatileBehavior, speedX, speedY);
gObjectEvents[gPlayerAvatar.objectEventId].noShadow = TRUE;
}
#undef tSpeedX
#undef tSpeedY
@ -1620,6 +1622,7 @@ static void Task_StairWarp(u8 taskId)
LockPlayerFieldControls();
FreezeObjectEvents();
CameraObjectFreeze();
HideFollowerForFieldEffect();
tState++;
break;
case 1: