Merge 220a9d7a49 into 076ef81691

Fix icons not showing in save slot selection

src/data/mystery-encounters/utils/encounter-pokemon-utils.ts

@@ -813,7 +813,7 @@ export async function catchPokemon(
       } else if (addStatus.value) {
         catchMessage = "battle:pokemonCaught";
       } else {
-        catchMessage = "battle:pokemonCaughtChallenge";
+        catchMessage = "battle:pokemonCaughtButChallenge";
       }
       globalScene.ui.showText(
         i18next.t(catchMessage, { pokemonName: pokemon.getNameToRender() }),

src/phases/attempt-capture-phase.ts

@@ -257,7 +257,7 @@ export class AttemptCapturePhase extends PokemonPhase {
     applyChallenges(ChallengeType.POKEMON_ADD_TO_PARTY, pokemon, addStatus);
 
     globalScene.ui.showText(
-      i18next.t(addStatus.value ? "battle:pokemonCaught" : "battle:pokemonCaughtChallenge", {
+      i18next.t(addStatus.value ? "battle:pokemonCaught" : "battle:pokemonCaughtButChallenge", {
         pokemonName: getPokemonNameWithAffix(pokemon),
       }),
       null,

src/ui/save-slot-select-ui-handler.ts

@@ -594,13 +594,9 @@ class SessionSlot extends Phaser.GameObjects.Container {
         TextStyle.PARTY,
         { fontSize: "54px", color: "#f8f8f8" },
       );
-      text.setShadow(0, 0, undefined);
-      text.setStroke("#424242", 14);
-      text.setOrigin(1, 0);
-
-      iconContainer.add(icon);
-      iconContainer.add(text);
+      text.setShadow(0, 0, undefined).setStroke("#424242", 14).setOrigin(1, 0);
 
+      iconContainer.add([icon, text]);
       pokemonIconsContainer.add(iconContainer);
 
       pokemon.destroy();
@@ -645,6 +641,7 @@ class SessionSlot extends Phaser.GameObjects.Container {
             return;
           }
           this.saveData = sessionData;
+          this.setupWithData(sessionData);
           resolve(true);
         })
         .catch(e => {