From 47ae281a0cd83ba96b034a381c0ad0e8bf46c6f9 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Sat, 18 Jan 2025 00:11:04 +0100
Subject: [PATCH] Added icons to legacy mode; fixed bug that caused game to
 hang when switching to or from legacy mode

---
 public/images/ui/legacy/mystery_egg.png   | Bin 0 -> 252 bytes
 public/images/ui/legacy/normal_memory.png | Bin 0 -> 405 bytes
 src/ui/pokedex-page-ui-handler.ts         |   5 ++++-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 public/images/ui/legacy/mystery_egg.png
 create mode 100644 public/images/ui/legacy/normal_memory.png

diff --git a/public/images/ui/legacy/mystery_egg.png b/public/images/ui/legacy/mystery_egg.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb117a137b0a9ef2cc75d1ec041655f5d820a092
GIT binary patch
literal 252
zcmV<Y00aMtP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002PNkl<ZSi|j=
zy$ypf6oeVYt7Hw<U<}%n86jm_O3JK3nH3yP@X%pBC5_Kfq<7Lu$c68FKgeAd3WY-d
zs+3Y@HxJLR$L3wlAP_XnW1g1j1b}ZjgoT@rF02L+&ZH2y+=7k{>^3MFz-jJ|xib=o
zZvfIU;KKPnd<^BY<$0|OVF1=*p1-${5`b|9xZHXdq6`OYbpV93y{Zvxmh3?Zflv;%
zF3J7^4(Dn)Tn50)=vi95_X?H(&0oczKF6U@sHWb@dA=k@<d%;B0000<MNUMnLSTYv
C)@c&}

literal 0
HcmV?d00001

diff --git a/public/images/ui/legacy/normal_memory.png b/public/images/ui/legacy/normal_memory.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddc22d1d4ab6ba08b375941a03375b1d3d43f105
GIT binary patch
literal 405
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijK0(?ST6%-VX9zFX0{rms_|33qP_t&mnyLa#2xpU{LtEVI-Rd>%>Q{3FV
z_vqQ=<Z7U%<i}fDfRsQ<kY6xR3o>AMpd2d+l;bS$h%9Dc;5!V$jK}j=qyPmkdAc};
zSomMPbW*5AfrsUSKvRSC|Nq-BC%Q0QyE5nP<QwZJxN6mZ@^Ub}?qJNMbo}0C<CFtW
zR4RB+d_Bih<ejsC+jx4kR07{a#uH1IIQ<qVid%n-LG+MLPu1;joD13~xIEeVkMY9e
zO!wamyPBrFI>qsHpKK))w~(armlGTPyO&5T=BUo9o&A8#Q6+&{XBT750^bCO1G*kP
zrQF}StO{;jcWyEeHVJrf`|*^|7s@9DtDec+`j?k$u9wA2-5L9s|L~@}om;rg;pCUy
ina@5d>oY8^VL125z+}DR{GUMIF?hQAxvX<aXaWGM6tWip

literal 0
HcmV?d00001

diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts
index 75aec0166da..1835cd5ebdd 100644
--- a/src/ui/pokedex-page-ui-handler.ts
+++ b/src/ui/pokedex-page-ui-handler.ts
@@ -1820,7 +1820,10 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
       return;
     }
 
-    const isFormCaught = (this.speciesStarterDexEntry!.caughtAttr! & globalScene.gameData.getFormAttr(this.formIndex ?? 0)) > 0n;
+    let isFormCaught: Boolean = false;
+    if (this.speciesStarterDexEntry) {
+      isFormCaught = (this.speciesStarterDexEntry?.caughtAttr! & globalScene.gameData.getFormAttr(this.formIndex ?? 0)) > 0n;
+    }
 
     if (this.speciesStarterDexEntry?.caughtAttr) {
       if (isFormCaught) {