From e0d20f309c81202ec6ceec25fdba2847258e4fdc Mon Sep 17 00:00:00 2001
From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com>
Date: Sun, 14 Jul 2024 12:24:47 -0400
Subject: [PATCH] Push fixes

---
 src/data/nature.ts | 8 ++++----
 src/logger.ts      | 4 +++-
 src/phases.ts      | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/data/nature.ts b/src/data/nature.ts
index 90924de99ed..86da8bc66a4 100644
--- a/src/data/nature.ts
+++ b/src/data/nature.ts
@@ -87,7 +87,7 @@ export function getNatureIncrease(nature: Nature): string {
     case Nature.HASTY:
     case Nature.JOLLY:
     case Nature.NAIVE:
-      return "speed"
+      return "spe"
     case Nature.HARDY:
       //return "atk"
     case Nature.DOCILE:
@@ -97,7 +97,7 @@ export function getNatureIncrease(nature: Nature): string {
     case Nature.BASHFUL:
       //return "spdef"
     case Nature.QUIRKY:
-      //return "speed"
+      //return "spe"
     default:
       return ""
   }
@@ -128,7 +128,7 @@ export function getNatureDecrease(nature: Nature): string {
     case Nature.RELAXED:
     case Nature.QUIET:
     case Nature.SASSY:
-      return "speed"
+      return "spe"
     case Nature.HARDY:
       //return "atk"
     case Nature.DOCILE:
@@ -138,7 +138,7 @@ export function getNatureDecrease(nature: Nature): string {
     case Nature.BASHFUL:
       //return "spdef"
     case Nature.QUIRKY:
-      //return "speed"
+      //return "spe"
     default:
       return ""
   }
diff --git a/src/logger.ts b/src/logger.ts
index de609da2891..5546970f08b 100644
--- a/src/logger.ts
+++ b/src/logger.ts
@@ -828,6 +828,8 @@ export function logPokemon(scene: BattleScene, floor: integer = undefined, slot:
   var pk: PokeData = exportPokemon(pokemon, encounterRarity)
   pk.source = pokemon
   pokemon.partyslot = slot;
+  if (wv.pokemon == undefined)
+    wv.pokemon = []
   if (wv.pokemon[slot] != undefined) {
     if (encounterRarity == "" || encounterRarity == undefined) {
       if (wv.pokemon[slot].rarity != undefined && wv.pokemon[slot].rarity != "???") pk.rarity = wv.pokemon[slot].rarity
@@ -1278,7 +1280,7 @@ function printIV(inData: string, indent: string, iv: IVData) {
   inData += ",\n" + indent + "  \"def\": " + iv.def
   inData += ",\n" + indent + "  \"spatk\": " + iv.spatk
   inData += ",\n" + indent + "  \"spdef\": " + iv.spdef
-  inData += ",\n" + indent + "  \"speed\": " + iv.speed
+  inData += ",\n" + indent + "  \"spe\": " + iv.speed
   inData += "\n" + indent + "}"
   return inData;
 }
diff --git a/src/phases.ts b/src/phases.ts
index 5e8954f33ab..0e2b774c406 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -5140,10 +5140,10 @@ export class SwitchPhase extends BattlePhase {
     this.scene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.FAINT_SWITCH : PartyUiMode.POST_BATTLE_SWITCH, fieldIndex, (slotIndex: integer, option: PartyOption) => {
       if (slotIndex >= this.scene.currentBattle.getBattlerCount() && slotIndex < 6) {
         if (LoggerTools.isPreSwitch.value) {
-          LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, "Pre-switch " + (option == PartyOption.PASS_BATON ? "+ Baton" : "") + " to " + LoggerTools.playerPokeName(this.scene, slotIndex))
+          LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, "Pre-switch " + (option == PartyOption.PASS_BATON ? "+ Baton" : "") + " " + LoggerTools.playerPokeName(this.scene, fieldIndex) + "  to " + LoggerTools.playerPokeName(this.scene, slotIndex))
         }
         if (LoggerTools.isFaintSwitch.value) {
-          LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, (option == PartyOption.PASS_BATON ? "Baton" : "Switch") + " in " + LoggerTools.playerPokeName(this.scene, slotIndex))
+          LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, (option == PartyOption.PASS_BATON ? "Baton" : "Send") + " in " + LoggerTools.playerPokeName(this.scene, slotIndex))
         }
         this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, fieldIndex, slotIndex, this.doReturn, option === PartyOption.PASS_BATON));
       }