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

Document object lock and some trainer approach

Browse Source
This commit is contained in:
GriffinR
2021-01-26 04:41:13 -05:00
parent 0064333e4a
commit 9e59581220
22 changed files with 209 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/scrcmd.c
View File

@@ -1212,7 +1212,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
else
{
ScriptFreezeObjectEvents();
SetupNativeScript(ctx, sub_80983C4);
SetupNativeScript(ctx, IsFreezePlayerFinished);
return TRUE;
}
}
@@ -1228,12 +1228,12 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
if (gObjectEvents[gSelectedObjectEvent].active)
{
LockSelectedObjectEvent();
SetupNativeScript(ctx, sub_809847C);
SetupNativeScript(ctx, IsFreezeSelectedObjectAndPlayerFinished);
}
else
{
ScriptFreezeObjectEvents();
SetupNativeScript(ctx, sub_80983C4);
SetupNativeScript(ctx, IsFreezePlayerFinished);
}
return TRUE;
}
@@ -2190,7 +2190,7 @@ bool8 ScrCmd_selectapproachingtrainer(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_cmdD9(struct ScriptContext *ctx)
bool8 ScrCmd_lockfortrainer(struct ScriptContext *ctx)
{
if (IsUpdateLinkStateCBActive())
{
@@ -2200,8 +2200,8 @@ bool8 ScrCmd_cmdD9(struct ScriptContext *ctx)
{
if (gObjectEvents[gSelectedObjectEvent].active)
{
sub_8098630();
SetupNativeScript(ctx, sub_8098734);
FreezeForApproachingTrainers();
SetupNativeScript(ctx, IsFreezeObjectAndPlayerFinished);
}
return TRUE;
}