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
+4 -4
View File
@@ -197,7 +197,7 @@ static void Task_ItemUse_CloseMessageBoxAndReturnToField(u8 taskId)
ClearDialogWindowAndFrame(0, 1);
DestroyTask(taskId);
ClearPlayerHeldMovementAndUnfreezeObjectEvents();
ScriptContext2_Disable();
UnlockPlayerFieldControls();
}
u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId)
@@ -218,7 +218,7 @@ static void sub_80A1184(void)
static bool8 sub_80A1194(void)
{
FreezeObjectEvents();
ScriptContext2_Enable();
LockPlayerFieldControls();
FadeInFromBlack();
CreateTask(sub_80A11C0, 10);
gExitStairsMovementDisabled = FALSE;
@@ -230,7 +230,7 @@ static void sub_80A11C0(u8 taskId)
if (IsWeatherNotFadingIn() == TRUE)
{
UnfreezeObjectEvents();
ScriptContext2_Disable();
UnlockPlayerFieldControls();
DestroyTask(taskId);
}
}
@@ -278,7 +278,7 @@ static void ItemUseOnFieldCB_Bicycle(u8 taskId)
PlaySE(SE_BIKE_BELL);
GetOnOffBike(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE);
ClearPlayerHeldMovementAndUnfreezeObjectEvents();
ScriptContext2_Disable();
UnlockPlayerFieldControls();
DestroyTask(taskId);
}