Merge branch 'beta' into instruct

public/locales

@@ -1 +1 @@
-Subproject commit e07ab625f2080afe36b61fad291b0ec5eff4000c
+Subproject commit 5ef993b95fa8248adc0fb7d9489baccf546bf8e3

src/modifier/modifier.ts

@@ -3183,12 +3183,12 @@ export abstract class HeldItemTransferModifier extends PokemonHeldItemModifier {
           break;
         }
       }
-      const randItemIndex = pokemon.randSeedInt(tierItemModifiers.length);
-      const randItem = tierItemModifiers[randItemIndex];
+      const randItemIndex = pokemon.randSeedInt(itemModifiers.length);
+      const randItem = itemModifiers[randItemIndex];
       heldItemTransferPromises.push(globalScene.tryTransferHeldItemModifier(randItem, pokemon, false).then(success => {
         if (success) {
           transferredModifierTypes.push(randItem.type);
-          tierItemModifiers.splice(randItemIndex, 1);
+          itemModifiers.splice(randItemIndex, 1);
         }
       }));
     }

src/ui/menu-ui-handler.ts

@@ -111,7 +111,7 @@ export default class MenuUiHandler extends MessageUiHandler {
   render() {
     const ui = this.getUi();
     this.excludedMenus = () => [
-      { condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase, options: [ MenuOptions.EGG_GACHA, MenuOptions.EGG_LIST ]},
+      { condition: globalScene.getCurrentPhase() instanceof SelectModifierPhase, options: [ MenuOptions.EGG_GACHA ]},
       { condition: bypassLogin, options: [ MenuOptions.LOG_OUT ]}
     ];