atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed ClearMsgBoxCancelableState per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1712963672

Browse source
This commit is contained in:
pkmnsnfrn 2024-08-11 18:01:52 -07:00
parent 846e8a29da
commit c3c433439e
4 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/script.h
View file

@ -67,9 +67,6 @@ extern u8 sMsgIsSignPost;
extern u8 sMsgBoxIsCancelable; extern u8 sMsgBoxIsCancelable;
void SetWalkingIntoSignVars(void); void SetWalkingIntoSignVars(void);
void MsgSetSignPost(void);
void ResetFacingNpcOrSignPostVars(void);
bool32 CanWalkAwayToCancelMsgBox(void); bool32 CanWalkAwayToCancelMsgBox(void);
void ClearMsgBoxCancelableState(void);
#endif // GUARD_SCRIPT_H #endif // GUARD_SCRIPT_H

4
src/field_control_avatar.c
View file

@ -162,7 +162,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
gSpecialVar_LastTalked = 0; gSpecialVar_LastTalked = 0;
gSelectedObjectEvent = 0; gSelectedObjectEvent = 0;
ResetFacingNpcOrSignPostVars(); sMsgIsSignPost = FALSE;
playerDirection = GetPlayerFacingDirection(); playerDirection = GetPlayerFacingDirection();
GetPlayerPosition(&position); GetPlayerPosition(&position);
metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y); metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
@ -1130,7 +1130,7 @@ static u32 GetFacingSignpostType(u16 metatileBehavior, u32 playerDirection)
static void SetMsgSignPostAndVarFacing(u32 playerDirection) static void SetMsgSignPostAndVarFacing(u32 playerDirection)
{ {
SetWalkingIntoSignVars(); SetWalkingIntoSignVars();
MsgSetSignPost(); sMsgIsSignPost = TRUE;
gSpecialVar_Facing = playerDirection; gSpecialVar_Facing = playerDirection;
} }

4
src/scrcmd.c
View file

@ -1290,7 +1290,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeObjectEvents(); ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents(); UnfreezeObjectEvents();
ClearMsgBoxCancelableState(); sMsgBoxIsCancelable = FALSE;
return FALSE; return FALSE;
} }
@ -1309,7 +1309,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeObjectEvents(); ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents(); UnfreezeObjectEvents();
ClearMsgBoxCancelableState(); sMsgBoxIsCancelable = FALSE;
return FALSE; return FALSE;
} }

15
src/script.c
View file

@ -513,21 +513,6 @@ void SetWalkingIntoSignVars(void)
sMsgBoxIsCancelable = TRUE; sMsgBoxIsCancelable = TRUE;
} }
void ResetFacingNpcOrSignPostVars(void)
{
sMsgIsSignPost = FALSE;
}
void MsgSetSignPost(void)
{
sMsgIsSignPost = TRUE;
}
void ClearMsgBoxCancelableState(void)
{
sMsgBoxIsCancelable = FALSE;
}
bool32 CanWalkAwayToCancelMsgBox(void) bool32 CanWalkAwayToCancelMsgBox(void)
{ {
return sMsgBoxIsCancelable; return sMsgBoxIsCancelable;