From abfabb9699827b8a4f98c8c733c4d3930b8605b7 Mon Sep 17 00:00:00 2001
From: AlexOn1ine <alexthenotes@gmail.com>
Date: Tue, 1 Apr 2025 15:57:04 +0200
Subject: [PATCH] revert fallback

---
 src/pokemon.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/pokemon.c b/src/pokemon.c
index 2e4ea13f2e..789935c654 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2792,9 +2792,18 @@ u32 GetBoxMonData3(struct BoxPokemon *boxMon, s32 field, u8 *data)
             break;
         case MON_DATA_TERA_TYPE:
             if (gSpeciesInfo[substruct0->species].forceTeraType)
+            {
                 retVal = gSpeciesInfo[substruct0->species].forceTeraType;
+            }
+            else if (substruct0->teraType == TYPE_NONE) // Tera Type hasn't been modified so we can just use the personality
+            {
+                const u8 *types = gSpeciesInfo[substruct0->species].types;
+                retVal = (boxMon->personality & 0x1) == 0 ? types[0] : types[1];
+            }
             else
+            {
                 retVal = substruct0->teraType;
+            }
             break;
         case MON_DATA_EVOLUTION_TRACKER:
             evoTracker.asField.a = substruct1->evolutionTracker1;