From 5dce35600e14c16759b1aa4f0c401cffd161a873 Mon Sep 17 00:00:00 2001
From: Yentis <yentl178@gmail.com>
Date: Sat, 18 May 2024 10:31:32 +0200
Subject: [PATCH] fix color not going back to white when new opponent is sent

---
 src/field/pokemon.ts       | 2 +-
 src/ui/fight-ui-handler.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 1152e3955a5..ee2338754c3 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -1430,7 +1430,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       return 'lightblue';
     }
 
-    return undefined;
+    return 'white';
   }
 
   toggleStats(visible: boolean): void {
diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts
index bc6e37a230a..e632e464b7a 100644
--- a/src/ui/fight-ui-handler.ts
+++ b/src/ui/fight-ui-handler.ts
@@ -241,7 +241,7 @@ export default class FightUiHandler extends UiHandler {
     return ` ${moveEffectiveness}x`;
   }
 
-  private getMoveColor(moveEffectiveness?: TypeDamageMultiplier): string | undefined {
+  private getMoveColor(moveEffectiveness?: TypeDamageMultiplier): string {
     switch (moveEffectiveness) {
       case 0:
         return 'black';
@@ -251,6 +251,8 @@ export default class FightUiHandler extends UiHandler {
         return 'red';
       case 0.5:
         return 'crimson';
+      case 1:
+        return 'white';
       case 2:
         return 'lightgreen';
       case 4:
@@ -258,8 +260,6 @@ export default class FightUiHandler extends UiHandler {
       case 8:
         return 'darkgreen';
     }
-
-    return undefined;
   }
 
   clear() {