dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-menu

Browse Source
This commit is contained in:
GriffinR
2021-11-04 12:11:31 -04:00
committed by GitHub
parent 17b657d83a 7940f121f6
commit be7d0bd3b0
53 changed files with 842 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scrcmd.c
View File

@@ -1208,7 +1208,7 @@ bool8 ScrCmd_turnvobject(struct ScriptContext *ctx)
// The player is frozen after waiting for their current movement to finish.
bool8 ScrCmd_lockall(struct ScriptContext *ctx)
{
if (IsUpdateLinkStateCBActive())
if (IsOverworldLinkActive())
{
return FALSE;
}
@@ -1224,7 +1224,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
// The player and selected object are frozen after waiting for their current movement to finish.
bool8 ScrCmd_lock(struct ScriptContext *ctx)
{
if (IsUpdateLinkStateCBActive())
if (IsOverworldLinkActive())
{
return FALSE;
}
@@ -2197,7 +2197,7 @@ bool8 ScrCmd_selectapproachingtrainer(struct ScriptContext *ctx)
bool8 ScrCmd_lockfortrainer(struct ScriptContext *ctx)
{
if (IsUpdateLinkStateCBActive())
if (IsOverworldLinkActive())
{
return FALSE;
}