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

Combined if statements per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1712962988

Browse source
This commit is contained in:
pkmnsnfrn 2024-08-11 17:29:09 -07:00
parent 91255a6054
commit 0a55a7f40b
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/field_control_avatar.c
View file

@ -183,18 +183,15 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
return TRUE; return TRUE;
} }
if (input->checkStandardWildEncounter) if ((input->checkStandardWildEncounter) && ((input->dpadDirection == 0) || input->dpadDirection == playerDirection))
{ {
if (input->dpadDirection == 0 || input->dpadDirection == playerDirection) GetInFrontOfPlayerPosition(&position);
{ metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
GetInFrontOfPlayerPosition(&position); if (TrySetUpWalkIntoSignpostScript(&position, metatileBehavior, playerDirection) == TRUE)
metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y); return TRUE;
if (TrySetUpWalkIntoSignpostScript(&position, metatileBehavior, playerDirection) == TRUE) GetPlayerPosition(&position);
return TRUE; metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
GetPlayerPosition(&position); }
metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
}
}
if (input->checkStandardWildEncounter && CheckStandardWildEncounter(metatileBehavior) == TRUE) if (input->checkStandardWildEncounter && CheckStandardWildEncounter(metatileBehavior) == TRUE)
return TRUE; return TRUE;