Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub

2022-09-03 14:19:50 -04:00
parent 321f5371d8 097fc309f6
commit 76ec1837aa
197 changed files with 9544 additions and 9398 deletions
@@ -2726,7 +2726,7 @@ static void LinkTrade_TearDownAssets(void)

 void DoInGameTradeScene(void)
 {
-    ScriptContext2_Enable();
+    LockPlayerFieldControls();
    CreateTask(Task_WaitFadeAndStartInGameTradeAnim, 10);
    BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
    HelpSystem_Disable();