Sync script.c

2022-08-22 20:27:23 -04:00
parent 56f8b1a47c
commit 72f76b19b3
52 changed files with 408 additions and 385 deletions
@@ -1129,7 +1129,7 @@ void CreatePokemartMenu(const u16 *itemsForSale)
 {    
    SetShopItemsForSale(itemsForSale);
    CreateShopMenu(MART_TYPE_REGULAR);
-    SetShopMenuCallback(EnableBothScriptContexts);
+    SetShopMenuCallback(ScriptContext_Enable);
    DebugFunc_PrintShopMenuHistoryBeforeClearMaybe();
    memset(&gShopMenuHistory, 0, sizeof(gShopMenuHistory));
    gShopMenuHistory[0].unk8 = gMapHeader.regionMapSectionId;
@@ -1140,13 +1140,13 @@ void CreateDecorationShop1Menu(const u16 *itemsForSale)
 {
    SetShopItemsForSale(itemsForSale);
    CreateShopMenu(MART_TYPE_DECOR);
-    SetShopMenuCallback(EnableBothScriptContexts);
+    SetShopMenuCallback(ScriptContext_Enable);
 }

 void CreateDecorationShop2Menu(const u16 *itemsForSale)
 {
    SetShopItemsForSale(itemsForSale);
    CreateShopMenu(MART_TYPE_DECOR2);
-    SetShopMenuCallback(EnableBothScriptContexts);
+    SetShopMenuCallback(ScriptContext_Enable);
 }