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

Fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#pullrequestreview-2315029773

Browse source
This commit is contained in:
pkmnsnfrn 2024-09-19 05:45:11 -07:00
parent 1ba8e7d300
commit f0bd3c57da
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/field_control_avatar.c
View file

@ -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);
@ -1122,7 +1122,7 @@ static void SetMsgSignPostAndVarFacing(u32 playerDirection)
{
gWalkAwayFromSignpostTimer = WALK_AWAY_SIGNPOST_FRAMES;
gMsgBoxIsCancelable = TRUE;
gMsgIsSignPost = TRUE;
gMsgIsSignPost = TRUE;
gSpecialVar_Facing = playerDirection;
}
@ -1168,8 +1168,8 @@ void CancelSignPostMessageBox(struct FieldInput *input)
return;
}
if (!gMsgBoxIsCancelable)
return;
if (!gMsgBoxIsCancelable)
return;
if (IsDpadPushedToTurnOrMovePlayer(input))
{

2
src/field_message_box.c
View file

@ -32,7 +32,7 @@ static void Task_DrawFieldMessage(u8 taskId)
switch (task->tState)
{
case 0:
if (gMsgIsSignPost)
if (gMsgIsSignPost)
LoadSignPostWindowFrameGfx();
else
LoadMessageBoxAndBorderGfx();

2
src/scrcmd.c
View file

@ -1310,7 +1310,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
gMsgBoxIsCancelable = FALSE;
gMsgBoxIsCancelable = FALSE;
return FALSE;
}

1
src/script.c
View file

@ -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
}