Merge branch 'master' into new_se

lxgr-linux · Sep 17, 2021 · 32f9a56 · 32f9a56
2 parents 9fa96be + 0578fcb
commit 32f9a56
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pokete.py b/pokete.py
@@ -406,7 +406,7 @@ def move_downgrade(self):
     def evolve(self):
         if not self.player:
             return
-        new = Poke(self.evolve_poke, self.xp, attacks = self.attacks)
+        new = Poke(self.evolve_poke, self.xp, _attacks = self.attacks)
         self.ico.remove()
         self.ico.add(evomap, round(evomap.width/2-4), round((evomap.height-8)/2))
         self.move_shine()
@@ -1368,6 +1368,7 @@ def text_input(obj, map, name, wrap_len, max_len=1000000):
             map.show()
             ev = ""
         std_loop()
+        time.sleep(0.05)
 
 
 # Functions needed for movemap