Sync script.c

This commit is contained in:
GriffinR
2022-08-22 20:27:23 -04:00
parent 56f8b1a47c
commit 72f76b19b3
52 changed files with 408 additions and 385 deletions
+3 -3
View File
@@ -46,7 +46,7 @@ static void Task_FieldEffectShowMon_Init(u8 taskId)
{
u8 mapObjId;
ScriptContext2_Enable();
LockPlayerFieldControls();
gPlayerAvatar.preventStep = TRUE;
mapObjId = gPlayerAvatar.objectEventId;
if (!ObjectEventIsMovementOverridden(&gObjectEvents[mapObjId])
@@ -117,7 +117,7 @@ bool8 SetUpFieldMove_RockSmash(void)
static void sub_80C9A10(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
ScriptContext1_SetupScript(EventScript_FldEffRockSmash);
ScriptContext_SetupScript(EventScript_FldEffRockSmash);
}
bool8 FldEff_UseRockSmash(void)
@@ -133,5 +133,5 @@ static void sub_80C9A60(void)
{
PlaySE(SE_M_ROCK_THROW);
FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH);
EnableBothScriptContexts();
ScriptContext_Enable();
}