Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
pkmnsnfrn committed Sep 19, 2024
1 parent 1ba8e7d commit f0bd3c5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/field_control_avatar.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
gSpecialVar_LastTalked = 0;
gSelectedObjectEvent = 0;

gMsgIsSignPost = FALSE;
gMsgIsSignPost = FALSE;
playerDirection = GetPlayerFacingDirection();
GetPlayerPosition(&position);
metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
Expand Down Expand Up @@ -1122,7 +1122,7 @@ static void SetMsgSignPostAndVarFacing(u32 playerDirection)
{
gWalkAwayFromSignpostTimer = WALK_AWAY_SIGNPOST_FRAMES;
gMsgBoxIsCancelable = TRUE;
gMsgIsSignPost = TRUE;
gMsgIsSignPost = TRUE;
gSpecialVar_Facing = playerDirection;
}

Expand Down Expand Up @@ -1168,8 +1168,8 @@ void CancelSignPostMessageBox(struct FieldInput *input)
return;
}

if (!gMsgBoxIsCancelable)
return;
if (!gMsgBoxIsCancelable)
return;

if (IsDpadPushedToTurnOrMovePlayer(input))
{
Expand Down
2 changes: 1 addition & 1 deletion src/field_message_box.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static void Task_DrawFieldMessage(u8 taskId)
switch (task->tState)
{
case 0:
if (gMsgIsSignPost)
if (gMsgIsSignPost)
LoadSignPostWindowFrameGfx();
else
LoadMessageBoxAndBorderGfx();
Expand Down
2 changes: 1 addition & 1 deletion src/scrcmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
gMsgBoxIsCancelable = FALSE;
gMsgBoxIsCancelable = FALSE;
return FALSE;
}

Expand Down
1 change: 0 additions & 1 deletion src/script.c
Original file line number Diff line number Diff line change
Expand Up @@ -504,4 +504,3 @@ void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize)
InitRamScript(script, scriptSize, MAP_GROUP(UNDEFINED), MAP_NUM(UNDEFINED), NO_OBJECT);
#endif //FREE_MYSTERY_EVENT_BUFFERS
}

0 comments on commit f0bd3c5

Please sign in to comment.